SD-SimpleDesk

@@ -430,6 +430,7 @@ $txt['shd_ticket_monitor_on_note'] = 'You can request an email for every reply,

 $txt['shd_ticket_monitor_off_note'] = 'You can turn off the email for every reply, and use your preferences instead:';

 $txt['shd_ticket_monitor_on'] = 'Turn on monitoring';

 $txt['shd_ticket_monitor_off'] = 'Turn off monitoring';

+$txt['shd_ticket_notify_me_never_note'] = 'You can request that all normal emails are turned off:';

 $txt['shd_ticket_notify_me_never'] = 'You have asked for notifications on this ticket to be turned off.';

 $txt['shd_ticket_notify_me_never_on'] = 'Ignore this ticket';

 $txt['shd_ticket_notify_me_never_off'] = 'Unignore this ticket';

@@ -213,7 +213,7 @@ $txt['shd_logopt_permadelete'] = 'Log tickets and replies being permadeleted';

 $txt['shd_logopt_relationships'] = 'Log any changes in ticket relationships';

 $txt['shd_logopt_autoclose'] = 'Log tickets closed automatically by the helpdesk';

 $txt['shd_logopt_move_dept'] = 'Log tickets being moved between two departments';

-$txt['shd_logopt_monitor'] = 'Log tickets being added to their monitor lists';

+$txt['shd_logopt_monitor'] = 'Log tickets being added to their monitor/ignore lists';

 $txt['shd_notify_send_to'] = 'Will be sent to';

 $txt['shd_notify_ticket_starter'] = 'the user who started the ticket (if set in their preferences)';

@@ -136,5 +136,7 @@ $txt['shd_log_unknown_user_1'] = '1 former user';

 $txt['shd_log_unknown_user_n'] = '%1$d former users';

 $txt['shd_log_monitor'] = 'Added &quot;<a href="{scripturl}?action=helpdesk;sa=ticket;ticket={ticket}">{subject}</a>&quot; to their monitor list.';

 $txt['shd_log_unmonitor'] = 'Removed &quot;<a href="{scripturl}?action=helpdesk;sa=ticket;ticket={ticket}">{subject}</a>&quot; from their monitor list.';

+$txt['shd_log_ignore'] = 'Added &quot;<a href="{scripturl}?action=helpdesk;sa=ticket;ticket={ticket}">{subject}</a>&quot; to their do-not-notify (ignore) list.';

+$txt['shd_log_unignore'] = 'Removed &quot;<a href="{scripturl}?action=helpdesk;sa=ticket;ticket={ticket}">{subject}</a>&quot; from their do-not-notify (ignore) list.';

 //@}

 ?>

\ No newline at end of file

@@ -95,11 +95,15 @@ $txt['permissionname_shd_assign_ticket_own'] = 'To themselves';

 $txt['permissionname_shd_assign_ticket_any'] = 'Any staff member';

 //@}

-//! @name Ticket modification: monitoring

+//! @name Ticket modification: monitoring/ignoring

 $txt['permissionname_shd_monitor_ticket'] = 'Monitor a ticket';

-$txt['permissionhelp_shd_monitor_ticket'] = 'This permission allows users to monitor tickets, to be notified on any changes to the ticket in addition to any of the usual email notifications. Use for example, to be notified about a ticket without replying to it or turning on the preferences for all tickets.';

+$txt['permissionhelp_shd_monitor_ticket'] = 'This permission allows users to monitor tickets, to be notified on any replies to the ticket in addition to any of the usual email notifications. Use for example, to be notified about a ticket without replying to it or turning on the preferences for all tickets.';

 $txt['permissionname_shd_monitor_ticket_own'] = 'Their own tickets';

 $txt['permissionname_shd_monitor_ticket_any'] = 'Any tickets';

+$txt['permissionname_shd_ignore_ticket'] = 'Monitor a ticket';

+$txt['permissionhelp_shd_ignore_ticket'] = 'This permission allows users to expressly turn off notifications on a ticket. This would allow them to have preferences saying to notify on all replies, but to be able to selectively ignore an individual ticket\'s replies.';

+$txt['permissionname_shd_ignore_ticket_own'] = 'Their own tickets';

+$txt['permissionname_shd_ignore_ticket_any'] = 'Any tickets';

 //! @name Ticket modification: resolution

 //@{

@@ -779,9 +779,9 @@ function shd_view_ticket()

 		'show' => false,

 		'preferences' => array(),

 		'can_change' => shd_allowed_to('shd_view_profile', 0) && shd_allowed_to('shd_view_preferences', 0), // not department related

-		'can_monitor' => shd_allowed_to('shd_monitor_ticket', $context['ticket']['dept']),

+		'can_monitor' => shd_allowed_to('shd_monitor_ticket_any', $context['ticket']['dept']) || ($context['ticket']['ticket_opener'] && shd_allowed_to('shd_monitor_ticket_own', $context['ticket']['dept'])),

 		'is_monitoring' => false,

-		'can_ignore' => false,

+		'can_ignore' => shd_allowed_to('shd_ignore_ticket_any', $context['ticket']['dept']) || ($context['ticket']['ticket_opener'] && shd_allowed_to('shd_ignore_ticket_own', $context['ticket']['dept'])),

 		'is_ignoring' => false,

 	);

 	$notify_state = NOTIFY_PREFS;

@@ -563,19 +563,48 @@ function shd_notify_ticket_options()

 	if (empty($_REQUEST['notifyaction']))

 		$_REQUEST['notifyaction'] = '';

+	// Get any existing entry.

+	$query = $smcFunc['db_query']('', '

+		SELECT notify_state

+		FROM {db_prefix}helpdesk_notify_override

+		WHERE id_member = {int:user}

+			AND id_ticket = {int:ticket}',

+		array(

+			'user' => $context['user']['id'],

+			'ticket' => $context['ticket_id'],

+		)

+	);

+	if ($smcFunc['db_num_rows']($query) == 0)

+		$old_state = NOTIFY_PREFS;

+	else

+		list($old_state) = $smcFunc['db_fetch_row']($query);

+	$smcFunc['db_free_result']($query);

+

 	switch ($_REQUEST['notifyaction'])

 	{

 		case 'monitor_on';

 			if (!shd_allowed_to('shd_monitor_ticket', $ticketinfo['dept']))

 				fatal_lang_error('cannot_monitor_ticket', false);

+			// Unlike turning it off, we might be turning it on from either just off, or ignored, so log that fact.

+			if ($old_state == NOTIFY_ALWAYS)

+				break;

+			elseif ($old_state == NOTIFY_NEVER)

+				// Log turning off ignore list first

+				shd_log_action('unignore',

+					array(

+						'ticket' => $context['ticket_id'],

+						'subject' => $ticketinfo['subject'],

+					)

+				);

+			// Then add the new status.

 			$smcFunc['db_insert']('replace',

 				'{db_prefix}helpdesk_notify_override',

 				array(

 					'id_member' => 'int', 'id_ticket' => 'int', 'notify_state' => 'int',

 				),

 				array(

-					$context['user']['id'], $context['ticket_id'], $_REQUEST['notifyaction'] == 'monitor_on' ? NOTIFY_ALWAYS : NOTIFY_PREFS,

+					$context['user']['id'], $context['ticket_id'], NOTIFY_ALWAYS,

 				),

 				array('id_member', 'id_ticket')

 			);

@@ -585,12 +614,11 @@ function shd_notify_ticket_options()

 					'subject' => $ticketinfo['subject'],

 				)

 			);

-			redirectexit('action=helpdesk;sa=ticket;ticket=' . $context['ticket_id']);

 			break;

 		case 'monitor_off';

 			if (!shd_allowed_to('shd_monitor_ticket', $ticketinfo['dept']))

 				fatal_lang_error('cannot_unmonitor_ticket', false);

-

+			// Just delete the old status.

 			$smcFunc['db_query']('', '

 				DELETE FROM {db_prefix}helpdesk_notify_override

 				WHERE id_member = {int:member}

@@ -606,15 +634,65 @@ function shd_notify_ticket_options()

 					'subject' => $ticketinfo['subject'],

 				)

 			);

-			redirectexit('action=helpdesk;sa=ticket;ticket=' . $context['ticket_id']);

 			break;

 		case 'ignore_on';

+			if (!shd_allowed_to('shd_monitor_ticket', $ticketinfo['dept']))

+				fatal_lang_error('cannot_monitor_ticket', false);

+

+			// Unlike turning it off, we might be turning it on from either just off, or ignored, so log that fact.

+			if ($old_state == NOTIFY_NEVER)

+				break;

+			elseif ($old_state == NOTIFY_ALWAYS)

+				// Log turning off ignore list first

+				shd_log_action('unmonitor',

+					array(

+						'ticket' => $context['ticket_id'],

+						'subject' => $ticketinfo['subject'],

+					)

+				);

+

+			$smcFunc['db_insert']('replace',

+				'{db_prefix}helpdesk_notify_override',

+				array(

+					'id_member' => 'int', 'id_ticket' => 'int', 'notify_state' => 'int',

+				),

+				array(

+					$context['user']['id'], $context['ticket_id'], NOTIFY_NEVER,

+				),

+				array('id_member', 'id_ticket')

+			);

+			shd_log_action('ignore',

+				array(

+					'ticket' => $context['ticket_id'],

+					'subject' => $ticketinfo['subject'],

+				)

+			);

 			break;

 		case 'ignore_off';

+			if (!shd_allowed_to('shd_monitor_ticket', $ticketinfo['dept']))

+				fatal_lang_error('cannot_unmonitor_ticket', false);

+

+			$smcFunc['db_query']('', '

+				DELETE FROM {db_prefix}helpdesk_notify_override

+				WHERE id_member = {int:member}

+					AND id_ticket = {int:ticket}',

+				array(

+					'member' => $context['user']['id'],

+					'ticket' => $context['ticket_id'],

+				)

+			);

+			shd_log_action('unignore',

+				array(

+					'ticket' => $context['ticket_id'],

+					'subject' => $ticketinfo['subject'],

+				)

+			);

 			break;

 		default:

 			break;

 	}

+

+	redirectexit('action=helpdesk;sa=ticket;ticket=' . $context['ticket_id']);

 }

 function shd_query_monitor_list($ticket_id)

@@ -479,6 +479,8 @@ function shd_log_action($action, $params, $do_last_update = true)

 		'move_dept' => 'shd_logopt_move_dept',

 		'monitor' => 'shd_logopt_monitor',

 		'unmonitor' => 'shd_logopt_monitor',

+		'ignore' => 'shd_logopt_monitor',

+		'unignore' => 'shd_logopt_monitor',

 	);

 	if (empty($logopt[$action]) || empty($modSettings[$logopt[$action]]))

@@ -77,6 +77,7 @@ function shd_load_all_permission_sets()

 		'shd_alter_privacy' => array(true, 'ticketactions', 'log_markprivate.png'),

 		'shd_assign_ticket' => array(true, 'ticketactions', 'log_assign.png'),

 		'shd_monitor_ticket' => array(true, 'ticketactions', 'log_notify.png'),

+		'shd_ignore_ticket' => array(true, 'ticketactions', 'perm_deny.png'),

 		'shd_view_attachment' => array(false, 'attachments', 'attachments.png'),

 		'shd_post_attachment' => array(false, 'attachments', 'attachments_add.png'),

@@ -165,6 +166,7 @@ function shd_load_role_templates()

 				'shd_edit_reply_any' => ROLEPERM_ALLOW,

 				'shd_post_proxy' => ROLEPERM_ALLOW,

 				'shd_monitor_ticket_any' => ROLEPERM_ALLOW,

+				'shd_ignore_ticket_own' => ROLEPERM_ALLOW,

 				'shd_view_attachment' => ROLEPERM_ALLOW,

 				'shd_post_attachment' => ROLEPERM_ALLOW,

 				'shd_resolve_ticket_any' => ROLEPERM_ALLOW,

@@ -207,6 +209,7 @@ function shd_load_role_templates()

 				'shd_post_proxy' => ROLEPERM_ALLOW,

 				'shd_override_cf' => ROLEPERM_ALLOW,

 				'shd_monitor_ticket_any' => ROLEPERM_ALLOW,

+				'shd_ignore_ticket_any' => ROLEPERM_ALLOW,

 				'shd_view_attachment' => ROLEPERM_ALLOW,

 				'shd_post_attachment' => ROLEPERM_ALLOW,

 				'shd_delete_attachment' => ROLEPERM_ALLOW,

@@ -496,8 +496,13 @@ function template_viewnotifications()

 					<div class="windowbg2">

 						<div class="shd_attachmentbox">';

+	$displayed_something = false;

+

+	if (!$context['display_notifications']['is_ignoring'])

+	{

 		if (!empty($context['display_notifications']['preferences']))

 		{

+			$displayed_something = true;

 			echo '

 							', $txt['shd_ticket_notify_because'], '

 							<ul>';

@@ -520,7 +525,7 @@ function template_viewnotifications()

 		if (!empty($context['display_notifications']['can_monitor']))

 		{

-		if (!empty($context['display_notifications']['preferences']) || !empty($context['display_notifications']['can_change']))

+			if ($displayed_something)

 				echo '

 							<br />';

@@ -538,6 +543,33 @@ function template_viewnotifications()

 								<input type="hidden" name="notifyaction" value="monitor_off" />

 								<input type="submit" value="', $txt['shd_ticket_monitor_off'], '" class="button_submit" />';

+			echo '

+								<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />

+							</form>';

+			$displayed_something = true;

+		}

+	}

+

+	if (!empty($context['display_notifications']['can_ignore']))

+	{

+		if ($displayed_something)

+			echo '

+							<br />';

+

+		echo '

+							<form action="', $scripturl, '?action=helpdesk;sa=notify;ticket=', $context['ticket_id'], '" method="post">';

+

+		if (!$context['display_notifications']['is_ignoring'])

+			echo '

+								<div>', $txt['shd_ticket_notify_me_never_note'], '</div>

+								<input type="hidden" name="notifyaction" value="ignore_on" />

+								<input type="submit" value="', $txt['shd_ticket_notify_me_never_on'], '" class="button_submit" />';

+		else

+			echo '

+								<div>', $txt['shd_ticket_notify_me_never'], '</div>

+								<input type="hidden" name="notifyaction" value="ignore_off" />

+								<input type="submit" value="', $txt['shd_ticket_notify_me_never_off'], '" class="button_submit" />';

+

 		echo '

 								<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />

 							</form>';