diff --git a/admin/admin_reply_ticket.php b/admin/admin_reply_ticket.php
index 9ddc887a..fc59ae36 100644
--- a/admin/admin_reply_ticket.php
+++ b/admin/admin_reply_ticket.php
@@ -89,6 +89,7 @@ $message = hesk_input(hesk_POST('message'));
// Submit as customer?
$submit_as_customer = isset($_POST['submit_as_customer']) ? true : false;
+$modsForHesk_settings = mfh_getSettings();
if (strlen($message))
{
// Save message for later and ignore the rest?
@@ -138,14 +139,14 @@ if (strlen($message))
// Attach signature to the message?
if ( ! $submit_as_customer && ! empty($_POST['signature']))
{
- if (mfh_getSetting('rich_text_for_tickets')) {
+ if ($modsForHesk_settings['rich_text_for_tickets']) {
$message .= "
" . nl2br($_SESSION['signature']) . "
";
} else {
$message .= "\n\n" . addslashes($_SESSION['signature']) . "\n";
}
}
- if (!mfh_getSetting('rich_text_for_tickets')) {
+ if (!$modsForHesk_settings['rich_text_for_tickets']) {
// Make links clickable
$message = hesk_makeURL($message);
@@ -210,7 +211,7 @@ if ($hesk_settings['attachments']['use'] && !empty($attachments))
}
// Add reply
-$html = mfh_getSetting('rich_text_for_tickets');
+$html = $modsForHesk_settings['rich_text_for_tickets'];
if ($submit_as_customer)
{
hesk_dbQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."replies` (`replyto`,`name`,`message`,`dt`,`attachments`,`html`) VALUES ('".intval($replyto)."','".hesk_dbEscape(addslashes($ticket['name']))."','".hesk_dbEscape($message."
{$hesklang['creb']} {$_SESSION['name']}")."',NOW(),'".hesk_dbEscape($myattachments)."', '".$html."')");
diff --git a/admin/admin_settings.php b/admin/admin_settings.php
index e45844c7..3dbf56ef 100644
--- a/admin/admin_settings.php
+++ b/admin/admin_settings.php
@@ -328,6 +328,7 @@ if ( defined('HESK_DEMO') )
$hesklang['err_custname'] = addslashes($hesklang['err_custname']);
+ $modsForHesk_settings = mfh_getSettings();
?>
+
@@ -123,7 +125,7 @@ hr
background-color: #9e9e9e;
height: 1px;
width: 100%;
- text-align: ;
+ text-align: ;
}
@@ -220,7 +222,7 @@ foreach ($hesk_settings['custom_fields'] as $k=>$v)
{
if ($v['use'])
{
- if (mfh_getSetting('custom_field_setting'))
+ if ($modsForHesk_settings['custom_field_setting'])
{
$v['name'] = $hesklang[$v['name']];
}
diff --git a/reply_ticket.php b/reply_ticket.php
index 9c0b273a..6f29555f 100644
--- a/reply_ticket.php
+++ b/reply_ticket.php
@@ -204,7 +204,8 @@ $ticket['status'] = $ticket['status'] == $defaultNewTicketStatus['ID'] ? $defaul
$res = hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` SET `lastchange`=NOW(), `status`='{$ticket['status']}', `replies`=`replies`+1, `lastreplier`='0' WHERE `id`='{$ticket['id']}' LIMIT 1");
// Insert reply into database
-$html = mfh_getSetting('rich_text_for_tickets_for_customers');
+$modsForHesk_settings = mfh_getSettings();
+$html = $modsForHesk_settings['rich_text_for_tickets_for_customers'];
hesk_dbQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."replies` (`replyto`,`name`,`message`,`dt`,`attachments`, `html`) VALUES ({$ticket['id']},'".hesk_dbEscape($ticket['name'])."','".hesk_dbEscape($message)."',NOW(),'".hesk_dbEscape($myattachments)."','".$html."')");
diff --git a/submit_ticket.php b/submit_ticket.php
index 739cfc1e..b9e936b8 100644
--- a/submit_ticket.php
+++ b/submit_ticket.php
@@ -271,11 +271,12 @@ if ($tmpvar['category'])
}
// Custom fields
+$modsForHesk_settings = mfh_getSettings();
foreach ($hesk_settings['custom_fields'] as $k=>$v)
{
if ($v['use'])
{
- if (mfh_getSetting('custom_field_setting'))
+ if ($modsForHesk_settings['custom_field_setting'])
{
$v['name'] = $hesklang[$v['name']];
}
@@ -447,11 +448,11 @@ $tmpvar['latitude'] = hesk_POST('latitude');
$tmpvar['longitude'] = hesk_POST('longitude');
// Set html
-$tmpvar['html'] = mfh_getSetting('rich_text_for_tickets_for_customers');
+$tmpvar['html'] = $modsForHesk_settings['rich_text_for_tickets_for_customers'];
// Should the helpdesk validate emails?
$createTicket = true;
-if (mfh_getSetting('customer_email_verification_required'))
+if ($modsForHesk_settings['customer_email_verification_required'])
{
$verifiedEmailSql = "SELECT `Email` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."verified_emails` WHERE `Email` = '".hesk_dbEscape($tmpvar['email'])."'";
$verifiedEmailRS = hesk_dbQuery($verifiedEmailSql);