SD-SimpleDesk

@@ -413,6 +413,17 @@ h3.ticketheader img

 	margin-bottom: 10px;

 }

+.shd_ajax_head

+{

+	font-weight: bold;

+}

+.shd_ajaxnotify

+{

+	width: 40%;

+	margin-right: 5%;

+	float: left;

+}

+

 /**********************************

 * Attachment stuff				  *

 ***********************************/

@@ -789,17 +789,26 @@ function shd_ajax_notify()

 		ob_start();

 		echo '<notify><![C', 'DATA[';

+		$selected = array();

+		if (!empty($_GET['list']))

+		{

+			$_GET['list'] = explode(',', $_GET['list']);

+			foreach ($_GET['list'] as $id)

+				if ((int) $id > 0)

+					$selected[] = (int) $id;

+		}

+

 		if (!empty($notify_list['being_notified']))

-			echo $txt['shd_ping_already_' . (count($notify_list['being_notified']) == 1 ? '1' : 'n')], '<br />', implode(', ', $notify_list['being_notified']);

+			echo '<span class="shd_ajax_head">', $txt['shd_ping_already_' . (count($notify_list['being_notified']) == 1 ? '1' : 'n')], '</span><br />', implode(', ', $notify_list['being_notified']);

 		if (!empty($notify_list['optional']))

 		{

 			if (!empty($notify_list['being_notified']))

 				echo '<br /><br />';

-			echo $txt['shd_ping_' . (count($notify_list['optional']) == 1 ? '1' : 'n')], '<br />';

+			echo '<span class="shd_ajax_head">', $txt['shd_ping_' . (count($notify_list['optional']) == 1 ? '1' : 'n')], '</span><br />';

 			foreach ($notify_list['optional'] as $id => $member)

-				echo '<div class="shd_ajaxnotify"><input type="checkbox" name="notify[', $id, ']" value="', $id, '" class="input_check" /> ', $member, '</div>';

+				echo '<div class="shd_ajaxnotify"><input type="checkbox" name="notify[', $id, ']" value="', $id, '"', in_array($id, $selected) ? ' checked="checked"' : '', ' class="input_check" /> ', $member, '</div>';

 		}

 		if (!empty($notify_list['optional_butoff']))

@@ -807,9 +816,9 @@ function shd_ajax_notify()

 			if (!empty($notify_list['being_notified']) || !empty($notify_list['optional_butoff']))

 				echo '<br /><br />';

-			echo $txt['shd_ping_none_' . (count($notify_list['optional_butoff']) == 1 ? '1' : 'n')], '<br />';

+			echo '<span class="shd_ajax_head">', $txt['shd_ping_none_' . (count($notify_list['optional_butoff']) == 1 ? '1' : 'n')], '</span><br />';

 			foreach ($notify_list['optional_butoff'] as $id => $member)

-				echo '<div class="shd_ajaxnotify"><input type="checkbox" name="notify[', $id, ']" value="', $id, '" class="input_check" /> ', $member, '</div>';

+				echo '<div class="shd_ajaxnotify"><input type="checkbox" name="notify[', $id, ']" value="', $id, '"', in_array($id, $selected) ? ' checked="checked"' : '', ' class="input_check" /> ', $member, '</div>';

 		}

 		echo ']', ']></notify>';

@@ -209,13 +209,23 @@ function shd_notifications_notify_newreply(&$msgOptions, &$ticketOptions, &$post

 		unset($members[$member_id]);

 	// And now, finally, receive the list of possible cases from the notification doodad, and verify against a list of possible people.

-	if ($context['can_ping'] && !empty($_POST['notify']) && is_array($_POST['notify']))

+	if ($context['can_ping'])

+	{

+		if (!empty($_POST['notify']) && is_array($_POST['notify']))

 		{

 			$staff[] = $ticketinfo['starter_id']; // Add the ticket starter as a possible candidate.

 			foreach ($_POST['notify'] as $id)

 				if (in_array((int) $id, $staff))

 					$members[$id]['ping'] = true;

 		}

+		elseif (!empty($_REQUEST['list']))

+		{

+			$list = explode(',', $_REQUEST['list']);

+			foreach ($list as $id)

+				if (in_array((int) $id, $staff))

+					$members[$id]['ping'] = true;

+		}

+	}

 	// So, at this point, $members contains a list of the members and a sequence of the possible messages they could get. We need to make some sense of it.

 	$notify_data['members'] = array();

@@ -1131,6 +1131,17 @@ function shd_save_reply()

 		$context['page_title'] = $txt['shd_helpdesk'];

 		$context['sub_template'] = 'reply_post';

+		// Oh, yeah, we need to look at the existing notifications pinging stuff, if appropriate, and reset that.

+		if ($context['can_ping'] && !empty($_POST['notify']) && is_array($_POST['notify']))

+		{

+			$items = array();

+			foreach ($_POST['notify'] as $item)

+				if (!empty($item) && is_numeric($item))

+					$items[] = $item;

+			if (!empty($items))

+				$context['notification_ping_list'] = implode(',', $items);

+		}

+

 		shd_check_attachments();

 		// Set up the fancy editor

@@ -758,7 +758,13 @@ function template_singleton_email()

 	{

 		echo '

 						<div id="shd_notifications_div" style="display:none;">

-							<a href="#" onclick="getAjaxNotifications(); return false;">', $txt['shd_select_notifications'], '</a>

+							<a href="#" onclick="getAjaxNotifications(); return false;">', $txt['shd_select_notifications'], '</a>';

+

+		if (!empty($context['notification_ping_list']))

+			echo '

+							<input type="hidden" name="list" value="', $context['notification_ping_list'], '" />';

+

+		echo '

 						</div>

 						<script type="text/javascript"><!-- // --><![CDATA[

 	document.getElementById("shd_notifications_div").style.display = "";

@@ -766,7 +772,7 @@ function template_singleton_email()

 	function getAjaxNotifications()

 	{

 		ajax_indicator(true);

-		getXMLDocument(smf_prepareScriptUrl(smf_scripturl) + "action=helpdesk;sa=ajax;op=notify;ticket=', $context['ticket_id'], ';', $context['session_var'], '=', $context['session_id'], '", handleAjaxNotifications);

+		getXMLDocument(smf_prepareScriptUrl(smf_scripturl) + "action=helpdesk;sa=ajax;op=notify;ticket=', $context['ticket_id'], ';', $context['session_var'], '=', $context['session_id'], !empty($context['notification_ping_list']) ? ';list=' . $context['notification_ping_list'] : '', '", handleAjaxNotifications);

 	}

 	function handleAjaxNotifications(XMLDoc)