Quellcode durchsuchen

Merge pull request #1278 from mafoo/Bugfix-Install

added suppression of progress by default
FusionPBX vor 9 Jahren
Ursprung
Commit
22f90f259e

+ 2 - 0
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();

+ 4 - 1
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() {

+ 4 - 1
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