SD-SimpleDesk

@@ -131,6 +131,7 @@ $txt['shd_pref_block_order_user_block'] = 'Normal ordering of tickets in the "Ti

 $txt['shd_pref_block_order_closed_block'] = 'Normal ordering of tickets in the "Closed Tickets" block';

 $txt['shd_pref_block_order_recycle_block'] = 'Normal ordering of tickets in the "Recycled Tickets" block';

 $txt['shd_pref_block_order_withdeleted_block'] = 'Normal ordering of tickets in the "Tickets with Deleted Replies" block';

+$txt['shd_pref_block_order_hold_block'] = 'Normal ordering of tickets in the "Tickets On Hold" block';

 $txt['shd_pref_block_order_ticketid_asc'] = 'Ticket number - lowest first';

 $txt['shd_pref_block_order_ticketid_desc'] = 'Ticket number - highest first';

@@ -20,7 +20,7 @@ function template_shd_frontpage()

 	echo '

 		<div class="modbuttons clearfix margintop">';

-	template_button_strip($context['navigation'], 'bottom');

+	template_shd_button_strip($context['navigation'], 'bottom');

 	echo '

 		</div>

@@ -520,7 +520,7 @@ function shd_save_ticket()

 	if (!empty($context['ticket_id']) && !empty($ticketinfo) && !empty($ticketinfo['starter_id']))

 	{

 		loadMemberData($ticketinfo['starter_id']);

-		if (isset($memberContext[$ticketinfo['starter_id']]) && loadMemberContext($ticketinfo['starter_id']))

+		if (isset($ticketinfo, $memberContext[$ticketinfo['starter_id']]) && loadMemberContext($ticketinfo['starter_id']))

 			$context['ticket_form']['member'] = array(

 				'name' => $ticketinfo['starter_name'],

 				'id' => $ticketinfo['starter_id'],

@@ -1412,12 +1412,23 @@ function shd_load_user_prefs($user = 0)

 				'permission' => 'shd_access_recyclebin',

 				'show' => true,

 			),

+			'block_order_hold_block' => array(

+				'default' => 'updated_asc',

+				'type' => 'select',

+				'icon' => 'ticket_hold.png',

+				'group' => 'block_order',

+				'permission' => 'access_helpdesk',

+				'show' => true,

+			),

 		);

 		// We want to add the preferences per block. Because we already know what options there are per block elsewhere, let's reuse that.

 		if (!function_exists('shd_get_block_columns'))

 			require_once($sourcedir . '/sd_source/SimpleDesk.php');

 		$blocks = array('assigned', 'new', 'staff', shd_allowed_to('shd_staff', 0) ? 'user_staff' : 'user_user', 'closed', 'recycled', 'withdeleted');

+		if (shd_allowed_to('shd_staff', 0))

+			$blocks[] = 'hold';

+

 		foreach ($blocks as $block)

 		{

 			$items = shd_get_block_columns($block);

@@ -1430,7 +1441,7 @@ function shd_load_user_prefs($user = 0)

 				$block = 'recycle';

 			$block_id = 'block_order_' . $block . '_block';

 			$base_prefs[$block_id]['options'] = array();

-			foreach ($items as $item)

+			foreach ($items as $item => $width)

 			{

 				if ($item != 'actions')

 				{

@@ -26,7 +26,7 @@ function template_assign()

 	if (empty($context['shd_return_to']))

 		$context['shd_return_to'] = 'ticket';

-		template_button_strip(array($context['navigation']['back']));

+		template_shd_button_strip(array($context['navigation']['back']));

 	echo '

 	<div class="cat_bar">

@@ -28,10 +28,10 @@ function template_viewticket()

 	// SMF style icons go first.

 	if ($modSettings['shd_ticketnav_style'] == 'smf')

-		template_button_strip($context['ticket_navigation'], 'right');

+		template_shd_button_strip($context['ticket_navigation'], 'right');

 	// Back to the helpdesk.

-	template_button_strip(array($context['navigation']['back'], $context['navigation']['replies'], $context['navigation']['ticketlog']));

+	template_shd_button_strip(array($context['navigation']['back'], $context['navigation']['replies'], $context['navigation']['ticketlog']));

 	echo '

 		<div class="cat_bar">

@@ -24,7 +24,7 @@ function template_movedept()

 		$context['shd_return_to'] = 'ticket';

 	// Back to the helpdesk.

-	template_button_strip(array($context['navigation']['back']), 'bottom');

+	template_shd_button_strip(array($context['navigation']['back']), 'bottom');

 	echo '

 	<div class="cat_bar">

@@ -19,7 +19,7 @@ function template_ticket_post()

 {

 	global $context;

-	template_button_strip(array($context['navigation']['back']));

+	template_shd_button_strip(array($context['navigation']['back']));

 	template_preview();

 	template_ticket_info();

 	template_ticket_subjectbox();

@@ -305,7 +305,7 @@ function template_shd_profile_show_tickets()

 				</div>';

 	// The navigation.

-	template_button_strip($context['show_tickets_navigation']);

+	template_shd_button_strip($context['show_tickets_navigation']);

 	// Pagination

 	echo '

@@ -370,7 +370,7 @@ function template_shd_profile_show_notify_override()

 				</div>';

 	// The navigation.

-	template_button_strip($context['show_tickets_navigation']);

+	template_shd_button_strip($context['show_tickets_navigation']);

 	echo '

 				<table class="table_grid">

@@ -19,7 +19,7 @@ function template_search()

 	global $context, $txt, $scripturl, $settings, $modSettings;

 	// Back to the helpdesk.

-	template_button_strip(array($context['navigation']['back']));

+	template_shd_button_strip(array($context['navigation']['back']));

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

 		echo '

@@ -155,7 +155,7 @@ function template_search_no_results()

 	global $context, $txt, $scripturl, $settings, $modSettings;

 	// Back to the helpdesk.

-	template_button_strip(array($context['navigation']['back'], $context['navigation']['search']));

+	template_shd_button_strip(array($context['navigation']['back'], $context['navigation']['search']));

 	echo '

 	<div class="cat_bar">

@@ -268,7 +268,7 @@ function template_search_results()

 	global $context, $txt, $scripturl, $settings, $modSettings, $smcFunc;

 	// Back to the helpdesk.

-	template_button_strip(array($context['navigation']['back'], $context['navigation']['search']));

+	template_shd_button_strip(array($context['navigation']['back'], $context['navigation']['search']));

 	echo '

 	<div class="cat_bar">

@@ -26,7 +26,7 @@ function template_shd_tickettotopic()

 {

 	global $txt, $settings, $context, $scripturl, $modSettings;

-	template_button_strip(array($context['navigation']['back']));

+	template_shd_button_strip(array($context['navigation']['back']));

 	echo '

 		<div class="cat_bar">

@@ -24,7 +24,7 @@ function template_main()

 {

 	global $context, $txt, $settings, $scripturl;

-	template_button_strip($context['navigation'], 'bottom');

+	template_shd_button_strip($context['navigation'], 'bottom');

 	echo '

 		<div class="title_bar">

@@ -97,7 +97,7 @@ function template_shd_depts()

 {

 	global $context, $txt, $settings, $scripturl;

-	template_button_strip($context['navigation'], 'bottom');

+	template_shd_button_strip($context['navigation'], 'bottom');

 	echo '

 		<div class="title_bar">

@@ -175,7 +175,7 @@ function template_closedtickets()

 {

 	global $context, $txt, $settings, $scripturl;

-	template_button_strip($context['navigation'], 'bottom');

+	template_shd_button_strip($context['navigation'], 'bottom');

 	echo '

 		<div class="title_bar">

@@ -241,7 +241,7 @@ function template_recyclebin()

 {

 	global $context, $txt, $settings, $scripturl;

-	template_button_strip($context['navigation'], 'bottom');

+	template_shd_button_strip($context['navigation'], 'bottom');

 	echo '

 		<div class="title_bar">

@@ -575,13 +575,16 @@ function template_shd_maintenance_above()

 */

 function template_shd_maintenance_below()

 {

-

 }

-// Provide a placeholder in the event template_button_strip isn't defined (like in the mobile templates)

-if (!function_exists('template_button_strip'))

-{

-	function template_button_strip()

+/**

+ *	Wrapper for the button_strip.

+ *

+ *	@since 2.1

+*/

+function template_shd_button_strip($button_strip, $direction = '', $strip_options = array())

 {

-	}

+	// If SMF version exists, use it.

+	if (function_exists('template_button_strip'))

+		template_button_strip($button_strip, $direction = '', $strip_options = array());

 }

\ No newline at end of file