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

Update music_on_hold.php 

Fix the default rate for music on hold.
This commit is contained in:
FusionPBX 2016-06-30 00:31:22 -06:00 committed by GitHub
parent a877998390
commit cfdbbf16a6
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/music_on_hold/music_on_hold.php
View File

@ -160,10 +160,11 @@
$moh_rate_auto = false; $moh_rate_auto = false;
} }
//define default path //define default path
$moh_path = path_join($_SESSION['switch']['sounds']['dir'], 'music', //$moh_path = path_join($_SESSION['switch']['sounds']['dir'], 'music',
(($moh_scope == 'global') ? 'global' : $_SESSION['domain_name']), // (($moh_scope == 'global') ? 'global' : $_SESSION['domain_name']),
$moh_name_only, $moh_rate // $moh_name_only, $moh_rate
); //);
$moh_path_found = false; $moh_path_found = false;
//begin query //begin query
$music_on_hold_uuid = uuid(); $music_on_hold_uuid = uuid();
@ -206,19 +207,14 @@
else { else {
//get existing path //get existing path
$moh_settings = $mohs[(($moh_scope == 'global') ? '_global_' : $domain_uuid)][$moh_name_only][$moh_rate]; $moh_settings = $mohs[(($moh_scope == 'global') ? '_global_' : $domain_uuid)][$moh_name_only][$moh_rate];
if ( if (($moh_rate_auto && $moh_name_only == $moh_settings['name']) ||
($moh_rate_auto && $moh_name_only == $moh_settings['name']) || (!$moh_rate_auto && path_join($moh_name_only, $moh_rate) == $moh_settings['name'])) {
(!$moh_rate_auto && path_join($moh_name_only, $moh_rate) == $moh_settings['name'])
) {
$moh_path = $moh_settings['path']; $moh_path = $moh_settings['path'];
$moh_path_found = true; $moh_path_found = true;
} }
//not found, finish query //not found, finish query
else { else {
$music_on_hold_name = $moh_name_only; $music_on_hold_name = $moh_name_only;
if (!$moh_rate_auto) {
$music_on_hold_name = path_join($music_on_hold_name, $moh_rate);
}
$music_on_hold_path = str_replace($_SESSION['switch']['sounds']['dir'], '$${sounds_dir}', $moh_path); $music_on_hold_path = str_replace($_SESSION['switch']['sounds']['dir'], '$${sounds_dir}', $moh_path);
$sql .= "( "; $sql .= "( ";
@ -494,10 +490,11 @@
echo " </td>\n"; echo " </td>\n";
echo " <td class='vtable' width='70%'>\n"; echo " <td class='vtable' width='70%'>\n";
echo " <select id='rate' name='rate' class='formfld' style='width: auto;'>\n"; echo " <select id='rate' name='rate' class='formfld' style='width: auto;'>\n";
echo " <option value=''>".$text['option-default']."</option>\n";
echo " <option value='8000'>8 kHz</option>\n"; echo " <option value='8000'>8 kHz</option>\n";
echo " <option value='16000'>16 kHz</option>\n"; echo " <option value='16000'>16 kHz</option>\n";
echo " <option value='32000'>32 kHz</option>\n"; echo " <option value='32000'>32 kHz</option>\n";
echo " <option value='auto'>48 kHz / ".$text['option-default']."</option>\n"; echo " <option value='48000'>48 kHz</option>\n";
echo " </select>\n"; echo " </select>\n";
echo " </td>\n"; echo " </td>\n";
echo " </tr>\n"; echo " </tr>\n";