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

Changes to the config.lua script where it is saved and how local.lua is included.

Browse Source
This commit is contained in:
Mark Crane
2013-05-02 02:16:49 +00:00
parent e18d08659d
commit d161215e44
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/databases/app_defaults.php
View File

@@ -98,7 +98,15 @@ if ($domains_processed == 1) {
}
//config.lua
$fout = fopen($_SESSION['switch']['scripts']['dir']."/resources/config.lua","w");
if (is_dir("/etc/fusionpbx")){
$config = "/etc/fusionpbx/config.lua";
} elseif (is_dir("/usr/local/etc/fusionpbx")){
$config = "/usr/local/etc/fusionpbx/config.lua";
}
else {
$config = $_SESSION['switch']['scripts']['dir']."/resources/config.lua";
}
$fout = fopen($config,"w");
$tmp = "\n";
$tmp .= "--switch directories\n";
if (strlen($_SESSION['switch']['sounds']['dir']) > 0) {
@@ -110,12 +118,9 @@ if ($domains_processed == 1) {
if (strlen($_SESSION['switch']['recordings']['dir']) > 0) {
$tmp .= " recordings_dir = \"".$recordings_dir."\";\n";
}
$tmp .= "\n";
$tmp .= "--define the database array\n";
$tmp .= " database = {}\n";
$tmp .= "\n";
$tmp .= "--database information\n";
$tmp .= " database = {}\n";
$tmp .= " database[\"type\"] = \"".$db_type."\";\n";
$tmp .= " database[\"name\"] = \"".$db_name."\";\n";
$tmp .= " database[\"path\"] = \"".$db_path."\";\n";
@@ -146,7 +151,14 @@ if ($domains_processed == 1) {
$tmp .= " temp_dir = \"".$_SESSION['server']['temp']['dir']."\";\n";
$tmp .= "\n";
$tmp .= "--include local.lua\n";
$tmp .= " include = loadfile(scripts_dir .. \"/resources/local.lua\"); if (include ~= nil) then include(); end\n";
$tmp .= " dofile(scripts_dir..\"/resources/functions/file_exists.lua\");\n";
$tmp .= " if (file_exists(\"/etc/fusionpbx/local.lua\")) then\n";
$tmp .= " dofile(scripts_dir..\"/etc/fusionpbx/local.lua\");\n";
$tmp .= " elseif (file_exists(\"/usr/local/etc/fusionpbx/local.lua\")) then\n";
$tmp .= " dofile(scripts_dir..\"/usr/local/etc/fusionpbx/local.lua\");\n";
$tmp .= " elseif (file_exists(scripts_dir..\"/resources/local.lua\")) then\n";
$tmp .= " dofile(scripts_dir..\"/resources/local.lua\");\n";
$tmp .= " end\n";
fwrite($fout, $tmp);
unset($tmp);
fclose($fout);