Merge pull request #1 from Antes/paw_prints

Try something ?

Sources/PersonalMessage.php

@@ -101,8 +101,9 @@ function MessageMain()
 		);
 
 		// First get the inbox counts
+		// The CASE WHEN here is because is_read is set to 3 when you reply to a message
 		$result = $smcFunc['db_query']('', '
-			SELECT COUNT(*) AS total, SUM(is_read) AS num_read
+			SELECT COUNT(*) AS total, SUM(is_read & 1) AS num_read
 			FROM {db_prefix}pm_recipients
 			WHERE id_member = {int:current_member}
 				AND in_inbox = {int:in_inbox}
@@ -124,12 +125,12 @@ function MessageMain()
 
 		// Now load info about all the other labels
 		$result = $smcFunc['db_query']('', '
-			SELECT l.id_label, l.name, IFNULL(SUM(pr.is_read), 0) AS num_read, IFNULL(COUNT(pr.id_pm), 0) AS total
+			SELECT l.id_label, l.name, IFNULL(SUM(pr.is_read & 1), 0) AS num_read, IFNULL(COUNT(pr.id_pm), 0) AS total
 			FROM {db_prefix}pm_labels AS l
 				LEFT JOIN {db_prefix}pm_labeled_messages AS pl ON (pl.id_label = l.id_label)
 				LEFT JOIN {db_prefix}pm_recipients AS pr ON (pr.id_pm = pl.id_pm)
 			WHERE l.id_member = {int:current_member}
-			GROUP BY l.id_label',
+			GROUP BY l.id_label, l.name',
 			array(
 				'current_member' => $user_info['id'],
 			)
@@ -500,7 +501,7 @@ function MessageFolder()
 	elseif ($context['folder'] != 'sent')
 	{
 		$labelJoin = '
-			INNER JOIN {db_prefix}pm_labeled_messages AS pl ON (pl.id_pm = pm.id_pm)';
+			INNER JOIN {db_prefix}pm_labeled_messages AS pl ON (pl.id_pm = pmr.id_pm)';
 
 		$labelQuery2 = '
 			AND pl.id_label = ' . $context['current_label_id'];
@@ -2655,6 +2656,30 @@ function MessageActionsApply()
 	{
 		$updateErrors = 0;
 
+		// Are we dealing with conversation view? If so, get all the messages in each conversation
+		if ($context['display_mode'] == 2)
+		{
+			$get_pms = $smcFunc['db_query']('', '
+				SELECT pm.id_pm_head, pm.id_pm
+				FROM {db_prefix}personal_messages AS pm
+					INNER JOIN {db_prefix}pm_recipients AS pmr ON (pmr.id_pm = pm.id_pm)
+				WHERE pm.id_pm_head IN ({array_int:head_pms})
+					AND pm.id_pm NOT IN ({array_int:head_pms})
+					AND pmr.id_recipient = {int:current_member}',
+				array(
+					'head_pms' => array_keys($to_label),
+					'current_member' => $user_info['id'],
+				)
+			);
+
+			while ($other_pms = $smcFunc['db_query']($get_pms))
+			{
+				$to_label[$other_pms['id_pm']] = $to_label[$other_pms['id_pm_head']];
+			}
+
+			$smcFunc['db_free_result']($get_pms);
+		}
+
 		// Get information about each message...
 		$request = $smcFunc['db_query']('', '
 			SELECT id_pm, in_inbox
@@ -2693,6 +2718,30 @@ function MessageActionsApply()
 
 				$smcFunc['db_free_result']($request2);
 			}
+			elseif ($type == 'rem')
+			{
+				// If we're removing from the inbox, see if we have at least one other label.
+				// This query is faster than the one above
+				$request2 = $smcFunc['db_query']('', '
+					SELECT COUNT(l.id_label)
+					FROM {db_prefix}pm_labels AS l
+						INNER JOIN {db_prefix}pm_labeled_messages AS pml ON (pml.id_label = l.id_label)
+					WHERE l.id_member = {int:current_member}
+						AND pml.id_pm = {int:current_pm}',
+					array(
+						'current_member' => $user_info['id'],
+						'current_pm' => $row['id_pm'],
+					)
+				);
+
+				// How many labels do you have?
+				list ($num_labels) = $smcFunc['db_fetch_assoc']($request2);
+
+				if ($num_labels > 0);
+					$context['can_remove_inbox'] = true;
+
+				$smcFunc['db_free_result']($request2);
+			}
 
 			// Use this to determine what to do later on...
 			$original_labels = $labels;
@@ -2707,9 +2756,9 @@ function MessageActionsApply()
 					$labels[$to_label[$row['id_pm']]] = $to_label[$row['id_pm']];
 			}
 
-			// Removing all labels, so make sure it's in the inbox
+			// Removing all labels or just removing the inbox label
 			if ($type == 'rem' && empty($labels))
-				$in_inbox = 1;
+				$in_inbox = (empty($context['can_remove_inbox']) ? 1 : 0);
 			// Adding new labels, but removing inbox and applying new ones
 			elseif ($type == 'add' && !empty($options['pm_remove_inbox_label']) && !empty($labels))
 				$in_inbox = 0;

Sources/Profile-Actions.php

@@ -590,6 +590,50 @@ function deleteAccount2($memID)
 	{
 		isAllowedTo('profile_remove_any');
 
+		// Before we go any further, handle possible poll vote deletion as well
+		if (!empty($_POST['deleteVotes']) && allowedTo('moderate_forum'))
+		{
+			// First we find any polls that this user has voted in...
+			$get_voted_polls = $smcFunc['db_query']('', '
+				SELECT DISTINCT id_poll
+				FROM {db_prefix}log_polls
+				WHERE id_member = {int:selected_member}',
+				array(
+					'selected_member' => $memID,
+				)
+			);
+
+			$polls_to_update = array();
+			
+			while ($row = $smcFunc['db_fetch_assoc']($get_voted_polls))
+			{
+				$polls_to_update[] = $row['id_poll'];
+			}
+
+			$smcFunc['db_free_result']($get_voted_polls);
+
+			// Now we delete the votes and update the polls
+			if (!empty($polls_to_update))
+			{
+				$smcFunc['db_query']('', '
+					DELETE FROM {db_prefix}log_polls
+					WHERE id_member = {int:selected_member}',
+					array(
+						'selected_member' => $memID,
+					)
+				);
+
+				$smcFunc['db_query']('', '
+					UPDATE {db_prefix}polls
+					SET votes = votes - 1
+					WHERE id_poll IN {array_int:polls_to_update}',
+					array(
+						'polls_to_update' => $polls_to_update
+					)
+				);
+			}
+		}
+
 		// Now, have you been naughty and need your posts deleting?
 		// @todo Should this check board permissions?
 		if (!empty($_POST['deletePosts']) && in_array($_POST['remove_type'], array('posts', 'topics')) && allowedTo('moderate_forum'))

Sources/Subs-Db-postgresql.php

@@ -287,6 +287,9 @@ function smf_db_query($identifier, $db_string, $db_values = array(), $connection
 		'consolidate_spider_stats' => array(
 			'~MONTH\(log_time\), DAYOFMONTH\(log_time\)~' => 'MONTH(CAST(CAST(log_time AS abstime) AS timestamp)), DAYOFMONTH(CAST(CAST(log_time AS abstime) AS timestamp))',
 		),
+		'cron_find_task' => array(
+			'~ORDER BY null~' => 'ORDER BY null::int'
+		),
 		'delete_subscription' => array(
 			'~LIMIT 1~' => '',
 		),

Sources/Subscriptions-PayPal.php

@@ -38,9 +38,13 @@ class paypal_display
 
 		$setting_data = array(
 			array(
-				'text', 'paypal_email',
+				'email', 'paypal_email',
 				'subtext' => $txt['paypal_email_desc']
 			),
+			array(
+				'email', 'paypal_sandbox_email',
+				'subtext' => $txt['paypal_sandbox_email_desc']
+			),
 		);
 
 		return $setting_data;
@@ -149,7 +153,7 @@ class paypal_payment
 		global $modSettings;
 
 		// Has the user set up an email address?
-		if (empty($modSettings['paypal_email']))
+		if ((empty($modSettings['paidsubs_test']) && empty($modSettings['paypal_email'])) || empty($modSettings['paypal_sandbox_email']))
 			return false;
 		// Check the correct transaction types are even here.
 		if ((!isset($_POST['txn_type']) && !isset($_POST['payment_status'])) || (!isset($_POST['business']) && !isset($_POST['receiver_email'])))
@@ -158,7 +162,10 @@ class paypal_payment
 		if (!isset($_POST['business']))
 			$_POST['business'] = $_POST['receiver_email'];
 
-		if ($modSettings['paypal_email'] !== $_POST['business'] && (empty($modSettings['paypal_additional_emails']) || !in_array($_POST['business'], explode(',', $modSettings['paypal_additional_emails']))))
+		// Are we testing?
+		if (!empty($modSettings['paidsubs_test']) && $modSettings['paypal_sandbox_email'] !== $_POST['business'] && (empty($modSettings['paypal_additional_emails']) || !in_array($_POST['business'], explode(',', $modSettings['paypal_additional_emails']))))
+			return false;
+		elseif ($modSettings['paypal_email'] !== $_POST['business'] && (empty($modSettings['paypal_additional_emails']) || !in_array($_POST['business'], explode(',', $modSettings['paypal_additional_emails']))))
 			return false;
 		return true;
 	}

Sources/tasks/EventNew-Notify.php

@@ -33,7 +33,7 @@ class EventNew_Notify_Background extends SMF_BackgroundTask
 		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']))
+			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;

Themes/default/Admin.template.php

@@ -168,8 +168,8 @@ function template_credits()
 
 					<div id="admincenter">
 						<div id="support_credits">
-							<div class="cat_bar">
-								<h3 class="catbg">
+							<div class="sub_bar">
+								<h3 class="subg">
 									', $txt['support_title'], ' <img src="', $settings['images_url'], '/smflogo.png" id="credits_logo" alt="">
 								</h3>
 							</div>
@@ -202,8 +202,8 @@ function template_credits()
 
 	// Point the admin to common support resources.
 	echo '
-							<div id="support_resources" class="cat_bar">
-								<h3 class="catbg">
+							<div id="support_resources" class="sub_bar">
+								<h3 class="subg">
 									', $txt['support_resources'], '
 								</h3>
 							</div>
@@ -216,8 +216,8 @@ function template_credits()
 
 	// The most important part - the credits :P.
 	echo '
-							<div id="credits_sections" class="cat_bar">
-								<h3 class="catbg">
+							<div id="credits_sections" class="sub_bar">
+								<h3 class="subg">
 									', $txt['admin_credits'], '
 								</h3>
 							</div>
@@ -734,8 +734,8 @@ function template_show_settings()
 			if ($config_var['type'] == 'title')
 			{
 				echo '
-							<div class="title_bar">
-								<h3 class="', !empty($config_var['class']) ? $config_var['class'] : 'titlebg', '"', !empty($config_var['force_div_id']) ? ' id="' . $config_var['force_div_id'] . '"' : '', '>
+							<div class="cat_bar">
+								<h3 class="', !empty($config_var['class']) ? $config_var['class'] : 'catbg', '"', !empty($config_var['force_div_id']) ? ' id="' . $config_var['force_div_id'] . '"' : '', '>
 									', ($config_var['help'] ? '<a href="' . $scripturl . '?action=helpadmin;help=' . $config_var['help'] . '" onclick="return reqOverlayDiv(this.href);" class="help"><img src="' . $settings['images_url'] . '/helptopics_hd.png" class="icon" alt="' . $txt['help'] . '"></a>' : ''), '
 									', $config_var['label'], '
 								</h3>
@@ -1455,8 +1455,7 @@ function template_php_info()
 							<h3 class="catbg">',
 								$txt['phpinfo_settings'], '
 							</h3>
-						</div>
-						<br>';
+						</div>';
 
 	// for each php info area
 	foreach ($context['pinfo'] as $area => $php_area)
@@ -1485,7 +1484,7 @@ function template_php_info()
 				{
 					// heading row for the settings section of this categorys settings
 					echo '
-								<tr class="titlebg">
+								<tr class="catbg">
 									<td align="center" width="33%"><strong>', $txt['phpinfo_itemsettings'], '</strong></td>
 									<td align="center" width="33%"><strong>', $txt['phpinfo_localsettings'], '</strong></td>
 									<td align="center" width="33%"><strong>', $txt['phpinfo_defaultsettings'], '</strong></td>

Themes/default/BoardIndex.template.php

@@ -232,8 +232,8 @@ function template_info_center()
 	// Here's where the "Info Center" starts...
 	echo '
 	<div class="roundframe" id="info_center">
-		<div class="cat_bar">
-			<h3 class="catbg">
+		<div class="title_bar">
+			<h3 class="titlebg">
 				<span class="toggle_up floatright" id="upshrink_ic" title="', $txt['hide'], '" style="display: none;"></span>
 				<a href="#" id="upshrink_link">', sprintf($txt['info_center_title'], $context['forum_name_html_safe']), '</a>
 			</h3>
@@ -293,8 +293,8 @@ function template_ic_block_recent()
 
 	// This is the "Recent Posts" bar.
 	echo '
-			<div class="title_barIC">
-				<h4 class="titlebg">
+			<div class="sub_bar">
+				<h4 class="subg">
 					<a href="', $scripturl, '?action=recent"><img class="icon" src="', $settings['images_url'], '/post/xx.png" alt="">', $txt['recent_posts'], '</a>
 				</h4>
 			</div>
@@ -345,8 +345,8 @@ function template_ic_block_calendar()
 
 	// Show information about events, birthdays, and holidays on the calendar.
 	echo '
-			<div class="title_barIC">
-				<h4 class="titlebg">
+			<div class="sub_bar">
+				<h4 class="subg">
 					<a href="', $scripturl, '?action=calendar' . '"><img class="icon" src="', $settings['images_url'], '/icons/calendar.png', '" alt="">', $context['calendar_only_today'] ? $txt['calendar_today'] : $txt['calendar_upcoming'], '</a>
 				</h4>
 			</div>';
@@ -393,8 +393,8 @@ function template_ic_block_stats()
 
 	// Show statistical style information...
 	echo '
-			<div class="title_barIC">
-				<h4 class="titlebg">
+			<div class="sub_bar">
+				<h4 class="subg">
 					<a href="', $scripturl, '?action=stats" title="', $txt['more_stats'], '"><span class="stats_icon boards"></span>', $txt['forum_stats'], '</a>
 				</h4>
 			</div>
@@ -410,8 +410,8 @@ function template_ic_block_online()
 	global $context, $scripturl, $txt, $modSettings, $settings;
 	// "Users online" - in order of activity.
 	echo '
-			<div class="title_barIC">
-				<h4 class="titlebg">
+			<div class="sub_bar">
+				<h4 class="subg">
 					', $context['show_who'] ? '<a href="' . $scripturl . '?action=who">' : '', '<span class="stats_icon people"></span>', $txt['online_users'], '', $context['show_who'] ? '</a>' : '', '
 				</h4>
 			</div>

Themes/default/Display.template.php

@@ -134,7 +134,7 @@ function template_main()
 				<div class="title_bar">
 					<h3 class="titlebg headerpadding">', $txt['calendar_linked_events'], '</h3>
 				</div>
-				<div class="windowbg">
+				<div class="description">
 					<div class="content">
 						<ul class="reset">';
 

Themes/default/Errors.template.php

@@ -86,7 +86,7 @@ function template_error_log()
 				</tr>';
 
 	echo '
-				<tr class="titlebg">
+				<tr>
 					<td colspan="3" class="righttext" style="padding: 4px 8px;">
 						<label for="check_all1"><strong>', $txt['check_all'], '</strong></label>&nbsp;
 						<input type="checkbox" id="check_all1" onclick="invertAll(this, this.form, \'delete[]\'); this.form.check_all2.checked = this.checked;" class="input_check">
@@ -159,7 +159,7 @@ function template_error_log()
 	}
 
 	echo '
-				<tr class="titlebg">
+				<tr>
 					<td colspan="3" class="righttext" style="padding-right: 1.2ex">
 						<label for="check_all2"><strong>', $txt['check_all'], '</strong></label>&nbsp;
 						<input type="checkbox" id="check_all2" onclick="invertAll(this, this.form, \'delete[]\'); this.form.check_all1.checked = this.checked;" class="input_check">

Themes/default/ManageBoards.template.php

@@ -117,8 +117,8 @@ function template_modify_category()
 	<div id="manage_boards">
 		<form action="', $scripturl, '?action=admin;area=manageboards;sa=cat2" method="post" accept-charset="', $context['character_set'], '">
 			<input type="hidden" name="cat" value="', $context['category']['id'], '">
-				<div class="title_bar">
-					<h3 class="titlebg">
+				<div class="cat_bar">
+					<h3 class="catbg">
 						', isset($context['category']['is_new']) ? $txt['mboards_new_cat_name'] : $txt['catEdit'], '
 					</h3>
 				</div>

Themes/default/ManageLanguages.template.php

@@ -70,8 +70,8 @@ function template_download_language()
 	// Now, all the images and the likes, hidden via javascript 'cause there are so fecking many.
 	echo '
 			<br>
-			<div class="title_bar">
-				<h3 class="titlebg">
+			<div class="cat_bar">
+				<h3 class="catbg">
 					', $txt['languages_download_theme_files'], '
 				</h3>
 			</div>
@@ -315,8 +315,8 @@ function template_modify_language_entries()
 		</form>
 
 		<form action="', $scripturl, '?action=admin;area=languages;sa=editlang;lid=', $context['lang_id'], ';entries" id="entry_form" method="post" accept-charset="', $context['character_set'], '">
-			<div class="title_bar">
-				<h3 class="titlebg">
+			<div class="cat_bar">
+				<h3 class="catbg">
 					', $txt['edit_language_entries'], '
 				</h3>
 			</div>

Themes/default/ManageMembergroups.template.php

@@ -560,8 +560,8 @@ function template_group_members()
 			</div>
 
 			<br>
-			<div class="title_bar">
-				<h4 class="titlebg">', $txt['membergroups_members_group_members'], '</h4>
+			<div class="cat_bar">
+				<h4 class="catbg">', $txt['membergroups_members_group_members'], '</h4>
 			</div>
 			<br>
 			<div class="pagesection">', $context['page_index'], '</div>
@@ -654,8 +654,8 @@ function template_group_members()
 	if (!empty($context['group']['assignable']))
 	{
 		echo '
-			<div class="cat_bar cat_bar_odd">
-				<h3 class="catbg catbg_odd">', $txt['membergroups_members_add_title'], '</h3>
+			<div class="cat_bar">
+				<h3 class="catbg">', $txt['membergroups_members_add_title'], '</h3>
 			</div>
 			<div class="windowbg">
 				<div class="content">

Themes/default/ManageMembers.template.php

@@ -156,8 +156,8 @@ function template_search_members()
 					</div>
 				</div>
 			</div>
-			<div class="title_bar">
-				<h3 class="titlebg">', $txt['member_part_of_these_membergroups'], '</h3>
+			<div class="cat_bar">
+				<h3 class="catbg">', $txt['member_part_of_these_membergroups'], '</h3>
 			</div>
 			<div class="flow_hidden">
 				<table width="49%" class="table_grid floatleft">

Themes/default/ManageNews.template.php

@@ -48,8 +48,8 @@ function template_email_members()
 			</div>
 			<br>
 
-			<div id="advanced_panel_header" class="cat_bar">
-				<h3 class="catbg">
+			<div id="advanced_panel_header" class="title_bar">
+				<h3 class="titlebg">
 					<span id="advanced_panel_toggle" class="toggle_down floatright" style="display: none;"></span>
 					<a href="#" id="advanced_panel_link">', $txt['advanced'], '</a>
 				</h3>

Themes/default/ManagePaid.template.php

@@ -481,8 +481,8 @@ function template_user_subscription()
 	echo '
 		</form>
 		<br class="clear"/>
-		<div class="title_bar">
-			<h3 class="titlebg">', $txt['paid_current'], '</h3>
+		<div class="cat_bar">
+			<h3 class="catbg">', $txt['paid_current'], '</h3>
 		</div>
 		<div class="description">
 			', $txt['paid_current_desc'], '
@@ -604,8 +604,8 @@ function template_paid_done()
 
 	echo '
 	<div id="paid_subscription">
-		<div class="title_bar">
-			<h3 class="titlebg">', $txt['paid_done'], '</h3>
+		<div class="cat_bar">
+			<h3 class="catbg">', $txt['paid_done'], '</h3>
 		</div>
 		<div class="windowbg2">
 			<div class="content">

Themes/default/ManagePermissions.template.php

@@ -28,13 +28,13 @@ function template_permission_index()
 
 		if (!empty($context['profile']))
 			echo '
-			<div class="title_bar">
-				<h3 class="titlebg">', $txt['permissions_for_profile'], ': &quot;', $context['profile']['name'], '&quot;</h3>
+			<div class="cat_bar">
+				<h3 class="catbg">', $txt['permissions_for_profile'], ': &quot;', $context['profile']['name'], '&quot;</h3>
 			</div>';
 		else
 			echo '
-			<div class="title_bar">
-				<h3 class="titlebg">', $txt['permissions_title'], '</h3>
+			<div class="cat_bar">
+				<h3 class="catbg">', $txt['permissions_title'], '</h3>
 			</div>';
 
 		echo '
@@ -278,7 +278,7 @@ function template_by_board()
 				', $txt['permissions_boards_desc'], '
 			</div>
 
-			<div class="title_bar">
+			<div class="title_bar title_top">
 				<h3 id="board_permissions" class="titlebg flow_hidden">
 					<span class="perm_name floatleft">', $txt['board_name'], '</span>
 					<span class="perm_profile floatleft">', $txt['permission_profile'], '</span>';
@@ -289,8 +289,8 @@ function template_by_board()
 	foreach ($context['categories'] as $category)
 	{
 		echo '
-			<div class="title_bar">
-				<h3 class="titlebg">', $category['name'], '</h3>
+			<div class="cat_bar">
+				<h3 class="catbg">', $category['name'], '</h3>
 			</div>';
 
 		if (!empty($category['boards']))
@@ -856,7 +856,7 @@ function template_postmod_permissions()
 		
 		echo '
 									</tr>
-									<tr class="titlebg">
+									<tr>
 										<th width="30%">
 											', $txt['permissions_post_moderation_group'], '
 										</th>

Themes/default/MessageIndex.template.php

@@ -322,7 +322,7 @@ function template_main()
 		if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics']))
 		{
 			echo '
-				<tr class="titlebg">
+				<tr>
 					<td colspan="5" class="righttext" id="quick_actions">
 						<select class="qaction" name="qaction"', $context['can_move'] ? ' onchange="this.form.move_to.disabled = (this.options[this.selectedIndex].value != \'move\');"' : '', '>
 							<option value="">--------</option>';

Themes/default/Packages.template.php

@@ -479,8 +479,8 @@ function template_list()
 		<div class="cat_bar">
 			<h3 class="catbg">', $txt['list_file'], '</h3>
 		</div>
-		<div class="title_bar">
-			<h3 class="titlebg">', $txt['files_archive'], ' ', $context['filename'], ':</h3>
+		<div class="cat_bar">
+			<h3 class="catbg">', $txt['files_archive'], ' ', $context['filename'], ':</h3>
 		</div>
 		<div class="windowbg">
 			<div class="content">
@@ -508,8 +508,8 @@ function template_examine()
 		<div class="cat_bar">
 			<h3 class="catbg">', $txt['package_examine_file'], '</h3>
 		</div>
-		<div class="title_bar">
-			<h3 class="titlebg">', $txt['package_file_contents'], ' ', $context['filename'], ':</h3>
+		<div class="cat_bar">
+			<h3 class="catbg">', $txt['package_file_contents'], ' ', $context['filename'], ':</h3>
 		</div>
 		<div class="windowbg">
 			<div class="content">
@@ -696,8 +696,8 @@ function template_servers()
 	if ($context['package_download_broken'])
 	{
 		echo '
-		<div class="title_bar">
-			<h3 class="titlebg">', $txt['package_ftp_necessary'], '</h3>
+		<div class="cat_bar">
+			<h3 class="catbg">', $txt['package_ftp_necessary'], '</h3>
 		</div>
 		<div class="windowbg">
 			<div class="content">
@@ -1518,8 +1518,8 @@ function template_file_permissions()
 	</div>
 
 	<form action="', $scripturl, '?action=admin;area=packages;sa=perms;', $context['session_var'], '=', $context['session_id'], '" method="post" accept-charset="', $context['character_set'], '">
-		<div class="title_bar">
-			<h3 class="titlebg">
+		<div class="cat_bar">
+			<h3 class="catbg">
 				<span class="floatleft">', $txt['package_file_perms'], '</span><span class="fperm floatright">', $txt['package_file_perms_new_status'], '</span>
 			</h3>
 		</div>

Themes/default/PersonalMessage.template.php

@@ -22,8 +22,8 @@ function template_pm_above()
 	// Show the capacity bar, if available.
 	if (!empty($context['limit_bar']))
 		echo '
-		<div class="title_bar">
-			<h3 class="titlebg">
+		<div class="cat_bar">
+			<h3 class="catbg">
 				<span class="floatleft">', $txt['pm_capacity'], ':</span>
 				<span class="floatleft capacity_bar">
 					<span class="', $context['limit_bar']['percent'] > 85 ? 'full' : ($context['limit_bar']['percent'] > 40 ? 'filled' : 'empty'), '" style="width: ', $context['limit_bar']['percent'] / 10, 'em;"></span>
@@ -768,8 +768,8 @@ function template_search()
 		echo '
 		<fieldset class="labels">
 			<div class="roundframe">
-				<div class="title_bar">
-					<h4 class="titlebg">
+				<div class="cat_bar">
+					<h4 class="catbg">
 						<span id="advanced_panel_toggle" class="toggle_up floatright" style="display: none;"></span><a href="#" id="advanced_panel_link">', $txt['pm_search_choose_label'], '</a>
 					</h4>
 				</div>
@@ -858,8 +858,8 @@ function template_search_results()
 		if (!empty($context['search_params']['show_complete']))
 		{
 			echo '
-			<div class="title_bar">
-				<h3 class="titlebg">
+			<div class="cat_bar">
+				<h3 class="catbg">
 					<span class="floatright">', $txt['search_on'], ': ', $message['time'], '</span>
 					<span class="floatleft">', $message['counter'], '&nbsp;&nbsp;<a href="', $message['href'], '">', $message['subject'], '</a></span>
 				</h3>
@@ -1110,8 +1110,8 @@ function template_send()
 	{
 		echo '
 			<br>
-			<div id="postDraftOptionsHeader" class="title_bar">
-				<h4 class="titlebg">
+			<div id="postDraftOptionsHeader" class="cat_bar">
+				<h4 class="catbg">
 					<span id="postDraftExpand" class="toggle_up floatright" style="display: none;"></span> <strong><a href="#" id="postDraftExpandLink">', $txt['draft_load'], '</a></strong>
 				</h4>
 			</div>

Themes/default/Post.template.php

@@ -379,7 +379,7 @@ function template_main()
 	// If the admin has enabled the hiding of the additional options - show a link and image for it.
 	if (!empty($settings['additional_options_collapsable']))
 		echo '
-					<div id="postAdditionalOptionsHeader" class="title_bar">
+					<div id="postAdditionalOptionsHeader" class="title_bar title_top">
 						<h4 class="titlebg">
 							<span id="postMoreExpand" class="toggle_up floatright" style="display: none;"></span> <strong><a href="#" id="postMoreExpandLink">', $context['can_post_attachment'] ? $txt['post_additionalopt_attach'] : $txt['post_additionalopt'], '</a></strong>
 						</h4>
@@ -505,7 +505,7 @@ function template_main()
 	if (!empty($modSettings['drafts_post_enabled']) && !empty($context['drafts']) && !empty($options['drafts_show_saved_enabled']))
 	{
 		echo '
-					<div id="postDraftOptionsHeader" class="title_bar">
+					<div id="postDraftOptionsHeader" class="title_bar title_top">
 						<h4 class="titlebg">
 							<span id="postDraftExpand" class="toggle_up floatright" style="display: none;"></span> <strong><a href="#" id="postDraftExpandLink">', $txt['draft_load'], '</a></strong>
 						</h4>

Themes/default/Profile.template.php

@@ -1029,7 +1029,7 @@ function template_showPermissions()
 			echo '
 					<table class="table_grid" cellspacing="0">
 						<thead>
-							<tr class="titlebg">
+							<tr class="catbg">
 								<th class="lefttext first_th" scope="col" width="50%">', $txt['showPermissions_permission'], '</th>
 								<th class="lefttext last_th" scope="col" width="50%">', $txt['showPermissions_status'], '</th>
 							</tr>
@@ -1093,7 +1093,7 @@ function template_showPermissions()
 			echo '
 				<table class="table_grid" cellspacing="0">
 					<thead>
-						<tr class="titlebg">
+						<tr class="catbg">
 							<th class="lefttext first_th" scope="col" width="50%">', $txt['showPermissions_permission'], '</th>
 							<th class="lefttext last_th" scope="col" width="50%">', $txt['showPermissions_status'], '</th>
 						</tr>
@@ -1165,8 +1165,8 @@ function template_statPanel()
 	// This next section draws a graph showing what times of day they post the most.
 	echo '
 		<div id="activitytime" class="flow_hidden">
-			<div class="cat_bar">
-				<h3 class="catbg">
+			<div class="title_bar">
+				<h3 class="titlebg">
 					<span class="stats_icon history"></span>', $txt['statPanel_activityTime'], '
 				</h3>
 			</div>
@@ -1212,8 +1212,8 @@ function template_statPanel()
 	echo '
 		<div class="flow_hidden">
 			<div id="popularposts">
-				<div class="cat_bar">
-					<h3 class="catbg">
+				<div class="title_bar">
+					<h3 class="titlebg">
 						<span class="stats_icon replies"></span>', $txt['statPanel_topBoards'], '
 					</h3>
 				</div>
@@ -1251,8 +1251,8 @@ function template_statPanel()
 			</div>';
 	echo '
 			<div id="popularactivity">
-				<div class="cat_bar">
-					<h3 class="catbg">
+				<div class="title_bar">
+					<h3 class="titlebg">
 						<span class="stats_icon replies"></span>', $txt['statPanel_topBoardsActivity'], '
 					</h3>
 				</div>
@@ -1757,8 +1757,8 @@ function template_alert_configuration()
 		</div>
 		<p class="description">', $txt['alert_prefs_desc'], '</p>
 		<form action="', $scripturl, '?action=profile;area=notification;sa=alerts" id="admin_form_wrapper" method="post" accept-charset="', $context['character_set'], '" id="notify_options" class="flow_hidden">
-			<div class="title_bar">
-				<h3 class="titlebg">
+			<div class="cat_bar">
+				<h3 class="catbg">
 					', $txt['notification_general'], '
 				</h3>
 			</div>
@@ -1823,16 +1823,16 @@ function template_alert_configuration()
 					</dl>
 				</div>
 			</div>
-			<div class="title_bar">
-				<h3 class="titlebg">
+			<div class="cat_bar">
+				<h3 class="catbg">
 					', $txt['notify_what_how'], '
 				</h3>
 			</div>
 			<table class="table_grid" style="width: 100%">
-				<tr class="titlebg">
+				<tr>
 					<td></td>
-					<td>', $txt['receive_alert'], '</td>
-					<td>', $txt['receive_mail'], '</td>
+					<td align="center">', $txt['receive_alert'], '</td>
+					<td align="center">', $txt['receive_mail'], '</td>
 				</tr>';
 	$use_bg2 = true;
 
@@ -2670,6 +2670,7 @@ function template_deleteAccount()
 		if ($context['can_delete_posts'])
 			echo '
 					<div>
+						<label for="deleteVotes"><input type="checkbox" name="deleteVotes" id="deleteVotes" value="1" class="input_check"> ', $txt['deleteAccount_votes'], ':</label><br>
 						<label for="deletePosts"><input type="checkbox" name="deletePosts" id="deletePosts" value="1" class="input_check"> ', $txt['deleteAccount_posts'], ':</label>
 						<select name="remove_type">
 							<option value="posts">', $txt['deleteAccount_all_posts'], '</option>

Themes/default/Register.template.php

@@ -90,7 +90,7 @@ function template_registration_form()
 			<div class="cat_bar">
 				<h3 class="catbg">', $txt['registration_form'], '</h3>
 			</div>
-			<div class="title_bar">
+			<div class="title_bar title_top">
 				<h4 class="titlebg">', $txt['required_info'], '</h4>
 			</div>
 			<div class="windowbg2">
@@ -202,7 +202,7 @@ function template_registration_form()
 	if (!empty($context['profile_fields']) || !empty($context['custom_fields']))
 	{
 		echo '
-			<div class="title_bar">
+			<div class="title_bar title_top">
 				<h4 class="titlebg">', $txt['additional_information'], '</h4>
 			</div>
 			<div class="windowbg2">
@@ -318,7 +318,7 @@ function template_registration_form()
 	if ($context['visual_verification'])
 	{
 		echo '
-			<div class="title_bar">
+			<div class="title_bar title_top">
 				<h4 class="titlebg">', $txt['verification'], '</h4>
 			</div>
 			<div class="windowbg2">
@@ -386,7 +386,7 @@ function template_coppa()
 
 	// Formulate a nice complicated message!
 	echo '
-			<div class="title_bar">
+			<div class="title_bar title_top">
 				<h3 class="titlebg">', $context['page_title'], '</h3>
 			</div>
 			<div class="windowbg2">

Themes/default/Search.template.php

@@ -381,7 +381,7 @@ function template_results()
 		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics']))
 		{
 			echo '
-			<div class="titlebg2" style="padding: 4px;">
+			<div style="padding: 4px;">
 				<div class="floatright flow_auto">
 					<select class="qaction" name="qaction"', $context['can_move'] ? ' onchange="this.form.move_to.disabled = (this.options[this.selectedIndex].value != \'move\');"' : '', '>
 						<option value="">--------</option>';

Themes/default/SplitTopics.template.php

@@ -263,7 +263,7 @@ function template_merge()
 			<div class="cat_bar">
 				<h3 class="catbg">', $txt['merge'], '</h3>
 			</div>
-			<div class="information">
+			<div class="description">
 				', $txt['merge_desc'], '
 			</div>
 			<div class="windowbg">
@@ -363,8 +363,8 @@ function template_merge_extra_options()
 	echo '
 	<div id="merge_topics">
 		<form action="', $scripturl, '?action=mergetopics;sa=execute;" method="post" accept-charset="', $context['character_set'], '">
-			<div class="title_bar">
-				<h3 class="titlebg">', $txt['merge_topic_list'], '</h3>
+			<div class="cat_bar">
+				<h3 class="catbg">', $txt['merge_topic_list'], '</h3>
 			</div>
 			<table class="bordercolor table_grid">
 				<thead>

Themes/default/Stats.template.php

@@ -19,78 +19,70 @@ function template_main()
 		<div class="cat_bar">
 			<h3 class="catbg">', $context['page_title'], '</h3>
 		</div>
-		<div class="flow_hidden">
+		<div class="roundframe title_top">
 			<div class="title_bar">
-				<h4 class="titlebg statstitle">
+				<h4 class="titlebg">
 					<span class="stats_icon general"></span>', $txt['general_stats'], '
 				</h4>
 			</div>
-			<div id="stats_left">
-				<div class="windowbg2">
-					<div class="content top_row">
-						<dl class="stats">
-							<dt>', $txt['total_members'], ':</dt>
-							<dd>', $context['show_member_list'] ? '<a href="' . $scripturl . '?action=mlist">' . $context['num_members'] . '</a>' : $context['num_members'], '</dd>
-							<dt>', $txt['total_posts'], ':</dt>
-							<dd>', $context['num_posts'], '</dd>
-							<dt>', $txt['total_topics'], ':</dt>
-							<dd>', $context['num_topics'], '</dd>
-							<dt>', $txt['total_cats'], ':</dt>
-							<dd>', $context['num_categories'], '</dd>
-							<dt>', $txt['users_online'], ':</dt>
-							<dd>', $context['users_online'], '</dd>
-							<dt>', $txt['most_online'], ':</dt>
-							<dd>', $context['most_members_online']['number'], ' - ', $context['most_members_online']['date'], '</dd>
-							<dt>', $txt['users_online_today'], ':</dt>
-							<dd>', $context['online_today'], '</dd>';
+			<div class="stats_left half top_row">
+				<dl class="stats">
+					<dt>', $txt['total_members'], ':</dt>
+					<dd>', $context['show_member_list'] ? '<a href="' . $scripturl . '?action=mlist">' . $context['num_members'] . '</a>' : $context['num_members'], '</dd>
+					<dt>', $txt['total_posts'], ':</dt>
+					<dd>', $context['num_posts'], '</dd>
+					<dt>', $txt['total_topics'], ':</dt>
+					<dd>', $context['num_topics'], '</dd>
+					<dt>', $txt['total_cats'], ':</dt>
+					<dd>', $context['num_categories'], '</dd>
+					<dt>', $txt['users_online'], ':</dt>
+					<dd>', $context['users_online'], '</dd>
+					<dt>', $txt['most_online'], ':</dt>
+					<dd>', $context['most_members_online']['number'], ' - ', $context['most_members_online']['date'], '</dd>
+					<dt>', $txt['users_online_today'], ':</dt>
+					<dd>', $context['online_today'], '</dd>';
 
 	if (!empty($modSettings['hitStats']))
 		echo '
-							<dt>', $txt['num_hits'], ':</dt>
-							<dd>', $context['num_hits'], '</dd>';
+					<dt>', $txt['num_hits'], ':</dt>
+					<dd>', $context['num_hits'], '</dd>';
 
 	echo '
-						</dl>
-					</div>
-				</div>
+				</dl>
 			</div>
-			<div id="stats_right">
-				<div class="windowbg2">
-					<div class="content top_row">
-						<dl class="stats">
-							<dt>', $txt['average_members'], ':</dt>
-							<dd>', $context['average_members'], '</dd>
-							<dt>', $txt['average_posts'], ':</dt>
-							<dd>', $context['average_posts'], '</dd>
-							<dt>', $txt['average_topics'], ':</dt>
-							<dd>', $context['average_topics'], '</dd>
-							<dt>', $txt['total_boards'], ':</dt>
-							<dd>', $context['num_boards'], '</dd>
-							<dt>', $txt['latest_member'], ':</dt>
-							<dd>', $context['common_stats']['latest_member']['link'], '</dd>
-							<dt>', $txt['average_online'], ':</dt>
-							<dd>', $context['average_online'], '</dd>';
+			<div class="stats_right half top_row">
+				<dl class="stats">
+					<dt>', $txt['average_members'], ':</dt>
+					<dd>', $context['average_members'], '</dd>
+					<dt>', $txt['average_posts'], ':</dt>
+					<dd>', $context['average_posts'], '</dd>
+					<dt>', $txt['average_topics'], ':</dt>
+					<dd>', $context['average_topics'], '</dd>
+					<dt>', $txt['total_boards'], ':</dt>
+					<dd>', $context['num_boards'], '</dd>
+					<dt>', $txt['latest_member'], ':</dt>
+					<dd>', $context['common_stats']['latest_member']['link'], '</dd>
+					<dt>', $txt['average_online'], ':</dt>
+					<dd>', $context['average_online'], '</dd>';
 
 	if (!empty($context['gender']))
 		echo '
-							<dt>', $txt['gender_ratio'], ':</dt>
-							<dd>', $context['gender']['ratio'], '</dd>';
+					<dt>', $txt['gender_ratio'], ':</dt>
+					<dd>', $context['gender']['ratio'], '</dd>';
 
 	if (!empty($modSettings['hitStats']))
 		echo '
-							<dt>', $txt['average_hits'], ':</dt>
-							<dd>', $context['average_hits'], '</dd>';
+					<dt>', $txt['average_hits'], ':</dt>
+					<dd>', $context['average_hits'], '</dd>';
 
 	echo '
-						</dl>
-					</div>
-				</div>
+				</dl>
 			</div>
 		</div>
-		<div class="flow_hidden">
+		<div class="roundframe title_top">
 			<div id="top_posters">
 				<div class="title_bar">
-					<h4 class="titlebg statstitle">
+					<h4 class="titlebg">
 						<span class="stats_icon posters"></span>', $txt['top_posters'], '
 					</h4>
 				</div>
@@ -127,7 +119,7 @@ function template_main()
 			</div>
 			<div id="top_boards">
 				<div class="title_bar">
-					<h4 class="titlebg statstitle">
+					<h4 class="titlebg">
 						<span class="stats_icon boards"></span>', $txt['top_boards'], '
 					</h4>
 				</div>
@@ -163,10 +155,10 @@ function template_main()
 					</div>
 			</div>
 		</div>
-		<div class="flow_hidden">
+		<div class="roundframe title_top">
 			<div id="top_topics_replies">
 				<div class="title_bar">
-					<h4 class="titlebg statstitle">
+					<h4 class="titlebg">
 						<span class="stats_icon replies"></span>', $txt['top_topics_replies'], '
 					</h4>
 				</div>
@@ -202,7 +194,7 @@ function template_main()
 
 			<div id="top_topics_views">
 				<div class="title_bar">
-					<h4 class="titlebg statstitle">
+					<h4 class="titlebg">
 						<span class="stats_icon views"></span>', $txt['top_topics_views'], '
 					</h4>
 				</div>
@@ -236,10 +228,10 @@ function template_main()
 				</div>
 			</div>
 		</div>
-		<div class="flow_hidden">
+		<div class="roundframe title_top">
 			<div id="top_topics_starter">
 				<div class="title_bar">
-					<h4 class="titlebg statstitle">
+					<h4 class="titlebg">
 						<span class="stats_icon starters"></span>', $txt['top_starters'], '
 					</h4>
 				</div>
@@ -273,7 +265,7 @@ function template_main()
 			</div>
 			<div id="most_online">
 				<div class="title_bar">
-					<h4 class="titlebg statstitle">
+					<h4 class="titlebg">
 						<span class="stats_icon history"></span>', $txt['most_time_online'], '
 					</h4>
 				</div>
@@ -315,14 +307,14 @@ function template_main()
 				<span class="stats_icon history"></span>', $txt['forum_history'], '
 			</h3>
 		</div>
-		<div class="flow_hidden">';
+		<div class="roundframe title_top">';
 
 	if (!empty($context['yearly']))
 	{
 		echo '
 		<table border="0" cellspacing="1" cellpadding="4" class="table_grid" id="stats">
 			<thead>
-				<tr class="titlebg" valign="middle" align="center">
+				<tr class="catbg" valign="middle" align="center">
 					<th class="first_th lefttext">', $txt['yearly_summary'], '</th>
 					<th>', $txt['stats_new_topics'], '</th>
 					<th>', $txt['stats_new_posts'], '</th>

Themes/default/Who.template.php

@@ -19,8 +19,8 @@ function template_main()
 	echo '
 	<div class="main_section" id="whos_online">
 		<form action="', $scripturl, '?action=who" method="post" id="whoFilter" accept-charset="', $context['character_set'], '">
-			<div class="title_bar">
-				<h4 class="titlebg margin_lower">', $txt['who_title'], '</h4>
+			<div class="cat_bar">
+				<h4 class="catbg">', $txt['who_title'], '</h4>
 			</div>
 			<div class="topic_table" id="mlist">
 				<div class="pagesection">

Themes/default/css/admin.css

@@ -47,35 +47,6 @@ body.action_admin .navigate_section ul li a {
 /* The CSS targeting for all this gets a bit convoluted and requires a good clean up.
 /* It's left over from when I started theming admin independently over a Curve forum.
 /* Can be simplified quite a lot before production builds. */
-
-/* Re-style default cat bars to get rid of header bar mania. */
-#manage_maintenance .cat_bar, #support_credits .cat_bar {
-	border: none;
-	border-top: 1px solid #bbb;
-}
-#manage_maintenance .cat_bar .catbg, #manage_boards .cat_bar .catbg,
-#support_credits .cat_bar .catbg, .generic_list_wrapper .cat_bar .catbg {
-	border: none;
-	border-top: 1px solid #fff;
-	text-shadow: none;
-}
-#admin_main_section .cat_bar:first-child, #admin_main_section .cat_bar:first-child h3.catbg,
-#support_credits .cat_bar, #support_credits .cat_bar:first-child,
-#support_credits .cat_bar h3.catbg, #support_credits .cat_bar:first-child h3.catbg,
-#manage_maintenance .cat_bar, #manage_maintenance .cat_bar:first-child,
-#manage_maintenance .cat_bar h3.catbg, #manage_maintenance .cat_bar:first-child h3.catbg {
-	color: #444;
-	font-size: 1.04em;
-	background: none;
-	border-radius: 0;
-	text-shadow: none;
-}
-#admin_main_section .cat_bar:first-child, #admin_main_section .cat_bar:first-child h3.catbg,
-#support_credits .cat_bar:first-child, #support_credits .cat_bar:first-child h3.catbg,
-#manage_maintenance .cat_bar:first-child, #manage_maintenance .cat_bar:first-child h3.catbg {
-	border: none;
-}
-
 /* Special styling for admin descriptions. */
 .action_admin p.description, .action_admin  .information {
 	overflow: auto;
@@ -126,7 +97,7 @@ body.action_admin .navigate_section ul li a {
 #support_credits, #admin_newsletters,
 #generate_reports_type,
 #groupForm, #mailqueue_stats, #manage_maintenance,
-#new_group, #view_group, #admin_form_wrapper, .action_admin .generic_list_wrapper{
+#new_group, #view_group, #admin_form_wrapper {
 	background: #f0f4f7;
 	margin: 12px 0 0 0;
 	padding: 8px 8px 16px 8px;
@@ -155,56 +126,6 @@ div.quick_tasks {
 #mailqueue_stats .windowbg .content {
 	padding: 12px 9px 0 9px;
 }
-#admin_newsletters div.cat_bar:first-child,
-#generate_reports_type div.cat_bar:first-child, #groupForm div.cat_bar:first-child,
-#admin_form_wrapper div.title_bar, #mailqueue_stats div.cat_bar:first-child,
-#new_group div.cat_bar:first-child, #view_group div.cat_bar, #view_group div.cat_bar:first-child {
-	background: none;
-	border: none;
-	border-bottom: 1px solid #fff;
-	box-shadow: none;
-}
-#admin_newsletters div.cat_bar:first-child h3.catbg,
-#generate_reports_type div.cat_bar:first-child h3.catbg, #groupForm div.cat_bar:first-child h3.catbg, #mailqueue_stats div.cat_bar:first-child  h3.catbg,
-#new_group div.cat_bar:first-child  h3.catbg, #view_group div.cat_bar  h3.catbg, #view_group div.cat_bar:first-child  h3.catbg {
-	color: #444;
-	text-shadow: none;
-	padding: 3px 1px 5px 1px;
-	margin: 0;
-	border-bottom: 1px solid #bbb;
-}
-#admin_form_wrapper div.title_bar {
-	border-radius: 2px 2px 0 0;
-	margin: 0;
-	border-bottom: 0;
-	background: linear-gradient(bottom, #FFFFFF 1%, #F1F3F5 96%);
-	background: -o-linear-gradient(bottom, #FFFFFF 1%, #F1F3F5 96%);
-	background: -moz-linear-gradient(bottom, #FFFFFF 1%, #F1F3F5 96%);
-	background: -webkit-linear-gradient(bottom, #FFFFFF 1%, #F1F3F5 96%);
-	background: -ms-linear-gradient(bottom, #FFFFFF 1%, #F1F3F5 96%);
-}
-.action_admin .generic_list_wrapper .title_bar {
-	background: none;
-	border-bottom: 1px solid #fff;
-}
-.action_admin .generic_list_wrapper .titlebg {
-	border-bottom: 1px solid #bbb;
-}
-#admin_form_wrapper h3.titlebg {
-	color: #fff;
-	border-bottom: none;
-	padding: 8px 6px 5px 6px;
-}
-#view_group .title_bar {
-	background: none;
-	border-bottom: none;
-	border-top: 1px solid #bbb;
-	margin: -12px 0;
-}
-#view_group .titlebg {
-	border-top: 1px solid #fff;
-	border-bottom: none;
-}
 #view_group .table_grid {
 	margin: 4px 0 8px 0;
 }
@@ -251,28 +172,10 @@ div.quick_tasks {
 	background: -webkit-linear-gradient(bottom, #FFFFFF 1%, #F1F3F5 96%);
 	background: -ms-linear-gradient(bottom, #FFFFFF 1%, #F1F3F5 96%);
 }
-#advanced_panel_header {
-	margin-bottom: 8px;
-
-	box-shadow: 0 1px 2px rgba(0,0,0,0.1);
-	border: 1px solid #ccc;
-	border-radius: 2px;
-	background: linear-gradient(bottom, #FFFFFF 1%, #F1F3F5 96%);
-	background: -o-linear-gradient(bottom, #FFFFFF 1%, #F1F3F5 96%);
-	background: -moz-linear-gradient(bottom, #FFFFFF 1%, #F1F3F5 96%);
-	background: -webkit-linear-gradient(bottom, #FFFFFF 1%, #F1F3F5 96%);
-	background: -ms-linear-gradient(bottom, #FFFFFF 1%, #F1F3F5 96%);
-}
-#advanced_panel_header a {
-	color: #444;
-}
 /*-------------------------------------------*/
 .action_admin .generic_list .flow_auto {
 	padding: 4px 2px;
 }
-h3.titlebg form {
-	font-size: 80%;
-}
 .windowbg.nopadding {
 	margin: 4px 0 0 0;
 	padding: 0;
@@ -405,14 +308,6 @@ body#chrome  #quick_search .button_submit {
 	padding: 8px 12px;
 	border-radius: 7px;
 }
-#admin_main_section .cat_bar {
-	background: none;
-}
-#admin_main_section .catbg, #admin_main_section .catbg a {
-	color: #444;
-	max-height: 1.5em;
-	overflow: hidden;
-}
 #live_news, #supportVersionsTable {
 	width: 70%;
 	-moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box;
@@ -537,11 +432,10 @@ div.quick_tasks {
 	position: relative;
 	padding: 6px 12px 12px 12px;
 }
-#support_credits h3.catbg, #support_credits .cat_bar:first-child h3.catbg {
-	padding: 12px 6px 6px 6px;
-}
-#support_resources {
+#support_resources, #credits_sections {
 	margin: 16px 0 -24px 0;
+	border: none;
+	border-top: 1px solid #bbb;	
 }
 #credits_logo {
 	position: absolute;
@@ -573,9 +467,6 @@ div.quick_tasks {
 #latestSupport{
 	padding: 0 25px 15px 25px;
 }
-#credits_sections {
-	margin: 0 0 -24px 0;
-}
 #support_credits dl {
 	padding: 0 6px;
 }
@@ -728,28 +619,13 @@ pre.file_content {
 	box-shadow: 0 -2px 2px rgba(0,0,0,0.1);
 	overflow: auto;
 }
-#manage_boards .title_bar {
-	background: none;
-	border-bottom: 1px solid #fff;
-}
-#manage_boards .titlebg {
-	border-bottom: 1px solid #bbb;
-}
-#manage_boards .cat_bar, #manage_boards .windowbg {
+#manage_boards .windowbg {
 	background: none;
 	margin: 0 0 0 0;
 	padding: 0 0 0 0;
 	border: none;
 	border-radius: 7px 7px 0 0;
 }
-#manage_boards .catbg {
-	padding: 8px 16px 4px 16px;
-	color: #444;
-}
-#manage_boards .cat_bar .catbg {
-	border: none;
-	border-bottom: 1px solid #bbb;
-}
 #manage_boards .catbg a {
 	color: #346;
 }
@@ -869,15 +745,6 @@ dl.right dt {
 
 /* Styles for the manage maintenance section.
 ------------------------------------------------- */
-#manage_maintenance .catbg {
-	border-top: 1px solid #fff;
-	padding-top: 14px;
-	color: #555;
-}
-#manage_maintenance .cat_bar:first-child, #manage_maintenance .cat_bar:first-child .catbg {
-	border-top: none;
-	margin: 0 0 -4px 0;
-}
 #manage_maintenance div.windowbg, #manage_maintenance div.windowbg2 {
 	background: none;
 	padding: 0 0 12px 0;
@@ -1217,3 +1084,7 @@ h3.grid_header {
 }
 /* These kids and their new-fangled thingummys. :P */
 /* When I were a lad, things were different! */
+
+#support_credits .sub_bar {
+	padding: 6px 0px 5px 0px;
+}

Themes/default/css/index.css

@@ -201,9 +201,6 @@ input.input_check, input.input_radio {
 	background: none;
 	vertical-align: top;
 }
-h3.catbg input.input_check {
-	margin: 0 7px 0 7px;
-}
 
 /* Give disabled text input elements a different background color. */
 input[disabled].input_text {
@@ -495,15 +492,7 @@ a img {
 
 /* Generic, mostly color-related, classes.
 ------------------------------------------------------- */
-
-.titlebg, .titlebg2, tr.titlebg th, tr.titlebg td, tr.titlebg2 td {
-	color: #444;
-	font-size: /*1.1em*/1em;
-	font-weight: bold;
-	background: -webkit-linear-gradient(bottom, #FFFFFF 1%, #F1F3F5 96%);
-	background: linear-gradient(to top, #FFFFFF 1%, #F1F3F5 96%);
-}
-.catbg, .catbg2, tr.catbg td, tr.catbg2 td, tr.catbg th, tr.catbg2 th {
+.catbg, tr.catbg td, tr.catbg th {
 	color: #fff;
 	font-size: 1.1em;
 	font-weight: bold;
@@ -512,13 +501,10 @@ a img {
 }
 
 /* adjust the table versions of headers */
-tr.titlebg th, tr.titlebg2 th, td.titlebg, td.titlebg2, tr.catbg th, tr.catbg2 th, td.catbg, td.catbg2 {
+tr.catbg th, td.catbg {
 	padding: 0 6px;
 }
-tr.titlebg th a:link, tr.titlebg th a:visited, tr.titlebg2 td a:link, tr.titlebg2 td a:visited {
-	color: #444;
-}
-tr.catbg th a:link, tr.catbg th a:visited, tr.catbg2 td a:link, tr.catbg2 td a:visited {
+tr.catbg th a:link, tr.catbg th a:visited {
 	color: #fff;
 }
 .catbg select {
@@ -846,7 +832,7 @@ dl.settings dt a img {
 
 /* Styles for rounded headers.
 ------------------------------------------------------- */
-h3.catbg, h3.catbg2, h3.titlebg, h4.titlebg, h4.catbg {
+h3.catbg, h4.catbg {
 	overflow: hidden;
 	font-size: 1.1em;
 	font-family: "Tahoma", sans-serif;
@@ -864,29 +850,11 @@ h3.catbg, h3.catbg2, h3.titlebg, h4.titlebg, h4.catbg {
 h3.catbg a:link, h3.catbg a:visited, h4.catbg a:link, h4.catbg a:visited, h3.catbg, .table_list tbody.header td, .table_list tbody.header td a {
 	color: #fff;
 }
-h3.catbg2 a, h3.catbg2 {
-	color: #feb;
-}
 h3.catbg a:hover, h4.catbg a:hover, .table_list tbody.header td a:hover {
 	color: #ffc178;
 	text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.4);
 	text-decoration: none;
 }
-h3.catbg2 a:hover {
-	color: #fff;
-	text-decoration: none;
-}
-h3.titlebg, h4.titlebg {
-	color: #fff;
-}
-h3.titlebg a, h4.titlebg a {
-	color: #fff;
-	text-decoration: underline;
-}
-h3.titlebg a:hover, h4.titlebg a:hover {
-	color: #fff;
-	text-decoration: none;
-}
 h3.catbg .icon {
 	vertical-align: middle;
 	margin: 0 5px 0 0;
@@ -895,38 +863,20 @@ h4.catbg a.toggle img {
 	vertical-align: middle;
 	margin: 0 5px 0 5px;
 }
-h4.catbg, h4.catbg2, h3.catbg, h3.catbg2, .table_list tbody.header td.catbg {
+h4.catbg, h3.catbg, .table_list tbody.header td.catbg {
 	background: none;
 }
-h4.titlebg, h3.titlebg {
-	background: #557EA0;
-	border-bottom: 1px solid #777;
-	border-radius: 6px 6px 0 0;
-	box-shadow: 0 16px 20px rgba(255,255,255,0.15) inset;
-	text-shadow: -1px -1px 1px rgba(0,0,0,0.2)
-}
-h4.titlebg .icon {
-	float: left;
-	margin: 0 8px 0 0;
-}
-/* Fix colors for the stats page */
-h3.statstitle, h4.statstitle {
-	color: #a85400;
-}
 
 /* Box-sizing for these should be useful. */
-div.cat_bar, div.title_bar,div.title_barIC {
-	-moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box;
-	margin-bottom: 1px;
-	border-radius: 5px;
-}
 div.cat_bar {
 	background: #557ea0;
 	border-bottom: 1px solid #777;
 	padding: 0;
 	border-radius: 6px 6px 0 0;
 	box-shadow: 0 16px 20px rgba(255,255,255,0.15) inset;
-	text-shadow: -1px -1px 1px rgba(0,0,0,0.2)
+	text-shadow: -1px -1px 1px rgba(0,0,0,0.2);
+	-moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box;
+	margin-bottom: 1px;
 }
 /* Message index board descriptions*/
 .description_header {
@@ -935,19 +885,6 @@ div.cat_bar {
 .cat_bar h3 {
 	padding: 8px 12px 6px 12px;
 }
-div.title_bar {
-	background: #557ea0;
-	box-shadow: 0 16px 20px rgba(255,255,255,0.15) inset;
-	text-shadow: -1px -1px 1px rgba(0,0,0,0.2)
-}
-
-/* Info center title bars are a bit different. */ /* @todo */
-/*div.title_barIC {
-	background: #dde3e9 url(../images/theme/bars.png) IMAGE NO LONGER EXISTS;
-}*/
-div.title_barIC h4.titlebg {
-	font-size: 1.1em;
-}
 
 /* Upshrinks in cat and title bars. */
 #upshrinkHeaderIC p.pminfo {
@@ -965,15 +902,6 @@ table.table_list a.collapse {
 	padding: 4px 4px 0 8px;
 }
 
-/* Basic icons in cat and title bars. */
-#upshrinkHeaderIC h4.titlebg a img{
-	margin: 0;
-	padding: 2px 6px 0 0;
-}
-
-.table_grid th.last_th input {
-	margin: 0 7px;
-}
 .table_grid th.lefttext {
 	padding: 0 8px;
 }
@@ -2005,9 +1933,6 @@ p.whoisviewing {
 	float: right;
 	margin: 4px;
 }
-.titlebg td.qaction_cell {
-	font-size: 0.909em;
-}
 select.qaction {
 	padding: 0;
 }
@@ -2215,7 +2140,7 @@ div#pollmoderation {
 
 .poster .profile .profile_icons li, .poster .im_icons li {
 	display: table-cell;
-	padding-left: 5px;
+	padding-right: 5px;
 }
 
 /* The visible stuff below the avatar. */
@@ -2945,13 +2870,6 @@ dl.register_form dd {
 }
 
 /* common for all admin sections */
-h3.titlebg img {
-	vertical-align: middle;
-	margin: 0 5px 0 0;
-}
-tr.titlebg td {
-	padding-left: 8px;
-}
 #admin_content {
 	clear: left;
 	padding-top: 6px;
@@ -3177,7 +3095,6 @@ tr.windowbg td, tr.windowbg2 td, tr.highlight2 td {
 	text-align: left;
 	padding: 7px 10px 7px 10px;
 	border: 1px solid #c5c5c5;
-	border-radius: 7px;
 	margin: 6px 0;
 }
 
@@ -3508,42 +3425,19 @@ dl {
 #statistics  div {
 	-moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box;
 }
-#statistics div.title_bar {
-	margin: 4px 0 0 0;
-}
-#statistics .titlebg img {
-	margin: 3px 6px 0 3px;
-}
-#statistics .cat_bar {
-	margin: 4px 0 0 0;
-}
-#statistics .flow_hidden {
-	background: #f0f4f7;
-	margin: 4px 0;
-	padding: 2px 6px;
-	border-radius: 7px;
-}
 #statistics div.windowbg2 {
 	background: none;
 }
-#stats_left, #top_posters, #top_topics_replies, #top_topics_starter {
+#top_posters, #top_topics_replies, #top_topics_starter {
 	float: left;
 	width: 50%;
 	padding: 0 3px 0 0;
 }
-#stats_right, #top_boards, #top_topics_views, #most_online {
+#top_boards, #top_topics_views, #most_online {
 	float: right;
 	width: 50%;
 	padding: 0 0 0 3px;
 }
-#stats_left{
-	border-right: 1px solid #bbb;
-	margin-top: 8px;
-}
-#stats_right{
-	border-left: 1px solid #fff;
-	margin-top: 8px;
-}
 .stats_icon {
 	width: 16px;
 	height: 16px;
@@ -3575,9 +3469,6 @@ dl.stats {
 	margin: 0 0 0 0;
 	padding: 0 0 0 0;
 }
-#stats_left dl.stats, #stats_right dl.stats{
-	margin: -8px 0 -12px 0;
-}
 dl.stats dt {
 	width: 50%;
 	float: left;
@@ -3601,21 +3492,6 @@ dl.stats dd {
 	border-radius: 2px;
 	position: relative;
 }
-/* Methinks topic links, etc need a little more oomph next to the orange bars. */
-/* Open to suggestions. */
-#stats_left dt a {
-	color: #232f46;
-}
-.top_row dl.stats dd {
-	background: none; border: none;
-}
-/* Give a bit more room for the date here. */
-#stats_left dt {
-	width: 35%;
-}
-#stats_left dd {
-	width: 65%;
-}
 .statsbar div.bar {
 	float: left;
 	background: orange;
@@ -3623,7 +3499,6 @@ dl.stats dd {
 	border-radius: 1px 0 0 1px;
 	box-shadow: 4px -4px 8px rgba(0,0,0,0.1) inset, 4px 4px 8px rgba(255,255,255,0.3) inset;
 	display: block;
-
 	margin: 0 4px 0 0;
 	height: 1.4em;
 }
@@ -3652,7 +3527,7 @@ dl.stats dd span {
 #stats th.first_th {
 	padding-left: 8px;
 }
-#stats tr.windowbg2 th.lefttext, #stats tr.titlebg th.lefttext {
+#stats tr.windowbg2 th.lefttext {
 	border-left: 1px solid #fff;
 	text-align: left;
 }
@@ -3775,7 +3650,7 @@ dl.addrules dt.floatleft {
 }
 #main_grid .cat_bar {
 	border-radius: 5px 5px 0 0;
-	margin: 0 1px;
+	margin: 0 0 0 1px;
 }
 #month_grid table th:first-child {
 	background: #e7eaef;
@@ -3991,9 +3866,6 @@ span.hidelink {
 #searchform p.clear {
 	clear: both;
 }
-#searchform .roundframe h4.titlebg {
-	border-bottom: none;
-}
 
 /* Styles for the search results page.
 ------------------------------------------------- */
@@ -4194,7 +4066,7 @@ span.hidelink {
 /* Forum posts may require some special treatment for dealing with clearing floated content. */
 /* Suspect it will be necessary to use float: left; width: 100%; on the windowbg and windowbg2 divs. */
 
-#forumposts .windowbg, #forumposts .windowbg2, #statistics .flow_hidden, #forumposts .approvebg, #forumposts .approvebg2, #personal_messages .windowbg, #personal_messages .windowbg2 {
+#forumposts .windowbg, #forumposts .windowbg2, #forumposts .approvebg, #forumposts .approvebg2, #personal_messages .windowbg, #personal_messages .windowbg2 {
 	background: /*#e8eff5;*/#f0f4f7;
 	margin: 12px 0 0 0;
 	padding: 8px 8px 16px 8px;
@@ -4205,28 +4077,6 @@ span.hidelink {
 #forumposts .windowbg2, #personal_messages .windowbg2 {
 	background: #eaf1f4;
 }
-#statistics .flow_hidden {
-	background: #e8eff5;
-	margin: 12px 0 0 0;
-	padding: 8px 8px 16px 8px;
-	border: 1px solid #ccc;
-	border-radius: 5px;
-	box-shadow: 0 -2px 2px rgba(0,0,0,0.1);
-}
-#statistics div.title_bar {
-	background: none;
-	border-bottom: 2px solid #f5f5f5;
-	border-radius: 2px 2px 0 0;
-	margin: 1px 4px 0 4px;
-}
-#statistics h4.titlebg {
-	background: none;
-	border-bottom: 1px solid #bbb;
-	border-radius: 0;
-	padding: 6px 0;
-	margin: 0;
-	font-size: 1.1em;
-}
 /* The generic wrapper thingy for teh awesome cool looks innit. */
 /* This lot will be simplified once I get all the styling hooks in place. */
 .generic_list_wrapper, .action_profile  #permissions, #postmodify .roundframe, .add_buddy, #creator .windowbg2,
@@ -4241,19 +4091,6 @@ span.hidelink {
 	overflow: auto;
 	-moz-box-sizing: border-box; box-sizing: border-box; -webkit-box-sizing: border-box;
 }
-.generic_list_wrapper {
-	margin-top: -5px;
-}
-.generic_list_wrapper .title_bar{
-	background: none;
-	border-bottom: 1px solid #fff;
-	border-radius: 0;
-}
-.generic_list_wrapper .titlebg {
-	background: none;
-	border-bottom: 1px solid #aaa;
-	font-size: /*1.1em*/1em;
-}
 .generic_list_wrapper .additional_row {
 	margin: 0;
 	padding: 5px 0;
@@ -4285,7 +4122,7 @@ span.hidelink {
 	box-shadow: 0 -2px 2px rgba(0,0,0,0.1);
 	overflow: auto;
 }
-.add_buddy .roundframe, .add_buddy .title_bar {
+.add_buddy .roundframe {
 	background: none;
 	border: none;
 	max-width: 100%;
@@ -4325,12 +4162,12 @@ div#editlang_desc {
 	padding: 3px 4px;
 	margin: 0 0 -10px 0;
 }
-#info_center{
+#info_center {
 	background: #f8f8f8;
 	margin: 12px 0 0 0;
 	padding: 16px 12px 6px 12px;
 }
-#info_center .cat_bar, .table_grid tr.catbg th, #searchform .roundframe .title_bar {
+.table_grid tr.catbg th{
 	border-top: 2px solid #ff9400;
 	border-bottom: 2px solid #bf6900;
 	background: #fff;
@@ -4344,11 +4181,6 @@ div#editlang_desc {
 .table_grid tr.catbg th.centercol, .table_grid tr.windowbg2 td.centercol, .table_grid tr.windowbg td.centercol, .table_grid tr.highlight2 td.centercol {
 	text-align: center;
 }
-#info_center .cat_bar, #searchform .roundframe .title_bar {
-	border-right: 1px solid #ddd;
-	border-left: 1px solid #ddd;
-	margin: 0 -1px;
-}
 .table_grid tr.catbg th {
 	padding: 4px 3px 3px 8px;
 }
@@ -4358,62 +4190,10 @@ tr.catbg th:first-child {
 tr.catbg th:last-child {
 	border-right: 1px solid #ddd;
 }
-#info_center .catbg, #searchform .roundframe .titlebg {
-	padding: 6px 12px 5px 12px;
-	background: none;
-	font-size: 1.1em;
-}
-#info_center .catbg, #info_center .catbg a, .table_grid tr.catbg th a, #searchform .roundframe .titlebg {
+.table_grid tr.catbg th a {
 	color: #555;
 	text-shadow: none;
 }
-#info_center .title_barIC, #postmodify .roundframe .title_bar,
-#activitytime .cat_bar, #popularposts .cat_bar, #popularactivity .cat_bar {
-	background: none;
-	border-top: 1px solid #999;
-	border-bottom: 1px solid #fff;
-	border-radius: 0;
-}
-#info_center h4.titlebg, #postmodify .roundframe .titlebg,
-#activitytime .catbg, #popularposts .catbg, #popularactivity .catbg {
-	border-bottom: 1px solid #ccc;
-	border-top: 1px solid #ccc;
-	box-shadow: 0 1px 0 #fff inset, 0 -1px 0 #999 inset;
-	padding: 6px 6px 5px 6px;
-	font-size: 1em;
-	color: #444;
-	text-shadow: none;
-	background:none;
-}
-#info_center .title_barIC:first-child, #info_center .title_barIC:first-child .titlebg {
-	border-top: none;
-	box-shadow: 0 -1px 0 #999 inset;
-	background: none;
-}
-#postmodify .roundframe .title_bar{
-	background: #f7f7f7;
-	border: 1px solid #aaa;
-	border-left: 1px solid #bbb;
-	border-top: 1px solid #ccc;
-	border-radius: 4px 4px 0 0;
-	box-shadow: 0 -1px 2px rgba(0,0,0,0.1) inset;
-	margin: 15px 0 0 0;
-}
-#postmodify .roundframe .titlebg{
-	background: none;
-	border: none;
-	box-shadow: none;
-	padding: 5px 5px 4px 10px;
-}
-#postmodify .roundframe .titlebg img {
-	padding: 4px 4px 0 4px;
-	background: none;
-	border: none;
-}
-#postmodify .roundframe .titlebg img:hover{
-	background: none;
-	border: none;
-}
 #postmodify .roundframe div{
 	padding-right: 0;
 }
@@ -4475,4 +4255,80 @@ div#manage_boards dl dd textarea[name=desc] {
 
 .full_width {
 	width: 100%;
+}
+
+/* Introduce New Title Bar */
+.title_bar {
+	border-right: 1px solid #ddd;
+	border-left: 1px solid #ddd;
+	border-top: 2px solid #ff9400;
+	border-bottom: 2px solid #bf6900;
+	background: #fff;
+	color: #666;
+	border-radius: 2px 2px 0 0;
+	text-align: left;
+	margin: 0 -1px;
+}
+.sub_bar {
+	border-bottom: 1px solid #ccc;
+	text-shadow: none;
+	background: none;
+	box-shadow: 0 -1px 0 #999 inset;
+}
+h3.titlebg, h4.titlebg, .titlebg, h3.subbg, h4.subbg, .subbg {
+	background: none;
+	color: #555;
+	font-family: "Tahoma", sans-serif;
+	font-weight: bold;	
+	overflow: hidden;
+	padding: 6px 12px 5px 12px;	
+	text-shadow: none;
+}
+.titlebg a, .subbg a {
+	background: none;
+	color: #555;
+	text-decoration: none;
+}	
+.title_top {
+	margin-top: 10px;
+}
+
+/* This place is about Info Center on BoardIndex */
+#info_center .sub_bar {
+	border-top: 1px solid #ccc;
+}
+#info_center .sub_bar:first-child {
+	border-top: none;
+}
+
+/* This place is about stats page */
+.stats_left {
+	float: left;
+	margin-top: 8px;
+	padding: 6px 15px;
+	border-right: 1px solid #bbb;
+}
+.stats_right{
+	float: right;
+	padding: 6px 15px;
+	margin-top: 8px;
+}
+.stats_left dl.stats, .stats_right dl.stats {
+	margin: -8px 0 -12px 0;
+}
+.stats_left dt a {
+	color: #232f46;
+}
+.stats_left dt {
+	width: 35%;
+}
+.stats_left dd {
+	width: 65%;
+}
+.top_row dl.stats dd {
+	background: none;
+	border: none;
+}
+.half {
+	width: 50%;
 }

Themes/default/css/rtl.css

@@ -603,7 +603,7 @@ div#admin_menu {
 .topic_table td.lastpost {
 	background: none;
 }
-#info_center .cat_bar, .table_grid tr.catbg th, #searchform .roundframe .title_bar {
+#info_center .cat_bar, .table_grid tr.catbg th {
 	text-align: right;
 }
 .message_index_title {

Themes/default/languages/ManagePaid.english.php

@@ -48,6 +48,8 @@ $txt['paid_currency_symbol'] = 'Symbol used by payment method';
 $txt['paid_currency_symbol_desc'] = 'Use \'%1.2f\' to specify where number goes, for example $%1.2f, %1.2fDM etc';
 $txt['paypal_email'] = 'Paypal email address';
 $txt['paypal_email_desc'] = 'Leave blank if you do not wish to use paypal.';
+$txt['paypal_sandbox_email'] = 'Paypal sandbox email address';
+$txt['paypal_sandbox_email_desc'] = 'Can be left blank if test mode is disabled or not using PayPal.'; 
 $txt['worldpay_id'] = 'WorldPay Install ID';
 $txt['worldpay_id_desc'] = 'The Install ID generated by WorldPay. Leave blank if you are not using WorldPay';
 $txt['worldpay_password'] = 'WorldPay Callback Password';

Themes/default/languages/Profile.english.php

@@ -188,6 +188,7 @@ $txt['deleteAccount_member'] = 'Delete this member\'s account';
 $txt['deleteAccount_posts'] = 'Remove posts made by this member';
 $txt['deleteAccount_all_posts'] = 'Replies to Topics';
 $txt['deleteAccount_topics'] = 'Topics and Posts';
+$txt['deleteAccount_votes'] = 'Remove poll votes made by this member';
 $txt['deleteAccount_confirm'] = 'Are you completely sure you want to delete this account?';
 $txt['deleteAccount_approval'] = 'Please note that the forum moderators will have to approve this account\'s deletion before it will be removed.';
 

cron.php

@@ -132,7 +132,7 @@ function fetch_task()
 	// Try to find a task. Specifically, try to find one that hasn't been claimed previously, or failing that,
 	// a task that was claimed but failed for whatever reason and failed long enough ago. We should not care
 	// what task it is, merely that it is one in the queue, the order is irrelevant.
-	$request = $smcFunc['db_query']('', '
+	$request = $smcFunc['db_query']('cron_find_task', '
 		SELECT id_task, task_file, task_class, task_data, claimed_time
 		FROM {db_prefix}background_tasks
 		WHERE claimed_time < {int:claim_limit}

other/upgrade.php

@@ -2686,7 +2686,7 @@ function upgrade_query($string, $unbuffered = false)
 	// If a table already exists don't go potty.
 	else
 	{
-		if (in_array(substr(trim($string), 0, 8), array('CREATE T', 'CREATE S', 'DROP TABL', 'ALTER TA', 'CREATE I')))
+		if (in_array(substr(trim($string), 0, 8), array('CREATE T', 'CREATE S', 'DROP TABL', 'ALTER TA', 'CREATE I', 'CREATE U')))
 		{
 			if (strpos($db_error_message, 'exist') !== false)
 				return true;

other/upgrade_2-1_postgresql.sql

@@ -538,10 +538,8 @@ INSERT INTO {$db_prefix}user_alerts_prefs (id_member, alert_pref, alert_value) V
 --- Adding support for topic unwatch
 /******************************************************************************/
 ---# Adding new columns to log_topics...
----{
-upgrade_query("
-	ALTER TABLE {$db_prefix}log_topics
-	ADD COLUMN unwatched int NOT NULL DEFAULT '0'");
+ALTER TABLE {$db_prefix}log_topics
+ADD COLUMN unwatched int NOT NULL DEFAULT '0';
 
 UPDATE {$db_prefix}log_topics
 SET unwatched = 0;
@@ -550,7 +548,6 @@ INSERT INTO {$db_prefix}settings
 	(variable, value)
 VALUES
 	('enable_unwatch', 0);
----}
 ---#
 
 ---# Fixing column name change...
@@ -1040,7 +1037,7 @@ $request = upgrade_query("
 --- Upgrading PM labels...
 /******************************************************************************/
 ---# Creating pm_labels sequence...
-CREATE SEQUENCE {$db_prefix}pm_labels_sequence;
+CREATE SEQUENCE {$db_prefix}pm_labels_seq;
 ---#
 
 ---# Adding pm_labels table...
@@ -1111,7 +1108,7 @@ ADD COLUMN in_inbox smallint NOT NULL default '1';
 		$smcFunc['db_query']('', '
 			UPDATE {db_prefix}pm_recipients
 			SET in_inbox = {int:in_inbox}
-			WHERE FIND_IN_SET({int:minus_one}, labels)',
+			WHERE FIND_IN_SET({int:minus_one}, labels) != 0',
 			array(
 				'in_inbox' => 1,
 				'minus_one' => -1,
@@ -1176,7 +1173,7 @@ ADD COLUMN in_inbox smallint NOT NULL default '1';
 			SELECT id_member, id_rule, actions
 			FROM {db_prefix}pm_rules',
 			array(
-			),
+			)
 		);
 
 		// Go through the rules, unserialize the actions, then figure out if there's anything we can use
@@ -1215,7 +1212,8 @@ ADD COLUMN in_inbox smallint NOT NULL default '1';
 		$smcFunc['db_remove_column']('{db_prefix}members', 'message_labels');
 		$smcFunc['db_remove_column']('{db_prefix}pm_recipients', 'labels');
 	}
-}
+---}
+---#
 
 /******************************************************************************/
 --- Adding support for edit reasons