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

reorganised upgrade routine to make more sense

This commit is contained in:
Matthew Vale 2015-12-02 14:32:49 +00:00
parent 3f6fdc1df4
commit b9b05f757c
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/install/install_first_time.php
View File

@ -311,8 +311,6 @@ if(!$install_step) { $install_step = 'select_language'; }
//$system->debug = true; //$system->debug = true;
$system->install(); $system->install();
$switch->install(); $switch->install();
$system->app_defaults();
$detect_switch->restart_switch();
}catch(Exception $e){ }catch(Exception $e){
echo "</pre>\n"; echo "</pre>\n";
echo "<p><b>Failed to install</b><br/>" . $e->getMessage() . "</p>\n"; echo "<p><b>Failed to install</b><br/>" . $e->getMessage() . "</p>\n";

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

@ -91,9 +91,14 @@ include "root.php";
$this->write_progress("\tRunning requires"); $this->write_progress("\tRunning requires");
require "resources/require.php"; require "resources/require.php";
$this->create_menus(); $this->create_menus();
$this->app_defaults();
$this->write_progress("Install complete for FusionPBX"); $this->write_progress("Install complete for FusionPBX");
} }
function upgrade() {
$this->app_defaults();
}
protected function create_config_php() { protected function create_config_php() {
$this->write_progress("\tCreating " . $this->config_php); $this->write_progress("\tCreating " . $this->config_php);
$tmp_config = "<?php\n"; $tmp_config = "<?php\n";
@ -1021,7 +1026,7 @@ include "root.php";
} }
} }
public function app_defaults() { protected function app_defaults() {
$this->write_progress("\tRunning app_defaults"); $this->write_progress("\tRunning app_defaults");
//set needed session settings //set needed session settings

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

@ -186,15 +186,17 @@ include "root.php";
$this->copy_conf(); $this->copy_conf();
$this->copy_scripts(); $this->copy_scripts();
$this->create_config_lua(); $this->create_config_lua();
$this->restart_switch();
$this->write_progress("Install completed for switch"); $this->write_progress("Install completed for switch");
} }
function upgrade() { function upgrade() {
$this->copy_scripts(); $this->copy_scripts();
$this->create_config_lua(); $this->create_config_lua();
$this->restart_switch();
} }
function copy_conf() { protected function copy_conf() {
$this->write_progress("\tCopying Config"); $this->write_progress("\tCopying Config");
//make a backup of the config //make a backup of the config
if (file_exists($this->global_settings->switch_conf_dir())) { if (file_exists($this->global_settings->switch_conf_dir())) {
@ -249,7 +251,7 @@ include "root.php";
} }
function copy_scripts() { protected function copy_scripts() {
$this->write_progress("\tCopying Scripts"); $this->write_progress("\tCopying Scripts");
$script_dir = $this->global_settings->switch_script_dir(); $script_dir = $this->global_settings->switch_script_dir();
if(strlen($script_dir) == 0) { if(strlen($script_dir) == 0) {
@ -275,7 +277,7 @@ include "root.php";
} }
} }
function create_config_lua() { public function create_config_lua() {
$this->write_progress("\tCreating " . $this->config_lua); $this->write_progress("\tCreating " . $this->config_lua);
global $db; global $db;
//get the odbc information //get the odbc information
@ -410,4 +412,16 @@ include "root.php";
fclose($fout); fclose($fout);
} }
} }
protected function restart_switch() {
global $errstr;
$esl = new EventSocket;
if (!$esl->connect($this->event_host, $this->event_port, $this->event_password)) {
throw new Exception("Failed to connect to switch: $errstr");
}
if (!$esl->request('api fsctl shutdown restart elegant')){
throw new Exception("Failed to send switch restart: $errstr");
}
$esl->reset_fp();
}
?> ?>