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

BugFix - GUI install (#2779) 

Fixes to remove some errors in the GUI installer
This commit is contained in:
Mafoo 2017-08-02 17:45:35 +01:00 committed by FusionPBX
parent c72fca1c6b
commit b1c5d870e0
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/install/install.php
View File

@ -355,10 +355,26 @@
//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; $x = 0;
$domains_processed = 1; include "themes/$default_template/app_config.php";
include "themes/$default_template/app_defaults.php"; $_SESSION['theme'] = Array();
unset($set_session_theme, $domains_processed); foreach ($apps as $app_id => $data) {
foreach ($apps[$app_id]['default_settings'] as $index => $default_setting) {
$sub_category = $default_setting['default_setting_subcategory'];
$name = $default_setting['default_setting_name'];
if($default_setting['default_setting_enabled'] == 'true'){
if($name == 'array'){
$_SESSION['theme'][$sub_category][(isset($default_setting['default_setting_order']) ? $default_setting['default_setting_order'] : null)] = $default_setting['default_setting_value'];
}
else {
$_SESSION['theme'][$sub_category][$name] = $default_setting['default_setting_value'];
}
}else{
$_SESSION['theme'][$sub_category][$name] = '';
}
}
}
unset($apps, $x);
$_SESSION['theme']['menu_brand_type']['text'] = "text"; $_SESSION['theme']['menu_brand_type']['text'] = "text";
//set the default template path //set the default template path

2
core/install/resources/page_parts/install_config_detail.php
View File

@ -99,7 +99,7 @@
if ($dir_name != "." && $dir_name != ".." && $dir_name != ".svn" && $dir_name != ".git" && $dir_name != "flags" && is_readable($theme_dir.'/'.$dir_name)) { if ($dir_name != "." && $dir_name != ".." && $dir_name != ".svn" && $dir_name != ".git" && $dir_name != "flags" && is_readable($theme_dir.'/'.$dir_name)) {
$dir_label = str_replace('_', ' ', $dir_name); $dir_label = str_replace('_', ' ', $dir_name);
$dir_label = str_replace('-', ' ', $dir_label); $dir_label = str_replace('-', ' ', $dir_label);
if ($dir_name == 'enhanced') { if ($dir_name == 'default') {
echo " <option value='$dir_name' selected='selected'>$dir_label</option>\n"; echo " <option value='$dir_name' selected='selected'>$dir_label</option>\n";
} }
else { else {

1
resources/require.php
View File

@ -28,6 +28,7 @@
include "root.php"; include "root.php";
//find and include the config.php file //find and include the config.php file
$config_exists = false;
if (file_exists("/etc/fusionpbx/config.php")) { if (file_exists("/etc/fusionpbx/config.php")) {
$config_exists = true; $config_exists = true;
include "/etc/fusionpbx/config.php"; include "/etc/fusionpbx/config.php";