diff --git a/include/upgrader/sql/dd0022fb-f4da0c9b.patch.sql b/include/upgrader/sql/dd0022fb-f4da0c9b.patch.sql index 03b811f7edb55bdc3488e1d8b097223c4c0501be..c0f10cfa52ec2a8767109d12cfcdec38d9d13136 100644 --- a/include/upgrader/sql/dd0022fb-f4da0c9b.patch.sql +++ b/include/upgrader/sql/dd0022fb-f4da0c9b.patch.sql @@ -37,7 +37,7 @@ UPDATE `%TABLE_PREFIX%email_template` `note_alert_body` = REPLACE(`note_alert_body`, '%id', '%{ticket.id}'), `assigned_alert_body` = REPLACE(`assigned_alert_body`, '%id', '%{ticket.id}'), `transfer_alert_body` = REPLACE(`transfer_alert_body`, '%id', '%{ticket.id}'), - `ticket_overlimit_body` = REPLACE(`ticket_overlimit_body`, '%id', '%{ticket.id}'); + `ticket_overdue_body` = REPLACE(`ticket_overdue_body`, '%id', '%{ticket.id}'); -- %ticket UPDATE `%TABLE_PREFIX%email_template` @@ -61,8 +61,8 @@ UPDATE `%TABLE_PREFIX%email_template` `assigned_alert_body` = REPLACE(`assigned_alert_body`, '%ticket', '%{ticket.number}'), `transfer_alert_subj` = REPLACE(`transfer_alert_subj`, '%ticket', '%{ticket.number}'), `transfer_alert_body` = REPLACE(`transfer_alert_body`, '%ticket', '%{ticket.number}'), - `ticket_overlimit_subj` = REPLACE(`ticket_overlimit_subj`, '%ticket', '%{ticket.number}'), - `ticket_overlimit_body` = REPLACE(`ticket_overlimit_body`, '%ticket', '%{ticket.number}'); + `ticket_overdue_subj` = REPLACE(`ticket_overdue_subj`, '%ticket', '%{ticket.number}'), + `ticket_overdue_body` = REPLACE(`ticket_overdue_body`, '%ticket', '%{ticket.number}'); -- %subject UPDATE `%TABLE_PREFIX%email_template` @@ -86,8 +86,8 @@ UPDATE `%TABLE_PREFIX%email_template` `assigned_alert_body` = REPLACE(`assigned_alert_body`, '%subject', '%{ticket.subject}'), `transfer_alert_subj` = REPLACE(`transfer_alert_subj`, '%subject', '%{ticket.subject}'), `transfer_alert_body` = REPLACE(`transfer_alert_body`, '%subject', '%{ticket.subject}'), - `ticket_overlimit_subj` = REPLACE(`ticket_overlimit_subj`, '%subject', '%{ticket.subject}'), - `ticket_overlimit_body` = REPLACE(`ticket_overlimit_body`, '%subject', '%{ticket.subject}'); + `ticket_overdue_subj` = REPLACE(`ticket_overdue_subj`, '%subject', '%{ticket.subject}'), + `ticket_overdue_body` = REPLACE(`ticket_overdue_body`, '%subject', '%{ticket.subject}'); -- %name UPDATE `%TABLE_PREFIX%email_template` @@ -111,8 +111,8 @@ UPDATE `%TABLE_PREFIX%email_template` `assigned_alert_body` = REPLACE(`assigned_alert_body`, '%name', '%{ticket.name}'), `transfer_alert_subj` = REPLACE(`transfer_alert_subj`, '%name', '%{ticket.name}'), `transfer_alert_body` = REPLACE(`transfer_alert_body`, '%name', '%{ticket.name}'), - `ticket_overlimit_subj` = REPLACE(`ticket_overlimit_subj`, '%name', '%{ticket.name}'), - `ticket_overlimit_body` = REPLACE(`ticket_overlimit_body`, '%name', '%{ticket.name}'); + `ticket_overdue_subj` = REPLACE(`ticket_overdue_subj`, '%name', '%{ticket.name}'), + `ticket_overdue_body` = REPLACE(`ticket_overdue_body`, '%name', '%{ticket.name}'); -- %email UPDATE `%TABLE_PREFIX%email_template` @@ -136,8 +136,8 @@ UPDATE `%TABLE_PREFIX%email_template` `assigned_alert_body` = REPLACE(`assigned_alert_body`, '%email', '%{ticket.email}'), `transfer_alert_subj` = REPLACE(`transfer_alert_subj`, '%email', '%{ticket.email}'), `transfer_alert_body` = REPLACE(`transfer_alert_body`, '%email', '%{ticket.email}'), - `ticket_overlimit_subj` = REPLACE(`ticket_overlimit_subj`, '%email', '%{ticket.email}'), - `ticket_overlimit_body` = REPLACE(`ticket_overlimit_body`, '%email', '%{ticket.email}'); + `ticket_overdue_subj` = REPLACE(`ticket_overdue_subj`, '%email', '%{ticket.email}'), + `ticket_overdue_body` = REPLACE(`ticket_overdue_body`, '%email', '%{ticket.email}'); -- %status UPDATE `%TABLE_PREFIX%email_template` @@ -161,8 +161,8 @@ UPDATE `%TABLE_PREFIX%email_template` `assigned_alert_body` = REPLACE(`assigned_alert_body`, '%status', '%{ticket.status}'), `transfer_alert_subj` = REPLACE(`transfer_alert_subj`, '%status', '%{ticket.status}'), `transfer_alert_body` = REPLACE(`transfer_alert_body`, '%status', '%{ticket.status}'), - `ticket_overlimit_subj` = REPLACE(`ticket_overlimit_subj`, '%status', '%{ticket.status}'), - `ticket_overlimit_body` = REPLACE(`ticket_overlimit_body`, '%status', '%{ticket.status}'); + `ticket_overdue_subj` = REPLACE(`ticket_overdue_subj`, '%status', '%{ticket.status}'), + `ticket_overdue_body` = REPLACE(`ticket_overdue_body`, '%status', '%{ticket.status}'); -- %priority UPDATE `%TABLE_PREFIX%email_template` @@ -186,8 +186,8 @@ UPDATE `%TABLE_PREFIX%email_template` `assigned_alert_body` = REPLACE(`assigned_alert_body`, '%priority', '%{ticket.priority}'), `transfer_alert_subj` = REPLACE(`transfer_alert_subj`, '%priority', '%{ticket.priority}'), `transfer_alert_body` = REPLACE(`transfer_alert_body`, '%priority', '%{ticket.priority}'), - `ticket_overlimit_subj` = REPLACE(`ticket_overlimit_subj`, '%priority', '%{ticket.priority}'), - `ticket_overlimit_body` = REPLACE(`ticket_overlimit_body`, '%priority', '%{ticket.priority}'); + `ticket_overdue_subj` = REPLACE(`ticket_overdue_subj`, '%priority', '%{ticket.priority}'), + `ticket_overdue_body` = REPLACE(`ticket_overdue_body`, '%priority', '%{ticket.priority}'); -- %auth UPDATE `%TABLE_PREFIX%email_template` @@ -201,7 +201,7 @@ UPDATE `%TABLE_PREFIX%email_template` `note_alert_body` = REPLACE(`note_alert_body`, '%auth', '%{ticket.auth_code}'), `assigned_alert_body` = REPLACE(`assigned_alert_body`, '%auth', '%{ticket.auth_code}'), `transfer_alert_body` = REPLACE(`transfer_alert_body`, '%auth', '%{ticket.auth_code}'), - `ticket_overlimit_body` = REPLACE(`ticket_overlimit_body`, '%auth', '%{ticket.auth_code}'); + `ticket_overdue_body` = REPLACE(`ticket_overdue_body`, '%auth', '%{ticket.auth_code}'); -- %phone UPDATE `%TABLE_PREFIX%email_template` @@ -215,7 +215,7 @@ UPDATE `%TABLE_PREFIX%email_template` `note_alert_body` = REPLACE(`note_alert_body`, '%phone', '%{ticket.phone_number}'), `assigned_alert_body` = REPLACE(`assigned_alert_body`, '%phone', '%{ticket.phone_number}'), `transfer_alert_body` = REPLACE(`transfer_alert_body`, '%phone', '%{ticket.phone_number}'), - `ticket_overlimit_body` = REPLACE(`ticket_overlimit_body`, '%phone', '%{ticket.phone_number}'); + `ticket_overdue_body` = REPLACE(`ticket_overdue_body`, '%phone', '%{ticket.phone_number}'); -- %createdate UPDATE `%TABLE_PREFIX%email_template` @@ -229,7 +229,7 @@ UPDATE `%TABLE_PREFIX%email_template` `note_alert_body` = REPLACE(`note_alert_body`, '%createdate', '%{ticket.create_date}'), `assigned_alert_body` = REPLACE(`assigned_alert_body`, '%createdate', '%{ticket.create_date}'), `transfer_alert_body` = REPLACE(`transfer_alert_body`, '%createdate', '%{ticket.create_date}'), - `ticket_overlimit_body` = REPLACE(`ticket_overlimit_body`, '%createdate', '%{ticket.create_date}'); + `ticket_overdue_body` = REPLACE(`ticket_overdue_body`, '%createdate', '%{ticket.create_date}'); -- %duedate UPDATE `%TABLE_PREFIX%email_template` @@ -243,7 +243,7 @@ UPDATE `%TABLE_PREFIX%email_template` `note_alert_body` = REPLACE(`note_alert_body`, '%duedate', '%{ticket.due_date}'), `assigned_alert_body` = REPLACE(`assigned_alert_body`, '%duedate', '%{ticket.due_date}'), `transfer_alert_body` = REPLACE(`transfer_alert_body`, '%duedate', '%{ticket.due_date}'), - `ticket_overlimit_body` = REPLACE(`ticket_overlimit_body`, '%duedate', '%{ticket.due_date}'); + `ticket_overdue_body` = REPLACE(`ticket_overdue_body`, '%duedate', '%{ticket.due_date}'); -- %closedate UPDATE `%TABLE_PREFIX%email_template` @@ -257,7 +257,7 @@ UPDATE `%TABLE_PREFIX%email_template` `note_alert_body` = REPLACE(`note_alert_body`, '%closedate', '%{ticket.close_date}'), `assigned_alert_body` = REPLACE(`assigned_alert_body`, '%closedate', '%{ticket.close_date}'), `transfer_alert_body` = REPLACE(`transfer_alert_body`, '%closedate', '%{ticket.close_date}'), - `ticket_overlimit_body` = REPLACE(`ticket_overlimit_body`, '%closedate', '%{ticket.close_date}'); + `ticket_overdue_body` = REPLACE(`ticket_overdue_body`, '%closedate', '%{ticket.close_date}'); -- %topic UPDATE `%TABLE_PREFIX%email_template` @@ -271,7 +271,7 @@ UPDATE `%TABLE_PREFIX%email_template` `note_alert_body` = REPLACE(`note_alert_body`, '%topic', '%{ticket.topic.name}'), `assigned_alert_body` = REPLACE(`assigned_alert_body`, '%topic', '%{ticket.topic.name}'), `transfer_alert_body` = REPLACE(`transfer_alert_body`, '%topic', '%{ticket.topic.name}'), - `ticket_overlimit_body` = REPLACE(`ticket_overlimit_body`, '%topic', '%{ticket.topic.name}'); + `ticket_overdue_body` = REPLACE(`ticket_overdue_body`, '%topic', '%{ticket.topic.name}'); -- %dept UPDATE `%TABLE_PREFIX%email_template` @@ -284,8 +284,9 @@ UPDATE `%TABLE_PREFIX%email_template` `message_alert_body` = REPLACE(`message_alert_body`, '%dept', '%{ticket.dept.name}'), `note_alert_body` = REPLACE(`note_alert_body`, '%dept', '%{ticket.dept.name}'), `assigned_alert_body` = REPLACE(`assigned_alert_body`, '%dept', '%{ticket.dept.name}'), + `transfer_alert_subj` = REPLACE(`transfer_alert_subj`, '%dept', '%{ticket.dept.name}'), `transfer_alert_body` = REPLACE(`transfer_alert_body`, '%dept', '%{ticket.dept.name}'), - `ticket_overlimit_body` = REPLACE(`ticket_overlimit_body`, '%dept', '%{ticket.dept.name}'); + `ticket_overdue_body` = REPLACE(`ticket_overdue_body`, '%dept', '%{ticket.dept.name}'); -- %team UPDATE `%TABLE_PREFIX%email_template` @@ -299,7 +300,7 @@ UPDATE `%TABLE_PREFIX%email_template` `note_alert_body` = REPLACE(`note_alert_body`, '%team', '%{ticket.team.name}'), `assigned_alert_body` = REPLACE(`assigned_alert_body`, '%team', '%{ticket.team.name}'), `transfer_alert_body` = REPLACE(`transfer_alert_body`, '%team', '%{ticket.team.name}'), - `ticket_overlimit_body` = REPLACE(`ticket_overlimit_body`, '%team', '%{ticket.team.name}'); + `ticket_overdue_body` = REPLACE(`ticket_overdue_body`, '%team', '%{ticket.team.name}'); -- %clientlink UPDATE `%TABLE_PREFIX%email_template` @@ -313,7 +314,7 @@ UPDATE `%TABLE_PREFIX%email_template` `note_alert_body` = REPLACE(`note_alert_body`, '%clientlink', '%{ticket.client_link}'), `assigned_alert_body` = REPLACE(`assigned_alert_body`, '%clientlink', '%{ticket.client_link}'), `transfer_alert_body` = REPLACE(`transfer_alert_body`, '%clientlink', '%{ticket.client_link}'), - `ticket_overlimit_body` = REPLACE(`ticket_overlimit_body`, '%clientlink', '%{ticket.client_link}'); + `ticket_overdue_body` = REPLACE(`ticket_overdue_body`, '%clientlink', '%{ticket.client_link}'); -- %staff (recipient of the alert) UPDATE `%TABLE_PREFIX%email_template` @@ -322,7 +323,8 @@ UPDATE `%TABLE_PREFIX%email_template` `note_alert_body` = REPLACE(`note_alert_body`, '%staff', '%{recipient}'), `assigned_alert_body` = REPLACE(`assigned_alert_body`, '%staff', '%{recipient}'), `transfer_alert_body` = REPLACE(`transfer_alert_body`, '%staff', '%{recipient}'), - `ticket_overlimit_body` = REPLACE(`ticket_overlimit_body`, '%staff', '%{recipient}'); + `ticket_overlimit_body` = REPLACE(`ticket_overlimit_body`, '%staff', '%{recipient}'), + `ticket_overdue_body` = REPLACE(`ticket_overdue_body`, '%staff', '%{recipient}'); -- %message UPDATE `%TABLE_PREFIX%email_template` @@ -336,7 +338,7 @@ UPDATE `%TABLE_PREFIX%email_template` `note_alert_body` = REPLACE(`note_alert_body`, '%message', '%{message}'), `assigned_alert_body` = REPLACE(`assigned_alert_body`, '%message', '%{message}'), `transfer_alert_body` = REPLACE(`transfer_alert_body`, '%message', '%{message}'), - `ticket_overlimit_body` = REPLACE(`ticket_overlimit_body`, '%message', '%{message}'); + `ticket_overdue_body` = REPLACE(`ticket_overdue_body`, '%message', '%{message}'); -- %response UPDATE `%TABLE_PREFIX%email_template` @@ -350,21 +352,23 @@ UPDATE `%TABLE_PREFIX%email_template` `note_alert_body` = REPLACE(`note_alert_body`, '%response', '%{response}'), `assigned_alert_body` = REPLACE(`assigned_alert_body`, '%response', '%{response}'), `transfer_alert_body` = REPLACE(`transfer_alert_body`, '%response', '%{response}'), - `ticket_overlimit_body` = REPLACE(`ticket_overlimit_body`, '%response', '%{response}'); + `ticket_overdue_body` = REPLACE(`ticket_overdue_body`, '%response', '%{response}'); -- %note UPDATE `%TABLE_PREFIX%email_template` - SET `ticket_autoresp_body` = REPLACE(`ticket_autoresp_body`, '%note', '%{note}'), - `message_autoresp_body` = REPLACE(`message_autoresp_body`, '%note', '%{note}'), - `ticket_notice_body` = REPLACE(`ticket_notice_body`, '%note', '%{note}'), - `ticket_overlimit_body` = REPLACE(`ticket_overlimit_body`, '%note', '%{note}'), - `ticket_reply_body` = REPLACE(`ticket_reply_body`, '%note', '%{note}'), - `ticket_alert_body` = REPLACE(`ticket_alert_body`, '%note', '%{note}'), - `message_alert_body` = REPLACE(`message_alert_body`, '%note', '%{note}'), - `note_alert_body` = REPLACE(`note_alert_body`, '%note', '%{title}\r\n%{note}'), - `assigned_alert_body` = REPLACE(`assigned_alert_body`, '%note', '%{note}'), - `transfer_alert_body` = REPLACE(`transfer_alert_body`, '%note', '%{note}'), - `ticket_overlimit_body` = REPLACE(`ticket_overlimit_body`, '%note', '%{note}'); + SET `note_alert_body` = REPLACE(`note_alert_body`, '%note', '* %{note.title} *\r\n\r\n%{note.message}'), + `assigned_alert_body` = REPLACE(`assigned_alert_body`, '%note', '%{comments}'), + `transfer_alert_body` = REPLACE(`transfer_alert_body`, '%note', '%{comments}'); + +-- %{note} (dev branch installations) +UPDATE `%TABLE_PREFIX%email_template` + SET `note_alert_body` = REPLACE(`note_alert_body`, '%{note}', '%{note.message}'), + `assigned_alert_body` = REPLACE(`assigned_alert_body`, '%{note}', '%{comments}'), + `transfer_alert_body` = REPLACE(`transfer_alert_body`, '%{note}', '%{comments}'); + +-- %{title} (dev branch installations) +UPDATE `%TABLE_PREFIX%email_template` + SET `note_alert_body` = REPLACE(`note_alert_body`, '%{title}', '* %{note.title} *\r\n'); -- %url UPDATE `%TABLE_PREFIX%email_template` @@ -378,7 +382,7 @@ UPDATE `%TABLE_PREFIX%email_template` `note_alert_body` = REPLACE(`note_alert_body`, '%url', '%{url}'), `assigned_alert_body` = REPLACE(`assigned_alert_body`, '%url', '%{url}'), `transfer_alert_body` = REPLACE(`transfer_alert_body`, '%url', '%{url}'), - `ticket_overlimit_body` = REPLACE(`ticket_overlimit_body`, '%url', '%{url}'); + `ticket_overdue_body` = REPLACE(`ticket_overdue_body`, '%url', '%{url}'); -- %signature UPDATE `%TABLE_PREFIX%email_template` @@ -392,7 +396,7 @@ UPDATE `%TABLE_PREFIX%email_template` `note_alert_body` = REPLACE(`note_alert_body`, '%signature', '%{signature}'), `assigned_alert_body` = REPLACE(`assigned_alert_body`, '%signature', '%{signature}'), `transfer_alert_body` = REPLACE(`transfer_alert_body`, '%signature', '%{signature}'), - `ticket_overlimit_body` = REPLACE(`ticket_overlimit_body`, '%signature', '%{signature}'); + `ticket_overdue_body` = REPLACE(`ticket_overdue_body`, '%signature', '%{signature}'); -- %assignee UPDATE `%TABLE_PREFIX%email_template` @@ -404,6 +408,38 @@ UPDATE `%TABLE_PREFIX%email_template` SET `assigned_alert_subj` = REPLACE(`assigned_alert_subj`, '%assigner', '%{assigner}'), `assigned_alert_body` = REPLACE(`assigned_alert_body`, '%assigner', '%{assigner}'); +/* Change links */ + +-- Client URL -> %{url}/view.php?e=%{ticket.email}&t=%{ticket.number} +UPDATE `%TABLE_PREFIX%email_template` + SET `ticket_autoresp_body` = REPLACE(`ticket_autoresp_body`, '%{url}/view.php?e=%{ticket.email}&t=%{ticket.number}', '%{ticket.client_link}'), + `message_autoresp_body` = REPLACE(`message_autoresp_body`, '%{url}/view.php?e=%{ticket.email}&t=%{ticket.number}', '%{ticket.client_link}'), + `ticket_notice_body` = REPLACE(`ticket_notice_body`, '%{url}/view.php?e=%{ticket.email}&t=%{ticket.number}', '%{ticket.client_link}'), + `ticket_overlimit_body` = REPLACE(`ticket_overlimit_body`, '%{url}/view.php?e=%{ticket.email}&t=%{ticket.number}', '%{ticket.client_link}'), + `ticket_reply_body` = REPLACE(`ticket_reply_body`, '%{url}/view.php?e=%{ticket.email}&t=%{ticket.number}', '%{ticket.client_link}'); + +-- Client URL -> %{url}/view.php?e=%{ticket.email} (overlimit template) +UPDATE `%TABLE_PREFIX%email_template` + SET `ticket_overlimit_body` = REPLACE(`ticket_overlimit_body`, '%{url}/view.php?e=%{ticket.email}', '%{url}/tickets.php?e=%{ticket.email}'); + +-- Staff URL -> %{url}/scp/ticket.php?id=%{ticket.id} (should be tickets.php) +UPDATE `%TABLE_PREFIX%email_template` + SET `ticket_alert_body` = REPLACE(`ticket_alert_body`, '%{url}/scp/ticket.php?id=%{ticket.id}', '%{ticket.staff_link}'), + `message_alert_body` = REPLACE(`message_alert_body`, '%{url}/scp/ticket.php?id=%{ticket.id}', '%{ticket.staff_link}'), + `note_alert_body` = REPLACE(`note_alert_body`, '%{url}/scp/ticket.php?id=%{ticket.id}', '%{ticket.staff_link}'), + `assigned_alert_body` = REPLACE(`assigned_alert_body`, '%{url}/scp/ticket.php?id=%{ticket.id}', '%{ticket.staff_link}'), + `transfer_alert_body` = REPLACE(`transfer_alert_body`, '%{url}/scp/ticket.php?id=%{ticket.id}', '%{ticket.staff_link}'), + `ticket_overdue_body` = REPLACE(`ticket_overdue_body`, '%{url}/scp/ticket.php?id=%{ticket.id}', '%{ticket.staff_link}'); + +-- Staff URL 2 -> %{url}/scp/tickets.php?id=%{ticket.id} +UPDATE `%TABLE_PREFIX%email_template` + SET `ticket_alert_body` = REPLACE(`ticket_alert_body`, '%{url}/scp/tickets.php?id=%{ticket.id}', '%{ticket.staff_link}'), + `message_alert_body` = REPLACE(`message_alert_body`, '%{url}/scp/tickets.php?id=%{ticket.id}', '%{ticket.staff_link}'), + `note_alert_body` = REPLACE(`note_alert_body`, '%{url}/scp/tickets.php?id=%{ticket.id}', '%{ticket.staff_link}'), + `assigned_alert_body` = REPLACE(`assigned_alert_body`, '%{url}/scp/tickets.php?id=%{ticket.id}', '%{ticket.staff_link}'), + `transfer_alert_body` = REPLACE(`transfer_alert_body`, '%{url}/scp/tickets.php?id=%{ticket.id}', '%{ticket.staff_link}'), + `ticket_overdue_body` = REPLACE(`ticket_overdue_body`, '%{url}/scp/tickets.php?id=%{ticket.id}', '%{ticket.staff_link}'); + -- update schema signature UPDATE `%TABLE_PREFIX%config` - SET `schema_signature`='157195364f4f2f68936cd432b86b0351'; + SET `schema_signature`='f4da0c9befa257b5a20a923d4e9c0e91'; diff --git a/main.inc.php b/main.inc.php index 5569c0a165acf226f0424b222806a428f4074fe3..872f56758854a2d84ba78251dcce13c25cc00a42 100644 --- a/main.inc.php +++ b/main.inc.php @@ -63,7 +63,7 @@ #Current version && schema signature (Changes from version to version) define('THIS_VERSION','1.7-RC2+'); //Shown on admin panel - define('SCHEMA_SIGNATURE','157195364f4f2f68936cd432b86b0351'); //MD5 signature of the db schema. (used to trigger upgrades) + define('SCHEMA_SIGNATURE','f4da0c9befa257b5a20a923d4e9c0e91'); //MD5 signature of the db schema. (used to trigger upgrades) #load config info $configfile=''; if(file_exists(ROOT_DIR.'ostconfig.php')) //Old installs prior to v 1.6 RC5