SD-Team-Mods-TopicSolved

@@ -1,5 +1,6 @@

 <?php

 // Version: 2.1; Topic solved mod

+global $helptxt;

 $txt['topic_solved_title'] = 'Topic Solved mod';

 $txt['solve_topic'] = '<strong style="color: green">Mark topic solved</strong>';

@@ -10,6 +11,7 @@ $txt['modlog_solve_log'] = 'Topic solved log';

 $txt['modlog_solve_log_desc'] = 'Below is a list of all topics that have been solved or unsolved by your users.<br /><strong>Please note:</strong> Entries cannot be removed from this log until they are at least twenty-four hours old.';

 $txt['modlog_solve_log_no_entries_found'] = 'There are currently no entries in the topic solved log.';

 $txt['solve_log_help'] = '<strong>Topic solved log</strong><br />This section allows members of the moderation team to track all usage of the topic solved/not solved feature. To ensure that moderators cannot remove references to the actions they have performed, entries may not be deleted until 24 hours after the action was taken.';

+$helptxt['solve_log'] = $txt['solve_log_help'];

 $txt['permissionname_solve_topic'] = 'Mark topics solved/not solved';

 $txt['permissionhelp_solve_topic'] = 'This permission will allow the user to mark topics as solved and not solved.';

@@ -58,6 +58,7 @@

 		<hook function="add_ts_permissions" hook="integrate_load_permissions" file="$sourcedir/SolveTopic-Admin.php" />

 		<hook function="integrate_moderate_areas_solveTopic" hook="integrate_moderate_areas" file="$sourcedir/SolveTopic-Admin.php" />

 		<hook function="integrate_viewModLog_solveTopic" hook="integrate_viewModLog" file="$sourcedir/SolveTopic-Admin.php" />

+		<hook function="integrate_helpadmin_solveTopic" hook="integrate_helpadmin" file="$sourcedir/SolveTopic-Admin.php" />

 	</install>

 	<uninstall for="2.1-2.1.99">

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

@@ -89,6 +90,7 @@

 		<hook function="add_ts_permissions" hook="integrate_load_permissions" file="$sourcedir/SolveTopic.php" reverse="true" />

 		<hook function="integrate_moderate_areas_solveTopic" hook="integrate_moderate_areas" file="$sourcedir/SolveTopic.php" reverse="true" />

 		<hook function="integrate_viewModLog_solveTopic" hook="integrate_viewModLog" file="$sourcedir/SolveTopic-Admin.php" reverse="true" />

+		<hook function="integrate_helpadmin_solveTopic" hook="integrate_helpadmin" file="$sourcedir/SolveTopic-Admin.php" reverse="true" />

 	</uninstall>	

 </package-info>

\ No newline at end of file

@@ -1,4 +1,9 @@

 <?php

+/**********************************************************************************

+* SolveTopic-Admin.php                                                                                                                                                                              *

+***********************************************************************************

+* Topic Solved mod for SMF 2.1, by SimpleDesk - www.simpledesk.net                                                                            *

+**********************************************************************************/

 if (!defined('SMF'))

 	die('Hacking attempt...');

@@ -75,6 +80,10 @@ function ModifyTopicSolvedSettings($return_config = false)

 	{

 		checkSession();

+		// Ensure we use the compatible 2.1 method of enabling a log, incase anywhere in the code it expecs it.

+		$config_vars[] = array('check', 'solvelog_enabled');

+		$_POST['solvelog_enabled'] = !empty($_POST['enable_solved_log']);

+

 		$save_vars = $config_vars;

 		saveDBSettings($save_vars);

@@ -98,7 +107,10 @@ function integrate_viewModLog_solveTopic(&$listOptions, &$moderation_menu_name)

 	loadLanguage('SolveTopic');

-	// Topic solved log

+	// Topic solved log.

+	if (function_exists('loadCacheAccelerator'))

+		$context['log_type'] = isset($_REQUEST['area']) && $_REQUEST['area'] == 'solvelog' ? 4 : $context['log_type'];

+	else

 		$context['log_type'] = isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'solvelog' ? 4 : $context['log_type'];

 	// Make sure the solve log is enabled.

@@ -119,7 +131,11 @@ function integrate_viewModLog_solveTopic(&$listOptions, &$moderation_menu_name)

 	);

 	// Fix up the list options.

+	if (function_exists('loadCacheAccelerator'))

+		$listOptions['title'] = $txt['modlog_solve_log'];

+	else

 		$listOptions['title'] = '<a href="' . $scripturl . '?action=helpadmin;help=solve_log_help" onclick="return reqWin(this.href);" class="help"><img src="' . $settings['images_url'] . '/helptopics.gif" alt="' . $txt['help'] . '" align="top" /></a> ' . $txt['modlog_solve_log'];

+

 	$listOptions['additional_rows'][0]['value'] = '

 					' . $txt['modlog_search'] . ' (' . $txt['modlog_by'] . ': ' . $context['search']['label'] . '):

 					<input type="text" name="search" size="18" value="' . $smcFunc['htmlspecialchars']($context['search']['string']) . '">

@@ -197,4 +213,9 @@ function integrate_moderate_areas_solveTopic(&$menuData)

 	);

 }

+function integrate_helpadmin_solveTopic()

+{

+	loadLanguage('SolveTopic');

+}

+

 ?>

\ No newline at end of file

@@ -2,7 +2,7 @@

 /**********************************************************************************

 * SolveTopic.php                                                                                                                                                                              *

 ***********************************************************************************

-* Topic Solved mod for SMF 2.0, by SimpleDesk - www.simpledesk.net                                                                            *

+* Topic Solved mod for SMF 2.1, by SimpleDesk - www.simpledesk.net                                                                            *

 **********************************************************************************/

 if (!defined('SMF'))