diff --git a/core/install/index.php b/core/install/index.php
index 1eb6efc8c9..36d012f0f7 100644
--- a/core/install/index.php
+++ b/core/install/index.php
@@ -78,10 +78,6 @@ if (!if_group("superadmin")) {
echo "\n";
echo "\n";
- echo "
";
-
- echo "
WiP
";
-
//include the footer
require_once "resources/footer.php";
?>
\ No newline at end of file
diff --git a/core/install/install_first_time.php b/core/install/install_first_time.php
index fd9472bfc4..dcc7e04ade 100644
--- a/core/install/install_first_time.php
+++ b/core/install/install_first_time.php
@@ -170,7 +170,7 @@ if(!$install_step) { $install_step = 'select_language'; }
}
//test for windows and non sqlite
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN' and strlen($db_type) > 0 and $db_type !='sqlite') {
- $messages[] = "Windows requires a system DSN ODBC connection this must be configured after installing then restart freeswitch.";
+ $messages[] = "Windows requires a system DSN ODBC connection this must be configured.";
}
//action code
@@ -309,8 +309,10 @@ if(!$install_step) { $install_step = 'select_language'; }
$switch = new install_switch($global_settings);
//$switch->debug = true;
//$system->debug = true;
- $system->install();
- $switch->install();
+ $system->install_phase_1();
+ $switch->install_phase_1();
+ $system->install_phase_2();
+ $switch->install_phase_2();
}catch(Exception $e){
echo "\n";
echo "Failed to install
" . $e->getMessage() . "
\n";
diff --git a/core/install/resources/classes/install_fusionpbx.php b/core/install/resources/classes/install_fusionpbx.php
index cf1cee1076..28bed4cd17 100644
--- a/core/install/resources/classes/install_fusionpbx.php
+++ b/core/install/resources/classes/install_fusionpbx.php
@@ -74,9 +74,9 @@ include "root.php";
echo "$message\n";
}
- function install() {
+ function install_phase_1() {
ini_set('max_execution_time',3600);
- $this->write_progress("Install started for FusionPBX");
+ $this->write_progress("Install phase 1 started for FusionPBX");
$this->create_config_php();
$this->write_progress("\tExecuting config.php");
require $this->config_php;
@@ -88,8 +88,14 @@ include "root.php";
$this->write_progress("\tRunning requires");
require "resources/require.php";
$this->create_menus();
+ $this->write_progress("Install phase 1 complete for FusionPBX");
+ }
+
+ function install_phase_2() {
+ ini_set('max_execution_time',3600);
+ $this->write_progress("Install phase 2 started for FusionPBX");
$this->app_defaults();
- $this->write_progress("Install complete for FusionPBX");
+ $this->write_progress("Install phase 2 complete for FusionPBX");
}
function upgrade() {
diff --git a/core/install/resources/classes/install_switch.php b/core/install/resources/classes/install_switch.php
index dd64ee1d60..bdf9a2c48b 100644
--- a/core/install/resources/classes/install_switch.php
+++ b/core/install/resources/classes/install_switch.php
@@ -181,13 +181,18 @@ include "root.php";
}
}
- function install() {
- $this->write_progress("Install started for switch");
+ function install_phase_1() {
+ $this->write_progress("Install phase 1 started for switch");
$this->copy_conf();
$this->copy_scripts();
+ $this->write_progress("Install phase 1 completed for switch");
+ }
+
+ function install_phase_2() {
+ $this->write_progress("Install phase 2 started for switch");
$this->create_config_lua();
$this->restart_switch();
- $this->write_progress("Install completed for switch");
+ $this->write_progress("Install phase 2 completed for switch");
}
function upgrade() {
diff --git a/themes/enhanced/app_defaults.php b/themes/enhanced/app_defaults.php
index 333fb6efca..5080029782 100644
--- a/themes/enhanced/app_defaults.php
+++ b/themes/enhanced/app_defaults.php
@@ -287,7 +287,7 @@ if ($domains_processed == 1) {
$array[$x]['default_setting_category'] = 'theme';
$array[$x]['default_setting_subcategory'] = 'background_color';
$array[$x]['default_setting_name'] = 'array';
- $array[$x]['default_setting_value'] = '#ffffff';
+ $array[$x]['default_setting_value'] = '#6c89b5';
$array[$x]['default_setting_enabled'] = 'true';
$array[$x]['default_setting_order'] = '0';
$array[$x]['default_setting_description'] = 'Set a background (HTML compatible) color.';
@@ -295,7 +295,7 @@ if ($domains_processed == 1) {
$array[$x]['default_setting_category'] = 'theme';
$array[$x]['default_setting_subcategory'] = 'background_color';
$array[$x]['default_setting_name'] = 'array';
- $array[$x]['default_setting_value'] = '#e7ebf1';
+ $array[$x]['default_setting_value'] = '#144794';
$array[$x]['default_setting_order'] = '1';
$array[$x]['default_setting_enabled'] = 'true';
$array[$x]['default_setting_description'] = 'Set a secondary background (HTML compatible) color, for a gradient effect.';