SD-SimpleDesk

@@ -735,7 +735,7 @@ function shd_maint_status()

 	$tickets = array();

 	$tickets_modify = array();

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

-		SELECT id_ticket, num_replies, id_member_started, id_member_updated, status

+		SELECT id_ticket, num_replies, id_member_started, id_member_updated, status, id_dept

 		FROM {db_prefix}helpdesk_tickets

 		WHERE status IN ({array_int:open})

 		ORDER BY id_ticket ASC

@@ -754,7 +754,7 @@ function shd_maint_status()

 	{

 		foreach ($tickets as $ticket)

 		{

-			$new_status = shd_determine_status('reply', $ticket['id_member_started'], $ticket['id_member_updated'], $ticket['num_replies']);

+			$new_status = shd_determine_status('reply', $ticket['id_member_started'], $ticket['id_member_updated'], $ticket['num_replies'], $ticket['dept']);

 			if ($ticket['status'] != $new_status)

 				$tickets_modify[$ticket['id_ticket']] = $new_status;

 		}

@@ -182,7 +182,7 @@ function shd_reply_delete()

 		WHERE id_ticket = {int:ticket}',

 		array(

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

-			'status' => shd_determine_status('deletereply', $starter, $replier, $num_replies),

+			'status' => shd_determine_status('deletereply', $starter, $replier, $num_replies, $row['id_dept']),

 		)

 	);

@@ -434,7 +434,7 @@ function shd_perma_delete()

 			WHERE id_ticket = {int:ticket}',

 			array(

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

-				'status' => shd_determine_status('deletereply', $starter, $replier, $num_replies),

+				'status' => shd_determine_status('deletereply', $starter, $replier, $num_replies, $row['id_dept']),

 			)

 		);

@@ -550,7 +550,7 @@ function shd_ticket_restore()

 			AND {query_see_ticket}',

 		array(

 			'current_ticket' => $context['ticket_id'],

-			'status_new' => shd_determine_status('restoreticket', $starter, $replier, $num_replies),

+			'status_new' => shd_determine_status('restoreticket', $starter, $replier, $num_replies, $row['id_dept']),

 		)

 	);

@@ -646,7 +646,7 @@ function shd_reply_restore()

 		WHERE id_ticket = {int:ticket}',

 		array(

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

-			'status' => shd_determine_status('restorereply', $starter, $replier, $num_replies),

+			'status' => shd_determine_status('restorereply', $starter, $replier, $num_replies, $row['id_dept']),

 		)

 	);

@@ -129,7 +129,7 @@ function shd_ticket_resolve()

 				fatal_lang_error('error_shd_cannot_resolve_children', false);

 		}

-		$new = shd_determine_status($action, $row['id_member_started'], $row['id_member_updated'], $row['num_replies']);

+		$new = shd_determine_status($action, $row['id_member_started'], $row['id_member_updated'], $row['num_replies'], $row['id_dept']);

 		shd_db_query('', '

 			UPDATE {db_prefix}helpdesk_tickets

@@ -1168,7 +1168,7 @@ function shd_save_reply()

 		if ($new_reply)

 		{

 			// So... what is the new status?

-			$new_status = shd_determine_status('reply', $ticketinfo['starter_id'], $user_info['id']);

+			$new_status = shd_determine_status('reply', $ticketinfo['starter_id'], $user_info['id'], $context['ticket_form']['dept']);

 			// Now to add the ticket details

 			$posterOptions = array(

@@ -1048,7 +1048,7 @@ function shd_topictoticket2()

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

 	// Figure out what the status of the ticket should be.

-	$status = shd_determine_status('topictoticket', $owner, $memberupdated, $numreplies);

+	$status = shd_determine_status('topictoticket', $owner, $memberupdated, $numreplies, $_REQUEST['dept']);

 	// Are we changing the subject?

 	$old_subject = $subject;

@@ -986,12 +986,13 @@ function shd_image_url($filename)

  *	@return int Returns an integer value that corresponds to the ticket's status, relating to one of the TICKET_STATUS states.

  *	@since 1.0

 */

-function shd_determine_status($action, $starter_id = 0, $replier_id = 0, $replies = -1)

+function shd_determine_status($action, $starter_id = 0, $replier_id = 0, $replies = -1, $dept = -1)

 {

+	global $context;

 	static $staff = null;

-	if ($staff === null)

-		$staff = shd_members_allowed_to('shd_staff');

+	if (!isset($staff[$dept]))

+		$staff[$dept] = shd_members_allowed_to('shd_staff', $dept);

 	$known_states = array(

 		'new',

@@ -1026,7 +1027,7 @@ function shd_determine_status($action, $starter_id = 0, $replier_id = 0, $replie

 				return TICKET_STATUS_NEW;

 			else

 			{

-				if (in_array($replier_id, $staff))

+				if (in_array($replier_id, $staff[$dept]))

 					$new_status = $starter_id == $replier_id ? TICKET_STATUS_PENDING_STAFF : TICKET_STATUS_PENDING_USER; // i.e. if they're staff but it's their own ticket they're replying to, it's not with user.

 				else

 					$new_status = TICKET_STATUS_PENDING_STAFF;