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

Theme: Side Menu updates.

Browse Source
This commit is contained in:
Nate
2020-05-23 18:57:17 -06:00
parent f18e2423ed
commit 6f829ea6cf
12 changed files with 199 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/default_settings/default_setting_edit.php
+6
View File
@@ -615,6 +615,12 @@
echo " <option value='expanded' ".($default_setting_value == "expanded" ? "selected='selected'" : null).">".$text['option-expanded']."</option>\n";
echo " </select>\n";
}
elseif ($category == "theme" && $subcategory == "menu_side_toggle" && $name == "text" ) {
echo " <select class='formfld' id='default_setting_value' name='default_setting_value'>\n";
echo " <option value='hover'>".$text['option-hover']."</option>\n";
echo " <option value='click' ".($default_setting_value == "click" ? "selected='selected'" : null).">".$text['option-click']."</option>\n";
echo " </select>\n";
}
elseif ($category == "voicemail" && $subcategory == "voicemail_file" && $name == "text" ) {
echo " <select class='formfld' id='default_setting_value' name='default_setting_value'>\n";
echo " <option value='listen' ".(($default_setting_value == "listen") ? "selected='selected'" : null).">".$text['option-voicemail_file_listen']."</option>\n";
core/default_settings/default_settings.php
+3
View File
@@ -340,6 +340,9 @@
else if ($category == 'theme' && $subcategory == 'menu_side_state' && $name == 'text') {
echo " ".$text['option-'.$row['default_setting_value']]."\n";
}
else if ($category == 'theme' && $subcategory == 'menu_side_toggle' && $name == 'text') {
echo " ".$text['option-'.$row['default_setting_value']]."\n";
}
else if ($category == "theme" && substr_count($subcategory, "_color") > 0 && ($name == "text" || $name == 'array')) {
echo " ".(img_spacer('15px', '15px', 'background: '.escape($row['default_setting_value']).'; margin-right: 4px; vertical-align: middle; border: 1px solid '.(color_adjust($row['default_setting_value'], -0.18)).'; padding: -1px;'));
echo "<span style=\"font-family: 'Courier New'; line-height: 6pt;\">".escape($row['default_setting_value'])."</span>\n";
core/domain_settings/domain_setting_edit.php
+6
View File
@@ -672,6 +672,12 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
echo " <option value='expanded' ".($row['domain_setting_value'] == "expanded" ? "selected='selected'" : null).">".$text['option-expanded']."</option>\n";
echo " </select>\n";
}
elseif ($category == "theme" && $subcategory == "menu_side_toggle" && $name == "text" ) {
echo " <select class='formfld' id='domain_setting_value' name='domain_setting_value'>\n";
echo " <option value='hover'>".$text['option-hover']."</option>\n";
echo " <option value='click' ".($row['domain_setting_value'] == "click" ? "selected='selected'" : null).">".$text['option-click']."</option>\n";
echo " </select>\n";
}
elseif ($category == "voicemail" && $subcategory == "voicemail_file" && $name == "text" ) {
echo " <select class='formfld' id='domain_setting_value' name='domain_setting_value'>\n";
echo " <option value='listen' ".(($row['domain_setting_value'] == "listen") ? "selected='selected'" : null).">".$text['option-voicemail_file_listen']."</option>\n";
core/domain_settings/domain_settings.php
+3
View File
@@ -297,6 +297,9 @@
else if ($category == 'theme' && $subcategory == 'menu_side_state' && $name == 'text') {
echo " ".$text['option-'.$row['domain_setting_value']]."\n";
}
else if ($category == 'theme' && $subcategory == 'menu_side_toggle' && $name == 'text') {
echo " ".$text['option-'.$row['domain_setting_value']]."\n";
}
else if ($category == "theme" && substr_count($subcategory, "_color") > 0 && ($name == "text" || $name == 'array')) {
echo " ".(img_spacer('15px', '15px', 'background: '.escape($row['domain_setting_value']).'; margin-right: 4px; vertical-align: middle; border: 1px solid '.(color_adjust($row['domain_setting_value'], -0.18)).'; padding: -1px;'));
echo "<span style=\"font-family: 'Courier New'; line-height: 6pt;\">".escape($row['domain_setting_value'])."</span>\n";
core/user_settings/user_setting_edit.php
+6
View File
@@ -634,6 +634,12 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
echo " <option value='expanded' ".($user_setting_value == "expanded" ? "selected='selected'" : null).">".$text['option-expanded']."</option>\n";
echo " </select>\n";
}
elseif ($user_setting_category == "theme" && $user_setting_subcategory == "menu_side_toggle" && $user_setting_name == "text" ) {
echo " <select class='formfld' id='user_setting_value' name='user_setting_value'>\n";
echo " <option value='hover'>".$text['option-hover']."</option>\n";
echo " <option value='click' ".($user_setting_value == "click" ? "selected='selected'" : null).">".$text['option-click']."</option>\n";
echo " </select>\n";
}
else {
echo " <input class='formfld' type='text' id='user_setting_value' name='user_setting_value' maxlength='255' value=\"".escape($user_setting_value)."\">\n";
}
core/user_settings/user_setting_set.php
+67 -28
View File
@@ -48,7 +48,11 @@ Mark J Crane <markjcrane@fusionpbx.com>
case 'theme':
switch ($user_setting_subcategory) {
case 'menu_side_state':
if ($submitted_value == 'expanded' || $submitted_value == 'contracted') {
if ($submitted_value == 'delete') {
$user_setting_value = 'delete';
$user_setting_enabled = 'delete';
}
else if ($submitted_value == 'expanded' || $submitted_value == 'contracted') {
$user_setting_value = $submitted_value;
$user_setting_enabled = 'true';
}
@@ -84,38 +88,73 @@ Mark J Crane <markjcrane@fusionpbx.com>
$user_setting_uuid = $database->select($sql, $parameters, 'column');
unset($sql, $parameters);
//create data array
$array['user_settings'][0]['user_setting_uuid'] = is_uuid($user_setting_uuid) ? $user_setting_uuid : uuid();
$array['user_settings'][0]['user_uuid'] = $_SESSION['user_uuid'];
$array['user_settings'][0]['domain_uuid'] = $_SESSION['domain_uuid'];
$array['user_settings'][0]['user_setting_category'] = $user_setting_category;
$array['user_settings'][0]['user_setting_subcategory'] = $user_setting_subcategory;
$array['user_settings'][0]['user_setting_name'] = $user_setting_name;
$array['user_settings'][0]['user_setting_value'] = $user_setting_value;
//$array['user_settings'][0]['user_setting_order'] = $user_setting_order;
$array['user_settings'][0]['user_setting_enabled'] = $user_setting_enabled;
//delete user setting
if ($user_setting_value == 'delete' && $user_setting_enabled == 'delete') {
if (is_uuid($user_setting_uuid)) {
//create data array
$array['user_settings'][0]['user_setting_uuid'] = $user_setting_uuid;
$array['user_settings'][0]['user_uuid'] = $_SESSION['user_uuid'];
$array['user_settings'][0]['domain_uuid'] = $_SESSION['domain_uuid'];
//grant temporary permissions
$p = new permissions;
$p->add('user_setting_delete', 'temp');
//execute
$database = new database;
$database->app_name = 'user_settings';
$database->app_uuid = '3a3337f7-78d1-23e3-0cfd-f14499b8ed97';
$database->delete($array);
unset($array);
//revoke temporary permissions
$p->delete('user_setting_delete', 'temp');
//reset session variables to default
require "resources/classes/domains.php";
$domain = new domains();
$domain->db = $db;
$domain->set();
}
//grant temporary permissions
$p = new permissions;
$p->add('user_setting_add', 'temp');
$p->add('user_setting_edit', 'temp');
//set response
echo 'deleted';
//execute
$database = new database;
$database->app_name = 'user_settings';
$database->app_uuid = '3a3337f7-78d1-23e3-0cfd-f14499b8ed97';
$database->save($array);
unset($array);
}
//revoke temporary permissions
$p->delete('user_setting_add', 'temp');
$p->delete('user_setting_edit', 'temp');
//insert or update user setting
else {
//update session variable
$_SESSION[$user_setting_category][$user_setting_subcategory][$user_setting_name] = $user_setting_value;
//create data array
$array['user_settings'][0]['user_setting_uuid'] = is_uuid($user_setting_uuid) ? $user_setting_uuid : uuid();
$array['user_settings'][0]['user_uuid'] = $_SESSION['user_uuid'];
$array['user_settings'][0]['domain_uuid'] = $_SESSION['domain_uuid'];
$array['user_settings'][0]['user_setting_category'] = $user_setting_category;
$array['user_settings'][0]['user_setting_subcategory'] = $user_setting_subcategory;
$array['user_settings'][0]['user_setting_name'] = $user_setting_name;
$array['user_settings'][0]['user_setting_value'] = $user_setting_value;
//$array['user_settings'][0]['user_setting_order'] = $user_setting_order;
$array['user_settings'][0]['user_setting_enabled'] = $user_setting_enabled;
//set response
echo 'true';
//grant temporary permissions
$p = new permissions;
$p->add('user_setting_add', 'temp');
$p->add('user_setting_edit', 'temp');
//execute
$database = new database;
$database->app_name = 'user_settings';
$database->app_uuid = '3a3337f7-78d1-23e3-0cfd-f14499b8ed97';
$database->save($array);
unset($array);
//revoke temporary permissions
$p->delete('user_setting_add', 'temp');
$p->delete('user_setting_edit', 'temp');
//update session variable
$_SESSION[$user_setting_category][$user_setting_subcategory][$user_setting_name] = $user_setting_value;
//set response
echo 'true';
}
}
?>
core/user_settings/user_settings.php
+3
View File
@@ -285,6 +285,9 @@
else if ($category == 'theme' && $subcategory == 'menu_side_state' && $name == 'text') {
echo " ".$text['option-'.$row['user_setting_value']]."\n";
}
else if ($category == 'theme' && $subcategory == 'menu_side_toggle' && $name == 'text') {
echo " ".$text['option-'.$row['user_setting_value']]."\n";
}
else if ($category == "theme" && substr_count($subcategory, "_color") > 0 && ($name == "text" || $name == 'array')) {
echo " ".(img_spacer('15px', '15px', 'background: '.escape($row['user_setting_value']).'; margin-right: 4px; vertical-align: middle; border: 1px solid '.(color_adjust($row['user_setting_value'], -0.18)).'; padding: -1px;'));
echo "<span style=\"font-family: 'Courier New'; line-height: 6pt;\">".escape($row['user_setting_value'])."</span>\n";