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

menu fixing utf8 and ring groups pt-ring option

Browse Source
This commit is contained in:
Nuno Miguel Reis
2014-01-16 23:30:56 +00:00
parent 09f6d2825b
commit 4cb72d88cc
4 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/ring_groups/app_languages.php
+4
View File
@@ -186,6 +186,10 @@
$text['option-usring']['pt-pt'] = "us-ring"; $text['option-usring']['pt-pt'] = "us-ring";
$text['option-usring']['fr-fr'] = "us-ring"; $text['option-usring']['fr-fr'] = "us-ring";
$text['option-ptring']['en-us'] = "pt-ring";
$text['option-ptring']['pt-pt'] = "pt-ring";
$text['option-ptring']['fr-fr'] = "pt-ring";
$text['option-frring']['en-us'] = "fr-ring"; $text['option-frring']['en-us'] = "fr-ring";
$text['option-frring']['pt-pt'] = "fr-ring"; $text['option-frring']['pt-pt'] = "fr-ring";
$text['option-frring']['fr-fr'] = "fr-ring"; $text['option-frring']['fr-fr'] = "fr-ring";
app/ring_groups/ring_group_edit.php
+6
View File
@@ -654,6 +654,12 @@ else {
else { else {
$select_options .= " <option value='\${us-ring}'>".$text['option-usring']."</option>\n"; $select_options .= " <option value='\${us-ring}'>".$text['option-usring']."</option>\n";
} }
if ($ring_group_ringback == "\${pt-ring}" || $ring_group_ringback == "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 ($ring_group_ringback == "\${fr-ring}" || $ring_group_ringback == "fr-ring") { if ($ring_group_ringback == "\${fr-ring}" || $ring_group_ringback == "fr-ring") {
$select_options .= " <option value='\${fr-ring}' selected='selected'>".$text['option-frring']."</option>\n"; $select_options .= " <option value='\${fr-ring}' selected='selected'>".$text['option-frring']."</option>\n";
} }
resources/classes/menu.php
+2 -2
View File
@@ -267,7 +267,7 @@
//echo $sql."<br />\n"; //echo $sql."<br />\n";
} }
else { else {
$db->exec(check_sql($sql)); $db->exec(utf8_encode(check_sql($sql)));
} }
unset($sql); unset($sql);
@@ -290,7 +290,7 @@
$sql .= "'".$menu_language."', "; $sql .= "'".$menu_language."', ";
$sql .= "'".check_str($menu_item_title)."' "; $sql .= "'".check_str($menu_item_title)."' ";
$sql .= ")"; $sql .= ")";
$db->exec(check_sql($sql)); $db->exec(utf8_encode(check_sql($sql)));
unset($sql); unset($sql);
} }
} }
resources/install/scripts/app/ring_groups/index.lua
+3
View File
@@ -184,6 +184,9 @@
if (ring_group_ringback == "${us-ring}") then if (ring_group_ringback == "${us-ring}") then
ring_group_ringback = "tone_stream://%(2000,4000,440.0,480.0);loops=-1"; ring_group_ringback = "tone_stream://%(2000,4000,440.0,480.0);loops=-1";
end end
if (ring_group_ringback == "${pt-ring}") then
ring_group_ringback = "tone_stream://%(1000,5000,400.0,0.0);loops=-1";
end
if (ring_group_ringback == "${fr-ring}") then if (ring_group_ringback == "${fr-ring}") then
ring_group_ringback = "tone_stream://%(1500,3500,440.0,0.0);loops=-1"; ring_group_ringback = "tone_stream://%(1500,3500,440.0,0.0);loops=-1";
end end