SD-SimpleDesk

@@ -129,6 +129,23 @@ function shd_search2()

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

 		}

 	}

+	else

+	{

+		$visible_depts = shd_allowed_to('access_helpdesk', false);

+		$context['dept_list'] = array();

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

+			SELECT id_dept, dept_name

+			FROM {db_prefix}helpdesk_depts

+			WHERE id_dept IN ({array_int:depts})

+			ORDER BY dept_order',

+			array(

+				'depts' => $visible_depts,

+			)

+		);

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

+			$context['dept_list'][$row['id_dept']] = $row['dept_name'];

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

+	}

 	// Ticket urgency

 	$using_urgency = array();

@@ -161,11 +178,20 @@ function shd_search2()

 	{

 		$status = array();

 		if (!empty($_POST['scope_open']))

+		{

 			$status = array_merge($status, array(TICKET_STATUS_NEW, TICKET_STATUS_PENDING_STAFF, TICKET_STATUS_PENDING_USER, TICKET_STATUS_WITH_SUPERVISOR, TICKET_STATUS_ESCALATED));

+			$context['search_params']['scope_open'] = true;

+		}

 		if (!empty($_POST['scope_closed']))

+		{

 			$status = array_merge($status, array(TICKET_STATUS_CLOSED));

+			$context['search_params']['scope_closed'] = true;

+		}

 		if (!empty($_POST['scope_recycle']))

+		{

 			$status = array_merge($status, array(TICKET_STATUS_DELETED));

+			$context['search_params']['scope_recycle'] = true;

+		}

 		$context['search_clauses'][] = 'hdt.status IN ({array_int:status})';

 		$context['search_params']['status'] = $status;

@@ -195,6 +221,10 @@ function shd_search2()

 	if (empty($context['pagenum']) || $context['pagenum'] < 1)

 		$context['pagenum'] = 1;

+	// Pages.

+	$context['next_page'] = $context['pagenum'] + 1;

+	$context['prev_page'] = $context['pagenum'] < 2 ? 0 :  $context['pagenum'] - 1;

+

 	$number_per_page = 20;

 	// OK, so are there any words? If not, execute this sucker the quick way and get out to the template quick.

@@ -223,6 +253,9 @@ function shd_search2()

 		}

 	}

+	// Search type.

+	$context['search_params']['searchtype'] = in_array($_POST['searchtype'], array('any', 'all')) ? $_POST['searchtype'] : 'all';

+

 	// Spam me not!

 	if (empty($_SESSION['lastsearch']))

 		spamProtection('search');

@@ -387,9 +420,8 @@ function shd_search2()

 						unset($matches['messages'][$ticket]);

 			// Now, we just have a list of tickets to play with. Let's put that together in a master list.

-			// !!! TODO: This doesn't make sense.

 			foreach ($matches['messages'] as $msg => $ticket_words)

-				$matches['id_msg'][$ticket] = true;

+				$matches['id_msg'][$msg] = true;

 			unset($matches['messages']);

 		}

@@ -335,4 +335,79 @@ function template_search_results()

 		</div>

 	</div>';

 	}

+

+	// Some buttons.

+	echo '

+	<div class="search_results_posts">

+		<div class="windowbg">';

+

+	template_search_navigation('prev');

+	template_search_navigation('next');

+

+	echo '

+		</div>

+	</div>';

+}

+

+function template_search_navigation($direction = 'next')

+{

+	global $scripturl, $context, $txt, $smcFunc;

+

+	if ($direction == 'prev' && empty($context['prev_page']))

+		return;

+

+	echo '

+	<form method="post" action="', $scripturl, '?action=helpdesk;sa=search2">';

+

+	// Departments.

+	if (count($context['dept_list']) == 1)

+	{

+		$array = array_keys($context['dept_list']);

+		echo '

+		<input type="hidden" name="search_dept[]" value="', $array[0], '" />';

+	}

+	elseif (isset($context['search_params']['visible_depts']))

+		foreach ($context['search_params']['visible_depts'] as $dept)

+		echo '

+		<input type="hidden" name="search_dept[]" value="', $dept, '">';

+

+	// Some search areas.

+	if (isset($context['search_params']['areas']))

+		foreach ($context['search_params']['areas'] as $area => $dummy)

+		echo '

+		<input type="hidden" name="search_', $area, '" value="1">';

+

+	// Standard search params arrays.

+	foreach (array('urgency', 'starter_name_form', 'assigned_name_form') as $param)

+		if (isset($context['search_params'][$param]))

+			foreach ($context['search_params'][$param] as $value)

+				echo '

+		<input type="hidden" name="', $param, '[]" value="', $value, '">';

+	

+	// Standard search params bools.

+	foreach (array('scope_open', 'scope_closed', 'scope_recycle') as $param)

+		if (!empty($context['search_params'][$param]))

+			echo '

+		<input type="hidden" name="', $param, '" value="1">';

+

+	// Standard search params strings.

+	foreach (array('searchtype') as $param)

+		if (!empty($context['search_params'][$param]))

+			echo '

+		<input type="hidden" name="', $param, '" value="', $context['search_params'][$param], '">';

+

+	// Search terms.

+	echo '

+		<input type="hidden" name="search" value="', $smcFunc['htmlspecialchars']($context['search_terms']), '">';

+

+	if ($direction == 'prev')

+		echo '

+		<input type="hidden" name="page" value="', $context['prev_page'], '" />

+		<input type="submit" value="Previous" onclick="return submitThisOnce(this);" accesskey="s" class="button_submit floatleft" />';

+	else

+		echo '

+		<input type="hidden" name="page" value="', $context['next_page'], '" />

+		<input type="submit" value="Next" onclick="return submitThisOnce(this);" accesskey="s" class="button_submit" />';

+

+	echo '</form>';

 }

\ No newline at end of file