SimpleMachines / SMF2.1

Themes/default/Stats.template.php

Braces +27 added lines, -19 removed lines

@@ -44,10 +44,11 @@ 
 				<dt>', $txt['users_online_today'], ':</dt>
 				<dd>', $context['online_today'], '</dd>';
 
-	if (!empty($modSettings['hitStats']))
-		echo '
+	if (!empty($modSettings['hitStats'])) {
+			echo '
 				<dt>', $txt['num_hits'], ':</dt>
 				<dd>', $context['num_hits'], '</dd>';
+	}
 
 	echo '
 			</dl>
@@ -71,17 +72,19 @@ 
 				<dt>', $txt['gender_stats'], ':</dt>
 				<dd>';
 
-		foreach ($context['gender'] as $g => $n)
-			echo $g, ': ', $n, '<br>';
+		foreach ($context['gender'] as $g => $n) {
+					echo $g, ': ', $n, '<br>';
+		}
 
 		echo '
 				</dd>';
 	}
 
-	if (!empty($modSettings['hitStats']))
-		echo '
+	if (!empty($modSettings['hitStats'])) {
+			echo '
 				<dt>', $txt['average_hits'], ':</dt>
 				<dd>', $context['average_hits'], '</dd>';
+	}
 
 	echo '
 			</dl>';
@@ -105,12 +108,13 @@ 
 					</dt>
 					<dd class="statsbar generic_bar righttext">';
 
-			if (!empty($item['percent']))
-				echo '
+			if (!empty($item['percent'])) {
+							echo '
 						<div class="bar" style="width: ', $item['percent'], '%;"></div>';
-			else
-				echo '
-						<div class="bar empty"></div>';			
+			} else {
+							echo '
+						<div class="bar empty"></div>';
+			}
 
 			echo '
 						<span>', $item['num'], '</span>
@@ -143,9 +147,10 @@ 
 					<th>', $txt['stats_new_members'], '</th>
 					<th>', $txt['most_online'], '</th>';
 
-		if (!empty($modSettings['hitStats']))
-			echo '
+		if (!empty($modSettings['hitStats'])) {
+					echo '
 					<th>', $txt['page_views'], '</th>';
+		}
 
 		echo '
 				</tr>
@@ -164,9 +169,10 @@ 
 					<th>', $year['new_members'], '</th>
 					<th>', $year['most_members_online'], '</th>';
 
-			if (!empty($modSettings['hitStats']))
-				echo '
+			if (!empty($modSettings['hitStats'])) {
+							echo '
 					<th>', $year['hits'], '</th>';
+			}
 
 			echo '
 				</tr>';
@@ -183,9 +189,10 @@ 
 					<th>', $month['new_members'], '</th>
 					<th>', $month['most_members_online'], '</th>';
 
-				if (!empty($modSettings['hitStats']))
-					echo '
+				if (!empty($modSettings['hitStats'])) {
+									echo '
 					<th>', $month['hits'], '</th>';
+				}
 
 				echo '
 				</tr>';
@@ -202,9 +209,10 @@ 
 					<td>', $day['new_members'], '</td>
 					<td>', $day['most_members_online'], '</td>';
 
-						if (!empty($modSettings['hitStats']))
-							echo '
+						if (!empty($modSettings['hitStats'])) {
+													echo '
 					<td>', $day['hits'], '</td>';
+						}
 
 						echo '
 				</tr>';

Themes/default/BoardIndex.template.php

Braces +67 added lines, -47 removed lines

@@ -31,9 +31,10 @@ 
 		echo '
 		<ul id="smf_slider" class="roundframe">';
 
-		foreach ($context['news_lines'] as $news)
-			echo '
+		foreach ($context['news_lines'] as $news) {
+					echo '
 			<li>', $news, '</li>';
+		}
 
 		echo '
 		</ul>
@@ -65,8 +66,9 @@ 
 	foreach ($context['categories'] as $category)
 	{
 		// If theres no parent boards we can see, avoid showing an empty category (unless its collapsed)
-		if (empty($category['boards']) && !$category['is_collapsed'])
-			continue;
+		if (empty($category['boards']) && !$category['is_collapsed']) {
+					continue;
+		}
 
 		echo '
 		<div class="main_container">
@@ -74,9 +76,10 @@ 
 				<h3 class="catbg">';
 
 		// If this category even can collapse, show a link to collapse it.
-		if ($category['can_collapse'])
-			echo '
+		if ($category['can_collapse']) {
+					echo '
 					<span id="category_', $category['id'], '_upshrink" class="', $category['is_collapsed'] ? 'toggle_down' : 'toggle_up', ' floatright" data-collapsed="', (int) $category['is_collapsed'], '" title="', !$category['is_collapsed'] ? $txt['hide_category'] : $txt['show_category'], '" style="display: none;"></span>';
+		}
 
 		echo '
 					', $category['link'], '
@@ -106,10 +109,11 @@ 
 					</div>';
 
 				// Won't somebody think of the children!
-				if (function_exists('template_bi_' . $board['type'] . '_children'))
-					call_user_func('template_bi_' . $board['type'] . '_children', $board);
-				else
-					template_bi_board_children($board);
+				if (function_exists('template_bi_' . $board['type'] . '_children')) {
+									call_user_func('template_bi_' . $board['type'] . '_children', $board);
+				} else {
+									template_bi_board_children($board);
+				}
 
 				echo '
 				</div><!-- #board_[id] -->';
@@ -124,12 +128,13 @@ 
 	</div><!-- #boardindex_table -->';
 
 	// Show the mark all as read button?
-	if ($context['user']['is_logged'] && !empty($context['categories']))
-		echo '
+	if ($context['user']['is_logged'] && !empty($context['categories'])) {
+			echo '
 	<div class="mark_read">
 		', template_button_strip($context['mark_read_button'], 'right'), '
 	</div>';
-}
+	}
+	}
 
 /**
  * Outputs the board icon for a standard board.
@@ -173,18 +178,20 @@ 
 						</a>';
 
 	// Has it outstanding posts for approval?
-	if ($board['can_approve_posts'] && ($board['unapproved_posts'] || $board['unapproved_topics']))
-		echo '
+	if ($board['can_approve_posts'] && ($board['unapproved_posts'] || $board['unapproved_topics'])) {
+			echo '
 						<a href="', $scripturl, '?action=moderate;area=postmod;sa=', ($board['unapproved_topics'] > 0 ? 'topics' : 'posts'), ';brd=', $board['id'], ';', $context['session_var'], '=', $context['session_id'], '" title="', sprintf($txt['unapproved_posts'], $board['unapproved_topics'], $board['unapproved_posts']), '" class="moderation_link">(!)</a>';
+	}
 
 	echo '
 						<p class="board_description">', $board['description'], '</p>';
 
 	// Show the "Moderators: ". Each has name, href, link, and id. (but we're gonna use link_moderators.)
-	if (!empty($board['link_moderators']))
-		echo '
+	if (!empty($board['link_moderators'])) {
+			echo '
 						<p class="moderators">', count($board['link_moderators']) == 1 ? $txt['moderator'] : $txt['moderators'], ': ', implode(', ', $board['link_moderators']), '</p>';
-}
+	}
+	}
 
 /**
  * Outputs the board stats for a standard board.
@@ -225,10 +232,11 @@ 
  */
 function template_bi_board_lastpost($board)
 {
-	if (!empty($board['last_post']['id']))
-		echo '
+	if (!empty($board['last_post']['id'])) {
+			echo '
 						<p>', $board['last_post']['last_post_message'], '</p>';
-}
+	}
+	}
 
 /**
  * Outputs the board children for a standard board.
@@ -248,14 +256,16 @@ 
 			id, name, description, new (is it new?), topics (#), posts (#), href, link, and last_post. */
 		foreach ($board['children'] as $child)
 		{
-			if (!$child['is_redirect'])
-				$child['link'] = ''. ($child['new'] ? '<a href="' . $scripturl . '?action=unread;board=' . $child['id'] . '" title="' . $txt['new_posts'] . ' (' . $txt['board_topics'] . ': ' . comma_format($child['topics']) . ', ' . $txt['posts'] . ': ' . comma_format($child['posts']) . ')" class="new_posts">' . $txt['new'] . '</a>' : '') . '<a href="' . $child['href'] . '" ' . ($child['new'] ? 'class="board_new_posts" ' : '') . 'title="' . ($child['new'] ? $txt['new_posts'] : $txt['old_posts']) . ' (' . $txt['board_topics'] . ': ' . comma_format($child['topics']) . ', ' . $txt['posts'] . ': ' . comma_format($child['posts']) . ')">' . $child['name'] . '</a>';
-			else
-				$child['link'] = '<a href="' . $child['href'] . '" title="' . comma_format($child['posts']) . ' ' . $txt['redirects'] . ' - ' . $child['short_description'] . '">' . $child['name'] . '</a>';
+			if (!$child['is_redirect']) {
+							$child['link'] = ''. ($child['new'] ? '<a href="' . $scripturl . '?action=unread;board=' . $child['id'] . '" title="' . $txt['new_posts'] . ' (' . $txt['board_topics'] . ': ' . comma_format($child['topics']) . ', ' . $txt['posts'] . ': ' . comma_format($child['posts']) . ')" class="new_posts">' . $txt['new'] . '</a>' : '') . '<a href="' . $child['href'] . '" ' . ($child['new'] ? 'class="board_new_posts" ' : '') . 'title="' . ($child['new'] ? $txt['new_posts'] : $txt['old_posts']) . ' (' . $txt['board_topics'] . ': ' . comma_format($child['topics']) . ', ' . $txt['posts'] . ': ' . comma_format($child['posts']) . ')">' . $child['name'] . '</a>';
+			} else {
+							$child['link'] = '<a href="' . $child['href'] . '" title="' . comma_format($child['posts']) . ' ' . $txt['redirects'] . ' - ' . $child['short_description'] . '">' . $child['name'] . '</a>';
+			}
 
 			// Has it posts awaiting approval?
-			if ($child['can_approve_posts'] && ($child['unapproved_posts'] || $child['unapproved_topics']))
-				$child['link'] .= ' <a href="' . $scripturl . '?action=moderate;area=postmod;sa=' . ($child['unapproved_topics'] > 0 ? 'topics' : 'posts') . ';brd=' . $child['id'] . ';' . $context['session_var'] . '=' . $context['session_id'] . '" title="' . sprintf($txt['unapproved_posts'], $child['unapproved_topics'], $child['unapproved_posts']) . '" class="moderation_link">(!)</a>';
+			if ($child['can_approve_posts'] && ($child['unapproved_posts'] || $child['unapproved_topics'])) {
+							$child['link'] .= ' <a href="' . $scripturl . '?action=moderate;area=postmod;sa=' . ($child['unapproved_topics'] > 0 ? 'topics' : 'posts') . ';brd=' . $child['id'] . ';' . $context['session_var'] . '=' . $context['session_id'] . '" title="' . sprintf($txt['unapproved_posts'], $child['unapproved_topics'], $child['unapproved_posts']) . '" class="moderation_link">(!)</a>';
+			}
 
 			$children[] = $child['new'] ? '<span class="strong">' . $child['link'] . '</span>' : '<span>' . $child['link'] . '</span>';
 		}
@@ -282,8 +292,9 @@ 
 {
 	global $context, $options, $txt;
 
-	if (empty($context['info_center']))
-		return;
+	if (empty($context['info_center'])) {
+			return;
+	}
 
 	// Here's where the "Info Center" starts...
 	echo '
@@ -383,14 +394,15 @@ 
 		/* Each post in latest_posts has:
 			board (with an id, name, and link.), topic (the topic's id.), poster (with id, name, and link.),
 			subject, short_subject (shortened with...), time, link, and href. */
-		foreach ($context['latest_posts'] as $post)
-			echo '
+		foreach ($context['latest_posts'] as $post) {
+					echo '
 					<tr class="windowbg">
 						<td class="recentpost"><strong>', $post['link'], '</strong></td>
 						<td class="recentposter">', $post['poster']['link'], '</td>
 						<td class="recentboard">', $post['board']['link'], '</td>
 						<td class="recenttime">', $post['time'], '</td>
 					</tr>';
+		}
 		echo '
 				</table>';
 	}
@@ -414,11 +426,12 @@ 
 			</div>';
 
 	// Holidays like "Christmas", "Chanukah", and "We Love [Unknown] Day" :P
-	if (!empty($context['calendar_holidays']))
-		echo '
+	if (!empty($context['calendar_holidays'])) {
+			echo '
 			<p class="inline holiday">
 				<span>', $txt['calendar_prompt'], '</span> ', implode(', ', $context['calendar_holidays']), '
 			</p>';
+	}
 
 	// People's birthdays. Like mine. And yours, I guess. Kidding.
 	if (!empty($context['calendar_birthdays']))
@@ -428,9 +441,10 @@ 
 				<span class="birthday">', $context['calendar_only_today'] ? $txt['birthdays'] : $txt['birthdays_upcoming'], '</span>';
 
 		// Each member in calendar_birthdays has: id, name (person), age (if they have one set?), is_last. (last in list?), and is_today (birthday is today?)
-		foreach ($context['calendar_birthdays'] as $member)
-			echo '
+		foreach ($context['calendar_birthdays'] as $member) {
+					echo '
 				<a href="', $scripturl, '?action=profile;u=', $member['id'], '">', $member['is_today'] ? '<strong class="fix_rtl_names">' : '', $member['name'], $member['is_today'] ? '</strong>' : '', isset($member['age']) ? ' (' . $member['age'] . ')' : '', '</a>', $member['is_last'] ? '' : ', ';
+		}
 
 		echo '
 			</p>';
@@ -445,9 +459,10 @@ 
 
 		// Each event in calendar_events should have:
 		//		title, href, is_last, can_edit (are they allowed?), modify_href, and is_today.
-		foreach ($context['calendar_events'] as $event)
-			echo '
+		foreach ($context['calendar_events'] as $event) {
+					echo '
 				', $event['can_edit'] ? '<a href="' . $event['modify_href'] . '" title="' . $txt['calendar_edit'] . '"><span class="generic_icons calendar_modify"></span></a> ' : '', $event['href'] == '' ? '' : '<a href="' . $event['href'] . '">', $event['is_today'] ? '<strong>' . $event['title'] . '</strong>' : $event['title'], $event['href'] == '' ? '' : '</a>', $event['is_last'] ? '<br>' : ', ';
+		}
 		echo '
 			</p>';
 	}
@@ -493,17 +508,21 @@ 
 	// Handle hidden users and buddies.
 	$bracketList = array();
 
-	if ($context['show_buddies'])
-		$bracketList[] = comma_format($context['num_buddies']) . ' ' . ($context['num_buddies'] == 1 ? $txt['buddy'] : $txt['buddies']);
+	if ($context['show_buddies']) {
+			$bracketList[] = comma_format($context['num_buddies']) . ' ' . ($context['num_buddies'] == 1 ? $txt['buddy'] : $txt['buddies']);
+	}
 
-	if (!empty($context['num_spiders']))
-		$bracketList[] = comma_format($context['num_spiders']) . ' ' . ($context['num_spiders'] == 1 ? $txt['spider'] : $txt['spiders']);
+	if (!empty($context['num_spiders'])) {
+			$bracketList[] = comma_format($context['num_spiders']) . ' ' . ($context['num_spiders'] == 1 ? $txt['spider'] : $txt['spiders']);
+	}
 
-	if (!empty($context['num_users_hidden']))
-		$bracketList[] = comma_format($context['num_users_hidden']) . ' ' . ($context['num_spiders'] == 1 ? $txt['hidden'] : $txt['hidden_s']);
+	if (!empty($context['num_users_hidden'])) {
+			$bracketList[] = comma_format($context['num_users_hidden']) . ' ' . ($context['num_spiders'] == 1 ? $txt['hidden'] : $txt['hidden_s']);
+	}
 
-	if (!empty($bracketList))
-		echo ' (' . implode(', ', $bracketList) . ')';
+	if (!empty($bracketList)) {
+			echo ' (' . implode(', ', $bracketList) . ')';
+	}
 
 	echo $context['show_who'] ? '</a>' : '', '
 
@@ -517,9 +536,10 @@ 
 				', sprintf($txt['users_active'], $modSettings['lastActive']), ': ', implode(', ', $context['list_users_online']);
 
 		// Showing membergroups?
-		if (!empty($settings['show_group_key']) && !empty($context['membergroups']))
-			echo '
+		if (!empty($settings['show_group_key']) && !empty($context['membergroups'])) {
+					echo '
 				<span class="membergroups">' . implode(', ', $context['membergroups']) . '</span>';
+		}
 	}
 
 	echo '

Sources/Groups.php

Braces +80 added lines, -59 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Entry point function, permission checks, admin bars, etc.
@@ -99,27 +100,27 @@ 
 					'function' => function($rowData) use ($scripturl)
 					{
 						// Since the moderator group has no explicit members, no link is needed.
-						if ($rowData['id_group'] == 3)
-							$group_name = $rowData['group_name'];
-						else
+						if ($rowData['id_group'] == 3) {
+													$group_name = $rowData['group_name'];
+						} else
 						{
 							$color_style = empty($rowData['online_color']) ? '' : sprintf(' style="color: %1$s;"', $rowData['online_color']);
 
 							if (allowedTo('manage_membergroups'))
 							{
 								$group_name = sprintf('<a href="%1$s?action=admin;area=membergroups;sa=members;group=%2$d"%3$s>%4$s</a>', $scripturl, $rowData['id_group'], $color_style, $rowData['group_name']);
-							}
-							else
+							} else
 							{
 								$group_name = sprintf('<a href="%1$s?action=groups;sa=members;group=%2$d"%3$s>%4$s</a>', $scripturl, $rowData['id_group'], $color_style, $rowData['group_name']);
 							}
 						}
 
 						// Add a help option for moderator and administrator.
-						if ($rowData['id_group'] == 1)
-							$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_administrator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl);
-						elseif ($rowData['id_group'] == 3)
-							$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_moderator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl);
+						if ($rowData['id_group'] == 1) {
+													$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_administrator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl);
+						} elseif ($rowData['id_group'] == 3) {
+													$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_moderator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl);
+						}
 
 						return $group_name;
 					},
@@ -198,8 +199,9 @@ 
 	$_REQUEST['group'] = isset($_REQUEST['group']) ? (int) $_REQUEST['group'] : 0;
 
 	// No browsing of guests, membergroup 0 or moderators.
-	if (in_array($_REQUEST['group'], array(-1, 0, 3)))
-		fatal_lang_error('membergroup_does_not_exist', false);
+	if (in_array($_REQUEST['group'], array(-1, 0, 3))) {
+			fatal_lang_error('membergroup_does_not_exist', false);
+	}
 
 	// Load up the group details.
 	$request = $smcFunc['db_query']('', '
@@ -214,8 +216,9 @@ 
 		)
 	);
 	// Doesn't exist?
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('membergroup_does_not_exist', false);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('membergroup_does_not_exist', false);
+	}
 	$context['group'] = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -248,21 +251,25 @@ 
 			'name' => $row['real_name']
 		);
 
-		if ($user_info['id'] == $row['id_member'] && $context['group']['group_type'] != 1)
-			$context['group']['can_moderate'] = true;
+		if ($user_info['id'] == $row['id_member'] && $context['group']['group_type'] != 1) {
+					$context['group']['can_moderate'] = true;
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
 	// If this group is hidden then it can only "exists" if the user can moderate it!
-	if ($context['group']['hidden'] && !$context['group']['can_moderate'])
-		fatal_lang_error('membergroup_does_not_exist', false);
+	if ($context['group']['hidden'] && !$context['group']['can_moderate']) {
+			fatal_lang_error('membergroup_does_not_exist', false);
+	}
 
 	// You can only assign membership if you are the moderator and/or can manage groups!
-	if (!$context['group']['can_moderate'])
-		$context['group']['assignable'] = 0;
+	if (!$context['group']['can_moderate']) {
+			$context['group']['assignable'] = 0;
+	}
 	// Non-admins cannot assign admins.
-	elseif ($context['group']['id'] == 1 && !allowedTo('admin_forum'))
-		$context['group']['assignable'] = 0;
+	elseif ($context['group']['id'] == 1 && !allowedTo('admin_forum')) {
+			$context['group']['assignable'] = 0;
+	}
 
 	// Removing member from group?
 	if (isset($_POST['remove']) && !empty($_REQUEST['rem']) && is_array($_REQUEST['rem']) && $context['group']['assignable'])
@@ -271,8 +278,9 @@ 
 		validateToken('mod-mgm');
 
 		// Make sure we're dealing with integers only.
-		foreach ($_REQUEST['rem'] as $key => $group)
-			$_REQUEST['rem'][$key] = (int) $group;
+		foreach ($_REQUEST['rem'] as $key => $group) {
+					$_REQUEST['rem'][$key] = (int) $group;
+		}
 
 		require_once($sourcedir . '/Subs-Membergroups.php');
 		removeMembersFromGroups($_REQUEST['rem'], $_REQUEST['group'], true);
@@ -295,16 +303,18 @@ 
 		{
 			$member_names[$index] = trim($smcFunc['strtolower']($member_names[$index]));
 
-			if (strlen($member_names[$index]) == 0)
-				unset($member_names[$index]);
+			if (strlen($member_names[$index]) == 0) {
+							unset($member_names[$index]);
+			}
 		}
 
 		// Any passed by ID?
 		$member_ids = array();
-		if (!empty($_REQUEST['member_add']))
-			foreach ($_REQUEST['member_add'] as $id)
+		if (!empty($_REQUEST['member_add'])) {
+					foreach ($_REQUEST['member_add'] as $id)
 				if ($id > 0)
 					$member_ids[] = (int) $id;
+		}
 
 		// Construct the query pelements.
 		if (!empty($member_ids))
@@ -332,8 +342,9 @@ 
 					'id_group' => $_REQUEST['group'],
 				))
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$members[] = $row['id_member'];
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$members[] = $row['id_member'];
+			}
 			$smcFunc['db_free_result']($request);
 		}
 
@@ -372,10 +383,11 @@ 
 	$context['sort_direction'] = isset($_REQUEST['desc']) ? 'down' : 'up';
 
 	// The where on the query is interesting. Non-moderators should only see people who are in this group as primary.
-	if ($context['group']['can_moderate'])
-		$where = $context['group']['is_post_group'] ? 'id_post_group = {int:group}' : 'id_group = {int:group} OR FIND_IN_SET({int:group}, additional_groups) != 0';
-	else
-		$where = $context['group']['is_post_group'] ? 'id_post_group = {int:group}' : 'id_group = {int:group}';
+	if ($context['group']['can_moderate']) {
+			$where = $context['group']['is_post_group'] ? 'id_post_group = {int:group}' : 'id_group = {int:group} OR FIND_IN_SET({int:group}, additional_groups) != 0';
+	} else {
+			$where = $context['group']['is_post_group'] ? 'id_post_group = {int:group}' : 'id_group = {int:group}';
+	}
 
 	// Count members of the group.
 	$request = $smcFunc['db_query']('', '
@@ -416,8 +428,9 @@ 
 		$last_online = empty($row['last_login']) ? $txt['never'] : timeformat($row['last_login']);
 
 		// Italicize the online note if they aren't activated.
-		if ($row['is_activated'] % 10 != 1)
-			$last_online = '<em title="' . $txt['not_activated'] . '">' . $last_online . '</em>';
+		if ($row['is_activated'] % 10 != 1) {
+					$last_online = '<em title="' . $txt['not_activated'] . '">' . $last_online . '</em>';
+		}
 
 		$context['members'][] = array(
 			'id' => $row['id_member'],
@@ -437,9 +450,10 @@ 
 	$context['page_title'] = $txt['membergroups_members_title'] . ': ' . $context['group']['name'];
 	createToken('mod-mgm');
 
-	if ($context['group']['assignable'])
-		loadJavaScriptFile('suggest.js', array('defer' => false, 'minimize' => true), 'smf_suggest');
-}
+	if ($context['group']['assignable']) {
+			loadJavaScriptFile('suggest.js', array('defer' => false, 'minimize' => true), 'smf_suggest');
+	}
+	}
 
 /**
  * Show and manage all group requests.
@@ -453,16 +467,18 @@ 
 	$context['sub_template'] = 'show_list';
 
 	// Verify we can be here.
-	if ($user_info['mod_cache']['gq'] == '0=1')
-		isAllowedTo('manage_membergroups');
+	if ($user_info['mod_cache']['gq'] == '0=1') {
+			isAllowedTo('manage_membergroups');
+	}
 
 	// Normally, we act normally...
 	$where = ($user_info['mod_cache']['gq'] == '1=1' || $user_info['mod_cache']['gq'] == '0=1' ? $user_info['mod_cache']['gq'] : 'lgr.' . $user_info['mod_cache']['gq']);
 
-	if (isset($_GET['closed']))
-		$where .= ' AND lgr.status != {int:status_open}';
-	else
-		$where .= ' AND lgr.status = {int:status_open}';
+	if (isset($_GET['closed'])) {
+			$where .= ' AND lgr.status != {int:status_open}';
+	} else {
+			$where .= ' AND lgr.status = {int:status_open}';
+	}
 
 	$where_parameters = array(
 		'status_open' => 0,
@@ -475,8 +491,9 @@ 
 		validateToken('mod-gr');
 
 		// Clean the values.
-		foreach ($_POST['groupr'] as $k => $request)
-			$_POST['groupr'][$k] = (int) $request;
+		foreach ($_POST['groupr'] as $k => $request) {
+					$_POST['groupr'][$k] = (int) $request;
+		}
 
 		$log_changes = array();
 
@@ -513,8 +530,8 @@ 
 			$request_list = array();
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
-				if (!isset($log_changes[$row['id_request']]))
-					$log_changes[$row['id_request']] = array(
+				if (!isset($log_changes[$row['id_request']])) {
+									$log_changes[$row['id_request']] = array(
 						'id_request' => $row['id_request'],
 						'status' => $_POST['req_action'] == 'approve' ? 1 : 2, // 1 = approved, 2 = rejected
 						'id_member_acted' => $user_info['id'],
@@ -522,6 +539,7 @@ 
 						'time_acted' => time(),
 						'act_reason' => $_POST['req_action'] != 'approve' && !empty($_POST['groupreason']) && !empty($_POST['groupreason'][$row['id_request']]) ? $smcFunc['htmlspecialchars']($_POST['groupreason'][$row['id_request']], ENT_QUOTES) : '',
 					);
+				}
 				$request_list[] = $row['id_request'];
 			}
 			$smcFunc['db_free_result']($request);
@@ -744,21 +762,24 @@ 
 	$group_requests = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (empty($row['reason']))
-			$reason = '<em>(' . $txt['mc_groupr_no_reason'] . ')</em>';
-		else
-			$reason = censorText($row['reason']);
+		if (empty($row['reason'])) {
+					$reason = '<em>(' . $txt['mc_groupr_no_reason'] . ')</em>';
+		} else {
+					$reason = censorText($row['reason']);
+		}
 
 		if (isset($_GET['closed']))
 		{
-			if ($row['status'] == 1)
-				$reason .= '<br><br><strong>' . $txt['mc_groupr_approved'] . '</strong>';
-			elseif ($row['status'] == 2)
-				$reason .= '<br><br><strong>' . $txt['mc_groupr_rejected'] . '</strong>';
+			if ($row['status'] == 1) {
+							$reason .= '<br><br><strong>' . $txt['mc_groupr_approved'] . '</strong>';
+			} elseif ($row['status'] == 2) {
+							$reason .= '<br><br><strong>' . $txt['mc_groupr_rejected'] . '</strong>';
+			}
 
 				$reason .= ' (' . timeformat($row['time_acted']) . ')';
-			if (!empty($row['act_reason']))
-				$reason .= '<br><br>' . censorText($row['act_reason']);
+			if (!empty($row['act_reason'])) {
+							$reason .= '<br><br>' . censorText($row['act_reason']);
+			}
 		}
 
 		$group_requests[] = array(

Sources/Admin.php

Braces +75 added lines, -52 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The main admin handling function.<br>
@@ -444,8 +445,9 @@ 
 		foreach ($admin_includes as $include)
 		{
 			$include = strtr(trim($include), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir, '$themedir' => $settings['theme_dir']));
-			if (file_exists($include))
-				require_once($include);
+			if (file_exists($include)) {
+							require_once($include);
+			}
 		}
 	}
 
@@ -457,24 +459,27 @@ 
 	unset($admin_areas);
 
 	// Nothing valid?
-	if ($admin_include_data == false)
-		fatal_lang_error('no_access', false);
+	if ($admin_include_data == false) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Build the link tree.
 	$context['linktree'][] = array(
 		'url' => $scripturl . '?action=admin',
 		'name' => $txt['admin_center'],
 	);
-	if (isset($admin_include_data['current_area']) && $admin_include_data['current_area'] != 'index')
-		$context['linktree'][] = array(
+	if (isset($admin_include_data['current_area']) && $admin_include_data['current_area'] != 'index') {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=admin;area=' . $admin_include_data['current_area'] . ';' . $context['session_var'] . '=' . $context['session_id'],
 			'name' => $admin_include_data['label'],
 		);
-	if (!empty($admin_include_data['current_subsection']) && $admin_include_data['subsections'][$admin_include_data['current_subsection']][0] != $admin_include_data['label'])
-		$context['linktree'][] = array(
+	}
+	if (!empty($admin_include_data['current_subsection']) && $admin_include_data['subsections'][$admin_include_data['current_subsection']][0] != $admin_include_data['label']) {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=admin;area=' . $admin_include_data['current_area'] . ';sa=' . $admin_include_data['current_subsection'] . ';' . $context['session_var'] . '=' . $context['session_id'],
 			'name' => $admin_include_data['subsections'][$admin_include_data['current_subsection']][0],
 		);
+	}
 
 	// Make a note of the Unique ID for this menu.
 	$context['admin_menu_id'] = $context['max_menu_id'];
@@ -484,16 +489,18 @@ 
 	$context['admin_area'] = $admin_include_data['current_area'];
 
 	// Now - finally - call the right place!
-	if (isset($admin_include_data['file']))
-		require_once($sourcedir . '/' . $admin_include_data['file']);
+	if (isset($admin_include_data['file'])) {
+			require_once($sourcedir . '/' . $admin_include_data['file']);
+	}
 
 	// Get the right callable.
 	$call = call_helper($admin_include_data['function'], true);
 
 	// Is it valid?
-	if (!empty($call))
-		call_user_func($call);
-}
+	if (!empty($call)) {
+			call_user_func($call);
+	}
+	}
 
 /**
  * The main administration section.
@@ -547,13 +554,14 @@ 
 
 	$context['sub_template'] = $context['admin_area'] == 'credits' ? 'credits' : 'admin';
 	$context['page_title'] = $context['admin_area'] == 'credits' ? $txt['support_credits_title'] : $txt['admin_center'];
-	if ($context['admin_area'] != 'credits')
-		$context[$context['admin_menu_name']]['tab_data'] = array(
+	if ($context['admin_area'] != 'credits') {
+			$context[$context['admin_menu_name']]['tab_data'] = array(
 			'title' => $txt['admin_center'],
 			'help' => '',
 			'description' => '<strong>' . $txt['hello_guest'] . ' ' . $context['user']['name'] . '!</strong>
 						' . sprintf($txt['admin_main_welcome'], $txt['admin_center'], $txt['help'], $txt['help']),
 		);
+	}
 
 	// Lastly, fill in the blanks in the support resources paragraphs.
 	$txt['support_resources_p1'] = sprintf($txt['support_resources_p1'],
@@ -571,9 +579,10 @@ 
 		'https://www.simplemachines.org/redirect/customize_support'
 	);
 
-	if ($context['admin_area'] == 'admin')
-		loadJavaScriptFile('admin.js', array('defer' => false, 'minimize' => true), 'smf_admin');
-}
+	if ($context['admin_area'] == 'admin') {
+			loadJavaScriptFile('admin.js', array('defer' => false, 'minimize' => true), 'smf_admin');
+	}
+	}
 
 /**
  * Get one of the admin information files from Simple Machines.
@@ -584,8 +593,9 @@ 
 
 	setMemoryLimit('32M');
 
-	if (empty($_REQUEST['filename']) || !is_string($_REQUEST['filename']))
-		fatal_lang_error('no_access', false);
+	if (empty($_REQUEST['filename']) || !is_string($_REQUEST['filename'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Strip off the forum cache part or we won't find it...
 	$_REQUEST['filename'] = str_replace($modSettings['browser_cache'], '', $_REQUEST['filename']);
@@ -600,27 +610,30 @@ 
 		)
 	);
 
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('admin_file_not_found', true, array($_REQUEST['filename']), 404);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('admin_file_not_found', true, array($_REQUEST['filename']), 404);
+	}
 
 	list ($file_data, $filetype) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
 	// @todo Temp
 	// Figure out if sesc is still being used.
-	if (strpos($file_data, ';sesc=') !== false && $filetype == 'text/javascript')
-		$file_data = '
+	if (strpos($file_data, ';sesc=') !== false && $filetype == 'text/javascript') {
+			$file_data = '
 if (!(\'smfForum_sessionvar\' in window))
 	window.smfForum_sessionvar = \'sesc\';
 ' . strtr($file_data, array(';sesc=' => ';\' + window.smfForum_sessionvar + \'='));
+	}
 
 	$context['template_layers'] = array();
 	// Lets make sure we aren't going to output anything nasty.
 	@ob_end_clean();
-	if (!empty($modSettings['enableCompressedOutput']))
-		@ob_start('ob_gzhandler');
-	else
-		@ob_start();
+	if (!empty($modSettings['enableCompressedOutput'])) {
+			@ob_start('ob_gzhandler');
+	} else {
+			@ob_start();
+	}
 
 	// Make sure they know what type of file we are.
 	header('content-type: ' . $filetype);
@@ -660,11 +673,12 @@ 
 		updateAdminPreferences();
 	}
 
-	if (trim($context['search_term']) == '')
-		$context['search_results'] = array();
-	else
-		call_helper($subActions[$context['search_type']]);
-}
+	if (trim($context['search_term']) == '') {
+			$context['search_results'] = array();
+	} else {
+			call_helper($subActions[$context['search_type']]);
+	}
+	}
 
 /**
  * A complicated but relatively quick internal search.
@@ -728,8 +742,9 @@ 
 
 	loadLanguage(implode('+', $language_files));
 
-	foreach ($include_files as $file)
-		require_once($sourcedir . '/' . $file . '.php');
+	foreach ($include_files as $file) {
+			require_once($sourcedir . '/' . $file . '.php');
+	}
 
 	/* This is the huge array that defines everything... it's a huge array of items formatted as follows:
 		0 = Language index (Can be array of indexes) to search through for this setting.
@@ -753,11 +768,12 @@ 
 		foreach ($section['areas'] as $menu_key => $menu_item)
 		{
 			$search_data['sections'][] = array($menu_item['label'], 'area=' . $menu_key);
-			if (!empty($menu_item['subsections']))
-				foreach ($menu_item['subsections'] as $key => $sublabel)
+			if (!empty($menu_item['subsections'])) {
+							foreach ($menu_item['subsections'] as $key => $sublabel)
 				{
 					if (isset($sublabel['label']))
 						$search_data['sections'][] = array($sublabel['label'], 'area=' . $menu_key . ';sa=' . $key);
+			}
 				}
 		}
 	}
@@ -767,9 +783,10 @@ 
 		// Get a list of their variables.
 		$config_vars = $setting_area[0](true);
 
-		foreach ($config_vars as $var)
-			if (!empty($var[1]) && !in_array($var[0], array('permissions', 'switch', 'desc')))
+		foreach ($config_vars as $var) {
+					if (!empty($var[1]) && !in_array($var[0], array('permissions', 'switch', 'desc')))
 				$search_data['settings'][] = array($var[(isset($var[2]) && in_array($var[2], array('file', 'db'))) ? 0 : 1], $setting_area[1], 'alttxt' => (isset($var[2]) && in_array($var[2], array('file', 'db'))) || isset($var[3]) ? (in_array($var[2], array('file', 'db')) ? $var[1] : $var[3]) : '');
+		}
 	}
 
 	$context['page_title'] = $txt['admin_search_results'];
@@ -782,8 +799,9 @@ 
 		foreach ($data as $item)
 		{
 			$found = false;
-			if (!is_array($item[0]))
-				$item[0] = array($item[0]);
+			if (!is_array($item[0])) {
+							$item[0] = array($item[0]);
+			}
 			foreach ($item[0] as $term)
 			{
 				if (stripos($term, $search_term) !== false || (isset($txt[$term]) && stripos($txt[$term], $search_term) !== false) || (isset($txt['setting_' . $term]) && stripos($txt['setting_' . $term], $search_term) !== false))
@@ -841,8 +859,9 @@ 
 	$postVars = explode(' ', $context['search_term']);
 
 	// Encode the search data.
-	foreach ($postVars as $k => $v)
-		$postVars[$k] = urlencode($v);
+	foreach ($postVars as $k => $v) {
+			$postVars[$k] = urlencode($v);
+	}
 
 	// This is what we will send.
 	$postVars = implode('+', $postVars);
@@ -853,8 +872,9 @@ 
 	$search_results = fetch_web_data($context['doc_apiurl'] . '?action=query&list=search&srprop=timestamp|snippet&format=xml&srwhat=text&srsearch=' . $postVars);
 
 	// If we didn't get any xml back we are in trouble - perhaps the doc site is overloaded?
-	if (!$search_results || preg_match('~<' . '\?xml\sversion="\d+\.\d+"\?' . '>\s*(<api>.+?</api>)~is', $search_results, $matches) != true)
-		fatal_lang_error('cannot_connect_doc_site');
+	if (!$search_results || preg_match('~<' . '\?xml\sversion="\d+\.\d+"\?' . '>\s*(<api>.+?</api>)~is', $search_results, $matches) != true) {
+			fatal_lang_error('cannot_connect_doc_site');
+	}
 
 	$search_results = $matches[1];
 
@@ -866,8 +886,9 @@ 
 	$results = new xmlArray($search_results, false);
 
 	// Move through the api layer.
-	if (!$results->exists('api'))
-		fatal_lang_error('cannot_connect_doc_site');
+	if (!$results->exists('api')) {
+			fatal_lang_error('cannot_connect_doc_site');
+	}
 
 	// Are there actually some results?
 	if ($results->exists('api/query/search/p'))
@@ -903,8 +924,9 @@ 
 	);
 
 	// If it's not got a sa set it must have come here for first time, pretend error log should be reversed.
-	if (!isset($_REQUEST['sa']))
-		$_REQUEST['desc'] = true;
+	if (!isset($_REQUEST['sa'])) {
+			$_REQUEST['desc'] = true;
+	}
 
 	// Setup some tab stuff.
 	$context[$context['admin_menu_name']]['tab_data'] = array(
@@ -954,9 +976,10 @@ 
 	unset($_SESSION['admin_time']);
 
 	// Clean any admin tokens as well.
-	foreach ($_SESSION['token'] as $key => $token)
-		if (strpos($key, '-admin') !== false)
+	foreach ($_SESSION['token'] as $key => $token) {
+			if (strpos($key, '-admin') !== false)
 			unset($_SESSION['token'][$key]);
+	}
 
 	redirectexit();
 }

Sources/Profile.php

Braces +158 added lines, -120 removed lines

@@ -15,8 +15,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The main designating function for modifying profiles. Loads up info, determins what to do, etc.
@@ -29,18 +30,21 @@ 
 	global $modSettings, $memberContext, $profile_vars, $post_errors, $smcFunc;
 
 	// Don't reload this as we may have processed error strings.
-	if (empty($post_errors))
-		loadLanguage('Profile+Drafts');
+	if (empty($post_errors)) {
+			loadLanguage('Profile+Drafts');
+	}
 	loadTemplate('Profile');
 
 	require_once($sourcedir . '/Subs-Menu.php');
 
 	// Did we get the user by name...
-	if (isset($_REQUEST['user']))
-		$memberResult = loadMemberData($_REQUEST['user'], true, 'profile');
+	if (isset($_REQUEST['user'])) {
+			$memberResult = loadMemberData($_REQUEST['user'], true, 'profile');
+	}
 	// ... or by id_member?
-	elseif (!empty($_REQUEST['u']))
-		$memberResult = loadMemberData((int) $_REQUEST['u'], false, 'profile');
+	elseif (!empty($_REQUEST['u'])) {
+			$memberResult = loadMemberData((int) $_REQUEST['u'], false, 'profile');
+	}
 	// If it was just ?action=profile, edit your own profile, but only if you're not a guest.
 	else
 	{
@@ -50,8 +54,9 @@ 
 	}
 
 	// Check if loadMemberData() has returned a valid result.
-	if (!$memberResult)
-		fatal_lang_error('not_a_user', false, 404);
+	if (!$memberResult) {
+			fatal_lang_error('not_a_user', false, 404);
+	}
 
 	// If all went well, we have a valid member ID!
 	list ($memID) = $memberResult;
@@ -67,8 +72,9 @@ 
 
 	// Group management isn't actually a permission. But we need it to be for this, so we need a phantom permission.
 	// And we care about what the current user can do, not what the user whose profile it is.
-	if ($user_info['mod_cache']['gq'] != '0=1')
-		$user_info['permissions'][] = 'approve_group_requests';
+	if ($user_info['mod_cache']['gq'] != '0=1') {
+			$user_info['permissions'][] = 'approve_group_requests';
+	}
 
 	// If paid subscriptions are enabled, make sure we actually have at least one subscription available...
 	$context['subs_available'] = false;
@@ -436,21 +442,25 @@ 
 		foreach ($section['areas'] as $area_id => $area)
 		{
 			// If it said no permissions that meant it wasn't valid!
-			if (empty($area['permission'][$context['user']['is_owner'] ? 'own' : 'any']))
-				$profile_areas[$section_id]['areas'][$area_id]['enabled'] = false;
+			if (empty($area['permission'][$context['user']['is_owner'] ? 'own' : 'any'])) {
+							$profile_areas[$section_id]['areas'][$area_id]['enabled'] = false;
+			}
 			// Otherwise pick the right set.
-			else
-				$profile_areas[$section_id]['areas'][$area_id]['permission'] = $area['permission'][$context['user']['is_owner'] ? 'own' : 'any'];
+			else {
+							$profile_areas[$section_id]['areas'][$area_id]['permission'] = $area['permission'][$context['user']['is_owner'] ? 'own' : 'any'];
+			}
 
 			// Password required in most cases
-			if (!empty($area['password']))
-				$context['password_areas'][] = $area_id;
+			if (!empty($area['password'])) {
+							$context['password_areas'][] = $area_id;
+			}
 		}
 	}
 
 	// Is there an updated message to show?
-	if (isset($_GET['updated']))
-		$context['profile_updated'] = $txt['profile_updated_own'];
+	if (isset($_GET['updated'])) {
+			$context['profile_updated'] = $txt['profile_updated_own'];
+	}
 
 	// Set a few options for the menu.
 	$menuOptions = array(
@@ -465,8 +475,9 @@ 
 	$profile_include_data = createMenu($profile_areas, $menuOptions);
 
 	// No menu means no access.
-	if (!$profile_include_data && (!$user_info['is_guest'] || validateSession()))
-		fatal_lang_error('no_access', false);
+	if (!$profile_include_data && (!$user_info['is_guest'] || validateSession())) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Make a note of the Unique ID for this menu.
 	$context['profile_menu_id'] = $context['max_menu_id'];
@@ -492,8 +503,9 @@ 
 			if ($current_area == $area_id)
 			{
 				// This can't happen - but is a security check.
-				if ((isset($section['enabled']) && $section['enabled'] == false) || (isset($area['enabled']) && $area['enabled'] == false))
-					fatal_lang_error('no_access', false);
+				if ((isset($section['enabled']) && $section['enabled'] == false) || (isset($area['enabled']) && $area['enabled'] == false)) {
+									fatal_lang_error('no_access', false);
+				}
 
 				// Are we saving data in a valid area?
 				if (isset($area['sc']) && (isset($_REQUEST['save']) || $context['do_preview']))
@@ -512,12 +524,14 @@ 
 				}
 
 				// Does this require session validating?
-				if (!empty($area['validate']) || (isset($_REQUEST['save']) && !$context['user']['is_owner']))
-					$security_checks['validate'] = true;
+				if (!empty($area['validate']) || (isset($_REQUEST['save']) && !$context['user']['is_owner'])) {
+									$security_checks['validate'] = true;
+				}
 
 				// Permissions for good measure.
-				if (!empty($profile_include_data['permission']))
-					$security_checks['permission'] = $profile_include_data['permission'];
+				if (!empty($profile_include_data['permission'])) {
+									$security_checks['permission'] = $profile_include_data['permission'];
+				}
 
 				// Either way got something.
 				$found_area = true;
@@ -526,21 +540,26 @@ 
 	}
 
 	// Oh dear, some serious security lapse is going on here... we'll put a stop to that!
-	if (!$found_area)
-		fatal_lang_error('no_access', false);
+	if (!$found_area) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Release this now.
 	unset($profile_areas);
 
 	// Now the context is setup have we got any security checks to carry out additional to that above?
-	if (isset($security_checks['session']))
-		checkSession($security_checks['session']);
-	if (isset($security_checks['validate']))
-		validateSession();
-	if (isset($security_checks['validateToken']))
-		validateToken($token_name, $token_type);
-	if (isset($security_checks['permission']))
-		isAllowedTo($security_checks['permission']);
+	if (isset($security_checks['session'])) {
+			checkSession($security_checks['session']);
+	}
+	if (isset($security_checks['validate'])) {
+			validateSession();
+	}
+	if (isset($security_checks['validateToken'])) {
+			validateToken($token_name, $token_type);
+	}
+	if (isset($security_checks['permission'])) {
+			isAllowedTo($security_checks['permission']);
+	}
 
 	// Create a token if needed.
 	if (isset($security_checks['needsToken']) || isset($security_checks['validateToken']))
@@ -550,8 +569,9 @@ 
 	}
 
 	// File to include?
-	if (isset($profile_include_data['file']))
-		require_once($sourcedir . '/' . $profile_include_data['file']);
+	if (isset($profile_include_data['file'])) {
+			require_once($sourcedir . '/' . $profile_include_data['file']);
+	}
 
 	// Build the link tree.
 	$context['linktree'][] = array(
@@ -559,17 +579,19 @@ 
 		'name' => sprintf($txt['profile_of_username'], $context['member']['name']),
 	);
 
-	if (!empty($profile_include_data['label']))
-		$context['linktree'][] = array(
+	if (!empty($profile_include_data['label'])) {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=profile' . ($memID != $user_info['id'] ? ';u=' . $memID : '') . ';area=' . $profile_include_data['current_area'],
 			'name' => $profile_include_data['label'],
 		);
+	}
 
-	if (!empty($profile_include_data['current_subsection']) && $profile_include_data['subsections'][$profile_include_data['current_subsection']][0] != $profile_include_data['label'])
-		$context['linktree'][] = array(
+	if (!empty($profile_include_data['current_subsection']) && $profile_include_data['subsections'][$profile_include_data['current_subsection']][0] != $profile_include_data['label']) {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=profile' . ($memID != $user_info['id'] ? ';u=' . $memID : '') . ';area=' . $profile_include_data['current_area'] . ';sa=' . $profile_include_data['current_subsection'],
 			'name' => $profile_include_data['subsections'][$profile_include_data['current_subsection']][0],
 		);
+	}
 
 	// Set the template for this area and add the profile layer.
 	$context['sub_template'] = $profile_include_data['function'];
@@ -595,12 +617,14 @@ 
 		if ($check_password)
 		{
 			// Check to ensure we're forcing SSL for authentication
-			if (!empty($modSettings['force_ssl']) && empty($maintenance) && !httpsOn())
-				fatal_lang_error('login_ssl_required');
+			if (!empty($modSettings['force_ssl']) && empty($maintenance) && !httpsOn()) {
+							fatal_lang_error('login_ssl_required');
+			}
 
 			// You didn't even enter a password!
-			if (trim($_POST['oldpasswrd']) == '')
-				$post_errors[] = 'no_password';
+			if (trim($_POST['oldpasswrd']) == '') {
+							$post_errors[] = 'no_password';
+			}
 
 			// Since the password got modified due to all the $_POST cleaning, lets undo it so we can get the correct password
 			$_POST['oldpasswrd'] = un_htmlspecialchars($_POST['oldpasswrd']);
@@ -609,42 +633,43 @@ 
 			$good_password = in_array(true, call_integration_hook('integrate_verify_password', array($cur_profile['member_name'], $_POST['oldpasswrd'], false)), true);
 
 			// Bad password!!!
-			if (!$good_password && !hash_verify_password($user_profile[$memID]['member_name'], un_htmlspecialchars(stripslashes($_POST['oldpasswrd'])), $user_info['passwd']))
-				$post_errors[] = 'bad_password';
+			if (!$good_password && !hash_verify_password($user_profile[$memID]['member_name'], un_htmlspecialchars(stripslashes($_POST['oldpasswrd'])), $user_info['passwd'])) {
+							$post_errors[] = 'bad_password';
+			}
 
 			// Warn other elements not to jump the gun and do custom changes!
-			if (in_array('bad_password', $post_errors))
-				$context['password_auth_failed'] = true;
+			if (in_array('bad_password', $post_errors)) {
+							$context['password_auth_failed'] = true;
+			}
 		}
 
 		// Change the IP address in the database.
-		if ($context['user']['is_owner'])
-			$profile_vars['member_ip'] = $user_info['ip'];
+		if ($context['user']['is_owner']) {
+					$profile_vars['member_ip'] = $user_info['ip'];
+		}
 
 		// Now call the sub-action function...
 		if ($current_area == 'activateaccount')
 		{
-			if (empty($post_errors))
-				activateAccount($memID);
-		}
-		elseif ($current_area == 'deleteaccount')
+			if (empty($post_errors)) {
+							activateAccount($memID);
+			}
+		} elseif ($current_area == 'deleteaccount')
 		{
 			if (empty($post_errors))
 			{
 				deleteAccount2($memID);
 				redirectexit();
 			}
-		}
-		elseif ($current_area == 'groupmembership' && empty($post_errors))
+		} elseif ($current_area == 'groupmembership' && empty($post_errors))
 		{
 			$msg = groupMembership2($profile_vars, $post_errors, $memID);
 
 			// Whatever we've done, we have nothing else to do here...
 			redirectexit('action=profile' . ($context['user']['is_owner'] ? '' : ';u=' . $memID) . ';area=groupmembership' . (!empty($msg) ? ';msg=' . $msg : ''));
-		}
-		elseif (in_array($current_area, array('account', 'forumprofile', 'theme')))
-			saveProfileFields();
-		else
+		} elseif (in_array($current_area, array('account', 'forumprofile', 'theme'))) {
+					saveProfileFields();
+		} else
 		{
 			$force_redirect = true;
 			// Ensure we include this.
@@ -660,34 +685,36 @@ 
 			// Load the language file so we can give a nice explanation of the errors.
 			loadLanguage('Errors');
 			$context['post_errors'] = $post_errors;
-		}
-		elseif (!empty($profile_vars))
+		} elseif (!empty($profile_vars))
 		{
 			// If we've changed the password, notify any integration that may be listening in.
-			if (isset($profile_vars['passwd']))
-				call_integration_hook('integrate_reset_pass', array($cur_profile['member_name'], $cur_profile['member_name'], $_POST['passwrd2']));
+			if (isset($profile_vars['passwd'])) {
+							call_integration_hook('integrate_reset_pass', array($cur_profile['member_name'], $cur_profile['member_name'], $_POST['passwrd2']));
+			}
 
 			updateMemberData($memID, $profile_vars);
 
 			// What if this is the newest member?
-			if ($modSettings['latestMember'] == $memID)
-				updateStats('member');
-			elseif (isset($profile_vars['real_name']))
-				updateSettings(array('memberlist_updated' => time()));
+			if ($modSettings['latestMember'] == $memID) {
+							updateStats('member');
+			} elseif (isset($profile_vars['real_name'])) {
+							updateSettings(array('memberlist_updated' => time()));
+			}
 
 			// If the member changed his/her birthdate, update calendar statistics.
-			if (isset($profile_vars['birthdate']) || isset($profile_vars['real_name']))
-				updateSettings(array(
+			if (isset($profile_vars['birthdate']) || isset($profile_vars['real_name'])) {
+							updateSettings(array(
 					'calendar_updated' => time(),
 				));
+			}
 
 			// Anything worth logging?
 			if (!empty($context['log_changes']) && !empty($modSettings['modlog_enabled']))
 			{
 				$log_changes = array();
 				require_once($sourcedir . '/Logging.php');
-				foreach ($context['log_changes'] as $k => $v)
-					$log_changes[] = array(
+				foreach ($context['log_changes'] as $k => $v) {
+									$log_changes[] = array(
 						'action' => $k,
 						'log_type' => 'user',
 						'extra' => array_merge($v, array(
@@ -695,14 +722,16 @@ 
 							'member_affected' => $memID,
 						)),
 					);
+				}
 
 				logActions($log_changes);
 			}
 
 			// Have we got any post save functions to execute?
-			if (!empty($context['profile_execute_on_save']))
-				foreach ($context['profile_execute_on_save'] as $saveFunc)
+			if (!empty($context['profile_execute_on_save'])) {
+							foreach ($context['profile_execute_on_save'] as $saveFunc)
 					$saveFunc();
+			}
 
 			// Let them know it worked!
 			$context['profile_updated'] = $context['user']['is_owner'] ? $txt['profile_updated_own'] : sprintf($txt['profile_updated_else'], $cur_profile['member_name']);
@@ -716,27 +745,31 @@ 
 	if (!empty($post_errors))
 	{
 		// Set all the errors so the template knows what went wrong.
-		foreach ($post_errors as $error_type)
-			$context['modify_error'][$error_type] = true;
+		foreach ($post_errors as $error_type) {
+					$context['modify_error'][$error_type] = true;
+		}
 	}
 	// If it's you then we should redirect upon save.
-	elseif (!empty($profile_vars) && $context['user']['is_owner'] && !$context['do_preview'])
-		redirectexit('action=profile;area=' . $current_area . (!empty($current_sa) ? ';sa=' . $current_sa : '') . ';updated');
-	elseif (!empty($force_redirect))
-		redirectexit('action=profile' . ($context['user']['is_owner'] ? '' : ';u=' . $memID) . ';area=' . $current_area);
+	elseif (!empty($profile_vars) && $context['user']['is_owner'] && !$context['do_preview']) {
+			redirectexit('action=profile;area=' . $current_area . (!empty($current_sa) ? ';sa=' . $current_sa : '') . ';updated');
+	} elseif (!empty($force_redirect)) {
+			redirectexit('action=profile' . ($context['user']['is_owner'] ? '' : ';u=' . $memID) . ';area=' . $current_area);
+	}
 
 
 	// Get the right callable.
 	$call = call_helper($profile_include_data['function'], true);
 
 	// Is it valid?
-	if (!empty($call))
-		call_user_func($call, $memID);
+	if (!empty($call)) {
+			call_user_func($call, $memID);
+	}
 
 	// Set the page title if it's not already set...
-	if (!isset($context['page_title']))
-		$context['page_title'] = $txt['profile'] . (isset($txt[$current_area]) ? ' - ' . $txt[$current_area] : '');
-}
+	if (!isset($context['page_title'])) {
+			$context['page_title'] = $txt['profile'] . (isset($txt[$current_area]) ? ' - ' . $txt[$current_area] : '');
+	}
+	}
 
 /**
  * Set up the requirements for the profile popup - the area that is shown as the popup menu for the current user.
@@ -859,16 +892,18 @@ 
 	if (!allowedTo('admin_forum') && $area != 'register')
 	{
 		// If it's the owner they can see two types of private fields, regardless.
-		if ($memID == $user_info['id'])
-			$where .= $area == 'summary' ? ' AND private < 3' : ' AND (private = 0 OR private = 2)';
-		else
-			$where .= $area == 'summary' ? ' AND private < 2' : ' AND private = 0';
+		if ($memID == $user_info['id']) {
+					$where .= $area == 'summary' ? ' AND private < 3' : ' AND (private = 0 OR private = 2)';
+		} else {
+					$where .= $area == 'summary' ? ' AND private < 2' : ' AND private = 0';
+		}
 	}
 
-	if ($area == 'register')
-		$where .= ' AND show_reg != 0';
-	elseif ($area != 'summary')
-		$where .= ' AND show_profile = {string:area}';
+	if ($area == 'register') {
+			$where .= ' AND show_reg != 0';
+	} elseif ($area != 'summary') {
+			$where .= ' AND show_profile = {string:area}';
+	}
 
 	// Load all the relevant fields - and data.
 	$request = $smcFunc['db_query']('', '
@@ -893,8 +928,9 @@ 
 			$fieldOptions = explode(',', $row['field_options']);
 			foreach ($fieldOptions as $k => $v)
 			{
-				if (empty($currentKey))
-					$currentKey = $v === $value ? $k : 0;
+				if (empty($currentKey)) {
+									$currentKey = $v === $value ? $k : 0;
+				}
 			}
 		}
 
@@ -906,13 +942,15 @@ 
 		if (isset($_POST['customfield']) && isset($_POST['customfield'][$row['col_name']]))
 		{
 			$value = $smcFunc['htmlspecialchars']($_POST['customfield'][$row['col_name']]);
-			if (in_array($row['field_type'], array('select', 'radio')))
-					$value = ($options = explode(',', $row['field_options'])) && isset($options[$value]) ? $options[$value] : '';
+			if (in_array($row['field_type'], array('select', 'radio'))) {
+								$value = ($options = explode(',', $row['field_options'])) && isset($options[$value]) ? $options[$value] : '';
+			}
 		}
 
 		// Don't show the "disabled" option for the "gender" field if we are on the "summary" area.
-		if ($area == 'summary' && $row['col_name'] == 'cust_gender' && $value == 'None')
-			continue;
+		if ($area == 'summary' && $row['col_name'] == 'cust_gender' && $value == 'None') {
+					continue;
+		}
 
 		// HTML for the input form.
 		$output_html = $value;
@@ -921,8 +959,7 @@ 
 			$true = (!$exists && $row['default_value']) || $value;
 			$input_html = '<input type="checkbox" name="customfield[' . $row['col_name'] . ']" id="customfield[' . $row['col_name'] . ']"' . ($true ? ' checked' : '') . '>';
 			$output_html = $true ? $txt['yes'] : $txt['no'];
-		}
-		elseif ($row['field_type'] == 'select')
+		} elseif ($row['field_type'] == 'select')
 		{
 			$input_html = '<select name="customfield[' . $row['col_name'] . ']" id="customfield[' . $row['col_name'] . ']"><option value="-1"></option>';
 			$options = explode(',', $row['field_options']);
@@ -930,13 +967,13 @@ 
 			{
 				$true = (!$exists && $row['default_value'] == $v) || $value == $v;
 				$input_html .= '<option value="' . $k . '"' . ($true ? ' selected' : '') . '>' . $v . '</option>';
-				if ($true)
-					$output_html = $v;
+				if ($true) {
+									$output_html = $v;
+				}
 			}
 
 			$input_html .= '</select>';
-		}
-		elseif ($row['field_type'] == 'radio')
+		} elseif ($row['field_type'] == 'radio')
 		{
 			$input_html = '<fieldset>';
 			$options = explode(',', $row['field_options']);
@@ -944,37 +981,38 @@ 
 			{
 				$true = (!$exists && $row['default_value'] == $v) || $value == $v;
 				$input_html .= '<label for="customfield_' . $row['col_name'] . '_' . $k . '"><input type="radio" name="customfield[' . $row['col_name'] . ']" id="customfield_' . $row['col_name'] . '_' . $k . '" value="' . $k . '"' . ($true ? ' checked' : '') . '>' . $v . '</label><br>';
-				if ($true)
-					$output_html = $v;
+				if ($true) {
+									$output_html = $v;
+				}
 			}
 			$input_html .= '</fieldset>';
-		}
-		elseif ($row['field_type'] == 'text')
+		} elseif ($row['field_type'] == 'text')
 		{
 			$input_html = '<input type="text" name="customfield[' . $row['col_name'] . ']" id="customfield[' . $row['col_name'] . ']"' . ($row['field_length'] != 0 ? ' maxlength="' . $row['field_length'] . '"' : '') . ' size="' . ($row['field_length'] == 0 || $row['field_length'] >= 50 ? 50 : ($row['field_length'] > 30 ? 30 : ($row['field_length'] > 10 ? 20 : 10))) . '" value="' . un_htmlspecialchars($value) . '"' . ($row['show_reg'] == 2 ? ' required' : '') . '>';
-		}
-		else
+		} else
 		{
 			@list ($rows, $cols) = @explode(',', $row['default_value']);
 			$input_html = '<textarea name="customfield[' . $row['col_name'] . ']" id="customfield[' . $row['col_name'] . ']"' . (!empty($rows) ? ' rows="' . $rows . '"' : '') . (!empty($cols) ? ' cols="' . $cols . '"' : '') . ($row['show_reg'] == 2 ? ' required' : '') . '>' . un_htmlspecialchars($value) . '</textarea>';
 		}
 
 		// Parse BBCode
-		if ($row['bbc'])
-			$output_html = parse_bbc($output_html);
-		elseif ($row['field_type'] == 'textarea')
-			// Allow for newlines at least
+		if ($row['bbc']) {
+					$output_html = parse_bbc($output_html);
+		} elseif ($row['field_type'] == 'textarea') {
+					// Allow for newlines at least
 			$output_html = strtr($output_html, array("\n" => '<br>'));
+		}
 
 		// Enclosing the user input within some other text?
-		if (!empty($row['enclose']) && !empty($output_html))
-			$output_html = strtr($row['enclose'], array(
+		if (!empty($row['enclose']) && !empty($output_html)) {
+					$output_html = strtr($row['enclose'], array(
 				'{SCRIPTURL}' => $scripturl,
 				'{IMAGES_URL}' => $settings['images_url'],
 				'{DEFAULT_IMAGES_URL}' => $settings['default_images_url'],
 				'{INPUT}' => un_htmlspecialchars($output_html),
 				'{KEY}' => $currentKey
 			));
+		}
 
 		$context['custom_fields'][] = array(
 			'name' => $row['field_name'],

Sources/ManageSettings.php

Braces +276 added lines, -201 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This function makes sure the requested subaction does exists, if it doesn't, it sets a default action or.
@@ -206,16 +207,18 @@ 
 	{
 		$all_zones = timezone_identifiers_list();
 		// Make sure we set the value to the same as the printed value.
-		foreach ($all_zones as $zone)
-			$config_vars['default_timezone'][2][$zone] = $zone;
+		foreach ($all_zones as $zone) {
+					$config_vars['default_timezone'][2][$zone] = $zone;
+		}
+	} else {
+			unset($config_vars['default_timezone']);
 	}
-	else
-		unset($config_vars['default_timezone']);
 
 	call_integration_hook('integrate_modify_basic_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Saving?
 	if (isset($_GET['save']))
@@ -223,8 +226,9 @@ 
 		checkSession();
 
 		// Prevent absurd boundaries here - make it a day tops.
-		if (isset($_POST['lastActive']))
-			$_POST['lastActive'] = min((int) $_POST['lastActive'], 1440);
+		if (isset($_POST['lastActive'])) {
+					$_POST['lastActive'] = min((int) $_POST['lastActive'], 1440);
+		}
 
 		call_integration_hook('integrate_save_basic_settings');
 
@@ -232,8 +236,9 @@ 
 		$_SESSION['adm-save'] = true;
 
 		// Do a bit of housekeeping
-		if (empty($_POST['minimize_files']))
-			deleteAllMinified();
+		if (empty($_POST['minimize_files'])) {
+					deleteAllMinified();
+		}
 
 		writeLog();
 		redirectexit('action=admin;area=featuresettings;sa=basic');
@@ -273,8 +278,9 @@ 
 
 	call_integration_hook('integrate_modify_bbc_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Setup the template.
 	require_once($sourcedir . '/ManageServer.php');
@@ -291,13 +297,15 @@ 
 
 		// Clean up the tags.
 		$bbcTags = array();
-		foreach (parse_bbc(false) as $tag)
-			$bbcTags[] = $tag['tag'];
+		foreach (parse_bbc(false) as $tag) {
+					$bbcTags[] = $tag['tag'];
+		}
 
-		if (!isset($_POST['disabledBBC_enabledTags']))
-			$_POST['disabledBBC_enabledTags'] = array();
-		elseif (!is_array($_POST['disabledBBC_enabledTags']))
-			$_POST['disabledBBC_enabledTags'] = array($_POST['disabledBBC_enabledTags']);
+		if (!isset($_POST['disabledBBC_enabledTags'])) {
+					$_POST['disabledBBC_enabledTags'] = array();
+		} elseif (!is_array($_POST['disabledBBC_enabledTags'])) {
+					$_POST['disabledBBC_enabledTags'] = array($_POST['disabledBBC_enabledTags']);
+		}
 		// Work out what is actually disabled!
 		$_POST['disabledBBC'] = implode(',', array_diff($bbcTags, $_POST['disabledBBC_enabledTags']));
 
@@ -341,8 +349,9 @@ 
 
 	call_integration_hook('integrate_layout_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Saving?
 	if (isset($_GET['save']))
@@ -382,8 +391,9 @@ 
 
 	call_integration_hook('integrate_likes_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Saving?
 	if (isset($_GET['save']))
@@ -421,8 +431,9 @@ 
 
 	call_integration_hook('integrate_mentions_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Saving?
 	if (isset($_GET['save']))
@@ -466,8 +477,8 @@ 
 			'enable' => array('check', 'warning_enable'),
 	);
 
-	if (!empty($modSettings['warning_settings']) && $currently_enabled)
-		$config_vars += array(
+	if (!empty($modSettings['warning_settings']) && $currently_enabled) {
+			$config_vars += array(
 			'',
 				array('int', 'warning_watch', 'subtext' => $txt['setting_warning_watch_note'] . ' ' . $txt['zero_to_disable']),
 				'moderate' => array('int', 'warning_moderate', 'subtext' => $txt['setting_warning_moderate_note'] . ' ' . $txt['zero_to_disable']),
@@ -476,15 +487,18 @@ 
 				'rem2' => array('int', 'warning_decrement', 'subtext' => $txt['setting_warning_decrement_note'] . ' ' . $txt['zero_to_disable']),
 				array('permissions', 'view_warning'),
 		);
+	}
 
 	call_integration_hook('integrate_warning_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Cannot use moderation if post moderation is not enabled.
-	if (!$modSettings['postmod_active'])
-		unset($config_vars['moderate']);
+	if (!$modSettings['postmod_active']) {
+			unset($config_vars['moderate']);
+	}
 
 	// Will need the utility functions from here.
 	require_once($sourcedir . '/ManageServer.php');
@@ -509,16 +523,16 @@ 
 				'warning_watch' => 10,
 				'warning_mute' => 60,
 			);
-			if ($modSettings['postmod_active'])
-				$vars['warning_moderate'] = 35;
+			if ($modSettings['postmod_active']) {
+							$vars['warning_moderate'] = 35;
+			}
 
 			foreach ($vars as $var => $value)
 			{
 				$config_vars[] = array('int', $var);
 				$_POST[$var] = $value;
 			}
-		}
-		else
+		} else
 		{
 			$_POST['warning_watch'] = min($_POST['warning_watch'], 100);
 			$_POST['warning_moderate'] = $modSettings['postmod_active'] ? min($_POST['warning_moderate'], 100) : 0;
@@ -606,8 +620,9 @@ 
 
 	call_integration_hook('integrate_spam_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// You need to be an admin to edit settings!
 	isAllowedTo('admin_forum');
@@ -641,8 +656,9 @@ 
 
 	if (empty($context['qa_by_lang'][strtr($language, array('-utf8' => ''))]) && !empty($context['question_answers']))
 	{
-		if (empty($context['settings_insert_above']))
-			$context['settings_insert_above'] = '';
+		if (empty($context['settings_insert_above'])) {
+					$context['settings_insert_above'] = '';
+		}
 
 		$context['settings_insert_above'] .= '<div class="noticebox">' . sprintf($txt['question_not_defined'], $context['languages'][$language]['name']) . '</div>';
 	}
@@ -685,8 +701,9 @@ 
 		$_POST['pm_spam_settings'] = (int) $_POST['max_pm_recipients'] . ',' . (int) $_POST['pm_posts_verification'] . ',' . (int) $_POST['pm_posts_per_hour'];
 
 		// Hack in guest requiring verification!
-		if (empty($_POST['posts_require_captcha']) && !empty($_POST['guests_require_captcha']))
-			$_POST['posts_require_captcha'] = -1;
+		if (empty($_POST['posts_require_captcha']) && !empty($_POST['guests_require_captcha'])) {
+					$_POST['posts_require_captcha'] = -1;
+		}
 
 		$save_vars = $config_vars;
 		unset($save_vars['pm1'], $save_vars['pm2'], $save_vars['pm3'], $save_vars['guest_verify']);
@@ -703,14 +720,16 @@ 
 		foreach ($context['qa_languages'] as $lang_id => $dummy)
 		{
 			// If we had some questions for this language before, but don't now, delete everything from that language.
-			if ((!isset($_POST['question'][$lang_id]) || !is_array($_POST['question'][$lang_id])) && !empty($context['qa_by_lang'][$lang_id]))
-				$changes['delete'] = array_merge($questions['delete'], $context['qa_by_lang'][$lang_id]);
+			if ((!isset($_POST['question'][$lang_id]) || !is_array($_POST['question'][$lang_id])) && !empty($context['qa_by_lang'][$lang_id])) {
+							$changes['delete'] = array_merge($questions['delete'], $context['qa_by_lang'][$lang_id]);
+			}
 
 			// Now step through and see if any existing questions no longer exist.
-			if (!empty($context['qa_by_lang'][$lang_id]))
-				foreach ($context['qa_by_lang'][$lang_id] as $q_id)
+			if (!empty($context['qa_by_lang'][$lang_id])) {
+							foreach ($context['qa_by_lang'][$lang_id] as $q_id)
 					if (empty($_POST['question'][$lang_id][$q_id]))
 						$changes['delete'][] = $q_id;
+			}
 
 			// Now let's see if there are new questions or ones that need updating.
 			if (isset($_POST['question'][$lang_id]))
@@ -719,14 +738,16 @@ 
 				{
 					// Ignore junky ids.
 					$q_id = (int) $q_id;
-					if ($q_id <= 0)
-						continue;
+					if ($q_id <= 0) {
+											continue;
+					}
 
 					// Check the question isn't empty (because they want to delete it?)
 					if (empty($question) || trim($question) == '')
 					{
-						if (isset($context['question_answers'][$q_id]))
-							$changes['delete'][] = $q_id;
+						if (isset($context['question_answers'][$q_id])) {
+													$changes['delete'][] = $q_id;
+						}
 						continue;
 					}
 					$question = $smcFunc['htmlspecialchars'](trim($question));
@@ -734,19 +755,22 @@ 
 					// Get the answers. Firstly check there actually might be some.
 					if (!isset($_POST['answer'][$lang_id][$q_id]) || !is_array($_POST['answer'][$lang_id][$q_id]))
 					{
-						if (isset($context['question_answers'][$q_id]))
-							$changes['delete'][] = $q_id;
+						if (isset($context['question_answers'][$q_id])) {
+													$changes['delete'][] = $q_id;
+						}
 						continue;
 					}
 					// Now get them and check that they might be viable.
 					$answers = array();
-					foreach ($_POST['answer'][$lang_id][$q_id] as $answer)
-						if (!empty($answer) && trim($answer) !== '')
+					foreach ($_POST['answer'][$lang_id][$q_id] as $answer) {
+											if (!empty($answer) && trim($answer) !== '')
 							$answers[] = $smcFunc['htmlspecialchars'](trim($answer));
+					}
 					if (empty($answers))
 					{
-						if (isset($context['question_answers'][$q_id]))
-							$changes['delete'][] = $q_id;
+						if (isset($context['question_answers'][$q_id])) {
+													$changes['delete'][] = $q_id;
+						}
 						continue;
 					}
 					$answers = $smcFunc['json_encode']($answers);
@@ -756,16 +780,17 @@ 
 					{
 						// New question. Now, we don't want to randomly consume ids, so we'll set those, rather than trusting the browser's supplied ids.
 						$changes['insert'][] = array($lang_id, $question, $answers);
-					}
-					else
+					} else
 					{
 						// It's an existing question. Let's see what's changed, if anything.
-						if ($lang_id != $context['question_answers'][$q_id]['lngfile'] || $question != $context['question_answers'][$q_id]['question'] || $answers != $context['question_answers'][$q_id]['answers'])
-							$changes['replace'][$q_id] = array('lngfile' => $lang_id, 'question' => $question, 'answers' => $answers);
+						if ($lang_id != $context['question_answers'][$q_id]['lngfile'] || $question != $context['question_answers'][$q_id]['question'] || $answers != $context['question_answers'][$q_id]['answers']) {
+													$changes['replace'][$q_id] = array('lngfile' => $lang_id, 'question' => $question, 'answers' => $answers);
+						}
 					}
 
-					if (!isset($qs_per_lang[$lang_id]))
-						$qs_per_lang[$lang_id] = 0;
+					if (!isset($qs_per_lang[$lang_id])) {
+											$qs_per_lang[$lang_id] = 0;
+					}
 					$qs_per_lang[$lang_id]++;
 				}
 			}
@@ -815,8 +840,9 @@ 
 
 		// Lastly, the count of messages needs to be no more than the lowest number of questions for any one language.
 		$count_questions = empty($qs_per_lang) ? 0 : min($qs_per_lang);
-		if (empty($count_questions) || $_POST['qa_verification_number'] > $count_questions)
-			$_POST['qa_verification_number'] = $count_questions;
+		if (empty($count_questions) || $_POST['qa_verification_number'] > $count_questions) {
+					$_POST['qa_verification_number'] = $count_questions;
+		}
 
 		call_integration_hook('integrate_save_spam_settings', array(&$save_vars));
 
@@ -831,24 +857,27 @@ 
 
 	$character_range = array_merge(range('A', 'H'), array('K', 'M', 'N', 'P', 'R'), range('T', 'Y'));
 	$_SESSION['visual_verification_code'] = '';
-	for ($i = 0; $i < 6; $i++)
-		$_SESSION['visual_verification_code'] .= $character_range[array_rand($character_range)];
+	for ($i = 0; $i < 6; $i++) {
+			$_SESSION['visual_verification_code'] .= $character_range[array_rand($character_range)];
+	}
 
 	// Some javascript for CAPTCHA.
 	$context['settings_post_javascript'] = '';
-	if ($context['use_graphic_library'])
-		$context['settings_post_javascript'] .= '
+	if ($context['use_graphic_library']) {
+			$context['settings_post_javascript'] .= '
 		function refreshImages()
 		{
 			var imageType = document.getElementById(\'visual_verification_type\').value;
 			document.getElementById(\'verification_image\').src = \'' . $context['verification_image_href'] . ';type=\' + imageType;
 		}';
+	}
 
 	// Show the image itself, or text saying we can't.
-	if ($context['use_graphic_library'])
-		$config_vars['vv']['postinput'] = '<br><img src="' . $context['verification_image_href'] . ';type=' . (empty($modSettings['visual_verification_type']) ? 0 : $modSettings['visual_verification_type']) . '" alt="' . $txt['setting_image_verification_sample'] . '" id="verification_image"><br>';
-	else
-		$config_vars['vv']['postinput'] = '<br><span class="smalltext">' . $txt['setting_image_verification_nogd'] . '</span>';
+	if ($context['use_graphic_library']) {
+			$config_vars['vv']['postinput'] = '<br><img src="' . $context['verification_image_href'] . ';type=' . (empty($modSettings['visual_verification_type']) ? 0 : $modSettings['visual_verification_type']) . '" alt="' . $txt['setting_image_verification_sample'] . '" id="verification_image"><br>';
+	} else {
+			$config_vars['vv']['postinput'] = '<br><span class="smalltext">' . $txt['setting_image_verification_nogd'] . '</span>';
+	}
 
 	// Hack for PM spam settings.
 	list ($modSettings['max_pm_recipients'], $modSettings['pm_posts_verification'], $modSettings['pm_posts_per_hour']) = explode(',', $modSettings['pm_spam_settings']);
@@ -858,9 +887,10 @@ 
 	$modSettings['posts_require_captcha'] = !isset($modSettings['posts_require_captcha']) || $modSettings['posts_require_captcha'] == -1 ? 0 : $modSettings['posts_require_captcha'];
 
 	// Some minor javascript for the guest post setting.
-	if ($modSettings['posts_require_captcha'])
-		$context['settings_post_javascript'] .= '
+	if ($modSettings['posts_require_captcha']) {
+			$context['settings_post_javascript'] .= '
 		document.getElementById(\'guests_require_captcha\').disabled = true;';
+	}
 
 	// And everything else.
 	$context['post_url'] = $scripturl . '?action=admin;area=antispam;save';
@@ -907,8 +937,9 @@ 
 
 	call_integration_hook('integrate_signature_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Setup the template.
 	$context['page_title'] = $txt['signature_settings'];
@@ -963,8 +994,9 @@ 
 				$sig = strtr($row['signature'], array('<br>' => "\n"));
 
 				// Max characters...
-				if (!empty($sig_limits[1]))
-					$sig = $smcFunc['substr']($sig, 0, $sig_limits[1]);
+				if (!empty($sig_limits[1])) {
+									$sig = $smcFunc['substr']($sig, 0, $sig_limits[1]);
+				}
 				// Max lines...
 				if (!empty($sig_limits[2]))
 				{
@@ -974,8 +1006,9 @@ 
 						if ($sig[$i] == "\n")
 						{
 							$count++;
-							if ($count >= $sig_limits[2])
-								$sig = substr($sig, 0, $i) . strtr(substr($sig, $i), array("\n" => ' '));
+							if ($count >= $sig_limits[2]) {
+															$sig = substr($sig, 0, $i) . strtr(substr($sig, $i), array("\n" => ' '));
+							}
 						}
 					}
 				}
@@ -986,17 +1019,19 @@ 
 					{
 						$limit_broke = 0;
 						// Attempt to allow all sizes of abuse, so to speak.
-						if ($matches[2][$ind] == 'px' && $size > $sig_limits[7])
-							$limit_broke = $sig_limits[7] . 'px';
-						elseif ($matches[2][$ind] == 'pt' && $size > ($sig_limits[7] * 0.75))
-							$limit_broke = ((int) $sig_limits[7] * 0.75) . 'pt';
-						elseif ($matches[2][$ind] == 'em' && $size > ((float) $sig_limits[7] / 16))
-							$limit_broke = ((float) $sig_limits[7] / 16) . 'em';
-						elseif ($matches[2][$ind] != 'px' && $matches[2][$ind] != 'pt' && $matches[2][$ind] != 'em' && $sig_limits[7] < 18)
-							$limit_broke = 'large';
-
-						if ($limit_broke)
-							$sig = str_replace($matches[0][$ind], '[size=' . $sig_limits[7] . 'px', $sig);
+						if ($matches[2][$ind] == 'px' && $size > $sig_limits[7]) {
+													$limit_broke = $sig_limits[7] . 'px';
+						} elseif ($matches[2][$ind] == 'pt' && $size > ($sig_limits[7] * 0.75)) {
+													$limit_broke = ((int) $sig_limits[7] * 0.75) . 'pt';
+						} elseif ($matches[2][$ind] == 'em' && $size > ((float) $sig_limits[7] / 16)) {
+													$limit_broke = ((float) $sig_limits[7] / 16) . 'em';
+						} elseif ($matches[2][$ind] != 'px' && $matches[2][$ind] != 'pt' && $matches[2][$ind] != 'em' && $sig_limits[7] < 18) {
+													$limit_broke = 'large';
+						}
+
+						if ($limit_broke) {
+													$sig = str_replace($matches[0][$ind], '[size=' . $sig_limits[7] . 'px', $sig);
+						}
 					}
 				}
 
@@ -1052,32 +1087,34 @@ 
 											$img_offset = false;
 										}
 									}
+								} else {
+																	$replaces[$image] = '';
 								}
-								else
-									$replaces[$image] = '';
 
 								continue;
 							}
 
 							// Does it have predefined restraints? Width first.
-							if ($matches[6][$key])
-								$matches[2][$key] = $matches[6][$key];
+							if ($matches[6][$key]) {
+															$matches[2][$key] = $matches[6][$key];
+							}
 							if ($matches[2][$key] && $sig_limits[5] && $matches[2][$key] > $sig_limits[5])
 							{
 								$width = $sig_limits[5];
 								$matches[4][$key] = $matches[4][$key] * ($width / $matches[2][$key]);
+							} elseif ($matches[2][$key]) {
+															$width = $matches[2][$key];
 							}
-							elseif ($matches[2][$key])
-								$width = $matches[2][$key];
 							// ... and height.
 							if ($matches[4][$key] && $sig_limits[6] && $matches[4][$key] > $sig_limits[6])
 							{
 								$height = $sig_limits[6];
-								if ($width != -1)
-									$width = $width * ($height / $matches[4][$key]);
+								if ($width != -1) {
+																	$width = $width * ($height / $matches[4][$key]);
+								}
+							} elseif ($matches[4][$key]) {
+															$height = $matches[4][$key];
 							}
-							elseif ($matches[4][$key])
-								$height = $matches[4][$key];
 
 							// If the dimensions are still not fixed - we need to check the actual image.
 							if (($width == -1 && $sig_limits[5]) || ($height == -1 && $sig_limits[6]))
@@ -1095,12 +1132,13 @@ 
 									if ($sizes[1] > $sig_limits[6] && $sig_limits[6])
 									{
 										$height = $sig_limits[6];
-										if ($width == -1)
-											$width = $sizes[0];
+										if ($width == -1) {
+																					$width = $sizes[0];
+										}
 										$width = $width * ($height / $sizes[1]);
+									} elseif ($width != -1) {
+																			$height = $sizes[1];
 									}
-									elseif ($width != -1)
-										$height = $sizes[1];
 								}
 							}
 
@@ -1113,8 +1151,9 @@ 
 							// Record that we got one.
 							$image_count_holder[$image] = isset($image_count_holder[$image]) ? $image_count_holder[$image] + 1 : 1;
 						}
-						if (!empty($replaces))
-							$sig = str_replace(array_keys($replaces), array_values($replaces), $sig);
+						if (!empty($replaces)) {
+													$sig = str_replace(array_keys($replaces), array_values($replaces), $sig);
+						}
 					}
 				}
 				// Try to fix disabled tags.
@@ -1126,18 +1165,20 @@ 
 
 				$sig = strtr($sig, array("\n" => '<br>'));
 				call_integration_hook('integrate_apply_signature_settings', array(&$sig, $sig_limits, $disabledTags));
-				if ($sig != $row['signature'])
-					$changes[$row['id_member']] = $sig;
+				if ($sig != $row['signature']) {
+									$changes[$row['id_member']] = $sig;
+				}
+			}
+			if ($smcFunc['db_num_rows']($request) == 0) {
+							$done = true;
 			}
-			if ($smcFunc['db_num_rows']($request) == 0)
-				$done = true;
 			$smcFunc['db_free_result']($request);
 
 			// Do we need to delete what we have?
 			if (!empty($changes))
 			{
-				foreach ($changes as $id => $sig)
-					$smcFunc['db_query']('', '
+				foreach ($changes as $id => $sig) {
+									$smcFunc['db_query']('', '
 						UPDATE {db_prefix}members
 						SET signature = {string:signature}
 						WHERE id_member = {int:id_member}',
@@ -1146,11 +1187,13 @@ 
 							'signature' => $sig,
 						)
 					);
+				}
 			}
 
 			$_GET['step'] += 50;
-			if (!$done)
-				pauseSignatureApplySettings();
+			if (!$done) {
+							pauseSignatureApplySettings();
+			}
 		}
 		$settings_applied = true;
 	}
@@ -1168,8 +1211,9 @@ 
 	);
 
 	// Temporarily make each setting a modSetting!
-	foreach ($context['signature_settings'] as $key => $value)
-		$modSettings['signature_' . $key] = $value;
+	foreach ($context['signature_settings'] as $key => $value) {
+			$modSettings['signature_' . $key] = $value;
+	}
 
 	// Make sure we check the right tags!
 	$modSettings['bbc_disabled_signature_bbc'] = $disabledTags;
@@ -1181,23 +1225,26 @@ 
 
 		// Clean up the tag stuff!
 		$bbcTags = array();
-		foreach (parse_bbc(false) as $tag)
-			$bbcTags[] = $tag['tag'];
+		foreach (parse_bbc(false) as $tag) {
+					$bbcTags[] = $tag['tag'];
+		}
 
-		if (!isset($_POST['signature_bbc_enabledTags']))
-			$_POST['signature_bbc_enabledTags'] = array();
-		elseif (!is_array($_POST['signature_bbc_enabledTags']))
-			$_POST['signature_bbc_enabledTags'] = array($_POST['signature_bbc_enabledTags']);
+		if (!isset($_POST['signature_bbc_enabledTags'])) {
+					$_POST['signature_bbc_enabledTags'] = array();
+		} elseif (!is_array($_POST['signature_bbc_enabledTags'])) {
+					$_POST['signature_bbc_enabledTags'] = array($_POST['signature_bbc_enabledTags']);
+		}
 
 		$sig_limits = array();
 		foreach ($context['signature_settings'] as $key => $value)
 		{
-			if ($key == 'allow_smileys')
-				continue;
-			elseif ($key == 'max_smileys' && empty($_POST['signature_allow_smileys']))
-				$sig_limits[] = -1;
-			else
-				$sig_limits[] = !empty($_POST['signature_' . $key]) ? max(1, (int) $_POST['signature_' . $key]) : 0;
+			if ($key == 'allow_smileys') {
+							continue;
+			} elseif ($key == 'max_smileys' && empty($_POST['signature_allow_smileys'])) {
+							$sig_limits[] = -1;
+			} else {
+							$sig_limits[] = !empty($_POST['signature_' . $key]) ? max(1, (int) $_POST['signature_' . $key]) : 0;
+			}
 		}
 
 		call_integration_hook('integrate_save_signature_settings', array(&$sig_limits, &$bbcTags));
@@ -1230,12 +1277,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 exhausted all the time we allowed?
-	if (time() - array_sum(explode(' ', $sig_start)) < 3)
-		return;
+	if (time() - array_sum(explode(' ', $sig_start)) < 3) {
+			return;
+	}
 
 	$context['continue_get_data'] = '?action=admin;area=featuresettings;sa=sig;apply;step=' . $_GET['step'] . ';' . $context['session_var'] . '=' . $context['session_id'];
 	$context['page_title'] = $txt['not_done_title'];
@@ -1281,9 +1330,10 @@ 
 		$disable_fields = array_flip($standard_fields);
 		if (!empty($_POST['active']))
 		{
-			foreach ($_POST['active'] as $value)
-				if (isset($disable_fields[$value]))
+			foreach ($_POST['active'] as $value) {
+							if (isset($disable_fields[$value]))
 					unset($disable_fields[$value]);
+			}
 		}
 		// What we have left!
 		$changes['disabled_profile_fields'] = empty($disable_fields) ? '' : implode(',', array_keys($disable_fields));
@@ -1292,16 +1342,18 @@ 
 		$reg_fields = array();
 		if (!empty($_POST['reg']))
 		{
-			foreach ($_POST['reg'] as $value)
-				if (in_array($value, $standard_fields) && !isset($disable_fields[$value]))
+			foreach ($_POST['reg'] as $value) {
+							if (in_array($value, $standard_fields) && !isset($disable_fields[$value]))
 					$reg_fields[] = $value;
+			}
 		}
 		// What we have left!
 		$changes['registration_fields'] = empty($reg_fields) ? '' : implode(',', $reg_fields);
 
 		$_SESSION['adm-save'] = true;
-		if (!empty($changes))
-			updateSettings($changes);
+		if (!empty($changes)) {
+					updateSettings($changes);
+		}
 	}
 
 	createToken('admin-scp');
@@ -1404,11 +1456,13 @@ 
 					{
 						$return = '<p class="centertext bold_text">'. $rowData['field_order'] .'<br>';
 
-						if ($rowData['field_order'] > 1)
-							$return .= '<a href="' . $scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $rowData['id_field'] . ';move=up"><span class="toggle_up" title="'. $txt['custom_edit_order_move'] .' '. $txt['custom_edit_order_up'] .'"></span></a>';
+						if ($rowData['field_order'] > 1) {
+													$return .= '<a href="' . $scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $rowData['id_field'] . ';move=up"><span class="toggle_up" title="'. $txt['custom_edit_order_move'] .' '. $txt['custom_edit_order_up'] .'"></span></a>';
+						}
 
-						if ($rowData['field_order'] < $context['custFieldsMaxOrder'])
-							$return .= '<a href="' . $scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $rowData['id_field'] . ';move=down"><span class="toggle_down" title="'. $txt['custom_edit_order_move'] .' '. $txt['custom_edit_order_down'] .'"></span></a>';
+						if ($rowData['field_order'] < $context['custFieldsMaxOrder']) {
+													$return .= '<a href="' . $scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $rowData['id_field'] . ';move=down"><span class="toggle_down" title="'. $txt['custom_edit_order_move'] .' '. $txt['custom_edit_order_down'] .'"></span></a>';
+						}
 
 						$return .= '</p>';
 
@@ -1546,16 +1600,16 @@ 
 		$disabled_fields = isset($modSettings['disabled_profile_fields']) ? explode(',', $modSettings['disabled_profile_fields']) : array();
 		$registration_fields = isset($modSettings['registration_fields']) ? explode(',', $modSettings['registration_fields']) : array();
 
-		foreach ($standard_fields as $field)
-			$list[] = array(
+		foreach ($standard_fields as $field) {
+					$list[] = array(
 				'id' => $field,
 				'label' => isset($txt['standard_profile_field_' . $field]) ? $txt['standard_profile_field_' . $field] : (isset($txt[$field]) ? $txt[$field] : $field),
 				'disabled' => in_array($field, $disabled_fields),
 				'on_register' => in_array($field, $registration_fields) && !in_array($field, $fields_no_registration),
 				'can_show_register' => !in_array($field, $fields_no_registration),
 			);
-	}
-	else
+		}
+	} else
 	{
 		// Load all the fields.
 		$request = $smcFunc['db_query']('', '
@@ -1569,8 +1623,9 @@ 
 				'items_per_page' => $items_per_page,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$list[] = $row;
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$list[] = $row;
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -1636,9 +1691,9 @@ 
 		$context['field'] = array();
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if ($row['field_type'] == 'textarea')
-				@list ($rows, $cols) = @explode(',', $row['default_value']);
-			else
+			if ($row['field_type'] == 'textarea') {
+							@list ($rows, $cols) = @explode(',', $row['default_value']);
+			} else
 			{
 				$rows = 3;
 				$cols = 30;
@@ -1674,8 +1729,8 @@ 
 	}
 
 	// Setup the default values as needed.
-	if (empty($context['field']))
-		$context['field'] = array(
+	if (empty($context['field'])) {
+			$context['field'] = array(
 			'name' => '',
 			'col_name' => '???',
 			'desc' => '',
@@ -1700,6 +1755,7 @@ 
 			'enclose' => '',
 			'placement' => 0,
 		);
+	}
 
 	// Are we moving it?
 	if (isset($_GET['move']) && in_array($smcFunc['htmlspecialchars']($_GET['move']), $move_to))
@@ -1708,8 +1764,10 @@ 
 		$new_order = ($_GET['move'] == 'up' ? ($context['field']['order'] - 1) : ($context['field']['order'] + 1));
 
 		// Is this a valid position?
-		if ($new_order <= 0 || $new_order > $order_count)
-			redirectexit('action=admin;area=featuresettings;sa=profile'); // @todo implement an error handler
+		if ($new_order <= 0 || $new_order > $order_count) {
+					redirectexit('action=admin;area=featuresettings;sa=profile');
+		}
+		// @todo implement an error handler
 
 		// All good, proceed.
 		$smcFunc['db_query']('','
@@ -1740,12 +1798,14 @@ 
 		validateToken('admin-ecp');
 
 		// Everyone needs a name - even the (bracket) unknown...
-		if (trim($_POST['field_name']) == '')
-			redirectexit($scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $_GET['fid'] . ';msg=need_name');
+		if (trim($_POST['field_name']) == '') {
+					redirectexit($scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $_GET['fid'] . ';msg=need_name');
+		}
 
 		// Regex you say?  Do a very basic test to see if the pattern is valid
-		if (!empty($_POST['regex']) && @preg_match($_POST['regex'], 'dummy') === false)
-			redirectexit($scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $_GET['fid'] . ';msg=regex_error');
+		if (!empty($_POST['regex']) && @preg_match($_POST['regex'], 'dummy') === false) {
+					redirectexit($scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $_GET['fid'] . ';msg=regex_error');
+		}
 
 		$_POST['field_name'] = $smcFunc['htmlspecialchars']($_POST['field_name']);
 		$_POST['field_desc'] = $smcFunc['htmlspecialchars']($_POST['field_desc']);
@@ -1762,8 +1822,9 @@ 
 
 		// Some masking stuff...
 		$mask = isset($_POST['mask']) ? $_POST['mask'] : '';
-		if ($mask == 'regex' && isset($_POST['regex']))
-			$mask .= $_POST['regex'];
+		if ($mask == 'regex' && isset($_POST['regex'])) {
+					$mask .= $_POST['regex'];
+		}
 
 		$field_length = isset($_POST['max_length']) ? (int) $_POST['max_length'] : 255;
 		$enclose = isset($_POST['enclose']) ? $_POST['enclose'] : '';
@@ -1782,8 +1843,9 @@ 
 				$v = strtr($v, array(',' => ''));
 
 				// Nada, zip, etc...
-				if (trim($v) == '')
-					continue;
+				if (trim($v) == '') {
+									continue;
+				}
 
 				// Otherwise, save it boy.
 				$field_options .= $v . ',';
@@ -1791,15 +1853,17 @@ 
 				$newOptions[$k] = $v;
 
 				// Is it default?
-				if (isset($_POST['default_select']) && $_POST['default_select'] == $k)
-					$default = $v;
+				if (isset($_POST['default_select']) && $_POST['default_select'] == $k) {
+									$default = $v;
+				}
 			}
 			$field_options = substr($field_options, 0, -1);
 		}
 
 		// Text area has default has dimensions
-		if ($_POST['field_type'] == 'textarea')
-			$default = (int) $_POST['rows'] . ',' . (int) $_POST['cols'];
+		if ($_POST['field_type'] == 'textarea') {
+					$default = (int) $_POST['rows'] . ',' . (int) $_POST['cols'];
+		}
 
 		// Come up with the unique name?
 		if (empty($context['fid']))
@@ -1808,32 +1872,36 @@ 
 			preg_match('~([\w\d_-]+)~', $col_name, $matches);
 
 			// If there is nothing to the name, then let's start out own - for foreign languages etc.
-			if (isset($matches[1]))
-				$col_name = $initial_col_name = 'cust_' . strtolower($matches[1]);
-			else
-				$col_name = $initial_col_name = 'cust_' . mt_rand(1, 9999);
+			if (isset($matches[1])) {
+							$col_name = $initial_col_name = 'cust_' . strtolower($matches[1]);
+			} else {
+							$col_name = $initial_col_name = 'cust_' . mt_rand(1, 9999);
+			}
 
 			// Make sure this is unique.
 			$current_fields = array();
 			$request = $smcFunc['db_query']('', '
 				SELECT id_field, col_name
 				FROM {db_prefix}custom_fields');
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$current_fields[$row['id_field']] = $row['col_name'];
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$current_fields[$row['id_field']] = $row['col_name'];
+			}
 			$smcFunc['db_free_result']($request);
 
 			$unique = false;
 			for ($i = 0; !$unique && $i < 9; $i ++)
 			{
-				if (!in_array($col_name, $current_fields))
-					$unique = true;
-				else
-					$col_name = $initial_col_name . $i;
+				if (!in_array($col_name, $current_fields)) {
+									$unique = true;
+				} else {
+									$col_name = $initial_col_name . $i;
+				}
 			}
 
 			// Still not a unique column name? Leave it up to the user, then.
-			if (!$unique)
-				fatal_lang_error('custom_option_not_unique');
+			if (!$unique) {
+							fatal_lang_error('custom_option_not_unique');
+			}
 		}
 		// Work out what to do with the user data otherwise...
 		else
@@ -1861,8 +1929,9 @@ 
 				// Work out what's changed!
 				foreach ($context['field']['options'] as $k => $option)
 				{
-					if (trim($option) == '')
-						continue;
+					if (trim($option) == '') {
+											continue;
+					}
 
 					// Still exists?
 					if (in_array($option, $newOptions))
@@ -1876,8 +1945,8 @@ 
 				foreach ($optionChanges as $k => $option)
 				{
 					// Just been renamed?
-					if (!in_array($k, $takenKeys) && !empty($newOptions[$k]))
-						$smcFunc['db_query']('', '
+					if (!in_array($k, $takenKeys) && !empty($newOptions[$k])) {
+											$smcFunc['db_query']('', '
 							UPDATE {db_prefix}themes
 							SET value = {string:new_value}
 							WHERE variable = {string:current_column}
@@ -1890,6 +1959,7 @@ 
 								'old_value' => $option,
 							)
 						);
+					}
 				}
 			}
 			// @todo Maybe we should adjust based on new text length limits?
@@ -1932,8 +2002,8 @@ 
 			);
 
 			// Just clean up any old selects - these are a pain!
-			if (($_POST['field_type'] == 'select' || $_POST['field_type'] == 'radio') && !empty($newOptions))
-				$smcFunc['db_query']('', '
+			if (($_POST['field_type'] == 'select' || $_POST['field_type'] == 'radio') && !empty($newOptions)) {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}themes
 					WHERE variable = {string:current_column}
 						AND value NOT IN ({array_string:new_option_values})
@@ -1944,8 +2014,8 @@ 
 						'current_column' => $context['field']['col_name'],
 					)
 				);
-		}
-		else
+			}
+		} else
 		{
 			// Gotta figure it out the order.
 			$new_order = $order_count > 1 ? ($order_count + 1) : 1;
@@ -2120,11 +2190,13 @@ 
 	call_integration_hook('integrate_prune_settings', array(&$config_vars, &$prune_toggle, false));
 
 	$prune_toggle_dt = array();
-	foreach ($prune_toggle as $item)
-		$prune_toggle_dt[] = 'setting_' . $item;
+	foreach ($prune_toggle as $item) {
+			$prune_toggle_dt[] = 'setting_' . $item;
+	}
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	addInlineJavaScript('
 	function togglePruned()
@@ -2162,15 +2234,16 @@ 
 			$vals = array();
 			foreach ($config_vars as $index => $dummy)
 			{
-				if (!is_array($dummy) || $index == 'pruningOptions' || !in_array($dummy[1], $prune_toggle))
-					continue;
+				if (!is_array($dummy) || $index == 'pruningOptions' || !in_array($dummy[1], $prune_toggle)) {
+									continue;
+				}
 
 				$vals[] = empty($_POST[$dummy[1]]) || $_POST[$dummy[1]] < 0 ? 0 : (int) $_POST[$dummy[1]];
 			}
 			$_POST['pruningOptions'] = implode(',', $vals);
+		} else {
+					$_POST['pruningOptions'] = '';
 		}
-		else
-			$_POST['pruningOptions'] = '';
 
 		saveDBSettings($savevar);
 		$_SESSION['adm-save'] = true;
@@ -2182,10 +2255,11 @@ 
 	$context['sub_template'] = 'show_settings';
 
 	// Get the actual values
-	if (!empty($modSettings['pruningOptions']))
-		@list ($modSettings['pruneErrorLog'], $modSettings['pruneModLog'], $modSettings['pruneBanLog'], $modSettings['pruneReportLog'], $modSettings['pruneScheduledTaskLog'], $modSettings['pruneSpiderHitLog']) = explode(',', $modSettings['pruningOptions']);
-	else
-		$modSettings['pruneErrorLog'] = $modSettings['pruneModLog'] = $modSettings['pruneBanLog'] = $modSettings['pruneReportLog'] = $modSettings['pruneScheduledTaskLog'] = $modSettings['pruneSpiderHitLog'] = 0;
+	if (!empty($modSettings['pruningOptions'])) {
+			@list ($modSettings['pruneErrorLog'], $modSettings['pruneModLog'], $modSettings['pruneBanLog'], $modSettings['pruneReportLog'], $modSettings['pruneScheduledTaskLog'], $modSettings['pruneSpiderHitLog']) = explode(',', $modSettings['pruningOptions']);
+	} else {
+			$modSettings['pruneErrorLog'] = $modSettings['pruneModLog'] = $modSettings['pruneBanLog'] = $modSettings['pruneReportLog'] = $modSettings['pruneScheduledTaskLog'] = $modSettings['pruneSpiderHitLog'] = 0;
+	}
 
 	prepareDBSettingContext($config_vars);
 }
@@ -2207,8 +2281,9 @@ 
 	// Make it even easier to add new settings.
 	call_integration_hook('integrate_general_mod_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	$context['post_url'] = $scripturl . '?action=admin;area=modsettings;save;sa=general';
 	$context['settings_title'] = $txt['mods_cat_modifications_misc'];

proxy.php

Braces +35 added lines, -23 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	define('SMF', 'proxy');
+}
 
 global $proxyhousekeeping;
 
@@ -68,33 +69,38 @@ 
 	 */
 	public function checkRequest()
 	{
-		if (!$this->enabled)
-			return false;
+		if (!$this->enabled) {
+					return false;
+		}
 
 		// Try to create the image cache directory if it doesn't exist
-		if (!file_exists($this->cache))
-			if (!mkdir($this->cache) || !copy(dirname($this->cache) . '/index.php', $this->cache . '/index.php'))
+		if (!file_exists($this->cache)) {
+					if (!mkdir($this->cache) || !copy(dirname($this->cache) . '/index.php', $this->cache . '/index.php'))
 				return false;
+		}
 
 		// Basic sanity check
 		$_GET['request'] = validate_iri($_GET['request']);
 
 		// We aren't going anywhere without these
-		if (empty($_GET['hash']) || empty($_GET['request']))
-			return false;
+		if (empty($_GET['hash']) || empty($_GET['request'])) {
+					return false;
+		}
 
 		$hash = $_GET['hash'];
 		$request = $_GET['request'];
 
-		if (md5($request . $this->secret) != $hash)
-			return false;
+		if (md5($request . $this->secret) != $hash) {
+					return false;
+		}
 
 		// Ensure any non-ASCII characters in the URL are encoded correctly
 		$request = iri_to_url($request);
 
 		// Attempt to cache the request if it doesn't exist
-		if (!$this->isCached($request))
-			return $this->cacheImage($request);
+		if (!$this->isCached($request)) {
+					return $this->cacheImage($request);
+		}
 
 		return true;
 	}
@@ -131,8 +137,9 @@ 
 		if (!$cached || $time - $cached['time'] > ($this->maxDays * 86400))
 		{
 			@unlink($cached_file);
-			if ($this->checkRequest())
-				$this->serve();
+			if ($this->checkRequest()) {
+							$this->serve();
+			}
 			$this::redirectexit($request);
 		}
 
@@ -145,8 +152,9 @@ 
 
 		// Make sure we're serving an image
 		$contentParts = explode('/', !empty($cached['content_type']) ? $cached['content_type'] : '');
-		if ($contentParts[0] != 'image')
-			exit;
+		if ($contentParts[0] != 'image') {
+					exit;
+		}
 
 		$max_age = $time - $cached['time'] + (5 * 86400);
 		header('content-type: ' . $cached['content_type']);
@@ -196,25 +204,29 @@ 
 		$image = fetch_web_data($request);
 
 		// Looks like nobody was home
-		if (empty($image))
-			return -1;
+		if (empty($image)) {
+					return -1;
+		}
 
 		// What kind of file did they give us?
 		$finfo = finfo_open(FILEINFO_MIME_TYPE);
 		$mime_type = finfo_buffer($finfo, $image);
 
 		// SVG needs a little extra care
-		if ($ext == 'svg' && $mime_type == 'text/plain')
-			$mime_type = 'image/svg+xml';
+		if ($ext == 'svg' && $mime_type == 'text/plain') {
+					$mime_type = 'image/svg+xml';
+		}
 
 		// Make sure the url is returning an image
-		if (strpos($mime_type, 'image/') !== 0)
-			return -1;
+		if (strpos($mime_type, 'image/') !== 0) {
+					return -1;
+		}
 
 		// Validate the filesize
 		$size = strlen($image);
-		if ($size > ($this->maxSize * 1024))
-			return 0;
+		if ($size > ($this->maxSize * 1024)) {
+					return 0;
+		}
 
 		// Cache it for later
 		return file_put_contents($dest, json_encode(array(

Sources/Class-Punycode.php

Braces +2 added lines, -1 removed lines

@@ -18,8 +18,9 @@
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
     die('No direct access...');
+}
 
 /**
  * Punycode implementation as described in RFC 3492

other/upgrade-helper.php

Braces +96 added lines, -68 removed lines

@@ -13,8 +13,9 @@ 
  * This file contains helper functions for upgrade.php
  */
 
-if (!defined('SMF_VERSION'))
+if (!defined('SMF_VERSION')) {
 	die('No direct access!');
+}
 
 /**
  * Clean the cache using the SMF 2.1 CacheAPI.
@@ -45,8 +46,9 @@ 
 	global $smcFunc;
 	static $member_groups = array();
 
-	if (!empty($member_groups))
-		return $member_groups;
+	if (!empty($member_groups)) {
+			return $member_groups;
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT group_name, id_group
@@ -71,8 +73,9 @@ 
 			)
 		);
 	}
-	while ($row = $smcFunc['db_fetch_row']($request))
-		$member_groups[trim($row[0])] = $row[1];
+	while ($row = $smcFunc['db_fetch_row']($request)) {
+			$member_groups[trim($row[0])] = $row[1];
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $member_groups;
@@ -88,8 +91,9 @@ 
 {
 	global $upcontext, $boarddir, $sourcedir;
 
-	if (empty($files))
-		return true;
+	if (empty($files)) {
+			return true;
+	}
 
 	$failure = false;
 	// On linux, it's easy - just use is_writable!
@@ -100,22 +104,25 @@ 
 		foreach ($files as $k => $file)
 		{
 			// Some files won't exist, try to address up front
-			if (!file_exists($file))
-				@touch($file);
+			if (!file_exists($file)) {
+							@touch($file);
+			}
 			// NOW do the writable check...
 			if (!is_writable($file))
 			{
 				@chmod($file, 0755);
 
 				// Well, 755 hopefully worked... if not, try 777.
-				if (!is_writable($file) && !@chmod($file, 0777))
-					$failure = true;
+				if (!is_writable($file) && !@chmod($file, 0777)) {
+									$failure = true;
+				}
 				// Otherwise remove it as it's good!
-				else
-					unset($files[$k]);
+				else {
+									unset($files[$k]);
+				}
+			} else {
+							unset($files[$k]);
 			}
-			else
-				unset($files[$k]);
 		}
 	}
 	// Windows is trickier.  Let's try opening for r+...
@@ -126,30 +133,35 @@ 
 		foreach ($files as $k => $file)
 		{
 			// Folders can't be opened for write... but the index.php in them can ;).
-			if (is_dir($file))
-				$file .= '/index.php';
+			if (is_dir($file)) {
+							$file .= '/index.php';
+			}
 
 			// Funny enough, chmod actually does do something on windows - it removes the read only attribute.
 			@chmod($file, 0777);
 			$fp = @fopen($file, 'r+');
 
 			// Hmm, okay, try just for write in that case...
-			if (!$fp)
-				$fp = @fopen($file, 'w');
+			if (!$fp) {
+							$fp = @fopen($file, 'w');
+			}
 
-			if (!$fp)
-				$failure = true;
-			else
-				unset($files[$k]);
+			if (!$fp) {
+							$failure = true;
+			} else {
+							unset($files[$k]);
+			}
 			@fclose($fp);
 		}
 	}
 
-	if (empty($files))
-		return true;
+	if (empty($files)) {
+			return true;
+	}
 
-	if (!isset($_SERVER))
-		return !$failure;
+	if (!isset($_SERVER)) {
+			return !$failure;
+	}
 
 	// What still needs to be done?
 	$upcontext['chmod']['files'] = $files;
@@ -201,36 +213,40 @@ 
 
 		if (!isset($ftp) || $ftp->error !== false)
 		{
-			if (!isset($ftp))
-				$ftp = new ftp_connection(null);
+			if (!isset($ftp)) {
+							$ftp = new ftp_connection(null);
+			}
 			// Save the error so we can mess with listing...
-			elseif ($ftp->error !== false && !isset($upcontext['chmod']['ftp_error']))
-				$upcontext['chmod']['ftp_error'] = $ftp->last_message === null ? '' : $ftp->last_message;
+			elseif ($ftp->error !== false && !isset($upcontext['chmod']['ftp_error'])) {
+							$upcontext['chmod']['ftp_error'] = $ftp->last_message === null ? '' : $ftp->last_message;
+			}
 
 			list ($username, $detect_path, $found_path) = $ftp->detect_path(dirname(__FILE__));
 
-			if ($found_path || !isset($upcontext['chmod']['path']))
-				$upcontext['chmod']['path'] = $detect_path;
+			if ($found_path || !isset($upcontext['chmod']['path'])) {
+							$upcontext['chmod']['path'] = $detect_path;
+			}
 
-			if (!isset($upcontext['chmod']['username']))
-				$upcontext['chmod']['username'] = $username;
+			if (!isset($upcontext['chmod']['username'])) {
+							$upcontext['chmod']['username'] = $username;
+			}
 
 			// Don't forget the login token.
 			$upcontext += createToken('login');
 
 			return false;
-		}
-		else
+		} else
 		{
 			// We want to do a relative path for FTP.
 			if (!in_array($upcontext['chmod']['path'], array('', '/')))
 			{
 				$ftp_root = strtr($boarddir, array($upcontext['chmod']['path'] => ''));
-				if (substr($ftp_root, -1) == '/' && ($upcontext['chmod']['path'] == '' || $upcontext['chmod']['path'][0] === '/'))
-					$ftp_root = substr($ftp_root, 0, -1);
+				if (substr($ftp_root, -1) == '/' && ($upcontext['chmod']['path'] == '' || $upcontext['chmod']['path'][0] === '/')) {
+									$ftp_root = substr($ftp_root, 0, -1);
+				}
+			} else {
+							$ftp_root = $boarddir;
 			}
-			else
-				$ftp_root = $boarddir;
 
 			// Save the info for next time!
 			$_SESSION['installer_temp_ftp'] = array(
@@ -244,10 +260,12 @@ 
 
 			foreach ($files as $k => $file)
 			{
-				if (!is_writable($file))
-					$ftp->chmod($file, 0755);
-				if (!is_writable($file))
-					$ftp->chmod($file, 0777);
+				if (!is_writable($file)) {
+									$ftp->chmod($file, 0755);
+				}
+				if (!is_writable($file)) {
+									$ftp->chmod($file, 0777);
+				}
 
 				// Assuming that didn't work calculate the path without the boarddir.
 				if (!is_writable($file))
@@ -256,19 +274,23 @@ 
 					{
 						$ftp_file = strtr($file, array($_SESSION['installer_temp_ftp']['root'] => ''));
 						$ftp->chmod($ftp_file, 0755);
-						if (!is_writable($file))
-							$ftp->chmod($ftp_file, 0777);
+						if (!is_writable($file)) {
+													$ftp->chmod($ftp_file, 0777);
+						}
 						// Sometimes an extra slash can help...
 						$ftp_file = '/' . $ftp_file;
-						if (!is_writable($file))
-							$ftp->chmod($ftp_file, 0755);
-						if (!is_writable($file))
-							$ftp->chmod($ftp_file, 0777);
+						if (!is_writable($file)) {
+													$ftp->chmod($ftp_file, 0755);
+						}
+						if (!is_writable($file)) {
+													$ftp->chmod($ftp_file, 0777);
+						}
 					}
 				}
 
-				if (is_writable($file))
-					unset($files[$k]);
+				if (is_writable($file)) {
+									unset($files[$k]);
+				}
 			}
 
 			$ftp->close();
@@ -278,8 +300,9 @@ 
 	// What remains?
 	$upcontext['chmod']['files'] = $files;
 
-	if (empty($files))
-		return true;
+	if (empty($files)) {
+			return true;
+	}
 
 	return false;
 }
@@ -293,12 +316,14 @@ 
 function quickFileWritable($file)
 {
 	// Some files won't exist, try to address up front
-	if (!file_exists($file))
-		@touch($file);
+	if (!file_exists($file)) {
+			@touch($file);
+	}
 
 	// NOW do the writable check...
-	if (is_writable($file))
-		return true;
+	if (is_writable($file)) {
+			return true;
+	}
 
 	@chmod($file, 0755);
 
@@ -308,10 +333,11 @@ 
 	foreach ($chmod_values as $val)
 	{
 		// If it's writable, break out of the loop
-		if (is_writable($file))
-			break;
-		else
-			@chmod($file, $val);
+		if (is_writable($file)) {
+					break;
+		} else {
+					@chmod($file, $val);
+		}
 	}
 
 	return is_writable($file);
@@ -338,14 +364,16 @@ 
 {
 	static $fp = null;
 
-	if ($fp === null)
-		$fp = fopen('php://stderr', 'wb');
+	if ($fp === null) {
+			$fp = fopen('php://stderr', 'wb');
+	}
 
 	fwrite($fp, $message . "\n");
 
-	if ($fatal)
-		exit;
-}
+	if ($fatal) {
+			exit;
+	}
+	}
 
 /**
  * Throws a graphical error message.