From 836a41ddbb4bf9326ea22ce7f7a8d481e5195c42 Mon Sep 17 00:00:00 2001
From: markjcrane <markjcrane@gmail.com>
Date: Sun, 20 Dec 2015 22:46:52 -0700
Subject: [PATCH] Minor adjustments.

---
 app/gateways/app_defaults.php            | 44 ++++++++++++++++++++++++
 core/default_settings/app_defaults.php   | 13 -------
 core/domain_settings/app_defaults.php    | 14 ++++----
 core/events/resources/classes/events.php |  2 +-
 core/user_settings/app_defaults.php      |  2 +-
 5 files changed, 52 insertions(+), 23 deletions(-)
 create mode 100644 app/gateways/app_defaults.php

diff --git a/app/gateways/app_defaults.php b/app/gateways/app_defaults.php
new file mode 100644
index 0000000000..a5eea236ba
--- /dev/null
+++ b/app/gateways/app_defaults.php
@@ -0,0 +1,44 @@
+<?php
+/*
+	FusionPBX
+	Version: MPL 1.1
+
+	The contents of this file are subject to the Mozilla Public License Version
+	1.1 (the "License"); you may not use this file except in compliance with
+	the License. You may obtain a copy of the License at
+	http://www.mozilla.org/MPL/
+
+	Software distributed under the License is distributed on an "AS IS" basis,
+	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+	for the specific language governing rights and limitations under the
+	License.
+
+	The Original Code is FusionPBX
+
+	The Initial Developer of the Original Code is
+	Mark J Crane <markjcrane@fusionpbx.com>
+	Portions created by the Initial Developer are Copyright (C) 2008-2010
+	the Initial Developer. All Rights Reserved.
+
+	Contributor(s):
+	Mark J Crane <markjcrane@fusionpbx.com>
+*/
+
+//process this only one time
+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/default_settings/app_defaults.php b/core/default_settings/app_defaults.php
index a058969777..73dffd1b4e 100644
--- a/core/default_settings/app_defaults.php
+++ b/core/default_settings/app_defaults.php
@@ -371,19 +371,6 @@ if ($domains_processed == 1) {
 			unset($prep_statement, $row);
 		}
 
-	//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/app_defaults.php b/core/domain_settings/app_defaults.php
index 95633206c5..2d613a83ca 100644
--- a/core/domain_settings/app_defaults.php
+++ b/core/domain_settings/app_defaults.php
@@ -35,13 +35,11 @@
 	}
 
 //proccess this only one time
-if ($domains_processed == 1) {
-
-	//set domains with enabled status of empty or null to true
-		$sql = "update v_domains set domain_enabled = 'true' where domain_enabled = '' or domain_enabled is null";
-		$db->exec(check_sql($sql));
-		unset($sql);
-
-}
+	if ($domains_processed == 1) {
+		//set domains with enabled status of empty or null to true
+			$sql = "update v_domains set domain_enabled = 'true' where domain_enabled = '' or domain_enabled is null";
+			$db->exec(check_sql($sql));
+			unset($sql);
+	}
 
 ?>
\ No newline at end of file
diff --git a/core/events/resources/classes/events.php b/core/events/resources/classes/events.php
index 5349e724ea..87ddde6276 100644
--- a/core/events/resources/classes/events.php
+++ b/core/events/resources/classes/events.php
@@ -9,7 +9,7 @@
 class events {
 
 	/**
-	 * @var obj $db 				Database connnection object
+	 * @var obj $db 			Database connnection object
 	 * @var array $plugins		Store available plugin classes
 	 * @var array $methods		store methods found on each plugin
 	 * @var array $headers		headers provide information about the events
diff --git a/core/user_settings/app_defaults.php b/core/user_settings/app_defaults.php
index 6b897c6f61..71905a592e 100644
--- a/core/user_settings/app_defaults.php
+++ b/core/user_settings/app_defaults.php
@@ -15,7 +15,7 @@ if ($domains_processed == 1) {
 	//iterate and add each, if necessary
 		foreach ($array as $index => $default_settings) {
 
-		//add theme default settings
+			//add theme default settings
 			$sql = "select count(*) as num_rows from v_default_settings ";
 			$sql .= "where default_setting_category = '".$default_settings['default_setting_category']."' ";
 			$sql .= "and default_setting_subcategory = '".$default_settings['default_setting_subcategory']."' ";