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

stored config_lua path correctly

Browse Source
This commit is contained in:
Matthew Vale
2015-12-01 16:47:18 +00:00
parent 64f103ddbb
commit 8c8cf44b4c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/install/install_first_time.php
+1 -1
View File
@@ -45,7 +45,7 @@ require_once "resources/classes/text.php";
$db_name = ''; $db_name = '';
$db_username = ''; $db_username = '';
$db_password = ''; $db_password = '';
$db_create_option = 'none'; $db_create = '';
$db_create_username = ''; $db_create_username = '';
$db_create_password = ''; $db_create_password = '';
core/install/resources/classes/install_switch.php
+3 -3
View File
@@ -50,12 +50,12 @@ include "root.php";
$this->domain = $domain_name; $this->domain = $domain_name;
$this->detect_switch = $detect_switch; $this->detect_switch = $detect_switch;
if (is_dir("/etc/fusionpbx")){ if (is_dir("/etc/fusionpbx")){
$config = "/etc/fusionpbx/config.lua"; $this->config_lua = "/etc/fusionpbx/config.lua";
} elseif (is_dir("/usr/local/etc/fusionpbx")){ } elseif (is_dir("/usr/local/etc/fusionpbx")){
$config = "/usr/local/etc/fusionpbx/config.lua"; $this->config_lua = "/usr/local/etc/fusionpbx/config.lua";
} }
else { else {
$config = $_SESSION['switch']['scripts']['dir']."/resources/config.lua"; $this->config_lua = $_SESSION['switch']['scripts']['dir']."/resources/config.lua";
} }
$this->config_lua = normalize_path_to_os($this->config_lua); $this->config_lua = normalize_path_to_os($this->config_lua);
} }