소스 검색

BugFix - GUI install (#2779)

Fixes to remove some errors in the GUI installer
Mafoo 8 년 전
부모
커밋
a239b595b3
3개의 변경된 파일22개의 추가작업 그리고 5개의 파일을 삭제
  1. 20 4
      core/install/install.php
  2. 1 1
      core/install/resources/page_parts/install_config_detail.php
  3. 1 0
      resources/require.php

+ 20 - 4
core/install/install.php

@@ -355,10 +355,26 @@
 //set a default template
 	$default_template = 'default';
 	$_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);
+    $x = 0;
+	include "themes/$default_template/app_config.php";
+    $_SESSION['theme'] = Array();
+    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";
 
 //set the default template path

+ 1 - 1
core/install/resources/page_parts/install_config_detail.php

@@ -99,7 +99,7 @@
 				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_label);
-					if ($dir_name == 'enhanced') {
+					if ($dir_name == 'default') {
 						echo "		<option value='$dir_name' selected='selected'>$dir_label</option>\n";
 					}
 					else {

+ 1 - 0
resources/require.php

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