From 6a4dd6687d8a8ee45dccbc678ff8897a0c4471be Mon Sep 17 00:00:00 2001
From: Mark Crane <markjcrane@gmail.com>
Date: Sun, 13 Apr 2014 04:45:05 +0000
Subject: [PATCH] Finish up  the source conf directory for the Debian Package
 install.

---
 app/dialplan/app_defaults.php | 10 +++++++++-
 app/xml_cdr/app_defaults.php  | 11 +++--------
 resources/switch.php          | 14 +++++++++++---
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/app/dialplan/app_defaults.php b/app/dialplan/app_defaults.php
index 80ad28ad05..88f56c38d4 100644
--- a/app/dialplan/app_defaults.php
+++ b/app/dialplan/app_defaults.php
@@ -49,8 +49,16 @@
 //only run the following code if the directory exists
 	if (is_dir($_SESSION['switch']['dialplan']['dir'])) {
 		//write the dialplan/default.xml if it does not exist
+			//set the path
+				if (file_exists('/usr/share/fusionpbx/resources/templates/conf')) {
+					$path = "/usr/share/fusionpbx/resources/templates/conf";
+				}
+				else {
+					$path = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH;
+				}
+
 			//get the contents of the dialplan/default.xml
-				$file_default_path = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/resources/templates/conf/dialplan/default.xml';
+				$file_default_path = $path.'/resources/templates/conf/dialplan/default.xml';
 				$file_default_contents = file_get_contents($file_default_path);
 
 			//prepare the file contents and the path
diff --git a/app/xml_cdr/app_defaults.php b/app/xml_cdr/app_defaults.php
index 79ab8aa027..bf259bb099 100644
--- a/app/xml_cdr/app_defaults.php
+++ b/app/xml_cdr/app_defaults.php
@@ -25,14 +25,9 @@
 */
 
 //make sure that prefix-a-leg is set to true in the xml_cdr.conf.xml file
+/*
 	if ($domains_processed == 1) {
-		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 = file_get_contents($_SESSION['switch']['conf']['dir']."/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");
@@ -43,5 +38,5 @@
 			}
 		}
 	}
-
+*/
 ?>
\ No newline at end of file
diff --git a/resources/switch.php b/resources/switch.php
index 838050d8fa..b43ba42460 100644
--- a/resources/switch.php
+++ b/resources/switch.php
@@ -2908,8 +2908,16 @@ if (!function_exists('save_call_center_xml')) {
 					$x++;
 				}
 
+			//set the path
+				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";
+				}
+
 			//get the contents of the template
-				$file_contents = file_get_contents($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/resources/templates/conf/autoload_configs/callcenter.conf.xml");
+				$file_contents = file_get_contents($path."/autoload_configs/callcenter.conf.xml");
 
 			//add the Call Center Queues, Agents and Tiers to the XML config
 				$file_contents = str_replace("{v_queues}", $v_queues, $file_contents);
@@ -2993,9 +3001,9 @@ if (!function_exists('xml_cdr_conf_xml')) {
 				$path = "/usr/share/fusionpbx/resources/templates/conf";
 			}
 			else {
-				$path = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH;
+				$path = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/resources/templates/conf";
 			}
-			$file_contents = file_get_contents($path."/resources/templates/conf/autoload_configs/xml_cdr.conf.xml");
+			$file_contents = file_get_contents($path."/autoload_configs/xml_cdr.conf.xml");
 
 		//replace the values in the template
 			$file_contents = str_replace("{v_http_protocol}", "http", $file_contents);