From cfac14c6eea1a959f201b8a717c8a36f7f15159e Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Sat, 12 Apr 2014 20:54:32 +0000 Subject: [PATCH] Adjust the source conf directory to work with the debian package --- app/xml_cdr/app_defaults.php | 8 +++++++- resources/switch.php | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/app/xml_cdr/app_defaults.php b/app/xml_cdr/app_defaults.php index 07c82b9603..79ab8aa027 100644 --- a/app/xml_cdr/app_defaults.php +++ b/app/xml_cdr/app_defaults.php @@ -26,7 +26,13 @@ //make sure that prefix-a-leg is set to true in the xml_cdr.conf.xml file if ($domains_processed == 1) { - $file_contents = file_get_contents($_SESSION['switch']['conf']['dir']."/autoload_configs/xml_cdr.conf.xml"); + if (file_exists('/usr/share/fusionpbx/resources/templates/conf')) { + $path = "/usr/share/fusionpbx/resources/templates/conf"; + } + else { + $path = $_SESSION['switch']['conf']['dir']; + } + $file_contents = file_get_contents($path."/autoload_configs/xml_cdr.conf.xml"); $file_contents_new = str_replace("param name=\"prefix-a-leg\" value=\"false\"/", "param name=\"prefix-a-leg\" value=\"true\"/", $file_contents); if ($file_contents != $file_contents_new) { $fout = fopen($_SESSION['switch']['conf']['dir']."/autoload_configs/xml_cdr.conf.xml","w"); diff --git a/resources/switch.php b/resources/switch.php index 3cd186ecac..28b00dfac5 100644 --- a/resources/switch.php +++ b/resources/switch.php @@ -2942,7 +2942,13 @@ if (!function_exists('switch_conf_xml')) { global $db, $domain_uuid; //get the contents of the template - $file_contents = file_get_contents($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/resources/templates/conf/autoload_configs/switch.conf.xml"); + if (file_exists('/usr/share/fusionpbx/resources/templates/conf')) { + $path = "/usr/share/fusionpbx/resources/templates/conf"; + } + else { + $path = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/resources/templates/conf"; + } + $file_contents = file_get_contents($path."/autoload_configs/switch.conf.xml"); //prepare the php variables if (stristr(PHP_OS, 'WIN')) {