From 3153315da20cedc433c5e007e74e714dc3e2a292 Mon Sep 17 00:00:00 2001
From: Mark Crane <markjcrane@gmail.com>
Date: Sat, 22 Mar 2014 01:00:46 +0000
Subject: [PATCH] Add code to change switch gateways dir to switch sip_profiles
 dir. Update the domain settings.

---
 core/default_settings/app_defaults.php | 13 +++++++++++++
 core/domain_settings/domain_delete.php | 24 ++++++++++++++++--------
 core/upgrade/upgrade_domains.php       | 18 ++++++++++++++----
 3 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/core/default_settings/app_defaults.php b/core/default_settings/app_defaults.php
index d42c757e99..a2261da03f 100644
--- a/core/default_settings/app_defaults.php
+++ b/core/default_settings/app_defaults.php
@@ -111,6 +111,19 @@ if ($domains_processed == 1) {
 			}
 		}
 
+//set the sip_profiles directory for older installs
+	if (isset($_SESSION['switch']['gateways']['dir'])) {
+		$orm = new orm;
+		$orm->name('default_settings');
+		$orm->uuid($_SESSION['switch']['gateways']['uuid']);
+		$array['default_setting_category'] = 'switch';
+		$array['default_setting_subcategory'] = 'sip_profiles';
+		$array['default_setting_name'] = 'dir';
+		//$array['default_setting_value'] = '';
+		//$array['default_setting_enabled'] = 'true';
+		$orm->save($array);
+		unset($array);
+	}
 }
 
 ?>
\ No newline at end of file
diff --git a/core/domain_settings/domain_delete.php b/core/domain_settings/domain_delete.php
index ba1abc0f78..4b875e9f50 100644
--- a/core/domain_settings/domain_delete.php
+++ b/core/domain_settings/domain_delete.php
@@ -68,12 +68,20 @@ if (strlen($id) > 0) {
 			$category = $row['domain_setting_category'];
 			$subcategory = $row['domain_setting_subcategory'];
 			if (strlen($subcategory) == 0) {
-				//$$category[$name] = $row['domain_setting_value'];
-				$_SESSION[$category][$name] = $row['domain_setting_value'];
-			}
-			else {
-				//$$category[$subcategory][$name] = $row['domain_setting_value'];
-				$_SESSION[$category][$subcategory][$name] = $row['domain_setting_value'];
+				if ($name == "array") {
+					$_SESSION[$category][] = $row['default_setting_value'];
+				}
+				else {
+					$_SESSION[$category][$name] = $row['default_setting_value'];
+				}
+			} else {
+				if ($name == "array") {
+					$_SESSION[$category][$subcategory][] = $row['default_setting_value'];
+				}
+				else {
+					$_SESSION[$category][$subcategory]['uuid'] = $row['default_setting_uuid'];
+					$_SESSION[$category][$subcategory][$name] = $row['default_setting_value'];
+				}
 			}
 		}
 
@@ -133,7 +141,7 @@ if (strlen($id) > 0) {
 			}
 
 		//delete the gateways
-			if($dh = opendir($_SESSION['switch']['gateways']['dir'])) {
+			if($dh = opendir($_SESSION['switch']['sip_profiles']['dir'])) {
 				$files = Array();
 				while($file = readdir($dh)) {
 					if($file != "." && $file != ".." && $file[0] != '.') {
@@ -142,7 +150,7 @@ if (strlen($id) > 0) {
 						} else {
 							//check if file extension is xml
 							if (strpos($file, $v_needle) !== false && substr($file,-4) == '.xml') {
-								unlink($_SESSION['switch']['gateways']['dir']."/".$file);
+								unlink($_SESSION['switch']['sip_profiles']['dir']."/".$file);
 							}
 						}
 					}
diff --git a/core/upgrade/upgrade_domains.php b/core/upgrade/upgrade_domains.php
index 2923ee59c6..3f50b404a9 100644
--- a/core/upgrade/upgrade_domains.php
+++ b/core/upgrade/upgrade_domains.php
@@ -137,10 +137,20 @@
 				$category = $row['default_setting_category'];
 				$subcategory = $row['default_setting_subcategory'];
 				if (strlen($subcategory) == 0) {
-					$_SESSION[$category][$name] = $row['default_setting_value'];
-				}
-				else {
-					$_SESSION[$category][$subcategory][$name] = $row['default_setting_value'];
+					if ($name == "array") {
+						$_SESSION[$category][] = $row['default_setting_value'];
+					}
+					else {
+						$_SESSION[$category][$name] = $row['default_setting_value'];
+					}
+				} else {
+					if ($name == "array") {
+						$_SESSION[$category][$subcategory][] = $row['default_setting_value'];
+					}
+					else {
+						$_SESSION[$category][$subcategory]['uuid'] = $row['default_setting_uuid'];
+						$_SESSION[$category][$subcategory][$name] = $row['default_setting_value'];
+					}
 				}
 			}