From 7d6f3828fd73c3ef7b237faa2ec5d861155310c4 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Mon, 12 Jun 2017 08:21:28 -0400
Subject: [PATCH] Fixed some SQL and used proper settings names

---
 admin/admin_settings.php                 | 30 ++++++++++++------------
 install/mods-for-hesk/sql/installSql.php | 12 +++++-----
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/admin/admin_settings.php b/admin/admin_settings.php
index 3ae5db34..ef40ccc5 100644
--- a/admin/admin_settings.php
+++ b/admin/admin_settings.php
@@ -3787,7 +3787,7 @@ $modsForHesk_settings = mfh_getSettings();
                             <div class="col-sm-5 col-xs-12">
                                 <input type="text" id="admin-navbar-background-color" name="admin-navbar-background-color"
                                        class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_background_color']; ?>">
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_background']; ?>">
                             </div>
                         </div>
                     </div>
@@ -3807,7 +3807,7 @@ $modsForHesk_settings = mfh_getSettings();
                             <div class="col-sm-5 col-xs-12">
                                 <input type="text" id="admin-navbar-brand-background-color" name="admin-navbar-brand-background-color"
                                        class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_background_color']; ?>">
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_background']; ?>">
                             </div>
                         </div>
                     </div>
@@ -3826,7 +3826,7 @@ $modsForHesk_settings = mfh_getSettings();
                             <div class="col-sm-5 col-xs-12">
                                 <input type="text" id="admin-navbar-text-color" name="admin-navbar-text-color"
                                        class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_text_color']; ?>">
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_text']; ?>">
                             </div>
                         </div>
                     </div>
@@ -3843,7 +3843,7 @@ $modsForHesk_settings = mfh_getSettings();
                             <div class="col-sm-5 col-xs-12">
                                 <input type="text" id="admin-navbar-brand-text-color" name="admin-navbar-brand-text-color"
                                        class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_text_color']; ?>">
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_text']; ?>">
                             </div>
                         </div>
                     </div>
@@ -3862,7 +3862,7 @@ $modsForHesk_settings = mfh_getSettings();
                             <div class="col-sm-5 col-xs-12">
                                 <input type="text" id="admin-navbar-text-color" name="admin-navbar-text-color"
                                        class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_text_hover_color']; ?>">
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_text_hover']; ?>">
                             </div>
                         </div>
                     </div>
@@ -3879,7 +3879,7 @@ $modsForHesk_settings = mfh_getSettings();
                             <div class="col-sm-5 col-xs-12">
                                 <input type="text" id="admin-navbar-brand-text-color" name="admin-navbar-brand-text-color"
                                        class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_text_hover_color']; ?>">
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_text_hover']; ?>">
                             </div>
                         </div>
                     </div>
@@ -3898,7 +3898,7 @@ $modsForHesk_settings = mfh_getSettings();
                             <div class="col-sm-5 col-xs-12">
                                 <input type="text" id="admin-navbar-background-hover-color" name="admin-navbar-background-hover-color"
                                        class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_background_hover_color']; ?>">
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_background_hover']; ?>">
                             </div>
                         </div>
                     </div>
@@ -3915,7 +3915,7 @@ $modsForHesk_settings = mfh_getSettings();
                             <div class="col-sm-5 col-xs-12">
                                 <input type="text" id="admin-navbar-brand-background-hover-color" name="admin-navbar-brand-background-hover-color"
                                        class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_background_hover_color']; ?>">
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_background_hover']; ?>">
                             </div>
                         </div>
                     </div>
@@ -3937,7 +3937,7 @@ $modsForHesk_settings = mfh_getSettings();
                             <div class="col-sm-5 col-xs-12">
                                 <input type="text" id="admin-navbar-background-color" name="admin-navbar-background-color"
                                        class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_background_color']; ?>">
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_background']; ?>">
                             </div>
                         </div>
                     </div>
@@ -3957,7 +3957,7 @@ $modsForHesk_settings = mfh_getSettings();
                             <div class="col-sm-5 col-xs-12">
                                 <input type="text" id="admin-navbar-brand-background-color" name="admin-navbar-brand-background-color"
                                        class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_background_color']; ?>">
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_background']; ?>">
                             </div>
                         </div>
                     </div>
@@ -3976,7 +3976,7 @@ $modsForHesk_settings = mfh_getSettings();
                             <div class="col-sm-5 col-xs-12">
                                 <input type="text" id="admin-navbar-text-color" name="admin-navbar-text-color"
                                        class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_text_color']; ?>">
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_text']; ?>">
                             </div>
                         </div>
                     </div>
@@ -3993,7 +3993,7 @@ $modsForHesk_settings = mfh_getSettings();
                             <div class="col-sm-5 col-xs-12">
                                 <input type="text" id="admin-navbar-brand-text-color" name="admin-navbar-brand-text-color"
                                        class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_text_color']; ?>">
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_text']; ?>">
                             </div>
                         </div>
                     </div>
@@ -4012,7 +4012,7 @@ $modsForHesk_settings = mfh_getSettings();
                             <div class="col-sm-5 col-xs-12">
                                 <input type="text" id="admin-navbar-text-color" name="admin-navbar-text-color"
                                        class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_text_hover_color']; ?>">
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_text_hover']; ?>">
                             </div>
                         </div>
                     </div>
@@ -4031,7 +4031,7 @@ $modsForHesk_settings = mfh_getSettings();
                             <div class="col-sm-5 col-xs-12">
                                 <input type="text" id="admin-navbar-background-hover-color" name="admin-navbar-background-hover-color"
                                        class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_background_hover_color']; ?>">
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_background_hover']; ?>">
                             </div>
                         </div>
                     </div>
@@ -4050,7 +4050,7 @@ $modsForHesk_settings = mfh_getSettings();
                             <div class="col-sm-5 col-xs-12">
                                 <input type="text" id="admin-navbar-background-hover-color" name="admin-navbar-background-hover-color"
                                        class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_background_hover_color']; ?>">
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_background_hover']; ?>">
                             </div>
                         </div>
                     </div>
diff --git a/install/mods-for-hesk/sql/installSql.php b/install/mods-for-hesk/sql/installSql.php
index 74cdb261..1bfd29eb 100644
--- a/install/mods-for-hesk/sql/installSql.php
+++ b/install/mods-for-hesk/sql/installSql.php
@@ -1048,14 +1048,14 @@ function execute310Scripts() {
         'background' => $light_theme ? '#f9fafc' : '#1a2226',
         'text' => $light_theme ? '#848484' : '#4b646f',
         'text_hover' => $light_theme ? '#848484' : '#4b646f',
-        'background_hover' => $light_theme ? '#f9fafc': '#1a2226'
+        'background_hover' => $light_theme ? '#f9fafc': '#1e282c'
     );
     if (preg_match('/skin-blue.*/g', $theme)) {
         $navbar['background'] = '#3c8dbc';
         $navbar['background_hover'] = '#367fa9';
 
         $navbar_brand['background'] = $light_theme ? '#3c8dbc' : '#367fa9';
-        $navbar_brand['background_hover'] = $light_theme ? '#3b8ab8' : '#367fa9';
+        $navbar_brand['background_hover'] = $light_theme ? '#3b8ab8' : '#357ca5';
     } elseif (preg_match('/skin-yellow.*/g', $theme)) {
         $navbar['background'] = '#f39c12';
         $navbar['background_hover'] = '#da8c10';
@@ -1089,9 +1089,9 @@ function execute310Scripts() {
     }
 
     executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) 
-        VALUES ('admin_navbar_background_color', '{$navbar['background']}')");
+        VALUES ('admin_navbar_background', '{$navbar['background']}')");
     executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) 
-        VALUES ('admin_navbar_background_color_hover', '{$navbar['background_hover']}')");
+        VALUES ('admin_navbar_background_hover', '{$navbar['background_hover']}')");
     executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) 
         VALUES ('admin_navbar_text', '{$navbar['text']}')");
     executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) 
@@ -1119,9 +1119,9 @@ function execute310Scripts() {
     executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) 
         VALUES ('admin_sidebar_header_background_hover', '{$sidebar_header['background_hover']}')");
     executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) 
-        VALUES ('admin_sidebar_text', '{$sidebar_header['text']}')");
+        VALUES ('admin_sidebar_header_text', '{$sidebar_header['text']}')");
     executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) 
-        VALUES ('admin_sidebar_text_hover', '{$sidebar_header['text_hover']}')");
+        VALUES ('admin_sidebar_header_text_hover', '{$sidebar_header['text_hover']}')");
 
     updateVersion('3.1.0');
 }
\ No newline at end of file