nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-01-25 10:09:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Change. Use require "resources.functions.config" to load config file."

Browse Source
This commit is contained in:
FusionPBX
2015-08-10 11:50:29 -06:00
parent 1a29486bcc
commit 2a2dd209df
69 changed files with 507 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
core/databases/app_defaults.php
View File

@@ -24,22 +24,6 @@
Mark J Crane <markjcrane@fusionpbx.com>
*/
global $IS_WINDOWS;
if ($IS_WINDOWS == null) {
if (stristr(PHP_OS, 'WIN')) { $IS_WINDOWS = true; } else { $IS_WINDOWS = false; }
}
if (!function_exists('correct_path')) {
function correct_path($p) {
global $IS_WINDOWS;
if ($IS_WINDOWS) {
return str_replace('/', '\\', $p);
}
return $p;
}
}
//proccess this only one time
if ($domains_processed == 1) {
@@ -129,31 +113,28 @@ if ($domains_processed == 1) {
$tmp = "\n";
$tmp .= "--set the variables\n";
if (strlen($_SESSION['switch']['sounds']['dir']) > 0) {
$tmp .= correct_path(" sounds_dir = [[".$_SESSION['switch']['sounds']['dir']."]];\n");
$tmp .= " sounds_dir = [[".$_SESSION['switch']['sounds']['dir']."]];\n";
}
if (strlen($_SESSION['switch']['db']['dir']) > 0) {
$tmp .= correct_path(" database_dir = [[".$_SESSION['switch']['db']['dir']."]];\n");
$tmp .= " database_dir = [[".$_SESSION['switch']['db']['dir']."]];\n";
}
if (strlen($_SESSION['switch']['recordings']['dir']) > 0) {
$tmp .= correct_path(" recordings_dir = [[".$recordings_dir."]];\n");
$tmp .= " recordings_dir = [[".$recordings_dir."]];\n";
}
if (strlen($_SESSION['switch']['storage']['dir']) > 0) {
$tmp .= correct_path(" storage_dir = [[".$_SESSION['switch']['storage']['dir']."]];\n");
$tmp .= " storage_dir = [[".$_SESSION['switch']['storage']['dir']."]];\n";
}
if (strlen($_SESSION['switch']['voicemail']['dir']) > 0) {
$tmp .= correct_path(" voicemail_dir = [[".$_SESSION['switch']['voicemail']['dir']."]];\n");
$tmp .= " voicemail_dir = [[".$_SESSION['switch']['voicemail']['dir']."]];\n";
}
if (strlen($_SESSION['switch']['scripts']['dir']) > 0) {
$tmp .= correct_path(" scripts_dir = [[".$_SESSION['switch']['scripts']['dir']."]];\n");
}
$tmp .= correct_path(" php_dir = [[".PHP_BINDIR."]];\n");
$tmp .= " php_dir = [[".PHP_BINDIR."]];\n";
if (substr(strtoupper(PHP_OS), 0, 3) == "WIN") {
$tmp .= " php_bin = \"php.exe\";\n";
}
else {
$tmp .= " php_bin = \"php\";\n";
}
$tmp .= correct_path(" document_root = [[".$_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."]];\n");
$tmp .= " document_root = [[".$_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."]];\n";
$tmp .= "\n";
if ((strlen($db_type) > 0) || (strlen($dsn_name) > 0)) {
@@ -161,7 +142,7 @@ if ($domains_processed == 1) {
$tmp .= " database = {}\n";
$tmp .= " database[\"type\"] = \"".$db_type."\";\n";
$tmp .= " database[\"name\"] = \"".$db_name."\";\n";
$tmp .= correct_path(" database[\"path\"] = [[".$db_path."]];\n");
$tmp .= " database[\"path\"] = \"".$db_path."\";\n";
if (strlen($dsn_name) > 0) {
$tmp .= " database[\"system\"] = \"odbc://".$dsn_name.":".$dsn_username.":".$dsn_password."\";\n";
@@ -185,19 +166,19 @@ if ($domains_processed == 1) {
$tmp .= "--additional info\n";
$tmp .= " domain_count = ".count($_SESSION["domains"]).";\n";
$tmp .= correct_path(" temp_dir = [[".$_SESSION['server']['temp']['dir']."]];\n");
$tmp .= " temp_dir = [[".$_SESSION['server']['temp']['dir']."]];\n";
if (isset($_SESSION['domain']['dial_string']['text'])) {
$tmp .= " dial_string = \"".$_SESSION['domain']['dial_string']['text']."\";\n";
}
$tmp .= "\n";
$tmp .= "--include local.lua\n";
$tmp .= " require(\"resources.functions.file_exists\");\n";
$tmp .= " dofile(scripts_dir..\"/resources/functions/file_exists.lua\");\n";
$tmp .= " if (file_exists(\"/etc/fusionpbx/local.lua\")) then\n";
$tmp .= " dofile(\"/etc/fusionpbx/local.lua\");\n";
$tmp .= " elseif (file_exists(\"/usr/local/etc/fusionpbx/local.lua\")) then\n";
$tmp .= " dofile(\"/usr/local/etc/fusionpbx/local.lua\");\n";
$tmp .= " elseif (file_exists(scripts_dir..\"/resources/local.lua\")) then\n";
$tmp .= " require(\"resources.local\");\n";
$tmp .= " dofile(scripts_dir..\"/resources/local.lua\");\n";
$tmp .= " end\n";
fwrite($fout, $tmp);
unset($tmp);