SD-SimpleDesk

@@ -8,11 +8,12 @@ php:

   - 7.1

   - 7.2

   - 7.3

+  - 7.4

 matrix:

   include:

     - php: hhvm

-      dist: trusty

+      dist: xenial

 script:

   - sudo add-apt-repository ppa:git-core/ppa -y

@@ -466,10 +466,18 @@ dl.settings dt.shd_cust_fields_largetext, .shd_cust_fields_largetext textarea {

 /* Urgency stuff */

 .generic_icons.urgency_increase::before {

-	background-position: -161px -5px;

+	width: 16px;

+	height: 16px;

+	display: inline-block;

+	content: '';

+	background: url(../images/simpledesk/move_up.png) no-repeat;

 }

 .generic_icons.urgency_decrease::before {

-	background-position: -213px -5px;

+	width: 16px;

+	height: 16px;

+	display: inline-block;

+	content: '';

+	background: url(../images/simpledesk/move_down.png) no-repeat;

 }

 /* We need some adjustments */

@@ -116,13 +116,15 @@ function shd_admin_canned_list()

 		}

 		$context['canned_replies'][$cat_id]['move_up'] &= $context['move_between_cats'];

 		$context['canned_replies'][$cat_id]['move_down'] &= $context['move_between_cats'];

+

+		$last_cat_id = $cat_id;

 	}

-	if (!isset($cat_id))

+	if (!isset($last_cat_id))

 		return;

 	$context['canned_replies'][key($context['canned_replies'])]['move_up'] = false;

-	$context['canned_replies'][$cat_id]['move_down'] = false;

+	$context['canned_replies'][$last_cat_id]['move_down'] = false;

 }

 /**

@@ -148,7 +150,7 @@ function shd_admin_canned_movecat()

 	if ($smcFunc['db_num_rows']($query) == 0 || empty($_REQUEST['direction']))

 	{

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

-		return fatal_lang_error('shd_admin_cannedreplies_cannot_move_cat', false);

+		shd_fatal_lang_error('shd_admin_cannedreplies_cannot_move_cat', false);

 	}

 	$cats = array();

@@ -158,13 +160,13 @@ function shd_admin_canned_movecat()

 	$cats_map = array_flip($cats);

 	if (empty($cats_map[$context['canned_category']]))

-		return fatal_lang_error('shd_admin_cannedreplies_cannot_move_cat', false);

+		shd_fatal_lang_error('shd_admin_cannedreplies_cannot_move_cat', false);

 	$current_pos = $cats_map[$context['canned_category']];

 	$destination = $current_pos + ($_REQUEST['direction'] == 'up' ? -1 : 1);

 	if (empty($cats[$destination]))

-		return fatal_lang_error('shd_admin_cannedreplies_cannot_move_cat_' . $_REQUEST['direction'], false);

+		shd_fatal_lang_error('shd_admin_cannedreplies_cannot_move_cat_' . $_REQUEST['direction'], false);

 	$other_cat = $cats[$destination];

@@ -214,7 +216,7 @@ function shd_admin_canned_movereply()

 	if ($smcFunc['db_num_rows']($query) == 0 || empty($_REQUEST['direction']))

 	{

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

-		return fatal_lang_error('shd_admin_cannedreplies_cannot_move_reply', false);

+		shd_fatal_lang_error('shd_admin_cannedreplies_cannot_move_reply', false);

 	}

 	$replies = array();

@@ -224,13 +226,13 @@ function shd_admin_canned_movereply()

 	$replies_map = array_flip($replies);

 	if (empty($replies_map[$context['canned_reply_id']]))

-		return fatal_lang_error('shd_admin_cannedreplies_cannot_move_reply', false);

+		shd_fatal_lang_error('shd_admin_cannedreplies_cannot_move_reply', false);

 	$current_pos = $replies_map[$context['canned_reply_id']];

 	$destination = $current_pos + ($_REQUEST['direction'] == 'up' ? -1 : 1);

 	if (empty($replies[$destination]))

-		return fatal_lang_error('shd_admin_cannedreplies_cannot_move_reply_' . $_REQUEST['direction'], false);

+		shd_fatal_lang_error('shd_admin_cannedreplies_cannot_move_reply_' . $_REQUEST['direction'], false);

 	$other_reply = $replies[$destination];

@@ -293,7 +295,7 @@ function shd_admin_canned_editcat()

 	if ($smcFunc['db_num_rows']($query) == 0)

 	{

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

-		return fatal_lang_error('shd_admin_cannedreplies_thecatisalie', false);

+		shd_fatal_lang_error('shd_admin_cannedreplies_thecatisalie', false);

 	}

 	list($context['category_name']) = $smcFunc['db_fetch_row']($query);

@@ -392,9 +394,9 @@ function shd_admin_canned_savecat()

 	// There are two things we could be doing here. $_POST['cat'] should be set, and it should be set to 'new' for new categories, or a number of an existing category otherwise.

 	if (empty($_POST['cat']))

-		return fatal_lang_error('shd_admin_cannedreplies_thecatisalie', false);

+		shd_fatal_lang_error('shd_admin_cannedreplies_thecatisalie', false);

 	elseif (empty($_POST['catname']))

-		return fatal_lang_error('shd_admin_cannedreplies_nocatname', false);

+		shd_fatal_lang_error('shd_admin_cannedreplies_nocatname', false);

 	checkSubmitOnce('check');

@@ -436,7 +438,7 @@ function shd_admin_canned_savecat()

 		);

 		if ($smcFunc['db_affected_rows']() == 0)

-			return fatal_lang_error('shd_admin_cannedreplies_thecatisalie', false);

+			shd_fatal_lang_error('shd_admin_cannedreplies_thecatisalie', false);

 		// Log this action.

 		shd_admin_log('admin_canned', array(

@@ -473,7 +475,7 @@ function shd_admin_canned_createreply()

 	if ($smcFunc['db_num_rows']($query) == 0)

 	{

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

-		return fatal_lang_error('shd_admin_cannedreplies_thecatisalie', false);

+		shd_fatal_lang_error('shd_admin_cannedreplies_thecatisalie', false);

 	}

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

@@ -538,7 +540,7 @@ function shd_admin_canned_editreply()

 	if ($smcFunc['db_num_rows']($query) == 0)

 	{

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

-		return fatal_lang_error('shd_admin_cannedreplies_thereplyisalie', false);

+		shd_fatal_lang_error('shd_admin_cannedreplies_thereplyisalie', false);

 	}

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

@@ -658,11 +660,11 @@ function shd_admin_canned_savereply()

 	}

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

-		return fatal_lang_error('shd_admin_cannedreplies_thereplyisalie', false);

+		shd_fatal_lang_error('shd_admin_cannedreplies_thereplyisalie', false);

 	$_POST['title'] = isset($_POST['title']) ? strtr($smcFunc['htmlspecialchars']($_POST['title']), array("\r" => '', "\n" => '', "\t" => '')) : '';

 	if (empty($_POST['title']))

-		return fatal_lang_error('shd_admin_cannedreplies_notitle', false);

+		shd_fatal_lang_error('shd_admin_cannedreplies_notitle', false);

 	$_REQUEST['shd_canned_reply'] = isset($_POST['shd_canned_reply']) ? $_POST['shd_canned_reply'] : '';

@@ -674,7 +676,7 @@ function shd_admin_canned_savereply()

 	}

 	if ($smcFunc['htmltrim']($smcFunc['htmlspecialchars']($_POST['shd_canned_reply']), ENT_QUOTES) === '')

-		return fatal_lang_error('shd_admin_cannedreplies_nobody', false);

+		shd_fatal_lang_error('shd_admin_cannedreplies_nobody', false);

 	$_POST['shd_canned_reply'] = $smcFunc['htmlspecialchars']($_POST['shd_canned_reply'], ENT_QUOTES);

 	preparsecode($_POST['shd_canned_reply']);

@@ -686,7 +688,7 @@ function shd_admin_canned_savereply()

 	// Verify the destination category exists.

 	if (!isset($_POST['cat']))

-		return fatal_lang_error('shd_admin_cannedreplies_thecatisalie', false);

+		shd_fatal_lang_error('shd_admin_cannedreplies_thecatisalie', false);

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

 		SELECT cat_name

@@ -699,7 +701,7 @@ function shd_admin_canned_savereply()

 	if ($smcFunc['db_num_rows']($query) == 0)

 	{

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

-		return fatal_lang_error('shd_admin_cannedreplies_thecatisalie', false);

+		shd_fatal_lang_error('shd_admin_cannedreplies_thecatisalie', false);

 	}

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

@@ -742,7 +744,7 @@ function shd_admin_canned_savereply()

 		// 3. Insert the departments.

 		if (empty($reply_id))

-			return fatal_lang_error('shd_admin_cannedreplies_notcreated', false);

+			shd_fatal_lang_error('shd_admin_cannedreplies_notcreated', false);

 		$inserts = array();

 		foreach ($depts_insert as $dept)

@@ -772,7 +774,7 @@ function shd_admin_canned_savereply()

 			)

 		);

 		if ($smcFunc['db_num_rows']($query) == 0)

-			return fatal_lang_error('shd_admin_cannedreplies_thereplyisalie', false);

+			shd_fatal_lang_error('shd_admin_cannedreplies_thereplyisalie', false);

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

 		// We're updating, apparently.

@@ -830,7 +832,7 @@ function shd_admin_canned_movereplycat()

 	// Before we go any further, establish that the user specified a reply to move and that there is at least one category not including the one the reply is in.

 	$context['canned_reply_id'] = isset($_REQUEST['reply']) ? (int) $_REQUEST['reply'] : 0;

 	if (empty($context['canned_reply_id']) || $context['canned_reply_id'] < 0)

-		return fatal_lang_error('shd_admin_cannedreplies_thereplyisalie', false);

+		shd_fatal_lang_error('shd_admin_cannedreplies_thereplyisalie', false);

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

 		SELECT id_cat, reply_order

@@ -841,7 +843,7 @@ function shd_admin_canned_movereplycat()

 		)

 	);

 	if ($smcFunc['db_num_rows']($query) == 0)

-		return fatal_lang_error('shd_admin_cannedreplies_thereplyisalie', false);

+		shd_fatal_lang_error('shd_admin_cannedreplies_thereplyisalie', false);

 	list($current_cat, $current_reply_pos) = $smcFunc['db_fetch_row']($query);

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

@@ -858,7 +860,7 @@ function shd_admin_canned_movereplycat()

 		)

 	);

 	if ($smcFunc['db_num_rows']($query) == 0)

-		return fatal_lang_error('shd_admin_cannedreplies_onlyonecat', false);

+		shd_fatal_lang_error('shd_admin_cannedreplies_onlyonecat', false);

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

 		$context['cannedreply_cats'][$row['id_cat']] = $row['cat_name'];

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

@@ -877,7 +879,7 @@ function shd_admin_canned_movereplycat()

 		// 1. Is the new department valid?

 		$_REQUEST['newcat'] = isset($_REQUEST['newcat']) ? (int) $_REQUEST['newcat'] : 0;

 		if (!isset($context['cannedreply_cats'][$_REQUEST['newcat']]))

-			return fatal_lang_error('shd_admin_cannedreplies_destnoexist', false);

+			shd_fatal_lang_error('shd_admin_cannedreplies_destnoexist', false);

 		// 1a. Everything is valid, just double check it's not a random double submission.

 		checkSubmitOnce('check');

@@ -235,7 +235,7 @@ function shd_admin_custom_edit()

 	else

 	{

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

-		return fatal_lang_error('shd_admin_cannot_edit_custom_field', false);

+		shd_fatal_lang_error('shd_admin_cannot_edit_custom_field', false);

 	}

 	loadLanguage('ManageSettings');

@@ -326,7 +326,7 @@ function shd_admin_custom_save()

 	// Fix all the input

 	if (trim($_POST['field_name']) == '')

-		return fatal_lang_error('shd_admin_no_fieldname', false);

+		shd_fatal_lang_error('shd_admin_no_fieldname', false);

 	$_POST['field_name'] = $smcFunc['htmlspecialchars']($_POST['field_name']);

 	$_POST['description'] = $smcFunc['htmlspecialchars'](isset($_POST['description']) ? $_POST['description'] : '');

 	preparsecode($_POST['description']);

@@ -437,7 +437,7 @@ function shd_admin_custom_save()

 	{

 		$types = shd_admin_cf_change_types(false);

 		if (!in_array($_POST['field_type'], $types))

-			return fatal_lang_error('shd_admin_custom_field_invalid', false);

+			shd_fatal_lang_error('shd_admin_custom_field_invalid', false);

 		// Order??

 		$count_query = shd_db_query('', '

@@ -469,7 +469,7 @@ function shd_admin_custom_save()

 		);

 		if (empty($new_field))

-			return fatal_lang_error('shd_admin_could_not_create_field', false);

+			shd_fatal_lang_error('shd_admin_could_not_create_field', false);

 		// Also update fields

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

@@ -519,12 +519,12 @@ function shd_admin_custom_save()

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

 			$types = shd_admin_cf_change_types($row['field_type']);

 			if (!in_array($_POST['field_type'], $types))

-				return fatal_lang_error('shd_admin_custom_field_reselect_invalid', false);

+				shd_fatal_lang_error('shd_admin_custom_field_reselect_invalid', false);

 		}

 		else

 		{

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

-			return fatal_lang_error('shd_admin_cannot_edit_custom_field', false);

+			shd_fatal_lang_error('shd_admin_cannot_edit_custom_field', false);

 		}

 		// Depending on the field type, we may need to be funky about overlaying things, hence grabbing the old options.

@@ -637,7 +637,7 @@ function shd_admin_custom_move()

 	if ($smcFunc['db_num_rows']($query) == 0 || empty($_REQUEST['direction']))

 	{

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

-		return fatal_lang_error('shd_admin_cannot_move_custom_field', false);

+		shd_fatal_lang_error('shd_admin_cannot_move_custom_field', false);

 	}

 	$fields = array();

@@ -651,13 +651,13 @@ function shd_admin_custom_move()

 	ksort($fields);

 	if (!isset($fields_map[$_REQUEST['field']]))

-		return fatal_lang_error('shd_admin_cannot_move_custom_field', false);

+		shd_fatal_lang_error('shd_admin_cannot_move_custom_field', false);

 	$current_pos = $fields_map[$_REQUEST['field']];

 	$destination = $current_pos + ($_REQUEST['direction'] == 'up' ? -1 : 1);

 	if (empty($fields[$destination]))

-		return fatal_lang_error('shd_admin_cannot_move_custom_field_' . $_REQUEST['direction'], false);

+		shd_fatal_lang_error('shd_admin_cannot_move_custom_field_' . $_REQUEST['direction'], false);

 	$other_field = $fields[$destination];

@@ -110,7 +110,7 @@ function shd_admin_dept_move()

 	if ($smcFunc['db_num_rows']($query) == 0 || empty($_REQUEST['direction']))

 	{

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

-		return fatal_lang_error('shd_admin_cannot_move_dept', false);

+		shd_fatal_lang_error('shd_admin_cannot_move_dept', false);

 	}

 	$depts = array();

@@ -120,13 +120,13 @@ function shd_admin_dept_move()

 	$depts_map = array_flip($depts);

 	if (empty($depts_map[$_REQUEST['dept']]))

-		return fatal_lang_error('shd_admin_cannot_move_dept', false);

+		shd_fatal_lang_error('shd_admin_cannot_move_dept', false);

 	$current_pos = $depts_map[$_REQUEST['dept']];

 	$destination = $current_pos + ($_REQUEST['direction'] == 'up' ? -1 : 1);

 	if (empty($depts[$destination]))

-		return fatal_lang_error('shd_admin_cannot_move_dept_' . $_REQUEST['direction'], false);

+		shd_fatal_lang_error('shd_admin_cannot_move_dept_' . $_REQUEST['direction'], false);

 	$other_dept = $depts[$destination];

@@ -180,13 +180,13 @@ function shd_admin_create_dept()

 		// Boring stuff like session checks done. Were you a naughty admin and didn't set it properly?

 		if (!isset($_POST['dept_name']) || $smcFunc['htmltrim']($smcFunc['htmlspecialchars']($_POST['dept_name'])) === '')

-			return fatal_lang_error('shd_no_dept_name', false);

+			shd_fatal_lang_error('shd_no_dept_name', false);

 		else

 			$_POST['dept_name'] = strtr($smcFunc['htmlspecialchars']($_POST['dept_name']), array("\r" => '', "\n" => '', "\t" => ''));

 		// Now to check the category.

 		if (!isset($_POST['dept_cat']) || !isset($context['shd_cat_list'][$_POST['dept_cat']]))

-			return fatal_lang_error('shd_invalid_category', false);

+			shd_fatal_lang_error('shd_invalid_category', false);

 		$_POST['dept_cat'] = (int) $_POST['dept_cat'];

 		$_POST['dept_beforeafter'] = empty($_POST['dept_beforeafter']) || empty($_POST['dept_cat']) ? 0 : 1;

@@ -210,7 +210,7 @@ function shd_admin_create_dept()

 		);

 		if (empty($newdept))

-			return fatal_lang_error('shd_could_not_create_dept', false);

+			shd_fatal_lang_error('shd_could_not_create_dept', false);

 		// Log this.

 		shd_admin_log('admin_dept', array(

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

 	if ($smcFunc['db_num_rows']($query) == 0)

 	{

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

-		return fatal_lang_error('shd_unknown_dept', false);

+		shd_fatal_lang_error('shd_unknown_dept', false);

 	}

 	$context['shd_dept'] = $smcFunc['db_fetch_assoc']($query);

 	$context['shd_dept']['description'] = htmlspecialchars($context['shd_dept']['description']);

@@ -309,7 +309,7 @@ function shd_admin_save_dept()

 	if ($smcFunc['db_num_rows']($query) == 0)

 	{

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

-		return fatal_lang_error('shd_unknown_dept', false);

+		shd_fatal_lang_error('shd_unknown_dept', false);

 	}

 	$context['shd_dept'] = $smcFunc['db_fetch_assoc']($query);

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

@@ -323,7 +323,7 @@ function shd_admin_save_dept()

 			FROM {db_prefix}helpdesk_depts');

 		list($count) = $smcFunc['db_fetch_row']($query);

 		if ($count == 1)

-			return fatal_lang_error('shd_must_have_dept', false);

+			shd_fatal_lang_error('shd_must_have_dept', false);

 		// What about it having tickets in it?

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

@@ -337,7 +337,7 @@ function shd_admin_save_dept()

 		list($count) = $smcFunc['db_fetch_row']($query);

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

 		if (!empty($count))

-			return fatal_lang_error('shd_dept_not_empty', false);

+			shd_fatal_lang_error('shd_dept_not_empty', false);

 		// Before we kill it, get its order position.

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

@@ -351,7 +351,7 @@ function shd_admin_save_dept()

 		if ($smcFunc['db_num_rows']($query) == 0)

 		{

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

-			return fatal_lang_error(shd_unknown_dept, false);

+			shd_fatal_lang_error(shd_unknown_dept, false);

 		}

 		list($dept_order) = $smcFunc['db_fetch_row']($query);

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

@@ -408,10 +408,10 @@ function shd_admin_save_dept()

 	// 5. Get the stuff in the form.

 	// 5a. That there's something in the dept. name

 	if (!isset($_POST['dept_name']) || $smcFunc['htmltrim']($smcFunc['htmlspecialchars']($_POST['dept_name'])) === '')

-		return fatal_lang_error('shd_no_dept_name', false);

+		shd_fatal_lang_error('shd_no_dept_name', false);

 	// 5b. Now to check the category exists and where we're putting it in the category.

 	elseif (!isset($_POST['dept_cat']) || !isset($context['shd_cat_list'][$_POST['dept_cat']]))

-		return fatal_lang_error('shd_invalid_category', false);

+		shd_fatal_lang_error('shd_invalid_category', false);

 	$_POST['dept_name'] = strtr($smcFunc['htmlspecialchars']($_POST['dept_name']), array("\r" => '', "\n" => '', "\t" => ''));

 	$_POST['dept_cat'] = (int) $_POST['dept_cat'];

@@ -138,7 +138,7 @@ function shd_admin_maint_reattribute()

 	$members = findMembers($_POST['to']);

 	if (empty($members))

-		return fatal_lang_error('shd_reattribute_cannot_find_member');

+		shd_fatal_lang_error('shd_reattribute_cannot_find_member');

 	$memID = array_shift($members);

 	$memID = $memID['id'];

@@ -146,25 +146,25 @@ function shd_admin_maint_reattribute()

 	if ($_POST['type'] == 'email')

 	{

 		if (empty($_POST['from_email']))

-			return fatal_lang_error('shd_reattribute_no_email');

+			shd_fatal_lang_error('shd_reattribute_no_email');

 		$clause = 'poster_email = {string:attribute}';

 		$attribute = $_POST['from_email'];

 	}

 	elseif ($_POST['type'] == 'name')

 	{

 		if (empty($_POST['from_name']))

-			return fatal_lang_error('shd_reattribute_no_user');

+			shd_fatal_lang_error('shd_reattribute_no_user');

 		$clause = 'poster_name = {string:attribute}';

 		$attribute = $_POST['from_name'];

 	}

 	elseif ($_POST['type'] == 'starter')

 	{

 		if (empty($_POST['from_starter']))

-			return fatal_lang_error('shd_reattribute_no_user');

+			shd_fatal_lang_error('shd_reattribute_no_user');

 		$from = findMembers($_POST['from_starter']);

 		if (empty($from))

-			return fatal_lang_error('shd_reattribute_cannot_find_member_from');

+			shd_fatal_lang_error('shd_reattribute_cannot_find_member_from');

 		$fromID = array_shift($from);

 		$attribute = $fromID['id'];

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

 			WHERE id_member_started = {int:attribute})';

 	}

 	else

-		return fatal_lang_error('shd_reattribute_no_user');

+		shd_fatal_lang_error('shd_reattribute_no_user');

 	// Now, we don't delete the user id from posts on account deletion, never have.

 	// So, get all the user ids attached to this user/email, make sure they're not in use, and then reattribute them.

@@ -194,7 +194,7 @@ function shd_admin_maint_reattribute()

 	// Did we find any members? If not, bail.

 	if (empty($members))

-		return fatal_lang_error('shd_reattribute_no_messages', false);

+		shd_fatal_lang_error('shd_reattribute_no_messages', false);

 	// Topic starters are a bit easier.

 	if ($_POST['type'] == 'starter')

@@ -221,7 +221,7 @@ function shd_admin_maint_reattribute()

 		$members = array_diff($members, $temp_members);

 		if (empty($members))

-			return fatal_lang_error('shd_reattribute_in_use', false);

+			shd_fatal_lang_error('shd_reattribute_in_use', false);

 		// OK, let's go!

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

@@ -255,9 +255,9 @@ function shd_admin_maint_massdeptmove()

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

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

 	if ($_POST['id_dept_from'] == 0 || $_POST['id_dept_to'] == 0 || !in_array($_POST['id_dept_from'], $depts) || !in_array($_POST['id_dept_to'], $depts))

-		return fatal_lang_error('shd_unknown_dept', false);

+		shd_fatal_lang_error('shd_unknown_dept', false);

 	elseif ($_POST['id_dept_from'] == $_POST['id_dept_to'])

-		return fatal_lang_error('shd_admin_maint_massdeptmove_samedept', false);

+		shd_fatal_lang_error('shd_admin_maint_massdeptmove_samedept', false);

 	$clauses = array();

 	if (empty($_POST['moveopen']))

@@ -88,7 +88,7 @@ function shd_admin_create_role()

 	$context['role_template_id'] = isset($_REQUEST['template']) ? (int) $_REQUEST['template'] : 0;

 	if (empty($context['shd_permissions']['roles'][$context['role_template_id']]))

-		return fatal_lang_error('shd_unknown_template', false);

+		shd_fatal_lang_error('shd_unknown_template', false);

 	if (empty($_REQUEST['part']))

 	{

@@ -103,7 +103,7 @@ function shd_admin_create_role()

 		// Boring stuff like session checks done. Were you a naughty admin and didn't set it properly?

 		if (!isset($_POST['rolename']) || $smcFunc['htmltrim']($smcFunc['htmlspecialchars']($_POST['rolename'])) === '')

-			return fatal_lang_error('shd_no_role_name', false);

+			shd_fatal_lang_error('shd_no_role_name', false);

 		$_POST['rolename'] = strtr($smcFunc['htmlspecialchars']($_POST['rolename']), array("\r" => '', "\n" => '', "\t" => ''));

@@ -117,7 +117,7 @@ function shd_admin_create_role()

 		);

 		if (empty($newrole))

-			return fatal_lang_error('shd_could_not_create_role', false);

+			shd_fatal_lang_error('shd_could_not_create_role', false);

 		// Always need logs.

 		shd_admin_log('admin_permissions', array(

@@ -138,7 +138,7 @@ function shd_admin_edit_role()

 	shd_load_role($context['shd_role_id']);

 	if (empty($context['shd_permissions']['user_defined_roles'][$context['shd_role_id']]))

-		return fatal_lang_error('shd_unknown_role', false);

+		shd_fatal_lang_error('shd_unknown_role', false);

 	// OK, figure out what groups are possible groups (including regular members), and what groups this role has.

 	// We're not interested in admin (group 1), board mod (group 3) or post count groups (min_posts != -1)

@@ -218,7 +218,7 @@ function shd_admin_save_role()

 	// Hah, no, you're just an extra, bye.

 	if (empty($context['shd_permissions']['user_defined_roles'][$context['shd_role_id']]))

-		return fatal_lang_error('shd_unknown_role', false);

+		shd_fatal_lang_error('shd_unknown_role', false);

 	// 2b. Oh, we have actually heard of you. That's fine, we'll just refer to you by codename because we're lazy.

 	$role = &$context['shd_permissions']['user_defined_roles'][$context['shd_role_id']];

@@ -270,7 +270,7 @@ function shd_admin_save_role()

 	// 4. The unknown actor in a role?

 	if (!isset($_POST['rolename']) || $smcFunc['htmltrim']($smcFunc['htmlspecialchars']($_POST['rolename'])) === '')

-		return fatal_lang_error('shd_no_role_name', false);

+		shd_fatal_lang_error('shd_no_role_name', false);

 	$_POST['rolename'] = strtr($smcFunc['htmlspecialchars']($_POST['rolename']), array("\r" => '', "\n" => '', "\t" => ''));

@@ -487,7 +487,7 @@ function shd_admin_copy_role()

 	// Hah, no, you're just an extra, bye.

 	if (empty($context['shd_permissions']['user_defined_roles'][$context['shd_role_id']]))

-		return fatal_lang_error('shd_unknown_role', false);

+		shd_fatal_lang_error('shd_unknown_role', false);

 	if (empty($_REQUEST['part']))

 	{

@@ -502,7 +502,7 @@ function shd_admin_copy_role()

 		// Boring stuff like session checks done. Were you a naughty admin and didn't set it properly?

 		if (!isset($_POST['rolename']) || $smcFunc['htmltrim']($smcFunc['htmlspecialchars']($_POST['rolename'])) === '')

-			return fatal_lang_error('shd_no_role_name', false);

+			shd_fatal_lang_error('shd_no_role_name', false);

 		$_POST['rolename'] = strtr($smcFunc['htmlspecialchars']($_POST['rolename']), array("\r" => '', "\n" => '', "\t" => ''));

@@ -516,7 +516,7 @@ function shd_admin_copy_role()

 		);

 		if (empty($newrole))

-			return fatal_lang_error('shd_could_not_create_role', false);

+			shd_fatal_lang_error('shd_could_not_create_role', false);

 		// OK, so we made the role. Now add the permissions from the existing role, first grab 'em

 		$new_perms = array();

@@ -142,10 +142,13 @@ function shd_ajax_privacy()

 		)

 	);

-	if ($row = $smcFunc['db_fetch_assoc']($query))

-	{

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

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

+	// No ticket, no luck.

+	if (empty($row))

+		return array('success' => false, 'error' => $txt['shd_no_ticket']);

+		

 	if (in_array($row['status'], array(TICKET_STATUS_CLOSED, TICKET_STATUS_DELETED)) || !shd_allowed_to('shd_alter_privacy_any', $row['id_dept']) && (!shd_allowed_to('shd_alter_privacy_own', $row['id_dept']) || $row['id_member_started'] != $user_info['id']))

 		return array('success' => false, 'error' => $txt['shd_cannot_change_privacy']);

@@ -172,8 +175,6 @@ function shd_ajax_privacy()

 	return array('success' => true, 'message' => $new ? $txt['shd_ticket_private'] : $txt['shd_ticket_notprivate']);

 }

-	return array('success' => false, 'error' => $txt['shd_no_ticket']);

-}

 /**

  *	Handles AJAX updates to ticket urgency.

@@ -215,10 +216,13 @@ function shd_ajax_urgency()

 		)

 	);

-	if ($row = $smcFunc['db_fetch_assoc']($query))

-	{

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

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

+	// No ticket, no luck.

+	if (empty($row))

+		return array('error' => $txt['shd_no_ticket']);

+

 	$can_urgency = shd_can_alter_urgency($row['urgency'], $row['id_member_started'], ($row['status'] == TICKET_STATUS_CLOSED), ($row['status'] == TICKET_STATUS_DELETED), $row['id_dept']);

 	if (empty($_GET['change']) || empty($can_urgency[$_GET['change']]))

@@ -261,8 +265,6 @@ function shd_ajax_urgency()

 	return $context['ajax_return'];

 }

-	return array('error' => $txt['shd_no_ticket']);

-}

 /**

  *	Collects ticket post data for quoting posts through AJAX (i.e. inserting a quote live into the postbox)

@@ -291,8 +293,11 @@ function shd_ajax_quote()

 	$_REQUEST['quote'] = !empty($_REQUEST['quote']) ? (int) $_REQUEST['quote'] : 0;

 	$message = '';

-	if (!empty($_REQUEST['quote']))

-	{

+

+	// Nothing to quote, blank message.

+	if (empty($_REQUEST['quote']))

+		return array('success' => true, 'message' => $message);

+

 	$query = shd_db_query('', '

 		SELECT hdtr.body, COALESCE(mem.real_name, hdtr.poster_name) AS poster_name, hdtr.poster_time, hdt.id_ticket, hdt.id_first_msg

 		FROM {db_prefix}helpdesk_ticket_replies AS hdtr

@@ -305,10 +310,13 @@ function shd_ajax_quote()

 		)

 	);

-		if ($row = $smcFunc['db_fetch_assoc']($query))

-		{

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

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

+	// Can't find this, no quote.

+	if (empty($row))

+		return array('success' => true, 'message' => $message);

+		

 	// Censor the message!

 	$row['body'] = un_preparsecode($row['body']);

 	censorText($row['body']);

@@ -317,25 +325,13 @@ function shd_ajax_quote()

 	if (strpos($row['poster_name'], '[') !== false || strpos($row['poster_name'], ']') !== false)

 		$row['poster_name'] = '"' . $row['poster_name'] . '"';

-			// Make the body HTML if need be.

-			if (!empty($_REQUEST['mode']))

-			{

-				require_once($sourcedir . '/Subs-Editor.php');

-				$row['body'] = strtr($row['body'], array('<' => '#smlt#', '>' => '#smgt#', '&' => '#smamp#'));

-				$row['body'] = bbc_to_html($row['body']);

-				$lb = "\n";

-			}

-			else

-				$lb = "\n";

-

 	$message = '[quote author=' . $row['poster_name'] . ' link=action=helpdesk;sa=ticket;ticket=' . $row['id_ticket'];

-			if ($row['id_first_msg'] != $_REQUEST['quote']) // don't add the msg if we're quoting the ticket itself

-				$message .= '.msg' . $_REQUEST['quote'] . '#msg' . $_REQUEST['quote'];

-			$message .= ' date=' . $row['poster_time'] . ']' . $lb . $row['body'] . $lb . '[/quote]';

-		}

-	}

+	// don't add the msg if we're quoting the ticket itself

+	if ($row['id_first_msg'] != $_REQUEST['quote'])

+		$message .= '.msg' . $_REQUEST['quote'] . '#msg' . $_REQUEST['quote'];

+	$message .= ' date=' . $row['poster_time'] . ']' . "\n" . $row['body'] . "\n" . '[/quote]';

 	return array('success' => true, 'message' => $message);

 }

@@ -365,8 +361,9 @@ function shd_ajax_canned()

 	$_REQUEST['reply'] = !empty($_REQUEST['reply']) ? (int) $_REQUEST['reply'] : 0;

 	$message = '';

-	if (!empty($_REQUEST['reply']) && !empty($context['ticket_id']))

-	{

+	if (empty($_REQUEST['reply']) || empty($context['ticket_id']))

+		return array('success' => true, 'message' => $message);

+

 	$query = shd_db_query('', '

 		SELECT hdt.id_member_started, hdt.id_dept, hdcr.body, hdcr.vis_user, hdcr.vis_staff

 		FROM {db_prefix}helpdesk_tickets AS hdt

@@ -381,7 +378,8 @@ function shd_ajax_canned()

 			'reply' => $_REQUEST['reply'],

 		)

 	);

-		if ($smcFunc['db_num_rows']($query) == 0)

+

+	if (empty($smcFunc['db_num_rows']($query)))

 	{

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

 		return array('success' => true, 'message' => $message);

@@ -410,15 +408,6 @@ function shd_ajax_canned()

 	censorText($message);

 	$message = preg_replace('~<br ?/?' . '>~i', "\n", $row['body']);

-		// Make the body HTML if need be.

-		if (!empty($_REQUEST['mode']))

-		{

-			require_once($sourcedir . '/Subs-Editor.php');

-			$message = strtr($message, array('<' => '#smlt#', '>' => '#smgt#', '&' => '#smamp#'));

-			$message = bbc_to_html($message);

-		}

-	}

-

 	$message = strtr($message, array('&nbsp;' => '&#160;', '<' => '&lt;', '>' => '&gt;'));

 	return array('success' => true, 'message' => $message);

 }

@@ -446,7 +435,7 @@ function shd_ajax_assign()

 		return array('success' => false, 'error' => $txt['shd_no_ticket']);

 	$query = shd_db_query('', '

-		SELECT hdt.private, hdt.id_member_started, id_member_assigned, id_dept, hdt.status, 1 AS valid

+		SELECT hdt.private, hdt.id_member_started, id_member_assigned, id_dept, hdt.status

 		FROM {db_prefix}helpdesk_tickets AS hdt

 		WHERE {query_see_ticket}

 			AND hdt.id_ticket = {int:ticket}',

@@ -454,13 +443,12 @@ function shd_ajax_assign()

 			'ticket' => $context['ticket_id'],

 		)

 	);

-	if ($smcFunc['db_num_rows']($query) != 0)

-		list($private, $ticket_starter, $ticket_assigned, $dept, $status, $valid) = $smcFunc['db_fetch_row']($query);

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

-

-	if (empty($valid))

+	if (empty($smcFunc['db_num_rows']($query)))

 		return array('success' => false, 'error' => $txt['shd_no_ticket']);

+	list($private, $ticket_starter, $ticket_assigned, $dept, $status) = $smcFunc['db_fetch_row']($query);

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

+

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

 	$assignees = shd_get_possible_assignees($private, $ticket_starter, $dept);

 	array_unshift($assignees, 0); // add the unassigned option in at the start

@@ -512,7 +500,7 @@ function shd_ajax_assign2()

 		return array('error' => $txt['shd_no_ticket']);

 	$query = shd_db_query('', '

-		SELECT hdt.private, hdt.id_member_started, id_member_assigned, subject, id_dept, hdt.status, 1 AS valid

+		SELECT hdt.private, hdt.id_member_started, id_member_assigned, subject, id_dept, hdt.status

 		FROM {db_prefix}helpdesk_tickets AS hdt

 		WHERE {query_see_ticket}

 			AND hdt.id_ticket = {int:ticket}',

@@ -520,13 +508,12 @@ function shd_ajax_assign2()

 			'ticket' => $context['ticket_id'],

 		)

 	);

-	if ($smcFunc['db_num_rows']($query) != 0)

-		list($private, $ticket_starter, $ticket_assigned, $subject, $dept, $status, $valid) = $smcFunc['db_fetch_row']($query);

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

-

-	if (empty($valid))

+	if (empty($smcFunc['db_num_rows']($query)))

 		return array('error' => $txt['shd_no_ticket']);

+	list($private, $ticket_starter, $ticket_assigned, $subject, $dept, $status) = $smcFunc['db_fetch_row']($query);

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

+

 	if (!isset($_GET['to_user']) || !is_numeric($_GET['to_user']))

 		return array('success' => false, 'error' => $txt['shd_assigned_not_permitted']);

@@ -54,7 +54,7 @@ function shd_assign()

 	checkSession('get');

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

-		return fatal_lang_error('shd_no_ticket');

+		shd_fatal_lang_error('shd_no_ticket');

 	$context['shd_return_to'] = isset($_REQUEST['home']) ? 'home' : 'ticket';

@@ -80,11 +80,11 @@ function shd_assign()

 	else

 	{

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

-		return fatal_lang_error('shd_no_ticket');

+		shd_fatal_lang_error('shd_no_ticket');

 	}

 	if ($status == TICKET_STATUS_CLOSED || $status == TICKET_STATUS_DELETED)

-		return fatal_lang_error('shd_cannot_assign', false);

+		shd_fatal_lang_error('shd_cannot_assign', false);

 	if (shd_allowed_to('shd_assign_ticket_any', $dept)) // can regularly assign? If so, load up potential candidates and throw it at the template.

 	{

@@ -112,7 +112,7 @@ function shd_assign()

 		}

 		if (empty($members))

-			return fatal_lang_error('shd_no_staff_assign');

+			shd_fatal_lang_error('shd_no_staff_assign');

 		if ($context['shd_multi_dept'])

 			$context['linktree'][] = array(

@@ -153,10 +153,10 @@ function shd_assign()

 			shd_commit_assignment($context['ticket_id'], 0);

 		}

 		else // oops, assigned to somebody else

-			return fatal_lang_error('shd_cannot_assign_other', false);

+			shd_fatal_lang_error('shd_cannot_assign_other', false);

 	}

 	else

-		return fatal_lang_error('shd_cannot_assign', false);

+		shd_fatal_lang_error('shd_cannot_assign', false);

 }

 /**

@@ -177,7 +177,7 @@ function shd_assign2()

 	checkSubmitOnce('check');

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

-		return fatal_lang_error('shd_no_ticket');

+		shd_fatal_lang_error('shd_no_ticket');

 	$context['shd_return_to'] = isset($_REQUEST['home']) ? 'home' : 'ticket';

@@ -206,7 +206,7 @@ function shd_assign2()

 	else

 	{

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

-		return fatal_lang_error('shd_no_ticket');

+		shd_fatal_lang_error('shd_no_ticket');

 	}

 	// Just in case, are they cancelling?

@@ -214,7 +214,7 @@ function shd_assign2()

 		return redirectexit('action=helpdesk;sa=ticket;ticket=' . $context['ticket_id']);

 	if ($status == TICKET_STATUS_CLOSED || $status == TICKET_STATUS_DELETED)

-		return fatal_lang_error('shd_cannot_assign', false);

+		shd_fatal_lang_error('shd_cannot_assign', false);

 	if (shd_allowed_to('shd_assign_ticket_any', $dept)) // can regularly assign? If so, see if our requested member is staff and can see the ticket

 	{

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

 				shd_commit_assignment($context['ticket_id'], $assignee);

 			}

 			else

-				return fatal_lang_error('shd_assigned_not_permitted', false);

+				shd_fatal_lang_error('shd_assigned_not_permitted', false);

 		}

 	}

 	elseif (shd_allowed_to('shd_assign_ticket_own', $dept) && shd_allowed_to('shd_staff', $dept)) // can't just randomly assign (and must be staff), so look at if it's already assigned or not.

@@ -259,10 +259,10 @@ function shd_assign2()

 			shd_commit_assignment($context['ticket_id'], 0);

 		}

 		else // oops, assigned to somebody else

-			return fatal_lang_error('shd_cannot_assign_other', false);

+			shd_fatal_lang_error('shd_cannot_assign_other', false);

 	}

 	else

-		return fatal_lang_error('shd_cannot_assign', false);

+		shd_fatal_lang_error('shd_cannot_assign', false);

 }

 /**

@@ -52,7 +52,7 @@ function shd_ticket_delete()

 	checkSession('get');

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

-		return fatal_lang_error('shd_no_ticket', false);

+		shd_fatal_lang_error('shd_no_ticket', false);

 	// Check we can actually see the ticket we're deleting, and if we can only delete our own, we are the owner

 	$query_ticket = shd_db_query('', '

@@ -69,12 +69,12 @@ function shd_ticket_delete()

 	{

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

 		if (!shd_allowed_to('shd_delete_ticket_any', $row['id_dept']) && (!shd_allowed_to('shd_delete_ticket_own', $row['id_dept']) || $user_info['id'] != $row['id_member_started']))

-			return fatal_lang_error('shd_cannot_delete_ticket', false);

+			shd_fatal_lang_error('shd_cannot_delete_ticket', false);

 	}

 	else

 	{

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

-		return fatal_lang_error('shd_no_ticket', false);

+		shd_fatal_lang_error('shd_no_ticket', false);

 	}

 	$subject = $row['subject'];

@@ -116,7 +116,7 @@ function shd_reply_delete()

 	$_REQUEST['reply'] = !empty($_REQUEST['reply']) ? (int) $_REQUEST['reply'] : 0;

 	if (empty($_REQUEST['reply']) || empty($context['ticket_id']))

-		return fatal_lang_error('shd_no_ticket');

+		shd_fatal_lang_error('shd_no_ticket');

 	// Check we can actually see the ticket we're deleting, that this reply is in this ticket and that we can delete this reply

 	$query_ticket = shd_db_query('', '

@@ -138,12 +138,12 @@ function shd_reply_delete()

 	{

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

 		if (($row['status'] == TICKET_STATUS_CLOSED || $row['status'] == TICKET_STATUS_DELETED) || (!shd_allowed_to('shd_delete_reply_any', $row['id_dept']) && (!shd_allowed_to('shd_delete_reply_own', $row['id_dept']) || $user_info['id'] != $row['id_member'])))

-			return fatal_lang_error('shd_cannot_delete_reply', false);

+			shd_fatal_lang_error('shd_cannot_delete_reply', false);

 	}

 	else

 	{

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

-		return fatal_lang_error('shd_no_ticket', false);

+		shd_fatal_lang_error('shd_no_ticket', false);

 	}

 	$subject = $row['subject'];

@@ -203,7 +203,7 @@ function shd_perma_delete()

 	// We have to have either a ticket or a reply to know what to delete (Or do you want me to drop your whole database? >:D)

 	if (empty($context['ticket_id']) && empty($_REQUEST['reply']))

-		return fatal_lang_error('shd_no_ticket', false);

+		shd_fatal_lang_error('shd_no_ticket', false);

 	// If we're deleting a whole ticket...

 	if (!empty($context['ticket_id']) && empty($_REQUEST['reply']))

@@ -222,7 +222,7 @@ function shd_perma_delete()

 		if ($smcFunc['db_num_rows']($query_ticket) == 0)

 		{

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

-			return fatal_lang_error('shd_no_ticket', false);

+			shd_fatal_lang_error('shd_no_ticket', false);

 		}

 		else

 		{

@@ -232,7 +232,7 @@ function shd_perma_delete()

 		}

 		if ($row['status'] != TICKET_STATUS_DELETED)