From fe40c4ede9a402dcd2204810a51e6736f954f6c8 Mon Sep 17 00:00:00 2001
From: Nate Jones <git@reliberate.com>
Date: Sun, 17 Aug 2014 04:33:57 +0000
Subject: [PATCH] Enhanced Theme: Added Default Settings to control footer
 colors and opacity.

Other minor code enhancements.
---
 app/provision/app_defaults.php                |  9 ++----
 app/xml_cdr/app_defaults.php                  |  6 ++--
 .../default_settings/default_setting_edit.php |  4 ++-
 themes/enhanced/app_defaults.php              | 30 +++++++++++++------
 themes/enhanced/template.php                  | 19 +++++-------
 5 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/app/provision/app_defaults.php b/app/provision/app_defaults.php
index ac223a0bfc..66b2ee6cf2 100644
--- a/app/provision/app_defaults.php
+++ b/app/provision/app_defaults.php
@@ -113,12 +113,9 @@
 					$x++;
 					$orm = new orm;
 					$orm->name('default_settings');
-					$orm->save($array[0]);
-					$orm->save($array[1]);
-					$orm->save($array[2]);
-					$orm->save($array[3]);
-					$orm->save($array[4]);
-					$orm->save($array[5]);
+					foreach ($array as $index => $null) {
+						$orm->save($array[$index]);
+					}
 					$message = $orm->message;
 					//print_r($message);
 				}
diff --git a/app/xml_cdr/app_defaults.php b/app/xml_cdr/app_defaults.php
index 4959a04115..ea9ed50a8a 100644
--- a/app/xml_cdr/app_defaults.php
+++ b/app/xml_cdr/app_defaults.php
@@ -75,9 +75,9 @@
 					$x++;
 					$orm = new orm;
 					$orm->name('default_settings');
-					$orm->save($array[0]);
-					$orm->save($array[1]);
-					$orm->save($array[2]);
+					foreach ($array as $index => $null) {
+						$orm->save($array[$index]);
+					}
 					$message = $orm->message;
 					//print_r($message);
 				}
diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php
index af2cf34bf7..590ab61583 100644
--- a/core/default_settings/default_setting_edit.php
+++ b/core/default_settings/default_setting_edit.php
@@ -415,7 +415,9 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 	elseif (
 		$category == "theme" && $subcategory == "background_color" && $name == "array" ||
-		$category == "theme" && $subcategory == "login_color" && $name == "text"
+		$category == "theme" && $subcategory == "login_background_color" && $name == "text" ||
+		$category == "theme" && $subcategory == "footer_color" && $name == "text" ||
+		$category == "theme" && $subcategory == "footer_background_color" && $name == "text"
 		) {
 		echo "	<style>";
 		echo "		DIV.rui-colorpicker  { width: 253px; }";
diff --git a/themes/enhanced/app_defaults.php b/themes/enhanced/app_defaults.php
index 80fc94c838..46b3f9b83f 100644
--- a/themes/enhanced/app_defaults.php
+++ b/themes/enhanced/app_defaults.php
@@ -67,26 +67,38 @@ if ($domains_processed == 1) {
 				$array[$x]['default_setting_description'] = 'Set the opacity of the login box (decimal).';
 				$x++;
 				$array[$x]['default_setting_category'] = 'theme';
-				$array[$x]['default_setting_subcategory'] = 'login_color';
+				$array[$x]['default_setting_subcategory'] = 'login_background_color';
 				$array[$x]['default_setting_name'] = 'text';
 				$array[$x]['default_setting_value'] = '#ffffff';
 				$array[$x]['default_setting_enabled'] = 'true';
 				$array[$x]['default_setting_description'] = 'Set a background color (HTML compatible) for the login box.';
 				$x++;
 				$array[$x]['default_setting_category'] = 'theme';
-				$array[$x]['default_setting_subcategory'] = 'footer';
+				$array[$x]['default_setting_subcategory'] = 'footer_background_color';
 				$array[$x]['default_setting_name'] = 'text';
-				$array[$x]['default_setting_value'] = 'true';
+				$array[$x]['default_setting_value'] = '#000000';
 				$array[$x]['default_setting_enabled'] = 'true';
-				$array[$x]['default_setting_description'] = '';
+				$array[$x]['default_setting_description'] = 'Set a background color (HTML compatible) for the footer bar.';
+				$x++;
+				$array[$x]['default_setting_category'] = 'theme';
+				$array[$x]['default_setting_subcategory'] = 'footer_color';
+				$array[$x]['default_setting_name'] = 'text';
+				$array[$x]['default_setting_value'] = '#ffffff';
+				$array[$x]['default_setting_enabled'] = 'true';
+				$array[$x]['default_setting_description'] = 'Set a foreground color (HTML compatible) for the footer bar.';
+				$x++;
+				$array[$x]['default_setting_category'] = 'theme';
+				$array[$x]['default_setting_subcategory'] = 'footer_opacity';
+				$array[$x]['default_setting_name'] = 'text';
+				$array[$x]['default_setting_value'] = '0.2';
+				$array[$x]['default_setting_enabled'] = 'true';
+				$array[$x]['default_setting_description'] = 'Set the opacity of the footer bar (decimal).';
 				$x++;
 				$orm = new orm;
 				$orm->name('default_settings');
-				$orm->save($array[0]);
-				$orm->save($array[1]);
-				$orm->save($array[2]);
-				$orm->save($array[3]);
-				$orm->save($array[4]);
+				foreach ($array as $index => $null) {
+					$orm->save($array[$index]);
+				}
 				$message = $orm->message;
 				//print_r($message);
 			}
diff --git a/themes/enhanced/template.php b/themes/enhanced/template.php
index 184ab0821e..2a48b6023f 100644
--- a/themes/enhanced/template.php
+++ b/themes/enhanced/template.php
@@ -118,7 +118,7 @@ DIV#default_login {
 		$_SESSION['theme']['background_color'][0] != '' ||
 		$_SESSION['theme']['background_color'][1] != ''
 		) { ?>
-		background-color: <?php echo $_SESSION['theme']['login_color']['text']; ?>;
+		background-color: <?php echo $_SESSION['theme']['login_background_color']['text']; ?>;
 		opacity: <?php echo $_SESSION['theme']['login_opacity']['text']; ?>;
 		filter: alpha(opacity=<?php echo (100 * (float) $_SESSION['theme']['login_opacity']['text']); ?>);
 		-moz-opacity: <?php echo $_SESSION['theme']['login_opacity']['text']; ?>;
@@ -135,17 +135,16 @@ DIV#default_login {
 }
 
 DIV#footer {
-	background-color: #000;
+	background-color: <?php echo $_SESSION['theme']['footer_background_color']['text']; ?>;
 	bottom: 0;
 	left: 0;
 	right: 0;
 	height: 20px;
-	-khtml-opacity: 0.2;
-	-moz-opacity: 0.2;
-	-ms-filter: "alpha(opacity=20)";
-	filter: alpha(opacity=20);
-	filter: progid:DXImageTransform.Microsoft.Alpha(opacity=0.2);
-	opacity: 0.2;
+	-khtml-opacity: <?php echo $_SESSION['theme']['footer_opacity']['text']; ?>;
+	-moz-opacity: <?php echo $_SESSION['theme']['footer_opacity']['text']; ?>;
+	filter: alpha(opacity=<?php echo (100 * (float) $_SESSION['theme']['footer_opacity']['text']); ?>);
+	filter: progid:DXImageTransform.Microsoft.Alpha(opacity=<?php echo $_SESSION['theme']['footer_opacity']['text']; ?>);
+	opacity: <?php echo $_SESSION['theme']['footer_opacity']['text']; ?>;
 	text-align: center;
 	vertical-align: middle;
 	padding-bottom: 0;
@@ -155,7 +154,7 @@ DIV#footer {
 .footer {
 	font-size: 11px;
 	font-family: arial;
-	color: #fff;
+	color: <?php echo $_SESSION['theme']['footer_color']['text']; ?>;
 }
 
 img {
@@ -1411,10 +1410,8 @@ if (strlen($_SESSION['message']) > 0) {
 		</div>
 		<?php
 	}
-	if ($_SESSION['theme']['footer']['text'] == "false"){ echo "<!--\n"; }
 	$footer .= "&copy; Copyright 2008 - ".date("Y")." <a href='http://www.fusionpbx.com' class='footer' target='_blank'>fusionpbx.com</a>. All rights reserved.\n";
 	echo "<div id='footer' style='position: absolute; z-index; 10000;'><span class='footer'>".$footer."</span></div>\n";
-	if ($_SESSION['theme']['footer']['text'] == "false"){ echo "-->\n"; }
 	?>
 
 </body>