SD-SimpleDesk

@@ -226,7 +226,7 @@ $txt['shd_notify_nobody'] = 'nobody';

 $txt['shd_notify_email'] = 'Email address to use in the notifications, leave blank to use the forum default (%1$s)';

 $txt['shd_notify_log'] = 'Log notifications being sent (what notification, when sent, user(s) involved)';

 $txt['shd_notify_with_body'] = 'When sending notifications, send the new ticket or new reply content in the email';

-$txt['shd_notify_new_ticket'] = 'Allow staff to receive notifications on new and updated tickets';

+$txt['shd_notify_new_ticket'] = 'Allow staff to receive notifications on new tickets';

 $txt['shd_notify_new_reply_own'] = 'Allow users to receive notifications when their tickets are replied to';

 $txt['shd_notify_new_reply_assigned'] = 'Allow staff to receive notifications when tickets assigned to them are replied to';

 $txt['shd_notify_new_reply_previous'] = 'Allow staff to receive notifications when tickets they have replied to, are replied to again';

@@ -35,11 +35,6 @@ $txt['template_body_notify_new_ticket'] = 'A new helpdesk ticket, "[{ticket_id}]

 $txt['template_bodyfull_notify_new_ticket'] = 'A new helpdesk ticket, "[{ticket_id}] {subject}", has been created, by {poster_name}.' . "\n\n" . '====Begin Comment====' . "\n" . '{body}' . "\n" . '====End Comment====' . "\n\n" . 'You can access it here:' . "\n" . '{ticketlink}';

 $txt['template_log_notify_new_ticket'] = 'New ticket';

-$txt['template_subject_notify_update_ticket'] = 'Helpdesk [{ticket_id}] Ticket updated by [{poster_name}] -RE- [{subject}]';

-$txt['template_body_notify_update_ticket'] = 'A helpdesk ticket, "[{ticket_id}] {subject}", has been updated, by {poster_name}.' . "\n\n" . 'You can access it here:' . "\n" . '{ticketlink}';

-$txt['template_bodyfull_notify_update_ticket'] = 'A helpdesk ticket, "[{ticket_id}] {subject}", has been updated, by {poster_name}.' . "\n\n" . 'You can access it here:' . "\n" . '{ticketlink}';

-$txt['template_log_notify_update_ticket'] = 'Ticket updated';

-

 $txt['template_subject_notify_new_reply_own'] = 'Helpdesk [{ticket_id}] New reply from [{poster_name}] -RE- [{subject}]';

 $txt['template_body_notify_new_reply_own'] = 'Your ticket, "[{ticket_id}] {subject}", has been replied to, by {poster_name}.' . "\n\n" . 'You can read the reply here:' . "\n" . '{ticketlink}';

 $txt['template_bodyfull_notify_new_reply_own'] = 'Your ticket, "[{ticket_id}] {subject}", has been replied to, by {poster_name}.' . "\n\n" . '====Begin Comment====' . "\n" . '{body}' . "\n" . '====End Comment====' . "\n\n" . 'You can read the reply here:' . "\n" . '{ticketlink}';

@@ -138,7 +138,7 @@ $txt['shd_pref_block_order_lastreply_desc'] = 'Last reply - latest first';

 // Preferences: email notifications

 $txt['shd_pref_group_notify'] = 'Notifications By Email';

-$txt['shd_pref_notify_new_ticket'] = 'Email me when a new ticket is posted, or one is updated';

+$txt['shd_pref_notify_new_ticket'] = 'Email me when a new ticket is posted';

 $txt['shd_pref_notify_new_reply_own'] = 'Email me when one of my tickets is replied to';

 $txt['shd_pref_notify_new_reply_assigned'] = 'Email me when a ticket assigned to me is replied to';

 $txt['shd_pref_notify_new_reply_previous'] = 'Email me when a ticket I\'ve replied to before is replied to again';

@@ -26,7 +26,7 @@

 if (!defined('SMF'))

 	die('Hacking attempt...');

-function shd_notifications_notify_newticket(&$msgOptions, &$ticketOptions, &$posterOptions, $new_ticket = true)

+function shd_notifications_notify_newticket(&$msgOptions, &$ticketOptions, &$posterOptions)

 {

 	global $smcFunc, $context, $modSettings, $scripturl;

@@ -34,7 +34,7 @@ function shd_notifications_notify_newticket(&$msgOptions, &$ticketOptions, &$pos

 	if (empty($modSettings['shd_notify_new_ticket']))

 		return;

-	// We don't always have this. But it should be available in context because if we're coming from updated ticket, we will have the other...

+	// We don't always have this. But it should be available elsewhere.

 	if (!isset($ticketOptions['private']))

 		$ticketOptions['private'] = $context['ticket_form']['private']['setting'];

 	if (empty($posterOptions['name']))

@@ -74,11 +74,10 @@ function shd_notifications_notify_newticket(&$msgOptions, &$ticketOptions, &$pos

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

 	// OK, now figure out who we're sending to, and discard any member id's we're not sending to

-	$template = $new_ticket ? 'new_ticket' : 'update_ticket';

 	foreach ($members as $member => $value)

 	{

 		if (!empty($value))

-			$members[$member] = $template;

+			$members[$member] = 'new_ticket';

 		else

 			unset($members[$member]);

 	}

@@ -584,7 +584,7 @@ function shd_save_ticket()

 			// Handle notifications

 			require_once($sourcedir . '/sd_source/SimpleDesk-Notifications.php');

-			shd_notifications_notify_newticket($msgOptions, $ticketOptions, $posterOptions, true);

+			shd_notifications_notify_newticket($msgOptions, $ticketOptions, $posterOptions);

 		}

 		else

 		{

@@ -672,10 +672,6 @@ function shd_save_ticket()

 					shd_log_action($action, $field);

 				}

 			}

-

-			// Handle notifications

-			require_once($sourcedir . '/sd_source/SimpleDesk-Notifications.php');

-			shd_notifications_notify_newticket($msgOptions, $ticketOptions, $posterOptions, false);

 		}

 		shd_done_posting();

 	}