albertlast / SMF2.1

Sources/Subs-Categories.php

Braces +44 added lines, -29 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Edit the position and properties of a category.
@@ -42,8 +43,9 @@ 
 		$cat_order = array();
 
 		// Setting 'move_after' to '0' moves the category to the top.
-		if ($catOptions['move_after'] == 0)
-			$cats[] = $category_id;
+		if ($catOptions['move_after'] == 0) {
+					$cats[] = $category_id;
+		}
 
 		// Grab the categories sorted by cat_order.
 		$request = $smcFunc['db_query']('', '
@@ -55,17 +57,19 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if ($row['id_cat'] != $category_id)
-				$cats[] = $row['id_cat'];
-			if ($row['id_cat'] == $catOptions['move_after'])
-				$cats[] = $category_id;
+			if ($row['id_cat'] != $category_id) {
+							$cats[] = $row['id_cat'];
+			}
+			if ($row['id_cat'] == $catOptions['move_after']) {
+							$cats[] = $category_id;
+			}
 			$cat_order[$row['id_cat']] = $row['cat_order'];
 		}
 		$smcFunc['db_free_result']($request);
 
 		// Set the new order for the categories.
-		foreach ($cats as $index => $cat)
-			if ($index != $cat_order[$cat])
+		foreach ($cats as $index => $cat) {
+					if ($index != $cat_order[$cat])
 				$smcFunc['db_query']('', '
 					UPDATE {db_prefix}categories
 					SET cat_order = {int:new_order}
@@ -75,6 +79,7 @@ 
 						'current_category' => $cat,
 					)
 				);
+		}
 
 		// If the category order changed, so did the board order.
 		require_once($sourcedir . '/Subs-Boards.php');
@@ -117,8 +122,9 @@ 
 			))
 		);
 
-		if (empty($catOptions['dont_log']))
-			logAction('edit_cat', array('catname' => isset($catOptions['cat_name']) ? $catOptions['cat_name'] : $category_id), 'admin');
+		if (empty($catOptions['dont_log'])) {
+					logAction('edit_cat', array('catname' => isset($catOptions['cat_name']) ? $catOptions['cat_name'] : $category_id), 'admin');
+		}
 	}
 }
 
@@ -135,16 +141,20 @@ 
 	global $smcFunc;
 
 	// Check required values.
-	if (!isset($catOptions['cat_name']) || trim($catOptions['cat_name']) == '')
-		trigger_error('createCategory(): A category name is required', E_USER_ERROR);
+	if (!isset($catOptions['cat_name']) || trim($catOptions['cat_name']) == '') {
+			trigger_error('createCategory(): A category name is required', E_USER_ERROR);
+	}
 
 	// Set default values.
-	if (!isset($catOptions['cat_desc']))
-		$catOptions['cat_desc'] = '';
-	if (!isset($catOptions['move_after']))
-		$catOptions['move_after'] = 0;
-	if (!isset($catOptions['is_collapsible']))
-		$catOptions['is_collapsible'] = true;
+	if (!isset($catOptions['cat_desc'])) {
+			$catOptions['cat_desc'] = '';
+	}
+	if (!isset($catOptions['move_after'])) {
+			$catOptions['move_after'] = 0;
+	}
+	if (!isset($catOptions['is_collapsible'])) {
+			$catOptions['is_collapsible'] = true;
+	}
 	// Don't log an edit right after.
 	$catOptions['dont_log'] = true;
 
@@ -210,21 +220,24 @@ 
 			)
 		);
 		$boards_inside = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$boards_inside[] = $row['id_board'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$boards_inside[] = $row['id_board'];
+		}
 		$smcFunc['db_free_result']($request);
 
-		if (!empty($boards_inside))
-			deleteBoards($boards_inside, null);
+		if (!empty($boards_inside)) {
+					deleteBoards($boards_inside, null);
+		}
 	}
 
 	// Make sure the safe category is really safe.
-	elseif (in_array($moveBoardsTo, $categories))
-		trigger_error('deleteCategories(): You cannot move the boards to a category that\'s being deleted', E_USER_ERROR);
+	elseif (in_array($moveBoardsTo, $categories)) {
+			trigger_error('deleteCategories(): You cannot move the boards to a category that\'s being deleted', E_USER_ERROR);
+	}
 
 	// Move the boards inside the categories to a safe category.
-	else
-		$smcFunc['db_query']('', '
+	else {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}boards
 			SET id_cat = {int:new_parent_cat}
 			WHERE id_cat IN ({array_int:category_list})',
@@ -233,6 +246,7 @@ 
 				'new_parent_cat' => $moveBoardsTo,
 			)
 		);
+	}
 
 	// Do the deletion of the category itself
 	$smcFunc['db_query']('', '
@@ -244,8 +258,9 @@ 
 	);
 
 	// Log what we've done.
-	foreach ($categories as $category)
-		logAction('delete_cat', array('catname' => $cat_tree[$category]['node']['name']), 'admin');
+	foreach ($categories as $category) {
+			logAction('delete_cat', array('catname' => $cat_tree[$category]['node']['name']), 'admin');
+	}
 
 	// Get all boards back into the right order.
 	reorderBoards();

Sources/Class-Graphics.php

Braces +90 added lines, -62 removed lines

@@ -19,8 +19,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Class gif_lzw_compression
@@ -52,13 +53,15 @@ 
 
 		$this->LZWCommand($data, true);
 
-		while (($iIndex = $this->LZWCommand($data, false)) >= 0)
-			$ret .= chr($iIndex);
+		while (($iIndex = $this->LZWCommand($data, false)) >= 0) {
+					$ret .= chr($iIndex);
+		}
 
 		$datLen = $stLen - strlen($data);
 
-		if ($iIndex != -2)
-			return false;
+		if ($iIndex != -2) {
+					return false;
+		}
 
 		return $ret;
 	}
@@ -140,8 +143,9 @@ 
 				return $this->FirstCode;
 			}
 
-			if ($Code == $this->EndCode)
-				return -2;
+			if ($Code == $this->EndCode) {
+							return -2;
+			}
 
 			$InCode = $Code;
 			if ($Code >= $this->MaxCode)
@@ -156,8 +160,10 @@ 
 				$this->Stack[$this->sp] = $this->Vals[$Code];
 				$this->sp++;
 
-				if ($Code == $this->Next[$Code]) // Circular table entry, big GIF Error!
+				if ($Code == $this->Next[$Code]) {
+					// Circular table entry, big GIF Error!
 					return -1;
+				}
 
 				$Code = $this->Next[$Code];
 			}
@@ -207,8 +213,9 @@ 
 			if ($this->Done)
 			{
 				// Ran off the end of my bits...
-				if ($this->CurBit >= $this->LastBit)
-					return 0;
+				if ($this->CurBit >= $this->LastBit) {
+									return 0;
+				}
 
 				return -1;
 			}
@@ -221,13 +228,14 @@ 
 
 			if ($count)
 			{
-				for ($i = 0; $i < $count; $i++)
-					$this->Buf[2 + $i] = ord($data{$i});
+				for ($i = 0; $i < $count; $i++) {
+									$this->Buf[2 + $i] = ord($data{$i});
+				}
 
 				$data = substr($data, $count);
+			} else {
+							$this->Done = 1;
 			}
-			else
-				$this->Done = 1;
 
 			$this->LastByte = 2 + $count;
 			$this->CurBit = ($this->CurBit - $this->LastBit) + 16;
@@ -235,8 +243,9 @@ 
 		}
 
 		$iRet = 0;
-		for ($i = $this->CurBit, $j = 0; $j < $this->CodeSize; $i++, $j++)
-			$iRet |= (($this->Buf[intval($i / 8)] & (1 << ($i % 8))) != 0) << $j;
+		for ($i = $this->CurBit, $j = 0; $j < $this->CodeSize; $i++, $j++) {
+					$iRet |= (($this->Buf[intval($i / 8)] & (1 << ($i % 8))) != 0) << $j;
+		}
 
 		$this->CurBit += $this->CodeSize;
 		return $iRet;
@@ -261,8 +270,9 @@ 
 		for ($i = 0; $i < $num; $i++)
 		{
 			$rgb = substr($lpData, $i * 3, 3);
-			if (strlen($rgb) < 3)
-				return false;
+			if (strlen($rgb) < 3) {
+							return false;
+			}
 
 			$this->m_arColors[] = (ord($rgb[2]) << 16) + (ord($rgb[1]) << 8) + ord($rgb[0]);
 			$this->m_nColors++;
@@ -329,13 +339,15 @@ 
 		$hdrLen = 0;
 
 		$this->m_lpVer = substr($lpData, 0, 6);
-		if (($this->m_lpVer != 'GIF87a') && ($this->m_lpVer != 'GIF89a'))
-			return false;
+		if (($this->m_lpVer != 'GIF87a') && ($this->m_lpVer != 'GIF89a')) {
+					return false;
+		}
 
 		list ($this->m_nWidth, $this->m_nHeight) = array_values(unpack('v2', substr($lpData, 6, 4)));
 
-		if (!$this->m_nWidth || !$this->m_nHeight)
-			return false;
+		if (!$this->m_nWidth || !$this->m_nHeight) {
+					return false;
+		}
 
 		$b = ord(substr($lpData, 10, 1));
 		$this->m_bGlobalClr  = ($b & 0x80) ? true : false;
@@ -349,8 +361,9 @@ 
 		if ($this->m_bGlobalClr)
 		{
 			$this->m_colorTable = new gif_color_table();
-			if (!$this->m_colorTable->load(substr($lpData, $hdrLen), $this->m_nTableSize))
-				return false;
+			if (!$this->m_colorTable->load(substr($lpData, $hdrLen), $this->m_nTableSize)) {
+							return false;
+			}
 
 			$hdrLen += 3 * $this->m_nTableSize;
 		}
@@ -377,8 +390,9 @@ 
 		// Get the width/height/etc. from the header.
 		list ($this->m_nLeft, $this->m_nTop, $this->m_nWidth, $this->m_nHeight) = array_values(unpack('v4', substr($lpData, 0, 8)));
 
-		if (!$this->m_nWidth || !$this->m_nHeight)
-			return false;
+		if (!$this->m_nWidth || !$this->m_nHeight) {
+					return false;
+		}
 
 		$b = ord($lpData[8]);
 		$this->m_bLocalClr  = ($b & 0x80) ? true : false;
@@ -390,8 +404,9 @@ 
 		if ($this->m_bLocalClr)
 		{
 			$this->m_colorTable = new gif_color_table();
-			if (!$this->m_colorTable->load(substr($lpData, $hdrLen), $this->m_nTableSize))
-				return false;
+			if (!$this->m_colorTable->load(substr($lpData, $hdrLen), $this->m_nTableSize)) {
+							return false;
+			}
 
 			$hdrLen += 3 * $this->m_nTableSize;
 		}
@@ -427,8 +442,9 @@ 
 			// Extension...
 				case 0x21:
 					$len = 0;
-					if (!$this->skipExt($data, $len))
-						return false;
+					if (!$this->skipExt($data, $len)) {
+											return false;
+					}
 
 					$datLen += $len;
 					break;
@@ -437,21 +453,24 @@ 
 				case 0x2C:
 					// Load the header and color table.
 					$len = 0;
-					if (!$this->m_gih->load($data, $len))
-						return false;
+					if (!$this->m_gih->load($data, $len)) {
+											return false;
+					}
 
 					$data = substr($data, $len);
 					$datLen += $len;
 
 					// Decompress the data, and ride on home ;).
 					$len = 0;
-					if (!($this->m_data = $this->m_lzw->decompress($data, $len)))
-						return false;
+					if (!($this->m_data = $this->m_lzw->decompress($data, $len))) {
+											return false;
+					}
 
 					$datLen += $len;
 
-					if ($this->m_gih->m_bInterlace)
-						$this->deInterlace();
+					if ($this->m_gih->m_bInterlace) {
+											$this->deInterlace();
+					}
 
 					return true;
 
@@ -571,17 +590,20 @@ 
 
 	public function loadFile($filename, $iIndex)
 	{
-		if ($iIndex < 0)
-			return false;
+		if ($iIndex < 0) {
+					return false;
+		}
 
 		$this->data = @file_get_contents($filename);
-		if ($this->data === false)
-			return false;
+		if ($this->data === false) {
+					return false;
+		}
 
 		// Tell the header to load up....
 		$len = 0;
-		if (!$this->header->load($this->data, $len))
-			return false;
+		if (!$this->header->load($this->data, $len)) {
+					return false;
+		}
 
 		$this->data = substr($this->data, $len);
 
@@ -589,8 +611,9 @@ 
 		for ($j = 0; $j <= $iIndex; $j++)
 		{
 			$imgLen = 0;
-			if (!$this->image->load($this->data, $imgLen))
-				return false;
+			if (!$this->image->load($this->data, $imgLen)) {
+							return false;
+			}
 
 			$this->data = substr($this->data, $imgLen);
 		}
@@ -601,8 +624,9 @@ 
 
 	public function get_png_data($background_color)
 	{
-		if (!$this->loaded)
-			return false;
+		if (!$this->loaded) {
+					return false;
+		}
 
 		// Prepare the color table.
 		if ($this->image->m_gih->m_bLocalClr)
@@ -610,25 +634,26 @@ 
 			$colors = $this->image->m_gih->m_nTableSize;
 			$pal = $this->image->m_gih->m_colorTable->toString();
 
-			if ($background_color != -1)
-				$background_color = $this->image->m_gih->m_colorTable->colorIndex($background_color);
-		}
-		elseif ($this->header->m_bGlobalClr)
+			if ($background_color != -1) {
+							$background_color = $this->image->m_gih->m_colorTable->colorIndex($background_color);
+			}
+		} elseif ($this->header->m_bGlobalClr)
 		{
 			$colors = $this->header->m_nTableSize;
 			$pal = $this->header->m_colorTable->toString();
 
-			if ($background_color != -1)
-				$background_color = $this->header->m_colorTable->colorIndex($background_color);
-		}
-		else
+			if ($background_color != -1) {
+							$background_color = $this->header->m_colorTable->colorIndex($background_color);
+			}
+		} else
 		{
 			$colors = 0;
 			$background_color = -1;
 		}
 
-		if ($background_color == -1)
-			$background_color = $this->header->m_nBgColor;
+		if ($background_color == -1) {
+					$background_color = $this->header->m_nBgColor;
+		}
 
 		$data = &$this->image->m_data;
 		$header = &$this->image->m_gih;
@@ -644,11 +669,13 @@ 
 			for ($x = 0; $x < $this->header->m_nWidth; $x++, $i++)
 			{
 				// Is this in the proper range?  If so, get the specific pixel data...
-				if ($x >= $header->m_nLeft && $y >= $header->m_nTop && $x < ($header->m_nLeft + $header->m_nWidth) && $y < ($header->m_nTop + $header->m_nHeight))
-					$bmp .= $data{$i};
+				if ($x >= $header->m_nLeft && $y >= $header->m_nTop && $x < ($header->m_nLeft + $header->m_nWidth) && $y < ($header->m_nTop + $header->m_nHeight)) {
+									$bmp .= $data{$i};
+				}
 				// Otherwise, this is background...
-				else
-					$bmp .= chr($background_color);
+				else {
+									$bmp .= chr($background_color);
+				}
 			}
 		}
 
@@ -677,8 +704,9 @@ 
 			$tmp = 'tRNS';
 
 			// Stick each color on - full transparency or none.
-			for ($i = 0; $i < $colors; $i++)
-				$tmp .= $i == $this->image->m_nTrans ? "\x00" : "\xFF";
+			for ($i = 0; $i < $colors; $i++) {
+							$tmp .= $i == $this->image->m_nTrans ? "\x00" : "\xFF";
+			}
 
 			$out .= $tmp . pack('N', smf_crc32($tmp));
 		}

Sources/Topic.php

Braces +31 added lines, -21 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Locks a topic... either by way of a moderator or the topic starter.
@@ -32,8 +33,9 @@ 
 	global $topic, $user_info, $sourcedir, $board, $smcFunc;
 
 	// Just quit if there's no topic to lock.
-	if (empty($topic))
-		fatal_lang_error('not_a_topic', false);
+	if (empty($topic)) {
+			fatal_lang_error('not_a_topic', false);
+	}
 
 	checkSession('get');
 
@@ -55,23 +57,28 @@ 
 
 	// Can you lock topics here, mister?
 	$user_lock = !allowedTo('lock_any');
-	if ($user_lock && $starter == $user_info['id'])
-		isAllowedTo('lock_own');
-	else
-		isAllowedTo('lock_any');
+	if ($user_lock && $starter == $user_info['id']) {
+			isAllowedTo('lock_own');
+	} else {
+			isAllowedTo('lock_any');
+	}
 
 	// Locking with high privileges.
-	if ($locked == '0' && !$user_lock)
-		$locked = '1';
+	if ($locked == '0' && !$user_lock) {
+			$locked = '1';
+	}
 	// Locking with low privileges.
-	elseif ($locked == '0')
-		$locked = '2';
+	elseif ($locked == '0') {
+			$locked = '2';
+	}
 	// Unlocking - make sure you don't unlock what you can't.
-	elseif ($locked == '2' || ($locked == '1' && !$user_lock))
-		$locked = '0';
+	elseif ($locked == '2' || ($locked == '1' && !$user_lock)) {
+			$locked = '0';
+	}
 	// You cannot unlock this!
-	else
-		fatal_lang_error('locked_by_admin', 'user');
+	else {
+			fatal_lang_error('locked_by_admin', 'user');
+	}
 
 	// Actually lock the topic in the database with the new value.
 	$smcFunc['db_query']('', '
@@ -85,8 +92,9 @@ 
 	);
 
 	// If they are allowed a "moderator" permission, log it in the moderator log.
-	if (!$user_lock)
-		logAction($locked ? 'lock' : 'unlock', array('topic' => $topic, 'board' => $board));
+	if (!$user_lock) {
+			logAction($locked ? 'lock' : 'unlock', array('topic' => $topic, 'board' => $board));
+	}
 	// Notify people that this topic has been locked?
 	sendNotifications($topic, empty($locked) ? 'unlock' : 'lock');
 
@@ -112,8 +120,9 @@ 
 	isAllowedTo('make_sticky');
 
 	// You can't sticky a board or something!
-	if (empty($topic))
-		fatal_lang_error('not_a_topic', false);
+	if (empty($topic)) {
+			fatal_lang_error('not_a_topic', false);
+	}
 
 	checkSession('get');
 
@@ -147,8 +156,9 @@ 
 	// Log this sticky action - always a moderator thing.
 	logAction(empty($is_sticky) ? 'sticky' : 'unsticky', array('topic' => $topic, 'board' => $board));
 	// Notify people that this topic has been stickied?
-	if (empty($is_sticky))
-		sendNotifications($topic, 'sticky');
+	if (empty($is_sticky)) {
+			sendNotifications($topic, 'sticky');
+	}
 
 	// Take them back to the now stickied topic.
 	redirectexit('topic=' . $topic . '.' . $_REQUEST['start'] . ';moderate');

Sources/PackageGet.php

Braces +197 added lines, -154 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Browse the list of package servers, add servers...
@@ -43,13 +44,15 @@ 
 	);
 
 	// Now let's decide where we are taking this...
-	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']]))
-		$context['sub_action'] = $_REQUEST['sa'];
+	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']])) {
+			$context['sub_action'] = $_REQUEST['sa'];
+	}
 	// We need to support possible old javascript links...
-	elseif (isset($_GET['pgdownload']))
-		$context['sub_action'] = 'download';
-	else
-		$context['sub_action'] = 'servers';
+	elseif (isset($_GET['pgdownload'])) {
+			$context['sub_action'] = 'download';
+	} else {
+			$context['sub_action'] = 'servers';
+	}
 
 	// We need to force the "Download" tab as selected.
 	$context['menu_data_' . $context['admin_menu_id']]['current_subsection'] = 'packageget';
@@ -141,17 +144,19 @@ 
 			{
 				require_once($sourcedir . '/Class-Package.php');
 				$ftp = new ftp_connection(null);
+			} elseif ($ftp->error !== false && !isset($ftp_error)) {
+							$ftp_error = $ftp->last_message === null ? '' : $ftp->last_message;
 			}
-			elseif ($ftp->error !== false && !isset($ftp_error))
-				$ftp_error = $ftp->last_message === null ? '' : $ftp->last_message;
 
 			list ($username, $detect_path, $found_path) = $ftp->detect_path($packagesdir);
 
-			if ($found_path || !isset($_POST['ftp_path']))
-				$_POST['ftp_path'] = $detect_path;
+			if ($found_path || !isset($_POST['ftp_path'])) {
+							$_POST['ftp_path'] = $detect_path;
+			}
 
-			if (!isset($_POST['ftp_username']))
-				$_POST['ftp_username'] = $username;
+			if (!isset($_POST['ftp_username'])) {
+							$_POST['ftp_username'] = $username;
+			}
 
 			$context['package_ftp'] = array(
 				'server' => isset($_POST['ftp_server']) ? $_POST['ftp_server'] : (isset($modSettings['package_server']) ? $modSettings['package_server'] : 'localhost'),
@@ -160,8 +165,7 @@ 
 				'path' => $_POST['ftp_path'],
 				'error' => empty($ftp_error) ? null : $ftp_error,
 			);
-		}
-		else
+		} else
 		{
 			$context['package_download_broken'] = false;
 
@@ -203,8 +207,9 @@ 
 
 	if (isset($_GET['server']))
 	{
-		if ($_GET['server'] == '')
-			redirectexit('action=admin;area=packages;get');
+		if ($_GET['server'] == '') {
+					redirectexit('action=admin;area=packages;get');
+		}
 
 		$server = (int) $_GET['server'];
 
@@ -222,17 +227,18 @@ 
 		$smcFunc['db_free_result']($request);
 
 		// If the server does not exist, dump out.
-		if (empty($url))
-			fatal_lang_error('couldnt_connect', false);
+		if (empty($url)) {
+					fatal_lang_error('couldnt_connect', false);
+		}
 
 		// If there is a relative link, append to the stored server url.
-		if (isset($_GET['relative']))
-			$url = $url . (substr($url, -1) == '/' ? '' : '/') . $_GET['relative'];
+		if (isset($_GET['relative'])) {
+					$url = $url . (substr($url, -1) == '/' ? '' : '/') . $_GET['relative'];
+		}
 
 		// Clear any "absolute" URL.  Since "server" is present, "absolute" is garbage.
 		unset($_GET['absolute']);
-	}
-	elseif (isset($_GET['absolute']) && $_GET['absolute'] != '')
+	} elseif (isset($_GET['absolute']) && $_GET['absolute'] != '')
 	{
 		// Initialize the requried variables.
 		$server = '';
@@ -256,16 +262,19 @@ 
 		}
 	}
 	// Minimum required parameter did not exist so dump out.
-	else
-		fatal_lang_error('couldnt_connect', false);
+	else {
+			fatal_lang_error('couldnt_connect', false);
+	}
 
 	// Attempt to connect.  If unsuccessful... try the URL.
-	if (!isset($_GET['package']) || file_exists($_GET['package']))
-		$_GET['package'] = $url . '/packages.xml?language=' . $context['user']['language'];
+	if (!isset($_GET['package']) || file_exists($_GET['package'])) {
+			$_GET['package'] = $url . '/packages.xml?language=' . $context['user']['language'];
+	}
 
 	// Check to be sure the packages.xml file actually exists where it is should be... or dump out.
-	if ((isset($_GET['absolute']) || isset($_GET['relative'])) && !url_exists($_GET['package']))
-		fatal_lang_error('packageget_unable', false, array($url . '/index.php'));
+	if ((isset($_GET['absolute']) || isset($_GET['relative'])) && !url_exists($_GET['package'])) {
+			fatal_lang_error('packageget_unable', false, array($url . '/index.php'));
+	}
 
 	// Might take some time.
 	@set_time_limit(600);
@@ -275,8 +284,9 @@ 
 	$listing = new xmlArray(fetch_web_data($_GET['package']), true);
 
 	// Errm.... empty file?  Try the URL....
-	if (!$listing->exists('package-list'))
-		fatal_lang_error('packageget_unable', false, array($url . '/index.php'));
+	if (!$listing->exists('package-list')) {
+			fatal_lang_error('packageget_unable', false, array($url . '/index.php'));
+	}
 
 	// List out the packages...
 	$context['package_list'] = array();
@@ -284,8 +294,9 @@ 
 	$listing = $listing->path('package-list[0]');
 
 	// Use the package list's name if it exists.
-	if ($listing->exists('list-title'))
-		$name = $smcFunc['htmlspecialchars']($listing->fetch('list-title'));
+	if ($listing->exists('list-title')) {
+			$name = $smcFunc['htmlspecialchars']($listing->fetch('list-title'));
+	}
 
 	// Pick the correct template.
 	$context['sub_template'] = 'package_list';
@@ -300,28 +311,32 @@ 
 
 	$installed_mods = array();
 	// Look through the list of installed mods...
-	foreach ($instmods as $installed_mod)
-		$installed_mods[$installed_mod['package_id']] = $installed_mod['version'];
+	foreach ($instmods as $installed_mod) {
+			$installed_mods[$installed_mod['package_id']] = $installed_mod['version'];
+	}
 
 	// Get default author and email if they exist.
 	if ($listing->exists('default-author'))
 	{
 		$default_author = $smcFunc['htmlspecialchars']($listing->fetch('default-author'));
-		if ($listing->exists('default-author/@email') && filter_var($listing->fetch('default-author/@email'), FILTER_VALIDATE_EMAIL))
-			$default_email = $smcFunc['htmlspecialchars']($listing->fetch('default-author/@email'));
+		if ($listing->exists('default-author/@email') && filter_var($listing->fetch('default-author/@email'), FILTER_VALIDATE_EMAIL)) {
+					$default_email = $smcFunc['htmlspecialchars']($listing->fetch('default-author/@email'));
+		}
 	}
 
 	// Get default web site if it exists.
 	if ($listing->exists('default-website'))
 	{
 		$default_website = $smcFunc['htmlspecialchars']($listing->fetch('default-website'));
-		if ($listing->exists('default-website/@title'))
-			$default_title = $smcFunc['htmlspecialchars']($listing->fetch('default-website/@title'));
+		if ($listing->exists('default-website/@title')) {
+					$default_title = $smcFunc['htmlspecialchars']($listing->fetch('default-website/@title'));
+		}
 	}
 
 	$the_version = strtr($forum_version, array('SMF ' => ''));
-	if (!empty($_SESSION['version_emulate']))
-		$the_version = $_SESSION['version_emulate'];
+	if (!empty($_SESSION['version_emulate'])) {
+			$the_version = $_SESSION['version_emulate'];
+	}
 
 	$packageNum = 0;
 	$packageSection = 0;
@@ -342,11 +357,13 @@ 
 				'type' => $thisPackage->name(),
 			);
 
-			if (in_array($package['type'], array('title', 'text')))
-				$context['package_list'][$packageSection][$package['type']] = $smcFunc['htmlspecialchars']($thisPackage->fetch('.'));
+			if (in_array($package['type'], array('title', 'text'))) {
+							$context['package_list'][$packageSection][$package['type']] = $smcFunc['htmlspecialchars']($thisPackage->fetch('.'));
+			}
 			// It's a Title, Heading, Rule or Text.
-			elseif (in_array($package['type'], array('heading', 'rule')))
-				$package['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('.'));
+			elseif (in_array($package['type'], array('heading', 'rule'))) {
+							$package['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('.'));
+			}
 			// It's a Remote link.
 			elseif ($package['type'] == 'remote')
 			{
@@ -354,20 +371,21 @@ 
 
 				if ($remote_type == 'relative' && substr($thisPackage->fetch('@href'), 0, 7) != 'http://' && substr($thisPackage->fetch('@href'), 0, 8) != 'https://')
 				{
-					if (isset($_GET['absolute']))
-						$current_url = $_GET['absolute'] . '/';
-					elseif (isset($_GET['relative']))
-						$current_url = $_GET['relative'] . '/';
-					else
-						$current_url = '';
+					if (isset($_GET['absolute'])) {
+											$current_url = $_GET['absolute'] . '/';
+					} elseif (isset($_GET['relative'])) {
+											$current_url = $_GET['relative'] . '/';
+					} else {
+											$current_url = '';
+					}
 
 					$current_url .= $thisPackage->fetch('@href');
-					if (isset($_GET['absolute']))
-						$package['href'] = $scripturl . '?action=admin;area=packages;get;sa=browse;absolute=' . $current_url;
-					else
-						$package['href'] = $scripturl . '?action=admin;area=packages;get;sa=browse;server=' . $context['package_server'] . ';relative=' . $current_url;
-				}
-				else
+					if (isset($_GET['absolute'])) {
+											$package['href'] = $scripturl . '?action=admin;area=packages;get;sa=browse;absolute=' . $current_url;
+					} else {
+											$package['href'] = $scripturl . '?action=admin;area=packages;get;sa=browse;server=' . $context['package_server'] . ';relative=' . $current_url;
+					}
+				} else
 				{
 					$current_url = $thisPackage->fetch('@href');
 					$package['href'] = $scripturl . '?action=admin;area=packages;get;sa=browse;absolute=' . $current_url;
@@ -379,25 +397,28 @@ 
 			// It's a package...
 			else
 			{
-				if (isset($_GET['absolute']))
-					$current_url = $_GET['absolute'] . '/';
-				elseif (isset($_GET['relative']))
-					$current_url = $_GET['relative'] . '/';
-				else
-					$current_url = '';
+				if (isset($_GET['absolute'])) {
+									$current_url = $_GET['absolute'] . '/';
+				} elseif (isset($_GET['relative'])) {
+									$current_url = $_GET['relative'] . '/';
+				} else {
+									$current_url = '';
+				}
 
 				$server_att = $server != '' ? ';server=' . $server : '';
 
 				$package += $thisPackage->to_array();
 
-				if (isset($package['website']))
-					unset($package['website']);
+				if (isset($package['website'])) {
+									unset($package['website']);
+				}
 				$package['author'] = array();
 
-				if ($package['description'] == '')
-					$package['description'] = $txt['package_no_description'];
-				else
-					$package['description'] = parse_bbc(preg_replace('~\[[/]?html\]~i', '', $smcFunc['htmlspecialchars']($package['description'])));
+				if ($package['description'] == '') {
+									$package['description'] = $txt['package_no_description'];
+				} else {
+									$package['description'] = parse_bbc(preg_replace('~\[[/]?html\]~i', '', $smcFunc['htmlspecialchars']($package['description'])));
+				}
 
 				$package['is_installed'] = isset($installed_mods[$package['id']]);
 				$package['is_current'] = $package['is_installed'] && ($installed_mods[$package['id']] == $package['version']);
@@ -406,12 +427,14 @@ 
 				// This package is either not installed, or installed but old.  Is it supported on this version of SMF?
 				if (!$package['is_installed'] || (!$package['is_current'] && !$package['is_newer']))
 				{
-					if ($thisPackage->exists('version/@for'))
-						$package['can_install'] = matchPackageVersion($the_version, $thisPackage->fetch('version/@for'));
+					if ($thisPackage->exists('version/@for')) {
+											$package['can_install'] = matchPackageVersion($the_version, $thisPackage->fetch('version/@for'));
+					}
 				}
 				// Okay, it's already installed AND up to date.
-				else
-					$package['can_install'] = false;
+				else {
+									$package['can_install'] = false;
+				}
 
 				$already_exists = getPackageInfo(basename($package['filename']));
 				$package['download_conflict'] = is_array($already_exists) && $already_exists['id'] == $package['id'] && $already_exists['version'] != $package['version'];
@@ -423,40 +446,44 @@ 
 
 				if ($thisPackage->exists('author') || isset($default_author))
 				{
-					if ($thisPackage->exists('author/@email') && filter_var($thisPackage->fetch('author/@email'), FILTER_VALIDATE_EMAIL))
-						$package['author']['email'] = $thisPackage->fetch('author/@email');
-					elseif (isset($default_email))
-						$package['author']['email'] = $default_email;
-
-					if ($thisPackage->exists('author') && $thisPackage->fetch('author') != '')
-						$package['author']['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('author'));
-					else
-						$package['author']['name'] = $default_author;
-
-					if (!empty($package['author']['email']))
-						$package['author']['link'] = '<a href="mailto:' . $package['author']['email'] . '">' . $package['author']['name'] . '</a>';
+					if ($thisPackage->exists('author/@email') && filter_var($thisPackage->fetch('author/@email'), FILTER_VALIDATE_EMAIL)) {
+											$package['author']['email'] = $thisPackage->fetch('author/@email');
+					} elseif (isset($default_email)) {
+											$package['author']['email'] = $default_email;
+					}
+
+					if ($thisPackage->exists('author') && $thisPackage->fetch('author') != '') {
+											$package['author']['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('author'));
+					} else {
+											$package['author']['name'] = $default_author;
+					}
+
+					if (!empty($package['author']['email'])) {
+											$package['author']['link'] = '<a href="mailto:' . $package['author']['email'] . '">' . $package['author']['name'] . '</a>';
+					}
 				}
 
 				if ($thisPackage->exists('website') || isset($default_website))
 				{
-					if ($thisPackage->exists('website') && $thisPackage->exists('website/@title'))
-						$package['author']['website']['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('website/@title'));
-					elseif (isset($default_title))
-						$package['author']['website']['name'] = $default_title;
-					elseif ($thisPackage->exists('website'))
-						$package['author']['website']['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('website'));
-					else
-						$package['author']['website']['name'] = $default_website;
-
-					if ($thisPackage->exists('website') && $thisPackage->fetch('website') != '')
-						$authorhompage = $smcFunc['htmlspecialchars']($thisPackage->fetch('website'));
-					else
-						$authorhompage = $default_website;
+					if ($thisPackage->exists('website') && $thisPackage->exists('website/@title')) {
+											$package['author']['website']['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('website/@title'));
+					} elseif (isset($default_title)) {
+											$package['author']['website']['name'] = $default_title;
+					} elseif ($thisPackage->exists('website')) {
+											$package['author']['website']['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('website'));
+					} else {
+											$package['author']['website']['name'] = $default_website;
+					}
+
+					if ($thisPackage->exists('website') && $thisPackage->fetch('website') != '') {
+											$authorhompage = $smcFunc['htmlspecialchars']($thisPackage->fetch('website'));
+					} else {
+											$authorhompage = $default_website;
+					}
 
 					$package['author']['website']['href'] = $authorhompage;
 					$package['author']['website']['link'] = '<a href="' . $authorhompage . '">' . $package['author']['website']['name'] . '</a>';
-				}
-				else
+				} else
 				{
 					$package['author']['website']['href'] = '';
 					$package['author']['website']['link'] = '';
@@ -472,11 +499,13 @@ 
 			$packageNum = in_array($package['type'], array('title', 'heading', 'text', 'remote', 'rule')) ? 0 : $packageNum + 1;
 			$package['count'] = $packageNum;
 
-			if (!in_array($package['type'], array('title', 'text')))
-				$context['package_list'][$packageSection]['items'][] = $package;
+			if (!in_array($package['type'], array('title', 'text'))) {
+							$context['package_list'][$packageSection]['items'][] = $package;
+			}
 
-			if ($package['count'] > 1)
-				$context['list_type'] = 'ol';
+			if ($package['count'] > 1) {
+							$context['list_type'] = 'ol';
+			}
 		}
 
 		$packageSection++;
@@ -489,8 +518,9 @@ 
 	{
 		foreach ($packageSection['items'] as $i => $package)
 		{
-			if ($package['count'] == 0 || isset($package['can_install']))
-				continue;
+			if ($package['count'] == 0 || isset($package['can_install'])) {
+							continue;
+			}
 
 			$context['package_list'][$ps_id]['items'][$i]['can_install'] = false;
 
@@ -539,8 +569,9 @@ 
 	checkSession('get');
 
 	// To download something, we need a valid server or url.
-	if (empty($_GET['server']) && (!empty($_GET['get']) && !empty($_REQUEST['package'])))
-		fatal_lang_error('package_get_error_is_zero', false);
+	if (empty($_GET['server']) && (!empty($_GET['get']) && !empty($_REQUEST['package']))) {
+			fatal_lang_error('package_get_error_is_zero', false);
+	}
 
 	if (isset($_GET['server']))
 	{
@@ -560,22 +591,23 @@ 
 		$smcFunc['db_free_result']($request);
 
 		// If server does not exist then dump out.
-		if (empty($url))
-			fatal_lang_error('couldnt_connect', false);
+		if (empty($url)) {
+					fatal_lang_error('couldnt_connect', false);
+		}
 
 		$url = $url . '/';
-	}
-	else
+	} else
 	{
 		// Initialize the requried variables.
 		$server = '';
 		$url = '';
 	}
 
-	if (isset($_REQUEST['byurl']) && !empty($_POST['filename']))
-		$package_name = basename($_REQUEST['filename']);
-	else
-		$package_name = basename($_REQUEST['package']);
+	if (isset($_REQUEST['byurl']) && !empty($_POST['filename'])) {
+			$package_name = basename($_REQUEST['filename']);
+	} else {
+			$package_name = basename($_REQUEST['package']);
+	}
 
 	if (isset($_REQUEST['conflict']) || (isset($_REQUEST['auto']) && file_exists($packagesdir . '/' . $package_name)))
 	{
@@ -584,14 +616,15 @@ 
 		{
 			$ext = substr($package_name, strrpos(substr($package_name, 0, -3), '.'));
 			$package_name = substr($package_name, 0, strrpos(substr($package_name, 0, -3), '.')) . '_';
+		} else {
+					$ext = '';
 		}
-		else
-			$ext = '';
 
 		// Find the first available.
 		$i = 1;
-		while (file_exists($packagesdir . '/' . $package_name . $i . $ext))
-			$i++;
+		while (file_exists($packagesdir . '/' . $package_name . $i . $ext)) {
+					$i++;
+		}
 
 		$package_name = $package_name . $i . $ext;
 	}
@@ -602,25 +635,28 @@ 
 
 	// Done!  Did we get this package automatically?
 	// @ TODO: These are usually update packages.  Allowing both for now until more testing has been done.
-	if (preg_match('~^https?://[\w_\-]+\.simplemachines\.org/~', $_REQUEST['package']) == 1 && strpos($_REQUEST['package'], 'dlattach') === false && isset($_REQUEST['auto']))
-		redirectexit('action=admin;area=packages;sa=install;package=' . $package_name);
+	if (preg_match('~^https?://[\w_\-]+\.simplemachines\.org/~', $_REQUEST['package']) == 1 && strpos($_REQUEST['package'], 'dlattach') === false && isset($_REQUEST['auto'])) {
+			redirectexit('action=admin;area=packages;sa=install;package=' . $package_name);
+	}
 
 	// You just downloaded a mod from SERVER_NAME_GOES_HERE.
 	$context['package_server'] = $server;
 
 	$context['package'] = getPackageInfo($package_name);
 
-	if (!is_array($context['package']))
-		fatal_lang_error('package_cant_download', false);
+	if (!is_array($context['package'])) {
+			fatal_lang_error('package_cant_download', false);
+	}
 
-	if ($context['package']['type'] == 'modification')
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['install_mod'] . ' ]</a>';
-	elseif ($context['package']['type'] == 'avatar')
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['use_avatars'] . ' ]</a>';
-	elseif ($context['package']['type'] == 'language')
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['add_languages'] . ' ]</a>';
-	else
-		$context['package']['install']['link'] = '';
+	if ($context['package']['type'] == 'modification') {
+			$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['install_mod'] . ' ]</a>';
+	} elseif ($context['package']['type'] == 'avatar') {
+			$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['use_avatars'] . ' ]</a>';
+	} elseif ($context['package']['type'] == 'language') {
+			$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['add_languages'] . ' ]</a>';
+	} else {
+			$context['package']['install']['link'] = '';
+	}
 
 	// Does a 3rd party hook want to do some additional changes?
 	call_integration_hook('integrate_package_download');
@@ -646,10 +682,11 @@ 
 	// @todo Use FTP if the Packages directory is not writable.
 
 	// Check the file was even sent!
-	if (!isset($_FILES['package']['name']) || $_FILES['package']['name'] == '')
-		fatal_lang_error('package_upload_error_nofile');
-	elseif (!is_uploaded_file($_FILES['package']['tmp_name']) || (ini_get('open_basedir') == '' && !file_exists($_FILES['package']['tmp_name'])))
-		fatal_lang_error('package_upload_error_failed');
+	if (!isset($_FILES['package']['name']) || $_FILES['package']['name'] == '') {
+			fatal_lang_error('package_upload_error_nofile');
+	} elseif (!is_uploaded_file($_FILES['package']['tmp_name']) || (ini_get('open_basedir') == '' && !file_exists($_FILES['package']['tmp_name']))) {
+			fatal_lang_error('package_upload_error_failed');
+	}
 
 	// Make sure it has a sane filename.
 	$_FILES['package']['name'] = preg_replace(array('/\s/', '/\.[\.]+/', '/[^\w_\.\-]/'), array('_', '.', ''), $_FILES['package']['name']);
@@ -666,8 +703,9 @@ 
 	// Setup the destination and throw an error if the file is already there!
 	$destination = $packagesdir . '/' . $packageName;
 	// @todo Maybe just roll it like we do for downloads?
-	if (file_exists($destination))
-		fatal_lang_error('package_upload_error_exists');
+	if (file_exists($destination)) {
+			fatal_lang_error('package_upload_error_exists');
+	}
 
 	// Now move the file.
 	move_uploaded_file($_FILES['package']['tmp_name'], $destination);
@@ -690,12 +728,14 @@ 
 	{
 		while ($package = readdir($dir))
 		{
-			if ($package == '.' || $package == '..' || $package == 'temp' || $package == $packageName || (!(is_dir($packagesdir . '/' . $package) && file_exists($packagesdir . '/' . $package . '/package-info.xml')) && substr(strtolower($package), -7) != '.tar.gz' && substr(strtolower($package), -4) != '.tgz' && substr(strtolower($package), -4) != '.zip'))
-				continue;
+			if ($package == '.' || $package == '..' || $package == 'temp' || $package == $packageName || (!(is_dir($packagesdir . '/' . $package) && file_exists($packagesdir . '/' . $package . '/package-info.xml')) && substr(strtolower($package), -7) != '.tar.gz' && substr(strtolower($package), -4) != '.tgz' && substr(strtolower($package), -4) != '.zip')) {
+							continue;
+			}
 
 			$packageInfo = getPackageInfo($package);
-			if (!is_array($packageInfo))
-				continue;
+			if (!is_array($packageInfo)) {
+							continue;
+			}
 
 			if ($packageInfo['id'] == $context['package']['id'] && $packageInfo['version'] == $context['package']['version'])
 			{
@@ -707,14 +747,15 @@ 
 		closedir($dir);
 	}
 
-	if ($context['package']['type'] == 'modification')
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['install_mod'] . ' ]</a>';
-	elseif ($context['package']['type'] == 'avatar')
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['use_avatars'] . ' ]</a>';
-	elseif ($context['package']['type'] == 'language')
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['add_languages'] . ' ]</a>';
-	else
-		$context['package']['install']['link'] = '';
+	if ($context['package']['type'] == 'modification') {
+			$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['install_mod'] . ' ]</a>';
+	} elseif ($context['package']['type'] == 'avatar') {
+			$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['use_avatars'] . ' ]</a>';
+	} elseif ($context['package']['type'] == 'language') {
+			$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['add_languages'] . ' ]</a>';
+	} else {
+			$context['package']['install']['link'] = '';
+	}
 
 	// Does a 3rd party hook want to do some additional changes?
 	call_integration_hook('integrate_package_upload');
@@ -737,16 +778,18 @@ 
 	checkSession();
 
 	// If they put a slash on the end, get rid of it.
-	if (substr($_POST['serverurl'], -1) == '/')
-		$_POST['serverurl'] = substr($_POST['serverurl'], 0, -1);
+	if (substr($_POST['serverurl'], -1) == '/') {
+			$_POST['serverurl'] = substr($_POST['serverurl'], 0, -1);
+	}
 
 	// Are they both nice and clean?
 	$servername = trim($smcFunc['htmlspecialchars']($_POST['servername']));
 	$serverurl = trim($smcFunc['htmlspecialchars']($_POST['serverurl']));
 
 	// Make sure the URL has the correct prefix.
-	if (strpos($serverurl, 'http://') !== 0 && strpos($serverurl, 'https://') !== 0)
-		$serverurl = 'http://' . $serverurl;
+	if (strpos($serverurl, 'http://') !== 0 && strpos($serverurl, 'https://') !== 0) {
+			$serverurl = 'http://' . $serverurl;
+	}
 
 	$smcFunc['db_insert']('',
 		'{db_prefix}package_servers',

Sources/ViewQuery.php

Braces +34 added lines, -26 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Show the database queries for debugging
@@ -30,8 +31,9 @@ 
 	global $scripturl, $settings, $context, $db_connection, $boarddir, $smcFunc, $txt, $db_show_debug;
 
 	// We should have debug mode enabled, as well as something to display!
-	if (!isset($db_show_debug) || $db_show_debug !== true || !isset($_SESSION['debug']))
-		fatal_lang_error('no_access', false);
+	if (!isset($db_show_debug) || $db_show_debug !== true || !isset($_SESSION['debug'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Don't allow except for administrators.
 	isAllowedTo('admin_forum');
@@ -41,10 +43,11 @@ 
 	{
 		$_SESSION['view_queries'] = $_SESSION['view_queries'] == 1 ? 0 : 1;
 
-		if (strpos($_SESSION['old_url'], 'action=viewquery') !== false)
-			redirectexit();
-		else
-			redirectexit($_SESSION['old_url']);
+		if (strpos($_SESSION['old_url'], 'action=viewquery') !== false) {
+					redirectexit();
+		} else {
+					redirectexit($_SESSION['old_url']);
+		}
 	}
 
 	call_integration_hook('integrate_egg_nog');
@@ -83,26 +86,28 @@ 
 		foreach ($query as $line)
 		{
 			preg_match('/^(\t*)/', $line, $temp);
-			if (strlen($temp[0]) < $min_indent || $min_indent == 0)
-				$min_indent = strlen($temp[0]);
+			if (strlen($temp[0]) < $min_indent || $min_indent == 0) {
+							$min_indent = strlen($temp[0]);
+			}
+		}
+		foreach ($query as $l => $dummy) {
+					$query[$l] = substr($dummy, $min_indent);
 		}
-		foreach ($query as $l => $dummy)
-			$query[$l] = substr($dummy, $min_indent);
 		$query_data['q'] = implode("\n", $query);
 
 		// Make the filenames look a bit better.
-		if (isset($query_data['f']))
-			$query_data['f'] = preg_replace('~^' . preg_quote($boarddir, '~') . '~', '...', $query_data['f']);
+		if (isset($query_data['f'])) {
+					$query_data['f'] = preg_replace('~^' . preg_quote($boarddir, '~') . '~', '...', $query_data['f']);
+		}
 
 		$is_select_query = substr(trim($query_data['q']), 0, 6) == 'SELECT';
-		if ($is_select_query)
-			$select = $query_data['q'];
-		elseif (preg_match('~^INSERT(?: IGNORE)? INTO \w+(?:\s+\([^)]+\))?\s+(SELECT .+)$~s', trim($query_data['q']), $matches) != 0)
+		if ($is_select_query) {
+					$select = $query_data['q'];
+		} elseif (preg_match('~^INSERT(?: IGNORE)? INTO \w+(?:\s+\([^)]+\))?\s+(SELECT .+)$~s', trim($query_data['q']), $matches) != 0)
 		{
 			$is_select_query = true;
 			$select = $matches[1];
-		}
-		elseif (preg_match('~^CREATE TEMPORARY TABLE .+?(SELECT .+)$~s', trim($query_data['q']), $matches) != 0)
+		} elseif (preg_match('~^CREATE TEMPORARY TABLE .+?(SELECT .+)$~s', trim($query_data['q']), $matches) != 0)
 		{
 			$is_select_query = true;
 			$select = $matches[1];
@@ -110,10 +115,11 @@ 
 		// Temporary tables created in earlier queries are not explainable.
 		if ($is_select_query)
 		{
-			foreach (array('log_topics_unread', 'topics_posted_in', 'tmp_log_search_topics', 'tmp_log_search_messages') as $tmp)
-				if (strpos($select, $tmp) !== false)
+			foreach (array('log_topics_unread', 'topics_posted_in', 'tmp_log_search_topics', 'tmp_log_search_messages') as $tmp) {
+							if (strpos($select, $tmp) !== false)
 				{
 					$is_select_query = false;
+			}
 					break;
 				}
 		}
@@ -124,13 +130,15 @@ 
 				', nl2br(str_replace("\t", '&nbsp;&nbsp;&nbsp;', $smcFunc['htmlspecialchars']($query_data['q']))), '
 			</a><br>';
 
-		if (!empty($query_data['f']) && !empty($query_data['l']))
-			echo sprintf($txt['debug_query_in_line'], $query_data['f'], $query_data['l']);
+		if (!empty($query_data['f']) && !empty($query_data['l'])) {
+					echo sprintf($txt['debug_query_in_line'], $query_data['f'], $query_data['l']);
+		}
 
-		if (isset($query_data['s'], $query_data['t']) && isset($txt['debug_query_which_took_at']))
-			echo sprintf($txt['debug_query_which_took_at'], round($query_data['t'], 8), round($query_data['s'], 8));
-		else
-			echo sprintf($txt['debug_query_which_took'], round($query_data['t'], 8));
+		if (isset($query_data['s'], $query_data['t']) && isset($txt['debug_query_which_took_at'])) {
+					echo sprintf($txt['debug_query_which_took_at'], round($query_data['t'], 8), round($query_data['s'], 8));
+		} else {
+					echo sprintf($txt['debug_query_which_took'], round($query_data['t'], 8));
+		}
 
 		echo '
 		</div>';

Sources/Class-BrowserDetect.php

Braces +88 added lines, -60 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Class browser_detector
@@ -55,20 +56,25 @@ 
 		$this->_browsers['needs_size_fix'] = false;
 
 		// One at a time, one at a time, and in this order too
-		if ($this->isOpera())
-			$this->setupOpera();
+		if ($this->isOpera()) {
+					$this->setupOpera();
+		}
 		// Meh...
-		elseif ($this->isEdge())
-			$this->setupEdge();
+		elseif ($this->isEdge()) {
+					$this->setupEdge();
+		}
 		// Them webkits need to be set up too
-		elseif ($this->isWebkit())
-			$this->setupWebkit();
+		elseif ($this->isWebkit()) {
+					$this->setupWebkit();
+		}
 		// We may have work to do on Firefox...
-		elseif ($this->isFirefox())
-			$this->setupFirefox();
+		elseif ($this->isFirefox()) {
+					$this->setupFirefox();
+		}
 		// Old friend, old frenemy
-		elseif ($this->isIe())
-			$this->setupIe();
+		elseif ($this->isIe()) {
+					$this->setupIe();
+		}
 
 		// Just a few mobile checks
 		$this->isOperaMini();
@@ -84,11 +90,12 @@ 
 			$this->_browsers['possibly_robot'] = !empty($user_info['possibly_robot']);
 
 			// Robots shouldn't be logging in or registering.  So, they aren't a bot.  Better to be wrong than sorry (or people won't be able to log in!), anyway.
-			if ((isset($_REQUEST['action']) && in_array($_REQUEST['action'], array('login', 'login2', 'register', 'signup'))) || !$user_info['is_guest'])
-				$this->_browsers['possibly_robot'] = false;
+			if ((isset($_REQUEST['action']) && in_array($_REQUEST['action'], array('login', 'login2', 'register', 'signup'))) || !$user_info['is_guest']) {
+							$this->_browsers['possibly_robot'] = false;
+			}
+		} else {
+					$this->_browsers['possibly_robot'] = false;
 		}
-		else
-			$this->_browsers['possibly_robot'] = false;
 
 		// Fill out the historical array as needed to support old mods that don't use isBrowser
 		$this->fillInformation();
@@ -106,8 +113,9 @@ 
 	*/
 	function isOpera()
 	{
-		if (!isset($this->_browsers['is_opera']))
-			$this->_browsers['is_opera'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Opera') !== false;
+		if (!isset($this->_browsers['is_opera'])) {
+					$this->_browsers['is_opera'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Opera') !== false;
+		}
 		return $this->_browsers['is_opera'];
 	}
 
@@ -118,8 +126,9 @@ 
 	function isIe()
 	{
 		// I'm IE, Yes I'm the real IE; All you other IEs are just imitating.
-		if (!isset($this->_browsers['is_ie']))
-			$this->_browsers['is_ie'] = !$this->isOpera() && !$this->isGecko() && !$this->isWebTv() && preg_match('~MSIE \d+~', $_SERVER['HTTP_USER_AGENT']) === 1;
+		if (!isset($this->_browsers['is_ie'])) {
+					$this->_browsers['is_ie'] = !$this->isOpera() && !$this->isGecko() && !$this->isWebTv() && preg_match('~MSIE \d+~', $_SERVER['HTTP_USER_AGENT']) === 1;
+		}
 		return $this->_browsers['is_ie'];
 	}
 
@@ -131,8 +140,9 @@ 
 	{
 		// IE11 is a bit different than earlier versions
 		// The isGecko() part is to ensure we get this right...
-		if (!isset($this->_browsers['is_ie11']))
-			$this->_browsers['is_ie11'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Trident') !== false && $this->isGecko();
+		if (!isset($this->_browsers['is_ie11'])) {
+					$this->_browsers['is_ie11'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Trident') !== false && $this->isGecko();
+		}
 		return $this->_browsers['is_ie11'];
  	}
 
@@ -142,8 +152,9 @@ 
 	*/
 	function isEdge()
 	{
-		if (!isset($this->_browsers['is_edge']))
-			$this->_browsers['is_edge'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Edge') !== false;
+		if (!isset($this->_browsers['is_edge'])) {
+					$this->_browsers['is_edge'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Edge') !== false;
+		}
 		return $this->_browsers['is_edge'];
 	}
 
@@ -153,8 +164,9 @@ 
 	*/
 	function isWebkit()
 	{
-		if (!isset($this->_browsers['is_webkit']))
-			$this->_browsers['is_webkit'] = strpos($_SERVER['HTTP_USER_AGENT'], 'AppleWebKit') !== false;
+		if (!isset($this->_browsers['is_webkit'])) {
+					$this->_browsers['is_webkit'] = strpos($_SERVER['HTTP_USER_AGENT'], 'AppleWebKit') !== false;
+		}
 		return $this->_browsers['is_webkit'];
 	}
 
@@ -164,8 +176,9 @@ 
 	*/
 	function isFirefox()
 	{
-		if (!isset($this->_browsers['is_firefox']))
-			$this->_browsers['is_firefox'] = preg_match('~(?:Firefox|Ice[wW]easel|IceCat|Shiretoko|Minefield)/~', $_SERVER['HTTP_USER_AGENT']) === 1 && $this->isGecko();
+		if (!isset($this->_browsers['is_firefox'])) {
+					$this->_browsers['is_firefox'] = preg_match('~(?:Firefox|Ice[wW]easel|IceCat|Shiretoko|Minefield)/~', $_SERVER['HTTP_USER_AGENT']) === 1 && $this->isGecko();
+		}
 		return $this->_browsers['is_firefox'];
 	}
 
@@ -175,8 +188,9 @@ 
 	*/
 	function isWebTv()
 	{
-		if (!isset($this->_browsers['is_web_tv']))
-			$this->_browsers['is_web_tv'] = strpos($_SERVER['HTTP_USER_AGENT'], 'WebTV') !== false;
+		if (!isset($this->_browsers['is_web_tv'])) {
+					$this->_browsers['is_web_tv'] = strpos($_SERVER['HTTP_USER_AGENT'], 'WebTV') !== false;
+		}
 		return $this->_browsers['is_web_tv'];
 	}
 
@@ -186,8 +200,9 @@ 
 	*/
 	function isKonqueror()
 	{
-		if (!isset($this->_browsers['is_konqueror']))
-			$this->_browsers['is_konqueror'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Konqueror') !== false;
+		if (!isset($this->_browsers['is_konqueror'])) {
+					$this->_browsers['is_konqueror'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Konqueror') !== false;
+		}
 		return $this->_browsers['is_konqueror'];
 	}
 
@@ -197,8 +212,9 @@ 
 	*/
 	function isGecko()
 	{
-		if (!isset($this->_browsers['is_gecko']))
-			$this->_browsers['is_gecko'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Gecko') !== false && !$this->isWebkit() && !$this->isKonqueror();
+		if (!isset($this->_browsers['is_gecko'])) {
+					$this->_browsers['is_gecko'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Gecko') !== false && !$this->isWebkit() && !$this->isKonqueror();
+		}
 		return $this->_browsers['is_gecko'];
 	}
 
@@ -208,10 +224,12 @@ 
 	*/
 	function isOperaMini()
 	{
-		if (!isset($this->_browsers['is_opera_mini']))
-			$this->_browsers['is_opera_mini'] = (isset($_SERVER['HTTP_X_OPERAMINI_PHONE_UA']) || stripos($_SERVER['HTTP_USER_AGENT'], 'opera mini') !== false);
-		if ($this->_browsers['is_opera_mini'])
-			$this->_is_mobile = true;
+		if (!isset($this->_browsers['is_opera_mini'])) {
+					$this->_browsers['is_opera_mini'] = (isset($_SERVER['HTTP_X_OPERAMINI_PHONE_UA']) || stripos($_SERVER['HTTP_USER_AGENT'], 'opera mini') !== false);
+		}
+		if ($this->_browsers['is_opera_mini']) {
+					$this->_is_mobile = true;
+		}
 		return $this->_browsers['is_opera_mini'];
 	}
 
@@ -221,10 +239,12 @@ 
 	*/
 	function isOperaMobi()
 	{
-		if (!isset($this->_browsers['is_opera_mobi']))
-			$this->_browsers['is_opera_mobi'] = stripos($_SERVER['HTTP_USER_AGENT'], 'opera mobi') !== false;
-		if ($this->_browsers['is_opera_mobi'])
-			$this->_is_mobile = true;
+		if (!isset($this->_browsers['is_opera_mobi'])) {
+					$this->_browsers['is_opera_mobi'] = stripos($_SERVER['HTTP_USER_AGENT'], 'opera mobi') !== false;
+		}
+		if ($this->_browsers['is_opera_mobi']) {
+					$this->_is_mobile = true;
+		}
 		return $this->_browsers['is_opera_mini'];
 	}
 
@@ -244,8 +264,9 @@ 
 		);
 
 		// blackberry, playbook, iphone, nokia, android and ipods set a mobile flag
-		if ($this->_browsers['is_iphone'] || $this->_browsers['is_blackberry'] || $this->_browsers['is_android'] || $this->_browsers['is_nokia'])
-			$this->_is_mobile = true;
+		if ($this->_browsers['is_iphone'] || $this->_browsers['is_blackberry'] || $this->_browsers['is_android'] || $this->_browsers['is_nokia']) {
+					$this->_is_mobile = true;
+		}
 
 		// @todo what to do with the blaPad? ... for now leave it detected as Safari ...
 		$this->_browsers['is_safari'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Safari') !== false && !$this->_browsers['is_chrome'] && !$this->_browsers['is_iphone'];
@@ -254,15 +275,17 @@ 
 		// if Chrome, get the major version
 		if ($this->_browsers['is_chrome'])
 		{
-			if (preg_match('~chrome[/]([0-9][0-9]?[.])~i', $_SERVER['HTTP_USER_AGENT'], $match) === 1)
-				$this->_browsers['is_chrome' . (int) $match[1]] = true;
+			if (preg_match('~chrome[/]([0-9][0-9]?[.])~i', $_SERVER['HTTP_USER_AGENT'], $match) === 1) {
+							$this->_browsers['is_chrome' . (int) $match[1]] = true;
+			}
 		}
 
 		// or if Safari get its major version
 		if ($this->_browsers['is_safari'])
 		{
-			if (preg_match('~version/?(.*)safari.*~i', $_SERVER['HTTP_USER_AGENT'], $match) === 1)
-				$this->_browsers['is_safari' . (int) trim($match[1])] = true;
+			if (preg_match('~version/?(.*)safari.*~i', $_SERVER['HTTP_USER_AGENT'], $match) === 1) {
+							$this->_browsers['is_safari' . (int) trim($match[1])] = true;
+			}
 		}
 	}
 
@@ -291,8 +314,9 @@ 
 			$this->_browsers['is_ie' . ((int) $trident_match[1] + 4)] = true;
 
 			// If trident is set, see the (if any) msie tag in the user agent matches ... if not its in some compatibility view
-			if (isset($msie_match[1]) && ($msie_match[1] < $trident_match[1] + 4))
-				$this->_browsers['is_ie_compat_view'] = true;
+			if (isset($msie_match[1]) && ($msie_match[1] < $trident_match[1] + 4)) {
+							$this->_browsers['is_ie_compat_view'] = true;
+			}
 		}
 
 		// Detect true IE6 and IE7 and not IE in compat mode.
@@ -326,8 +350,9 @@ 
 	 */
 	private function setupFirefox()
 	{
-		if (preg_match('~(?:Firefox|Ice[wW]easel|IceCat|Shiretoko|Minefield)[\/ \(]([^ ;\)]+)~', $_SERVER['HTTP_USER_AGENT'], $match) === 1)
-			$this->_browsers['is_firefox' . (int) $match[1]] = true;
+		if (preg_match('~(?:Firefox|Ice[wW]easel|IceCat|Shiretoko|Minefield)[\/ \(]([^ ;\)]+)~', $_SERVER['HTTP_USER_AGENT'], $match) === 1) {
+					$this->_browsers['is_firefox' . (int) $match[1]] = true;
+		}
 	}
 
 	/**
@@ -338,11 +363,13 @@ 
 	private function setupOpera()
 	{
 		// Opera 10+ uses the version tag at the end of the string
-		if (preg_match('~\sVersion/([0-9]+)\.[0-9]+(?:\s*|$)~', $_SERVER['HTTP_USER_AGENT'], $match))
-			$this->_browsers['is_opera' . (int) $match[1]] = true;
+		if (preg_match('~\sVersion/([0-9]+)\.[0-9]+(?:\s*|$)~', $_SERVER['HTTP_USER_AGENT'], $match)) {
+					$this->_browsers['is_opera' . (int) $match[1]] = true;
+		}
 		// Opera pre 10 is supposed to uses the Opera tag alone, as do some spoofers
-		elseif (preg_match('~Opera[ /]([0-9]+)(?!\\.[89])~', $_SERVER['HTTP_USER_AGENT'], $match))
-			$this->_browsers['is_opera' . (int) $match[1]] = true;
+		elseif (preg_match('~Opera[ /]([0-9]+)(?!\\.[89])~', $_SERVER['HTTP_USER_AGENT'], $match)) {
+					$this->_browsers['is_opera' . (int) $match[1]] = true;
+		}
 
 		// Needs size fix?
 		$this->_browsers['needs_size_fix'] = !empty($this->_browsers['is_opera6']);
@@ -353,8 +380,9 @@ 
 	 */
 	private function setupEdge()
 	{
-		if (preg_match('~Edge[\/]([0-9][0-9]?[\.][0-9][0-9])~i', $_SERVER['HTTP_USER_AGENT'], $match) === 1)
-			$this->_browsers['is_edge' . (int) $match[1]] = true;
+		if (preg_match('~Edge[\/]([0-9][0-9]?[\.][0-9][0-9])~i', $_SERVER['HTTP_USER_AGENT'], $match) === 1) {
+					$this->_browsers['is_edge' . (int) $match[1]] = true;
+		}
 	}
 
 	/**
@@ -367,9 +395,9 @@ 
 	{
 		global $context;
 
-		if ($this->_is_mobile)
-			$context['browser_body_id'] = 'mobile';
-		else
+		if ($this->_is_mobile) {
+					$context['browser_body_id'] = 'mobile';
+		} else
 		{
 			// add in any specific detection conversions here if you want a special body id e.g. 'is_opera9' => 'opera9'
 			$browser_priority = array(

Sources/ManageRegistration.php

Braces +27 added lines, -19 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Entrance point for the registration center, it checks permissions and forwards
@@ -31,8 +32,9 @@ 
 	global $context, $txt;
 
 	// Old templates might still request this.
-	if (isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'browse')
-		redirectexit('action=admin;area=viewmembers;sa=browse' . (isset($_REQUEST['type']) ? ';type=' . $_REQUEST['type'] : ''));
+	if (isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'browse') {
+			redirectexit('action=admin;area=viewmembers;sa=browse' . (isset($_REQUEST['type']) ? ';type=' . $_REQUEST['type'] : ''));
+	}
 
 	$subActions = array(
 		'register' => array('AdminRegister', 'moderate_forum'),
@@ -99,9 +101,10 @@ 
 		checkSession();
 		validateToken('admin-regc');
 
-		foreach ($_POST as $key => $value)
-			if (!is_array($_POST[$key]))
+		foreach ($_POST as $key => $value) {
+					if (!is_array($_POST[$key]))
 				$_POST[$key] = htmltrim__recursive(str_replace(array("\n", "\r"), '', $_POST[$key]));
+		}
 
 		$regOptions = array(
 			'interface' => 'admin',
@@ -161,12 +164,13 @@ 
 			)
 		);
 		$context['member_groups'] = array(0 => $txt['admin_register_group_none']);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$context['member_groups'][$row['id_group']] = $row['group_name'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$context['member_groups'][$row['id_group']] = $row['group_name'];
+		}
 		$smcFunc['db_free_result']($request);
+	} else {
+			$context['member_groups'] = array();
 	}
-	else
-		$context['member_groups'] = array();
 
 	// Basic stuff.
 	$context['sub_template'] = 'admin_register';
@@ -207,8 +211,9 @@ 
 		{
 			$context['editable_agreements']['.' . $lang['filename']] = $lang['name'];
 			// Are we editing this?
-			if (isset($_POST['agree_lang']) && $_POST['agree_lang'] == '.' . $lang['filename'])
-				$context['current_agreement'] = '.' . $lang['filename'];
+			if (isset($_POST['agree_lang']) && $_POST['agree_lang'] == '.' . $lang['filename']) {
+							$context['current_agreement'] = '.' . $lang['filename'];
+			}
 		}
 	}
 
@@ -223,10 +228,11 @@ 
 
 		updateSettings(array('requireAgreement' => !empty($_POST['requireAgreement'])));
 
-		if ($bytes == strlen($to_write))
-			$context['saved_successful'] = true;
-		else
-			$context['could_not_save'] = true;
+		if ($bytes == strlen($to_write)) {
+					$context['saved_successful'] = true;
+		} else {
+					$context['could_not_save'] = true;
+		}
 	}
 
 	$context['agreement'] = file_exists($boarddir . '/agreement' . $context['current_agreement'] . '.txt') ? $smcFunc['htmlspecialchars'](file_get_contents($boarddir . '/agreement' . $context['current_agreement'] . '.txt')) : '';
@@ -310,8 +316,9 @@ 
 
 	call_integration_hook('integrate_modify_registration_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Setup the template
 	$context['sub_template'] = 'show_settings';
@@ -322,8 +329,9 @@ 
 		checkSession();
 
 		// Are there some contacts missing?
-		if (!empty($_POST['coppaAge']) && !empty($_POST['coppaType']) && empty($_POST['coppaPost']) && empty($_POST['coppaFax']))
-			fatal_lang_error('admin_setting_coppa_require_contact');
+		if (!empty($_POST['coppaAge']) && !empty($_POST['coppaType']) && empty($_POST['coppaPost']) && empty($_POST['coppaFax'])) {
+					fatal_lang_error('admin_setting_coppa_require_contact');
+		}
 
 		// Post needs to take into account line breaks.
 		$_POST['coppaPost'] = str_replace("\n", '<br>', empty($_POST['coppaPost']) ? '' : $_POST['coppaPost']);

Sources/ManagePermissions.php

Braces +312 added lines, -223 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Dispatches to the right function based on the given subaction.
@@ -176,8 +177,9 @@ 
 		// If it's inherited, just add it as a child.
 		if ($row['id_parent'] != -2)
 		{
-			if (isset($context['groups'][$row['id_parent']]))
-				$context['groups'][$row['id_parent']]['children'][$row['id_group']] = $row['group_name'];
+			if (isset($context['groups'][$row['id_parent']])) {
+							$context['groups'][$row['id_parent']]['children'][$row['id_group']] = $row['group_name'];
+			}
 			continue;
 		}
 
@@ -202,10 +204,11 @@ 
 			'access' => false,
 		);
 
-		if ($row['min_posts'] == -1)
-			$normalGroups[$row['id_group']] = $row['id_group'];
-		else
-			$postGroups[$row['id_group']] = $row['id_group'];
+		if ($row['min_posts'] == -1) {
+					$normalGroups[$row['id_group']] = $row['id_group'];
+		} else {
+					$postGroups[$row['id_group']] = $row['id_group'];
+		}
 	}
 	$smcFunc['db_free_result']($query);
 
@@ -221,8 +224,9 @@ 
 				'post_group_list' => $postGroups,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($query))
-			$context['groups'][$row['id_group']]['num_members'] += $row['num_members'];
+		while ($row = $smcFunc['db_fetch_assoc']($query)) {
+					$context['groups'][$row['id_group']]['num_members'] += $row['num_members'];
+		}
 		$smcFunc['db_free_result']($query);
 	}
 
@@ -238,8 +242,9 @@ 
 				'normal_group_list' => $normalGroups,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($query))
-			$context['groups'][$row['id_group']]['num_members'] += $row['num_members'];
+		while ($row = $smcFunc['db_fetch_assoc']($query)) {
+					$context['groups'][$row['id_group']]['num_members'] += $row['num_members'];
+		}
 		$smcFunc['db_free_result']($query);
 
 		// This one is slower, but it's okay... careful not to count twice!
@@ -256,15 +261,17 @@ 
 				'blank_string' => '',
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($query))
-			$context['groups'][$row['id_group']]['num_members'] += $row['num_members'];
+		while ($row = $smcFunc['db_fetch_assoc']($query)) {
+					$context['groups'][$row['id_group']]['num_members'] += $row['num_members'];
+		}
 		$smcFunc['db_free_result']($query);
 	}
 
 	foreach ($context['groups'] as $id => $data)
 	{
-		if ($data['href'] != '')
-			$context['groups'][$id]['link'] = '<a href="' . $data['href'] . '">' . $data['num_members'] . '</a>';
+		if ($data['href'] != '') {
+					$context['groups'][$id]['link'] = '<a href="' . $data['href'] . '">' . $data['num_members'] . '</a>';
+		}
 	}
 
 	if (empty($_REQUEST['pid']))
@@ -278,9 +285,10 @@ 
 				'hidden_permissions' => !empty($context['hidden_permissions']) ? $context['hidden_permissions'] : array(),
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			if (isset($context['groups'][(int) $row['id_group']]) && (!empty($row['add_deny']) || $row['id_group'] != -1))
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					if (isset($context['groups'][(int) $row['id_group']]) && (!empty($row['add_deny']) || $row['id_group'] != -1))
 				$context['groups'][(int) $row['id_group']]['num_permissions'][empty($row['add_deny']) ? 'denied' : 'allowed'] = $row['num_permissions'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Get the "default" profile permissions too.
@@ -297,17 +305,18 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (isset($context['groups'][(int) $row['id_group']]) && (!empty($row['add_deny']) || $row['id_group'] != -1))
-				$context['groups'][(int) $row['id_group']]['num_permissions'][empty($row['add_deny']) ? 'denied' : 'allowed'] += $row['num_permissions'];
+			if (isset($context['groups'][(int) $row['id_group']]) && (!empty($row['add_deny']) || $row['id_group'] != -1)) {
+							$context['groups'][(int) $row['id_group']]['num_permissions'][empty($row['add_deny']) ? 'denied' : 'allowed'] += $row['num_permissions'];
+			}
 		}
 		$smcFunc['db_free_result']($request);
-	}
-	else
+	} else
 	{
 		$_REQUEST['pid'] = (int) $_REQUEST['pid'];
 
-		if (!isset($context['profiles'][$_REQUEST['pid']]))
-			fatal_lang_error('no_access', false);
+		if (!isset($context['profiles'][$_REQUEST['pid']])) {
+					fatal_lang_error('no_access', false);
+		}
 
 		// Change the selected tab to better reflect that this really is a board profile.
 		$context[$context['admin_menu_name']]['current_subsection'] = 'profiles';
@@ -323,8 +332,9 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (isset($context['groups'][(int) $row['id_group']]) && (!empty($row['add_deny']) || $row['id_group'] != -1))
-				$context['groups'][(int) $row['id_group']]['num_permissions'][empty($row['add_deny']) ? 'denied' : 'allowed'] += $row['num_permissions'];
+			if (isset($context['groups'][(int) $row['id_group']]) && (!empty($row['add_deny']) || $row['id_group'] != -1)) {
+							$context['groups'][(int) $row['id_group']]['num_permissions'][empty($row['add_deny']) ? 'denied' : 'allowed'] += $row['num_permissions'];
+			}
 		}
 		$smcFunc['db_free_result']($request);
 
@@ -366,8 +376,8 @@ 
 
 		if (!empty($changes))
 		{
-			foreach ($changes as $profile => $boards)
-				$smcFunc['db_query']('', '
+			foreach ($changes as $profile => $boards) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}boards
 					SET id_profile = {int:current_profile}
 					WHERE id_board IN ({array_int:board_list})',
@@ -376,6 +386,7 @@ 
 						'current_profile' => $profile,
 					)
 				);
+			}
 		}
 
 		$context['edit_all'] = false;
@@ -400,8 +411,9 @@ 
 		);
 		foreach ($boardList[$catid] as $boardid)
 		{
-			if (!isset($context['profiles'][$boards[$boardid]['profile']]))
-				$boards[$boardid]['profile'] = 1;
+			if (!isset($context['profiles'][$boards[$boardid]['profile']])) {
+							$boards[$boardid]['profile'] = 1;
+			}
 
 			$context['categories'][$catid]['boards'][$boardid] = array(
 				'id' => &$boards[$boardid]['id'],
@@ -433,64 +445,74 @@ 
 	loadIllegalGuestPermissions();
 
 	// Make sure only one of the quick options was selected.
-	if ((!empty($_POST['predefined']) && ((isset($_POST['copy_from']) && $_POST['copy_from'] != 'empty') || !empty($_POST['permissions']))) || (!empty($_POST['copy_from']) && $_POST['copy_from'] != 'empty' && !empty($_POST['permissions'])))
-		fatal_lang_error('permissions_only_one_option', false);
+	if ((!empty($_POST['predefined']) && ((isset($_POST['copy_from']) && $_POST['copy_from'] != 'empty') || !empty($_POST['permissions']))) || (!empty($_POST['copy_from']) && $_POST['copy_from'] != 'empty' && !empty($_POST['permissions']))) {
+			fatal_lang_error('permissions_only_one_option', false);
+	}
 
-	if (empty($_POST['group']) || !is_array($_POST['group']))
-		$_POST['group'] = array();
+	if (empty($_POST['group']) || !is_array($_POST['group'])) {
+			$_POST['group'] = array();
+	}
 
 	// Only accept numeric values for selected membergroups.
-	foreach ($_POST['group'] as $id => $group_id)
-		$_POST['group'][$id] = (int) $group_id;
+	foreach ($_POST['group'] as $id => $group_id) {
+			$_POST['group'][$id] = (int) $group_id;
+	}
 	$_POST['group'] = array_unique($_POST['group']);
 
-	if (empty($_REQUEST['pid']))
-		$_REQUEST['pid'] = 0;
-	else
-		$_REQUEST['pid'] = (int) $_REQUEST['pid'];
+	if (empty($_REQUEST['pid'])) {
+			$_REQUEST['pid'] = 0;
+	} else {
+			$_REQUEST['pid'] = (int) $_REQUEST['pid'];
+	}
 
 	// Fix up the old global to the new default!
 	$bid = max(1, $_REQUEST['pid']);
 
 	// No modifying the predefined profiles.
-	if ($_REQUEST['pid'] > 1 && $_REQUEST['pid'] < 5)
-		fatal_lang_error('no_access', false);
+	if ($_REQUEST['pid'] > 1 && $_REQUEST['pid'] < 5) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Clear out any cached authority.
 	updateSettings(array('settings_updated' => time()));
 
 	// No groups where selected.
-	if (empty($_POST['group']))
-		redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+	if (empty($_POST['group'])) {
+			redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+	}
 
 	// Set a predefined permission profile.
 	if (!empty($_POST['predefined']))
 	{
 		// Make sure it's a predefined permission set we expect.
-		if (!in_array($_POST['predefined'], array('restrict', 'standard', 'moderator', 'maintenance')))
-			redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+		if (!in_array($_POST['predefined'], array('restrict', 'standard', 'moderator', 'maintenance'))) {
+					redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+		}
 
 		foreach ($_POST['group'] as $group_id)
 		{
-			if (!empty($_REQUEST['pid']))
-				setPermissionLevel($_POST['predefined'], $group_id, $_REQUEST['pid']);
-			else
-				setPermissionLevel($_POST['predefined'], $group_id);
+			if (!empty($_REQUEST['pid'])) {
+							setPermissionLevel($_POST['predefined'], $group_id, $_REQUEST['pid']);
+			} else {
+							setPermissionLevel($_POST['predefined'], $group_id);
+			}
 		}
 	}
 	// Set a permission profile based on the permissions of a selected group.
 	elseif ($_POST['copy_from'] != 'empty')
 	{
 		// Just checking the input.
-		if (!is_numeric($_POST['copy_from']))
-			redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+		if (!is_numeric($_POST['copy_from'])) {
+					redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+		}
 
 		// Make sure the group we're copying to is never included.
 		$_POST['group'] = array_diff($_POST['group'], array($_POST['copy_from']));
 
 		// No groups left? Too bad.
-		if (empty($_POST['group']))
-			redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+		if (empty($_POST['group'])) {
+					redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+		}
 
 		if (empty($_REQUEST['pid']))
 		{
@@ -504,22 +526,26 @@ 
 				)
 			);
 			$target_perm = array();
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$target_perm[$row['permission']] = $row['add_deny'];
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$target_perm[$row['permission']] = $row['add_deny'];
+			}
 			$smcFunc['db_free_result']($request);
 
 			$inserts = array();
-			foreach ($_POST['group'] as $group_id)
-				foreach ($target_perm as $perm => $add_deny)
+			foreach ($_POST['group'] as $group_id) {
+							foreach ($target_perm as $perm => $add_deny)
 				{
 					// No dodgy permissions please!
 					if (!empty($context['illegal_permissions']) && in_array($perm, $context['illegal_permissions']))
 						continue;
-					if ($group_id == -1 && in_array($perm, $context['non_guest_permissions']))
-						continue;
+			}
+					if ($group_id == -1 && in_array($perm, $context['non_guest_permissions'])) {
+											continue;
+					}
 
-					if ($group_id != 1 && $group_id != 3)
-						$inserts[] = array($perm, $group_id, $add_deny);
+					if ($group_id != 1 && $group_id != 3) {
+											$inserts[] = array($perm, $group_id, $add_deny);
+					}
 				}
 
 			// Delete the previous permissions...
@@ -559,17 +585,19 @@ 
 			)
 		);
 		$target_perm = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$target_perm[$row['permission']] = $row['add_deny'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$target_perm[$row['permission']] = $row['add_deny'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		$inserts = array();
-		foreach ($_POST['group'] as $group_id)
-			foreach ($target_perm as $perm => $add_deny)
+		foreach ($_POST['group'] as $group_id) {
+					foreach ($target_perm as $perm => $add_deny)
 			{
 				// Are these for guests?
 				if ($group_id == -1 && in_array($perm, $context['non_guest_permissions']))
 					continue;
+		}
 
 				$inserts[] = array($perm, $group_id, $bid, $add_deny);
 			}
@@ -607,13 +635,14 @@ 
 		list ($permissionType, $permission) = explode('/', $_POST['permissions']);
 
 		// Check whether our input is within expected range.
-		if (!in_array($_POST['add_remove'], array('add', 'clear', 'deny')) || !in_array($permissionType, array('membergroup', 'board')))
-			redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+		if (!in_array($_POST['add_remove'], array('add', 'clear', 'deny')) || !in_array($permissionType, array('membergroup', 'board'))) {
+					redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+		}
 
 		if ($_POST['add_remove'] == 'clear')
 		{
-			if ($permissionType == 'membergroup')
-				$smcFunc['db_query']('', '
+			if ($permissionType == 'membergroup') {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}permissions
 					WHERE id_group IN ({array_int:current_group_list})
 						AND permission = {string:current_permission}
@@ -624,8 +653,8 @@ 
 						'illegal_permissions' => !empty($context['illegal_permissions']) ? $context['illegal_permissions'] : array(),
 					)
 				);
-			else
-				$smcFunc['db_query']('', '
+			} else {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}board_permissions
 					WHERE id_group IN ({array_int:current_group_list})
 						AND id_profile = {int:current_profile}
@@ -636,6 +665,7 @@ 
 						'current_permission' => $permission,
 					)
 				);
+			}
 		}
 		// Add a permission (either 'set' or 'deny').
 		else
@@ -644,32 +674,36 @@ 
 			$permChange = array();
 			foreach ($_POST['group'] as $groupID)
 			{
-				if ($groupID == -1 && in_array($permission, $context['non_guest_permissions']))
-					continue;
+				if ($groupID == -1 && in_array($permission, $context['non_guest_permissions'])) {
+									continue;
+				}
 
-				if ($permissionType == 'membergroup' && $groupID != 1 && $groupID != 3 && (empty($context['illegal_permissions']) || !in_array($permission, $context['illegal_permissions'])))
-					$permChange[] = array($permission, $groupID, $add_deny);
-				elseif ($permissionType != 'membergroup')
-					$permChange[] = array($permission, $groupID, $bid, $add_deny);
+				if ($permissionType == 'membergroup' && $groupID != 1 && $groupID != 3 && (empty($context['illegal_permissions']) || !in_array($permission, $context['illegal_permissions']))) {
+									$permChange[] = array($permission, $groupID, $add_deny);
+				} elseif ($permissionType != 'membergroup') {
+									$permChange[] = array($permission, $groupID, $bid, $add_deny);
+				}
 			}
 
 			if (!empty($permChange))
 			{
-				if ($permissionType == 'membergroup')
-					$smcFunc['db_insert']('replace',
+				if ($permissionType == 'membergroup') {
+									$smcFunc['db_insert']('replace',
 						'{db_prefix}permissions',
 						array('permission' => 'string', 'id_group' => 'int', 'add_deny' => 'int'),
 						$permChange,
 						array('permission', 'id_group')
 					);
+				}
 				// Board permissions go into the other table.
-				else
-					$smcFunc['db_insert']('replace',
+				else {
+									$smcFunc['db_insert']('replace',
 						'{db_prefix}board_permissions',
 						array('permission' => 'string', 'id_group' => 'int', 'id_profile' => 'int', 'add_deny' => 'int'),
 						$permChange,
 						array('permission', 'id_group', 'id_profile')
 					);
+				}
 			}
 		}
 
@@ -687,14 +721,16 @@ 
 {
 	global $context, $txt, $smcFunc, $modSettings;
 
-	if (!isset($_GET['group']))
-		fatal_lang_error('no_access', false);
+	if (!isset($_GET['group'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	$context['group']['id'] = (int) $_GET['group'];
 
 	// It's not likely you'd end up here with this setting disabled.
-	if ($_GET['group'] == 1)
-		redirectexit('action=admin;area=permissions');
+	if ($_GET['group'] == 1) {
+			redirectexit('action=admin;area=permissions');
+	}
 
 	loadAllPermissions();
 	loadPermissionProfiles();
@@ -715,13 +751,14 @@ 
 		$smcFunc['db_free_result']($result);
 
 		// Cannot edit an inherited group!
-		if ($parent != -2)
-			fatal_lang_error('cannot_edit_permissions_inherited');
+		if ($parent != -2) {
+					fatal_lang_error('cannot_edit_permissions_inherited');
+		}
+	} elseif ($context['group']['id'] == -1) {
+			$context['group']['name'] = $txt['membergroups_guests'];
+	} else {
+			$context['group']['name'] = $txt['membergroups_members'];
 	}
-	elseif ($context['group']['id'] == -1)
-		$context['group']['name'] = $txt['membergroups_guests'];
-	else
-		$context['group']['name'] = $txt['membergroups_members'];
 
 	$context['profile']['id'] = empty($_GET['pid']) ? 0 : (int) $_GET['pid'];
 
@@ -767,8 +804,9 @@ 
 				'current_group' => $_GET['group'],
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($result))
-			$permissions['membergroup'][empty($row['add_deny']) ? 'denied' : 'allowed'][] = $row['permission'];
+		while ($row = $smcFunc['db_fetch_assoc']($result)) {
+					$permissions['membergroup'][empty($row['add_deny']) ? 'denied' : 'allowed'][] = $row['permission'];
+		}
 		$smcFunc['db_free_result']($result);
 	}
 
@@ -783,8 +821,9 @@ 
 			'current_profile' => $context['permission_type'] == 'membergroup' ? 1 : $context['profile']['id'],
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($result))
-		$permissions['board'][empty($row['add_deny']) ? 'denied' : 'allowed'][] = $row['permission'];
+	while ($row = $smcFunc['db_fetch_assoc']($result)) {
+			$permissions['board'][empty($row['add_deny']) ? 'denied' : 'allowed'][] = $row['permission'];
+	}
 	$smcFunc['db_free_result']($result);
 
 	// Loop through each permission and set whether it's checked.
@@ -803,9 +842,9 @@ 
 					{
 						$curPerm['any']['select'] = in_array($perm['id'] . '_any', $permissions[$permissionType]['allowed']) ? 'on' : (in_array($perm['id'] . '_any', $permissions[$permissionType]['denied']) ? 'deny' : 'off');
 						$curPerm['own']['select'] = in_array($perm['id'] . '_own', $permissions[$permissionType]['allowed']) ? 'on' : (in_array($perm['id'] . '_own', $permissions[$permissionType]['denied']) ? 'deny' : 'off');
+					} else {
+											$curPerm['select'] = in_array($perm['id'], $permissions[$permissionType]['denied']) ? 'deny' : (in_array($perm['id'], $permissions[$permissionType]['allowed']) ? 'on' : 'off');
 					}
-					else
-						$curPerm['select'] = in_array($perm['id'], $permissions[$permissionType]['denied']) ? 'deny' : (in_array($perm['id'], $permissions[$permissionType]['allowed']) ? 'on' : 'off');
 
 						// Keep the last value if it's hidden.
 						if ($perm['hidden'] || $permissionArray['hidden'])
@@ -822,13 +861,13 @@ 
 									$perm['any']['id'],
 									$curPerm['any']['select'] == 'deny' && !empty($modSettings['permission_enable_deny']) ? 'deny' : $curPerm['any']['select'],
 								);
-							}
-							else
-								$context['hidden_perms'][] = array(
+							} else {
+															$context['hidden_perms'][] = array(
 									$permissionType,
 									$perm['id'],
 									$curPerm['select'] == 'deny' && !empty($modSettings['permission_enable_deny']) ? 'deny' : $curPerm['select'],
 								);
+							}
 						}
 				}
 			}
@@ -856,13 +895,14 @@ 
 	$_GET['pid'] = (int) $_GET['pid'];
 
 	// Cannot modify predefined profiles.
-	if ($_GET['pid'] > 1 && $_GET['pid'] < 5)
-		fatal_lang_error('no_access', false);
+	if ($_GET['pid'] > 1 && $_GET['pid'] < 5) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Verify this isn't inherited.
-	if ($_GET['group'] == -1 || $_GET['group'] == 0)
-		$parent = -2;
-	else
+	if ($_GET['group'] == -1 || $_GET['group'] == 0) {
+			$parent = -2;
+	} else
 	{
 		$result = $smcFunc['db_query']('', '
 			SELECT id_parent
@@ -877,8 +917,9 @@ 
 		$smcFunc['db_free_result']($result);
 	}
 
-	if ($parent != -2)
-		fatal_lang_error('cannot_edit_permissions_inherited');
+	if ($parent != -2) {
+			fatal_lang_error('cannot_edit_permissions_inherited');
+	}
 
 	$givePerms = array('membergroup' => array(), 'board' => array());
 
@@ -896,12 +937,13 @@ 
 		{
 			if (is_array($perm_array))
 			{
-				foreach ($perm_array as $permission => $value)
-					if ($value == 'on' || $value == 'deny')
+				foreach ($perm_array as $permission => $value) {
+									if ($value == 'on' || $value == 'deny')
 					{
 						// Don't allow people to escalate themselves!
 						if (!empty($context['illegal_permissions']) && in_array($permission, $context['illegal_permissions']))
 							continue;
+				}
 
 						$givePerms[$perm_type][] = array($_GET['group'], $permission, $value == 'deny' ? 0 : 1);
 					}
@@ -946,8 +988,9 @@ 
 	);
 	if (!empty($givePerms['board']))
 	{
-		foreach ($givePerms['board'] as $k => $v)
-			$givePerms['board'][$k][] = $profileid;
+		foreach ($givePerms['board'] as $k => $v) {
+					$givePerms['board'][$k][] = $profileid;
+		}
 		$smcFunc['db_insert']('replace',
 			'{db_prefix}board_permissions',
 			array('id_group' => 'int', 'permission' => 'string', 'add_deny' => 'int', 'id_profile' => 'int'),
@@ -988,8 +1031,9 @@ 
 
 	call_integration_hook('integrate_modify_permission_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	$context['page_title'] = $txt['permission_settings_title'];
 	$context['sub_template'] = 'show_settings';
@@ -1040,8 +1084,9 @@ 
 					'min_posts' => -1,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$post_groups[] = $row['id_group'];
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$post_groups[] = $row['id_group'];
+			}
 			$smcFunc['db_free_result']($request);
 
 			// Remove'em.
@@ -1250,16 +1295,19 @@ 
 	// Make sure we're not granting someone too many permissions!
 	foreach ($groupLevels['global'][$level] as $k => $permission)
 	{
-		if (!empty($context['illegal_permissions']) && in_array($permission, $context['illegal_permissions']))
-			unset($groupLevels['global'][$level][$k]);
+		if (!empty($context['illegal_permissions']) && in_array($permission, $context['illegal_permissions'])) {
+					unset($groupLevels['global'][$level][$k]);
+		}
 
-		if ($group == -1 && in_array($permission, $context['non_guest_permissions']))
-			unset($groupLevels['global'][$level][$k]);
+		if ($group == -1 && in_array($permission, $context['non_guest_permissions'])) {
+					unset($groupLevels['global'][$level][$k]);
+		}
 	}
-	if ($group == -1)
-		foreach ($groupLevels['board'][$level] as $k => $permission)
+	if ($group == -1) {
+			foreach ($groupLevels['board'][$level] as $k => $permission)
 			if (in_array($permission, $context['non_guest_permissions']))
 				unset($groupLevels['board'][$level][$k]);
+	}
 
 	// Reset all cached permissions.
 	updateSettings(array('settings_updated' => time()));
@@ -1269,8 +1317,9 @@ 
 	{
 		$group = (int) $group;
 
-		if (empty($groupLevels['global'][$level]))
-			return;
+		if (empty($groupLevels['global'][$level])) {
+					return;
+		}
 
 		$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}permissions
@@ -1292,8 +1341,9 @@ 
 		);
 
 		$groupInserts = array();
-		foreach ($groupLevels['global'][$level] as $permission)
-			$groupInserts[] = array($group, $permission);
+		foreach ($groupLevels['global'][$level] as $permission) {
+					$groupInserts[] = array($group, $permission);
+		}
 
 		$smcFunc['db_insert']('insert',
 			'{db_prefix}permissions',
@@ -1303,8 +1353,9 @@ 
 		);
 
 		$boardInserts = array();
-		foreach ($groupLevels['board'][$level] as $permission)
-			$boardInserts[] = array(1, $group, $permission);
+		foreach ($groupLevels['board'][$level] as $permission) {
+					$boardInserts[] = array(1, $group, $permission);
+		}
 
 		$smcFunc['db_insert']('insert',
 			'{db_prefix}board_permissions',
@@ -1335,8 +1386,9 @@ 
 		if (!empty($groupLevels['board'][$level]))
 		{
 			$boardInserts = array();
-			foreach ($groupLevels['board'][$level] as $permission)
-				$boardInserts[] = array($profile, $group, $permission);
+			foreach ($groupLevels['board'][$level] as $permission) {
+							$boardInserts[] = array($profile, $group, $permission);
+			}
 
 			$smcFunc['db_insert']('insert',
 				'{db_prefix}board_permissions',
@@ -1359,8 +1411,9 @@ 
 			)
 		);
 
-		if (empty($boardLevels[$level]))
-			return;
+		if (empty($boardLevels[$level])) {
+					return;
+		}
 
 		// Get all the groups...
 		$query = $smcFunc['db_query']('', '
@@ -1378,8 +1431,9 @@ 
 			$group = $row[0];
 
 			$boardInserts = array();
-			foreach ($boardLevels[$level] as $permission)
-				$boardInserts[] = array($profile, $group, $permission);
+			foreach ($boardLevels[$level] as $permission) {
+							$boardInserts[] = array($profile, $group, $permission);
+			}
 
 			$smcFunc['db_insert']('insert',
 				'{db_prefix}board_permissions',
@@ -1392,8 +1446,9 @@ 
 
 		// Add permissions for ungrouped members.
 		$boardInserts = array();
-		foreach ($boardLevels[$level] as $permission)
-			$boardInserts[] = array($profile, 0, $permission);
+		foreach ($boardLevels[$level] as $permission) {
+					$boardInserts[] = array($profile, 0, $permission);
+		}
 
 		$smcFunc['db_insert']('insert',
 				'{db_prefix}board_permissions',
@@ -1403,9 +1458,10 @@ 
 			);
 	}
 	// $profile and $group are both null!
-	else
-		fatal_lang_error('no_access', false);
-}
+	else {
+			fatal_lang_error('no_access', false);
+	}
+	}
 
 /**
  * Load permissions into $context['permissions'].
@@ -1606,15 +1662,17 @@ 
 		foreach ($permissionList as $permission => $permissionArray)
 		{
 			// If this is a guest permission we don't do it if it's the guest group.
-			if (isset($context['group']['id']) && $context['group']['id'] == -1 && in_array($permission, $context['non_guest_permissions']))
-				continue;
+			if (isset($context['group']['id']) && $context['group']['id'] == -1 && in_array($permission, $context['non_guest_permissions'])) {
+							continue;
+			}
 
 			// What groups will this permission be in?
 			$own_group = $permissionArray[1];
 
 			// First, Do these groups actually exist - if not add them.
-			if (!isset($permissionGroups[$permissionType][$own_group]))
-				$permissionGroups[$permissionType][$own_group] = true;
+			if (!isset($permissionGroups[$permissionType][$own_group])) {
+							$permissionGroups[$permissionType][$own_group] = true;
+			}
 
 			// What column should this be located into?
 			$position = !in_array($own_group, $leftPermissionGroups) ? 1 : 0;
@@ -1622,8 +1680,8 @@ 
 			// If the groups have not yet been created be sure to create them.
 			$bothGroups = array('own' => $own_group);
 
-			foreach ($bothGroups as $group)
-				if (!isset($context['permissions'][$permissionType]['columns'][$position][$group]))
+			foreach ($bothGroups as $group) {
+							if (!isset($context['permissions'][$permissionType]['columns'][$position][$group]))
 					$context['permissions'][$permissionType]['columns'][$position][$group] = array(
 						'type' => $permissionType,
 						'id' => $group,
@@ -1633,6 +1691,7 @@ 
 						'hidden' => false,
 						'permissions' => array()
 					);
+			}
 
 			$context['permissions'][$permissionType]['columns'][$position][$own_group]['permissions'][$permission] = array(
 				'id' => $permission,
@@ -1657,27 +1716,30 @@ 
 				{
 					$context['hidden_permissions'][] = $permission . '_own';
 					$context['hidden_permissions'][] = $permission . '_any';
+				} else {
+									$context['hidden_permissions'][] = $permission;
 				}
-				else
-					$context['hidden_permissions'][] = $permission;
 			}
 		}
 		ksort($context['permissions'][$permissionType]['columns']);
 
 		// Check we don't leave any empty groups - and mark hidden ones as such.
-		foreach ($context['permissions'][$permissionType]['columns'] as $column => $groups)
-			foreach ($groups as $id => $group)
+		foreach ($context['permissions'][$permissionType]['columns'] as $column => $groups) {
+					foreach ($groups as $id => $group)
 			{
 				if (empty($group['permissions']))
 					unset($context['permissions'][$permissionType]['columns'][$column][$id]);
+		}
 				else
 				{
 					$foundNonHidden = false;
-					foreach ($group['permissions'] as $permission)
-						if (empty($permission['hidden']))
+					foreach ($group['permissions'] as $permission) {
+											if (empty($permission['hidden']))
 							$foundNonHidden = true;
-					if (!$foundNonHidden)
-						$context['permissions'][$permissionType]['columns'][$column][$id]['hidden'] = true;
+					}
+					if (!$foundNonHidden) {
+											$context['permissions'][$permissionType]['columns'][$column][$id]['hidden'] = true;
+					}
 				}
 			}
 	}
@@ -1704,12 +1766,13 @@ 
 	$context['can_change_permissions'] = allowedTo('manage_permissions');
 
 	// Nothing to initialize here.
-	if (!$context['can_change_permissions'])
-		return;
+	if (!$context['can_change_permissions']) {
+			return;
+	}
 
 	// Load the permission settings for guests
-	foreach ($permissions as $permission)
-		$context[$permission] = array(
+	foreach ($permissions as $permission) {
+			$context[$permission] = array(
 			-1 => array(
 				'id' => -1,
 				'name' => $txt['membergroups_guests'],
@@ -1723,6 +1786,7 @@ 
 				'status' => 'off',
 			),
 		);
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT id_group, CASE WHEN add_deny = {int:denied} THEN {string:deny} ELSE {string:on} END AS status, permission
@@ -1736,8 +1800,9 @@ 
 			'on' => 'on',
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context[$row['permission']][$row['id_group']]['status'] = $row['status'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context[$row['permission']][$row['id_group']]['status'] = $row['status'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	$request = $smcFunc['db_query']('', '
@@ -1758,14 +1823,15 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Initialize each permission as being 'off' until proven otherwise.
-		foreach ($permissions as $permission)
-			if (!isset($context[$permission][$row['id_group']]))
+		foreach ($permissions as $permission) {
+					if (!isset($context[$permission][$row['id_group']]))
 				$context[$permission][$row['id_group']] = array(
 					'id' => $row['id_group'],
 					'name' => $row['group_name'],
 					'is_postgroup' => $row['min_posts'] != -1,
 					'status' => 'off',
 				);
+		}
 
 		$context[$row['permission']][$row['id_group']]['status'] = empty($row['status']) ? 'deny' : ($row['status'] == 1 ? 'on' : 'off');
 	}
@@ -1779,8 +1845,9 @@ 
 	{
 		foreach ($permissions as $permission)
 		{
-			if (isset($context[$permission][$group]))
-				unset($context[$permission][$group]);
+			if (isset($context[$permission][$group])) {
+							unset($context[$permission][$group]);
+			}
 		}
 	}
 
@@ -1788,8 +1855,9 @@ 
 	$non_guest_perms = array_intersect(str_replace(array('_any', '_own'), '', $permissions), $context['non_guest_permissions']);
 	foreach ($non_guest_perms as $permission)
 	{
-		if (isset($context[$permission][-1]))
-			unset($context[$permission][-1]);
+		if (isset($context[$permission][-1])) {
+					unset($context[$permission][-1]);
+		}
 	}
 
 	// Create the token for the separate inline permission verification.
@@ -1824,8 +1892,9 @@ 
 	global $context, $smcFunc;
 
 	// No permissions? Not a great deal to do here.
-	if (!allowedTo('manage_permissions'))
-		return;
+	if (!allowedTo('manage_permissions')) {
+			return;
+	}
 
 	// Almighty session check, verify our ways.
 	checkSession();
@@ -1837,13 +1906,15 @@ 
 	$insertRows = array();
 	foreach ($permissions as $permission)
 	{
-		if (!isset($_POST[$permission]))
-			continue;
+		if (!isset($_POST[$permission])) {
+					continue;
+		}
 
 		foreach ($_POST[$permission] as $id_group => $value)
 		{
-			if (in_array($value, array('on', 'deny')) && (empty($context['illegal_permissions']) || !in_array($permission, $context['illegal_permissions'])))
-				$insertRows[] = array((int) $id_group, $permission, $value == 'on' ? 1 : 0);
+			if (in_array($value, array('on', 'deny')) && (empty($context['illegal_permissions']) || !in_array($permission, $context['illegal_permissions']))) {
+							$insertRows[] = array((int) $id_group, $permission, $value == 'on' ? 1 : 0);
+			}
 		}
 	}
 
@@ -1859,13 +1930,14 @@ 
 	);
 
 	// ...and replace them with new ones.
-	if (!empty($insertRows))
-		$smcFunc['db_insert']('insert',
+	if (!empty($insertRows)) {
+			$smcFunc['db_insert']('insert',
 			'{db_prefix}permissions',
 			array('id_group' => 'int', 'permission' => 'string', 'add_deny' => 'int'),
 			$insertRows,
 			array('id_group', 'permission')
 		);
+	}
 
 	// Do a full child update.
 	updateChildPermissions(array(), -1);
@@ -1892,10 +1964,11 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Format the label nicely.
-		if (isset($txt['permissions_profile_' . $row['profile_name']]))
-			$name = $txt['permissions_profile_' . $row['profile_name']];
-		else
-			$name = $row['profile_name'];
+		if (isset($txt['permissions_profile_' . $row['profile_name']])) {
+					$name = $txt['permissions_profile_' . $row['profile_name']];
+		} else {
+					$name = $row['profile_name'];
+		}
 
 		$context['profiles'][$row['id_profile']] = array(
 			'id' => $row['id_profile'],
@@ -1950,17 +2023,19 @@ 
 			)
 		);
 		$inserts = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$inserts[] = array($profile_id, $row['id_group'], $row['permission'], $row['add_deny']);
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$inserts[] = array($profile_id, $row['id_group'], $row['permission'], $row['add_deny']);
+		}
 		$smcFunc['db_free_result']($request);
 
-		if (!empty($inserts))
-			$smcFunc['db_insert']('insert',
+		if (!empty($inserts)) {
+					$smcFunc['db_insert']('insert',
 				'{db_prefix}board_permissions',
 				array('id_profile' => 'int', 'id_group' => 'int', 'permission' => 'string', 'add_deny' => 'int'),
 				$inserts,
 				array('id_profile', 'id_group', 'permission')
 			);
+		}
 	}
 	// Renaming?
 	elseif (isset($_POST['rename']))
@@ -1969,16 +2044,16 @@ 
 		validateToken('admin-mpp');
 
 		// Just showing the boxes?
-		if (!isset($_POST['rename_profile']))
-			$context['show_rename_boxes'] = true;
-		else
+		if (!isset($_POST['rename_profile'])) {
+					$context['show_rename_boxes'] = true;
+		} else
 		{
 			foreach ($_POST['rename_profile'] as $id => $value)
 			{
 				$value = $smcFunc['htmlspecialchars']($value);
 
-				if (trim($value) != '' && $id > 4)
-					$smcFunc['db_query']('', '
+				if (trim($value) != '' && $id > 4) {
+									$smcFunc['db_query']('', '
 						UPDATE {db_prefix}permission_profiles
 						SET profile_name = {string:profile_name}
 						WHERE id_profile = {int:current_profile}',
@@ -1987,6 +2062,7 @@ 
 							'profile_name' => $value,
 						)
 					);
+				}
 			}
 		}
 	}
@@ -1997,9 +2073,10 @@ 
 		validateToken('admin-mpp');
 
 		$profiles = array();
-		foreach ($_POST['delete_profile'] as $profile)
-			if ($profile > 4)
+		foreach ($_POST['delete_profile'] as $profile) {
+					if ($profile > 4)
 				$profiles[] = (int) $profile;
+		}
 
 		// Verify it's not in use...
 		$request = $smcFunc['db_query']('', '
@@ -2011,8 +2088,9 @@ 
 				'profile_list' => $profiles,
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) != 0)
-			fatal_lang_error('no_access', false);
+		if ($smcFunc['db_num_rows']($request) != 0) {
+					fatal_lang_error('no_access', false);
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Oh well, delete.
@@ -2036,10 +2114,11 @@ 
 		array(
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		if (isset($context['profiles'][$row['id_profile']]))
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			if (isset($context['profiles'][$row['id_profile']]))
 		{
 			$context['profiles'][$row['id_profile']]['in_use'] = true;
+	}
 			$context['profiles'][$row['id_profile']]['boards'] = $row['board_count'];
 			$context['profiles'][$row['id_profile']]['boards_text'] = $row['board_count'] > 1 ? sprintf($txt['permissions_profile_used_by_many'], $row['board_count']) : $txt['permissions_profile_used_by_' . ($row['board_count'] ? 'one' : 'none')];
 		}
@@ -2051,8 +2130,9 @@ 
 	{
 		// Can't delete special ones.
 		$context['profiles'][$id]['can_edit'] = isset($txt['permissions_profile_' . $profile['unformatted_name']]) ? false : true;
-		if ($context['profiles'][$id]['can_edit'])
-			$context['can_edit_something'] = true;
+		if ($context['profiles'][$id]['can_edit']) {
+					$context['can_edit_something'] = true;
+		}
 
 		// You can only delete it if you can edit it AND it's not in use.
 		$context['profiles'][$id]['can_delete'] = $context['profiles'][$id]['can_edit'] && empty($profile['in_use']) ? true : false;
@@ -2073,8 +2153,9 @@ 
 	global $smcFunc;
 
 	// All the parent groups to sort out.
-	if (!is_array($parents))
-		$parents = array($parents);
+	if (!is_array($parents)) {
+			$parents = array($parents);
+	}
 
 	// Find all the children of this group.
 	$request = $smcFunc['db_query']('', '
@@ -2101,8 +2182,9 @@ 
 	$parents = array_unique($parents);
 
 	// Not a sausage, or a child?
-	if (empty($children))
-		return false;
+	if (empty($children)) {
+			return false;
+	}
 
 	// First off, are we doing general permissions?
 	if ($profile < 1 || $profile === null)
@@ -2117,9 +2199,10 @@ 
 			)
 		);
 		$permissions = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			foreach ($children[$row['id_group']] as $child)
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					foreach ($children[$row['id_group']] as $child)
 				$permissions[] = array($child, $row['permission'], $row['add_deny']);
+		}
 		$smcFunc['db_free_result']($request);
 
 		$smcFunc['db_query']('', '
@@ -2159,9 +2242,10 @@ 
 			)
 		);
 		$permissions = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			foreach ($children[$row['id_group']] as $child)
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					foreach ($children[$row['id_group']] as $child)
 				$permissions[] = array($child, $row['id_profile'], $row['permission'], $row['add_deny']);
+		}
 		$smcFunc['db_free_result']($request);
 
 		$smcFunc['db_query']('', '
@@ -2195,12 +2279,15 @@ 
 	global $context;
 
 	$context['illegal_permissions'] = array();
-	if (!allowedTo('admin_forum'))
-		$context['illegal_permissions'][] = 'admin_forum';
-	if (!allowedTo('manage_membergroups'))
-		$context['illegal_permissions'][] = 'manage_membergroups';
-	if (!allowedTo('manage_permissions'))
-		$context['illegal_permissions'][] = 'manage_permissions';
+	if (!allowedTo('admin_forum')) {
+			$context['illegal_permissions'][] = 'admin_forum';
+	}
+	if (!allowedTo('manage_membergroups')) {
+			$context['illegal_permissions'][] = 'manage_membergroups';
+	}
+	if (!allowedTo('manage_permissions')) {
+			$context['illegal_permissions'][] = 'manage_permissions';
+	}
 
 	call_integration_hook('integrate_load_illegal_permissions');
 }
@@ -2349,16 +2436,17 @@ 
 				'attachment' => 'disallow',
 				'children' => array(),
 			);
+		} elseif (isset($context['profile_groups'][$row['id_parent']])) {
+					$context['profile_groups'][$row['id_parent']]['children'][] = $row['group_name'];
 		}
-		elseif (isset($context['profile_groups'][$row['id_parent']]))
-			$context['profile_groups'][$row['id_parent']]['children'][] = $row['group_name'];
 	}
 	$smcFunc['db_free_result']($request);
 
 	// What are the permissions we are querying?
 	$all_permissions = array();
-	foreach ($mappings as $perm_set)
-		$all_permissions = array_merge($all_permissions, $perm_set);
+	foreach ($mappings as $perm_set) {
+			$all_permissions = array_merge($all_permissions, $perm_set);
+	}
 
 	// If we're saving the changes then do just that - save them.
 	if (!empty($_POST['save_changes']) && ($context['current_profile'] == 1 || $context['current_profile'] > 4))
@@ -2373,8 +2461,7 @@ 
 			{
 				// Turning it on. This seems easy enough.
 				updateSettings(array('postmod_active' => 1));
-			}
-			else
+			} else
 			{
 				// Turning it off. Not so straightforward. We have to turn off warnings to moderation level, and make everything approved.
 				updateSettings(array(
@@ -2385,8 +2472,7 @@ 
 				require_once($sourcedir . '/PostModeration.php');
 				approveAllData();
 			}
-		}
-		elseif ($modSettings['postmod_active'])
+		} elseif ($modSettings['postmod_active'])
 		{
 			// We're not saving a new setting - and if it's still enabled we have more work to do.
 
@@ -2416,21 +2502,22 @@ 
 							// Give them both sets for fun.
 							$new_permissions[] = array($context['current_profile'], $group['id'], $data[0], 1);
 							$new_permissions[] = array($context['current_profile'], $group['id'], $data[1], 1);
+						} elseif ($_POST[$index][$group['id']] == 'moderate') {
+													$new_permissions[] = array($context['current_profile'], $group['id'], $data[1], 1);
 						}
-						elseif ($_POST[$index][$group['id']] == 'moderate')
-							$new_permissions[] = array($context['current_profile'], $group['id'], $data[1], 1);
 					}
 				}
 			}
 
 			// Insert new permissions.
-			if (!empty($new_permissions))
-				$smcFunc['db_insert']('',
+			if (!empty($new_permissions)) {
+							$smcFunc['db_insert']('',
 					'{db_prefix}board_permissions',
 					array('id_profile' => 'int', 'id_group' => 'int', 'permission' => 'string', 'add_deny' => 'int'),
 					$new_permissions,
 					array('id_profile', 'id_group', 'permission')
 				);
+			}
 		}
 	}
 
@@ -2459,11 +2546,13 @@ 
 					if ($row['add_deny'])
 					{
 						// Full allowance?
-						if ($index == 0)
-							$context['profile_groups'][$row['id_group']][$key] = 'allow';
+						if ($index == 0) {
+													$context['profile_groups'][$row['id_group']][$key] = 'allow';
+						}
 						// Otherwise only bother with moderate if not on allow.
-						elseif ($context['profile_groups'][$row['id_group']][$key] != 'allow')
-							$context['profile_groups'][$row['id_group']][$key] = 'moderate';
+						elseif ($context['profile_groups'][$row['id_group']][$key] != 'allow') {
+													$context['profile_groups'][$row['id_group']][$key] = 'moderate';
+						}
 					}
 				}
 			}

Sources/ManageBans.php

Braces +258 added lines, -207 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Ban center. The main entrance point for all ban center functions.
@@ -120,10 +121,11 @@ 
 	}
 
 	// Create a date string so we don't overload them with date info.
-	if (preg_match('~%[AaBbCcDdeGghjmuYy](?:[^%]*%[AaBbCcDdeGghjmuYy])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0]))
-		$context['ban_time_format'] = $user_info['time_format'];
-	else
-		$context['ban_time_format'] = $matches[0];
+	if (preg_match('~%[AaBbCcDdeGghjmuYy](?:[^%]*%[AaBbCcDdeGghjmuYy])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0])) {
+			$context['ban_time_format'] = $user_info['time_format'];
+	} else {
+			$context['ban_time_format'] = $matches[0];
+	}
 
 	$listOptions = array(
 		'id' => 'ban_list',
@@ -201,16 +203,19 @@ 
 					'function' => function($rowData) use ($txt)
 					{
 						// This ban never expires...whahaha.
-						if ($rowData['expire_time'] === null)
-							return $txt['never'];
+						if ($rowData['expire_time'] === null) {
+													return $txt['never'];
+						}
 
 						// This ban has already expired.
-						elseif ($rowData['expire_time'] < time())
-							return sprintf('<span class="red">%1$s</span>', $txt['ban_expired']);
+						elseif ($rowData['expire_time'] < time()) {
+													return sprintf('<span class="red">%1$s</span>', $txt['ban_expired']);
+						}
 
 						// Still need to wait a few days for this ban to expire.
-						else
-							return sprintf('%1$d&nbsp;%2$s', ceil(($rowData['expire_time'] - time()) / (60 * 60 * 24)), $txt['ban_days']);
+						else {
+													return sprintf('%1$d&nbsp;%2$s', ceil(($rowData['expire_time'] - time()) / (60 * 60 * 24)), $txt['ban_days']);
+						}
 					},
 				),
 				'sort' => array(
@@ -309,8 +314,9 @@ 
 		)
 	);
 	$bans = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$bans[] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$bans[] = $row;
+	}
 
 	$smcFunc['db_free_result']($request);
 
@@ -352,8 +358,9 @@ 
 {
 	global $txt, $modSettings, $context, $scripturl, $smcFunc, $sourcedir;
 
-	if ((isset($_POST['add_ban']) || isset($_POST['modify_ban']) || isset($_POST['remove_selection'])) && empty($context['ban_errors']))
-		BanEdit2();
+	if ((isset($_POST['add_ban']) || isset($_POST['modify_ban']) || isset($_POST['remove_selection'])) && empty($context['ban_errors'])) {
+			BanEdit2();
+	}
 
 	$ban_group_id = isset($context['ban']['id']) ? $context['ban']['id'] : (isset($_REQUEST['bg']) ? (int) $_REQUEST['bg'] : 0);
 
@@ -364,10 +371,10 @@ 
 
 	if (!empty($context['ban_errors']))
 	{
-		foreach ($context['ban_errors'] as $error)
-			$context['error_messages'][$error] = $txt[$error];
-	}
-	else
+		foreach ($context['ban_errors'] as $error) {
+					$context['error_messages'][$error] = $txt[$error];
+		}
+	} else
 	{
 		// If we're editing an existing ban, get it from the database.
 		if (!empty($ban_group_id))
@@ -403,12 +410,13 @@ 
 						'data' => array(
 							'function' => function($ban_item) use ($txt)
 							{
-								if (in_array($ban_item['type'], array('ip', 'hostname', 'email')))
-									return '<strong>' . $txt[$ban_item['type']] . ':</strong>&nbsp;' . $ban_item[$ban_item['type']];
-								elseif ($ban_item['type'] == 'user')
-									return '<strong>' . $txt['username'] . ':</strong>&nbsp;' . $ban_item['user']['link'];
-								else
-									return '<strong>' . $txt['unknown'] . ':</strong>&nbsp;' . $ban_item['no_bantype_selected'];
+								if (in_array($ban_item['type'], array('ip', 'hostname', 'email'))) {
+																	return '<strong>' . $txt[$ban_item['type']] . ':</strong>&nbsp;' . $ban_item[$ban_item['type']];
+								} elseif ($ban_item['type'] == 'user') {
+																	return '<strong>' . $txt['username'] . ':</strong>&nbsp;' . $ban_item['user']['link'];
+								} else {
+																	return '<strong>' . $txt['unknown'] . ':</strong>&nbsp;' . $ban_item['no_bantype_selected'];
+								}
 							},
 							'style' => 'text-align: left;',
 						),
@@ -546,8 +554,9 @@ 
 					$context['ban']['from_user'] = true;
 
 					// Would be nice if we could also ban the hostname.
-					if ((preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $context['ban_suggestions']['main_ip']) == 1 || isValidIPv6($context['ban_suggestions']['main_ip'])) && empty($modSettings['disableHostnameLookup']))
-						$context['ban_suggestions']['hostname'] = host_from_ip($context['ban_suggestions']['main_ip']);
+					if ((preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $context['ban_suggestions']['main_ip']) == 1 || isValidIPv6($context['ban_suggestions']['main_ip'])) && empty($modSettings['disableHostnameLookup'])) {
+											$context['ban_suggestions']['hostname'] = host_from_ip($context['ban_suggestions']['main_ip']);
+					}
 
 					$context['ban_suggestions']['other_ips'] = banLoadAdditionalIPs($context['ban_suggestions']['member']['id']);
 				}
@@ -615,8 +624,9 @@ 
 			'items_per_page' => $items_per_page,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('ban_not_found', false);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('ban_not_found', false);
+	}
 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
@@ -653,18 +663,15 @@ 
 			{
 				$ban_items[$row['id_ban']]['type'] = 'ip';
 				$ban_items[$row['id_ban']]['ip'] = range2ip($row['ip_low'], $row['ip_high']);
-			}
-			elseif (!empty($row['hostname']))
+			} elseif (!empty($row['hostname']))
 			{
 				$ban_items[$row['id_ban']]['type'] = 'hostname';
 				$ban_items[$row['id_ban']]['hostname'] = str_replace('%', '*', $row['hostname']);
-			}
-			elseif (!empty($row['email_address']))
+			} elseif (!empty($row['email_address']))
 			{
 				$ban_items[$row['id_ban']]['type'] = 'email';
 				$ban_items[$row['id_ban']]['email'] = str_replace('%', '*', $row['email_address']);
-			}
-			elseif (!empty($row['id_member']))
+			} elseif (!empty($row['id_member']))
 			{
 				$ban_items[$row['id_ban']]['type'] = 'user';
 				$ban_items[$row['id_ban']]['user'] = array(
@@ -730,9 +737,10 @@ 
 	$search_list += array('ips_in_messages' => 'banLoadAdditionalIPsMember', 'ips_in_errors' => 'banLoadAdditionalIPsError');
 
 	$return = array();
-	foreach ($search_list as $key => $callable)
-		if (is_callable($callable))
+	foreach ($search_list as $key => $callable) {
+			if (is_callable($callable))
 			$return[$key] = call_user_func($callable, $member_id);
+	}
 
 	return $return;
 }
@@ -757,8 +765,9 @@ 
 			'current_user' => $member_id,
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$message_ips[] = inet_dtop($row['poster_ip']);
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$message_ips[] = inet_dtop($row['poster_ip']);
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $message_ips;
@@ -783,8 +792,9 @@ 
 			'current_user' => $member_id,
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-	    $error_ips[] = inet_dtop($row['ip']);
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+		    $error_ips[] = inet_dtop($row['ip']);
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $error_ips;
@@ -825,11 +835,13 @@ 
 		$ban_info['cannot']['login'] = !empty($ban_info['full_ban']) || empty($_POST['cannot_login']) ? 0 : 1;
 
 		// Adding a new ban group
-		if (empty($_REQUEST['bg']))
-			$ban_group_id = insertBanGroup($ban_info);
+		if (empty($_REQUEST['bg'])) {
+					$ban_group_id = insertBanGroup($ban_info);
+		}
 		// Editing an existing ban group
-		else
-			$ban_group_id = updateBanGroup($ban_info);
+		else {
+					$ban_group_id = updateBanGroup($ban_info);
+		}
 
 		if (is_numeric($ban_group_id))
 		{
@@ -840,9 +852,10 @@ 
 		$context['ban'] = $ban_info;
 	}
 
-	if (isset($_POST['ban_suggestions']))
-		// @TODO: is $_REQUEST['bi'] ever set?
+	if (isset($_POST['ban_suggestions'])) {
+			// @TODO: is $_REQUEST['bi'] ever set?
 		$saved_triggers = saveTriggers($_POST['ban_suggestions'], $ban_info['id'], isset($_REQUEST['u']) ? (int) $_REQUEST['u'] : 0, isset($_REQUEST['bi']) ? (int) $_REQUEST['bi'] : 0);
+	}
 
 	// Something went wrong somewhere... Oh well, let's go back.
 	if (!empty($context['ban_errors']))
@@ -852,8 +865,9 @@ 
 		$context['ban_suggestions'] = array_merge($context['ban_suggestions'], getMemberData((int) $_REQUEST['u']));
 
 		// Not strictly necessary, but it's nice
-		if (!empty($context['ban_suggestions']['member']['id']))
-			$context['ban_suggestions']['other_ips'] = banLoadAdditionalIPs($context['ban_suggestions']['member']['id']);
+		if (!empty($context['ban_suggestions']['member']['id'])) {
+					$context['ban_suggestions']['other_ips'] = banLoadAdditionalIPs($context['ban_suggestions']['member']['id']);
+		}
 		return BanEdit();
 	}
 	$context['ban_suggestions']['saved_triggers'] = !empty($saved_triggers) ? $saved_triggers : array();
@@ -900,10 +914,11 @@ 
 
 	foreach ($suggestions as $key => $value)
 	{
-		if (is_array($value))
-			$triggers[$key] = $value;
-		else
-			$triggers[$value] = !empty($_POST[$value]) ? $_POST[$value] : '';
+		if (is_array($value)) {
+					$triggers[$key] = $value;
+		} else {
+					$triggers[$value] = !empty($_POST[$value]) ? $_POST[$value] : '';
+		}
 	}
 
 	$ban_triggers = validateTriggers($triggers);
@@ -911,16 +926,18 @@ 
 	// Time to save!
 	if (!empty($ban_triggers['ban_triggers']) && empty($context['ban_errors']))
 	{
-		if (empty($ban_id))
-			addTriggers($ban_group, $ban_triggers['ban_triggers'], $ban_triggers['log_info']);
-		else
-			updateTriggers($ban_id, $ban_group, array_shift($ban_triggers['ban_triggers']), $ban_triggers['log_info']);
+		if (empty($ban_id)) {
+					addTriggers($ban_group, $ban_triggers['ban_triggers'], $ban_triggers['log_info']);
+		} else {
+					updateTriggers($ban_id, $ban_group, array_shift($ban_triggers['ban_triggers']), $ban_triggers['log_info']);
+		}
+	}
+	if (!empty($context['ban_errors'])) {
+			return $triggers;
+	} else {
+			return false;
+	}
 	}
-	if (!empty($context['ban_errors']))
-		return $triggers;
-	else
-		return false;
-}
 
 /**
  * This function removes a bunch of triggers based on ids
@@ -934,14 +951,17 @@ 
 {
 	global $smcFunc, $scripturl;
 
-	if ($group_id !== false)
-		$group_id = (int) $group_id;
+	if ($group_id !== false) {
+			$group_id = (int) $group_id;
+	}
 
-	if (empty($group_id) && empty($items_ids))
-		return false;
+	if (empty($group_id) && empty($items_ids)) {
+			return false;
+	}
 
-	if (!is_array($items_ids))
-		$items_ids = array($items_ids);
+	if (!is_array($items_ids)) {
+			$items_ids = array($items_ids);
+	}
 
 	$log_info = array();
 	$ban_items = array();
@@ -979,8 +999,7 @@ 
 					'bantype' => ($is_range ? 'ip_range' : 'main_ip'),
 					'value' => $ban_items[$row['id_ban']]['ip'],
 				);
-			}
-			elseif (!empty($row['hostname']))
+			} elseif (!empty($row['hostname']))
 			{
 				$ban_items[$row['id_ban']]['type'] = 'hostname';
 				$ban_items[$row['id_ban']]['hostname'] = str_replace('%', '*', $row['hostname']);
@@ -988,8 +1007,7 @@ 
 					'bantype' => 'hostname',
 					'value' => $row['hostname'],
 				);
-			}
-			elseif (!empty($row['email_address']))
+			} elseif (!empty($row['email_address']))
 			{
 				$ban_items[$row['id_ban']]['type'] = 'email';
 				$ban_items[$row['id_ban']]['email'] = str_replace('%', '*', $row['email_address']);
@@ -997,8 +1015,7 @@ 
 					'bantype' => 'email',
 					'value' => $ban_items[$row['id_ban']]['email'],
 				);
-			}
-			elseif (!empty($row['id_member']))
+			} elseif (!empty($row['id_member']))
 			{
 				$ban_items[$row['id_ban']]['type'] = 'user';
 				$ban_items[$row['id_ban']]['user'] = array(
@@ -1031,8 +1048,7 @@ 
 				'ban_group' => $group_id,
 			)
 		);
-	}
-	elseif (!empty($items_ids))
+	} elseif (!empty($items_ids))
 	{
 		$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}ban_items
@@ -1057,13 +1073,15 @@ 
 {
 	global $smcFunc;
 
-	if (!is_array($group_ids))
-		$group_ids = array($group_ids);
+	if (!is_array($group_ids)) {
+			$group_ids = array($group_ids);
+	}
 
 	$group_ids = array_unique($group_ids);
 
-	if (empty($group_ids))
-		return false;
+	if (empty($group_ids)) {
+			return false;
+	}
 
 	$smcFunc['db_query']('', '
 		DELETE FROM {db_prefix}ban_groups
@@ -1087,21 +1105,23 @@ 
 {
 	global $smcFunc;
 
-	if (empty($ids))
-		$smcFunc['db_query']('truncate_table', '
+	if (empty($ids)) {
+			$smcFunc['db_query']('truncate_table', '
 			TRUNCATE {db_prefix}log_banned',
 			array(
 			)
 		);
-	else
+	} else
 	{
-		if (!is_array($ids))
-			$ids = array($ids);
+		if (!is_array($ids)) {
+					$ids = array($ids);
+		}
 
 		$ids = array_unique($ids);
 
-		if (empty($ids))
-			return false;
+		if (empty($ids)) {
+					return false;
+		}
 
 		$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}log_banned
@@ -1127,8 +1147,9 @@ 
 {
 	global $context, $smcFunc;
 
-	if (empty($triggers))
-		$context['ban_erros'][] = 'ban_empty_triggers';
+	if (empty($triggers)) {
+			$context['ban_erros'][] = 'ban_empty_triggers';
+	}
 
 	$ban_triggers = array();
 	$log_info = array();
@@ -1137,39 +1158,39 @@ 
 	{
 		if (!empty($value))
 		{
-			if ($key == 'member')
-				continue;
+			if ($key == 'member') {
+							continue;
+			}
 
 			if ($key == 'main_ip')
 			{
 				$value = trim($value);
 				$ip_parts = ip2range($value);
-				if (!checkExistingTriggerIP($ip_parts, $value))
-					$context['ban_erros'][] = 'invalid_ip';
-				else
+				if (!checkExistingTriggerIP($ip_parts, $value)) {
+									$context['ban_erros'][] = 'invalid_ip';
+				} else
 				{
 					$ban_triggers['main_ip'] = array(
 						'ip_low' => $ip_parts['low'],
 						'ip_high' => $ip_parts['high']
 					);
 				}
-			}
-			elseif ($key == 'hostname')
+			} elseif ($key == 'hostname')
 			{
-				if (preg_match('/[^\w.\-*]/', $value) == 1)
-					$context['ban_erros'][] = 'invalid_hostname';
-				else
+				if (preg_match('/[^\w.\-*]/', $value) == 1) {
+									$context['ban_erros'][] = 'invalid_hostname';
+				} else
 				{
 					// Replace the * wildcard by a MySQL wildcard %.
 					$value = substr(str_replace('*', '%', $value), 0, 255);
 
 					$ban_triggers['hostname']['hostname'] = $value;
 				}
-			}
-			elseif ($key == 'email')
+			} elseif ($key == 'email')
 			{
-				if (preg_match('/[^\w.\-\+*@]/', $value) == 1)
-					$context['ban_erros'][] = 'invalid_email';
+				if (preg_match('/[^\w.\-\+*@]/', $value) == 1) {
+									$context['ban_erros'][] = 'invalid_email';
+				}
 
 				// Check the user is not banning an admin.
 				$request = $smcFunc['db_query']('', '
@@ -1183,15 +1204,15 @@ 
 						'email' => $value,
 					)
 				);
-				if ($smcFunc['db_num_rows']($request) != 0)
-					$context['ban_erros'][] = 'no_ban_admin';
+				if ($smcFunc['db_num_rows']($request) != 0) {
+									$context['ban_erros'][] = 'no_ban_admin';
+				}
 				$smcFunc['db_free_result']($request);
 
 				$value = substr(strtolower(str_replace('*', '%', $value)), 0, 255);
 
 				$ban_triggers['email']['email_address'] = $value;
-			}
-			elseif ($key == 'user')
+			} elseif ($key == 'user')
 			{
 				$user = preg_replace('~&amp;#(\d{4,5}|[2-9]\d{2,4}|1[2-9]\d);~', '&#$1;', $smcFunc['htmlspecialchars']($value, ENT_QUOTES));
 
@@ -1205,8 +1226,9 @@ 
 						'username' => $user,
 					)
 				);
-				if ($smcFunc['db_num_rows']($request) == 0)
-					$context['ban_erros'][] = 'invalid_username';
+				if ($smcFunc['db_num_rows']($request) == 0) {
+									$context['ban_erros'][] = 'invalid_username';
+				}
 				list ($value, $isAdmin) = $smcFunc['db_fetch_row']($request);
 				$smcFunc['db_free_result']($request);
 
@@ -1214,25 +1236,25 @@ 
 				{
 					unset($value);
 					$context['ban_erros'][] = 'no_ban_admin';
+				} else {
+									$ban_triggers['user']['id_member'] = $value;
 				}
-				else
-					$ban_triggers['user']['id_member'] = $value;
-			}
-			elseif (in_array($key, array('ips_in_messages', 'ips_in_errors')))
+			} elseif (in_array($key, array('ips_in_messages', 'ips_in_errors')))
 			{
 				// Special case, those two are arrays themselves
 				$values = array_unique($value);
 				// Don't add the main IP again.
-				if (isset($triggers['main_ip']))
-					$values = array_diff($values, array($triggers['main_ip']));
+				if (isset($triggers['main_ip'])) {
+									$values = array_diff($values, array($triggers['main_ip']));
+				}
 				unset($value);
 				foreach ($values as $val)
 				{
 					$val = trim($val);
 					$ip_parts = ip2range($val);
-					if (!checkExistingTriggerIP($ip_parts, $val))
-						$context['ban_erros'][] = 'invalid_ip';
-					else
+					if (!checkExistingTriggerIP($ip_parts, $val)) {
+											$context['ban_erros'][] = 'invalid_ip';
+					} else
 					{
 						$ban_triggers[$key][] = array(
 							'ip_low' => $ip_parts['low'],
@@ -1245,15 +1267,16 @@ 
 						);
 					}
 				}
+			} else {
+							$context['ban_erros'][] = 'no_bantype_selected';
 			}
-			else
-				$context['ban_erros'][] = 'no_bantype_selected';
 
-			if (isset($value) && !is_array($value))
-				$log_info[] = array(
+			if (isset($value) && !is_array($value)) {
+							$log_info[] = array(
 					'value' => $value,
 					'bantype' => $key,
 				);
+			}
 		}
 	}
 	return array('ban_triggers' => $ban_triggers, 'log_info' => $log_info);
@@ -1273,8 +1296,9 @@ 
 {
 	global $smcFunc, $context;
 
-	if (empty($group_id))
-		$context['ban_errors'][] = 'ban_id_empty';
+	if (empty($group_id)) {
+			$context['ban_errors'][] = 'ban_id_empty';
+	}
 
 	// Preset all values that are required.
 	$values = array(
@@ -1299,18 +1323,21 @@ 
 	foreach ($triggers as $key => $trigger)
 	{
 		// Exceptions, exceptions, exceptions...always exceptions... :P
-		if (in_array($key, array('ips_in_messages', 'ips_in_errors')))
-			foreach ($trigger as $real_trigger)
+		if (in_array($key, array('ips_in_messages', 'ips_in_errors'))) {
+					foreach ($trigger as $real_trigger)
 				$insertTriggers[] = array_merge($values, $real_trigger);
-		else
-			$insertTriggers[] = array_merge($values, $trigger);
+		} else {
+					$insertTriggers[] = array_merge($values, $trigger);
+		}
 	}
 
-	if (empty($insertTriggers))
-		$context['ban_errors'][] = 'ban_no_triggers';
+	if (empty($insertTriggers)) {
+			$context['ban_errors'][] = 'ban_no_triggers';
+	}
 
-	if (!empty($context['ban_errors']))
-		return false;
+	if (!empty($context['ban_errors'])) {
+			return false;
+	}
 
 	$smcFunc['db_insert']('',
 		'{db_prefix}ban_items',
@@ -1338,15 +1365,19 @@ 
 {
 	global $smcFunc, $context;
 
-	if (empty($ban_item))
-		$context['ban_errors'][] = 'ban_ban_item_empty';
-	if (empty($group_id))
-		$context['ban_errors'][] = 'ban_id_empty';
-	if (empty($trigger))
-		$context['ban_errors'][] = 'ban_no_triggers';
+	if (empty($ban_item)) {
+			$context['ban_errors'][] = 'ban_ban_item_empty';
+	}
+	if (empty($group_id)) {
+			$context['ban_errors'][] = 'ban_id_empty';
+	}
+	if (empty($trigger)) {
+			$context['ban_errors'][] = 'ban_no_triggers';
+	}
 
-	if (!empty($context['ban_errors']))
-		return;
+	if (!empty($context['ban_errors'])) {
+			return;
+	}
 
 	// Preset all values that are required.
 	$values = array(
@@ -1387,8 +1418,9 @@ 
  */
 function logTriggersUpdates($logs, $new = true, $removal = false)
 {
-	if (empty($logs))
-		return;
+	if (empty($logs)) {
+			return;
+	}
 
 	$log_name_map = array(
 		'main_ip' => 'ip_range',
@@ -1399,14 +1431,15 @@ 
 	);
 
 	// Log the addion of the ban entries into the moderation log.
-	foreach ($logs as $log)
-		logAction('ban' . ($removal == true ? 'remove' : ''), array(
+	foreach ($logs as $log) {
+			logAction('ban' . ($removal == true ? 'remove' : ''), array(
 			$log_name_map[$log['bantype']] => $log['value'],
 			'new' => empty($new) ? 0 : 1,
 			'remove' => empty($removal) ? 0 : 1,
 			'type' => $log['bantype'],
 		));
-}
+	}
+	}
 
 /**
  * Updates an existing ban group
@@ -1420,12 +1453,15 @@ 
 {
 	global $smcFunc, $context;
 
-	if (empty($ban_info['name']))
-		$context['ban_errors'][] = 'ban_name_empty';
-	if (empty($ban_info['id']))
-		$context['ban_errors'][] = 'ban_id_empty';
-	if (empty($ban_info['cannot']['access']) && empty($ban_info['cannot']['register']) && empty($ban_info['cannot']['post']) && empty($ban_info['cannot']['login']))
-		$context['ban_errors'][] = 'ban_unknown_restriction_type';
+	if (empty($ban_info['name'])) {
+			$context['ban_errors'][] = 'ban_name_empty';
+	}
+	if (empty($ban_info['id'])) {
+			$context['ban_errors'][] = 'ban_id_empty';
+	}
+	if (empty($ban_info['cannot']['access']) && empty($ban_info['cannot']['register']) && empty($ban_info['cannot']['post']) && empty($ban_info['cannot']['login'])) {
+			$context['ban_errors'][] = 'ban_unknown_restriction_type';
+	}
 
 	if (!empty($ban_info['id']))
 	{
@@ -1440,8 +1476,9 @@ 
 			)
 		);
 
-		if ($smcFunc['db_num_rows']($request) == 0)
-			$context['ban_errors'][] = 'ban_not_found';
+		if ($smcFunc['db_num_rows']($request) == 0) {
+					$context['ban_errors'][] = 'ban_not_found';
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -1459,13 +1496,15 @@ 
 				'new_ban_name' => $ban_info['name'],
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) != 0)
-			$context['ban_errors'][] = 'ban_name_exists';
+		if ($smcFunc['db_num_rows']($request) != 0) {
+					$context['ban_errors'][] = 'ban_name_exists';
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
-	if (!empty($context['ban_errors']))
-		return $ban_info['id'];
+	if (!empty($context['ban_errors'])) {
+			return $ban_info['id'];
+	}
 
 	$smcFunc['db_query']('', '
 		UPDATE {db_prefix}ban_groups
@@ -1509,10 +1548,12 @@ 
 {
 	global $smcFunc, $context;
 
-	if (empty($ban_info['name']))
-		$context['ban_errors'][] = 'ban_name_empty';
-	if (empty($ban_info['cannot']['access']) && empty($ban_info['cannot']['register']) && empty($ban_info['cannot']['post']) && empty($ban_info['cannot']['login']))
-		$context['ban_errors'][] = 'ban_unknown_restriction_type';
+	if (empty($ban_info['name'])) {
+			$context['ban_errors'][] = 'ban_name_empty';
+	}
+	if (empty($ban_info['cannot']['access']) && empty($ban_info['cannot']['register']) && empty($ban_info['cannot']['post']) && empty($ban_info['cannot']['login'])) {
+			$context['ban_errors'][] = 'ban_unknown_restriction_type';
+	}
 
 	if (!empty($ban_info['name']))
 	{
@@ -1527,13 +1568,15 @@ 
 			)
 		);
 
-		if ($smcFunc['db_num_rows']($request) == 1)
-			$context['ban_errors'][] = 'ban_name_exists';
+		if ($smcFunc['db_num_rows']($request) == 1) {
+					$context['ban_errors'][] = 'ban_name_exists';
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
-	if (!empty($context['ban_errors']))
-		return;
+	if (!empty($context['ban_errors'])) {
+			return;
+	}
 
 	// Yes yes, we're ready to add now.
 	$ban_info['id'] = $smcFunc['db_insert']('',
@@ -1550,8 +1593,9 @@ 
 		1
 	);
 
-	if (empty($ban_info['id']))
-		$context['ban_errors'][] = 'impossible_insert_new_bangroup';
+	if (empty($ban_info['id'])) {
+			$context['ban_errors'][] = 'impossible_insert_new_bangroup';
+	}
 
 	return $ban_info['id'];
 }
@@ -1576,24 +1620,24 @@ 
 	$ban_group = isset($_REQUEST['bg']) ? (int) $_REQUEST['bg'] : 0;
 	$ban_id = isset($_REQUEST['bi']) ? (int) $_REQUEST['bi'] : 0;
 
-	if (empty($ban_group))
-		fatal_lang_error('ban_not_found', false);
+	if (empty($ban_group)) {
+			fatal_lang_error('ban_not_found', false);
+	}
 
 	if (isset($_POST['add_new_trigger']) && !empty($_POST['ban_suggestions']))
 	{
 		saveTriggers($_POST['ban_suggestions'], $ban_group, 0, $ban_id);
 		redirectexit('action=admin;area=ban;sa=edit' . (!empty($ban_group) ? ';bg=' . $ban_group : ''));
-	}
-	elseif (isset($_POST['edit_trigger']) && !empty($_POST['ban_suggestions']))
+	} elseif (isset($_POST['edit_trigger']) && !empty($_POST['ban_suggestions']))
 	{
 		// The first replaces the old one, the others are added new (simplification, otherwise it would require another query and some work...)
 		saveTriggers(array_shift($_POST['ban_suggestions']), $ban_group, 0, $ban_id);
-		if (!empty($_POST['ban_suggestions']))
-			saveTriggers($_POST['ban_suggestions'], $ban_group);
+		if (!empty($_POST['ban_suggestions'])) {
+					saveTriggers($_POST['ban_suggestions'], $ban_group);
+		}
 
 		redirectexit('action=admin;area=ban;sa=edit' . (!empty($ban_group) ? ';bg=' . $ban_group : ''));
-	}
-	elseif (isset($_POST['edit_trigger']))
+	} elseif (isset($_POST['edit_trigger']))
 	{
 		removeBanTriggers($ban_id);
 		redirectexit('action=admin;area=ban;sa=edit' . (!empty($ban_group) ? ';bg=' . $ban_group : ''));
@@ -1624,8 +1668,7 @@ 
 			),
 			'is_new' => true,
 		);
-	}
-	else
+	} else
 	{
 		$request = $smcFunc['db_query']('', '
 			SELECT
@@ -1642,8 +1685,9 @@ 
 				'ban_group' => $ban_group,
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) == 0)
-			fatal_lang_error('ban_not_found', false);
+		if ($smcFunc['db_num_rows']($request) == 0) {
+					fatal_lang_error('ban_not_found', false);
+		}
 		$row = $smcFunc['db_fetch_assoc']($request);
 		$smcFunc['db_free_result']($request);
 
@@ -1692,8 +1736,9 @@ 
 		removeBanTriggers($_POST['remove']);
 
 		// Rehabilitate some members.
-		if ($_REQUEST['entity'] == 'member')
-			updateBanMembers();
+		if ($_REQUEST['entity'] == 'member') {
+					updateBanMembers();
+		}
 
 		// Make sure the ban cache is refreshed.
 		updateSettings(array('banLastUpdated' => time()));
@@ -1806,8 +1851,7 @@ 
 			'default' => 'bi.ip_low, bi.ip_high, bi.ip_low',
 			'reverse' => 'bi.ip_low DESC, bi.ip_high DESC',
 		);
-	}
-	elseif ($context['selected_entity'] === 'hostname')
+	} elseif ($context['selected_entity'] === 'hostname')
 	{
 		$listOptions['columns']['banned_entity']['data'] = array(
 			'function' => function($rowData) use ($smcFunc)
@@ -1819,8 +1863,7 @@ 
 			'default' => 'bi.hostname',
 			'reverse' => 'bi.hostname DESC',
 		);
-	}
-	elseif ($context['selected_entity'] === 'email')
+	} elseif ($context['selected_entity'] === 'email')
 	{
 		$listOptions['columns']['banned_entity']['data'] = array(
 			'function' => function($rowData) use ($smcFunc)
@@ -1832,8 +1875,7 @@ 
 			'default' => 'bi.email_address',
 			'reverse' => 'bi.email_address DESC',
 		);
-	}
-	elseif ($context['selected_entity'] === 'member')
+	} elseif ($context['selected_entity'] === 'member')
 	{
 		$listOptions['columns']['banned_entity']['data'] = array(
 			'sprintf' => array(
@@ -1897,8 +1939,9 @@ 
 		)
 	);
 	$ban_triggers = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$ban_triggers[] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$ban_triggers[] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $ban_triggers;
@@ -1954,8 +1997,9 @@ 
 		validateToken('admin-bl');
 
 		// 'Delete all entries' button was pressed.
-		if (!empty($_POST['removeAll']))
-			removeBanLogs();
+		if (!empty($_POST['removeAll'])) {
+					removeBanLogs();
+		}
 		// 'Delete selection' button was pressed.
 		else
 		{
@@ -2164,12 +2208,15 @@ 
 	$low = inet_dtop($low);
 	$high = inet_dtop($high);
 
-	if ($low == '255.255.255.255') return 'unknown';
-	if ($low == $high)
-	    return $low;
-	else
-	    return $low . '-' . $high;
-}
+	if ($low == '255.255.255.255') {
+		return 'unknown';
+	}
+	if ($low == $high) {
+		    return $low;
+	} else {
+		    return $low . '-' . $high;
+	}
+	}
 
 /**
  * Checks whether a given IP range already exists in the trigger list.
@@ -2245,15 +2292,17 @@ 
 	$memberEmailWild = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if ($row['id_member'])
-			$memberIDs[$row['id_member']] = $row['id_member'];
+		if ($row['id_member']) {
+					$memberIDs[$row['id_member']] = $row['id_member'];
+		}
 		if ($row['email_address'])
 		{
 			// Does it have a wildcard - if so we can't do a IN on it.
-			if (strpos($row['email_address'], '%') !== false)
-				$memberEmailWild[$row['email_address']] = $row['email_address'];
-			else
-				$memberEmails[$row['email_address']] = $row['email_address'];
+			if (strpos($row['email_address'], '%') !== false) {
+							$memberEmailWild[$row['email_address']] = $row['email_address'];
+			} else {
+							$memberEmails[$row['email_address']] = $row['email_address'];
+			}
 		}
 	}
 	$smcFunc['db_free_result']($request);
@@ -2304,14 +2353,15 @@ 
 	}
 
 	// We welcome our new members in the realm of the banned.
-	if (!empty($newMembers))
-		$smcFunc['db_query']('', '
+	if (!empty($newMembers)) {
+			$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}log_online
 			WHERE id_member IN ({array_int:new_banned_members})',
 			array(
 				'new_banned_members' => $newMembers,
 			)
 		);
+	}
 
 	// Find members that are wrongfully marked as banned.
 	$request = $smcFunc['db_query']('', '
@@ -2338,9 +2388,10 @@ 
 	}
 	$smcFunc['db_free_result']($request);
 
-	if (!empty($updates))
-		foreach ($updates as $newStatus => $members)
+	if (!empty($updates)) {
+			foreach ($updates as $newStatus => $members)
 			updateMemberData($members, array('is_activated' => $newStatus));
+	}
 
 	// Update the latest member and our total members as banning may change them.
 	updateStats('member');