Merge branch '2-5-0' into user-agent-support

.gitignore

@@ -1,8 +1,6 @@
 admin/admin_suggest_articles.php
 admin/archive.php
-admin/assign_owner.php
 admin/generate_spam_question.php
-admin/move_category.php
 admin/priority.php
 admin/test_connection.php
 attachments/index.htm

README.md

@@ -1,8 +1,8 @@
-## [Mods for HESK](http://mods-for-hesk.mkochcs.com) [![Current Release](https://img.shields.io/github/release/mkoch227/Mods-for-HESK.svg)](https://www.github.com/mkoch227/Mods-for-HESK/releases) [![Project Status](http://stillmaintained.com/mkoch227/Mods-for-HESK.png)](https://www.github.com/mkoch227/Mods-for-HESK)
+## [Mods for HESK](http://mods-for-hesk.mkochcs.com)  [![Number of Downloads](https://img.shields.io/github/downloads/mkoch227/Mods-for-HESK/latest/total.svg)](https://www.github.com/mkoch227/Mods-for-HESK/releases) [![Open Issues](https://img.shields.io/github/issues-raw/mkoch227/Mods-for-HESK.svg)](https://www.github.com/mkoch227/Mods-for-HESK/issues) [![Current Release](https://img.shields.io/github/release/mkoch227/Mods-for-HESK.svg)](https://www.github.com/mkoch227/Mods-for-HESK/releases) [![Project Status](http://stillmaintained.com/mkoch227/Mods-for-HESK.png)](https://www.github.com/mkoch227/Mods-for-HESK)
 [![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/mkoch227/Mods-for-HESK/blob/master/LICENSE)
 [![Join the chat at https://gitter.im/mkoch227/Mods-for-HESK](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mkoch227/Mods-for-HESK?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-Mods for HESK is a set of modifications for [HESK](http://www.hesk.com) v2.6.4, a free and popular helpdesk solution.
+Mods for HESK is a set of modifications for [HESK](http://www.hesk.com) v2.6.5, a free and popular helpdesk solution.
 
 ## Features
 <table>

admin/admin_main.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -40,7 +40,6 @@ if (is_dir(HESK_PATH . 'install')) {die('Please delete the <b>install</b> folder
 
 /* Get all the required files and functions */
 require(HESK_PATH . 'hesk_settings.inc.php');
-require(HESK_PATH . 'modsForHesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
 require(HESK_PATH . 'inc/status_functions.inc.php');

admin/admin_reply_ticket.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -37,7 +37,6 @@ define('HESK_PATH','../');
 
 /* Get all the required files and functions */
 require(HESK_PATH . 'hesk_settings.inc.php');
-require(HESK_PATH . 'modsForHesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
 hesk_load_database_functions();
@@ -90,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?
@@ -388,13 +388,13 @@ if ($submit_as_customer)
 {
     if ($ticket['owner'] && $ticket['owner'] != $_SESSION['id'])
     {
-        hesk_notifyAssignedStaff(false, 'new_reply_by_customer', 'notify_reply_my');
+        hesk_notifyAssignedStaff(false, 'new_reply_by_customer', $modsForHesk_settings, 'notify_reply_my');
     }
 }
 // Notify customer?
 elseif ( ! isset($_POST['no_notify']) || intval( hesk_POST('no_notify') ) != 1)
 {
-	hesk_notifyCustomer('new_reply_by_staff');
+	hesk_notifyCustomer($modsForHesk_settings, 'new_reply_by_staff');
 }
 
 // Delete any existing drafts from this owner for this ticket

admin/admin_settings.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -42,7 +42,6 @@ if (is_dir(HESK_PATH . 'install')) {die('Please delete the <b>install</b> folder
 
 // Get all the required files and functions
 require(HESK_PATH . 'hesk_settings.inc.php');
-require(HESK_PATH . 'modsForHesk_settings.inc.php');
 
 // Save the default language for the settings page before choosing user's preferred one
 $hesk_settings['language_default'] = $hesk_settings['language'];
@@ -254,25 +253,6 @@ if ( defined('HESK_DEMO') )
                         ?>
                     </td>
                 </tr>
-                <tr>
-                    <td class="text-right">
-                        /modsForHesk_settings.inc.php
-                    </td>
-                    <?php
-                    $modsForHeskIsWritable = is_writable(HESK_PATH . 'modsForHesk_settings.inc.php');
-                    $cellClass = $modsForHeskIsWritable ? 'success' : 'danger';
-                    ?>
-                    <td style="padding-left: 10px" class="<?php echo $cellClass; ?>">
-                        <?php
-                        if ($modsForHeskIsWritable) {
-                            $enable_save_settings=1;
-                            echo '<span class="success">'.$hesklang['exists'].'</span>, <span class="success">'.$hesklang['writable'].'</span>';
-                        } else {
-                            echo '<span class="success">'.$hesklang['exists'].'</span>, <span class="error">'.$hesklang['not_writable'].'</span><br />'.$hesklang['e_mfh_settings'];
-                        }
-                        ?>
-                    </td>
-                </tr>
             </table>
         </div>
     </div>
@@ -348,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()
@@ -2711,7 +2692,7 @@ function hesk_cacheMfhLatestVersion($latest)
 
 function hesk_testLanguage($return_options = 0)
 {
-	global $hesk_settings, $hesklang, $modsForHesk_settings;
+	global $hesk_settings, $hesklang;
 
 	/* Get a list of valid emails */
     include_once(HESK_PATH . 'inc/email_functions.inc.php');

admin/admin_settings_save.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -35,17 +35,24 @@
 define('IN_SCRIPT',1);
 define('HESK_PATH','../');
 
+// Make sure OPcache is reset when modifying settings
+if ( function_exists('opcache_reset') )
+{
+	opcache_reset();
+}
+
 /* Get all the required files and functions */
 require(HESK_PATH . 'hesk_settings.inc.php');
-require(HESK_PATH . 'modsForHesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
-require(HESK_PATH . 'inc/email_functions.inc.php');
 require(HESK_PATH . 'inc/setup_functions.inc.php');
 hesk_load_database_functions();
 
 hesk_session_start();
 hesk_dbConnect();
+
+require(HESK_PATH . 'inc/email_functions.inc.php');
+
 hesk_isLoggedIn();
 
 // Check permissions for this feature
@@ -108,7 +115,7 @@ else
 /* --> Helpdesk settings */
 $set['hesk_title']		= hesk_input( hesk_POST('s_hesk_title'), $hesklang['err_htitle']);
 $set['hesk_title']		= str_replace('\\&quot;','&quot;',$set['hesk_title']);
-$set['hesk_url']		= hesk_input( hesk_POST('s_hesk_url'), $hesklang['err_hurl']);
+$set['hesk_url']		= rtrim( hesk_input( hesk_POST('s_hesk_url'), $hesklang['err_hurl']), '/');
 
 // ---> check admin folder
 $set['admin_dir'] = isset($_POST['s_admin_dir']) && ! is_array($_POST['s_admin_dir']) ? preg_replace('/[^a-zA-Z0-9_-]/', '', $_POST['s_admin_dir']) : 'admin';
@@ -487,6 +494,19 @@ for ($i=1;$i<=20;$i++)
         {
         	$set['custom_fields'][$this_field]['type'] = 'text';
         }
+
+		// Try to detect if field type changed to anything except "select"
+		if ($set['custom_fields'][$this_field]['type'] != 'select')
+		{
+			// If type is "radio" or "checkbox" remove "please select", keep other options
+			$set['custom_fields'][$this_field]['value'] = str_replace('{HESK_SELECT}', '', $set['custom_fields'][$this_field]['value']);
+
+			// Field type changed to "text" or "textarea", clear default value if it contains "#HESK#" separator
+			if ( in_array($set['custom_fields'][$this_field]['type'], array('text','textarea')) && ! in_array($hesk_settings['custom_fields'][$this_field]['type'], array('text','textarea')) && strpos($set['custom_fields'][$this_field]['value'], '#HESK#') !== false )
+			{
+				$set['custom_fields'][$this_field]['value'] = '';
+			}
+		}
 	}
 	else
 	{
@@ -516,6 +536,7 @@ $set['mfh_attachments'] = empty($_POST['email_attachments']) ? 0 : 1;
 $set['show_number_merged'] = empty($_POST['show_number_merged']) ? 0 : 1;
 $set['request_location'] = empty($_POST['request_location']) ? 0 : 1;
 $set['category_order_column'] = empty($_POST['category_order_column']) ? 'cat_order' : 'name';
+
 $rich_text_setting = hesk_POST('rich_text_for_tickets', 0);
 if ($rich_text_setting == 0) {
 	$set['rich_text_for_tickets'] = 0;
@@ -527,6 +548,7 @@ if ($rich_text_setting == 0) {
 	$set['rich_text_for_tickets'] = 1;
 	$set['rich_text_for_tickets_for_customers'] = 1;
 }
+
 $set['statuses_order_column'] = empty($_POST['statuses_order_column']) ? 'sort' : 'name';
 $set['kb_attach_dir'] = hesk_POST('kb_attach_dir', 'attachments');
 
@@ -546,77 +568,32 @@ $set['dropdownItemTextColor'] = hesk_input(hesk_POST('dropdownItemTextColor'));
 $set['dropdownItemTextHoverColor'] = hesk_input(hesk_POST('dropdownItemTextHoverColor'));
 $set['questionMarkColor'] = hesk_input(hesk_POST('questionMarkColor'));
 $set['dropdownItemTextHoverBackgroundColor'] = hesk_input(hesk_POST('dropdownItemTextHoverBackgroundColor'));
-$modsForHesk_file_content='<?php
+mfh_updateSetting('rtl', $set['rtl']);
-
+mfh_updateSetting('show_icons', $set['show-icons']);
-//-- Mods For Hesk Theme Color Settings
+mfh_updateSetting('custom_field_setting', $set['custom-field-setting']);
-$modsForHesk_settings[\'navbarBackgroundColor\'] = \''.$set['navbarBackgroundColor'].'\';
+mfh_updateSetting('customer_email_verification_required', $set['customer-email-verification-required']);
-$modsForHesk_settings[\'navbarBrandColor\'] = \''.$set['navbarBrandColor'].'\';
+mfh_updateSetting('html_emails', $set['html_emails']);
-$modsForHesk_settings[\'navbarBrandHoverColor\'] = \''.$set['navbarBrandHoverColor'].'\';
+mfh_updateSetting('use_bootstrap_theme', $set['use_bootstrap_theme']);
-$modsForHesk_settings[\'navbarItemTextColor\'] = \''.$set['navbarItemTextColor'].'\';
+mfh_updateSetting('new_kb_article_visibility', $set['new_kb_article_visibility']);
-$modsForHesk_settings[\'navbarItemTextHoverColor\'] = \''.$set['navbarItemTextHoverColor'].'\';
+mfh_updateSetting('attachments', $set['mfh_attachments']);
-$modsForHesk_settings[\'navbarItemTextSelectedColor\'] = \''.$set['navbarItemTextSelectedColor'].'\';
+mfh_updateSetting('show_number_merged', $set['show_number_merged']);
-$modsForHesk_settings[\'navbarItemSelectedBackgroundColor\'] = \''.$set['navbarItemSelectedBackgroundColor'].'\';
+mfh_updateSetting('request_location', $set['request_location']);
-$modsForHesk_settings[\'dropdownItemTextColor\'] = \''.$set['dropdownItemTextColor'].'\';
+mfh_updateSetting('category_order_column', $set['category_order_column'], true);
-$modsForHesk_settings[\'dropdownItemTextHoverColor\'] = \''.$set['dropdownItemTextHoverColor'].'\';
+mfh_updateSetting('rich_text_for_tickets', $set['rich_text_for_tickets']);
-$modsForHesk_settings[\'dropdownItemTextHoverBackgroundColor\'] = \''.$set['dropdownItemTextHoverBackgroundColor'].'\';
+mfh_updateSetting('rich_text_for_tickets_for_customers', $set['rich_text_for_tickets_for_customers']);
-$modsForHesk_settings[\'questionMarkColor\'] = \''.$set['questionMarkColor'].'\';
+mfh_updateSetting('statuses_order_column', $set['statuses_order_column'], true);
-
+mfh_updateSetting('kb_attach_dir', $set['kb_attach_dir'], true);
-//-- Set this to 1 for right-to-left text.
+mfh_updateSetting('navbarBackgroundColor', $set['navbarBackgroundColor'], true);
-$modsForHesk_settings[\'rtl\'] = '.$set['rtl'].';
+mfh_updateSetting('navbarBrandColor', $set['navbarBrandColor'], true);
-
+mfh_updateSetting('navbarBrandHoverColor', $set['navbarBrandHoverColor'], true);
-//-- Set this to 1 to show icons next to navigation menu items
+mfh_updateSetting('navbarItemTextColor', $set['navbarItemTextColor'], true);
-$modsForHesk_settings[\'show_icons\'] = '.$set['show-icons'].';
+mfh_updateSetting('navbarItemTextHoverColor', $set['navbarItemTextHoverColor'], true);
-
+mfh_updateSetting('navbarItemTextSelectedColor', $set['navbarItemTextSelectedColor'], true);
-//-- Set this to 1 to enable custom field names as keys
+mfh_updateSetting('navbarItemSelectedBackgroundColor', $set['navbarItemSelectedBackgroundColor'], true);
-$modsForHesk_settings[\'custom_field_setting\'] = '.$set['custom-field-setting'].';
+mfh_updateSetting('dropdownItemTextColor', $set['dropdownItemTextColor'], true);
-
+mfh_updateSetting('dropdownItemTextHoverColor', $set['dropdownItemTextHoverColor'], true);
-//-- Set this to 1 to enable email verification for new customers
+mfh_updateSetting('questionMarkColor', $set['questionMarkColor'], true);
-$modsForHesk_settings[\'customer_email_verification_required\'] = '.$set['customer-email-verification-required'].';
+mfh_updateSetting('dropdownItemTextHoverBackgroundColor', $set['dropdownItemTextHoverBackgroundColor'], true);
-
-//-- Set this to 1 to enable HTML-formatted emails.
-$modsForHesk_settings[\'html_emails\'] = '.$set['html_emails'].';
-
-//-- Mailgun Settings
-$modsForHesk_settings[\'use_mailgun\'] = '.$set['use_mailgun'].';
-$modsForHesk_settings[\'mailgun_api_key\'] = \''.$set['mailgun_api_key'].'\';
-$modsForHesk_settings[\'mailgun_domain\'] = \''.$set['mailgun_domain'].'\';
-
-//-- Set this to 1 to enable bootstrap-theme.css
-$modsForHesk_settings[\'use_bootstrap_theme\'] = '.$set['use_bootstrap_theme'].';
-
-//-- Default value for new Knowledgebase article: 0 = Published, 1 = Private, 2 = Draft
-$modsForHesk_settings[\'new_kb_article_visibility\'] = '.$set['new_kb_article_visibility'].';
-
-//-- Setting for adding attachments to email messages. Either 0 for default-HESK behavior, or 1 to send as attachments
-$modsForHesk_settings[\'attachments\'] = '.$set['mfh_attachments'].';
-
-//-- Setting for showing number of merged tickets in the ticket search screen. 0 = Disable, 1 = Enable
-$modsForHesk_settings[\'show_number_merged\'] = '.$set['show_number_merged'].';
-
-//-- Setting for requesting user\'s location. 0 = Disable, 1 = Enable
-$modsForHesk_settings[\'request_location\'] = '.$set['request_location'].';
-
-//-- Column to sort categories by. Can be either \'name\' or \'cat_order\'
-$modsForHesk_settings[\'category_order_column\'] = \''.$set['category_order_column'].'\';
-
-//-- Setting for using rich-text editor for tickets. 0 = Disable, 1 = Enable
-$modsForHesk_settings[\'rich_text_for_tickets\'] = '.$set['rich_text_for_tickets'].';
-
-//-- Column to sort statuses by. Can be either \'sort\' or \'name\'
-$modsForHesk_settings[\'statuses_order_column\'] = \''.$set['statuses_order_column'].'\';
-
-//-- Directory to store knowledgebase articles in.
-$modsForHesk_settings[\'kb_attach_dir\'] = \''.$set['kb_attach_dir'].'\';
-
-//-- Setting for using rich-text editor for customers. 0 = Disable, 1 = Enable
-$modsForHesk_settings[\'rich_text_for_tickets_for_customers\'] = '.$set['rich_text_for_tickets_for_customers'].';';
-
-// Write the file
-if ( ! file_put_contents(HESK_PATH . 'modsForHesk_settings.inc.php', $modsForHesk_file_content) )
-{
-    hesk_error($hesklang['err_modsForHesk_settings']);
-}
-
 
 // Prepare settings file and save it
 $settings_file_content='<?php
@@ -857,6 +834,13 @@ exit();
 
 
 /** FUNCTIONS **/
+function mfh_updateSetting($key, $value, $isString = false) {
+	global $hesk_settings;
+
+	$formattedValue = $isString ? "'".hesk_dbEscape($value)."'" : intval($value);
+
+	hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` SET `Value` = ".$formattedValue." WHERE `Key` = '".$key."'");
+}
 
 function hesk_checkMinMax($myint,$min,$max,$defval)
 {

admin/admin_submit_ticket.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -37,7 +37,6 @@ define('HESK_PATH','../');
 
 // Get all the required files and functions
 require(HESK_PATH . 'hesk_settings.inc.php');
-require(HESK_PATH . 'modsForHesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
 hesk_load_database_functions();
@@ -48,6 +47,7 @@ require(HESK_PATH . 'inc/posting_functions.inc.php');
 hesk_session_start();
 hesk_dbConnect();
 hesk_isLoggedIn();
+$modsForHesk_settings = mfh_getSettings();
 
 // We only allow POST requests from the HESK form to this file
 if ( $_SERVER['REQUEST_METHOD'] != 'POST' )
@@ -287,7 +287,7 @@ $ticket = hesk_newTicket($tmpvar);
 // Notify the customer about the ticket?
 if ($notify)
 {
-	hesk_notifyCustomer();
+	hesk_notifyCustomer($modsForHesk_settings);
 }
 
 // If ticket is assigned to someone notify them?
@@ -296,18 +296,18 @@ if ($ticket['owner'] && $ticket['owner'] != intval($_SESSION['id']))
 	// If we don't have info from auto-assign get it from database
     if ( ! isset($autoassign_owner['email']) )
     {
-		hesk_notifyAssignedStaff(false, 'ticket_assigned_to_you');
+		hesk_notifyAssignedStaff(false, 'ticket_assigned_to_you', $modsForHesk_settings);
 	}
     else
     {
-		hesk_notifyAssignedStaff($autoassign_owner, 'ticket_assigned_to_you');
+		hesk_notifyAssignedStaff($autoassign_owner, 'ticket_assigned_to_you', $modsForHesk_settings);
     }
 }
 
 // Ticket unassigned, notify everyone that selected to be notified about unassigned tickets
 elseif ( ! $ticket['owner'])
 {
-	hesk_notifyStaff('new_ticket_staff', " `id` != ".intval($_SESSION['id'])." AND `notify_new_unassigned` = '1' ");
+	hesk_notifyStaff('new_ticket_staff', " `id` != ".intval($_SESSION['id'])." AND `notify_new_unassigned` = '1' ", $modsForHesk_settings);
 }
 
 // Unset temporary variables

admin/admin_ticket.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -38,7 +38,6 @@ define('WYSIWYG',1);
 
 /* Get all the required files and functions */
 require(HESK_PATH . 'hesk_settings.inc.php');
-require(HESK_PATH . 'modsForHesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
 require(HESK_PATH . 'inc/status_functions.inc.php');
@@ -51,6 +50,8 @@ hesk_isLoggedIn();
 
 /* Check permissions for this feature */
 hesk_checkPermission('can_view_tickets');
+$modsForHesk_settings = mfh_getSettings();
+
 $can_del_notes		 = hesk_checkPermission('can_del_notes',0);
 $can_reply			 = hesk_checkPermission('can_reply_tickets',0);
 $can_delete			 = hesk_checkPermission('can_del_tickets',0);
@@ -456,14 +457,14 @@ if (isset($_POST['notemsg']) && hesk_token_check('POST'))
 
             /* Format email subject and message for staff */
             $subject = hesk_getEmailSubject('new_note',$ticket);
-            $message = hesk_getEmailMessage('new_note',$ticket,1);
+            $message = hesk_getEmailMessage('new_note',$ticket,$modsForHesk_settings,1);
-            $htmlMessage = hesk_getHtmlMessage('new_note',$ticket,1);
+            $htmlMessage = hesk_getHtmlMessage('new_note',$ticket,$modsForHesk_settings, 1);
-            $hasMessage = hesk_doesTemplateHaveTag('new_note', '%%MESSAGE%%');
+            $hasMessage = hesk_doesTemplateHaveTag('new_note', '%%MESSAGE%%', $modsForHesk_settings);
 
 
             /* Send email to staff */
             while ($user = hesk_dbFetchAssoc($users)) {
-                hesk_mail($user['email'], $subject, $message, $htmlMessage, array(), array(), $hasMessage);
+                hesk_mail($user['email'], $subject, $message, $htmlMessage, $modsForHesk_settings, array(), array(), $hasMessage);
             }
         }
     }
@@ -1973,7 +1974,9 @@ function hesk_printCanned()
 	{
 	    $can_options .= '<option value="' . $mysaved[0] . '">' . $mysaved[1]. "</option>\n";
 	    if ($modsForHesk_settings['rich_text_for_tickets']) {
-	        echo 'myMsgTxt['.$mysaved[0].']=\''.str_replace("\r\n","\\r\\n' + \r\n'", hesk_html_entity_decode($mysaved[2]))."';\n";
+	        $theMessage = hesk_html_entity_decode($mysaved[2]);
+	        $theMessage = addslashes($theMessage);
+	        echo 'myMsgTxt['.$mysaved[0].']=\''.str_replace("\r\n","\\r\\n' + \r\n'", $theMessage)."';\n";
 	    } else {
 	        echo 'myMsgTxt['.$mysaved[0].']=\''.str_replace("\r\n","\\r\\n' + \r\n'", addslashes($mysaved[2]))."';\n";
 	    }

admin/assign_owner.php

@@ -0,0 +1,160 @@
+<?php
+/*******************************************************************************
+*  Title: Help Desk Software HESK
+*  Version: 2.6.1 from 26th February 2015
+*  Author: Klemen Stirn
+*  Website: http://www.hesk.com
+********************************************************************************
+*  COPYRIGHT AND TRADEMARK NOTICE
+*  Copyright 2005-2015 Klemen Stirn. All Rights Reserved.
+*  HESK is a registered trademark of Klemen Stirn.
+
+*  The HESK may be used and modified free of charge by anyone
+*  AS LONG AS COPYRIGHT NOTICES AND ALL THE COMMENTS REMAIN INTACT.
+*  By using this code you agree to indemnify Klemen Stirn from any
+*  liability that might arise from it's use.
+
+*  Selling the code for this program, in part or full, without prior
+*  written consent is expressly forbidden.
+
+*  Using this code, in part or full, to create derivate work,
+*  new scripts or products is expressly forbidden. Obtain permission
+*  before redistributing this software over the Internet or in
+*  any other medium. In all cases copyright and header must remain intact.
+*  This Copyright is in full effect in any country that has International
+*  Trade Agreements with the United States of America or
+*  with the European Union.
+
+*  Removing any of the copyright notices without purchasing a license
+*  is expressly forbidden. To remove HESK copyright notice you must purchase
+*  a license for this script. For more information on how to obtain
+*  a license please visit the page below:
+*  https://www.hesk.com/buy.php
+*******************************************************************************/
+
+define('IN_SCRIPT',1);
+define('HESK_PATH','../');
+
+/* Get all the required files and functions */
+require(HESK_PATH . 'hesk_settings.inc.php');
+require(HESK_PATH . 'inc/common.inc.php');
+require(HESK_PATH . 'inc/admin_functions.inc.php');
+hesk_load_database_functions();
+require(HESK_PATH . 'inc/email_functions.inc.php');
+
+hesk_session_start();
+hesk_dbConnect();
+hesk_isLoggedIn();
+$modsForHesk_settings = mfh_getSettings();
+
+$can_assign_others = hesk_checkPermission('can_assign_others',0);
+if ($can_assign_others)
+{
+	$can_assign_self = TRUE;
+}
+else
+{
+	$can_assign_self = hesk_checkPermission('can_assign_self',0);
+}
+
+/* A security check */
+hesk_token_check();
+
+/* Ticket ID */
+$trackingID = hesk_cleanID() or die($hesklang['int_error'].': '.$hesklang['no_trackID']);
+
+$res = hesk_dbQuery("SELECT * FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` WHERE `trackid`='".hesk_dbEscape($trackingID)."' LIMIT 1");
+if (hesk_dbNumRows($res) != 1)
+{
+	hesk_error($hesklang['ticket_not_found']);
+}
+$ticket = hesk_dbFetchAssoc($res);
+
+$_SERVER['PHP_SELF'] = 'admin_ticket.php?track='.$trackingID.'&Refresh='.rand(10000,99999);
+
+/* New owner ID */
+$owner = intval( hesk_REQUEST('owner') );
+
+/* If ID is -1 the ticket will be unassigned */
+if ($owner == -1)
+{
+	$revision = sprintf($hesklang['thist2'],hesk_date(),'<i>'.$hesklang['unas'].'</i>',$_SESSION['name'].' ('.$_SESSION['user'].')');
+	$res = hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` SET `owner`=0 , `history`=CONCAT(`history`,'".hesk_dbEscape($revision)."') WHERE `trackid`='".hesk_dbEscape($trackingID)."' LIMIT 1");
+
+    hesk_process_messages($hesklang['tunasi2'],$_SERVER['PHP_SELF'],'SUCCESS');
+}
+elseif ($owner < 1)
+{
+    hesk_process_messages($hesklang['nose'],$_SERVER['PHP_SELF'],'NOTICE');
+}
+
+/* Verify the new owner and permissions */
+$res = hesk_dbQuery("SELECT `id`,`user`,`name`,`email`,`isadmin`,`categories`,`notify_assigned` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."users` WHERE `id`='{$owner}' LIMIT 1");
+$row = hesk_dbFetchAssoc($res);
+
+/* Has new owner access to the category? */
+if ( ! $row['isadmin'])
+{
+	$row['categories']=explode(',',$row['categories']);
+	if (!in_array($ticket['category'],$row['categories']))
+	{
+		hesk_error($hesklang['unoa']);
+	}
+}
+
+/* Assigning to self? */
+if ($can_assign_others || ($owner == $_SESSION['id'] && $can_assign_self))
+{
+	$revision = sprintf($hesklang['thist2'],hesk_date(),$row['name'].' ('.$row['user'].')',$_SESSION['name'].' ('.$_SESSION['user'].')');
+	$res = hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` SET `owner`={$owner} , `history`=CONCAT(`history`,'".hesk_dbEscape($revision)."') WHERE `trackid`='".hesk_dbEscape($trackingID)."' LIMIT 1");
+
+    if ($owner != $_SESSION['id'] && !hesk_checkPermission('can_view_ass_others',0))
+    {
+    	$_SERVER['PHP_SELF']='admin_main.php';
+    }
+}
+else
+{
+	hesk_error($hesklang['no_permission']);
+}
+
+$ticket['owner'] = $owner;
+
+/* --> Prepare message */
+
+// 1. Generate the array with ticket info that can be used in emails
+$info = array(
+'email'			=> $ticket['email'],
+'category'		=> $ticket['category'],
+'priority'		=> $ticket['priority'],
+'owner'			=> $ticket['owner'],
+'trackid'		=> $ticket['trackid'],
+'status'		=> $ticket['status'],
+'name'			=> $ticket['name'],
+'lastreplier'	=> $ticket['lastreplier'],
+'subject'		=> $ticket['subject'],
+'message'		=> $ticket['message'],
+'attachments'	=> $ticket['attachments'],
+'dt'			=> hesk_date($ticket['dt'], true),
+'lastchange'	=> hesk_date($ticket['lastchange'], true),
+'id'			=> $ticket['id'],
+);
+
+// 2. Add custom fields to the array
+foreach ($hesk_settings['custom_fields'] as $k => $v)
+{
+	$info[$k] = $v['use'] ? $ticket[$k] : '';
+}
+
+// 3. Make sure all values are properly formatted for email
+$ticket = hesk_ticketToPlain($info, 1, 0);
+
+/* Notify the new owner? */
+if ($ticket['owner'] != intval($_SESSION['id']))
+{
+	hesk_notifyAssignedStaff(false, 'ticket_assigned_to_you', $modsForHesk_settings);
+}
+
+$tmp = ($owner == $_SESSION['id']) ? $hesklang['tasy'] : $hesklang['taso'];
+hesk_process_messages($tmp,$_SERVER['PHP_SELF'],'SUCCESS');
+?>

admin/banned_emails.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************

admin/banned_ips.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************

admin/change_status.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -44,6 +44,7 @@ hesk_load_database_functions();
 hesk_session_start();
 hesk_dbConnect();
 hesk_isLoggedIn();
+$modsForHesk_settings = mfh_getSettings();
 
 /* Check permissions for this feature */
 if (!isset($_REQUEST['isManager']) || !$_REQUEST['isManager']) {
@@ -103,7 +104,7 @@ if ($statusRow['IsClosed']) // Closed
 
         // Notify customer
         require(HESK_PATH . 'inc/email_functions.inc.php');
-        hesk_notifyCustomer('ticket_closed');
+        hesk_notifyCustomer($modsForHesk_settings,'ticket_closed');
     }
 
     // Log who marked the ticket resolved

admin/delete_tickets.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -44,6 +44,7 @@ hesk_load_database_functions();
 hesk_session_start();
 hesk_dbConnect();
 hesk_isLoggedIn();
+$modsForHesk_settings = mfh_getSettings();
 
 /* Set correct return URL */
 if (isset($_SERVER['HTTP_REFERER']))
@@ -311,7 +312,7 @@ else
             $ticket['dt'] = hesk_date($ticket['dt'], true);
             $ticket['lastchange'] = hesk_date($ticket['lastchange'], true);
             $ticket = hesk_ticketToPlain($ticket, 1, 0);
-            hesk_notifyCustomer('ticket_closed');
+            hesk_notifyCustomer($modsForHesk_settings,'ticket_closed');
         }
 	}
 

admin/edit_note.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************

admin/edit_post.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -38,7 +38,6 @@ define('WYSIWYG',1);
 
 /* Get all the required files and functions */
 require(HESK_PATH . 'hesk_settings.inc.php');
-require(HESK_PATH . 'modsForHesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
 hesk_load_database_functions();
@@ -52,6 +51,7 @@ if (!isset($_REQUEST['isManager']) || !$_REQUEST['isManager']) {
     hesk_checkPermission('can_view_tickets');
     hesk_checkPermission('can_edit_tickets');
 }
+$modsForHesk_settings = mfh_getSettings();
 
 /* Ticket ID */
 $trackingID = hesk_cleanID() or die($hesklang['int_error'].': '.$hesklang['no_trackID']);
@@ -114,8 +114,10 @@ if (isset($_POST['save']))
 	    	hesk_error($myerror);
 	    }
 
-		$tmpvar['message'] = hesk_makeURL($tmpvar['message']);
+		if (!$modsForHesk_settings['rich_text_for_tickets']) {
-		$tmpvar['message'] = nl2br($tmpvar['message']);
+			$tmpvar['message'] = hesk_makeURL($tmpvar['message']);
+			$tmpvar['message'] = nl2br($tmpvar['message']);
+		}
 
     	hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."replies` SET `message`='".hesk_dbEscape($tmpvar['message'])."' WHERE `id`='".intval($tmpvar['id'])."' AND `replyto`='".intval($ticket['id'])."' LIMIT 1");
     }

admin/export.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -36,7 +36,6 @@ define('HESK_PATH','../');
 
 /* Get all the required files and functions */
 require(HESK_PATH . 'hesk_settings.inc.php');
-require(HESK_PATH . 'modsForHesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
 require(HESK_PATH . 'inc/reporting_functions.inc.php');
@@ -49,6 +48,7 @@ hesk_isLoggedIn();
 
 // Check permissions for this feature
 hesk_checkPermission('can_export');
+$modsForHesk_settings = mfh_getSettings();
 
 // Set default values
 define('CALENDAR',1);

admin/find_tickets.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -39,6 +39,7 @@ define('HESK_PATH','../');
 require(HESK_PATH . 'hesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
+require(HESK_PATH . 'inc/status_functions.inc.php');
 hesk_load_database_functions();
 
 hesk_session_start();
@@ -66,7 +67,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 <tr>
 <td>
 <div class="row" style="padding-top: 20px">
-    <div class="col-md-10 col-md-offset-1">
+    <div class="col-md-12">
         <div class="panel panel-default">
             <div class="panel-heading">
                 <h4><?php echo $hesklang['tickets_found']; ?> <span style="float: right; margin-top: -7px;"><a href="new_ticket.php" class="btn btn-success"><?php echo $hesklang['nti']; ?></a></span></h4>
@@ -99,7 +100,8 @@ LEFT(`message`, 400) AS `message`,
 `lastreplier`,
 `replierid`,
 `archive`,
-`locked`
+`locked`,
+`merged`
 ";
 
 foreach ($hesk_settings['custom_fields'] as $k=>$v)

admin/index.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -43,6 +43,7 @@ hesk_load_database_functions();
 
 hesk_session_start();
 hesk_dbConnect();
+$modsForHesk_settings = mfh_getSettings();
 
 /* What should we do? */
 $action = hesk_REQUEST('a');
@@ -70,7 +71,7 @@ exit();
 /*** START FUNCTIONS ***/
 function do_login()
 {
-	global $hesk_settings, $hesklang;
+	global $hesk_settings, $hesklang, $modsForHesk_settings;
 
     $hesk_error_buffer = array();
 
@@ -285,7 +286,7 @@ function do_login()
                         $ticket['dt'] = hesk_date($ticket['dt'], true);
                         $ticket['lastchange'] = hesk_date($ticket['lastchange'], true);
                         $ticket = hesk_ticketToPlain($ticket, 1, 0);
-                        hesk_notifyCustomer('ticket_closed');
+                        hesk_notifyCustomer($modsForHesk_settings,'ticket_closed');
                     }
                 }
             }

admin/knowledgebase_private.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************

admin/lock.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -44,6 +44,7 @@ hesk_load_database_functions();
 hesk_session_start();
 hesk_dbConnect();
 hesk_isLoggedIn();
+$modsForHesk_settings = mfh_getSettings();
 
 /* Check permissions for this feature */
 hesk_checkPermission('can_view_tickets');
@@ -98,7 +99,7 @@ else
 
             $ticket['dt'] = hesk_date($ticket['dt'], true);
             $ticket['lastchange'] = hesk_date($ticket['lastchange'], true);
-            hesk_notifyCustomer('ticket_closed');
+            hesk_notifyCustomer($modsForHesk_settings, 'ticket_closed');
         }
     }
 }

admin/mail.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -37,16 +37,17 @@ define('HESK_PATH','../');
 
 /* Get all the required files and functions */
 require(HESK_PATH . 'hesk_settings.inc.php');
-require(HESK_PATH . 'modsForHesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
 hesk_load_database_functions();
-require(HESK_PATH . 'inc/email_functions.inc.php');
 
 hesk_session_start();
 hesk_dbConnect();
+require(HESK_PATH . 'inc/email_functions.inc.php');
 hesk_isLoggedIn();
 
+$modsForHesk_settings = mfh_getSettings();
+
 /* List of staff */
 $admins = array();
 $res = hesk_dbQuery("SELECT `id`,`name` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."users` ORDER BY `name` ASC");
@@ -289,7 +290,7 @@ function mail_get_ids()
 
 function mail_send()
 {
-	global $hesk_settings, $hesklang;
+	global $hesk_settings, $hesklang, $modsForHesk_settings;
 
 	/* A security check */
 	hesk_token_check('POST');
@@ -362,12 +363,12 @@ function mail_send()
 
 			/* Format email subject and message for recipient */
 			$subject = hesk_getEmailSubject('new_pm',$pm,0);
-			$message = hesk_getEmailMessage('new_pm',$pm,1,0);
+			$message = hesk_getEmailMessage('new_pm',$pm,$modsForHesk_settings,1,0);
-            $htmlMessage = hesk_getHtmlMessage('new_pm',$pm,1,0);
+            $htmlMessage = hesk_getHtmlMessage('new_pm',$pm,$modsForHesk_settings,1,0);
-            $hasMessage = hesk_doesTemplateHaveTag('new_pm','%%MESSAGE%%');
+            $hasMessage = hesk_doesTemplateHaveTag('new_pm','%%MESSAGE%%', $modsForHesk_settings);
 
 			/* Send e-mail */
-			hesk_mail($pm_recipient['email'], $subject, $message, $htmlMessage, array(), array(), $hasMessage);
+			hesk_mail($pm_recipient['email'], $subject, $message, $htmlMessage, $modsForHesk_settings, array(), array(), $hasMessage);
         }
 
 		unset($_SESSION['mail']);

admin/manage_canned.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -37,7 +37,6 @@ define('HESK_PATH','../');
 
 /* Get all the required files and functions */
 require(HESK_PATH . 'hesk_settings.inc.php');
-require(HESK_PATH . 'modsForHesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
 hesk_load_database_functions();
@@ -60,6 +59,8 @@ if ( $action = hesk_REQUEST('a') )
 	elseif ($action == 'order')  {order_saved();}
 }
 
+$modsForHesk_settings = mfh_getSettings();
+
 /* Print header */
 require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
 
@@ -161,7 +162,9 @@ function hesk_insertAtCursor(myField, myValue) {
 
                         $javascript_titles.='myTitle['.$mysaved['id'].']=\''.addslashes($mysaved['title'])."';\n";
                         if ($modsForHesk_settings['rich_text_for_tickets']) {
-                            $javascript_messages.='myMsgTxt['.$mysaved['id'].']=\''.str_replace("\r\n","\\r\\n' + \r\n'", hesk_html_entity_decode($mysaved['message']) )."';\n";
+                            $theMessage = hesk_html_entity_decode($mysaved['message']);
+                            $theMessage = addslashes($theMessage);
+                            $javascript_messages.='myMsgTxt['.$mysaved['id'].']=\''.str_replace("\r\n","\\r\\n' + \r\n'", $theMessage )."';\n";
                         } else {
                             $javascript_messages.='myMsgTxt['.$mysaved['id'].']=\''.str_replace("\r\n","\\r\\n' + \r\n'", addslashes($mysaved['message']) )."';\n";
                         }

admin/manage_categories.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -37,7 +37,6 @@ define('HESK_PATH','../');
 
 /* Get all the required files and functions */
 require(HESK_PATH . 'hesk_settings.inc.php');
-require(HESK_PATH . 'modsForHesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
 hesk_load_database_functions();
@@ -72,6 +71,8 @@ if ( $action = hesk_REQUEST('a') )
     elseif ($action == 'manager')    {change_manager();}
 }
 
+$modsForHesk_settings = mfh_getSettings();
+
 /* Print header */
 require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
 

admin/manage_email_templates.php

@@ -289,6 +289,7 @@ function getSpecialTagMap() {
     $map['%%EMAIL%%'] = $hesklang['customer_email'];
     $map['%%SUBJECT%%'] = $hesklang['ticket_subject'];
     $map['%%MESSAGE%%'] = $hesklang['ticket_message'];
+    $map['%%MESSAGE_NO_ATTACHMENTS%%'] = $hesklang['ticket_message_no_attachments'];
     $map['%%CREATED%%'] = $hesklang['ticket_created'];
     $map['%%UPDATED%%'] = $hesklang['ticket_updated'];
     $map['%%TRACK_ID%%'] = $hesklang['ticket_trackID'];

admin/manage_knowledgebase.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -37,7 +37,6 @@ define('HESK_PATH','../');
 
 /* Get all the required files and functions */
 require(HESK_PATH . 'hesk_settings.inc.php');
-require(HESK_PATH . 'modsForHesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
 hesk_load_database_functions();
@@ -374,6 +373,7 @@ if (!isset($_SESSION['hide']['new_article']))
                                 $selectedIndex = -1;
                             } else
                             {
+                                $modsForHesk_settings = mfh_getSettings();
                                 $selectedIndex = $modsForHesk_settings['new_kb_article_visibility'];
                             }
                             ?>

admin/manage_permission_templates.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -37,7 +37,6 @@ define('HESK_PATH','../');
 
 /* Get all the required files and functions */
 require(HESK_PATH . 'hesk_settings.inc.php');
-require(HESK_PATH . 'modsForHesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
 hesk_load_database_functions();
@@ -76,6 +75,8 @@ else {return false;}
 </script>
 
 <?php
+    $modsForHesk_settings = mfh_getSettings();
+
     $res = hesk_dbQuery("SELECT * FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."permission_templates` ORDER BY `name` ASC");
     $templates = array();
     while ($row = hesk_dbFetchAssoc($res)) {

admin/manage_statuses.php

@@ -5,7 +5,6 @@ define('HESK_PATH','../');
 
 /* Get all the required files and functions */
 require(HESK_PATH . 'hesk_settings.inc.php');
-require(HESK_PATH . 'modsForHesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
 require(HESK_PATH . 'inc/status_functions.inc.php');
@@ -29,6 +28,8 @@ if (isset($_REQUEST['a'])) {
     elseif ($_REQUEST['a'] == 'save') { save(); }
 }
 
+$modsForHesk_settings = mfh_getSettings();
+
 
 /* Print header */
 require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
@@ -148,7 +149,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                             <i class="fa fa-pencil icon-link" style="color: orange"
                                                data-toggle="tooltip" title="<?php echo $hesklang['edit']; ?>"></i>
                                         </span>
-                                        <?php echoArrows($j, $numberOfStatuses, $row['ID']); ?>
+                                        <?php echoArrows($j, $numberOfStatuses, $row['ID'], $modsForHesk_settings); ?>
                                         <?php
                                         // Only show the delete button if (1) it's not a default action and (2) no tickets are set to that status
                                         $delete = canStatusBeDeleted($row['ID']);
@@ -379,8 +380,8 @@ function buildConfirmDeleteModal($statusId) {
     <?php
 }
 
-function echoArrows($index, $numberOfStatuses, $statusId) {
+function echoArrows($index, $numberOfStatuses, $statusId, $modsForHesk_settings) {
-    global $hesklang, $modsForHesk_settings;
+    global $hesklang;
 
     if ($modsForHesk_settings['statuses_order_column'] == 'name') {
         return;

admin/manage_ticket_templates.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -37,7 +37,6 @@ define('HESK_PATH','../');
 
 /* Get all the required files and functions */
 require(HESK_PATH . 'hesk_settings.inc.php');
-require(HESK_PATH . 'modsForHesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
 hesk_load_database_functions();
@@ -46,6 +45,8 @@ hesk_session_start();
 hesk_dbConnect();
 hesk_isLoggedIn();
 
+$modsForHesk_settings = mfh_getSettings();
+
 /* Check permissions for this feature */
 hesk_checkPermission('can_man_ticket_tpl');
 
@@ -66,6 +67,7 @@ if ( $action = hesk_REQUEST('a') )
 	elseif ($action == 'order')  {order_saved();}
 }
 
+
 /* Print header */
 require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
 
@@ -133,7 +135,9 @@ $num = hesk_dbNumRows($result);
                             $options .= '>'.$mysaved['title'].'</option>';
 
                             if ($modsForHesk_settings['rich_text_for_tickets']) {
-                                $javascript_messages.='myMsgTxt['.$mysaved['id'].']=\''.str_replace("\r\n","\\r\\n' + \r\n'", html_entity_decode($mysaved['message'] ))."';\n";
+                                $theMessage = html_entity_decode($mysaved['message']);
+                                $theMessage = addslashes($theMessage);
+                                $javascript_messages.='myMsgTxt['.$mysaved['id'].']=\''.str_replace("\r\n","\\r\\n' + \r\n'", $theMessage)."';\n";
                             } else {
                                 $javascript_messages.='myMsgTxt['.$mysaved['id'].']=\''.str_replace("\r\n","\\r\\n' + \r\n'", addslashes($mysaved['message']) )."';\n";
                             }

admin/manage_users.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -37,7 +37,6 @@ define('HESK_PATH','../');
 
 /* Get all the required files and functions */
 require(HESK_PATH . 'hesk_settings.inc.php');
-require(HESK_PATH . 'modsForHesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
 require(HESK_PATH . 'inc/profile_functions.inc.php');
@@ -93,6 +92,7 @@ $default_userdata = array(
     'notify_note_unassigned' => 1,
 );
 
+$modsForHesk_settings = mfh_getSettings();
 /* A list of all categories */
 $orderBy = $modsForHesk_settings['category_order_column'];
 $hesk_settings['categories'] = array();

admin/move_category.php

@@ -0,0 +1,212 @@
+<?php
+/*******************************************************************************
+*  Title: Help Desk Software HESK
+*  Version: 2.6.1 from 26th February 2015
+*  Author: Klemen Stirn
+*  Website: http://www.hesk.com
+********************************************************************************
+*  COPYRIGHT AND TRADEMARK NOTICE
+*  Copyright 2005-2015 Klemen Stirn. All Rights Reserved.
+*  HESK is a registered trademark of Klemen Stirn.
+
+*  The HESK may be used and modified free of charge by anyone
+*  AS LONG AS COPYRIGHT NOTICES AND ALL THE COMMENTS REMAIN INTACT.
+*  By using this code you agree to indemnify Klemen Stirn from any
+*  liability that might arise from it's use.
+
+*  Selling the code for this program, in part or full, without prior
+*  written consent is expressly forbidden.
+
+*  Using this code, in part or full, to create derivate work,
+*  new scripts or products is expressly forbidden. Obtain permission
+*  before redistributing this software over the Internet or in
+*  any other medium. In all cases copyright and header must remain intact.
+*  This Copyright is in full effect in any country that has International
+*  Trade Agreements with the United States of America or
+*  with the European Union.
+
+*  Removing any of the copyright notices without purchasing a license
+*  is expressly forbidden. To remove HESK copyright notice you must purchase
+*  a license for this script. For more information on how to obtain
+*  a license please visit the page below:
+*  https://www.hesk.com/buy.php
+*******************************************************************************/
+
+define('IN_SCRIPT',1);
+define('HESK_PATH','../');
+
+/* Get all the required files and functions */
+require(HESK_PATH . 'hesk_settings.inc.php');
+require(HESK_PATH . 'inc/common.inc.php');
+require(HESK_PATH . 'inc/admin_functions.inc.php');
+hesk_load_database_functions();
+require(HESK_PATH . 'inc/email_functions.inc.php');
+
+hesk_session_start();
+hesk_dbConnect();
+hesk_isLoggedIn();
+$modsForHesk_settings = mfh_getSettings();
+
+/* Check permissions for this feature */
+hesk_checkPermission('can_change_cat');
+
+/* A security check */
+hesk_token_check('POST');
+
+/* Ticket ID */
+$trackingID = hesk_cleanID() or die($hesklang['int_error'].': '.$hesklang['no_trackID']);
+
+/* Category ID */
+$category   = intval( hesk_POST('category', -1) );
+if ($category < 1)
+{
+	hesk_process_messages($hesklang['incat'],'admin_ticket.php?track='.$trackingID.'&Refresh='.rand(10000,99999),'NOTICE');
+}
+
+/* Get new category details */
+$res = hesk_dbQuery("SELECT `name`,`autoassign` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."categories` WHERE `id`='{$category}' LIMIT 1");
+if (hesk_dbNumRows($res) != 1)
+{
+	hesk_error("$hesklang[int_error]: $hesklang[kb_cat_inv].");
+}
+$row = hesk_dbFetchAssoc($res);
+
+/* Should tickets in new category be auto-assigned if necessary? */
+if ( ! $row['autoassign'])
+{
+	$hesk_settings['autoassign'] = false;
+}
+
+/* Is user allowed to view tickets in new category? */
+$category_ok = hesk_okCategory($category,0);
+
+/* Get details about the original ticket */
+$res = hesk_dbQuery("SELECT * FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` WHERE `trackid`='".hesk_dbEscape($trackingID)."' LIMIT 1");
+if (hesk_dbNumRows($res) != 1)
+{
+	hesk_error($hesklang['ticket_not_found']);
+}
+$ticket = hesk_dbFetchAssoc($res);
+
+/* Log that ticket is being moved */
+$history = sprintf($hesklang['thist1'],hesk_date(),$row['name'],$_SESSION['name'].' ('.$_SESSION['user'].')');
+
+/* Is the ticket assigned to someone? If yes, check that the user has access to category or change to unassigned */
+$need_to_reassign = 0;
+if ($ticket['owner'])
+{
+	if ($ticket['owner'] == $_SESSION['id'] && ! $category_ok )
+    {
+		$need_to_reassign = 1;
+    }
+    else
+    {
+		$res = hesk_dbQuery("SELECT `isadmin`,`categories` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."users` WHERE `id`='".intval($ticket['owner'])."' LIMIT 1");
+		if (hesk_dbNumRows($res) != 1)
+		{
+			$need_to_reassign = 1;
+		}
+        else
+        {
+        	$tmp = hesk_dbFetchAssoc($res);
+            if ( ! hesk_okCategory($category,0,$tmp['isadmin'], explode(',',$tmp['categories']) ) )
+            {
+            	$need_to_reassign = 1;
+            }
+        }
+    }
+}
+
+/* Reassign automatically if possible */
+if ($need_to_reassign || ! $ticket['owner'])
+{
+	$need_to_reassign = 1;
+	$autoassign_owner = hesk_autoAssignTicket($category);
+	if ($autoassign_owner)
+	{
+		$ticket['owner'] = $autoassign_owner['id'];
+	    $history .= sprintf($hesklang['thist10'],hesk_date(),$autoassign_owner['name'].' ('.$autoassign_owner['user'].')');
+	}
+    else
+    {
+    	$ticket['owner'] = 0;
+    }
+}
+
+hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` SET `category`='".intval($category)."', `owner`='".intval($ticket['owner'])."' , `history`=CONCAT(`history`,'".hesk_dbEscape($history)."') WHERE `trackid`='".hesk_dbEscape($trackingID)."' LIMIT 1");
+
+$ticket['category'] = $category;
+
+/* --> Prepare message */
+
+// 1. Generate the array with ticket info that can be used in emails
+$info = array(
+'email'			=> $ticket['email'],
+'category'		=> $ticket['category'],
+'priority'		=> $ticket['priority'],
+'owner'			=> $ticket['owner'],
+'trackid'		=> $ticket['trackid'],
+'status'		=> $ticket['status'],
+'name'			=> $ticket['name'],
+'lastreplier'	=> $ticket['lastreplier'],
+'subject'		=> $ticket['subject'],
+'message'		=> $ticket['message'],
+'attachments'	=> $ticket['attachments'],
+'dt'			=> hesk_date($ticket['dt'], true),
+'lastchange'	=> hesk_date($ticket['lastchange'], true),
+'id'			=> $ticket['id'],
+);
+
+// 2. Add custom fields to the array
+foreach ($hesk_settings['custom_fields'] as $k => $v)
+{
+	$info[$k] = $v['use'] ? $ticket[$k] : '';
+}
+
+// 3. Make sure all values are properly formatted for email
+$ticket = hesk_ticketToPlain($info, 1, 0);
+
+/* Need to notify any staff? */
+/* --> From autoassign? */
+if ($need_to_reassign && ! empty($autoassign_owner['email']) )
+{
+	hesk_notifyAssignedStaff($autoassign_owner, 'ticket_assigned_to_you', $modsForHesk_settings);
+}
+/* --> No autoassign, find and notify appropriate staff */
+elseif ( ! $ticket['owner'] )
+{
+	hesk_notifyStaff('category_moved', "`notify_new_unassigned`='1' AND `id`!=".intval($_SESSION['id']), $modsForHesk_settings);
+}
+
+/* Is the user allowed to view tickets in the new category? */
+if ($category_ok)
+{
+	/* Ticket has an owner */
+	if ($ticket['owner'])
+    {
+    	/* Staff is owner or can view tickets assigned to others */
+		if ($ticket['owner'] == $_SESSION['id'] || hesk_checkPermission('can_view_ass_others',0) )
+        {
+			hesk_process_messages($hesklang['moved_to'],'admin_ticket.php?track='.$trackingID.'&Refresh='.rand(10000,99999),'SUCCESS');
+        }
+        else
+        {
+			hesk_process_messages($hesklang['moved_to'],'admin_main.php','SUCCESS');
+        }
+    }
+    /* Ticket is unassigned, staff can view unassigned tickets */
+    elseif (hesk_checkPermission('can_view_unassigned',0))
+    {
+		hesk_process_messages($hesklang['moved_to'],'admin_ticket.php?track='.$trackingID.'&Refresh='.rand(10000,99999),'SUCCESS');
+    }
+    /* Ticket is unassigned, staff cannot view unassigned tickets */
+	else
+	{
+	    hesk_process_messages($hesklang['moved_to'],'admin_main.php','SUCCESS');
+	}
+}
+else
+{
+    hesk_process_messages($hesklang['moved_to'],'admin_main.php','SUCCESS');
+}
+?>

admin/new_ticket.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -572,7 +572,9 @@ if (!$show['show']) {
                         {
                             $can_options .= '<option value="' . $mysaved[0] . '">' . $mysaved[1]. "</option>\n";
                             if ($modsForHesk_settings['rich_text_for_tickets']) {
-                                echo 'myMsgTxt['.$mysaved[0].']=\''.str_replace("\r\n","\\r\\n' + \r\n'", hesk_html_entity_decode($mysaved[2]))."';\n";
+                                $theMessage = hesk_html_entity_decode($mysaved[2]);
+                                $theMessage = addslashes($theMessage);
+                                echo 'myMsgTxt['.$mysaved[0].']=\''.str_replace("\r\n","\\r\\n' + \r\n'", $theMessage)."';\n";
                             } else {
                                 echo 'myMsgTxt['.$mysaved[0].']=\''.str_replace("\r\n","\\r\\n' + \r\n'", addslashes($mysaved[2]))."';\n";
                             }

admin/options.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************

admin/password.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -37,9 +37,15 @@ define('HESK_PATH','../');
 
 /* Get all the required files and functions */
 require(HESK_PATH . 'hesk_settings.inc.php');
-require(HESK_PATH . 'modsForHesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 
+// Connect to database and check for brute force attempts
+hesk_load_database_functions();
+hesk_dbConnect();
+hesk_limitBfAttempts();
+
+$modsForHesk_settings = mfh_getSettings();
+
 // Is the password reset function enabled?
 if ( ! $hesk_settings['reset_pass'])
 {
@@ -133,11 +139,6 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST')
 		}
 	}
 
-	// Connect to database and check for brute force attempts
-	hesk_load_database_functions();
-	hesk_dbConnect();
-	hesk_limitBfAttempts();
-
 	// Get email
 	$email = hesk_validateEmail( hesk_POST('email'), 'ERR', 0) or $hesk_error_buffer['email']=$hesklang['enter_valid_email'];
 
@@ -180,8 +181,8 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST')
 			require(HESK_PATH . 'inc/email_functions.inc.php');
 
 			// Get the email message
-			$msg = hesk_getEmailMessage('reset_password',array(),1,0,1);
+			$msg = hesk_getEmailMessage('reset_password',array(),$modsForHesk_settings,1,0,1);
-            $htmlMsg = hesk_getHtmlMessage('reset_password',array(),1,0,1);
+            $htmlMsg = hesk_getHtmlMessage('reset_password',array(),$modsForHesk_settings,1,0,1);
 
 			// Replace message special tags
 			$msg = str_replace('%%NAME%%',				hesk_msgToPlain($row['name'],1,1),	$msg);
@@ -194,7 +195,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST')
             $htmlMsg = str_replace('%%PASSWORD_RESET%%',	$hesk_settings['hesk_url'].'/'.$hesk_settings['admin_dir'].'/password.php?h='.$hash, $htmlMsg);
 
 			// Send email
-			hesk_mail($email, $hesklang['reset_password'], $msg, $htmlMsg);
+			hesk_mail($email, $hesklang['reset_password'], $msg, $htmlMsg, $modsForHesk_settings);
 
 			// Show success
 			hesk_process_messages($hesklang['pemls'],'NOREDIRECT','SUCCESS');
@@ -238,6 +239,9 @@ elseif ( isset($_GET['h']) )
 			// Expire all verification hashes for this user
 			hesk_dbQuery("DELETE FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."reset_password` WHERE `user`=".intval($row['user']));
 
+			// Load additional required functions
+			require(HESK_PATH . 'inc/admin_functions.inc.php');
+
 			// Get user details
 			$res = hesk_dbQuery('SELECT * FROM `'.$hesk_settings['db_pfix']."users` WHERE `id`=".intval($row['user'])." LIMIT 1");
 			$row = hesk_dbFetchAssoc($res);
@@ -245,6 +249,11 @@ elseif ( isset($_GET['h']) )
 			{
 				$_SESSION[$k]=$v;
 			}
+
+			// Set a tag that will be used to expire sessions after username or password change
+			$_SESSION['session_verify'] = hesk_activeSessionCreateTag($_SESSION['user'], $_SESSION['pass']);
+
+			// We don't need the password hash anymore
 			unset($_SESSION['pass']);
 
 			// Clean brute force attempts

admin/profile.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************

admin/reports.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************

admin/service_messages.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************

admin/show_tickets.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -37,7 +37,6 @@ define('HESK_PATH','../');
 
 /* Get all the required files and functions */
 require(HESK_PATH . 'hesk_settings.inc.php');
-require(HESK_PATH . 'modsForHesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
 require(HESK_PATH . 'inc/status_functions.inc.php');

change_status.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************

css/hesk_newStyle.css

@@ -1,23 +1,3 @@
-<?php
-    header("Content-type: text/css; charset: UTF-8");
-    require_once('../modsForHesk_settings.inc.php');
-
-    $navbarBackgroundColor = $modsForHesk_settings['navbarBackgroundColor'];
-    $navbarBrandColor = $modsForHesk_settings['navbarBrandColor'];
-    $navbarBrandHoverColor = $modsForHesk_settings['navbarBrandHoverColor'];
-
-    $navbarItemTextColor = $modsForHesk_settings['navbarItemTextColor'];
-    $navbarItemTextHoverColor = $modsForHesk_settings['navbarItemTextHoverColor'];
-    $navbarItemTextSelectedColor = $modsForHesk_settings['navbarItemTextSelectedColor'];
-    $navbarItemSelectedBackgroundColor = $modsForHesk_settings['navbarItemSelectedBackgroundColor'];
-
-    $dropdownItemTextColor = $modsForHesk_settings['dropdownItemTextColor'];
-    $dropdownItemTextHoverColor = $modsForHesk_settings['dropdownItemTextHoverColor'];
-    $dropdownItemTextHoverBackgroundColor = $modsForHesk_settings['dropdownItemTextHoverBackgroundColor'];
-
-    $questionMarkColor = $modsForHesk_settings['questionMarkColor'];
-?>
-
 .nu-rtlFloatLeft {
     /* Don't do anything; the pager looks good already */
 }
@@ -89,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;
 }

css/hesk_newStyleRTL.css

@@ -1,23 +1,3 @@
-<?php
-    header("Content-type: text/css; charset: UTF-8");
-    require_once('../modsForHesk_settings.inc.php');
-
-    $navbarBackgroundColor = $modsForHesk_settings['navbarBackgroundColor'];
-    $navbarBrandColor = $modsForHesk_settings['navbarBrandColor'];
-    $navbarBrandHoverColor = $modsForHesk_settings['navbarBrandHoverColor'];
-
-    $navbarItemTextColor = $modsForHesk_settings['navbarItemTextColor'];
-    $navbarItemTextHoverColor = $modsForHesk_settings['navbarItemTextHoverColor'];
-    $navbarItemTextSelectedColor = $modsForHesk_settings['navbarItemTextSelectedColor'];
-    $navbarItemSelectedBackgroundColor = $modsForHesk_settings['navbarItemSelectedBackgroundColor'];
-
-    $dropdownItemTextColor = $modsForHesk_settings['dropdownItemTextColor'];
-    $dropdownItemTextHoverColor = $modsForHesk_settings['dropdownItemTextHoverColor'];
-    $dropdownItemTextHoverBackgroundColor = $modsForHesk_settings['dropdownItemTextHoverBackgroundColor'];
-
-    $questionMarkColor = $modsForHesk_settings['questionMarkColor'];
-?>
-
 .nu-rtlFloatLeft {
     float: left;
 }
@@ -89,50 +69,9 @@
 .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;
-}
 .settingsquestionmark:hover {
     text-decoration: underline;
 }
-.h3questionmark {
-    color: <?php echo $questionMarkColor; ?>;
-    font-size: 14px;
-}
 .h3questionmark:hover {
     text-decoration: underline;
 }

download_attachment.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -37,7 +37,6 @@ define('HESK_PATH','./');
 
 // Get all the required files and functions
 require(HESK_PATH . 'hesk_settings.inc.php');
-require(HESK_PATH . 'modsForHesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 hesk_load_database_functions();
 
@@ -141,6 +140,7 @@ else
 // Path of the file on the server
 $realpath = $hesk_settings['attach_dir'] . '/' . $file['saved_name'];
 if (isset($_GET['kb_att'])) {
+	$modsForHesk_settings = mfh_getSettings();
 	$realpath = $modsForHesk_settings['kb_attach_dir'] . '/' . $file['saved_name'];
 }
 

hesk_javascript.js

@@ -1,6 +1,6 @@
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************

inc/admin_functions.inc.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -498,7 +498,8 @@ function hesk_autoLogin($noredirect=0)
 					$ticket['dt'] = hesk_date($ticket['dt'], true);
 					$ticket['lastchange'] = hesk_date($ticket['lastchange'], true);
                     $ticket = hesk_ticketToPlain($ticket, 1, 0);
-					hesk_notifyCustomer('ticket_closed');
+					$modsForHesk_settings = mfh_getSettings();
+					hesk_notifyCustomer($modsForHesk_settings, 'ticket_closed');
 				}
 			}
 		}
@@ -758,13 +759,13 @@ function hesk_checkPermission($feature,$showerror=1) {
 	global $hesklang;
 
     /* Admins have full access to all features */
-    if ($_SESSION['isadmin'])
+	if (isset($_SESSION['isadmin']) && $_SESSION['isadmin'])
     {
         return true;
     }
 
     /* Check other staff for permissions */
-    if (strpos($_SESSION['heskprivileges'], $feature) === false)
+	if (isset($_SESSION['heskprivileges']) && strpos($_SESSION['heskprivileges'], $feature) === false)
     {
     	if ($showerror)
         {

inc/attachments.inc.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************

inc/common.inc.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -37,6 +37,12 @@ if (!defined('IN_SCRIPT')) {die('Invalid attempt');}
 
 #error_reporting(E_ALL);
 
+// Set correct Content-Type header
+if ( ! defined('NO_HTTP_HEADER') )
+{
+	header('Content-Type: text/html; charset=utf-8');
+}
+
 // Set backslash options
 if (get_magic_quotes_gpc())
 {
@@ -1983,3 +1989,14 @@ function mfh_getNumberOfDownloadsForAttachment($att_id, $table='attachments')
 	$rec = hesk_dbFetchAssoc($res);
 	return $rec['download_count'];
 }
+
+function mfh_getSettings() {
+	global $hesk_settings;
+
+	$settings = array();
+	$res = hesk_dbQuery("SELECT `Key`, `Value` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` WHERE `Key` <> 'modsForHeskVersion'");
+	while ($row = hesk_dbFetchAssoc($res)) {
+		$settings[$row['Key']] = $row['Value'];
+	}
+	return $settings;
+}

inc/email_functions.inc.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -35,12 +35,6 @@
 /* Check if this is a valid include */
 if (!defined('IN_SCRIPT')) {die('Invalid attempt');}
 
-// Include modsForHesk_settings.inc.php if it hasn't been included already
-if (!isset($modsForHesk_settings))
-{
-    include(HESK_PATH . 'modsForHesk_settings.inc.php');
-}
-
 /* Get includes for SMTP */
 if ($hesk_settings['smtp'])
 {
@@ -51,7 +45,7 @@ if ($hesk_settings['smtp'])
 	}
 }
 
-function hesk_notifyCustomerForVerifyEmail($email_template = 'verify_email', $activationKey)
+function hesk_notifyCustomerForVerifyEmail($email_template = 'verify_email', $activationKey, $modsForHesk_settings)
 {
     global $hesk_settings, $ticket;
 
@@ -62,14 +56,14 @@ function hesk_notifyCustomerForVerifyEmail($email_template = 'verify_email', $ac
 
     // Format email subject and message
     $subject = hesk_getEmailSubject($email_template, $ticket);
-    $message = hesk_getEmailMessage($email_template, $ticket);
+    $message = hesk_getEmailMessage($email_template, $ticket, $modsForHesk_settings);
-    $htmlMessage = hesk_getHtmlMessage($email_template, $ticket);
+    $htmlMessage = hesk_getHtmlMessage($email_template, $ticket, $modsForHesk_settings);
     $activationUrl = $hesk_settings['hesk_url'] . '/verifyemail.php?key=%%ACTIVATIONKEY%%';
     $message = str_replace('%%VERIFYURL%%', $activationUrl, $message);
     $htmlMessage = str_replace('%%VERIFYURL%%', $activationUrl, $htmlMessage);
     $message = str_replace('%%ACTIVATIONKEY%%', $activationKey, $message);
     $htmlMessage = str_replace('%%ACTIVATIONKEY%%', $activationKey, $htmlMessage);
-    $hasMessage = hesk_doesTemplateHaveTag($email_template, '%%MESSAGE%%');
+    $hasMessage = hesk_doesTemplateHaveTag($email_template, '%%MESSAGE%%', $modsForHesk_settings);
 
     // Add Cc / Bcc recipents if needed
     $ccEmails = array();
@@ -88,11 +82,11 @@ function hesk_notifyCustomerForVerifyEmail($email_template = 'verify_email', $ac
         }
     }
 
-    hesk_mail($ticket['email'], $subject, $message, $htmlMessage, $ccEmails, $bccEmails, $hasMessage);
+    hesk_mail($ticket['email'], $subject, $message, $htmlMessage, $modsForHesk_settings, $ccEmails, $bccEmails, $hasMessage);
 }
 
 
-function hesk_notifyCustomer($email_template = 'new_ticket')
+function hesk_notifyCustomer($modsForHesk_settings, $email_template = 'new_ticket')
 {
 	global $hesk_settings, $hesklang, $ticket;
 
@@ -104,7 +98,7 @@ function hesk_notifyCustomer($email_template = 'new_ticket')
 
     $changedLanguage = false;
     //Set the user's language according to the ticket.
-    if ($ticket['language'] !== NULL)
+    if (isset($ticket['language']) && $ticket['language'] !== NULL)
     {
         hesk_setLanguage($ticket['language']);
         $changedLanguage = true;
@@ -112,9 +106,9 @@ function hesk_notifyCustomer($email_template = 'new_ticket')
 
 	// Format email subject and message
 	$subject = hesk_getEmailSubject($email_template,$ticket);
-	$message = hesk_getEmailMessage($email_template,$ticket);
+	$message = hesk_getEmailMessage($email_template,$ticket,$modsForHesk_settings);
-    $htmlMessage = hesk_getHtmlMessage($email_template,$ticket);
+    $htmlMessage = hesk_getHtmlMessage($email_template,$ticket, $modsForHesk_settings);
-    $hasMessage = hesk_doesTemplateHaveTag($email_template,'%%MESSAGE%%');
+    $hasMessage = hesk_doesTemplateHaveTag($email_template,'%%MESSAGE%%', $modsForHesk_settings);
 
     // Add Cc / Bcc recipents if needed
     $ccEmails = array();
@@ -132,20 +126,17 @@ function hesk_notifyCustomer($email_template = 'new_ticket')
     }
 
 	// Send e-mail
-	hesk_mail($ticket['email'], $subject, $message, $htmlMessage, $ccEmails, $bccEmails, $hasMessage);
+	hesk_mail($ticket['email'], $subject, $message, $htmlMessage, $modsForHesk_settings, $ccEmails, $bccEmails, $hasMessage);
 
     // Reset the language if it was changed
-    if ($changedLanguage)
+    hesk_resetLanguage();
-    {
-        hesk_resetLanguage();
-    }
 
     return true;
 
 } // END hesk_notifyCustomer()
 
 
-function hesk_notifyAssignedStaff($autoassign_owner, $email_template, $type = 'notify_assigned')
+function hesk_notifyAssignedStaff($autoassign_owner, $email_template, $modsForHesk_settings, $type = 'notify_assigned')
 {
 	global $hesk_settings, $hesklang, $ticket;
 
@@ -177,12 +168,12 @@ function hesk_notifyAssignedStaff($autoassign_owner, $email_template, $type = 'n
 
 	/* Format email subject and message for staff */
     $subject = hesk_getEmailSubject($email_template,$ticket);
-	$message = hesk_getEmailMessage($email_template,$ticket,1);
+	$message = hesk_getEmailMessage($email_template,$ticket,$modsForHesk_settings,1);
-    $htmlMessage = hesk_getHtmlMessage($email_template,$ticket,1);
+    $htmlMessage = hesk_getHtmlMessage($email_template,$ticket,$modsForHesk_settings,1);
-    $hasMessage = hesk_doesTemplateHaveTag($email_template,'%%MESSAGE%%');
+    $hasMessage = hesk_doesTemplateHaveTag($email_template,'%%MESSAGE%%', $modsForHesk_settings);
 
 	/* Send email to staff */
-	hesk_mail($autoassign_owner['email'], $subject, $message, $htmlMessage, array(), array(), $hasMessage);
+	hesk_mail($autoassign_owner['email'], $subject, $message, $htmlMessage, $modsForHesk_settings, array(), array(), $hasMessage);
 
     /* Reset language to original one */
     hesk_resetLanguage();
@@ -192,7 +183,7 @@ function hesk_notifyAssignedStaff($autoassign_owner, $email_template, $type = 'n
 } // END hesk_notifyAssignedStaff()
 
 
-function hesk_notifyStaff($email_template,$sql_where,$is_ticket=1)
+function hesk_notifyStaff($email_template,$sql_where,$modsForHesk_settings,$is_ticket=1)
 {
 	global $hesk_settings, $hesklang, $ticket;
 
@@ -228,7 +219,7 @@ function hesk_notifyStaff($email_template,$sql_where,$is_ticket=1)
     	/* Make sure each user gets email in his/her preferred language */
         $current_language = 'NONE';
         $recipients = array();
-        $hasMessage = hesk_doesTemplateHaveTag($email_template,'%%MESSAGE%%');
+        $hasMessage = hesk_doesTemplateHaveTag($email_template,'%%MESSAGE%%', $modsForHesk_settings);
 
 		/* Loop through staff */
         foreach ($admins as $admin)
@@ -251,7 +242,7 @@ function hesk_notifyStaff($email_template,$sql_where,$is_ticket=1)
                 if ($current_language != 'NONE')
                 {
 					/* Send e-mail to staff */
-					hesk_mail(implode(',',$recipients), $subject, $message, $htmlMessage, array(), array(), $hasMessage);
+					hesk_mail(implode(',',$recipients), $subject, $message, $htmlMessage, $modsForHesk_settings, array(), array(), $hasMessage);
 
                     /* Reset list of email addresses */
                     $recipients = array();
@@ -262,9 +253,9 @@ function hesk_notifyStaff($email_template,$sql_where,$is_ticket=1)
 
 				/* Format staff email subject and message for this language */
                 $subject = hesk_getEmailSubject($email_template,$ticket);
-				$message = hesk_getEmailMessage($email_template,$ticket,$is_ticket);
+				$message = hesk_getEmailMessage($email_template,$ticket,$modsForHesk_settings,$is_ticket);
-                $htmlMessage = hesk_getHtmlMessage($email_template,$ticket,$is_ticket);
+                $htmlMessage = hesk_getHtmlMessage($email_template,$ticket,$modsForHesk_settings,$is_ticket);
-                $hasMessage = hesk_doesTemplateHaveTag($email_template, '%%MESSAGE%%');
+                $hasMessage = hesk_doesTemplateHaveTag($email_template, '%%MESSAGE%%', $modsForHesk_settings);
 
 				/* Add email to the recipients list */
 				$recipients[] = $admin['email'];
@@ -275,7 +266,7 @@ function hesk_notifyStaff($email_template,$sql_where,$is_ticket=1)
         }
 
         /* Send email messages to the remaining staff */
-		hesk_mail(implode(',',$recipients), $subject, $message, $htmlMessage, array(), array(), $hasMessage);
+		hesk_mail(implode(',',$recipients), $subject, $message, $htmlMessage, $modsForHesk_settings, array(), array(), $hasMessage);
 
 		/* Reset language to original one */
 		hesk_resetLanguage();
@@ -337,9 +328,9 @@ function hesk_validEmails()
 } // END hesk_validEmails()
 
 
-function hesk_mail($to,$subject,$message,$htmlMessage,$cc=array(),$bcc=array(),$hasMessageTag = false)
+function hesk_mail($to,$subject,$message,$htmlMessage,$modsForHesk_settings,$cc=array(),$bcc=array(),$hasMessageTag = false)
 {
-	global $hesk_settings, $hesklang, $modsForHesk_settings, $ticket;
+	global $hesk_settings, $hesklang, $ticket;
 
 	// Are we in demo mode or are all email fields blank? If so, don't send an email.
 	if ( defined('HESK_DEMO')
@@ -627,9 +618,9 @@ function hesk_getEmailSubject($eml_file, $ticket='', $is_ticket=1, $strip=0)
 
 } // hesk_getEmailSubject()
 
-function hesk_getHtmlMessage($eml_file, $ticket, $is_admin=0, $is_ticket=1, $just_message=0)
+function hesk_getHtmlMessage($eml_file, $ticket, $modsForHesk_settings, $is_admin=0, $is_ticket=1, $just_message=0)
 {
-    global $hesk_settings, $hesklang, $modsForHesk_settings;
+    global $hesk_settings, $hesklang;
 
     // Demo mode
     if ( defined('HESK_DEMO') || !$modsForHesk_settings['html_emails'])
@@ -658,11 +649,11 @@ function hesk_getHtmlMessage($eml_file, $ticket, $is_admin=0, $is_ticket=1, $jus
     }
 
     //Perform logic common between hesk_getEmailMessage and hesk_getHtmlMessage
-    $msg = hesk_processMessage($msg, $ticket, $is_admin, $is_ticket, $just_message, true);
+    $msg = hesk_processMessage($msg, $ticket, $is_admin, $is_ticket, $just_message, $modsForHesk_settings, true);
     return $msg;
 }
 
-function hesk_getEmailMessage($eml_file, $ticket, $is_admin=0, $is_ticket=1, $just_message=0)
+function hesk_getEmailMessage($eml_file, $ticket, $modsForHesk_settings, $is_admin=0, $is_ticket=1, $just_message=0)
 {
 	global $hesk_settings, $hesklang;
 
@@ -693,14 +684,14 @@ function hesk_getEmailMessage($eml_file, $ticket, $is_admin=0, $is_ticket=1, $ju
     	hesk_error($hesklang['emfm'].': '.$eml_file);
     }
 
-    $msg = hesk_processMessage($msg, $ticket, $is_admin, $is_ticket, $just_message);
+    $msg = hesk_processMessage($msg, $ticket, $is_admin, $is_ticket, $just_message, $modsForHesk_settings);
     return $msg;
 
 } // END hesk_getEmailMessage
 
-function hesk_doesTemplateHaveTag($eml_file, $tag)
+function hesk_doesTemplateHaveTag($eml_file, $tag, $modsForHesk_settings)
 {
-    global $hesk_settings, $modsForHesk_settings;
+    global $hesk_settings;
     $path = 'language/' . $hesk_settings['languages'][$hesk_settings['language']]['folder'] . '/emails/'. $eml_file .'.txt';
     $htmlHasTag = false;
     if ($modsForHesk_settings['html_emails']) {
@@ -712,9 +703,9 @@ function hesk_doesTemplateHaveTag($eml_file, $tag)
     return !(strpos($emailContents, $tag) === false) || $htmlHasTag;
 }
 
-function hesk_processMessage($msg, $ticket, $is_admin, $is_ticket, $just_message, $isForHtml = 0)
+function hesk_processMessage($msg, $ticket, $is_admin, $is_ticket, $just_message, $modsForHesk_settings, $isForHtml = 0)
 {
-    global $hesk_settings, $hesklang, $modsForHesk_settings;
+    global $hesk_settings, $hesklang;
 
     /* Return just the message without any processing? */
     if ($just_message)
@@ -741,8 +732,10 @@ function hesk_processMessage($msg, $ticket, $is_admin, $is_ticket, $just_message
             if ($isForHtml)
             {
                 $htmlMessage = nl2br($ticket['message']);
+                $msg = str_replace('%%MESSAGE_NO_ATTACHMENTS%%', $htmlMessage, $msg);
                 return str_replace('%%MESSAGE%%', $htmlMessage, $msg);
             }
+            $msg = str_replace('%%MESSAGE_NO_ATTACHMENTS%%', $ticket['message'], $msg);
             return str_replace('%%MESSAGE%%', $ticket['message'], $msg);
         }
         else
@@ -834,7 +827,6 @@ function hesk_processMessage($msg, $ticket, $is_admin, $is_ticket, $just_message
         }
 
         // Add direct links to any attachments at the bottom of the email message OR add them as attachments, depending on the settings
-        // if ($modsForHesk_settings['attachments'] == 'inline' (other is 'attachment') {...}
         if ($hesk_settings['attachments']['use'] && isset($ticket['attachments']) && strlen($ticket['attachments']) )
         {
             if (!$modsForHesk_settings['attachments']) {
@@ -866,6 +858,15 @@ function hesk_processMessage($msg, $ticket, $is_admin, $is_ticket, $just_message
         {
             $msg = $hesklang['EMAIL_HR'] . "\n\n" . $msg;
         }
+    } elseif (strpos($msg, '%%MESSAGE_NO_ATTACHMENTS%%') !== false) {
+        if ($isForHtml)
+        {
+            $htmlMessage = nl2br($ticket['message']);
+            $msg = str_replace('%%MESSAGE_NO_ATTACHMENTS%%', $htmlMessage, $msg);
+        } else
+        {
+            $msg = str_replace('%%MESSAGE_NO_ATTACHMENTS%%',$ticket['message'],$msg);
+        }
     }
 
     return $msg;

inc/header.inc.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -34,7 +34,11 @@
 
 /* Check if this is a valid include */
 if (!defined('IN_SCRIPT')) {die('Invalid attempt');}
-require(HESK_PATH . 'modsForHesk_settings.inc.php');
+if (!function_exists('mfh_getSettings')) {
+    die('Mods for HESK settings are not accessible!');
+}
+
+$modsForHesk_settings = mfh_getSettings();
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -42,7 +46,7 @@ require(HESK_PATH . 'modsForHesk_settings.inc.php');
 	<title><?php echo (isset($hesk_settings['tmp_title']) ? $hesk_settings['tmp_title'] : $hesk_settings['hesk_title']); ?></title>
 	<meta http-equiv="Content-Type" content="text/html;charset=<?php echo $hesklang['ENCODING']; ?>" />
     <meta name="viewport" content="width=device-width, user-scalable=no">
-    <meta name="theme-color" content="<?php echo $modsForHesk_settings['navbarBackgroundColor']; ?>">
+    <meta name="theme-color" content="<?php echo '#414a5c'; ?>">
     <?php if ($modsForHesk_settings['rtl']) { ?>
     <link href="<?php echo HESK_PATH; ?>hesk_style_RTL.css?v=<?php echo $hesk_settings['hesk_version']; ?>" type="text/css" rel="stylesheet" />
     <?php } else { ?>
@@ -53,9 +57,9 @@ require(HESK_PATH . 'modsForHesk_settings.inc.php');
 	<link href="<?php echo HESK_PATH; ?>css/bootstrap-theme.css?v=<?php echo $hesk_settings['hesk_version']; ?>" type="text/css" rel="stylesheet" <?php if ($modsForHesk_settings['use_bootstrap_theme'] == 0) {echo 'disabled';} ?>>
     <?php if ($modsForHesk_settings['rtl']) { ?>
     <link href="<?php echo HESK_PATH; ?>css/bootstrap-rtl.min.css?v=<?php echo $hesk_settings['hesk_version']; ?>" type="text/css" rel="stylesheet" />
-	<link href="<?php echo HESK_PATH; ?>css/hesk_newStyleRTL.php?v=<?php echo $hesk_settings['hesk_version']; ?>" type="text/css" rel="stylesheet" />
+	<link href="<?php echo HESK_PATH; ?>css/hesk_newStyleRTL.css?v=<?php echo $hesk_settings['hesk_version']; ?>" type="text/css" rel="stylesheet" />
     <?php } else { ?>
-    <link href="<?php echo HESK_PATH; ?>css/hesk_newStyle.php?v=<?php echo $hesk_settings['hesk_version']; ?>" type="text/css" rel="stylesheet" />
+    <link href="<?php echo HESK_PATH; ?>css/hesk_newStyle.css?v=<?php echo $hesk_settings['hesk_version']; ?>" type="text/css" rel="stylesheet" />
     <?php } ?>
     <link href="<?php echo HESK_PATH; ?>css/bootstrap-iconpicker.min.css" rel="stylesheet">
     <link href="//netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
@@ -70,6 +74,47 @@ require(HESK_PATH . 'modsForHesk_settings.inc.php');
     <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 $modsForHesk_settings['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']; ?>;
+            cursor: pointer;
+        }
+        .h3questionmark {
+            color: <?php echo $modsForHesk_settings['questionMarkColor']; ?>;
+        }
+    </style>
 
     <?php
 

inc/headerAdmin.inc.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -34,7 +34,8 @@
 
 /* Check if this is a valid include */
 if (!defined('IN_SCRIPT')) {die('Invalid attempt');}
-require(HESK_PATH . 'modsForHesk_settings.inc.php');
+
+$modsForHesk_settings = mfh_getSettings();
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
@@ -42,7 +43,7 @@ require(HESK_PATH . 'modsForHesk_settings.inc.php');
 	<title><?php echo (isset($hesk_settings['tmp_title']) ? $hesk_settings['tmp_title'] : $hesk_settings['hesk_title']); ?></title>
 	<meta http-equiv="Content-Type" content="text/html;charset=<?php echo $hesklang['ENCODING']; ?>" />
     <meta name="viewport" content="width=device-width, user-scalable=no">
-    <meta name="theme-color" content="<?php echo $modsForHesk_settings['navbarBackgroundColor']; ?>">
+    <meta name="theme-color" content="<?php echo '#414a5c'; ?>">
 	<?php if ($modsForHesk_settings['rtl']) { ?>
     <link href="<?php echo HESK_PATH; ?>hesk_style_RTL.css?v=<?php echo $hesk_settings['hesk_version']; ?>" type="text/css" rel="stylesheet" />
     <?php } else { ?>
@@ -53,9 +54,9 @@ require(HESK_PATH . 'modsForHesk_settings.inc.php');
 	<link href="<?php echo HESK_PATH; ?>css/bootstrap-theme.css?v=<?php echo $hesk_settings['hesk_version']; ?>" type="text/css" rel="stylesheet" <?php if ($modsForHesk_settings['use_bootstrap_theme'] == 0) {echo 'disabled';} ?>>
     <?php if ($modsForHesk_settings['rtl']) { ?>
     <link href="<?php echo HESK_PATH; ?>css/bootstrap-rtl.min.css?v=<?php echo $hesk_settings['hesk_version']; ?>" type="text/css" rel="stylesheet" />
-	<link href="<?php echo HESK_PATH; ?>css/hesk_newStyleRTL.php?v=<?php echo $hesk_settings['hesk_version']; ?>" type="text/css" rel="stylesheet" />
+	<link href="<?php echo HESK_PATH; ?>css/hesk_newStyleRTL.css?v=<?php echo $hesk_settings['hesk_version']; ?>" type="text/css" rel="stylesheet" />
     <?php } else { ?>
-    <link href="<?php echo HESK_PATH; ?>css/hesk_newStyle.php?v=<?php echo $hesk_settings['hesk_version']; ?>" type="text/css" rel="stylesheet" />
+    <link href="<?php echo HESK_PATH; ?>css/hesk_newStyle.css?v=<?php echo $hesk_settings['hesk_version']; ?>" type="text/css" rel="stylesheet" />
     <?php } ?>
     <link href="<?php echo HESK_PATH; ?>css/bootstrap-iconpicker.min.css" rel="stylesheet">
     <link href="//netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
@@ -70,6 +71,47 @@ require(HESK_PATH . 'modsForHesk_settings.inc.php');
     <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 $modsForHesk_settings['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']; ?>;
+			cursor: pointer;
+		}
+		.h3questionmark {
+			color: <?php echo $modsForHesk_settings['questionMarkColor']; ?>;
+		}
+	</style>
 
     <?php
 	/* Prepare Javascript that browser should load on page load */

inc/knowledgebase_functions.inc.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************

inc/pipe_functions.inc.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -43,7 +43,6 @@ require(HESK_PATH . 'inc/htmLawed.php');
 require(HESK_PATH . 'inc/mail/rfc822_addresses.php');
 require(HESK_PATH . 'inc/mail/mime_parser.php');
 require(HESK_PATH . 'inc/mail/email_parser.php');
-require(HESK_PATH . 'modsForHesk_settings.inc.php');
 
 /*** FUNCTIONS ***/
 
@@ -301,12 +300,13 @@ function hesk_email2ticket($results, $pop3 = 0, $set_category = 1, $set_priority
 		// --> If ticket is assigned just notify the owner
 		if ($ticket['owner'])
 		{
-			hesk_notifyAssignedStaff(false, 'new_reply_by_customer', 'notify_reply_my');
+			$modsForHesk_settings = mfh_getSettings();
+			hesk_notifyAssignedStaff(false, 'new_reply_by_customer', $modsForHesk_settings, 'notify_reply_my');
 		}
 		// --> No owner assigned, find and notify appropriate staff
 		else
 		{
-			hesk_notifyStaff('new_reply_by_customer',"`notify_reply_unassigned`='1'");
+			hesk_notifyStaff('new_reply_by_customer',"`notify_reply_unassigned`='1'", $modsForHesk_settings);
 		}
 
 		return $ticket['trackid'];
@@ -363,7 +363,7 @@ function hesk_email2ticket($results, $pop3 = 0, $set_category = 1, $set_priority
 		// SPAM tags not found or not checked, send email
 		if ($possible_SPAM === false)
 		{
-			hesk_notifyCustomer();
+			hesk_notifyCustomer($modsForHesk_settings);
 		}
 	}
 
@@ -371,12 +371,12 @@ function hesk_email2ticket($results, $pop3 = 0, $set_category = 1, $set_priority
 	// --> From autoassign?
 	if ($tmpvar['owner'] && $autoassign_owner['notify_assigned'])
 	{
-		hesk_notifyAssignedStaff($autoassign_owner, 'ticket_assigned_to_you');
+		hesk_notifyAssignedStaff($autoassign_owner, 'ticket_assigned_to_you', $modsForHesk_settings);
 	}
 	// --> No autoassign, find and notify appropriate staff
 	elseif ( ! $tmpvar['owner'] )
 	{
-		hesk_notifyStaff('new_ticket_staff', " `notify_new_unassigned` = '1' ");
+		hesk_notifyStaff('new_ticket_staff', " `notify_new_unassigned` = '1' ", $modsForHesk_settings);
 	}
 
     return $ticket['trackid'];

inc/posting_functions.inc.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************

inc/print_tickets.inc.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************

inc/profile_functions.inc.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************

inc/recaptcha/recaptchalib_v2.php

@@ -52,7 +52,7 @@ class ReCaptcha
      *
      * @param string $secret shared secret between site and ReCAPTCHA server.
      */
-    function ReCaptcha($secret)
+    function __construct($secret)
     {
         if ($secret == null || $secret == "") {
             die("To use reCAPTCHA you must get an API key from <a href='"

inc/show_admin_nav.inc.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************

inc/show_search_form.inc.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.4 from 22nd June 2015
+ *  Version: 2.6.5 from 28th August 2015
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
@@ -41,7 +41,7 @@ if ( ! isset($status) )
     //-- We don't want to check statuses that are considered "closed"
     foreach ($allStatuses as $row)
     {
-        if ($status['IsClosed'] == 1) {
+        if ($row['IsClosed'] == 1) {
             continue;
         }
 

inc/status_functions.inc.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.4 from 22nd June 2015
+ *  Version: 2.6.5 from 28th August 2015
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************

inc/ticket_list.inc.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************

index.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -38,16 +38,18 @@ define('WYSIWYG',1);
 
 // Get all the required files and functions
 require(HESK_PATH . 'hesk_settings.inc.php');
-require(HESK_PATH . 'modsForHesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 
+hesk_load_database_functions();
+hesk_dbConnect();
 // Are we in maintenance mode?
 hesk_check_maintenance();
-hesk_load_database_functions();
 
 // Are we in "Knowledgebase only" mode?
 hesk_check_kb_only();
 
+$modsForHesk_settings = mfh_getSettings();
+
 // What should we do?
 $action = hesk_REQUEST('a');
 
@@ -1273,7 +1275,7 @@ function print_start()
 
 function forgot_tid()
 {
-	global $hesk_settings, $hesklang;
+	global $hesk_settings, $hesklang, $modsForHesk_settings;
 
 	require(HESK_PATH . 'inc/email_functions.inc.php');
 
@@ -1337,18 +1339,18 @@ function forgot_tid()
     $html_tid_list .= '</ul>';
 
 	/* Get e-mail message for customer */
-	$msg = hesk_getEmailMessage('forgot_ticket_id','',0,0,1);
+	$msg = hesk_getEmailMessage('forgot_ticket_id','',$modsForHesk_settings,0,0,1);
     $msg = processEmail($msg, $name, $num, $tid_list);
 
     // Get HTML message for customer
-    $htmlMsg = hesk_getHtmlMessage('forgot_ticket_id','',0,0,1);
+    $htmlMsg = hesk_getHtmlMessage('forgot_ticket_id','', $modsForHesk_settings, 0,0,1);
     $htmlMsg = processEmail($htmlMsg, $name, $num, $html_tid_list);
 
 
     $subject = hesk_getEmailSubject('forgot_ticket_id');
 
 	/* Send e-mail */
-	hesk_mail($email, $subject, $msg, $htmlMsg);
+	hesk_mail($email, $subject, $msg, $htmlMsg, $modsForHesk_settings);
 
 	/* Show success message */
 	$tmp  = '<b>'.$hesklang['tid_sent'].'!</b>';

install/install.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************

install/install_functions.inc.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -36,8 +36,8 @@
 if (!defined('IN_SCRIPT')) {die('Invalid attempt');}
 
 // We will be installing this HESK version:
-define('HESK_NEW_VERSION','2.6.4');
+define('HESK_NEW_VERSION','2.6.5');
-define('MODS_FOR_HESK_NEW_VERSION','2.4.1');
+define('MODS_FOR_HESK_NEW_VERSION','2.4.2');
 define('REQUIRE_PHP_VERSION','5.0.0');
 define('REQUIRE_MYSQL_VERSION','5.0.7');
 

install/mods-for-hesk/ajax/install-database-ajax.php

@@ -51,6 +51,8 @@ if ($version == 1) {
 } elseif ($version == 241) {
     execute241Scripts();
     execute241FileUpdate();
+} elseif ($version == 242) {
+    execute242Scripts();
 } else {
     $response = 'The version "'.$version.'" was not recognized. Check the value submitted and try again.';
     print $response;

install/mods-for-hesk/installModsForHesk.php

@@ -61,6 +61,12 @@ function echoInitialVersionRows($version) {
     if ($version < 240) {
         printRow('v2.4.0');
     }
+    if ($version < 241) {
+        printRow('v2.4.1');
+    }
+    if ($version < 242) {
+        printRow('v2.4.2');
+    }
 }
 
 function printRow($version) {

install/mods-for-hesk/js/version-scripts.js

@@ -53,6 +53,9 @@ function processUpdates(startingVersion) {
     } else if (startingVersion < 241) {
         startVersionUpgrade('241');
         executeUpdate(241, '241', '2.4.1');
+    } else if (startingVersion < 242) {
+        startVersionUpgrade('242');
+        executeUpdate(242, '242', '2.4.2');
     } else {
         installationFinished();
     }

install/mods-for-hesk/modsForHesk.php

@@ -65,24 +65,6 @@ hesk_dbConnect();
                                 <td>CREATE, ALTER, DROP Permissions:</td>
                                 <td class="warning"><i class="fa fa-exclamation-triangle"></i> Please check before continuing!*</td>
                             </tr>
-                            <tr>
-                                <td>
-                                    modsForHesk_settings.inc.php
-                                </td>
-                                <?php
-                                $fileperm = substr(sprintf('%o', fileperms(HESK_PATH.'modsForHesk_settings.inc.php')), -4);
-                                $class =  (intval($fileperm) < 666) ? 'class="danger"' : 'class="success"';
-                                ?>
-                                <td <?php echo $class; ?>>
-                                    <?php if ($class == 'class="success"') {
-                                        echo '<i class="fa fa-check-circle"></i> Success';
-                                    } else {
-                                        echo '<i class="fa fa-times-circle"></i> CHMOD to 0666, yours is '.$fileperm;
-                                        $allowInstallation = false;
-                                    }
-                                    ?>
-                                </td>
-                            </tr>
                             <tr>
                                 <td colspan="2">
                                     * Mods for HESK is unable to check database permissions automatically.
@@ -137,6 +119,17 @@ hesk_dbConnect();
                                 }
                                 ?>
                                 <div class="row">
+                                    <div class="col-md-3 col-sm-12">
+                                        <?php
+                                        if ($version == '2.4.1') {
+                                            $v241btn = 'btn-success';
+                                            $disableAllExcept = '241';
+                                        } else {
+                                            $v241btn = 'btn-default';
+                                        }
+                                        ?>
+                                        <a id="241" class="btn <?php echo $v241btn; ?> btn-block disablable" href="installModsForHesk.php?v=241">v2.4.1</a>
+                                    </div>
                                     <div class="col-md-3 col-sm-12">
                                         <?php
                                         if ($version == '2.4.0') {
@@ -170,6 +163,9 @@ hesk_dbConnect();
                                         ?>
                                         <a id="231" class="btn <?php echo $v231btn; ?> btn-block disablable" href="installModsForHesk.php?v=231">v2.3.1</a>
                                     </div>
+                                </div>
+                                <br>
+                                <div class="row">
                                     <div class="col-md-3 col-sm-12">
                                         <?php
                                         if ($version == '2.3.0') {
@@ -181,9 +177,6 @@ hesk_dbConnect();
                                         ?>
                                         <a id="230" class="btn <?php echo $v230btn; ?> btn-block disablable" href="installModsForHesk.php?v=230">v2.3.0</a>
                                     </div>
-                                </div>
-                                <br>
-                                <div class="row">
                                     <div class="col-md-3 col-sm-12">
                                         <?php
                                         if ($version == '2.2.1') {
@@ -217,6 +210,9 @@ hesk_dbConnect();
                                         ?>
                                         <a id="211" class="btn <?php echo $v211btn; ?> btn-block disablable" href="installModsForHesk.php?v=211">v2.1.1</a>
                                     </div>
+                                </div>
+                                <br>
+                                <div class="row">
                                     <div class="col-md-3 col-sm-12">
                                         <?php
                                         if ($version == '2.1.0') {
@@ -228,9 +224,6 @@ hesk_dbConnect();
                                         ?>
                                         <a id="210" class="btn <?php echo $v210btn; ?> btn-block disablable" href="installModsForHesk.php?v=210">v2.1.0</a>
                                     </div>
-                                </div>
-                                <br>
-                                <div class="row">
                                     <div class="col-md-3 col-sm-12">
                                         <?php
                                         if ($version == '2.0.1') {
@@ -264,6 +257,9 @@ hesk_dbConnect();
                                         ?>
                                         <a id="170" class="btn <?php echo $v170btn; ?> btn-block disablable" href="installModsForHesk.php?v=170">v1.7.0</a>
                                     </div>
+                                </div>
+                                <br>
+                                <div class="row">
                                     <div class="col-md-3 col-sm-12">
                                         <?php
                                         if ($version == '1.6.1') {
@@ -275,9 +271,6 @@ hesk_dbConnect();
                                         ?>
                                         <a id="161" class="btn <?php echo $v161btn; ?> btn-block disablable" href="installModsForHesk.php?v=161">v1.6.1</a>
                                     </div>
-                                </div>
-                                <br>
-                                <div class="row">
                                     <div class="col-md-3 col-sm-12">
 
                                         <?php
@@ -296,12 +289,12 @@ hesk_dbConnect();
                                     <div class="col-md-3 col-sm-12">
                                         <a id="141" class="btn btn-default btn-block disablable" href="installModsForHesk.php?v=141">v1.4.1</a>
                                     </div>
-                                    <div class="col-md-3 col-sm-12">
-                                        <a id="140" class="btn btn-default btn-block disablable" href="installModsForHesk.php?v=140">v1.4.0</a>
-                                    </div>
                                 </div>
                                 <br>
                                 <div class="row">
+                                    <div class="col-md-3 col-sm-12">
+                                        <a id="140" class="btn btn-default btn-block disablable" href="installModsForHesk.php?v=140">v1.4.0</a>
+                                    </div>
                                     <div class="col-md-3 col-sm-12">
                                         <a id="130" class="btn btn-default btn-block disablable" href="installModsForHesk.php?v=130">v1.3.0</a>
                                     </div>

install/mods-for-hesk/sql/installSql.php

@@ -677,3 +677,117 @@ $modsForHesk_settings[\'rich_text_for_tickets_for_customers\'] = 0;';
 
     return file_put_contents(HESK_PATH.'modsForHesk_settings.inc.php', $file);
 }
+// END Version 2.4.1
+
+// Version 2.4.2
+function execute242Scripts() {
+    global $hesk_settings;
+
+    hesk_dbConnect();
+
+    executeQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` SET `Value` = '2.4.2' WHERE `Key` = 'modsForHeskVersion'");
+}
+
+// BEGIN Version 2.5.0
+function migrateSettings() {
+    global $hesk_settings;
+
+    if (file_exists(HESK_PATH . 'modsForHesk_settings.inc.php')) {
+        require_once(HESK_PATH . 'modsForHesk_settings.inc.php');
+
+        $rtl = getSettingValue($modsForHesk_settings, 'rtl', 0);
+        $show_icons = getSettingValue($modsForHesk_settings, 'show_icons', 0);
+        $custom_field_setting = getSettingValue($modsForHesk_settings, 'custom_field_setting', 0);
+        $customer_email_verification_required = getSettingValue($modsForHesk_settings, 'customer_email_verification_required', 0);
+        $html_emails = getSettingValue($modsForHesk_settings, 'html_emails', 1);
+        $use_mailgun = getSettingValue($modsForHesk_settings, 'use_mailgun', 0);
+        $mailgun_api_key = getSettingValue($modsForHesk_settings, 'mailgun_api_key', '');
+        $mailgun_domain = getSettingValue($modsForHesk_settings, 'mailgun_domain', '');
+        $use_bootstrap_theme = getSettingValue($modsForHesk_settings, 'use_bootstrap_theme', 1);
+        $new_kb_article_visibility = getSettingValue($modsForHesk_settings, 'new_kb_article_visibility', 0);
+        $attachments = getSettingValue($modsForHesk_settings, 'attachments', 0);
+        $show_number_merged = getSettingValue($modsForHesk_settings, 'show_number_merged', 1);
+        $request_location = getSettingValue($modsForHesk_settings, 'request_location', 0);
+        $category_order_column = getSettingValue($modsForHesk_settings, 'category_order_column', 'cat_order');
+        $rich_text_for_tickets = getSettingValue($modsForHesk_settings, 'rich_text_for_tickets', 0);
+        $statuses_order_column = getSettingValue($modsForHesk_settings, 'statuses_order_column', 'sort');
+        $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).")");
+        executeQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` (`Key`, `Value`)
+            VALUES ('show_icons', ".intval($show_icons).")");
+        executeQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` (`Key`, `Value`)
+            VALUES ('custom_field_setting', ".intval($custom_field_setting).")");
+        executeQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` (`Key`, `Value`)
+            VALUES ('customer_email_verification_required', ".intval($customer_email_verification_required).")");
+        executeQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` (`Key`, `Value`)
+            VALUES ('html_emails', ".intval($html_emails).")");
+        executeQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` (`Key`, `Value`)
+            VALUES ('use_mailgun', ".intval($use_mailgun).")");
+        executeQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` (`Key`, `Value`)
+            VALUES ('mailgun_api_key', '".hesk_dbEscape($mailgun_api_key)."')");
+        executeQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` (`Key`, `Value`)
+            VALUES ('mailgun_domain', '".hesk_dbEscape($mailgun_domain)."')");
+        executeQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` (`Key`, `Value`)
+            VALUES ('use_bootstrap_theme', ".intval($use_bootstrap_theme).")");
+        executeQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` (`Key`, `Value`)
+            VALUES ('new_kb_article_visibility', ".intval($new_kb_article_visibility).")");
+        executeQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` (`Key`, `Value`)
+            VALUES ('attachments', ".intval($attachments).")");
+        executeQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` (`Key`, `Value`)
+            VALUES ('show_number_merged', ".intval($show_number_merged).")");
+        executeQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` (`Key`, `Value`)
+            VALUES ('request_location', ".intval($request_location).")");
+        executeQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` (`Key`, `Value`)
+            VALUES ('category_order_column', '".hesk_dbEscape($category_order_column)."')");
+        executeQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` (`Key`, `Value`)
+            VALUES ('rich_text_for_tickets', ".intval($rich_text_for_tickets).")");
+        executeQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` (`Key`, `Value`)
+            VALUES ('statuses_order_column', '".hesk_dbEscape($statuses_order_column)."')");
+        executeQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` (`Key`, `Value`)
+            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)."')");
+    }
+}
+
+function getSettingValue($settings, $setting, $default) {
+    return isset($settings[$setting]) ? $settings[$setting] : $default;
+}

knowledgebase.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************

language/en/text.php

@@ -21,6 +21,9 @@ $hesklang['_COLLATE']='utf8_unicode_ci';
 // This is the email break line that will be used in email piping
 $hesklang['EMAIL_HR']='------ Reply above this line ------';
 
+// ADDED OR MODIFIED IN Mods for HESK 2.5.0
+$hesklang['ticket_message_no_attachments'] = 'Ticket/Reply message, however attachments will not be included in the email';
+
 // ADDED OR MODIFIED IN Mods for HESK 2.4.0
 $hesklang['sort_by_user_defined_order'] = 'Sort by user-defined order';
 $hesklang['sort_alphabetically'] = 'Sort alphabetically';

modsForHesk_settings.inc.php

@@ -1,64 +0,0 @@
-<?php
-
-//-- Mods For Hesk Theme Color Settings
-$modsForHesk_settings['navbarBackgroundColor'] = '#414a5c';
-$modsForHesk_settings['navbarBrandColor'] = '#d4dee7';
-$modsForHesk_settings['navbarBrandHoverColor'] = '#ffffff';
-$modsForHesk_settings['navbarItemTextColor'] = '#d4dee7';
-$modsForHesk_settings['navbarItemTextHoverColor'] = '#ffffff';
-$modsForHesk_settings['navbarItemTextSelectedColor'] = '#ffffff';
-$modsForHesk_settings['navbarItemSelectedBackgroundColor'] = '#2d3646';
-$modsForHesk_settings['dropdownItemTextColor'] = '#333333';
-$modsForHesk_settings['dropdownItemTextHoverColor'] = '#262626';
-$modsForHesk_settings['dropdownItemTextHoverBackgroundColor'] = '#f5f5f5';
-$modsForHesk_settings['questionMarkColor'] = '#000000';
-
-//-- Set this to 1 for right-to-left text.
-$modsForHesk_settings['rtl'] = 0;
-
-//-- Set this to 1 to show icons next to navigation menu items
-$modsForHesk_settings['show_icons'] = 0;
-
-//-- Set this to 1 to enable custom field names as keys
-$modsForHesk_settings['custom_field_setting'] = 0;
-
-//-- Set this to 1 to enable email verification for new customers
-$modsForHesk_settings['customer_email_verification_required'] = 0;
-
-//-- Set this to 1 to enable HTML-formatted emails.
-$modsForHesk_settings['html_emails'] = 1;
-
-//-- Mailgun Settings
-$modsForHesk_settings['use_mailgun'] = 0;
-$modsForHesk_settings['mailgun_api_key'] = '';
-$modsForHesk_settings['mailgun_domain'] = '';
-
-//-- Set this to 1 to enable bootstrap-theme.css
-$modsForHesk_settings['use_bootstrap_theme'] = 1;
-
-//-- Default value for new Knowledgebase article: 0 = Published, 1 = Private, 2 = Draft
-$modsForHesk_settings['new_kb_article_visibility'] = 0;
-
-//-- Setting for adding attachments to email messages. Either 0 for default-HESK behavior, or 1 to send as attachments
-$modsForHesk_settings['attachments'] = 0;
-
-//-- Setting for showing number of merged tickets in the ticket search screen. 0 = Disable, 1 = Enable
-$modsForHesk_settings['show_number_merged'] = 1;
-
-//-- Setting for requesting user's location. 0 = Disable, 1 = Enable
-$modsForHesk_settings['request_location'] = 0;
-
-//-- Column to sort categories by. Can be either 'name' or 'cat_order'
-$modsForHesk_settings['category_order_column'] = 'cat_order';
-
-//-- Setting for using rich-text editor for tickets. 0 = Disable, 1 = Enable
-$modsForHesk_settings['rich_text_for_tickets'] = 0;
-
-//-- Column to sort statuses by. Can be either 'sort' or 'name'
-$modsForHesk_settings['statuses_order_column'] = 'sort';
-
-//-- Directory to store knowledgebase articles in.
-$modsForHesk_settings['kb_attach_dir'] = 'attachments';
-
-//-- Setting for using rich-text editor for customers. 0 = Disable, 1 = Enable
-$modsForHesk_settings['rich_text_for_tickets_for_customers'] = 0;

print.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -37,12 +37,12 @@ define('HESK_PATH','./');
 
 /* Get all the required files and functions */
 require(HESK_PATH . 'hesk_settings.inc.php');
-require(HESK_PATH . 'modsForHesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 hesk_load_database_functions();
 
 hesk_session_start();
 
+
 /* Get the tracking ID */
 $trackingID = hesk_cleanID() or die("$hesklang[int_error]: $hesklang[no_trackID]");
 
@@ -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>

reply_ticket.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -37,7 +37,6 @@ define('HESK_PATH','./');
 
 /* Get all the required files and functions */
 require(HESK_PATH . 'hesk_settings.inc.php');
-require(HESK_PATH . 'modsForHesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 
 // Are we in maintenance mode?
@@ -66,6 +65,9 @@ hesk_session_start();
 /* A security check */
 # hesk_token_check('POST');
 
+
+/* Connect to database */
+hesk_dbConnect();
 $hesk_error_buffer = array();
 
 // Tracking ID
@@ -78,7 +80,7 @@ $my_email = hesk_getCustomerEmail();
 $message = hesk_input( hesk_POST('message') );
 
 // If the message was entered, further parse it
-if ( strlen($message) )
+if ( strlen($message) && !$modsForHesk_settings['rich_text_for_tickets_for_customers'] )
 {
 	// Make links clickable
 	$message = hesk_makeURL($message);
@@ -135,9 +137,6 @@ if (count($hesk_error_buffer)!=0)
     hesk_process_messages($hesk_error_buffer,'ticket.php?track='.$trackingID.$hesk_settings['e_param'].'&Refresh='.rand(10000,99999));
 }
 
-/* Connect to database */
-hesk_dbConnect();
-
 // Check if this IP is temporarily locked out
 $res = hesk_dbQuery("SELECT `number` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."logins` WHERE `ip`='".hesk_dbEscape($_SERVER['REMOTE_ADDR'])."' AND `last_attempt` IS NOT NULL AND DATE_ADD(`last_attempt`, INTERVAL ".intval($hesk_settings['attempt_banmin'])." MINUTE ) > NOW() LIMIT 1");
 if (hesk_dbNumRows($res) == 1)
@@ -205,6 +204,7 @@ $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
+$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."')");
 
@@ -243,12 +243,12 @@ $ticket = hesk_ticketToPlain($info, 1, 0);
 // --> If ticket is assigned just notify the owner
 if ($ticket['owner'])
 {
-	hesk_notifyAssignedStaff(false, 'new_reply_by_customer', 'notify_reply_my');
+	hesk_notifyAssignedStaff(false, 'new_reply_by_customer', $modsForHesk_settings, 'notify_reply_my');
 }
 // --> No owner assigned, find and notify appropriate staff
 else
 {
-	hesk_notifyStaff('new_reply_by_customer',"`notify_reply_unassigned`='1'");
+	hesk_notifyStaff('new_reply_by_customer',"`notify_reply_unassigned`='1'", $modsForHesk_settings);
 }
 
 /* Clear unneeded session variables */

submit_ticket.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -44,7 +44,6 @@ if ( ! isset($_POST['hx']) || $_POST['hx'] != 3 || ! isset($_POST['hy']) || $_PO
 
 // Get all the required files and functions
 require(HESK_PATH . 'hesk_settings.inc.php');
-require(HESK_PATH . 'modsForHesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 
 // Are we in maintenance mode?
@@ -272,6 +271,7 @@ if ($tmpvar['category'])
 }
 
 // Custom fields
+$modsForHesk_settings = mfh_getSettings();
 foreach ($hesk_settings['custom_fields'] as $k=>$v)
 {
 	if ($v['use'])
@@ -412,8 +412,10 @@ if (count($hesk_error_buffer))
     hesk_process_messages($hesk_error_buffer, 'index.php?a=add');
 }
 
-$tmpvar['message']=hesk_makeURL($tmpvar['message']);
+if (!$modsForHesk_settings['rich_text_for_tickets_for_customers']) {
-$tmpvar['message']=nl2br($tmpvar['message']);
+    $tmpvar['message']=hesk_makeURL($tmpvar['message']);
+    $tmpvar['message']=nl2br($tmpvar['message']);
+}
 
 // Track suggested knowledgebase articles
 if ($hesk_settings['kb_enable'] && $hesk_settings['kb_recommendanswers'] && isset($_POST['suggested']) && is_array($_POST['suggested']) )
@@ -470,7 +472,7 @@ if ($modsForHesk_settings['customer_email_verification_required'])
         hesk_dbQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."pending_verification_emails` (`Email`, `ActivationKey`)
         VALUES ('".$escapedEmail."', '".$escapedKey."')");
 
-        hesk_notifyCustomerForVerifyEmail('verify_email', $key);
+        hesk_notifyCustomerForVerifyEmail('verify_email', $key, $modsForHesk_settings);
         $createTicket = false;
     }
 }
@@ -482,19 +484,19 @@ if ($createTicket)
     // Notify the customer
     if ($hesk_settings['notify_new'])
     {
-        hesk_notifyCustomer();
+        hesk_notifyCustomer($modsForHesk_settings);
     }
 
     // Need to notify staff?
     // --> From autoassign?
         if ($tmpvar['owner'] && $autoassign_owner['notify_assigned'])
         {
-            hesk_notifyAssignedStaff($autoassign_owner, 'ticket_assigned_to_you');
+            hesk_notifyAssignedStaff($autoassign_owner, 'ticket_assigned_to_you', $modsForHesk_settings);
         }
     // --> No autoassign, find and notify appropriate staff
         elseif ( ! $tmpvar['owner'] )
         {
-            hesk_notifyStaff('new_ticket_staff', " `notify_new_unassigned` = '1' ");
+            hesk_notifyStaff('new_ticket_staff', " `notify_new_unassigned` = '1' ", $modsForHesk_settings);
         }
 }
 

suggest_articles.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************

suggest_email.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************

ticket.php

@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -48,6 +48,9 @@ hesk_check_maintenance();
 hesk_load_database_functions();
 
 hesk_session_start();
+/* Connect to database */
+hesk_dbConnect();
+$modsForHesk_settings = mfh_getSettings();
 
 $hesk_error_buffer = array();
 $do_remember = '';
@@ -101,8 +104,6 @@ elseif ( empty($trackingID) || ( $hesk_settings['email_view_ticket'] && empty($m
 	print_form();
 }
 
-/* Connect to database */
-hesk_dbConnect();
 
 /* Limit brute force attempts */
 hesk_limitBfAttempts();

verifyemail.php

@@ -4,7 +4,6 @@ define('HESK_PATH','./');
 
 // Get all the required files and functions
 require(HESK_PATH . 'hesk_settings.inc.php');
-require(HESK_PATH . 'modsForHesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 hesk_load_database_functions();
 require(HESK_PATH . 'inc/posting_functions.inc.php');
@@ -46,7 +45,8 @@ require_once(HESK_PATH . 'inc/header.inc.php');
                 {
                     $ticket = hesk_newTicket($innerResult);
                     // Notify the customer
-                    hesk_notifyCustomer();
+                    $modsForHesk_settings = mfh_getSettings();
+                    hesk_notifyCustomer($modsForHesk_settings);
 
                     // Need to notify staff?
                     // --> From autoassign?
@@ -54,12 +54,12 @@ require_once(HESK_PATH . 'inc/header.inc.php');
                     $autoassign_owner = $getOwnerRs->fetch_assoc();
                     if ($ticket['owner'] && $autoassign_owner['notify_assigned'])
                     {
-                        hesk_notifyAssignedStaff($autoassign_owner, 'ticket_assigned_to_you');
+                        hesk_notifyAssignedStaff($autoassign_owner, 'ticket_assigned_to_you', $modsForHesk_settings);
                     }
                     // --> No autoassign, find and notify appropriate staff
                     elseif ( ! $ticket['owner'] )
                     {
-                        hesk_notifyStaff('new_ticket_staff', " `notify_new_unassigned` = '1' ");
+                        hesk_notifyStaff('new_ticket_staff', " `notify_new_unassigned` = '1' ", $modsForHesk_settings);
                     }
 
                     array_push($submittedTickets, $innerResult['trackid']);