This commit is contained in:
Nuno Miguel Reis
2014-01-21 18:03:05 +00:00
parent b8058f0a18
commit 05e3a61ac4
8 changed files with 35 additions and 1 deletions

View File

@@ -121,6 +121,10 @@
$text['option-frring']['pt-pt'] = "fr-ring";
$text['option-frring']['fr-fr'] = "fr-ring";
$text['option-ptring']['en-us'] = "pt-ring";
$text['option-ptring']['pt-pt'] = "pt-ring";
$text['option-ptring']['fr-fr'] = "pt-ring";
$text['option-ukring']['en-us'] = "uk-ring";
$text['option-ukring']['pt-pt'] = "uk-ring";
$text['option-ukring']['fr-fr'] = "uk-ring";

View File

@@ -439,6 +439,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
else {
$select_options .= " <option value='\${us-ring}'>".$text['option-usring']."</option>\n";
}
if ($queue_moh_sound == "\${pt-ring}" || $queue_moh_sound == "pt-ring") {
$select_options .= " <option value='\${pt-ring}' selected='selected'>".$text['option-ptring']."</option>\n";
}
else {
$select_options .= " <option value='\${pt-ring}'>".$text['option-ptring']."</option>\n";
}
if ($queue_moh_sound == "\${fr-ring}" || $queue_moh_sound == "fr-ring") {
$select_options .= " <option value='\${fr-ring}' selected='selected'>".$text['option-frring']."</option>\n";
}

View File

@@ -124,6 +124,10 @@
$text['opt-frring']['pt-pt'] = "fr-ring";
$text['opt-frring']['fr-fr'] = "fr-ring";
$text['opt-ptring']['en-us'] = "pt-ring";
$text['opt-ptring']['pt-pt'] = "pt-ring";
$text['opt-ptring']['fr-fr'] = "pt-ring";
$text['opt-ukring']['en-us'] = "uk-ring";
$text['opt-ukring']['pt-pt'] = "uk-ring";
$text['opt-ukring']['fr-fr'] = "uk-ring";

View File

@@ -99,6 +99,9 @@ if (is_array($_REQUEST) && !empty($_REQUEST['src']) && !empty($_REQUEST['dest'])
case "fr-ring":
$ringback_value = "\'%(1500,3500,440.0,0.0)\'";
break;
case "pt-ring":
$ringback_value = "\'%(1000,5000,400.0,0.0)\'";
break;
case "rs-ring":
$ringback_value = "\'%(1000,4000,425.0,0.0)\'";
break;
@@ -363,6 +366,12 @@ if (is_array($_REQUEST) && !empty($_REQUEST['src']) && !empty($_REQUEST['dest'])
else {
echo " <option value='fr-ring'>".$text['opt-frring']."</option>\n";
}
if ($ringback == "pt-ring") {
echo " <option value='pt-ring' selected='selected'>".$text['opt-ptring']."</option>\n";
}
else {
echo " <option value='pt-ring'>".$text['opt-ptring']."</option>\n";
}
if ($ringback == "uk-ring") {
echo " <option value='uk-ring' selected='selected'>".$text['opt-ukring']."</option>\n";
}

View File

@@ -770,6 +770,12 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
else {
$select_options .= " <option value='\${us-ring}'>us-ring</option>\n";
}
if ($ivr_menu_ringback == "\${pt-ring}" || $ivr_menu_ringback == "pt-ring") {
$select_options .= " <option value='\${pt-ring}' selected='selected'>pt-ring</option>\n";
}
else {
$select_options .= " <option value='\${pt-ring}'>pt-ring</option>\n";
}
if ($ivr_menu_ringback == "\${fr-ring}" || $ivr_menu_ringback == "fr-ring") {
$select_options .= " <option value='\${fr-ring}' selected='selected'>fr-ring</option>\n";
}
@@ -1010,4 +1016,4 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
//include the footer
require_once "resources/footer.php";
?>
?>

View File

@@ -43,6 +43,7 @@ $vars = <<<EOD
{"var_name":"default_areacode","var_value":"208","var_cat":"Defaults","var_enabled":"true","var_description":""},
{"var_name":"uk-ring","var_value":"%(400,200,400,450);%(400,2200,400,450)","var_cat":"Defaults","var_enabled":"true","var_description":""},
{"var_name":"us-ring","var_value":"%(2000, 4000, 440.0, 480.0)","var_cat":"Defaults","var_enabled":"true","var_description":""},
{"var_name":"pt-ring","var_value":"%(1000, 5000, 400.0, 0.0)","var_cat":"Defaults","var_enabled":"true","var_description":""},
{"var_name":"fr-ring","var_value":"%(1500, 3500, 440.0, 0.0)","var_cat":"Defaults","var_enabled":"true","var_description":""},
{"var_name":"rs-ring","var_value":"%(1000, 4000, 425.0, 0.0)","var_cat":"Defaults","var_enabled":"true","var_description":""},
{"var_name":"bong-ring","var_value":"v=-7;%(100,0,941.0,1477.0);v=-7;>=2;+=.1;%(1400,0,350,440)","var_cat":"Defaults","var_enabled":"true","var_description":""},

View File

@@ -87,6 +87,9 @@
elseif (ringback == "us-ring") then
session:setVariable("ringback", "%(2000, 4000, 440.0, 480.0)");
session:setVariable("transfer_ringback", "%(2000, 4000, 440.0, 480.0)");
elseif (ringback == "pt-ring") then
session:setVariable("ringback", "%(1000, 5000, 400.0, 0.0)");
session:setVariable("transfer_ringback", "%(1000, 5000, 400.0, 0.0)");
elseif (ringback == "fr-ring") then
session:setVariable("ringback", "%(1500, 3500, 440.0, 0.0)");
session:setVariable("transfer_ringback", "%(1500, 3500, 440.0, 0.0)");

View File

@@ -203,6 +203,7 @@
<X-PRE-PROCESS cmd="set" data="eg-ring=%(2000,1000,475,375)"/>
<X-PRE-PROCESS cmd="set" data="fi-ring=%(1000,4000,425)"/>
<X-PRE-PROCESS cmd="set" data="fr-ring=%(1500,3500,440)"/>
<X-PRE-PROCESS cmd="set" data="pt-ring=%(1000,5000,400)"/>
<X-PRE-PROCESS cmd="set" data="hk-ring=%(400,200,440,480);%(400,3000,440,480)"/>
<X-PRE-PROCESS cmd="set" data="hu-ring=%(1250,3750,425)"/>
<X-PRE-PROCESS cmd="set" data="il-ring=%(1000,3000,400)"/>