SimpleMachines / SMF2.1

Sources/Profile-View.php

Braces +297 added lines, -216 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * View a summary.
@@ -23,8 +24,9 @@ 
 	global $context, $memberContext, $txt, $modSettings, $user_profile, $sourcedir, $scripturl, $smcFunc;
 
 	// Attempt to load the member's profile data.
-	if (!loadMemberContext($memID) || !isset($memberContext[$memID]))
-		fatal_lang_error('not_a_user', false, 404);
+	if (!loadMemberContext($memID) || !isset($memberContext[$memID])) {
+			fatal_lang_error('not_a_user', false, 404);
+	}
 
 	// Set up the stuff and load the user.
 	$context += array(
@@ -49,19 +51,21 @@ 
 
 	// See if they have broken any warning levels...
 	list ($modSettings['warning_enable'], $modSettings['user_limit']) = explode(',', $modSettings['warning_settings']);
-	if (!empty($modSettings['warning_mute']) && $modSettings['warning_mute'] <= $context['member']['warning'])
-		$context['warning_status'] = $txt['profile_warning_is_muted'];
-	elseif (!empty($modSettings['warning_moderate']) && $modSettings['warning_moderate'] <= $context['member']['warning'])
-		$context['warning_status'] = $txt['profile_warning_is_moderation'];
-	elseif (!empty($modSettings['warning_watch']) && $modSettings['warning_watch'] <= $context['member']['warning'])
-		$context['warning_status'] = $txt['profile_warning_is_watch'];
+	if (!empty($modSettings['warning_mute']) && $modSettings['warning_mute'] <= $context['member']['warning']) {
+			$context['warning_status'] = $txt['profile_warning_is_muted'];
+	} elseif (!empty($modSettings['warning_moderate']) && $modSettings['warning_moderate'] <= $context['member']['warning']) {
+			$context['warning_status'] = $txt['profile_warning_is_moderation'];
+	} elseif (!empty($modSettings['warning_watch']) && $modSettings['warning_watch'] <= $context['member']['warning']) {
+			$context['warning_status'] = $txt['profile_warning_is_watch'];
+	}
 
 	// They haven't even been registered for a full day!?
 	$days_registered = (int) ((time() - $user_profile[$memID]['date_registered']) / (3600 * 24));
-	if (empty($user_profile[$memID]['date_registered']) || $days_registered < 1)
-		$context['member']['posts_per_day'] = $txt['not_applicable'];
-	else
-		$context['member']['posts_per_day'] = comma_format($context['member']['real_posts'] / $days_registered, 3);
+	if (empty($user_profile[$memID]['date_registered']) || $days_registered < 1) {
+			$context['member']['posts_per_day'] = $txt['not_applicable'];
+	} else {
+			$context['member']['posts_per_day'] = comma_format($context['member']['real_posts'] / $days_registered, 3);
+	}
 
 	// Set the age...
 	if (empty($context['member']['birth_date']) || substr($context['member']['birth_date'], 0, 4) < 1002)
@@ -70,8 +74,7 @@ 
 			'age' => $txt['not_applicable'],
 			'today_is_birthday' => false
 		);
-	}
-	else
+	} else
 	{
 		list ($birth_year, $birth_month, $birth_day) = sscanf($context['member']['birth_date'], '%d-%d-%d');
 		$datearray = getdate(forum_time());
@@ -84,15 +87,16 @@ 
 	if (allowedTo('moderate_forum'))
 	{
 		// Make sure it's a valid ip address; otherwise, don't bother...
-		if (preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $memberContext[$memID]['ip']) == 1 && empty($modSettings['disableHostnameLookup']))
-			$context['member']['hostname'] = host_from_ip($memberContext[$memID]['ip']);
-		else
-			$context['member']['hostname'] = '';
+		if (preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $memberContext[$memID]['ip']) == 1 && empty($modSettings['disableHostnameLookup'])) {
+					$context['member']['hostname'] = host_from_ip($memberContext[$memID]['ip']);
+		} else {
+					$context['member']['hostname'] = '';
+		}
 
 		$context['can_see_ip'] = true;
+	} else {
+			$context['can_see_ip'] = false;
 	}
-	else
-		$context['can_see_ip'] = false;
 
 	// Are they hidden?
 	$context['member']['is_hidden'] = empty($user_profile[$memID]['show_online']);
@@ -103,8 +107,9 @@ 
 		include_once($sourcedir . '/Who.php');
 		$action = determineActions($user_profile[$memID]['url']);
 
-		if ($action !== false)
-			$context['member']['action'] = $action;
+		if ($action !== false) {
+					$context['member']['action'] = $action;
+		}
 	}
 
 	// If the user is awaiting activation, and the viewer has permission - setup some activation context messages.
@@ -167,13 +172,15 @@ 
 		{
 			// Work out what restrictions we actually have.
 			$ban_restrictions = array();
-			foreach (array('access', 'register', 'login', 'post') as $type)
-				if ($row['cannot_' . $type])
+			foreach (array('access', 'register', 'login', 'post') as $type) {
+							if ($row['cannot_' . $type])
 					$ban_restrictions[] = $txt['ban_type_' . $type];
+			}
 
 			// No actual ban in place?
-			if (empty($ban_restrictions))
-				continue;
+			if (empty($ban_restrictions)) {
+							continue;
+			}
 
 			// Prepare the link for context.
 			$ban_explanation = sprintf($txt['user_cannot_due_to'], implode(', ', $ban_restrictions), '<a href="' . $scripturl . '?action=admin;area=ban;sa=edit;bg=' . $row['id_ban_group'] . '">' . $row['name'] . '</a>');
@@ -196,9 +203,10 @@ 
 	$context['print_custom_fields'] = array();
 
 	// Any custom profile fields?
-	if (!empty($context['custom_fields']))
-		foreach ($context['custom_fields'] as $custom)
+	if (!empty($context['custom_fields'])) {
+			foreach ($context['custom_fields'] as $custom)
 			$context['print_custom_fields'][$context['cust_profile_fields_placement'][$custom['placement']]][] = $custom;
+	}
 
 }
 
@@ -242,14 +250,16 @@ 
 		$row['extra'] = !empty($row['extra']) ? $smcFunc['json_decode']($row['extra'], true) : array();
 		$alerts[$id_alert] = $row;
 
-		if (!empty($row['sender_id']))
-			$senders[] = $row['sender_id'];
+		if (!empty($row['sender_id'])) {
+					$senders[] = $row['sender_id'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
 	$senders = loadMemberData($senders);
-	foreach ($senders as $member)
-		loadMemberContext($member);
+	foreach ($senders as $member) {
+			loadMemberContext($member);
+	}
 
 	// Now go through and actually make with the text.
 	loadLanguage('Alerts');
@@ -263,12 +273,15 @@ 
 	$msgs = array();
 	foreach ($alerts as $id_alert => $alert)
 	{
-		if (isset($alert['extra']['board']))
-			$boards[$alert['extra']['board']] = $txt['board_na'];
-		if (isset($alert['extra']['topic']))
-			$topics[$alert['extra']['topic']] = $txt['topic_na'];
-		if ($alert['content_type'] == 'msg')
-			$msgs[$alert['content_id']] = $txt['topic_na'];
+		if (isset($alert['extra']['board'])) {
+					$boards[$alert['extra']['board']] = $txt['board_na'];
+		}
+		if (isset($alert['extra']['topic'])) {
+					$topics[$alert['extra']['topic']] = $txt['topic_na'];
+		}
+		if ($alert['content_type'] == 'msg') {
+					$msgs[$alert['content_id']] = $txt['topic_na'];
+		}
 	}
 
 	// Having figured out what boards etc. there are, let's now get the names of them if we can see them. If not, there's already a fallback set up.
@@ -283,8 +296,9 @@ 
 				'boards' => array_keys($boards),
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$boards[$row['id_board']] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$boards[$row['id_board']] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
+		}
 	}
 	if (!empty($topics))
 	{
@@ -299,8 +313,9 @@ 
 				'topics' => array_keys($topics),
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$topics[$row['id_topic']] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0">' . $row['subject'] . '</a>';
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$topics[$row['id_topic']] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0">' . $row['subject'] . '</a>';
+		}
 	}
 	if (!empty($msgs))
 	{
@@ -315,26 +330,33 @@ 
 				'msgs' => array_keys($msgs),
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$msgs[$row['id_msg']] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'] . '">' . $row['subject'] . '</a>';
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$msgs[$row['id_msg']] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'] . '">' . $row['subject'] . '</a>';
+		}
 	}
 
 	// Now to go back through the alerts, reattach this extra information and then try to build the string out of it (if a hook didn't already)
 	foreach ($alerts as $id_alert => $alert)
 	{
-		if (!empty($alert['text']))
-			continue;
-		if (isset($alert['extra']['board']))
-			$alerts[$id_alert]['extra']['board_msg'] = $boards[$alert['extra']['board']];
-		if (isset($alert['extra']['topic']))
-			$alerts[$id_alert]['extra']['topic_msg'] = $topics[$alert['extra']['topic']];
-		if ($alert['content_type'] == 'msg')
-			$alerts[$id_alert]['extra']['msg_msg'] = $msgs[$alert['content_id']];
-		if ($alert['content_type'] == 'profile')
-			$alerts[$id_alert]['extra']['profile_msg'] = '<a href="' . $scripturl . '?action=profile;u=' . $alerts[$id_alert]['content_id'] . '">' . $alerts[$id_alert]['extra']['user_name'] . '</a>';
-
-		if (!empty($memberContext[$alert['sender_id']]))
-			$alerts[$id_alert]['sender'] = &$memberContext[$alert['sender_id']];
+		if (!empty($alert['text'])) {
+					continue;
+		}
+		if (isset($alert['extra']['board'])) {
+					$alerts[$id_alert]['extra']['board_msg'] = $boards[$alert['extra']['board']];
+		}
+		if (isset($alert['extra']['topic'])) {
+					$alerts[$id_alert]['extra']['topic_msg'] = $topics[$alert['extra']['topic']];
+		}
+		if ($alert['content_type'] == 'msg') {
+					$alerts[$id_alert]['extra']['msg_msg'] = $msgs[$alert['content_id']];
+		}
+		if ($alert['content_type'] == 'profile') {
+					$alerts[$id_alert]['extra']['profile_msg'] = '<a href="' . $scripturl . '?action=profile;u=' . $alerts[$id_alert]['content_id'] . '">' . $alerts[$id_alert]['extra']['user_name'] . '</a>';
+		}
+
+		if (!empty($memberContext[$alert['sender_id']])) {
+					$alerts[$id_alert]['sender'] = &$memberContext[$alert['sender_id']];
+		}
 
 		$string = 'alert_' . $alert['content_type'] . '_' . $alert['content_action'];
 		if (isset($txt[$string]))
@@ -422,11 +444,11 @@ 
 		checkSession('request');
 
 		// Call it!
-		if ($action == 'remove')
-			alert_delete($toMark, $memID);
-
-		else
-			alert_mark($memID, $toMark, $action == 'read' ? 1 : 0);
+		if ($action == 'remove') {
+					alert_delete($toMark, $memID);
+		} else {
+					alert_mark($memID, $toMark, $action == 'read' ? 1 : 0);
+		}
 
 		// Set a nice update message.
 		$_SESSION['update_message'] = true;
@@ -476,23 +498,27 @@ 
 	);
 
 	// Set the page title
-	if (isset($_GET['sa']) && array_key_exists($_GET['sa'], $title))
-		$context['page_title'] = $txt['show' . $title[$_GET['sa']]];
-	else
-		$context['page_title'] = $txt['showPosts'];
+	if (isset($_GET['sa']) && array_key_exists($_GET['sa'], $title)) {
+			$context['page_title'] = $txt['show' . $title[$_GET['sa']]];
+	} else {
+			$context['page_title'] = $txt['showPosts'];
+	}
 
 	$context['page_title'] .= ' - ' . $user_profile[$memID]['real_name'];
 
 	// Is the load average too high to allow searching just now?
-	if (!empty($context['load_average']) && !empty($modSettings['loadavg_show_posts']) && $context['load_average'] >= $modSettings['loadavg_show_posts'])
-		fatal_lang_error('loadavg_show_posts_disabled', false);
+	if (!empty($context['load_average']) && !empty($modSettings['loadavg_show_posts']) && $context['load_average'] >= $modSettings['loadavg_show_posts']) {
+			fatal_lang_error('loadavg_show_posts_disabled', false);
+	}
 
 	// If we're specifically dealing with attachments use that function!
-	if (isset($_GET['sa']) && $_GET['sa'] == 'attach')
-		return showAttachments($memID);
+	if (isset($_GET['sa']) && $_GET['sa'] == 'attach') {
+			return showAttachments($memID);
+	}
 	// Instead, if we're dealing with unwatched topics (and the feature is enabled) use that other function.
-	elseif (isset($_GET['sa']) && $_GET['sa'] == 'unwatchedtopics')
-		return showUnwatched($memID);
+	elseif (isset($_GET['sa']) && $_GET['sa'] == 'unwatchedtopics') {
+			return showUnwatched($memID);
+	}
 
 	// Are we just viewing topics?
 	$context['is_topics'] = isset($_GET['sa']) && $_GET['sa'] == 'topics' ? true : false;
@@ -515,27 +541,30 @@ 
 		$smcFunc['db_free_result']($request);
 
 		// Trying to remove a message that doesn't exist.
-		if (empty($info))
-			redirectexit('action=profile;u=' . $memID . ';area=showposts;start=' . $_GET['start']);
+		if (empty($info)) {
+					redirectexit('action=profile;u=' . $memID . ';area=showposts;start=' . $_GET['start']);
+		}
 
 		// We can be lazy, since removeMessage() will check the permissions for us.
 		require_once($sourcedir . '/RemoveTopic.php');
 		removeMessage((int) $_GET['delete']);
 
 		// Add it to the mod log.
-		if (allowedTo('delete_any') && (!allowedTo('delete_own') || $info[1] != $user_info['id']))
-			logAction('delete', array('topic' => $info[2], 'subject' => $info[0], 'member' => $info[1], 'board' => $info[3]));
+		if (allowedTo('delete_any') && (!allowedTo('delete_own') || $info[1] != $user_info['id'])) {
+					logAction('delete', array('topic' => $info[2], 'subject' => $info[0], 'member' => $info[1], 'board' => $info[3]));
+		}
 
 		// Back to... where we are now ;).
 		redirectexit('action=profile;u=' . $memID . ';area=showposts;start=' . $_GET['start']);
 	}
 
 	// Default to 10.
-	if (empty($_REQUEST['viewscount']) || !is_numeric($_REQUEST['viewscount']))
-		$_REQUEST['viewscount'] = '10';
+	if (empty($_REQUEST['viewscount']) || !is_numeric($_REQUEST['viewscount'])) {
+			$_REQUEST['viewscount'] = '10';
+	}
 
-	if ($context['is_topics'])
-		$request = $smcFunc['db_query']('', '
+	if ($context['is_topics']) {
+			$request = $smcFunc['db_query']('', '
 			SELECT COUNT(*)
 			FROM {db_prefix}topics AS t' . ($user_info['query_see_board'] == '1=1' ? '' : '
 				INNER JOIN {db_prefix}boards AS b ON (b.id_board = t.id_board AND {query_see_board})') . '
@@ -548,8 +577,8 @@ 
 				'board' => $board,
 			)
 		);
-	else
-		$request = $smcFunc['db_query']('', '
+	} else {
+			$request = $smcFunc['db_query']('', '
 			SELECT COUNT(*)
 			FROM {db_prefix}messages AS m' . ($user_info['query_see_board'] == '1=1' ? '' : '
 				INNER JOIN {db_prefix}boards AS b ON (b.id_board = m.id_board AND {query_see_board})') . '
@@ -562,6 +591,7 @@ 
 				'board' => $board,
 			)
 		);
+	}
 	list ($msgCount) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -582,10 +612,11 @@ 
 
 	$range_limit = '';
 
-	if ($context['is_topics'])
-		$maxPerPage = empty($modSettings['disableCustomPerPage']) && !empty($options['topics_per_page']) ? $options['topics_per_page'] : $modSettings['defaultMaxTopics'];
-	else
-		$maxPerPage = empty($modSettings['disableCustomPerPage']) && !empty($options['messages_per_page']) ? $options['messages_per_page'] : $modSettings['defaultMaxMessages'];
+	if ($context['is_topics']) {
+			$maxPerPage = empty($modSettings['disableCustomPerPage']) && !empty($options['topics_per_page']) ? $options['topics_per_page'] : $modSettings['defaultMaxTopics'];
+	} else {
+			$maxPerPage = empty($modSettings['disableCustomPerPage']) && !empty($options['messages_per_page']) ? $options['messages_per_page'] : $modSettings['defaultMaxMessages'];
+	}
 
 	$maxIndex = $maxPerPage;
 
@@ -611,9 +642,9 @@ 
 		{
 			$margin *= 5;
 			$range_limit = $reverse ? 't.id_first_msg < ' . ($min_msg_member + $margin) : 't.id_first_msg > ' . ($max_msg_member - $margin);
+		} else {
+					$range_limit = $reverse ? 'm.id_msg < ' . ($min_msg_member + $margin) : 'm.id_msg > ' . ($max_msg_member - $margin);
 		}
-		else
-			$range_limit = $reverse ? 'm.id_msg < ' . ($min_msg_member + $margin) : 'm.id_msg > ' . ($max_msg_member - $margin);
 	}
 
 	// Find this user's posts.  The left join on categories somehow makes this faster, weird as it looks.
@@ -645,8 +676,7 @@ 
 					'max' => $maxIndex,
 				)
 			);
-		}
-		else
+		} else
 		{
 			$request = $smcFunc['db_query']('', '
 				SELECT
@@ -675,8 +705,9 @@ 
 		}
 
 		// Make sure we quit this loop.
-		if ($smcFunc['db_num_rows']($request) === $maxIndex || $looped)
-			break;
+		if ($smcFunc['db_num_rows']($request) === $maxIndex || $looped) {
+					break;
+		}
 		$looped = true;
 		$range_limit = '';
 	}
@@ -720,19 +751,21 @@ 
 			'css_class' => $row['approved'] ? 'windowbg' : 'approvebg',
 		);
 
-		if ($user_info['id'] == $row['id_member_started'])
-			$board_ids['own'][$row['id_board']][] = $counter;
+		if ($user_info['id'] == $row['id_member_started']) {
+					$board_ids['own'][$row['id_board']][] = $counter;
+		}
 		$board_ids['any'][$row['id_board']][] = $counter;
 	}
 	$smcFunc['db_free_result']($request);
 
 	// All posts were retrieved in reverse order, get them right again.
-	if ($reverse)
-		$context['posts'] = array_reverse($context['posts'], true);
+	if ($reverse) {
+			$context['posts'] = array_reverse($context['posts'], true);
+	}
 
 	// These are all the permissions that are different from board to board..
-	if ($context['is_topics'])
-		$permissions = array(
+	if ($context['is_topics']) {
+			$permissions = array(
 			'own' => array(
 				'post_reply_own' => 'can_reply',
 			),
@@ -740,8 +773,8 @@ 
 				'post_reply_any' => 'can_reply',
 			)
 		);
-	else
-		$permissions = array(
+	} else {
+			$permissions = array(
 			'own' => array(
 				'post_reply_own' => 'can_reply',
 				'delete_own' => 'can_delete',
@@ -751,6 +784,7 @@ 
 				'delete_any' => 'can_delete',
 			)
 		);
+	}
 
 	// For every permission in the own/any lists...
 	foreach ($permissions as $type => $list)
@@ -761,19 +795,22 @@ 
 			$boards = boardsAllowedTo($permission);
 
 			// Hmm, they can do it on all boards, can they?
-			if (!empty($boards) && $boards[0] == 0)
-				$boards = array_keys($board_ids[$type]);
+			if (!empty($boards) && $boards[0] == 0) {
+							$boards = array_keys($board_ids[$type]);
+			}
 
 			// Now go through each board they can do the permission on.
 			foreach ($boards as $board_id)
 			{
 				// There aren't any posts displayed from this board.
-				if (!isset($board_ids[$type][$board_id]))
-					continue;
+				if (!isset($board_ids[$type][$board_id])) {
+									continue;
+				}
 
 				// Set the permission to true ;).
-				foreach ($board_ids[$type][$board_id] as $counter)
-					$context['posts'][$counter][$allowed] = true;
+				foreach ($board_ids[$type][$board_id] as $counter) {
+									$context['posts'][$counter][$allowed] = true;
+				}
 			}
 		}
 	}
@@ -804,8 +841,9 @@ 
 	$boardsAllowed = boardsAllowedTo('view_attachments');
 
 	// Make sure we can't actually see anything...
-	if (empty($boardsAllowed))
-		$boardsAllowed = array(-1);
+	if (empty($boardsAllowed)) {
+			$boardsAllowed = array(-1);
+	}
 
 	require_once($sourcedir . '/Subs-List.php');
 
@@ -956,8 +994,8 @@ 
 		)
 	);
 	$attachments = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$attachments[] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$attachments[] = array(
 			'id' => $row['id_attach'],
 			'filename' => $row['filename'],
 			'downloads' => $row['downloads'],
@@ -969,6 +1007,7 @@ 
 			'board_name' => $row['name'],
 			'approved' => $row['approved'],
 		);
+	}
 
 	$smcFunc['db_free_result']($request);
 
@@ -1023,8 +1062,9 @@ 
 	global $txt, $user_info, $scripturl, $modSettings, $context, $sourcedir;
 
 	// Only the owner can see the list (if the function is enabled of course)
-	if ($user_info['id'] != $memID)
-		return;
+	if ($user_info['id'] != $memID) {
+			return;
+	}
 
 	require_once($sourcedir . '/Subs-List.php');
 
@@ -1170,8 +1210,9 @@ 
 	);
 
 	$topics = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$topics[] = $row['id_topic'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$topics[] = $row['id_topic'];
+	}
 
 	$smcFunc['db_free_result']($request);
 
@@ -1191,8 +1232,9 @@ 
 				'topics' => $topics,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$topicsInfo[] = $row;
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$topicsInfo[] = $row;
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -1240,8 +1282,9 @@ 
 	$context['page_title'] = $txt['statPanel_showStats'] . ' ' . $user_profile[$memID]['real_name'];
 
 	// Is the load average too high to allow searching just now?
-	if (!empty($context['load_average']) && !empty($modSettings['loadavg_userstats']) && $context['load_average'] >= $modSettings['loadavg_userstats'])
-		fatal_lang_error('loadavg_userstats_disabled', false);
+	if (!empty($context['load_average']) && !empty($modSettings['loadavg_userstats']) && $context['load_average'] >= $modSettings['loadavg_userstats']) {
+			fatal_lang_error('loadavg_userstats_disabled', false);
+	}
 
 	// General user statistics.
 	$timeDays = floor($user_profile[$memID]['total_time_logged_in'] / 86400);
@@ -1399,11 +1442,13 @@ 
 	}
 	$smcFunc['db_free_result']($result);
 
-	if ($maxPosts > 0)
-		for ($hour = 0; $hour < 24; $hour++)
+	if ($maxPosts > 0) {
+			for ($hour = 0;
+	}
+	$hour < 24; $hour++)
 		{
-			if (!isset($context['posts_by_time'][$hour]))
-				$context['posts_by_time'][$hour] = array(
+			if (!isset($context['posts_by_time'][$hour])) {
+							$context['posts_by_time'][$hour] = array(
 					'hour' => $hour,
 					'hour_format' => stripos($user_info['time_format'], '%p') === false ? $hour : date('g a', mktime($hour)),
 					'posts' => 0,
@@ -1411,7 +1456,7 @@ 
 					'relative_percent' => 0,
 					'is_last' => $hour == 23,
 				);
-			else
+			} else
 			{
 				$context['posts_by_time'][$hour]['posts_percent'] = round(($context['posts_by_time'][$hour]['posts'] * 100) / $realPosts);
 				$context['posts_by_time'][$hour]['relative_percent'] = round(($context['posts_by_time'][$hour]['posts'] * 100) / $maxPosts);
@@ -1444,8 +1489,9 @@ 
 
 	foreach ($subActions as $sa => $action)
 	{
-		if (!allowedTo($action[2]))
-			unset($subActions[$sa]);
+		if (!allowedTo($action[2])) {
+					unset($subActions[$sa]);
+		}
 	}
 
 	// Create the tabs for the template.
@@ -1463,15 +1509,18 @@ 
 	);
 
 	// Moderation must be on to track edits.
-	if (empty($modSettings['userlog_enabled']))
-		unset($context[$context['profile_menu_name']]['tab_data']['edits'], $subActions['edits']);
+	if (empty($modSettings['userlog_enabled'])) {
+			unset($context[$context['profile_menu_name']]['tab_data']['edits'], $subActions['edits']);
+	}
 
 	// Group requests must be active to show it...
-	if (empty($modSettings['show_group_membership']))
-		unset($context[$context['profile_menu_name']]['tab_data']['groupreq'], $subActions['groupreq']);
+	if (empty($modSettings['show_group_membership'])) {
+			unset($context[$context['profile_menu_name']]['tab_data']['groupreq'], $subActions['groupreq']);
+	}
 
-	if (empty($subActions))
-		fatal_lang_error('no_access', false);
+	if (empty($subActions)) {
+			fatal_lang_error('no_access', false);
+	}
 
 	$keys = array_keys($subActions);
 	$default = array_shift($keys);
@@ -1484,9 +1533,10 @@ 
 	$context['sub_template'] = $subActions[$context['tracking_area']][0];
 	$call = call_helper($subActions[$context['tracking_area']][0], true);
 
-	if (!empty($call))
-		call_user_func($call, $memID);
-}
+	if (!empty($call)) {
+			call_user_func($call, $memID);
+	}
+	}
 
 /**
  * Handles tracking a user's activity
@@ -1502,8 +1552,9 @@ 
 	isAllowedTo('moderate_forum');
 
 	$context['last_ip'] = $user_profile[$memID]['member_ip'];
-	if ($context['last_ip'] != $user_profile[$memID]['member_ip2'])
-		$context['last_ip2'] = $user_profile[$memID]['member_ip2'];
+	if ($context['last_ip'] != $user_profile[$memID]['member_ip2']) {
+			$context['last_ip2'] = $user_profile[$memID]['member_ip2'];
+	}
 	$context['member']['name'] = $user_profile[$memID]['real_name'];
 
 	// Set the options for the list component.
@@ -1669,8 +1720,9 @@ 
 			)
 		);
 		$message_members = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$message_members[] = $row['id_member'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$message_members[] = $row['id_member'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Fetch their names, cause of the GROUP BY doesn't like giving us that normally.
@@ -1685,8 +1737,9 @@ 
 					'ip_list' => $ips,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$context['members_in_range'][$row['id_member']] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$context['members_in_range'][$row['id_member']] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+			}
 			$smcFunc['db_free_result']($request);
 		}
 
@@ -1700,8 +1753,9 @@ 
 				'ip_list' => $ips,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$context['members_in_range'][$row['id_member']] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$context['members_in_range'][$row['id_member']] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+		}
 		$smcFunc['db_free_result']($request);
 	}
 }
@@ -1761,8 +1815,8 @@ 
 		))
 	);
 	$error_messages = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$error_messages[] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$error_messages[] = array(
 			'ip' => inet_dtop($row['ip']),
 			'member_link' => $row['id_member'] > 0 ? '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['display_name'] . '</a>' : $row['display_name'],
 			'message' => strtr($row['message'], array('&lt;span class=&quot;remove&quot;&gt;' => '', '&lt;/span&gt;' => '')),
@@ -1770,6 +1824,7 @@ 
 			'time' => timeformat($row['log_time']),
 			'timestamp' => forum_time(true, $row['log_time']),
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $error_messages;
@@ -1832,8 +1887,8 @@ 
 		))
 	);
 	$messages = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$messages[] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$messages[] = array(
 			'ip' => inet_dtop($row['poster_ip']),
 			'member_link' => empty($row['id_member']) ? $row['display_name'] : '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['display_name'] . '</a>',
 			'board' => array(
@@ -1846,6 +1901,7 @@ 
 			'time' => timeformat($row['poster_time']),
 			'timestamp' => forum_time(true, $row['poster_time'])
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $messages;
@@ -1872,19 +1928,20 @@ 
 		$context['sub_template'] = 'trackIP';
 		$context['page_title'] = $txt['profile'];
 		$context['base_url'] = $scripturl . '?action=trackip';
-	}
-	else
+	} else
 	{
 		$context['ip'] = $user_profile[$memID]['member_ip'];
 		$context['base_url'] = $scripturl . '?action=profile;area=tracking;sa=ip;u=' . $memID;
 	}
 
 	// Searching?
-	if (isset($_REQUEST['searchip']))
-		$context['ip'] = trim($_REQUEST['searchip']);
+	if (isset($_REQUEST['searchip'])) {
+			$context['ip'] = trim($_REQUEST['searchip']);
+	}
 
-	if (isValidIP($context['ip']) === false)
-		fatal_lang_error('invalid_tracking_ip', false);
+	if (isValidIP($context['ip']) === false) {
+			fatal_lang_error('invalid_tracking_ip', false);
+	}
 
 	//mysql didn't support like search with varbinary
 	//$ip_var = str_replace('*', '%', $context['ip']);
@@ -1892,8 +1949,9 @@ 
 	$ip_var = $context['ip'];
 	$ip_string = '= {inet:ip_address}';
 
-	if (empty($context['tracking_area']))
-		$context['page_title'] = $txt['trackIP'] . ' - ' . $context['ip'];
+	if (empty($context['tracking_area'])) {
+			$context['page_title'] = $txt['trackIP'] . ' - ' . $context['ip'];
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT id_member, real_name AS display_name, member_ip
@@ -1904,8 +1962,9 @@ 
 		)
 	);
 	$context['ips'] = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['ips'][inet_dtop($row['member_ip'])][] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['display_name'] . '</a>';
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['ips'][inet_dtop($row['member_ip'])][] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['display_name'] . '</a>';
+	}
 	$smcFunc['db_free_result']($request);
 
 	ksort($context['ips']);
@@ -2134,8 +2193,9 @@ 
 		foreach ($context['whois_servers'] as $whois)
 		{
 			// Strip off the "decimal point" and anything following...
-			if (in_array((int) $context['ip'], $whois['range']))
-				$context['auto_whois_server'] = $whois;
+			if (in_array((int) $context['ip'], $whois['range'])) {
+							$context['auto_whois_server'] = $whois;
+			}
 		}
 	}
 }
@@ -2152,10 +2212,11 @@ 
 	// Gonna want this for the list.
 	require_once($sourcedir . '/Subs-List.php');
 
-	if ($memID == 0)
-		$context['base_url'] = $scripturl . '?action=trackip';
-	else
-		$context['base_url'] = $scripturl . '?action=profile;area=tracking;sa=ip;u=' . $memID;
+	if ($memID == 0) {
+			$context['base_url'] = $scripturl . '?action=trackip';
+	} else {
+			$context['base_url'] = $scripturl . '?action=profile;area=tracking;sa=ip;u=' . $memID;
+	}
 
 	// Start with the user messages.
 	$listOptions = array(
@@ -2265,12 +2326,13 @@ 
 		)
 	);
 	$logins = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$logins[] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$logins[] = array(
 			'time' => timeformat($row['time']),
 			'ip' => inet_dtop($row['ip']),
 			'ip2' => inet_dtop($row['ip2']),
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $logins;
@@ -2295,11 +2357,12 @@ 
 		)
 	);
 	$context['custom_field_titles'] = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['custom_field_titles']['customfield_' . $row['col_name']] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['custom_field_titles']['customfield_' . $row['col_name']] = array(
 			'title' => $row['field_name'],
 			'parse_bbc' => $row['bbc'],
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Set the options for the error lists.
@@ -2438,19 +2501,22 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		$extra = $smcFunc['json_decode']($row['extra'], true);
-		if (!empty($extra['applicator']))
-			$members[] = $extra['applicator'];
+		if (!empty($extra['applicator'])) {
+					$members[] = $extra['applicator'];
+		}
 
 		// Work out what the name of the action is.
-		if (isset($txt['trackEdit_action_' . $row['action']]))
-			$action_text = $txt['trackEdit_action_' . $row['action']];
-		elseif (isset($txt[$row['action']]))
-			$action_text = $txt[$row['action']];
+		if (isset($txt['trackEdit_action_' . $row['action']])) {
+					$action_text = $txt['trackEdit_action_' . $row['action']];
+		} elseif (isset($txt[$row['action']])) {
+					$action_text = $txt[$row['action']];
+		}
 		// Custom field?
-		elseif (isset($context['custom_field_titles'][$row['action']]))
-			$action_text = $context['custom_field_titles'][$row['action']]['title'];
-		else
-			$action_text = $row['action'];
+		elseif (isset($context['custom_field_titles'][$row['action']])) {
+					$action_text = $context['custom_field_titles'][$row['action']]['title'];
+		} else {
+					$action_text = $row['action'];
+		}
 
 		// Parse BBC?
 		$parse_bbc = isset($context['custom_field_titles'][$row['action']]) && $context['custom_field_titles'][$row['action']]['parse_bbc'] ? true : false;
@@ -2482,13 +2548,15 @@ 
 			)
 		);
 		$members = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$members[$row['id_member']] = $row['real_name'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$members[$row['id_member']] = $row['real_name'];
+		}
 		$smcFunc['db_free_result']($request);
 
-		foreach ($edits as $key => $value)
-			if (isset($members[$value['id_member']]))
+		foreach ($edits as $key => $value) {
+					if (isset($members[$value['id_member']]))
 				$edits[$key]['member_link'] = '<a href="' . $scripturl . '?action=profile;u=' . $value['id_member'] . '">' . $members[$value['id_member']] . '</a>';
+		}
 	}
 
 	return $edits;
@@ -2689,10 +2757,11 @@ 
 	$context['board'] = $board;
 
 	// Determine which groups this user is in.
-	if (empty($user_profile[$memID]['additional_groups']))
-		$curGroups = array();
-	else
-		$curGroups = explode(',', $user_profile[$memID]['additional_groups']);
+	if (empty($user_profile[$memID]['additional_groups'])) {
+			$curGroups = array();
+	} else {
+			$curGroups = explode(',', $user_profile[$memID]['additional_groups']);
+	}
 	$curGroups[] = $user_profile[$memID]['id_group'];
 	$curGroups[] = $user_profile[$memID]['id_post_group'];
 
@@ -2712,28 +2781,30 @@ 
 	$context['no_access_boards'] = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (count(array_intersect($curGroups, explode(',', $row['member_groups']))) === 0 && !$row['is_mod'])
-			$context['no_access_boards'][] = array(
+		if (count(array_intersect($curGroups, explode(',', $row['member_groups']))) === 0 && !$row['is_mod']) {
+					$context['no_access_boards'][] = array(
 				'id' => $row['id_board'],
 				'name' => $row['name'],
 				'is_last' => false,
 			);
-		elseif ($row['id_profile'] != 1 || $row['is_mod'])
-			$context['boards'][$row['id_board']] = array(
+		} elseif ($row['id_profile'] != 1 || $row['is_mod']) {
+					$context['boards'][$row['id_board']] = array(
 				'id' => $row['id_board'],
 				'name' => $row['name'],
 				'selected' => $board == $row['id_board'],
 				'profile' => $row['id_profile'],
 				'profile_name' => $context['profiles'][$row['id_profile']]['name'],
 			);
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
 	require_once($sourcedir . '/Subs-Boards.php');
 	sortBoards($context['boards']);
 
-	if (!empty($context['no_access_boards']))
-		$context['no_access_boards'][count($context['no_access_boards']) - 1]['is_last'] = true;
+	if (!empty($context['no_access_boards'])) {
+			$context['no_access_boards'][count($context['no_access_boards']) - 1]['is_last'] = true;
+	}
 
 	$context['member']['permissions'] = array(
 		'general' => array(),
@@ -2742,8 +2813,9 @@ 
 
 	// If you're an admin we know you can do everything, we might as well leave.
 	$context['member']['has_all_permissions'] = in_array(1, $curGroups);
-	if ($context['member']['has_all_permissions'])
-		return;
+	if ($context['member']['has_all_permissions']) {
+			return;
+	}
 
 	$denied = array();
 
@@ -2762,21 +2834,24 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($result))
 	{
 		// We don't know about this permission, it doesn't exist :P.
-		if (!isset($txt['permissionname_' . $row['permission']]))
-			continue;
+		if (!isset($txt['permissionname_' . $row['permission']])) {
+					continue;
+		}
 
-		if (empty($row['add_deny']))
-			$denied[] = $row['permission'];
+		if (empty($row['add_deny'])) {
+					$denied[] = $row['permission'];
+		}
 
 		// Permissions that end with _own or _any consist of two parts.
-		if (in_array(substr($row['permission'], -4), array('_own', '_any')) && isset($txt['permissionname_' . substr($row['permission'], 0, -4)]))
-			$name = $txt['permissionname_' . substr($row['permission'], 0, -4)] . ' - ' . $txt['permissionname_' . $row['permission']];
-		else
-			$name = $txt['permissionname_' . $row['permission']];
+		if (in_array(substr($row['permission'], -4), array('_own', '_any')) && isset($txt['permissionname_' . substr($row['permission'], 0, -4)])) {
+					$name = $txt['permissionname_' . substr($row['permission'], 0, -4)] . ' - ' . $txt['permissionname_' . $row['permission']];
+		} else {
+					$name = $txt['permissionname_' . $row['permission']];
+		}
 
 		// Add this permission if it doesn't exist yet.
-		if (!isset($context['member']['permissions']['general'][$row['permission']]))
-			$context['member']['permissions']['general'][$row['permission']] = array(
+		if (!isset($context['member']['permissions']['general'][$row['permission']])) {
+					$context['member']['permissions']['general'][$row['permission']] = array(
 				'id' => $row['permission'],
 				'groups' => array(
 					'allowed' => array(),
@@ -2786,6 +2861,7 @@ 
 				'is_denied' => false,
 				'is_global' => true,
 			);
+		}
 
 		// Add the membergroup to either the denied or the allowed groups.
 		$context['member']['permissions']['general'][$row['permission']]['groups'][empty($row['add_deny']) ? 'denied' : 'allowed'][] = $row['id_group'] == 0 ? $txt['membergroups_members'] : $row['group_name'];
@@ -2819,18 +2895,20 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// We don't know about this permission, it doesn't exist :P.
-		if (!isset($txt['permissionname_' . $row['permission']]))
-			continue;
+		if (!isset($txt['permissionname_' . $row['permission']])) {
+					continue;
+		}
 
 		// The name of the permission using the format 'permission name' - 'own/any topic/event/etc.'.
-		if (in_array(substr($row['permission'], -4), array('_own', '_any')) && isset($txt['permissionname_' . substr($row['permission'], 0, -4)]))
-			$name = $txt['permissionname_' . substr($row['permission'], 0, -4)] . ' - ' . $txt['permissionname_' . $row['permission']];
-		else
-			$name = $txt['permissionname_' . $row['permission']];
+		if (in_array(substr($row['permission'], -4), array('_own', '_any')) && isset($txt['permissionname_' . substr($row['permission'], 0, -4)])) {
+					$name = $txt['permissionname_' . substr($row['permission'], 0, -4)] . ' - ' . $txt['permissionname_' . $row['permission']];
+		} else {
+					$name = $txt['permissionname_' . $row['permission']];
+		}
 
 		// Create the structure for this permission.
-		if (!isset($context['member']['permissions']['board'][$row['permission']]))
-			$context['member']['permissions']['board'][$row['permission']] = array(
+		if (!isset($context['member']['permissions']['board'][$row['permission']])) {
+					$context['member']['permissions']['board'][$row['permission']] = array(
 				'id' => $row['permission'],
 				'groups' => array(
 					'allowed' => array(),
@@ -2840,6 +2918,7 @@ 
 				'is_denied' => false,
 				'is_global' => empty($board),
 			);
+		}
 
 		$context['member']['permissions']['board'][$row['permission']]['groups'][empty($row['add_deny']) ? 'denied' : 'allowed'][$row['id_group']] = $row['id_group'] == 0 ? $txt['membergroups_members'] : $row['group_name'];
 
@@ -2858,8 +2937,9 @@ 
 	global $modSettings, $context, $sourcedir, $txt, $scripturl;
 
 	// Firstly, can we actually even be here?
-	if (!($context['user']['is_owner'] && allowedTo('view_warning_own')) && !allowedTo('view_warning_any') && !allowedTo('issue_warning') && !allowedTo('moderate_forum'))
-		fatal_lang_error('no_access', false);
+	if (!($context['user']['is_owner'] && allowedTo('view_warning_own')) && !allowedTo('view_warning_any') && !allowedTo('issue_warning') && !allowedTo('moderate_forum')) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Make sure things which are disabled stay disabled.
 	$modSettings['warning_watch'] = !empty($modSettings['warning_watch']) ? $modSettings['warning_watch'] : 110;
@@ -2946,9 +3026,10 @@ 
 		$modSettings['warning_mute'] => $txt['profile_warning_effect_own_muted'],
 	);
 	$context['current_level'] = 0;
-	foreach ($context['level_effects'] as $limit => $dummy)
-		if ($context['member']['warning'] >= $limit)
+	foreach ($context['level_effects'] as $limit => $dummy) {
+			if ($context['member']['warning'] >= $limit)
 			$context['current_level'] = $limit;
-}
+	}
+	}
 
 ?>
\ No newline at end of file

Sources/SearchAPI-Custom.php

Braces +48 added lines, -34 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Used for the "custom search index" option
@@ -54,8 +55,9 @@ 
 			return;
 		}
 
-		if (empty($modSettings['search_custom_index_config']))
-			return;
+		if (empty($modSettings['search_custom_index_config'])) {
+					return;
+		}
 
 		$this->indexSettings = $smcFunc['json_decode']($modSettings['search_custom_index_config'], true);
 
@@ -117,21 +119,23 @@ 
 
 		$subwords = text2words($word, $this->min_word_length, true);
 
-		if (empty($modSettings['search_force_index']))
-			$wordsSearch['words'][] = $word;
+		if (empty($modSettings['search_force_index'])) {
+					$wordsSearch['words'][] = $word;
+		}
 
 		// Excluded phrases don't benefit from being split into subwords.
-		if (count($subwords) > 1 && $isExcluded)
-			return;
-		else
+		if (count($subwords) > 1 && $isExcluded) {
+					return;
+		} else
 		{
 			foreach ($subwords as $subword)
 			{
 				if ($smcFunc['strlen']($subword) >= $this->min_word_length && !in_array($subword, $this->bannedWords))
 				{
 					$wordsSearch['indexed_words'][] = $subword;
-					if ($isExcluded)
-						$wordsExclude[] = $subword;
+					if ($isExcluded) {
+											$wordsExclude[] = $subword;
+					}
 				}
 			}
 		}
@@ -152,8 +156,9 @@ 
 		$query_where = array();
 		$query_params = $search_data['params'];
 
-		if ($query_params['id_search'])
-			$query_select['id_search'] = '{int:id_search}';
+		if ($query_params['id_search']) {
+					$query_select['id_search'] = '{int:id_search}';
+		}
 
 		$count = 0;
 		foreach ($words['words'] as $regularWord)
@@ -162,30 +167,37 @@ 
 			$query_params['complex_body_' . $count++] = empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? '%' . strtr($regularWord, array('_' => '\\_', '%' => '\\%')) . '%' : '[[:<:]]' . addcslashes(preg_replace(array('/([\[\]$.+*?|{}()])/'), array('[$1]'), $regularWord), '\\\'') . '[[:>:]]';
 		}
 
-		if ($query_params['user_query'])
-			$query_where[] = '{raw:user_query}';
-		if ($query_params['board_query'])
-			$query_where[] = 'm.id_board {raw:board_query}';
+		if ($query_params['user_query']) {
+					$query_where[] = '{raw:user_query}';
+		}
+		if ($query_params['board_query']) {
+					$query_where[] = 'm.id_board {raw:board_query}';
+		}
 
-		if ($query_params['topic'])
-			$query_where[] = 'm.id_topic = {int:topic}';
-		if ($query_params['min_msg_id'])
-			$query_where[] = 'm.id_msg >= {int:min_msg_id}';
-		if ($query_params['max_msg_id'])
-			$query_where[] = 'm.id_msg <= {int:max_msg_id}';
+		if ($query_params['topic']) {
+					$query_where[] = 'm.id_topic = {int:topic}';
+		}
+		if ($query_params['min_msg_id']) {
+					$query_where[] = 'm.id_msg >= {int:min_msg_id}';
+		}
+		if ($query_params['max_msg_id']) {
+					$query_where[] = 'm.id_msg <= {int:max_msg_id}';
+		}
 
 		$count = 0;
-		if (!empty($query_params['excluded_phrases']) && empty($modSettings['search_force_index']))
-			foreach ($query_params['excluded_phrases'] as $phrase)
+		if (!empty($query_params['excluded_phrases']) && empty($modSettings['search_force_index'])) {
+					foreach ($query_params['excluded_phrases'] as $phrase)
 			{
 				$query_where[] = 'subject NOT ' . (empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? ' LIKE ' : ' RLIKE ') . '{string:exclude_subject_phrase_' . $count . '}';
+		}
 				$query_params['exclude_subject_phrase_' . $count++] = empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? '%' . strtr($phrase, array('_' => '\\_', '%' => '\\%')) . '%' : '[[:<:]]' . addcslashes(preg_replace(array('/([\[\]$.+*?|{}()])/'), array('[$1]'), $phrase), '\\\'') . '[[:>:]]';
 			}
 		$count = 0;
-		if (!empty($query_params['excluded_subject_words']) && empty($modSettings['search_force_index']))
-			foreach ($query_params['excluded_subject_words'] as $excludedWord)
+		if (!empty($query_params['excluded_subject_words']) && empty($modSettings['search_force_index'])) {
+					foreach ($query_params['excluded_subject_words'] as $excludedWord)
 			{
 				$query_where[] = 'subject NOT ' . (empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? ' LIKE ' : ' RLIKE ') . '{string:exclude_subject_words_' . $count . '}';
+		}
 				$query_params['exclude_subject_words_' . $count++] = empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? '%' . strtr($excludedWord, array('_' => '\\_', '%' => '\\%')) . '%' : '[[:<:]]' . addcslashes(preg_replace(array('/([\[\]$.+*?|{}()])/'), array('[$1]'), $excludedWord), '\\\'') . '[[:>:]]';
 			}
 
@@ -198,8 +210,7 @@ 
 			{
 				$query_left_join[] = '{db_prefix}log_search_words AS lsw' . $numTables . ' ON (lsw' . $numTables . '.id_word = ' . $indexedWord . ' AND lsw' . $numTables . '.id_msg = m.id_msg)';
 				$query_where[] = '(lsw' . $numTables . '.id_word IS NULL)';
-			}
-			else
+			} else
 			{
 				$query_inner_join[] = '{db_prefix}log_search_words AS lsw' . $numTables . ' ON (lsw' . $numTables . '.id_msg = ' . ($prev_join === 0 ? 'm' : 'lsw' . $prev_join) . '.id_msg)';
 				$query_where[] = 'lsw' . $numTables . '.id_word = ' . $indexedWord;
@@ -235,16 +246,18 @@ 
 		$customIndexSettings = $smcFunc['json_decode']($modSettings['search_custom_index_config'], true);
 
 		$inserts = array();
-		foreach (text2words($msgOptions['body'], $customIndexSettings['bytes_per_word'], true) as $word)
-			$inserts[] = array($word, $msgOptions['id']);
+		foreach (text2words($msgOptions['body'], $customIndexSettings['bytes_per_word'], true) as $word) {
+					$inserts[] = array($word, $msgOptions['id']);
+		}
 
-		if (!empty($inserts))
-			$smcFunc['db_insert']('ignore',
+		if (!empty($inserts)) {
+					$smcFunc['db_insert']('ignore',
 				'{db_prefix}log_search_words',
 				array('id_word' => 'int', 'id_msg' => 'int'),
 				$inserts,
 				array('id_word', 'id_msg')
 			);
+		}
 	}
 
 	/**
@@ -287,8 +300,9 @@ 
 			if (!empty($inserted_words))
 			{
 				$inserts = array();
-				foreach ($inserted_words as $word)
-					$inserts[] = array($word, $msgOptions['id']);
+				foreach ($inserted_words as $word) {
+									$inserts[] = array($word, $msgOptions['id']);
+				}
 				$smcFunc['db_insert']('insert',
 					'{db_prefix}log_search_words',
 					array('id_word' => 'string', 'id_msg' => 'int'),

Sources/Profile-Actions.php

Braces +117 added lines, -86 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Activate an account.
@@ -48,8 +49,9 @@ 
 		logAction('approve_member', array('member' => $memID), 'admin');
 
 		// If we are doing approval, update the stats for the member just in case.
-		if (in_array($user_profile[$memID]['is_activated'], array(3, 4, 5, 13, 14, 15)))
-			updateSettings(array('unapprovedMembers' => ($modSettings['unapprovedMembers'] > 1 ? $modSettings['unapprovedMembers'] - 1 : 0)));
+		if (in_array($user_profile[$memID]['is_activated'], array(3, 4, 5, 13, 14, 15))) {
+					updateSettings(array('unapprovedMembers' => ($modSettings['unapprovedMembers'] > 1 ? $modSettings['unapprovedMembers'] - 1 : 0)));
+		}
 
 		// Make sure we update the stats too.
 		updateStats('member', false);
@@ -76,8 +78,9 @@ 
 	$issueErrors = array();
 
 	// Doesn't hurt to be overly cautious.
-	if (empty($modSettings['warning_enable']) || ($context['user']['is_owner'] && !$cur_profile['warning']) || !allowedTo('issue_warning'))
-		fatal_lang_error('no_access', false);
+	if (empty($modSettings['warning_enable']) || ($context['user']['is_owner'] && !$cur_profile['warning']) || !allowedTo('issue_warning')) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Get the base (errors related) stuff done.
 	loadLanguage('Errors');
@@ -135,16 +138,18 @@ 
 
 		// This cannot be empty!
 		$_POST['warn_reason'] = isset($_POST['warn_reason']) ? trim($_POST['warn_reason']) : '';
-		if ($_POST['warn_reason'] == '' && !$context['user']['is_owner'])
-			$issueErrors[] = 'warning_no_reason';
+		if ($_POST['warn_reason'] == '' && !$context['user']['is_owner']) {
+					$issueErrors[] = 'warning_no_reason';
+		}
 		$_POST['warn_reason'] = $smcFunc['htmlspecialchars']($_POST['warn_reason']);
 
 		$_POST['warning_level'] = (int) $_POST['warning_level'];
 		$_POST['warning_level'] = max(0, min(100, $_POST['warning_level']));
-		if ($_POST['warning_level'] < $context['min_allowed'])
-			$_POST['warning_level'] = $context['min_allowed'];
-		elseif ($_POST['warning_level'] > $context['max_allowed'])
-			$_POST['warning_level'] = $context['max_allowed'];
+		if ($_POST['warning_level'] < $context['min_allowed']) {
+					$_POST['warning_level'] = $context['min_allowed'];
+		} elseif ($_POST['warning_level'] > $context['max_allowed']) {
+					$_POST['warning_level'] = $context['max_allowed'];
+		}
 
 		// Do we actually have to issue them with a PM?
 		$id_notice = 0;
@@ -152,8 +157,9 @@ 
 		{
 			$_POST['warn_sub'] = trim($_POST['warn_sub']);
 			$_POST['warn_body'] = trim($_POST['warn_body']);
-			if (empty($_POST['warn_sub']) || empty($_POST['warn_body']))
-				$issueErrors[] = 'warning_notify_blank';
+			if (empty($_POST['warn_sub']) || empty($_POST['warn_body'])) {
+							$issueErrors[] = 'warning_notify_blank';
+			}
 			// Send the PM?
 			else
 			{
@@ -190,8 +196,8 @@ 
 		if (empty($issueErrors))
 		{
 			// Log what we've done!
-			if (!$context['user']['is_owner'])
-				$smcFunc['db_insert']('',
+			if (!$context['user']['is_owner']) {
+							$smcFunc['db_insert']('',
 					'{db_prefix}log_comments',
 					array(
 						'id_member' => 'int', 'member_name' => 'string', 'comment_type' => 'string', 'id_recipient' => 'int', 'recipient_name' => 'string-255',
@@ -203,14 +209,14 @@ 
 					),
 					array('id_comment')
 				);
+			}
 
 			// Make the change.
 			updateMemberData($memID, array('warning' => $_POST['warning_level']));
 
 			// Leave a lovely message.
 			$context['profile_updated'] = $context['user']['is_owner'] ? $txt['profile_updated_own'] : $txt['profile_warning_success'];
-		}
-		else
+		} else
 		{
 			// Try to remember some bits.
 			$context['warning_data'] = array(
@@ -229,8 +235,9 @@ 
 	{
 		$warning_body = !empty($_POST['warn_body']) ? trim(censorText($_POST['warn_body'])) : '';
 		$context['preview_subject'] = !empty($_POST['warn_sub']) ? trim($smcFunc['htmlspecialchars']($_POST['warn_sub'])) : '';
-		if (empty($_POST['warn_sub']) || empty($_POST['warn_body']))
-			$issueErrors[] = 'warning_notify_blank';
+		if (empty($_POST['warn_sub']) || empty($_POST['warn_body'])) {
+					$issueErrors[] = 'warning_notify_blank';
+		}
 
 		if (!empty($_POST['warn_body']))
 		{
@@ -254,8 +261,9 @@ 
 	{
 		// Fill in the suite of errors.
 		$context['post_errors'] = array();
-		foreach ($issueErrors as $error)
-			$context['post_errors'][] = $txt[$error];
+		foreach ($issueErrors as $error) {
+					$context['post_errors'][] = $txt[$error];
+		}
 	}
 
 
@@ -272,9 +280,10 @@ 
 		$modSettings['warning_mute'] => $txt['profile_warning_effect_mute'],
 	);
 	$context['current_level'] = 0;
-	foreach ($context['level_effects'] as $limit => $dummy)
-		if ($context['member']['warning'] >= $limit)
+	foreach ($context['level_effects'] as $limit => $dummy) {
+			if ($context['member']['warning'] >= $limit)
 			$context['current_level'] = $limit;
+	}
 
 	$listOptions = array(
 		'id' => 'view_warnings',
@@ -337,11 +346,12 @@ 
 							' . $warning['reason'] . '
 						</div>';
 
-						if (!empty($warning['id_notice']))
-							$ret .= '
+						if (!empty($warning['id_notice'])) {
+													$ret .= '
 						<div class="floatright">
 							<a href="' . $scripturl . '?action=moderate;area=notice;nid=' . $warning['id_notice'] . '" onclick="window.open(this.href, \'\', \'scrollbars=yes,resizable=yes,width=400,height=250\');return false;" target="_blank" class="new_win" title="' . $txt['profile_warning_previous_notice'] . '"><span class="generic_icons filter centericon"></span></a>
 						</div>';
+						}
 
 						return $ret;
 					},
@@ -413,8 +423,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// If we're not warning for a message skip any that are.
-		if (!$context['warning_for_message'] && strpos($row['body'], '{MESSAGE}') !== false)
-			continue;
+		if (!$context['warning_for_message'] && strpos($row['body'], '{MESSAGE}') !== false) {
+					continue;
+		}
 
 		$context['notification_templates'][] = array(
 			'title' => $row['template_title'],
@@ -424,16 +435,18 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Setup the "default" templates.
-	foreach (array('spamming', 'offence', 'insulting') as $type)
-		$context['notification_templates'][] = array(
+	foreach (array('spamming', 'offence', 'insulting') as $type) {
+			$context['notification_templates'][] = array(
 			'title' => $txt['profile_warning_notify_title_' . $type],
 			'body' => sprintf($txt['profile_warning_notify_template_outline' . (!empty($context['warning_for_message']) ? '_post' : '')], $txt['profile_warning_notify_for_' . $type]),
 		);
+	}
 
 	// Replace all the common variables in the templates.
-	foreach ($context['notification_templates'] as $k => $name)
-		$context['notification_templates'][$k]['body'] = strtr($name['body'], array('{MEMBER}' => un_htmlspecialchars($context['member']['name']), '{MESSAGE}' => '[url=' . $scripturl . '?msg=' . $context['warning_for_message'] . ']' . un_htmlspecialchars($context['warned_message_subject']) . '[/url]', '{SCRIPTURL}' => $scripturl, '{FORUMNAME}' => $mbname, '{REGARDS}' => $txt['regards_team']));
-}
+	foreach ($context['notification_templates'] as $k => $name) {
+			$context['notification_templates'][$k]['body'] = strtr($name['body'], array('{MEMBER}' => un_htmlspecialchars($context['member']['name']), '{MESSAGE}' => '[url=' . $scripturl . '?msg=' . $context['warning_for_message'] . ']' . un_htmlspecialchars($context['warned_message_subject']) . '[/url]', '{SCRIPTURL}' => $scripturl, '{FORUMNAME}' => $mbname, '{REGARDS}' => $txt['regards_team']));
+	}
+	}
 
 /**
  * Get the number of warnings a user has. Callback for $listOptions['get_count'] in issueWarning()
@@ -517,10 +530,11 @@ 
 {
 	global $txt, $context, $modSettings, $cur_profile;
 
-	if (!$context['user']['is_owner'])
-		isAllowedTo('profile_remove_any');
-	elseif (!allowedTo('profile_remove_any'))
-		isAllowedTo('profile_remove_own');
+	if (!$context['user']['is_owner']) {
+			isAllowedTo('profile_remove_any');
+	} elseif (!allowedTo('profile_remove_any')) {
+			isAllowedTo('profile_remove_own');
+	}
 
 	// Permissions for removing stuff...
 	$context['can_delete_posts'] = !$context['user']['is_owner'] && allowedTo('moderate_forum');
@@ -547,10 +561,11 @@ 
 
 	// @todo Add a way to delete pms as well?
 
-	if (!$context['user']['is_owner'])
-		isAllowedTo('profile_remove_any');
-	elseif (!allowedTo('profile_remove_any'))
-		isAllowedTo('profile_remove_own');
+	if (!$context['user']['is_owner']) {
+			isAllowedTo('profile_remove_any');
+	} elseif (!allowedTo('profile_remove_any')) {
+			isAllowedTo('profile_remove_own');
+	}
 
 	checkSession();
 
@@ -576,8 +591,9 @@ 
 		list ($another) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 
-		if (empty($another))
-			fatal_lang_error('at_least_one_admin', 'critical');
+		if (empty($another)) {
+					fatal_lang_error('at_least_one_admin', 'critical');
+		}
 	}
 
 	// This file is needed for the deleteMembers function.
@@ -656,8 +672,9 @@ 
 					)
 				);
 				$topicIDs = array();
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					$topicIDs[] = $row['id_topic'];
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									$topicIDs[] = $row['id_topic'];
+				}
 				$smcFunc['db_free_result']($request);
 
 				// Actually remove the topics. Ignore recycling if we want to perma-delete things...
@@ -680,8 +697,9 @@ 
 			// This could take a while... but ya know it's gonna be worth it in the end.
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
-				if (function_exists('apache_reset_timeout'))
-					@apache_reset_timeout();
+				if (function_exists('apache_reset_timeout')) {
+									@apache_reset_timeout();
+				}
 
 				removeMessage($row['id_msg']);
 			}
@@ -689,8 +707,9 @@ 
 		}
 
 		// Only delete this poor members account if they are actually being booted out of camp.
-		if (isset($_POST['deleteAccount']))
-			deleteMembers($memID);
+		if (isset($_POST['deleteAccount'])) {
+					deleteMembers($memID);
+		}
 	}
 	// Do they need approval to delete?
 	elseif (!empty($modSettings['approveAccountDeletion']) && !allowedTo('moderate_forum'))
@@ -741,18 +760,18 @@ 
 		{
 			foreach ($costs as $duration => $cost)
 			{
-				if ($cost != 0)
-					$cost_array[$duration] = $cost;
+				if ($cost != 0) {
+									$cost_array[$duration] = $cost;
+				}
 			}
-		}
-		else
+		} else
 		{
 			$cost_array['fixed'] = $costs['fixed'];
 		}
 
-		if (empty($cost_array))
-			unset($context['subscriptions'][$id]);
-		else
+		if (empty($cost_array)) {
+					unset($context['subscriptions'][$id]);
+		} else
 		{
 			$context['subscriptions'][$id]['member'] = 0;
 			$context['subscriptions'][$id]['subscribed'] = false;
@@ -765,13 +784,15 @@ 
 	foreach ($gateways as $id => $gateway)
 	{
 		$gateways[$id] = new $gateway['display_class']();
-		if (!$gateways[$id]->gatewayEnabled())
-			unset($gateways[$id]);
+		if (!$gateways[$id]->gatewayEnabled()) {
+					unset($gateways[$id]);
+		}
 	}
 
 	// No gateways yet?
-	if (empty($gateways))
-		fatal_error($txt['paid_admin_not_setup_gateway']);
+	if (empty($gateways)) {
+			fatal_error($txt['paid_admin_not_setup_gateway']);
+	}
 
 	// Get the current subscriptions.
 	$request = $smcFunc['db_query']('', '
@@ -786,8 +807,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// The subscription must exist!
-		if (!isset($context['subscriptions'][$row['id_subscribe']]))
-			continue;
+		if (!isset($context['subscriptions'][$row['id_subscribe']])) {
+					continue;
+		}
 
 		$context['current'][$row['id_subscribe']] = array(
 			'id' => $row['id_sublog'],
@@ -801,8 +823,9 @@ 
 			'status_text' => $row['status'] == 0 ? ($row['payments_pending'] ? $txt['paid_pending'] : $txt['paid_finished']) : $txt['paid_active'],
 		);
 
-		if ($row['status'] == 1)
-			$context['subscriptions'][$row['id_subscribe']]['subscribed'] = true;
+		if ($row['status'] == 1) {
+					$context['subscriptions'][$row['id_subscribe']]['subscribed'] = true;
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -853,21 +876,25 @@ 
 	if (isset($_GET['confirm']) && isset($_POST['sub_id']) && is_array($_POST['sub_id']))
 	{
 		// Hopefully just one.
-		foreach ($_POST['sub_id'] as $k => $v)
-			$ID_SUB = (int) $k;
+		foreach ($_POST['sub_id'] as $k => $v) {
+					$ID_SUB = (int) $k;
+		}
 
-		if (!isset($context['subscriptions'][$ID_SUB]) || $context['subscriptions'][$ID_SUB]['active'] == 0)
-			fatal_lang_error('paid_sub_not_active');
+		if (!isset($context['subscriptions'][$ID_SUB]) || $context['subscriptions'][$ID_SUB]['active'] == 0) {
+					fatal_lang_error('paid_sub_not_active');
+		}
 
 		// Simplify...
 		$context['sub'] = $context['subscriptions'][$ID_SUB];
 		$period = 'xx';
-		if ($context['sub']['flexible'])
-			$period = isset($_POST['cur'][$ID_SUB]) && isset($context['sub']['costs'][$_POST['cur'][$ID_SUB]]) ? $_POST['cur'][$ID_SUB] : 'xx';
+		if ($context['sub']['flexible']) {
+					$period = isset($_POST['cur'][$ID_SUB]) && isset($context['sub']['costs'][$_POST['cur'][$ID_SUB]]) ? $_POST['cur'][$ID_SUB] : 'xx';
+		}
 
 		// Check we have a valid cost.
-		if ($context['sub']['flexible'] && $period == 'xx')
-			fatal_lang_error('paid_sub_not_active');
+		if ($context['sub']['flexible'] && $period == 'xx') {
+					fatal_lang_error('paid_sub_not_active');
+		}
 
 		// Sort out the cost/currency.
 		$context['currency'] = $modSettings['paid_currency_code'];
@@ -880,8 +907,7 @@ 
 			$context['cost'] = sprintf($modSettings['paid_currency_symbol'], $context['value']) . '/' . $txt[$_POST['cur'][$ID_SUB]];
 			// The period value for paypal.
 			$context['paypal_period'] = strtoupper(substr($_POST['cur'][$ID_SUB], 0, 1));
-		}
-		else
+		} else
 		{
 			// Real cost...
 			$context['value'] = $context['sub']['costs']['fixed'];
@@ -898,13 +924,15 @@ 
 		foreach ($gateways as $id => $gateway)
 		{
 			$fields = $gateways[$id]->fetchGatewayFields($context['sub']['id'] . '+' . $memID, $context['sub'], $context['value'], $period, $scripturl . '?action=profile;u=' . $memID . ';area=subscriptions;sub_id=' . $context['sub']['id'] . ';done');
-			if (!empty($fields['form']))
-				$context['gateways'][] = $fields;
+			if (!empty($fields['form'])) {
+							$context['gateways'][] = $fields;
+			}
 		}
 
 		// Bugger?!
-		if (empty($context['gateways']))
-			fatal_error($txt['paid_admin_not_setup_gateway']);
+		if (empty($context['gateways'])) {
+					fatal_error($txt['paid_admin_not_setup_gateway']);
+		}
 
 		// Now we are going to assume they want to take this out ;)
 		$new_data = array($context['sub']['id'], $context['value'], $period, 'prepay');
@@ -912,16 +940,19 @@ 
 		{
 			// What are the details like?
 			$current_pending = array();
-			if ($context['current'][$context['sub']['id']]['pending_details'] != '')
-				$current_pending = $smcFunc['json_decode']($context['current'][$context['sub']['id']]['pending_details'], true);
+			if ($context['current'][$context['sub']['id']]['pending_details'] != '') {
+							$current_pending = $smcFunc['json_decode']($context['current'][$context['sub']['id']]['pending_details'], true);
+			}
 			// Don't get silly.
-			if (count($current_pending) > 9)
-				$current_pending = array();
+			if (count($current_pending) > 9) {
+							$current_pending = array();
+			}
 			$pending_count = 0;
 			// Only record real pending payments as will otherwise confuse the admin!
-			foreach ($current_pending as $pending)
-				if ($pending[3] == 'payback')
+			foreach ($current_pending as $pending) {
+							if ($pending[3] == 'payback')
 					$pending_count++;
+			}
 
 			if (!in_array($new_data, $current_pending))
 			{
@@ -966,9 +997,9 @@ 
 
 		// Quit.
 		return;
+	} else {
+			$context['sub_template'] = 'user_subscription';
+	}
 	}
-	else
-		$context['sub_template'] = 'user_subscription';
-}
 
 ?>
\ No newline at end of file

Sources/Themes.php

Braces +348 added lines, -271 removed lines

@@ -30,8 +30,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Subaction handler - manages the action and delegates control to the proper
@@ -103,12 +104,12 @@ 
 	cache_put_data('minimized_css', null);
 
 	// Follow the sa or just go to administration.
-	if (isset($_GET['sa']) && !empty($subActions[$_GET['sa']]))
-		call_helper($subActions[$_GET['sa']]);
-
-	else
-		call_helper($subActions['admin']);
-}
+	if (isset($_GET['sa']) && !empty($subActions[$_GET['sa']])) {
+			call_helper($subActions[$_GET['sa']]);
+	} else {
+			call_helper($subActions['admin']);
+	}
+	}
 
 /**
  * This function allows administration of themes and their settings,
@@ -130,15 +131,16 @@ 
 		checkSession();
 		validateToken('admin-tm');
 
-		if (isset($_POST['options']['known_themes']))
-			foreach ($_POST['options']['known_themes'] as $key => $id)
+		if (isset($_POST['options']['known_themes'])) {
+					foreach ($_POST['options']['known_themes'] as $key => $id)
 				$_POST['options']['known_themes'][$key] = (int) $id;
+		} else {
+					fatal_lang_error('themes_none_selectable', false);
+		}
 
-		else
-			fatal_lang_error('themes_none_selectable', false);
-
-		if (!in_array($_POST['options']['theme_guests'], $_POST['options']['known_themes']))
-			fatal_lang_error('themes_default_selectable', false);
+		if (!in_array($_POST['options']['theme_guests'], $_POST['options']['known_themes'])) {
+					fatal_lang_error('themes_default_selectable', false);
+		}
 
 		// Commit the new settings.
 		updateSettings(array(
@@ -146,8 +148,9 @@ 
 			'theme_guests' => $_POST['options']['theme_guests'],
 			'knownThemes' => implode(',', $_POST['options']['known_themes']),
 		));
-		if ((int) $_POST['theme_reset'] == 0 || in_array($_POST['theme_reset'], $_POST['options']['known_themes']))
-			updateMemberData(null, array('id_theme' => (int) $_POST['theme_reset']));
+		if ((int) $_POST['theme_reset'] == 0 || in_array($_POST['theme_reset'], $_POST['options']['known_themes'])) {
+					updateMemberData(null, array('id_theme' => (int) $_POST['theme_reset']));
+		}
 
 		redirectexit('action=admin;area=theme;' . $context['session_var'] . '=' . $context['session_id'] . ';sa=admin');
 	}
@@ -166,8 +169,9 @@ 
 	// Look for a non existent theme directory. (ie theme87.)
 	$theme_dir = $boarddir . '/Themes/theme';
 	$i = 1;
-	while (file_exists($theme_dir . $i))
-		$i++;
+	while (file_exists($theme_dir . $i)) {
+			$i++;
+	}
 
 	$context['new_theme_name'] = 'theme' . $i;
 
@@ -189,8 +193,9 @@ 
 	loadLanguage('Admin');
 	isAllowedTo('admin_forum');
 
-	if (isset($_REQUEST['th']))
-		return SetThemeSettings();
+	if (isset($_REQUEST['th'])) {
+			return SetThemeSettings();
+	}
 
 	if (isset($_POST['save']))
 	{
@@ -274,12 +279,13 @@ 
 		$context['themes'] = array();
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (!isset($context['themes'][$row['id_theme']]))
-				$context['themes'][$row['id_theme']] = array(
+			if (!isset($context['themes'][$row['id_theme']])) {
+							$context['themes'][$row['id_theme']] = array(
 					'id' => $row['id_theme'],
 					'num_default_options' => 0,
 					'num_members' => 0,
 				);
+			}
 			$context['themes'][$row['id_theme']][$row['variable']] = $row['value'];
 		}
 		$smcFunc['db_free_result']($request);
@@ -293,8 +299,9 @@ 
 				'guest_member' => -1,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$context['themes'][$row['id_theme']]['num_default_options'] = $row['value'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$context['themes'][$row['id_theme']]['num_default_options'] = $row['value'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Need to make sure we don't do custom fields.
@@ -305,8 +312,9 @@ 
 			)
 		);
 		$customFields = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$customFields[] = $row['col_name'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$customFields[] = $row['col_name'];
+		}
 		$smcFunc['db_free_result']($request);
 		$customFieldsQuery = empty($customFields) ? '' : ('AND variable NOT IN ({array_string:custom_fields})');
 
@@ -321,14 +329,16 @@ 
 				'custom_fields' => empty($customFields) ? array() : $customFields,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$context['themes'][$row['id_theme']]['num_members'] = $row['value'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$context['themes'][$row['id_theme']]['num_members'] = $row['value'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// There has to be a Settings template!
-		foreach ($context['themes'] as $k => $v)
-			if (empty($v['theme_dir']) || (!file_exists($v['theme_dir'] . '/Settings.template.php') && empty($v['num_members'])))
+		foreach ($context['themes'] as $k => $v) {
+					if (empty($v['theme_dir']) || (!file_exists($v['theme_dir'] . '/Settings.template.php') && empty($v['num_members'])))
 				unset($context['themes'][$k]);
+		}
 
 		loadTemplate('Themes');
 		$context['sub_template'] = 'reset_list';
@@ -343,16 +353,19 @@ 
 		checkSession();
 		validateToken('admin-sto');
 
-		if (empty($_POST['options']))
-			$_POST['options'] = array();
-		if (empty($_POST['default_options']))
-			$_POST['default_options'] = array();
+		if (empty($_POST['options'])) {
+					$_POST['options'] = array();
+		}
+		if (empty($_POST['default_options'])) {
+					$_POST['default_options'] = array();
+		}
 
 		// Set up the sql query.
 		$setValues = array();
 
-		foreach ($_POST['options'] as $opt => $val)
-			$setValues[] = array(-1, $_GET['th'], $opt, is_array($val) ? implode(',', $val) : $val);
+		foreach ($_POST['options'] as $opt => $val) {
+					$setValues[] = array(-1, $_GET['th'], $opt, is_array($val) ? implode(',', $val) : $val);
+		}
 
 		$old_settings = array();
 		foreach ($_POST['default_options'] as $opt => $val)
@@ -366,8 +379,8 @@ 
 		if (!empty($setValues))
 		{
 			// Are there options in non-default themes set that should be cleared?
-			if (!empty($old_settings))
-				$smcFunc['db_query']('', '
+			if (!empty($old_settings)) {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}themes
 					WHERE id_theme != {int:default_theme}
 						AND id_member = {int:guest_member}
@@ -378,6 +391,7 @@ 
 						'old_settings' => $old_settings,
 					)
 				);
+			}
 
 			$smcFunc['db_insert']('replace',
 				'{db_prefix}themes',
@@ -391,8 +405,7 @@ 
 		cache_put_data('theme_settings-1', null, 90);
 
 		redirectexit('action=admin;area=theme;' . $context['session_var'] . '=' . $context['session_id'] . ';sa=reset');
-	}
-	elseif (isset($_POST['submit']) && $_POST['who'] == 1)
+	} elseif (isset($_POST['submit']) && $_POST['who'] == 1)
 	{
 		checkSession();
 		validateToken('admin-sto');
@@ -405,9 +418,9 @@ 
 		$old_settings = array();
 		foreach ($_POST['default_options'] as $opt => $val)
 		{
-			if ($_POST['default_options_master'][$opt] == 0)
-				continue;
-			elseif ($_POST['default_options_master'][$opt] == 1)
+			if ($_POST['default_options_master'][$opt] == 0) {
+							continue;
+			} elseif ($_POST['default_options_master'][$opt] == 1)
 			{
 				// Delete then insert for ease of database compatibility!
 				$smcFunc['db_query']('substring', '
@@ -433,8 +446,7 @@ 
 				);
 
 				$old_settings[] = $opt;
-			}
-			elseif ($_POST['default_options_master'][$opt] == 2)
+			} elseif ($_POST['default_options_master'][$opt] == 2)
 			{
 				$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}themes
@@ -449,8 +461,8 @@ 
 		}
 
 		// Delete options from other themes.
-		if (!empty($old_settings))
-			$smcFunc['db_query']('', '
+		if (!empty($old_settings)) {
+					$smcFunc['db_query']('', '
 				DELETE FROM {db_prefix}themes
 				WHERE id_theme != {int:default_theme}
 					AND id_member > {int:no_member}
@@ -461,12 +473,13 @@ 
 					'old_settings' => $old_settings,
 				)
 			);
+		}
 
 		foreach ($_POST['options'] as $opt => $val)
 		{
-			if ($_POST['options_master'][$opt] == 0)
-				continue;
-			elseif ($_POST['options_master'][$opt] == 1)
+			if ($_POST['options_master'][$opt] == 0) {
+							continue;
+			} elseif ($_POST['options_master'][$opt] == 1)
 			{
 				// Delete then insert for ease of database compatibility - again!
 				$smcFunc['db_query']('substring', '
@@ -491,8 +504,7 @@ 
 						'value' => (is_array($val) ? implode(',', $val) : $val),
 					)
 				);
-			}
-			elseif ($_POST['options_master'][$opt] == 2)
+			} elseif ($_POST['options_master'][$opt] == 2)
 			{
 				$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}themes
@@ -509,8 +521,7 @@ 
 		}
 
 		redirectexit('action=admin;area=theme;' . $context['session_var'] . '=' . $context['session_id'] . ';sa=reset');
-	}
-	elseif (!empty($_GET['who']) && $_GET['who'] == 2)
+	} elseif (!empty($_GET['who']) && $_GET['who'] == 2)
 	{
 		checkSession('get');
 		validateToken('admin-stor', 'request');
@@ -525,8 +536,9 @@ 
 				)
 			);
 			$customFields = array();
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$customFields[] = $row['col_name'];
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$customFields[] = $row['col_name'];
+			}
 			$smcFunc['db_free_result']($request);
 		}
 		$customFieldsQuery = empty($customFields) ? '' : ('AND variable NOT IN ({array_string:custom_fields})');
@@ -578,13 +590,13 @@ 
 			)
 		);
 		$context['theme_options'] = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$context['theme_options'][$row['variable']] = $row['value'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$context['theme_options'][$row['variable']] = $row['value'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		$context['theme_options_reset'] = false;
-	}
-	else
+	} else
 	{
 		$context['theme_options'] = array();
 		$context['theme_options_reset'] = true;
@@ -593,30 +605,32 @@ 
 	foreach ($context['options'] as $i => $setting)
 	{
 		// Just skip separators
-		if (!is_array($setting))
-			continue;
+		if (!is_array($setting)) {
+					continue;
+		}
 
 		// Is this disabled?
 		if ($setting['id'] == 'calendar_start_day' && empty($modSettings['cal_enabled']))
 		{
 			unset($context['options'][$i]);
 			continue;
-		}
-		elseif (($setting['id'] == 'topics_per_page' || $setting['id'] == 'messages_per_page') && !empty($modSettings['disableCustomPerPage']))
+		} elseif (($setting['id'] == 'topics_per_page' || $setting['id'] == 'messages_per_page') && !empty($modSettings['disableCustomPerPage']))
 		{
 			unset($context['options'][$i]);
 			continue;
 		}
 
-		if (!isset($setting['type']) || $setting['type'] == 'bool')
-			$context['options'][$i]['type'] = 'checkbox';
-		elseif ($setting['type'] == 'int' || $setting['type'] == 'integer')
-			$context['options'][$i]['type'] = 'number';
-		elseif ($setting['type'] == 'string')
-			$context['options'][$i]['type'] = 'text';
+		if (!isset($setting['type']) || $setting['type'] == 'bool') {
+					$context['options'][$i]['type'] = 'checkbox';
+		} elseif ($setting['type'] == 'int' || $setting['type'] == 'integer') {
+					$context['options'][$i]['type'] = 'number';
+		} elseif ($setting['type'] == 'string') {
+					$context['options'][$i]['type'] = 'text';
+		}
 
-		if (isset($setting['options']))
-			$context['options'][$i]['type'] = 'list';
+		if (isset($setting['options'])) {
+					$context['options'][$i]['type'] = 'list';
+		}
 
 		$context['options'][$i]['value'] = !isset($context['theme_options'][$setting['id']]) ? '' : $context['theme_options'][$setting['id']];
 	}
@@ -641,8 +655,9 @@ 
 {
 	global $txt, $context, $settings, $modSettings, $smcFunc;
 
-	if (empty($_GET['th']) && empty($_GET['id']))
-		return ThemeAdmin();
+	if (empty($_GET['th']) && empty($_GET['id'])) {
+			return ThemeAdmin();
+	}
 
 	$_GET['th'] = isset($_GET['th']) ? (int) $_GET['th'] : (int) $_GET['id'];
 
@@ -653,8 +668,9 @@ 
 	isAllowedTo('admin_forum');
 
 	// Validate inputs/user.
-	if (empty($_GET['th']))
-		fatal_lang_error('no_theme', false);
+	if (empty($_GET['th'])) {
+			fatal_lang_error('no_theme', false);
+	}
 
 	// Fetch the smiley sets...
 	$sets = explode(',', 'none,' . $modSettings['smiley_sets_known']);
@@ -662,8 +678,9 @@ 
 	$context['smiley_sets'] = array(
 		'' => $txt['smileys_no_default']
 	);
-	foreach ($sets as $i => $set)
-		$context['smiley_sets'][$set] = $smcFunc['htmlspecialchars']($set_names[$i]);
+	foreach ($sets as $i => $set) {
+			$context['smiley_sets'][$set] = $smcFunc['htmlspecialchars']($set_names[$i]);
+	}
 
 	$old_id = $settings['theme_id'];
 	$old_settings = $settings;
@@ -688,8 +705,9 @@ 
 	if (file_exists($settings['theme_dir'] . '/index.template.php'))
 	{
 		$file_contents = implode('', file($settings['theme_dir'] . '/index.template.php'));
-		if (preg_match('~\$settings\[\'theme_variants\'\]\s*=(.+?);~', $file_contents, $matches))
-				eval('global $settings;' . $matches[0]);
+		if (preg_match('~\$settings\[\'theme_variants\'\]\s*=(.+?);~', $file_contents, $matches)) {
+						eval('global $settings;' . $matches[0]);
+		}
 	}
 
 	// Submitting!
@@ -698,37 +716,45 @@ 
 		checkSession();
 		validateToken('admin-sts');
 
-		if (empty($_POST['options']))
-			$_POST['options'] = array();
-		if (empty($_POST['default_options']))
-			$_POST['default_options'] = array();
+		if (empty($_POST['options'])) {
+					$_POST['options'] = array();
+		}
+		if (empty($_POST['default_options'])) {
+					$_POST['default_options'] = array();
+		}
 
 		// Make sure items are cast correctly.
 		foreach ($context['theme_settings'] as $item)
 		{
 			// Disregard this item if this is just a separator.
-			if (!is_array($item))
-				continue;
+			if (!is_array($item)) {
+							continue;
+			}
 
 			foreach (array('options', 'default_options') as $option)
 			{
-				if (!isset($_POST[$option][$item['id']]))
-					continue;
+				if (!isset($_POST[$option][$item['id']])) {
+									continue;
+				}
 				// Checkbox.
-				elseif (empty($item['type']))
-					$_POST[$option][$item['id']] = $_POST[$option][$item['id']] ? 1 : 0;
+				elseif (empty($item['type'])) {
+									$_POST[$option][$item['id']] = $_POST[$option][$item['id']] ? 1 : 0;
+				}
 				// Number
-				elseif ($item['type'] == 'number')
-					$_POST[$option][$item['id']] = (int) $_POST[$option][$item['id']];
+				elseif ($item['type'] == 'number') {
+									$_POST[$option][$item['id']] = (int) $_POST[$option][$item['id']];
+				}
 			}
 		}
 
 		// Set up the sql query.
 		$inserts = array();
-		foreach ($_POST['options'] as $opt => $val)
-			$inserts[] = array(0, $_GET['th'], $opt, is_array($val) ? implode(',', $val) : $val);
-		foreach ($_POST['default_options'] as $opt => $val)
-			$inserts[] = array(0, 1, $opt, is_array($val) ? implode(',', $val) : $val);
+		foreach ($_POST['options'] as $opt => $val) {
+					$inserts[] = array(0, $_GET['th'], $opt, is_array($val) ? implode(',', $val) : $val);
+		}
+		foreach ($_POST['default_options'] as $opt => $val) {
+					$inserts[] = array(0, 1, $opt, is_array($val) ? implode(',', $val) : $val);
+		}
 		// If we're actually inserting something..
 		if (!empty($inserts))
 		{
@@ -754,8 +780,9 @@ 
 
 	foreach ($settings as $setting => $dummy)
 	{
-		if (!in_array($setting, array('theme_url', 'theme_dir', 'images_url', 'template_dirs')))
-			$settings[$setting] = htmlspecialchars__recursive($settings[$setting]);
+		if (!in_array($setting, array('theme_url', 'theme_dir', 'images_url', 'template_dirs'))) {
+					$settings[$setting] = htmlspecialchars__recursive($settings[$setting]);
+		}
 	}
 
 	$context['settings'] = $context['theme_settings'];
@@ -764,18 +791,21 @@ 
 	foreach ($context['settings'] as $i => $setting)
 	{
 		// Separators are dummies, so leave them alone.
-		if (!is_array($setting))
-			continue;
+		if (!is_array($setting)) {
+					continue;
+		}
 
-		if (!isset($setting['type']) || $setting['type'] == 'bool')
-			$context['settings'][$i]['type'] = 'checkbox';
-		elseif ($setting['type'] == 'int' || $setting['type'] == 'integer')
-			$context['settings'][$i]['type'] = 'number';
-		elseif ($setting['type'] == 'string')
-			$context['settings'][$i]['type'] = 'text';
+		if (!isset($setting['type']) || $setting['type'] == 'bool') {
+					$context['settings'][$i]['type'] = 'checkbox';
+		} elseif ($setting['type'] == 'int' || $setting['type'] == 'integer') {
+					$context['settings'][$i]['type'] = 'number';
+		} elseif ($setting['type'] == 'string') {
+					$context['settings'][$i]['type'] = 'text';
+		}
 
-		if (isset($setting['options']))
-			$context['settings'][$i]['type'] = 'list';
+		if (isset($setting['options'])) {
+					$context['settings'][$i]['type'] = 'list';
+		}
 
 		$context['settings'][$i]['value'] = !isset($settings[$setting['id']]) ? '' : $settings[$setting['id']];
 	}
@@ -828,8 +858,9 @@ 
 	$themeID = isset($_GET['th']) ? (int) $_GET['th'] : (int) $_GET['id'];
 
 	// You can't delete the default theme!
-	if ($themeID == 1)
-		fatal_lang_error('no_access', false);
+	if ($themeID == 1) {
+			fatal_lang_error('no_access', false);
+	}
 
 	$theme_info = get_single_theme($themeID);
 
@@ -837,8 +868,9 @@ 
 	remove_theme($themeID);
 
 	// And remove all its files and folders too.
-	if (!empty($theme_info) && !empty($theme_info['theme_dir']))
-		remove_dir($theme_info['theme_dir']);
+	if (!empty($theme_info) && !empty($theme_info['theme_dir'])) {
+			remove_dir($theme_info['theme_dir']);
+	}
 
 	// Go back to the list page.
 	redirectexit('action=admin;area=theme;sa=list;' . $context['session_var'] . '=' . $context['session_id'] . ';done=removing');
@@ -863,12 +895,14 @@ 
 	$enableThemes = explode(',', $modSettings['enableThemes']);
 
 	// Are we disabling it?
-	if (isset($_GET['disabled']))
-		$enableThemes = array_diff($enableThemes, array($themeID));
+	if (isset($_GET['disabled'])) {
+			$enableThemes = array_diff($enableThemes, array($themeID));
+	}
 
 	// Nope? then enable it!
-	else
-		$enableThemes[] = (string) $themeID;
+	else {
+			$enableThemes[] = (string) $themeID;
+	}
 
 	// Update the setting.
 	$enableThemes = strtr(implode(',', $enableThemes), array(',,' => ','));
@@ -903,18 +937,21 @@ 
 
 	$_SESSION['id_theme'] = 0;
 
-	if (isset($_GET['id']))
-		$_GET['th'] = $_GET['id'];
+	if (isset($_GET['id'])) {
+			$_GET['th'] = $_GET['id'];
+	}
 
 	// Saving a variant cause JS doesn't work - pretend it did ;)
 	if (isset($_POST['save']))
 	{
 		// Which theme?
-		foreach ($_POST['save'] as $k => $v)
-			$_GET['th'] = (int) $k;
+		foreach ($_POST['save'] as $k => $v) {
+					$_GET['th'] = (int) $k;
+		}
 
-		if (isset($_POST['vrt'][$k]))
-			$_GET['vrt'] = $_POST['vrt'][$k];
+		if (isset($_POST['vrt'][$k])) {
+					$_GET['vrt'] = $_POST['vrt'][$k];
+		}
 	}
 
 	// Have we made a decision, or are we just browsing?
@@ -992,8 +1029,9 @@ 
 		else
 		{
 			// The forum's default theme is always 0 and we
-			if (isset($_GET['th']) && $_GET['th'] == 0)
-					$_GET['th'] = $modSettings['theme_guests'];
+			if (isset($_GET['th']) && $_GET['th'] == 0) {
+								$_GET['th'] = $modSettings['theme_guests'];
+			}
 
 			updateMemberData((int) $_REQUEST['u'], array('id_theme' => (int) $_GET['th']));
 
@@ -1007,8 +1045,9 @@ 
 				);
 				cache_put_data('theme_settings-' . $_GET['th'] . ':' . (int) $_REQUEST['u'], null, 90);
 
-				if ($user_info['id'] == $_REQUEST['u'])
-					$_SESSION['id_variant'] = 0;
+				if ($user_info['id'] == $_REQUEST['u']) {
+									$_SESSION['id_variant'] = 0;
+				}
 			}
 
 			redirectexit('action=profile;u=' . (int) $_REQUEST['u'] . ';area=theme');
@@ -1077,12 +1116,13 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (!isset($context['available_themes'][$row['id_theme']]))
-				$context['available_themes'][$row['id_theme']] = array(
+			if (!isset($context['available_themes'][$row['id_theme']])) {
+							$context['available_themes'][$row['id_theme']] = array(
 					'id' => $row['id_theme'],
 					'selected' => $context['current_theme'] == $row['id_theme'],
 					'num_users' => 0
 				);
+			}
 			$context['available_themes'][$row['id_theme']][$row['variable']] = $row['value'];
 		}
 		$smcFunc['db_free_result']($request);
@@ -1095,9 +1135,9 @@ 
 			'num_users' => 0
 		);
 		$guest_theme = 0;
+	} else {
+			$guest_theme = $modSettings['theme_guests'];
 	}
-	else
-		$guest_theme = $modSettings['theme_guests'];
 
 	$request = $smcFunc['db_query']('', '
 		SELECT id_theme, COUNT(*) AS the_count
@@ -1110,15 +1150,17 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Figure out which theme it is they are REALLY using.
-		if (!empty($modSettings['knownThemes']) && !in_array($row['id_theme'], explode(',', $modSettings['knownThemes'])))
-			$row['id_theme'] = $guest_theme;
-		elseif (empty($modSettings['theme_allow']))
-			$row['id_theme'] = $guest_theme;
+		if (!empty($modSettings['knownThemes']) && !in_array($row['id_theme'], explode(',', $modSettings['knownThemes']))) {
+					$row['id_theme'] = $guest_theme;
+		} elseif (empty($modSettings['theme_allow'])) {
+					$row['id_theme'] = $guest_theme;
+		}
 
-		if (isset($context['available_themes'][$row['id_theme']]))
-			$context['available_themes'][$row['id_theme']]['num_users'] += $row['the_count'];
-		else
-			$context['available_themes'][$guest_theme]['num_users'] += $row['the_count'];
+		if (isset($context['available_themes'][$row['id_theme']])) {
+					$context['available_themes'][$row['id_theme']]['num_users'] += $row['the_count'];
+		} else {
+					$context['available_themes'][$guest_theme]['num_users'] += $row['the_count'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -1137,8 +1179,9 @@ 
 				'id_member' => isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'pick' ? array(-1, $context['current_member']) : array(-1),
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$variant_preferences[$row['id_theme']] = $row['value'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$variant_preferences[$row['id_theme']] = $row['value'];
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -1149,17 +1192,18 @@ 
 	foreach ($context['available_themes'] as $id_theme => $theme_data)
 	{
 		// Don't try to load the forum or board default theme's data... it doesn't have any!
-		if ($id_theme == 0)
-			continue;
+		if ($id_theme == 0) {
+					continue;
+		}
 
 		// The thumbnail needs the correct path.
 		$settings['images_url'] = &$theme_data['images_url'];
 
-		if (file_exists($theme_data['theme_dir'] . '/languages/Settings.' . $user_info['language'] . '.php'))
-			include($theme_data['theme_dir'] . '/languages/Settings.' . $user_info['language'] . '.php');
-		elseif (file_exists($theme_data['theme_dir'] . '/languages/Settings.' . $language . '.php'))
-			include($theme_data['theme_dir'] . '/languages/Settings.' . $language . '.php');
-		else
+		if (file_exists($theme_data['theme_dir'] . '/languages/Settings.' . $user_info['language'] . '.php')) {
+					include($theme_data['theme_dir'] . '/languages/Settings.' . $user_info['language'] . '.php');
+		} elseif (file_exists($theme_data['theme_dir'] . '/languages/Settings.' . $language . '.php')) {
+					include($theme_data['theme_dir'] . '/languages/Settings.' . $language . '.php');
+		} else
 		{
 			$txt['theme_thumbnail_href'] = $theme_data['images_url'] . '/thumbnail.png';
 			$txt['theme_description'] = '';
@@ -1184,15 +1228,17 @@ 
 					loadLanguage('Settings');
 
 					$context['available_themes'][$id_theme]['variants'] = array();
-					foreach ($settings['theme_variants'] as $variant)
-						$context['available_themes'][$id_theme]['variants'][$variant] = array(
+					foreach ($settings['theme_variants'] as $variant) {
+											$context['available_themes'][$id_theme]['variants'][$variant] = array(
 							'label' => isset($txt['variant_' . $variant]) ? $txt['variant_' . $variant] : $variant,
 							'thumbnail' => !file_exists($theme_data['theme_dir'] . '/images/thumbnail.png') || file_exists($theme_data['theme_dir'] . '/images/thumbnail_' . $variant . '.png') ? $theme_data['images_url'] . '/thumbnail_' . $variant . '.png' : ($theme_data['images_url'] . '/thumbnail.png'),
 						);
+					}
 
 					$context['available_themes'][$id_theme]['selected_variant'] = isset($_GET['vrt']) ? $_GET['vrt'] : (!empty($variant_preferences[$id_theme]) ? $variant_preferences[$id_theme] : (!empty($settings['default_variant']) ? $settings['default_variant'] : $settings['theme_variants'][0]));
-					if (!isset($context['available_themes'][$id_theme]['variants'][$context['available_themes'][$id_theme]['selected_variant']]['thumbnail']))
-						$context['available_themes'][$id_theme]['selected_variant'] = $settings['theme_variants'][0];
+					if (!isset($context['available_themes'][$id_theme]['variants'][$context['available_themes'][$id_theme]['selected_variant']]['thumbnail'])) {
+											$context['available_themes'][$id_theme]['selected_variant'] = $settings['theme_variants'][0];
+					}
 
 					$context['available_themes'][$id_theme]['thumbnail_href'] = $context['available_themes'][$id_theme]['variants'][$context['available_themes'][$id_theme]['selected_variant']]['thumbnail'];
 					// Allow themes to override the text.
@@ -1208,8 +1254,9 @@ 
 	// As long as we're not doing the default theme...
 	if (!isset($_REQUEST['u']) || $_REQUEST['u'] >= 0)
 	{
-		if ($guest_theme != 0)
-			$context['available_themes'][0] = $context['available_themes'][$guest_theme];
+		if ($guest_theme != 0) {
+					$context['available_themes'][0] = $context['available_themes'][$guest_theme];
+		}
 
 		$context['available_themes'][0]['id'] = 0;
 		$context['available_themes'][0]['name'] = $txt['theme_forum_default'];
@@ -1258,14 +1305,16 @@ 
 		$action = $smcFunc['htmlspecialchars'](trim($_GET['do']));
 
 		// Got any info from the specific form?
-		if (!isset($_POST['save_' . $action]))
-			fatal_lang_error('theme_install_no_action', false);
+		if (!isset($_POST['save_' . $action])) {
+					fatal_lang_error('theme_install_no_action', false);
+		}
 
 		validateToken('admin-t-' . $action);
 
 		// Hopefully the themes directory is writable, or we might have a problem.
-		if (!is_writable($themedir))
-			fatal_lang_error('theme_install_write_error', 'critical');
+		if (!is_writable($themedir)) {
+					fatal_lang_error('theme_install_write_error', 'critical');
+		}
 
 		// Call the function and handle the result.
 		$result = $subActions[$action]();
@@ -1280,9 +1329,10 @@ 
 	}
 
 	// Nope, show a nice error.
-	else
-		fatal_lang_error('theme_install_no_action', false);
-}
+	else {
+			fatal_lang_error('theme_install_no_action', false);
+	}
+	}
 
 /**
  * Installs a theme from a theme package.
@@ -1298,8 +1348,9 @@ 
 	$dirtemp = $themedir . '/temp';
 
 	// Make sure the temp dir doesn't already exist
-	if (file_exists($dirtemp))
-		remove_dir($dirtemp);
+	if (file_exists($dirtemp)) {
+			remove_dir($dirtemp);
+	}
 
 	// Create the temp dir.
 	mkdir($dirtemp, 0777);
@@ -1311,17 +1362,20 @@ 
 		smf_chmod($dirtemp, '0755');
 
 		// How about now?
-		if (!is_writable($dirtemp))
-			fatal_lang_error('theme_install_write_error', 'critical');
+		if (!is_writable($dirtemp)) {
+					fatal_lang_error('theme_install_write_error', 'critical');
+		}
 	}
 
 	// This happens when the admin session is gone and the user has to login again.
-	if (!isset($_FILES) || !isset($_FILES['theme_gz']) || empty($_FILES['theme_gz']))
-		redirectexit('action=admin;area=theme;sa=admin;' . $context['session_var'] . '=' . $context['session_id']);
+	if (!isset($_FILES) || !isset($_FILES['theme_gz']) || empty($_FILES['theme_gz'])) {
+			redirectexit('action=admin;area=theme;sa=admin;' . $context['session_var'] . '=' . $context['session_id']);
+	}
 
 	// Another error check layer, something went wrong with the upload.
-	if (isset($_FILES['theme_gz']['error']) && $_FILES['theme_gz']['error'] != 0)
-		fatal_lang_error('theme_install_error_file_' . $_FILES['theme_gz']['error'], false);
+	if (isset($_FILES['theme_gz']['error']) && $_FILES['theme_gz']['error'] != 0) {
+			fatal_lang_error('theme_install_error_file_' . $_FILES['theme_gz']['error'], false);
+	}
 
 	// Get the theme's name.
 	$name = pathinfo($_FILES['theme_gz']['name'], PATHINFO_FILENAME);
@@ -1352,11 +1406,10 @@ 
 
 		// return all the info.
 		return $context['to_install'];
+	} else {
+			fatal_lang_error('theme_install_error_title', false);
+	}
 	}
-
-	else
-		fatal_lang_error('theme_install_error_title', false);
-}
 
 /**
  * Makes a copy from the default theme, assigns a name for it and installs it.
@@ -1370,15 +1423,17 @@ 
 	global $forum_version;
 
 	// There's gotta be something to work with.
-	if (!isset($_REQUEST['copy']) || empty($_REQUEST['copy']))
-		fatal_lang_error('theme_install_error_title', false);
+	if (!isset($_REQUEST['copy']) || empty($_REQUEST['copy'])) {
+			fatal_lang_error('theme_install_error_title', false);
+	}
 
 	// Get a cleaner version.
 	$name = preg_replace('~[^A-Za-z0-9_\- ]~', '', $_REQUEST['copy']);
 
 	// Is there a theme already named like this?
-	if (file_exists($themedir . '/' . $name))
-		fatal_lang_error('theme_install_already_dir', false);
+	if (file_exists($themedir . '/' . $name)) {
+			fatal_lang_error('theme_install_already_dir', false);
+	}
 
 	// This is a brand new theme so set all possible values.
 	$context['to_install'] = array(
@@ -1398,8 +1453,9 @@ 
 
 	// Buy some time.
 	@set_time_limit(600);
-	if (function_exists('apache_reset_timeout'))
-		@apache_reset_timeout();
+	if (function_exists('apache_reset_timeout')) {
+			@apache_reset_timeout();
+	}
 
 	// Create subdirectories for css and javascript files.
 	mkdir($context['to_install']['theme_dir'] . '/css', 0777);
@@ -1435,12 +1491,13 @@ 
 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if ($row['variable'] == 'theme_templates')
-			$theme_templates = $row['value'];
-		elseif ($row['variable'] == 'theme_layers')
-			$theme_layers = $row['value'];
-		else
-			continue;
+		if ($row['variable'] == 'theme_templates') {
+					$theme_templates = $row['value'];
+		} elseif ($row['variable'] == 'theme_layers') {
+					$theme_layers = $row['value'];
+		} else {
+					continue;
+		}
 	}
 
 	$smcFunc['db_free_result']($request);
@@ -1499,12 +1556,14 @@ 
 	global $themedir, $themeurl, $context;
 
 	// Cannot use the theme dir as a theme dir.
-	if (!isset($_REQUEST['theme_dir']) || empty($_REQUEST['theme_dir']) || rtrim(realpath($_REQUEST['theme_dir']), '/\\') == realpath($themedir))
-		fatal_lang_error('theme_install_invalid_dir', false);
+	if (!isset($_REQUEST['theme_dir']) || empty($_REQUEST['theme_dir']) || rtrim(realpath($_REQUEST['theme_dir']), '/\\') == realpath($themedir)) {
+			fatal_lang_error('theme_install_invalid_dir', false);
+	}
 
 	// Check is there is "something" on the dir.
-	elseif (!is_dir($_REQUEST['theme_dir']) || !file_exists($_REQUEST['theme_dir'] . '/theme_info.xml'))
-		fatal_lang_error('theme_install_error', false);
+	elseif (!is_dir($_REQUEST['theme_dir']) || !file_exists($_REQUEST['theme_dir'] . '/theme_info.xml')) {
+			fatal_lang_error('theme_install_error', false);
+	}
 
 	$name = basename($_REQUEST['theme_dir']);
 	$name = preg_replace(array('/\s/', '/\.[\.]+/', '/[^\w_\.\-]/'), array('_', '.', ''), $name);
@@ -1548,24 +1607,27 @@ 
 	}
 
 	// Any special layers?
-	if (isset($settings['catch_action']['layers']))
-		$context['template_layers'] = $settings['catch_action']['layers'];
+	if (isset($settings['catch_action']['layers'])) {
+			$context['template_layers'] = $settings['catch_action']['layers'];
+	}
 
 	// Any function to call?
 	if (isset($settings['catch_action']['function']))
 	{
 		$hook = $settings['catch_action']['function'];
 
-		if (!isset($settings['catch_action']['filename']))
-			$settings['catch_action']['filename'] = '';
+		if (!isset($settings['catch_action']['filename'])) {
+					$settings['catch_action']['filename'] = '';
+		}
 
 		add_integration_function('integrate_wrap_action', $hook, false, $settings['catch_action']['filename'], false);
 		call_integration_hook('integrate_wrap_action');
 	}
 	// And finally, the main sub template ;).
-	if (isset($settings['catch_action']['sub_template']))
-		$context['sub_template'] = $settings['catch_action']['sub_template'];
-}
+	if (isset($settings['catch_action']['sub_template'])) {
+			$context['sub_template'] = $settings['catch_action']['sub_template'];
+	}
+	}
 
 /**
  * Set an option via javascript.
@@ -1584,12 +1646,14 @@ 
 	checkSession('get');
 
 	// This good-for-nothing pixel is being used to keep the session alive.
-	if (empty($_GET['var']) || !isset($_GET['val']))
-		redirectexit($settings['images_url'] . '/blank.png');
+	if (empty($_GET['var']) || !isset($_GET['val'])) {
+			redirectexit($settings['images_url'] . '/blank.png');
+	}
 
 	// Sorry, guests can't go any further than this.
-	if ($user_info['is_guest'] || $user_info['id'] == 0)
-		obExit(false);
+	if ($user_info['is_guest'] || $user_info['id'] == 0) {
+			obExit(false);
+	}
 
 	$reservedVars = array(
 		'actual_theme_url',
@@ -1612,8 +1676,9 @@ 
 	);
 
 	// Can't change reserved vars.
-	if (in_array(strtolower($_GET['var']), $reservedVars))
-		redirectexit($settings['images_url'] . '/blank.png');
+	if (in_array(strtolower($_GET['var']), $reservedVars)) {
+			redirectexit($settings['images_url'] . '/blank.png');
+	}
 
 	// Use a specific theme?
 	if (isset($_GET['th']) || isset($_GET['id']))
@@ -1629,8 +1694,9 @@ 
 	{
 		$options['admin_preferences'] = !empty($options['admin_preferences']) ? $smcFunc['json_decode']($options['admin_preferences'], true) : array();
 		// New thingy...
-		if (isset($_GET['admin_key']) && strlen($_GET['admin_key']) < 5)
-			$options['admin_preferences'][$_GET['admin_key']] = $_GET['val'];
+		if (isset($_GET['admin_key']) && strlen($_GET['admin_key']) < 5) {
+					$options['admin_preferences'][$_GET['admin_key']] = $_GET['val'];
+		}
 
 		// Change the value to be something nice,
 		$_GET['val'] = $smcFunc['json_encode']($options['admin_preferences']);
@@ -1660,8 +1726,9 @@ 
 	global $context, $scripturl, $boarddir, $smcFunc, $txt;
 
 	// @todo Should this be removed?
-	if (isset($_REQUEST['preview']))
-		die('die() with fire');
+	if (isset($_REQUEST['preview'])) {
+			die('die() with fire');
+	}
 
 	isAllowedTo('admin_forum');
 	loadTemplate('Themes');
@@ -1675,11 +1742,11 @@ 
 		foreach ($context['themes'] as $key => $theme)
 		{
 			// There has to be a Settings template!
-			if (!file_exists($theme['theme_dir'] . '/index.template.php') && !file_exists($theme['theme_dir'] . '/css/index.css'))
-				unset($context['themes'][$key]);
-
-			else
-				$context['themes'][$key]['can_edit_style'] = file_exists($theme['theme_dir'] . '/css/index.css');
+			if (!file_exists($theme['theme_dir'] . '/index.template.php') && !file_exists($theme['theme_dir'] . '/css/index.css')) {
+							unset($context['themes'][$key]);
+			} else {
+							$context['themes'][$key]['can_edit_style'] = file_exists($theme['theme_dir'] . '/css/index.css');
+			}
 		}
 
 		$context['sub_template'] = 'edit_list';
@@ -1694,22 +1761,24 @@ 
 	$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);
+	if (!file_exists($currentTheme['theme_dir'] . '/index.template.php') && !file_exists($currentTheme['theme_dir'] . '/css/index.css')) {
+			fatal_lang_error('theme_edit_missing', false);
+	}
 
 	if (!isset($_REQUEST['filename']))
 	{
 		if (isset($_GET['directory']))
 		{
-			if (substr($_GET['directory'], 0, 1) == '.')
-				$_GET['directory'] = '';
-			else
+			if (substr($_GET['directory'], 0, 1) == '.') {
+							$_GET['directory'] = '';
+			} else
 			{
 				$_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($currentTheme['theme_dir']))) != realpath($currentTheme['theme_dir']))
-					$_GET['directory'] = '';
+				if (empty($temp) || substr($temp, 0, strlen(realpath($currentTheme['theme_dir']))) != realpath($currentTheme['theme_dir'])) {
+									$_GET['directory'] = '';
+				}
 			}
 		}
 
@@ -1728,37 +1797,39 @@ 
 				'href' => $scripturl . '?action=admin;area=theme;th=' . $_GET['th'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';sa=edit;directory=' . $temp,
 				'size' => '',
 			));
+		} else {
+					$context['theme_files'] = get_file_listing($currentTheme['theme_dir'], '');
 		}
-		else
-			$context['theme_files'] = get_file_listing($currentTheme['theme_dir'], '');
 
 		$context['sub_template'] = 'edit_browse';
 
 		return;
-	}
-	else
+	} else
 	{
-		if (substr($_REQUEST['filename'], 0, 1) == '.')
-			$_REQUEST['filename'] = '';
-		else
+		if (substr($_REQUEST['filename'], 0, 1) == '.') {
+					$_REQUEST['filename'] = '';
+		} else
 		{
 			$_REQUEST['filename'] = preg_replace(array('~^[\./\\:\0\n\r]+~', '~[\\\\]~', '~/[\./]+~'), array('', '/', '/'), $_REQUEST['filename']);
 
 			$temp = realpath($currentTheme['theme_dir'] . '/' . $_REQUEST['filename']);
-			if (empty($temp) || substr($temp, 0, strlen(realpath($currentTheme['theme_dir']))) != realpath($currentTheme['theme_dir']))
-				$_REQUEST['filename'] = '';
+			if (empty($temp) || substr($temp, 0, strlen(realpath($currentTheme['theme_dir']))) != realpath($currentTheme['theme_dir'])) {
+							$_REQUEST['filename'] = '';
+			}
 		}
 
-		if (empty($_REQUEST['filename']))
-			fatal_lang_error('theme_edit_missing', false);
+		if (empty($_REQUEST['filename'])) {
+					fatal_lang_error('theme_edit_missing', false);
+		}
 	}
 
 	if (isset($_POST['save']))
 	{
 		if (checkSession('post', '', false) == '' && validateToken('admin-te-' . md5($_GET['th'] . '-' . $_REQUEST['filename']), 'post', false) == true)
 		{
-			if (is_array($_POST['entire_file']))
-				$_POST['entire_file'] = implode("\n", $_POST['entire_file']);
+			if (is_array($_POST['entire_file'])) {
+							$_POST['entire_file'] = implode("\n", $_POST['entire_file']);
+			}
 
 			$_POST['entire_file'] = rtrim(strtr($_POST['entire_file'], array("\r" => '', '   ' => "\t")));
 
@@ -1770,10 +1841,11 @@ 
 				fclose($fp);
 
 				$error = @file_get_contents($currentTheme['theme_url'] . '/tmp_' . session_id() . '.php');
-				if (preg_match('~ <b>(\d+)</b><br( /)?' . '>$~i', $error) != 0)
-					$error_file = $currentTheme['theme_dir'] . '/tmp_' . session_id() . '.php';
-				else
-					unlink($currentTheme['theme_dir'] . '/tmp_' . session_id() . '.php');
+				if (preg_match('~ <b>(\d+)</b><br( /)?' . '>$~i', $error) != 0) {
+									$error_file = $currentTheme['theme_dir'] . '/tmp_' . session_id() . '.php';
+				} else {
+									unlink($currentTheme['theme_dir'] . '/tmp_' . session_id() . '.php');
+				}
 			}
 
 			if (!isset($error_file))
@@ -1794,10 +1866,11 @@ 
 			$context['sub_template'] = 'edit_file';
 
 			// Recycle the submitted data.
-			if (is_array($_POST['entire_file']))
-				$context['entire_file'] = $smcFunc['htmlspecialchars'](implode("\n", $_POST['entire_file']));
-			else
-				$context['entire_file'] = $smcFunc['htmlspecialchars']($_POST['entire_file']);
+			if (is_array($_POST['entire_file'])) {
+							$context['entire_file'] = $smcFunc['htmlspecialchars'](implode("\n", $_POST['entire_file']));
+			} else {
+							$context['entire_file'] = $smcFunc['htmlspecialchars']($_POST['entire_file']);
+			}
 
 			$context['edit_filename'] = $smcFunc['htmlspecialchars']($_POST['filename']);
 
@@ -1820,17 +1893,17 @@ 
 		$context['sub_template'] = 'edit_style';
 
 		$context['entire_file'] = $smcFunc['htmlspecialchars'](strtr(file_get_contents($currentTheme['theme_dir'] . '/' . $_REQUEST['filename']), array("\t" => '   ')));
-	}
-	elseif (substr($_REQUEST['filename'], -13) == '.template.php')
+	} elseif (substr($_REQUEST['filename'], -13) == '.template.php')
 	{
 		$context['sub_template'] = 'edit_template';
 
-		if (!isset($error_file))
-			$file_data = file($currentTheme['theme_dir'] . '/' . $_REQUEST['filename']);
-		else
+		if (!isset($error_file)) {
+					$file_data = file($currentTheme['theme_dir'] . '/' . $_REQUEST['filename']);
+		} else
 		{
-			if (preg_match('~(<b>.+?</b>:.+?<b>).+?(</b>.+?<b>\d+</b>)<br( /)?' . '>$~i', $error, $match) != 0)
-				$context['parse_error'] = $match[1] . $_REQUEST['filename'] . $match[2];
+			if (preg_match('~(<b>.+?</b>:.+?<b>).+?(</b>.+?<b>\d+</b>)<br( /)?' . '>$~i', $error, $match) != 0) {
+							$context['parse_error'] = $match[1] . $_REQUEST['filename'] . $match[2];
+			}
 			$file_data = file($error_file);
 			unlink($error_file);
 		}
@@ -1844,8 +1917,9 @@ 
 				// Try to format the functions a little nicer...
 				$context['file_parts'][$j]['data'] = trim($context['file_parts'][$j]['data']) . "\n";
 
-				if (empty($context['file_parts'][$j]['lines']))
-					unset($context['file_parts'][$j]);
+				if (empty($context['file_parts'][$j]['lines'])) {
+									unset($context['file_parts'][$j]);
+				}
 				$context['file_parts'][++$j] = array('lines' => 0, 'line' => $i + 1, 'data' => '');
 			}
 
@@ -1854,8 +1928,7 @@ 
 		}
 
 		$context['entire_file'] = $smcFunc['htmlspecialchars'](strtr(implode('', $file_data), array("\t" => '   ')));
-	}
-	else
+	} else
 	{
 		$context['sub_template'] = 'edit_file';
 
@@ -1881,8 +1954,9 @@ 
 
 	$_GET['th'] = isset($_GET['th']) ? (int) $_GET['th'] : (int) $_GET['id'];
 
-	if (empty($_GET['th']))
-		fatal_lang_error('theme_install_invalid_id');
+	if (empty($_GET['th'])) {
+			fatal_lang_error('theme_install_invalid_id');
+	}
 
 	// Get the theme info.
 	$theme = get_single_theme($_GET['th']);
@@ -1890,25 +1964,24 @@ 
 
 	if (isset($_REQUEST['template']) && preg_match('~[\./\\\\:\0]~', $_REQUEST['template']) == 0)
 	{
-		if (file_exists($settings['default_theme_dir'] . '/' . $_REQUEST['template'] . '.template.php'))
-			$filename = $settings['default_theme_dir'] . '/' . $_REQUEST['template'] . '.template.php';
-
-		else
-			fatal_lang_error('no_access', false);
+		if (file_exists($settings['default_theme_dir'] . '/' . $_REQUEST['template'] . '.template.php')) {
+					$filename = $settings['default_theme_dir'] . '/' . $_REQUEST['template'] . '.template.php';
+		} else {
+					fatal_lang_error('no_access', false);
+		}
 
 		$fp = fopen($theme['theme_dir'] . '/' . $_REQUEST['template'] . '.template.php', 'w');
 		fwrite($fp, file_get_contents($filename));
 		fclose($fp);
 
 		redirectexit('action=admin;area=theme;th=' . $context['theme_id'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';sa=copy');
-	}
-	elseif (isset($_REQUEST['lang_file']) && preg_match('~^[^\./\\\\:\0]\.[^\./\\\\:\0]$~', $_REQUEST['lang_file']) != 0)
+	} elseif (isset($_REQUEST['lang_file']) && preg_match('~^[^\./\\\\:\0]\.[^\./\\\\:\0]$~', $_REQUEST['lang_file']) != 0)
 	{
-		if (file_exists($settings['default_theme_dir'] . '/languages/' . $_REQUEST['template'] . '.php'))
-			$filename = $settings['default_theme_dir'] . '/languages/' . $_REQUEST['template'] . '.php';
-
-		else
-			fatal_lang_error('no_access', false);
+		if (file_exists($settings['default_theme_dir'] . '/languages/' . $_REQUEST['template'] . '.php')) {
+					$filename = $settings['default_theme_dir'] . '/languages/' . $_REQUEST['template'] . '.php';
+		} else {
+					fatal_lang_error('no_access', false);
+		}
 
 		$fp = fopen($theme['theme_dir'] . '/languages/' . $_REQUEST['lang_file'] . '.php', 'w');
 		fwrite($fp, file_get_contents($filename));
@@ -1923,16 +1996,18 @@ 
 	$dir = dir($settings['default_theme_dir']);
 	while ($entry = $dir->read())
 	{
-		if (substr($entry, -13) == '.template.php')
-			$templates[] = substr($entry, 0, -13);
+		if (substr($entry, -13) == '.template.php') {
+					$templates[] = substr($entry, 0, -13);
+		}
 	}
 	$dir->close();
 
 	$dir = dir($settings['default_theme_dir'] . '/languages');
 	while ($entry = $dir->read())
 	{
-		if (preg_match('~^([^\.]+\.[^\.]+)\.php$~', $entry, $matches))
-			$lang_files[] = $matches[1];
+		if (preg_match('~^([^\.]+\.[^\.]+)\.php$~', $entry, $matches)) {
+					$lang_files[] = $matches[1];
+		}
 	}
 	$dir->close();
 
@@ -1940,21 +2015,23 @@ 
 	natcasesort($lang_files);
 
 	$context['available_templates'] = array();
-	foreach ($templates as $template)
-		$context['available_templates'][$template] = array(
+	foreach ($templates as $template) {
+			$context['available_templates'][$template] = array(
 			'filename' => $template . '.template.php',
 			'value' => $template,
 			'already_exists' => false,
 			'can_copy' => is_writable($theme['theme_dir']),
 		);
+	}
 	$context['available_language_files'] = array();
-	foreach ($lang_files as $file)
-		$context['available_language_files'][$file] = array(
+	foreach ($lang_files as $file) {
+			$context['available_language_files'][$file] = array(
 			'filename' => $file . '.php',
 			'value' => $file,
 			'already_exists' => false,
 			'can_copy' => file_exists($theme['theme_dir'] . '/languages') ? is_writable($theme['theme_dir'] . '/languages') : is_writable($theme['theme_dir']),
 		);
+	}
 
 	$dir = dir($theme['theme_dir']);
 	while ($entry = $dir->read())

Sources/Subs-Menu.php

Braces +87 added lines, -63 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Create a menu.
@@ -64,22 +65,26 @@ 
 	$menu_context['current_action'] = isset($menuOptions['action']) ? $menuOptions['action'] : $context['current_action'];
 
 	// Allow extend *any* menu with a single hook
-	if (!empty($menu_context['current_action']))
-		call_integration_hook('integrate_' . $menu_context['current_action'] . '_areas', array(&$menuData));
+	if (!empty($menu_context['current_action'])) {
+			call_integration_hook('integrate_' . $menu_context['current_action'] . '_areas', array(&$menuData));
+	}
 
 	// What is the current area selected?
-	if (isset($menuOptions['current_area']) || isset($_GET['area']))
-		$menu_context['current_area'] = isset($menuOptions['current_area']) ? $menuOptions['current_area'] : $_GET['area'];
+	if (isset($menuOptions['current_area']) || isset($_GET['area'])) {
+			$menu_context['current_area'] = isset($menuOptions['current_area']) ? $menuOptions['current_area'] : $_GET['area'];
+	}
 
 	// Build a list of additional parameters that should go in the URL.
 	$menu_context['extra_parameters'] = '';
-	if (!empty($menuOptions['extra_url_parameters']))
-		foreach ($menuOptions['extra_url_parameters'] as $key => $value)
+	if (!empty($menuOptions['extra_url_parameters'])) {
+			foreach ($menuOptions['extra_url_parameters'] as $key => $value)
 			$menu_context['extra_parameters'] .= ';' . $key . '=' . $value;
+	}
 
 	// Only include the session ID in the URL if it's strictly necessary.
-	if (empty($menuOptions['disable_url_session_check']))
-		$menu_context['extra_parameters'] .= ';' . $context['session_var'] . '=' . $context['session_id'];
+	if (empty($menuOptions['disable_url_session_check'])) {
+			$menu_context['extra_parameters'] .= ';' . $context['session_var'] . '=' . $context['session_id'];
+	}
 
 	$include_data = array();
 
@@ -87,8 +92,9 @@ 
 	foreach ($menuData as $section_id => $section)
 	{
 		// Is this enabled - or has as permission check - which fails?
-		if ((isset($section['enabled']) && $section['enabled'] == false) || (isset($section['permission']) && !allowedTo($section['permission'])))
-			continue;
+		if ((isset($section['enabled']) && $section['enabled'] == false) || (isset($section['permission']) && !allowedTo($section['permission']))) {
+					continue;
+		}
 
 		// Now we cycle through the sections to pick the right area.
 		foreach ($section['areas'] as $area_id => $area)
@@ -110,41 +116,45 @@ 
 					if (empty($area['hidden']))
 					{
 						// First time this section?
-						if (!isset($menu_context['sections'][$section_id]))
-							$menu_context['sections'][$section_id]['title'] = $section['title'];
+						if (!isset($menu_context['sections'][$section_id])) {
+													$menu_context['sections'][$section_id]['title'] = $section['title'];
+						}
 
 						$menu_context['sections'][$section_id]['areas'][$area_id] = array('label' => isset($area['label']) ? $area['label'] : $txt[$area_id]);
 						// We'll need the ID as well...
 						$menu_context['sections'][$section_id]['id'] = $section_id;
 						// Does it have a custom URL?
-						if (isset($area['custom_url']))
-							$menu_context['sections'][$section_id]['areas'][$area_id]['url'] = $area['custom_url'];
+						if (isset($area['custom_url'])) {
+													$menu_context['sections'][$section_id]['areas'][$area_id]['url'] = $area['custom_url'];
+						}
 
 						// Does this area have its own icon?
-						if (!isset($area['force_menu_into_arms_of_another_menu']) && $user_info['name'] == 'iamanoompaloompa')
-							$menu_context['sections'][$section_id]['areas'][$area_id] = $smcFunc['json_decode'](base64_decode('eyJsYWJlbCI6Ik9vbXBhIExvb21wYSIsInVybCI6Imh0dHBzOlwvXC9lbi53aWtpcGVkaWEub3JnXC93aWtpXC9Pb21wYV9Mb29tcGFzPyIsImljb24iOiI8aW1nIHNyYz1cImh0dHBzOlwvXC93d3cuc2ltcGxlbWFjaGluZXMub3JnXC9pbWFnZXNcL29vbXBhLmdpZlwiIGFsdD1cIkknbSBhbiBPb21wYSBMb29tcGFcIiBcLz4ifQ=='), true);
-						elseif (isset($area['icon']) && file_exists($settings['theme_dir'] . '/images/admin/' . $area['icon']))
-							$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<img src="' . $settings['images_url'] . '/admin/' . $area['icon'] . '" alt="">';
-						elseif (isset($area['icon']) && file_exists($settings['default_theme_dir'] . '/images/admin/' . $area['icon']))
-							$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<img src="' . $settings['default_images_url'] . '/admin/' . $area['icon'] . '" alt="">';
-						elseif (isset($area['icon']))
-							$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<span class="generic_icons ' . $area['icon'] . '"></span>';
-						else
-							$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<span class="generic_icons ' . $area_id . '"></span>';
-
-						if (isset($area['icon_class']) && empty($menu_context['sections'][$section_id]['areas'][$area_id]['icon']))
-							$menu_context['sections'][$section_id]['areas'][$area_id]['icon_class'] = $menu_context['current_action'] . '_menu_icon ' . $area['icon_class'];
-						elseif (isset($area['icon']))
+						if (!isset($area['force_menu_into_arms_of_another_menu']) && $user_info['name'] == 'iamanoompaloompa') {
+													$menu_context['sections'][$section_id]['areas'][$area_id] = $smcFunc['json_decode'](base64_decode('eyJsYWJlbCI6Ik9vbXBhIExvb21wYSIsInVybCI6Imh0dHBzOlwvXC9lbi53aWtpcGVkaWEub3JnXC93aWtpXC9Pb21wYV9Mb29tcGFzPyIsImljb24iOiI8aW1nIHNyYz1cImh0dHBzOlwvXC93d3cuc2ltcGxlbWFjaGluZXMub3JnXC9pbWFnZXNcL29vbXBhLmdpZlwiIGFsdD1cIkknbSBhbiBPb21wYSBMb29tcGFcIiBcLz4ifQ=='), true);
+						} elseif (isset($area['icon']) && file_exists($settings['theme_dir'] . '/images/admin/' . $area['icon'])) {
+													$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<img src="' . $settings['images_url'] . '/admin/' . $area['icon'] . '" alt="">';
+						} elseif (isset($area['icon']) && file_exists($settings['default_theme_dir'] . '/images/admin/' . $area['icon'])) {
+													$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<img src="' . $settings['default_images_url'] . '/admin/' . $area['icon'] . '" alt="">';
+						} elseif (isset($area['icon'])) {
+													$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<span class="generic_icons ' . $area['icon'] . '"></span>';
+						} else {
+													$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<span class="generic_icons ' . $area_id . '"></span>';
+						}
+
+						if (isset($area['icon_class']) && empty($menu_context['sections'][$section_id]['areas'][$area_id]['icon'])) {
+													$menu_context['sections'][$section_id]['areas'][$area_id]['icon_class'] = $menu_context['current_action'] . '_menu_icon ' . $area['icon_class'];
+						} elseif (isset($area['icon']))
 						{
-							if ((substr($area['icon'], -4) === '.png' || substr($area['icon'], -4) === '.gif') && file_exists($settings['theme_dir'] . '/images/admin/big/' . $area['icon']))
-								$menu_context['sections'][$section_id]['areas'][$area_id]['icon_file'] = $settings['theme_url'] . '/images/admin/big/' . $area['icon'];
-							elseif ((substr($area['icon'], -4) === '.png' || substr($area['icon'], -4) === '.gif') && file_exists($settings['default_theme_dir'] . '/images/admin/big/' . $area['icon']))
-								$menu_context['sections'][$section_id]['areas'][$area_id]['icon_file'] = $settings['default_theme_url'] . '/images/admin/big/' . $area['icon'];
+							if ((substr($area['icon'], -4) === '.png' || substr($area['icon'], -4) === '.gif') && file_exists($settings['theme_dir'] . '/images/admin/big/' . $area['icon'])) {
+															$menu_context['sections'][$section_id]['areas'][$area_id]['icon_file'] = $settings['theme_url'] . '/images/admin/big/' . $area['icon'];
+							} elseif ((substr($area['icon'], -4) === '.png' || substr($area['icon'], -4) === '.gif') && file_exists($settings['default_theme_dir'] . '/images/admin/big/' . $area['icon'])) {
+															$menu_context['sections'][$section_id]['areas'][$area_id]['icon_file'] = $settings['default_theme_url'] . '/images/admin/big/' . $area['icon'];
+							}
 
 							$menu_context['sections'][$section_id]['areas'][$area_id]['icon_class'] = $menu_context['current_action'] . '_menu_icon ' . str_replace(array('.png', '.gif'), '', $area['icon']);
+						} else {
+													$menu_context['sections'][$section_id]['areas'][$area_id]['icon_class'] = $menu_context['current_action'] . '_menu_icon ' . str_replace(array('.png', '.gif'), '', $area_id);
 						}
-						else
-							$menu_context['sections'][$section_id]['areas'][$area_id]['icon_class'] = $menu_context['current_action'] . '_menu_icon ' . str_replace(array('.png', '.gif'), '', $area_id);
 
 						// Some areas may be listed but not active, which we show as greyed out.
 						$menu_context['sections'][$section_id]['areas'][$area_id]['inactive'] = !empty($area['inactive']);
@@ -158,35 +168,41 @@ 
 							{
 								if ((empty($sub[1]) || allowedTo($sub[1])) && (!isset($sub['enabled']) || !empty($sub['enabled'])))
 								{
-									if ($first_sa == null)
-										$first_sa = $sa;
+									if ($first_sa == null) {
+																			$first_sa = $sa;
+									}
 
 									$menu_context['sections'][$section_id]['areas'][$area_id]['subsections'][$sa] = array('label' => $sub[0]);
 									// Custom URL?
-									if (isset($sub['url']))
-										$menu_context['sections'][$section_id]['areas'][$area_id]['subsections'][$sa]['url'] = $sub['url'];
+									if (isset($sub['url'])) {
+																			$menu_context['sections'][$section_id]['areas'][$area_id]['subsections'][$sa]['url'] = $sub['url'];
+									}
 
 									// A bit complicated - but is this set?
 									if ($menu_context['current_area'] == $area_id)
 									{
 										// Save which is the first...
-										if (empty($first_sa))
-											$first_sa = $sa;
+										if (empty($first_sa)) {
+																					$first_sa = $sa;
+										}
 
 										// Is this the current subsection?
-										if (isset($_REQUEST['sa']) && $_REQUEST['sa'] == $sa)
-											$menu_context['current_subsection'] = $sa;
+										if (isset($_REQUEST['sa']) && $_REQUEST['sa'] == $sa) {
+																					$menu_context['current_subsection'] = $sa;
+										}
 										// Otherwise is it the default?
-										elseif (!isset($menu_context['current_subsection']) && !empty($sub[2]))
-											$menu_context['current_subsection'] = $sa;
+										elseif (!isset($menu_context['current_subsection']) && !empty($sub[2])) {
+																					$menu_context['current_subsection'] = $sa;
+										}
 									}
 
 									// Let's assume this is the last, for now.
 									$last_sa = $sa;
 								}
 								// Mark it as disabled...
-								else
-									$menu_context['sections'][$section_id]['areas'][$area_id]['subsections'][$sa]['disabled'] = true;
+								else {
+																	$menu_context['sections'][$section_id]['areas'][$area_id]['subsections'][$sa]['disabled'] = true;
+								}
 							}
 
 							// Set which one is first, last and selected in the group.
@@ -195,8 +211,9 @@ 
 								$menu_context['sections'][$section_id]['areas'][$area_id]['subsections'][$context['right_to_left'] ? $last_sa : $first_sa]['is_first'] = true;
 								$menu_context['sections'][$section_id]['areas'][$area_id]['subsections'][$context['right_to_left'] ? $first_sa : $last_sa]['is_last'] = true;
 
-								if ($menu_context['current_area'] == $area_id && !isset($menu_context['current_subsection']))
-									$menu_context['current_subsection'] = $first_sa;
+								if ($menu_context['current_area'] == $area_id && !isset($menu_context['current_subsection'])) {
+																	$menu_context['current_subsection'] = $first_sa;
+								}
 							}
 						}
 					}
@@ -230,23 +247,26 @@ 
 	$menu_context['base_url'] = isset($menuOptions['base_url']) ? $menuOptions['base_url'] : $scripturl . '?action=' . $menu_context['current_action'];
 
 	// If we didn't find the area we were looking for go to a default one.
-	if (isset($backup_area) && empty($found_section))
-		$menu_context['current_area'] = $backup_area;
+	if (isset($backup_area) && empty($found_section)) {
+			$menu_context['current_area'] = $backup_area;
+	}
 
 	// If there are sections quickly goes through all the sections to check if the base menu has an url
 	if (!empty($menu_context['current_section']))
 	{
 		$menu_context['sections'][$menu_context['current_section']]['selected'] = true;
 		$menu_context['sections'][$menu_context['current_section']]['areas'][$menu_context['current_area']]['selected'] = true;
-		if (!empty($menu_context['sections'][$menu_context['current_section']]['areas'][$menu_context['current_area']]['subsections'][$context['current_subaction']]))
-			$menu_context['sections'][$menu_context['current_section']]['areas'][$menu_context['current_area']]['subsections'][$context['current_subaction']]['selected'] = true;
+		if (!empty($menu_context['sections'][$menu_context['current_section']]['areas'][$menu_context['current_area']]['subsections'][$context['current_subaction']])) {
+					$menu_context['sections'][$menu_context['current_section']]['areas'][$menu_context['current_area']]['subsections'][$context['current_subaction']]['selected'] = true;
+		}
 
-		foreach ($menu_context['sections'] as $section_id => $section)
-			foreach ($section['areas'] as $area_id => $area)
+		foreach ($menu_context['sections'] as $section_id => $section) {
+					foreach ($section['areas'] as $area_id => $area)
 			{
 				if (!isset($menu_context['sections'][$section_id]['url']))
 				{
 					$menu_context['sections'][$section_id]['url'] = isset($area['url']) ? $area['url'] : $menu_context['base_url'] . ';area=' . $area_id;
+		}
 					break;
 				}
 			}
@@ -257,8 +277,9 @@ 
 	{
 		// Never happened!
 		$context['max_menu_id']--;
-		if ($context['max_menu_id'] == 0)
-			unset($context['max_menu_id']);
+		if ($context['max_menu_id'] == 0) {
+					unset($context['max_menu_id']);
+		}
 
 		return false;
 	}
@@ -269,8 +290,9 @@ 
 	$context['template_layers'][] = $menu_context['layer_name'];
 
 	// Check we had something - for sanity sake.
-	if (empty($include_data))
-		return false;
+	if (empty($include_data)) {
+			return false;
+	}
 
 	// Finally - return information on the selected item.
 	$include_data += array(
@@ -293,12 +315,14 @@ 
 	global $context;
 
 	$menu_name = $menu_id == 'last' && isset($context['max_menu_id']) && isset($context['menu_data_' . $context['max_menu_id']]) ? 'menu_data_' . $context['max_menu_id'] : 'menu_data_' . $menu_id;
-	if (!isset($context[$menu_name]))
-		return false;
+	if (!isset($context[$menu_name])) {
+			return false;
+	}
 
 	$layer_index = array_search($context[$menu_name]['layer_name'], $context['template_layers']);
-	if ($layer_index !== false)
-		unset($context['template_layers'][$layer_index]);
+	if ($layer_index !== false) {
+			unset($context['template_layers'][$layer_index]);
+	}
 
 	unset($context[$menu_name]);
 }

Sources/Drafts.php

Braces +75 added lines, -53 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 loadLanguage('Drafts');
 
@@ -33,8 +34,9 @@ 
 	global $context, $user_info, $smcFunc, $modSettings, $board;
 
 	// can you be, should you be ... here?
-	if (empty($modSettings['drafts_post_enabled']) || !allowedTo('post_draft') || !isset($_POST['save_draft']) || !isset($_POST['id_draft']))
-		return false;
+	if (empty($modSettings['drafts_post_enabled']) || !allowedTo('post_draft') || !isset($_POST['save_draft']) || !isset($_POST['id_draft'])) {
+			return false;
+	}
 
 	// read in what they sent us, if anything
 	$id_draft = (int) $_POST['id_draft'];
@@ -46,14 +48,16 @@ 
 		$context['draft_saved_on'] = $draft_info['poster_time'];
 
 		// since we were called from the autosave function, send something back
-		if (!empty($id_draft))
-			XmlDraft($id_draft);
+		if (!empty($id_draft)) {
+					XmlDraft($id_draft);
+		}
 
 		return true;
 	}
 
-	if (!isset($_POST['message']))
-		$_POST['message'] = isset($_POST['quickReply']) ? $_POST['quickReply'] : '';
+	if (!isset($_POST['message'])) {
+			$_POST['message'] = isset($_POST['quickReply']) ? $_POST['quickReply'] : '';
+	}
 
 	// prepare any data from the form
 	$topic_id = empty($_REQUEST['topic']) ? 0 : (int) $_REQUEST['topic'];
@@ -66,8 +70,9 @@ 
 
 	// message and subject still need a bit more work
 	preparsecode($draft['body']);
-	if ($smcFunc['strlen']($draft['subject']) > 100)
-		$draft['subject'] = $smcFunc['substr']($draft['subject'], 0, 100);
+	if ($smcFunc['strlen']($draft['subject']) > 100) {
+			$draft['subject'] = $smcFunc['substr']($draft['subject'], 0, 100);
+	}
 
 	// Modifying an existing draft, like hitting the save draft button or autosave enabled?
 	if (!empty($id_draft) && !empty($draft_info))
@@ -148,9 +153,9 @@ 
 		{
 			$context['draft_saved'] = true;
 			$context['id_draft'] = $id_draft;
+		} else {
+					$post_errors[] = 'draft_not_saved';
 		}
-		else
-			$post_errors[] = 'draft_not_saved';
 
 		// cleanup
 		unset($_POST['save_draft']);
@@ -180,8 +185,9 @@ 
 	global $context, $user_info, $smcFunc, $modSettings;
 
 	// PM survey says ... can you stay or must you go
-	if (empty($modSettings['drafts_pm_enabled']) || !allowedTo('pm_draft') || !isset($_POST['save_draft']))
-		return false;
+	if (empty($modSettings['drafts_pm_enabled']) || !allowedTo('pm_draft') || !isset($_POST['save_draft'])) {
+			return false;
+	}
 
 	// read in what you sent us
 	$id_pm_draft = (int) $_POST['id_pm_draft'];
@@ -193,8 +199,9 @@ 
 		$context['draft_saved_on'] = $draft_info['poster_time'];
 
 		// Send something back to the javascript caller
-		if (!empty($id_draft))
-			XmlDraft($id_draft);
+		if (!empty($id_draft)) {
+					XmlDraft($id_draft);
+		}
 
 		return true;
 	}
@@ -204,9 +211,9 @@ 
 	{
 		$recipientList['to'] = isset($_POST['recipient_to']) ? explode(',', $_POST['recipient_to']) : array();
 		$recipientList['bcc'] = isset($_POST['recipient_bcc']) ? explode(',', $_POST['recipient_bcc']) : array();
+	} elseif (!empty($draft_info['to_list']) && empty($recipientList)) {
+			$recipientList = $smcFunc['json_decode']($draft_info['to_list'], true);
 	}
-	elseif (!empty($draft_info['to_list']) && empty($recipientList))
-		$recipientList = $smcFunc['json_decode']($draft_info['to_list'], true);
 
 	// prepare the data we got from the form
 	$reply_id = empty($_POST['replied_to']) ? 0 : (int) $_POST['replied_to'];
@@ -215,8 +222,9 @@ 
 
 	// message and subject always need a bit more work
 	preparsecode($draft['body']);
-	if ($smcFunc['strlen']($draft['subject']) > 100)
-		$draft['subject'] = $smcFunc['substr']($draft['subject'], 0, 100);
+	if ($smcFunc['strlen']($draft['subject']) > 100) {
+			$draft['subject'] = $smcFunc['substr']($draft['subject'], 0, 100);
+	}
 
 	// Modifying an existing PM draft?
 	if (!empty($id_pm_draft) && !empty($draft_info))
@@ -280,9 +288,9 @@ 
 		{
 			$context['draft_saved'] = true;
 			$context['id_pm_draft'] = $id_pm_draft;
+		} else {
+					$post_errors[] = 'draft_not_saved';
 		}
-		else
-			$post_errors[] = 'draft_not_saved';
 	}
 
 	// if we were called from the autosave function, send something back
@@ -315,8 +323,9 @@ 
 	$type = (int) $type;
 
 	// nothing to read, nothing to do
-	if (empty($id_draft))
-		return false;
+	if (empty($id_draft)) {
+			return false;
+	}
 
 	// load in this draft from the DB
 	$request = $smcFunc['db_query']('', '
@@ -337,8 +346,9 @@ 
 	);
 
 	// no results?
-	if (!$smcFunc['db_num_rows']($request))
-		return false;
+	if (!$smcFunc['db_num_rows']($request)) {
+			return false;
+	}
 
 	// load up the data
 	$draft_info = $smcFunc['db_fetch_assoc']($request);
@@ -358,8 +368,7 @@ 
 			$context['subject'] = !empty($draft_info['subject']) ? stripslashes($draft_info['subject']) : '';
 			$context['board'] = !empty($draft_info['id_board']) ? $draft_info['id_board'] : '';
 			$context['id_draft'] = !empty($draft_info['id_draft']) ? $draft_info['id_draft'] : 0;
-		}
-		elseif ($type === 1)
+		} elseif ($type === 1)
 		{
 			// one of those pm drafts? then set it up like we have an error
 			$_REQUEST['subject'] = !empty($draft_info['subject']) ? stripslashes($draft_info['subject']) : '';
@@ -395,12 +404,14 @@ 
 	global $user_info, $smcFunc;
 
 	// Only a single draft.
-	if (is_numeric($id_draft))
-		$id_draft = array($id_draft);
+	if (is_numeric($id_draft)) {
+			$id_draft = array($id_draft);
+	}
 
 	// can't delete nothing
-	if (empty($id_draft) || ($check && empty($user_info['id'])))
-		return false;
+	if (empty($id_draft) || ($check && empty($user_info['id']))) {
+			return false;
+	}
 
 	$smcFunc['db_query']('', '
 		DELETE FROM {db_prefix}user_drafts
@@ -429,14 +440,16 @@ 
 	global $smcFunc, $scripturl, $context, $txt, $modSettings;
 
 	// Permissions
-	if (($draft_type === 0 && empty($context['drafts_save'])) || ($draft_type === 1 && empty($context['drafts_pm_save'])) || empty($member_id))
-		return false;
+	if (($draft_type === 0 && empty($context['drafts_save'])) || ($draft_type === 1 && empty($context['drafts_pm_save'])) || empty($member_id)) {
+			return false;
+	}
 
 	$context['drafts'] = array();
 
 	// has a specific draft has been selected?  Load it up if there is not a message already in the editor
-	if (isset($_REQUEST['id_draft']) && empty($_POST['subject']) && empty($_POST['message']))
-		ReadDraft((int) $_REQUEST['id_draft'], $draft_type, true, true);
+	if (isset($_REQUEST['id_draft']) && empty($_POST['subject']) && empty($_POST['message'])) {
+			ReadDraft((int) $_REQUEST['id_draft'], $draft_type, true, true);
+	}
 
 	// load the drafts this user has available
 	$request = $smcFunc['db_query']('', '
@@ -459,8 +472,9 @@ 
 	// add them to the draft array for display
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (empty($row['subject']))
-			$row['subject'] = $txt['no_subject'];
+		if (empty($row['subject'])) {
+					$row['subject'] = $txt['no_subject'];
+		}
 
 		// Post drafts
 		if ($draft_type === 0)
@@ -545,8 +559,9 @@ 
 	}
 
 	// Default to 10.
-	if (empty($_REQUEST['viewscount']) || !is_numeric($_REQUEST['viewscount']))
-		$_REQUEST['viewscount'] = 10;
+	if (empty($_REQUEST['viewscount']) || !is_numeric($_REQUEST['viewscount'])) {
+			$_REQUEST['viewscount'] = 10;
+	}
 
 	// Get the count of applicable drafts on the boards they can (still) see ...
 	// @todo .. should we just let them see their drafts even if they have lost board access ?
@@ -611,12 +626,14 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Censor....
-		if (empty($row['body']))
-			$row['body'] = '';
+		if (empty($row['body'])) {
+					$row['body'] = '';
+		}
 
 		$row['subject'] = $smcFunc['htmltrim']($row['subject']);
-		if (empty($row['subject']))
-			$row['subject'] = $txt['no_subject'];
+		if (empty($row['subject'])) {
+					$row['subject'] = $txt['no_subject'];
+		}
 
 		censorText($row['body']);
 		censorText($row['subject']);
@@ -648,8 +665,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// If the drafts were retrieved in reverse order, get them right again.
-	if ($reverse)
-		$context['drafts'] = array_reverse($context['drafts'], true);
+	if ($reverse) {
+			$context['drafts'] = array_reverse($context['drafts'], true);
+	}
 
 	// Menu tab
 	$context[$context['profile_menu_name']]['tab_data'] = array(
@@ -707,8 +725,9 @@ 
 	}
 
 	// Default to 10.
-	if (empty($_REQUEST['viewscount']) || !is_numeric($_REQUEST['viewscount']))
-		$_REQUEST['viewscount'] = 10;
+	if (empty($_REQUEST['viewscount']) || !is_numeric($_REQUEST['viewscount'])) {
+			$_REQUEST['viewscount'] = 10;
+	}
 
 	// Get the count of applicable drafts
 	$request = $smcFunc['db_query']('', '
@@ -767,12 +786,14 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Censor....
-		if (empty($row['body']))
-			$row['body'] = '';
+		if (empty($row['body'])) {
+					$row['body'] = '';
+		}
 
 		$row['subject'] = $smcFunc['htmltrim']($row['subject']);
-		if (empty($row['subject']))
-			$row['subject'] = $txt['no_subject'];
+		if (empty($row['subject'])) {
+					$row['subject'] = $txt['no_subject'];
+		}
 
 		censorText($row['body']);
 		censorText($row['subject']);
@@ -827,8 +848,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// if the drafts were retrieved in reverse order, then put them in the right order again.
-	if ($reverse)
-		$context['drafts'] = array_reverse($context['drafts'], true);
+	if ($reverse) {
+			$context['drafts'] = array_reverse($context['drafts'], true);
+	}
 
 	// off to the template we go
 	$context['page_title'] = $txt['drafts'];

Sources/ModerationCenter.php

Braces +139 added lines, -102 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Entry point for the moderation center.
@@ -26,8 +27,9 @@ 
 	global $smcFunc, $txt, $context, $scripturl, $modSettings, $user_info, $sourcedir, $options;
 
 	// Don't run this twice... and don't conflict with the admin bar.
-	if (isset($context['admin_area']))
-		return;
+	if (isset($context['admin_area'])) {
+			return;
+	}
 
 	$context['can_moderate_boards'] = $user_info['mod_cache']['bq'] != '0=1';
 	$context['can_moderate_groups'] = $user_info['mod_cache']['gq'] != '0=1';
@@ -35,8 +37,9 @@ 
 	$context['can_moderate_users'] = allowedTo('moderate_forum');
 
 	// Everyone using this area must be allowed here!
-	if (!$context['can_moderate_boards'] && !$context['can_moderate_groups'] && !$context['can_moderate_approvals'] && !$context['can_moderate_users'])
-		isAllowedTo('access_mod_center');
+	if (!$context['can_moderate_boards'] && !$context['can_moderate_groups'] && !$context['can_moderate_approvals'] && !$context['can_moderate_users']) {
+			isAllowedTo('access_mod_center');
+	}
 
 	// We're gonna want a menu of some kind.
 	require_once($sourcedir . '/Subs-Menu.php');
@@ -195,8 +198,9 @@ 
 	unset($moderation_areas);
 
 	// We got something - didn't we? DIDN'T WE!
-	if ($mod_include_data == false)
-		fatal_lang_error('no_access', false);
+	if ($mod_include_data == false) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Retain the ID information in case required by a subaction.
 	$context['moderation_menu_id'] = $context['max_menu_id'];
@@ -219,22 +223,25 @@ 
 		'url' => $scripturl . '?action=moderate',
 		'name' => $txt['moderation_center'],
 	);
-	if (isset($mod_include_data['current_area']) && $mod_include_data['current_area'] != 'index')
-		$context['linktree'][] = array(
+	if (isset($mod_include_data['current_area']) && $mod_include_data['current_area'] != 'index') {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=moderate;area=' . $mod_include_data['current_area'],
 			'name' => $mod_include_data['label'],
 		);
-	if (!empty($mod_include_data['current_subsection']) && $mod_include_data['subsections'][$mod_include_data['current_subsection']][0] != $mod_include_data['label'])
-		$context['linktree'][] = array(
+	}
+	if (!empty($mod_include_data['current_subsection']) && $mod_include_data['subsections'][$mod_include_data['current_subsection']][0] != $mod_include_data['label']) {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=moderate;area=' . $mod_include_data['current_area'] . ';sa=' . $mod_include_data['current_subsection'],
 			'name' => $mod_include_data['subsections'][$mod_include_data['current_subsection']][0],
 		);
+	}
 
 	// Now - finally - the bit before the encore - the main performance of course!
 	if (!$dont_call)
 	{
-		if (isset($mod_include_data['file']))
-			require_once($sourcedir . '/' . $mod_include_data['file']);
+		if (isset($mod_include_data['file'])) {
+					require_once($sourcedir . '/' . $mod_include_data['file']);
+		}
 
 		call_helper($mod_include_data['function']);
 	}
@@ -259,8 +266,9 @@ 
 	// Load what blocks the user actually can see...
 	$valid_blocks = array();
 
-	if ($context['can_moderate_groups'])
-		$valid_blocks['g'] = 'GroupRequests';
+	if ($context['can_moderate_groups']) {
+			$valid_blocks['g'] = 'GroupRequests';
+	}
 	if ($context['can_moderate_boards'])
 	{
 		$valid_blocks['r'] = 'ReportedPosts';
@@ -269,8 +277,9 @@ 
 	if ($context['can_moderate_users'])
 	{
 		// This falls under the category of moderating users as well...
-		if (!$context['can_moderate_boards'])
-			$valid_blocks['w'] = 'WatchedUsers';
+		if (!$context['can_moderate_boards']) {
+					$valid_blocks['w'] = 'WatchedUsers';
+		}
 
 		$valid_blocks['rm'] = 'ReportedMembers';
 	}
@@ -281,8 +290,9 @@ 
 	foreach ($valid_blocks as $k => $block)
 	{
 		$block = 'ModBlock' . $block;
-		if (function_exists($block))
-			$context['mod_blocks'][] = $block();
+		if (function_exists($block)) {
+					$context['mod_blocks'][] = $block();
+		}
 	}
 
 	$context['admin_prefs'] = !empty($options['admin_preferences']) ? $smcFunc['json_decode']($options['admin_preferences'], true) : array();
@@ -309,8 +319,9 @@ 
 			)
 		);
 		$watched_users = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$watched_users[] = $row;
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$watched_users[] = $row;
+		}
 		$smcFunc['db_free_result']($request);
 
 		cache_put_data('recent_user_watches', $watched_users, 240);
@@ -402,8 +413,9 @@ 
 			$note_owner = $smcFunc['db_num_rows']($get_owner);
 			$smcFunc['db_free_result']($get_owner);
 
-			if (empty($note_owner))
-				fatal_lang_error('mc_notes_delete_own', false);
+			if (empty($note_owner)) {
+							fatal_lang_error('mc_notes_delete_own', false);
+			}
 		}
 
 		// Lets delete it.
@@ -460,12 +472,14 @@ 
 			)
 		);
 		$moderator_notes = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$moderator_notes[] = $row;
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$moderator_notes[] = $row;
+		}
 		$smcFunc['db_free_result']($request);
 
-		if ($offset == 0)
-			cache_put_data('moderator_notes', $moderator_notes, 240);
+		if ($offset == 0) {
+					cache_put_data('moderator_notes', $moderator_notes, 240);
+		}
 	}
 
 	// Lets construct a page index.
@@ -504,8 +518,9 @@ 
 	// Got the info already?
 	$cachekey = md5($smcFunc['json_encode']($user_info['mod_cache']['bq']));
 	$context['reported_posts'] = array();
-	if ($user_info['mod_cache']['bq'] == '0=1')
-		return 'reported_posts_block';
+	if ($user_info['mod_cache']['bq'] == '0=1') {
+			return 'reported_posts_block';
+	}
 
 	if (($reported_posts = cache_get_data('reported_posts_' . $cachekey, 90)) === null)
 	{
@@ -529,8 +544,9 @@ 
 			)
 		);
 		$reported_posts = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$reported_posts[] = $row;
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$reported_posts[] = $row;
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Cache it.
@@ -568,8 +584,9 @@ 
 
 	$context['group_requests'] = array();
 	// Make sure they can even moderate someone!
-	if ($user_info['mod_cache']['gq'] == '0=1')
-		return 'group_requests_block';
+	if ($user_info['mod_cache']['gq'] == '0=1') {
+			return 'group_requests_block';
+	}
 
 	// What requests are outstanding?
 	$request = $smcFunc['db_query']('', '
@@ -618,8 +635,9 @@ 
 	// Got the info already?
 	$cachekey = md5($smcFunc['json_encode']((int) allowedTo('moderate_forum')));
 	$context['reported_users'] = array();
-	if (!allowedTo('moderate_forum'))
-		return 'reported_users_block';
+	if (!allowedTo('moderate_forum')) {
+			return 'reported_users_block';
+	}
 
 	if (($reported_users = cache_get_data('reported_users_' . $cachekey, 90)) === null)
 	{
@@ -642,8 +660,9 @@ 
 			)
 		);
 		$reported_users = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$reported_users[] = $row;
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$reported_users[] = $row;
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Cache it.
@@ -691,8 +710,9 @@ 
 	isAllowedTo('moderate_forum');
 
 	// Are they wanting to view a particular report?
-	if (!empty($_REQUEST['report']))
-		return MemberReport();
+	if (!empty($_REQUEST['report'])) {
+			return MemberReport();
+	}
 
 	// Set up the comforting bits...
 	$context['page_title'] = $txt['mc_reported_members'];
@@ -746,15 +766,15 @@ 
 		// Time to update.
 		updateSettings(array('last_mod_report_action' => time()));
 		recountOpenReports('members');
-	}
-	elseif (isset($_POST['close']) && isset($_POST['close_selected']))
+	} elseif (isset($_POST['close']) && isset($_POST['close_selected']))
 	{
 		checkSession();
 
 		// All the ones to update...
 		$toClose = array();
-		foreach ($_POST['close'] as $rid)
-			$toClose[] = (int) $rid;
+		foreach ($_POST['close'] as $rid) {
+					$toClose[] = (int) $rid;
+		}
 
 		if (!empty($toClose))
 		{
@@ -907,8 +927,9 @@ 
 	global $context, $user_info;
 
 	// You need to be allowed to moderate groups...
-	if ($user_info['mod_cache']['gq'] == '0=1')
-		isAllowedTo('manage_membergroups');
+	if ($user_info['mod_cache']['gq'] == '0=1') {
+			isAllowedTo('manage_membergroups');
+	}
 
 	// Load the group templates.
 	loadTemplate('ModerationCenter');
@@ -919,8 +940,9 @@ 
 		'view' => 'ViewGroups',
 	);
 
-	if (!isset($_GET['sa']) || !isset($subActions[$_GET['sa']]))
-		$_GET['sa'] = 'view';
+	if (!isset($_GET['sa']) || !isset($subActions[$_GET['sa']])) {
+			$_GET['sa'] = 'view';
+	}
 	$context['sub_action'] = $_GET['sa'];
 
 	// Call the relevant function.
@@ -950,8 +972,9 @@ 
 			'id_notice' => $id_notice,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('no_access', false);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('no_access', false);
+	}
 	list ($context['notice_body'], $context['notice_subject']) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -988,18 +1011,20 @@ 
 		checkSession(!is_array($_REQUEST['delete']) ? 'get' : 'post');
 
 		$toDelete = array();
-		if (!is_array($_REQUEST['delete']))
-			$toDelete[] = (int) $_REQUEST['delete'];
-		else
-			foreach ($_REQUEST['delete'] as $did)
+		if (!is_array($_REQUEST['delete'])) {
+					$toDelete[] = (int) $_REQUEST['delete'];
+		} else {
+					foreach ($_REQUEST['delete'] as $did)
 				$toDelete[] = (int) $did;
+		}
 
 		if (!empty($toDelete))
 		{
 			require_once($sourcedir . '/RemoveTopic.php');
 			// If they don't have permission we'll let it error - either way no chance of a security slip here!
-			foreach ($toDelete as $did)
-				removeMessage($did);
+			foreach ($toDelete as $did) {
+							removeMessage($did);
+			}
 		}
 	}
 
@@ -1008,20 +1033,21 @@ 
 	{
 		$approve_query = '';
 		$delete_boards = array();
-	}
-	else
+	} else
 	{
 		// Still obey permissions!
 		$approve_boards = boardsAllowedTo('approve_posts');
 		$delete_boards = boardsAllowedTo('delete_any');
 
-		if ($approve_boards == array(0))
-			$approve_query = '';
-		elseif (!empty($approve_boards))
-			$approve_query = ' AND m.id_board IN (' . implode(',', $approve_boards) . ')';
+		if ($approve_boards == array(0)) {
+					$approve_query = '';
+		} elseif (!empty($approve_boards)) {
+					$approve_query = ' AND m.id_board IN (' . implode(',', $approve_boards) . ')';
+		}
 		// Nada, zip, etc...
-		else
-			$approve_query = ' AND 1=0';
+		else {
+					$approve_query = ' AND 1=0';
+		}
 	}
 
 	require_once($sourcedir . '/Subs-List.php');
@@ -1120,10 +1146,11 @@ 
 				'data' => array(
 					'function' => function($member) use ($scripturl)
 					{
-						if ($member['last_post_id'])
-							return '<a href="' . $scripturl . '?msg=' . $member['last_post_id'] . '">' . $member['last_post'] . '</a>';
-						else
-							return $member['last_post'];
+						if ($member['last_post_id']) {
+													return '<a href="' . $scripturl . '?msg=' . $member['last_post_id'] . '">' . $member['last_post'] . '</a>';
+						} else {
+													return $member['last_post'];
+						}
 					},
 				),
 			),
@@ -1251,8 +1278,9 @@ 
 			)
 		);
 		$latest_posts = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$latest_posts[$row['id_member']] = $row['last_post_id'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$latest_posts[$row['id_member']] = $row['last_post_id'];
+		}
 
 		if (!empty($latest_posts))
 		{
@@ -1443,15 +1471,17 @@ 
 	// Setup the direction stuff...
 	$context['order'] = isset($_REQUEST['sort']) && isset($sort_types[$_REQUEST['sort']]) ? $_REQUEST['sort'] : 'member';
 
-	if (!isset($search_params['string']) || (!empty($_REQUEST['search']) && $search_params['string'] != $_REQUEST['search']))
-		$search_params_string = empty($_REQUEST['search']) ? '' : $_REQUEST['search'];
-	else
-		$search_params_string = $search_params['string'];
+	if (!isset($search_params['string']) || (!empty($_REQUEST['search']) && $search_params['string'] != $_REQUEST['search'])) {
+			$search_params_string = empty($_REQUEST['search']) ? '' : $_REQUEST['search'];
+	} else {
+			$search_params_string = $search_params['string'];
+	}
 
-	if (isset($_REQUEST['search_type']) || empty($search_params['type']) || !isset($searchTypes[$search_params['type']]))
-		$search_params_type = isset($_REQUEST['search_type']) && isset($searchTypes[$_REQUEST['search_type']]) ? $_REQUEST['search_type'] : (isset($searchTypes[$context['order']]) ? $context['order'] : 'member');
-	else
-		$search_params_type = $search_params['type'];
+	if (isset($_REQUEST['search_type']) || empty($search_params['type']) || !isset($searchTypes[$search_params['type']])) {
+			$search_params_type = isset($_REQUEST['search_type']) && isset($searchTypes[$_REQUEST['search_type']]) ? $_REQUEST['search_type'] : (isset($searchTypes[$context['order']]) ? $context['order'] : 'member');
+	} else {
+			$search_params_type = $search_params['type'];
+	}
 
 	$search_params = array(
 		'string' => $search_params_string,
@@ -1534,9 +1564,10 @@ 
 								' . $rowData['reason'] . '
 							</div>';
 
-						if (!empty($rowData['id_notice']))
-							$output .= '
+						if (!empty($rowData['id_notice'])) {
+													$output .= '
 								&nbsp;<a href="' . $scripturl . '?action=moderate;area=notice;nid=' . $rowData['id_notice'] . '" onclick="window.open(this.href, \'\', \'scrollbars=yes,resizable=yes,width=400,height=250\');return false;" target="_blank" class="new_win" title="' . $txt['profile_warning_previous_notice'] . '"><span class="generic_icons filter centericon"></span></a>';
+						}
 						return $output;
 					},
 				),
@@ -1654,9 +1685,9 @@ 
 	global $smcFunc, $modSettings, $context, $txt, $scripturl, $sourcedir, $user_info;
 
 	// Submitting a new one?
-	if (isset($_POST['add']))
-		return ModifyWarningTemplate();
-	elseif (isset($_POST['delete']) && !empty($_POST['deltpl']))
+	if (isset($_POST['add'])) {
+			return ModifyWarningTemplate();
+	} elseif (isset($_POST['delete']) && !empty($_POST['deltpl']))
 	{
 		checkSession();
 		validateToken('mod-wt');
@@ -1675,8 +1706,9 @@ 
 				'current_member' => $user_info['id'],
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			logAction('delete_warn_template', array('template' => $row['recipient_name']));
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					logAction('delete_warn_template', array('template' => $row['recipient_name']));
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Do the deletes.
@@ -1967,16 +1999,18 @@ 
 				);
 
 				// If it wasn't visible and now is they've effectively added it.
-				if ($context['template_data']['personal'] && !$recipient_id)
-					logAction('add_warn_template', array('template' => $_POST['template_title']));
+				if ($context['template_data']['personal'] && !$recipient_id) {
+									logAction('add_warn_template', array('template' => $_POST['template_title']));
+				}
 				// Conversely if they made it personal it's a delete.
-				elseif (!$context['template_data']['personal'] && $recipient_id)
-					logAction('delete_warn_template', array('template' => $_POST['template_title']));
+				elseif (!$context['template_data']['personal'] && $recipient_id) {
+									logAction('delete_warn_template', array('template' => $_POST['template_title']));
+				}
 				// Otherwise just an edit.
-				else
-					logAction('modify_warn_template', array('template' => $_POST['template_title']));
-			}
-			else
+				else {
+									logAction('modify_warn_template', array('template' => $_POST['template_title']));
+				}
+			} else
 			{
 				$smcFunc['db_insert']('',
 					'{db_prefix}log_comments',
@@ -1996,17 +2030,18 @@ 
 
 			// Get out of town...
 			redirectexit('action=moderate;area=warnings;sa=templates');
-		}
-		else
+		} else
 		{
 			$context['warning_errors'] = array();
 			$context['template_data']['title'] = !empty($_POST['template_title']) ? $_POST['template_title'] : '';
 			$context['template_data']['body'] = !empty($_POST['template_body']) ? $_POST['template_body'] : $txt['mc_warning_template_body_default'];
 			$context['template_data']['personal'] = !empty($_POST['make_personal']);
-			if (empty($_POST['template_title']))
-				$context['warning_errors'][] = $txt['mc_warning_template_error_no_title'];
-			if (empty($_POST['template_body']))
-				$context['warning_errors'][] = $txt['mc_warning_template_error_no_body'];
+			if (empty($_POST['template_title'])) {
+							$context['warning_errors'][] = $txt['mc_warning_template_error_no_title'];
+			}
+			if (empty($_POST['template_body'])) {
+							$context['warning_errors'][] = $txt['mc_warning_template_error_no_body'];
+			}
 		}
 	}
 
@@ -2051,8 +2086,9 @@ 
 		// Now check other options!
 		$pref_binary = 0;
 
-		if ($context['can_moderate_approvals'] && !empty($_POST['mod_notify_approval']))
-			$pref_binary |= 4;
+		if ($context['can_moderate_approvals'] && !empty($_POST['mod_notify_approval'])) {
+					$pref_binary |= 4;
+		}
 
 		// Put it all together.
 		$mod_prefs = '0||' . $pref_binary;
@@ -2076,9 +2112,10 @@ 
 	unset($_SESSION['moderate_time']);
 
 	// Clean any moderator tokens as well.
-	foreach ($_SESSION['token'] as $key => $token)
-		if (strpos($key, '-mod') !== false)
+	foreach ($_SESSION['token'] as $key => $token) {
+			if (strpos($key, '-mod') !== false)
 			unset($_SESSION['token'][$key]);
+	}
 
 	redirectexit();
 }

Sources/ManageAttachments.php

Braces +429 added lines, -325 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The main 'Attachments and Avatars' management function.
@@ -63,10 +64,11 @@ 
 	call_integration_hook('integrate_manage_attachments', array(&$subActions));
 
 	// Pick the correct sub-action.
-	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']]))
-		$context['sub_action'] = $_REQUEST['sa'];
-	else
-		$context['sub_action'] = 'browse';
+	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']])) {
+			$context['sub_action'] = $_REQUEST['sa'];
+	} else {
+			$context['sub_action'] = 'browse';
+	}
 
 	// Default page title is good.
 	$context['page_title'] = $txt['attachments_avatars'];
@@ -94,20 +96,20 @@ 
 	$context['attachmentUploadDir'] = $modSettings['attachmentUploadDir'][$modSettings['currentAttachmentUploadDir']];
 
 	// If not set, show a default path for the base directory
-	if (!isset($_GET['save']) && empty($modSettings['basedirectory_for_attachments']))
-		if (is_dir($modSettings['attachmentUploadDir'][1]))
+	if (!isset($_GET['save']) && empty($modSettings['basedirectory_for_attachments'])) {
+			if (is_dir($modSettings['attachmentUploadDir'][1]))
 			$modSettings['basedirectory_for_attachments'] = $modSettings['attachmentUploadDir'][1];
-
-	else
-		$modSettings['basedirectory_for_attachments'] = $context['attachmentUploadDir'];
+	} else {
+			$modSettings['basedirectory_for_attachments'] = $context['attachmentUploadDir'];
+	}
 
 	$context['valid_upload_dir'] = is_dir($context['attachmentUploadDir']) && is_writable($context['attachmentUploadDir']);
 
-	if (!empty($modSettings['automanage_attachments']))
-		$context['valid_basedirectory'] = !empty($modSettings['basedirectory_for_attachments']) && is_writable($modSettings['basedirectory_for_attachments']);
-
-	else
-		$context['valid_basedirectory'] = true;
+	if (!empty($modSettings['automanage_attachments'])) {
+			$context['valid_basedirectory'] = !empty($modSettings['basedirectory_for_attachments']) && is_writable($modSettings['basedirectory_for_attachments']);
+	} else {
+			$context['valid_basedirectory'] = true;
+	}
 
 	// A bit of razzle dazzle with the $txt strings. :)
 	$txt['attachment_path'] = $context['attachmentUploadDir'];
@@ -185,8 +187,9 @@ 
 
 	call_integration_hook('integrate_modify_attachment_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// These are very likely to come in handy! (i.e. without them we're doomed!)
 	require_once($sourcedir . '/ManagePermissions.php');
@@ -197,21 +200,24 @@ 
 	{
 		checkSession();
 
-		if (isset($_POST['attachmentUploadDir']))
-			unset($_POST['attachmentUploadDir']);
+		if (isset($_POST['attachmentUploadDir'])) {
+					unset($_POST['attachmentUploadDir']);
+		}
 
 		if (!empty($_POST['use_subdirectories_for_attachments']))
 		{
-			if (isset($_POST['use_subdirectories_for_attachments']) && empty($_POST['basedirectory_for_attachments']))
-				$_POST['basedirectory_for_attachments'] = (!empty($modSettings['basedirectory_for_attachments']) ? ($modSettings['basedirectory_for_attachments']) : $boarddir);
+			if (isset($_POST['use_subdirectories_for_attachments']) && empty($_POST['basedirectory_for_attachments'])) {
+							$_POST['basedirectory_for_attachments'] = (!empty($modSettings['basedirectory_for_attachments']) ? ($modSettings['basedirectory_for_attachments']) : $boarddir);
+			}
 
 			if (!empty($_POST['use_subdirectories_for_attachments']) && !empty($modSettings['attachment_basedirectories']))
 			{
-				if (!is_array($modSettings['attachment_basedirectories']))
-					$modSettings['attachment_basedirectories'] = $smcFunc['json_decode']($modSettings['attachment_basedirectories'], true);
+				if (!is_array($modSettings['attachment_basedirectories'])) {
+									$modSettings['attachment_basedirectories'] = $smcFunc['json_decode']($modSettings['attachment_basedirectories'], true);
+				}
+			} else {
+							$modSettings['attachment_basedirectories'] = array();
 			}
-			else
-				$modSettings['attachment_basedirectories'] = array();
 
 			if (!empty($_POST['use_subdirectories_for_attachments']) && !empty($_POST['basedirectory_for_attachments']) && !in_array($_POST['basedirectory_for_attachments'], $modSettings['attachment_basedirectories']))
 			{
@@ -219,8 +225,9 @@ 
 
 				if (!in_array($_POST['basedirectory_for_attachments'], $modSettings['attachmentUploadDir']))
 				{
-					if (!automanage_attachments_create_directory($_POST['basedirectory_for_attachments']))
-						$_POST['basedirectory_for_attachments'] = $modSettings['basedirectory_for_attachments'];
+					if (!automanage_attachments_create_directory($_POST['basedirectory_for_attachments'])) {
+											$_POST['basedirectory_for_attachments'] = $modSettings['basedirectory_for_attachments'];
+					}
 				}
 
 				if (!in_array($_POST['basedirectory_for_attachments'], $modSettings['attachment_basedirectories']))
@@ -336,8 +343,9 @@ 
 
 	call_integration_hook('integrate_modify_avatar_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// We need this file for the settings template.
 	require_once($sourcedir . '/ManageServer.php');
@@ -348,17 +356,21 @@ 
 		checkSession();
 
 		// These settings cannot be left empty!
-		if (empty($_POST['custom_avatar_dir']))
-			$_POST['custom_avatar_dir'] = $boarddir . '/custom_avatar';
+		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['custom_avatar_url'])) {
+					$_POST['custom_avatar_url'] = $boardurl . '/custom_avatar';
+		}
 
-		if (empty($_POST['avatar_directory']))
-			$_POST['avatar_directory'] = $boarddir . '/avatars';
+		if (empty($_POST['avatar_directory'])) {
+					$_POST['avatar_directory'] = $boarddir . '/avatars';
+		}
 
-		if (empty($_POST['avatar_url']))
-			$_POST['avatar_url'] = $boardurl . '/avatars';
+		if (empty($_POST['avatar_url'])) {
+					$_POST['avatar_url'] = $boardurl . '/avatars';
+		}
 
 		call_integration_hook('integrate_save_avatar_settings');
 
@@ -406,11 +418,13 @@ 
 	$list_title = $txt['attachment_manager_browse_files'] . ': ';
 	foreach ($titles as $browse_type => $details)
 	{
-		if ($browse_type != 'attachments')
-			$list_title .= ' | ';
+		if ($browse_type != 'attachments') {
+					$list_title .= ' | ';
+		}
 
-		if ($context['browse_type'] == $browse_type)
-			$list_title .= '<img src="' . $settings['images_url'] . '/selected.png" alt="&gt;"> ';
+		if ($context['browse_type'] == $browse_type) {
+					$list_title .= '<img src="' . $settings['images_url'] . '/selected.png" alt="&gt;"> ';
+		}
 
 		$list_title .= '<a href="' . $scripturl . $details[0] . '">' . $details[1] . '</a>';
 	}
@@ -446,28 +460,33 @@ 
 						$link = '<a href="';
 
 						// In case of a custom avatar URL attachments have a fixed directory.
-						if ($rowData['attachment_type'] == 1)
-							$link .= sprintf('%1$s/%2$s', $modSettings['custom_avatar_url'], $rowData['filename']);
+						if ($rowData['attachment_type'] == 1) {
+													$link .= sprintf('%1$s/%2$s', $modSettings['custom_avatar_url'], $rowData['filename']);
+						}
 
 						// By default avatars are downloaded almost as attachments.
-						elseif ($context['browse_type'] == 'avatars')
-							$link .= sprintf('%1$s?action=dlattach;type=avatar;attach=%2$d', $scripturl, $rowData['id_attach']);
+						elseif ($context['browse_type'] == 'avatars') {
+													$link .= sprintf('%1$s?action=dlattach;type=avatar;attach=%2$d', $scripturl, $rowData['id_attach']);
+						}
 
 						// Normal attachments are always linked to a topic ID.
-						else
-							$link .= sprintf('%1$s?action=dlattach;topic=%2$d.0;attach=%3$d', $scripturl, $rowData['id_topic'], $rowData['id_attach']);
+						else {
+													$link .= sprintf('%1$s?action=dlattach;topic=%2$d.0;attach=%3$d', $scripturl, $rowData['id_topic'], $rowData['id_attach']);
+						}
 
 						$link .= '"';
 
 						// Show a popup on click if it's a picture and we know its dimensions.
-						if (!empty($rowData['width']) && !empty($rowData['height']))
-							$link .= sprintf(' onclick="return reqWin(this.href' . ($rowData['attachment_type'] == 1 ? '' : ' + \';image\'') . ', %1$d, %2$d, true);"', $rowData['width'] + 20, $rowData['height'] + 20);
+						if (!empty($rowData['width']) && !empty($rowData['height'])) {
+													$link .= sprintf(' onclick="return reqWin(this.href' . ($rowData['attachment_type'] == 1 ? '' : ' + \';image\'') . ', %1$d, %2$d, true);"', $rowData['width'] + 20, $rowData['height'] + 20);
+						}
 
 						$link .= sprintf('>%1$s</a>', preg_replace('~&amp;#(\\\\d{1,7}|x[0-9a-fA-F]{1,6});~', '&#\\\\1;', $smcFunc['htmlspecialchars']($rowData['filename'])));
 
 						// Show the dimensions.
-						if (!empty($rowData['width']) && !empty($rowData['height']))
-							$link .= sprintf(' <span class="smalltext">%1$dx%2$d</span>', $rowData['width'], $rowData['height']);
+						if (!empty($rowData['width']) && !empty($rowData['height'])) {
+													$link .= sprintf(' <span class="smalltext">%1$dx%2$d</span>', $rowData['width'], $rowData['height']);
+						}
 
 						return $link;
 					},
@@ -500,12 +519,14 @@ 
 					'function' => function($rowData) use ($scripturl, $smcFunc)
 					{
 						// In case of an attachment, return the poster of the attachment.
-						if (empty($rowData['id_member']))
-							return $smcFunc['htmlspecialchars']($rowData['poster_name']);
+						if (empty($rowData['id_member'])) {
+													return $smcFunc['htmlspecialchars']($rowData['poster_name']);
+						}
 
 						// Otherwise it must be an avatar, return the link to the owner of it.
-						else
-							return sprintf('<a href="%1$s?action=profile;u=%2$d">%3$s</a>', $scripturl, $rowData['id_member'], $rowData['poster_name']);
+						else {
+													return sprintf('<a href="%1$s?action=profile;u=%2$d">%3$s</a>', $scripturl, $rowData['id_member'], $rowData['poster_name']);
+						}
 					},
 				),
 				'sort' => array(
@@ -524,8 +545,9 @@ 
 						$date = empty($rowData['poster_time']) ? $txt['never'] : timeformat($rowData['poster_time']);
 
 						// Add a link to the topic in case of an attachment.
-						if ($context['browse_type'] !== 'avatars')
-							$date .= sprintf('<br>%1$s <a href="%2$s?topic=%3$d.msg%4$d#msg%4$d">%5$s</a>', $txt['in'], $scripturl, $rowData['id_topic'], $rowData['id_msg'], $rowData['subject']);
+						if ($context['browse_type'] !== 'avatars') {
+													$date .= sprintf('<br>%1$s <a href="%2$s?topic=%3$d.msg%4$d#msg%4$d">%5$s</a>', $txt['in'], $scripturl, $rowData['id_topic'], $rowData['id_msg'], $rowData['subject']);
+						}
 
 						return $date;
 					},
@@ -610,8 +632,8 @@ 
 	global $smcFunc, $txt;
 
 	// Choose a query depending on what we are viewing.
-	if ($browse_type === 'avatars')
-		$request = $smcFunc['db_query']('', '
+	if ($browse_type === 'avatars') {
+			$request = $smcFunc['db_query']('', '
 			SELECT
 				{string:blank_text} AS id_msg, COALESCE(mem.real_name, {string:not_applicable_text}) AS poster_name,
 				mem.last_login AS poster_time, 0 AS id_topic, a.id_member, a.id_attach, a.filename, a.file_hash, a.attachment_type,
@@ -630,8 +652,8 @@ 
 				'per_page' => $items_per_page,
 			)
 		);
-	else
-		$request = $smcFunc['db_query']('', '
+	} else {
+			$request = $smcFunc['db_query']('', '
 			SELECT
 				m.id_msg, COALESCE(mem.real_name, m.poster_name) AS poster_name, m.poster_time, m.id_topic, m.id_member,
 				a.id_attach, a.filename, a.file_hash, a.attachment_type, a.size, a.width, a.height, a.downloads, mf.subject, t.id_board
@@ -650,9 +672,11 @@ 
 				'per_page' => $items_per_page,
 			)
 		);
+	}
 	$files = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$files[] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$files[] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $files;
@@ -670,8 +694,8 @@ 
 	global $smcFunc;
 
 	// Depending on the type of file, different queries are used.
-	if ($browse_type === 'avatars')
-		$request = $smcFunc['db_query']('', '
+	if ($browse_type === 'avatars') {
+			$request = $smcFunc['db_query']('', '
 		SELECT COUNT(*)
 		FROM {db_prefix}attachments
 		WHERE id_member != {int:guest_id_member}',
@@ -679,8 +703,8 @@ 
 			'guest_id_member' => 0,
 		)
 	);
-	else
-		$request = $smcFunc['db_query']('', '
+	} else {
+			$request = $smcFunc['db_query']('', '
 			SELECT COUNT(*) AS num_attach
 			FROM {db_prefix}attachments AS a
 				INNER JOIN {db_prefix}messages AS m ON (m.id_msg = a.id_msg)
@@ -693,6 +717,7 @@ 
 				'guest_id_member' => 0,
 			)
 		);
+	}
 
 	list ($num_files) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
@@ -775,12 +800,14 @@ 
 	$current_dir_size /= 1024;
 
 	// If they specified a limit only....
-	if (!empty($modSettings['attachmentDirSizeLimit']))
-		$context['attachment_space'] = comma_format(max($modSettings['attachmentDirSizeLimit'] - $current_dir_size, 0), 2);
+	if (!empty($modSettings['attachmentDirSizeLimit'])) {
+			$context['attachment_space'] = comma_format(max($modSettings['attachmentDirSizeLimit'] - $current_dir_size, 0), 2);
+	}
 	$context['attachment_current_size'] = comma_format($current_dir_size, 2);
 
-	if (!empty($modSettings['attachmentDirFileLimit']))
-		$context['attachment_files'] = comma_format(max($modSettings['attachmentDirFileLimit'] - $current_dir_files, 0), 0);
+	if (!empty($modSettings['attachmentDirFileLimit'])) {
+			$context['attachment_files'] = comma_format(max($modSettings['attachmentDirFileLimit'] - $current_dir_files, 0), 0);
+	}
 	$context['attachment_current_files'] = comma_format($current_dir_files, 0);
 
 	$context['attach_multiple_dirs'] = count($attach_dirs) > 1 ? true : false;
@@ -817,8 +844,8 @@ 
 		$messages = removeAttachments(array('attachment_type' => 0, 'poster_time' => (time() - 24 * 60 * 60 * $_POST['age'])), 'messages', true);
 
 		// Update the messages to reflect the change.
-		if (!empty($messages) && !empty($_POST['notice']))
-			$smcFunc['db_query']('', '
+		if (!empty($messages) && !empty($_POST['notice'])) {
+					$smcFunc['db_query']('', '
 				UPDATE {db_prefix}messages
 				SET body = CONCAT(body, {string:notice})
 				WHERE id_msg IN ({array_int:messages})',
@@ -827,8 +854,8 @@ 
 					'notice' => '<br><br>' . $_POST['notice'],
 				)
 			);
-	}
-	else
+		}
+	} else
 	{
 		// Remove all the old avatars.
 		removeAttachments(array('not_id_member' => 0, 'last_login' => (time() - 24 * 60 * 60 * $_POST['age'])), 'members');
@@ -853,8 +880,8 @@ 
 	$messages = removeAttachments(array('attachment_type' => 0, 'size' => 1024 * $_POST['size']), 'messages', true);
 
 	// And make a note on the post.
-	if (!empty($messages) && !empty($_POST['notice']))
-		$smcFunc['db_query']('', '
+	if (!empty($messages) && !empty($_POST['notice'])) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}messages
 			SET body = CONCAT(body, {string:notice})
 			WHERE id_msg IN ({array_int:messages})',
@@ -863,6 +890,7 @@ 
 				'notice' => '<br><br>' . $_POST['notice'],
 			)
 		);
+	}
 
 	redirectexit('action=admin;area=manageattachments;sa=maintenance');
 }
@@ -882,16 +910,17 @@ 
 	{
 		$attachments = array();
 		// There must be a quicker way to pass this safety test??
-		foreach ($_POST['remove'] as $removeID => $dummy)
-			$attachments[] = (int) $removeID;
+		foreach ($_POST['remove'] as $removeID => $dummy) {
+					$attachments[] = (int) $removeID;
+		}
 
 		// If the attachments are from a 3rd party, let them remove it. Hooks should remove their ids from the array.
 		$filesRemoved = false;
 		call_integration_hook('integrate_attachment_remove', array(&$filesRemoved, $attachments));
 
-		if ($_REQUEST['type'] == 'avatars' && !empty($attachments))
-			removeAttachments(array('id_attach' => $attachments));
-		else if (!empty($attachments))
+		if ($_REQUEST['type'] == 'avatars' && !empty($attachments)) {
+					removeAttachments(array('id_attach' => $attachments));
+		} else if (!empty($attachments))
 		{
 			$messages = removeAttachments(array('id_attach' => $attachments), 'messages', true);
 
@@ -930,12 +959,13 @@ 
 
 	$messages = removeAttachments(array('attachment_type' => 0), '', true);
 
-	if (!isset($_POST['notice']))
-		$_POST['notice'] = $txt['attachment_delete_admin'];
+	if (!isset($_POST['notice'])) {
+			$_POST['notice'] = $txt['attachment_delete_admin'];
+	}
 
 	// Add the notice on the end of the changed messages.
-	if (!empty($messages))
-		$smcFunc['db_query']('', '
+	if (!empty($messages)) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}messages
 			SET body = CONCAT(body, {string:deleted_message})
 			WHERE id_msg IN ({array_int:messages})',
@@ -944,6 +974,7 @@ 
 				'deleted_message' => '<br><br>' . $_POST['notice'],
 			)
 		);
+	}
 
 	redirectexit('action=admin;area=manageattachments;sa=maintenance');
 }
@@ -982,24 +1013,26 @@ 
 			$is_not = substr($real_type, 0, 4) == 'not_';
 			$type = $is_not ? substr($real_type, 4) : $real_type;
 
-			if (in_array($type, array('id_member', 'id_attach', 'id_msg')))
-				$new_condition[] = 'a.' . $type . ($is_not ? ' NOT' : '') . ' IN (' . (is_array($restriction) ? '{array_int:' . $real_type . '}' : '{int:' . $real_type . '}') . ')';
-			elseif ($type == 'attachment_type')
-				$new_condition[] = 'a.attachment_type = {int:' . $real_type . '}';
-			elseif ($type == 'poster_time')
-				$new_condition[] = 'm.poster_time < {int:' . $real_type . '}';
-			elseif ($type == 'last_login')
-				$new_condition[] = 'mem.last_login < {int:' . $real_type . '}';
-			elseif ($type == 'size')
-				$new_condition[] = 'a.size > {int:' . $real_type . '}';
-			elseif ($type == 'id_topic')
-				$new_condition[] = 'm.id_topic IN (' . (is_array($restriction) ? '{array_int:' . $real_type . '}' : '{int:' . $real_type . '}') . ')';
+			if (in_array($type, array('id_member', 'id_attach', 'id_msg'))) {
+							$new_condition[] = 'a.' . $type . ($is_not ? ' NOT' : '') . ' IN (' . (is_array($restriction) ? '{array_int:' . $real_type . '}' : '{int:' . $real_type . '}') . ')';
+			} elseif ($type == 'attachment_type') {
+							$new_condition[] = 'a.attachment_type = {int:' . $real_type . '}';
+			} elseif ($type == 'poster_time') {
+							$new_condition[] = 'm.poster_time < {int:' . $real_type . '}';
+			} elseif ($type == 'last_login') {
+							$new_condition[] = 'mem.last_login < {int:' . $real_type . '}';
+			} elseif ($type == 'size') {
+							$new_condition[] = 'a.size > {int:' . $real_type . '}';
+			} elseif ($type == 'id_topic') {
+							$new_condition[] = 'm.id_topic IN (' . (is_array($restriction) ? '{array_int:' . $real_type . '}' : '{int:' . $real_type . '}') . ')';
+			}
 
 			// Add the parameter!
 			$query_parameter[$real_type] = $restriction;
 
-			if ($type == 'do_logging')
-				$do_logging = $condition['id_attach'];
+			if ($type == 'do_logging') {
+							$do_logging = $condition['id_attach'];
+			}
 		}
 		$condition = implode(' AND ', $new_condition);
 	}
@@ -1031,15 +1064,15 @@ 
 			// wasn't it obvious? :P
 			// @todo look again at this.
 			@unlink($modSettings['custom_avatar_dir'] . '/' . $row['filename']);
-		}
-		else
+		} else
 		{
 			$filename = getAttachmentFilename($row['filename'], $row['id_attach'], $row['id_folder'], false, $row['file_hash']);
 			@unlink($filename);
 
 			// If this was a thumb, the parent attachment should know about it.
-			if (!empty($row['id_parent']))
-				$parents[] = $row['id_parent'];
+			if (!empty($row['id_parent'])) {
+							$parents[] = $row['id_parent'];
+			}
 
 			// If this attachments has a thumb, remove it as well.
 			if (!empty($row['id_thumb']) && $autoThumbRemoval)
@@ -1051,8 +1084,9 @@ 
 		}
 
 		// Make a list.
-		if ($return_affected_messages && empty($row['attachment_type']))
-			$msgs[] = $row['id_msg'];
+		if ($return_affected_messages && empty($row['attachment_type'])) {
+					$msgs[] = $row['id_msg'];
+		}
 
 		$attach[] = $row['id_attach'];
 	}
@@ -1060,8 +1094,8 @@ 
 
 	// Removed attachments don't have to be updated anymore.
 	$parents = array_diff($parents, $attach);
-	if (!empty($parents))
-		$smcFunc['db_query']('', '
+	if (!empty($parents)) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}attachments
 			SET id_thumb = {int:no_thumb}
 			WHERE id_attach IN ({array_int:parent_attachments})',
@@ -1070,6 +1104,7 @@ 
 				'no_thumb' => 0,
 			)
 		);
+	}
 
 	if (!empty($do_logging))
 	{
@@ -1086,31 +1121,34 @@ 
 			)
 		);
 
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			logAction(
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					logAction(
 				'remove_attach',
 				array(
 					'message' => $row['id_msg'],
 					'filename' => preg_replace('~&amp;#(\\d{1,7}|x[0-9a-fA-F]{1,6});~', '&#\\1;', $smcFunc['htmlspecialchars']($row['filename'])),
 				)
 			);
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
-	if (!empty($attach))
-		$smcFunc['db_query']('', '
+	if (!empty($attach)) {
+			$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}attachments
 			WHERE id_attach IN ({array_int:attachment_list})',
 			array(
 				'attachment_list' => $attach,
 			)
 		);
+	}
 
 	call_integration_hook('integrate_remove_attachments', array($attach));
 
-	if ($return_affected_messages)
-		return array_unique($msgs);
-}
+	if ($return_affected_messages) {
+			return array_unique($msgs);
+	}
+	}
 
 /**
  * This function should find attachments in the database that no longer exist and clear them, and fix filesize issues.
@@ -1122,8 +1160,9 @@ 
 	checkSession('get');
 
 	// If we choose cancel, redirect right back.
-	if (isset($_POST['cancel']))
-		redirectexit('action=admin;area=manageattachments;sa=maintenance');
+	if (isset($_POST['cancel'])) {
+			redirectexit('action=admin;area=manageattachments;sa=maintenance');
+	}
 
 	// Try give us a while to sort this out...
 	@set_time_limit(600);
@@ -1140,13 +1179,15 @@ 
 		if (isset($_GET['fixErrors']))
 		{
 			// Nothing?
-			if (empty($_POST['to_fix']))
-				redirectexit('action=admin;area=manageattachments;sa=maintenance');
+			if (empty($_POST['to_fix'])) {
+							redirectexit('action=admin;area=manageattachments;sa=maintenance');
+			}
 
 			$_SESSION['attachments_to_fix'] = array();
 			// @todo No need to do this I think.
-			foreach ($_POST['to_fix'] as $value)
-				$_SESSION['attachments_to_fix'][] = $value;
+			foreach ($_POST['to_fix'] as $value) {
+							$_SESSION['attachments_to_fix'][] = $value;
+			}
 		}
 	}
 
@@ -1213,13 +1254,14 @@ 
 					}
 				}
 			}
-			if ($smcFunc['db_num_rows']($result) != 0)
-				$to_fix[] = 'missing_thumbnail_parent';
+			if ($smcFunc['db_num_rows']($result) != 0) {
+							$to_fix[] = 'missing_thumbnail_parent';
+			}
 			$smcFunc['db_free_result']($result);
 
 			// Do we need to delete what we have?
-			if ($fix_errors && !empty($to_remove) && in_array('missing_thumbnail_parent', $to_fix))
-				$smcFunc['db_query']('', '
+			if ($fix_errors && !empty($to_remove) && in_array('missing_thumbnail_parent', $to_fix)) {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}attachments
 					WHERE id_attach IN ({array_int:to_remove})
 						AND attachment_type = {int:attachment_type}',
@@ -1228,6 +1270,7 @@ 
 						'attachment_type' => 3,
 					)
 				);
+			}
 
 			pauseAttachmentMaintenance($to_fix, $thumbnails);
 		}
@@ -1272,13 +1315,14 @@ 
 				$to_update[] = $row['id_attach'];
 				$context['repair_errors']['parent_missing_thumbnail']++;
 			}
-			if ($smcFunc['db_num_rows']($result) != 0)
-				$to_fix[] = 'parent_missing_thumbnail';
+			if ($smcFunc['db_num_rows']($result) != 0) {
+							$to_fix[] = 'parent_missing_thumbnail';
+			}
 			$smcFunc['db_free_result']($result);
 
 			// Do we need to delete what we have?
-			if ($fix_errors && !empty($to_update) && in_array('parent_missing_thumbnail', $to_fix))
-				$smcFunc['db_query']('', '
+			if ($fix_errors && !empty($to_update) && in_array('parent_missing_thumbnail', $to_fix)) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}attachments
 					SET id_thumb = {int:no_thumb}
 					WHERE id_attach IN ({array_int:to_update})',
@@ -1287,6 +1331,7 @@ 
 						'no_thumb' => 0,
 					)
 				);
+			}
 
 			pauseAttachmentMaintenance($to_fix, $thumbnails);
 		}
@@ -1324,10 +1369,11 @@ 
 			while ($row = $smcFunc['db_fetch_assoc']($result))
 			{
 				// Get the filename.
-				if ($row['attachment_type'] == 1)
-					$filename = $modSettings['custom_avatar_dir'] . '/' . $row['filename'];
-				else
-					$filename = getAttachmentFilename($row['filename'], $row['id_attach'], $row['id_folder'], false, $row['file_hash']);
+				if ($row['attachment_type'] == 1) {
+									$filename = $modSettings['custom_avatar_dir'] . '/' . $row['filename'];
+				} else {
+									$filename = getAttachmentFilename($row['filename'], $row['id_attach'], $row['id_folder'], false, $row['file_hash']);
+				}
 
 				// File doesn't exist?
 				if (!file_exists($filename))
@@ -1339,15 +1385,16 @@ 
 						$attachment_name = $row['id_attach'] . '_' . $row['file_hash'] . '.dat';
 
 						// Loop through the other folders.
-						foreach ($modSettings['attachmentUploadDir'] as $id => $dir)
-							if (file_exists($dir . '/' . $attachment_name))
+						foreach ($modSettings['attachmentUploadDir'] as $id => $dir) {
+													if (file_exists($dir . '/' . $attachment_name))
 							{
 								$context['repair_errors']['wrong_folder']++;
+						}
 								$errors_found[] = 'wrong_folder';
 
 								// Are we going to fix this now?
-								if ($fix_errors && in_array('wrong_folder', $to_fix))
-									$smcFunc['db_query']('', '
+								if ($fix_errors && in_array('wrong_folder', $to_fix)) {
+																	$smcFunc['db_query']('', '
 										UPDATE {db_prefix}attachments
 										SET id_folder = {int:new_folder}
 										WHERE id_attach = {int:id_attach}',
@@ -1356,6 +1403,7 @@ 
 											'id_attach' => $row['id_attach'],
 										)
 									);
+								}
 
 								continue 2;
 							}
@@ -1364,8 +1412,7 @@ 
 					$to_remove[] = $row['id_attach'];
 					$context['repair_errors']['file_missing_on_disk']++;
 					$errors_found[] = 'file_missing_on_disk';
-				}
-				elseif (filesize($filename) == 0)
+				} elseif (filesize($filename) == 0)
 				{
 					$context['repair_errors']['file_size_of_zero']++;
 					$errors_found[] = 'file_size_of_zero';
@@ -1376,8 +1423,7 @@ 
 						$to_remove[] = $row['id_attach'];
 						@unlink($filename);
 					}
-				}
-				elseif (filesize($filename) != $row['size'])
+				} elseif (filesize($filename) != $row['size'])
 				{
 					$context['repair_errors']['file_wrong_size']++;
 					$errors_found[] = 'file_wrong_size';
@@ -1398,14 +1444,18 @@ 
 				}
 			}
 
-			if (in_array('file_missing_on_disk', $errors_found))
-				$to_fix[] = 'file_missing_on_disk';
-			if (in_array('file_size_of_zero', $errors_found))
-				$to_fix[] = 'file_size_of_zero';
-			if (in_array('file_wrong_size', $errors_found))
-				$to_fix[] = 'file_wrong_size';
-			if (in_array('wrong_folder', $errors_found))
-				$to_fix[] = 'wrong_folder';
+			if (in_array('file_missing_on_disk', $errors_found)) {
+							$to_fix[] = 'file_missing_on_disk';
+			}
+			if (in_array('file_size_of_zero', $errors_found)) {
+							$to_fix[] = 'file_size_of_zero';
+			}
+			if (in_array('file_wrong_size', $errors_found)) {
+							$to_fix[] = 'file_wrong_size';
+			}
+			if (in_array('wrong_folder', $errors_found)) {
+							$to_fix[] = 'wrong_folder';
+			}
 			$smcFunc['db_free_result']($result);
 
 			// Do we need to delete what we have?
@@ -1475,20 +1525,22 @@ 
 				// If we are repairing remove the file from disk now.
 				if ($fix_errors && in_array('avatar_no_member', $to_fix))
 				{
-					if ($row['attachment_type'] == 1)
-						$filename = $modSettings['custom_avatar_dir'] . '/' . $row['filename'];
-					else
-						$filename = getAttachmentFilename($row['filename'], $row['id_attach'], $row['id_folder'], false, $row['file_hash']);
+					if ($row['attachment_type'] == 1) {
+											$filename = $modSettings['custom_avatar_dir'] . '/' . $row['filename'];
+					} else {
+											$filename = getAttachmentFilename($row['filename'], $row['id_attach'], $row['id_folder'], false, $row['file_hash']);
+					}
 					@unlink($filename);
 				}
 			}
-			if ($smcFunc['db_num_rows']($result) != 0)
-				$to_fix[] = 'avatar_no_member';
+			if ($smcFunc['db_num_rows']($result) != 0) {
+							$to_fix[] = 'avatar_no_member';
+			}
 			$smcFunc['db_free_result']($result);
 
 			// Do we need to delete what we have?
-			if ($fix_errors && !empty($to_remove) && in_array('avatar_no_member', $to_fix))
-				$smcFunc['db_query']('', '
+			if ($fix_errors && !empty($to_remove) && in_array('avatar_no_member', $to_fix)) {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}attachments
 					WHERE id_attach IN ({array_int:to_remove})
 						AND id_member != {int:no_member}
@@ -1499,6 +1551,7 @@ 
 						'no_msg' => 0,
 					)
 				);
+			}
 
 			pauseAttachmentMaintenance($to_fix, $thumbnails);
 		}
@@ -1558,13 +1611,14 @@ 
 					@unlink($filename);
 				}
 			}
-			if ($smcFunc['db_num_rows']($result) != 0)
-				$to_fix[] = 'attachment_no_msg';
+			if ($smcFunc['db_num_rows']($result) != 0) {
+							$to_fix[] = 'attachment_no_msg';
+			}
 			$smcFunc['db_free_result']($result);
 
 			// Do we need to delete what we have?
-			if ($fix_errors && !empty($to_remove) && in_array('attachment_no_msg', $to_fix))
-				$smcFunc['db_query']('', '
+			if ($fix_errors && !empty($to_remove) && in_array('attachment_no_msg', $to_fix)) {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}attachments
 					WHERE id_attach IN ({array_int:to_remove})
 						AND id_member = {int:no_member}
@@ -1575,6 +1629,7 @@ 
 						'attach_thumb' => array(0,3),
 					)
 				);
+			}
 
 			pauseAttachmentMaintenance($to_fix, $thumbnails);
 		}
@@ -1598,8 +1653,9 @@ 
 			{
 				while ($file = readdir($dir))
 				{
-					if (in_array($file, array('.', '..', '.htaccess', 'index.php')))
-						continue;
+					if (in_array($file, array('.', '..', '.htaccess', 'index.php'))) {
+											continue;
+					}
 
 					if ($files_checked <= $current_check)
 					{
@@ -1607,8 +1663,9 @@ 
 						if (strpos($file, 'post_tmp_') !== false)
 						{
 							// Temp file is more than 5 hours old!
-							if (filemtime($attach_dir . '/' . $file) < time() - 18000)
-								@unlink($attach_dir . '/' . $file);
+							if (filemtime($attach_dir . '/' . $file) < time() - 18000) {
+															@unlink($attach_dir . '/' . $file);
+							}
 						}
 						// That should be an attachment, let's check if we have it in the database
 						elseif (strpos($file, '_') !== false)
@@ -1630,8 +1687,7 @@ 
 									if ($fix_errors && in_array('files_without_attachment', $to_fix))
 									{
 										@unlink($attach_dir . '/' . $file);
-									}
-									else
+									} else
 									{
 										$context['repair_errors']['files_without_attachment']++;
 										$to_fix[] = 'files_without_attachment';
@@ -1639,14 +1695,12 @@ 
 								}
 								$smcFunc['db_free_result']($request);
 							}
-						}
-						else
+						} else
 						{
 							if ($fix_errors && in_array('files_without_attachment', $to_fix))
 							{
 								@unlink($attach_dir . '/' . $file);
-							}
-							else
+							} else
 							{
 								$context['repair_errors']['files_without_attachment']++;
 								$to_fix[] = 'files_without_attachment';
@@ -1655,8 +1709,9 @@ 
 					}
 					$current_check++;
 					$_GET['substep'] = $current_check;
-					if ($current_check - $files_checked >= $max_checks)
-						pauseAttachmentMaintenance($to_fix);
+					if ($current_check - $files_checked >= $max_checks) {
+											pauseAttachmentMaintenance($to_fix);
+					}
 				}
 				closedir($dir);
 			}
@@ -1692,12 +1747,14 @@ 
 
 	// Try get more time...
 	@set_time_limit(600);
-	if (function_exists('apache_reset_timeout'))
-		@apache_reset_timeout();
+	if (function_exists('apache_reset_timeout')) {
+			@apache_reset_timeout();
+	}
 
 	// Have we already used our maximum time?
-	if (time() - array_sum(explode(' ', $time_start)) < 3 || $context['starting_substep'] == $_GET['substep'])
-		return;
+	if (time() - array_sum(explode(' ', $time_start)) < 3 || $context['starting_substep'] == $_GET['substep']) {
+			return;
+	}
 
 	$context['continue_get_data'] = '?action=admin;area=manageattachments;sa=repair' . (isset($_GET['fixErrors']) ? ';fixErrors' : '') . ';step=' . $_GET['step'] . ';substep=' . $_GET['substep'] . ';' . $context['session_var'] . '=' . $context['session_id'];
 	$context['page_title'] = $txt['not_done_title'];
@@ -1709,10 +1766,11 @@ 
 	$context[$context['admin_menu_name']]['current_subsection'] = 'maintenance';
 
 	// Change these two if more steps are added!
-	if (empty($max_substep))
-		$context['continue_percent'] = round(($_GET['step'] * 100) / 25);
-	else
-		$context['continue_percent'] = round(($_GET['step'] * 100 + ($_GET['substep'] * 100) / $max_substep) / 25);
+	if (empty($max_substep)) {
+			$context['continue_percent'] = round(($_GET['step'] * 100) / 25);
+	} else {
+			$context['continue_percent'] = round(($_GET['step'] * 100 + ($_GET['substep'] * 100) / $max_substep) / 25);
+	}
 
 	// Never more than 100%!
 	$context['continue_percent'] = min($context['continue_percent'], 100);
@@ -1754,15 +1812,17 @@ 
 				'attachment_type' => 0,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$attachments[] = $row['id_attach'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$attachments[] = $row['id_attach'];
+		}
 		$smcFunc['db_free_result']($request);
+	} elseif (!empty($_GET['aid'])) {
+			$attachments[] = (int) $_GET['aid'];
 	}
-	elseif (!empty($_GET['aid']))
-		$attachments[] = (int) $_GET['aid'];
 
-	if (empty($attachments))
-		fatal_lang_error('no_access', false);
+	if (empty($attachments)) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Now we have some ID's cleaned and ready to approve, but first - let's check we have permission!
 	$allowed_boards = boardsAllowedTo('approve_posts');
@@ -1795,17 +1855,18 @@ 
 	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($attachments))
-		fatal_lang_error('no_access', false);
+	if (empty($attachments)) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Finally, we are there. Follow through!
 	if ($is_approve)
 	{
 		// Checked and deemed worthy.
 		ApproveAttachments($attachments);
+	} else {
+			removeAttachments(array('id_attach' => $attachments, 'do_logging' => true));
 	}
-	else
-		removeAttachments(array('id_attach' => $attachments, 'do_logging' => true));
 
 	// Return to the topic....
 	redirectexit($redirect);
@@ -1821,8 +1882,9 @@ 
 {
 	global $smcFunc;
 
-	if (empty($attachments))
-		return 0;
+	if (empty($attachments)) {
+			return 0;
+	}
 
 	// For safety, check for thumbnails...
 	$request = $smcFunc['db_query']('', '
@@ -1841,15 +1903,17 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Update the thumbnail too...
-		if (!empty($row['id_thumb']))
-			$attachments[] = $row['id_thumb'];
+		if (!empty($row['id_thumb'])) {
+					$attachments[] = $row['id_thumb'];
+		}
 
 		$attachments[] = $row['id_attach'];
 	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($attachments))
-		return 0;
+	if (empty($attachments)) {
+			return 0;
+	}
 
 	// Approving an attachment is not hard - it's easy.
 	$smcFunc['db_query']('', '
@@ -1875,14 +1939,15 @@ 
 		)
 	);
 
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		logAction(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			logAction(
 			'approve_attach',
 			array(
 				'message' => $row['id_msg'],
 				'filename' => preg_replace('~&amp;#(\\d{1,7}|x[0-9a-fA-F]{1,6});~', '&#\\1;', $smcFunc['htmlspecialchars']($row['filename'])),
 			)
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Remove from the approval queue.
@@ -1905,11 +1970,11 @@ 
 	global $modSettings, $scripturl, $context, $txt, $sourcedir, $boarddir, $smcFunc, $settings;
 
 	// Since this needs to be done eventually.
-	if (!isset($modSettings['attachment_basedirectories']))
-		$modSettings['attachment_basedirectories'] = array();
-
-	elseif (!is_array($modSettings['attachment_basedirectories']))
-		$modSettings['attachment_basedirectories'] = $smcFunc['json_decode']($modSettings['attachment_basedirectories'], true);
+	if (!isset($modSettings['attachment_basedirectories'])) {
+			$modSettings['attachment_basedirectories'] = array();
+	} elseif (!is_array($modSettings['attachment_basedirectories'])) {
+			$modSettings['attachment_basedirectories'] = $smcFunc['json_decode']($modSettings['attachment_basedirectories'], true);
+	}
 
 	$errors = array();
 
@@ -1924,8 +1989,9 @@ 
 		{
 			$error = '';
 			$id = (int) $id;
-			if ($id < 1)
-				continue;
+			if ($id < 1) {
+							continue;
+			}
 
 			// Sorry, these dirs are NOT valid
 			$invalid_dirs = array($boarddir, $settings['default_theme_dir'], $sourcedir);
@@ -1944,8 +2010,7 @@ 
 				{
 						$errors[] = $path . ': ' . $txt['attach_dir_duplicate_msg'];
 						continue;
-				}
-				elseif (empty($path))
+				} elseif (empty($path))
 				{
 					// Ignore this and set $id to one less
 					continue;
@@ -1953,10 +2018,11 @@ 
 
 				// OK, so let's try to create it then.
 				require_once($sourcedir . '/Subs-Attachments.php');
-				if (automanage_attachments_create_directory($path))
-					$_POST['current_dir'] = $modSettings['currentAttachmentUploadDir'];
-				else
-					$errors[] = $path . ': ' . $txt[$context['dir_creation_error']];
+				if (automanage_attachments_create_directory($path)) {
+									$_POST['current_dir'] = $modSettings['currentAttachmentUploadDir'];
+				} else {
+									$errors[] = $path . ': ' . $txt[$context['dir_creation_error']];
+				}
 			}
 
 			// Changing a directory name?
@@ -1969,8 +2035,7 @@ 
 						$errors[] = $path . ': ' . $txt['attach_dir_no_rename'];
 						$path = $modSettings['attachmentUploadDir'][$id];
 					}
-				}
-				else
+				} else
 				{
 					$errors[] = $path . ': ' . $txt['attach_dir_exists_msg'];
 					$path = $modSettings['attachmentUploadDir'][$id];
@@ -1995,12 +2060,13 @@ 
 				$path = $modSettings['attachmentUploadDir'][$id];
 
 				// It's not a good idea to delete the current directory.
-				if ($id == (!empty($_POST['current_dir']) ? $_POST['current_dir'] : $modSettings['currentAttachmentUploadDir']))
-					$errors[] = $path . ': ' . $txt['attach_dir_is_current'];
+				if ($id == (!empty($_POST['current_dir']) ? $_POST['current_dir'] : $modSettings['currentAttachmentUploadDir'])) {
+									$errors[] = $path . ': ' . $txt['attach_dir_is_current'];
+				}
 				// Or the current base directory
-				elseif (!empty($modSettings['basedirectory_for_attachments']) && $modSettings['basedirectory_for_attachments'] == $modSettings['attachmentUploadDir'][$id])
-					$errors[] = $path . ': ' . $txt['attach_dir_is_current_bd'];
-				else
+				elseif (!empty($modSettings['basedirectory_for_attachments']) && $modSettings['basedirectory_for_attachments'] == $modSettings['attachmentUploadDir'][$id]) {
+									$errors[] = $path . ': ' . $txt['attach_dir_is_current_bd'];
+				} else
 				{
 					// Let's not try to delete a path with files in it.
 					$request = $smcFunc['db_query']('', '
@@ -2019,17 +2085,18 @@ 
 					if (!empty($modSettings['attachment_basedirectories']))
 					{
 						// Count any sub-folders.
-						foreach ($modSettings['attachmentUploadDir'] as $sub)
-							if (strpos($sub, $path . DIRECTORY_SEPARATOR) !== false)
+						foreach ($modSettings['attachmentUploadDir'] as $sub) {
+													if (strpos($sub, $path . DIRECTORY_SEPARATOR) !== false)
 								$num_attach++;
+						}
 					}
 
 					// It's safe to delete. So try to delete the folder also
 					if ($num_attach == 0)
 					{
-						if (is_dir($path))
-							$doit = true;
-						elseif (is_dir($boarddir . DIRECTORY_SEPARATOR . $path))
+						if (is_dir($path)) {
+													$doit = true;
+						} elseif (is_dir($boarddir . DIRECTORY_SEPARATOR . $path))
 						{
 							$doit = true;
 							$path = $boarddir . DIRECTORY_SEPARATOR . $path;
@@ -2039,8 +2106,9 @@ 
 						{
 							unlink($path . '/.htaccess');
 							unlink($path . '/index.php');
-							if (!@rmdir($path))
-								$error = $path . ': ' . $txt['attach_dir_no_delete'];
+							if (!@rmdir($path)) {
+															$error = $path . ': ' . $txt['attach_dir_no_delete'];
+							}
 						}
 
 						// Remove it from the base directory list.
@@ -2050,14 +2118,15 @@ 
 							updateSettings(array('attachment_basedirectories' => $smcFunc['json_encode']($modSettings['attachment_basedirectories'])));
 							$modSettings['attachment_basedirectories'] = $smcFunc['json_decode']($modSettings['attachment_basedirectories'], true);
 						}
+					} else {
+											$error = $path . ': ' . $txt['attach_dir_no_remove'];
 					}
-					else
-						$error = $path . ': ' . $txt['attach_dir_no_remove'];
 
-					if (empty($error))
-						continue;
-					else
-						$errors[] = $error;
+					if (empty($error)) {
+											continue;
+					} else {
+											$errors[] = $error;
+					}
 				}
 			}
 
@@ -2065,23 +2134,26 @@ 
 		}
 
 		// We need to make sure the current directory is right.
-		if (empty($_POST['current_dir']) && !empty($modSettings['currentAttachmentUploadDir']))
-			$_POST['current_dir'] = $modSettings['currentAttachmentUploadDir'];
+		if (empty($_POST['current_dir']) && !empty($modSettings['currentAttachmentUploadDir'])) {
+					$_POST['current_dir'] = $modSettings['currentAttachmentUploadDir'];
+		}
 
 		// Find the current directory if there's no value carried,
 		if (empty($_POST['current_dir']) || empty($new_dirs[$_POST['current_dir']]))
 		{
-			if (array_key_exists($modSettings['currentAttachmentUploadDir'], $modSettings['attachmentUploadDir']))
-				$_POST['current_dir'] = $modSettings['currentAttachmentUploadDir'];
-			else
-				$_POST['current_dir'] = max(array_keys($modSettings['attachmentUploadDir']));
+			if (array_key_exists($modSettings['currentAttachmentUploadDir'], $modSettings['attachmentUploadDir'])) {
+							$_POST['current_dir'] = $modSettings['currentAttachmentUploadDir'];
+			} else {
+							$_POST['current_dir'] = max(array_keys($modSettings['attachmentUploadDir']));
+			}
 		}
 
 		// If the user wishes to go back, update the last_dir array
 		if ($_POST['current_dir'] != $modSettings['currentAttachmentUploadDir'] && !empty($modSettings['last_attachments_directory']) && (isset($modSettings['last_attachments_directory'][$_POST['current_dir']]) || isset($modSettings['last_attachments_directory'][0])))
 		{
-			if (!is_array($modSettings['last_attachments_directory']))
-				$modSettings['last_attachments_directory'] = $smcFunc['json_decode']($modSettings['last_attachments_directory'], true);
+			if (!is_array($modSettings['last_attachments_directory'])) {
+							$modSettings['last_attachments_directory'] = $smcFunc['json_decode']($modSettings['last_attachments_directory'], true);
+			}
 			$num = substr(strrchr($modSettings['attachmentUploadDir'][$_POST['current_dir']], '_'), 1);
 
 			if (is_numeric($num))
@@ -2089,16 +2161,18 @@ 
 				// Need to find the base folder.
 				$bid = -1;
 				$use_subdirectories_for_attachments = 0;
-				if (!empty($modSettings['attachment_basedirectories']))
-					foreach ($modSettings['attachment_basedirectories'] as $bid => $base)
+				if (!empty($modSettings['attachment_basedirectories'])) {
+									foreach ($modSettings['attachment_basedirectories'] as $bid => $base)
 						if (strpos($modSettings['attachmentUploadDir'][$_POST['current_dir']], $base . DIRECTORY_SEPARATOR) !== false)
 						{
 							$use_subdirectories_for_attachments = 1;
+				}
 							break;
 						}
 
-				if ($use_subdirectories_for_attachments == 0 && strpos($modSettings['attachmentUploadDir'][$_POST['current_dir']], $boarddir . DIRECTORY_SEPARATOR) !== false)
-					$bid = 0;
+				if ($use_subdirectories_for_attachments == 0 && strpos($modSettings['attachmentUploadDir'][$_POST['current_dir']], $boarddir . DIRECTORY_SEPARATOR) !== false) {
+									$bid = 0;
+				}
 
 				$modSettings['last_attachments_directory'][$bid] = (int) $num;
 				$modSettings['basedirectory_for_attachments'] = !empty($modSettings['basedirectory_for_attachments']) ? $modSettings['basedirectory_for_attachments'] : '';
@@ -2117,8 +2191,8 @@ 
 			// We might need to reset the paths. This loop will just loop through once.
 			foreach ($new_dirs as $id => $dir)
 			{
-				if ($id != 1)
-					$smcFunc['db_query']('', '
+				if ($id != 1) {
+									$smcFunc['db_query']('', '
 						UPDATE {db_prefix}attachments
 						SET id_folder = {int:default_folder}
 						WHERE id_folder = {int:current_folder}',
@@ -2127,14 +2201,14 @@ 
 							'current_folder' => $id,
 						)
 					);
+				}
 
 				$update = array(
 					'currentAttachmentUploadDir' => 1,
 					'attachmentUploadDir' => $smcFunc['json_encode'](array(1 => $dir)),
 				);
 			}
-		}
-		else
+		} else
 		{
 			// Save it to the database.
 			$update = array(
@@ -2143,11 +2217,13 @@ 
 			);
 		}
 
-		if (!empty($update))
-			updateSettings($update);
+		if (!empty($update)) {
+					updateSettings($update);
+		}
 
-		if (!empty($errors))
-			$_SESSION['errors']['dir'] = $errors;
+		if (!empty($errors)) {
+					$_SESSION['errors']['dir'] = $errors;
+		}
 
 		redirectexit('action=admin;area=manageattachments;sa=attachpaths;' . $context['session_var'] . '=' . $context['session_id']);
 	}
@@ -2161,10 +2237,11 @@ 
 		$_POST['current_base_dir'] = isset($_POST['current_base_dir']) ? (int) $_POST['current_base_dir'] : 1;
 		if (empty($_POST['new_base_dir']) && !empty($_POST['current_base_dir']))
 		{
-			if ($modSettings['basedirectory_for_attachments'] != $modSettings['attachmentUploadDir'][$_POST['current_base_dir']])
-				$update = (array(
+			if ($modSettings['basedirectory_for_attachments'] != $modSettings['attachmentUploadDir'][$_POST['current_base_dir']]) {
+							$update = (array(
 					'basedirectory_for_attachments' => $modSettings['attachmentUploadDir'][$_POST['current_base_dir']],
 				));
+			}
 		}
 
 		if (isset($_POST['base_dir']))
@@ -2212,13 +2289,15 @@ 
 
 			if (!in_array($_POST['new_base_dir'], $modSettings['attachmentUploadDir']))
 			{
-				if (!automanage_attachments_create_directory($_POST['new_base_dir']))
-					$errors[] = $_POST['new_base_dir'] . ': ' . $txt['attach_dir_base_no_create'];
+				if (!automanage_attachments_create_directory($_POST['new_base_dir'])) {
+									$errors[] = $_POST['new_base_dir'] . ': ' . $txt['attach_dir_base_no_create'];
+				}
 			}
 
 			$modSettings['currentAttachmentUploadDir'] = array_search($_POST['new_base_dir'], $modSettings['attachmentUploadDir']);
-			if (!in_array($_POST['new_base_dir'], $modSettings['attachment_basedirectories']))
-				$modSettings['attachment_basedirectories'][$modSettings['currentAttachmentUploadDir']] = $_POST['new_base_dir'];
+			if (!in_array($_POST['new_base_dir'], $modSettings['attachment_basedirectories'])) {
+							$modSettings['attachment_basedirectories'][$modSettings['currentAttachmentUploadDir']] = $_POST['new_base_dir'];
+			}
 			ksort($modSettings['attachment_basedirectories']);
 
 			$update = (array(
@@ -2228,11 +2307,13 @@ 
 			));
 		}
 
-		if (!empty($errors))
-			$_SESSION['errors']['base'] = $errors;
+		if (!empty($errors)) {
+					$_SESSION['errors']['base'] = $errors;
+		}
 
-		if (!empty($update))
-			updateSettings($update);
+		if (!empty($update)) {
+					updateSettings($update);
+		}
 
 		redirectexit('action=admin;area=manageattachments;sa=attachpaths;' . $context['session_var'] . '=' . $context['session_id']);
 	}
@@ -2242,13 +2323,15 @@ 
 		if (is_array($_SESSION['errors']))
 		{
 			$errors = array();
-			if (!empty($_SESSION['errors']['dir']))
-				foreach ($_SESSION['errors']['dir'] as $error)
+			if (!empty($_SESSION['errors']['dir'])) {
+							foreach ($_SESSION['errors']['dir'] as $error)
 					$errors['dir'][] = $smcFunc['htmlspecialchars']($error, ENT_QUOTES);
+			}
 
-			if (!empty($_SESSION['errors']['base']))
-				foreach ($_SESSION['errors']['base'] as $error)
+			if (!empty($_SESSION['errors']['base'])) {
+							foreach ($_SESSION['errors']['base'] as $error)
 					$errors['base'][] = $smcFunc['htmlspecialchars']($error, ENT_QUOTES);
+			}
 		}
 		unset($_SESSION['errors']);
 	}
@@ -2458,8 +2541,9 @@ 
 	foreach ($modSettings['attachmentUploadDir'] as $id => $dir)
 	{
 		// If there aren't any attachments in this directory this won't exist.
-		if (!isset($expected_files[$id]))
-			$expected_files[$id] = 0;
+		if (!isset($expected_files[$id])) {
+					$expected_files[$id] = 0;
+		}
 
 		// Check if the directory is doing okay.
 		list ($status, $error, $files) = attachDirStatus($dir, $expected_files[$id]);
@@ -2472,10 +2556,11 @@ 
 			$is_base_dir = in_array($dir, $modSettings['attachment_basedirectories']);
 
 			// Count any sub-folders.
-			foreach ($modSettings['attachmentUploadDir'] as $sid => $sub)
-				if (strpos($sub, $dir . DIRECTORY_SEPARATOR) !== false)
+			foreach ($modSettings['attachmentUploadDir'] as $sid => $sub) {
+							if (strpos($sub, $dir . DIRECTORY_SEPARATOR) !== false)
 				{
 					$expected_files[$id]++;
+			}
 					$sub_dirs++;
 				}
 		}
@@ -2493,8 +2578,8 @@ 
 	}
 
 	// Just stick a new directory on at the bottom.
-	if (isset($_REQUEST['new_path']))
-		$attachdirs[] = array(
+	if (isset($_REQUEST['new_path'])) {
+			$attachdirs[] = array(
 			'id' => max(array_merge(array_keys($expected_files), array_keys($modSettings['attachmentUploadDir']))) + 1,
 			'current' => false,
 			'path' => '',
@@ -2502,6 +2587,7 @@ 
 			'num_files' => '',
 			'status' => '',
 		);
+	}
 
 	return $attachdirs;
 }
@@ -2514,8 +2600,9 @@ 
 {
 	global $modSettings, $txt;
 
-	if (empty($modSettings['attachment_basedirectories']))
-		return;
+	if (empty($modSettings['attachment_basedirectories'])) {
+			return;
+	}
 
 	$basedirs = array();
 	// Get a list of the base directories.
@@ -2523,16 +2610,18 @@ 
 	{
 		// Loop through the attach directory array to count any sub-directories
 		$expected_dirs = 0;
-		foreach ($modSettings['attachmentUploadDir'] as $sid => $sub)
-			if (strpos($sub, $dir . DIRECTORY_SEPARATOR) !== false)
+		foreach ($modSettings['attachmentUploadDir'] as $sid => $sub) {
+					if (strpos($sub, $dir . DIRECTORY_SEPARATOR) !== false)
 				$expected_dirs++;
+		}
 
-		if (!is_dir($dir))
-			$status = 'does_not_exist';
-		elseif (!is_writeable($dir))
-			$status = 'not_writable';
-		else
-			$status = 'ok';
+		if (!is_dir($dir)) {
+					$status = 'does_not_exist';
+		} elseif (!is_writeable($dir)) {
+					$status = 'not_writable';
+		} else {
+					$status = 'ok';
+		}
 
 		$basedirs[] = array(
 			'id' => $id,
@@ -2543,14 +2632,15 @@ 
 		);
 	}
 
-	if (isset($_REQUEST['new_base_path']))
-		$basedirs[] = array(
+	if (isset($_REQUEST['new_base_path'])) {
+			$basedirs[] = array(
 			'id' => '',
 			'current' => false,
 			'path' => '<input type="text" name="new_base_dir" value="" size="40">',
 			'num_dirs' => '',
 			'status' => '',
 		);
+	}
 
 	return $basedirs;
 }
@@ -2566,10 +2656,11 @@ 
  */
 function attachDirStatus($dir, $expected_files)
 {
-	if (!is_dir($dir))
-		return array('does_not_exist', true, '');
-	elseif (!is_writable($dir))
-		return array('not_writable', true, '');
+	if (!is_dir($dir)) {
+			return array('does_not_exist', true, '');
+	} elseif (!is_writable($dir)) {
+			return array('not_writable', true, '');
+	}
 
 	// Everything is okay so far, start to scan through the directory.
 	$num_files = 0;
@@ -2577,22 +2668,26 @@ 
 	while ($file = $dir_handle->read())
 	{
 		// Now do we have a real file here?
-		if (in_array($file, array('.', '..', '.htaccess', 'index.php')))
-			continue;
+		if (in_array($file, array('.', '..', '.htaccess', 'index.php'))) {
+					continue;
+		}
 
 		$num_files++;
 	}
 	$dir_handle->close();
 
-	if ($num_files < $expected_files)
-		return array('files_missing', true, $num_files);
+	if ($num_files < $expected_files) {
+			return array('files_missing', true, $num_files);
+	}
 	// Empty?
-	elseif ($expected_files == 0)
-		return array('unused', false, $num_files);
+	elseif ($expected_files == 0) {
+			return array('unused', false, $num_files);
+	}
 	// All good!
-	else
-		return array('ok', false, $num_files);
-}
+	else {
+			return array('ok', false, $num_files);
+	}
+	}
 
 /**
  * Maintance function to move attachments from one directory to another
@@ -2604,10 +2699,11 @@ 
 	checkSession();
 
 	$modSettings['attachmentUploadDir'] = $smcFunc['json_decode']($modSettings['attachmentUploadDir'], true);
-	if (!empty($modSettings['attachment_basedirectories']))
-		$modSettings['attachment_basedirectories'] = $smcFunc['json_decode']($modSettings['attachment_basedirectories'], true);
-	else
-		$modSettings['basedirectory_for_attachments'] = array();
+	if (!empty($modSettings['attachment_basedirectories'])) {
+			$modSettings['attachment_basedirectories'] = $smcFunc['json_decode']($modSettings['attachment_basedirectories'], true);
+	} else {
+			$modSettings['basedirectory_for_attachments'] = array();
+	}
 
 	$_POST['from'] = (int) $_POST['from'];
 	$_POST['auto'] = !empty($_POST['auto']) ? (int) $_POST['auto'] : 0;
@@ -2621,11 +2717,13 @@ 
 	$total_moved = 0;
 	$total_not_moved = 0;
 
-	if (empty($_POST['from']) || (empty($_POST['auto']) && empty($_POST['to'])))
-		$results[] = $txt['attachment_transfer_no_dir'];
+	if (empty($_POST['from']) || (empty($_POST['auto']) && empty($_POST['to']))) {
+			$results[] = $txt['attachment_transfer_no_dir'];
+	}
 
-	if ($_POST['from'] == $_POST['to'])
-		$results[] = $txt['attachment_transfer_same_dir'];
+	if ($_POST['from'] == $_POST['to']) {
+			$results[] = $txt['attachment_transfer_same_dir'];
+	}
 
 	if (empty($results))
 	{
@@ -2644,8 +2742,9 @@ 
 		$smcFunc['db_free_result']($request);
 		$total_progress -= $start;
 
-		if ($total_progress < 1)
-			$results[] = $txt['attachment_transfer_no_find'];
+		if ($total_progress < 1) {
+					$results[] = $txt['attachment_transfer_no_find'];
+		}
 	}
 
 	if (empty($results))
@@ -2661,9 +2760,9 @@ 
 
 			automanage_attachments_check_directory();
 			$new_dir = $modSettings['currentAttachmentUploadDir'];
+		} else {
+					$new_dir = $_POST['to'];
 		}
-		else
-			$new_dir = $_POST['to'];
 
 		$modSettings['currentAttachmentUploadDir'] = $new_dir;
 
@@ -2671,8 +2770,9 @@ 
 		while ($break == false)
 		{
 			@set_time_limit(300);
-			if (function_exists('apache_reset_timeout'))
-				@apache_reset_timeout();
+			if (function_exists('apache_reset_timeout')) {
+							@apache_reset_timeout();
+			}
 
 			// If limits are set, get the file count and size for the destination folder
 			if ($dir_files <= 0 && (!empty($modSettings['attachmentDirSizeLimit']) || !empty($modSettings['attachmentDirFileLimit'])))
@@ -2708,13 +2808,15 @@ 
 
 			if ($smcFunc['db_num_rows']($request) === 0)
 			{
-				if (empty($current_progress))
-					$results[] = $txt['attachment_transfer_no_find'];
+				if (empty($current_progress)) {
+									$results[] = $txt['attachment_transfer_no_find'];
+				}
 				break;
 			}
 
-			if ($smcFunc['db_num_rows']($request) < $limit)
-				$break = true;
+			if ($smcFunc['db_num_rows']($request) < $limit) {
+							$break = true;
+			}
 
 			// Move them
 			$moved = array();
@@ -2738,8 +2840,9 @@ 
 							automanage_attachments_by_space();
 
 							$results[] = sprintf($txt['attachments_transferred'], $total_moved, $modSettings['attachmentUploadDir'][$new_dir]);
-							if (!empty($total_not_moved))
-								$results[] = sprintf($txt['attachments_not_transferred'], $total_not_moved);
+							if (!empty($total_not_moved)) {
+															$results[] = sprintf($txt['attachments_not_transferred'], $total_not_moved);
+							}
 
 							$dir_files = 0;
 							$total_moved = 0;
@@ -2747,8 +2850,7 @@ 
 
 							$break = false;
 							break;
-						}
-						else
+						} else
 						{
 							// Hmm, not in auto. Time to bail out then...
 							$results[] = $txt['attachment_transfer_no_room'];
@@ -2763,9 +2865,9 @@ 
 					$total_moved++;
 					$current_progress++;
 					$moved[] = $row['id_attach'];
+				} else {
+									$total_not_moved++;
 				}
-				else
-					$total_not_moved++;
 			}
 			$smcFunc['db_free_result']($request);
 
@@ -2803,13 +2905,15 @@ 
 		}
 
 		$results[] = sprintf($txt['attachments_transferred'], $total_moved, $modSettings['attachmentUploadDir'][$new_dir]);
-		if (!empty($total_not_moved))
-			$results[] = sprintf($txt['attachments_not_transferred'], $total_not_moved);
+		if (!empty($total_not_moved)) {
+					$results[] = sprintf($txt['attachments_not_transferred'], $total_not_moved);
+		}
 	}
 
 	$_SESSION['results'] = $results;
-	if (file_exists($boarddir . '/progress.php'))
-		unlink($boarddir . '/progress.php');
+	if (file_exists($boarddir . '/progress.php')) {
+			unlink($boarddir . '/progress.php');
+	}
 
 	redirectexit('action=admin;area=manageattachments;sa=maintenance#transfer');
 }

Sources/Subs-Charset.php

Braces +5 added lines, -3 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Converts the given UTF-8 string into lowercase.
@@ -575,8 +576,8 @@ 
 		if (safe_unserialize($row['extra']) === false && preg_match('~^(a:3:{s:5:"topic";i:\d+;s:7:"subject";s:)(\d+):"(.+)"(;s:6:"member";s:5:"\d+";})$~', $row['extra'], $matches) === 1)
 		{
 			$temp = $matches[1] . strlen($matches[3]) . ':"' . $matches[3] . '"' . $matches[4];
-			if (safe_unserialize($temp) !== false)
-				$smcFunc['db_query']('', '
+			if (safe_unserialize($temp) !== false) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}log_actions
 					SET extra = {string:extra}
 					WHERE id_action = {int:current_action}',
@@ -585,6 +586,7 @@ 
 						'extra' => $smcFunc['json_encode'](safe_unserialize($temp)),
 					)
 				);
+			}
 		}
 	}
 	$smcFunc['db_free_result']($request);