-
new \v320\AddAuditTrail\CreateAuditTrailToReplacementValuesTable(),
158 => new \v320\AddMigrationSetting(),
159 => new UpdateMigration('3.2.0', '3.1.1', 159),
+ //3.2.1 - 3.2.3
+ 160 => new UpdateMigration('3.2.1', '3.2.0', 160),
+ 161 => new UpdateMigration('3.2.2', '3.2.1', 161),
+ 162 => new UpdateMigration('3.2.3', '3.2.2', 162),
+ 163 => new UpdateMigration('3.2.4', '3.2.3', 163),
);
}
\ No newline at end of file
diff --git a/internal-api/core/database.inc.php b/internal-api/core/database.inc.php
index 47c0eb59..224de93d 100755
--- a/internal-api/core/database.inc.php
+++ b/internal-api/core/database.inc.php
@@ -97,7 +97,7 @@ function hesk_dbEscape($in)
function hesk_dbLike($in)
{
- return str_replace( array('_', '%'), array('\\\\_', '\\\\%'), $in);
+ return str_replace( array('_', '%', '\\'), array('\\\\_', '\\\\%', '\\\\'), $in); // '
} // END hesk_dbLike()
diff --git a/internal-api/core/database_mysqli.inc.php b/internal-api/core/database_mysqli.inc.php
index befdded2..120a4c0e 100755
--- a/internal-api/core/database_mysqli.inc.php
+++ b/internal-api/core/database_mysqli.inc.php
@@ -97,7 +97,7 @@ function hesk_dbEscape($in)
function hesk_dbLike($in)
{
- return str_replace( array('_', '%'), array('\\\\_', '\\\\%'), $in);
+ return str_replace( array('_', '%', '\\'), array('\\\\_', '\\\\%', '\\\\'), $in); // '
} // END hesk_dbLike()
diff --git a/knowledgebase.php b/knowledgebase.php
index 20bacd3f..fdb2a3a4 100644
--- a/knowledgebase.php
+++ b/knowledgebase.php
@@ -286,8 +286,8 @@ if (!$show['show']) {
if ($hesk_settings['kb_rating'] && strpos(hesk_COOKIE('hesk_kb_rate'), 'a' . $artid . '%') === false) {
echo '
';
}
diff --git a/language/en/emails/html/new_reply_by_customer.txt b/language/en/emails/html/new_reply_by_customer.txt
index f0eb563d..79cc0a86 100644
--- a/language/en/emails/html/new_reply_by_customer.txt
+++ b/language/en/emails/html/new_reply_by_customer.txt
@@ -1,6 +1,6 @@
Hello,
A customer has just replied to ticket "%%SUBJECT%%".
-
You can manage this ticket here:
+
You can read the reply message and manage this ticket here:
%%TRACK_URL%%
Regards,
%%SITE_TITLE%%
diff --git a/language/en/emails/html/new_reply_by_staff.txt b/language/en/emails/html/new_reply_by_staff.txt
index 1287b2b8..fcf1093a 100644
--- a/language/en/emails/html/new_reply_by_staff.txt
+++ b/language/en/emails/html/new_reply_by_staff.txt
@@ -1,8 +1,9 @@
Dear %%NAME%%,
-
Our staff has just replied to your ticket "%%SUBJECT%%".
-
You can view the ticket here:
+
We have just replied to your ticket "%%SUBJECT%%".
+
To read the message, submit a reply and view details, please visit:
%%TRACK_URL%%
+
If the above link is not clickable, try copying and pasting it into the address bar of your web browser.
Sincerely,
%%SITE_TITLE%%
diff --git a/language/en/emails/html/ticket_closed.txt b/language/en/emails/html/ticket_closed.txt
index f547ba76..10220a1a 100644
--- a/language/en/emails/html/ticket_closed.txt
+++ b/language/en/emails/html/ticket_closed.txt
@@ -1,8 +1,8 @@
Dear %%NAME%%,
Your support ticket "%%SUBJECT%%" has been updated to a closed/resolved status.
-
Ticket tracking ID: %%TRACK_ID%%
You can view the status of your ticket here:
%%TRACK_URL%%
+
If the above link is not clickable, try copying and pasting it into the address bar of your web browser.
Sincerely,
%%SITE_TITLE%%
%%SITE_URL%%
\ No newline at end of file
diff --git a/language/en/emails/ticket_closed.txt b/language/en/emails/ticket_closed.txt
index 51cfb97c..33a94afd 100644
--- a/language/en/emails/ticket_closed.txt
+++ b/language/en/emails/ticket_closed.txt
@@ -2,11 +2,10 @@ Dear %%NAME%%,
Your support ticket "%%SUBJECT%%" has been updated to a closed/resolved status.
-Ticket tracking ID: %%TRACK_ID%%
-
You can view the status of your ticket here:
%%TRACK_URL%%
+If the above link is not clickable, try copying and pasting it into the address bar of your web browser.
Sincerely,
diff --git a/language/en/text.php b/language/en/text.php
index d543ccd3..e55cd0e4 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -1239,7 +1239,7 @@ $hesklang['cat_pri_ch']='Category priority has been set to:';
$hesklang['err_dbversion']='Too old MySQL version:'; // %s will be replaced with MySQL version
$hesklang['signature_max']='Signature (max 1000 chars)';
$hesklang['signature_long']='User signature is too long! Please limit the signature to 1000 chars';
-$hesklang['ip_whois']='IP whois';
+$hesklang['ip_whois']='IP WHOIS';
$hesklang['ednote']='Edit note message';
$hesklang['ednote2']='Note message saved';
$hesklang['perm_deny']='Permission denied';
@@ -1284,7 +1284,6 @@ $hesklang['click_unban']='Click here to unban.';
$hesklang['banip_intro']='Visitors from banned IP addresses will not be able to view or submit tickets and login into the help desk.';
$hesklang['ipperm']='Permanent IP bans:';
$hesklang['iptemp']='Login failure bans:';
-$hesklang['savebanip']='Ban this IP';
$hesklang['no_banips']='
No IPs are being banned.';
$hesklang['bananip']='IP address to ban';
$hesklang['banex']='Examples:';
@@ -2192,7 +2191,7 @@ $hesklang['changing_permissions_will_reset_permission_group'] = 'Changing a user
// --> Ticket audit trail
$hesklang['audit_moved_category']='%s moved ticket to category %s'; // %s = new category, user making change, thist1
$hesklang['audit_assigned']='%s assigned ticket to %s'; // %s = assigned user, user making change
-$hesklang['audit_assigned_self'] = '%s assigned ticket to themself';
+$hesklang['audit_assigned_self'] = '%s self-assigned ticket';
$hesklang['audit_unassigned'] = '%s unassigned ticket';
$hesklang['audit_closed']='%s closed ticket'; // thist3
$hesklang['audit_automatically_closed'] ='Ticket automatically closed';
diff --git a/reply_ticket.php b/reply_ticket.php
index 499f3d1f..0760ac06 100644
--- a/reply_ticket.php
+++ b/reply_ticket.php
@@ -206,13 +206,14 @@ $info = array(
'trackid' => $ticket['trackid'],
'status' => $ticket['status'],
'name' => $ticket['name'],
- 'lastreplier' => $ticket['name'],
'subject' => $ticket['subject'],
'message' => stripslashes($message),
'attachments' => $myattachments,
'dt' => hesk_date($ticket['dt'], true),
'lastchange' => hesk_date($ticket['lastchange'], true),
'id' => $ticket['id'],
+ 'time_worked' => $ticket['time_worked'],
+ 'last_reply_by' => $ticket['name'],
);
// 2. Add custom fields to the array
diff --git a/submit_ticket.php b/submit_ticket.php
index 06090ef6..d11f5225 100644
--- a/submit_ticket.php
+++ b/submit_ticket.php
@@ -73,7 +73,7 @@ if ($hesk_settings['question_use']) {
if (strlen($question) == 0) {
$hesk_error_buffer['question'] = $hesklang['q_miss'];
- } elseif (strtolower($question) != strtolower($hesk_settings['question_ans'])) {
+ } elseif (hesk_mb_strtolower($question) != hesk_mb_strtolower($hesk_settings['question_ans'])) {
$hesk_error_buffer['question'] = $hesklang['q_wrng'];
} else {
$_SESSION['c_question'] = $question;
diff --git a/ticket.php b/ticket.php
index 2d7197b4..cb7ef11b 100644
--- a/ticket.php
+++ b/ticket.php
@@ -722,8 +722,8 @@ function hesk_printCustomerTicketReplies()
echo '
';
}