dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1278 from mafoo/Bugfix-Install 

added suppression of progress by default
This commit is contained in:
FusionPBX 2015-12-03 23:40:26 -07:00
parent 8e94812d98 6d13594e80
commit c4ddfd2fb7
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/install/install_first_time.php
View File

@ -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();

5
core/install/resources/classes/install_fusionpbx.php
View File

@ -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() {

5
core/install/resources/classes/install_switch.php
View File

@ -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