diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php index 58be2a65..ed4fd551 100644 --- a/admin/admin_ticket.php +++ b/admin/admin_ticket.php @@ -1400,12 +1400,10 @@ function hesk_printReplyForm() {
()
- -

- - -

- +

+ '; + } ?> diff --git a/admin/profile.php b/admin/profile.php index fcb8c1d4..21082c12 100644 --- a/admin/profile.php +++ b/admin/profile.php @@ -256,14 +256,6 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); -
- -
-
- -
-
-
@@ -449,7 +441,6 @@ function update_profile() { $_SESSION['new']['notify_note'] = empty($_POST['notify_note']) ? 0 : 1; $_SESSION['new']['notify_note_unassigned'] = empty($_POST['notify_note_unassigned']) ? 0 : 1; $_SESSION['new']['notify_pm'] = empty($_POST['notify_pm']) ? 0 : 1; - $_SESSION['new']['default_notify_customer_email'] = empty($_POST['default_notify_customer_email']) ? 1 : 0; /* Any errors? */ if (strlen($hesk_error_buffer)) @@ -480,8 +471,7 @@ function update_profile() { `notify_assigned`='".intval($_SESSION['new']['notify_assigned'])."' , `notify_pm`='".intval($_SESSION['new']['notify_pm'])."', `notify_note`='".intval($_SESSION['new']['notify_note'])."', - `notify_note_unassigned`='".intval($_SESSION['new']['notify_note_unassigned'])."', - `default_notify_customer_email`='".intval($_SESSION['new']['default_notify_customer_email'])."' + `notify_note_unassigned`='".intval($_SESSION['new']['notify_note_unassigned'])."' WHERE `id`='".intval($_SESSION['id'])."' LIMIT 1" ); diff --git a/install/updateTo2-0-0.php b/install/updateTo2-0-0.php index 38af22cf..d543d8d9 100644 --- a/install/updateTo2-0-0.php +++ b/install/updateTo2-0-0.php @@ -10,6 +10,7 @@ hesk_dbConnect(); hesk_dbQuery("ALTER TABLE `".hesk_dbEscape($hesk_settings['db_pfix'])."attachments` DROP COLUMN `note_id`"); hesk_dbQuery("ALTER TABLE `".hesk_dbEscape($hesk_settings['db_pfix'])."notes` DROP COLUMN `edit_date`"); hesk_dbQuery("ALTER TABLE `".hesk_dbEscape($hesk_settings['db_pfix'])."notes` DROP COLUMN `number_of_edits`"); +hesk_dbQuery("ALTER TABLE `".hesk_dbEscape($hesk_settings['db_pfix'])."users` DROP COLUMN `default_notify_customer_email`"); if ($updateSuccess) { diff --git a/language/en/text.php b/language/en/text.php index 8e8f48c2..3d0468c7 100644 --- a/language/en/text.php +++ b/language/en/text.php @@ -72,8 +72,6 @@ $hesklang['user_deactivated'] = 'User has been deactivated'; $hesklang['active_user'] = 'Is active user'; $hesklang['self_deactivation'] = 'You cannot deactivate yourself!'; $hesklang['inactive_user'] = 'Your account is currently inactive. Contact an administrator for more information.'; -$hesklang['notify_customer_email'] = 'Emails to customer on reply'; -$hesklang['notify_customer_email_text'] = 'Don\'t send email notifications of replies to the customer by default'; $hesklang['cant_edit_admin'] = 'You cannot edit the God Admin (User ID = 1)'; $hesklang['notifications_disabled_info'] = 'Changing notifications settings has been disabled by your administrator.';