From 6d13594e80d3f1df51a9e0005d7d5b7bd1930389 Mon Sep 17 00:00:00 2001 From: Matthew Vale Date: Thu, 3 Dec 2015 14:59:46 +0000 Subject: [PATCH] added suppression of progress by default --- core/install/install_first_time.php | 2 ++ core/install/resources/classes/install_fusionpbx.php | 5 ++++- core/install/resources/classes/install_switch.php | 5 ++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/core/install/install_first_time.php b/core/install/install_first_time.php index dcc7e04ade..1b629de24b 100644 --- a/core/install/install_first_time.php +++ b/core/install/install_first_time.php @@ -309,6 +309,8 @@ if(!$install_step) { $install_step = 'select_language'; } $switch = new install_switch($global_settings); //$switch->debug = true; //$system->debug = true; + $switch->echo_progress = true; + $system->echo_progress = true; $system->install_phase_1(); $switch->install_phase_1(); $system->install_phase_2(); diff --git a/core/install/resources/classes/install_fusionpbx.php b/core/install/resources/classes/install_fusionpbx.php index 28bed4cd17..41d28ca92c 100644 --- a/core/install/resources/classes/install_fusionpbx.php +++ b/core/install/resources/classes/install_fusionpbx.php @@ -35,6 +35,7 @@ include "root.php"; protected $dbh; public $debug = false; + public $echo_progress = false; public $install_language = 'en-us'; public $admin_username; @@ -71,7 +72,9 @@ include "root.php"; } function write_progress($message) { - echo "$message\n"; + if($this->echo_progress){ + echo "$message\n"; + } } function install_phase_1() { diff --git a/core/install/resources/classes/install_switch.php b/core/install/resources/classes/install_switch.php index bdf9a2c48b..3fb3950cb6 100644 --- a/core/install/resources/classes/install_switch.php +++ b/core/install/resources/classes/install_switch.php @@ -33,6 +33,7 @@ include "root.php"; protected $dbh; public $debug = false; + public $echo_progress = false; function __construct($global_settings) { if(is_null($global_settings)){ @@ -63,7 +64,9 @@ include "root.php"; } function write_progress($message) { - echo "$message\n"; + if($this->echo_progress){ + echo "$message\n"; + } } //$options '-n' --no-clobber