|
|
@@ -46,8 +46,8 @@ include "root.php";
|
|
|
$this->config_lua = "/etc/fusionpbx/config.lua";
|
|
|
}elseif (is_dir("/usr/local/etc/fusionpbx")){
|
|
|
$this->config_lua = "/usr/local/etc/fusionpbx/config.lua";
|
|
|
- }elseif(strlen($this->global_settings->script_dir) > 0) {
|
|
|
- $this->config_lua = $this->global_settings->script_dir."/resources/config.lua";
|
|
|
+ }elseif(strlen($this->global_settings->switch_script_dir()) > 0) {
|
|
|
+ $this->config_lua = $this->global_settings->switch_script_dir()."/resources/config.lua";
|
|
|
}else{
|
|
|
throw new Exception("Could not work out where to put the config.lua");
|
|
|
}
|
|
|
@@ -193,7 +193,6 @@ include "root.php";
|
|
|
function upgrade() {
|
|
|
$this->copy_scripts();
|
|
|
$this->create_config_lua();
|
|
|
- $this->restart_switch();
|
|
|
}
|
|
|
|
|
|
protected function copy_conf() {
|
|
|
@@ -335,7 +334,7 @@ include "root.php";
|
|
|
$tmp .= normalize_path_to_os(" voicemail_dir = [[".$this->global_settings->switch_voicemail_vdir()."]];\n");
|
|
|
}
|
|
|
if (strlen($this->global_settings->switch_script_dir()) > 0) {
|
|
|
- $tmp .= normalize_path_to_os(" script_dir = [[".$this->global_settings->switch_script_dir()."]];\n");
|
|
|
+ $tmp .= normalize_path_to_os(" scripts_dir = [[".$this->global_settings->switch_script_dir()."]];\n");
|
|
|
}
|
|
|
$tmp .= normalize_path_to_os(" php_dir = [[".PHP_BINDIR."]];\n");
|
|
|
if (substr(strtoupper(PHP_OS), 0, 3) == "WIN") {
|
Matthew Vale