SD-SimpleDesk

@@ -53,7 +53,7 @@ function shd_scheduled_close_tickets()

 	// 1. Get the list of tickets.

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

-		SELECT hdt.id_ticket, hdt.subject, hdt.id_member_started, hdt.id_member_updated

+		SELECT hdt.id_ticket, hdt.subject, hdt.id_member_started, hdt.id_member_updated, hdt.id_dept

 		FROM {db_prefix}helpdesk_depts AS hdd

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

 		WHERE hdd.autoclose_days > 0

@@ -67,21 +67,24 @@ function shd_scheduled_close_tickets()

 	$tickets = array();

 	$subjects = array();

 	$members = array();

+	$depts = array();

 	while ($row = $smcFunc['db_fetch_assoc']($query))

 	{

 		$tickets[$row['id_ticket']] = $row['id_ticket'];

 		$subjects[$row['id_ticket']] = $row['subject'];

 		$members[] = $row['id_member_started'];

 		$members[] = $row['id_member_updated'];

+		$depts[$row['id_dept']] = $row['id_dept'];

 	}

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

 	// Any to do?

-	if (empty($tickets))

-		return;

+	if (!empty($tickets))

+	{

+		$time = time();

 		// 2. Update the tickets.

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

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

 			UPDATE {db_prefix}helpdesk_tickets

 			SET status = {int:closed},

 				last_updated = {int:time}

@@ -89,7 +92,7 @@ function shd_scheduled_close_tickets()

 			array(

 				'closed' => 3, // TICKET_STATUS_CLOSED isn't defined here either.

 				'tickets' => $tickets,

-			'time' => time(),

+				'time' => $time,

 			)

 		);

@@ -97,7 +100,6 @@ function shd_scheduled_close_tickets()

 		if (empty($modSettings['shd_disable_action_log']) && !empty($modSettings['shd_logopt_autoclose']))

 		{

 			$rows = array();

-		$time = time();

 			foreach ($tickets as $ticket)

 			{

 				$rows[] = array(

@@ -126,7 +128,10 @@ function shd_scheduled_close_tickets()

 		// 4. If caching is enabled, make sure to purge the cache for members so their number of tickets will be recalculated.

 		// No need to dump all SD cache items though, though we have to get all those whose tickets were affected, plus all staff.

-	shd_clear_active_tickets();

+		$depts = array_flip($depts);

+		foreach ($depts as $dept)

+			shd_clear_active_tickets($dept);

+	}

 }

 function shd_scheduled_purge_tickets()

@@ -359,15 +359,20 @@ function shd_get_active_tickets()

 function shd_clear_active_tickets($dept = 0)

 {

 	global $modSettings;

+	static $done_all = false;

 	// This isn't very nice, unfortunately. But it's the only way to ensure that caches are flushed as necessary and to prevent us having to query so much more on every page.

 	// Firstly, the active ticket count. Needs to be for every person that can see this department.

 	$members = shd_members_allowed_to('access_helpdesk', $dept);

+	if (!$done_all)

+	{

 		foreach ($members as $member)

 		{

 			cache_put_data('shd_active_tickets_' . $member, null, 120);

 			cache_put_data('shd_ticket_count_' . $member, null, 120);

 		}

+		$done_all = true;

+	}

 	// This is going to hurt.

 	if ($dept == 0)

@@ -1571,7 +1576,8 @@ function scheduled_simpledesk()

 		return;

 	require($sourcedir . '/sd_source/SimpleDesk-Scheduled.php');

-	return shd_scheduled();

+	shd_scheduled();

+	return true;

 }

 /**