Parcourir la source

Minor adjustments.

markjcrane il y a 9 ans
Parent
commit
064ac0ab1e

+ 0 - 13
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);
-		}
 }
 
 ?>

+ 6 - 8
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);
+	}
 
 ?>

+ 1 - 1
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

+ 1 - 1
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']."' ";