nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-01-06 11:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes during upgrade

Browse Source
This commit is contained in:
Matthew Vale
2015-12-02 15:55:21 +00:00
parent 7c1422fd13
commit 36e1d5c4c5
2 changed files with 38 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,7 +36,7 @@ include "root.php";
function __construct($global_settings) {
if(is_null($global_settings)){
require_once "resources/classes/global_settings.php";
require_once "core/install/resources/classes/global_settings.php";
$global_settings = new global_settings();
}elseif(!is_a($global_settings, 'global_settings')){
throw new Exception('The parameter $global_settings must be a global_settings object (or a subclass of)');
@@ -411,17 +411,16 @@ include "root.php";
unset($tmp);
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");
protected function restart_switch() {
$esl = new EventSocket;
if(!$esl->connect($this->global_settings->switch_event_host(), $this->global_settings->switch_event_port(), $this->global_settings->switch_event_password())) {
throw new Exception("Failed to connect to switch");
}
if (!$esl->request('api fsctl shutdown restart elegant')){
throw new Exception("Failed to send switch restart");
}
$esl->reset_fp();
}
if (!$esl->request('api fsctl shutdown restart elegant')){
throw new Exception("Failed to send switch restart: $errstr");
}
$esl->reset_fp();
}
?>