SD-SimpleDesk

@@ -105,15 +105,7 @@

 		}

 		// Now engage any hooks.

-		if (!empty($modSettings['shd_hook_profilemenu']))

-		{

-			$functions = explode(',', $modSettings['shd_hook_profilemenu']);

-			foreach ($functions as $function)

-			{

-				if (is_callable($function))

-					$function($profile_areas); // this should be picked up by reference in the called function or it won't do anything!

-			}

-		}

+		call_integration_hook('shd_hook_profilemenu', array(&$profile_areas));

 	}

 ]]></add>

@@ -420,6 +420,26 @@ $tables[] = array(

 // Oh joy, we've now made it to extra rows... (testing data)

 $rows = array();

+$rows[] = array(

+	'method' => 'replace',

+	'table_name' => '{db_prefix}scheduled_tasks',

+	'columns' => array(

+		'next_time' => 'int',

+		'time_offset' => 'int',

+		'time_regularity' => 'int',

+		'time_unit' => 'string',

+		'disabled' => 'int',

+		'task' => 'string',

+	),

+	'data' => array(

+		strtotime('tomorrow'),

+		0,

+		1,

+		'd',

+		0,

+		'simpledesk',

+	),

+);

 // Now we can add a new column to an existing table

 $columns = array();

@@ -38,6 +38,8 @@ $txt['core_settings_item_shd_desc'] = 'The helpdesk allows you to expand your fo

 //@{

 $txt['errortype_simpledesk'] = 'SimpleDesk';

 $txt['errortype_simpledesk_desc'] = 'Errors most likely related to SimpleDesk. Please report any such errors on www.simpledesk.net.';

+$txt['scheduled_task_simpledesk'] = 'SimpleDesk daily maintenance';

+$txt['scheduled_task_desc_simpledesk'] = 'Maintenance tasks and internal processing to be run daily for SimpleDesk. It is strongly not advised to disable this task.';

 //@}

 //! @name Items for the administration menu structure

@@ -199,6 +201,7 @@ $txt['shd_logopt_restore'] = 'Log tickets and replies being restored';

 $txt['shd_logopt_permadelete'] = 'Log tickets and replies being permadeleted';

 $txt['shd_logopt_relationships'] = 'Log any changes in ticket relationships';

 $txt['shd_logopt_split'] = 'Log splitting of a ticket into two tickets';

+$txt['shd_logopt_autoclose'] = 'Log tickets closed automatically by the helpdesk';

 $txt['shd_notify_send_to'] = 'Will be sent to';

 $txt['shd_notify_ticket_starter'] = 'the user who started the ticket (if set in their preferences)';

@@ -104,5 +104,7 @@ $txt['shd_log_newticketproxy'] = '&quot;<a href="{scripturl}?action=helpdesk;sa=

 $txt['shd_logpart_att_added'] = 'Files added';

 $txt['shd_logpart_att_removed'] = 'Files removed';

+

+$txt['shd_log_autoclose'] = '&quot;<a href="{scripturl}?action=helpdesk;sa=ticket;ticket={ticket}">{subject}</a>&quot; marked as <strong>resolved</strong> due to inactivity.';

 //@}

 ?>

\ No newline at end of file

@@ -72,7 +72,7 @@ function shd_admin_main()

 	);

 	// Int hooks - after we basically set everything up (so it's manipulatable by the hook, but before we do the last bits of finalisation)

-	call_integration_hook('shd_hook_hdadmin', array($subActions));

+	call_integration_hook('shd_hook_hdadmin', array(&$subActions));

 	// Make sure we can find a subaction. If not set, default to info

 	$_REQUEST['area'] = isset($_REQUEST['area']) && isset($subActions[$_REQUEST['area']]) ? $_REQUEST['area'] : 'helpdesk_info';

@@ -522,6 +522,7 @@ function shd_modify_standalone_options($return_config)

  *	<li>'shd_logopt_newposts' (checkbox) - if checked, a ticket's being creation and subsequent replies will be logged.</li>

  *	<li>'shd_logopt_editposts' (checkbox) - if checked, a ticket or its replies being edited will be logged.</li>

  *	<li>'shd_logopt_resolve' (checkbox) - if checked, a ticket's being closed and/or reopened will be logged.</li>

+ *	<li>'shd_logopt_autoclose' (checkbox) - if checked, tickets being closed by the helpdesk due to age will be logged.</li>

  *	<li>'shd_logopt_assign' (checkbox) - if checked, a ticket being assigned/reassigned/unassigned will be logged.</li>

  *	<li>'shd_logopt_privacy' (checkbox) - if checked, ticket privacy changes will be logged.</li>

  *	<li>'shd_logopt_urgency' (checkbox) - if checked, ticket urgency changes will be logged.</li>

@@ -550,10 +551,13 @@ 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_assign', 'disabled' => !empty($modSettings['shd_disable_action_log'])),

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

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

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

+		'',

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

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

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

@@ -323,7 +323,6 @@ function shd_list_hooks()

 		'shd_hook_modpost', // functions to call when a ticket or reply is edited (since all kinds of things might be altered)

 		'shd_hook_assign', // functions to call when a ticket is assigned to someone

 		'shd_hook_buffer', // functions to call prior to the final page generation

-		'shd_hook_postingopts', // functions to call to augment the additional options on posting screen

 		'shd_hook_after_main', // functions to call after action=helpdesk has been evaluated but before template calls are made

 		// Menu hooks - called after the rest of menu configuration is done (meaning menu items may or may not exist depending on permissions)

@@ -289,7 +289,7 @@ function shd_commit_assignment($ticket, $assignment, $is_ajax = false)

 	);

 	// Int hooks - after we've set everything up but before we actually press the button

-	call_integration_hook('shd_hook_assign', array($ticket, $assignment));

+	call_integration_hook('shd_hook_assign', array(&$ticket, &$assignment));

 	shd_modify_ticket_post($msgOptions, $ticketOptions, $posterOptions);

@@ -1869,8 +1869,6 @@ function shd_posting_additional_options()

 			'show' => !empty($context['can_solve']),

 		),

 	);

-

-	call_integration_hook('shd_hook_postingopts');

 }

 /**

@@ -90,7 +90,7 @@ function shd_profile_main($memID)

 	);

 	// Int hooks - after we basically set everything up (so it's manipulatable by the hook, but before we do the last bits of finalisation)

-	call_integration_hook('shd_hook_hdprofile', array($subActions, $memID));

+	call_integration_hook('shd_hook_hdprofile', array(&$subActions, &$memID));

 	// Make sure the menu is configured appropriately

 	$context['shd_profile_menu'][count($context['shd_profile_menu'])-1]['is_last'] = true;

@@ -30,7 +30,8 @@ if (!defined('SMF'))

 /**

  *	Container task for all the scheduled maintenance that SD can be asked to do.

  *

- *	- purge deleted tickets

+ *	- close older open tickets (if not replied to within a given number of days)

+ *	- purge deleted tickets (delete their contents aftet a given number of days of being already deleted)

  *

  *	@since 1.1

 */

@@ -39,15 +40,109 @@ function shd_scheduled()

 {

 	global $smcFunc, $modSettings;

+	shd_scheduled_close_tickets();

 	shd_scheduled_purge_tickets();

 	return true;

 }

+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}',

+		array(

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

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

+		)

+	);

+	$tickets = array();

+	$subjects = array();

+	$members = 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'];

+	}

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

+

+	// Any to do?

+	if (empty($tickets))

+		return;

+

+	// 2. Update the tickets.

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

+		UPDATE {db_prefix}helpdesk_tickets

+		SET status = {int:closed}

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

+		array(

+			'closed' => TICKET_STATUS_CLOSED,

+			'tickets' => $tickets,

+		)

+	);

+

+	// 3. Update the log if appropriate. Normally we would call shd_log_action(), however here... we might be doing a lot, so instead, we do it manually ourselves.

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

+	{

+		$rows = array();

+		$time = time();

+		foreach ($tickets as $ticket)

+		{

+			$rows[] = array(

+				$time, // log_time

+				0, // id_member

+				'', // ip

+				'autoclose', // action

+				$ticket, // id_ticket

+				0, // id_msg

+				serialize(array(

+					'subject' => $subjects[$ticket],

+					'auto' => true, // indicate to the action log that this is the case

+				)),

+			);

+		}

+

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

+			'{db_prefix}helpdesk_log_action',

+			array(

+				'log_time' => 'int', 'id_member' => 'int', 'ip' => 'string-16', 'action' => 'string', 'id_ticket' => 'int', 'id_msg' => 'int', 'extra' => 'string-65534',

+			),

+			$rows,

+			array('id_action')

+		);

+	}

+

+	// 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.

+	if (!empty($modSettings['cache_enable']))

+	{

+		$members = array_merge($members, shd_members_allowed_to('shd_staff'));

+		$members = array_unique($members);

+		foreach ($members as $member)

+		{

+			cache_put_data('shd_active_tickets_' . $member, null, 0);

+			cache_put_data('shd_ticket_count_' . $member, null, 0);

+		}

+	}

+}

+

 function shd_scheduled_purge_tickets()

 {

 	global $smcFunc, $modSettings;

-	if (empty($modSettings['shd_purge_tickets']) || empty($modSettings['shd_purge_tickets_days']))

+	if (empty($modSettings['shd_autopurge_tickets']) || empty($modSettings['shd_autopurge_tickets_days']))

 		return;

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

@@ -89,7 +184,7 @@ function shd_scheduled_purge_tickets()

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

 	// 3. Purge that list of threads too new to be deleted

-	$del_time = time() - (86400 * $modSettings['shd_purge_tickets_days']);

+	$del_time = time() - (86400 * $modSettings['shd_autopurge_tickets_days']);

 	foreach ($tickets as $k => $v)

 	{

 		if ($v == 0 || $v > $del_time)

@@ -1257,7 +1257,10 @@ function shd_display_btn_mvtopic(&$normal_buttons)

 */

 function scheduled_simpledesk()

 {

-	global $sourcedir;

+	global $sourcedir, $modSettings;

+

+	if (empty($modSettings['helpdesk_active']))

+		return;

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

 	return shd_scheduled();

@@ -1293,7 +1296,7 @@ function shd_init_actions(&$actionArray)

 		shd_load_language('SimpleDeskAdmin');

 	// Now engage any SD specific hooks.

-	call_integration_hook('shd_hook_actions', array($actionArray));

+	call_integration_hook('shd_hook_actions', array(&$actionArray));

 	if (!empty($modSettings['shd_helpdesk_only']))

 	{

@@ -1352,7 +1355,7 @@ function shd_buffer_replace(&$buffer)

 	}

 	// And any replacements a buffer might want to make...

-	call_integration_hook('shd_hook_buffer', array($buffer));

+	call_integration_hook('shd_hook_buffer', array(&$buffer));

 	return $buffer;

 }

@@ -74,8 +74,8 @@ function shd_load_action_log_entries($start = 0, $items_per_page = 10, $sort = '

 	// Without further screaming and waving, fetch the actions.

 	$request = shd_db_query('','

-		SELECT la.id_action, la.log_time, la.id_member, la.ip, la.action, la.id_ticket, la.id_msg, la.extra,

-		mem.real_name, mg.group_name

+		SELECT la.id_action, la.log_time, la.ip, la.action, la.id_ticket, la.id_msg, la.extra,

+		IFNULL(mem.id_member, 0) AS id_member, IFNULL(mem.real_name, {string:blank}) AS real_name, IFNULL(mg.group_name, {string:na}) AS group_name

 		FROM {db_prefix}helpdesk_log_action AS la

 			LEFT JOIN {db_prefix}members AS mem ON(mem.id_member = la.id_member)

 			LEFT JOIN {db_prefix}membergroups AS mg ON (mg.id_group = CASE WHEN mem.id_group = {int:reg_group_id} THEN mem.id_post_group ELSE mem.id_group END)

@@ -89,6 +89,8 @@ function shd_load_action_log_entries($start = 0, $items_per_page = 10, $sort = '

 			'items_per_page' => $items_per_page,

 			'order' => $order,

 			'clause' => empty($clause) ? '' : 'WHERE ' . $clause,

+			'na' => $txt['not_applicable'],

+			'blank' => '',

 		)

 	);

@@ -99,6 +100,15 @@ function shd_load_action_log_entries($start = 0, $items_per_page = 10, $sort = '

 		$row['extra'] = @unserialize($row['extra']);

 		$row['extra'] = is_array($row['extra']) ? $row['extra'] : array();

+		// Uhoh, we don't know who this is! Check it's not automatically by the system. If it is... mark it so.

+		if (empty($row['id_member']))

+		{

+			if (isset($row['extra']) && $row['extra']['auto'] === true)

+				$row['real_name'] = $txt['shd_helpdesk'];

+			else

+				$row['real_name'] = $txt['shd_admin_actionlog_unknown'];

+		}

+

 		$actions[$row['id_action']] = array(

 			'id' => $row['id_action'],

 			'time' => timeformat($row['log_time']),

@@ -310,7 +310,7 @@ function shd_create_ticket_post(&$msgOptions, &$ticketOptions, &$posterOptions)

 	// Int hooks

 	$hook = $new_ticket ? 'shd_hook_newticket' : 'shd_hook_newreply';

-	call_integration_hook($hook, array($msgOptions, $ticketOptions, $posterOptions));

+	call_integration_hook($hook, array(&$msgOptions, &$ticketOptions, &$posterOptions));

 	ignore_user_abort($previous_ignore_user_abort);

@@ -483,7 +483,7 @@ function shd_modify_ticket_post(&$msgOptions, &$ticketOptions, &$posterOptions)

 	}

 	// Int hook

-	call_integration_hook('shd_hook_modpost', array($msgOptions, $ticketOptions, $posterOptions));

+	call_integration_hook('shd_hook_modpost', array(&$msgOptions, &$ticketOptions, &$posterOptions));

 	ignore_user_abort($previous_ignore_user_abort);

@@ -68,6 +68,7 @@ $to_remove = array(

 	'shd_logopt_newposts',

 	'shd_logopt_editposts',

 	'shd_logopt_resolve',

+	'shd_logopt_autoclose',

 	'shd_logopt_assign',

 	'shd_logopt_privacy',

 	'shd_logopt_urgency',

@@ -91,6 +92,11 @@ $to_remove = array(

 	'shd_notify_new_reply_any',

 	'shd_notify_assign_me',

 	'shd_notify_assign_own',

+	// Scheduled tasks

+	'shd_autoclose_tickets',

+	'shd_autoclose_tickets_days',

+	'shd_autopurge_tickets',

+	'shd_autopurge_tickets_days',

 	// Plugin related: general

 	'shd_enabled_plugins',

 	// Plugin: source load hooks

@@ -113,7 +119,6 @@ $to_remove = array(

 	'shd_hook_modpost',

 	'shd_hook_assign',

 	'shd_hook_buffer',

-	'shd_hook_postingopts',

 	'shd_hook_after_main',

 	// Plugin: menu hooks

 	'shd_hook_mainmenu',

@@ -45,7 +45,7 @@ elseif (!defined('SMF'))

 	die('<b>Error:</b> Cannot uninstall - please verify you put this file in the same place as SMF\'s SSI.php.');

 }

-// Unchecking the option in Core Features, and deactivating all the hooks

+// Unchecking the option in Core Features.

 global $modSettings;

 $modSettings['helpdesk_active'] = false;

 $features = implode(',', array_diff(explode(',', $modSettings['admin_features']), array('shd')));

@@ -57,6 +57,7 @@ updateSettings(

 	true

 );

+// Removing all the hooks.

 $hooks = array();

 $hooks[] = array(

 	'hook' => 'integrate_display_buttons',

@@ -98,4 +99,12 @@ $hooks[] = array(

 foreach ($hooks as $hook)

 	remove_integration_function($hook['hook'], $hook['function']);

+// Removing the scheduled task.

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

+	DELETE FROM {db_prefix}scheduled_tasks

+	WHERE task = {string:simpledesk}',

+	array(

+		'simpledesk' => 'simpledesk',

+	)

+);

 ?>

\ No newline at end of file