dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove enter_sound from conference center manager it in the conference profile instead.

Browse Source
This commit is contained in:
Mark Crane
2013-01-05 11:38:10 +00:00
parent 0aad1b0944
commit b4725e1ea9
3 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/conference_centers/app_config.php
+4 -4
View File
@@ -178,10 +178,10 @@
$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Introduce participants as they enter the conference.'; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Introduce participants as they enter the conference.';
$z++; $z++;
$apps[$x]['db'][$y]['fields'][$z]['name'] = 'enter_sound'; //$apps[$x]['db'][$y]['fields'][$z]['name'] = 'enter_sound';
$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; //$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'The sound played when someone enters the conference.'; //$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'The sound played when someone enters the conference.';
$z++; //$z++;
$apps[$x]['db'][$y]['fields'][$z]['name'] = 'mute'; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'mute';
$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Mute participants on entering the conference.'; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Mute participants on entering the conference.';
app/conference_centers/conference_room_edit.php
+18 -18
View File
@@ -61,7 +61,7 @@ else {
$max_members = check_str($_POST["max_members"]); $max_members = check_str($_POST["max_members"]);
$wait_mod = check_str($_POST["wait_mod"]); $wait_mod = check_str($_POST["wait_mod"]);
$announce = check_str($_POST["announce"]); $announce = check_str($_POST["announce"]);
$enter_sound = check_str($_POST["enter_sound"]); //$enter_sound = check_str($_POST["enter_sound"]);
$mute = check_str($_POST["mute"]); $mute = check_str($_POST["mute"]);
$created = check_str($_POST["created"]); $created = check_str($_POST["created"]);
$created_by = check_str($_POST["created_by"]); $created_by = check_str($_POST["created_by"]);
@@ -202,7 +202,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "max_members, "; $sql .= "max_members, ";
$sql .= "wait_mod, "; $sql .= "wait_mod, ";
$sql .= "announce, "; $sql .= "announce, ";
$sql .= "enter_sound, "; //$sql .= "enter_sound, ";
$sql .= "mute, "; $sql .= "mute, ";
$sql .= "created, "; $sql .= "created, ";
$sql .= "created_by, "; $sql .= "created_by, ";
@@ -220,7 +220,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "'$max_members', "; $sql .= "'$max_members', ";
$sql .= "'$wait_mod', "; $sql .= "'$wait_mod', ";
$sql .= "'$announce', "; $sql .= "'$announce', ";
$sql .= "'$enter_sound', "; //$sql .= "'$enter_sound', ";
$sql .= "'$mute', "; $sql .= "'$mute', ";
$sql .= "now(), "; $sql .= "now(), ";
$sql .= "'".$_SESSION['user_uuid']."', "; $sql .= "'".$_SESSION['user_uuid']."', ";
@@ -286,7 +286,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "max_members = '$max_members', "; $sql .= "max_members = '$max_members', ";
$sql .= "wait_mod = '$wait_mod', "; $sql .= "wait_mod = '$wait_mod', ";
$sql .= "announce = '$announce', "; $sql .= "announce = '$announce', ";
$sql .= "enter_sound = '$enter_sound', "; //$sql .= "enter_sound = '$enter_sound', ";
$sql .= "mute = '$mute', "; $sql .= "mute = '$mute', ";
$sql .= "enabled = '$enabled', "; $sql .= "enabled = '$enabled', ";
$sql .= "description = '$description' "; $sql .= "description = '$description' ";
@@ -372,7 +372,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
$max_members = $row["max_members"]; $max_members = $row["max_members"];
$wait_mod = $row["wait_mod"]; $wait_mod = $row["wait_mod"];
$announce = $row["announce"]; $announce = $row["announce"];
$enter_sound = $row["enter_sound"]; //$enter_sound = $row["enter_sound"];
$mute = $row["mute"]; $mute = $row["mute"];
$created = $row["created"]; $created = $row["created"];
$created_by = $row["created_by"]; $created_by = $row["created_by"];
@@ -387,9 +387,9 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
if (strlen($max_members) == 0) { $max_members = 0; } if (strlen($max_members) == 0) { $max_members = 0; }
if (strlen($wait_mod) == 0) { $wait_mod = 'false'; } if (strlen($wait_mod) == 0) { $wait_mod = 'false'; }
if (strlen($announce) == 0) { $announce = 'true'; } if (strlen($announce) == 0) { $announce = 'true'; }
if ($action == "add") { //if ($action == "add") {
if (strlen($enter_sound) == 0) { $enter_sound = 'tone_stream://%(200,0,500,600,700)'; } // if (strlen($enter_sound) == 0) { $enter_sound = 'tone_stream://%(200,0,500,600,700)'; }
} //}
if (strlen($mute) == 0) { $mute = 'false'; } if (strlen($mute) == 0) { $mute = 'false'; }
if (strlen($enabled) == 0) { $enabled = 'true'; } if (strlen($enabled) == 0) { $enabled = 'true'; }
@@ -668,16 +668,16 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
echo "</td>\n"; echo "</td>\n";
echo "</tr>\n"; echo "</tr>\n";
echo "<tr>\n"; //echo "<tr>\n";
echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n"; //echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
echo " ".$text['label-enter-sound'].":\n"; //echo " ".$text['label-enter-sound'].":\n";
echo "</td>\n"; //echo "</td>\n";
echo "<td class='vtable' align='left'>\n"; //echo "<td class='vtable' align='left'>\n";
echo " <input class='formfld' type='text' name='enter_sound' maxlength='255' value=\"$enter_sound\">\n"; //echo " <input class='formfld' type='text' name='enter_sound' maxlength='255' value=\"$enter_sound\">\n";
echo "<br />\n"; //echo "<br />\n";
echo "\n"; //echo "\n";
echo "</td>\n"; //echo "</td>\n";
echo "</tr>\n"; //echo "</tr>\n";
echo "<tr>\n"; echo "<tr>\n";
echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n"; echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
includes/install/scripts/conference_center.lua
+5 -5
View File
@@ -225,7 +225,7 @@
wait_mod = row["wait_mod"]; wait_mod = row["wait_mod"];
member_type = row["member_type"]; member_type = row["member_type"];
announce = row["announce"]; announce = row["announce"];
enter_sound = row["enter_sound"]; --enter_sound = row["enter_sound"];
mute = row["mute"]; mute = row["mute"];
created = row["created"]; created = row["created"];
created_by = row["created_by"]; created_by = row["created_by"];
@@ -395,10 +395,10 @@
freeswitch.consoleLog("notice", "[conference] ".. cmd .."\n"); freeswitch.consoleLog("notice", "[conference] ".. cmd .."\n");
response = api:executeString(cmd); response = api:executeString(cmd);
else else
if (enter_sound ~= nil) then --if (enter_sound ~= nil) then
cmd = "conference "..meeting_uuid.."-"..domain_name.." play "..enter_sound; -- cmd = "conference "..meeting_uuid.."-"..domain_name.." play "..enter_sound;
response = api:executeString(cmd); -- response = api:executeString(cmd);
end --end
end end
--send the call to the conference --send the call to the conference