From a149404637b2a3f2f072c1e5b97c25f6e28e41df Mon Sep 17 00:00:00 2001
From: Mark Crane <markjcrane@gmail.com>
Date: Sat, 24 Jan 2015 10:22:16 +0000
Subject: [PATCH] Prevent duplicates on the time conditons presets and make it
 more efficient to load the default settings.

---
 app/time_conditions/app_defaults.php | 50 +++++++++++++++++-----------
 1 file changed, 30 insertions(+), 20 deletions(-)

diff --git a/app/time_conditions/app_defaults.php b/app/time_conditions/app_defaults.php
index ea0b850d60..d0b462977a 100644
--- a/app/time_conditions/app_defaults.php
+++ b/app/time_conditions/app_defaults.php
@@ -26,30 +26,40 @@ if ($domains_processed == 1) {
 			$x++;
 		}
 
-	//iterate and add each, if necessary
-		foreach ($array as $index => $default_settings) {
+	//get an array of the default settings
+		$sql = "select * from v_default_settings ";
+		$sql .= "where default_setting_category = 'time_conditions' ";
+		$sql .= "and default_setting_subcategory = 'preset' ";
+		$sql .= "and default_setting_name = 'array' ";
+		$prep_statement = $db->prepare($sql);
+		$prep_statement->execute();
+		$default_settings = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+		unset ($prep_statement, $sql);
 
-		//add 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']."' ";
-			$sql .= "and default_setting_name = '".$default_settings['default_setting_name']."' ";
-			$sql .= "and default_setting_value = '".$default_settings['default_setting_value']."' ";
-			$prep_statement = $db->prepare($sql);
-			if ($prep_statement) {
-				$prep_statement->execute();
-				$row = $prep_statement->fetch(PDO::FETCH_ASSOC);
-				unset($prep_statement);
-				if ($row['num_rows'] == 0) {
-					$orm = new orm;
-					$orm->name('default_settings');
-					$orm->save($array[$index]);
-					$message = $orm->message;
-					//print_r($message);
+	//find the missing default settings
+		$x = 0;
+		foreach ($array as $setting) {
+			$found = false;
+			$missing[$x] = $setting;
+			foreach ($default_settings as $row) {
+				if (trim($row['default_setting_value']) == trim($setting['default_setting_value'])) {
+					$found = true;
+					//remove items from the array that were found
+					unset($missing[$x]);
 				}
-				unset($row);
 			}
+			$x++;
+		}
 
+	//add the missing default settings
+		foreach ($missing as $row) {
+			//add the default settings
+			$orm = new orm;
+			$orm->name('default_settings');
+			$orm->save($row);
+			$message = $orm->message;
+			unset($orm);
+			//print_r($message);
 		}
 
 }