nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-30 09:03:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

User Settings: Select query fix, case adjustment on Domain Template select option labels.

Browse Source
This commit is contained in:
reliberate
2016-03-21 16:54:59 -06:00
parent 74006543ef
commit bab6f047f9
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/users/user_setting_edit.php
View File

@@ -73,6 +73,7 @@ else {
//get http post variables and set them to php variables
if (count($_REQUEST) > 0) {
echo "<pre>".print_r($_REQUEST, true)."</pre>";
$user_setting_category = strtolower(check_str($_REQUEST["user_setting_category"]));
$user_setting_subcategory = strtolower(check_str($_POST["user_setting_subcategory"]));
$user_setting_name = strtolower(check_str($_POST["user_setting_name"]));
@@ -470,10 +471,10 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
$dir_label = str_replace('_', ' ', $dir_name);
$dir_label = str_replace('-', ' ', $dir_label);
if ($dir_name == $row['user_setting_value']) {
echo " <option value='$dir_name' selected='selected'>$dir_label</option>\n";
echo " <option value='$dir_name' selected='selected'>".ucwords($dir_label)."</option>\n";
}
else {
echo " <option value='$dir_name'>$dir_label</option>\n";
echo " <option value='$dir_name'>".ucwords($dir_label)."</option>\n";
}
}
}

6
core/users/user_settings.php
View File

@@ -93,8 +93,10 @@ else {
//get the list
$sql = "select * from v_user_settings ";
$sql .= "where user_uuid = '$user_uuid' ";
$sql .= "and (user_setting_category <> 'domain' and user_setting_subcategory <> 'language') ";
$sql .= "and (user_setting_category <> 'domain' and user_setting_subcategory <> 'time_zone') ";
$sql .= "and not ( ";
$sql .= "(user_setting_category = 'domain' and user_setting_subcategory = 'language') ";
$sql .= "or (user_setting_category = 'domain' and user_setting_subcategory = 'time_zone') ";
$sql .= ") ";
if (strlen($order_by) == 0) {
$sql .= "order by user_setting_category, user_setting_subcategory, user_setting_order asc ";
}