From a784ef1c14731b03a1716f4b240558c1d9f55fc5 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Wed, 2 Sep 2015 22:04:32 -0400
Subject: [PATCH] #327 Switched back to getting all settings

---
 admin/admin_reply_ticket.php             |  7 ++-
 admin/admin_settings.php                 | 79 ++++++++++++------------
 css/hesk_newStyle.php                    | 60 ------------------
 download_attachment.php                  |  3 +-
 inc/common.inc.php                       | 11 ----
 inc/email_functions.inc.php              |  5 --
 inc/header.inc.php                       | 43 +++++++++++++
 install/mods-for-hesk/sql/installSql.php | 34 ++++++++++
 print.php                                |  6 +-
 reply_ticket.php                         |  3 +-
 submit_ticket.php                        |  7 ++-
 11 files changed, 133 insertions(+), 125 deletions(-)

diff --git a/admin/admin_reply_ticket.php b/admin/admin_reply_ticket.php
index 9ddc887a..fc59ae36 100644
--- a/admin/admin_reply_ticket.php
+++ b/admin/admin_reply_ticket.php
@@ -89,6 +89,7 @@ $message = hesk_input(hesk_POST('message'));
 // Submit as customer?
 $submit_as_customer = isset($_POST['submit_as_customer']) ? true : false;
 
+$modsForHesk_settings = mfh_getSettings();
 if (strlen($message))
 {
     // Save message for later and ignore the rest?
@@ -138,14 +139,14 @@ if (strlen($message))
     // Attach signature to the message?
     if ( ! $submit_as_customer && ! empty($_POST['signature']))
 	{
-        if (mfh_getSetting('rich_text_for_tickets')) {
+        if ($modsForHesk_settings['rich_text_for_tickets']) {
             $message .= "<br><br>" . nl2br($_SESSION['signature']) . "<br>";
         } else {
             $message .= "\n\n" . addslashes($_SESSION['signature']) . "\n";
         }
 	}
 
-    if (!mfh_getSetting('rich_text_for_tickets')) {
+    if (!$modsForHesk_settings['rich_text_for_tickets']) {
         // Make links clickable
         $message = hesk_makeURL($message);
 
@@ -210,7 +211,7 @@ if ($hesk_settings['attachments']['use'] && !empty($attachments))
 }
 
 // Add reply
-$html = mfh_getSetting('rich_text_for_tickets');
+$html = $modsForHesk_settings['rich_text_for_tickets'];
 if ($submit_as_customer)
 {
     hesk_dbQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."replies` (`replyto`,`name`,`message`,`dt`,`attachments`,`html`) VALUES ('".intval($replyto)."','".hesk_dbEscape(addslashes($ticket['name']))."','".hesk_dbEscape($message."<br /><br /><i>{$hesklang['creb']} {$_SESSION['name']}</i>")."',NOW(),'".hesk_dbEscape($myattachments)."', '".$html."')");
diff --git a/admin/admin_settings.php b/admin/admin_settings.php
index e45844c7..3dbf56ef 100644
--- a/admin/admin_settings.php
+++ b/admin/admin_settings.php
@@ -328,6 +328,7 @@ if ( defined('HESK_DEMO') )
 
         $hesklang['err_custname'] = addslashes($hesklang['err_custname']);
 
+        $modsForHesk_settings = mfh_getSettings();
         ?>
         <script language="javascript" type="text/javascript"><!--
         function hesk_checkFields()
@@ -823,8 +824,8 @@ if ( defined('HESK_DEMO') )
                             </label>
 							<div class="col-sm-6">
 								<?php
-								$on = mfh_getSetting('category_order_column') == 'name' ? 'checked' : '';
-								$off = mfh_getSetting('category_order_column') == 'name' ? '' : 'checked';
+								$on = $modsForHesk_settings['category_order_column'] == 'name' ? 'checked' : '';
+								$off = $modsForHesk_settings['category_order_column'] == 'name' ? '' : 'checked';
 								echo '
 								<div class="radio"><label><input type="radio" name="category_order_column" value="0" '.$off.'>'.$hesklang['sort_by_user_defined_order'].'</label></div>
 								<div class="radio"><label><input type="radio" name="category_order_column" value="1" '.$on.'>'.$hesklang['sort_alphabetically'].'</label></div>
@@ -844,9 +845,9 @@ if ( defined('HESK_DEMO') )
                             </label>
                             <div class="col-sm-6 form-inline">
                                 <?php
-                                $both = mfh_getSetting('rich_text_for_tickets') && mfh_getSetting('rich_text_for_tickets_for_customers') ? 'checked' : '';
-                                $staff = mfh_getSetting('rich_text_for_tickets') && !mfh_getSetting('rich_text_for_tickets_for_customers') ? 'checked' : '';
-								$no = mfh_getSetting('rich_text_for_tickets') && mfh_getSetting('rich_text_for_tickets_for_customers') ? '' : 'checked';
+                                $both = $modsForHesk_settings['rich_text_for_tickets'] && $modsForHesk_settings['rich_text_for_tickets_for_customers'] ? 'checked' : '';
+                                $staff = $modsForHesk_settings['rich_text_for_tickets'] && !$modsForHesk_settings['rich_text_for_tickets_for_customers'] ? 'checked' : '';
+								$no = $modsForHesk_settings['rich_text_for_tickets'] && $modsForHesk_settings['rich_text_for_tickets_for_customers'] ? '' : 'checked';
                                 echo '
 								<div class="radio"><label><input type="radio" name="rich_text_for_tickets" value="0" '.$no.'> '.$hesklang['off'].'</label></div>&nbsp;&nbsp;&nbsp;
 								<div class="radio"><label><input type="radio" name="rich_text_for_tickets" value="1" '.$staff.'> '.$hesklang['staff_only'].'</label></div>&nbsp;&nbsp;&nbsp;
@@ -867,8 +868,8 @@ if ( defined('HESK_DEMO') )
                             </label>
                             <div class="col-sm-6">
                                 <?php
-                                $on = mfh_getSetting('statuses_order_column') == 'name' ? 'checked' : '';
-                                $off = mfh_getSetting('statuses_order_column') == 'name' ? '' : 'checked';
+                                $on = $modsForHesk_settings['statuses_order_column'] == 'name' ? 'checked' : '';
+                                $off = $modsForHesk_settings['statuses_order_column'] == 'name' ? '' : 'checked';
                                 echo '
 								<div class="radio"><label><input type="radio" name="statuses_order_column" value="0" '.$off.'>'.$hesklang['sort_by_user_defined_order'].'</label></div>
 								<div class="radio"><label><input type="radio" name="statuses_order_column" value="1" '.$on.'>'.$hesklang['sort_alphabetically'].'</label></div>
@@ -951,8 +952,8 @@ if ( defined('HESK_DEMO') )
                             </label>
                             <div class="col-sm-6 form-inline">
                                 <?php
-                                $on = mfh_getSetting('request_location') ? 'checked' : '';
-                                $off = mfh_getSetting('request_location') ? '' : 'checked';
+                                $on = $modsForHesk_settings['request_location'] ? 'checked' : '';
+                                $off = $modsForHesk_settings['request_location'] ? '' : 'checked';
                                 echo '
                                 <div class="radio"><label><input type="radio" name="request_location" value="0" '.$off.' /> '.$hesklang['off'].'</label></div>&nbsp;&nbsp;&nbsp;
                                 <div class="radio"><label><input type="radio" name="request_location" value="1" '.$on.' /> '.$hesklang['on'].'</label></div>';
@@ -1147,7 +1148,7 @@ if ( defined('HESK_DEMO') )
                 <div class="col-sm-8 col-xs-12">
                     <div class="checkbox">
                         <label>
-                            <input id="email-verification" name="email-verification" type="checkbox" <?php if (mfh_getSetting('customer_email_verification_required')) {echo 'checked';} ?>> <?php echo $hesklang['require_customer_validate_email']; ?>
+                            <input id="email-verification" name="email-verification" type="checkbox" <?php if ($modsForHesk_settings['customer_email_verification_required']) {echo 'checked';} ?>> <?php echo $hesklang['require_customer_validate_email']; ?>
                         </label>
                     </div>
                 </div>
@@ -1273,7 +1274,7 @@ if ( defined('HESK_DEMO') )
                              data-content="<?php echo $hesklang['kb_attach_dir_help']; ?>"></i>
                       </label>
                       <div class="col-sm-8">
-                          <input type="text" class="form-control" placeholder="<?php echo htmlspecialchars($hesklang['kb_attach_dir']); ?>" name="kb_attach_dir" size="40" maxlength="255" value="<?php echo mfh_getSetting('kb_attach_dir'); ?>">
+                          <input type="text" class="form-control" placeholder="<?php echo htmlspecialchars($hesklang['kb_attach_dir']); ?>" name="kb_attach_dir" size="40" maxlength="255" value="<?php echo $modsForHesk_settings['kb_attach_dir']; ?>">
                       </div>
                   </div>
                   <div class="form-group">
@@ -1289,7 +1290,7 @@ if ( defined('HESK_DEMO') )
                       <div class="col-sm-8 col-xs-12">
                           <div class="radio">
                               <label>
-                                  <input type="radio" name="new_kb_article_visibility" value="0" <?php echo mfh_getSetting('new_kb_article_visibility') == 0 ? 'checked' : ''; ?>>
+                                  <input type="radio" name="new_kb_article_visibility" value="0" <?php echo $modsForHesk_settings['new_kb_article_visibility'] == 0 ? 'checked' : ''; ?>>
                                   <?php echo $hesklang['kb_published']; ?>
                                   <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
                                      title="<?php echo $hesklang['kb_published']; ?>"
@@ -1298,7 +1299,7 @@ if ( defined('HESK_DEMO') )
                           </div>
                           <div class="radio">
                               <label>
-                                  <input type="radio" name="new_kb_article_visibility" value="1" <?php echo mfh_getSetting('new_kb_article_visibility') == 1 ? 'checked' : ''; ?>>
+                                  <input type="radio" name="new_kb_article_visibility" value="1" <?php echo $modsForHesk_settings['new_kb_article_visibility'] == 1 ? 'checked' : ''; ?>>
                                   <?php echo $hesklang['kb_private']; ?>
                                   <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
                                      title="<?php echo $hesklang['kb_private']; ?>"
@@ -1307,7 +1308,7 @@ if ( defined('HESK_DEMO') )
                           </div>
                           <div class="radio">
                               <label>
-                                  <input type="radio" name="new_kb_article_visibility" value="2" <?php echo mfh_getSetting('new_kb_article_visibility') == 2 ? 'checked' : ''; ?>>
+                                  <input type="radio" name="new_kb_article_visibility" value="2" <?php echo $modsForHesk_settings['new_kb_article_visibility'] == 2 ? 'checked' : ''; ?>>
                                   <?php echo $hesklang['kb_draft']; ?>
                                   <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
                                      title="<?php echo $hesklang['kb_draft']; ?>"
@@ -1487,7 +1488,7 @@ if ( defined('HESK_DEMO') )
                                              '<?php echo $hesklang['custom_language_key']; ?>',
                                              '<?php echo $hesklang['custom_n']; ?>',
                                              this)"
-                                      <?php if (mfh_getSetting('custom_field_setting')) {echo 'checked';} ?>> <?php echo $hesklang['enable_custom_field_language']; ?>
+                                      <?php if ($modsForHesk_settings['custom_field_setting']) {echo 'checked';} ?>> <?php echo $hesklang['enable_custom_field_language']; ?>
                               </label>
                           </div>
                       </div>
@@ -1498,7 +1499,7 @@ if ( defined('HESK_DEMO') )
                 <th><?php echo $hesklang['s_type']; ?></th>
                 <th><?php echo $hesklang['custom_r']; ?></th>
                 <th id="fieldNameHeader">
-                    <?php if (mfh_getSetting('custom_field_setting')) { echo $hesklang['custom_language_key']; } else { echo $hesklang['custom_n']; } ?>
+                    <?php if ($modsForHesk_settings['custom_field_setting']) { echo $hesklang['custom_language_key']; } else { echo $hesklang['custom_n']; } ?>
                 </th>
                 <th><?php echo $hesklang['custom_place']; ?></th>
                 <th><?php echo $hesklang['opt']; ?></th>
@@ -1568,7 +1569,7 @@ if ( defined('HESK_DEMO') )
                             $on = 'checked="checked"';
                             $onload_div = 'block';
                         }
-                        elseif (mfh_getSetting('use_mailgun'))
+                        elseif ($modsForHesk_settings['use_mailgun'])
                         {
                             $mailgunOn = 'checked="checked"';
                             $onload_mailgun = 'block';
@@ -1634,7 +1635,7 @@ if ( defined('HESK_DEMO') )
                             </i>
                         </label>
                         <div class="col-sm-9">
-                            <input type="text" class="form-control" placeholder="<?php echo htmlspecialchars($hesklang['mailgun_api_key']); ?>" id="mailgun_api_key" name="mailgun_api_key" value="<?php echo mfh_getSetting('mailgun_api_key'); ?>">
+                            <input type="text" class="form-control" placeholder="<?php echo htmlspecialchars($hesklang['mailgun_api_key']); ?>" id="mailgun_api_key" name="mailgun_api_key" value="<?php echo $modsForHesk_settings['mailgun_api_key']; ?>">
                         </div>
                     </div>
                     <div class="form-group">
@@ -1646,7 +1647,7 @@ if ( defined('HESK_DEMO') )
                             <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover" title="<?php echo $hesklang['mailgun_domain']; ?>" data-content="<?php echo $hesklang['mailgun_domain_help']; ?>"></i>
                         </label>
                         <div class="col-sm-9">
-                            <input type="text" class="form-control" placeholder="<?php echo htmlspecialchars($hesklang['mailgun_domain']); ?>" id="mailgun_domain" name="mailgun_domain" value="<?php echo mfh_getSetting('mailgun_domain'); ?>">
+                            <input type="text" class="form-control" placeholder="<?php echo htmlspecialchars($hesklang['mailgun_domain']); ?>" id="mailgun_domain" name="mailgun_domain" value="<?php echo $modsForHesk_settings['mailgun_domain']; ?>">
                         </div>
                     </div>
                 </div>
@@ -2063,7 +2064,7 @@ if ( defined('HESK_DEMO') )
                         <div class="col-sm-9">
                             <div class="checkbox">
                                 <?php
-                                if (mfh_getSetting('customer_email_verification_required'))
+                                if ($modsForHesk_settings['customer_email_verification_required'])
                                 {
                                 ?>
                                     <label>
@@ -2112,7 +2113,7 @@ if ( defined('HESK_DEMO') )
                         <div class="col-sm-9 col-xs-12">
                             <div class="checkbox">
                                 <label>
-                                    <input id="html_emails" name="html_emails" type="checkbox" <?php if (mfh_getSetting('html_emails')) {echo 'checked';} ?>> <?php echo $hesklang['html_emails_text']; ?>
+                                    <input id="html_emails" name="html_emails" type="checkbox" <?php if ($modsForHesk_settings['html_emails']) {echo 'checked';} ?>> <?php echo $hesklang['html_emails_text']; ?>
                                 </label>
                             </div>
                         </div>
@@ -2130,13 +2131,13 @@ if ( defined('HESK_DEMO') )
                         <div class="col-sm-9 col-xs-12">
                             <div class="radio">
                                 <label>
-                                    <input type="radio" name="email_attachments" value="0" <?php echo mfh_getSetting('attachments') == 0 ? 'checked' : ''; ?>>
+                                    <input type="radio" name="email_attachments" value="0" <?php echo $modsForHesk_settings['attachments'] == 0 ? 'checked' : ''; ?>>
                                     <?php echo $hesklang['show_attachments_as_links']; ?>
                                 </label>
                             </div>
                             <div class="radio">
                                 <label>
-                                    <input type="radio" name="email_attachments" value="1" <?php echo mfh_getSetting('attachments') == 1 ? 'checked' : ''; ?>>
+                                    <input type="radio" name="email_attachments" value="1" <?php echo $modsForHesk_settings['attachments'] == 1 ? 'checked' : ''; ?>>
                                     <?php echo $hesklang['attach_directly_to_email']; ?>
                                 </label>
                             </div>
@@ -2175,7 +2176,7 @@ if ( defined('HESK_DEMO') )
                       <div class="col-sm-8">
                           <div class="checkbox">
                               <label>
-                                  <input type="checkbox" name="show_number_merged" <?php if (mfh_getSetting('show_number_merged')) {echo 'checked';} ?>> <?php echo $hesklang['show_number_merged_descr']; ?>
+                                  <input type="checkbox" name="show_number_merged" <?php if ($modsForHesk_settings['show_number_merged']) {echo 'checked';} ?>> <?php echo $hesklang['show_number_merged_descr']; ?>
                               </label>
                           </div>
                       </div>
@@ -2317,7 +2318,7 @@ if ( defined('HESK_DEMO') )
                     <div class="col-sm-8 col-xs-12">
                         <div class="checkbox">
                             <label>
-                                <input id="rtl" name="rtl" type="checkbox" <?php if (mfh_getSetting('rtl')) {echo 'checked' ;} ?>> <?php echo $hesklang['display_rtl']; ?>
+                                <input id="rtl" name="rtl" type="checkbox" <?php if ($modsForHesk_settings['rtl']) {echo 'checked' ;} ?>> <?php echo $hesklang['display_rtl']; ?>
                             </label>
                         </div>
                     </div>
@@ -2335,7 +2336,7 @@ if ( defined('HESK_DEMO') )
                     <div class="col-sm-8 col-xs-12">
                         <div class="checkbox">
                             <label>
-                                <input id="show-icons" name="show-icons" type="checkbox" <?php if (mfh_getSetting('show_icons')) {echo 'checked';} ?>> <?php echo $hesklang['show_icons_navigation']; ?>
+                                <input id="show-icons" name="show-icons" type="checkbox" <?php if ($modsForHesk_settings['show_icons']) {echo 'checked';} ?>> <?php echo $hesklang['show_icons_navigation']; ?>
                             </label>
                         </div>
                     </div>
@@ -2353,7 +2354,7 @@ if ( defined('HESK_DEMO') )
                     <div class="col-sm-8 col-xs-12">
                         <div class="checkbox">
                             <label>
-                                <input id="use_boostrap_theme" name="use_bootstrap_theme" type="checkbox" <?php if (mfh_getSetting('use_bootstrap_theme')) {echo 'checked';} ?>> <?php echo $hesklang['use_bootstrap_theme']; ?>
+                                <input id="use_boostrap_theme" name="use_bootstrap_theme" type="checkbox" <?php if ($modsForHesk_settings['use_bootstrap_theme']) {echo 'checked';} ?>> <?php echo $hesklang['use_bootstrap_theme']; ?>
                             </label>
                         </div>
                     </div>
@@ -2380,7 +2381,7 @@ if ( defined('HESK_DEMO') )
                                      data-content="<?php echo $hesklang['navbarBackgroundColorHelp']; ?>"></i>
                               </label>
                               <div class="col-sm-5 col-xs-12">
-                                  <input type="text" id="navbarBackgroundColor" name="navbarBackgroundColor" class="form-control" value="<?php echo mfh_getSetting('navbarBackgroundColor'); ?>">
+                                  <input type="text" id="navbarBackgroundColor" name="navbarBackgroundColor" class="form-control" value="<?php echo $modsForHesk_settings['navbarBackgroundColor']; ?>">
                               </div>
                           </div>
                       </div>
@@ -2392,7 +2393,7 @@ if ( defined('HESK_DEMO') )
                                      data-content="<?php echo $hesklang['navbarBrandColorHelp']; ?>"></i>
                               </label>
                               <div class="col-sm-5 col-xs-12">
-                                  <input type="text" id="navbarBrandColor" name="navbarBrandColor" class="form-control" value="<?php echo mfh_getSetting('navbarBrandColor'); ?>">
+                                  <input type="text" id="navbarBrandColor" name="navbarBrandColor" class="form-control" value="<?php echo $modsForHesk_settings['navbarBrandColor']; ?>">
                               </div>
                           </div>
                       </div>
@@ -2406,7 +2407,7 @@ if ( defined('HESK_DEMO') )
                                      data-content="<?php echo $hesklang['navbarBrandHoverColorHelp']; ?>"></i>
                               </label>
                               <div class="col-sm-5 col-xs-12">
-                                  <input type="text" id="navbarBrandHoverColor" name="navbarBrandHoverColor" class="form-control" value="<?php echo mfh_getSetting('navbarBrandHoverColor'); ?>">
+                                  <input type="text" id="navbarBrandHoverColor" name="navbarBrandHoverColor" class="form-control" value="<?php echo $modsForHesk_settings['navbarBrandHoverColor']; ?>">
                               </div>
                           </div>
                       </div>
@@ -2418,7 +2419,7 @@ if ( defined('HESK_DEMO') )
                                      data-content="<?php echo $hesklang['navbarItemTextColorHelp']; ?>"></i>
                               </label>
                               <div class="col-sm-5 col-xs-12">
-                                  <input type="text" id="navbarItemTextColor" name="navbarItemTextColor" class="form-control" value="<?php echo mfh_getSetting('navbarItemTextColor'); ?>">
+                                  <input type="text" id="navbarItemTextColor" name="navbarItemTextColor" class="form-control" value="<?php echo $modsForHesk_settings['navbarItemTextColor']; ?>">
                               </div>
                           </div>
                       </div>
@@ -2432,7 +2433,7 @@ if ( defined('HESK_DEMO') )
                                      data-content="<?php echo $hesklang['navbarItemTextHoverColorHelp']; ?>"></i>
                               </label>
                               <div class="col-sm-5 col-xs-12">
-                                  <input type="text" id="navbarItemTextHoverColor" name="navbarItemTextHoverColor" class="form-control" value="<?php echo mfh_getSetting('navbarItemTextHoverColor'); ?>">
+                                  <input type="text" id="navbarItemTextHoverColor" name="navbarItemTextHoverColor" class="form-control" value="<?php echo $modsForHesk_settings['navbarItemTextHoverColor']; ?>">
                               </div>
                           </div>
                       </div>
@@ -2444,7 +2445,7 @@ if ( defined('HESK_DEMO') )
                                      data-content="<?php echo $hesklang['navbarItemTextSelectedColorHelp']; ?>"></i>
                               </label>
                               <div class="col-sm-5 col-xs-12">
-                                  <input type="text" id="navbarItemTextSelectedColor" name="navbarItemTextSelectedColor" class="form-control" value="<?php echo mfh_getSetting('navbarItemTextSelectedColor'); ?>">
+                                  <input type="text" id="navbarItemTextSelectedColor" name="navbarItemTextSelectedColor" class="form-control" value="<?php echo $modsForHesk_settings['navbarItemTextSelectedColor']; ?>">
                               </div>
                           </div>
                       </div>
@@ -2458,7 +2459,7 @@ if ( defined('HESK_DEMO') )
                                      data-content="<?php echo $hesklang['navbarItemSelectedBackgroundColorHelp']; ?>"></i>
                               </label>
                               <div class="col-sm-5 col-xs-12">
-                                  <input type="text" id="navbarItemSelectedBackgroundColor" name="navbarItemSelectedBackgroundColor" class="form-control" value="<?php echo mfh_getSetting('navbarItemSelectedBackgroundColor'); ?>">
+                                  <input type="text" id="navbarItemSelectedBackgroundColor" name="navbarItemSelectedBackgroundColor" class="form-control" value="<?php echo $modsForHesk_settings['navbarItemSelectedBackgroundColor']; ?>">
                               </div>
                           </div>
                       </div>
@@ -2470,7 +2471,7 @@ if ( defined('HESK_DEMO') )
                                      data-content="<?php echo $hesklang['dropdownItemTextColorHelp']; ?>"></i>
                               </label>
                               <div class="col-sm-5 col-xs-12">
-                                  <input type="text" id="dropdownItemTextColor" name="dropdownItemTextColor" class="form-control" value="<?php echo mfh_getSetting('dropdownItemTextColor'); ?>">
+                                  <input type="text" id="dropdownItemTextColor" name="dropdownItemTextColor" class="form-control" value="<?php echo $modsForHesk_settings['dropdownItemTextColor']; ?>">
                               </div>
                           </div>
                       </div>
@@ -2484,7 +2485,7 @@ if ( defined('HESK_DEMO') )
                                      data-content="<?php echo $hesklang['dropdownItemTextHoverColorHelp']; ?>"></i>
                               </label>
                               <div class="col-sm-5 col-xs-12">
-                                  <input type="text" id="dropdownItemTextHoverColor" name="dropdownItemTextHoverColor" class="form-control" value="<?php echo mfh_getSetting('dropdownItemTextHoverColor'); ?>">
+                                  <input type="text" id="dropdownItemTextHoverColor" name="dropdownItemTextHoverColor" class="form-control" value="<?php echo $modsForHesk_settings['dropdownItemTextHoverColor']; ?>">
                               </div>
                           </div>
                       </div>
@@ -2496,7 +2497,7 @@ if ( defined('HESK_DEMO') )
                                      data-content="<?php echo $hesklang['questionMarkColorHelp']; ?>"></i>
                               </label>
                               <div class="col-sm-5 col-xs-12">
-                                  <input type="text" id="questionMarkColor" name="questionMarkColor" class="form-control" value="<?php echo mfh_getSetting('questionMarkColor'); ?>">
+                                  <input type="text" id="questionMarkColor" name="questionMarkColor" class="form-control" value="<?php echo $modsForHesk_settings['questionMarkColor']; ?>">
                               </div>
                           </div>
                       </div>
@@ -2510,7 +2511,7 @@ if ( defined('HESK_DEMO') )
                                      data-content="<?php echo $hesklang['dropdownItemTextHoverBackgroundColorHelp']; ?>"></i>
                               </label>
                               <div class="col-sm-5 col-xs-12">
-                                  <input type="text" id="dropdownItemTextHoverBackgroundColor" name="dropdownItemTextHoverBackgroundColor" class="form-control" value="<?php echo mfh_getSetting('dropdownItemTextHoverBackgroundColor'); ?>">
+                                  <input type="text" id="dropdownItemTextHoverBackgroundColor" name="dropdownItemTextHoverBackgroundColor" class="form-control" value="<?php echo $modsForHesk_settings['dropdownItemTextHoverBackgroundColor']; ?>">
                               </div>
                           </div>
                       </div>
@@ -2848,7 +2849,7 @@ function hesk_testLanguage($return_options = 0)
 		        background:#fff;
 		        color: black;
 		        font : 68.8%/1.5 Verdana, Geneva, Arial, Helvetica, sans-serif;
-		        text-align: <?php if (mfh_getSetting('rtl')) { echo 'right'; } else { echo 'left'; } ?>;
+		        text-align: <?php if ($modsForHesk_settings['rtl']) { echo 'right'; } else { echo 'left'; } ?>;
 		}
 
 		p
diff --git a/css/hesk_newStyle.php b/css/hesk_newStyle.php
index f758a48a..4749b50c 100644
--- a/css/hesk_newStyle.php
+++ b/css/hesk_newStyle.php
@@ -1,22 +1,3 @@
-<?php
-    header("Content-type: text/css; charset: UTF-8");
-
-    $navbarBackgroundColor = '#414a5c';
-    $navbarBrandColor = '#d4dee7';
-    $navbarBrandHoverColor = '#ffffff';
-
-    $navbarItemTextColor = '#d4dee7';
-    $navbarItemTextHoverColor = '#ffffff';
-    $navbarItemTextSelectedColor = '#ffffff';
-    $navbarItemSelectedBackgroundColor = '#2d3646';
-
-    $dropdownItemTextColor = '#333333';
-    $dropdownItemTextHoverColor = '#262626';
-    $dropdownItemTextHoverBackgroundColor = '#f5f5f5';
-
-    $questionMarkColor = '#000000';
-?>
-
 .nu-rtlFloatLeft {
     /* Don't do anything; the pager looks good already */
 }
@@ -88,47 +69,6 @@
 .navbar {
     margin-bottom: 0;
 }
-.navbar-default {
-    background-color: <?php echo $navbarBackgroundColor; ?>;
-    background-image: none;
-    filter: none;
-}
-.navbar-default .navbar-brand {
-    color: <?php echo $navbarBrandColor; ?>;
-}
-.navbar-default .navbar-brand:focus, .navbar-default .navbar-brand:hover {
-    color: <?php echo $navbarBrandHoverColor; ?>;
-    background-color: transparent;
-}
-.navbar-default .navbar-nav>li>a {
-    color: <?php echo $navbarItemTextColor; ?>;
-}
-.navbar-default .navbar-nav>li>a:focus, .navbar-default .navbar-nav>li>a:hover {
-    color: <?php echo $navbarItemTextHoverColor; ?>;
-    background-color: transparent;
-}
-.dropdown-menu>li>a {
-    color: <?php echo $dropdownItemTextColor; ?>;
-}
-.dropdown-menu>li>a:focus, .dropdown-menu>li>a:hover {
-    color: <?php echo $dropdownItemTextHoverColor; ?>;
-    text-decoration: none;
-    background-color: <?php echo $dropdownItemTextHoverBackgroundColor; ?>;
-}
-.navbar-default .navbar-nav>.open>a, .navbar-default .navbar-nav>.open>a:focus, .navbar-default .navbar-nav>.open>a:hover {
-    color: <?php echo $navbarItemTextSelectedColor; ?>;
-    background-color: <?php echo $navbarItemSelectedBackgroundColor; ?>;
-    background-image: none;
-}
-.settingsquestionmark {
-    color: <?php echo $questionMarkColor; ?>;
-    font-size: 14px;
-    cursor: pointer;
-}
-.h3questionmark {
-    color: <?php echo $questionMarkColor; ?>;
-    font-size: 14px;
-}
 .h3questionmark:hover {
     text-decoration: underline;
 }
diff --git a/download_attachment.php b/download_attachment.php
index b2f82714..dab6dae9 100755
--- a/download_attachment.php
+++ b/download_attachment.php
@@ -140,7 +140,8 @@ else
 // Path of the file on the server
 $realpath = $hesk_settings['attach_dir'] . '/' . $file['saved_name'];
 if (isset($_GET['kb_att'])) {
-	$realpath = mfh_getSetting('kb_attach_dir') . '/' . $file['saved_name'];
+	$modsForHesk_settings = mfh_getSettings();
+	$realpath = $modsForHesk_settings['kb_attach_dir'] . '/' . $file['saved_name'];
 }
 
 // Perhaps the file has been deleted?
diff --git a/inc/common.inc.php b/inc/common.inc.php
index 990f6105..e676d214 100644
--- a/inc/common.inc.php
+++ b/inc/common.inc.php
@@ -1984,7 +1984,6 @@ function mfh_getNumberOfDownloadsForAttachment($att_id, $table='attachments')
 	return $rec['download_count'];
 }
 
-/* @deprecated */
 function mfh_getSettings() {
 	global $hesk_settings;
 
@@ -1994,14 +1993,4 @@ function mfh_getSettings() {
 		$settings[$row['Key']] = $row['Value'];
 	}
 	return $settings;
-}
-
-function mfh_getSetting($key) {
-	global $hesk_settings;
-
-	hesk_dbConnect();
-
-	$res = hesk_dbQuery("SELECT `Value` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` WHERE `Key` <> '".hesk_dbEscape($key)."' LIMIT 1");
-	$row = hesk_dbFetchAssoc($res);
-	return $row['Value'];
 }
\ No newline at end of file
diff --git a/inc/email_functions.inc.php b/inc/email_functions.inc.php
index 5a789656..29b4cab5 100644
--- a/inc/email_functions.inc.php
+++ b/inc/email_functions.inc.php
@@ -45,11 +45,6 @@ if ($hesk_settings['smtp'])
 	}
 }
 
-// Include common if needed
-if (!function_exists('mfh_getSetting')) {
-    require_once(HESK_PATH . 'common.inc.php');
-}
-
 function hesk_notifyCustomerForVerifyEmail($email_template = 'verify_email', $activationKey)
 {
     global $hesk_settings, $ticket;
diff --git a/inc/header.inc.php b/inc/header.inc.php
index b5149231..d485f3f1 100644
--- a/inc/header.inc.php
+++ b/inc/header.inc.php
@@ -74,6 +74,49 @@ $modsForHesk_settings = mfh_getSettings();
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/iconset-octicon-2.1.2.js"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap-iconpicker.js"></script>
     <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.js"></script>
+    <style>
+        .navbar-default {
+            background-color: <?php echo $navbarBackgroundColor; ?>;
+            background-image: none;
+            filter: none;
+        }
+        .navbar-default .navbar-brand {
+            color: <?php echo $modsForHesk_settings['navbarBrandColor']; ?>;
+        }
+        .navbar-default .navbar-brand:focus, .navbar-default .navbar-brand:hover {
+            color: <?php echo $modsForHesk_settings['navbarBrandHoverColor']; ?>;
+            background-color: transparent;
+        }
+        .navbar-default .navbar-nav>li>a {
+            color: <?php echo $modsForHesk_settings['navbarItemTextColor']; ?>;
+        }
+        .navbar-default .navbar-nav>li>a:focus, .navbar-default .navbar-nav>li>a:hover {
+            color: <?php echo $modsForHesk_settings['navbarItemTextHoverColor']; ?>;
+            background-color: transparent;
+        }
+        .dropdown-menu>li>a {
+            color: <?php echo $modsForHesk_settings['dropdownItemTextColor']; ?>;
+        }
+        .dropdown-menu>li>a:focus, .dropdown-menu>li>a:hover {
+            color: <?php echo $modsForHesk_settings['dropdownItemTextHoverColor']; ?>;
+            text-decoration: none;
+            background-color: <?php echo $modsForHesk_settings['dropdownItemTextHoverBackgroundColor']; ?>;
+        }
+        .navbar-default .navbar-nav>.open>a, .navbar-default .navbar-nav>.open>a:focus, .navbar-default .navbar-nav>.open>a:hover {
+            color: <?php echo $modsForHesk_settings['navbarItemTextSelectedColor']; ?>;
+            background-color: <?php echo $modsForHesk_settings['navbarItemSelectedBackgroundColor']; ?>;
+            background-image: none;
+        }
+        .settingsquestionmark {
+            color: <?php echo $modsForHesk_settings['questionMarkColor']; ?>;
+            font-size: 14px;
+            cursor: pointer;
+        }
+        .h3questionmark {
+            color: <?php echo $modsForHesk_settings['questionMarkColor']; ?>;
+            font-size: 14px;
+        }
+    </style>
 
     <?php
 
diff --git a/install/mods-for-hesk/sql/installSql.php b/install/mods-for-hesk/sql/installSql.php
index d83b7bc2..cb86566b 100644
--- a/install/mods-for-hesk/sql/installSql.php
+++ b/install/mods-for-hesk/sql/installSql.php
@@ -705,6 +705,18 @@ function migrateSettings() {
         $kb_attach_dir = getSettingValue($modsForHesk_settings, 'kb_attach_dir', 'attachments');
         $rich_text_for_tickets_for_customers = getSettingValue($modsForHesk_settings, 'rich_text_for_tickets_for_customers', 0);
 
+        $navbar_background_color = getSettingValue($modsForHesk_settings, 'navbarBackgroundColor', '#414a5c');
+        $navbar_brand_color = getSettingValue($modsForHesk_settings, 'navbarBrandColor', '#d4dee7');
+        $navbar_brand_hover_color = getSettingValue($modsForHesk_settings, 'navbarBrandHoverColor', '#ffffff');
+        $navbar_item_text_color = getSettingValue($modsForHesk_settings, 'navbarItemTextColor', '#d4dee7');
+        $navbar_item_text_hover_color = getSettingValue($modsForHesk_settings, 'navbarItemTextHoverColor', '#ffffff');
+        $navbar_item_text_selected_color = getSettingValue($modsForHesk_settings, 'navbarItemTextSelectedColor', '#ffffff');
+        $navbar_item_selected_background_color = getSettingValue($modsForHesk_settings, 'navbarItemSelectedBackgroundColor', '#2d3646');
+        $dropdown_item_text_color = getSettingValue($modsForHesk_settings, 'dropdownItemTextColor', '#333333');
+        $dropdown_item_text_hover_color = getSettingValue($modsForHesk_settings, 'dropdownItemTextHoverColor', '#262626');
+        $dropdown_item_text_hover_background_color = getSettingValue($modsForHesk_settings, 'dropdownItemTextHoverBackgroundColor', '#f5f5f5');
+        $question_mark_color = getSettingValue($modsForHesk_settings, 'questionMarkColor', '#000000');
+
 
         executeQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` (`Key`, `Value`)
             VALUES ('rtl', ".intval($rtl).")");
@@ -742,6 +754,28 @@ function migrateSettings() {
             VALUES ('kb_attach_dir', '".hesk_dbEscape($kb_attach_dir)."')");
         executeQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` (`Key`, `Value`)
             VALUES ('rich_text_for_tickets_for_customers', ".intval($rich_text_for_tickets_for_customers).")");
+        executeQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` (`Key`, `Value`)
+            VALUES ('navbarBackgroundColor', '".hesk_dbEscape($navbar_background_color)."')");
+        executeQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` (`Key`, `Value`)
+            VALUES ('navbarBrandColor', '".hesk_dbEscape($navbar_brand_color)."')");
+        executeQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` (`Key`, `Value`)
+            VALUES ('navbarBrandHoverColor', '".hesk_dbEscape($navbar_brand_hover_color)."')");
+        executeQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` (`Key`, `Value`)
+            VALUES ('navbarItemTextColor', '".hesk_dbEscape($navbar_item_text_color)."')");
+        executeQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` (`Key`, `Value`)
+            VALUES ('navbarItemTextHoverColor', '".hesk_dbEscape($navbar_item_text_hover_color)."')");
+        executeQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` (`Key`, `Value`)
+            VALUES ('navbarItemTextSelectedColor', '".hesk_dbEscape($navbar_item_text_selected_color)."')");
+        executeQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` (`Key`, `Value`)
+            VALUES ('navbarItemSelectedBackgroundColor', '".hesk_dbEscape($navbar_item_selected_background_color)."')");
+        executeQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` (`Key`, `Value`)
+            VALUES ('dropdownItemTextColor', '".hesk_dbEscape($dropdown_item_text_color)."')");
+        executeQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` (`Key`, `Value`)
+            VALUES ('dropdownItemTextHoverColor', '".hesk_dbEscape($dropdown_item_text_hover_color)."')");
+        executeQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` (`Key`, `Value`)
+            VALUES ('dropdownItemTextHoverBackgroundColor', '".hesk_dbEscape($dropdown_item_text_hover_background_color)."')");
+        executeQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` (`Key`, `Value`)
+            VALUES ('questionMarkColor', '".hesk_dbEscape($question_mark_color)."')");
     }
 }
 
diff --git a/print.php b/print.php
index 9c7e5edd..a21c92c6 100644
--- a/print.php
+++ b/print.php
@@ -91,6 +91,8 @@ $category = hesk_dbFetchAssoc($res);
 /* Get replies */
 $res  = hesk_dbQuery("SELECT * FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."replies` WHERE `replyto`='{$ticket['id']}' ORDER BY `id` ASC");
 $replies = hesk_dbNumRows($res);
+
+$modsForHesk_settings = mfh_getSettings();
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
@@ -123,7 +125,7 @@ hr
 	background-color: #9e9e9e;
 	height: 1px;
 	width: 100%;
-	text-align: <?php if (mfh_getSetting('rtl')) {echo 'right';} else {echo 'left';} ?>;
+	text-align: <?php if ($modsForHesk_settings['rtl']) {echo 'right';} else {echo 'left';} ?>;
 }
 </style>
 </head>
@@ -220,7 +222,7 @@ foreach ($hesk_settings['custom_fields'] as $k=>$v)
 {
     if ($v['use'])
 	{
-        if (mfh_getSetting('custom_field_setting'))
+        if ($modsForHesk_settings['custom_field_setting'])
         {
             $v['name'] = $hesklang[$v['name']];
         }
diff --git a/reply_ticket.php b/reply_ticket.php
index 9c0b273a..6f29555f 100644
--- a/reply_ticket.php
+++ b/reply_ticket.php
@@ -204,7 +204,8 @@ $ticket['status'] = $ticket['status'] == $defaultNewTicketStatus['ID'] ? $defaul
 $res = hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` SET `lastchange`=NOW(), `status`='{$ticket['status']}', `replies`=`replies`+1, `lastreplier`='0' WHERE `id`='{$ticket['id']}' LIMIT 1");
 
 // Insert reply into database
-$html = mfh_getSetting('rich_text_for_tickets_for_customers');
+$modsForHesk_settings = mfh_getSettings();
+$html = $modsForHesk_settings['rich_text_for_tickets_for_customers'];
 hesk_dbQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."replies` (`replyto`,`name`,`message`,`dt`,`attachments`, `html`) VALUES ({$ticket['id']},'".hesk_dbEscape($ticket['name'])."','".hesk_dbEscape($message)."',NOW(),'".hesk_dbEscape($myattachments)."','".$html."')");
 
 
diff --git a/submit_ticket.php b/submit_ticket.php
index 739cfc1e..b9e936b8 100644
--- a/submit_ticket.php
+++ b/submit_ticket.php
@@ -271,11 +271,12 @@ if ($tmpvar['category'])
 }
 
 // Custom fields
+$modsForHesk_settings = mfh_getSettings();
 foreach ($hesk_settings['custom_fields'] as $k=>$v)
 {
 	if ($v['use'])
     {
-        if (mfh_getSetting('custom_field_setting'))
+        if ($modsForHesk_settings['custom_field_setting'])
         {
             $v['name'] = $hesklang[$v['name']];
         }
@@ -447,11 +448,11 @@ $tmpvar['latitude'] = hesk_POST('latitude');
 $tmpvar['longitude'] = hesk_POST('longitude');
 
 // Set html
-$tmpvar['html'] = mfh_getSetting('rich_text_for_tickets_for_customers');
+$tmpvar['html'] = $modsForHesk_settings['rich_text_for_tickets_for_customers'];
 
 // Should the helpdesk validate emails?
 $createTicket = true;
-if (mfh_getSetting('customer_email_verification_required'))
+if ($modsForHesk_settings['customer_email_verification_required'])
 {
     $verifiedEmailSql = "SELECT `Email` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."verified_emails` WHERE `Email` = '".hesk_dbEscape($tmpvar['email'])."'";
     $verifiedEmailRS = hesk_dbQuery($verifiedEmailSql);