From 87f2ac556160642d31c8c52c67f40af00edbecfe Mon Sep 17 00:00:00 2001
From: Nate Jones <git@reliberate.com>
Date: Sun, 17 Aug 2014 14:29:51 +0000
Subject: [PATCH] Theme Default Settings: Prevent background_color from getting
 added more than twice, and adds both colors if none exist.

---
 themes/enhanced/app_defaults.php  | 23 +++++++++++++----------
 themes/minimized/app_defaults.php | 23 +++++++++++++----------
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/themes/enhanced/app_defaults.php b/themes/enhanced/app_defaults.php
index 6890156a8c..b0255945b9 100644
--- a/themes/enhanced/app_defaults.php
+++ b/themes/enhanced/app_defaults.php
@@ -29,14 +29,6 @@ if ($domains_processed == 1) {
 	//define array of settings
 		$x = 0;
 		$array[$x]['default_setting_category'] = 'theme';
-		$array[$x]['default_setting_subcategory'] = 'background_color';
-		$array[$x]['default_setting_name'] = 'array';
-		$array[$x]['default_setting_value'] = '#ffffff';
-		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_order'] = '0';
-		$array[$x]['default_setting_description'] = 'Set a background (HTML compatible) color.';
-		$x++;
-		$array[$x]['default_setting_category'] = 'theme';
 		$array[$x]['default_setting_subcategory'] = 'login_opacity';
 		$array[$x]['default_setting_name'] = 'text';
 		$array[$x]['default_setting_value'] = '0.35';
@@ -157,6 +149,14 @@ if ($domains_processed == 1) {
 		$array[$x]['default_setting_category'] = 'theme';
 		$array[$x]['default_setting_subcategory'] = 'background_color';
 		$array[$x]['default_setting_name'] = 'array';
+		$array[$x]['default_setting_value'] = '#ffffff';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_order'] = '0';
+		$array[$x]['default_setting_description'] = 'Set a background (HTML compatible) color.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'background_color';
+		$array[$x]['default_setting_name'] = 'array';
 		$array[$x]['default_setting_value'] = '#e7ebf1';
 		$array[$x]['default_setting_order'] = '1';
 		$array[$x]['default_setting_enabled'] = 'true';
@@ -171,10 +171,12 @@ if ($domains_processed == 1) {
 			$prep_statement->execute();
 			$row = $prep_statement->fetch(PDO::FETCH_ASSOC);
 			unset($prep_statement);
-			if ($row['num_rows'] == 1) {
+			if ($row['num_rows'] == 0) {
 				$orm = new orm;
 				$orm->name('default_settings');
-				$orm->save($array[0]);
+				foreach ($array as $index => $null) {
+					$orm->save($array[$index]);
+				}
 				$message = $orm->message;
 				//print_r($message);
 			}
@@ -184,6 +186,7 @@ if ($domains_processed == 1) {
 	//get the background images
 		$relative_path = PROJECT_PATH.'/themes/enhanced/images/backgrounds';
 		$backgrounds = opendir($_SERVER["DOCUMENT_ROOT"].'/'.$relative_path);
+		unset($array);
 		$x = 0;
 		while (false !== ($file = readdir($backgrounds))) {
 			if ($file != "." AND $file != ".."){
diff --git a/themes/minimized/app_defaults.php b/themes/minimized/app_defaults.php
index dd39758af5..0332d1ea7d 100644
--- a/themes/minimized/app_defaults.php
+++ b/themes/minimized/app_defaults.php
@@ -29,14 +29,6 @@ if ($domains_processed == 1) {
 	//define array of settings
 		$x = 0;
 		$array[$x]['default_setting_category'] = 'theme';
-		$array[$x]['default_setting_subcategory'] = 'background_color';
-		$array[$x]['default_setting_name'] = 'array';
-		$array[$x]['default_setting_value'] = '#ffffff';
-		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_order'] = '0';
-		$array[$x]['default_setting_description'] = 'Set a background (HTML compatible) color.';
-		$x++;
-		$array[$x]['default_setting_category'] = 'theme';
 		$array[$x]['default_setting_subcategory'] = 'login_opacity';
 		$array[$x]['default_setting_name'] = 'text';
 		$array[$x]['default_setting_value'] = '0.35';
@@ -157,6 +149,14 @@ if ($domains_processed == 1) {
 		$array[$x]['default_setting_category'] = 'theme';
 		$array[$x]['default_setting_subcategory'] = 'background_color';
 		$array[$x]['default_setting_name'] = 'array';
+		$array[$x]['default_setting_value'] = '#ffffff';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_order'] = '0';
+		$array[$x]['default_setting_description'] = 'Set a background (HTML compatible) color.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'background_color';
+		$array[$x]['default_setting_name'] = 'array';
 		$array[$x]['default_setting_value'] = '#e7ebf1';
 		$array[$x]['default_setting_order'] = '1';
 		$array[$x]['default_setting_enabled'] = 'true';
@@ -171,10 +171,12 @@ if ($domains_processed == 1) {
 			$prep_statement->execute();
 			$row = $prep_statement->fetch(PDO::FETCH_ASSOC);
 			unset($prep_statement);
-			if ($row['num_rows'] == 1) {
+			if ($row['num_rows'] == 0) {
 				$orm = new orm;
 				$orm->name('default_settings');
-				$orm->save($array[0]);
+				foreach ($array as $index => $null) {
+					$orm->save($array[$index]);
+				}
 				$message = $orm->message;
 				//print_r($message);
 			}
@@ -184,6 +186,7 @@ if ($domains_processed == 1) {
 	//get the background images
 		$relative_path = PROJECT_PATH.'/themes/minimized/images/backgrounds';
 		$backgrounds = opendir($_SERVER["DOCUMENT_ROOT"].'/'.$relative_path);
+		unset($array);
 		$x = 0;
 		while (false !== ($file = readdir($backgrounds))) {
 			if ($file != "." AND $file != ".."){