diff --git a/app/conference_centers/app_config.php b/app/conference_centers/app_config.php index 573f5e2661..e4a11170d5 100644 --- a/app/conference_centers/app_config.php +++ b/app/conference_centers/app_config.php @@ -178,10 +178,10 @@ $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Introduce participants as they enter the conference.'; $z++; - $apps[$x]['db'][$y]['fields'][$z]['name'] = 'enter_sound'; - $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.'; - $z++; + //$apps[$x]['db'][$y]['fields'][$z]['name'] = 'enter_sound'; + //$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.'; + //$z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'mute'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Mute participants on entering the conference.'; diff --git a/app/conference_centers/conference_room_edit.php b/app/conference_centers/conference_room_edit.php index fffef5b1f6..6201f6952a 100644 --- a/app/conference_centers/conference_room_edit.php +++ b/app/conference_centers/conference_room_edit.php @@ -61,7 +61,7 @@ else { $max_members = check_str($_POST["max_members"]); $wait_mod = check_str($_POST["wait_mod"]); $announce = check_str($_POST["announce"]); - $enter_sound = check_str($_POST["enter_sound"]); + //$enter_sound = check_str($_POST["enter_sound"]); $mute = check_str($_POST["mute"]); $created = check_str($_POST["created"]); $created_by = check_str($_POST["created_by"]); @@ -202,7 +202,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { $sql .= "max_members, "; $sql .= "wait_mod, "; $sql .= "announce, "; - $sql .= "enter_sound, "; + //$sql .= "enter_sound, "; $sql .= "mute, "; $sql .= "created, "; $sql .= "created_by, "; @@ -220,7 +220,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { $sql .= "'$max_members', "; $sql .= "'$wait_mod', "; $sql .= "'$announce', "; - $sql .= "'$enter_sound', "; + //$sql .= "'$enter_sound', "; $sql .= "'$mute', "; $sql .= "now(), "; $sql .= "'".$_SESSION['user_uuid']."', "; @@ -286,7 +286,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { $sql .= "max_members = '$max_members', "; $sql .= "wait_mod = '$wait_mod', "; $sql .= "announce = '$announce', "; - $sql .= "enter_sound = '$enter_sound', "; + //$sql .= "enter_sound = '$enter_sound', "; $sql .= "mute = '$mute', "; $sql .= "enabled = '$enabled', "; $sql .= "description = '$description' "; @@ -372,7 +372,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { $max_members = $row["max_members"]; $wait_mod = $row["wait_mod"]; $announce = $row["announce"]; - $enter_sound = $row["enter_sound"]; + //$enter_sound = $row["enter_sound"]; $mute = $row["mute"]; $created = $row["created"]; $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($wait_mod) == 0) { $wait_mod = 'false'; } if (strlen($announce) == 0) { $announce = 'true'; } - if ($action == "add") { - if (strlen($enter_sound) == 0) { $enter_sound = 'tone_stream://%(200,0,500,600,700)'; } - } + //if ($action == "add") { + // if (strlen($enter_sound) == 0) { $enter_sound = 'tone_stream://%(200,0,500,600,700)'; } + //} if (strlen($mute) == 0) { $mute = 'false'; } if (strlen($enabled) == 0) { $enabled = 'true'; } @@ -668,16 +668,16 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; echo "\n"; - echo "\n"; - echo "\n"; - echo " ".$text['label-enter-sound'].":\n"; - echo "\n"; - echo "\n"; - echo " \n"; - echo "
\n"; - echo "\n"; - echo "\n"; - echo "\n"; + //echo "\n"; + //echo "\n"; + //echo " ".$text['label-enter-sound'].":\n"; + //echo "\n"; + //echo "\n"; + //echo " \n"; + //echo "
\n"; + //echo "\n"; + //echo "\n"; + //echo "\n"; echo "\n"; echo "\n"; diff --git a/includes/install/scripts/conference_center.lua b/includes/install/scripts/conference_center.lua index 84835a387b..e966420f58 100644 --- a/includes/install/scripts/conference_center.lua +++ b/includes/install/scripts/conference_center.lua @@ -225,7 +225,7 @@ wait_mod = row["wait_mod"]; member_type = row["member_type"]; announce = row["announce"]; - enter_sound = row["enter_sound"]; + --enter_sound = row["enter_sound"]; mute = row["mute"]; created = row["created"]; created_by = row["created_by"]; @@ -395,10 +395,10 @@ freeswitch.consoleLog("notice", "[conference] ".. cmd .."\n"); response = api:executeString(cmd); else - if (enter_sound ~= nil) then - cmd = "conference "..meeting_uuid.."-"..domain_name.." play "..enter_sound; - response = api:executeString(cmd); - end + --if (enter_sound ~= nil) then + -- cmd = "conference "..meeting_uuid.."-"..domain_name.." play "..enter_sound; + -- response = api:executeString(cmd); + --end end --send the call to the conference