SimpleMachines / SMF2.1

Sources/CacheAPI-smf.php

Doc Comments +1 added lines, -1 removed lines

@@ -180,7 +180,7 @@
 	 *
 	 * @access public
 	 * @param string $dir A valid path
-	 * @return boolean If this was successful or not.
+	 * @return boolean|null If this was successful or not.
 	 */
 	public function setCachedir($dir = null)
 	{

Braces +36 added lines, -26 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 /**
  * Our Cache API class
@@ -43,8 +44,9 @@ 
 	{
 		$supported = is_writable($this->cachedir);
 
-		if ($test)
-			return $supported;
+		if ($test) {
+					return $supported;
+		}
 		return parent::isSupported() && $supported;
 	}
 
@@ -61,11 +63,13 @@ 
 		{
 			// Work around Zend's opcode caching (PHP 5.5+), they would cache older files for a couple of seconds
 			// causing newer files to take effect a while later.
-			if (function_exists('opcache_invalidate'))
-				opcache_invalidate($cachedir . '/data_' . $key . '.php', true);
+			if (function_exists('opcache_invalidate')) {
+							opcache_invalidate($cachedir . '/data_' . $key . '.php', true);
+			}
 
-			if (function_exists('apc_delete_file'))
-				@apc_delete_file($cachedir . '/data_' . $key . '.php');
+			if (function_exists('apc_delete_file')) {
+							@apc_delete_file($cachedir . '/data_' . $key . '.php');
+			}
 
 			// php will cache file_exists et all, we can't 100% depend on its results so proceed with caution
 			@include($cachedir . '/data_' . $key . '.php');
@@ -89,16 +93,18 @@ 
 
 		// Work around Zend's opcode caching (PHP 5.5+), they would cache older files for a couple of seconds
 		// causing newer files to take effect a while later.
-		if (function_exists('opcache_invalidate'))
-			opcache_invalidate($cachedir . '/data_' . $key . '.php', true);
+		if (function_exists('opcache_invalidate')) {
+					opcache_invalidate($cachedir . '/data_' . $key . '.php', true);
+		}
 
-		if (function_exists('apc_delete_file'))
-			@apc_delete_file($cachedir . '/data_' . $key . '.php');
+		if (function_exists('apc_delete_file')) {
+					@apc_delete_file($cachedir . '/data_' . $key . '.php');
+		}
 
 		// Otherwise custom cache?
-		if ($value === null)
-			@unlink($cachedir . '/data_' . $key . '.php');
-		else
+		if ($value === null) {
+					@unlink($cachedir . '/data_' . $key . '.php');
+		} else
 		{
 			$cache_data = '<' . '?' . 'php if (!defined(\'SMF\')) die; if (' . (time() + $ttl) . ' < time()) $expired = true; else{$expired = false; $value = \'' . addcslashes($value, '\\\'') . '\';}' . '?' . '>';
 
@@ -109,9 +115,9 @@ 
 			{
 				@unlink($cachedir . '/data_' . $key . '.php');
 				return false;
+			} else {
+							return true;
 			}
-			else
-				return true;
 		}
 	}
 
@@ -123,15 +129,17 @@ 
 		$cachedir = $this->cachedir;
 
 		// No directory = no game.
-		if (!is_dir($cachedir))
-			return;
+		if (!is_dir($cachedir)) {
+					return;
+		}
 
 		// Remove the files in SMF's own disk cache, if any
 		$dh = opendir($cachedir);
 		while ($file = readdir($dh))
 		{
-			if ($file != '.' && $file != '..' && $file != 'index.php' && $file != '.htaccess' && (!$type || substr($file, 0, strlen($type)) == $type))
-				@unlink($cachedir . '/' . $file);
+			if ($file != '.' && $file != '..' && $file != 'index.php' && $file != '.htaccess' && (!$type || substr($file, 0, strlen($type)) == $type)) {
+							@unlink($cachedir . '/' . $file);
+			}
 		}
 		closedir($dh);
 
@@ -165,8 +173,9 @@ 
 		$config_vars[] = $txt['cache_smf_settings'];
 		$config_vars[] = array('cachedir', $txt['cachedir'], 'file', 'text', 36, 'cache_cachedir');
 
-		if (!isset($context['settings_post_javascript']))
-			$context['settings_post_javascript'] = '';
+		if (!isset($context['settings_post_javascript'])) {
+					$context['settings_post_javascript'] = '';
+		}
 
 		$context['settings_post_javascript'] .= '
 			$("#cache_accelerator").change(function (e) {
@@ -187,10 +196,11 @@ 
 		global $cachedir;
 
 		// If its invalid, use SMF's.
-		if (is_null($dir) || !is_writable($dir))
-			$this->cachedir = $cachedir;
-		else
-			$this->cachedir = $dir;
+		if (is_null($dir) || !is_writable($dir)) {
+					$this->cachedir = $cachedir;
+		} else {
+					$this->cachedir = $dir;
+		}
 	}
 
 	/**

Sources/Class-Graphics.php

Doc Comments +28 added lines

@@ -44,6 +44,10 @@ 
 		$this->Buf   = range(0, 279);
 	}
 
+	/**
+	 * @param string $data
+	 * @param integer $datLen
+	 */
 	public function decompress($data, &$datLen)
 	{
 		$stLen  = strlen($data);
@@ -63,6 +67,11 @@ 
 		return $ret;
 	}
 
+	/**
+	 * @param boolean $bInit
+	 *
+	 * @return integer
+	 */
 	public function LZWCommand(&$data, $bInit)
 	{
 		if ($bInit)
@@ -253,6 +262,10 @@ 
 		unset($this->m_nColors, $this->m_arColors);
 	}
 
+	/**
+	 * @param string $lpData
+	 * @param integer $num
+	 */
 	public function load($lpData, $num)
 	{
 		$this->m_nColors  = 0;
@@ -324,6 +337,9 @@ 
 		unset($this->m_bSorted, $this->m_nTableSize, $this->m_nBgColor, $this->m_nPixelRatio, $this->m_colorTable);
 	}
 
+	/**
+	 * @param integer $hdrLen
+	 */
 	public function load($lpData, &$hdrLen)
 	{
 		$hdrLen = 0;
@@ -370,6 +386,10 @@ 
 		unset($this->m_bInterlace, $this->m_bSorted, $this->m_nTableSize, $this->m_colorTable);
 	}
 
+	/**
+	 * @param string $lpData
+	 * @param integer $hdrLen
+	 */
 	public function load($lpData, &$hdrLen)
 	{
 		$hdrLen = 0;
@@ -412,6 +432,10 @@ 
 		$this->m_lzw = new gif_lzw_compression();
 	}
 
+	/**
+	 * @param string $data
+	 * @param integer $datLen
+	 */
 	public function load($data, &$datLen)
 	{
 		$datLen = 0;
@@ -464,6 +488,10 @@ 
 		return false;
 	}
 
+	/**
+	 * @param string $data
+	 * @param integer $extLen
+	 */
 	public function skipExt(&$data, &$extLen)
 	{
 		$extLen = 0;

Spacing +7 added lines, -7 removed lines

@@ -38,8 +38,8 @@ 
 		$this->MAX_LZW_BITS = 12;
 		unset($this->Next, $this->Vals, $this->Stack, $this->Buf);
 
-		$this->Next  = range(0, (1 << $this->MAX_LZW_BITS)       - 1);
-		$this->Vals  = range(0, (1 << $this->MAX_LZW_BITS)       - 1);
+		$this->Next  = range(0, (1 << $this->MAX_LZW_BITS) - 1);
+		$this->Vals  = range(0, (1 << $this->MAX_LZW_BITS) - 1);
 		$this->Stack = range(0, (1 << ($this->MAX_LZW_BITS + 1)) - 1);
 		$this->Buf   = range(0, 279);
 	}
@@ -278,9 +278,9 @@ 
 		for ($i = 0; $i < $this->m_nColors; $i++)
 		{
 			$ret .=
-				chr(($this->m_arColors[$i] & 0x000000FF))       . // R
-				chr(($this->m_arColors[$i] & 0x0000FF00) >>  8) . // G
-				chr(($this->m_arColors[$i] & 0x00FF0000) >> 16);  // B
+				chr(($this->m_arColors[$i] & 0x000000FF)) . // R
+				chr(($this->m_arColors[$i] & 0x0000FF00) >> 8) . // G
+				chr(($this->m_arColors[$i] & 0x00FF0000) >> 16); // B
 		}
 
 		return $ret;
@@ -290,14 +290,14 @@ 
 	{
 		$rgb  = intval($rgb) & 0xFFFFFF;
 		$r1   = ($rgb & 0x0000FF);
-		$g1   = ($rgb & 0x00FF00) >>  8;
+		$g1   = ($rgb & 0x00FF00) >> 8;
 		$b1   = ($rgb & 0xFF0000) >> 16;
 		$idx  = -1;
 
 		for ($i = 0; $i < $this->m_nColors; $i++)
 		{
 			$r2 = ($this->m_arColors[$i] & 0x000000FF);
-			$g2 = ($this->m_arColors[$i] & 0x0000FF00) >>  8;
+			$g2 = ($this->m_arColors[$i] & 0x0000FF00) >> 8;
 			$b2 = ($this->m_arColors[$i] & 0x00FF0000) >> 16;
 			$d  = abs($r2 - $r1) + abs($g2 - $g1) + abs($b2 - $b1);
 

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/Class-SearchAPI.php

Doc Comments +2 added lines, -1 removed lines

@@ -56,6 +56,7 @@ 
 	 * @param array $wordsSearch Search words
 	 * @param array $wordsExclude Words to exclude
 	 * @param bool $isExcluded Whether the specfied word should be excluded
+	 * @return void
 	 */
 	public function prepareIndexes($word, array &$wordsSearch, array &$wordsExclude, $isExcluded);
 
@@ -130,7 +131,7 @@ 
 	 * @param array $excludedIndexWords Indexed words that should be excluded
 	 * @param array $participants
 	 * @param array $searchArray
-	 * @return mixed
+	 * @return integer
 	 */
 	public function searchQuery(array $query_params, array $searchWords, array $excludedIndexWords, array &$participants, array &$searchArray);
 }

Spacing +4 added lines, -4 removed lines

@@ -223,7 +223,7 @@ 
 
 		global $smcFunc;
 
-		$result = $smcFunc['db_query']('','
+		$result = $smcFunc['db_query']('', '
 			SELECT DISTINCT id_search
 			FROM {db_prefix}log_search_results
 			WHERE id_msg = {int:id_msg}',
@@ -239,7 +239,7 @@ 
 		if (count($id_searchs) < 1)
 			return;
 
-		$smcFunc['db_query']('','
+		$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}log_search_results
 			WHERE id_search in ({array_int:id_searchs})',
 			array(
@@ -247,7 +247,7 @@ 
 			)
 		);
 
-		$smcFunc['db_query']('','
+		$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}log_search_topics
 			WHERE id_search in ({array_int:id_searchs})',
 			array(
@@ -255,7 +255,7 @@ 
 			)
 		);
 
-		$smcFunc['db_query']('','
+		$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}log_search_messages
 			WHERE id_search in ({array_int:id_searchs})',
 			array(

Braces +6 added lines, -4 removed lines

@@ -233,11 +233,13 @@
 		);
 
 		$id_searchs = array();
-		while ($row = $smcFunc['db_fetch_assoc']($result))
-			$id_searchs[] = $row['id_search'];
+		while ($row = $smcFunc['db_fetch_assoc']($result)) {
+					$id_searchs[] = $row['id_search'];
+		}
 
-		if (count($id_searchs) < 1)
-			return;
+		if (count($id_searchs) < 1) {
+					return;
+		}
 
 		$smcFunc['db_query']('','
 			DELETE FROM {db_prefix}log_search_results

Sources/Class-TOTP.php

Doc Comments +2 added lines, -2 removed lines

@@ -279,7 +279,7 @@ 
 	/**
 	 * Generate the timestamp for the calculation
 	 *
-	 * @return integer Timestamp
+	 * @return double Timestamp
 	 */
 	public function generateTimestamp()
 	{
@@ -290,7 +290,7 @@ 
 	 * Truncate the given hash down to just what we need
 	 *
 	 * @param string $hash Hash to truncate
-	 * @return string Truncated hash value
+	 * @return integer Truncated hash value
 	 */
 	public function truncateHash($hash)
 	{

Sources/DbPackages-mysql.php

Doc Comments +1 added lines, -1 removed lines

@@ -382,7 +382,7 @@
  * @param array $parameters Not used?
  * @param string $if_exists What to do if the index exists. If 'update', the definition will be updated.
  * @param string $error
- * @return boolean Whether or not the operation was successful
+ * @return false|null Whether or not the operation was successful
  */
 function smf_db_add_index($table_name, $index_info, $parameters = array(), $if_exists = 'update', $error = 'fatal')
 {

Braces +122 added lines, -98 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Add the file functions to the $smcFunc array.
@@ -53,8 +54,9 @@ 
 		'messages', 'moderator_groups', 'moderators', 'package_servers', 'permission_profiles', 'permissions', 'personal_messages',
 		'pm_labeled_messages', 'pm_labels', 'pm_recipients', 'pm_rules', 'poll_choices', 'polls', 'scheduled_tasks', 'sessions', 'settings', 'smileys',
 		'spiders', 'subscriptions', 'themes', 'topics', 'user_alerts', 'user_alerts_prefs', 'user_drafts', 'user_likes');
-	foreach ($reservedTables as $k => $table_name)
-		$reservedTables[$k] = strtolower($db_prefix . $table_name);
+	foreach ($reservedTables as $k => $table_name) {
+			$reservedTables[$k] = strtolower($db_prefix . $table_name);
+	}
 
 	// We in turn may need the extra stuff.
 	db_extend('extra');
@@ -109,8 +111,9 @@ 
 	$table_name = str_replace('{db_prefix}', $db_prefix, $table_name);
 
 	// First - no way do we touch SMF tables.
-	if (in_array(strtolower($table_name), $reservedTables))
-		return false;
+	if (in_array(strtolower($table_name), $reservedTables)) {
+			return false;
+	}
 
 	// Log that we'll want to remove this on uninstall.
 	$db_package_log[] = array('remove_table', $table_name);
@@ -120,9 +123,9 @@ 
 	if (in_array($full_table_name, $tables))
 	{
 		// This is a sad day... drop the table? If not, return false (error) by default.
-		if ($if_exists == 'overwrite')
-			$smcFunc['db_drop_table']($table_name);
-		else if ($if_exists == 'update')
+		if ($if_exists == 'overwrite') {
+					$smcFunc['db_drop_table']($table_name);
+		} else if ($if_exists == 'update')
 		{
 			$smcFunc['db_transaction']('begin');
 			$db_trans = true;
@@ -134,15 +137,16 @@ 
 				)
 			);
 			$old_table_exists = true;
+		} else {
+					return $if_exists == 'ignore';
 		}
-		else
-			return $if_exists == 'ignore';
 	}
 
 	// Righty - let's do the damn thing!
 	$table_query = 'CREATE TABLE ' . $table_name . "\n" . '(';
-	foreach ($columns as $column)
-		$table_query .= "\n\t" . smf_db_create_query_column($column) . ',';
+	foreach ($columns as $column) {
+			$table_query .= "\n\t" . smf_db_create_query_column($column) . ',';
+	}
 
 	// Loop through the indexes next...
 	foreach ($indexes as $index)
@@ -150,19 +154,21 @@ 
 		$columns = implode(',', $index['columns']);
 
 		// Is it the primary?
-		if (isset($index['type']) && $index['type'] == 'primary')
-			$table_query .= "\n\t" . 'PRIMARY KEY (' . implode(',', $index['columns']) . '),';
-		else
+		if (isset($index['type']) && $index['type'] == 'primary') {
+					$table_query .= "\n\t" . 'PRIMARY KEY (' . implode(',', $index['columns']) . '),';
+		} else
 		{
-			if (empty($index['name']))
-				$index['name'] = implode('_', $index['columns']);
+			if (empty($index['name'])) {
+							$index['name'] = implode('_', $index['columns']);
+			}
 			$table_query .= "\n\t" . (isset($index['type']) && $index['type'] == 'unique' ? 'UNIQUE' : 'KEY') . ' ' . $index['name'] . ' (' . $columns . '),';
 		}
 	}
 
 	// No trailing commas!
-	if (substr($table_query, -1) == ',')
-		$table_query = substr($table_query, 0, -1);
+	if (substr($table_query, -1) == ',') {
+			$table_query = substr($table_query, 0, -1);
+	}
 
 	// Which engine do we want here?
 	if (empty($engines))
@@ -172,8 +178,9 @@ 
 
 		while ($row = $smcFunc['db_fetch_assoc']($get_engines))
 		{
-			if ($row['Support'] == 'YES' || $row['Support'] == 'DEFAULT')
-				$engines[] = $row['Engine'];
+			if ($row['Support'] == 'YES' || $row['Support'] == 'DEFAULT') {
+							$engines[] = $row['Engine'];
+			}
 		}
 
 		$smcFunc['db_free_result']($get_engines);
@@ -187,8 +194,9 @@ 
 	}
 
 	$table_query .= ') ENGINE=' . $parameters['engine'];
-	if (!empty($db_character_set) && $db_character_set == 'utf8')
-		$table_query .= ' DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci';
+	if (!empty($db_character_set) && $db_character_set == 'utf8') {
+			$table_query .= ' DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci';
+	}
 
 	// Create the table!
 	$smcFunc['db_query']('', $table_query,
@@ -255,8 +263,9 @@ 
 	$table_name = str_replace('{db_prefix}', $db_prefix, $table_name);
 
 	// God no - dropping one of these = bad.
-	if (in_array(strtolower($table_name), $reservedTables))
-		return false;
+	if (in_array(strtolower($table_name), $reservedTables)) {
+			return false;
+	}
 
 	// Does it exist?
 	if (in_array($full_table_name, $smcFunc['db_list_tables']()))
@@ -297,14 +306,16 @@ 
 
 	// Does it exist - if so don't add it again!
 	$columns = $smcFunc['db_list_columns']($table_name, false);
-	foreach ($columns as $column)
-		if ($column == $column_info['name'])
+	foreach ($columns as $column) {
+			if ($column == $column_info['name'])
 		{
 			// If we're going to overwrite then use change column.
 			if ($if_exists == 'update')
 				return $smcFunc['db_change_column']($table_name, $column_info['name'], $column_info);
-			else
-				return false;
+	}
+			else {
+							return false;
+			}
 		}
 
 	// Get the specifics...
@@ -340,8 +351,8 @@ 
 
 	// Does it exist?
 	$columns = $smcFunc['db_list_columns']($table_name, true);
-	foreach ($columns as $column)
-		if ($column['name'] == $column_name)
+	foreach ($columns as $column) {
+			if ($column['name'] == $column_name)
 		{
 			$smcFunc['db_query']('', '
 				ALTER TABLE ' . $table_name . '
@@ -350,6 +361,7 @@ 
 					'security_override' => true,
 				)
 			);
+	}
 
 			return true;
 		}
@@ -375,37 +387,47 @@ 
 	// Check it does exist!
 	$columns = $smcFunc['db_list_columns']($table_name, true);
 	$old_info = null;
-	foreach ($columns as $column)
-		if ($column['name'] == $old_column)
+	foreach ($columns as $column) {
+			if ($column['name'] == $old_column)
 			$old_info = $column;
+	}
 
 	// Nothing?
-	if ($old_info == null)
-		return false;
+	if ($old_info == null) {
+			return false;
+	}
 
 	// Get the right bits.
-	if (!isset($column_info['name']))
-		$column_info['name'] = $old_column;
-	if (!isset($column_info['default']))
-		$column_info['default'] = $old_info['default'];
-	if (!isset($column_info['null']))
-		$column_info['null'] = $old_info['null'];
-	if (!isset($column_info['auto']))
-		$column_info['auto'] = $old_info['auto'];
-	if (!isset($column_info['type']))
-		$column_info['type'] = $old_info['type'];
-	if (!isset($column_info['size']) || !is_numeric($column_info['size']))
-		$column_info['size'] = $old_info['size'];
-	if (!isset($column_info['unsigned']) || !in_array($column_info['type'], array('int', 'tinyint', 'smallint', 'mediumint', 'bigint')))
-		$column_info['unsigned'] = '';
+	if (!isset($column_info['name'])) {
+			$column_info['name'] = $old_column;
+	}
+	if (!isset($column_info['default'])) {
+			$column_info['default'] = $old_info['default'];
+	}
+	if (!isset($column_info['null'])) {
+			$column_info['null'] = $old_info['null'];
+	}
+	if (!isset($column_info['auto'])) {
+			$column_info['auto'] = $old_info['auto'];
+	}
+	if (!isset($column_info['type'])) {
+			$column_info['type'] = $old_info['type'];
+	}
+	if (!isset($column_info['size']) || !is_numeric($column_info['size'])) {
+			$column_info['size'] = $old_info['size'];
+	}
+	if (!isset($column_info['unsigned']) || !in_array($column_info['type'], array('int', 'tinyint', 'smallint', 'mediumint', 'bigint'))) {
+			$column_info['unsigned'] = '';
+	}
 
 	list ($type, $size) = $smcFunc['db_calculate_type']($column_info['type'], $column_info['size']);
 
 	// Allow for unsigned integers (mysql only)
 	$unsigned = in_array($type, array('int', 'tinyint', 'smallint', 'mediumint', 'bigint')) && !empty($column_info['unsigned']) ? 'unsigned ' : '';
 
-	if ($size !== null)
-		$type = $type . '(' . $size . ')';
+	if ($size !== null) {
+			$type = $type . '(' . $size . ')';
+	}
 
 	$smcFunc['db_query']('', '
 		ALTER TABLE ' . $table_name . '
@@ -435,18 +457,20 @@ 
 	$table_name = str_replace('{db_prefix}', $db_prefix, $table_name);
 
 	// No columns = no index.
-	if (empty($index_info['columns']))
-		return false;
+	if (empty($index_info['columns'])) {
+			return false;
+	}
 	$columns = implode(',', $index_info['columns']);
 
 	// No name - make it up!
 	if (empty($index_info['name']))
 	{
 		// No need for primary.
-		if (isset($index_info['type']) && $index_info['type'] == 'primary')
-			$index_info['name'] = '';
-		else
-			$index_info['name'] = implode('_', $index_info['columns']);
+		if (isset($index_info['type']) && $index_info['type'] == 'primary') {
+					$index_info['name'] = '';
+		} else {
+					$index_info['name'] = implode('_', $index_info['columns']);
+		}
 	}
 
 	// Log that we are going to want to remove this!
@@ -460,10 +484,11 @@ 
 		if ($index['name'] == $index_info['name'] || ($index['type'] == 'primary' && isset($index_info['type']) && $index_info['type'] == 'primary'))
 		{
 			// If we want to overwrite simply remove the current one then continue.
-			if ($if_exists != 'update' || $index['type'] == 'primary')
-				return false;
-			else
-				$smcFunc['db_remove_index']($table_name, $index_info['name']);
+			if ($if_exists != 'update' || $index['type'] == 'primary') {
+							return false;
+			} else {
+							$smcFunc['db_remove_index']($table_name, $index_info['name']);
+			}
 		}
 	}
 
@@ -477,8 +502,7 @@ 
 				'security_override' => true,
 			)
 		);
-	}
-	else
+	} else
 	{
 		$smcFunc['db_query']('', '
 			ALTER TABLE ' . $table_name . '
@@ -562,8 +586,7 @@ 
 		$types = array(
 			'inet' => 'varbinary',
 		);
-	}
-	else
+	} else
 	{
 		$types = array(
 			'varbinary' => 'inet',
@@ -577,16 +600,15 @@ 
 		{
 			$type_size = 16;
 			$type_name = 'varbinary';
-		}
-		elseif ($type_name == 'varbinary' && $reverse && $type_size == 16)
+		} elseif ($type_name == 'varbinary' && $reverse && $type_size == 16)
 		{
 			$type_name = 'inet';
 			$type_size = null;
+		} elseif ($type_name == 'varbinary') {
+					$type_name = 'varbinary';
+		} else {
+					$type_name = $types[$type_name];
 		}
-		elseif ($type_name == 'varbinary')
-			$type_name = 'varbinary';
-		else
-			$type_name = $types[$type_name];
 	}
 
 	return array($type_name, $type_size);
@@ -653,8 +675,7 @@ 
 		if (!$detail)
 		{
 			$columns[] = $row['Field'];
-		}
-		else
+		} else
 		{
 			// Is there an auto_increment?
 			$auto = strpos($row['Extra'], 'auto_increment') !== false ? true : false;
@@ -664,10 +685,10 @@ 
 			{
 				$type = $matches[1];
 				$size = $matches[2];
-				if (!empty($matches[3]) && $matches[3] == 'unsigned')
-					$unsigned = true;
-			}
-			else
+				if (!empty($matches[3]) && $matches[3] == 'unsigned') {
+									$unsigned = true;
+				}
+			} else
 			{
 				$type = $row['Type'];
 				$size = null;
@@ -718,19 +739,20 @@ 
 	$indexes = array();
 	while ($row = $smcFunc['db_fetch_assoc']($result))
 	{
-		if (!$detail)
-			$indexes[] = $row['Key_name'];
-		else
+		if (!$detail) {
+					$indexes[] = $row['Key_name'];
+		} else
 		{
 			// What is the type?
-			if ($row['Key_name'] == 'PRIMARY')
-				$type = 'primary';
-			elseif (empty($row['Non_unique']))
-				$type = 'unique';
-			elseif (isset($row['Index_type']) && $row['Index_type'] == 'FULLTEXT')
-				$type = 'fulltext';
-			else
-				$type = 'index';
+			if ($row['Key_name'] == 'PRIMARY') {
+							$type = 'primary';
+			} elseif (empty($row['Non_unique'])) {
+							$type = 'unique';
+			} elseif (isset($row['Index_type']) && $row['Index_type'] == 'FULLTEXT') {
+							$type = 'fulltext';
+			} else {
+							$type = 'index';
+			}
 
 			// This is the first column we've seen?
 			if (empty($indexes[$row['Key_name']]))
@@ -743,10 +765,11 @@ 
 			}
 
 			// Is it a partial index?
-			if (!empty($row['Sub_part']))
-				$indexes[$row['Key_name']]['columns'][] = $row['Column_name'] . '(' . $row['Sub_part'] . ')';
-			else
-				$indexes[$row['Key_name']]['columns'][] = $row['Column_name'];
+			if (!empty($row['Sub_part'])) {
+							$indexes[$row['Key_name']]['columns'][] = $row['Column_name'] . '(' . $row['Sub_part'] . ')';
+			} else {
+							$indexes[$row['Key_name']]['columns'][] = $row['Column_name'];
+			}
 		}
 	}
 	$smcFunc['db_free_result']($result);
@@ -768,11 +791,11 @@ 
 	if (!empty($column['auto']))
 	{
 		$default = 'auto_increment';
+	} elseif (isset($column['default']) && $column['default'] !== null) {
+			$default = 'default \'' . $smcFunc['db_escape_string']($column['default']) . '\'';
+	} else {
+			$default = '';
 	}
-	elseif (isset($column['default']) && $column['default'] !== null)
-		$default = 'default \'' . $smcFunc['db_escape_string']($column['default']) . '\'';
-	else
-		$default = '';
 
 	// Sort out the size... and stuff...
 	$column['size'] = isset($column['size']) && is_numeric($column['size']) ? $column['size'] : null;
@@ -781,8 +804,9 @@ 
 	// Allow unsigned integers (mysql only)
 	$unsigned = in_array($type, array('int', 'tinyint', 'smallint', 'mediumint', 'bigint')) && !empty($column['unsigned']) ? 'unsigned ' : '';
 
-	if ($size !== null)
-		$type = $type . '(' . $size . ')';
+	if ($size !== null) {
+			$type = $type . '(' . $size . ')';
+	}
 
 	// Now just put it together!
 	return '`' . $column['name'] . '` ' . $type . ' ' . (!empty($unsigned) ? $unsigned : '') . (!empty($column['null']) ? '' : 'NOT NULL') . ' ' . $default;

Spacing +8 added lines, -8 removed lines

@@ -126,9 +126,9 @@ 
 		{
 			$smcFunc['db_transaction']('begin');
 			$db_trans = true;
-			$smcFunc['db_drop_table']($table_name.'_old');
-			$smcFunc['db_query']('','
-				RENAME TABLE '. $table_name .' TO ' . $table_name . '_old',
+			$smcFunc['db_drop_table']($table_name . '_old');
+			$smcFunc['db_query']('', '
+				RENAME TABLE '. $table_name . ' TO ' . $table_name . '_old',
 				array(
 					'security_override' => true,
 				)
@@ -202,15 +202,15 @@ 
 	{
 		$same_col = array();
 
-		$request = $smcFunc['db_query']('','
+		$request = $smcFunc['db_query']('', '
 			SELECT count(*), column_name
 			FROM information_schema.columns
 			WHERE table_name in ({string:table1},{string:table2}) AND table_schema = {string:schema}
 			GROUP BY column_name
 			HAVING count(*) > 1',
-			array (
+			array(
 				'table1' => $table_name,
-				'table2' => $table_name.'_old',
+				'table2' => $table_name . '_old',
 				'schema' => $db_name,
 			)
 		);
@@ -220,8 +220,8 @@ 
 			$same_col[] = $row['column_name'];
 		}
 
-		$smcFunc['db_query']('','
-			INSERT INTO ' . $table_name .'('
+		$smcFunc['db_query']('', '
+			INSERT INTO ' . $table_name . '('
 			. implode($same_col, ',') .
 			')
 			SELECT '. implode($same_col, ',') . '

Sources/Errors.php

Doc Comments +1 added lines, -1 removed lines

@@ -475,7 +475,7 @@
  * Used by fatal_error(), fatal_lang_error()
  *
  * @param string $error The error
- * @param array $sprintf An array of data to be sprintf()'d into the specified message
+ * @param boolean $sprintf An array of data to be sprintf()'d into the specified message
  */
 function log_error_online($error, $sprintf = array())
 {

Spacing +2 added lines, -2 removed lines

@@ -45,7 +45,7 @@ 
 		$backtrace = debug_backtrace();
 
 	// are we in a loop?
-	if($error_call > 2)
+	if ($error_call > 2)
 	{
 		var_dump($backtrace);
 		die('Error loop.');
@@ -549,7 +549,7 @@ 
 		$url['error'] = $error;
 		// Url field got a max length of 1024 in db
 		if (strlen($url['error']) > 500)
-			$url['error'] = substr($url['error'],0,500);
+			$url['error'] = substr($url['error'], 0, 500);
 
 		if (!empty($sprintf))
 			$url['error_params'] = $sprintf;

Braces +127 added lines, -90 removed lines

@@ -15,8 +15,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Log an error, if the error logging is enabled.
@@ -39,10 +40,11 @@ 
 	$error_call++;
 
 	// Collect a backtrace
-	if (!isset($db_show_debug) || $db_show_debug === false)
-		$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-	else
-		$backtrace = debug_backtrace();
+	if (!isset($db_show_debug) || $db_show_debug === false) {
+			$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+	} else {
+			$backtrace = debug_backtrace();
+	}
 
 	// are we in a loop?
 	if($error_call > 2)
@@ -52,8 +54,9 @@ 
 	}
 
 	// Check if error logging is actually on.
-	if (empty($modSettings['enableErrorLogging']))
-		return $error_message;
+	if (empty($modSettings['enableErrorLogging'])) {
+			return $error_message;
+	}
 
 	// Basically, htmlspecialchars it minus &. (for entities!)
 	$error_message = strtr($error_message, array('<' => '&lt;', '>' => '&gt;', '"' => '&quot;'));
@@ -61,33 +64,39 @@ 
 
 	// Add a file and line to the error message?
 	// Don't use the actual txt entries for file and line but instead use %1$s for file and %2$s for line
-	if ($file == null)
-		$file = '';
-	else
-		// Window style slashes don't play well, lets convert them to the unix style.
+	if ($file == null) {
+			$file = '';
+	} else {
+			// Window style slashes don't play well, lets convert them to the unix style.
 		$file = str_replace('\\', '/', $file);
+	}
 
-	if ($line == null)
-		$line = 0;
-	else
-		$line = (int) $line;
+	if ($line == null) {
+			$line = 0;
+	} else {
+			$line = (int) $line;
+	}
 
 	// Just in case there's no id_member or IP set yet.
-	if (empty($user_info['id']))
-		$user_info['id'] = 0;
-	if (empty($user_info['ip']))
-		$user_info['ip'] = '';
+	if (empty($user_info['id'])) {
+			$user_info['id'] = 0;
+	}
+	if (empty($user_info['ip'])) {
+			$user_info['ip'] = '';
+	}
 
 	// Find the best query string we can...
 	$query_string = empty($_SERVER['QUERY_STRING']) ? (empty($_SERVER['REQUEST_URL']) ? '' : str_replace($scripturl, '', $_SERVER['REQUEST_URL'])) : $_SERVER['QUERY_STRING'];
 
 	// Don't log the session hash in the url twice, it's a waste.
-	if (!empty($smcFunc['htmlspecialchars']))
-		$query_string = $smcFunc['htmlspecialchars']((SMF == 'SSI' || SMF == 'BACKGROUND' ? '' : '?') . preg_replace(array('~;sesc=[^&;]+~', '~' . session_name() . '=' . session_id() . '[&;]~'), array(';sesc', ''), $query_string));
+	if (!empty($smcFunc['htmlspecialchars'])) {
+			$query_string = $smcFunc['htmlspecialchars']((SMF == 'SSI' || SMF == 'BACKGROUND' ? '' : '?') . preg_replace(array('~;sesc=[^&;]+~', '~' . session_name() . '=' . session_id() . '[&;]~'), array(';sesc', ''), $query_string));
+	}
 
 	// Just so we know what board error messages are from.
-	if (isset($_POST['board']) && !isset($_GET['board']))
-		$query_string .= ($query_string == '' ? 'board=' : ';board=') . $_POST['board'];
+	if (isset($_POST['board']) && !isset($_GET['board'])) {
+			$query_string .= ($query_string == '' ? 'board=' : ';board=') . $_POST['board'];
+	}
 
 	// What types of categories do we have?
 	$known_error_types = array(
@@ -140,9 +149,9 @@ 
 
 			list($context['num_errors']) = $smcFunc['db_fetch_row']($query);
 			$smcFunc['db_free_result']($query);
+		} else {
+					$context['num_errors']++;
 		}
-		else
-			$context['num_errors']++;
 	}
 
 	// reset error call
@@ -164,12 +173,14 @@ 
 	global $txt;
 
 	// Send the appropriate HTTP status header - set this to 0 or false if you don't want to send one at all
-	if (!empty($status))
-		send_http_status($status);
+	if (!empty($status)) {
+			send_http_status($status);
+	}
 
 	// We don't have $txt yet, but that's okay...
-	if (empty($txt))
-		die($error);
+	if (empty($txt)) {
+			die($error);
+	}
 
 	log_error_online($error, false);
 	setup_fatal_error_context($log ? log_error($error, $log) : $error);
@@ -196,8 +207,9 @@ 
 	static $fatal_error_called = false;
 
 	// Send the status header - set this to 0 or false if you don't want to send one at all
-	if (!empty($status))
-		send_http_status($status);
+	if (!empty($status)) {
+			send_http_status($status);
+	}
 
 	// Try to load a theme if we don't have one.
 	if (empty($context['theme_loaded']) && empty($fatal_error_called))
@@ -207,8 +219,9 @@ 
 	}
 
 	// If we have no theme stuff we can't have the language file...
-	if (empty($context['theme_loaded']))
-		die($error);
+	if (empty($context['theme_loaded'])) {
+			die($error);
+	}
 
 	$reload_lang_file = true;
 	// Log the error in the forum's language, but don't waste the time if we aren't logging
@@ -244,8 +257,9 @@ 
 	global $settings, $modSettings, $db_show_debug;
 
 	// Ignore errors if we're ignoring them or they are strict notices from PHP 5
-	if (error_reporting() == 0)
-		return;
+	if (error_reporting() == 0) {
+			return;
+	}
 
 	if (strpos($file, 'eval()') !== false && !empty($settings['current_include_filename']))
 	{
@@ -253,19 +267,22 @@ 
 		$count = count($array);
 		for ($i = 0; $i < $count; $i++)
 		{
-			if ($array[$i]['function'] != 'loadSubTemplate')
-				continue;
+			if ($array[$i]['function'] != 'loadSubTemplate') {
+							continue;
+			}
 
 			// This is a bug in PHP, with eval, it seems!
-			if (empty($array[$i]['args']))
-				$i++;
+			if (empty($array[$i]['args'])) {
+							$i++;
+			}
 			break;
 		}
 
-		if (isset($array[$i]) && !empty($array[$i]['args']))
-			$file = realpath($settings['current_include_filename']) . ' (' . $array[$i]['args'][0] . ' sub template - eval?)';
-		else
-			$file = realpath($settings['current_include_filename']) . ' (eval?)';
+		if (isset($array[$i]) && !empty($array[$i]['args'])) {
+					$file = realpath($settings['current_include_filename']) . ' (' . $array[$i]['args'][0] . ' sub template - eval?)';
+		} else {
+					$file = realpath($settings['current_include_filename']) . ' (eval?)';
+		}
 	}
 
 	if (isset($db_show_debug) && $db_show_debug === true)
@@ -274,8 +291,9 @@ 
 		if ($error_level % 255 != E_ERROR)
 		{
 			$temporary = ob_get_contents();
-			if (substr($temporary, -2) == '="')
-				echo '"';
+			if (substr($temporary, -2) == '="') {
+							echo '"';
+			}
 		}
 
 		// Debugging!  This should look like a PHP error message.
@@ -291,23 +309,27 @@ 
 	call_integration_hook('integrate_output_error', array($message, $error_type, $error_level, $file, $line));
 
 	// Dying on these errors only causes MORE problems (blank pages!)
-	if ($file == 'Unknown')
-		return;
+	if ($file == 'Unknown') {
+			return;
+	}
 
 	// If this is an E_ERROR or E_USER_ERROR.... die.  Violently so.
-	if ($error_level % 255 == E_ERROR)
-		obExit(false);
-	else
-		return;
+	if ($error_level % 255 == E_ERROR) {
+			obExit(false);
+	} else {
+			return;
+	}
 
 	// If this is an E_ERROR, E_USER_ERROR, E_WARNING, or E_USER_WARNING.... die.  Violently so.
-	if ($error_level % 255 == E_ERROR || $error_level % 255 == E_WARNING)
-		fatal_error(allowedTo('admin_forum') ? $message : $error_string, false);
+	if ($error_level % 255 == E_ERROR || $error_level % 255 == E_WARNING) {
+			fatal_error(allowedTo('admin_forum') ? $message : $error_string, false);
+	}
 
 	// We should NEVER get to this point.  Any fatal error MUST quit, or very bad things can happen.
-	if ($error_level % 255 == E_ERROR)
-		die('No direct access...');
-}
+	if ($error_level % 255 == E_ERROR) {
+			die('No direct access...');
+	}
+	}
 
 /**
  * It is called by {@link fatal_error()} and {@link fatal_lang_error()}.
@@ -323,24 +345,28 @@ 
 
 	// Attempt to prevent a recursive loop.
 	++$level;
-	if ($level > 1)
-		return false;
+	if ($level > 1) {
+			return false;
+	}
 
 	// Maybe they came from dlattach or similar?
-	if (SMF != 'SSI' && SMF != 'BACKGROUND' && empty($context['theme_loaded']))
-		loadTheme();
+	if (SMF != 'SSI' && SMF != 'BACKGROUND' && empty($context['theme_loaded'])) {
+			loadTheme();
+	}
 
 	// Don't bother indexing errors mate...
 	$context['robot_no_index'] = true;
 
-	if (!isset($context['error_title']))
-		$context['error_title'] = $txt['error_occured'];
+	if (!isset($context['error_title'])) {
+			$context['error_title'] = $txt['error_occured'];
+	}
 	$context['error_message'] = isset($context['error_message']) ? $context['error_message'] : $error_message;
 
 	$context['error_code'] = isset($error_code) ? 'id="' . $error_code . '" ' : '';
 
-	if (empty($context['page_title']))
-		$context['page_title'] = $context['error_title'];
+	if (empty($context['page_title'])) {
+			$context['page_title'] = $context['error_title'];
+	}
 
 	loadTemplate('Errors');
 	$context['sub_template'] = 'fatal_error';
@@ -348,23 +374,26 @@ 
 	// If this is SSI, what do they want us to do?
 	if (SMF == 'SSI')
 	{
-		if (!empty($ssi_on_error_method) && $ssi_on_error_method !== true && is_callable($ssi_on_error_method))
-			$ssi_on_error_method();
-		elseif (empty($ssi_on_error_method) || $ssi_on_error_method !== true)
-			loadSubTemplate('fatal_error');
+		if (!empty($ssi_on_error_method) && $ssi_on_error_method !== true && is_callable($ssi_on_error_method)) {
+					$ssi_on_error_method();
+		} elseif (empty($ssi_on_error_method) || $ssi_on_error_method !== true) {
+					loadSubTemplate('fatal_error');
+		}
 
 		// No layers?
-		if (empty($ssi_on_error_method) || $ssi_on_error_method !== true)
-			exit;
+		if (empty($ssi_on_error_method) || $ssi_on_error_method !== true) {
+					exit;
+		}
 	}
 	// Alternatively from the cron call?
 	elseif (SMF == 'BACKGROUND')
 	{
 		// We can't rely on even having language files available.
-		if (defined('FROM_CLI') && FROM_CLI)
-			echo 'cron error: ', $context['error_message'];
-		else
-			echo 'An error occurred. More information may be available in your logs.';
+		if (defined('FROM_CLI') && FROM_CLI) {
+					echo 'cron error: ', $context['error_message'];
+		} else {
+					echo 'An error occurred. More information may be available in your logs.';
+		}
 		exit;
 	}
 
@@ -392,8 +421,8 @@ 
 
 	set_fatal_error_headers();
 
-	if (!empty($maintenance))
-		echo '<!DOCTYPE html>
+	if (!empty($maintenance)) {
+			echo '<!DOCTYPE html>
 <html>
 	<head>
 		<meta name="robots" content="noindex">
@@ -404,6 +433,7 @@ 
 		', $mmessage, '
 	</body>
 </html>';
+	}
 
 	die();
 }
@@ -425,15 +455,17 @@ 
 	// For our purposes, we're gonna want this on if at all possible.
 	$modSettings['cache_enable'] = '1';
 
-	if (($temp = cache_get_data('db_last_error', 600)) !== null)
-		$db_last_error = max($db_last_error, $temp);
+	if (($temp = cache_get_data('db_last_error', 600)) !== null) {
+			$db_last_error = max($db_last_error, $temp);
+	}
 
 	if ($db_last_error < time() - 3600 * 24 * 3 && empty($maintenance) && !empty($db_error_send))
 	{
 		// Avoid writing to the Settings.php file if at all possible; use shared memory instead.
 		cache_put_data('db_last_error', time(), 600);
-		if (($temp = cache_get_data('db_last_error', 600)) === null)
-			logLastDatabaseError();
+		if (($temp = cache_get_data('db_last_error', 600)) === null) {
+					logLastDatabaseError();
+		}
 
 		// Language files aren't loaded yet :(.
 		$db_error = @$smcFunc['db_error']($db_connection);
@@ -490,8 +522,9 @@ 
  */
 function set_fatal_error_headers()
 {
-	if (headers_sent())
-		return;
+	if (headers_sent()) {
+			return;
+	}
 
 	// Don't cache this page!
 	header('expires: Mon, 26 Jul 1997 05:00:00 GMT');
@@ -517,12 +550,14 @@ 
 	global $smcFunc, $user_info, $modSettings;
 
 	// Don't bother if Who's Online is disabled.
-	if (empty($modSettings['who_enabled']))
-		return;
+	if (empty($modSettings['who_enabled'])) {
+			return;
+	}
 
 	// Maybe they came from SSI or similar where sessions are not recorded?
-	if (SMF == 'SSI' || SMF == 'BACKGROUND')
-		return;
+	if (SMF == 'SSI' || SMF == 'BACKGROUND') {
+			return;
+	}
 
 	$session_id = !empty($user_info['is_guest']) ? 'ip' . $user_info['ip'] : session_id();
 
@@ -548,11 +583,13 @@ 
 		$url = $smcFunc['json_decode']($url, true);
 		$url['error'] = $error;
 		// Url field got a max length of 1024 in db
-		if (strlen($url['error']) > 500)
-			$url['error'] = substr($url['error'],0,500);
+		if (strlen($url['error']) > 500) {
+					$url['error'] = substr($url['error'],0,500);
+		}
 
-		if (!empty($sprintf))
-			$url['error_params'] = $sprintf;
+		if (!empty($sprintf)) {
+					$url['error_params'] = $sprintf;
+		}
 
 		$smcFunc['db_query']('', '
 			UPDATE {db_prefix}log_online

Sources/ManageBans.php

Doc Comments +2 added lines, -2 removed lines

@@ -929,7 +929,7 @@ 
  * Doesn't clean the inputs
  *
  * @param array $items_ids The items to remove
- * @param bool|int $group_id The ID of the group these triggers are associated with or false if deleting them from all groups
+ * @param integer $group_id The ID of the group these triggers are associated with or false if deleting them from all groups
  * @return bool Always returns true
  */
 function removeBanTriggers($items_ids = array(), $group_id = false)
@@ -1123,7 +1123,7 @@ 
  * Errors in $context['ban_errors']
  *
  * @param array $triggers The triggers to validate
- * @return array An array of riggers and log info ready to be used
+ * @return integer An array of riggers and log info ready to be used
  */
 function validateTriggers(&$triggers)
 {

Indentation +3 added lines, -3 removed lines

@@ -784,7 +784,7 @@ 
 		)
 	);
 	while ($row = $smcFunc['db_fetch_assoc']($request))
-	    $error_ips[] = inet_dtop($row['ip']);
+		$error_ips[] = inet_dtop($row['ip']);
 	$smcFunc['db_free_result']($request);
 
 	return $error_ips;
@@ -2168,9 +2168,9 @@ 
 
 	if ($low == '255.255.255.255') return 'unknown';
 	if ($low == $high)
-	    return $low;
+		return $low;
 	else
-	    return $low . '-' . $high;
+		return $low . '-' . $high;
 }
 
 /**

Braces +257 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(
@@ -320,8 +325,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);
 
@@ -363,8 +369,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);
 
@@ -373,11 +380,10 @@ 
 	createToken('admin-bet');
 	$context['form_url'] = $scripturl . '?action=admin;area=ban;sa=edit';
 
-	if (!empty($context['ban_errors']))
-		foreach ($context['ban_errors'] as $error)
+	if (!empty($context['ban_errors'])) {
+			foreach ($context['ban_errors'] as $error)
 			$context['error_messages'][$error] = $txt[$error];
-
-	else
+	} else
 	{
 		// If we're editing an existing ban, get it from the database.
 		if (!empty($ban_group_id))
@@ -413,12 +419,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;',
 						),
@@ -556,8 +563,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']);
 				}
@@ -625,8 +633,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))
 	{
@@ -663,18 +672,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(
@@ -740,9 +746,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;
 }
@@ -767,8 +774,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;
@@ -793,8 +801,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;
@@ -835,11 +844,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))
 		{
@@ -850,9 +861,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']))
@@ -862,8 +874,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();
@@ -910,10 +923,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);
@@ -921,16 +935,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
@@ -944,14 +960,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();
@@ -989,8 +1008,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']);
@@ -998,8 +1016,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']);
@@ -1007,8 +1024,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(
@@ -1041,8 +1057,7 @@ 
 				'ban_group' => $group_id,
 			)
 		);
-	}
-	elseif (!empty($items_ids))
+	} elseif (!empty($items_ids))
 	{
 		$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}ban_items
@@ -1067,13 +1082,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
@@ -1097,21 +1114,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
@@ -1137,8 +1156,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();
@@ -1147,39 +1167,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']('', '
@@ -1193,15 +1213,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));
 
@@ -1215,8 +1235,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);
 
@@ -1224,25 +1245,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'],
@@ -1255,15 +1276,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);
@@ -1283,8 +1305,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(
@@ -1309,18 +1332,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',
@@ -1348,15 +1374,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(
@@ -1397,8 +1427,9 @@ 
  */
 function logTriggersUpdates($logs, $new = true, $removal = false)
 {
-	if (empty($logs))
-		return;
+	if (empty($logs)) {
+			return;
+	}
 
 	$log_name_map = array(
 		'main_ip' => 'ip_range',
@@ -1409,14 +1440,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
@@ -1430,12 +1462,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']))
 	{
@@ -1450,8 +1485,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);
 	}
 
@@ -1469,13 +1505,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
@@ -1519,10 +1557,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']))
 	{
@@ -1537,13 +1577,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']('',
@@ -1560,8 +1602,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'];
 }
@@ -1586,24 +1629,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 : ''));
@@ -1634,8 +1677,7 @@ 
 			),
 			'is_new' => true,
 		);
-	}
-	else
+	} else
 	{
 		$request = $smcFunc['db_query']('', '
 			SELECT
@@ -1652,8 +1694,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);
 
@@ -1702,8 +1745,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()));
@@ -1816,8 +1860,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)
@@ -1829,8 +1872,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)
@@ -1842,8 +1884,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(
@@ -1907,8 +1948,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;
@@ -1964,8 +2006,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
 		{
@@ -2174,12 +2217,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.
@@ -2255,15 +2301,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);
@@ -2314,14 +2362,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']('', '
@@ -2348,9 +2397,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');

Spacing +5 added lines, -5 removed lines

@@ -283,11 +283,11 @@ 
 			if (removeItems == 0)
 			{
 				e.preventDefault();
-				return alert("'. $txt['select_item_check'] .'");
+				return alert("'. $txt['select_item_check'] . '");
 			}
 
 
-			return confirm("'. $txt['ban_remove_selected_confirm'] .'");
+			return confirm("'. $txt['ban_remove_selected_confirm'] . '");
 		});',
 	);
 
@@ -486,7 +486,7 @@ 
 					array(
 						'position' => 'below_table_data',
 						'value' => '
-						<input type="submit" name="remove_selection" value="' . $txt['ban_remove_selected_triggers'] . '" class="button"> <a class="button" href="' . $scripturl	. '?action=admin;area=ban;sa=edittrigger;bg=' . $ban_group_id . '">' . $txt['ban_add_trigger'] . '</a>',
+						<input type="submit" name="remove_selection" value="' . $txt['ban_remove_selected_triggers'] . '" class="button"> <a class="button" href="' . $scripturl . '?action=admin;area=ban;sa=edittrigger;bg=' . $ban_group_id . '">' . $txt['ban_add_trigger'] . '</a>',
 						'style' => 'text-align: right;',
 					),
 					array(
@@ -506,11 +506,11 @@ 
 			if (removeItems == 0)
 			{
 				e.preventDefault();
-				return alert("'. $txt['select_item_check'] .'");
+				return alert("'. $txt['select_item_check'] . '");
 			}
 
 
-			return confirm("'. $txt['ban_remove_selected_confirm'] .'");
+			return confirm("'. $txt['ban_remove_selected_confirm'] . '");
 		});',
 			);
 			createList($listOptions);

Sources/ManagePaid.php

Doc Comments +1 added lines, -1 removed lines

@@ -1452,7 +1452,7 @@
  *
  * @param int $id_subscribe The subscription ID
  * @param int $id_member The ID of the member
- * @param int|string $renewal 0 if we're forcing start/end time, otherwise a string indicating how long to renew the subscription for ('D', 'W', 'M' or 'Y')
+ * @param integer $renewal 0 if we're forcing start/end time, otherwise a string indicating how long to renew the subscription for ('D', 'W', 'M' or 'Y')
  * @param int $forceStartTime If set, forces the subscription to start at the specified time
  * @param int $forceEndTime If set, forces the subscription to end at the specified time
  */

Braces +202 added lines, -148 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The main entrance point for the 'Paid Subscription' screen, calling
@@ -32,18 +33,19 @@ 
 	loadLanguage('ManagePaid');
 	loadTemplate('ManagePaid');
 
-	if (!empty($modSettings['paid_enabled']))
-		$subActions = array(
+	if (!empty($modSettings['paid_enabled'])) {
+			$subActions = array(
 			'modify' => array('ModifySubscription', 'admin_forum'),
 			'modifyuser' => array('ModifyUserSubscription', 'admin_forum'),
 			'settings' => array('ModifySubscriptionSettings', 'admin_forum'),
 			'view' => array('ViewSubscriptions', 'admin_forum'),
 			'viewsub' => array('ViewSubscribedUsers', 'admin_forum'),
 		);
-	else
-		$subActions = array(
+	} else {
+			$subActions = array(
 			'settings' => array('ModifySubscriptionSettings', 'admin_forum'),
 		);
+	}
 
 	// Default the sub-action to 'view subscriptions', but only if they have already set things up..
 	$_REQUEST['sa'] = isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']]) ? $_REQUEST['sa'] : (!empty($modSettings['paid_currency_symbol']) && !empty($modSettings['paid_enabled']) ? 'view' : 'settings');
@@ -59,8 +61,8 @@ 
 		'help' => '',
 		'description' => $txt['paid_subscriptions_desc'],
 	);
-	if (!empty($modSettings['paid_enabled']))
-		$context[$context['admin_menu_name']]['tab_data']['tabs'] = array(
+	if (!empty($modSettings['paid_enabled'])) {
+			$context[$context['admin_menu_name']]['tab_data']['tabs'] = array(
 			'view' => array(
 				'description' => $txt['paid_subs_view_desc'],
 			),
@@ -68,6 +70,7 @@ 
 				'description' => $txt['paid_subs_settings_desc'],
 			),
 		);
+	}
 
 	call_integration_hook('integrate_manage_subscriptions', array(&$subActions));
 
@@ -92,8 +95,9 @@ 
 	{
 		// If the currency is set to something different then we need to set it to other for this to work and set it back shortly.
 		$modSettings['paid_currency'] = !empty($modSettings['paid_currency_code']) ? $modSettings['paid_currency_code'] : '';
-		if (!empty($modSettings['paid_currency_code']) && !in_array($modSettings['paid_currency_code'], array('usd', 'eur', 'gbp', 'cad', 'aud')))
-			$modSettings['paid_currency'] = 'other';
+		if (!empty($modSettings['paid_currency_code']) && !in_array($modSettings['paid_currency_code'], array('usd', 'eur', 'gbp', 'cad', 'aud'))) {
+					$modSettings['paid_currency'] = 'other';
+		}
 
 		// These are all the default settings.
 		$config_vars = array(
@@ -156,8 +160,7 @@ 
 			}
 		}
 		toggleOther();', true);
-	}
-	else
+	} else
 	{
 		$config_vars = array(
 			array('check', 'paid_enabled'),
@@ -166,8 +169,9 @@ 
 	}
 
 	// Just searching?
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Get the settings template fired up.
 	require_once($sourcedir . '/ManageServer.php');
@@ -211,8 +215,9 @@ 
 			foreach (explode(',', $_POST['paid_email_to']) as $email)
 			{
 				$email = trim($email);
-				if (!empty($email) && filter_var($email, FILTER_VALIDATE_EMAIL))
-					$email_addresses[] = $email;
+				if (!empty($email) && filter_var($email, FILTER_VALIDATE_EMAIL)) {
+									$email_addresses[] = $email;
+				}
 				$_POST['paid_email_to'] = implode(',', $email_addresses);
 			}
 		}
@@ -249,8 +254,9 @@ 
 	global $context, $txt, $modSettings, $sourcedir, $scripturl;
 
 	// Not made the settings yet?
-	if (empty($modSettings['paid_currency_symbol']))
-		fatal_lang_error('paid_not_set_currency', false, $scripturl . '?action=admin;area=paidsubscribe;sa=settings');
+	if (empty($modSettings['paid_currency_symbol'])) {
+			fatal_lang_error('paid_not_set_currency', false, $scripturl . '?action=admin;area=paidsubscribe;sa=settings');
+	}
 
 	// Some basic stuff.
 	$context['page_title'] = $txt['paid_subs_view'];
@@ -270,10 +276,11 @@ 
 
 				foreach ($context['subscriptions'] as $data)
 				{
-					if (++$counter < $start)
-						continue;
-					elseif ($counter == $start + $items_per_page)
-						break;
+					if (++$counter < $start) {
+											continue;
+					} elseif ($counter == $start + $items_per_page) {
+											break;
+					}
 
 					$subscriptions[] = $data;
 				}
@@ -450,8 +457,9 @@ 
 			);
 			$id_group = 0;
 			$add_groups = '';
-			if ($smcFunc['db_num_rows']($request))
-				list ($id_group, $add_groups) = $smcFunc['db_fetch_row']($request);
+			if ($smcFunc['db_num_rows']($request)) {
+							list ($id_group, $add_groups) = $smcFunc['db_fetch_row']($request);
+			}
 			$smcFunc['db_free_result']($request);
 
 			$changes = array();
@@ -463,8 +471,9 @@ 
 				{
 					// If their current primary group isn't what they had before the subscription, and their current group was
 					// granted by the sub, remove it.
-					if ($member_data['old_id_group'] != $member_data['id_group'] && $member_data['id_group'] == $id_group)
-						$changes[$id_member]['id_group'] = $member_data['old_id_group'];
+					if ($member_data['old_id_group'] != $member_data['id_group'] && $member_data['id_group'] == $id_group) {
+											$changes[$id_member]['id_group'] = $member_data['old_id_group'];
+					}
 				}
 			}
 
@@ -477,15 +486,17 @@ 
 					// First let's get their groups sorted.
 					$current_groups = explode(',', $member_data['additional_groups']);
 					$new_groups = implode(',', array_diff($current_groups, $add_groups));
-					if ($new_groups != $member_data['additional_groups'])
-						$changes[$id_member]['additional_groups'] = $new_groups;
+					if ($new_groups != $member_data['additional_groups']) {
+											$changes[$id_member]['additional_groups'] = $new_groups;
+					}
 				}
 			}
 
 			// We're going through changes...
-			if (!empty($changes))
-				foreach ($changes as $id_member => $new_values)
+			if (!empty($changes)) {
+							foreach ($changes as $id_member => $new_values)
 					updateMemberData($id_member, $new_values);
+			}
 		}
 
 		// Delete the subscription
@@ -533,11 +544,13 @@ 
 				'M' => 24,
 				'Y' => 5,
 			);
-			if (empty($_POST['span_unit']) || empty($limits[$_POST['span_unit']]) || empty($_POST['span_value']) || $_POST['span_value'] < 1)
-				fatal_lang_error('paid_invalid_duration', false);
+			if (empty($_POST['span_unit']) || empty($limits[$_POST['span_unit']]) || empty($_POST['span_value']) || $_POST['span_value'] < 1) {
+							fatal_lang_error('paid_invalid_duration', false);
+			}
 
-			if ($_POST['span_value'] > $limits[$_POST['span_unit']])
-				fatal_lang_error('paid_invalid_duration_' . $_POST['span_unit'], false);
+			if ($_POST['span_value'] > $limits[$_POST['span_unit']]) {
+							fatal_lang_error('paid_invalid_duration_' . $_POST['span_unit'], false);
+			}
 
 			// Clean the span.
 			$span = $_POST['span_value'] . $_POST['span_unit'];
@@ -546,8 +559,9 @@ 
 			$cost = array('fixed' => sprintf('%01.2f', strtr($_POST['cost'], ',', '.')));
 
 			// There needs to be something.
-			if (empty($_POST['span_value']) || empty($_POST['cost']))
-				fatal_lang_error('paid_no_cost_value');
+			if (empty($_POST['span_value']) || empty($_POST['cost'])) {
+							fatal_lang_error('paid_no_cost_value');
+			}
 		}
 		// Flexible is harder but more fun ;)
 		else
@@ -561,8 +575,9 @@ 
 				'year' => sprintf('%01.2f', strtr($_POST['cost_year'], ',', '.')),
 			);
 
-			if (empty($_POST['cost_day']) && empty($_POST['cost_week']) && empty($_POST['cost_month']) && empty($_POST['cost_year']))
-				fatal_lang_error('paid_all_freq_blank');
+			if (empty($_POST['cost_day']) && empty($_POST['cost_week']) && empty($_POST['cost_month']) && empty($_POST['cost_year'])) {
+							fatal_lang_error('paid_all_freq_blank');
+			}
 		}
 		$cost = $smcFunc['json_encode']($cost);
 
@@ -571,9 +586,10 @@ 
 
 		// Yep, time to do additional groups.
 		$addgroups = array();
-		if (!empty($_POST['addgroup']))
-			foreach ($_POST['addgroup'] as $id => $dummy)
+		if (!empty($_POST['addgroup'])) {
+					foreach ($_POST['addgroup'] as $id => $dummy)
 				$addgroups[] = (int) $id;
+		}
 		$addgroups = implode(',', $addgroups);
 
 		// Is it new?!
@@ -683,18 +699,18 @@ 
 			{
 				$span_value = $match[1];
 				$span_unit = $match[2];
-			}
-			else
+			} else
 			{
 				$span_value = 0;
 				$span_unit = 'D';
 			}
 
 			// Is this a flexible one?
-			if ($row['length'] == 'F')
-				$isFlexible = true;
-			else
-				$isFlexible = false;
+			if ($row['length'] == 'F') {
+							$isFlexible = true;
+			} else {
+							$isFlexible = false;
+			}
 
 			$context['sub'] = array(
 				'name' => $row['name'],
@@ -743,8 +759,9 @@ 
 		)
 	);
 	$context['groups'] = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['groups'][$row['id_group']] = $row['group_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['groups'][$row['id_group']] = $row['group_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// This always happens.
@@ -778,8 +795,9 @@ 
 		)
 	);
 	// Something wrong?
-	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);
+	}
 	// Do the subscription context.
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$context['subscription'] = array(
@@ -1014,8 +1032,8 @@ 
 		))
 	);
 	$subscribers = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$subscribers[] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$subscribers[] = array(
 			'id' => $row['id_sublog'],
 			'id_member' => $row['id_member'],
 			'name' => $row['name'],
@@ -1025,6 +1043,7 @@ 
 			'status' => $row['status'],
 			'status_text' => $row['status'] == 0 ? ($row['payments_pending'] == 0 ? $txt['paid_finished'] : $txt['paid_pending']) : $txt['paid_active'],
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $subscribers;
@@ -1059,14 +1078,16 @@ 
 				'current_log_item' => $context['log_id'],
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) == 0)
-			fatal_lang_error('no_access', false);
+		if ($smcFunc['db_num_rows']($request) == 0) {
+					fatal_lang_error('no_access', false);
+		}
 		list ($context['sub_id']) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 	}
 
-	if (!isset($context['subscriptions'][$context['sub_id']]))
-		fatal_lang_error('no_access', false);
+	if (!isset($context['subscriptions'][$context['sub_id']])) {
+			fatal_lang_error('no_access', false);
+	}
 	$context['current_subscription'] = $context['subscriptions'][$context['sub_id']];
 
 	// Searching?
@@ -1099,8 +1120,9 @@ 
 					'name' => $_POST['name'],
 				)
 			);
-			if ($smcFunc['db_num_rows']($request) == 0)
-				fatal_lang_error('error_member_not_found');
+			if ($smcFunc['db_num_rows']($request) == 0) {
+							fatal_lang_error('error_member_not_found');
+			}
 
 			list ($id_member, $id_group) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
@@ -1116,14 +1138,15 @@ 
 					'current_member' => $id_member,
 				)
 			);
-			if ($smcFunc['db_num_rows']($request) != 0)
-				fatal_lang_error('member_already_subscribed');
+			if ($smcFunc['db_num_rows']($request) != 0) {
+							fatal_lang_error('member_already_subscribed');
+			}
 			$smcFunc['db_free_result']($request);
 
 			// Actually put the subscription in place.
-			if ($status == 1)
-				addSubscription($context['sub_id'], $id_member, 0, $starttime, $endtime);
-			else
+			if ($status == 1) {
+							addSubscription($context['sub_id'], $id_member, 0, $starttime, $endtime);
+			} else
 			{
 				$smcFunc['db_insert']('',
 					'{db_prefix}log_subscribed',
@@ -1150,20 +1173,20 @@ 
 					'current_log_item' => $context['log_id'],
 				)
 			);
-			if ($smcFunc['db_num_rows']($request) == 0)
-				fatal_lang_error('no_access', false);
+			if ($smcFunc['db_num_rows']($request) == 0) {
+							fatal_lang_error('no_access', false);
+			}
 
 			list ($id_member, $old_status) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
 
 			// Pick the right permission stuff depending on what the status is changing from/to.
-			if ($old_status == 1 && $status != 1)
-				removeSubscription($context['sub_id'], $id_member);
-			elseif ($status == 1 && $old_status != 1)
+			if ($old_status == 1 && $status != 1) {
+							removeSubscription($context['sub_id'], $id_member);
+			} elseif ($status == 1 && $old_status != 1)
 			{
 				addSubscription($context['sub_id'], $id_member, 0, $starttime, $endtime);
-			}
-			else
+			} else
 			{
 				$smcFunc['db_query']('', '
 					UPDATE {db_prefix}log_subscribed
@@ -1191,8 +1214,9 @@ 
 		if (!empty($_REQUEST['delsub']))
 		{
 			$toDelete = array();
-			foreach ($_REQUEST['delsub'] as $id => $dummy)
-				$toDelete[] = (int) $id;
+			foreach ($_REQUEST['delsub'] as $id => $dummy) {
+							$toDelete[] = (int) $id;
+			}
 
 			$request = $smcFunc['db_query']('', '
 				SELECT id_subscribe, id_member
@@ -1202,8 +1226,9 @@ 
 					'subscription_list' => $toDelete,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				removeSubscription($row['id_subscribe'], $row['id_member'], isset($_REQUEST['delete']));
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							removeSubscription($row['id_subscribe'], $row['id_member'], isset($_REQUEST['delete']));
+			}
 			$smcFunc['db_free_result']($request);
 		}
 		redirectexit('action=admin;area=paidsubscribe;sa=viewsub;sid=' . $context['sub_id']);
@@ -1247,9 +1272,9 @@ 
 			);
 			list ($context['sub']['username']) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
+		} else {
+					$context['sub']['username'] = '';
 		}
-		else
-			$context['sub']['username'] = '';
 	}
 	// Otherwise load the existing info.
 	else
@@ -1266,8 +1291,9 @@ 
 				'blank_string' => '',
 			)
 		);
-		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);
+		}
 		$row = $smcFunc['db_fetch_assoc']($request);
 		$smcFunc['db_free_result']($request);
 
@@ -1288,13 +1314,13 @@ 
 					{
 						foreach ($costs as $duration => $cost)
 						{
-							if ($cost != 0 && $cost == $pending[1] && $duration == $pending[2])
-								$context['pending_payments'][$id] = array(
+							if ($cost != 0 && $cost == $pending[1] && $duration == $pending[2]) {
+															$context['pending_payments'][$id] = array(
 									'desc' => sprintf($modSettings['paid_currency_symbol'], $cost . '/' . $txt[$duration]),
 								);
+							}
 						}
-					}
-					elseif ($costs['fixed'] == $pending[1])
+					} elseif ($costs['fixed'] == $pending[1])
 					{
 						$context['pending_payments'][$id] = array(
 							'desc' => sprintf($modSettings['paid_currency_symbol'], $costs['fixed']),
@@ -1312,8 +1338,9 @@ 
 					if ($_GET['pending'] == $id && $pending[3] == 'payback' && isset($context['pending_payments'][$id]))
 					{
 						// Flexible?
-						if (isset($_GET['accept']))
-							addSubscription($context['current_subscription']['id'], $row['id_member'], $context['current_subscription']['real_length'] == 'F' ? strtoupper(substr($pending[2], 0, 1)) : 0);
+						if (isset($_GET['accept'])) {
+													addSubscription($context['current_subscription']['id'], $row['id_member'], $context['current_subscription']['real_length'] == 'F' ? strtoupper(substr($pending[2], 0, 1)) : 0);
+						}
 						unset($pending_details[$id]);
 
 						$new_details = $smcFunc['json_encode']($pending_details);
@@ -1375,8 +1402,9 @@ 
 	global $smcFunc;
 
 	// Make it an array.
-	if (!is_array($users))
-		$users = array($users);
+	if (!is_array($users)) {
+			$users = array($users);
+	}
 
 	// Get all the members current groups.
 	$groups = array();
@@ -1414,14 +1442,16 @@ 
 		if ($row['id_group'] != 0)
 		{
 			// If this is changing - add the old one to the additional groups so it's not lost.
-			if ($row['id_group'] != $groups[$row['id_member']]['primary'])
-				$groups[$row['id_member']]['additional'][] = $groups[$row['id_member']]['primary'];
+			if ($row['id_group'] != $groups[$row['id_member']]['primary']) {
+							$groups[$row['id_member']]['additional'][] = $groups[$row['id_member']]['primary'];
+			}
 			$groups[$row['id_member']]['primary'] = $row['id_group'];
 		}
 
 		// Additional groups.
-		if (!empty($row['add_groups']))
-			$groups[$row['id_member']]['additional'] = array_merge($groups[$row['id_member']]['additional'], explode(',', $row['add_groups']));
+		if (!empty($row['add_groups'])) {
+					$groups[$row['id_member']]['additional'] = array_merge($groups[$row['id_member']]['additional'], explode(',', $row['add_groups']));
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -1429,9 +1459,10 @@ 
 	foreach ($groups as $id => $group)
 	{
 		$group['additional'] = array_unique($group['additional']);
-		foreach ($group['additional'] as $key => $value)
-			if (empty($value))
+		foreach ($group['additional'] as $key => $value) {
+					if (empty($value))
 				unset($group['additional'][$key]);
+		}
 		$addgroups = implode(',', $group['additional']);
 
 		$smcFunc['db_query']('', '
@@ -1465,8 +1496,9 @@ 
 	loadSubscriptions();
 
 	// Exists, yes?
-	if (!isset($context['subscriptions'][$id_subscribe]))
-		return;
+	if (!isset($context['subscriptions'][$id_subscribe])) {
+			return;
+	}
 
 	$curSub = $context['subscriptions'][$id_subscribe];
 
@@ -1514,16 +1546,19 @@ 
 		list ($id_sublog, $endtime, $starttime) = $smcFunc['db_fetch_row']($request);
 
 		// If this has already expired but is active, extension means the period from now.
-		if ($endtime < time())
-			$endtime = time();
-		if ($starttime == 0)
-			$starttime = time();
+		if ($endtime < time()) {
+					$endtime = time();
+		}
+		if ($starttime == 0) {
+					$starttime = time();
+		}
 
 		// Work out the new expiry date.
 		$endtime += $duration;
 
-		if ($forceEndTime != 0)
-			$endtime = $forceEndTime;
+		if ($forceEndTime != 0) {
+					$endtime = $forceEndTime;
+		}
 
 		// As everything else should be good, just update!
 		$smcFunc['db_query']('', '
@@ -1553,8 +1588,9 @@ 
 	);
 
 	// Just in case the member doesn't exist.
-	if ($smcFunc['db_num_rows']($request) == 0)
-		return;
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			return;
+	}
 
 	list ($old_id_group, $additional_groups) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
@@ -1571,16 +1607,18 @@ 
 		$id_group = $curSub['prim_group'];
 
 		// Ensure their old privileges are maintained.
-		if ($old_id_group != 0)
-			$newAddGroups[] = $old_id_group;
+		if ($old_id_group != 0) {
+					$newAddGroups[] = $old_id_group;
+		}
+	} else {
+			$id_group = $old_id_group;
 	}
-	else
-		$id_group = $old_id_group;
 
 	// Yep, make sure it's unique, and no empties.
-	foreach ($newAddGroups as $k => $v)
-		if (empty($v))
+	foreach ($newAddGroups as $k => $v) {
+			if (empty($v))
 			unset($newAddGroups[$k]);
+	}
 	$newAddGroups = array_unique($newAddGroups);
 	$newAddGroups = implode(',', $newAddGroups);
 
@@ -1616,16 +1654,19 @@ 
 		list ($id_sublog, $endtime, $starttime) = $smcFunc['db_fetch_row']($request);
 
 		// If this has already expired but is active, extension means the period from now.
-		if ($endtime < time())
-			$endtime = time();
-		if ($starttime == 0)
-			$starttime = time();
+		if ($endtime < time()) {
+					$endtime = time();
+		}
+		if ($starttime == 0) {
+					$starttime = time();
+		}
 
 		// Work out the new expiry date.
 		$endtime += $duration;
 
-		if ($forceEndTime != 0)
-			$endtime = $forceEndTime;
+		if ($forceEndTime != 0) {
+					$endtime = $forceEndTime;
+		}
 
 		// As everything else should be good, just update!
 		$smcFunc['db_query']('', '
@@ -1648,13 +1689,15 @@ 
 
 	// Otherwise a very simple insert.
 	$endtime = time() + $duration;
-	if ($forceEndTime != 0)
-		$endtime = $forceEndTime;
+	if ($forceEndTime != 0) {
+			$endtime = $forceEndTime;
+	}
 
-	if ($forceStartTime == 0)
-		$starttime = time();
-	else
-		$starttime = $forceStartTime;
+	if ($forceStartTime == 0) {
+			$starttime = time();
+	} else {
+			$starttime = $forceStartTime;
+	}
 
 	$smcFunc['db_insert']('',
 		'{db_prefix}log_subscribed',
@@ -1727,15 +1770,17 @@ 
 	$new_id_group = -1;
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (!isset($context['subscriptions'][$row['id_subscribe']]))
-			continue;
+		if (!isset($context['subscriptions'][$row['id_subscribe']])) {
+					continue;
+		}
 
 		// The one we're removing?
 		if ($row['id_subscribe'] == $id_subscribe)
 		{
 			$removals = explode(',', $context['subscriptions'][$row['id_subscribe']]['add_groups']);
-			if ($context['subscriptions'][$row['id_subscribe']]['prim_group'] != 0)
-				$removals[] = $context['subscriptions'][$row['id_subscribe']]['prim_group'];
+			if ($context['subscriptions'][$row['id_subscribe']]['prim_group'] != 0) {
+							$removals[] = $context['subscriptions'][$row['id_subscribe']]['prim_group'];
+			}
 			$old_id_group = $row['old_id_group'];
 		}
 		// Otherwise things we allow.
@@ -1753,30 +1798,33 @@ 
 
 	// Now, for everything we are removing check they definitely are not allowed it.
 	$existingGroups = explode(',', $additional_groups);
-	foreach ($existingGroups as $key => $group)
-		if (empty($group) || (in_array($group, $removals) && !in_array($group, $allowed)))
+	foreach ($existingGroups as $key => $group) {
+			if (empty($group) || (in_array($group, $removals) && !in_array($group, $allowed)))
 			unset($existingGroups[$key]);
+	}
 
 	// Finally, do something with the current primary group.
 	if (in_array($id_group, $removals))
 	{
 		// If this primary group is actually allowed keep it.
-		if (in_array($id_group, $allowed))
-			$existingGroups[] = $id_group;
+		if (in_array($id_group, $allowed)) {
+					$existingGroups[] = $id_group;
+		}
 
 		// Either way, change the id_group back.
 		if ($new_id_group < 1)
 		{
 			// If we revert to the old id-group we need to ensure it wasn't from a subscription.
-			foreach ($context['subscriptions'] as $id => $group)
-				// It was? Make them a regular member then!
+			foreach ($context['subscriptions'] as $id => $group) {
+							// It was? Make them a regular member then!
 				if ($group['prim_group'] == $old_id_group)
 					$old_id_group = 0;
+			}
 
 			$id_group = $old_id_group;
+		} else {
+					$id_group = $new_id_group;
 		}
-		else
-			$id_group = $new_id_group;
 	}
 
 	// Crazy stuff, we seem to have our groups fixed, just make them unique
@@ -1796,8 +1844,8 @@ 
 	);
 
 	// Disable the subscription.
-	if (!$delete)
-		$smcFunc['db_query']('', '
+	if (!$delete) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}log_subscribed
 			SET status = {int:not_active}
 			WHERE id_member = {int:current_member}
@@ -1808,9 +1856,10 @@ 
 				'current_subscription' => $id_subscribe,
 			)
 		);
+	}
 	// Otherwise delete it!
-	else
-		$smcFunc['db_query']('', '
+	else {
+			$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}log_subscribed
 			WHERE id_member = {int:current_member}
 				AND id_subscribe = {int:current_subscription}',
@@ -1819,7 +1868,8 @@ 
 				'current_subscription' => $id_subscribe,
 			)
 		);
-}
+	}
+	}
 
 /**
  * This just kind of caches all the subscription data.
@@ -1828,8 +1878,9 @@ 
 {
 	global $context, $txt, $modSettings, $smcFunc;
 
-	if (!empty($context['subscriptions']))
-		return;
+	if (!empty($context['subscriptions'])) {
+			return;
+	}
 
 	// Make sure this is loaded, just in case.
 	loadLanguage('ManagePaid');
@@ -1846,10 +1897,11 @@ 
 		// Pick a cost.
 		$costs = $smcFunc['json_decode']($row['cost'], true);
 
-		if ($row['length'] != 'F' && !empty($modSettings['paid_currency_symbol']) && !empty($costs['fixed']))
-			$cost = sprintf($modSettings['paid_currency_symbol'], $costs['fixed']);
-		else
-			$cost = '???';
+		if ($row['length'] != 'F' && !empty($modSettings['paid_currency_symbol']) && !empty($costs['fixed'])) {
+					$cost = sprintf($modSettings['paid_currency_symbol'], $costs['fixed']);
+		} else {
+					$cost = '???';
+		}
 
 		// Do the span.
 		preg_match('~(\d*)(\w)~', $row['length'], $match);
@@ -1876,9 +1928,9 @@ 
 					$num_length *= 31556926;
 					break;
 			}
+		} else {
+					$length = '??';
 		}
-		else
-			$length = '??';
 
 		$context['subscriptions'][$row['id_subscribe']] = array(
 			'id' => $row['id_subscribe'],
@@ -1913,8 +1965,9 @@ 
 	{
 		$ind = $row['status'] == 0 ? 'finished' : 'total';
 
-		if (isset($context['subscriptions'][$row['id_subscribe']]))
-			$context['subscriptions'][$row['id_subscribe']][$ind] = $row['member_count'];
+		if (isset($context['subscriptions'][$row['id_subscribe']])) {
+					$context['subscriptions'][$row['id_subscribe']][$ind] = $row['member_count'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -1928,8 +1981,9 @@ 
 	);
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (isset($context['subscriptions'][$row['id_subscribe']]))
-			$context['subscriptions'][$row['id_subscribe']]['pending'] = $row['total_pending'];
+		if (isset($context['subscriptions'][$row['id_subscribe']])) {
+					$context['subscriptions'][$row['id_subscribe']]['pending'] = $row['total_pending'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 }

Spacing +1 added lines, -1 removed lines

@@ -1129,7 +1129,7 @@
 					'{db_prefix}log_subscribed',
 					array(
 						'id_subscribe' => 'int', 'id_member' => 'int', 'old_id_group' => 'int', 'start_time' => 'int',
-						'end_time' => 'int', 'status' => 'int','pending_details' => 'string-65534'
+						'end_time' => 'int', 'status' => 'int', 'pending_details' => 'string-65534'
 					),
 					array(
 						$context['sub_id'], $id_member, $id_group, $starttime,

Sources/PersonalMessage.php

Doc Comments +1 added lines, -1 removed lines

@@ -4070,7 +4070,7 @@
  *
  * @param int $pmID The ID of the PM
  * @param string $validFor Which folders this is valud for - can be 'inbox', 'outbox' or 'in_or_outbox'
- * @return boolean Whether the PM is accessible in that folder for the current user
+ * @return boolean|null Whether the PM is accessible in that folder for the current user
  */
 function isAccessiblePM($pmID, $validFor = 'in_or_outbox')
 {

Braces +633 added lines, -471 removed lines

@@ -15,8 +15,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This helps organize things...
@@ -37,13 +38,14 @@ 
 
 	loadLanguage('PersonalMessage+Drafts');
 
-	if (!isset($_REQUEST['xml']))
-		loadTemplate('PersonalMessage');
+	if (!isset($_REQUEST['xml'])) {
+			loadTemplate('PersonalMessage');
+	}
 
 	// Load up the members maximum message capacity.
-	if ($user_info['is_admin'])
-		$context['message_limit'] = 0;
-	elseif (($context['message_limit'] = cache_get_data('msgLimit:' . $user_info['id'], 360)) === null)
+	if ($user_info['is_admin']) {
+			$context['message_limit'] = 0;
+	} elseif (($context['message_limit'] = cache_get_data('msgLimit:' . $user_info['id'], 360)) === null)
 	{
 		// @todo Why do we do this?  It seems like if they have any limit we should use it.
 		$request = $smcFunc['db_query']('', '
@@ -78,8 +80,9 @@ 
 	}
 
 	// a previous message was sent successfully? show a small indication.
-	if (isset($_GET['done']) && ($_GET['done'] == 'sent'))
-		$context['pm_sent'] = true;
+	if (isset($_GET['done']) && ($_GET['done'] == 'sent')) {
+			$context['pm_sent'] = true;
+	}
 
 	$context['labels'] = array();
 
@@ -210,11 +213,11 @@ 
 	{
 		$_REQUEST['sa'] = '';
 		MessageFolder();
-	}
-	else
+	} else
 	{
-		if (!isset($_REQUEST['xml']) && $_REQUEST['sa'] != 'popup')
-			messageIndexBar($_REQUEST['sa']);
+		if (!isset($_REQUEST['xml']) && $_REQUEST['sa'] != 'popup') {
+					messageIndexBar($_REQUEST['sa']);
+		}
 
 		call_helper($subActions[$_REQUEST['sa']]);
 	}
@@ -297,15 +300,16 @@ 
 	);
 
 	// Handle labels.
-	if (empty($context['currently_using_labels']))
-		unset($pm_areas['labels']);
-	else
+	if (empty($context['currently_using_labels'])) {
+			unset($pm_areas['labels']);
+	} else
 	{
 		// Note we send labels by id as it will have less problems in the querystring.
 		foreach ($context['labels'] as $label)
 		{
-			if ($label['id'] == -1)
-				continue;
+			if ($label['id'] == -1) {
+							continue;
+			}
 
 			// Count the amount of unread items in labels.
 			$pm_areas['labels']['amt'] += $label['unread_messages'];
@@ -356,8 +360,9 @@ 
 	unset($pm_areas);
 
 	// No menu means no access.
-	if (!$pm_include_data && (!$user_info['is_guest'] || validateSession()))
-		fatal_lang_error('no_access', false);
+	if (!$pm_include_data && (!$user_info['is_guest'] || validateSession())) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Make a note of the Unique ID for this menu.
 	$context['pm_menu_id'] = $context['max_menu_id'];
@@ -368,9 +373,10 @@ 
 	$context['menu_item_selected'] = $current_area;
 
 	// Set the template for this area and add the profile layer.
-	if (!isset($_REQUEST['xml']))
-		$context['template_layers'][] = 'pm';
-}
+	if (!isset($_REQUEST['xml'])) {
+			$context['template_layers'][] = 'pm';
+	}
+	}
 
 /**
  * The popup for when we ask for the popup from the user.
@@ -402,8 +408,9 @@ 
 		)
 	);
 	$pms = array();
-	while ($row = $smcFunc['db_fetch_row']($request))
-		$pms[] = $row[0];
+	while ($row = $smcFunc['db_fetch_row']($request)) {
+			$pms[] = $row[0];
+	}
 	$smcFunc['db_free_result']($request);
 
 	if (!empty($pms))
@@ -431,8 +438,9 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (!empty($row['id_member_from']))
-				$senders[] = $row['id_member_from'];
+			if (!empty($row['id_member_from'])) {
+							$senders[] = $row['id_member_from'];
+			}
 
 			$row['replied_to_you'] = $row['id_pm'] != $row['id_pm_head'];
 			$row['time'] = timeformat($row['timestamp']);
@@ -442,13 +450,15 @@ 
 		$smcFunc['db_free_result']($request);
 
 		$senders = loadMemberData($senders);
-		foreach ($senders as $member)
-			loadMemberContext($member);
+		foreach ($senders as $member) {
+					loadMemberContext($member);
+		}
 
 		// Having loaded everyone, attach them to the PMs.
-		foreach ($context['unread_pms'] as $id_pm => $details)
-			if (!empty($memberContext[$details['id_member_from']]))
+		foreach ($context['unread_pms'] as $id_pm => $details) {
+					if (!empty($memberContext[$details['id_member_from']]))
 				$context['unread_pms'][$id_pm]['member'] = &$memberContext[$details['id_member_from']];
+		}
 	}
 }
 
@@ -468,12 +478,13 @@ 
 	}
 
 	// Make sure the starting location is valid.
-	if (isset($_GET['start']) && $_GET['start'] != 'new')
-		$_GET['start'] = (int) $_GET['start'];
-	elseif (!isset($_GET['start']) && !empty($options['view_newest_pm_first']))
-		$_GET['start'] = 0;
-	else
-		$_GET['start'] = 'new';
+	if (isset($_GET['start']) && $_GET['start'] != 'new') {
+			$_GET['start'] = (int) $_GET['start'];
+	} elseif (!isset($_GET['start']) && !empty($options['view_newest_pm_first'])) {
+			$_GET['start'] = 0;
+	} else {
+			$_GET['start'] = 'new';
+	}
 
 	// Set up some basic theme stuff.
 	$context['from_or_to'] = $context['folder'] != 'sent' ? 'from' : 'to';
@@ -487,9 +498,10 @@ 
 		list ($sig_limits, $sig_bbc) = explode(':', $modSettings['signature_settings']);
 		$sig_limits = explode(',', $sig_limits);
 
-		if (!empty($sig_limits[5]) || !empty($sig_limits[6]))
-			addInlineCss('
+		if (!empty($sig_limits[5]) || !empty($sig_limits[6])) {
+					addInlineCss('
 	.signature img { ' . (!empty($sig_limits[5]) ? 'max-width: ' . (int) $sig_limits[5] . 'px; ' : '') . (!empty($sig_limits[6]) ? 'max-height: ' . (int) $sig_limits[6] . 'px; ' : '') . '}');
+		}
 	}
 
 	$labelJoin = '';
@@ -501,8 +513,7 @@ 
 	{
 		$labelQuery = '
 			AND pmr.in_inbox = 1';
-	}
-	elseif ($context['folder'] != 'sent')
+	} elseif ($context['folder'] != 'sent')
 	{
 		$labelJoin = '
 			INNER JOIN {db_prefix}pm_labeled_messages AS pl ON (pl.id_pm = pmr.id_pm)';
@@ -544,22 +555,24 @@ 
 	$txt['delete_all'] = str_replace('PMBOX', $pmbox, $txt['delete_all']);
 
 	// Now, build the link tree!
-	if ($context['current_label_id'] == -1)
-		$context['linktree'][] = array(
+	if ($context['current_label_id'] == -1) {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=pm;f=' . $context['folder'],
 			'name' => $pmbox
 		);
+	}
 
 	// Build it further for a label.
-	if ($context['current_label_id'] != -1)
-		$context['linktree'][] = array(
+	if ($context['current_label_id'] != -1) {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=pm;f=' . $context['folder'] . ';l=' . $context['current_label_id'],
 			'name' => $txt['pm_current_label'] . ': ' . $context['current_label']
 		);
+	}
 
 	// Figure out how many messages there are.
-	if ($context['folder'] == 'sent')
-		$request = $smcFunc['db_query']('', '
+	if ($context['folder'] == 'sent') {
+			$request = $smcFunc['db_query']('', '
 			SELECT COUNT(' . ($context['display_mode'] == 2 ? 'DISTINCT pm.id_pm_head' : '*') . ')
 			FROM {db_prefix}personal_messages AS pm
 			WHERE pm.id_member_from = {int:current_member}
@@ -569,8 +582,8 @@ 
 				'not_deleted' => 0,
 			)
 		);
-	else
-		$request = $smcFunc['db_query']('', '
+	} else {
+			$request = $smcFunc['db_query']('', '
 			SELECT COUNT(' . ($context['display_mode'] == 2 ? 'DISTINCT pm.id_pm_head' : '*') . ')
 			FROM {db_prefix}pm_recipients AS pmr' . ($context['display_mode'] == 2 ? '
 				INNER JOIN {db_prefix}personal_messages AS pm ON (pm.id_pm = pmr.id_pm)' : '') . $labelJoin . '
@@ -581,6 +594,7 @@ 
 				'not_deleted' => 0,
 			)
 		);
+	}
 	list ($max_messages) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -589,10 +603,11 @@ 
 	$maxPerPage = empty($modSettings['disableCustomPerPage']) && !empty($options['messages_per_page']) ? $options['messages_per_page'] : $modSettings['defaultMaxMessages'];
 
 	// Start on the last page.
-	if (!is_numeric($_GET['start']) || $_GET['start'] >= $max_messages)
-		$_GET['start'] = ($max_messages - 1) - (($max_messages - 1) % $maxPerPage);
-	elseif ($_GET['start'] < 0)
-		$_GET['start'] = 0;
+	if (!is_numeric($_GET['start']) || $_GET['start'] >= $max_messages) {
+			$_GET['start'] = ($max_messages - 1) - (($max_messages - 1) % $maxPerPage);
+	} elseif ($_GET['start'] < 0) {
+			$_GET['start'] = 0;
+	}
 
 	// ... but wait - what if we want to start from a specific message?
 	if (isset($_GET['pmid']))
@@ -600,19 +615,21 @@ 
 		$pmID = (int) $_GET['pmid'];
 
 		// Make sure you have access to this PM.
-		if (!isAccessiblePM($pmID, $context['folder'] == 'sent' ? 'outbox' : 'inbox'))
-			fatal_lang_error('no_access', false);
+		if (!isAccessiblePM($pmID, $context['folder'] == 'sent' ? 'outbox' : 'inbox')) {
+					fatal_lang_error('no_access', false);
+		}
 
 		$context['current_pm'] = $pmID;
 
 		// With only one page of PM's we're gonna want page 1.
-		if ($max_messages <= $maxPerPage)
-			$_GET['start'] = 0;
+		if ($max_messages <= $maxPerPage) {
+					$_GET['start'] = 0;
+		}
 		// If we pass kstart we assume we're in the right place.
 		elseif (!isset($_GET['kstart']))
 		{
-			if ($context['folder'] == 'sent')
-				$request = $smcFunc['db_query']('', '
+			if ($context['folder'] == 'sent') {
+							$request = $smcFunc['db_query']('', '
 					SELECT COUNT(' . ($context['display_mode'] == 2 ? 'DISTINCT pm.id_pm_head' : '*') . ')
 					FROM {db_prefix}personal_messages
 					WHERE id_member_from = {int:current_member}
@@ -624,8 +641,8 @@ 
 						'id_pm' => $pmID,
 					)
 				);
-			else
-				$request = $smcFunc['db_query']('', '
+			} else {
+							$request = $smcFunc['db_query']('', '
 					SELECT COUNT(' . ($context['display_mode'] == 2 ? 'DISTINCT pm.id_pm_head' : '*') . ')
 					FROM {db_prefix}pm_recipients AS pmr' . ($context['display_mode'] == 2 ? '
 						INNER JOIN {db_prefix}personal_messages AS pm ON (pm.id_pm = pmr.id_pm)' : '') . $labelJoin . '
@@ -638,6 +655,7 @@ 
 						'id_pm' => $pmID,
 					)
 				);
+			}
 
 			list ($_GET['start']) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
@@ -652,8 +670,9 @@ 
 	{
 		$pmsg = (int) $_GET['pmsg'];
 
-		if (!isAccessiblePM($pmsg, $context['folder'] == 'sent' ? 'outbox' : 'inbox'))
-			fatal_lang_error('no_access', false);
+		if (!isAccessiblePM($pmsg, $context['folder'] == 'sent' ? 'outbox' : 'inbox')) {
+					fatal_lang_error('no_access', false);
+		}
 	}
 
 	// Set up the page index.
@@ -747,8 +766,9 @@ 
 	{
 		if (!isset($recipients[$row['id_pm']]))
 		{
-			if (isset($row['id_member_from']))
-				$posters[$row['id_pm']] = $row['id_member_from'];
+			if (isset($row['id_member_from'])) {
+							$posters[$row['id_pm']] = $row['id_member_from'];
+			}
 			$pms[$row['id_pm']] = $row['id_pm'];
 			$recipients[$row['id_pm']] = array(
 				'to' => array(),
@@ -757,29 +777,33 @@ 
 		}
 
 		// Keep track of the last message so we know what the head is without another query!
-		if ((empty($pmID) && (empty($options['view_newest_pm_first']) || !isset($lastData))) || empty($lastData) || (!empty($pmID) && $pmID == $row['id_pm']))
-			$lastData = array(
+		if ((empty($pmID) && (empty($options['view_newest_pm_first']) || !isset($lastData))) || empty($lastData) || (!empty($pmID) && $pmID == $row['id_pm'])) {
+					$lastData = array(
 				'id' => $row['id_pm'],
 				'head' => $row['id_pm_head'],
 			);
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
 	// Make sure that we have been given a correct head pm id!
-	if ($context['display_mode'] == 2 && !empty($pmID) && $pmID != $lastData['id'])
-		fatal_lang_error('no_access', false);
+	if ($context['display_mode'] == 2 && !empty($pmID) && $pmID != $lastData['id']) {
+			fatal_lang_error('no_access', false);
+	}
 
 	if (!empty($pms))
 	{
 		// Select the correct current message.
-		if (empty($pmID))
-			$context['current_pm'] = $lastData['id'];
+		if (empty($pmID)) {
+					$context['current_pm'] = $lastData['id'];
+		}
 
 		// This is a list of the pm's that are used for "full" display.
-		if ($context['display_mode'] == 0)
-			$display_pms = $pms;
-		else
-			$display_pms = array($context['current_pm']);
+		if ($context['display_mode'] == 0) {
+					$display_pms = $pms;
+		} else {
+					$display_pms = array($context['current_pm']);
+		}
 
 		// At this point we know the main id_pm's. But - if we are looking at conversations we need the others!
 		if ($context['display_mode'] == 2)
@@ -801,16 +825,18 @@ 
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
 				// This is, frankly, a joke. We will put in a workaround for people sending to themselves - yawn!
-				if ($context['folder'] == 'sent' && $row['id_member_from'] == $user_info['id'] && $row['deleted_by_sender'] == 1)
-					continue;
-				elseif ($row['id_member'] == $user_info['id'] & $row['deleted'] == 1)
-					continue;
+				if ($context['folder'] == 'sent' && $row['id_member_from'] == $user_info['id'] && $row['deleted_by_sender'] == 1) {
+									continue;
+				} elseif ($row['id_member'] == $user_info['id'] & $row['deleted'] == 1) {
+									continue;
+				}
 
-				if (!isset($recipients[$row['id_pm']]))
-					$recipients[$row['id_pm']] = array(
+				if (!isset($recipients[$row['id_pm']])) {
+									$recipients[$row['id_pm']] = array(
 						'to' => array(),
 						'bcc' => array()
 					);
+				}
 				$display_pms[] = $row['id_pm'];
 				$posters[$row['id_pm']] = $row['id_member_from'];
 			}
@@ -861,8 +887,9 @@ 
 				while ($row2 = $smcFunc['db_fetch_assoc']($request2))
 				{
 					$l_id = $row2['id_label'];
-					if (isset($context['labels'][$l_id]))
-						$context['message_labels'][$row['id_pm']][$l_id] = array('id' => $l_id, 'name' => $context['labels'][$l_id]['name']);
+					if (isset($context['labels'][$l_id])) {
+											$context['message_labels'][$row['id_pm']][$l_id] = array('id' => $l_id, 'name' => $context['labels'][$l_id]['name']);
+					}
 				}
 
 				$smcFunc['db_free_result']($request2);
@@ -879,9 +906,10 @@ 
 		// Make sure we don't load unnecessary data.
 		if ($context['display_mode'] == 1)
 		{
-			foreach ($posters as $k => $v)
-				if (!in_array($k, $display_pms))
+			foreach ($posters as $k => $v) {
+							if (!in_array($k, $display_pms))
 					unset($posters[$k]);
+			}
 		}
 
 		// Load any users....
@@ -892,8 +920,9 @@ 
 		{
 			// Get the order right.
 			$orderBy = array();
-			foreach (array_reverse($pms) as $pm)
-				$orderBy[] = 'pm.id_pm = ' . $pm;
+			foreach (array_reverse($pms) as $pm) {
+							$orderBy[] = 'pm.id_pm = ' . $pm;
+			}
 
 			// Seperate query for these bits!
 			$subjects_request = $smcFunc['db_query']('', '
@@ -939,9 +968,9 @@ 
 			// Allow mods to add additional buttons here
 			call_integration_hook('integrate_conversation_buttons');
 		}
+	} else {
+			$messages_request = false;
 	}
-	else
-		$messages_request = false;
 
 	$context['can_send_pm'] = allowedTo('pm_send');
 	$context['can_send_email'] = allowedTo('moderate_forum');
@@ -952,11 +981,13 @@ 
 	if ($context['folder'] != 'sent' && !empty($context['labels'][(int) $context['current_label_id']]['unread_messages']))
 	{
 		// If the display mode is "old sk00l" do them all...
-		if ($context['display_mode'] == 0)
-			markMessages(null, $context['current_label_id']);
+		if ($context['display_mode'] == 0) {
+					markMessages(null, $context['current_label_id']);
+		}
 		// Otherwise do just the current one!
-		elseif (!empty($context['current_pm']))
-			markMessages($display_pms, $context['current_label_id']);
+		elseif (!empty($context['current_pm'])) {
+					markMessages($display_pms, $context['current_label_id']);
+		}
 	}
 }
 
@@ -974,8 +1005,9 @@ 
 
 	// Count the current message number....
 	static $counter = null;
-	if ($counter === null || $reset)
-		$counter = $context['start'];
+	if ($counter === null || $reset) {
+			$counter = $context['start'];
+	}
 
 	static $temp_pm_selected = null;
 	if ($temp_pm_selected === null)
@@ -1020,19 +1052,22 @@ 
 	}
 
 	// Bail if it's false, ie. no messages.
-	if ($messages_request == false)
-		return false;
+	if ($messages_request == false) {
+			return false;
+	}
 
 	// Reset the data?
-	if ($reset == true)
-		return @$smcFunc['db_data_seek']($messages_request, 0);
+	if ($reset == true) {
+			return @$smcFunc['db_data_seek']($messages_request, 0);
+	}
 
 	// Get the next one... bail if anything goes wrong.
 	$message = $smcFunc['db_fetch_assoc']($messages_request);
 	if (!$message)
 	{
-		if ($type != 'subject')
-			$smcFunc['db_free_result']($messages_request);
+		if ($type != 'subject') {
+					$smcFunc['db_free_result']($messages_request);
+		}
 
 		return false;
 	}
@@ -1052,8 +1087,7 @@ 
 		$memberContext[$message['id_member_from']]['email'] = '';
 		$memberContext[$message['id_member_from']]['show_email'] = false;
 		$memberContext[$message['id_member_from']]['is_guest'] = true;
-	}
-	else
+	} else
 	{
 		$memberContext[$message['id_member_from']]['can_view_profile'] = allowedTo('profile_view') || ($message['id_member_from'] == $user_info['id'] && !$user_info['is_guest']);
 		$memberContext[$message['id_member_from']]['can_see_warning'] = !isset($context['disabled_fields']['warning_status']) && $memberContext[$message['id_member_from']]['warning_status'] && ($context['user']['can_mod'] || (!empty($modSettings['warning_show']) && ($modSettings['warning_show'] > 1 || $message['id_member_from'] == $user_info['id'])));
@@ -1094,9 +1128,10 @@ 
 	$counter++;
 
 	// Any custom profile fields?
-	if (!empty($memberContext[$message['id_member_from']]['custom_fields']))
-		foreach ($memberContext[$message['id_member_from']]['custom_fields'] as $custom)
+	if (!empty($memberContext[$message['id_member_from']]['custom_fields'])) {
+			foreach ($memberContext[$message['id_member_from']]['custom_fields'] as $custom)
 			$output['custom_fields'][$context['cust_profile_fields_placement'][$custom['placement']]][] = $custom;
+	}
 
 	call_integration_hook('integrate_prepare_pm_context', array(&$output, &$message, $counter));
 
@@ -1120,22 +1155,28 @@ 
 			$context['search_params'][$k] = $v;
 		}
 	}
-	if (isset($_REQUEST['search']))
-		$context['search_params']['search'] = un_htmlspecialchars($_REQUEST['search']);
+	if (isset($_REQUEST['search'])) {
+			$context['search_params']['search'] = un_htmlspecialchars($_REQUEST['search']);
+	}
 
-	if (isset($context['search_params']['search']))
-		$context['search_params']['search'] = $smcFunc['htmlspecialchars']($context['search_params']['search']);
-	if (isset($context['search_params']['userspec']))
-		$context['search_params']['userspec'] = $smcFunc['htmlspecialchars']($context['search_params']['userspec']);
+	if (isset($context['search_params']['search'])) {
+			$context['search_params']['search'] = $smcFunc['htmlspecialchars']($context['search_params']['search']);
+	}
+	if (isset($context['search_params']['userspec'])) {
+			$context['search_params']['userspec'] = $smcFunc['htmlspecialchars']($context['search_params']['userspec']);
+	}
 
-	if (!empty($context['search_params']['searchtype']))
-		$context['search_params']['searchtype'] = 2;
+	if (!empty($context['search_params']['searchtype'])) {
+			$context['search_params']['searchtype'] = 2;
+	}
 
-	if (!empty($context['search_params']['minage']))
-		$context['search_params']['minage'] = (int) $context['search_params']['minage'];
+	if (!empty($context['search_params']['minage'])) {
+			$context['search_params']['minage'] = (int) $context['search_params']['minage'];
+	}
 
-	if (!empty($context['search_params']['maxage']))
-		$context['search_params']['maxage'] = (int) $context['search_params']['maxage'];
+	if (!empty($context['search_params']['maxage'])) {
+			$context['search_params']['maxage'] = (int) $context['search_params']['maxage'];
+	}
 
 	$context['search_params']['subject_only'] = !empty($context['search_params']['subject_only']);
 	$context['search_params']['show_complete'] = !empty($context['search_params']['show_complete']);
@@ -1162,8 +1203,9 @@ 
 		$context['search_errors']['messages'] = array();
 		foreach ($context['search_errors'] as $search_error => $dummy)
 		{
-			if ($search_error == 'messages')
-				continue;
+			if ($search_error == 'messages') {
+							continue;
+			}
 
 			$context['search_errors']['messages'][] = $txt['error_' . $search_error];
 		}
@@ -1185,8 +1227,9 @@ 
 	global $scripturl, $modSettings, $user_info, $context, $txt;
 	global $memberContext, $smcFunc;
 
-	if (!empty($context['load_average']) && !empty($modSettings['loadavg_search']) && $context['load_average'] >= $modSettings['loadavg_search'])
-		fatal_lang_error('loadavg_search_disabled', false);
+	if (!empty($context['load_average']) && !empty($modSettings['loadavg_search']) && $context['load_average'] >= $modSettings['loadavg_search']) {
+			fatal_lang_error('loadavg_search_disabled', false);
+	}
 
 	/**
 	 * @todo For the moment force the folder to the inbox.
@@ -1215,35 +1258,40 @@ 
 	$context['start'] = isset($_GET['start']) ? (int) $_GET['start'] : 0;
 
 	// Store whether simple search was used (needed if the user wants to do another query).
-	if (!isset($search_params['advanced']))
-		$search_params['advanced'] = empty($_REQUEST['advanced']) ? 0 : 1;
+	if (!isset($search_params['advanced'])) {
+			$search_params['advanced'] = empty($_REQUEST['advanced']) ? 0 : 1;
+	}
 
 	// 1 => 'allwords' (default, don't set as param) / 2 => 'anywords'.
-	if (!empty($search_params['searchtype']) || (!empty($_REQUEST['searchtype']) && $_REQUEST['searchtype'] == 2))
-		$search_params['searchtype'] = 2;
+	if (!empty($search_params['searchtype']) || (!empty($_REQUEST['searchtype']) && $_REQUEST['searchtype'] == 2)) {
+			$search_params['searchtype'] = 2;
+	}
 
 	// Minimum age of messages. Default to zero (don't set param in that case).
-	if (!empty($search_params['minage']) || (!empty($_REQUEST['minage']) && $_REQUEST['minage'] > 0))
-		$search_params['minage'] = !empty($search_params['minage']) ? (int) $search_params['minage'] : (int) $_REQUEST['minage'];
+	if (!empty($search_params['minage']) || (!empty($_REQUEST['minage']) && $_REQUEST['minage'] > 0)) {
+			$search_params['minage'] = !empty($search_params['minage']) ? (int) $search_params['minage'] : (int) $_REQUEST['minage'];
+	}
 
 	// Maximum age of messages. Default to infinite (9999 days: param not set).
-	if (!empty($search_params['maxage']) || (!empty($_REQUEST['maxage']) && $_REQUEST['maxage'] != 9999))
-		$search_params['maxage'] = !empty($search_params['maxage']) ? (int) $search_params['maxage'] : (int) $_REQUEST['maxage'];
+	if (!empty($search_params['maxage']) || (!empty($_REQUEST['maxage']) && $_REQUEST['maxage'] != 9999)) {
+			$search_params['maxage'] = !empty($search_params['maxage']) ? (int) $search_params['maxage'] : (int) $_REQUEST['maxage'];
+	}
 
 	$search_params['subject_only'] = !empty($search_params['subject_only']) || !empty($_REQUEST['subject_only']);
 	$search_params['show_complete'] = !empty($search_params['show_complete']) || !empty($_REQUEST['show_complete']);
 
 	// Default the user name to a wildcard matching every user (*).
-	if (!empty($search_params['user_spec']) || (!empty($_REQUEST['userspec']) && $_REQUEST['userspec'] != '*'))
-		$search_params['userspec'] = isset($search_params['userspec']) ? $search_params['userspec'] : $_REQUEST['userspec'];
+	if (!empty($search_params['user_spec']) || (!empty($_REQUEST['userspec']) && $_REQUEST['userspec'] != '*')) {
+			$search_params['userspec'] = isset($search_params['userspec']) ? $search_params['userspec'] : $_REQUEST['userspec'];
+	}
 
 	// This will be full of all kinds of parameters!
 	$searchq_parameters = array();
 
 	// If there's no specific user, then don't mention it in the main query.
-	if (empty($search_params['userspec']))
-		$userQuery = '';
-	else
+	if (empty($search_params['userspec'])) {
+			$userQuery = '';
+	} else
 	{
 		$userString = strtr($smcFunc['htmlspecialchars']($search_params['userspec'], ENT_QUOTES), array('&quot;' => '"'));
 		$userString = strtr($userString, array('%' => '\%', '_' => '\_', '*' => '%', '?' => '_'));
@@ -1255,8 +1303,9 @@ 
 		{
 			$possible_users[$k] = trim($possible_users[$k]);
 
-			if (strlen($possible_users[$k]) == 0)
-				unset($possible_users[$k]);
+			if (strlen($possible_users[$k]) == 0) {
+							unset($possible_users[$k]);
+			}
 		}
 
 		if (!empty($possible_users))
@@ -1268,8 +1317,9 @@ 
 			{
 				$where_params['name_' . $k] = $v;
 				$where_clause[] = '{raw:real_name} LIKE {string:name_' . $k . '}';
-				if (!isset($where_params['real_name']))
-					$where_params['real_name'] = $smcFunc['db_case_sensitive'] ? 'LOWER(real_name)' : 'real_name';
+				if (!isset($where_params['real_name'])) {
+									$where_params['real_name'] = $smcFunc['db_case_sensitive'] ? 'LOWER(real_name)' : 'real_name';
+				}
 			}
 
 			// Who matches those criteria?
@@ -1282,28 +1332,28 @@ 
 			);
 
 			// Simply do nothing if there're too many members matching the criteria.
-			if ($smcFunc['db_num_rows']($request) > $maxMembersToSearch)
-				$userQuery = '';
-			elseif ($smcFunc['db_num_rows']($request) == 0)
+			if ($smcFunc['db_num_rows']($request) > $maxMembersToSearch) {
+							$userQuery = '';
+			} elseif ($smcFunc['db_num_rows']($request) == 0)
 			{
 				$userQuery = 'AND pm.id_member_from = 0 AND ({raw:pm_from_name} LIKE {raw:guest_user_name_implode})';
 				$searchq_parameters['guest_user_name_implode'] = '\'' . implode('\' OR ' . ($smcFunc['db_case_sensitive'] ? 'LOWER(pm.from_name)' : 'pm.from_name') . ' LIKE \'', $possible_users) . '\'';
 				$searchq_parameters['pm_from_name'] = $smcFunc['db_case_sensitive'] ? 'LOWER(pm.from_name)' : 'pm.from_name';
-			}
-			else
+			} else
 			{
 				$memberlist = array();
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					$memberlist[] = $row['id_member'];
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									$memberlist[] = $row['id_member'];
+				}
 				$userQuery = 'AND (pm.id_member_from IN ({array_int:member_list}) OR (pm.id_member_from = 0 AND ({raw:pm_from_name} LIKE {raw:guest_user_name_implode})))';
 				$searchq_parameters['guest_user_name_implode'] = '\'' . implode('\' OR ' . ($smcFunc['db_case_sensitive'] ? 'LOWER(pm.from_name)' : 'pm.from_name') . ' LIKE \'', $possible_users) . '\'';
 				$searchq_parameters['member_list'] = $memberlist;
 				$searchq_parameters['pm_from_name'] = $smcFunc['db_case_sensitive'] ? 'LOWER(pm.from_name)' : 'pm.from_name';
 			}
 			$smcFunc['db_free_result']($request);
+		} else {
+					$userQuery = '';
 		}
-		else
-			$userQuery = '';
 	}
 
 	// Setup the sorting variables...
@@ -1311,8 +1361,9 @@ 
 	$sort_columns = array(
 		'pm.id_pm',
 	);
-	if (empty($search_params['sort']) && !empty($_REQUEST['sort']))
-		list ($search_params['sort'], $search_params['sort_dir']) = array_pad(explode('|', $_REQUEST['sort']), 2, '');
+	if (empty($search_params['sort']) && !empty($_REQUEST['sort'])) {
+			list ($search_params['sort'], $search_params['sort_dir']) = array_pad(explode('|', $_REQUEST['sort']), 2, '');
+	}
 	$search_params['sort'] = !empty($search_params['sort']) && in_array($search_params['sort'], $sort_columns) ? $search_params['sort'] : 'pm.id_pm';
 	$search_params['sort_dir'] = !empty($search_params['sort_dir']) && $search_params['sort_dir'] == 'asc' ? 'asc' : 'desc';
 
@@ -1322,24 +1373,27 @@ 
 	if ($context['folder'] == 'inbox' && !empty($search_params['advanced']) && $context['currently_using_labels'])
 	{
 		// Came here from pagination?  Put them back into $_REQUEST for sanitization.
-		if (isset($search_params['labels']))
-			$_REQUEST['searchlabel'] = explode(',', $search_params['labels']);
+		if (isset($search_params['labels'])) {
+					$_REQUEST['searchlabel'] = explode(',', $search_params['labels']);
+		}
 
 		// Assuming we have some labels - make them all integers.
 		if (!empty($_REQUEST['searchlabel']) && is_array($_REQUEST['searchlabel']))
 		{
-			foreach ($_REQUEST['searchlabel'] as $key => $id)
-				$_REQUEST['searchlabel'][$key] = (int) $id;
+			foreach ($_REQUEST['searchlabel'] as $key => $id) {
+							$_REQUEST['searchlabel'][$key] = (int) $id;
+			}
+		} else {
+					$_REQUEST['searchlabel'] = array();
 		}
-		else
-			$_REQUEST['searchlabel'] = array();
 
 		// Now that everything is cleaned up a bit, make the labels a param.
 		$search_params['labels'] = implode(',', $_REQUEST['searchlabel']);
 
 		// No labels selected? That must be an error!
-		if (empty($_REQUEST['searchlabel']))
-			$context['search_errors']['no_labels_selected'] = true;
+		if (empty($_REQUEST['searchlabel'])) {
+					$context['search_errors']['no_labels_selected'] = true;
+		}
 		// Otherwise prepare the query!
 		elseif (count($_REQUEST['searchlabel']) != count($context['labels']))
 		{
@@ -1362,8 +1416,7 @@ 
 					// Not searching the inbox - PM must be labeled
 					$labelQuery = ' AND pml.id_label IN ({array_int:labels})';
 					$labelJoin = ' INNER JOIN {db_prefix}pm_labeled_messages AS pml ON (pml.id_pm = pmr.id_pm)';
-				}
-				else
+				} else
 				{
 					// Searching the inbox - PM doesn't have to be labeled
 					$labelQuery = ' AND (' . substr($labelQuery, 5) . ' OR pml.id_label IN ({array_int:labels}))';
@@ -1378,8 +1431,9 @@ 
 	// What are we actually searching for?
 	$search_params['search'] = !empty($search_params['search']) ? $search_params['search'] : (isset($_REQUEST['search']) ? $_REQUEST['search'] : '');
 	// If we ain't got nothing - we should error!
-	if (!isset($search_params['search']) || $search_params['search'] == '')
-		$context['search_errors']['invalid_search_string'] = true;
+	if (!isset($search_params['search']) || $search_params['search'] == '') {
+			$context['search_errors']['invalid_search_string'] = true;
+	}
 
 	// Extract phrase parts first (e.g. some words "this is a phrase" some more words.)
 	preg_match_all('~(?:^|\s)([-]?)"([^"]+)"(?:$|\s)~' . ($context['utf8'] ? 'u' : ''), $search_params['search'], $matches, PREG_PATTERN_ORDER);
@@ -1392,12 +1446,14 @@ 
 	$excludedWords = array();
 
 	// .. first, we check for things like -"some words", but not "-some words".
-	foreach ($matches[1] as $index => $word)
-		if ($word == '-')
+	foreach ($matches[1] as $index => $word) {
+			if ($word == '-')
 		{
 			$word = $smcFunc['strtolower'](trim($searchArray[$index]));
-			if (strlen($word) > 0)
-				$excludedWords[] = $word;
+	}
+			if (strlen($word) > 0) {
+							$excludedWords[] = $word;
+			}
 			unset($searchArray[$index]);
 		}
 
@@ -1407,8 +1463,9 @@ 
 		if (strpos(trim($word), '-') === 0)
 		{
 			$word = substr($smcFunc['strtolower']($word), 1);
-			if (strlen($word) > 0)
-				$excludedWords[] = $word;
+			if (strlen($word) > 0) {
+							$excludedWords[] = $word;
+			}
 			unset($tempSearch[$index]);
 		}
 	}
@@ -1419,9 +1476,9 @@ 
 	foreach ($searchArray as $index => $value)
 	{
 		$searchArray[$index] = $smcFunc['strtolower'](trim($value));
-		if ($searchArray[$index] == '')
-			unset($searchArray[$index]);
-		else
+		if ($searchArray[$index] == '') {
+					unset($searchArray[$index]);
+		} else
 		{
 			// Sort out entities first.
 			$searchArray[$index] = $smcFunc['htmlspecialchars']($searchArray[$index]);
@@ -1431,27 +1488,32 @@ 
 
 	// Create an array of replacements for highlighting.
 	$context['mark'] = array();
-	foreach ($searchArray as $word)
-		$context['mark'][$word] = '<strong class="highlight">' . $word . '</strong>';
+	foreach ($searchArray as $word) {
+			$context['mark'][$word] = '<strong class="highlight">' . $word . '</strong>';
+	}
 
 	// This contains *everything*
 	$searchWords = array_merge($searchArray, $excludedWords);
 
 	// Make sure at least one word is being searched for.
-	if (empty($searchArray))
-		$context['search_errors']['invalid_search_string'] = true;
+	if (empty($searchArray)) {
+			$context['search_errors']['invalid_search_string'] = true;
+	}
 
 	// Sort out the search query so the user can edit it - if they want.
 	$context['search_params'] = $search_params;
-	if (isset($context['search_params']['search']))
-		$context['search_params']['search'] = $smcFunc['htmlspecialchars']($context['search_params']['search']);
-	if (isset($context['search_params']['userspec']))
-		$context['search_params']['userspec'] = $smcFunc['htmlspecialchars']($context['search_params']['userspec']);
+	if (isset($context['search_params']['search'])) {
+			$context['search_params']['search'] = $smcFunc['htmlspecialchars']($context['search_params']['search']);
+	}
+	if (isset($context['search_params']['userspec'])) {
+			$context['search_params']['userspec'] = $smcFunc['htmlspecialchars']($context['search_params']['userspec']);
+	}
 
 	// Now we have all the parameters, combine them together for pagination and the like...
 	$context['params'] = array();
-	foreach ($search_params as $k => $v)
-		$context['params'][] = $k . '|\'|' . $v;
+	foreach ($search_params as $k => $v) {
+			$context['params'][] = $k . '|\'|' . $v;
+	}
 	$context['params'] = base64_encode(implode('|"|', $context['params']));
 
 	// Compile the subject query part.
@@ -1459,26 +1521,31 @@ 
 
 	foreach ($searchWords as $index => $word)
 	{
-		if ($word == '')
-			continue;
+		if ($word == '') {
+					continue;
+		}
 
-		if ($search_params['subject_only'])
-			$andQueryParts[] = 'pm.subject' . (in_array($word, $excludedWords) ? ' NOT' : '') . ' LIKE {string:search_' . $index . '}';
-		else
-			$andQueryParts[] = '(pm.subject' . (in_array($word, $excludedWords) ? ' NOT' : '') . ' LIKE {string:search_' . $index . '} ' . (in_array($word, $excludedWords) ? 'AND pm.body NOT' : 'OR pm.body') . ' LIKE {string:search_' . $index . '})';
+		if ($search_params['subject_only']) {
+					$andQueryParts[] = 'pm.subject' . (in_array($word, $excludedWords) ? ' NOT' : '') . ' LIKE {string:search_' . $index . '}';
+		} else {
+					$andQueryParts[] = '(pm.subject' . (in_array($word, $excludedWords) ? ' NOT' : '') . ' LIKE {string:search_' . $index . '} ' . (in_array($word, $excludedWords) ? 'AND pm.body NOT' : 'OR pm.body') . ' LIKE {string:search_' . $index . '})';
+		}
 		$searchq_parameters['search_' . $index] = '%' . strtr($word, array('_' => '\\_', '%' => '\\%')) . '%';
 	}
 
 	$searchQuery = ' 1=1';
-	if (!empty($andQueryParts))
-		$searchQuery = implode(!empty($search_params['searchtype']) && $search_params['searchtype'] == 2 ? ' OR ' : ' AND ', $andQueryParts);
+	if (!empty($andQueryParts)) {
+			$searchQuery = implode(!empty($search_params['searchtype']) && $search_params['searchtype'] == 2 ? ' OR ' : ' AND ', $andQueryParts);
+	}
 
 	// Age limits?
 	$timeQuery = '';
-	if (!empty($search_params['minage']))
-		$timeQuery .= ' AND pm.msgtime < ' . (time() - $search_params['minage'] * 86400);
-	if (!empty($search_params['maxage']))
-		$timeQuery .= ' AND pm.msgtime > ' . (time() - $search_params['maxage'] * 86400);
+	if (!empty($search_params['minage'])) {
+			$timeQuery .= ' AND pm.msgtime < ' . (time() - $search_params['minage'] * 86400);
+	}
+	if (!empty($search_params['maxage'])) {
+			$timeQuery .= ' AND pm.msgtime > ' . (time() - $search_params['maxage'] * 86400);
+	}
 
 	// If we have errors - return back to the first screen...
 	if (!empty($context['search_errors']))
@@ -1564,8 +1631,9 @@ 
 			)
 		);
 		$real_pm_ids = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$real_pm_ids[$row['id_pm_head']] = $row['id_pm'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$real_pm_ids[$row['id_pm_head']] = $row['id_pm'];
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -1595,8 +1663,9 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if ($context['folder'] == 'sent' || empty($row['bcc']))
-				$recipients[$row['id_pm']][empty($row['bcc']) ? 'to' : 'bcc'][] = empty($row['id_member_to']) ? $txt['guest_title'] : '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member_to'] . '">' . $row['to_name'] . '</a>';
+			if ($context['folder'] == 'sent' || empty($row['bcc'])) {
+							$recipients[$row['id_pm']][empty($row['bcc']) ? 'to' : 'bcc'][] = empty($row['id_member_to']) ? $txt['guest_title'] : '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member_to'] . '">' . $row['to_name'] . '</a>';
+			}
 
 			if ($row['id_member_to'] == $user_info['id'] && $context['folder'] != 'sent')
 			{
@@ -1617,12 +1686,14 @@ 
 				while ($row2 = $smcFunc['db_fetch_assoc']($request2))
 				{
 					$l_id = $row2['id_label'];
-					if (isset($context['labels'][$l_id]))
-						$context['message_labels'][$row['id_pm']][$l_id] = array('id' => $l_id, 'name' => $context['labels'][$l_id]['name']);
+					if (isset($context['labels'][$l_id])) {
+											$context['message_labels'][$row['id_pm']][$l_id] = array('id' => $l_id, 'name' => $context['labels'][$l_id]['name']);
+					}
 
 					// Here we find the first label on a message - for linking to posts in results
-					if (!isset($context['first_label'][$row['id_pm']]) && $row['in_inbox'] != 1)
-						$context['first_label'][$row['id_pm']] = $l_id;
+					if (!isset($context['first_label'][$row['id_pm']]) && $row['in_inbox'] != 1) {
+											$context['first_label'][$row['id_pm']] = $l_id;
+					}
 				}
 
 				$smcFunc['db_free_result']($request2);
@@ -1749,8 +1820,9 @@ 
 		list ($postCount) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 
-		if (!empty($postCount) && $postCount >= $modSettings['pm_posts_per_hour'])
-			fatal_lang_error('pm_too_many_per_hour', true, array($modSettings['pm_posts_per_hour']));
+		if (!empty($postCount) && $postCount >= $modSettings['pm_posts_per_hour']) {
+					fatal_lang_error('pm_too_many_per_hour', true, array($modSettings['pm_posts_per_hour']));
+		}
 	}
 
 	// Quoting/Replying to a message?
@@ -1759,8 +1831,9 @@ 
 		$pmsg = (int) $_REQUEST['pmsg'];
 
 		// Make sure this is yours.
-		if (!isAccessiblePM($pmsg))
-			fatal_lang_error('no_access', false);
+		if (!isAccessiblePM($pmsg)) {
+					fatal_lang_error('no_access', false);
+		}
 
 		// Work out whether this is one you've received?
 		$request = $smcFunc['db_query']('', '
@@ -1797,8 +1870,9 @@ 
 				'id_pm' => $pmsg,
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) == 0)
-			fatal_lang_error('pm_not_yours', false);
+		if ($smcFunc['db_num_rows']($request) == 0) {
+					fatal_lang_error('pm_not_yours', false);
+		}
 		$row_quoted = $smcFunc['db_fetch_assoc']($request);
 		$smcFunc['db_free_result']($request);
 
@@ -1809,9 +1883,9 @@ 
 		// Add 'Re: ' to it....
 		if (!isset($context['response_prefix']) && !($context['response_prefix'] = cache_get_data('response_prefix')))
 		{
-			if ($language === $user_info['language'])
-				$context['response_prefix'] = $txt['response_prefix'];
-			else
+			if ($language === $user_info['language']) {
+							$context['response_prefix'] = $txt['response_prefix'];
+			} else
 			{
 				loadLanguage('index', $language, false);
 				$context['response_prefix'] = $txt['response_prefix'];
@@ -1820,22 +1894,25 @@ 
 			cache_put_data('response_prefix', $context['response_prefix'], 600);
 		}
 		$form_subject = $row_quoted['subject'];
-		if ($context['reply'] && trim($context['response_prefix']) != '' && $smcFunc['strpos']($form_subject, trim($context['response_prefix'])) !== 0)
-			$form_subject = $context['response_prefix'] . $form_subject;
+		if ($context['reply'] && trim($context['response_prefix']) != '' && $smcFunc['strpos']($form_subject, trim($context['response_prefix'])) !== 0) {
+					$form_subject = $context['response_prefix'] . $form_subject;
+		}
 
 		if (isset($_REQUEST['quote']))
 		{
 			// Remove any nested quotes and <br>...
 			$form_message = preg_replace('~<br ?/?' . '>~i', "\n", $row_quoted['body']);
-			if (!empty($modSettings['removeNestedQuotes']))
-				$form_message = preg_replace(array('~\n?\[quote.*?\].+?\[/quote\]\n?~is', '~^\n~', '~\[/quote\]~'), '', $form_message);
-			if (empty($row_quoted['id_member']))
-				$form_message = '[quote author=&quot;' . $row_quoted['real_name'] . '&quot;]' . "\n" . $form_message . "\n" . '[/quote]';
-			else
-				$form_message = '[quote author=' . $row_quoted['real_name'] . ' link=action=profile;u=' . $row_quoted['id_member'] . ' date=' . $row_quoted['msgtime'] . ']' . "\n" . $form_message . "\n" . '[/quote]';
+			if (!empty($modSettings['removeNestedQuotes'])) {
+							$form_message = preg_replace(array('~\n?\[quote.*?\].+?\[/quote\]\n?~is', '~^\n~', '~\[/quote\]~'), '', $form_message);
+			}
+			if (empty($row_quoted['id_member'])) {
+							$form_message = '[quote author=&quot;' . $row_quoted['real_name'] . '&quot;]' . "\n" . $form_message . "\n" . '[/quote]';
+			} else {
+							$form_message = '[quote author=' . $row_quoted['real_name'] . ' link=action=profile;u=' . $row_quoted['id_member'] . ' date=' . $row_quoted['msgtime'] . ']' . "\n" . $form_message . "\n" . '[/quote]';
+			}
+		} else {
+					$form_message = '';
 		}
-		else
-			$form_message = '';
 
 		// Do the BBC thang on the message.
 		$row_quoted['body'] = parse_bbc($row_quoted['body'], true, 'pm' . $row_quoted['id_pm']);
@@ -1856,8 +1933,7 @@ 
 			'timestamp' => forum_time(true, $row_quoted['msgtime']),
 			'body' => $row_quoted['body']
 		);
-	}
-	else
+	} else
 	{
 		$context['quoted_message'] = false;
 		$form_subject = '';
@@ -1876,11 +1952,12 @@ 
 		if ($_REQUEST['u'] == 'all' && isset($row_quoted))
 		{
 			// Firstly, to reply to all we clearly already have $row_quoted - so have the original member from.
-			if ($row_quoted['id_member'] != $user_info['id'])
-				$context['recipients']['to'][] = array(
+			if ($row_quoted['id_member'] != $user_info['id']) {
+							$context['recipients']['to'][] = array(
 					'id' => $row_quoted['id_member'],
 					'name' => $smcFunc['htmlspecialchars']($row_quoted['real_name']),
 				);
+			}
 
 			// Now to get the others.
 			$request = $smcFunc['db_query']('', '
@@ -1896,18 +1973,19 @@ 
 					'not_bcc' => 0,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$context['recipients']['to'][] = array(
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$context['recipients']['to'][] = array(
 					'id' => $row['id_member'],
 					'name' => $row['real_name'],
 				);
+			}
 			$smcFunc['db_free_result']($request);
-		}
-		else
+		} else
 		{
 			$_REQUEST['u'] = explode(',', $_REQUEST['u']);
-			foreach ($_REQUEST['u'] as $key => $uID)
-				$_REQUEST['u'][$key] = (int) $uID;
+			foreach ($_REQUEST['u'] as $key => $uID) {
+							$_REQUEST['u'][$key] = (int) $uID;
+			}
 
 			$_REQUEST['u'] = array_unique($_REQUEST['u']);
 
@@ -1921,22 +1999,24 @@ 
 					'limit' => count($_REQUEST['u']),
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$context['recipients']['to'][] = array(
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$context['recipients']['to'][] = array(
 					'id' => $row['id_member'],
 					'name' => $row['real_name'],
 				);
+			}
 			$smcFunc['db_free_result']($request);
 		}
 
 		// Get a literal name list in case the user has JavaScript disabled.
 		$names = array();
-		foreach ($context['recipients']['to'] as $to)
-			$names[] = $to['name'];
+		foreach ($context['recipients']['to'] as $to) {
+					$names[] = $to['name'];
+		}
 		$context['to_value'] = empty($names) ? '' : '&quot;' . implode('&quot;, &quot;', $names) . '&quot;';
+	} else {
+			$context['to_value'] = '';
 	}
-	else
-		$context['to_value'] = '';
 
 	// Set the defaults...
 	$context['subject'] = $form_subject;
@@ -2006,8 +2086,9 @@ 
 
 	// validate with loadMemberData()
 	$memberResult = loadMemberData($user_info['id'], false);
-	if (!$memberResult)
-		fatal_lang_error('not_a_user', false);
+	if (!$memberResult) {
+			fatal_lang_error('not_a_user', false);
+	}
 	list ($memID) = $memberResult;
 
 	// drafts is where the functions reside
@@ -2033,9 +2114,9 @@ 
 		$context['sub_template'] = 'send';
 		loadJavaScriptFile('PersonalMessage.js', array('defer' => false, 'minimize' => true), 'smf_pms');
 		loadJavaScriptFile('suggest.js', array('defer' => false, 'minimize' => true), 'smf_suggest');
+	} else {
+			$context['sub_template'] = 'pm';
 	}
-	else
-		$context['sub_template'] = 'pm';
 
 	$context['page_title'] = $txt['send_message'];
 
@@ -2096,10 +2177,11 @@ 
 		);
 		if ($smcFunc['db_num_rows']($request) == 0)
 		{
-			if (!isset($_REQUEST['xml']))
-				fatal_lang_error('pm_not_yours', false);
-			else
-				$error_types[] = 'pm_not_yours';
+			if (!isset($_REQUEST['xml'])) {
+							fatal_lang_error('pm_not_yours', false);
+			} else {
+							$error_types[] = 'pm_not_yours';
+			}
 		}
 		$row_quoted = $smcFunc['db_fetch_assoc']($request);
 		$smcFunc['db_free_result']($request);
@@ -2146,14 +2228,16 @@ 
 		$context['post_error'][$error_type] = true;
 		if (isset($txt['error_' . $error_type]))
 		{
-			if ($error_type == 'long_message')
-				$txt['error_' . $error_type] = sprintf($txt['error_' . $error_type], $modSettings['max_messageLength']);
+			if ($error_type == 'long_message') {
+							$txt['error_' . $error_type] = sprintf($txt['error_' . $error_type], $modSettings['max_messageLength']);
+			}
 			$context['post_error']['messages'][] = $txt['error_' . $error_type];
 		}
 
 		// If it's not a minor error flag it as such.
-		if (!in_array($error_type, array('new_reply', 'not_approved', 'new_replies', 'old_topic', 'need_qr_verification', 'no_subject')))
-			$context['error_type'] = 'serious';
+		if (!in_array($error_type, array('new_reply', 'not_approved', 'new_replies', 'old_topic', 'need_qr_verification', 'no_subject'))) {
+					$context['error_type'] = 'serious';
+		}
 	}
 
 	// We need to load the editor once more.
@@ -2211,8 +2295,9 @@ 
 	require_once($sourcedir . '/Subs-Auth.php');
 
 	// PM Drafts enabled and needed?
-	if ($context['drafts_pm_save'] && (isset($_POST['save_draft']) || isset($_POST['id_pm_draft'])))
-		require_once($sourcedir . '/Drafts.php');
+	if ($context['drafts_pm_save'] && (isset($_POST['save_draft']) || isset($_POST['id_pm_draft']))) {
+			require_once($sourcedir . '/Drafts.php');
+	}
 
 	loadLanguage('PersonalMessage', '', false);
 
@@ -2242,24 +2327,27 @@ 
 
 		if (!empty($postCount) && $postCount >= $modSettings['pm_posts_per_hour'])
 		{
-			if (!isset($_REQUEST['xml']))
-				fatal_lang_error('pm_too_many_per_hour', true, array($modSettings['pm_posts_per_hour']));
-			else
-				$post_errors[] = 'pm_too_many_per_hour';
+			if (!isset($_REQUEST['xml'])) {
+							fatal_lang_error('pm_too_many_per_hour', true, array($modSettings['pm_posts_per_hour']));
+			} else {
+							$post_errors[] = 'pm_too_many_per_hour';
+			}
 		}
 	}
 
 	// If your session timed out, show an error, but do allow to re-submit.
-	if (!isset($_REQUEST['xml']) && checkSession('post', '', false) != '')
-		$post_errors[] = 'session_timeout';
+	if (!isset($_REQUEST['xml']) && checkSession('post', '', false) != '') {
+			$post_errors[] = 'session_timeout';
+	}
 
 	$_REQUEST['subject'] = isset($_REQUEST['subject']) ? trim($_REQUEST['subject']) : '';
 	$_REQUEST['to'] = empty($_POST['to']) ? (empty($_GET['to']) ? '' : $_GET['to']) : $_POST['to'];
 	$_REQUEST['bcc'] = empty($_POST['bcc']) ? (empty($_GET['bcc']) ? '' : $_GET['bcc']) : $_POST['bcc'];
 
 	// Route the input from the 'u' parameter to the 'to'-list.
-	if (!empty($_POST['u']))
-		$_POST['recipient_to'] = explode(',', $_POST['u']);
+	if (!empty($_POST['u'])) {
+			$_POST['recipient_to'] = explode(',', $_POST['u']);
+	}
 
 	// Construct the list of recipients.
 	$recipientList = array();
@@ -2271,8 +2359,9 @@ 
 		$recipientList[$recipientType] = array();
 		if (!empty($_POST['recipient_' . $recipientType]) && is_array($_POST['recipient_' . $recipientType]))
 		{
-			foreach ($_POST['recipient_' . $recipientType] as $recipient)
-				$recipientList[$recipientType][] = (int) $recipient;
+			foreach ($_POST['recipient_' . $recipientType] as $recipient) {
+							$recipientList[$recipientType][] = (int) $recipient;
+			}
 		}
 
 		// Are there also literal names set?
@@ -2286,10 +2375,11 @@ 
 
 			foreach ($namedRecipientList[$recipientType] as $index => $recipient)
 			{
-				if (strlen(trim($recipient)) > 0)
-					$namedRecipientList[$recipientType][$index] = $smcFunc['htmlspecialchars']($smcFunc['strtolower'](trim($recipient)));
-				else
-					unset($namedRecipientList[$recipientType][$index]);
+				if (strlen(trim($recipient)) > 0) {
+									$namedRecipientList[$recipientType][$index] = $smcFunc['htmlspecialchars']($smcFunc['strtolower'](trim($recipient)));
+				} else {
+									unset($namedRecipientList[$recipientType][$index]);
+				}
 			}
 
 			if (!empty($namedRecipientList[$recipientType]))
@@ -2319,8 +2409,9 @@ 
 		}
 
 		// Selected a recipient to be deleted? Remove them now.
-		if (!empty($_POST['delete_recipient']))
-			$recipientList[$recipientType] = array_diff($recipientList[$recipientType], array((int) $_POST['delete_recipient']));
+		if (!empty($_POST['delete_recipient'])) {
+					$recipientList[$recipientType] = array_diff($recipientList[$recipientType], array((int) $_POST['delete_recipient']));
+		}
 
 		// Make sure we don't include the same name twice
 		$recipientList[$recipientType] = array_unique($recipientList[$recipientType]);
@@ -2330,8 +2421,9 @@ 
 	$is_recipient_change = !empty($_POST['delete_recipient']) || !empty($_POST['to_submit']) || !empty($_POST['bcc_submit']);
 
 	// Check if there's at least one recipient.
-	if (empty($recipientList['to']) && empty($recipientList['bcc']))
-		$post_errors[] = 'no_to';
+	if (empty($recipientList['to']) && empty($recipientList['bcc'])) {
+			$post_errors[] = 'no_to';
+	}
 
 	// Make sure that we remove the members who did get it from the screen.
 	if (!$is_recipient_change)
@@ -2345,28 +2437,31 @@ 
 				// Since we already have a post error, remove the previous one.
 				$post_errors = array_diff($post_errors, array('no_to'));
 
-				foreach ($namesNotFound[$recipientType] as $name)
-					$context['send_log']['failed'][] = sprintf($txt['pm_error_user_not_found'], $name);
+				foreach ($namesNotFound[$recipientType] as $name) {
+									$context['send_log']['failed'][] = sprintf($txt['pm_error_user_not_found'], $name);
+				}
 			}
 		}
 	}
 
 	// Did they make any mistakes?
-	if ($_REQUEST['subject'] == '')
-		$post_errors[] = 'no_subject';
-	if (!isset($_REQUEST['message']) || $_REQUEST['message'] == '')
-		$post_errors[] = 'no_message';
-	elseif (!empty($modSettings['max_messageLength']) && $smcFunc['strlen']($_REQUEST['message']) > $modSettings['max_messageLength'])
-		$post_errors[] = 'long_message';
-	else
+	if ($_REQUEST['subject'] == '') {
+			$post_errors[] = 'no_subject';
+	}
+	if (!isset($_REQUEST['message']) || $_REQUEST['message'] == '') {
+			$post_errors[] = 'no_message';
+	} elseif (!empty($modSettings['max_messageLength']) && $smcFunc['strlen']($_REQUEST['message']) > $modSettings['max_messageLength']) {
+			$post_errors[] = 'long_message';
+	} else
 	{
 		// Preparse the message.
 		$message = $_REQUEST['message'];
 		preparsecode($message);
 
 		// Make sure there's still some content left without the tags.
-		if ($smcFunc['htmltrim'](strip_tags(parse_bbc($smcFunc['htmlspecialchars']($message, ENT_QUOTES), false), '<img>')) === '' && (!allowedTo('admin_forum') || strpos($message, '[html]') === false))
-			$post_errors[] = 'no_message';
+		if ($smcFunc['htmltrim'](strip_tags(parse_bbc($smcFunc['htmlspecialchars']($message, ENT_QUOTES), false), '<img>')) === '' && (!allowedTo('admin_forum') || strpos($message, '[html]') === false)) {
+					$post_errors[] = 'no_message';
+		}
 	}
 
 	// Wrong verification code?
@@ -2378,13 +2473,15 @@ 
 		);
 		$context['require_verification'] = create_control_verification($verificationOptions, true);
 
-		if (is_array($context['require_verification']))
-			$post_errors = array_merge($post_errors, $context['require_verification']);
+		if (is_array($context['require_verification'])) {
+					$post_errors = array_merge($post_errors, $context['require_verification']);
+		}
 	}
 
 	// If they did, give a chance to make ammends.
-	if (!empty($post_errors) && !$is_recipient_change && !isset($_REQUEST['preview']) && !isset($_REQUEST['xml']))
-		return messagePostError($post_errors, $namedRecipientList, $recipientList);
+	if (!empty($post_errors) && !$is_recipient_change && !isset($_REQUEST['preview']) && !isset($_REQUEST['xml'])) {
+			return messagePostError($post_errors, $namedRecipientList, $recipientList);
+	}
 
 	// Want to take a second glance before you send?
 	if (isset($_REQUEST['preview']))
@@ -2415,8 +2512,9 @@ 
 		foreach ($namesNotFound as $recipientType => $names)
 		{
 			$post_errors[] = 'bad_' . $recipientType;
-			foreach ($names as $name)
-				$context['send_log']['failed'][] = sprintf($txt['pm_error_user_not_found'], $name);
+			foreach ($names as $name) {
+							$context['send_log']['failed'][] = sprintf($txt['pm_error_user_not_found'], $name);
+			}
 		}
 
 		return messagePostError(array(), $namedRecipientList, $recipientList);
@@ -2446,13 +2544,14 @@ 
 	checkSubmitOnce('check');
 
 	// Do the actual sending of the PM.
-	if (!empty($recipientList['to']) || !empty($recipientList['bcc']))
-		$context['send_log'] = sendpm($recipientList, $_REQUEST['subject'], $_REQUEST['message'], true, null, !empty($_REQUEST['pm_head']) ? (int) $_REQUEST['pm_head'] : 0);
-	else
-		$context['send_log'] = array(
+	if (!empty($recipientList['to']) || !empty($recipientList['bcc'])) {
+			$context['send_log'] = sendpm($recipientList, $_REQUEST['subject'], $_REQUEST['message'], true, null, !empty($_REQUEST['pm_head']) ? (int) $_REQUEST['pm_head'] : 0);
+	} else {
+			$context['send_log'] = array(
 			'sent' => array(),
 			'failed' => array()
 		);
+	}
 
 	// Mark the message as "replied to".
 	if (!empty($context['send_log']['sent']) && !empty($_REQUEST['replied_to']) && isset($_REQUEST['f']) && $_REQUEST['f'] == 'inbox')
@@ -2470,11 +2569,12 @@ 
 	}
 
 	// If one or more of the recipient were invalid, go back to the post screen with the failed usernames.
-	if (!empty($context['send_log']['failed']))
-		return messagePostError($post_errors, $namesNotFound, array(
+	if (!empty($context['send_log']['failed'])) {
+			return messagePostError($post_errors, $namesNotFound, array(
 			'to' => array_intersect($recipientList['to'], $context['send_log']['failed']),
 			'bcc' => array_intersect($recipientList['bcc'], $context['send_log']['failed'])
 		));
+	}
 
 	// Message sent successfully?
 	if (!empty($context['send_log']) && empty($context['send_log']['failed']))
@@ -2482,8 +2582,9 @@ 
 		$context['current_label_redirect'] = $context['current_label_redirect'] . ';done=sent';
 
 		// If we had a PM draft for this one, then its time to remove it since it was just sent
-		if ($context['drafts_pm_save'] && !empty($_POST['id_pm_draft']))
-			DeleteDraft($_POST['id_pm_draft']);
+		if ($context['drafts_pm_save'] && !empty($_POST['id_pm_draft'])) {
+					DeleteDraft($_POST['id_pm_draft']);
+		}
 	}
 
 	// Go back to the where they sent from, if possible...
@@ -2498,24 +2599,28 @@ 
 
 	checkSession('request');
 
-	if (isset($_REQUEST['del_selected']))
-		$_REQUEST['pm_action'] = 'delete';
+	if (isset($_REQUEST['del_selected'])) {
+			$_REQUEST['pm_action'] = 'delete';
+	}
 
 	if (isset($_REQUEST['pm_action']) && $_REQUEST['pm_action'] != '' && !empty($_REQUEST['pms']) && is_array($_REQUEST['pms']))
 	{
-		foreach ($_REQUEST['pms'] as $pm)
-			$_REQUEST['pm_actions'][(int) $pm] = $_REQUEST['pm_action'];
+		foreach ($_REQUEST['pms'] as $pm) {
+					$_REQUEST['pm_actions'][(int) $pm] = $_REQUEST['pm_action'];
+		}
 	}
 
-	if (empty($_REQUEST['pm_actions']))
-		redirectexit($context['current_label_redirect']);
+	if (empty($_REQUEST['pm_actions'])) {
+			redirectexit($context['current_label_redirect']);
+	}
 
 	// If we are in conversation, we may need to apply this to every message in the conversation.
 	if ($context['display_mode'] == 2 && isset($_REQUEST['conversation']))
 	{
 		$id_pms = array();
-		foreach ($_REQUEST['pm_actions'] as $pm => $dummy)
-			$id_pms[] = (int) $pm;
+		foreach ($_REQUEST['pm_actions'] as $pm => $dummy) {
+					$id_pms[] = (int) $pm;
+		}
 
 		$request = $smcFunc['db_query']('', '
 			SELECT id_pm_head, id_pm
@@ -2526,8 +2631,9 @@ 
 			)
 		);
 		$pm_heads = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$pm_heads[$row['id_pm_head']] = $row['id_pm'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$pm_heads[$row['id_pm_head']] = $row['id_pm'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		$request = $smcFunc['db_query']('', '
@@ -2541,8 +2647,9 @@ 
 		// Copy the action from the single to PM to the others.
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (isset($pm_heads[$row['id_pm_head']]) && isset($_REQUEST['pm_actions'][$pm_heads[$row['id_pm_head']]]))
-				$_REQUEST['pm_actions'][$row['id_pm']] = $_REQUEST['pm_actions'][$pm_heads[$row['id_pm_head']]];
+			if (isset($pm_heads[$row['id_pm_head']]) && isset($_REQUEST['pm_actions'][$pm_heads[$row['id_pm_head']]])) {
+							$_REQUEST['pm_actions'][$row['id_pm']] = $_REQUEST['pm_actions'][$pm_heads[$row['id_pm_head']]];
+			}
 		}
 		$smcFunc['db_free_result']($request);
 	}
@@ -2553,22 +2660,21 @@ 
 	$labels = array();
 	foreach ($_REQUEST['pm_actions'] as $pm => $action)
 	{
-		if ($action === 'delete')
-			$to_delete[] = (int) $pm;
-		else
+		if ($action === 'delete') {
+					$to_delete[] = (int) $pm;
+		} else
 		{
 			if (substr($action, 0, 4) == 'add_')
 			{
 				$type = 'add';
 				$action = substr($action, 4);
-			}
-			elseif (substr($action, 0, 4) == 'rem_')
+			} elseif (substr($action, 0, 4) == 'rem_')
 			{
 				$type = 'rem';
 				$action = substr($action, 4);
+			} else {
+							$type = 'unk';
 			}
-			else
-				$type = 'unk';
 
 			if ($action == '-1' || (int) $action > 0)
 			{
@@ -2579,8 +2685,9 @@ 
 	}
 
 	// Deleting, it looks like?
-	if (!empty($to_delete))
-		deleteMessages($to_delete, $context['display_mode'] == 2 ? null : $context['folder']);
+	if (!empty($to_delete)) {
+			deleteMessages($to_delete, $context['display_mode'] == 2 ? null : $context['folder']);
+	}
 
 	// Are we labeling anything?
 	if (!empty($to_label) && $context['folder'] == 'inbox')
@@ -2646,8 +2753,7 @@ 
 				}
 
 				$smcFunc['db_free_result']($request2);
-			}
-			elseif ($type == 'rem')
+			} elseif ($type == 'rem')
 			{
 				// If we're removing from the inbox, see if we have at least one other label.
 				// This query is faster than the one above
@@ -2679,21 +2785,25 @@ 
 			if ($to_label[$row['id_pm']] != '-1')
 			{
 				// If this label is in the list and we're not adding it, remove it
-				if (array_key_exists($to_label[$row['id_pm']], $labels) && $type !== 'add')
-					unset($labels[$to_label[$row['id_pm']]]);
-				else if ($type !== 'rem')
-					$labels[$to_label[$row['id_pm']]] = $to_label[$row['id_pm']];
+				if (array_key_exists($to_label[$row['id_pm']], $labels) && $type !== 'add') {
+									unset($labels[$to_label[$row['id_pm']]]);
+				} else if ($type !== 'rem') {
+									$labels[$to_label[$row['id_pm']]] = $to_label[$row['id_pm']];
+				}
 			}
 
 			// Removing all labels or just removing the inbox label
-			if ($type == 'rem' && empty($labels))
-				$in_inbox = (empty($context['can_remove_inbox']) ? 1 : 0);
+			if ($type == 'rem' && empty($labels)) {
+							$in_inbox = (empty($context['can_remove_inbox']) ? 1 : 0);
+			}
 			// Adding new labels, but removing inbox and applying new ones
-			elseif ($type == 'add' && !empty($options['pm_remove_inbox_label']) && !empty($labels))
-				$in_inbox = 0;
+			elseif ($type == 'add' && !empty($options['pm_remove_inbox_label']) && !empty($labels)) {
+							$in_inbox = 0;
+			}
 			// Just adding it to the inbox
-			else
-				$in_inbox = 1;
+			else {
+							$in_inbox = 1;
+			}
 
 			// Are we adding it to or removing it from the inbox?
 			if ($in_inbox != $row['in_inbox'])
@@ -2735,8 +2845,9 @@ 
 			if (!empty($labels_to_apply))
 			{
 				$inserts = array();
-				foreach ($labels_to_apply as $label)
-					$inserts[] = array($row['id_pm'], $label);
+				foreach ($labels_to_apply as $label) {
+									$inserts[] = array($row['id_pm'], $label);
+				}
 
 				$smcFunc['db_insert']('',
 					'{db_prefix}pm_labeled_messages',
@@ -2780,11 +2891,13 @@ 
 	checkSession('get');
 
 	// If all then delete all messages the user has.
-	if ($_REQUEST['f'] == 'all')
-		deleteMessages(null, null);
+	if ($_REQUEST['f'] == 'all') {
+			deleteMessages(null, null);
+	}
 	// Otherwise just the selected folder.
-	else
-		deleteMessages(null, $_REQUEST['f'] != 'sent' ? 'inbox' : 'sent');
+	else {
+			deleteMessages(null, $_REQUEST['f'] != 'sent' ? 'inbox' : 'sent');
+	}
 
 	// Done... all gone.
 	redirectexit($context['current_label_redirect']);
@@ -2821,8 +2934,9 @@ 
 				'msgtime' => $deleteTime,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_row']($request))
-			$toDelete[] = $row[0];
+		while ($row = $smcFunc['db_fetch_row']($request)) {
+					$toDelete[] = $row[0];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Select all messages in their inbox older than $deleteTime.
@@ -2839,8 +2953,9 @@ 
 				'msgtime' => $deleteTime,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$toDelete[] = $row['id_pm'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$toDelete[] = $row['id_pm'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Delete the actual messages.
@@ -2871,26 +2986,29 @@ 
 {
 	global $user_info, $smcFunc;
 
-	if ($owner === null)
-		$owner = array($user_info['id']);
-	elseif (empty($owner))
-		return;
-	elseif (!is_array($owner))
-		$owner = array($owner);
+	if ($owner === null) {
+			$owner = array($user_info['id']);
+	} elseif (empty($owner)) {
+			return;
+	} elseif (!is_array($owner)) {
+			$owner = array($owner);
+	}
 
 	if ($personal_messages !== null)
 	{
-		if (empty($personal_messages) || !is_array($personal_messages))
-			return;
+		if (empty($personal_messages) || !is_array($personal_messages)) {
+					return;
+		}
 
-		foreach ($personal_messages as $index => $delete_id)
-			$personal_messages[$index] = (int) $delete_id;
+		foreach ($personal_messages as $index => $delete_id) {
+					$personal_messages[$index] = (int) $delete_id;
+		}
 
 		$where = '
 				AND id_pm IN ({array_int:pm_list})';
+	} else {
+			$where = '';
 	}
-	else
-		$where = '';
 
 	if ($folder == 'sent' || $folder === null)
 	{
@@ -2925,17 +3043,19 @@ 
 		// ...And update the statistics accordingly - now including unread messages!.
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if ($row['is_read'])
-				updateMemberData($row['id_member'], array('instant_messages' => $where == '' ? 0 : 'instant_messages - ' . $row['num_deleted_messages']));
-			else
-				updateMemberData($row['id_member'], array('instant_messages' => $where == '' ? 0 : 'instant_messages - ' . $row['num_deleted_messages'], 'unread_messages' => $where == '' ? 0 : 'unread_messages - ' . $row['num_deleted_messages']));
+			if ($row['is_read']) {
+							updateMemberData($row['id_member'], array('instant_messages' => $where == '' ? 0 : 'instant_messages - ' . $row['num_deleted_messages']));
+			} else {
+							updateMemberData($row['id_member'], array('instant_messages' => $where == '' ? 0 : 'instant_messages - ' . $row['num_deleted_messages'], 'unread_messages' => $where == '' ? 0 : 'unread_messages - ' . $row['num_deleted_messages']));
+			}
 
 			// If this is the current member we need to make their message count correct.
 			if ($user_info['id'] == $row['id_member'])
 			{
 				$user_info['messages'] -= $row['num_deleted_messages'];
-				if (!($row['is_read']))
-					$user_info['unread_messages'] -= $row['num_deleted_messages'];
+				if (!($row['is_read'])) {
+									$user_info['unread_messages'] -= $row['num_deleted_messages'];
+				}
 			}
 		}
 		$smcFunc['db_free_result']($request);
@@ -3003,8 +3123,9 @@ 
 		)
 	);
 	$remove_pms = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$remove_pms[] = $row['sender'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$remove_pms[] = $row['sender'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	if (!empty($remove_pms))
@@ -3049,8 +3170,9 @@ 
 {
 	global $user_info, $context, $smcFunc;
 
-	if ($owner === null)
-		$owner = $user_info['id'];
+	if ($owner === null) {
+			$owner = $user_info['id'];
+	}
 
 	$in_inbox = '';
 
@@ -3074,8 +3196,7 @@ 
 		}
 
 		$smcFunc['db_free_result']($get_messages);
-	}
-	elseif ($label = '-1')
+	} elseif ($label = '-1')
 	{
 		// Marking all PMs in your inbox read
 		$in_inbox = '
@@ -3100,8 +3221,9 @@ 
 	{
 		if ($owner == $user_info['id'])
 		{
-			foreach ($context['labels'] as $label)
-				$context['labels'][(int) $label['id']]['unread_messages'] = 0;
+			foreach ($context['labels'] as $label) {
+							$context['labels'][(int) $label['id']]['unread_messages'] = 0;
+			}
 		}
 
 		$result = $smcFunc['db_query']('', '
@@ -3121,8 +3243,9 @@ 
 		{
 			$total_unread += $row['num'];
 
-			if ($owner != $user_info['id'] || empty($row['id_pm']))
-				continue;
+			if ($owner != $user_info['id'] || empty($row['id_pm'])) {
+							continue;
+			}
 
 			$this_labels = array();
 
@@ -3146,11 +3269,13 @@ 
 
 			$smcFunc['db_free_result']($result2);
 
-			foreach ($this_labels as $this_label)
-				$context['labels'][$this_label]['unread_messages'] += $row['num'];
+			foreach ($this_labels as $this_label) {
+							$context['labels'][$this_label]['unread_messages'] += $row['num'];
+			}
 
-			if ($row['in_inbox'] == 1)
-				$context['labels'][-1]['unread_messages'] += $row['num'];
+			if ($row['in_inbox'] == 1) {
+							$context['labels'][-1]['unread_messages'] += $row['num'];
+			}
 		}
 		$smcFunc['db_free_result']($result);
 
@@ -3159,8 +3284,9 @@ 
 		updateMemberData($owner, array('unread_messages' => $total_unread));
 
 		// If it was for the current member, reflect this in the $user_info array too.
-		if ($owner == $user_info['id'])
-			$user_info['unread_messages'] = $total_unread;
+		if ($owner == $user_info['id']) {
+					$user_info['unread_messages'] = $total_unread;
+		}
 	}
 }
 
@@ -3188,8 +3314,9 @@ 
 	// Add all existing labels to the array to save, slashing them as necessary...
 	foreach ($context['labels'] as $label)
 	{
-		if ($label['id'] != -1)
-			$the_labels[$label['id']] = $label['name'];
+		if ($label['id'] != -1) {
+					$the_labels[$label['id']] = $label['name'];
+		}
 	}
 
 	if (isset($_POST[$context['session_var']]))
@@ -3208,8 +3335,9 @@ 
 		{
 			$_POST['label'] = strtr($smcFunc['htmlspecialchars'](trim($_POST['label'])), array(',' => '&#044;'));
 
-			if ($smcFunc['strlen']($_POST['label']) > 30)
-				$_POST['label'] = $smcFunc['substr']($_POST['label'], 0, 30);
+			if ($smcFunc['strlen']($_POST['label']) > 30) {
+							$_POST['label'] = $smcFunc['substr']($_POST['label'], 0, 30);
+			}
 			if ($_POST['label'] != '')
 			{
 				$the_labels[] = $_POST['label'];
@@ -3230,23 +3358,24 @@ 
 		{
 			foreach ($the_labels as $id => $name)
 			{
-				if ($id == -1)
-					continue;
-				elseif (isset($_POST['label_name'][$id]))
+				if ($id == -1) {
+									continue;
+				} elseif (isset($_POST['label_name'][$id]))
 				{
 					$_POST['label_name'][$id] = trim(strtr($smcFunc['htmlspecialchars']($_POST['label_name'][$id]), array(',' => '&#044;')));
 
-					if ($smcFunc['strlen']($_POST['label_name'][$id]) > 30)
-						$_POST['label_name'][$id] = $smcFunc['substr']($_POST['label_name'][$id], 0, 30);
+					if ($smcFunc['strlen']($_POST['label_name'][$id]) > 30) {
+											$_POST['label_name'][$id] = $smcFunc['substr']($_POST['label_name'][$id], 0, 30);
+					}
 					if ($_POST['label_name'][$id] != '')
 					{
 						// Changing the name of this label?
-						if ($the_labels[$id] != $_POST['label_name'][$id])
-							$label_updates[$id] = $_POST['label_name'][$id];
+						if ($the_labels[$id] != $_POST['label_name'][$id]) {
+													$label_updates[$id] = $_POST['label_name'][$id];
+						}
 
 						$the_labels[(int) $id] = $_POST['label_name'][$id];
-					}
-					else
+					} else
 					{
 						unset($the_labels[(int) $id]);
 						$labels_to_remove[] = $id;
@@ -3260,8 +3389,9 @@ 
 		if (!empty($labels_to_add))
 		{
 			$inserts = array();
-			foreach ($labels_to_add AS $label)
-				$inserts[] = array($user_info['id'], $label);
+			foreach ($labels_to_add AS $label) {
+							$inserts[] = array($user_info['id'], $label);
+			}
 
 			$smcFunc['db_insert']('', '{db_prefix}pm_labels', array('id_member' => 'int', 'name' => 'string-30'), $inserts, array());
 		}
@@ -3351,8 +3481,9 @@ 
 				// Each action...
 				foreach ($rule['actions'] as $k2 => $action)
 				{
-					if ($action['t'] != 'lab' || !in_array($action['v'], $labels_to_remove))
-						continue;
+					if ($action['t'] != 'lab' || !in_array($action['v'], $labels_to_remove)) {
+											continue;
+					}
 
 					$rule_changes[] = $rule['id'];
 
@@ -3367,8 +3498,8 @@ 
 		{
 			$rule_changes = array_unique($rule_changes);
 			// Update/delete as appropriate.
-			foreach ($rule_changes as $k => $id)
-				if (!empty($context['rules'][$id]['actions']))
+			foreach ($rule_changes as $k => $id) {
+							if (!empty($context['rules'][$id]['actions']))
 				{
 					$smcFunc['db_query']('', '
 						UPDATE {db_prefix}pm_rules
@@ -3381,12 +3512,13 @@ 
 							'actions' => $smcFunc['json_encode']($context['rules'][$id]['actions']),
 						)
 					);
+			}
 					unset($rule_changes[$k]);
 				}
 
 			// Anything left here means it's lost all actions...
-			if (!empty($rule_changes))
-				$smcFunc['db_query']('', '
+			if (!empty($rule_changes)) {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}pm_rules
 					WHERE id_rule IN ({array_int:rule_list})
 							AND id_member = {int:current_member}',
@@ -3395,6 +3527,7 @@ 
 						'rule_list' => $rule_changes,
 					)
 				);
+			}
 		}
 
 		// Make sure we're not caching this!
@@ -3464,8 +3597,9 @@ 
 		// Save the fields.
 		saveProfileFields();
 
-		if (!empty($profile_vars))
-			updateMemberData($user_info['id'], $profile_vars);
+		if (!empty($profile_vars)) {
+					updateMemberData($user_info['id'], $profile_vars);
+		}
 	}
 
 	setupProfileContext(
@@ -3490,13 +3624,15 @@ 
 	global $user_info, $language, $modSettings, $smcFunc;
 
 	// Check that this feature is even enabled!
-	if (empty($modSettings['enableReportPM']) || empty($_REQUEST['pmsg']))
-		fatal_lang_error('no_access', false);
+	if (empty($modSettings['enableReportPM']) || empty($_REQUEST['pmsg'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	$pmsg = (int) $_REQUEST['pmsg'];
 
-	if (!isAccessiblePM($pmsg, 'inbox'))
-		fatal_lang_error('no_access', false);
+	if (!isAccessiblePM($pmsg, 'inbox')) {
+			fatal_lang_error('no_access', false);
+	}
 
 	$context['pm_id'] = $pmsg;
 	$context['page_title'] = $txt['pm_report_title'];
@@ -3518,8 +3654,9 @@ 
 			)
 		);
 		$context['admins'] = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$context['admins'][$row['id_member']] = $row['real_name'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$context['admins'][$row['id_member']] = $row['real_name'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// How many admins in total?
@@ -3548,8 +3685,9 @@ 
 			)
 		);
 		// Can only be a hacker here!
-		if ($smcFunc['db_num_rows']($request) == 0)
-			fatal_lang_error('no_access', false);
+		if ($smcFunc['db_num_rows']($request) == 0) {
+					fatal_lang_error('no_access', false);
+		}
 		list ($subject, $body, $time, $memberFromID, $memberFromName) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 
@@ -3573,15 +3711,17 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
 			// If it's hidden still don't reveal their names - privacy after all ;)
-			if ($row['bcc'])
-				$hidden_recipients++;
-			else
-				$recipients[] = '[url=' . $scripturl . '?action=profile;u=' . $row['id_member_to'] . ']' . $row['to_name'] . '[/url]';
+			if ($row['bcc']) {
+							$hidden_recipients++;
+			} else {
+							$recipients[] = '[url=' . $scripturl . '?action=profile;u=' . $row['id_member_to'] . ']' . $row['to_name'] . '[/url]';
+			}
 		}
 		$smcFunc['db_free_result']($request);
 
-		if ($hidden_recipients)
-			$recipients[] = sprintf($txt['pm_report_pm_hidden'], $hidden_recipients);
+		if ($hidden_recipients) {
+					$recipients[] = sprintf($txt['pm_report_pm_hidden'], $hidden_recipients);
+		}
 
 		// Now let's get out and loop through the admins.
 		$request = $smcFunc['db_query']('', '
@@ -3597,8 +3737,9 @@ 
 		);
 
 		// Maybe we shouldn't advertise this?
-		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);
+		}
 
 		$memberFromName = un_htmlspecialchars($memberFromName);
 
@@ -3617,8 +3758,9 @@ 
 				// Make the body.
 				$report_body = str_replace(array('{REPORTER}', '{SENDER}'), array(un_htmlspecialchars($user_info['name']), $memberFromName), $txt['pm_report_pm_user_sent']);
 				$report_body .= "\n" . '[b]' . $_POST['reason'] . '[/b]' . "\n\n";
-				if (!empty($recipients))
-					$report_body .= $txt['pm_report_pm_other_recipients'] . ' ' . implode(', ', $recipients) . "\n\n";
+				if (!empty($recipients)) {
+									$report_body .= $txt['pm_report_pm_other_recipients'] . ' ' . implode(', ', $recipients) . "\n\n";
+				}
 				$report_body .= $txt['pm_report_pm_unedited_below'] . "\n" . '[quote author=' . (empty($memberFromID) ? '&quot;' . $memberFromName . '&quot;' : $memberFromName . ' link=action=profile;u=' . $memberFromID . ' date=' . $time) . ']' . "\n" . un_htmlspecialchars($body) . '[/quote]';
 
 				// Plonk it in the array ;)
@@ -3638,12 +3780,14 @@ 
 		$smcFunc['db_free_result']($request);
 
 		// Send a different email for each language.
-		foreach ($messagesToSend as $lang => $message)
-			sendpm($message['recipients'], $message['subject'], $message['body']);
+		foreach ($messagesToSend as $lang => $message) {
+					sendpm($message['recipients'], $message['subject'], $message['body']);
+		}
 
 		// Give the user their own language back!
-		if (!empty($modSettings['userLanguage']))
-			loadLanguage('PersonalMessage', '', false);
+		if (!empty($modSettings['userLanguage'])) {
+					loadLanguage('PersonalMessage', '', false);
+		}
 
 		// Leave them with a template.
 		$context['sub_template'] = 'report_message_complete';
@@ -3689,8 +3833,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Hide hidden groups!
-		if ($row['hidden'] && !$row['can_moderate'] && !allowedTo('manage_membergroups'))
-			continue;
+		if ($row['hidden'] && !$row['can_moderate'] && !allowedTo('manage_membergroups')) {
+					continue;
+		}
 
 		$context['groups'][$row['id_group']] = $row['group_name'];
 	}
@@ -3716,9 +3861,10 @@ 
 			$context['rule'] = $context['rules'][$context['rid']];
 			$members = array();
 			// Need to get member names!
-			foreach ($context['rule']['criteria'] as $k => $criteria)
-				if ($criteria['t'] == 'mid' && !empty($criteria['v']))
+			foreach ($context['rule']['criteria'] as $k => $criteria) {
+							if ($criteria['t'] == 'mid' && !empty($criteria['v']))
 					$members[(int) $criteria['v']] = $k;
+			}
 
 			if (!empty($members))
 			{
@@ -3730,19 +3876,20 @@ 
 						'member_list' => array_keys($members),
 					)
 				);
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					$context['rule']['criteria'][$members[$row['id_member']]]['v'] = $row['member_name'];
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									$context['rule']['criteria'][$members[$row['id_member']]]['v'] = $row['member_name'];
+				}
 				$smcFunc['db_free_result']($request);
 			}
-		}
-		else
-			$context['rule'] = array(
+		} else {
+					$context['rule'] = array(
 				'id' => '',
 				'name' => '',
 				'criteria' => array(),
 				'actions' => array(),
 				'logic' => 'and',
 			);
+		}
 	}
 	// Saving?
 	elseif (isset($_GET['save']))
@@ -3752,22 +3899,25 @@ 
 
 		// Name is easy!
 		$ruleName = $smcFunc['htmlspecialchars'](trim($_POST['rule_name']));
-		if (empty($ruleName))
-			fatal_lang_error('pm_rule_no_name', false);
+		if (empty($ruleName)) {
+					fatal_lang_error('pm_rule_no_name', false);
+		}
 
 		// Sanity check...
-		if (empty($_POST['ruletype']) || empty($_POST['acttype']))
-			fatal_lang_error('pm_rule_no_criteria', false);
+		if (empty($_POST['ruletype']) || empty($_POST['acttype'])) {
+					fatal_lang_error('pm_rule_no_criteria', false);
+		}
 
 		// Let's do the criteria first - it's also hardest!
 		$criteria = array();
 		foreach ($_POST['ruletype'] as $ind => $type)
 		{
 			// Check everything is here...
-			if ($type == 'gid' && (!isset($_POST['ruledefgroup'][$ind]) || !isset($context['groups'][$_POST['ruledefgroup'][$ind]])))
-				continue;
-			elseif ($type != 'bud' && !isset($_POST['ruledef'][$ind]))
-				continue;
+			if ($type == 'gid' && (!isset($_POST['ruledefgroup'][$ind]) || !isset($context['groups'][$_POST['ruledefgroup'][$ind]]))) {
+							continue;
+			} elseif ($type != 'bud' && !isset($_POST['ruledef'][$ind])) {
+							continue;
+			}
 
 			// Members need to be found.
 			if ($type == 'mid')
@@ -3791,13 +3941,13 @@ 
 				$smcFunc['db_free_result']($request);
 
 				$criteria[] = array('t' => 'mid', 'v' => $memID);
+			} elseif ($type == 'bud') {
+							$criteria[] = array('t' => 'bud', 'v' => 1);
+			} elseif ($type == 'gid') {
+							$criteria[] = array('t' => 'gid', 'v' => (int) $_POST['ruledefgroup'][$ind]);
+			} elseif (in_array($type, array('sub', 'msg')) && trim($_POST['ruledef'][$ind]) != '') {
+							$criteria[] = array('t' => $type, 'v' => $smcFunc['htmlspecialchars'](trim($_POST['ruledef'][$ind])));
 			}
-			elseif ($type == 'bud')
-				$criteria[] = array('t' => 'bud', 'v' => 1);
-			elseif ($type == 'gid')
-				$criteria[] = array('t' => 'gid', 'v' => (int) $_POST['ruledefgroup'][$ind]);
-			elseif (in_array($type, array('sub', 'msg')) && trim($_POST['ruledef'][$ind]) != '')
-				$criteria[] = array('t' => $type, 'v' => $smcFunc['htmlspecialchars'](trim($_POST['ruledef'][$ind])));
 		}
 
 		// Also do the actions!
@@ -3807,26 +3957,29 @@ 
 		foreach ($_POST['acttype'] as $ind => $type)
 		{
 			// Picking a valid label?
-			if ($type == 'lab' && (!isset($_POST['labdef'][$ind]) || !isset($context['labels'][$_POST['labdef'][$ind]])))
-				continue;
+			if ($type == 'lab' && (!isset($_POST['labdef'][$ind]) || !isset($context['labels'][$_POST['labdef'][$ind]]))) {
+							continue;
+			}
 
 			// Record what we're doing.
-			if ($type == 'del')
-				$doDelete = 1;
-			elseif ($type == 'lab')
-				$actions[] = array('t' => 'lab', 'v' => (int) $_POST['labdef'][$ind]);
+			if ($type == 'del') {
+							$doDelete = 1;
+			} elseif ($type == 'lab') {
+							$actions[] = array('t' => 'lab', 'v' => (int) $_POST['labdef'][$ind]);
+			}
 		}
 
-		if (empty($criteria) || (empty($actions) && !$doDelete))
-			fatal_lang_error('pm_rule_no_criteria', false);
+		if (empty($criteria) || (empty($actions) && !$doDelete)) {
+					fatal_lang_error('pm_rule_no_criteria', false);
+		}
 
 		// What are we storing?
 		$criteria = $smcFunc['json_encode']($criteria);
 		$actions = $smcFunc['json_encode']($actions);
 
 		// Create the rule?
-		if (empty($context['rid']))
-			$smcFunc['db_insert']('',
+		if (empty($context['rid'])) {
+					$smcFunc['db_insert']('',
 				'{db_prefix}pm_rules',
 				array(
 					'id_member' => 'int', 'rule_name' => 'string', 'criteria' => 'string', 'actions' => 'string',
@@ -3837,8 +3990,8 @@ 
 				),
 				array('id_rule')
 			);
-		else
-			$smcFunc['db_query']('', '
+		} else {
+					$smcFunc['db_query']('', '
 				UPDATE {db_prefix}pm_rules
 				SET rule_name = {string:rule_name}, criteria = {string:criteria}, actions = {string:actions},
 					delete_pm = {int:delete_pm}, is_or = {int:is_or}
@@ -3854,6 +4007,7 @@ 
 					'actions' => $actions,
 				)
 			);
+		}
 
 		redirectexit('action=pm;sa=manrules');
 	}
@@ -3862,11 +4016,12 @@ 
 	{
 		checkSession();
 		$toDelete = array();
-		foreach ($_POST['delrule'] as $k => $v)
-			$toDelete[] = (int) $k;
+		foreach ($_POST['delrule'] as $k => $v) {
+					$toDelete[] = (int) $k;
+		}
 
-		if (!empty($toDelete))
-			$smcFunc['db_query']('', '
+		if (!empty($toDelete)) {
+					$smcFunc['db_query']('', '
 				DELETE FROM {db_prefix}pm_rules
 				WHERE id_rule IN ({array_int:delete_list})
 					AND id_member = {int:current_member}',
@@ -3875,6 +4030,7 @@ 
 					'delete_list' => $toDelete,
 				)
 			);
+		}
 
 		redirectexit('action=pm;sa=manrules');
 	}
@@ -3893,8 +4049,9 @@ 
 	loadRules();
 
 	// No rules?
-	if (empty($context['rules']))
-		return;
+	if (empty($context['rules'])) {
+			return;
+	}
 
 	// Just unread ones?
 	$ruleQuery = $all_messages ? '' : ' AND pmr.is_new = 1';
@@ -3924,8 +4081,9 @@ 
 			// Loop through all the criteria hoping to make a match.
 			foreach ($rule['criteria'] as $criterium)
 			{
-				if (($criterium['t'] == 'mid' && $criterium['v'] == $row['id_member_from']) || ($criterium['t'] == 'gid' && $criterium['v'] == $row['id_group']) || ($criterium['t'] == 'sub' && strpos($row['subject'], $criterium['v']) !== false) || ($criterium['t'] == 'msg' && strpos($row['body'], $criterium['v']) !== false))
-					$match = true;
+				if (($criterium['t'] == 'mid' && $criterium['v'] == $row['id_member_from']) || ($criterium['t'] == 'gid' && $criterium['v'] == $row['id_group']) || ($criterium['t'] == 'sub' && strpos($row['subject'], $criterium['v']) !== false) || ($criterium['t'] == 'msg' && strpos($row['body'], $criterium['v']) !== false)) {
+									$match = true;
+				}
 				// If we're adding and one criteria don't match then we stop!
 				elseif ($rule['logic'] == 'and')
 				{
@@ -3937,17 +4095,18 @@ 
 			// If we have a match the rule must be true - act!
 			if ($match)
 			{
-				if ($rule['delete'])
-					$actions['deletes'][] = $row['id_pm'];
-				else
+				if ($rule['delete']) {
+									$actions['deletes'][] = $row['id_pm'];
+				} else
 				{
 					foreach ($rule['actions'] as $ruleAction)
 					{
 						if ($ruleAction['t'] == 'lab')
 						{
 							// Get a basic pot started!
-							if (!isset($actions['labels'][$row['id_pm']]))
-								$actions['labels'][$row['id_pm']] = array();
+							if (!isset($actions['labels'][$row['id_pm']])) {
+															$actions['labels'][$row['id_pm']] = array();
+							}
 							$actions['labels'][$row['id_pm']][] = $ruleAction['v'];
 						}
 					}
@@ -3958,8 +4117,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Deletes are easy!
-	if (!empty($actions['deletes']))
-		deleteMessages($actions['deletes']);
+	if (!empty($actions['deletes'])) {
+			deleteMessages($actions['deletes']);
+	}
 
 	// Relabel?
 	if (!empty($actions['labels']))
@@ -3986,8 +4146,7 @@ 
 								'current_member' => $user_info['id'],
 							)
 						);
-					}
-					else
+					} else
 					{
 						$realLabels[] = $label['id'];
 					}
@@ -3996,8 +4155,9 @@ 
 
 			$inserts = array();
 			// Now we insert the label info
-			foreach ($realLabels as $a_label)
-				$inserts[] = array($pm, $a_label);
+			foreach ($realLabels as $a_label) {
+							$inserts[] = array($pm, $a_label);
+			}
 
 			$smcFunc['db_insert']('ignore',
 				'{db_prefix}pm_labeled_messages',
@@ -4018,8 +4178,9 @@ 
 {
 	global $user_info, $context, $smcFunc;
 
-	if (isset($context['rules']) && !$reload)
-		return;
+	if (isset($context['rules']) && !$reload) {
+			return;
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT
@@ -4043,8 +4204,9 @@ 
 			'logic' => $row['is_or'] ? 'or' : 'and',
 		);
 
-		if ($row['delete_pm'])
-			$context['rules'][$row['id_rule']]['actions'][] = array('t' => 'del', 'v' => 1);
+		if ($row['delete_pm']) {
+					$context['rules'][$row['id_rule']]['actions'][] = array('t' => 'del', 'v' => 1);
+		}
 	}
 	$smcFunc['db_free_result']($request);
 }