10 years ago · a413bd676d
--- a/SSI.php
+++ b/SSI.php
@@ -672,7 +672,7 @@ function ssi_topBoards($num_top = 10, $output_method = 'echo')
 
 // Shows the top topics.
 
 function ssi_topTopics($type = 'replies', $num_topics = 10, $output_method = 'echo')
 
 {
 
-	global $txt, $scripturl, $user_info, $modSettings, $smcFunc, $context;
 
+	global $txt, $scripturl, $modSettings, $smcFunc, $context;
 
 
 
 	if ($modSettings['totalMessages'] > 100000)
 
 	{
@@ -868,7 +868,7 @@ function ssi_fetchGroupMembers($group_id = null, $output_method = 'echo')
 
 // Fetch some member data!
 
 function ssi_queryMembers($query_where = null, $query_where_params = array(), $query_limit = '', $query_order = 'id_member DESC', $output_method = 'echo')
 
 {
 
-	global $context, $scripturl, $txt, $user_info;
 
+	global $context, $scripturl, $txt;
 
 	global $modSettings, $smcFunc, $memberContext;
 
 
 
 	if ($query_where === null)
--- a/Sources/Admin.php
+++ b/Sources/Admin.php
@@ -6,7 +6,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
@@ -593,7 +593,7 @@ function DisplayAdminFile()
 
 
 
 	// @todo Temp
 
 	// Figure out if sesc is still being used.
 
-	if (strpos($file_data, ';sesc=') !== false)
 
+	if (strpos($file_data, ';sesc=') !== false && $filetype == 'text/javascript')
 
 		$file_data = '
 
 if (!(\'smfForum_sessionvar\' in window))
 
 	window.smfForum_sessionvar = \'sesc\';
--- a/Sources/Avatar.php
+++ b/Sources/Avatar.php
@@ -6,7 +6,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
--- a/Sources/Calendar.php
+++ b/Sources/Calendar.php
@@ -29,7 +29,7 @@ if (!defined('SMF'))
 
  */
 
 function CalendarMain()
 
 {
 
-	global $txt, $context, $modSettings, $scripturl, $options, $sourcedir, $user_info;
 
+	global $txt, $context, $modSettings, $scripturl, $options, $sourcedir, $user_info, $smcFunc;
 
 
 
 	// Permissions, permissions, permissions.
 
 	isAllowedTo('calendar_view');
@@ -56,6 +56,38 @@ function CalendarMain()
 
 	if (empty($modSettings['cal_enabled']))
 
 		fatal_lang_error('calendar_off', false);
 
 
 
+	// Did the specify an individual event ID? If so, let's splice the year/month in to what we would otherwise be doing.
 
+	if (isset($_GET['event']))
 
+	{
 
+		$evid = (int) $_GET['event'];
 
+		if ($evid > 0)
 
+		{
 
+			$request = $smcFunc['db_query']('', '
 
+				SELECT start_date
 
+				FROM {db_prefix}calendar
 
+				WHERE id_event = {int:event_id}',
 
+				array(
 
+					'event_id' => $evid,
 
+				)
 
+			);
 
+			if ($row = $smcFunc['db_fetch_assoc']($request))
 
+			{
 
+				// We know the format is going to be in yyyy-mm-dd from the database, so let's run with that.
 
+				list($_REQUEST['year'], $_REQUEST['month']) = explode('-', $row['start_date']);
 
+				$_REQUEST['year'] = (int) $_REQUEST['year'];
 
+				$_REQUEST['month'] = (int) $_REQUEST['month'];
 
+
 
+				// And we definitely don't want weekly view.
 
+				unset ($_GET['viewweek']);
 
+
 
+				// We might use this later.
 
+				$context['selected_event'] = $evid;
 
+			}
 
+			$smcFunc['db_free_result']($request);
 
+		}
 
+		unset ($_GET['event']);
 
+	}
 
+
 
 	// Set the page title to mention the calendar ;).
 
 	$context['page_title'] = $txt['calendar'];
 
 
@@ -118,9 +150,11 @@ function CalendarMain()
 
 
 
 	// Load up the previous and next months.
 
 	$context['calendar_grid_current'] = getCalendarGrid($curPage['month'], $curPage['year'], $calendarOptions);
 
+
 
 	// Only show previous month if it isn't pre-January of the min-year
 
 	if ($context['calendar_grid_current']['previous_calendar']['year'] > $modSettings['cal_minyear'] || $curPage['month'] != 1)
 
 		$context['calendar_grid_prev'] = getCalendarGrid($context['calendar_grid_current']['previous_calendar']['month'], $context['calendar_grid_current']['previous_calendar']['year'], $calendarOptions, true);
 
+
 
 	// Only show next month if it isn't post-December of the max-year
 
 	if ($context['calendar_grid_current']['next_calendar']['year'] < $modSettings['cal_maxyear'] || $curPage['month'] != 12)
 
 		$context['calendar_grid_next'] = getCalendarGrid($context['calendar_grid_current']['next_calendar']['month'], $context['calendar_grid_current']['next_calendar']['year'], $calendarOptions);
@@ -211,7 +245,7 @@ function CalendarPost()
 
 			isAllowedTo('calendar_edit_' . (!empty($user_info['id']) && getEventPoster($_REQUEST['eventid']) == $user_info['id'] ? 'own' : 'any'));
 
 
 
 		// New - and directing?
 
-		if ($_REQUEST['eventid'] == -1 && isset($_POST['link_to_board']))
 
+		if ($_REQUEST['eventid'] == -1 && (isset($_POST['link_to_board']) || empty($modSettings['allow_cal_unlinked'])))
 
 		{
 
 			$_REQUEST['calendar'] = 1;
 
 			require_once($sourcedir . '/Post.php');
--- a/Sources/Display.php
+++ b/Sources/Display.php
@@ -538,7 +538,7 @@ function Display()
 
 
 
 	// Set the topic's information for the template.
 
 	$context['subject'] = $topicinfo['subject'];
 
-	$context['num_views'] = $topicinfo['num_views'];
 
+	$context['num_views'] = comma_format($topicinfo['num_views']);
 
 	$context['num_views_text'] = $context['num_views'] == 1 ? $txt['read_one_time'] : sprintf($txt['read_many_times'], $context['num_views']);
 
 	$context['mark_unread_time'] = !empty($virtual_msg) ? $virtual_msg : $topicinfo['new_from'];
 
 
@@ -1063,7 +1063,6 @@ function Display()
 
 		'can_merge' => 'merge_any',
 
 		'can_split' => 'split_any',
 
 		'calendar_post' => 'calendar_post',
 
-		'can_send_topic' => 'send_topic',
 
 		'can_send_pm' => 'pm_send',
 
 		'can_send_email' => 'send_email_to_members',
 
 		'can_report_moderator' => 'report_any',
@@ -1113,7 +1112,6 @@ function Display()
 
 	$context['can_mark_unread'] = !$user_info['is_guest'];
 
 	$context['can_unwatch'] = !$user_info['is_guest'] && $modSettings['enable_unwatch'];
 
 
 
-	$context['can_send_topic'] = (!$modSettings['postmod_active'] || $topicinfo['approved']) && allowedTo('send_topic');
 
 	$context['can_print'] = empty($modSettings['disable_print_topic']);
 
 
 
 	// Start this off for quick moderation - it will be or'd for each post.
@@ -1183,7 +1181,6 @@ function Display()
 
 		'notify' => array('test' => 'can_mark_notify', 'text' => $context['is_marked_notify'] ? 'unnotify' : 'notify', 'image' => ($context['is_marked_notify'] ? 'un' : '') . 'notify.png', 'lang' => true, 'custom' => 'onclick="return confirm(\'' . ($context['is_marked_notify'] ? $txt['notification_disable_topic'] : $txt['notification_enable_topic']) . '\');"', 'url' => $scripturl . '?action=notify;sa=' . ($context['is_marked_notify'] ? 'off' : 'on') . ';topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']),
 
 		'mark_unread' => array('test' => 'can_mark_unread', 'text' => 'mark_unread', 'image' => 'markunread.png', 'lang' => true, 'url' => $scripturl . '?action=markasread;sa=topic;t=' . $context['mark_unread_time'] . ';topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']),
 
 		'unwatch' => array('test' => 'can_unwatch', 'text' => ($context['topic_unwatched'] ? '' : 'un') . 'watch', 'image' => ($context['topic_unwatched'] ? 'un' : '') . 'watch.png', 'lang' => true, 'url' => $scripturl . '?action=unwatchtopic;topic=' . $context['current_topic'] . '.' . $context['start'] . ';sa=' . ($context['topic_unwatched'] ? 'off' : 'on') . ';' . $context['session_var'] . '=' . $context['session_id']),
 
-		'send' => array('test' => 'can_send_topic', 'text' => 'send_topic', 'image' => 'sendtopic.png', 'lang' => true, 'url' => $scripturl . '?action=emailuser;sa=sendtopic;topic=' . $context['current_topic'] . '.0'),
 
 		'print' => array('test' => 'can_print', 'text' => 'print', 'image' => 'print.png', 'lang' => true, 'custom' => 'rel="nofollow"', 'url' => $scripturl . '?action=printpage;topic=' . $context['current_topic'] . '.0'),
 
 	);
 
 
--- a/Sources/Errors.php
+++ b/Sources/Errors.php
@@ -83,6 +83,7 @@ function log_error($error_message, $error_type = 'general', $file = null, $line
 
 		'template',
 
 		'debug',
 
 		'cron',
 
+		'paidsubs',
 
 	);
 
 
 
 	// This prevents us from infinite looping if the hook or call produces an error.
--- a/Sources/Karma.php
+++ b/Sources/Karma.php
@@ -53,6 +53,9 @@ function ModifyKarma()
 
 	// Applauding or smiting?
 
 	$dir = $_REQUEST['sa'] != 'applaud' ? -1 : 1;
 
 
 
+	if (($dir == 1 && empty($modSettings['karmaApplaudLabel'])) || ($dir == -1 && empty($modSettings['karmaSmiteLabel'])))
 
+		fatal_lang_error('feature_disabled', false);
 
+
 
 	// Delete any older items from the log. (karmaWaitTime is by hour.)
 
 	$smcFunc['db_query']('', '
 
 		DELETE FROM {db_prefix}log_karma
--- a/Sources/Likes.php
+++ b/Sources/Likes.php
@@ -278,7 +278,7 @@ function viewLikes($like_type, $like_content)
 
 		}
 
 
 
 		$context['likers'][$liker]['profile'] = &$memberContext[$liker];
 
-		$context['likers'][$liker]['time'] = timeformat($dummy['timestamp']);
 
+		$context['likers'][$liker]['time'] = !empty($dummy['timestamp']) ? timeformat($dummy['timestamp']) : '';
 
 	}
 
 
 
 	$count = count($context['likers']);
--- a/Sources/Load.php
+++ b/Sources/Load.php
@@ -1885,10 +1885,22 @@ function loadTheme($id_theme = 0, $initialize = true)
 
 			tempImage.src = smf_scripturl + "?scheduled=' . $type . ';ts=' . $ts . '";
 
 		}
 
 		window.setTimeout("smfAutoTask();", 1);');
 
-
 
 		}
 
 	}
 
 
 
+	// And we should probably trigger the cron too.
 
+	if (empty($modSettings['cron_is_real_cron']))
 
+	{
 
+		$ts = time();
 
+		$ts -= $ts % 15;
 
+		addInlineJavaScript('
 
+	function triggerCron() {
 
+		var tempImage = new Image();
 
+		tempImage.src = ' . JavaScriptEscape($boardurl) . ' + "/cron.php?ts=' . $ts . '";
 
+	}
 
+	window.setTimeout(triggerCron, 1);', true);
 
+	}
 
+
 
 	// Any files to include at this point?
 
 	if (!empty($modSettings['integrate_theme_include']))
 
 	{
@@ -2986,4 +2998,4 @@ function get_memcached_server($level = 3)
 
 		get_memcached_server($level - 1);
 
 }
 
 
 
-?>
 
+?>
--- a/Sources/ManageAttachments.php
+++ b/Sources/ManageAttachments.php
@@ -47,7 +47,6 @@ function ManageAttachments()
 
 		'byAge' => 'RemoveAttachmentByAge',
 
 		'bySize' => 'RemoveAttachmentBySize',
 
 		'maintenance' => 'MaintainFiles',
 
-		'moveAvatars' => 'MoveAvatars',
 
 		'repair' => 'RepairAttachments',
 
 		'remove' => 'RemoveAttachment',
 
 		'removeall' => 'RemoveAllAttachments',
@@ -272,12 +271,13 @@ function ManageAttachmentSettings($return_config = false)
 
 function ManageAvatarSettings($return_config = false)
 
 {
 
 	global $txt, $context, $modSettings, $sourcedir, $scripturl;
 
+	global $boarddir, $boardurl;
 
 
 
 	// Perform a test to see if the GD module or ImageMagick are installed.
 
 	$testImg = get_extension_funcs('gd') || class_exists('Imagick');
 
 
 
 	$context['valid_avatar_dir'] = is_dir($modSettings['avatar_directory']);
 
-	$context['valid_custom_avatar_dir'] = empty($modSettings['custom_avatar_enabled']) || (!empty($modSettings['custom_avatar_dir']) && is_dir($modSettings['custom_avatar_dir']) && is_writable($modSettings['custom_avatar_dir']));
 
+	$context['valid_custom_avatar_dir'] = !empty($modSettings['custom_avatar_dir']) && is_dir($modSettings['custom_avatar_dir']) && is_writable($modSettings['custom_avatar_dir']);
 
 
 
 	$config_vars = array(
 
 		// Server stored avatars!
@@ -305,13 +305,12 @@ function ManageAvatarSettings($return_config = false)
 
 			array('text', 'avatar_max_width_upload', 'subtext' => $txt['zero_for_no_limit'], 6),
 
 			array('text', 'avatar_max_height_upload', 'subtext' => $txt['zero_for_no_limit'], 6),
 
 			array('check', 'avatar_resize_upload', 'subtext' => $txt['avatar_resize_upload_note']),
 
+			array('check', 'avatar_download_png'),
 
 			array('check', 'avatar_reencode'),
 
 		'',
 
 			array('warning', 'avatar_paranoid_warning'),
 
 			array('check', 'avatar_paranoid'),
 
 		'',
 
-			array('check', 'avatar_download_png'),
 
-			array('select', 'custom_avatar_enabled', array($txt['option_attachment_dir'], $txt['option_specified_dir']), 'onchange' => 'fUpdateStatus();'),
 
 			array('text', 'custom_avatar_dir', 40, 'subtext' => $txt['custom_avatar_dir_desc'], 'invalid' => !$context['valid_custom_avatar_dir']),
 
 			array('text', 'custom_avatar_url', 40),
 
 	);
@@ -329,9 +328,18 @@ function ManageAvatarSettings($return_config = false)
 
 	{
 
 		checkSession();
 
 
 
-		// Just incase the admin forgot to set both custom avatar values, we disable it to prevent errors.
 
-		if (isset($_POST['custom_avatar_enabled']) && $_POST['custom_avatar_enabled'] == 1 && (empty($_POST['custom_avatar_dir']) || empty($_POST['custom_avatar_url'])))
 
-			$_POST['custom_avatar_enabled'] = 0;
 
+		// These settings cannot be left empty!
 
+		if (empty($_POST['custom_avatar_dir']))
 
+			$_POST['custom_avatar_dir'] = $boarddir .'/custom_avatar';
 
+
 
+		if (empty($_POST['custom_avatar_url']))
 
+			$_POST['custom_avatar_url'] = $boardurl .'/custom_avatar';
 
+
 
+		if (empty($_POST['avatar_directory']))
 
+			$_POST['avatar_directory'] = $boarddir .'/avatars';
 
+
 
+		if (empty($_POST['avatar_url']))
 
+			$_POST['avatar_url'] = $boardurl .'/avatars';
 
 
 
 		call_integration_hook('integrate_save_avatar_settings');
 
 
@@ -341,7 +349,7 @@ function ManageAvatarSettings($return_config = false)
 
 	}
 
 
 
 	// Attempt to figure out if the admin is trying to break things.
 
-	$context['settings_save_onclick'] = 'return document.getElementById(\'custom_avatar_enabled\').value == 1 && (document.getElementById(\'custom_avatar_dir\').value == \'\' || document.getElementById(\'custom_avatar_url\').value == \'\') ? confirm(\'' . $txt['custom_avatar_check_empty'] . '\') : true;';
 
+	$context['settings_save_onclick'] = 'return (document.getElementById(\'custom_avatar_dir\').value == \'\' || document.getElementById(\'custom_avatar_url\').value == \'\') ? confirm(\'' . $txt['custom_avatar_check_empty'] . '\') : true;';
 
 
 
 	// We need this for the in-line permissions
 
 	createToken('admin-mp');
@@ -765,59 +773,6 @@ function MaintainFiles()
 
 	}
 
 }
 
 
 
-/**
 
- * Move avatars from their current location, to the custom_avatar_dir folder.
 
- * Called from the maintenance screen by ?action=admin;area=manageattachments;sa=moveAvatars.
 
- */
 
-function MoveAvatars()
 
-{
 
-	global $modSettings, $smcFunc;
 
-
 
-	// First make sure the custom avatar dir is writable.
 
-	if (!is_writable($modSettings['custom_avatar_dir']))
 
-	{
 
-		// Try to fix it.
 
-		@chmod($modSettings['custom_avatar_dir'], 0777);
 
-
 
-		// Guess that didn't work?
 
-		if (!is_writable($modSettings['custom_avatar_dir']))
 
-			fatal_lang_error('attachments_no_write', 'critical');
 
-	}
 
-
 
-	$request = $smcFunc['db_query']('', '
 
-		SELECT id_attach, id_folder, id_member, filename, file_hash
 
-		FROM {db_prefix}attachments
 
-		WHERE attachment_type = {int:attachment_type}
 
-			AND id_member > {int:guest_id_member}',
 
-		array(
 
-			'attachment_type' => 0,
 
-			'guest_id_member' => 0,
 
-		)
 
-	);
 
-	$updatedAvatars = array();
 
-	while ($row = $smcFunc['db_fetch_assoc']($request))
 
-	{
 
-		$filename = getAttachmentFilename($row['filename'], $row['id_attach'], $row['id_folder'], false, $row['file_hash']);
 
-
 
-		if (rename($filename, $modSettings['custom_avatar_dir'] . '/' . $row['filename']))
 
-			$updatedAvatars[] = $row['id_attach'];
 
-	}
 
-	$smcFunc['db_free_result']($request);
 
-
 
-	if (!empty($updatedAvatars))
 
-		$smcFunc['db_query']('', '
 
-			UPDATE {db_prefix}attachments
 
-			SET attachment_type = {int:attachment_type}
 
-			WHERE id_attach IN ({array_int:updated_avatars})',
 
-			array(
 
-				'updated_avatars' => $updatedAvatars,
 
-				'attachment_type' => 1,
 
-			)
 
-		);
 
-
 
-	redirectexit('action=admin;area=manageattachments;sa=maintenance');
 
-}
 
-
 
 /**
 
  * Remove attachments older than a given age.
 
  * Called from the maintenance screen by
@@ -898,7 +853,7 @@ function RemoveAttachmentBySize()
 
  */
 
 function RemoveAttachment()
 
 {
 
-	global $txt, $smcFunc, $language;
 
+	global $txt, $smcFunc, $language, $user_info;
 
 
 
 	checkSession();
 
 
--- a/Sources/ManageCalendar.php
+++ b/Sources/ManageCalendar.php
@@ -127,8 +127,8 @@ function ModifyHolidays()
 
 					),
 
 				),
 
 				'sort' => array(
 
-					'default' => 'title',
 
-					'reverse' => 'title DESC',
 
+					'default' => 'title ASC, event_date ASC',
 
+					'reverse' => 'title DESC, event_date ASC',
 
 				)
 
 			),
 
 			'date' => array(
--- a/Sources/ManageErrors.php
+++ b/Sources/ManageErrors.php
@@ -357,7 +357,7 @@ function ViewFile()
 
 	if ($max <= 0 || $min >= $max)
 
 		fatal_lang_error('error_bad_line');
 
 
 
-	$file_data = explode('<br>', highlight_php_code($smcFunc['htmlspecialchars'](implode('', file($file)))));
 
+	$file_data = explode('<br />', highlight_php_code($smcFunc['htmlspecialchars'](implode('', file($file)))));
 
 
 
 	// We don't want to slice off too many so lets make sure we stop at the last one
 
 	$max = min($max, max(array_keys($file_data)));
--- a/Sources/ManageLanguages.php
+++ b/Sources/ManageLanguages.php
@@ -6,7 +6,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
@@ -565,7 +565,7 @@ function DownloadLanguage()
 
 function ModifyLanguages()
 
 {
 
 	global $txt, $context, $scripturl;
 
-	global $user_info, $smcFunc, $sourcedir, $language, $boarddir, $forum_version;
 
+	global $smcFunc, $sourcedir, $language, $boarddir, $forum_version;
 
 
 
 	// Setting a new default?
 
 	if (!empty($_POST['set_default']) && !empty($_POST['def_language']))
--- a/Sources/ManageMaintenance.php
+++ b/Sources/ManageMaintenance.php
@@ -720,7 +720,7 @@ function ConvertUtf8()
 
 function ConvertMsgBody()
 
 {
 
 	global $scripturl, $context, $txt, $language, $db_character_set, $db_type;
 
-	global $modSettings, $user_info, $sourcedir, $smcFunc, $time_start;
 
+	global $modSettings, $sourcedir, $smcFunc, $time_start;
 
 
 
 	// Show me your badge!
 
 	isAllowedTo('admin_forum');
--- a/Sources/ManageNews.php
+++ b/Sources/ManageNews.php
@@ -85,7 +85,7 @@ function ManageNews()
 
  */
 
 function EditNews()
 
 {
 
-	global $txt, $modSettings, $context, $sourcedir, $user_info, $scripturl;
 
+	global $txt, $modSettings, $context, $sourcedir, $scripturl;
 
 	global $smcFunc;
 
 
 
 	require_once($sourcedir . '/Subs-Post.php');
--- a/Sources/ManagePaid.php
+++ b/Sources/ManagePaid.php
@@ -91,7 +91,7 @@ function ModifySubscriptionSettings($return_config = false)
 
 	{
 
 		// If the currency is set to something different then we need to set it to other for this to work and set it back shortly.
 
 		$modSettings['paid_currency'] = !empty($modSettings['paid_currency_code']) ? $modSettings['paid_currency_code'] : '';
 
-		if (!empty($modSettings['paid_currency_code']) && !in_array($modSettings['paid_currency_code'], array('usd', 'eur', 'gbp')))
 
+		if (!empty($modSettings['paid_currency_code']) && !in_array($modSettings['paid_currency_code'], array('usd', 'eur', 'gbp', 'cad', 'aud')))
 
 			$modSettings['paid_currency'] = 'other';
 
 
 
 		// These are all the default settings.
@@ -101,7 +101,7 @@ function ModifySubscriptionSettings($return_config = false)
 
 				array('select', 'paid_email', array(0 => $txt['paid_email_no'], 1 => $txt['paid_email_error'], 2 => $txt['paid_email_all']), 'subtext' => $txt['paid_email_desc']),
 
 				array('text', 'paid_email_to', 'subtext' => $txt['paid_email_to_desc'], 'size' => 60),
 
 			'',
 
-				'dummy_currency' => array('select', 'paid_currency', array('usd' => $txt['usd'], 'eur' => $txt['eur'], 'gbp' => $txt['gbp'], 'other' => $txt['other']), 'javascript' => 'onchange="toggleOther();"'),
 
+				'dummy_currency' => array('select', 'paid_currency', array('usd' => $txt['usd'], 'eur' => $txt['eur'], 'gbp' => $txt['gbp'], 'cad' => $txt['cad'], 'aud' => $txt['aud'], 'other' => $txt['other']), 'javascript' => 'onchange="toggleOther();"'),
 
 				array('text', 'paid_currency_code', 'subtext' => $txt['paid_currency_code_desc'], 'size' => 5, 'force_div_id' => 'custom_currency_code_div'),
 
 				array('text', 'paid_currency_symbol', 'subtext' => $txt['paid_currency_symbol_desc'], 'size' => 8, 'force_div_id' => 'custom_currency_symbol_div'),
 
 				array('check', 'paidsubs_test', 'subtext' => $txt['paidsubs_test_desc'], 'onclick' => 'return document.getElementById(\'paidsubs_test\').checked ? confirm(\'' . $txt['paidsubs_test_confirm'] . '\') : true;'),
--- a/Sources/ManagePermissions.php
+++ b/Sources/ManagePermissions.php
@@ -1093,7 +1093,6 @@ function setPermissionLevel($level, $group, $profile = 'null')
 
 		'delete_own',
 
 		'modify_own',
 
 		'report_any',
 
-		'send_topic',
 
 	);
 
 
 
 	// Standard - ie. members.  They can do anything Restrictive can.
@@ -1181,7 +1180,6 @@ function setPermissionLevel($level, $group, $profile = 'null')
 
 	$boardLevels['locked'] = array(
 
 		'poll_view',
 
 		'report_any',
 
-		'send_topic',
 
 		'view_attachments',
 
 	);
 
 
@@ -1470,7 +1468,6 @@ function loadAllPermissions()
 
 			'post_reply' => array(true, 'topic'),
 
 			'merge_any' => array(false, 'topic'),
 
 			'split_any' => array(false, 'topic'),
 
-			'send_topic' => array(false, 'topic'),
 
 			'make_sticky' => array(false, 'topic'),
 
 			'move' => array(true, 'topic', 'moderate'),
 
 			'lock' => array(true, 'topic', 'moderate'),
--- a/Sources/ManageScheduledTasks.php
+++ b/Sources/ManageScheduledTasks.php
@@ -73,7 +73,7 @@ function ManageScheduledTasks()
 
  */
 
 function ScheduledTasks()
 
 {
 
-	global $context, $txt, $sourcedir, $smcFunc, $user_info, $scripturl;
 
+	global $context, $txt, $sourcedir, $smcFunc, $scripturl;
 
 
 
 	// Mama, setup the template first - cause it's like the most important bit, like pickle in a sandwich.
 
 	// ... ironically I don't like pickle. </grudge>
@@ -323,7 +323,7 @@ function list_getScheduledTasks($start, $items_per_page, $sort)
 
  */
 
 function EditTask()
 
 {
 
-	global $context, $txt, $sourcedir, $smcFunc, $user_info;
 
+	global $context, $txt, $sourcedir, $smcFunc;
 
 
 
 	// Just set up some lovely context stuff.
 
 	$context[$context['admin_menu_name']]['current_subsection'] = 'tasks';
--- a/Sources/ManageSettings.php
+++ b/Sources/ManageSettings.php
@@ -237,7 +237,6 @@ function ModifyLayoutSettings($return_config = false)
 
 		'',
 
 			// Stuff that just is everywhere - today, search, online, etc.
 
 			array('select', 'todayMod', array($txt['today_disabled'], $txt['today_only'], $txt['yesterday_today'])),
 
-			array('check', 'topbottomEnable'),
 
 			array('check', 'onlineEnable'),
 
 			array('check', 'enableVBStyleLogin'),
 
 		'',
--- a/Sources/ManageSmileys.php
+++ b/Sources/ManageSmileys.php
@@ -1699,7 +1699,7 @@ function ImportSmileys($smileyPath)
 
  */
 
 function EditMessageIcons()
 
 {
 
-	global $user_info, $context, $settings, $txt;
 
+	global $context, $settings, $txt;
 
 	global $boarddir, $smcFunc, $scripturl, $sourcedir;
 
 
 
 	// Get a list of icons.
@@ -1966,7 +1966,7 @@ function EditMessageIcons()
 
  */
 
 function list_getMessageIcons($start, $items_per_page, $sort)
 
 {
 
-	global $smcFunc, $user_info;
 
+	global $smcFunc;
 
 
 
 	$request = $smcFunc['db_query']('', '
 
 		SELECT m.id_icon, m.title, m.filename, m.icon_order, m.id_board, b.name AS board_name
--- a/Sources/ModerationCenter.php
+++ b/Sources/ModerationCenter.php
@@ -227,7 +227,7 @@ function ModerationMain($dont_call = false)
 
  */
 
 function ModerationHome()
 
 {
 
-	global $txt, $context, $scripturl, $user_info, $user_settings, $options;
 
+	global $txt, $context, $scripturl, $user_settings, $options;
 
 
 
 	loadTemplate('ModerationCenter');
 
 	loadJavascriptFile('admin.js', array('default_theme' => true), 'admin.js');
@@ -1182,7 +1182,7 @@ function ShowNotice()
 
  */
 
 function ViewWatchedUsers()
 
 {
 
-	global $smcFunc, $modSettings, $context, $txt, $scripturl, $user_info, $sourcedir;
 
+	global $smcFunc, $modSettings, $context, $txt, $scripturl, $sourcedir;
 
 
 
 	// Some important context!
 
 	$context['page_title'] = $txt['mc_watched_users_title'];
@@ -1521,7 +1521,7 @@ function list_getWatchedUsers($start, $items_per_page, $sort, $approve_query, $d
 
  */
 
 function list_getWatchedUserPostsCount($approve_query)
 
 {
 
-	global $smcFunc, $modSettings, $user_info;
 
+	global $smcFunc, $modSettings;
 
 
 
 	$request = $smcFunc['db_query']('', '
 
 		SELECT COUNT(*)
@@ -1552,7 +1552,7 @@ function list_getWatchedUserPostsCount($approve_query)
 
  */
 
 function list_getWatchedUserPosts($start, $items_per_page, $sort, $approve_query, $delete_boards)
 
 {
 
-	global $smcFunc, $txt, $scripturl, $modSettings, $user_info;
 
+	global $smcFunc, $txt, $scripturl, $modSettings;
 
 
 
 	$request = $smcFunc['db_query']('', '
 
 		SELECT m.id_msg, m.id_topic, m.id_board, m.id_member, m.subject, m.body, m.poster_time,
@@ -1752,7 +1752,7 @@ function list_getWarningCount()
 
  */
 
 function list_getWarnings($start, $items_per_page, $sort)
 
 {
 
-	global $smcFunc, $txt, $scripturl, $user_info;
 
+	global $smcFunc, $txt, $scripturl;
 
 
 
 	$request = $smcFunc['db_query']('', '
 
 		SELECT IFNULL(mem.id_member, 0) AS id_member, IFNULL(mem.real_name, lc.member_name) AS member_name_col,
--- a/Sources/Modlog.php
+++ b/Sources/Modlog.php
@@ -617,7 +617,7 @@ function list_getModLogEntries($start, $items_per_page, $sort, $query_string = '
 
 				$entries[$k]['extra'][$type] = sprintf($txt['modlog_id'], $entry['extra'][$type]);
 
 
 
 		if (isset($entry['extra']['report']))
 
-			$entries[$k]['extra']['report'] = '<a href="' . $scripturl . '?action=modlog;area=reports;report=' . $entry['extra']['report'] . '">' . $txt['modlog_report'] . '</a>';
 
+			$entries[$k]['extra']['report'] = '<a href="' . $scripturl . '?action=moderate;area=reports;report=' . $entry['extra']['report'] . '">' . $txt['modlog_report'] . '</a>';
 
 
 
 		if (empty($entries[$k]['action_text']))
 
 			$entries[$k]['action_text'] = isset($txt['modlog_ac_' . $entry['action']]) ? $txt['modlog_ac_' . $entry['action']] : $entry['action'];
--- a/Sources/PersonalMessage.php
+++ b/Sources/PersonalMessage.php
@@ -4004,7 +4004,7 @@ function ApplyRules($all_messages = false)
 
 			$inserts = array();
 
 			// Now we insert the label info
 
 			foreach ($realLabels as $a_label)
 
-				$inserts[] = array($user_info['id'], $pm, $label);
 
+				$inserts[] = array($pm, $label);
 
 
 
 			$smcFunc['db_insert']('', '{db_prefix}pm_labeled_messages', array('id_pm' => 'int', 'id_label' => 'int'), $inserts, array());
 
 		}
--- a/Sources/Post.php
+++ b/Sources/Post.php
@@ -2186,7 +2186,7 @@ function AnnouncementSelectMembergroup()
 
 function AnnouncementSend()
 
 {
 
 	global $topic, $board, $board_info, $context, $modSettings;
 
-	global $language, $scripturl, $txt, $user_info, $sourcedir, $smcFunc;
 
+	global $language, $scripturl, $txt, $sourcedir, $smcFunc;
 
 
 
 	checkSession();
 
 
--- a/Sources/Profile-Actions.php
+++ b/Sources/Profile-Actions.php
@@ -23,7 +23,7 @@ if (!defined('SMF'))
 
  */
 
 function activateAccount($memID)
 
 {
 
-	global $sourcedir, $context, $user_profile, $modSettings, $user_info;
 
+	global $sourcedir, $context, $user_profile, $modSettings;
 
 
 
 	isAllowedTo('moderate_forum');
 
 
@@ -520,7 +520,7 @@ function list_getUserWarnings($start, $items_per_page, $sort, $memID)
 
  */
 
 function deleteAccount($memID)
 
 {
 
-	global $txt, $context, $user_info, $modSettings, $cur_profile, $smcFunc;
 
+	global $txt, $context, $modSettings, $cur_profile, $smcFunc;
 
 
 
 	if (!$context['user']['is_owner'])
 
 		isAllowedTo('profile_remove_any');
--- a/Sources/Profile-Modify.php
+++ b/Sources/Profile-Modify.php
@@ -963,7 +963,7 @@ function saveProfileFields()
 
  */
 
 function saveProfileChanges(&$profile_vars, &$post_errors, $memID)
 
 {
 
-	global $user_info, $txt, $user_profile;
 
+	global $txt, $user_profile;
 
 	global $context, $sourcedir;
 
 	global $smcFunc;
 
 
@@ -1779,7 +1779,7 @@ function getAvatars($directory, $level)
 
  */
 
 function theme($memID)
 
 {
 
-	global $txt, $context, $user_profile, $user_info, $smcFunc;
 
+	global $txt, $context, $user_profile, $smcFunc;
 
 
 
 	loadThemeOptions($memID);
 
 	if (allowedTo(array('profile_extra_own', 'profile_extra_any')))
@@ -1889,7 +1889,7 @@ function authentication($memID, $saving = false)
 
  */
 
 function notification($memID)
 
 {
 
-	global $txt, $scripturl, $user_profile, $user_info, $context, $smcFunc, $sourcedir;
 
+	global $txt, $scripturl, $user_profile, $context, $smcFunc, $sourcedir;
 
 
 
 	// Going to want this for consistency.
 
 	loadCSSFile('admin.css', array(), 'admin');
@@ -1897,6 +1897,7 @@ function notification($memID)
 
 	// This is just a bootstrap for everything else.
 
 	$sa = array(
 
 		'alerts' => 'alert_configuration',
 
+		'markread' => 'alert_markread',
 
 		'topics' => 'alert_notifications_topics',
 
 		'boards' => 'alert_notifications_boards',
 
 	);
@@ -1914,7 +1915,7 @@ function notification($memID)
 
 
 
 function alert_configuration($memID)
 
 {
 
-	global $txt, $scripturl, $user_profile, $user_info, $context, $modSettings, $smcFunc, $sourcedir;
 
+	global $txt, $scripturl, $user_profile, $context, $modSettings, $smcFunc, $sourcedir;
 
 
 
 	$context['token_check'] = 'profile-nt' . $memID;
 
 	is_not_guest();
@@ -2112,9 +2113,45 @@ function alert_configuration($memID)
 
 	createToken($context['token_check'], 'post');
 
 }
 
 
 
+function alert_markread($memID)
 
+{
 
+	global $context, $db_show_debug, $smcFunc;
 
+
 
+	// We do not want to output debug information here.
 
+	$db_show_debug = false;
 
+
 
+	// We only want to output our little layer here.
 
+	$context['template_layers'] = array();
 
+	$context['sub_template'] = 'alerts_all_read';
 
+
 
+	loadLanguage('Alerts');
 
+
 
+	// Now we're all set up.
 
+	is_not_guest();
 
+	if (!$context['user']['is_owner'])
 
+		fatal_error('no_access');
 
+
 
+	checkSession('get');
 
+
 
+	// Assuming we're here, mark everything as read and head back.
 
+	// We only spit back the little layer because this should be called AJAXively.
 
+	$smcFunc['db_query']('', '
 
+		UPDATE {db_prefix}user_alerts
 
+		SET is_read = {int:now}
 
+		WHERE id_member = {int:current_member}
 
+			AND is_read = 0',
 
+		array(
 
+			'now' => time(),
 
+			'current_member' => $memID,
 
+		)
 
+	);
 
+
 
+	updateMemberData($memID, array('alerts' => 0));
 
+}
 
+
 
 function alert_notifications_topics($memID)
 
 {
 
-	global $txt, $scripturl, $user_profile, $user_info, $context, $modSettings, $smcFunc, $sourcedir;
 
+	global $txt, $scripturl, $user_profile, $context, $modSettings, $smcFunc, $sourcedir;
 
 
 
 	// Because of the way this stuff works, we want to do this ourselves.
 
 	if (isset($_POST['edit_notify_topics']))
@@ -2254,7 +2291,7 @@ function alert_notifications_topics($memID)
 
 
 
 function alert_notifications_boards($memID)
 
 {
 
-	global $txt, $scripturl, $user_profile, $user_info, $context, $smcFunc, $sourcedir;
 
+	global $txt, $scripturl, $user_profile, $context, $smcFunc, $sourcedir;
 
 
 
 	// Because of the way this stuff works, we want to do this ourselves.
 
 	if (isset($_POST['edit_notify_boards']))
@@ -2549,7 +2586,7 @@ function loadThemeOptions($memID)
 
  */
 
 function ignoreboards($memID)
 
 {
 
-	global $txt, $user_info, $context, $modSettings, $smcFunc, $cur_profile;
 
+	global $txt, $context, $modSettings, $smcFunc, $cur_profile;
 
 
 
 	// Have the admins enabled this option?
 
 	if (empty($modSettings['allow_ignore_boards']))
@@ -2945,26 +2982,9 @@ function profileSaveAvatarData(&$value)
 
 
 
 	require_once($sourcedir . '/ManageAttachments.php');
 
 
 
-	// We need to know where we're going to be putting it..
 
-	if (!empty($modSettings['custom_avatar_enabled']))
 
-	{
 
-		$uploadDir = $modSettings['custom_avatar_dir'];
 
-		$id_folder = 1;
 
-	}
 
-	elseif (!empty($modSettings['currentAttachmentUploadDir']))
 
-	{
 
-		if (!is_array($modSettings['attachmentUploadDir']))
 
-			$modSettings['attachmentUploadDir'] = unserialize($modSettings['attachmentUploadDir']);
 
-
 
-		// Just use the current path for temp files.
 
-		$uploadDir = $modSettings['attachmentUploadDir'][$modSettings['currentAttachmentUploadDir']];
 
-		$id_folder = $modSettings['currentAttachmentUploadDir'];
 
-	}
 
-	else
 
-	{
 
-		$uploadDir = $modSettings['attachmentUploadDir'];
 
-		$id_folder = 1;
 
-	}
 
+	// We're going to put this on a nice custom dir.
 
+	$uploadDir = $modSettings['custom_avatar_dir'];
 
+	$id_folder = 1;
 
 
 
 	$downloadedExternalAvatar = false;
 
 	if ($value == 'external' && allowedTo('profile_remote_avatar') && (stripos($_POST['userpicpersonal'], 'http://') === 0 || stripos($_POST['userpicpersonal'], 'https://') === 0) && strlen($_POST['userpicpersonal']) > 7 && !empty($modSettings['avatar_download_external']))
@@ -2988,6 +3008,7 @@ function profileSaveAvatarData(&$value)
 
 		}
 
 	}
 
 
 
+	// Removes whatever attachment there was before updating
 
 	if ($value == 'none')
 
 	{
 
 		$profile_vars['avatar'] = '';
@@ -2999,6 +3020,8 @@ function profileSaveAvatarData(&$value)
 
 
 
 		removeAttachments(array('id_member' => $memID));
 
 	}
 
+
 
+	// An avatar from the server-stored galleries.
 
 	elseif ($value == 'server_stored' && allowedTo('profile_server_avatar'))
 
 	{
 
 		$profile_vars['avatar'] = strtr(empty($_POST['file']) ? (empty($_POST['cat']) ? '' : $_POST['cat']) : $_POST['file'], array('&amp;' => '&'));
@@ -3022,14 +3045,13 @@ function profileSaveAvatarData(&$value)
 
 		// Remove any attached avatar...
 
 		removeAttachments(array('id_member' => $memID));
 
 
 
-		// @todo http://www.simplemachines.org/community/index.php?topic=462089.msg3226650#msg3226650
 
 		$profile_vars['avatar'] = str_replace(' ', '%20', preg_replace('~action(?:=|%3d)(?!dlattach)~i', 'action-', $_POST['userpicpersonal']));
 
 
 
 		if ($profile_vars['avatar'] == 'http://' || $profile_vars['avatar'] == 'http:///')
 
 			$profile_vars['avatar'] = '';
 
 		// Trying to make us do something we'll regret?
 
 		elseif (substr($profile_vars['avatar'], 0, 7) != 'http://' && substr($profile_vars['avatar'], 0, 8) != 'https://')
 
-			return 'bad_avatar';
 
+			return 'bad_avatar_invalid_url';
 
 		// Should we check dimensions?
 
 		elseif (!empty($modSettings['avatar_max_height_external']) || !empty($modSettings['avatar_max_width_external']))
 
 		{
@@ -3040,7 +3062,7 @@ function profileSaveAvatarData(&$value)
 
 			{
 
 				// Houston, we have a problem. The avatar is too large!!
 
 				if ($modSettings['avatar_action_too_large'] == 'option_refuse')
 
-					return 'bad_avatar';
 
+					return 'bad_avatar_too_large';
 
 				elseif ($modSettings['avatar_action_too_large'] == 'option_download_and_resize')
 
 				{
 
 					// @todo remove this if appropriate
@@ -3104,12 +3126,16 @@ function profileSaveAvatarData(&$value)
 
 					$cur_profile['filename'] = $modSettings['new_avatar_data']['filename'];
 
 					$cur_profile['attachment_type'] = $modSettings['new_avatar_data']['type'];
 
 				}
 
+
 
+				// Admin doesn't want to resize large avatars, can't do much about it but to tell you to use a different one :(
 
 				else
 
 				{
 
 					@unlink($_FILES['attachment']['tmp_name']);
 
-					return 'bad_avatar';
 
+					return 'bad_avatar_too_large';
 
 				}
 
 			}
 
+
 
+			// So far, so good, checks lies ahead!
 
 			elseif (is_array($sizes))
 
 			{
 
 				// Now try to find an infection.
@@ -3120,7 +3146,7 @@ function profileSaveAvatarData(&$value)
 
 					if (empty($modSettings['avatar_reencode']) || (!reencodeImage($_FILES['attachment']['tmp_name'], $sizes[2])))
 
 					{
 
 						@unlink($_FILES['attachment']['tmp_name']);
 
-						return 'bad_avatar';
 
+						return 'bad_avatar_fail_reencode';
 
 					}
 
 					// We were successful. However, at what price?
 
 					$sizes = @getimagesize($_FILES['attachment']['tmp_name']);
@@ -3143,7 +3169,7 @@ function profileSaveAvatarData(&$value)
 
 				$mime_type = 'image/' . ($extension === 'jpg' ? 'jpeg' : ($extension === 'bmp' ? 'x-ms-bmp' : $extension));
 
 				$destName = 'avatar_' . $memID . '_' . time() . '.' . $extension;
 
 				list ($width, $height) = getimagesize($_FILES['attachment']['tmp_name']);
 
-				$file_hash = empty($modSettings['custom_avatar_enabled']) ? getAttachmentFilename($destName, false, null, true) : '';
 
+				$file_hash = '';
 
 
 
 				// Remove previous attachments this member might have had.
 
 				removeAttachments(array('id_member' => $memID));
@@ -3155,7 +3181,7 @@ function profileSaveAvatarData(&$value)
 
 						'width' => 'int', 'height' => 'int', 'mime_type' => 'string', 'id_folder' => 'int',
 
 					),
 
 					array(
 
-						$memID, (empty($modSettings['custom_avatar_enabled']) ? 0 : 1), $destName, $file_hash, $extension, filesize($_FILES['attachment']['tmp_name']),
 
+						$memID, 1, $destName, $file_hash, $extension, filesize($_FILES['attachment']['tmp_name']),
 
 						(int) $width, (int) $height, $mime_type, $id_folder,
 
 					),
 
 					array('id_attach')
@@ -3163,7 +3189,7 @@ function profileSaveAvatarData(&$value)
 
 
 
 				$cur_profile['id_attach'] = $smcFunc['db_insert_id']('{db_prefix}attachments', 'id_attach');
 
 				$cur_profile['filename'] = $destName;
 
-				$cur_profile['attachment_type'] = empty($modSettings['custom_avatar_enabled']) ? 0 : 1;
 
+				$cur_profile['attachment_type'] = 1;
 
 
 
 				$destinationPath = $uploadDir . '/' . (empty($file_hash) ? $destName : $cur_profile['id_attach'] . '_' . $file_hash . '.dat');
 
 				if (!rename($_FILES['attachment']['tmp_name'], $destinationPath))
@@ -3487,7 +3513,7 @@ function profileSendActivation()
 
  */
 
 function groupMembership($memID)
 
 {
 
-	global $txt, $scripturl, $user_profile, $user_info, $context, $smcFunc;
 
+	global $txt, $scripturl, $user_profile, $context, $smcFunc;
 
 
 
 	$curMember = $user_profile[$memID];
 
 	$context['primary_group'] = $curMember['id_group'];
--- a/Sources/Profile-View.php
+++ b/Sources/Profile-View.php
@@ -20,7 +20,7 @@ if (!defined('SMF'))
 
  */
 
 function summary($memID)
 
 {
 
-	global $context, $memberContext, $txt, $modSettings, $user_info, $user_profile, $sourcedir, $scripturl, $smcFunc;
 
+	global $context, $memberContext, $txt, $modSettings, $user_profile, $sourcedir, $scripturl, $smcFunc;
 
 
 
 	// Attempt to load the member's profile data.
 
 	if (!loadMemberContext($memID) || !isset($memberContext[$memID]))
@@ -188,6 +188,9 @@ function summary($memID)
 
 		$smcFunc['db_free_result']($request);
 
 	}
 
 
 
+	// Are they hidden?
 
+	if ($context['member']['online']['is_online'] && empty($user_profile[$memID]['show_online']))
 
+		$context['member']['is_hidden'] = true;
 
 	loadCustomFields($memID);
 
 }
 
 
@@ -322,8 +325,8 @@ function fetch_alerts($memID, $all = false)
 
 		if (isset($txt[$string]))
 
 		{
 
 			$extra = $alerts[$id_alert]['extra'];
 
-			$search = array('{member_link}');
 
-			$repl = array(!empty($alert['sender_id']) ? '<a href="' . $scripturl . '?action=profile;u=' . $alert['sender_id'] . '">' . $alert['sender_name'] . '</a>' : $alert['sender_name']);
 
+			$search = array('{member_link}', '{scripturl}');
 
+			$repl = array(!empty($alert['sender_id']) ? '<a href="' . $scripturl . '?action=profile;u=' . $alert['sender_id'] . '">' . $alert['sender_name'] . '</a>' : $alert['sender_name'], $scripturl);
 
 			foreach ($extra as $k => $v)
 
 			{
 
 				$search[] = '{' . $k . '}';
@@ -685,7 +688,7 @@ function showPosts($memID)
 
  */
 
 function showAttachments($memID)
 
 {
 
-	global $txt, $user_info, $scripturl, $modSettings, $board;
 
+	global $txt, $scripturl, $modSettings, $board;
 
 	global $context, $user_profile, $sourcedir, $smcFunc;
 
 
 
 	// OBEY permissions!
@@ -1088,7 +1091,7 @@ function list_getUnwatched($start, $items_per_page, $sort, $memID)
 
  */
 
 function list_getNumUnwatched($memID)
 
 {
 
-	global $smcFunc, $user_info;
 
+	global $smcFunc;
 
 
 
 	// Get the total number of attachments they have posted.
 
 	$request = $smcFunc['db_query']('', '
@@ -2537,7 +2540,7 @@ function list_getGroupRequests($start, $items_per_page, $sort, $memID)
 
 function showPermissions($memID)
 
 {
 
 	global $scripturl, $txt, $board, $modSettings;
 
-	global $user_profile, $context, $user_info, $sourcedir, $smcFunc;
 
+	global $user_profile, $context, $sourcedir, $smcFunc;
 
 
 
 	// Verify if the user has sufficient permissions.
 
 	isAllowedTo('manage_permissions');
--- a/Sources/Register.php
+++ b/Sources/Register.php
@@ -220,7 +220,7 @@ function Register($reg_errors = array())
 
 function Register2($verifiedOpenID = false)
 
 {
 
 	global $scripturl, $txt, $modSettings, $context, $sourcedir;
 
-	global $user_info, $smcFunc;
 
+	global $smcFunc;
 
 
 
 	checkSession();
 
 	validateToken('register');
--- a/Sources/Reports.php
+++ b/Sources/Reports.php
@@ -185,6 +185,7 @@ function BoardReport()
 
 	$boardSettings = array(
 
 		'category' => $txt['board_category'],
 
 		'parent' => $txt['board_parent'],
 
+		'redirect' => $txt['board_redirect'],
 
 		'num_topics' => $txt['board_num_topics'],
 
 		'num_posts' => $txt['board_num_posts'],
 
 		'count_posts' => $txt['board_count_posts'],
@@ -204,7 +205,7 @@ function BoardReport()
 
 	// Go through each board!
 
 	$request = $smcFunc['db_query']('order_by_board_order', '
 
 		SELECT b.id_board, b.name, b.num_posts, b.num_topics, b.count_posts, b.member_groups, b.override_theme, b.id_profile, b.deny_member_groups,
 
-			c.name AS cat_name, IFNULL(par.name, {string:text_none}) AS parent_name, IFNULL(th.value, {string:text_none}) AS theme_name
 
+			b.redirect, c.name AS cat_name, IFNULL(par.name, {string:text_none}) AS parent_name, IFNULL(th.value, {string:text_none}) AS theme_name
 
 		FROM {db_prefix}boards AS b
 
 			LEFT JOIN {db_prefix}categories AS c ON (c.id_cat = b.id_cat)
 
 			LEFT JOIN {db_prefix}boards AS par ON (par.id_board = b.id_parent)
@@ -220,8 +221,12 @@ function BoardReport()
 
 		// Each board has it's own table.
 
 		newTable($row['name'], '', 'left', 'auto', 'left', 200, 'left');
 
 
 
+		$this_boardSettings = $boardSettings;
 
+		if (empty($row['redirect']))
 
+			unset($this_boardSettings['redirect']);
 
+
 
 		// First off, add in the side key.
 
-		addData($boardSettings);
 
+		addData($this_boardSettings);
 
 
 
 		// Format the profile name.
 
 		$profile_name = $context['profiles'][$row['id_profile']]['name'];
@@ -230,6 +235,7 @@ function BoardReport()
 
 		$boardData = array(
 
 			'category' => $row['cat_name'],
 
 			'parent' => $row['parent_name'],
 
+			'redirect' => $row['redirect'],
 
 			'num_posts' => $row['num_posts'],
 
 			'num_topics' => $row['num_topics'],
 
 			'count_posts' => empty($row['count_posts']) ? $txt['yes'] : $txt['no'],
@@ -263,6 +269,9 @@ function BoardReport()
 
 			$boardData['disallowed_groups'] = implode(', ', $disallowedGroups);
 
 		}
 
 
 
+		if (empty($row['redirect']))
 
+			unset ($boardData['redirect']);
 
+
 
 		// Next add the main data.
 
 		addData($boardData);
 
 	}
--- a/Sources/Security.php
+++ b/Sources/Security.php
@@ -450,7 +450,6 @@ function banPermissions()
 
 			'merge_any', 'split_any',
 
 			'modify_own', 'modify_any', 'modify_replies',
 
 			'move_any',
 
-			'send_topic',
 
 			'lock_own', 'lock_any',
 
 			'remove_own', 'remove_any',
 
 			'post_unapproved_topics', 'post_unapproved_replies_own', 'post_unapproved_replies_any',
@@ -1188,7 +1187,6 @@ function spamProtection($error_type)
 
 		'login' => 2,
 
 		'register' => 2,
 
 		'remind' => 30,
 
-		'sendtopic' => $modSettings['spamWaitTime'] * 4,
 
 		'sendmail' => $modSettings['spamWaitTime'] * 5,
 
 		'reporttm' => $modSettings['spamWaitTime'] * 4,
 
 		'search' => !empty($modSettings['search_floodcontrol_time']) ? $modSettings['search_floodcontrol_time'] : 1,
--- a/Sources/SendTopic.php
+++ b/Sources/SendTopic.php
@@ -30,118 +30,14 @@ function EmailUser()
 
 
 
 	$sub_actions = array(
 
 		'email' => 'CustomEmail',
 
-		'sendtopic' => 'SendTopic',
 
 	);
 
 
 
 	if (!isset($_GET['sa']) || !isset($sub_actions[$_GET['sa']]))
 
-		$_GET['sa'] = 'sendtopic';
 
+		$_GET['sa'] = 'email';
 
 
 
 	$sub_actions[$_GET['sa']]();
 
 }
 
 
 
-/**
 
- * Send a topic to a friend.
 
- * Uses the SendTopic template, with the main sub template.
 
- * Requires the send_topic permission.
 
- * Redirects back to the first page of the topic when done.
 
- * Is accessed via ?action=emailuser;sa=sendtopic.
 
- */
 
-function SendTopic()
 
-{
 
-	global $topic, $txt, $context, $scripturl, $sourcedir, $smcFunc, $modSettings;
 
-
 
-	// Check permissions...
 
-	isAllowedTo('send_topic');
 
-
 
-	// We need at least a topic... go away if you don't have one.
 
-	if (empty($topic))
 
-		fatal_lang_error('not_a_topic', false);
 
-
 
-	// Get the topic's subject.
 
-	$request = $smcFunc['db_query']('', '
 
-		SELECT m.subject, t.approved
 
-		FROM {db_prefix}topics AS t
 
-			INNER JOIN {db_prefix}messages AS m ON (m.id_msg = t.id_first_msg)
 
-		WHERE t.id_topic = {int:current_topic}
 
-		LIMIT 1',
 
-		array(
 
-			'current_topic' => $topic,
 
-		)
 
-	);
 
-	if ($smcFunc['db_num_rows']($request) == 0)
 
-		fatal_lang_error('not_a_topic', false);
 
-	$row = $smcFunc['db_fetch_assoc']($request);
 
-	$smcFunc['db_free_result']($request);
 
-
 
-	// Can't send topic if its unapproved and using post moderation.
 
-	if ($modSettings['postmod_active'] && !$row['approved'])
 
-		fatal_lang_error('not_approved_topic', false);
 
-
 
-	// Censor the subject....
 
-	censorText($row['subject']);
 
-
 
-	// Sending yet, or just getting prepped?
 
-	if (empty($_POST['send']))
 
-	{
 
-		$context['page_title'] = sprintf($txt['sendtopic_title'], $row['subject']);
 
-		$context['start'] = $_REQUEST['start'];
 
-
 
-		return;
 
-	}
 
-
 
-	// Actually send the message...
 
-	checkSession();
 
-	spamProtection('sendtopic');
 
-
 
-	// This is needed for sendmail().
 
-	require_once($sourcedir . '/Subs-Post.php');
 
-
 
-	// Trim the names..
 
-	$_POST['y_name'] = trim($_POST['y_name']);
 
-	$_POST['r_name'] = trim($_POST['r_name']);
 
-
 
-	// Make sure they aren't playing "let's use a fake email".
 
-	if ($_POST['y_name'] == '_' || !isset($_POST['y_name']) || $_POST['y_name'] == '')
 
-		fatal_lang_error('no_name', false);
 
-	if (!isset($_POST['y_email']) || $_POST['y_email'] == '')
 
-		fatal_lang_error('no_email', false);
 
-	if (preg_match('~^[0-9A-Za-z=_+\-/][0-9A-Za-z=_\'+\-/\.]*@[\w\-]+(\.[\w\-]+)*(\.[\w]{2,6})$~', $_POST['y_email']) == 0)
 
-		fatal_lang_error('email_invalid_character', false);
 
-
 
-	// The receiver should be valid to.
 
-	if ($_POST['r_name'] == '_' || !isset($_POST['r_name']) || $_POST['r_name'] == '')
 
-		fatal_lang_error('no_name', false);
 
-	if (!isset($_POST['r_email']) || $_POST['r_email'] == '')
 
-		fatal_lang_error('no_email', false);
 
-	if (preg_match('~^[0-9A-Za-z=_+\-/][0-9A-Za-z=_\'+\-/\.]*@[\w\-]+(\.[\w\-]+)*(\.[\w]{2,6})$~', $_POST['r_email']) == 0)
 
-		fatal_lang_error('email_invalid_character', false);
 
-
 
-	// Emails don't like entities...
 
-	$row['subject'] = un_htmlspecialchars($row['subject']);
 
-
 
-	$replacements = array(
 
-		'TOPICSUBJECT' => $row['subject'],
 
-		'SENDERNAME' => $_POST['y_name'],
 
-		'RECPNAME' => $_POST['r_name'],
 
-		'TOPICLINK' => $scripturl . '?topic=' . $topic . '.0',
 
-	);
 
-
 
-	$emailtemplate = 'send_topic';
 
-
 
-	if (!empty($_POST['comment']))
 
-	{
 
-		$emailtemplate .= '_comment';
 
-		$replacements['COMMENT'] = $_POST['comment'];
 
-	}
 
-
 
-	$emaildata = loadEmailTemplate($emailtemplate, $replacements);
 
-	// And off we go!
 
-	sendmail($_POST['r_email'], $emaildata['subject'], $emaildata['body'], $_POST['y_email'], 'sendtopic');
 
-
 
-	// Back to the topic!
 
-	redirectexit('topic=' . $topic . '.0;topicsent');
 
-}
 
-
 
 /**
 
  * Allow a user to send an email.
 
  * Send an email to the user - allow the sender to write the message.
--- a/Sources/SplitTopics.php
+++ b/Sources/SplitTopics.php
@@ -130,7 +130,7 @@ function SplitIndex()
 
  */
 
 function SplitExecute()
 
 {
 
-	global $txt, $board, $topic, $context, $user_info, $smcFunc;
 
+	global $txt, $board, $topic, $context, $smcFunc;
 
 
 
 	// Check the session to make sure they meant to do this.
 
 	checkSession();
@@ -464,7 +464,7 @@ function SplitSelectTopics()
 
  */
 
 function SplitSelectionExecute()
 
 {
 
-	global $txt, $board, $topic, $context, $user_info;
 
+	global $txt, $board, $topic, $context;
 
 
 
 	// Make sure the session id was passed with post.
 
 	checkSession();
@@ -499,7 +499,7 @@ function SplitSelectionExecute()
 
  */
 
 function splitTopic($split1_ID_TOPIC, $splitMessages, $new_subject)
 
 {
 
-	global $user_info, $topic, $board, $smcFunc, $txt, $sourcedir;
 
+	global $topic, $board, $smcFunc, $txt, $sourcedir;
 
 
 
 	// Nothing to split?
 
 	if (empty($splitMessages))
@@ -831,7 +831,7 @@ function MergeTopics()
 
 function MergeIndex()
 
 {
 
 	global $txt, $board, $context, $smcFunc, $sourcedir;
 
-	global $scripturl, $topic, $user_info, $modSettings;
 
+	global $scripturl, $topic, $modSettings;
 
 
 
 	if (!isset($_GET['from']))
 
 		fatal_lang_error('no_access', false);
--- a/Sources/Subs-Admin.php
+++ b/Sources/Subs-Admin.php
@@ -392,6 +392,11 @@ function updateSettingsFile($config_vars)
 
 				@copy($boarddir . '/Settings_bak.php', $boarddir . '/Settings.php');
 
 		}
 
 	}
 
+
 
+	// Even though on normal installations the filemtime should prevent this being used by the installer incorrectly
 
+	// it seems that there are times it might not. So let's MAKE it dump the cache.
 
+	if (function_exists('opcache_invalidate'))
 
+		opcache_invalidate($boarddir . '/Settings.php', true);
 
 }
 
 
 
 /**
--- a/Sources/Subs-Attachments.php
+++ b/Sources/Subs-Attachments.php
@@ -7,7 +7,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
--- a/Sources/Subs-Calendar.php
+++ b/Sources/Subs-Calendar.php
@@ -154,6 +154,7 @@ function getEventRange($low_date, $high_date, $use_permissions = true)
 
 					'end_date' => $row['end_date'],
 
 					'is_last' => false,
 
 					'id_board' => $row['id_board'],
 
+					'is_selected' => !empty($context['selected_event']) && $context['selected_event'] == $row['id_event'],
 
 					'href' => $row['id_board'] == 0 ? '' : $scripturl . '?topic=' . $row['id_topic'] . '.0',
 
 					'link' => $row['id_board'] == 0 ? $row['title'] : '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0">' . $row['title'] . '</a>',
 
 					'can_edit' => allowedTo('calendar_edit_any') || ($row['id_member'] == $user_info['id'] && allowedTo('calendar_edit_own')),
@@ -170,6 +171,7 @@ function getEventRange($low_date, $high_date, $use_permissions = true)
 
 					'end_date' => $row['end_date'],
 
 					'is_last' => false,
 
 					'id_board' => $row['id_board'],
 
+					'is_selected' => !empty($context['selected_event']) && $context['selected_event'] == $row['id_event'],
 
 					'href' => $row['id_topic'] == 0 ? '' : $scripturl . '?topic=' . $row['id_topic'] . '.0',
 
 					'link' => $row['id_topic'] == 0 ? $row['title'] : '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0">' . $row['title'] . '</a>',
 
 					'can_edit' => false,
@@ -888,6 +890,23 @@ function insertEvent(&$eventOptions)
 
 	// Store the just inserted id_event for future reference.
 
 	$eventOptions['id'] = $smcFunc['db_insert_id']('{db_prefix}calendar', 'id_event');
 
 
 
+	// If this isn't tied to a topic, we need to notify people about it.
 
+	if (empty($eventOptions['topic']))
 
+	{
 
+		$smcFunc['db_insert']('insert',
 
+			'{db_prefix}background_tasks',
 
+			array('task_file' => 'string', 'task_class' => 'string', 'task_data' => 'string', 'claimed_time' => 'int'),
 
+			array('$sourcedir/tasks/EventNew-Notify.php', 'EventNew_Notify_Background', serialize(array(
 
+				'event_title' => $eventOptions['title'],
 
+				'event_id' => $eventOptions['id'],
 
+				'sender_id' => $eventOptions['member'],
 
+				'sender_name' => $eventOptions['member'] == $context['user']['id'] ? $context['user']['name'] : '',
 
+				'time' => time(),
 
+			)), 0),
 
+			array('id_task')
 
+		);
 
+	}
 
+
 
 	// Update the settings to show something calendar-ish was updated.
 
 	updateSettings(array(
 
 		'calendar_updated' => time(),
@@ -939,10 +958,14 @@ function modifyEvent($event_id, &$eventOptions)
 
 	$real_event_id = $event_id;
 
 	call_integration_hook('integrate_modify_event', array($event_id, &$eventOptions, &$event_columns, &$event_parameters));
 
 
 
+	$column_clauses = array();
 
+	foreach ($event_columns as $col => $crit)
 
+		$column_clauses[] = $col . ' = ' . $crit;
 
+
 
 	$smcFunc['db_query']('', '
 
 		UPDATE {db_prefix}calendar
 
 		SET
 
-			' . implode(', ', $event_columns) . '
 
+			' . implode(', ', $column_clauses) . '
 
 		WHERE id_event = {int:id_event}',
 
 		array_merge(
 
 			$event_parameters,
--- a/Sources/Subs-Editor.php
+++ b/Sources/Subs-Editor.php
@@ -2341,6 +2341,7 @@ function AutoSuggest_Search_MemberGroups()
 
  */
 
 function AutoSuggest_Search_SMFVersions()
 
 {
 
+	global $smcFunc;
 
 
 
 	$xml_data = array(
 
 		'items' => array(
@@ -2349,46 +2350,35 @@ function AutoSuggest_Search_SMFVersions()
 
 		),
 
 	);
 
 
 
-	$versions = array(
 
-		'SMF 1.1',
 
-		'SMF 1.1.1',
 
-		'SMF 1.1.2',
 
-		'SMF 1.1.3',
 
-		'SMF 1.1.4',
 
-		'SMF 1.1.5',
 
-		'SMF 1.1.6',
 
-		'SMF 1.1.7',
 
-		'SMF 1.1.8',
 
-		'SMF 1.1.9',
 
-		'SMF 1.1.10',
 
-		'SMF 1.1.11',
 
-		'SMF 1.1.12',
 
-		'SMF 1.1.13',
 
-		'SMF 1.1.14',
 
-		'SMF 1.1.15',
 
-		'SMF 1.1.16',
 
-		'SMF 1.1.17',
 
-		'SMF 1.1.18',
 
-		'SMF 1.1.19',
 
-		'SMF 2.0 beta 1',
 
-		'SMF 2.0 beta 1.2',
 
-		'SMF 2.0 beta 2',
 
-		'SMF 2.0 beta 3',
 
-		'SMF 2.0 beta 4',
 
-		'SMF 2.0 RC1',
 
-		'SMF 2.0 RC1.2',
 
-		'SMF 2.0 RC2',
 
-		'SMF 2.0 RC3',
 
-		'SMF 2.0 RC4',
 
-		'SMF 2.0 RC5',
 
-		'SMF 2.0',
 
-		'SMF 2.0.1',
 
-		'SMF 2.0.2',
 
-		'SMF 2.0.3',
 
-		'SMF 2.0.4',
 
-		'SMF 2.0.5',
 
-		'SMF 2.0.6',
 
+	// First try and get it from the database.
 
+	$versions = array();
 
+	$request = $smcFunc['db_query']('', '
 
+		SELECT data
 
+		FROM {db_prefix}admin_info_files
 
+		WHERE filename = {string:latest_versions}
 
+			AND path = {string:path}',
 
+		array(
 
+			'latest_versions' => 'latest-versions.txt',
 
+			'path' => '/smf/',
 
+		)
 
 	);
 
+	if (($smcFunc['db_num_rows']($request) > 0) && ($row = $smcFunc['db_fetch_assoc']($request)) && !empty($row['data']))
 
+	{
 
+		// The file can be either Windows or Linux line endings, but let's ensure we clean it as best we can.
 
+		$possible_versions = explode("\n", $row['data']);
 
+		foreach ($possible_versions as $ver)
 
+		{
 
+			$ver = trim($ver);
 
+			if (strpos($ver, 'SMF') === 0)
 
+				$versions[] = $ver;
 
+		}
 
+	}
 
+	$smcFunc['db_free_result']($request);
 
+
 
+	// Just in case we don't have ANYthing.
 
+	if (empty($versions))
 
+		$versions = array('SMF 2.0');
 
+	
 
 
 
 	foreach ($versions as $id => $version)
 
 		if (strpos($version, strtoupper($_REQUEST['search'])) !== false)
--- a/Sources/Subs-Graphics.php
+++ b/Sources/Subs-Graphics.php
@@ -50,8 +50,8 @@ function downloadAvatar($url, $memID, $max_width, $max_height)
 
 	require_once($sourcedir . '/ManageAttachments.php');
 
 	removeAttachments(array('id_member' => $memID));
 
 
 
-	$id_folder = !empty($modSettings['currentAttachmentUploadDir']) ? $modSettings['currentAttachmentUploadDir'] : 1;
 
-	$avatar_hash = empty($modSettings['custom_avatar_enabled']) ? getAttachmentFilename($destName, false, null, true) : '';
 
+	$id_folder = 1;
 
+	$avatar_hash = '';
 
 	$smcFunc['db_insert']('',
 
 		'{db_prefix}attachments',
 
 		array(
@@ -59,7 +59,7 @@ function downloadAvatar($url, $memID, $max_width, $max_height)
 
 			'id_folder' => 'int',
 
 		),
 
 		array(
 
-			$memID, empty($modSettings['custom_avatar_enabled']) ? 0 : 1, $destName, $avatar_hash, $ext, 1,
 
+			$memID, 1, $destName, $avatar_hash, $ext, 1,
 
 			$id_folder,
 
 		),
 
 		array('id_attach')
@@ -70,10 +70,10 @@ function downloadAvatar($url, $memID, $max_width, $max_height)
 
 	$modSettings['new_avatar_data'] = array(
 
 		'id' => $attachID,
 
 		'filename' => $destName,
 
-		'type' => empty($modSettings['custom_avatar_enabled']) ? 0 : 1,
 
+		'type' => 1,
 
 	);
 
 
 
-	$destName = (empty($modSettings['custom_avatar_enabled']) ? (is_array($modSettings['attachmentUploadDir']) ? $modSettings['attachmentUploadDir'][$modSettings['currentAttachmentUploadDir']] : $modSettings['attachmentUploadDir']) : $modSettings['custom_avatar_dir']) . '/' . $destName . '.tmp';
 
+	$destName = $modSettings['custom_avatar_dir'] . '/' . $destName . '.tmp';
 
 
 
 	// Resize it.
 
 	if (!empty($modSettings['avatar_download_png']))
@@ -86,16 +86,6 @@ function downloadAvatar($url, $memID, $max_width, $max_height)
 
 
 
 	if ($success)
 
 	{
 
-		// Walk the right path.
 
-		if (!empty($modSettings['currentAttachmentUploadDir']))
 
-		{
 
-			if (!is_array($modSettings['attachmentUploadDir']))
 
-				$modSettings['attachmentUploadDir'] = unserialize($modSettings['attachmentUploadDir']);
 
-			$path = $modSettings['attachmentUploadDir'][$modSettings['currentAttachmentUploadDir']];
 
-		}
 
-		else
 
-			$path = $modSettings['attachmentUploadDir'];
 
-
 
 		// Remove the .tmp extension from the attachment.
 
 		if (rename($destName . '.tmp', empty($avatar_hash) ? $destName : $path . '/' . $attachID . '_' . $avatar_hash . '.dat'))
 
 		{
@@ -865,10 +855,14 @@ function showCodeImage($code)
 
 	$font_dir = dir($settings['default_theme_dir'] . '/fonts');
 
 	$font_list = array();
 
 	$ttfont_list = array();
 
+	$endian = unpack('v', pack('S', 0x00FF)) === 0x00FF;
 
 	while ($entry = $font_dir->read())
 
 	{
 
 		if (preg_match('~^(.+)\.gdf$~', $entry, $matches) === 1)
 
-			$font_list[] = $entry;
 
+		{
 
+			if ($endian ^ (strpos($entry, '_end.gdf') === false))
 
+				$font_list[] = $entry;
 
+		}
 
 		elseif (preg_match('~^(.+)\.ttf$~', $entry, $matches) === 1)
 
 			$ttfont_list[] = $entry;
 
 	}
@@ -956,7 +950,6 @@ function showCodeImage($code)
 
 			// Can we use true type fonts?
 
 			$can_do_ttf = function_exists('imagettftext');
 
 
 
-
 
 			// How much rotation will we give?
 
 			if ($rotationType == 'none')
 
 				$angle = 0;
--- a/Sources/Subs-Membergroups.php
+++ b/Sources/Subs-Membergroups.php
@@ -247,7 +247,7 @@ function deleteMembergroups($groups)
 
  */
 
 function removeMembersFromGroups($members, $groups = null, $permissionCheckDone = false, $ignoreProtected = false)
 
 {
 
-	global $smcFunc, $user_info, $modSettings, $sourcedir;
 
+	global $smcFunc, $modSettings, $sourcedir;
 
 
 
 	// You're getting nowhere without this permission, unless of course you are the group's moderator.
 
 	if (!$permissionCheckDone)
@@ -473,7 +473,7 @@ function removeMembersFromGroups($members, $groups = null, $permissionCheckDone
 
  */
 
 function addMembersToGroup($members, $group, $type = 'auto', $permissionCheckDone = false, $ignoreProtected = false)
 
 {
 
-	global $smcFunc, $user_info, $modSettings, $sourcedir;
 
+	global $smcFunc, $modSettings, $sourcedir;
 
 
 
 	// Show your licence, but only if it hasn't been done yet.
 
 	if (!$permissionCheckDone)
--- a/Sources/Subs-Members.php
+++ b/Sources/Subs-Members.php
@@ -882,7 +882,7 @@ function registerMember(&$regOptions, $return_errors = false)
 
  */
 
 function isReservedName($name, $current_ID_MEMBER = 0, $is_name = true, $fatal = true)
 
 {
 
-	global $user_info, $modSettings, $smcFunc, $context;
 
+	global $modSettings, $smcFunc, $context;
 
 
 
 	$name = preg_replace_callback('~(&#(\d{1,7}|x[0-9a-fA-F]{1,6});)~', 'replaceEntities__callback', $name);
 
 	$checkName = $smcFunc['strtolower']($name);
--- a/Sources/Subs-OpenID.php
+++ b/Sources/Subs-OpenID.php
@@ -237,7 +237,7 @@ function smf_openID_removeAssociation($handle)
 
 
 
 function smf_openID_return()
 
 {
 
-	global $smcFunc, $user_info, $user_profile, $sourcedir, $modSettings, $context, $sc, $user_settings;
 
+	global $smcFunc, $user_profile, $sourcedir, $modSettings, $context, $sc, $user_settings;
 
 
 
 	// Is OpenID even enabled?
 
 	if (empty($modSettings['enableOpenID']))
--- a/Sources/Subs-Post.php
+++ b/Sources/Subs-Post.php
@@ -2788,7 +2788,7 @@ function updateLastMessages($setboards, $id_msg = 0)
 
  */
 
 function adminNotify($type, $memberID, $member_name = null)
 
 {
 
-	global $txt, $modSettings, $language, $scripturl, $user_info, $context, $smcFunc;
 
+	global $txt, $modSettings, $language, $scripturl, $context, $smcFunc;
 
 
 
 	if ($member_name == null)
 
 	{
@@ -2830,7 +2830,7 @@ function adminNotify($type, $memberID, $member_name = null)
 
  */
 
 function loadEmailTemplate($template, $replacements = array(), $lang = '', $loadLang = true)
 
 {
 
-	global $txt, $mbname, $scripturl, $settings, $user_info;
 
+	global $txt, $mbname, $scripturl, $settings;
 
 
 
 	// First things first, load up the email templates language file, if we need to.
 
 	if ($loadLang)
--- a/Sources/Subs-Recent.php
+++ b/Sources/Subs-Recent.php
@@ -24,7 +24,7 @@ if (!defined('SMF'))
 
  */
 
 function getLastPosts($latestPostOptions)
 
 {
 
-	global $scripturl, $txt, $user_info, $modSettings, $smcFunc, $context;
 
+	global $scripturl, $txt, $modSettings, $smcFunc, $context;
 
 
 
 	// Find all the posts.  Newer ones will have higher IDs.  (assuming the last 20 * number are accessable...)
 
 	// @todo SLOW This query is now slow, NEEDS to be fixed.  Maybe break into two?
--- a/Sources/Subs-Themes.php
+++ b/Sources/Subs-Themes.php
@@ -6,7 +6,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
--- a/Sources/Subs.php
+++ b/Sources/Subs.php
@@ -2532,7 +2532,7 @@ function highlight_php_code($code)
 
 	global $context;
 
 
 
 	// Remove special characters.
 
-	$code = un_htmlspecialchars(strtr($code, array('<br>' => "\n", "\t" => 'SMF_TAB();', '&#91;' => '[')));
 
+	$code = un_htmlspecialchars(strtr($code, array('<br />' => "\n", '<br>' => "\n", "\t" => 'SMF_TAB();', '&#91;' => '[')));
 
 
 
 	$oldlevel = error_reporting(0);
 
 
@@ -3062,7 +3062,8 @@ function template_header()
 
 			header('Content-Type: text/html; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
 
 	}
 
 
 
-	header('Content-Type: text/' . (isset($_REQUEST['xml']) ? 'xml' : 'html') . '; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
 
+	if (!WIRELESS || WIRELESS_PROTOCOL != 'wap')
 
+		header('Content-Type: text/' . (isset($_REQUEST['xml']) ? 'xml' : 'html') . '; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
 
 
 
 	// We need to splice this in after the body layer, or after the main layer for older stuff.
 
 	if ($context['in_maintenance'] && $context['user']['is_admin'])
@@ -3211,7 +3212,7 @@ function template_footer()
 
 
 
 	// Show the load time?  (only makes sense for the footer.)
 
 	$context['show_load_time'] = !empty($modSettings['timeLoadPageEnable']);
 
-	$context['load_time'] = round(array_sum(explode(' ', microtime())) - array_sum(explode(' ', $time_start)), 3);
 
+	$context['load_time'] = comma_format(round(array_sum(explode(' ', microtime())) - array_sum(explode(' ', $time_start)), 3));
 
 	$context['load_queries'] = $db_count;
 
 
 
 	if (isset($settings['use_default_images']) && $settings['use_default_images'] == 'defaults' && isset($settings['default_template']))
@@ -3358,7 +3359,7 @@ function getAttachmentFilename($filename, $attachment_id, $dir = null, $new = fa
 
 		return sha1(md5($filename . time()) . mt_rand());
 
 
 
 	// Grab the file hash if it wasn't added.
 
-	// @todo: Locate all places that don't call a hash and fix that.
 
+	// Left this for legacy.
 
 	if ($file_hash === '')
 
 	{
 
 		$request = $smcFunc['db_query']('', '
--- a/Sources/Subscriptions-PayPal.php
+++ b/Sources/Subscriptions-PayPal.php
@@ -99,6 +99,9 @@ class paypal_display
 
 		$return_data['hidden']['src'] = 1;
 
 		$return_data['hidden']['notify_url'] = $boardurl . '/subscriptions.php';
 
 
 
+		// If possible let's use the language we know we need.
 
+		$return_data['hidden']['lc'] = !empty($txt['lang_paypal']) ? $txt['lang_paypal'] : 'US';
 
+
 
 		// Now stuff dependant on what we're doing.
 
 		if ($sub_data['flexible'])
 
 		{
@@ -256,6 +259,9 @@ class paypal_payment
 
 			exit;
 
 
 
 		// Is this a subscription - and if so is it a secondary payment that we need to process?
 
+		// If so, make sure we get it in the expected format. Seems PayPal sometimes sends it without urlencoding.
 
+		if (!empty($_POST['item_number']) && strpos($_POST['item_number'], ' ') !== false)
 
+			$_POST['item_number'] = str_replace(' ', '+', $_POST['item_number']);
 
 		if ($this->isSubscription() && (empty($_POST['item_number']) || strpos($_POST['item_number'], '+') === false))
 
 			// Calculate the subscription it relates to!
 
 			$this->_findSubscription();
@@ -311,6 +317,35 @@ class paypal_payment
 
 			return false;
 
 	}
 
 
 
+	/**
 
+	 * Is this a cancellation?
 
+	 *
 
+	 * @return boolean
 
+	 */
 
+	public function isCancellation()
 
+	{
 
+		// subscr_cancel is sent when the user cancels, subscr_eot is sent when the subscription reaches final payment
 
+		// Neither require us to *do* anything as per performCancel().
 
+		// subscr_eot, if sent, indicates an end of payments term.
 
+		if (substr($_POST['txn_type'], 0, 13) === 'subscr_cancel' || substr($_POST['txn_type'], 0, 10) === 'subscr_eot')
 
+			return true;
 
+		else
 
+			return false;
 
+	}
 
+
 
+	/**
 
+	 * Things to do in the event of a cancellation
 
+	 *
 
+	 * @return void
 
+	 */
 
+	public function performCancel($subscription_id, $member_id, $subscription_info)
 
+	{
 
+		// PayPal doesn't require SMF to notify it every time the subscription is up for renewal.
 
+		// A cancellation should not cause the user to be immediately dropped from their subscription, but
 
+		// let it expire normally. Some systems require taking action in the database to deal with this, but
 
+		// PayPal does not, so we actually just do nothing. But this is a nice prototype/example just in case.
 
+	}
 
+
 
 	/**
 
 	 * How much was paid?
 
 	 *
--- a/Sources/Themes.php
+++ b/Sources/Themes.php
@@ -1543,7 +1543,7 @@ function WrapAction()
 
 		$settings['catch_action']['function']();
 
 	}
 
 	// And finally, the main sub template ;).
 
-	elseif (isset($settings['catch_action']['sub_template']))
 
+	if (isset($settings['catch_action']['sub_template']))
 
 		$context['sub_template'] = $settings['catch_action']['sub_template'];
 
 }
 
 
@@ -1637,7 +1637,7 @@ function SetJavaScript()
 
  */
 
 function EditTheme()
 
 {
 
-	global $context, $settings, $scripturl, $boarddir, $smcFunc;
 
+	global $context, $settings, $scripturl, $boarddir, $smcFunc, $txt;
 
 
 
 	// @todo Should this be removed?
 
 	if (isset($_REQUEST['preview']))
@@ -1672,6 +1672,7 @@ function EditTheme()
 
 	// Get the directory of the theme we are editing.
 
 	$currentTheme = get_single_theme($_GET['th']);
 
 	$context['theme_id'] = $currentTheme['id'];
 
+	$context['browse_title'] = sprintf($txt['themeadmin_browsing_theme'], $currentTheme['name']);
 
 
 
 	if (!file_exists($currentTheme['theme_dir'] . '/index.template.php') && !file_exists($currentTheme['theme_dir'] . '/css/index.css'))
 
 		fatal_lang_error('theme_edit_missing', false);
@@ -1687,7 +1688,7 @@ function EditTheme()
 
 				$_GET['directory'] = preg_replace(array('~^[\./\\:\0\n\r]+~', '~[\\\\]~', '~/[\./]+~'), array('', '/', '/'), $_GET['directory']);
 
 
 
 				$temp = realpath($currentTheme['theme_dir'] . '/' . $_GET['directory']);
 
-				if (empty($temp) || substr($temp, 0, strlen(realpath($theme_dir))) != realpath($theme_dir))
 
+				if (empty($temp) || substr($temp, 0, strlen(realpath($currentTheme['theme_dir']))) != realpath($currentTheme['theme_dir']))
 
 					$_GET['directory'] = '';
 
 			}
 
 		}
--- a/Sources/tasks/EventNew-Notify.php
+++ b/Sources/tasks/EventNew-Notify.php
@@ -0,0 +1,90 @@
 
+<?php
 
+
 
+/**
 
+ * This taks handles notifying someone that a new event has been
 
+ * added to the calendar - but only when no topic has been created.
 
+ * 
 
+ * Simple Machines Forum (SMF)
 
+ * 
 
+ * @package SMF
 
+ * @author Simple Machines http://www.simplemachines.org
 
+ * @copyright 2014 Simple Machines and individual contributors
 
+ * @license http://www.simplemachines.org/about/smf/license.php BSD
 
+ * 
 
+ * @version SMF 2.1 Alpha 1
 
+ */
 
+
 
+class EventNew_Notify_Background extends SMF_BackgroundTask
 
+{
 
+	public function execute()
 
+ 	{
 
+ 		global $sourcedir, $smcFunc, $language, $modSettings, $user_profile;
 
+
 
+		// Get everyone who could be notified - those are the people who can see the calendar.
 
+		require_once($sourcedir . '/Subs-Members.php');
 
+		$members = membersAllowedTo('calendar_view');
 
+
 
+		// Having successfully figured this out, now let's get the preferences of everyone.
 
+		require_once($sourcedir . '/Subs-Notify.php');
 
+		$prefs = getNotifyPrefs($members, 'event_new', true);
 
+
 
+		// Just before we go any further, we may not have the sender's name. Let's just quickly fix that.
 
+		// If a guest creates the event, we wouldn't be capturing a username or anything.
 
+		if (!empty($this->_details['sender_id']) && empty($this->_details['sender_name']))
 
+		{
 
+			loadMemberData($this->_details['sender_id'], 'minimal');
 
+			if (!empty($user_profile[$this->_details['sender_id']))
 
+				$this->_details['sender_name'] = $user_profile[$this->_details['sender_id']]['real_name'];
 
+			else
 
+				$this->_details['sender_id'] = 0;
 
+		}
 
+
 
+		// So now we find out who wants what.
 
+		$alert_bits = array(
 
+			'alert' => 0x01,
 
+			'email' => 0x02,
 
+		);
 
+		$notifies = array();
 
+
 
+		foreach ($prefs as $member => $pref_option)
 
+		{
 
+			foreach ($alert_bits as $type => $bitvalue)
 
+				if ($pref_option['event_new'] & $bitvalue)
 
+					$notifies[$type][] = $member;
 
+		}
 
+
 
+		// Firstly, anyone who wants alerts.
 
+		if (!empty($notifies['alert']))
 
+		{
 
+			// Alerts are relatively easy.
 
+			$insert_rows = array();
 
+			foreach ($notifies['alert'] as $member)
 
+			{
 
+				$insert_rows[] = array(
 
+					'alert_time' => $this->_details['time'],
 
+					'id_member' => $member,
 
+					'id_member_started' => $this->_details['sender_id'],
 
+					'member_name' => $this->_details['sender_name'],
 
+					'content_type' => 'event',
 
+					'content_id' => $this->_details['event_id'],
 
+					'content_action' => empty($this->_details['sender_id']) ? 'new_guest' : 'new',
 
+					'is_read' => 0,
 
+					'extra' => '',
 
+				);
 
+			}
 
+
 
+			$smcFunc['db_insert']('insert',
 
+				'{db_prefix}user_alerts',
 
+				array('alert_time' => 'int', 'id_member' => 'int', 'id_member_started' => 'int',
 
+					'member_name' => 'string', 'content_type' => 'string', 'content_id' => 'int',
 
+					'content_action' => 'string', 'is_read' => 'int', 'extra' => 'string'),
 
+				$insert_rows,
 
+				array('id_alert')
 
+			);
 
+
 
+			// And update the count of alerts for those people.
 
+			updateMemberData($notifies['alert'], array('alerts' => '+'));
 
+		}
 
+	}
 
+}
 
+?>
--- a/Sources/tasks/GroupReq-Notify.php
+++ b/Sources/tasks/GroupReq-Notify.php
@@ -18,7 +18,7 @@ class GroupReq_Notify_Background extends SMF_BackgroundTask
 
 {
 
 	public function execute()
 
  	{
 
- 		global $sourcedir, $smcFunc, $language, $modSettings;		
 
+ 		global $sourcedir, $smcFunc, $language, $modSettings, $scripturl;		
 
 
 
 		// Do we have any group moderators?
 
 		$request = $smcFunc['db_query']('', '
--- a/Sources/tasks/MsgReport-Notify.php
+++ b/Sources/tasks/MsgReport-Notify.php
@@ -97,7 +97,7 @@ class MsgReport_Notify_Background extends SMF_BackgroundTask
 
 					'is_read' => 0,
 
 					'extra' => serialize(
 
 						array(
 
-							'report_link' => $scripturl . '?action=moderate;area=reports;report=' . $this->_details['report_id'],
 
+							'report_link' => '?action=moderate;area=reports;report=' . $this->_details['report_id'], // We don't put $scripturl in these!
 
 						)
 
 					),
 
 				);
--- a/Sources/tasks/MsgReportReply-Notify.php
+++ b/Sources/tasks/MsgReportReply-Notify.php
@@ -127,7 +127,7 @@ class MsgReportReply_Notify_Background extends SMF_BackgroundTask
 
 					'is_read' => 0,
 
 					'extra' => serialize(
 
 						array(
 
-							'report_link' => $scripturl . '?action=moderate;area=reports;report=' . $this->_details['report_id'],
 
+							'report_link' => '?action=moderate;area=reports;report=' . $this->_details['report_id'], // We don't put $scripturl in these!
 
 						)
 
 					),
 
 				);
--- a/Themes/default/Admin.template.php
+++ b/Themes/default/Admin.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
@@ -1175,7 +1175,7 @@ function template_edit_profile_field()
 
 												<span class="smalltext">', $txt['custom_edit_privacy_desc'], '</span>
 
 											</dt>
 
 											<dd>
 
-												<select name="private" id="private" onchange="updateInputBoxes();" style="width: 100%">
 
+												<select name="private" id="private" onchange="updateInputBoxes();">
 
 													<option value="0"', $context['field']['private'] == 0 ? ' selected' : '', '>', $txt['custom_edit_privacy_all'], '</option>
 
 													<option value="1"', $context['field']['private'] == 1 ? ' selected' : '', '>', $txt['custom_edit_privacy_see'], '</option>
 
 													<option value="2"', $context['field']['private'] == 2 ? ' selected' : '', '>', $txt['custom_edit_privacy_owner'], '</option>
--- a/Themes/default/BoardIndex.template.php
+++ b/Themes/default/BoardIndex.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
@@ -157,7 +157,7 @@ function template_main()
 
 					</td>
 
 					<td class="windowbg stats">
 
 						<p>', comma_format($board['posts']), ' ', $board['is_redirect'] ? $txt['redirects'] : $txt['posts'], '
 
-						', $board['is_redirect'] ? '' : '<br> '.comma_format($board['topics']) . ' ' . $txt['board_topics'], '
 
+						', $board['is_redirect'] ? '' : '<br> ' . comma_format($board['topics']) . ' ' . $txt['board_topics'], '
 
 						</p>
 
 					</td>
 
 					<td class="lastpost">';
--- a/Themes/default/Calendar.template.php
+++ b/Themes/default/Calendar.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
@@ -271,7 +271,7 @@ function template_show_month_grid($grid_name, $is_mini = false)
 
 									</a>
 
 								';
 
 							}
 
-							echo $event['link'], $event['is_last'] ? '' : '<br>';
 
+							echo $event['is_selected'] ? '<div class="sel_event">' . $event['link'] . '</div>' : $event['link'], $event['is_last'] ? '' : '<br>';
 
 						}
 
 
 
 						echo '</div>';
@@ -282,9 +282,9 @@ function template_show_month_grid($grid_name, $is_mini = false)
 
 			// Otherwise, assuming it's not a mini-calendar, we can show previous / next month days!
 
 			elseif ($is_mini === false)
 
 			{
 
-				if ($current_month_started === false && !empty($context['calendar_grid_prev']))
 
+				if (empty($current_month_started) && !empty($context['calendar_grid_prev']))
 
 					echo '<a href="', $scripturl, '?action=calendar;year=', $context['calendar_grid_prev']['current_year'], ';month=', $context['calendar_grid_prev']['current_month'], '">', $context['calendar_grid_prev']['last_of_month'] - $calendar_data['shift']-- + 1, '</a>';
 
-				elseif (!empty($context['calendar_grid_next']))
 
+				elseif (!empty($current_month_started) && !empty($context['calendar_grid_next']))
 
 					echo '<a href="', $scripturl, '?action=calendar;year=', $context['calendar_grid_next']['current_year'], ';month=', $context['calendar_grid_next']['current_month'], '">', $current_month_started + 1 == $count ? (!empty($calendar_data['short_month_titles']) ? $txt['months_short'][$context['calendar_grid_next']['current_month']] . ' ' : $txt['months_titles'][$context['calendar_grid_next']['current_month']] . ' ') : '', $final_count++, '</a>';
 
 			}
 
 
@@ -519,43 +519,9 @@ function template_calendar_base($col_span = 1)
 
 // Template for posting a calendar event.
 
 function template_event_post()
 
 {
 
-	global $context, $txt, $scripturl;
 
+	global $context, $txt, $scripturl, $modSettings;
 
 
 
-	// Start the javascript for drop down boxes...
 
 	echo '
 
-		<script><!-- // --><![CDATA[
 
-			var monthLength;
 
-			monthLength = [
 
-				31, 28, 31, 30,
 
-				31, 30, 31, 31,
 
-				30, 31, 30, 31
 
-			];
 
-			function generateDays()
 
-			{
 
-				var days, selected, dayElement, monthElement, yearElement;
 
-				dayElement = document.getElementById("day"), yearElement = document.getElementById("year"), monthElement = document.getElementById("month");
 
-
 
-				monthLength[1] = 28;
 
-				if (yearElement.options[yearElement.selectedIndex].value % 4 == 0)
 
-					monthLength[1] = 29;
 
-
 
-				selected = dayElement.selectedIndex;
 
-				while (dayElement.options.length)
 
-				{
 
-					dayElement.options[0] = null;
 
-				}
 
-				days = monthLength[monthElement.value - 1];
 
-
 
-				for (i = 0; i <= days; ++i)
 
-				{
 
-					dayElement.options[dayElement.length] = new Option(i, i);
 
-				}
 
-
 
-				if (selected < days)
 
-					dayElement.selectedIndex = selected;
 
-			}
 
-		// ]]></script>
 
-
 
 		<form action="', $scripturl, '?action=calendar;sa=post" method="post" name="postevent" accept-charset="', $context['character_set'], '" onsubmit="submitonce(this);smc_saveEntities(\'postevent\', [\'evtitle\']);" style="margin: 0;">';
 
 
 
 	if (!empty($context['event']['new']))
--- a/Themes/default/Compat.template.php
+++ b/Themes/default/Compat.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
--- a/Themes/default/Display.template.php
+++ b/Themes/default/Display.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
@@ -155,7 +155,7 @@ function template_main()
 
 	echo '
 
 			<div class="pagesection">
 
 				', template_button_strip($context['normal_buttons'], 'right'), '
 
-				', !empty($modSettings['topbottomEnable']) ? $context['menu_separator'] . '<a href="#bot" class="topbottom floatleft">' . $txt['go_down'] . '</a>' : '', '
 
+				', $context['menu_separator'], '<a href="#bot" class="topbottom floatleft">', $txt['go_down'], '</a>
 
 				<div class="pagelinks floatleft">
 
 					', $context['page_index'], '
 
 				</div>
@@ -206,7 +206,7 @@ function template_main()
 
 	echo '
 
 			<div class="pagesection">
 
 				', template_button_strip($context['normal_buttons'], 'right'), '
 
-				', !empty($modSettings['topbottomEnable']) ? $context['menu_separator'] . '<a href="#main_content_section" class="topbottom floatleft">' . $txt['go_up'] . '</a>' : '', '
 
+				', $context['menu_separator'], '<a href="#main_content_section" class="topbottom floatleft">', $txt['go_up'], '</a>
 
 				<div class="pagelinks floatleft">
 
 					', $context['page_index'], '
 
 				</div>
--- a/Themes/default/Errors.template.php
+++ b/Themes/default/Errors.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
--- a/Themes/default/GenericControls.template.php
+++ b/Themes/default/GenericControls.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
--- a/Themes/default/GenericList.template.php
+++ b/Themes/default/GenericList.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
@@ -15,7 +15,9 @@ function template_show_list($list_id = null)
 
 	global $context, $scripturl, $txt, $modSettings;
 
 
 
 	// Get a shortcut to the current list.
 
-	$list_id = $list_id === null ? $context['default_list'] : $list_id;
 
+	$list_id = $list_id === null ? (!empty($context['default_list']) ? $context['default_list'] : '') : $list_id;
 
+	if (empty($list_id) || empty($context[$list_id]))
 
+		return;
 
 	$cur_list = &$context[$list_id];
 
 
 
 	// These are the main tabs that is used all around the template.
--- a/Themes/default/GenericMenu.template.php
+++ b/Themes/default/GenericMenu.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
--- a/Themes/default/Help.template.php
+++ b/Themes/default/Help.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
--- a/Themes/default/Likes.template.php
+++ b/Themes/default/Likes.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
--- a/Themes/default/Login.template.php
+++ b/Themes/default/Login.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
--- a/Themes/default/ManageAttachments.template.php
+++ b/Themes/default/ManageAttachments.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
@@ -24,8 +24,6 @@ function template_avatar_settings_below()
 
 		document.getElementById("avatar_max_width_external").disabled = document.getElementById("avatar_download_external").checked;
 
 		document.getElementById("avatar_max_height_external").disabled = document.getElementById("avatar_download_external").checked;
 
 		document.getElementById("avatar_action_too_large").disabled = document.getElementById("avatar_download_external").checked;
 
-		document.getElementById("custom_avatar_dir").disabled = document.getElementById("custom_avatar_enabled").value == 0;
 
-		document.getElementById("custom_avatar_url").disabled = document.getElementById("custom_avatar_enabled").value == 0;
 
 
 
 	}
 
 	addLoadEvent(fUpdateStatus);
--- a/Themes/default/ManageBans.template.php
+++ b/Themes/default/ManageBans.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
--- a/Themes/default/ManageBoards.template.php
+++ b/Themes/default/ManageBoards.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
--- a/Themes/default/ManageCalendar.template.php
+++ b/Themes/default/ManageCalendar.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
@@ -15,34 +15,6 @@ function template_edit_holiday()
 
 {
 
 	global $context, $scripturl, $txt, $modSettings;
 
 
 
-	// Start with javascript for getting the calendar dates right.
 
-	echo '
 
-		<script><!-- // --><![CDATA[
 
-			var monthLength = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
 
-
 
-			function generateDays()
 
-			{
 
-				var days = 0, selected = 0;
 
-				var dayElement = document.getElementById("day"), yearElement = document.getElementById("year"), monthElement = document.getElementById("month");
 
-
 
-				monthLength[1] = 28;
 
-				if (yearElement.options[yearElement.selectedIndex].value % 4 == 0)
 
-					monthLength[1] = 29;
 
-
 
-				selected = dayElement.selectedIndex;
 
-				while (dayElement.options.length)
 
-					dayElement.options[0] = null;
 
-
 
-				days = monthLength[monthElement.value - 1];
 
-
 
-				for (i = 1; i <= days; i++)
 
-					dayElement.options[dayElement.length] = new Option(i, i);
 
-
 
-				if (selected < days)
 
-					dayElement.selectedIndex = selected;
 
-			}
 
-		// ]]></script>';
 
-
 
 	// Show a form for all the holiday information.
 
 	echo '
 
 	<div id="admincenter">
--- a/Themes/default/ManageLanguages.template.php
+++ b/Themes/default/ManageLanguages.template.php
@@ -4,7 +4,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
--- a/Themes/default/ManageMail.template.php
+++ b/Themes/default/ManageMail.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
--- a/Themes/default/ManageMaintenance.template.php
+++ b/Themes/default/ManageMaintenance.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
--- a/Themes/default/ManageMembergroups.template.php
+++ b/Themes/default/ManageMembergroups.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
--- a/Themes/default/ManageMembers.template.php
+++ b/Themes/default/ManageMembers.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
--- a/Themes/default/ManageNews.template.php
+++ b/Themes/default/ManageNews.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
--- a/Themes/default/ManagePaid.template.php
+++ b/Themes/default/ManagePaid.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
@@ -268,7 +268,7 @@ function template_modify_user_subscription()
 
 					</dl>
 
 					<fieldset>
 
 						<legend>', $txt['start_date_and_time'], '</legend>
 
-						<select name="year" id="year" onchange="generateDays(\'\');">';
 
+						<select name="year" id="year" onchange="generateDays();">';
 
 
 
 	// Show a list of all the years we allow...
 
 	for ($year = 2005; $year <= 2030; $year++)
@@ -278,7 +278,7 @@ function template_modify_user_subscription()
 
 	echo '
 
 						</select>&nbsp;
 
 						', (isset($txt['calendar_month']) ? $txt['calendar_month'] : $txt['calendar_month']), '&nbsp;
 
-						<select name="month" id="month" onchange="generateDays(\'\');">';
 
+						<select name="month" id="month" onchange="generateDays();">';
 
 
 
 	// There are 12 months per year - ensure that they all get listed.
 
 	for ($month = 1; $month <= 12; $month++)
--- a/Themes/default/ManagePermissions.template.php
+++ b/Themes/default/ManagePermissions.template.php
@@ -4,7 +4,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
--- a/Themes/default/ManageScheduledTasks.template.php
+++ b/Themes/default/ManageScheduledTasks.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
--- a/Themes/default/ManageSearch.template.php
+++ b/Themes/default/ManageSearch.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
--- a/Themes/default/ManageSmileys.template.php
+++ b/Themes/default/ManageSmileys.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
--- a/Themes/default/Memberlist.template.php
+++ b/Themes/default/Memberlist.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
--- a/Themes/default/MessageIndex.template.php
+++ b/Themes/default/MessageIndex.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
@@ -120,7 +120,7 @@ function template_main()
 
 	{
 
 		echo '
 
 	<div class="pagesection">
 
-		', !empty($modSettings['topbottomEnable']) ? $context['menu_separator'] . '<a href="#bot" class="topbottom floatleft">' . $txt['go_down'] . '</a>' : '', '
 
+		', $context['menu_separator'], '<a href="#bot" class="topbottom floatleft">', $txt['go_down'], '</a>
 
 		<div class="pagelinks floatleft">', $context['page_index'], '</div>
 
 		', template_button_strip($context['normal_buttons'], 'right'), '
 
 	</div>';
@@ -357,7 +357,7 @@ function template_main()
 
 		echo '
 
 	<div class="pagesection">
 
 		', template_button_strip($context['normal_buttons'], 'right'), '
 
-		', !empty($modSettings['topbottomEnable']) ? $context['menu_separator'] . '<a href="#main_content_section" class="topbottom floatleft">' . $txt['go_up'] . '</a>' : '', '
 
+		', $context['menu_separator'], '<a href="#main_content_section" class="topbottom floatleft">', $txt['go_up'], '</a>
 
 		<div class="pagelinks">', $context['page_index'], '</div>
 
 	</div>';
 
 	}
--- a/Themes/default/ModerationCenter.template.php
+++ b/Themes/default/ModerationCenter.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
@@ -245,7 +245,7 @@ function template_watched_users()
 
 // Little section for making... notes.
 
 function template_notes()
 
 {
 
-	global $settings, $context, $txt, $scripturl;
 
+	global $context, $txt, $scripturl;
 
 
 
 	echo '
 
 		<div class="modnotes">
@@ -264,7 +264,7 @@ function template_notes()
 
 			// Cycle through the notes.
 
 			foreach ($context['notes'] as $note)
 
 				echo '
 
-							<li class="smalltext"><a href="', $note['delete_href'], '"><img src="', $settings['images_url'], '/pm_recipient_delete.png" alt=""></a>', $note['time'] ,' <strong>', $note['author']['link'], ':</strong> ', $note['text'], '</li>';
 
+							<li class="smalltext"><a href="', $note['delete_href'], '"><span class="generic_icons del_small"></span></a>', $note['time'] ,' <strong>', $note['author']['link'], ':</strong> ', $note['text'], '</li>';
 
 
 
 			echo '
 
 						</ul>
--- a/Themes/default/MoveTopic.template.php
+++ b/Themes/default/MoveTopic.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
--- a/Themes/default/Notify.template.php
+++ b/Themes/default/Notify.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
--- a/Themes/default/Packages.template.php
+++ b/Themes/default/Packages.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
--- a/Themes/default/PersonalMessage.template.php
+++ b/Themes/default/PersonalMessage.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
@@ -60,8 +60,7 @@ function template_pm_popup()
 
 				<a href="', $scripturl, '?action=pm;sa=settings">', $txt['pm_settings_short'], '</a>
 
 			</div>
 
 			<div class="pm_mailbox floatleft">
 
-				', $txt['pm_unread'], '
 
-				| <a href="', $scripturl, '?action=pm">', $txt['inbox'], '</a>
 
+				<a href="', $scripturl, '?action=pm">', $txt['inbox'], '</a>
 
 				| <a href="', $scripturl, '?action=pm;f=sent">', $txt['pm_sent_short'], '</a>
 
 			</div>
 
 		</div>
@@ -1000,6 +999,7 @@ function template_send()
 
 					</div>
 
 				</div>
 
 			</div>
 
+			<br class="clear">
 
 		</div>';
 
 
 
 	// Main message editing box.
--- a/Themes/default/Poll.template.php
+++ b/Themes/default/Poll.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
--- a/Themes/default/Post.template.php
+++ b/Themes/default/Post.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
--- a/Themes/default/Printpage.template.php
+++ b/Themes/default/Printpage.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
--- a/Themes/default/Profile.template.php
+++ b/Themes/default/Profile.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
@@ -95,20 +95,18 @@ function template_alerts_popup()
 
 	echo '
 
 		<div class="alert_bar">
 
 			<div class="alerts_opts floatright">
 
-				<a href="' . $scripturl . '?action=pm;sa=send">', $txt['mark_alerts_read'], '</a>
 
+				<a href="' . $scripturl . '?action=profile;area=notification;sa=markread;', $context['session_var'], '=', $context['session_id'], '" onclick="return markAlertsRead(this)">', $txt['mark_alerts_read'], '</a>
 
 				| <a href="', $scripturl, '?action=profile;area=notification;sa=alerts">', $txt['alert_settings'], '</a>
 
 			</div>
 
 			<div class="alerts_box floatleft">
 
-				', $txt['unread_alerts'], '
 
-				| <a href="', $scripturl, '?action=pm">', $txt['all_alerts'], '</a>
 
+				<a href="', $scripturl, '?action=pm">', $txt['all_alerts'], '</a>
 
 			</div>
 
 		</div>
 
 		<div class="alerts_unread">';
 
 
 
 	if (empty($context['unread_alerts']))
 
 	{
 
-		echo '
 
-			<div class="no_unread">', $txt['alerts_no_unread'], '</div>';
 
+		template_alerts_all_read();
 
 	}
 
 	else
 
 	{
@@ -126,7 +124,28 @@ function template_alerts_popup()
 
 	}
 
 
 
 	echo '
 
-		</div>';
 
+		</div>
 
+		<script><!-- // --><![CDATA[
 
+		function markAlertsRead(obj) {
 
+			ajax_indicator(true);
 
+			$.get(
 
+				obj.href,
 
+				function(data) {
 
+					ajax_indicator(false);
 
+					$("#alerts_menu_top span.amt").remove();
 
+					$("#alerts_menu div.alerts_unread").html(data);
 
+				}
 
+			);
 
+			return false;
 
+		}
 
+		// ]]></script>';
 
+}
 
+
 
+function template_alerts_all_read()
 
+{
 
+	global $txt;
 
+
 
+	echo '<div class="no_unread">', $txt['alerts_no_unread'], '</div>';
 
 }
 
 
 
 // This template displays users details without any option to edit them.
@@ -370,9 +389,12 @@ function template_summary()
 
 					<dt>', $txt['language'], ':</dt>
 
 					<dd>', $context['member']['language'], '</dd>';
 
 
 
-	echo '
 
+	if ($context['member']['online']['is_online'])
 
+		echo '
 
 					<dt>', $txt['lastLoggedIn'], ': </dt>
 
-					<dd>', $context['member']['last_login'], '</dd>
 
+					<dd>', $context['member']['last_login'], (!empty($context['member']['is_hidden']) ? ' (' . $txt['hidden'] . ')' : ''), '</dd>';
 
+
 
+	echo '
 
 				</dl>';
 
 
 
 	// Are there any custom profile fields for the summary?
--- a/Themes/default/Recent.template.php
+++ b/Themes/default/Recent.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
@@ -96,7 +96,7 @@ function template_unread()
 
 	{
 
 		echo '
 
 			<div class="pagesection">
 
-				', !empty($modSettings['topbottomEnable']) ? $context['menu_separator'] . '<a href="#bot" class="topbottom floatleft">' . $txt['go_down'] . '</a>' : '', '
 
+				', $context['menu_separator'], '<a href="#bot" class="topbottom floatleft">', $txt['go_down'], '</a>
 
 				<div class="pagelinks floatleft">', $context['page_index'], '</div>
 
 				', !empty($context['recent_buttons']) ? template_button_strip($context['recent_buttons'], 'right') : '', '
 
 			</div>';
@@ -213,7 +213,7 @@ function template_unread()
 
 			</div>
 
 			<div class="pagesection">
 
 				', !empty($context['recent_buttons']) ? template_button_strip($context['recent_buttons'], 'right') : '', '
 
-				', !empty($modSettings['topbottomEnable']) ? $context['menu_separator'] . '<a href="#recent" class="topbottom floatleft">' . $txt['go_up'] . '</a>' : '', '
 
+				', $context['menu_separator'], '<a href="#recent" class="topbottom floatleft">', $txt['go_up'], '</a>
 
 				<div class="pagelinks">', $context['page_index'], '</div>
 
 			</div>';
 
 	}
@@ -254,7 +254,7 @@ function template_replies()
 
 	{
 
 		echo '
 
 			<div class="pagesection">
 
-				', !empty($modSettings['topbottomEnable']) ? $context['menu_separator'] . '<a href="#bot" class="topbottom floatleft">' . $txt['go_down'] . '</a>' : '', '
 
+				', $context['menu_separator'], '<a href="#bot" class="topbottom floatleft">', $txt['go_down'], '</a>
 
 				<div class="pagelinks floatleft">', $context['page_index'], '</div>
 
 				', !empty($context['recent_buttons']) ? template_button_strip($context['recent_buttons'], 'right') : '', '
 
 			</div>';
@@ -367,7 +367,7 @@ function template_replies()
 
 			</div>
 
 			<div class="pagesection">
 
 				', !empty($context['recent_buttons']) ? template_button_strip($context['recent_buttons'], 'right') : '', '
 
-				', !empty($modSettings['topbottomEnable']) ? $context['menu_separator'] . '<a href="#recent" class="topbottom floatleft">' . $txt['go_up'] . '</a>' : '', '
 
+				', $context['menu_separator'], '<a href="#recent" class="topbottom floatleft">', $txt['go_up'], '</a>
 
 				<div class="pagelinks">', $context['page_index'], '</div>
 
 			</div>';
 
 	}
--- a/Themes/default/Register.template.php
+++ b/Themes/default/Register.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
--- a/Themes/default/Reminder.template.php
+++ b/Themes/default/Reminder.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
--- a/Themes/default/Reports.template.php
+++ b/Themes/default/Reports.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
--- a/Themes/default/Search.template.php
+++ b/Themes/default/Search.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
--- a/Themes/default/SendTopic.template.php
+++ b/Themes/default/SendTopic.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
@@ -14,19 +14,6 @@
 
 /*	This template contains two humble sub templates - main. Its job is pretty
 
 	simple: it collects the information we need to actually send the topic.
 
 
 
-	The main sub template gets shown from:
 
-		'?action=emailuser;sa=sendtopic;topic=##.##'
 
-	And should submit to:
 
-		'?action=emailuser;sa=sendtopic;topic=' . $context['current_topic'] . '.' . $context['start']
 
-	It should send the following fields:
 
-		y_name: sender's name.
 
-		y_email: sender's email.
 
-		comment: any additional comment.
 
-		r_name: receiver's name.
 
-		r_email: receiver's email address.
 
-		send: this just needs to be set, as by the submit button.
 
-		sc: the session id, or $context['session_id'].
 
-
 
 	The report sub template gets shown from:
 
 		'?action=reporttm;topic=##.##;msg=##'
 
 	It should submit to:
@@ -36,69 +23,6 @@
 
 		sc: the session id, or $context['session_id'].
 
 */
 
 
 
-// This is where we get information about who they want to send the topic to, etc.
 
-function template_main()
 
-{
 
-	global $context, $txt, $scripturl;
 
-
 
-	echo '
 
-	<div id="send_topic">
 
-		<form action="', $scripturl, '?action=emailuser;sa=sendtopic;topic=', $context['current_topic'], '.', $context['start'], '" method="post" accept-charset="', $context['character_set'], '">
 
-			<div class="cat_bar">
 
-				<h3 class="catbg">
 
-					<span class="generic_icons mail icon"></span>', $context['page_title'], '
 
-				</h3>
 
-			</div>
 
-			<div class="windowbg2">
 
-				<div class="content">
 
-					<fieldset id="sender" class="send_topic">
 
-						<dl class="settings send_topic">
 
-							<dt>
 
-								<label for="y_name"><strong>', $txt['sendtopic_sender_name'], ':</strong></label>
 
-							</dt>
 
-							<dd>
 
-								<input type="text" id="y_name" name="y_name" size="30" maxlength="40" value="', $context['user']['name'], '" class="input_text">
 
-							</dd>
 
-							<dt>
 
-								<label for="y_email"><strong>', $txt['sendtopic_sender_email'], ':</strong></label>
 
-							</dt>
 
-							<dd>
 
-								<input type="text" id="y_email" name="y_email" size="30" maxlength="50" value="', $context['user']['email'], '" class="input_text">
 
-							</dd>
 
-							<dt>
 
-								<label for="comment"><strong>', $txt['sendtopic_comment'], ':</strong></label>
 
-							</dt>
 
-							<dd>
 
-								<input type="text" id="comment" name="comment" size="30" maxlength="100" class="input_text">
 
-							</dd>
 
-						</dl>
 
-					</fieldset>
 
-					<fieldset id="recipient" class="send_topic">
 
-						<dl class="settings send_topic">
 
-							<dt>
 
-								<label for="r_name"><strong>', $txt['sendtopic_receiver_name'], ':</strong></label>
 
-							</dt>
 
-							<dd>
 
-								<input type="text" id="r_name" name="r_name" size="30" maxlength="40" class="input_text">
 
-							</dd>
 
-							<dt>
 
-								<label for="r_email"><strong>', $txt['sendtopic_receiver_email'], ':</strong></label>
 
-							</dt>
 
-							<dd>
 
-								<input type="text" id="r_email" name="r_email" size="30" maxlength="50" class="input_text">
 
-							</dd>
 
-						</dl>
 
-					</fieldset>
 
-					<div class="flow_auto">
 
-						<input type="submit" name="send" value="', $txt['sendtopic_send'], '" class="button_submit">
 
-						<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 
-					</div>
 
-				</div>
 
-			</div>
 
-		</form>
 
-	</div>';
 
-}
 
-
 
 // Send an email to a user!
 
 function template_custom_email()
 
 {
--- a/Themes/default/Settings.template.php
+++ b/Themes/default/Settings.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
@@ -163,10 +163,6 @@ function template_settings()
 
 			'size' => 8,
 
 		),
 
 	'',
 
-		array(
 
-			'id' => 'linktree_link',
 
-			'label' => $txt['current_pos_text_img'],
 
-		),
 
 		array(
 
 			'id' => 'enable_news',
 
 			'label' => $txt['enable_random_news'],
--- a/Themes/default/SplitTopics.template.php
+++ b/Themes/default/SplitTopics.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
@@ -101,7 +101,7 @@ function template_select()
 
 					<li class="windowbg', $message['alternate'] ? '2' : '', '" id="not_selected_', $message['id'], '">
 
 						<div class="content">
 
 							<div class="message_header">
 
-								<a class="split_icon floatright" href="', $scripturl, '?action=splittopics;sa=selectTopics;subname=', $context['topic']['subject'], ';topic=', $context['topic']['id'], '.', $context['not_selected']['start'], ';start2=', $context['selected']['start'], ';move=down;msg=', $message['id'], '" onclick="return select(\'down\', ', $message['id'], ');"><img src="', $settings['images_url'], '/split_select.png" alt="-&gt;"></a>
 
+								<a class="split_icon floatright" href="', $scripturl, '?action=splittopics;sa=selectTopics;subname=', $context['topic']['subject'], ';topic=', $context['topic']['id'], '.', $context['not_selected']['start'], ';start2=', $context['selected']['start'], ';move=down;msg=', $message['id'], '" onclick="return select(\'down\', ', $message['id'], ');"><span class="generic_icons split_sel" title="-&gt;"></span></a>
 
 								', sprintf($txt['post_by_member'], $message['subject'], $message['poster']), '<br>
 
 								<em>', $message['time'], '</em>
 
 							</div>
@@ -133,7 +133,7 @@ function template_select()
 
 					<li class="windowbg', $message['alternate'] ? '2' : '', '" id="selected_', $message['id'], '">
 
 						<div class="content">
 
 							<div class="message_header">
 
-								<a class="split_icon floatleft" href="', $scripturl, '?action=splittopics;sa=selectTopics;subname=', $context['topic']['subject'], ';topic=', $context['topic']['id'], '.', $context['not_selected']['start'], ';start2=', $context['selected']['start'], ';move=up;msg=', $message['id'], '" onclick="return select(\'up\', ', $message['id'], ');"><img src="', $settings['images_url'], '/split_deselect.png" alt="&lt;-"></a>
 
+								<a class="split_icon floatleft" href="', $scripturl, '?action=splittopics;sa=selectTopics;subname=', $context['topic']['subject'], ';topic=', $context['topic']['id'], '.', $context['not_selected']['start'], ';start2=', $context['selected']['start'], ';move=up;msg=', $message['id'], '" onclick="return select(\'up\', ', $message['id'], ');"><span class="generic_icons split_desel" title="&lt;-"></span></a>
 
 								', sprintf($txt['post_by_member'], $message['subject'], $message['poster']), '<br>
 
 								<em>', $message['time'], '</em>
 
 							</div>
@@ -211,7 +211,7 @@ function template_select()
 
 					newItem = document.createElement("LI");
 
 					newItem.className = "windowbg2";
 
 					newItem.id = curSection + "_" + curId;
 
-					newItem.innerHTML = "<div class=\\"content\\"><div class=\\"message_header\\"><a class=\\"split_icon float" + (curSection == "selected" ? "left" : "right") + "\\" href=\\"" + smf_prepareScriptUrl(smf_scripturl) + "action=splittopics;sa=selectTopics;subname=', $context['topic']['subject'], ';topic=', $context['topic']['id'], '.', $context['not_selected']['start'], ';start2=', $context['selected']['start'], ';move=" + (curSection == "selected" ? "up" : "down") + ";msg=" + curId + "\\" onclick=\\"return select(\'" + (curSection == "selected" ? "up" : "down") + "\', " + curId + ");\\"><img src=\\"', $settings['images_url'], '/split_" + (curSection == "selected" ? "de" : "") + "select.png\\" alt=\\"" + (curSection == "selected" ? "&lt;-" : "-&gt;") + "\\"></a><strong>" + curChange.getElementsByTagName("subject")[0].firstChild.nodeValue + "</strong> ', $txt['by'], ' <strong>" + curChange.getElementsByTagName("poster")[0].firstChild.nodeValue + "</strong><br><em>" + curChange.getElementsByTagName("time")[0].firstChild.nodeValue + "</em></div><div class=\\"post\\">" + curChange.getElementsByTagName("body")[0].firstChild.nodeValue + "</div></div>";
 
+					newItem.innerHTML = "<div class=\\"content\\"><div class=\\"message_header\\"><a class=\\"split_icon float" + (curSection == "selected" ? "left" : "right") + "\\" href=\\"" + smf_prepareScriptUrl(smf_scripturl) + "action=splittopics;sa=selectTopics;subname=', $context['topic']['subject'], ';topic=', $context['topic']['id'], '.', $context['not_selected']['start'], ';start2=', $context['selected']['start'], ';move=" + (curSection == "selected" ? "up" : "down") + ";msg=" + curId + "\\" onclick=\\"return select(\'" + (curSection == "selected" ? "up" : "down") + "\', " + curId + ");\\"><span class=\\"generic_icons split_" + (curSection == "selected" ? "de" : "") + "sel\\" title=\\"" + (curSection == "selected" ? "&lt;-" : "-&gt;") + "\\"></span></a><strong>" + curChange.getElementsByTagName("subject")[0].firstChild.nodeValue + "</strong> ', $txt['by'], ' <strong>" + curChange.getElementsByTagName("poster")[0].firstChild.nodeValue + "</strong><br><em>" + curChange.getElementsByTagName("time")[0].firstChild.nodeValue + "</em></div><div class=\\"post\\">" + curChange.getElementsByTagName("body")[0].firstChild.nodeValue + "</div></div>";
 
 
 
 					// So, where do we insert it?
 
 					if (typeof sInsertBeforeId == "string")
--- a/Themes/default/Stats.template.php
+++ b/Themes/default/Stats.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
--- a/Themes/default/Themes.template.php
+++ b/Themes/default/Themes.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
@@ -887,7 +887,15 @@ function template_edit_browse()
 
 	global $context, $scripturl, $txt;
 
 
 
 	echo '
 
-	<div id="admincenter">
 
+	<div id="admincenter">';
 
+
 
+	if (!empty($context['browse_title']))
 
+		echo '
 
+		<div class="cat_bar">
 
+			<h3 class="catbg">', $context['browse_title'], '</h3>
 
+		</div>';
 
+
 
+	echo '
 
 		<table class="table_grid tborder">
 
 		<thead>
 
 			<tr class="catbg">
--- a/Themes/default/Who.template.php
+++ b/Themes/default/Who.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *
--- a/Themes/default/Wireless.template.php
+++ b/Themes/default/Wireless.template.php
@@ -3,7 +3,7 @@
 
  * Simple Machines Forum (SMF)
 
  *
 
  * @package SMF
 
- * @author Simple Machines
 
+ * @author Simple Machines http://www.simplemachines.org
 
  * @copyright 2014 Simple Machines and individual contributors
 
  * @license http://www.simplemachines.org/about/smf/license.php BSD
 
  *