SD-SimpleDesk

@@ -431,6 +431,7 @@ $tables[] = array(

 		db_field('before_after', 'tinyint'),

 		db_field('dept_order', 'smallint'),

 		db_field('dept_theme', 'tinyint'),

+		db_field('autoclose_days', 'smallint'),

 	),

 	'indexes' => array(

 		array(

@@ -387,6 +387,8 @@ $txt['shd_admin_cannot_move_dept_down'] = 'You cannot move that department down;

 $txt['shd_dept_theme'] = 'Use a specific theme in this department?';

 $txt['shd_dept_theme_note'] = 'You can set a theme for the helpdesk that differs to the main forum theme. This setting lets you override either the helpdesk or forum theme just within this department, for perhaps department specific branding.';

 $txt['shd_dept_theme_use_default'] = 'Use the helpdesk/forum default theme';

+$txt['shd_dept_autoclose_days'] = 'Number of days after which to automatically close a ticket?';

+$txt['shd_dept_autoclose_days_note'] = 'Use 0 to indicate that tickets in this department should never be automatically marked closed, no matter how old they are.';

 //@}

 //! Plugins

@@ -571,7 +571,7 @@ function shd_modify_actionlog_options($return_config)

 		array('check', 'shd_logopt_newposts', 'disabled' => !empty($modSettings['shd_disable_action_log'])),

 		array('check', 'shd_logopt_editposts', 'disabled' => !empty($modSettings['shd_disable_action_log'])),

 		array('check', 'shd_logopt_resolve', 'disabled' => !empty($modSettings['shd_disable_action_log'])),

-		array('check', 'shd_logopt_autoclose', 'disabled' => !empty($modSettings['shd_disable_action_log']) || empty($modSettings['shd_autoclose_tickets']) || empty($modSettings['shd_autoclose_tickets_days'])),

+		array('check', 'shd_logopt_autoclose', 'disabled' => !empty($modSettings['shd_disable_action_log'])),

 		array('checkall', 'shd_logopt_1', array('shd_logopt_newposts', 'shd_logopt_editposts', 'shd_logopt_resolve', 'shd_logopt_autoclose')),

 		'',

 		array('check', 'shd_logopt_assign', 'disabled' => !empty($modSettings['shd_disable_action_log'])),

@@ -239,7 +239,7 @@ function shd_admin_edit_dept()

 	// Get the current department

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

-		SELECT id_dept, dept_name, description, board_cat, before_after, dept_theme

+		SELECT id_dept, dept_name, description, board_cat, before_after, dept_theme, autoclose_days

 		FROM {db_prefix}helpdesk_depts

 		WHERE id_dept = {int:dept}',

 		array(

@@ -426,6 +426,12 @@ function shd_admin_save_dept()

 	shd_get_dept_theme_list();

 	$_POST['dept_theme'] = isset($_POST['dept_theme']) && isset($context['dept_theme_list'][$_POST['dept_theme']]) ? (int) $_POST['dept_theme'] : 0;

+	$_POST['autoclose_days'] = isset($_POST['autoclose_days']) ? (int) $_POST['autoclose_days'] : 0;

+	if ($_POST['autoclose_days'] < 0)

+		$_POST['autoclose_days'] = 0;

+	if ($_POST['autoclose_days'] > 9999)

+		$_POST['autoclose_days'] = 9999;

+

 	// 6. Commit that to DB.

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

 		UPDATE {db_prefix}helpdesk_depts

@@ -433,7 +439,8 @@ function shd_admin_save_dept()

 			description = {string:description},

 			board_cat = {int:board_cat},

 			before_after = {int:before_after},

-			dept_theme = {int:dept_theme}

+			dept_theme = {int:dept_theme},

+			autoclose_days = {int:autoclose_days}

 		WHERE id_dept = {int:id_dept}',

 		array(

 			'id_dept' => $_REQUEST['dept'],

@@ -442,6 +449,7 @@ function shd_admin_save_dept()

 			'board_cat' => $_POST['dept_cat'],

 			'before_after' => $_POST['dept_beforeafter'],

 			'dept_theme' => $_POST['dept_theme'],

+			'autoclose_days' => $_POST['autoclose_days'],

 		)

 	);

@@ -21,7 +21,7 @@

  *	This file handles the scheduled tasks that can come along.

  *

  *	@package source

- *	@since 1.0

+ *	@since 2.0

 */

 if (!defined('SMF'))

@@ -41,7 +41,7 @@ function shd_scheduled()

 	global $smcFunc, $modSettings;

 	shd_scheduled_close_tickets();

-	shd_scheduled_purge_tickets();

+	//shd_scheduled_purge_tickets();

 	return true;

 }

@@ -49,21 +49,19 @@ function shd_scheduled_close_tickets()

 {

 	global $modSettings, $smcFunc, $txt;

-	if (empty($modSettings['shd_autoclose_tickets']) || empty($modSettings['shd_autoclose_tickets_days']))

-		return;

-

 	@set_time_limit(600); // Ten minutes. Is a big job, possibly.

 	// 1. Get the list of tickets.

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

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

-		FROM {db_prefix}helpdesk_tickets AS hdt

-			INNER JOIN {db_prefix}helpdesk_ticket_replies AS hdtr_last ON (hdt.id_last_msg = hdtr_last.id_msg)

-		WHERE hdt.status IN ({array_int:open})

-			AND poster_time <= {int:old_time}',

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

+		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

+			AND hdt.last_updated <= {int:time} - (86400 * hdd.autoclose_days)

+			AND hdt.status IN ({array_int:open})',

 		array(

 			'open' => array(TICKET_STATUS_NEW, TICKET_STATUS_PENDING_STAFF, TICKET_STATUS_PENDING_USER),

-			'old_time' => time() - 86400 * $modSettings['shd_autoclose_tickets_days'],

+			'time' => time(),

 		)

 	);

 	$tickets = array();

@@ -85,11 +83,13 @@ function shd_scheduled_close_tickets()

 	// 2. Update the tickets.

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

 		UPDATE {db_prefix}helpdesk_tickets

-		SET status = {int:closed}

+		SET status = {int:closed},

+			last_updated = {int:time}

 		WHERE id_ticket IN ({array_int:tickets})',

 		array(

 			'closed' => TICKET_STATUS_CLOSED,

 			'tickets' => $tickets,

+			'time' => time(),

 		)

 	);

@@ -233,6 +233,13 @@ function template_shd_edit_dept()

 	echo '

 								</dd>

+								<dt>

+									<strong>', $txt['shd_dept_autoclose_days'], '</strong>

+									<div class="smalltext">', $txt['shd_dept_autoclose_days_note'], '</div>

+								</dt>

+								<dd>

+									<input type="text" name="autoclose_days" id="autoclose_days" value="', $context['shd_dept']['autoclose_days'], '" class="input_text" size="5" /></dd>

+								</dd>

 							</dl>

 						</div>

 					</div>

@@ -102,8 +102,6 @@ $to_remove = array(

 	'shd_notify_assign_me',

 	'shd_notify_assign_own',

 	// Scheduled tasks

-	'shd_autoclose_tickets',

-	'shd_autoclose_tickets_days',

 	'shd_autopurge_tickets',

 	'shd_autopurge_tickets_days',

 );