SD-SimpleDesk

@@ -13,8 +13,8 @@

 # Any questions, please contact SimpleDesk.net            #

 #                                                         #

 ###########################################################

-# SimpleDesk Version: 1.0 Felidae                         #

-# File Info: install.php / 1.0 Felidae                    #

+# SimpleDesk Version: 2.0 Anatidae                        #

+# File Info: install.php / 2.0 Anatidae                   #

 ###########################################################

 /**

@@ -77,6 +77,15 @@ $new_settings = array(

 	'shd_logopt_editposts' => 1,

 	'shd_thank_you_post' => 1,

 	'shd_zerofill' => 5,

+	'shd_notify_log' => 1,

+	'shd_notify_with_body' => 1,

+	'shd_notify_new_ticket' => 1,

+	'shd_notify_new_reply_own' => 1,

+	'shd_notify_new_reply_assigned' => 1,

+	'shd_notify_new_reply_previous' => 1,

+	'shd_notify_new_reply_any' => 1,

+	'shd_notify_assign_me' => 1,

+	'shd_notify_assign_own' => 1,

 );

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

@@ -6,11 +6,11 @@

 	<version>2.0</version>

 	<type>modification</type>

-	<install for="1.1.*, 2.0 RC2, 2.0 RC3, 2.0 RC4">

-		<readme lang="english" parsebbc="true" type="inline">This mod is [b]not compatible[/b] with your version of SMF, it requires facilities only in 2.0 RC5 and above.</readme>

+	<install for="1.1.*, 2.0 RC2, 2.0 RC3, 2.0 RC4, 2.0 RC5">

+		<readme lang="english" parsebbc="true" type="inline">This mod is [b]not compatible[/b] with your version of SMF, it requires 2.0 final or later.</readme>

 	</install>

-	<install for="2.0 RC5">

+	<install for="2.0">

 		<!-- readme files -->

 		<readme lang="english" parsebbc="true" type="file">language-readme/readme.english.txt</readme>

@@ -56,7 +56,7 @@

 		<redirect url="?action=admin;area=corefeatures#js_feature_shd" />

 	</install>

-	<uninstall for="2.0 RC5">

+	<uninstall for="2.0">

 		<!-- database changes, undone -->

 		<database>uninstall-optional.php</database>

 		<code type="file">uninstall-required.php</code>

@@ -218,6 +218,9 @@ $txt['shd_ticket_private'] = 'Private';

 $txt['shd_ticket_change'] = 'Change';

 $txt['shd_ticket_ip'] = 'IP address';

 $txt['shd_back_to_hd'] = 'Back to the helpdesk';

+$txt['shd_go_to_replies'] = 'Go to Replies';

+$txt['shd_go_to_action_log'] = 'Go to Action Log';

+$txt['shd_go_to_replies_start'] = 'Go to the first reply';

 $txt['shd_ticket_has_been_deleted'] = 'This ticket is currently in the recycle bin and cannot be altered without being returned to the helpdesk.';

 $txt['shd_ticket_replies_deleted'] = 'This ticket has had replies deleted from it previously.';

@@ -623,7 +623,7 @@ function shd_ajax_notify()

 	);

 	// Let's get all the possible actual people. The possible people who can be notified... well, they're staff.

-	$staff = shd_get_visible_list($ticket['id_dept'], $ticket['private'], $ticket['id_member_started'], !empty($modSettings['shd_admins_not_assignable']), false);

+	$staff = shd_get_visible_list($ticket['id_dept'], $ticket['private'], $ticket['id_member_started'], empty($modSettings['shd_admins_not_assignable']), false);

 	// Let's start figuring it out then! First, get the big ol' lists.

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

@@ -637,6 +637,14 @@ function shd_ajax_notify()

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

 		$notify_list[$row['notify_state'] == NOTIFY_NEVER ? 'optional_butoff' : 'being_notified'][$row['id_member']] = true;

+	// Did we exclude admins? If we did, we would have scooped the list of admins. If they're in the 'not being notified but you can...' list, remove them.

+	if (!empty($context['list_admin_exclude']))

+	{

+		foreach ($context['list_admin_exclude'] as $user_id)

+			if (isset($notify_list['optional_butoff'][$user_id]))

+				unset($notify_list['optional_butoff'][$user_id]);

+	}

+

 	// Now we get the list by preferences. This is where it starts to get complicated.

 	$possible_members = array();

 	// People who want replies to their own ticket, without including the ticket starter because they'd know about it...

@@ -636,6 +636,19 @@ function shd_view_ticket()

 		'text' => 'shd_ticket_move_to_topic',

 	);

+	// While we're at it, set up general navigation for this ticket. We'll sort out access to the action log later.

+	$context['navigation']['replies'] = array(

+		'text' => 'shd_go_to_replies',

+		'lang' => true,

+		'url' => '#replies',

+	);

+	$context['navigation']['ticketlog'] = array(

+		'text' => 'shd_go_to_action_log',

+		'test' => 'display_ticket_log',

+		'lang' => true,

+		'url' => '#ticket_log_header',

+	);

+

 	// If we are going SMF style with the navigation, we need to rework the structure a wee bit.

 	// No sense making a new array, mind, just fix up the existing one a touch, and don't do this on the master as we don't always need it.

 	if (empty($modSettings['shd_ticketnav_style']) || !in_array($modSettings['shd_ticketnav_style'], array('sd', 'sdcompact', 'smf')))

@@ -35,7 +35,7 @@ function shd_notifications_notify_newticket(&$msgOptions, &$ticketOptions, &$pos

 		return;

 	// So, we're getting the list of people that are being affected by this ticket being posted. Basically, that's a list of staff on new ticket, less people who've set preferences otherwise.

-	$members = shd_get_visible_list($ticketOptions['dept'], $ticketOptions['private'], false, !empty($modSettings['shd_admins_not_assignable']), false);

+	$members = shd_get_visible_list($ticketOptions['dept'], $ticketOptions['private'], false, empty($modSettings['shd_admins_not_assignable']), false);

 	if (empty($members))

 		return;

@@ -98,7 +98,7 @@ function shd_notifications_notify_newreply(&$msgOptions, &$ticketOptions, &$post

 	// We're doing various things here, so grab some general details, not just what we may have been passed before.

 	$ticketinfo = shd_load_ticket($ticketOptions['id']);

 	// $staff is the sum total of staff + ticket starter, subject to visibility of the ticket.

-	$staff = shd_get_visible_list($ticketOptions['dept'], $ticketinfo['private'], $ticketinfo['starter_id'], !empty($modSettings['shd_admins_not_assignable']), false);

+	$staff = shd_get_visible_list($ticketOptions['dept'], $ticketinfo['private'], $ticketinfo['starter_id'], empty($modSettings['shd_admins_not_assignable']), false);

 	// Might as well kick this off here.

 	$notify_data = array(

@@ -792,12 +792,12 @@ function shd_get_visible_list($dept, $private, $ticket_starter = 0, $include_adm

 			array()

 		);

-		$admins = array();

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

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

-			$admins[] = $row[0];

+			$context['list_admin_exclude'][] = $row[0];

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

-		$people = array_diff($people, $admins);

+		$people = array_diff($people, $context['list_admin_exclude']);

 	}

 	if (!$include_current_user)

@@ -27,7 +27,7 @@ function template_viewticket()

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

 	// Back to the helpdesk.

-	echo '<div class="floatleft">', template_button_strip(array($context['navigation']['back']), 'bottom'), '</div>', ($modSettings['shd_ticketnav_style'] != 'smf' ? '<br class="clear" /><br />' : ''), '';

+	echo '<div class="floatleft">', template_button_strip(array($context['navigation']['back'], $context['navigation']['replies'], $context['navigation']['ticketlog']), 'bottom'), '</div>', ($modSettings['shd_ticketnav_style'] != 'smf' ? '<br class="clear" /><br />' : ''), '';

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

 	{

@@ -884,7 +884,7 @@ function template_viewreplies()

 								</span>

 								<a href="', $reply['link'], '">', sprintf($txt['shd_reply_written'], $reply['time']), '</a>

 							</div>

-							<hr class="clearfix" />

+							<hr />

 							', $reply['body'], '

 							<br /><br />';

@@ -950,6 +950,7 @@ function template_viewreplies()

 	echo '

 				</div>

+				<span class="floatleft shd_nowrap"><a href="#replies" title="', $txt['shd_go_to_replies_start'], '"><img src="', $settings['default_images_url'], '/simpledesk/move_up.png" alt="" /><img src="', $settings['default_images_url'], '/simpledesk/replies.png" alt="" /></a></span>

 				<span class="floatright smalltext">', $txt['pages'], ': ', $context['page_index'], '</span>

 				<br class="clear" />

 			</div>

@@ -1101,6 +1102,7 @@ function template_ticketactionlog()

 		echo '

 						<tr class="titlebg">

 							<td colspan="3">

+								<span class="floatright shd_nowrap"><a href="#replies" title="', $txt['shd_go_to_replies_start'], '"><img src="', $settings['default_images_url'], '/simpledesk/move_up.png" alt="" /><img src="', $settings['default_images_url'], '/simpledesk/replies.png" alt="" /></a></span>

 								', !empty($context['ticket_full_log']) ? '<span class="smalltext shd_main_log"><img src="' . $settings['default_images_url'] . '/simpledesk/browse.png" alt="" /> <a href="' . $scripturl . '?action=admin;area=helpdesk_info;sa=actionlog">' . $txt['shd_ticket_log_full'] . '</a></span>' : '', '

 							</td>

 						</tr>

@@ -518,6 +518,14 @@ function template_ticket_postbox()

 						<div id="shd_bbcbox"', ((empty($modSettings['shd_allow_ticket_bbc']) || !empty($context['shd_display'])) ? ' style="display:none;"' : ''), '></div>

 						<div id="shd_smileybox"', ((empty($modSettings['shd_allow_ticket_smileys']) || !empty($context['shd_display'])) ? ' style="display:none;"' : ''), '></div>';

+	if ($editor_context['width'] == ((int) $editor_context['width']) . '%')

+	{

+		$width = round(((int) $editor_context['width']) / 0.988, 1);

+		echo '

+						<div style="width: ', $width, '%;">', template_control_richedit($context['post_box_name'], 'shd_smileybox', 'shd_bbcbox'), '</div>';

+	}

+	// Editor width isn't proportional, presumably we don't care.

+	else

 		echo template_control_richedit($context['post_box_name'], 'shd_smileybox', 'shd_bbcbox');

 	// Custom fields