SD-SimpleDesk

@@ -380,7 +380,7 @@ function shd_ajax_assign()

 	if (!empty($context['ticket_id']))

 	{

 		$query = shd_db_query('', '

-			SELECT hdt.private, hdt.id_member_started, id_member_assigned, id_dept, 1 AS valid

+			SELECT hdt.private, hdt.id_member_started, id_member_assigned, id_dept, hdt.status, 1 AS valid

 			FROM {db_prefix}helpdesk_tickets AS hdt

 			WHERE {query_see_ticket}

 				AND hdt.id_ticket = {int:ticket}',

@@ -389,7 +389,7 @@ function shd_ajax_assign()

 			)

 		);

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

-			list($private, $ticket_starter, $ticket_assigned, $dept, $valid) = $smcFunc['db_fetch_row']($query);

+			list($private, $ticket_starter, $ticket_assigned, $dept, $status, $valid) = $smcFunc['db_fetch_row']($query);

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

 	}

 	if (empty($valid))

@@ -402,7 +402,7 @@ function shd_ajax_assign()

 	if (empty($assignees))

 		return $context['ajax_return'] = array('error' => $txt['shd_no_staff_assign']);

-	if (!shd_allowed_to('shd_assign_ticket_any', $dept))

+	if (!shd_allowed_to('shd_assign_ticket_any', $dept) || $status == TICKET_STATUS_CLOSED || $status == TICKET_STATUS_DELETED)

 		return $context['ajax_return'] = array('error' => $txt['shd_cannot_assign']);

 	// OK, so we have the general values we need. Let's get user names, and get ready to kick this back to the user. We'll build the XML here though.

@@ -440,7 +440,7 @@ function shd_ajax_assign2()

 	if (!empty($context['ticket_id']))

 	{

 		$query = shd_db_query('', '

-			SELECT hdt.private, hdt.id_member_started, id_member_assigned, subject, id_dept, 1 AS valid

+			SELECT hdt.private, hdt.id_member_started, id_member_assigned, subject, id_dept, hdt.status, 1 AS valid

 			FROM {db_prefix}helpdesk_tickets AS hdt

 			WHERE {query_see_ticket}

 				AND hdt.id_ticket = {int:ticket}',

@@ -449,7 +449,7 @@ function shd_ajax_assign2()

 			)

 		);

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

-			list($private, $ticket_starter, $ticket_assigned, $subject, $dept, $valid) = $smcFunc['db_fetch_row']($query);

+			list($private, $ticket_starter, $ticket_assigned, $subject, $dept, $status, $valid) = $smcFunc['db_fetch_row']($query);

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

 	}

 	if (empty($valid))

@@ -458,7 +458,7 @@ function shd_ajax_assign2()

 	if (!isset($_GET['to_user']) || !is_numeric($_GET['to_user']))

 		return $context['ajax_return'] = array('error' => $txt['shd_assigned_not_permitted'] . 'line459');

-	if (!shd_allowed_to('shd_assign_ticket_any', $dept))

+	if (!shd_allowed_to('shd_assign_ticket_any', $dept) || $status == TICKET_STATUS_CLOSED || $status == TICKET_STATUS_DELETED)

 		return $context['ajax_return'] = array('error' => $txt['shd_cannot_assign']);

 	$_GET['to_user'] = isset($_GET['to_user']) ? (int) $_GET['to_user'] : 0;

@@ -61,7 +61,7 @@ function shd_assign()

 	// Get ticket details - and kick it out if they shouldn't be able to see it.

 	$query = shd_db_query('', '

-		SELECT id_member_started, id_member_assigned, private, subject, hdt.id_dept, hdd.dept_name

+		SELECT id_member_started, id_member_assigned, private, subject, hdt.id_dept, hdt.status, hdd.dept_name

 		FROM {db_prefix}helpdesk_tickets AS hdt

 			INNER JOIN {db_prefix}helpdesk_depts AS hdd ON (hdt.id_dept = hdd.id_dept)

 		WHERE {query_see_ticket} AND id_ticket = {int:ticket}',

@@ -73,7 +73,7 @@ function shd_assign()

 	$log_params = array();

 	if ($row = $smcFunc['db_fetch_row']($query))

 	{

-		list($ticket_starter, $ticket_owner, $private, $subject, $dept, $dept_name) = $row;

+		list($ticket_starter, $ticket_owner, $private, $subject, $dept, $status, $dept_name) = $row;

 		$log_params = array(

 			'subject' => $subject,

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

@@ -85,6 +85,9 @@ function shd_assign()

 		fatal_lang_error('shd_no_ticket');

 	}

+	if ($status == TICKET_STATUS_CLOSED || $status == TICKET_STATUS_DELETED)

+		fatal_lang_error('shd_cannot_assign', false);

+

 	if (shd_allowed_to('shd_assign_ticket_any', $dept)) // can regularly assign? If so, load up potential candidates and throw it at the template.

 	{

 		$members = shd_get_possible_assignees($private, $ticket_starter, $dept);

@@ -184,7 +187,7 @@ function shd_assign2()

 	// Get ticket details - and kick it out if they shouldn't be able to see it.

 	$query = shd_db_query('', '

-		SELECT id_member_started, id_member_assigned, private, subject, id_dept

+		SELECT id_member_started, id_member_assigned, private, subject, status, id_dept

 		FROM {db_prefix}helpdesk_tickets AS hdt

 		WHERE {query_see_ticket} AND id_ticket = {int:ticket}',

 		array(

@@ -196,7 +199,7 @@ function shd_assign2()

 	if ($row = $smcFunc['db_fetch_row']($query))

 	{

-		list($ticket_starter, $ticket_owner, $private, $subject, $dept) = $row;

+		list($ticket_starter, $ticket_owner, $private, $subject, $status, $dept) = $row;

 		// The core details that we'll be logging

 		$log_params = array(

@@ -214,6 +217,9 @@ function shd_assign2()

 	if (isset($_REQUEST['cancel']))

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

+	if ($status == TICKET_STATUS_CLOSED || $status == TICKET_STATUS_DELETED)

+		fatal_lang_error('shd_cannot_assign', false);

+

 	if (shd_allowed_to('shd_assign_ticket_any', $dept)) // can regularly assign? If so, see if our requested member is staff and can see the ticket

 	{

 		if ($assignee == 0) // can always unassign a ticket

@@ -585,7 +585,7 @@ function shd_view_ticket()

 	{

 		$assign_nav['display'] = shd_allowed_to('shd_staff', $context['ticket']['dept']) && !$context['ticket']['closed'] && !$context['ticket']['deleted'];

 		$assign_nav['text'] = empty($context['ticket']['id_member_assigned']) ? 'shd_ticket_assign' : 'shd_ticket_reassign';

-		$context['ajax_assign'] = true;

+		$context['ajax_assign'] = $assign_nav['display'];

 	}

 	elseif (shd_allowed_to('shd_assign_ticket_own', $context['ticket']['dept']))

 	{