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

update installer to use default theme (#1626) 

added support to allow install to use the theme's default settings and
reduce the number of php errors during the installer due to missing
settings
This commit is contained in:
Mafoo 2016-06-08 14:31:45 +01:00 committed by FusionPBX
parent d663891bd8
commit 96d576fc7a
3 changed files with 83 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/install/install.php
View File

@ -32,10 +32,6 @@
//start a php session //start a php session
session_start(); session_start();
//set theme settings
$_SESSION['theme']['footer_color'] = '#cccccc';
$_SESSION['theme']['footer_background_color'] = '#ffffff';
//initialize variables we are going to use //initialize variables we are going to use
$event_host = ''; $event_host = '';
$event_port = ''; $event_port = '';
@ -337,6 +333,7 @@
else { else {
echo "<p>Unkown install_step '$install_step'</p>\n"; echo "<p>Unkown install_step '$install_step'</p>\n";
} }
echo "</div>\n";
//initialize some defaults so we can be 'logged in' //initialize some defaults so we can be 'logged in'
$_SESSION['username'] = 'install_enabled'; $_SESSION['username'] = 'install_enabled';
@ -350,6 +347,10 @@
//set a default template //set a default template
$default_template = 'default'; $default_template = 'default';
$_SESSION['domain']['template']['name'] = $default_template; $_SESSION['domain']['template']['name'] = $default_template;
$set_session_theme = 1;
$domains_processed = 1;
include "themes/$default_template/app_defaults.php";
unset($set_session_theme, $domains_processed);
$_SESSION['theme']['menu_brand_type']['text'] = "text"; $_SESSION['theme']['menu_brand_type']['text'] = "text";
//set the default template path //set the default template path

132
themes/default/app_defaults.php
View File

@ -1381,65 +1381,85 @@ if ($domains_processed == 1) {
$x++; $x++;
//get an array of the default settings if(!$set_session_theme) {
$sql = "select * from v_default_settings "; //get an array of the default settings
$sql .= "where default_setting_category = 'theme' "; $sql = "select * from v_default_settings ";
$prep_statement = $db->prepare($sql); $sql .= "where default_setting_category = 'theme' ";
$prep_statement->execute(); $prep_statement = $db->prepare($sql);
$default_settings = $prep_statement->fetchAll(PDO::FETCH_NAMED); $prep_statement->execute();
unset ($prep_statement, $sql); $default_settings = $prep_statement->fetchAll(PDO::FETCH_NAMED);
unset ($prep_statement, $sql);
//find the missing default settings
$i = 0; //find the missing default settings
foreach ($array as $setting) { $i = 0;
$found = false; foreach ($array as $setting) {
$missing[$i] = $setting; $found = false;
foreach ($default_settings as $row) { $missing[$i] = $setting;
if (trim($row['default_setting_subcategory']) == trim($setting['default_setting_subcategory'])) { foreach ($default_settings as $row) {
$found = true; if (trim($row['default_setting_subcategory']) == trim($setting['default_setting_subcategory'])) {
//remove items from the array that were found $found = true;
unset($missing[$i]);
//remove items from the array that were found
unset($missing[$i]);
}
}
$i++;
} }
}
$i++; //get the missing count
} $i = 0;
foreach ($missing as $row) { $i++; }
//get the missing count $missing_count = $i;
$i = 0;
foreach ($missing as $row) { $i++; } //add the missing default settings
$missing_count = $i; if (count($missing) > 0) {
$sql = "insert into v_default_settings (";
//add the missing default settings $sql .= "default_setting_uuid, ";
if (count($missing) > 0) { $sql .= "default_setting_category, ";
$sql = "insert into v_default_settings ("; $sql .= "default_setting_subcategory, ";
$sql .= "default_setting_uuid, "; $sql .= "default_setting_name, ";
$sql .= "default_setting_category, "; $sql .= "default_setting_value, ";
$sql .= "default_setting_subcategory, "; $sql .= "default_setting_enabled, ";
$sql .= "default_setting_name, "; $sql .= "default_setting_description ";
$sql .= "default_setting_value, "; $sql .= ") values \n";
$sql .= "default_setting_enabled, "; $i = 1;
$sql .= "default_setting_description "; foreach ($missing as $row) {
$sql .= ") values \n"; $sql .= "(";
$i = 1; $sql .= "'".uuid()."', ";
foreach ($missing as $row) { $sql .= "'".check_str($row['default_setting_category'])."', ";
$sql .= "("; $sql .= "'".check_str($row['default_setting_subcategory'])."', ";
$sql .= "'".uuid()."', "; $sql .= "'".check_str($row['default_setting_name'])."', ";
$sql .= "'".check_str($row['default_setting_category'])."', "; $sql .= "'".check_str($row['default_setting_value'])."', ";
$sql .= "'".check_str($row['default_setting_subcategory'])."', "; $sql .= "'".check_str($row['default_setting_enabled'])."', ";
$sql .= "'".check_str($row['default_setting_name'])."', "; $sql .= "'".check_str($row['default_setting_description'])."' ";
$sql .= "'".check_str($row['default_setting_value'])."', "; $sql .= ")";
$sql .= "'".check_str($row['default_setting_enabled'])."', "; if ($missing_count != $i) {
$sql .= "'".check_str($row['default_setting_description'])."' "; $sql .= ",\n";
$sql .= ")"; }
if ($missing_count != $i) { $i++;
$sql .= ",\n"; }
$db->exec(check_sql($sql));
unset($missing);
}
}
else {
//populate the default settings into the session theme
$_SESSION['theme'] = Array();
foreach ($array as $index => $default_settings) {
$sub_category = $array[$index]['default_setting_subcategory'];
$name = $array[$index]['default_setting_name'];
if($array[$index]['default_setting_enabled'] == 'true'){
if($name == 'array'){
$_SESSION['theme'][$sub_category][$array[$index]['default_setting_order']] = $array[$index]['default_setting_value'];
}
else {
$_SESSION['theme'][$sub_category][$name] = $array[$index]['default_setting_value'];
}
}else{
$_SESSION['theme'][$sub_category][$name] = '';
}
} }
$i++;
}
$db->exec(check_sql($sql));
unset($missing);
} }
//unset the array variable //unset the array variable
unset($array); unset($array);
} }

2
themes/default/css.php
View File

@ -869,6 +869,7 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false;
box-shadow: none; box-shadow: none;
<?php <?php
/* then set */ /* then set */
$shadow_inset = $shadow_outset = '';
if ($_SESSION['theme']['input_shadow_inner_color_focus']['text'] != '') { if ($_SESSION['theme']['input_shadow_inner_color_focus']['text'] != '') {
$inner_color = $_SESSION['theme']['input_shadow_inner_color_focus']['text']; $inner_color = $_SESSION['theme']['input_shadow_inner_color_focus']['text'];
$shadow_inset = "0 0 3px ".$inner_color." inset"; $shadow_inset = "0 0 3px ".$inner_color." inset";
@ -944,6 +945,7 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false;
box-shadow: none; box-shadow: none;
<?php <?php
/* then set */ /* then set */
$shadow_inset = $shadow_outset = '';
if ($_SESSION['theme']['login_input_shadow_inner_color_focus']['text'] != '') { if ($_SESSION['theme']['login_input_shadow_inner_color_focus']['text'] != '') {
$inner_color = $_SESSION['theme']['login_input_shadow_inner_color_focus']['text']; $inner_color = $_SESSION['theme']['login_input_shadow_inner_color_focus']['text'];
$shadow_inset = "0 0 3px ".$inner_color." inset"; $shadow_inset = "0 0 3px ".$inner_color." inset";