albertlast / SMF2.1

Sources/PostModeration.php

Braces +100 added lines, -79 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This is a handling function for all things post moderation.
@@ -39,8 +40,9 @@ 
 	);
 
 	// Pick something valid...
-	if (!isset($_REQUEST['sa']) || !isset($subActions[$_REQUEST['sa']]))
-		$_REQUEST['sa'] = 'replies';
+	if (!isset($_REQUEST['sa']) || !isset($subActions[$_REQUEST['sa']])) {
+			$_REQUEST['sa'] = 'replies';
+	}
 
 	call_integration_hook('integrate_post_moderation', array(&$subActions));
 
@@ -68,13 +70,15 @@ 
 		$approve_boards = $approve_boards == array(0) ? $filter_board : array_intersect($approve_boards, $filter_board);
 	}
 
-	if ($approve_boards == array(0))
-		$approve_query = '';
-	elseif (!empty($approve_boards))
-		$approve_query = ' AND m.id_board IN (' . implode(',', $approve_boards) . ')';
+	if ($approve_boards == array(0)) {
+			$approve_query = '';
+	} elseif (!empty($approve_boards)) {
+			$approve_query = ' AND m.id_board IN (' . implode(',', $approve_boards) . ')';
+	}
 	// Nada, zip, etc...
-	else
-		$approve_query = ' AND 1=0';
+	else {
+			$approve_query = ' AND 1=0';
+	}
 
 	// We also need to know where we can delete topics and/or replies to.
 	if ($context['current_view'] == 'topics')
@@ -82,8 +86,7 @@ 
 		$delete_own_boards = boardsAllowedTo('remove_own');
 		$delete_any_boards = boardsAllowedTo('remove_any');
 		$delete_own_replies = array();
-	}
-	else
+	} else
 	{
 		$delete_own_boards = boardsAllowedTo('delete_own');
 		$delete_any_boards = boardsAllowedTo('delete_any');
@@ -92,21 +95,25 @@ 
 
 	$toAction = array();
 	// Check if we have something to do?
-	if (isset($_GET['approve']))
-		$toAction[] = (int) $_GET['approve'];
+	if (isset($_GET['approve'])) {
+			$toAction[] = (int) $_GET['approve'];
+	}
 	// Just a deletion?
-	elseif (isset($_GET['delete']))
-		$toAction[] = (int) $_GET['delete'];
+	elseif (isset($_GET['delete'])) {
+			$toAction[] = (int) $_GET['delete'];
+	}
 	// Lots of approvals?
-	elseif (isset($_POST['item']))
-		foreach ($_POST['item'] as $item)
+	elseif (isset($_POST['item'])) {
+			foreach ($_POST['item'] as $item)
 			$toAction[] = (int) $item;
+	}
 
 	// What are we actually doing.
-	if (isset($_GET['approve']) || (isset($_POST['do']) && $_POST['do'] == 'approve'))
-		$curAction = 'approve';
-	elseif (isset($_GET['delete']) || (isset($_POST['do']) && $_POST['do'] == 'delete'))
-		$curAction = 'delete';
+	if (isset($_GET['approve']) || (isset($_POST['do']) && $_POST['do'] == 'approve')) {
+			$curAction = 'approve';
+	} elseif (isset($_GET['delete']) || (isset($_POST['do']) && $_POST['do'] == 'delete')) {
+			$curAction = 'delete';
+	}
 
 	// Right, so we have something to do?
 	if (!empty($toAction) && isset($curAction))
@@ -135,8 +142,9 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
 			// If it's not within what our view is ignore it...
-			if (($row['id_msg'] == $row['id_first_msg'] && $context['current_view'] != 'topics') || ($row['id_msg'] != $row['id_first_msg'] && $context['current_view'] != 'replies'))
-				continue;
+			if (($row['id_msg'] == $row['id_first_msg'] && $context['current_view'] != 'topics') || ($row['id_msg'] != $row['id_first_msg'] && $context['current_view'] != 'replies')) {
+							continue;
+			}
 
 			$can_add = false;
 			// If we're approving this is simple.
@@ -148,18 +156,22 @@ 
 			elseif ($curAction == 'delete')
 			{
 				// Own post is easy!
-				if ($row['id_member'] == $user_info['id'] && ($delete_own_boards == array(0) || in_array($row['id_board'], $delete_own_boards)))
-					$can_add = true;
+				if ($row['id_member'] == $user_info['id'] && ($delete_own_boards == array(0) || in_array($row['id_board'], $delete_own_boards))) {
+									$can_add = true;
+				}
 				// Is it a reply to their own topic?
-				elseif ($row['id_member'] == $row['id_member_started'] && $row['id_msg'] != $row['id_first_msg'] && ($delete_own_replies == array(0) || in_array($row['id_board'], $delete_own_replies)))
-					$can_add = true;
+				elseif ($row['id_member'] == $row['id_member_started'] && $row['id_msg'] != $row['id_first_msg'] && ($delete_own_replies == array(0) || in_array($row['id_board'], $delete_own_replies))) {
+									$can_add = true;
+				}
 				// Someone elses?
-				elseif ($row['id_member'] != $user_info['id'] && ($delete_any_boards == array(0) || in_array($row['id_board'], $delete_any_boards)))
-					$can_add = true;
+				elseif ($row['id_member'] != $user_info['id'] && ($delete_any_boards == array(0) || in_array($row['id_board'], $delete_any_boards))) {
+									$can_add = true;
+				}
 			}
 
-			if ($can_add)
-				$anItem = $context['current_view'] == 'topics' ? $row['id_topic'] : $row['id_msg'];
+			if ($can_add) {
+							$anItem = $context['current_view'] == 'topics' ? $row['id_topic'] : $row['id_msg'];
+			}
 			$toAction[] = $anItem;
 
 			// All clear. What have we got now, what, what?
@@ -177,8 +189,7 @@ 
 			if ($curAction == 'approve')
 			{
 				approveMessages($toAction, $details, $context['current_view']);
-			}
-			else
+			} else
 			{
 				removeMessages($toAction, $details, $context['current_view']);
 			}
@@ -265,16 +276,19 @@ 
 	for ($i = 1; $row = $smcFunc['db_fetch_assoc']($request); $i++)
 	{
 		// Can delete is complicated, let's solve it first... is it their own post?
-		if ($row['id_member'] == $user_info['id'] && ($delete_own_boards == array(0) || in_array($row['id_board'], $delete_own_boards)))
-			$can_delete = true;
+		if ($row['id_member'] == $user_info['id'] && ($delete_own_boards == array(0) || in_array($row['id_board'], $delete_own_boards))) {
+					$can_delete = true;
+		}
 		// Is it a reply to their own topic?
-		elseif ($row['id_member'] == $row['id_member_started'] && $row['id_msg'] != $row['id_first_msg'] && ($delete_own_replies == array(0) || in_array($row['id_board'], $delete_own_replies)))
-			$can_delete = true;
+		elseif ($row['id_member'] == $row['id_member_started'] && $row['id_msg'] != $row['id_first_msg'] && ($delete_own_replies == array(0) || in_array($row['id_board'], $delete_own_replies))) {
+					$can_delete = true;
+		}
 		// Someone elses?
-		elseif ($row['id_member'] != $user_info['id'] && ($delete_any_boards == array(0) || in_array($row['id_board'], $delete_any_boards)))
-			$can_delete = true;
-		else
-			$can_delete = false;
+		elseif ($row['id_member'] != $user_info['id'] && ($delete_any_boards == array(0) || in_array($row['id_board'], $delete_any_boards))) {
+					$can_delete = true;
+		} else {
+					$can_delete = false;
+		}
 
 		$context['unapproved_items'][] = array(
 			'id' => $row['id_msg'],
@@ -323,28 +337,31 @@ 
 	// Once again, permissions are king!
 	$approve_boards = boardsAllowedTo('approve_posts');
 
-	if ($approve_boards == array(0))
-		$approve_query = '';
-	elseif (!empty($approve_boards))
-		$approve_query = ' AND m.id_board IN (' . implode(',', $approve_boards) . ')';
-	else
-		$approve_query = ' AND 1=0';
+	if ($approve_boards == array(0)) {
+			$approve_query = '';
+	} elseif (!empty($approve_boards)) {
+			$approve_query = ' AND m.id_board IN (' . implode(',', $approve_boards) . ')';
+	} else {
+			$approve_query = ' AND 1=0';
+	}
 
 	// Get together the array of things to act on, if any.
 	$attachments = array();
-	if (isset($_GET['approve']))
-		$attachments[] = (int) $_GET['approve'];
-	elseif (isset($_GET['delete']))
-		$attachments[] = (int) $_GET['delete'];
-	elseif (isset($_POST['item']))
-		foreach ($_POST['item'] as $item)
+	if (isset($_GET['approve'])) {
+			$attachments[] = (int) $_GET['approve'];
+	} elseif (isset($_GET['delete'])) {
+			$attachments[] = (int) $_GET['delete'];
+	} elseif (isset($_POST['item'])) {
+			foreach ($_POST['item'] as $item)
 			$attachments[] = (int) $item;
+	}
 
 	// Are we approving or deleting?
-	if (isset($_GET['approve']) || (isset($_POST['do']) && $_POST['do'] == 'approve'))
-		$curAction = 'approve';
-	elseif (isset($_GET['delete']) || (isset($_POST['do']) && $_POST['do'] == 'delete'))
-		$curAction = 'delete';
+	if (isset($_GET['approve']) || (isset($_POST['do']) && $_POST['do'] == 'approve')) {
+			$curAction = 'approve';
+	} elseif (isset($_GET['delete']) || (isset($_POST['do']) && $_POST['do'] == 'delete')) {
+			$curAction = 'delete';
+	}
 
 	// Something to do, let's do it!
 	if (!empty($attachments) && isset($curAction))
@@ -372,17 +389,19 @@ 
 			)
 		);
 		$attachments = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$attachments[] = $row['id_attach'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$attachments[] = $row['id_attach'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Assuming it wasn't all like, proper illegal, we can do the approving.
 		if (!empty($attachments))
 		{
-			if ($curAction == 'approve')
-				ApproveAttachments($attachments);
-			else
-				removeAttachments(array('id_attach' => $attachments, 'do_logging' => true));
+			if ($curAction == 'approve') {
+							ApproveAttachments($attachments);
+			} else {
+							removeAttachments(array('id_attach' => $attachments, 'do_logging' => true));
+			}
 		}
 	}
 
@@ -682,15 +701,16 @@ 
 	{
 		approveTopics($topic, !$approved);
 
-		if ($starter != $user_info['id'])
-			logAction(($approved ? 'un' : '') . 'approve_topic', array('topic' => $topic, 'subject' => $subject, 'member' => $starter, 'board' => $board));
-	}
-	else
+		if ($starter != $user_info['id']) {
+					logAction(($approved ? 'un' : '') . 'approve_topic', array('topic' => $topic, 'subject' => $subject, 'member' => $starter, 'board' => $board));
+		}
+	} else
 	{
 		approvePosts($_REQUEST['msg'], !$approved);
 
-		if ($poster != $user_info['id'])
-			logAction(($approved ? 'un' : '') . 'approve', array('topic' => $topic, 'subject' => $subject, 'member' => $poster, 'board' => $board));
+		if ($poster != $user_info['id']) {
+					logAction(($approved ? 'un' : '') . 'approve', array('topic' => $topic, 'subject' => $subject, 'member' => $poster, 'board' => $board));
+		}
 	}
 
 	redirectexit('topic=' . $topic . '.msg' . $_REQUEST['msg'] . '#msg' . $_REQUEST['msg']);
@@ -716,8 +736,7 @@ 
 		{
 			logAction('approve_topic', array('topic' => $topic, 'subject' => $messageDetails[$topic]['subject'], 'member' => $messageDetails[$topic]['member'], 'board' => $messageDetails[$topic]['board']));
 		}
-	}
-	else
+	} else
 	{
 		approvePosts($messages);
 		// and tell the world about it again
@@ -745,8 +764,9 @@ 
 		)
 	);
 	$msgs = array();
-	while ($row = $smcFunc['db_fetch_row']($request))
-		$msgs[] = $row[0];
+	while ($row = $smcFunc['db_fetch_row']($request)) {
+			$msgs[] = $row[0];
+	}
 	$smcFunc['db_free_result']($request);
 
 	if (!empty($msgs))
@@ -765,8 +785,9 @@ 
 		)
 	);
 	$attaches = array();
-	while ($row = $smcFunc['db_fetch_row']($request))
-		$attaches[] = $row[0];
+	while ($row = $smcFunc['db_fetch_row']($request)) {
+			$attaches[] = $row[0];
+	}
 	$smcFunc['db_free_result']($request);
 
 	if (!empty($attaches))
@@ -794,12 +815,12 @@ 
 	{
 		removeTopics($messages);
 		// and tell the world about it
-		foreach ($messages as $topic)
-			// Note, only log topic ID in native form if it's not gone forever.
+		foreach ($messages as $topic) {
+					// Note, only log topic ID in native form if it's not gone forever.
 			logAction('remove', array(
 				(empty($modSettings['recycle_enable']) || $modSettings['recycle_board'] != $messageDetails[$topic]['board'] ? 'topic' : 'old_topic_id') => $topic, 'subject' => $messageDetails[$topic]['subject'], 'member' => $messageDetails[$topic]['member'], 'board' => $messageDetails[$topic]['board']));
-	}
-	else
+		}
+	} else
 	{
 		foreach ($messages as $post)
 		{

Sources/CacheAPI-zend.php

Braces +15 added lines, -11 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 /**
  * Our Cache API class
@@ -27,8 +28,9 @@ 
 	{
 		$supported = function_exists('zend_shm_cache_fetch') || function_exists('output_cache_get');
 
-		if ($test)
-			return $supported;
+		if ($test) {
+					return $supported;
+		}
 		return parent::isSupported() && $supported;
 	}
 
@@ -40,10 +42,11 @@ 
 		$key = $this->prefix . strtr($key, ':/', '-_');
 
 		// Zend's pricey stuff.
-		if (function_exists('zend_shm_cache_fetch'))
-			return zend_shm_cache_fetch('SMF::' . $key);
-		elseif (function_exists('output_cache_get'))
-			return output_cache_get($key, $ttl);
+		if (function_exists('zend_shm_cache_fetch')) {
+					return zend_shm_cache_fetch('SMF::' . $key);
+		} elseif (function_exists('output_cache_get')) {
+					return output_cache_get($key, $ttl);
+		}
 	}
 
 	/**
@@ -53,10 +56,11 @@ 
 	{
 		$key = $this->prefix . strtr($key, ':/', '-_');
 
-		if (function_exists('zend_shm_cache_store'))
-			return zend_shm_cache_store('SMF::' . $key, $value, $ttl);
-		elseif (function_exists('output_cache_put'))
-			return output_cache_put($key, $value);
+		if (function_exists('zend_shm_cache_store')) {
+					return zend_shm_cache_store('SMF::' . $key, $value, $ttl);
+		} elseif (function_exists('output_cache_put')) {
+					return output_cache_put($key, $value);
+		}
 	}
 
 	/**

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), 'smf_suggest');
-}
+	if ($context['group']['assignable']) {
+			loadJavaScriptFile('suggest.js', array('defer' => false), '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/BoardIndex.php

Braces +20 added lines, -13 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This function shows the board index.
@@ -34,8 +35,9 @@ 
 	$context['canonical_url'] = $scripturl;
 
 	// Do not let search engines index anything if there is a random thing in $_GET.
-	if (!empty($_GET))
-		$context['robot_no_index'] = true;
+	if (!empty($_GET)) {
+			$context['robot_no_index'] = true;
+	}
 
 	// Retrieve the categories and boards.
 	require_once($sourcedir . '/Subs-BoardIndex.php');
@@ -62,11 +64,12 @@ 
 			$context['latest_posts'] = cache_quick_get('boardindex-latest_posts:' . md5($user_info['query_wanna_see_board'] . $user_info['language']), 'Subs-Recent.php', 'cache_getLastPosts', array($latestPostOptions));
 		}
 
-		if (!empty($context['latest_posts']) || !empty($context['latest_post']))
-			$context['info_center'][] = array(
+		if (!empty($context['latest_posts']) || !empty($context['latest_post'])) {
+					$context['info_center'][] = array(
 				'tpl' => 'recent',
 				'txt' => 'recent_posts',
 			);
+		}
 	}
 
 	// Load the calendar?
@@ -87,20 +90,22 @@ 
 		// This is used to show the "how-do-I-edit" help.
 		$context['calendar_can_edit'] = allowedTo('calendar_edit_any');
 
-		if ($context['show_calendar'])
-			$context['info_center'][] = array(
+		if ($context['show_calendar']) {
+					$context['info_center'][] = array(
 				'tpl' => 'calendar',
 				'txt' => $context['calendar_only_today'] ? 'calendar_today' : 'calendar_upcoming',
 			);
+		}
 	}
 
 	// And stats.
 	$context['show_stats'] = allowedTo('view_stats') && !empty($modSettings['trackStats']);
-	if ($settings['show_stats_index'])
-		$context['info_center'][] = array(
+	if ($settings['show_stats_index']) {
+			$context['info_center'][] = array(
 				'tpl' => 'stats',
 				'txt' => 'forum_stats',
 			);
+	}
 
 	// Now the online stuff
 	require_once($sourcedir . '/Subs-MembersOnline.php');
@@ -118,12 +123,14 @@ 
 			);
 
 	// Track most online statistics? (Subs-MembersOnline.php)
-	if (!empty($modSettings['trackStats']))
-		trackStatsUsersOnline($context['num_guests'] + $context['num_spiders'] + $context['num_users_online']);
+	if (!empty($modSettings['trackStats'])) {
+			trackStatsUsersOnline($context['num_guests'] + $context['num_spiders'] + $context['num_users_online']);
+	}
 
 	// Are we showing all membergroups on the board index?
-	if (!empty($settings['show_group_key']))
-		$context['membergroups'] = cache_quick_get('membergroup_list', 'Subs-Membergroups.php', 'cache_getMembergroupList', array());
+	if (!empty($settings['show_group_key'])) {
+			$context['membergroups'] = cache_quick_get('membergroup_list', 'Subs-Membergroups.php', 'cache_getMembergroupList', array());
+	}
 
 	// And back to normality.
 	$context['page_title'] = sprintf($txt['forum_index'], $context['forum_name']);

Sources/CacheAPI-apcu.php

Braces +10 added lines, -7 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 /**
  * Our Cache API class
@@ -27,8 +28,9 @@ 
 	{
 		$supported = function_exists('apcu_fetch') && function_exists('apcu_store');
 
-		if ($test)
-			return $supported;
+		if ($test) {
+					return $supported;
+		}
 		return parent::isSupported() && $supported;
 	}
 
@@ -50,10 +52,11 @@ 
 		$key = $this->prefix . strtr($key, ':/', '-_');
 
 		// An extended key is needed to counteract a bug in APC.
-		if ($value === null)
-			return apcu_delete($key . 'smf');
-		else
-			return apcu_store($key . 'smf', $value, $ttl);
+		if ($value === null) {
+					return apcu_delete($key . 'smf');
+		} else {
+					return apcu_store($key . 'smf', $value, $ttl);
+		}
 	}
 
 	/**

Sources/Subs-Boards.php

Braces +247 added lines, -175 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Mark a board or multiple boards read.
@@ -28,14 +29,16 @@ 
 	global $user_info, $modSettings, $smcFunc;
 
 	// Force $boards to be an array.
-	if (!is_array($boards))
-		$boards = array($boards);
-	else
-		$boards = array_unique($boards);
+	if (!is_array($boards)) {
+			$boards = array($boards);
+	} else {
+			$boards = array_unique($boards);
+	}
 
 	// No boards, nothing to mark as read.
-	if (empty($boards))
-		return;
+	if (empty($boards)) {
+			return;
+	}
 
 	// Allow the user to mark a board as unread.
 	if ($unread)
@@ -65,8 +68,9 @@ 
 	else
 	{
 		$markRead = array();
-		foreach ($boards as $board)
-			$markRead[] = array($modSettings['maxMsgID'], $user_info['id'], $board);
+		foreach ($boards as $board) {
+					$markRead[] = array($modSettings['maxMsgID'], $user_info['id'], $board);
+		}
 
 		// Update log_mark_read and log_boards.
 		$smcFunc['db_insert']('replace',
@@ -99,8 +103,9 @@ 
 	list ($lowest_topic) = $smcFunc['db_fetch_row']($result);
 	$smcFunc['db_free_result']($result);
 
-	if (empty($lowest_topic))
-		return;
+	if (empty($lowest_topic)) {
+			return;
+	}
 
 	// @todo SLOW This query seems to eat it sometimes.
 	$result = $smcFunc['db_query']('', '
@@ -118,12 +123,13 @@ 
 		)
 	);
 	$topics = array();
-	while ($row = $smcFunc['db_fetch_assoc']($result))
-		$topics[] = $row['id_topic'];
+	while ($row = $smcFunc['db_fetch_assoc']($result)) {
+			$topics[] = $row['id_topic'];
+	}
 	$smcFunc['db_free_result']($result);
 
-	if (!empty($topics))
-		$smcFunc['db_query']('', '
+	if (!empty($topics)) {
+			$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}log_topics
 			WHERE id_member = {int:current_member}
 				AND id_topic IN ({array_int:topic_list})',
@@ -132,7 +138,8 @@ 
 				'topic_list' => $topics,
 			)
 		);
-}
+	}
+	}
 
 /**
  * Mark one or more boards as read.
@@ -157,23 +164,26 @@ 
 			)
 		);
 		$boards = array();
-		while ($row = $smcFunc['db_fetch_assoc']($result))
-			$boards[] = $row['id_board'];
+		while ($row = $smcFunc['db_fetch_assoc']($result)) {
+					$boards[] = $row['id_board'];
+		}
 		$smcFunc['db_free_result']($result);
 
-		if (!empty($boards))
-			markBoardsRead($boards, isset($_REQUEST['unread']));
+		if (!empty($boards)) {
+					markBoardsRead($boards, isset($_REQUEST['unread']));
+		}
 
 		$_SESSION['id_msg_last_visit'] = $modSettings['maxMsgID'];
-		if (!empty($_SESSION['old_url']) && strpos($_SESSION['old_url'], 'action=unread') !== false)
-			redirectexit('action=unread');
+		if (!empty($_SESSION['old_url']) && strpos($_SESSION['old_url'], 'action=unread') !== false) {
+					redirectexit('action=unread');
+		}
 
-		if (isset($_SESSION['topicseen_cache']))
-			$_SESSION['topicseen_cache'] = array();
+		if (isset($_SESSION['topicseen_cache'])) {
+					$_SESSION['topicseen_cache'] = array();
+		}
 
 		redirectexit();
-	}
-	elseif (isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'unreadreplies')
+	} elseif (isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'unreadreplies')
 	{
 		// Make sure all the topics are integers!
 		$topics = array_map('intval', explode('-', $_REQUEST['topics']));
@@ -189,13 +199,15 @@ 
 			)
 		);
 		$logged_topics = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$logged_topics[$row['id_topic']] = $row['unwatched'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$logged_topics[$row['id_topic']] = $row['unwatched'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		$markRead = array();
-		foreach ($topics as $id_topic)
-			$markRead[] = array($modSettings['maxMsgID'], $user_info['id'], $id_topic, (isset($logged_topics[$topic]) ? $logged_topics[$topic] : 0));
+		foreach ($topics as $id_topic) {
+					$markRead[] = array($modSettings['maxMsgID'], $user_info['id'], $id_topic, (isset($logged_topics[$topic]) ? $logged_topics[$topic] : 0));
+		}
 
 		$smcFunc['db_insert']('replace',
 			'{db_prefix}log_topics',
@@ -204,8 +216,9 @@ 
 			array('id_member', 'id_topic')
 		);
 
-		if (isset($_SESSION['topicseen_cache']))
-			$_SESSION['topicseen_cache'] = array();
+		if (isset($_SESSION['topicseen_cache'])) {
+					$_SESSION['topicseen_cache'] = array();
+		}
 
 		redirectexit('action=unreadreplies');
 	}
@@ -230,11 +243,13 @@ 
 		if (!empty($_GET['t']))
 		{
 			// If they read the whole topic, go back to the beginning.
-			if ($_GET['t'] >= $topicinfo['id_last_msg'])
-				$earlyMsg = 0;
+			if ($_GET['t'] >= $topicinfo['id_last_msg']) {
+							$earlyMsg = 0;
+			}
 			// If they want to mark the whole thing read, same.
-			elseif ($_GET['t'] <= $topicinfo['id_first_msg'])
-				$earlyMsg = 0;
+			elseif ($_GET['t'] <= $topicinfo['id_first_msg']) {
+							$earlyMsg = 0;
+			}
 			// Otherwise, get the latest message before the named one.
 			else
 			{
@@ -255,9 +270,9 @@ 
 			}
 		}
 		// Marking read from first page?  That's the whole topic.
-		elseif ($_REQUEST['start'] == 0)
-			$earlyMsg = 0;
-		else
+		elseif ($_REQUEST['start'] == 0) {
+					$earlyMsg = 0;
+		} else
 		{
 			$result = $smcFunc['db_query']('', '
 				SELECT id_msg
@@ -285,8 +300,7 @@ 
 		);
 
 		redirectexit('board=' . $board . '.0');
-	}
-	else
+	} else
 	{
 		$categories = array();
 		$boards = array();
@@ -294,17 +308,20 @@ 
 		if (isset($_REQUEST['c']))
 		{
 			$_REQUEST['c'] = explode(',', $_REQUEST['c']);
-			foreach ($_REQUEST['c'] as $c)
-				$categories[] = (int) $c;
+			foreach ($_REQUEST['c'] as $c) {
+							$categories[] = (int) $c;
+			}
 		}
 		if (isset($_REQUEST['boards']))
 		{
 			$_REQUEST['boards'] = explode(',', $_REQUEST['boards']);
-			foreach ($_REQUEST['boards'] as $b)
-				$boards[] = (int) $b;
+			foreach ($_REQUEST['boards'] as $b) {
+							$boards[] = (int) $b;
+			}
+		}
+		if (!empty($board)) {
+					$boards[] = (int) $board;
 		}
-		if (!empty($board))
-			$boards[] = (int) $board;
 
 		if (isset($_REQUEST['children']) && !empty($boards))
 		{
@@ -324,9 +341,10 @@ 
 					'board_list' => $boards,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				if (in_array($row['id_parent'], $boards))
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							if (in_array($row['id_parent'], $boards))
 					$boards[] = $row['id_board'];
+			}
 			$smcFunc['db_free_result']($request);
 		}
 
@@ -343,8 +361,9 @@ 
 			$clauseParameters['board_list'] = $boards;
 		}
 
-		if (empty($clauses))
-			redirectexit();
+		if (empty($clauses)) {
+					redirectexit();
+		}
 
 		$request = $smcFunc['db_query']('', '
 			SELECT b.id_board
@@ -355,19 +374,22 @@ 
 			))
 		);
 		$boards = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$boards[] = $row['id_board'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$boards[] = $row['id_board'];
+		}
 		$smcFunc['db_free_result']($request);
 
-		if (empty($boards))
-			redirectexit();
+		if (empty($boards)) {
+					redirectexit();
+		}
 
 		markBoardsRead($boards, isset($_REQUEST['unread']));
 
 		foreach ($boards as $b)
 		{
-			if (isset($_SESSION['topicseen_cache'][$b]))
-				$_SESSION['topicseen_cache'][$b] = array();
+			if (isset($_SESSION['topicseen_cache'][$b])) {
+							$_SESSION['topicseen_cache'][$b] = array();
+			}
 		}
 
 		if (!isset($_REQUEST['unread']))
@@ -385,8 +407,9 @@ 
 			if ($smcFunc['db_num_rows']($result) > 0)
 			{
 				$logBoardInserts = array();
-				while ($row = $smcFunc['db_fetch_assoc']($result))
-					$logBoardInserts[] = array($modSettings['maxMsgID'], $user_info['id'], $row['id_board']);
+				while ($row = $smcFunc['db_fetch_assoc']($result)) {
+									$logBoardInserts[] = array($modSettings['maxMsgID'], $user_info['id'], $row['id_board']);
+				}
 
 				$smcFunc['db_insert']('replace',
 					'{db_prefix}log_boards',
@@ -397,17 +420,18 @@ 
 			}
 			$smcFunc['db_free_result']($result);
 
-			if (empty($board))
-				redirectexit();
-			else
-				redirectexit('board=' . $board . '.0');
-		}
-		else
+			if (empty($board)) {
+							redirectexit();
+			} else {
+							redirectexit('board=' . $board . '.0');
+			}
+		} else
 		{
-			if (empty($board_info['parent']))
-				redirectexit();
-			else
-				redirectexit('board=' . $board_info['parent'] . '.0');
+			if (empty($board_info['parent'])) {
+							redirectexit();
+			} else {
+							redirectexit('board=' . $board_info['parent'] . '.0');
+			}
 		}
 	}
 }
@@ -432,11 +456,13 @@ 
 			'selected_message' => (int) $messageID,
 		)
 	);
-	if ($smcFunc['db_num_rows']($result) > 0)
-		list ($memberID) = $smcFunc['db_fetch_row']($result);
+	if ($smcFunc['db_num_rows']($result) > 0) {
+			list ($memberID) = $smcFunc['db_fetch_row']($result);
+	}
 	// The message doesn't even exist.
-	else
-		$memberID = 0;
+	else {
+			$memberID = 0;
+	}
 	$smcFunc['db_free_result']($result);
 
 	return (int) $memberID;
@@ -457,8 +483,9 @@ 
 	getBoardTree();
 
 	// Make sure given boards and categories exist.
-	if (!isset($boards[$board_id]) || (isset($boardOptions['target_board']) && !isset($boards[$boardOptions['target_board']])) || (isset($boardOptions['target_category']) && !isset($cat_tree[$boardOptions['target_category']])))
-		fatal_lang_error('no_board');
+	if (!isset($boards[$board_id]) || (isset($boardOptions['target_board']) && !isset($boards[$boardOptions['target_board']])) || (isset($boardOptions['target_category']) && !isset($cat_tree[$boardOptions['target_category']]))) {
+			fatal_lang_error('no_board');
+	}
 
 	$id = $board_id;
 	call_integration_hook('integrate_pre_modify_board', array($id, &$boardOptions));
@@ -486,8 +513,9 @@ 
 			$child_level = 0;
 			$id_parent = 0;
 			$after = 0;
-			foreach ($cat_tree[$id_cat]['children'] as $id_board => $dummy)
-				$after = max($after, $boards[$id_board]['order']);
+			foreach ($cat_tree[$id_cat]['children'] as $id_board => $dummy) {
+							$after = max($after, $boards[$id_board]['order']);
+			}
 		}
 
 		// Make the board a child of a given board.
@@ -498,17 +526,19 @@ 
 			$id_parent = $boardOptions['target_board'];
 
 			// People can be creative, in many ways...
-			if (isChildOf($id_parent, $board_id))
-				fatal_lang_error('mboards_parent_own_child_error', false);
-			elseif ($id_parent == $board_id)
-				fatal_lang_error('mboards_board_own_child_error', false);
+			if (isChildOf($id_parent, $board_id)) {
+							fatal_lang_error('mboards_parent_own_child_error', false);
+			} elseif ($id_parent == $board_id) {
+							fatal_lang_error('mboards_board_own_child_error', false);
+			}
 
 			$after = $boards[$boardOptions['target_board']]['order'];
 
 			// Check if there are already children and (if so) get the max board order.
-			if (!empty($boards[$id_parent]['tree']['children']) && empty($boardOptions['move_first_child']))
-				foreach ($boards[$id_parent]['tree']['children'] as $childBoard_id => $dummy)
+			if (!empty($boards[$id_parent]['tree']['children']) && empty($boardOptions['move_first_child'])) {
+							foreach ($boards[$id_parent]['tree']['children'] as $childBoard_id => $dummy)
 					$after = max($after, $boards[$childBoard_id]['order']);
+			}
 		}
 
 		// Place a board before or after another board, on the same child level.
@@ -521,8 +551,9 @@ 
 		}
 
 		// Oops...?
-		else
-			trigger_error('modifyBoard(): The move_to value \'' . $boardOptions['move_to'] . '\' is incorrect', E_USER_ERROR);
+		else {
+					trigger_error('modifyBoard(): The move_to value \'' . $boardOptions['move_to'] . '\' is incorrect', E_USER_ERROR);
+		}
 
 		// Get a list of children of this board.
 		$childList = array();
@@ -531,14 +562,16 @@ 
 		// See if there are changes that affect children.
 		$childUpdates = array();
 		$levelDiff = $child_level - $boards[$board_id]['level'];
-		if ($levelDiff != 0)
-			$childUpdates[] = 'child_level = child_level ' . ($levelDiff > 0 ? '+ ' : '') . '{int:level_diff}';
-		if ($id_cat != $boards[$board_id]['category'])
-			$childUpdates[] = 'id_cat = {int:category}';
+		if ($levelDiff != 0) {
+					$childUpdates[] = 'child_level = child_level ' . ($levelDiff > 0 ? '+ ' : '') . '{int:level_diff}';
+		}
+		if ($id_cat != $boards[$board_id]['category']) {
+					$childUpdates[] = 'id_cat = {int:category}';
+		}
 
 		// Fix the children of this board.
-		if (!empty($childList) && !empty($childUpdates))
-			$smcFunc['db_query']('', '
+		if (!empty($childList) && !empty($childUpdates)) {
+					$smcFunc['db_query']('', '
 				UPDATE {db_prefix}boards
 				SET ' . implode(',
 					', $childUpdates) . '
@@ -549,6 +582,7 @@ 
 					'level_diff' => $levelDiff,
 				)
 			);
+		}
 
 		// Make some room for this spot.
 		$smcFunc['db_query']('', '
@@ -644,8 +678,8 @@ 
 	call_integration_hook('integrate_modify_board', array($id, $boardOptions, &$boardUpdates, &$boardUpdateParameters));
 
 	// Do the updates (if any).
-	if (!empty($boardUpdates))
-		$smcFunc['db_query']('', '
+	if (!empty($boardUpdates)) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}boards
 			SET
 				' . implode(',
@@ -655,6 +689,7 @@ 
 				'selected_board' => $board_id,
 			))
 		);
+	}
 
 	// Set moderators of this board.
 	if (isset($boardOptions['moderators']) || isset($boardOptions['moderator_string']) || isset($boardOptions['moderator_groups']) || isset($boardOptions['moderator_group_string']))
@@ -679,13 +714,15 @@ 
 			{
 				$moderators[$k] = trim($moderators[$k]);
 
-				if (strlen($moderators[$k]) == 0)
-					unset($moderators[$k]);
+				if (strlen($moderators[$k]) == 0) {
+									unset($moderators[$k]);
+				}
 			}
 
 			// Find all the id_member's for the member_name's in the list.
-			if (empty($boardOptions['moderators']))
-				$boardOptions['moderators'] = array();
+			if (empty($boardOptions['moderators'])) {
+							$boardOptions['moderators'] = array();
+			}
 			if (!empty($moderators))
 			{
 				$request = $smcFunc['db_query']('', '
@@ -698,8 +735,9 @@ 
 						'limit' => count($moderators),
 					)
 				);
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					$boardOptions['moderators'][] = $row['id_member'];
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									$boardOptions['moderators'][] = $row['id_member'];
+				}
 				$smcFunc['db_free_result']($request);
 			}
 		}
@@ -708,8 +746,9 @@ 
 		if (!empty($boardOptions['moderators']))
 		{
 			$inserts = array();
-			foreach ($boardOptions['moderators'] as $moderator)
-				$inserts[] = array($board_id, $moderator);
+			foreach ($boardOptions['moderators'] as $moderator) {
+							$inserts[] = array($board_id, $moderator);
+			}
 
 			$smcFunc['db_insert']('insert',
 				'{db_prefix}moderators',
@@ -739,14 +778,16 @@ 
 			{
 				$moderator_groups[$k] = trim($moderator_groups[$k]);
 
-				if (strlen($moderator_groups[$k]) == 0)
-					unset($moderator_groups[$k]);
+				if (strlen($moderator_groups[$k]) == 0) {
+									unset($moderator_groups[$k]);
+				}
 			}
 
 			/* 	Find all the id_group's for all the group names in the list
 				But skip any invalid ones (invisible/post groups/Administrator/Moderator) */
-			if (empty($boardOptions['moderator_groups']))
-				$boardOptions['moderator_groups'] = array();
+			if (empty($boardOptions['moderator_groups'])) {
+							$boardOptions['moderator_groups'] = array();
+			}
 			if (!empty($moderator_groups))
 			{
 				$request = $smcFunc['db_query']('', '
@@ -777,8 +818,9 @@ 
 		if (!empty($boardOptions['moderator_groups']))
 		{
 			$inserts = array();
-			foreach ($boardOptions['moderator_groups'] as $moderator_group)
-				$inserts[] = array($board_id, $moderator_group);
+			foreach ($boardOptions['moderator_groups'] as $moderator_group) {
+							$inserts[] = array($board_id, $moderator_group);
+			}
 
 			$smcFunc['db_insert']('insert',
 				'{db_prefix}moderator_groups',
@@ -792,14 +834,16 @@ 
 		updateSettings(array('settings_updated' => time()));
 	}
 
-	if (isset($boardOptions['move_to']))
-		reorderBoards();
+	if (isset($boardOptions['move_to'])) {
+			reorderBoards();
+	}
 
 	clean_cache('data');
 
-	if (empty($boardOptions['dont_log']))
-		logAction('edit_board', array('board' => $board_id), 'admin');
-}
+	if (empty($boardOptions['dont_log'])) {
+			logAction('edit_board', array('board' => $board_id), 'admin');
+	}
+	}
 
 /**
  * Create a new board and set its properties and position.
@@ -815,11 +859,13 @@ 
 	global $boards, $smcFunc;
 
 	// Trigger an error if one of the required values is not set.
-	if (!isset($boardOptions['board_name']) || trim($boardOptions['board_name']) == '' || !isset($boardOptions['move_to']) || !isset($boardOptions['target_category']))
-		trigger_error('createBoard(): One or more of the required options is not set', E_USER_ERROR);
+	if (!isset($boardOptions['board_name']) || trim($boardOptions['board_name']) == '' || !isset($boardOptions['move_to']) || !isset($boardOptions['target_category'])) {
+			trigger_error('createBoard(): One or more of the required options is not set', E_USER_ERROR);
+	}
 
-	if (in_array($boardOptions['move_to'], array('child', 'before', 'after')) && !isset($boardOptions['target_board']))
-		trigger_error('createBoard(): Target board is not set', E_USER_ERROR);
+	if (in_array($boardOptions['move_to'], array('child', 'before', 'after')) && !isset($boardOptions['target_board'])) {
+			trigger_error('createBoard(): Target board is not set', E_USER_ERROR);
+	}
 
 	// Set every optional value to its default value.
 	$boardOptions += array(
@@ -853,8 +899,9 @@ 
 		1
 	);
 
-	if (empty($board_id))
-		return 0;
+	if (empty($board_id)) {
+			return 0;
+	}
 
 	// Change the board according to the given specifications.
 	modifyBoard($board_id, $boardOptions);
@@ -917,8 +964,9 @@ 
 	global $sourcedir, $boards, $smcFunc;
 
 	// No boards to delete? Return!
-	if (empty($boards_to_remove))
-		return;
+	if (empty($boards_to_remove)) {
+			return;
+	}
 
 	getBoardTree();
 
@@ -929,12 +977,14 @@ 
 	{
 		// Get a list of the child boards that will also be removed.
 		$child_boards_to_remove = array();
-		foreach ($boards_to_remove as $board_to_remove)
-			recursiveBoards($child_boards_to_remove, $boards[$board_to_remove]['tree']);
+		foreach ($boards_to_remove as $board_to_remove) {
+					recursiveBoards($child_boards_to_remove, $boards[$board_to_remove]['tree']);
+		}
 
 		// Merge the children with their parents.
-		if (!empty($child_boards_to_remove))
-			$boards_to_remove = array_unique(array_merge($boards_to_remove, $child_boards_to_remove));
+		if (!empty($child_boards_to_remove)) {
+					$boards_to_remove = array_unique(array_merge($boards_to_remove, $child_boards_to_remove));
+		}
 	}
 	// Move the children to a safe home.
 	else
@@ -942,10 +992,11 @@ 
 		foreach ($boards_to_remove as $id_board)
 		{
 			// @todo Separate category?
-			if ($moveChildrenTo === 0)
-				fixChildren($id_board, 0, 0);
-			else
-				fixChildren($id_board, $boards[$moveChildrenTo]['level'] + 1, $moveChildrenTo);
+			if ($moveChildrenTo === 0) {
+							fixChildren($id_board, 0, 0);
+			} else {
+							fixChildren($id_board, $boards[$moveChildrenTo]['level'] + 1, $moveChildrenTo);
+			}
 		}
 	}
 
@@ -959,8 +1010,9 @@ 
 		)
 	);
 	$topics = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$topics[] = $row['id_topic'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$topics[] = $row['id_topic'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	require_once($sourcedir . '/RemoveTopic.php');
@@ -1048,8 +1100,9 @@ 
 	clean_cache('data');
 
 	// Let's do some serious logging.
-	foreach ($boards_to_remove as $id_board)
-		logAction('delete_board', array('boardname' => $boards[$id_board]['name']), 'admin');
+	foreach ($boards_to_remove as $id_board) {
+			logAction('delete_board', array('boardname' => $boards[$id_board]['name']), 'admin');
+	}
 
 	reorderBoards();
 }
@@ -1068,8 +1121,8 @@ 
 	$board_order = 0;
 	foreach ($cat_tree as $catID => $dummy)
 	{
-		foreach ($boardList[$catID] as $boardID)
-			if ($boards[$boardID]['order'] != ++$board_order)
+		foreach ($boardList[$catID] as $boardID) {
+					if ($boards[$boardID]['order'] != ++$board_order)
 				$smcFunc['db_query']('', '
 					UPDATE {db_prefix}boards
 					SET board_order = {int:new_order}
@@ -1079,6 +1132,7 @@ 
 						'selected_board' => $boardID,
 					)
 				);
+		}
 	}
 
 	// Empty the board order cache
@@ -1107,8 +1161,9 @@ 
 		)
 	);
 	$children = array();
-	while ($row = $smcFunc['db_fetch_assoc']($result))
-		$children[] = $row['id_board'];
+	while ($row = $smcFunc['db_fetch_assoc']($result)) {
+			$children[] = $row['id_board'];
+	}
 	$smcFunc['db_free_result']($result);
 
 	// ...and set it to a new parent and child_level.
@@ -1124,9 +1179,10 @@ 
 	);
 
 	// Recursively fix the children of the children.
-	foreach ($children as $child)
-		fixChildren($child, $newLevel + 1, $child);
-}
+	foreach ($children as $child) {
+			fixChildren($child, $newLevel + 1, $child);
+	}
+	}
 
 /**
  * Tries to load up the entire board order and category very very quickly
@@ -1143,8 +1199,9 @@ 
 		'boards' => array(),
 	);
 
-	if (!empty($tree_order['boards']))
-		return $tree_order;
+	if (!empty($tree_order['boards'])) {
+			return $tree_order;
+	}
 
 	if (($cached = cache_get_data('board_order', 86400)) !== null)
 	{
@@ -1160,8 +1217,9 @@ 
 	);
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (!in_array($row['id_cat'], $tree_order['cats']))
-			$tree_order['cats'][] = $row['id_cat'];
+		if (!in_array($row['id_cat'], $tree_order['cats'])) {
+					$tree_order['cats'][] = $row['id_cat'];
+		}
 		$tree_order['boards'][] = $row['id_board'];
 	}
 	$smcFunc['db_free_result']($request);
@@ -1181,16 +1239,19 @@ 
 	$tree = getTreeOrder();
 
 	$ordered = array();
-	foreach ($tree['boards'] as $board)
-		if (!empty($boards[$board]))
+	foreach ($tree['boards'] as $board) {
+			if (!empty($boards[$board]))
 		{
 			$ordered[$board] = $boards[$board];
+	}
 
-			if (is_array($ordered[$board]) && !empty($ordered[$board]['boards']))
-				sortBoards($ordered[$board]['boards']);
+			if (is_array($ordered[$board]) && !empty($ordered[$board]['boards'])) {
+							sortBoards($ordered[$board]['boards']);
+			}
 
-			if (is_array($ordered[$board]) && !empty($ordered[$board]['children']))
-				sortBoards($ordered[$board]['children']);
+			if (is_array($ordered[$board]) && !empty($ordered[$board]['children'])) {
+							sortBoards($ordered[$board]['children']);
+			}
 		}
 
 	$boards = $ordered;
@@ -1206,12 +1267,14 @@ 
 	$tree = getTreeOrder();
 
 	$ordered = array();
-	foreach ($tree['cats'] as $cat)
-		if (!empty($categories[$cat]))
+	foreach ($tree['cats'] as $cat) {
+			if (!empty($categories[$cat]))
 		{
 			$ordered[$cat] = $categories[$cat];
-			if (!empty($ordered[$cat]['boards']))
-				sortBoards($ordered[$cat]['boards']);
+	}
+			if (!empty($ordered[$cat]['boards'])) {
+							sortBoards($ordered[$cat]['boards']);
+			}
 		}
 
 	$categories = $ordered;
@@ -1227,8 +1290,9 @@ 
 {
 	global $smcFunc, $scripturl, $txt;
 
-	if (empty($boards))
-		return array();
+	if (empty($boards)) {
+			return array();
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT mem.id_member, mem.real_name, mo.id_board
@@ -1242,8 +1306,9 @@ 
 	$moderators = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (empty($moderators[$row['id_board']]))
-			$moderators[$row['id_board']] = array();
+		if (empty($moderators[$row['id_board']])) {
+					$moderators[$row['id_board']] = array();
+		}
 
 		$moderators[$row['id_board']][] = array(
 			'id' => $row['id_member'],
@@ -1267,8 +1332,9 @@ 
 {
 	global $smcFunc, $scripturl, $txt;
 
-	if (empty($boards))
-		return array();
+	if (empty($boards)) {
+			return array();
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT mg.id_group, mg.group_name, bg.id_board
@@ -1282,8 +1348,9 @@ 
 	$groups = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (empty($groups[$row['id_board']]))
-			$groups[$row['id_board']] = array();
+		if (empty($groups[$row['id_board']])) {
+					$groups[$row['id_board']] = array();
+		}
 
 		$groups[$row['id_board']][] = array(
 			'id' => $row['id_group'],
@@ -1358,8 +1425,9 @@ 
 
 		if (!empty($row['id_board']))
 		{
-			if ($row['child_level'] != $curLevel)
-				$prevBoard = 0;
+			if ($row['child_level'] != $curLevel) {
+							$prevBoard = 0;
+			}
 
 			$boards[$row['id_board']] = array(
 				'id' => $row['id_board'],
@@ -1391,16 +1459,16 @@ 
 					'children' => array()
 				);
 				$boards[$row['id_board']]['tree'] = &$cat_tree[$row['id_cat']]['children'][$row['id_board']];
-			}
-			else
+			} else
 			{
 				// Parent doesn't exist!
-				if (!isset($boards[$row['id_parent']]['tree']))
-					fatal_lang_error('no_valid_parent', false, array($row['board_name']));
+				if (!isset($boards[$row['id_parent']]['tree'])) {
+									fatal_lang_error('no_valid_parent', false, array($row['board_name']));
+				}
 
 				// Wrong childlevel...we can silently fix this...
-				if ($boards[$row['id_parent']]['tree']['node']['level'] != $row['child_level'] - 1)
-					$smcFunc['db_query']('', '
+				if ($boards[$row['id_parent']]['tree']['node']['level'] != $row['child_level'] - 1) {
+									$smcFunc['db_query']('', '
 						UPDATE {db_prefix}boards
 						SET child_level = {int:new_child_level}
 						WHERE id_board = {int:selected_board}',
@@ -1409,6 +1477,7 @@ 
 							'selected_board' => $row['id_board'],
 						)
 					);
+				}
 
 				$boards[$row['id_parent']]['tree']['children'][$row['id_board']] = array(
 					'node' => &$boards[$row['id_board']],
@@ -1442,8 +1511,9 @@ 
  */
 function recursiveBoards(&$_boardList, &$_tree)
 {
-	if (empty($_tree['children']))
-		return;
+	if (empty($_tree['children'])) {
+			return;
+	}
 
 	foreach ($_tree['children'] as $id => $node)
 	{
@@ -1462,11 +1532,13 @@ 
 {
 	global $boards;
 
-	if (empty($boards[$child]['parent']))
-		return false;
+	if (empty($boards[$child]['parent'])) {
+			return false;
+	}
 
-	if ($boards[$child]['parent'] == $parent)
-		return true;
+	if ($boards[$child]['parent'] == $parent) {
+			return true;
+	}
 
 	return isChildOf($boards[$child]['parent'], $parent);
 }

Sources/ReportToMod.php

Braces +71 added lines, -51 removed lines

@@ -12,8 +12,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Report a post or profile to the moderator... ask for a comment.
@@ -35,10 +36,11 @@ 
 
 	// You can't use this if it's off or you are not allowed to do it.
 	// If we don't have the ID of something to report, we'll die with a no_access error below
-	if (isset($_REQUEST['msg']))
-		isAllowedTo('report_any');
-	elseif (isset($_REQUEST['u']))
-		isAllowedTo('report_user');
+	if (isset($_REQUEST['msg'])) {
+			isAllowedTo('report_any');
+	} elseif (isset($_REQUEST['u'])) {
+			isAllowedTo('report_user');
+	}
 
 	// Previewing or modifying?
 	if (isset($_POST['preview']) && !isset($_POST['save']))
@@ -56,19 +58,23 @@ 
 	}
 
 	// If they're posting, it should be processed by ReportToModerator2.
-	if ((isset($_POST[$context['session_var']]) || isset($_POST['save'])) && empty($context['post_errors']) && !isset($_POST['preview']))
-		ReportToModerator2();
+	if ((isset($_POST[$context['session_var']]) || isset($_POST['save'])) && empty($context['post_errors']) && !isset($_POST['preview'])) {
+			ReportToModerator2();
+	}
 
 	// We need a message ID or user ID to check!
-	if (empty($_REQUEST['msg']) && empty($_REQUEST['mid']) && empty($_REQUEST['u']))
-		fatal_lang_error('no_access', false);
+	if (empty($_REQUEST['msg']) && empty($_REQUEST['mid']) && empty($_REQUEST['u'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// For compatibility, accept mid, but we should be using msg. (not the flavor kind!)
-	if (!empty($_REQUEST['msg']) || !empty($_REQUEST['mid']))
-		$_REQUEST['msg'] = empty($_REQUEST['msg']) ? (int) $_REQUEST['mid'] : (int) $_REQUEST['msg'];
+	if (!empty($_REQUEST['msg']) || !empty($_REQUEST['mid'])) {
+			$_REQUEST['msg'] = empty($_REQUEST['msg']) ? (int) $_REQUEST['mid'] : (int) $_REQUEST['msg'];
+	}
 	// msg and mid empty - assume we're reporting a user
-	elseif (!empty($_REQUEST['u']))
-		$_REQUEST['u'] = (int) $_REQUEST['u'];
+	elseif (!empty($_REQUEST['u'])) {
+			$_REQUEST['u'] = (int) $_REQUEST['u'];
+	}
 
 	// Set up some form values
 	$context['report_type'] = isset($_REQUEST['msg']) ? 'msg' : 'u';
@@ -89,8 +95,9 @@ 
 				'id_msg' => $_REQUEST['msg'],
 			)
 		);
-		if ($smcFunc['db_num_rows']($result) == 0)
-			fatal_lang_error('no_board', false);
+		if ($smcFunc['db_num_rows']($result) == 0) {
+					fatal_lang_error('no_board', false);
+		}
 		list ($_REQUEST['msg'], $member, $starter) = $smcFunc['db_fetch_row']($result);
 		$smcFunc['db_free_result']($result);
 
@@ -101,8 +108,7 @@ 
 
 		// The submit URL is different for users than it is for posts
 		$context['submit_url'] = $scripturl . '?action=reporttm;msg=' . $_REQUEST['msg'] . ';topic=' . $topic;
-	}
-	else
+	} else
 	{
 		// Check the user's ID
 		$result = $smcFunc['db_query']('', '
@@ -114,8 +120,9 @@ 
 			)
 		);
 
-		if ($smcFunc['db_num_rows']($result) == 0)
-			fatal_lang_error('no_user', false);
+		if ($smcFunc['db_num_rows']($result) == 0) {
+					fatal_lang_error('no_user', false);
+		}
 		list($_REQUEST['u'], $display_name, $username) = $smcFunc['db_fetch_row']($result);
 
 		$context['current_user'] = $_REQUEST['u'];
@@ -170,10 +177,11 @@ 
 	is_not_guest();
 
 	// You must have the proper permissions!
-	if (isset($_REQUEST['msg']))
-		isAllowedTo('report_any');
-	else
-		isAllowedTo('report_user');
+	if (isset($_REQUEST['msg'])) {
+			isAllowedTo('report_any');
+	} else {
+			isAllowedTo('report_user');
+	}
 
 	// Make sure they aren't spamming.
 	spamProtection('reporttm');
@@ -187,17 +195,20 @@ 
 	$post_errors = array();
 
 	// Check their session.
-	if (checkSession('post', '', false) != '')
-		$post_errors[] = 'session_timeout';
+	if (checkSession('post', '', false) != '') {
+			$post_errors[] = 'session_timeout';
+	}
 
 	// Make sure we have a comment and it's clean.
-	if (!isset($_POST['comment']) || $smcFunc['htmltrim']($_POST['comment']) === '')
-		$post_errors[] = 'no_comment';
+	if (!isset($_POST['comment']) || $smcFunc['htmltrim']($_POST['comment']) === '') {
+			$post_errors[] = 'no_comment';
+	}
 
 	$poster_comment = strtr($smcFunc['htmlspecialchars']($_POST['comment']), array("\r" => '', "\t" => ''));
 
-	if ($smcFunc['strlen']($poster_comment) > 254)
-		$post_errors[] = 'post_too_long';
+	if ($smcFunc['strlen']($poster_comment) > 254) {
+			$post_errors[] = 'post_too_long';
+	}
 
 	// Any errors?
 	if (!empty($post_errors))
@@ -205,8 +216,9 @@ 
 		loadLanguage('Errors');
 
 		$context['post_errors'] = array();
-		foreach ($post_errors as $post_error)
-			$context['post_errors'][$post_error] = $txt['error_' . $post_error];
+		foreach ($post_errors as $post_error) {
+					$context['post_errors'][$post_error] = $txt['error_' . $post_error];
+		}
 
 		return ReportToModerator();
 	}
@@ -215,8 +227,7 @@ 
 	{
 		// Handle this elsewhere to keep things from getting too long
 		reportPost($_POST['msg'], $poster_comment);
-	}
-	else
+	} else
 	{
 		reportUser($_POST['u'], $poster_comment);
 	}
@@ -247,8 +258,9 @@ 
 			'id_msg' => $_POST['msg'],
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('no_board', false);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('no_board', false);
+	}
 	$message = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -264,18 +276,20 @@ 
 			'ignored' => 1,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) != 0)
-		list ($id_report, $ignore) = $smcFunc['db_fetch_row']($request);
+	if ($smcFunc['db_num_rows']($request) != 0) {
+			list ($id_report, $ignore) = $smcFunc['db_fetch_row']($request);
+	}
 
 	$smcFunc['db_free_result']($request);
 
 	// If we're just going to ignore these, then who gives a monkeys...
-	if (!empty($ignore))
-		redirectexit('topic=' . $topic . '.msg' . $_POST['msg'] . '#msg' . $_POST['msg']);
+	if (!empty($ignore)) {
+			redirectexit('topic=' . $topic . '.msg' . $_POST['msg'] . '#msg' . $_POST['msg']);
+	}
 
 	// Already reported? My god, we could be dealing with a real rogue here...
-	if (!empty($id_report))
-		$smcFunc['db_query']('', '
+	if (!empty($id_report)) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}log_reported
 			SET num_reports = num_reports + 1, time_updated = {int:current_time}
 			WHERE id_report = {int:id_report}',
@@ -284,11 +298,13 @@ 
 				'id_report' => $id_report,
 			)
 		);
+	}
 	// Otherwise, we shall make one!
 	else
 	{
-		if (empty($message['real_name']))
-			$message['real_name'] = $message['poster_name'];
+		if (empty($message['real_name'])) {
+					$message['real_name'] = $message['poster_name'];
+		}
 
 		$id_report = $smcFunc['db_insert']('',
 			'{db_prefix}log_reported',
@@ -367,8 +383,9 @@ 
 			'id_member' => $_POST['u']
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('no_user', false);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('no_user', false);
+	}
 	$user = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -388,18 +405,20 @@ 
 			'ignored' => 1,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) != 0)
-		list ($id_report, $ignore) = $smcFunc['db_fetch_row']($request);
+	if ($smcFunc['db_num_rows']($request) != 0) {
+			list ($id_report, $ignore) = $smcFunc['db_fetch_row']($request);
+	}
 
 	$smcFunc['db_free_result']($request);
 
 	// If we're just going to ignore these, then who gives a monkeys...
-	if (!empty($ignore))
-		redirectexit('action=profile;u=' . $_POST['u']);
+	if (!empty($ignore)) {
+			redirectexit('action=profile;u=' . $_POST['u']);
+	}
 
 	// Already reported? My god, we could be dealing with a real rogue here...
-	if (!empty($id_report))
-		$smcFunc['db_query']('', '
+	if (!empty($id_report)) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}log_reported
 			SET num_reports = num_reports + 1, time_updated = {int:current_time}
 			WHERE id_report = {int:id_report}',
@@ -408,6 +427,7 @@ 
 				'id_report' => $id_report,
 			)
 		);
+	}
 	// Otherwise, we shall make one!
 	else
 	{

Sources/Subs-Membergroups.php

Braces +149 added lines, -112 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Delete one of more membergroups.
@@ -31,15 +32,16 @@ 
 	global $smcFunc, $modSettings, $txt;
 
 	// Make sure it's an array.
-	if (!is_array($groups))
-		$groups = array((int) $groups);
-	else
+	if (!is_array($groups)) {
+			$groups = array((int) $groups);
+	} else
 	{
 		$groups = array_unique($groups);
 
 		// Make sure all groups are integer.
-		foreach ($groups as $key => $value)
-			$groups[$key] = (int) $value;
+		foreach ($groups as $key => $value) {
+					$groups[$key] = (int) $value;
+		}
 	}
 
 	// Some groups are protected (guests, administrators, moderators, newbies).
@@ -56,15 +58,17 @@ 
 				'is_protected' => 1,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$protected_groups[] = $row['id_group'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$protected_groups[] = $row['id_group'];
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
 	// Make sure they don't delete protected groups!
 	$groups = array_diff($groups, array_unique($protected_groups));
-	if (empty($groups))
-		return 'no_group_found';
+	if (empty($groups)) {
+			return 'no_group_found';
+	}
 
 	// Make sure they don't try to delete a group attached to a paid subscription.
 	$subscriptions = array();
@@ -74,13 +78,14 @@ 
 		ORDER BY name');
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (in_array($row['id_group'], $groups))
-			$subscriptions[] = $row['name'];
-		else
+		if (in_array($row['id_group'], $groups)) {
+					$subscriptions[] = $row['name'];
+		} else
 		{
 			$add_groups = explode(',', $row['add_groups']);
-			if (count(array_intersect($add_groups, $groups)) != 0)
-				$subscriptions[] = $row['name'];
+			if (count(array_intersect($add_groups, $groups)) != 0) {
+							$subscriptions[] = $row['name'];
+			}
 		}
 	}
 	$smcFunc['db_free_result']($request);
@@ -101,8 +106,9 @@ 
 			'group_list' => $groups,
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		logAction('delete_group', array('group' => $row['group_name']), 'admin');
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			logAction('delete_group', array('group' => $row['group_name']), 'admin');
+	}
 	$smcFunc['db_free_result']($request);
 
 	call_integration_hook('integrate_delete_membergroups', array($groups));
@@ -187,12 +193,14 @@ 
 		)
 	);
 	$updates = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$updates[$row['additional_groups']][] = $row['id_member'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$updates[$row['additional_groups']][] = $row['id_member'];
+	}
 	$smcFunc['db_free_result']($request);
 
-	foreach ($updates as $additional_groups => $memberArray)
-		updateMemberData($memberArray, array('additional_groups' => implode(',', array_diff(explode(',', $additional_groups), $groups))));
+	foreach ($updates as $additional_groups => $memberArray) {
+			updateMemberData($memberArray, array('additional_groups' => implode(',', array_diff(explode(',', $additional_groups), $groups))));
+	}
 
 	// No boards can provide access to these membergroups anymore.
 	$request = $smcFunc['db_query']('', '
@@ -204,12 +212,13 @@ 
 		)
 	);
 	$updates = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$updates[$row['member_groups']][] = $row['id_board'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$updates[$row['member_groups']][] = $row['id_board'];
+	}
 	$smcFunc['db_free_result']($request);
 
-	foreach ($updates as $member_groups => $boardArray)
-		$smcFunc['db_query']('', '
+	foreach ($updates as $member_groups => $boardArray) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}boards
 			SET member_groups = {string:member_groups}
 			WHERE id_board IN ({array_int:board_lists})',
@@ -218,6 +227,7 @@ 
 				'member_groups' => implode(',', array_diff(explode(',', $member_groups), $groups)),
 			)
 		);
+	}
 
 	// Recalculate the post groups, as they likely changed.
 	updateStats('postgroups');
@@ -225,8 +235,9 @@ 
 	// Make a note of the fact that the cache may be wrong.
 	$settings_update = array('settings_updated' => time());
 	// Have we deleted the spider group?
-	if (isset($modSettings['spider_group']) && in_array($modSettings['spider_group'], $groups))
-		$settings_update['spider_group'] = 0;
+	if (isset($modSettings['spider_group']) && in_array($modSettings['spider_group'], $groups)) {
+			$settings_update['spider_group'] = 0;
+	}
 
 	updateSettings($settings_update);
 
@@ -250,22 +261,24 @@ 
 	global $smcFunc, $modSettings, $sourcedir;
 
 	// You're getting nowhere without this permission, unless of course you are the group's moderator.
-	if (!$permissionCheckDone)
-		isAllowedTo('manage_membergroups');
+	if (!$permissionCheckDone) {
+			isAllowedTo('manage_membergroups');
+	}
 
 	// Assume something will happen.
 	updateSettings(array('settings_updated' => time()));
 
 	// Cleaning the input.
-	if (!is_array($members))
-		$members = array((int) $members);
-	else
+	if (!is_array($members)) {
+			$members = array((int) $members);
+	} else
 	{
 		$members = array_unique($members);
 
 		// Cast the members to integer.
-		foreach ($members as $key => $value)
-			$members[$key] = (int) $value;
+		foreach ($members as $key => $value) {
+					$members[$key] = (int) $value;
+		}
 	}
 
 	// Before we get started, let's check we won't leave the admin group empty!
@@ -277,14 +290,15 @@ 
 		// Remove any admins if there are too many.
 		$non_changing_admins = array_diff(array_keys($admins), $members);
 
-		if (empty($non_changing_admins))
-			$members = array_diff($members, array_keys($admins));
+		if (empty($non_changing_admins)) {
+					$members = array_diff($members, array_keys($admins));
+		}
 	}
 
 	// Just in case.
-	if (empty($members))
-		return false;
-	elseif ($groups === null)
+	if (empty($members)) {
+			return false;
+	} elseif ($groups === null)
 	{
 		// Wanna remove all groups from these members? That's easy.
 		$smcFunc['db_query']('', '
@@ -306,20 +320,21 @@ 
 		updateStats('postgroups', $members);
 
 		// Log what just happened.
-		foreach ($members as $member)
-			logAction('removed_all_groups', array('member' => $member), 'admin');
+		foreach ($members as $member) {
+					logAction('removed_all_groups', array('member' => $member), 'admin');
+		}
 
 		return true;
-	}
-	elseif (!is_array($groups))
-		$groups = array((int) $groups);
-	else
+	} elseif (!is_array($groups)) {
+			$groups = array((int) $groups);
+	} else
 	{
 		$groups = array_unique($groups);
 
 		// Make sure all groups are integer.
-		foreach ($groups as $key => $value)
-			$groups[$key] = (int) $value;
+		foreach ($groups as $key => $value) {
+					$groups[$key] = (int) $value;
+		}
 	}
 
 	// Fetch a list of groups members cannot be assigned to explicitly, and the group names of the ones we want.
@@ -335,10 +350,11 @@ 
 	$group_names = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if ($row['min_posts'] != -1)
-			$implicitGroups[] = $row['id_group'];
-		else
-			$group_names[$row['id_group']] = $row['group_name'];
+		if ($row['min_posts'] != -1) {
+					$implicitGroups[] = $row['id_group'];
+		} else {
+					$group_names[$row['id_group']] = $row['group_name'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -357,8 +373,9 @@ 
 			)
 		);
 		$protected_groups = array(1);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$protected_groups[] = $row['id_group'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$protected_groups[] = $row['id_group'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// If you're not an admin yourself, you can't touch protected groups!
@@ -366,8 +383,9 @@ 
 	}
 
 	// Only continue if there are still groups and members left.
-	if (empty($groups) || empty($members))
-		return false;
+	if (empty($groups) || empty($members)) {
+			return false;
+	}
 
 	// First, reset those who have this as their primary group - this is the easy one.
 	$log_inserts = array();
@@ -381,8 +399,9 @@ 
 			'member_list' => $members,
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$log_inserts[] = array('group' => $group_names[$row['id_group']], 'member' => $row['id_member']);
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$log_inserts[] = array('group' => $group_names[$row['id_group']], 'member' => $row['id_member']);
+	}
 	$smcFunc['db_free_result']($request);
 
 	$smcFunc['db_query']('', '
@@ -414,16 +433,17 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// What log entries must we make for this one, eh?
-		foreach (explode(',', $row['additional_groups']) as $group)
-			if (in_array($group, $groups))
+		foreach (explode(',', $row['additional_groups']) as $group) {
+					if (in_array($group, $groups))
 				$log_inserts[] = array('group' => $group_names[$group], 'member' => $row['id_member']);
+		}
 
 		$updates[$row['additional_groups']][] = $row['id_member'];
 	}
 	$smcFunc['db_free_result']($request);
 
-	foreach ($updates as $additional_groups => $memberArray)
-		$smcFunc['db_query']('', '
+	foreach ($updates as $additional_groups => $memberArray) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}members
 			SET additional_groups = {string:additional_groups}
 			WHERE id_member IN ({array_int:member_list})',
@@ -432,6 +452,7 @@ 
 				'additional_groups' => implode(',', array_diff(explode(',', $additional_groups), $groups)),
 			)
 		);
+	}
 
 	// Their post groups may have changed now...
 	updateStats('postgroups', $members);
@@ -440,8 +461,9 @@ 
 	if (!empty($log_inserts) && !empty($modSettings['modlog_enabled']))
 	{
 		require_once($sourcedir . '/Logging.php');
-		foreach ($log_inserts as $extra)
-			logAction('removed_from_group', $extra, 'admin');
+		foreach ($log_inserts as $extra) {
+					logAction('removed_from_group', $extra, 'admin');
+		}
 	}
 
 	// Mission successful.
@@ -477,21 +499,23 @@ 
 	global $smcFunc, $sourcedir;
 
 	// Show your licence, but only if it hasn't been done yet.
-	if (!$permissionCheckDone)
-		isAllowedTo('manage_membergroups');
+	if (!$permissionCheckDone) {
+			isAllowedTo('manage_membergroups');
+	}
 
 	// Make sure we don't keep old stuff cached.
 	updateSettings(array('settings_updated' => time()));
 
-	if (!is_array($members))
-		$members = array((int) $members);
-	else
+	if (!is_array($members)) {
+			$members = array((int) $members);
+	} else
 	{
 		$members = array_unique($members);
 
 		// Make sure all members are integer.
-		foreach ($members as $key => $value)
-			$members[$key] = (int) $value;
+		foreach ($members as $key => $value) {
+					$members[$key] = (int) $value;
+		}
 	}
 	$group = (int) $group;
 
@@ -508,20 +532,23 @@ 
 	$group_names = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if ($row['min_posts'] != -1)
-			$implicitGroups[] = $row['id_group'];
-		else
-			$group_names[$row['id_group']] = $row['group_name'];
+		if ($row['min_posts'] != -1) {
+					$implicitGroups[] = $row['id_group'];
+		} else {
+					$group_names[$row['id_group']] = $row['group_name'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
 	// Sorry, you can't join an implicit group.
-	if (in_array($group, $implicitGroups) || empty($members))
-		return false;
+	if (in_array($group, $implicitGroups) || empty($members)) {
+			return false;
+	}
 
 	// Only admins can add admins...
-	if (!allowedTo('admin_forum') && $group == 1)
-		return false;
+	if (!allowedTo('admin_forum') && $group == 1) {
+			return false;
+	}
 	// ... and assign protected groups!
 	elseif (!allowedTo('admin_forum') && !$ignoreProtected)
 	{
@@ -539,13 +566,14 @@ 
 		$smcFunc['db_free_result']($request);
 
 		// Is it protected?
-		if ($is_protected == 1)
-			return false;
+		if ($is_protected == 1) {
+					return false;
+		}
 	}
 
 	// Do the actual updates.
-	if ($type == 'only_additional')
-		$smcFunc['db_query']('', '
+	if ($type == 'only_additional') {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}members
 			SET additional_groups = CASE WHEN additional_groups = {string:blank_string} THEN {string:id_group_string} ELSE CONCAT(additional_groups, {string:id_group_string_extend}) END
 			WHERE id_member IN ({array_int:member_list})
@@ -559,8 +587,8 @@ 
 				'blank_string' => '',
 			)
 		);
-	elseif ($type == 'only_primary' || $type == 'force_primary')
-		$smcFunc['db_query']('', '
+	} elseif ($type == 'only_primary' || $type == 'force_primary') {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}members
 			SET id_group = {int:id_group}
 			WHERE id_member IN ({array_int:member_list})' . ($type == 'force_primary' ? '' : '
@@ -572,8 +600,8 @@ 
 				'regular_group' => 0,
 			)
 		);
-	elseif ($type == 'auto')
-		$smcFunc['db_query']('', '
+	} elseif ($type == 'auto') {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}members
 			SET
 				id_group = CASE WHEN id_group = {int:regular_group} THEN {int:id_group} ELSE id_group END,
@@ -592,9 +620,11 @@ 
 				'id_group_string_extend' => ',' . $group,
 			)
 		);
+	}
 	// Ack!!?  What happened?
-	else
-		trigger_error('addMembersToGroup(): Unknown type \'' . $type . '\'', E_USER_WARNING);
+	else {
+			trigger_error('addMembersToGroup(): Unknown type \'' . $type . '\'', E_USER_WARNING);
+	}
 
 	call_integration_hook('integrate_add_members_to_group', array($members, $group, &$group_names));
 
@@ -603,8 +633,9 @@ 
 
 	// Log the data.
 	require_once($sourcedir . '/Logging.php');
-	foreach ($members as $member)
-		logAction('added_to_group', array('group' => $group_names[$group], 'member' => $member), 'admin');
+	foreach ($members as $member) {
+			logAction('added_to_group', array('group' => $group_names[$group], 'member' => $member), 'admin');
+	}
 
 	return true;
 }
@@ -632,8 +663,9 @@ 
 		)
 	);
 	$members = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$members[$row['id_member']] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$members[$row['id_member']] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+	}
 	$smcFunc['db_free_result']($request);
 
 	// If there are more than $limit members, add a 'more' link.
@@ -641,10 +673,10 @@ 
 	{
 		array_pop($members);
 		return true;
+	} else {
+			return false;
+	}
 	}
-	else
-		return false;
-}
 
 /**
  * Retrieve a list of (visible) membergroups used by the cache.
@@ -669,8 +701,9 @@ 
 		)
 	);
 	$groupCache = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$groupCache[] = '<a href="' . $scripturl . '?action=groups;sa=members;group=' . $row['id_group'] . '" ' . ($row['online_color'] ? 'style="color: ' . $row['online_color'] . '"' : '') . '>' . $row['group_name'] . '</a>';
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$groupCache[] = '<a href="' . $scripturl . '?action=groups;sa=members;group=' . $row['id_group'] . '" ' . ($row['online_color'] ? 'style="color: ' . $row['online_color'] . '"' : '') . '>' . $row['group_name'] . '</a>';
+	}
 	$smcFunc['db_free_result']($request);
 
 	return array(
@@ -716,8 +749,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// We only list the groups they can see.
-		if ($row['hidden'] && !$row['can_moderate'] && !allowedTo('manage_membergroups'))
-			continue;
+		if ($row['hidden'] && !$row['can_moderate'] && !allowedTo('manage_membergroups')) {
+					continue;
+		}
 
 		$row['icons'] = explode('#', $row['icons']);
 
@@ -752,12 +786,11 @@ 
 					'group_list' => $group_ids,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($query))
-				$groups[$row['id_group']]['num_members'] += $row['num_members'];
+			while ($row = $smcFunc['db_fetch_assoc']($query)) {
+							$groups[$row['id_group']]['num_members'] += $row['num_members'];
+			}
 			$smcFunc['db_free_result']($query);
-		}
-
-		else
+		} else
 		{
 			$query = $smcFunc['db_query']('', '
 				SELECT id_group, COUNT(*) AS num_members
@@ -768,8 +801,9 @@ 
 					'group_list' => $group_ids,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($query))
-				$groups[$row['id_group']]['num_members'] += $row['num_members'];
+			while ($row = $smcFunc['db_fetch_assoc']($query)) {
+							$groups[$row['id_group']]['num_members'] += $row['num_members'];
+			}
 			$smcFunc['db_free_result']($query);
 
 			// Only do additional groups if we can moderate...
@@ -788,8 +822,9 @@ 
 						'blank_string' => '',
 					)
 				);
-				while ($row = $smcFunc['db_fetch_assoc']($query))
-					$groups[$row['id_group']]['num_members'] += $row['num_members'];
+				while ($row = $smcFunc['db_fetch_assoc']($query)) {
+									$groups[$row['id_group']]['num_members'] += $row['num_members'];
+				}
 				$smcFunc['db_free_result']($query);
 			}
 		}
@@ -803,8 +838,9 @@ 
 				'group_list' => $group_ids,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($query))
-			$groups[$row['id_group']]['moderators'][] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+		while ($row = $smcFunc['db_fetch_assoc']($query)) {
+					$groups[$row['id_group']]['moderators'][] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+		}
 		$smcFunc['db_free_result']($query);
 	}
 
@@ -813,8 +849,9 @@ 
 	{
 		$sort_ascending = strpos($sort, 'DESC') === false;
 
-		foreach ($groups as $group)
-			$sort_array[] = $group['id_group'] != 3 ? (int) $group['num_members'] : -1;
+		foreach ($groups as $group) {
+					$sort_array[] = $group['id_group'] != 3 ? (int) $group['num_members'] : -1;
+		}
 
 		array_multisort($sort_array, $sort_ascending ? SORT_ASC : SORT_DESC, SORT_REGULAR, $groups);
 	}

Sources/Attachments.php

Braces +102 added lines, -75 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class Attachments
 {
@@ -70,16 +71,18 @@ 
 
 		$this->_sa = !empty($_REQUEST['sa']) ? $smcFunc['htmlspecialchars']($smcFunc['htmltrim']($_REQUEST['sa'])) : false;
 
-		if ($this->_canPostAttachment && $this->_sa && in_array($this->_sa, $this->_subActions))
-			$this->{$this->_sa}();
+		if ($this->_canPostAttachment && $this->_sa && in_array($this->_sa, $this->_subActions)) {
+					$this->{$this->_sa}();
+		}
 
 		// Just send a generic message.
-		else
-			$this->setResponse(array(
+		else {
+					$this->setResponse(array(
 				'text' => $this->_sa == 'add' ? 'attach_error_title' :   'attached_file_deleted_error',
 				'type' => 'error',
 				'data' => false,
 			));
+		}
 
 		// Back to the future, oh, to the browser!
 		$this->sendResponse();
@@ -95,12 +98,13 @@ 
 		$attachID = !empty($_REQUEST['attach']) && is_numeric($_REQUEST['attach']) ? (int) $_REQUEST['attach'] : 0;
 
 		// Need something to work with.
-		if (!$attachID || (!empty($_SESSION['already_attached']) && !isset($_SESSION['already_attached'][$attachID])))
-			return $this->setResponse(array(
+		if (!$attachID || (!empty($_SESSION['already_attached']) && !isset($_SESSION['already_attached'][$attachID]))) {
+					return $this->setResponse(array(
 				'text' => 'attached_file_deleted_error',
 				'type' => 'error',
 				'data' => false,
 			));
+		}
 
 		// Lets pass some params and see what happens :P
 		$affectedMessage = removeAttachments(array('id_attach' => $attachID), '', true, true);
@@ -119,19 +123,21 @@ 
 	public function add()
 	{
 		// You gotta be able to post attachments.
-		if (!$this->_canPostAttachment)
-			return $this->setResponse(array(
+		if (!$this->_canPostAttachment) {
+					return $this->setResponse(array(
 				'text' => 'attached_file_cannot',
 				'type' => 'error',
 				'data' => false,
 			));
+		}
 
 		// Process them at once!
 		$this->processAttachments();
 
 		// The attachments was created and moved the the right folder, time to update the DB.
-		if (!empty($_SESSION['temp_attachments']))
-			$this->createAtttach();
+		if (!empty($_SESSION['temp_attachments'])) {
+					$this->createAtttach();
+		}
 
 		// Set the response.
 		$this->setResponse();
@@ -144,8 +150,9 @@ 
 	{
 		global $context, $modSettings, $smcFunc, $user_info, $txt;
 
-		if (!isset($_FILES['attachment']['name']))
-			$_FILES['attachment']['tmp_name'] = array();
+		if (!isset($_FILES['attachment']['name'])) {
+					$_FILES['attachment']['tmp_name'] = array();
+		}
 
 		// If there are attachments, calculate the total size and how many.
 		$context['attachments']['total_size'] = 0;
@@ -155,25 +162,30 @@ 
 		if (isset($_REQUEST['msg']))
 		{
 			$context['attachments']['quantity'] = count($context['current_attachments']);
-			foreach ($context['current_attachments'] as $attachment)
-				$context['attachments']['total_size'] += $attachment['size'];
+			foreach ($context['current_attachments'] as $attachment) {
+							$context['attachments']['total_size'] += $attachment['size'];
+			}
 		}
 
 		// A bit of house keeping first.
-		if (!empty($_SESSION['temp_attachments']) && count($_SESSION['temp_attachments']) == 1)
-			unset($_SESSION['temp_attachments']);
+		if (!empty($_SESSION['temp_attachments']) && count($_SESSION['temp_attachments']) == 1) {
+					unset($_SESSION['temp_attachments']);
+		}
 
 		// Our infamous SESSION var, we are gonna have soo much fun with it!
-		if (!isset($_SESSION['temp_attachments']))
-			$_SESSION['temp_attachments'] = array();
+		if (!isset($_SESSION['temp_attachments'])) {
+					$_SESSION['temp_attachments'] = array();
+		}
 
 		// Make sure we're uploading to the right place.
-		if (!empty($modSettings['automanage_attachments']))
-			automanage_attachments_check_directory();
+		if (!empty($modSettings['automanage_attachments'])) {
+					automanage_attachments_check_directory();
+		}
 
 		// Is the attachments folder actually there?
-		if (!empty($context['dir_creation_error']))
-			$this->_generalErrors[] = $context['dir_creation_error'];
+		if (!empty($context['dir_creation_error'])) {
+					$this->_generalErrors[] = $context['dir_creation_error'];
+		}
 
 		// The current attach folder ha some issues...
 		elseif (!is_dir($this->_attchDir))
@@ -198,13 +210,12 @@ 
 			);
 			list ($context['attachments']['quantity'], $context['attachments']['total_size']) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
-		}
-
-		else
-			$context['attachments'] = array(
+		} else {
+					$context['attachments'] = array(
 				'quantity' => 0,
 				'total_size' => 0,
 			);
+		}
 
 		// Check for other general errors here.
 
@@ -212,9 +223,10 @@ 
 		if (!empty($this->_generalErrors))
 		{
 			// And delete the files 'cos they ain't going nowhere.
-			foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy)
-				if (file_exists($_FILES['attachment']['tmp_name'][$n]))
+			foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy) {
+							if (file_exists($_FILES['attachment']['tmp_name'][$n]))
 					unlink($_FILES['attachment']['tmp_name'][$n]);
+			}
 
 			$_FILES['attachment']['tmp_name'] = array();
 
@@ -225,26 +237,29 @@ 
 		// Loop through $_FILES['attachment'] array and move each file to the current attachments folder.
 		foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy)
 		{
-			if ($_FILES['attachment']['name'][$n] == '')
-				continue;
+			if ($_FILES['attachment']['name'][$n] == '') {
+							continue;
+			}
 
 			// First, let's first check for PHP upload errors.
 			$errors = array();
 			if (!empty($_FILES['attachment']['error'][$n]))
 			{
-				if ($_FILES['attachment']['error'][$n] == 2)
-					$errors[] = array('file_too_big', array($modSettings['attachmentSizeLimit']));
-
-				else
-					log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_' . $_FILES['attachment']['error'][$n]]);
+				if ($_FILES['attachment']['error'][$n] == 2) {
+									$errors[] = array('file_too_big', array($modSettings['attachmentSizeLimit']));
+				} else {
+									log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_' . $_FILES['attachment']['error'][$n]]);
+				}
 
 				// Log this one, because...
-				if ($_FILES['attachment']['error'][$n] == 6)
-					log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_6'], 'critical');
+				if ($_FILES['attachment']['error'][$n] == 6) {
+									log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_6'], 'critical');
+				}
 
 				// Weird, no errors were cached, still fill out a generic one.
-				if (empty($errors))
-					$errors[] = 'attach_php_error';
+				if (empty($errors)) {
+									$errors[] = 'attach_php_error';
+				}
 			}
 
 			// Try to move and rename the file before doing any more checks on it.
@@ -256,8 +271,9 @@ 
 			{
 				// The reported MIME type of the attachment might not be reliable.
 				// Fortunately, PHP 5.3+ lets us easily verify the real MIME type.
-				if (function_exists('mime_content_type'))
-					$_FILES['attachment']['type'][$n] = mime_content_type($_FILES['attachment']['tmp_name'][$n]);
+				if (function_exists('mime_content_type')) {
+									$_FILES['attachment']['type'][$n] = mime_content_type($_FILES['attachment']['tmp_name'][$n]);
+				}
 
 				$_SESSION['temp_attachments'][$attachID] = array(
 					'name' => $smcFunc['htmlspecialchars'](basename($_FILES['attachment']['name'][$n])),
@@ -269,16 +285,18 @@ 
 				);
 
 				// Move the file to the attachments folder with a temp name for now.
-				if (@move_uploaded_file($_FILES['attachment']['tmp_name'][$n], $destName))
-					smf_chmod($destName, 0644);
+				if (@move_uploaded_file($_FILES['attachment']['tmp_name'][$n], $destName)) {
+									smf_chmod($destName, 0644);
+				}
 
 				// This is madness!!
 				else
 				{
 					// File couldn't be moved.
 					$_SESSION['temp_attachments'][$attachID]['errors'][] = 'attach_timeout';
-					if (file_exists($_FILES['attachment']['tmp_name'][$n]))
-						unlink($_FILES['attachment']['tmp_name'][$n]);
+					if (file_exists($_FILES['attachment']['tmp_name'][$n])) {
+											unlink($_FILES['attachment']['tmp_name'][$n]);
+					}
 				}
 			}
 
@@ -291,13 +309,15 @@ 
 					'errors' => $errors,
 				);
 
-				if (file_exists($_FILES['attachment']['tmp_name'][$n]))
-					unlink($_FILES['attachment']['tmp_name'][$n]);
+				if (file_exists($_FILES['attachment']['tmp_name'][$n])) {
+									unlink($_FILES['attachment']['tmp_name'][$n]);
+				}
 			}
 
 			// If there's no errors to this point. We still do need to apply some additional checks before we are finished.
-			if (empty($_SESSION['temp_attachments'][$attachID]['errors']))
-				attachmentChecks($attachID);
+			if (empty($_SESSION['temp_attachments'][$attachID]['errors'])) {
+							attachmentChecks($attachID);
+			}
 		}
 
 		// Mod authors, finally a hook to hang an alternate attachment upload system upon
@@ -344,14 +364,15 @@ 
 
 					$_SESSION['already_attached'][$attachmentOptions['attachID']] = $attachmentOptions['attachID'];
 
-					if (!empty($attachmentOptions['thumb']))
-						$_SESSION['already_attached'][$attachmentOptions['thumb']] = $attachmentOptions['thumb'];
+					if (!empty($attachmentOptions['thumb'])) {
+											$_SESSION['already_attached'][$attachmentOptions['thumb']] = $attachmentOptions['thumb'];
+					}
 
-					if ($this->_msg)
-						assignAttachments($_SESSION['already_attached'], $this->_msg);
+					if ($this->_msg) {
+											assignAttachments($_SESSION['already_attached'], $this->_msg);
+					}
 				}
-			}
-			else
+			} else
 			{
 				// Sort out the errors for display and delete any associated files.
 				$log_these = array('attachments_no_create', 'attachments_no_write', 'attach_timeout', 'ran_out_of_space', 'cant_access_upload_path', 'attach_0_byte_file');
@@ -363,14 +384,16 @@ 
 					if (!is_array($error))
 					{
 						$attachmentOptions['errors'][] = $txt[$error];
-						if (in_array($error, $log_these))
-							log_error($attachment['name'] . ': ' . $txt[$error], 'critical');
+						if (in_array($error, $log_these)) {
+													log_error($attachment['name'] . ': ' . $txt[$error], 'critical');
+						}
+					} else {
+											$attachmentOptions['errors'][] = vsprintf($txt[$error[0]], $error[1]);
 					}
-					else
-						$attachmentOptions['errors'][] = vsprintf($txt[$error[0]], $error[1]);
 				}
-				if (file_exists($attachment['tmp_name']))
-					unlink($attachment['tmp_name']);
+				if (file_exists($attachment['tmp_name'])) {
+									unlink($attachment['tmp_name']);
+				}
 			}
 
 			// Regardless of errors, pass the results.
@@ -378,8 +401,9 @@ 
 		}
 
 		// Temp save this on the db.
-		if (!empty($_SESSION['already_attached']))
-			$this->_attachSuccess = $_SESSION['already_attached'];
+		if (!empty($_SESSION['already_attached'])) {
+					$this->_attachSuccess = $_SESSION['already_attached'];
+		}
 
 		unset($_SESSION['temp_attachments']);
 	}
@@ -399,14 +423,16 @@ 
 		if ($this->_sa == 'add')
 		{
 			// Is there any generic errors? made some sense out of them!
-			if ($this->_generalErrors)
-				foreach ($this->_generalErrors as $k => $v)
+			if ($this->_generalErrors) {
+							foreach ($this->_generalErrors as $k => $v)
 					$this->_generalErrors[$k] = (is_array($v) ? vsprintf($txt[$v[0]], $v[1]) : $txt[$v]);
+			}
 
 			// Gotta urlencode the filename.
-			if ($this->_attachResults)
-				foreach ($this->_attachResults as $k => $v)
+			if ($this->_attachResults) {
+							foreach ($this->_attachResults as $k => $v)
 					$this->_attachResults[$k]['name'] =  urlencode($this->_attachResults[$k]['name']);
+			}
 
 			$this->_response = array(
 				'files' => $this->_attachResults ? $this->_attachResults : false,
@@ -415,9 +441,10 @@ 
 		}
 
 		// Rest of us mere mortals gets no special treatment...
-		elseif (!empty($data))
-			if (!empty($data['text']) && !empty($txt[$data['text']]))
+		elseif (!empty($data)) {
+					if (!empty($data['text']) && !empty($txt[$data['text']]))
 				$this->_response['text'] = $txt[$data['text']];
+		}
 	}
 
 	protected function sendResponse()
@@ -426,11 +453,11 @@ 
 
 		ob_end_clean();
 
-		if (!empty($modSettings['CompressedOutput']))
-			@ob_start('ob_gzhandler');
-
-		else
-			ob_start();
+		if (!empty($modSettings['CompressedOutput'])) {
+					@ob_start('ob_gzhandler');
+		} else {
+					ob_start();
+		}
 
 		// Set the header.
 		header('Content-Type: application/json; charset='. $context['character_set'] .'');