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

Include the config.php file in the install so that the config.lua will have the db port, host, username and password values.

Browse Source
This commit is contained in:
markjcrane
2015-11-27 17:47:28 -07:00
parent fd65c15bb4
commit 74bdef67f8
1 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/install/install_first_time.php
+23 -15
View File
@@ -80,7 +80,6 @@ $first_time_install = true;
if (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/resources/config.php")) { if (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/resources/config.php")) {
$first_time_install = false; $first_time_install = false;
} elseif (file_exists("/etc/fusionpbx/config.php")) { } elseif (file_exists("/etc/fusionpbx/config.php")) {
//linux
$first_time_install = false; $first_time_install = false;
} elseif (file_exists("/usr/local/etc/fusionpbx/config.php")) { } elseif (file_exists("/usr/local/etc/fusionpbx/config.php")) {
$first_time_install = false; $first_time_install = false;
@@ -98,7 +97,7 @@ if(!$first_time_install) {
$install_step = ''; $install_step = '';
$return_install_step = ''; $return_install_step = '';
if (count($_POST)>0) { if (count($_POST) > 0) {
$install_language = check_str($_POST["install_language"]); $install_language = check_str($_POST["install_language"]);
$install_step = check_str($_POST["install_step"]); $install_step = check_str($_POST["install_step"]);
$return_install_step = check_str($_POST["return_install_step"]); $return_install_step = check_str($_POST["return_install_step"]);
@@ -291,34 +290,43 @@ if(!$install_step) { $install_step = 'select_language'; }
#set_error_handler("error_handler"); #set_error_handler("error_handler");
try { try {
require_once "resources/classes/install_fusionpbx.php"; require_once "resources/classes/install_fusionpbx.php";
$fusionPBX = new install_fusionpbx($domain_name, null, $switch_detect); $system = new install_fusionpbx($domain_name, null, $switch_detect);
$domain_uuid = $fusionPBX->domain_uuid(); $domain_uuid = $system->domain_uuid();
$fusionPBX->admin_username = $admin_username; $system->admin_username = $admin_username;
$fusionPBX->admin_password = $admin_password; $system->admin_password = $admin_password;
$fusionPBX->default_country = $install_default_country; $system->default_country = $install_default_country;
$fusionPBX->install_language = $install_language; $system->install_language = $install_language;
$fusionPBX->template_name = $install_template_name; $system->template_name = $install_template_name;
foreach($_POST as $key=>$value){ foreach($_POST as $key=>$value){
if(substr($key,0,3) == "db_"){ if(substr($key,0,3) == "db_"){
$fusionPBX->$key = $value; $system->$key = $value;
} }
} }
//include the config.php
if (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/resources/config.php")) {
require_once $_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/resources/config.php";
} elseif (file_exists("/etc/fusionpbx/config.php")) {
require_once "/etc/fusionpbx/config.php";
} elseif (file_exists("/usr/local/etc/fusionpbx/config.php")) {
require_once "/usr/local/etc/fusionpbx/config.php";
}
require_once "resources/classes/install_switch.php"; require_once "resources/classes/install_switch.php";
$switch = new install_switch($domain_name, $domain_uuid, $switch_detect); $switch = new install_switch($domain_name, $domain_uuid, $switch_detect);
//$switch->debug = true; //$switch->debug = true;
//$fusionPBX->debug = true; //$system->debug = true;
$fusionPBX->install(); $system->install();
$switch->install(); $switch->install();
$fusionPBX->app_defaults(); $system->app_defaults();
$switch_detect->restart_switch(); $switch_detect->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";
try { try {
require_once "resources/classes/install_fusionpbx.php"; require_once "resources/classes/install_fusionpbx.php";
$fusionPBX = new install_fusionpbx($domain_name, $domain_uuid, $switch_detect); $system = new install_fusionpbx($domain_name, $domain_uuid, $switch_detect);
$fusionPBX->remove_config(); $system->remove_config();
}catch(Exception $e){ }catch(Exception $e){
echo "<p><b>Failed to remove config:</b> " . $e->getMessage() . "</p>\n"; echo "<p><b>Failed to remove config:</b> " . $e->getMessage() . "</p>\n";
} }