diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php index d54c4ca0c4..dda3103fee 100644 --- a/app/extensions/extension_edit.php +++ b/app/extensions/extension_edit.php @@ -1169,18 +1169,20 @@ echo ""; echo "
\n"; @@ -509,29 +511,18 @@ echo "\n"; echo "\n"; - //--- begin: show_advanced ----------------------- echo "\n"; - echo "\n"; + echo "  \n"; + echo " \n"; + echo " ".button::create(['type'=>'button','label'=>$text['button-advanced'],'icon'=>'tools','onclick'=>'show_advanced_config();']); + echo " \n"; + echo "\n"; - echo "
\n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo "
 \n"; - echo button::create(['type'=>'button','label'=>$text['button-advanced'],'icon'=>'tools','onclick'=>'show_advanced_config();']); - echo "
\n"; - echo "
\n"; - - echo "
\n"; - echo " \n"; - - echo "\n"; - echo "\n"; + echo "\n"; - echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; @@ -559,7 +550,7 @@ echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; @@ -570,7 +561,7 @@ echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; @@ -601,7 +592,7 @@ echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; @@ -612,7 +603,7 @@ echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; @@ -623,7 +614,7 @@ echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; @@ -634,7 +625,7 @@ echo "\n"; echo "\n"; - echo " \n"; + echo " \n"; echo " \n"; @@ -655,7 +646,7 @@ echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; @@ -676,7 +667,7 @@ echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; @@ -687,7 +678,7 @@ echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; @@ -698,7 +689,7 @@ echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; @@ -723,7 +714,7 @@ echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; @@ -734,7 +725,7 @@ echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; @@ -745,7 +736,7 @@ echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; @@ -756,7 +747,7 @@ echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; @@ -778,7 +769,7 @@ echo "\n"; if (permission_exists('gateway_channels')) { - echo "\n"; + echo "\n"; echo "\n"; @@ -790,7 +781,7 @@ echo "\n"; } - echo "\n"; + echo "\n"; echo "\n"; @@ -802,7 +793,7 @@ echo "\n"; if (permission_exists('gateway_domain')) { - echo "\n"; + echo "\n"; echo "\n"; @@ -829,12 +820,6 @@ echo "\n"; } - echo "
\n"; + echo "
\n"; - echo "
"; - - echo "\n"; - echo "\n"; - //--- end: show_advanced ----------------------- echo "\n"; echo "\n"; diff --git a/app/ivr_menus/ivr_menu_edit.php b/app/ivr_menus/ivr_menu_edit.php index 9c846c375e..5850f39660 100644 --- a/app/ivr_menus/ivr_menu_edit.php +++ b/app/ivr_menus/ivr_menu_edit.php @@ -571,7 +571,7 @@ //set the defaults if (empty($ivr_menu_timeout)) { $ivr_menu_timeout = '3000'; } if (empty($ivr_menu_ringback)) { $ivr_menu_ringback = ''; } - if (empty($ivr_menu_invalid_sound)) { $ivr_menu_invalid_sound = 'ivr/ivr-that_was_an_invalid_entry.wav'; } + if (empty($ivr_menu_invalid_sound)) { $ivr_menu_invalid_sound = ''; } //if (empty($ivr_menu_confirm_key)) { $ivr_menu_confirm_key = '#'; } if (empty($ivr_menu_tts_engine)) { $ivr_menu_tts_engine = 'flite'; } if (empty($ivr_menu_tts_voice)) { $ivr_menu_tts_voice = 'rms'; } @@ -648,8 +648,10 @@ //show the content echo "\n"; @@ -1182,373 +1184,359 @@ echo "\n"; echo "\n"; - echo "\n"; + echo " \n"; echo " ".$text['label-ring_back']."\n"; - echo "\n"; - echo "\n"; + echo " \n"; + echo " \n"; - echo $ringbacks->select('ivr_menu_ringback', $ivr_menu_ringback); + echo " ".$ringbacks->select('ivr_menu_ringback', $ivr_menu_ringback); - echo "
\n"; - echo $text['description-ring_back']."\n"; - echo "\n"; + echo "
\n"; + echo " ".$text['description-ring_back']."\n"; + echo " \n"; echo "\n"; echo "\n"; - echo "\n"; - echo " ".$text['label-caller_id_name_prefix']."\n"; - echo "\n"; - echo "\n"; - echo " \n"; - echo "
\n"; + echo " \n"; + echo " ".$text['label-caller_id_name_prefix']."\n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo "
\n"; echo $text['description-caller_id_name_prefix']."\n"; - echo "\n"; + echo " \n"; echo "\n"; - echo "\n"; - //--- begin: advanced ----------------------- + echo "\n"; + echo "  \n"; + echo " \n"; + echo " ".button::create(['type'=>'button','label'=>$text['button-advanced'],'icon'=>'tools','onclick'=>'show_advanced_config();']); + echo " \n"; + echo " \n"; - echo "
\n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo "
 \n"; - echo button::create(['type'=>'button','label'=>$text['button-advanced'],'icon'=>'tools','onclick'=>'show_advanced_config();']); - echo "
\n"; - echo "
\n"; - - echo "
\n"; - echo " \n"; - - $instance_id = 'ivr_menu_invalid_sound'; - $instance_label = 'invalid_sound'; - $instance_value = $ivr_menu_invalid_sound; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; + echo " \n"; + echo " \n"; + echo "\n"; + echo "\n"; + echo " \n"; - echo "\n"; - - $instance_id = 'ivr_menu_exit_sound'; - $instance_label = 'exit_sound'; - $instance_value = $ivr_menu_exit_sound; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - - if (permission_exists('ivr_menu_domain')) { - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; + echo " \n"; } + } + if (permission_exists('ivr_menu_audio_edit') && !empty($instance_value) && !$found) { + echo " \n"; + } + unset($selected); + echo " \n"; + if (permission_exists('ivr_menu_audio_edit')) { + echo " "; + } + if ((permission_exists('recording_play') || permission_exists('recording_download')) && (!empty($playable) || empty($instance_value))) { + switch (pathinfo($playable, PATHINFO_EXTENSION)) { + case 'wav' : $mime_type = 'audio/wav'; break; + case 'mp3' : $mime_type = 'audio/mpeg'; break; + case 'ogg' : $mime_type = 'audio/ogg'; break; + } + echo " "; + echo button::create(['type'=>'button','title'=>$text['label-play'].' / '.$text['label-pause'],'icon'=>$settings->get('theme', 'button_icon_play'),'id'=>'recording_button_'.$instance_id,'style'=>'display: '.(!empty($mime_type) ? 'inline' : 'none'),'onclick'=>"recording_play('".$instance_id."', document.getElementById('".$instance_id."').value, document.getElementById('".$instance_id."').options[document.getElementById('".$instance_id."').selectedIndex].parentNode.getAttribute('data-type'));"]); + unset($playable, $mime_type); + } + echo "
\n"; + echo $text['description-'.$instance_label]."\n"; + echo " \n"; + echo "\n"; - echo "
\n"; - echo " ".$text['label-'.$instance_label]."\n"; - echo "
\n"; - echo "
\n"; - echo " ".$text['label-'.$instance_label]."\n"; - echo "
\n"; - echo "\n"; - if (permission_exists('ivr_menu_audio_edit')) { - echo ""; - } - if ((permission_exists('recording_play') || permission_exists('recording_download')) && (!empty($playable) || empty($instance_value))) { - switch (pathinfo($playable, PATHINFO_EXTENSION)) { - case 'wav' : $mime_type = 'audio/wav'; break; - case 'mp3' : $mime_type = 'audio/mpeg'; break; - case 'ogg' : $mime_type = 'audio/ogg'; break; - } - echo ""; - echo button::create(['type'=>'button','title'=>$text['label-play'].' / '.$text['label-pause'],'icon'=>$settings->get('theme', 'button_icon_play'),'id'=>'recording_button_'.$instance_id,'style'=>'display: '.(!empty($mime_type) ? 'inline' : 'none'),'onclick'=>"recording_play('".$instance_id."', document.getElementById('".$instance_id."').value, document.getElementById('".$instance_id."').options[document.getElementById('".$instance_id."').selectedIndex].parentNode.getAttribute('data-type'));"]); - unset($playable, $mime_type); - } - echo "
\n"; - echo $text['description-'.$instance_label]."\n"; - echo "
\n"; - echo " ".$text['label-pin_number']."\n"; - echo "\n"; - echo " \n"; - echo "
\n"; - echo $text['description-pin_number']."\n"; - echo "
\n"; - echo " ".$text['label-comfirm_macro']."\n"; - echo "\n"; - echo " \n"; - echo "
\n"; - echo $text['description-comfirm_macro']."\n"; - echo "
\n"; - echo " ".$text['label-comfirm_key']."\n"; - echo "\n"; - echo " \n"; - echo "
\n"; - echo $text['description-comfirm_key']."\n"; - echo "
\n"; - echo " ".$text['label-tts_engine']."\n"; - echo "\n"; - echo " \n"; - echo "
\n"; - echo $text['description-tts_engine']."\n"; - echo "
\n"; - echo " ".$text['label-tts_voice']."\n"; - echo "\n"; - echo " \n"; - echo "
\n"; - echo $text['description-tts_voice']."\n"; - echo "
\n"; - echo " ".$text['label-comfirm_attempts']."\n"; - echo "\n"; - echo " \n"; - echo "
\n"; - echo $text['description-comfirm_attempts']."\n"; - echo "
\n"; - echo " ".$text['label-inter-digit_timeout']."\n"; - echo "\n"; - echo " \n"; - echo "
\n"; - echo $text['description-inter-digit_timeout']."\n"; - echo "
\n"; - echo " ".$text['label-max_failures']."\n"; - echo "\n"; - echo " \n"; - echo "
\n"; - echo $text['description-max_failures']."\n"; - echo "
\n"; - echo " ".$text['label-max_timeouts']."\n"; - echo "\n"; - echo " \n"; - echo "
\n"; - echo $text['description-max_timeouts']."\n"; - echo "
\n"; - echo " ".$text['label-digit_length']."\n"; - echo "\n"; - echo " \n"; - echo "
\n"; - echo $text['description-digit_length']."\n"; - echo "
\n"; - echo " ".$text['label-domain']."\n"; - echo "\n"; - echo " \n"; - echo "
\n"; - echo $text['description-domain_name']."\n"; - echo "
\n"; - echo "
"; + $instance_id = 'ivr_menu_exit_sound'; + $instance_label = 'exit_sound'; + $instance_value = $ivr_menu_exit_sound; + echo "\n"; + echo " \n"; + echo " ".$text['label-'.$instance_label]."\n"; + echo " \n"; + echo " \n"; + echo "\n"; + echo "\n"; + echo " \n"; + echo " \n"; + if (permission_exists('ivr_menu_audio_edit')) { + echo " "; + } + if ((permission_exists('recording_play') || permission_exists('recording_download')) && (!empty($playable) || empty($instance_value))) { + switch (pathinfo($playable, PATHINFO_EXTENSION)) { + case 'wav' : $mime_type = 'audio/wav'; break; + case 'mp3' : $mime_type = 'audio/mpeg'; break; + case 'ogg' : $mime_type = 'audio/ogg'; break; + } + echo " "; + echo button::create(['type'=>'button','title'=>$text['label-play'].' / '.$text['label-pause'],'icon'=>$settings->get('theme', 'button_icon_play'),'id'=>'recording_button_'.$instance_id,'style'=>'display: '.(!empty($mime_type) ? 'inline' : 'none'),'onclick'=>"recording_play('".$instance_id."', document.getElementById('".$instance_id."').value, document.getElementById('".$instance_id."').options[document.getElementById('".$instance_id."').selectedIndex].parentNode.getAttribute('data-type'));"]); + unset($playable, $mime_type); + } + echo "
\n"; + echo " ".$text['description-'.$instance_label]."\n"; + echo " \n"; + echo "\n"; - //--- end: advanced ----------------------- + echo "\n"; + echo " \n"; + echo " ".$text['label-pin_number']."\n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo "
\n"; + echo " ".$text['description-pin_number']."\n"; + echo " \n"; + echo "\n"; - echo "\n"; + echo "\n"; + echo " \n"; + echo " \n"; + echo "\n"; + + echo "\n"; + echo " \n"; + echo " \n"; + echo "\n"; + + echo "\n"; + echo " \n"; + echo " \n"; + echo "\n"; + + echo "\n"; + echo " \n"; + echo " \n"; + echo "\n"; + + echo "\n"; + echo " \n"; + echo " \n"; + echo "\n"; + + echo "\n"; + echo " \n"; + echo " \n"; + echo "\n"; + + echo "\n"; + echo " \n"; + echo " \n"; + echo "\n"; + + echo "\n"; + echo " \n"; + echo " \n"; + echo "\n"; + + echo "\n"; + echo " \n"; + echo " \n"; + echo "\n"; + + if (permission_exists('ivr_menu_domain')) { + echo "\n"; + echo " \n"; + echo " \n"; + echo "\n"; + } + + + //echo "
\n"; if (permission_exists('ivr_menu_context')) { echo "\n"; - echo "\n"; - echo "\n"; + echo " \n"; + echo " \n"; echo "\n"; } echo "\n"; - echo "\n"; - echo "\n"; + echo " \n"; + echo "
\n"; + echo " ".$text['description-enabled']."\n"; + echo " \n"; echo "\n"; echo "\n"; - echo "\n"; - echo "\n"; + echo " \n"; + echo " \n"; echo "\n"; echo "
\n"; - echo " ".$text['label-context']."\n"; - echo "\n"; - echo " \n"; - echo "
\n"; - echo $text['description-enter-context']."\n"; - echo "
\n"; + echo " ".$text['label-context']."\n"; + echo " \n"; + echo " \n"; + echo "
\n"; + echo " ".$text['description-enter-context']."\n"; + echo "
\n"; - echo " ".$text['label-enabled']."\n"; - echo "\n"; + echo " \n"; + echo " ".$text['label-enabled']."\n"; + echo " \n"; if ($input_toggle_style_switch) { - echo " \n"; + echo " \n"; } - echo " \n"; + echo " \n"; if ($input_toggle_style_switch) { - echo " \n"; - echo " \n"; + echo " \n"; + echo " \n"; } - echo "
\n"; - echo $text['description-enabled']."\n"; - echo "
\n"; - echo " ".$text['label-description']."\n"; - echo "\n"; - echo " \n"; - echo "
\n"; - echo $text['description-description']."\n"; - echo "
\n"; + echo " ".$text['label-description']."\n"; + echo " \n"; + echo " \n"; + echo "
\n"; + echo " ".$text['description-description']."\n"; + echo "
";