ソースを参照

Only set the SESSION variables from default settings for the switch category.

markjcrane 9 年 前
コミット
2ccc7f5f38
1 ファイル変更4 行追加16 行削除
  1. 4 16
      core/install/resources/classes/install_fusionpbx.php

+ 4 - 16
core/install/resources/classes/install_fusionpbx.php

@@ -909,28 +909,16 @@ include "root.php";
 					$name = $row['default_setting_name'];
 					$name = $row['default_setting_name'];
 					$category = $row['default_setting_category'];
 					$category = $row['default_setting_category'];
 					$subcategory = $row['default_setting_subcategory'];
 					$subcategory = $row['default_setting_subcategory'];
-					if (strlen($subcategory) == 0) {
-						if ($name == "array") {
-							$_SESSION[$category][] = $row['default_setting_value'];
-						}
-						else {
-							$_SESSION[$category][$name] = $row['default_setting_value'];
-						}
-					}
-					else {
-						if ($name == "array") {
-							$_SESSION[$category][$subcategory][] = $row['default_setting_value'];
-						}
-						else {
-							$_SESSION[$category][$subcategory]['uuid'] = $row['default_setting_uuid'];
-							$_SESSION[$category][$subcategory][$name] = $row['default_setting_value'];
-						}
+					if ($category == "switch") {
+						$_SESSION[$category][$subcategory]['uuid'] = $row['default_setting_uuid'];
+						$_SESSION[$category][$subcategory][$name] = $row['default_setting_value'];
 					}
 					}
 				}
 				}
 				unset ($prep_statement, $sql);
 				unset ($prep_statement, $sql);
 
 
 			//update config.lua
 			//update config.lua
 				$obj = new scripts;
 				$obj = new scripts;
+				$obj->copy_files();
 				$obj->write_config();
 				$obj->write_config();
 
 
 			//synchronize the config with the saved settings
 			//synchronize the config with the saved settings