nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-30 00:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check teh config method result.

Browse Source 
Show the error message if the result is false.
This commit is contained in:
FusionPBX
2022-10-22 19:23:03 -06:00
committed by GitHub
parent d87ecbb3f2
commit bc378823bd
1 changed files with 9 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
core/install/install.php
View File

@@ -100,7 +100,7 @@
if (is_writable($config_path)) {
//include the config.php file
include $config_path.'/config.php';
//build the config file
$install = new install;
$install->database_host = $db_host;
@@ -109,7 +109,7 @@
$install->database_username = $db_username;
$install->database_password = $db_password;
$install->config();
//redirect the user
header("Location: /");
exit;
@@ -163,55 +163,6 @@
exit;
}
//set the default config file location
if (stristr(PHP_OS, 'BSD')) {
$config_path = '/usr/local/etc/fusionpbx';
$config_file = $config_path.'/config.conf';
$document_root = '/usr/local/www/fusionpbx';
$conf_dir = '/usr/local/etc/freeswitch';
$sounds_dir = '/usr/share/freeswitch/sounds';
$database_dir = '/var/lib/freeswitch/db';
$recordings_dir = '/var/lib/freeswitch/recordings';
$storage_dir = '/var/lib/freeswitch/storage';
$voicemail_dir = '/var/lib/freeswitch/storage/voicemail';
$scripts_dir = '/usr/share/freeswitch/scripts';
}
if (stristr(PHP_OS, 'Linux')) {
$config_path = '/etc/fusionpbx/';
$config_file = $config_path.'/config.conf';
$document_root = '/var/www/fusionpbx';
$conf_dir = '/etc/freeswitch';
$sounds_dir = '/usr/share/freeswitch/sounds';
$database_dir = '/var/lib/freeswitch/db';
$recordings_dir = '/var/lib/freeswitch/recordings';
$storage_dir = '/var/lib/freeswitch/storage';
$voicemail_dir = '/var/lib/freeswitch/storage/voicemail';
$scripts_dir = '/usr/share/freeswitch/scripts';
}
//end the script if the config path is not set
if (!isset($config_path)) {
echo "Config file path not found\n";
exit;
}
//make the config directory
if (isset($config_path)) {
system('mkdir -p '.$config_path);
}
else {
echo "config directory not found\n";
exit;
}
//ensure the config directory exists
if (!file_exists($config_path)) {
"Unable to make the ".$config_path." directory\n";
"Check file permissions\n";
}
//build the config file
$install = new install;
$install->database_host = $_SESSION['install']['database_host'];
@@ -219,7 +170,13 @@
$install->database_name = $_SESSION['install']['database_name'];
$install->database_username = $_SESSION['install']['database_username'];
$install->database_password = $_SESSION['install']['database_password'];
$install->config();
$result = $install->config();
//end the script if the config path is not set
if (!$result) {
echo $install->message;
exit;
}
//set the include path
$config_glob = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE);