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)
 	{

Spacing +14 added lines, -14 removed lines

@@ -53,25 +53,25 @@ 
 	 */
 	public function getData($key, $ttl = null)
 	{
-		$key = $this->prefix . strtr($key, ':/', '-_');
+		$key = $this->prefix.strtr($key, ':/', '-_');
 		$cachedir = $this->cachedir;
 
 		// SMF Data returns $value and $expired.  $expired has a unix timestamp of when this expires.
-		if (file_exists($cachedir . '/data_' . $key . '.php') && filesize($cachedir . '/data_' . $key . '.php') > 10)
+		if (file_exists($cachedir.'/data_'.$key.'.php') && filesize($cachedir.'/data_'.$key.'.php') > 10)
 		{
 			// 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);
+				opcache_invalidate($cachedir.'/data_'.$key.'.php', true);
 
 			if (function_exists('apc_delete_file'))
-				@apc_delete_file($cachedir . '/data_' . $key . '.php');
+				@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');
+			@include($cachedir.'/data_'.$key.'.php');
 			if (!empty($expired) && isset($value))
 			{
-				@unlink($cachedir . '/data_' . $key . '.php');
+				@unlink($cachedir.'/data_'.$key.'.php');
 				unset($value);
 			}
 		}
@@ -84,30 +84,30 @@ 
 	 */
 	public function putData($key, $value, $ttl = null)
 	{
-		$key = $this->prefix . strtr($key, ':/', '-_');
+		$key = $this->prefix.strtr($key, ':/', '-_');
 		$cachedir = $this->cachedir;
 
 		// 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);
+			opcache_invalidate($cachedir.'/data_'.$key.'.php', true);
 
 		if (function_exists('apc_delete_file'))
-			@apc_delete_file($cachedir . '/data_' . $key . '.php');
+			@apc_delete_file($cachedir.'/data_'.$key.'.php');
 
 		// Otherwise custom cache?
 		if ($value === null)
-			@unlink($cachedir . '/data_' . $key . '.php');
+			@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, '\\\'') . '\';}' . '?' . '>';
+			$cache_data = '<'.'?'.'php if (!defined(\'SMF\')) die; if ('.(time() + $ttl).' < time()) $expired = true; else{$expired = false; $value = \''.addcslashes($value, '\\\'').'\';}'.'?'.'>';
 
 			// Write out the cache file, check that the cache write was successful; all the data must be written
 			// If it fails due to low diskspace, or other, remove the cache file
-			$fileSize = file_put_contents($cachedir . '/data_' . $key . '.php', $cache_data, LOCK_EX);
+			$fileSize = file_put_contents($cachedir.'/data_'.$key.'.php', $cache_data, LOCK_EX);
 			if ($fileSize !== strlen($cache_data))
 			{
-				@unlink($cachedir . '/data_' . $key . '.php');
+				@unlink($cachedir.'/data_'.$key.'.php');
 				return false;
 			}
 			else
@@ -131,7 +131,7 @@ 
 		while ($file = readdir($dh))
 		{
 			if ($file != '.' && $file != '..' && $file != 'index.php' && $file != '.htaccess' && (!$type || substr($file, 0, strlen($type)) == $type))
-				@unlink($cachedir . '/' . $file);
+				@unlink($cachedir.'/'.$file);
 		}
 		closedir($dh);
 

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 +18 added lines, -18 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);
 
@@ -547,8 +547,8 @@ 
 				$this->m_data = substr($this->m_data, $this->m_gih->m_nWidth);
 
 				$data =
-					substr($data, 0, $y * $this->m_gih->m_nWidth) .
-					$lne .
+					substr($data, 0, $y * $this->m_gih->m_nWidth).
+					$lne.
 					substr($data, ($y + 1) * $this->m_gih->m_nWidth);
 			}
 		}
@@ -659,15 +659,15 @@ 
 
 		// Now, we want the header...
 		$out .= "\x00\x00\x00\x0D";
-		$tmp = 'IHDR' . pack('N', (int) $this->header->m_nWidth) . pack('N', (int) $this->header->m_nHeight) . "\x08\x03\x00\x00\x00";
-		$out .= $tmp . pack('N', smf_crc32($tmp));
+		$tmp = 'IHDR'.pack('N', (int) $this->header->m_nWidth).pack('N', (int) $this->header->m_nHeight)."\x08\x03\x00\x00\x00";
+		$out .= $tmp.pack('N', smf_crc32($tmp));
 
 		// The palette, assuming we have one to speak of...
 		if ($colors > 0)
 		{
 			$out .= pack('N', (int) $colors * 3);
-			$tmp = 'PLTE' . $pal;
-			$out .= $tmp . pack('N', smf_crc32($tmp));
+			$tmp = 'PLTE'.$pal;
+			$out .= $tmp.pack('N', smf_crc32($tmp));
 		}
 
 		// Do we have any transparency we want to make available?
@@ -680,16 +680,16 @@ 
 			for ($i = 0; $i < $colors; $i++)
 				$tmp .= $i == $this->image->m_nTrans ? "\x00" : "\xFF";
 
-			$out .= $tmp . pack('N', smf_crc32($tmp));
+			$out .= $tmp.pack('N', smf_crc32($tmp));
 		}
 
 		// Here's the data itself!
 		$out .= pack('N', strlen($bmp));
-		$tmp = 'IDAT' . $bmp;
-		$out .= $tmp . pack('N', smf_crc32($tmp));
+		$tmp = 'IDAT'.$bmp;
+		$out .= $tmp.pack('N', smf_crc32($tmp));
 
 		// EOF marker...
-		$out .= "\x00\x00\x00\x00" . 'IEND' . "\xAE\x42\x60\x82";
+		$out .= "\x00\x00\x00\x00".'IEND'."\xAE\x42\x60\x82";
 
 		return $out;
 	}
@@ -698,7 +698,7 @@ 
 // 64-bit only functions?
 if (!function_exists('smf_crc32'))
 {
-	require_once $sourcedir . '/Subs-Compat.php';
+	require_once $sourcedir.'/Subs-Compat.php';
 }
 
 ?>
\ No newline at end of file

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(

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)
 	{

Spacing +5 added lines, -5 removed lines

@@ -114,7 +114,7 @@ 
 	 */
 	public function setInitKey($key)
 	{
-		if (preg_match('/^[' . implode('', array_keys($this->getLookup())) . ']+$/', $key) == false) {
+		if (preg_match('/^['.implode('', array_keys($this->getLookup())).']+$/', $key) == false) {
 			throw new \InvalidArgumentException('Invalid base32 hash!');
 		}
 		$this->initKey = $key;
@@ -249,7 +249,7 @@ 
 
 		$hash = hash_hmac(
 			'sha1',
-			pack('N*', 0) . pack('N*', $timestamp),
+			pack('N*', 0).pack('N*', $timestamp),
 			$initKey,
 			true
 		);
@@ -315,7 +315,7 @@ 
 	{
 		$lookup = $this->getLookup();
 
-		if (preg_match('/^[' . implode('', array_keys($lookup)) . ']+$/', $hash) == false) {
+		if (preg_match('/^['.implode('', array_keys($lookup)).']+$/', $hash) == false) {
 			throw new \InvalidArgumentException('Invalid base32 hash!');
 		}
 
@@ -347,8 +347,8 @@ 
 	 */
 	public function getQrCodeUrl($name, $code)
 	{
-		$urlencoded = urlencode('otpauth://totp/' . urlencode($name) . '?secret=' . $code);
-		return 'https://chart.googleapis.com/chart?chs=280x280&chld=M|0&cht=qr&chl=' . $urlencoded;
+		$urlencoded = urlencode('otpauth://totp/'.urlencode($name).'?secret='.$code);
+		return 'https://chart.googleapis.com/chart?chs=280x280&chld=M|0&cht=qr&chl='.$urlencoded;
 	}
 }
 

Braces +24 added lines, -12 removed lines

@@ -64,7 +64,8 @@ 
 	{
 		$this->buildLookup();
 
-		if ($initKey !== null) {
+		if ($initKey !== null)
+		{
 			$this->setInitKey($initKey);
 		}
 	}
@@ -98,7 +99,8 @@ 
 	 */
 	public function setRange($range)
 	{
-		if (!is_numeric($range)) {
+		if (!is_numeric($range))
+		{
 			throw new \InvalidArgumentException('Invalid window range');
 		}
 		$this->range = $range;
@@ -114,7 +116,8 @@ 
 	 */
 	public function setInitKey($key)
 	{
-		if (preg_match('/^[' . implode('', array_keys($this->getLookup())) . ']+$/', $key) == false) {
+		if (preg_match('/^[' . implode('', array_keys($this->getLookup())) . ']+$/', $key) == false)
+		{
 			throw new \InvalidArgumentException('Invalid base32 hash!');
 		}
 		$this->initKey = $key;
@@ -140,7 +143,8 @@ 
 	 */
 	public function setLookup($lookup)
 	{
-		if (!is_array($lookup)) {
+		if (!is_array($lookup))
+		{
 			throw new \InvalidArgumentException('Lookup value must be an array');
 		}
 		$this->lookup = $lookup;
@@ -176,7 +180,8 @@ 
 	 */
 	public function setRefresh($seconds)
 	{
-		if (!is_numeric($seconds)) {
+		if (!is_numeric($seconds))
+		{
 			throw new \InvalidArgumentException('Seconds must be numeric');
 		}
 		$this->refreshSeconds = $seconds;
@@ -217,7 +222,8 @@ 
 	 */
 	public function validateCode($code, $initKey = null, $timestamp = null, $range = null)
 	{
-		if (strlen($code) !== $this->getCodeLength()) {
+		if (strlen($code) !== $this->getCodeLength())
+		{
 			throw new \InvalidArgumentException('Incorrect code length');
 		}
 
@@ -227,8 +233,10 @@ 
 
 		$binary = $this->base32_decode($initKey);
 
-		for ($time = ($timestamp - $range); $time <= ($timestamp + $range); $time++) {
-			if ($this->generateOneTime($binary, $time) == $code) {
+		for ($time = ($timestamp - $range); $time <= ($timestamp + $range); $time++)
+		{
+			if ($this->generateOneTime($binary, $time) == $code)
+			{
 				return true;
 			}
 		}
@@ -269,7 +277,8 @@ 
 		$lookup = implode('', array_keys($this->getLookup()));
 		$code = '';
 
-		for ($i = 0; $i < $length; $i++) {
+		for ($i = 0; $i < $length; $i++)
+		{
 			$code .= $lookup[mt_rand(0, strlen($lookup) - 1)];
 		}
 
@@ -315,7 +324,8 @@ 
 	{
 		$lookup = $this->getLookup();
 
-		if (preg_match('/^[' . implode('', array_keys($lookup)) . ']+$/', $hash) == false) {
+		if (preg_match('/^[' . implode('', array_keys($lookup)) . ']+$/', $hash) == false)
+		{
 			throw new \InvalidArgumentException('Invalid base32 hash!');
 		}
 
@@ -324,12 +334,14 @@ 
 		$length = 0;
 		$binary = '';
 
-		for ($i = 0; $i < strlen($hash); $i++) {
+		for ($i = 0; $i < strlen($hash); $i++)
+		{
 			$buffer = $buffer << 5;
 			$buffer += $lookup[$hash[$i]];
 			$length += 5;
 
-			if ($length >= 8) {
+			if ($length >= 8)
+			{
 				$length -= 8;
 				$binary .= chr(($buffer & (0xFF << $length)) >> $length);
 			}

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')
 {

Spacing +37 added lines, -37 removed lines

@@ -54,7 +54,7 @@ 
 		'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);
+		$reservedTables[$k] = strtolower($db_prefix.$table_name);
 
 	// We in turn may need the extra stuff.
 	db_extend('extra');
@@ -127,8 +127,8 @@ 
 			$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_query']('', '
+				RENAME TABLE '. $table_name.' TO '.$table_name.'_old',
 				array(
 					'security_override' => true,
 				)
@@ -140,9 +140,9 @@ 
 	}
 
 	// Righty - let's do the damn thing!
-	$table_query = 'CREATE TABLE ' . $table_name . "\n" . '(';
+	$table_query = 'CREATE TABLE '.$table_name."\n".'(';
 	foreach ($columns as $column)
-		$table_query .= "\n\t" . smf_db_create_query_column($column) . ',';
+		$table_query .= "\n\t".smf_db_create_query_column($column).',';
 
 	// Loop through the indexes next...
 	foreach ($indexes as $index)
@@ -151,12 +151,12 @@ 
 
 		// Is it the primary?
 		if (isset($index['type']) && $index['type'] == 'primary')
-			$table_query .= "\n\t" . 'PRIMARY KEY (' . implode(',', $index['columns']) . '),';
+			$table_query .= "\n\t".'PRIMARY KEY ('.implode(',', $index['columns']).'),';
 		else
 		{
 			if (empty($index['name']))
 				$index['name'] = implode('_', $index['columns']);
-			$table_query .= "\n\t" . (isset($index['type']) && $index['type'] == 'unique' ? 'UNIQUE' : 'KEY') . ' ' . $index['name'] . ' (' . $columns . '),';
+			$table_query .= "\n\t".(isset($index['type']) && $index['type'] == 'unique' ? 'UNIQUE' : 'KEY').' '.$index['name'].' ('.$columns.'),';
 		}
 	}
 
@@ -186,7 +186,7 @@ 
 		$parameters['engine'] = in_array('InnoDB', $engines) ? 'InnoDB' : 'MyISAM';
 	}
 
-	$table_query .= ') ENGINE=' . $parameters['engine'];
+	$table_query .= ') ENGINE='.$parameters['engine'];
 	if (!empty($db_character_set) && $db_character_set == 'utf8')
 		$table_query .= ' DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci';
 
@@ -202,13 +202,13 @@ 
 	{
 		$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',
 				'schema' => $db_name,
@@ -220,16 +220,16 @@ 
 			$same_col[] = $row['column_name'];
 		}
 
-		$smcFunc['db_query']('','
-			INSERT INTO ' . $table_name .'('
-			. implode($same_col, ',') .
+		$smcFunc['db_query']('', '
+			INSERT INTO ' . $table_name.'('
+			. implode($same_col, ',').
 			')
-			SELECT '. implode($same_col, ',') . '
-			FROM ' . $table_name . '_old',
+			SELECT '. implode($same_col, ',').'
+			FROM ' . $table_name.'_old',
 			array()
 		);
 
-		$smcFunc['db_drop_table']($table_name . '_old');
+		$smcFunc['db_drop_table']($table_name.'_old');
 	}
 
 	return true;
@@ -261,7 +261,7 @@ 
 	// Does it exist?
 	if (in_array($full_table_name, $smcFunc['db_list_tables']()))
 	{
-		$query = 'DROP TABLE ' . $table_name;
+		$query = 'DROP TABLE '.$table_name;
 		$smcFunc['db_query']('',
 			$query,
 			array(
@@ -312,8 +312,8 @@ 
 
 	// Now add the thing!
 	$query = '
-		ALTER TABLE ' . $table_name . '
-		ADD ' . smf_db_create_query_column($column_info) . (empty($column_info['auto']) ? '' : ' primary key');
+		ALTER TABLE ' . $table_name.'
+		ADD ' . smf_db_create_query_column($column_info).(empty($column_info['auto']) ? '' : ' primary key');
 	$smcFunc['db_query']('', $query,
 		array(
 			'security_override' => true,
@@ -344,7 +344,7 @@ 
 		if ($column['name'] == $column_name)
 		{
 			$smcFunc['db_query']('', '
-				ALTER TABLE ' . $table_name . '
+				ALTER TABLE ' . $table_name.'
 				DROP COLUMN ' . $column_name,
 				array(
 					'security_override' => true,
@@ -405,13 +405,13 @@ 
 	$unsigned = in_array($type, array('int', 'tinyint', 'smallint', 'mediumint', 'bigint')) && !empty($column_info['unsigned']) ? 'unsigned ' : '';
 
 	if ($size !== null)
-		$type = $type . '(' . $size . ')';
+		$type = $type.'('.$size.')';
 
 	$smcFunc['db_query']('', '
-		ALTER TABLE ' . $table_name . '
-		CHANGE COLUMN `' . $old_column . '` `' . $column_info['name'] . '` ' . $type . ' ' . (!empty($unsigned) ? $unsigned : '') . (empty($column_info['null']) ? 'NOT NULL' : '') . ' ' .
-			(!isset($column_info['default']) ? '' : 'default \'' . $smcFunc['db_escape_string']($column_info['default']) . '\'') . ' ' .
-			(empty($column_info['auto']) ? '' : 'auto_increment') . ' ',
+		ALTER TABLE ' . $table_name.'
+		CHANGE COLUMN `' . $old_column.'` `'.$column_info['name'].'` '.$type.' '.(!empty($unsigned) ? $unsigned : '').(empty($column_info['null']) ? 'NOT NULL' : '').' '.
+			(!isset($column_info['default']) ? '' : 'default \''.$smcFunc['db_escape_string']($column_info['default']).'\'').' '.
+			(empty($column_info['auto']) ? '' : 'auto_increment').' ',
 		array(
 			'security_override' => true,
 		)
@@ -471,8 +471,8 @@ 
 	if (!empty($index_info['type']) && $index_info['type'] == 'primary')
 	{
 		$smcFunc['db_query']('', '
-			ALTER TABLE ' . $table_name . '
-			ADD PRIMARY KEY (' . $columns . ')',
+			ALTER TABLE ' . $table_name.'
+			ADD PRIMARY KEY (' . $columns.')',
 			array(
 				'security_override' => true,
 			)
@@ -481,8 +481,8 @@ 
 	else
 	{
 		$smcFunc['db_query']('', '
-			ALTER TABLE ' . $table_name . '
-			ADD ' . (isset($index_info['type']) && $index_info['type'] == 'unique' ? 'UNIQUE' : 'INDEX') . ' ' . $index_info['name'] . ' (' . $columns . ')',
+			ALTER TABLE ' . $table_name.'
+			ADD ' . (isset($index_info['type']) && $index_info['type'] == 'unique' ? 'UNIQUE' : 'INDEX').' '.$index_info['name'].' ('.$columns.')',
 			array(
 				'security_override' => true,
 			)
@@ -515,7 +515,7 @@ 
 		{
 			// Dropping primary key?
 			$smcFunc['db_query']('', '
-				ALTER TABLE ' . $table_name . '
+				ALTER TABLE ' . $table_name.'
 				DROP PRIMARY KEY',
 				array(
 					'security_override' => true,
@@ -528,7 +528,7 @@ 
 		{
 			// Drop the bugger...
 			$smcFunc['db_query']('', '
-				ALTER TABLE ' . $table_name . '
+				ALTER TABLE ' . $table_name.'
 				DROP INDEX ' . $index_name,
 				array(
 					'security_override' => true,
@@ -644,7 +644,7 @@ 
 		SHOW FIELDS
 		FROM {raw:table_name}',
 		array(
-			'table_name' => substr($table_name, 0, 1) == '`' ? $table_name : '`' . $table_name . '`',
+			'table_name' => substr($table_name, 0, 1) == '`' ? $table_name : '`'.$table_name.'`',
 		)
 	);
 	$columns = array();
@@ -712,7 +712,7 @@ 
 		SHOW KEYS
 		FROM {raw:table_name}',
 		array(
-			'table_name' => substr($table_name, 0, 1) == '`' ? $table_name : '`' . $table_name . '`',
+			'table_name' => substr($table_name, 0, 1) == '`' ? $table_name : '`'.$table_name.'`',
 		)
 	);
 	$indexes = array();
@@ -744,7 +744,7 @@ 
 
 			// Is it a partial index?
 			if (!empty($row['Sub_part']))
-				$indexes[$row['Key_name']]['columns'][] = $row['Column_name'] . '(' . $row['Sub_part'] . ')';
+				$indexes[$row['Key_name']]['columns'][] = $row['Column_name'].'('.$row['Sub_part'].')';
 			else
 				$indexes[$row['Key_name']]['columns'][] = $row['Column_name'];
 		}
@@ -770,7 +770,7 @@ 
 		$default = 'auto_increment';
 	}
 	elseif (isset($column['default']) && $column['default'] !== null)
-		$default = 'default \'' . $smcFunc['db_escape_string']($column['default']) . '\'';
+		$default = 'default \''.$smcFunc['db_escape_string']($column['default']).'\'';
 	else
 		$default = '';
 
@@ -782,10 +782,10 @@ 
 	$unsigned = in_array($type, array('int', 'tinyint', 'smallint', 'mediumint', 'bigint')) && !empty($column['unsigned']) ? 'unsigned ' : '';
 
 	if ($size !== null)
-		$type = $type . '(' . $size . ')';
+		$type = $type.'('.$size.')';
 
 	// Now just put it together!
-	return '`' . $column['name'] . '` ' . $type . ' ' . (!empty($unsigned) ? $unsigned : '') . (!empty($column['null']) ? '' : 'NOT NULL') . ' ' . $default;
+	return '`'.$column['name'].'` '.$type.' '.(!empty($unsigned) ? $unsigned : '').(!empty($column['null']) ? '' : 'NOT NULL').' '.$default;
 }
 
 ?>
\ No newline at end of file

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 +12 added lines, -12 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.');
@@ -83,11 +83,11 @@ 
 
 	// 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));
+		$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'];
+		$query_string .= ($query_string == '' ? 'board=' : ';board=').$_POST['board'];
 
 	// What types of categories do we have?
 	$known_error_types = array(
@@ -263,9 +263,9 @@ 
 		}
 
 		if (isset($array[$i]) && !empty($array[$i]['args']))
-			$file = realpath($settings['current_include_filename']) . ' (' . $array[$i]['args'][0] . ' sub template - eval?)';
+			$file = realpath($settings['current_include_filename']).' ('.$array[$i]['args'][0].' sub template - eval?)';
 		else
-			$file = realpath($settings['current_include_filename']) . ' (eval?)';
+			$file = realpath($settings['current_include_filename']).' (eval?)';
 	}
 
 	if (isset($db_show_debug) && $db_show_debug === true)
@@ -285,7 +285,7 @@ 
 
 	$error_type = stripos($error_string, 'undefined') !== false ? 'undefined_vars' : 'general';
 
-	$message = log_error($error_level . ': ' . $error_string, $error_type, $file, $line);
+	$message = log_error($error_level.': '.$error_string, $error_type, $file, $line);
 
 	// Let's give integrations a chance to ouput a bit differently
 	call_integration_hook('integrate_output_error', array($message, $error_type, $error_level, $file, $line));
@@ -337,7 +337,7 @@ 
 		$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 . '" ' : '';
+	$context['error_code'] = isset($error_code) ? 'id="'.$error_code.'" ' : '';
 
 	if (empty($context['page_title']))
 		$context['page_title'] = $context['error_title'];
@@ -419,7 +419,7 @@ 
 	global $mbname, $modSettings, $maintenance;
 	global $db_connection, $webmaster_email, $db_last_error, $db_error_send, $smcFunc, $sourcedir;
 
-	require_once($sourcedir . '/Logging.php');
+	require_once($sourcedir.'/Logging.php');
 	set_fatal_error_headers();
 
 	// For our purposes, we're gonna want this on if at all possible.
@@ -437,7 +437,7 @@ 
 
 		// Language files aren't loaded yet :(.
 		$db_error = @$smcFunc['db_error']($db_connection);
-		@mail($webmaster_email, $mbname . ': SMF Database Error!', 'There has been a problem with the database!' . ($db_error == '' ? '' : "\n" . $smcFunc['db_title'] . ' reported:' . "\n" . $db_error) . "\n\n" . 'This is a notice email to let you know that SMF could not connect to the database, contact your host if this continues.');
+		@mail($webmaster_email, $mbname.': SMF Database Error!', 'There has been a problem with the database!'.($db_error == '' ? '' : "\n".$smcFunc['db_title'].' reported:'."\n".$db_error)."\n\n".'This is a notice email to let you know that SMF could not connect to the database, contact your host if this continues.');
 	}
 
 	// What to do?  Language files haven't and can't be loaded yet...
@@ -495,7 +495,7 @@ 
 
 	// Don't cache this page!
 	header('expires: Mon, 26 Jul 1997 05:00:00 GMT');
-	header('last-modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+	header('last-modified: '.gmdate('D, d M Y H:i:s').' GMT');
 	header('cache-control: no-cache');
 
 	// Send the right error codes.
@@ -524,7 +524,7 @@ 
 	if (SMF == 'SSI' || SMF == 'BACKGROUND')
 		return;
 
-	$session_id = !empty($user_info['is_guest']) ? 'ip' . $user_info['ip'] : session_id();
+	$session_id = !empty($user_info['is_guest']) ? 'ip'.$user_info['ip'] : session_id();
 
 	// First, we have to get the online log, because we need to break apart the serialized string.
 	$request = $smcFunc['db_query']('', '
@@ -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;

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;
 }
 
 /**

Spacing +64 added lines, -64 removed lines

@@ -58,22 +58,22 @@ 
 		'tabs' => array(
 			'list' => array(
 				'description' => $txt['ban_description'],
-				'href' => $scripturl . '?action=admin;area=ban;sa=list',
+				'href' => $scripturl.'?action=admin;area=ban;sa=list',
 				'is_selected' => $_REQUEST['sa'] == 'list' || $_REQUEST['sa'] == 'edit' || $_REQUEST['sa'] == 'edittrigger',
 			),
 			'add' => array(
 				'description' => $txt['ban_description'],
-				'href' => $scripturl . '?action=admin;area=ban;sa=add',
+				'href' => $scripturl.'?action=admin;area=ban;sa=add',
 				'is_selected' => $_REQUEST['sa'] == 'add',
 			),
 			'browse' => array(
 				'description' => $txt['ban_trigger_browse_description'],
-				'href' => $scripturl . '?action=admin;area=ban;sa=browse',
+				'href' => $scripturl.'?action=admin;area=ban;sa=browse',
 				'is_selected' => $_REQUEST['sa'] == 'browse',
 			),
 			'log' => array(
 				'description' => $txt['ban_log_description'],
-				'href' => $scripturl . '?action=admin;area=ban;sa=log',
+				'href' => $scripturl.'?action=admin;area=ban;sa=log',
 				'is_selected' => $_REQUEST['sa'] == 'log',
 				'is_last' => true,
 			),
@@ -129,7 +129,7 @@ 
 		'id' => 'ban_list',
 		'title' => $txt['ban_title'],
 		'items_per_page' => $modSettings['defaultMaxListItems'],
-		'base_href' => $scripturl . '?action=admin;area=ban;sa=list',
+		'base_href' => $scripturl.'?action=admin;area=ban;sa=list',
 		'default_sort_col' => 'added',
 		'default_sort_dir' => 'desc',
 		'get_items' => array(
@@ -237,7 +237,7 @@ 
 				),
 				'data' => array(
 					'sprintf' => array(
-						'format' => '<a href="' . $scripturl . '?action=admin;area=ban;sa=edit;bg=%1$d">' . $txt['modify'] . '</a>',
+						'format' => '<a href="'.$scripturl.'?action=admin;area=ban;sa=edit;bg=%1$d">'.$txt['modify'].'</a>',
 						'params' => array(
 							'id_ban_group' => false,
 						),
@@ -262,16 +262,16 @@ 
 			),
 		),
 		'form' => array(
-			'href' => $scripturl . '?action=admin;area=ban;sa=list',
+			'href' => $scripturl.'?action=admin;area=ban;sa=list',
 		),
 		'additional_rows' => array(
 			array(
 				'position' => 'top_of_list',
-				'value' => '<input type="submit" name="removeBans" value="' . $txt['ban_remove_selected'] . '" class="button">',
+				'value' => '<input type="submit" name="removeBans" value="'.$txt['ban_remove_selected'].'" class="button">',
 			),
 			array(
 				'position' => 'bottom_of_list',
-				'value' => '<input type="submit" name="removeBans" value="' . $txt['ban_remove_selected'] . '" class="button">',
+				'value' => '<input type="submit" name="removeBans" value="'.$txt['ban_remove_selected'].'" class="button">',
 			),
 		),
 		'javascript' => '
@@ -283,15 +283,15 @@ 
 			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'].'");
 		});',
 	);
 
-	require_once($sourcedir . '/Subs-List.php');
+	require_once($sourcedir.'/Subs-List.php');
 	createList($listOptions);
 
 	$context['sub_template'] = 'show_list';
@@ -375,7 +375,7 @@ 
 	// Template needs this to show errors using javascript
 	loadLanguage('Errors');
 	createToken('admin-bet');
-	$context['form_url'] = $scripturl . '?action=admin;area=ban;sa=edit';
+	$context['form_url'] = $scripturl.'?action=admin;area=ban;sa=edit';
 
 	if (!empty($context['ban_errors']))
 		foreach ($context['ban_errors'] as $error)
@@ -389,11 +389,11 @@ 
 			$context['ban_group_id'] = $ban_group_id;
 
 			// We're going to want this for making our list.
-			require_once($sourcedir . '/Subs-List.php');
+			require_once($sourcedir.'/Subs-List.php');
 
 			$listOptions = array(
 				'id' => 'ban_items',
-				'base_href' => $scripturl . '?action=admin;area=ban;sa=edit;bg=' . $ban_group_id,
+				'base_href' => $scripturl.'?action=admin;area=ban;sa=edit;bg='.$ban_group_id,
 				'no_items_label' => $txt['ban_no_triggers'],
 				'items_per_page' => $modSettings['defaultMaxListItems'],
 				'get_items' => array(
@@ -418,11 +418,11 @@ 
 							'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']];
+									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'];
+									return '<strong>'.$txt['username'].':</strong>&nbsp;'.$ban_item['user']['link'];
 								else
-									return '<strong>' . $txt['unknown'] . ':</strong>&nbsp;' . $ban_item['no_bantype_selected'];
+									return '<strong>'.$txt['unknown'].':</strong>&nbsp;'.$ban_item['no_bantype_selected'];
 							},
 							'style' => 'text-align: left;',
 						),
@@ -445,7 +445,7 @@ 
 						'data' => array(
 							'function' => function($ban_item) use ($txt, $context, $scripturl)
 							{
-								return '<a href="' . $scripturl . '?action=admin;area=ban;sa=edittrigger;bg=' . $context['ban_group_id'] . ';bi=' . $ban_item['id'] . '">' . $txt['ban_edit_trigger'] . '</a>';
+								return '<a href="'.$scripturl.'?action=admin;area=ban;sa=edittrigger;bg='.$context['ban_group_id'].';bi='.$ban_item['id'].'">'.$txt['ban_edit_trigger'].'</a>';
 							},
 							'style' => 'text-align: center;',
 						),
@@ -467,34 +467,34 @@ 
 					),
 				),
 				'form' => array(
-					'href' => $scripturl . '?action=admin;area=ban;sa=edit;bg=' . $ban_group_id,
+					'href' => $scripturl.'?action=admin;area=ban;sa=edit;bg='.$ban_group_id,
 				),
 				'additional_rows' => array(
 					array(
 						'position' => 'above_table_headers',
 						'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(
 						'position' => 'above_table_headers',
 						'value' => '
-						<input type="hidden" name="bg" value="' . $ban_group_id . '">
-						<input type="hidden" name="' . $context['session_var'] . '" value="' . $context['session_id'] . '">
-						<input type="hidden" name="' . $context['admin-bet_token_var'] . '" value="' . $context['admin-bet_token'] . '">',
+						<input type="hidden" name="bg" value="' . $ban_group_id.'">
+						<input type="hidden" name="' . $context['session_var'].'" value="'.$context['session_id'].'">
+						<input type="hidden" name="' . $context['admin-bet_token_var'].'" value="'.$context['admin-bet_token'].'">',
 					),
 					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(
 						'position' => 'below_table_data',
 						'value' => '
-						<input type="hidden" name="bg" value="' . $ban_group_id . '">
-						<input type="hidden" name="' . $context['session_var'] . '" value="' . $context['session_id'] . '">
-						<input type="hidden" name="' . $context['admin-bet_token_var'] . '" value="' . $context['admin-bet_token'] . '">',
+						<input type="hidden" name="bg" value="' . $ban_group_id.'">
+						<input type="hidden" name="' . $context['session_var'].'" value="'.$context['session_id'].'">
+						<input type="hidden" name="' . $context['admin-bet_token_var'].'" value="'.$context['admin-bet_token'].'">',
 					),
 				),
 				'javascript' => '
@@ -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);
@@ -566,8 +566,8 @@ 
 
 				if (!empty($context['ban_suggestions']['member']['id']))
 				{
-					$context['ban_suggestions']['href'] = $scripturl . '?action=profile;u=' . $context['ban_suggestions']['member']['id'];
-					$context['ban_suggestions']['member']['link'] = '<a href="' . $context['ban_suggestions']['href'] . '">' . $context['ban_suggestions']['member']['name'] . '</a>';
+					$context['ban_suggestions']['href'] = $scripturl.'?action=profile;u='.$context['ban_suggestions']['member']['id'];
+					$context['ban_suggestions']['member']['link'] = '<a href="'.$context['ban_suggestions']['href'].'">'.$context['ban_suggestions']['member']['name'].'</a>';
 
 					// Default the ban name to the name of the banned member.
 					$context['ban']['name'] = $context['ban_suggestions']['member']['name'];
@@ -699,8 +699,8 @@ 
 				$ban_items[$row['id_ban']]['user'] = array(
 					'id' => $row['id_member'],
 					'name' => $row['real_name'],
-					'href' => $scripturl . '?action=profile;u=' . $row['id_member'],
-					'link' => '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>',
+					'href' => $scripturl.'?action=profile;u='.$row['id_member'],
+					'link' => '<a href="'.$scripturl.'?action=profile;u='.$row['id_member'].'">'.$row['real_name'].'</a>',
 				);
 			}
 			// Invalid ban (member probably doesn't exist anymore).
@@ -900,7 +900,7 @@ 
 
 	// Update the member table to represent the new ban situation.
 	updateBanMembers();
-	redirectexit('action=admin;area=ban;sa=edit;bg=' . $ban_group_id);
+	redirectexit('action=admin;area=ban;sa=edit;bg='.$ban_group_id);
 }
 
 /**
@@ -1033,8 +1033,8 @@ 
 				$ban_items[$row['id_ban']]['user'] = array(
 					'id' => $row['id_member'],
 					'name' => $row['real_name'],
-					'href' => $scripturl . '?action=profile;u=' . $row['id_member'],
-					'link' => '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>',
+					'href' => $scripturl.'?action=profile;u='.$row['id_member'],
+					'link' => '<a href="'.$scripturl.'?action=profile;u='.$row['id_member'].'">'.$row['real_name'].'</a>',
 				);
 				$log_info[] = array(
 					'bantype' => 'user',
@@ -1429,7 +1429,7 @@ 
 
 	// Log the addion of the ban entries into the moderation log.
 	foreach ($logs as $log)
-		logAction('ban' . ($removal == true ? 'remove' : ''), array(
+		logAction('ban'.($removal == true ? 'remove' : ''), array(
 			$log_name_map[$log['bantype']] => $log['value'],
 			'new' => empty($new) ? 0 : 1,
 			'remove' => empty($removal) ? 0 : 1,
@@ -1600,7 +1600,7 @@ 
 	global $context, $smcFunc, $scripturl;
 
 	$context['sub_template'] = 'ban_edit_trigger';
-	$context['form_url'] = $scripturl . '?action=admin;area=ban;sa=edittrigger';
+	$context['form_url'] = $scripturl.'?action=admin;area=ban;sa=edittrigger';
 
 	$ban_group = isset($_REQUEST['bg']) ? (int) $_REQUEST['bg'] : 0;
 	$ban_id = isset($_REQUEST['bi']) ? (int) $_REQUEST['bi'] : 0;
@@ -1611,7 +1611,7 @@ 
 	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 : ''));
+		redirectexit('action=admin;area=ban;sa=edit'.(!empty($ban_group) ? ';bg='.$ban_group : ''));
 	}
 	elseif (isset($_POST['edit_trigger']) && !empty($_POST['ban_suggestions']))
 	{
@@ -1620,12 +1620,12 @@ 
 		if (!empty($_POST['ban_suggestions']))
 			saveTriggers($_POST['ban_suggestions'], $ban_group);
 
-		redirectexit('action=admin;area=ban;sa=edit' . (!empty($ban_group) ? ';bg=' . $ban_group : ''));
+		redirectexit('action=admin;area=ban;sa=edit'.(!empty($ban_group) ? ';bg='.$ban_group : ''));
 	}
 	elseif (isset($_POST['edit_trigger']))
 	{
 		removeBanTriggers($ban_id);
-		redirectexit('action=admin;area=ban;sa=edit' . (!empty($ban_group) ? ';bg=' . $ban_group : ''));
+		redirectexit('action=admin;area=ban;sa=edit'.(!empty($ban_group) ? ';bg='.$ban_group : ''));
 	}
 
 	loadJavaScriptFile('suggest.js', array('minimize' => true), 'smf_suggest');
@@ -1734,7 +1734,7 @@ 
 		'id' => 'ban_trigger_list',
 		'title' => $txt['ban_trigger_browse'],
 		'items_per_page' => $modSettings['defaultMaxListItems'],
-		'base_href' => $scripturl . '?action=admin;area=ban;sa=browse;entity=' . $context['selected_entity'],
+		'base_href' => $scripturl.'?action=admin;area=ban;sa=browse;entity='.$context['selected_entity'],
 		'default_sort_col' => 'banned_entity',
 		'no_items_label' => $txt['ban_no_triggers'],
 		'get_items' => array(
@@ -1761,7 +1761,7 @@ 
 				),
 				'data' => array(
 					'sprintf' => array(
-						'format' => '<a href="' . $scripturl . '?action=admin;area=ban;sa=edit;bg=%1$d">%2$s</a>',
+						'format' => '<a href="'.$scripturl.'?action=admin;area=ban;sa=edit;bg=%1$d">%2$s</a>',
 						'params' => array(
 							'id_ban_group' => false,
 							'name' => false,
@@ -1802,18 +1802,18 @@ 
 			),
 		),
 		'form' => array(
-			'href' => $scripturl . '?action=admin;area=ban;sa=browse;entity=' . $context['selected_entity'],
+			'href' => $scripturl.'?action=admin;area=ban;sa=browse;entity='.$context['selected_entity'],
 			'include_start' => true,
 			'include_sort' => true,
 		),
 		'additional_rows' => array(
 			array(
 				'position' => 'above_column_headers',
-				'value' => '<a href="' . $scripturl . '?action=admin;area=ban;sa=browse;entity=ip">' . ($context['selected_entity'] == 'ip' ? '<img src="' . $settings['images_url'] . '/selected.png" alt="&gt;"> ' : '') . $txt['ip'] . '</a>&nbsp;|&nbsp;<a href="' . $scripturl . '?action=admin;area=ban;sa=browse;entity=hostname">' . ($context['selected_entity'] == 'hostname' ? '<img src="' . $settings['images_url'] . '/selected.png" alt="&gt;"> ' : '') . $txt['hostname'] . '</a>&nbsp;|&nbsp;<a href="' . $scripturl . '?action=admin;area=ban;sa=browse;entity=email">' . ($context['selected_entity'] == 'email' ? '<img src="' . $settings['images_url'] . '/selected.png" alt="&gt;"> ' : '') . $txt['email'] . '</a>&nbsp;|&nbsp;<a href="' . $scripturl . '?action=admin;area=ban;sa=browse;entity=member">' . ($context['selected_entity'] == 'member' ? '<img src="' . $settings['images_url'] . '/selected.png" alt="&gt;"> ' : '') . $txt['username'] . '</a>',
+				'value' => '<a href="'.$scripturl.'?action=admin;area=ban;sa=browse;entity=ip">'.($context['selected_entity'] == 'ip' ? '<img src="'.$settings['images_url'].'/selected.png" alt="&gt;"> ' : '').$txt['ip'].'</a>&nbsp;|&nbsp;<a href="'.$scripturl.'?action=admin;area=ban;sa=browse;entity=hostname">'.($context['selected_entity'] == 'hostname' ? '<img src="'.$settings['images_url'].'/selected.png" alt="&gt;"> ' : '').$txt['hostname'].'</a>&nbsp;|&nbsp;<a href="'.$scripturl.'?action=admin;area=ban;sa=browse;entity=email">'.($context['selected_entity'] == 'email' ? '<img src="'.$settings['images_url'].'/selected.png" alt="&gt;"> ' : '').$txt['email'].'</a>&nbsp;|&nbsp;<a href="'.$scripturl.'?action=admin;area=ban;sa=browse;entity=member">'.($context['selected_entity'] == 'member' ? '<img src="'.$settings['images_url'].'/selected.png" alt="&gt;"> ' : '').$txt['username'].'</a>',
 			),
 			array(
 				'position' => 'bottom_of_list',
-				'value' => '<input type="submit" name="remove_triggers" value="' . $txt['ban_remove_selected_triggers'] . '" data-confirm="' . $txt['ban_remove_selected_triggers_confirm'] . '" class="button you_sure">',
+				'value' => '<input type="submit" name="remove_triggers" value="'.$txt['ban_remove_selected_triggers'].'" data-confirm="'.$txt['ban_remove_selected_triggers_confirm'].'" class="button you_sure">',
 			),
 		),
 	);
@@ -1866,7 +1866,7 @@ 
 	{
 		$listOptions['columns']['banned_entity']['data'] = array(
 			'sprintf' => array(
-				'format' => '<a href="' . $scripturl . '?action=profile;u=%1$d">%2$s</a>',
+				'format' => '<a href="'.$scripturl.'?action=profile;u=%1$d">%2$s</a>',
 				'params' => array(
 					'id_member' => false,
 					'real_name' => false,
@@ -1880,7 +1880,7 @@ 
 	}
 
 	// Create the list.
-	require_once($sourcedir . '/Subs-List.php');
+	require_once($sourcedir.'/Subs-List.php');
 	createList($listOptions);
 
 	// The list is the only thing to show, so make it the default sub template.
@@ -1911,11 +1911,11 @@ 
 		SELECT
 			bi.id_ban, bi.ip_low, bi.ip_high, bi.hostname, bi.email_address, bi.hits,
 			bg.id_ban_group, bg.name' . ($trigger_type === 'member' ? ',
-			mem.id_member, mem.real_name' : '') . '
+			mem.id_member, mem.real_name' : '').'
 		FROM {db_prefix}ban_items AS bi
 			INNER JOIN {db_prefix}ban_groups AS bg ON (bg.id_ban_group = bi.id_ban_group)' . ($trigger_type === 'member' ? '
 			INNER JOIN {db_prefix}members AS mem ON (mem.id_member = bi.id_member)' : '
-		WHERE ' . $where[$trigger_type]) . '
+		WHERE ' . $where[$trigger_type]).'
 		ORDER BY {raw:sort}
 		LIMIT {int:start}, {int:max}',
 		array(
@@ -1997,7 +1997,7 @@ 
 		'id' => 'ban_log',
 		'title' => $txt['ban_log'],
 		'items_per_page' => $modSettings['defaultMaxListItems'],
-		'base_href' => $context['admin_area'] == 'ban' ? $scripturl . '?action=admin;area=ban;sa=log' : $scripturl . '?action=admin;area=logs;sa=banlog',
+		'base_href' => $context['admin_area'] == 'ban' ? $scripturl.'?action=admin;area=ban;sa=log' : $scripturl.'?action=admin;area=logs;sa=banlog',
 		'default_sort_col' => 'date',
 		'get_items' => array(
 			'function' => 'list_getBanLogEntries',
@@ -2013,7 +2013,7 @@ 
 				),
 				'data' => array(
 					'sprintf' => array(
-						'format' => '<a href="' . $scripturl . '?action=trackip;searchip=%1$s">%1$s</a>',
+						'format' => '<a href="'.$scripturl.'?action=trackip;searchip=%1$s">%1$s</a>',
 						'params' => array(
 							'ip' => false,
 						),
@@ -2042,7 +2042,7 @@ 
 				),
 				'data' => array(
 					'sprintf' => array(
-						'format' => '<a href="' . $scripturl . '?action=profile;u=%1$d">%2$s</a>',
+						'format' => '<a href="'.$scripturl.'?action=profile;u=%1$d">%2$s</a>',
 						'params' => array(
 							'id_member' => false,
 							'real_name' => false,
@@ -2086,7 +2086,7 @@ 
 			),
 		),
 		'form' => array(
-			'href' => $context['admin_area'] == 'ban' ? $scripturl . '?action=admin;area=ban;sa=log' : $scripturl . '?action=admin;area=logs;sa=banlog',
+			'href' => $context['admin_area'] == 'ban' ? $scripturl.'?action=admin;area=ban;sa=log' : $scripturl.'?action=admin;area=logs;sa=banlog',
 			'include_start' => true,
 			'include_sort' => true,
 			'token' => 'admin-bl',
@@ -2095,21 +2095,21 @@ 
 			array(
 				'position' => 'top_of_list',
 				'value' => '
-					<input type="submit" name="removeSelected" value="' . $txt['ban_log_remove_selected'] . '" data-confirm="' . $txt['ban_log_remove_selected_confirm'] . '" class="button you_sure">
-					<input type="submit" name="removeAll" value="' . $txt['ban_log_remove_all'] . '" data-confirm="' . $txt['ban_log_remove_all_confirm'] . '" class="button you_sure">',
+					<input type="submit" name="removeSelected" value="' . $txt['ban_log_remove_selected'].'" data-confirm="'.$txt['ban_log_remove_selected_confirm'].'" class="button you_sure">
+					<input type="submit" name="removeAll" value="' . $txt['ban_log_remove_all'].'" data-confirm="'.$txt['ban_log_remove_all_confirm'].'" class="button you_sure">',
 			),
 			array(
 				'position' => 'bottom_of_list',
 				'value' => '
-					<input type="submit" name="removeSelected" value="' . $txt['ban_log_remove_selected'] . '" data-confirm="' . $txt['ban_log_remove_selected_confirm'] . '" class="button you_sure">
-					<input type="submit" name="removeAll" value="' . $txt['ban_log_remove_all'] . '" data-confirm="' . $txt['ban_log_remove_all_confirm'] . '" class="button you_sure">',
+					<input type="submit" name="removeSelected" value="' . $txt['ban_log_remove_selected'].'" data-confirm="'.$txt['ban_log_remove_selected_confirm'].'" class="button you_sure">
+					<input type="submit" name="removeAll" value="' . $txt['ban_log_remove_all'].'" data-confirm="'.$txt['ban_log_remove_all_confirm'].'" class="button you_sure">',
 			),
 		),
 	);
 
 	createToken('admin-bl');
 
-	require_once($sourcedir . '/Subs-List.php');
+	require_once($sourcedir.'/Subs-List.php');
 	createList($listOptions);
 
 	$context['page_title'] = $txt['ban_log'];
@@ -2197,7 +2197,7 @@ 
 	if ($low == $high)
 	    return $low;
 	else
-	    return $low . '-' . $high;
+	    return $low.'-'.$high;
 }
 
 /**
@@ -2234,7 +2234,7 @@ 
 		list ($error_id_ban, $error_ban_name) = $smcFunc['db_fetch_row']($request);
 		fatal_lang_error('ban_trigger_already_exists', false, array(
 			$fullip,
-			'<a href="' . $scripturl . '?action=admin;area=ban;sa=edit;bg=' . $error_id_ban . '">' . $error_ban_name . '</a>',
+			'<a href="'.$scripturl.'?action=admin;area=ban;sa=edit;bg='.$error_id_ban.'">'.$error_ban_name.'</a>',
 		));
 	}
 	$smcFunc['db_free_result']($request);
@@ -2303,8 +2303,8 @@ 
 	$count = 0;
 	foreach ($memberEmailWild as $email)
 	{
-		$queryPart[] = 'mem.email_address LIKE {string:wild_' . $count . '}';
-		$queryValues['wild_' . $count++] = $email;
+		$queryPart[] = 'mem.email_address LIKE {string:wild_'.$count.'}';
+		$queryValues['wild_'.$count++] = $email;
 	}
 
 	// Find all banned members.

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
  */

Spacing +51 added lines, -51 removed lines

@@ -105,7 +105,7 @@ 
 				'dummy_currency' => array('select', 'paid_currency', array('usd' => $txt['usd'], 'eur' => $txt['eur'], 'gbp' => $txt['gbp'], 'cad' => $txt['cad'], 'aud' => $txt['aud'], 'other' => $txt['other']), 'javascript' => 'onchange="toggleOther();"'),
 				array('text', 'paid_currency_code', 'subtext' => $txt['paid_currency_code_desc'], 'size' => 5, 'force_div_id' => 'custom_currency_code_div'),
 				array('text', 'paid_currency_symbol', 'subtext' => $txt['paid_currency_symbol_desc'], 'size' => 8, 'force_div_id' => 'custom_currency_symbol_div'),
-				array('check', 'paidsubs_test', 'subtext' => $txt['paidsubs_test_desc'], 'onclick' => 'return document.getElementById(\'paidsubs_test\').checked ? confirm(\'' . $txt['paidsubs_test_confirm'] . '\') : true;'),
+				array('check', 'paidsubs_test', 'subtext' => $txt['paidsubs_test_desc'], 'onclick' => 'return document.getElementById(\'paidsubs_test\').checked ? confirm(\''.$txt['paidsubs_test_confirm'].'\') : true;'),
 		);
 
 		// Now load all the other gateway settings.
@@ -116,7 +116,7 @@ 
 			$setting_data = $gatewayClass->getGatewaySettings();
 			if (!empty($setting_data))
 			{
-				$config_vars[] = array('title', $gatewayClass->title, 'text_label' => (isset($txt['paidsubs_gateway_title_' . $gatewayClass->title]) ? $txt['paidsubs_gateway_title_' . $gatewayClass->title] : $gatewayClass->title));
+				$config_vars[] = array('title', $gatewayClass->title, 'text_label' => (isset($txt['paidsubs_gateway_title_'.$gatewayClass->title]) ? $txt['paidsubs_gateway_title_'.$gatewayClass->title] : $gatewayClass->title));
 				$config_vars = array_merge($config_vars, $setting_data);
 			}
 		}
@@ -170,14 +170,14 @@ 
 		return $config_vars;
 
 	// Get the settings template fired up.
-	require_once($sourcedir . '/ManageServer.php');
+	require_once($sourcedir.'/ManageServer.php');
 
 	// Some important context stuff
 	$context['page_title'] = $txt['settings'];
 	$context['sub_template'] = 'show_settings';
 
 	// Get the final touches in place.
-	$context['post_url'] = $scripturl . '?action=admin;area=paidsubscribe;save;sa=settings';
+	$context['post_url'] = $scripturl.'?action=admin;area=paidsubscribe;save;sa=settings';
 
 	// Saving the settings?
 	if (isset($_GET['save']))
@@ -200,7 +200,7 @@ 
 			);
 
 			// This may well affect the next trigger, whether we're enabling or not.
-			require_once($sourcedir . '/ScheduledTasks.php');
+			require_once($sourcedir.'/ScheduledTasks.php');
 			CalculateNextTrigger('paid_subscriptions');
 		}
 
@@ -224,7 +224,7 @@ 
 			if ($_POST['paid_currency'] != 'other')
 			{
 				$_POST['paid_currency_code'] = $_POST['paid_currency'];
-				$_POST['paid_currency_symbol'] = $txt[$_POST['paid_currency'] . '_symbol'];
+				$_POST['paid_currency_symbol'] = $txt[$_POST['paid_currency'].'_symbol'];
 			}
 			unset($config_vars['dummy_currency']);
 		}
@@ -250,7 +250,7 @@ 
 
 	// 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');
+		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'];
@@ -260,7 +260,7 @@ 
 		'id' => 'subscription_list',
 		'title' => $txt['subscriptions'],
 		'items_per_page' => $modSettings['defaultMaxListItems'],
-		'base_href' => $scripturl . '?action=admin;area=paidsubscribe;sa=view',
+		'base_href' => $scripturl.'?action=admin;area=paidsubscribe;sa=view',
 		'get_items' => array(
 			'function' => function($start, $items_per_page) use ($context)
 			{
@@ -307,7 +307,7 @@ 
 				'data' => array(
 					'function' => function($rowData) use ($txt)
 					{
-						return $rowData['flexible'] ? '<em>' . $txt['flexible'] . '</em>' : $rowData['cost'] . ' / ' . $rowData['length'];
+						return $rowData['flexible'] ? '<em>'.$txt['flexible'].'</em>' : $rowData['cost'].' / '.$rowData['length'];
 					},
 				),
 			),
@@ -350,7 +350,7 @@ 
 				'data' => array(
 					'function' => function($rowData) use ($txt)
 					{
-						return '<span style="color: ' . ($rowData['active'] ? 'green' : 'red') . '">' . ($rowData['active'] ? $txt['yes'] : $txt['no']) . '</span>';
+						return '<span style="color: '.($rowData['active'] ? 'green' : 'red').'">'.($rowData['active'] ? $txt['yes'] : $txt['no']).'</span>';
 					},
 					'class' => 'centercol',
 				),
@@ -359,7 +359,7 @@ 
 				'data' => array(
 					'function' => function($rowData) use ($txt, $scripturl)
 					{
-						return '<a href="' . $scripturl . '?action=admin;area=paidsubscribe;sa=modify;sid=' . $rowData['id'] . '">' . $txt['modify'] . '</a>';
+						return '<a href="'.$scripturl.'?action=admin;area=paidsubscribe;sa=modify;sid='.$rowData['id'].'">'.$txt['modify'].'</a>';
 					},
 					'class' => 'centercol',
 				),
@@ -368,28 +368,28 @@ 
 				'data' => array(
 					'function' => function($rowData) use ($scripturl, $txt)
 					{
-						return '<a href="' . $scripturl . '?action=admin;area=paidsubscribe;sa=modify;delete;sid=' . $rowData['id'] . '">' . $txt['delete'] . '</a>';
+						return '<a href="'.$scripturl.'?action=admin;area=paidsubscribe;sa=modify;delete;sid='.$rowData['id'].'">'.$txt['delete'].'</a>';
 					},
 					'class' => 'centercol',
 				),
 			),
 		),
 		'form' => array(
-			'href' => $scripturl . '?action=admin;area=paidsubscribe;sa=modify',
+			'href' => $scripturl.'?action=admin;area=paidsubscribe;sa=modify',
 		),
 		'additional_rows' => array(
 			array(
 				'position' => 'above_table_headers',
-				'value' => '<input type="submit" name="add" value="' . $txt['paid_add_subscription'] . '" class="button">',
+				'value' => '<input type="submit" name="add" value="'.$txt['paid_add_subscription'].'" class="button">',
 			),
 			array(
 				'position' => 'below_table_data',
-				'value' => '<input type="submit" name="add" value="' . $txt['paid_add_subscription'] . '" class="button">',
+				'value' => '<input type="submit" name="add" value="'.$txt['paid_add_subscription'].'" class="button">',
 			),
 		),
 	);
 
-	require_once($sourcedir . '/Subs-List.php');
+	require_once($sourcedir.'/Subs-List.php');
 	createList($listOptions);
 
 	$context['sub_template'] = 'show_list';
@@ -409,7 +409,7 @@ 
 
 	// Setup the template.
 	$context['sub_template'] = $context['action_type'] == 'delete' ? 'delete_subscription' : 'modify_subscription';
-	$context['page_title'] = $txt['paid_' . $context['action_type'] . '_subscription'];
+	$context['page_title'] = $txt['paid_'.$context['action_type'].'_subscription'];
 
 	// Delete it?
 	if (isset($_POST['delete_confirm']) && isset($_REQUEST['delete']))
@@ -537,10 +537,10 @@ 
 				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);
+				fatal_lang_error('paid_invalid_duration_'.$_POST['span_unit'], false);
 
 			// Clean the span.
-			$span = $_POST['span_value'] . $_POST['span_unit'];
+			$span = $_POST['span_value'].$_POST['span_unit'];
 
 			// Sort out the cost.
 			$cost = array('fixed' => sprintf('%01.2f', strtr($_POST['cost'], ',', '.')));
@@ -616,7 +616,7 @@ 
 				UPDATE {db_prefix}subscriptions
 					SET name = SUBSTRING({string:name}, 1, 60), description = SUBSTRING({string:description}, 1, 255), active = {int:is_active},
 					length = SUBSTRING({string:length}, 1, 4), cost = {string:cost}' . ($disableGroups ? '' : ', id_group = {int:id_group},
-					add_groups = {string:additional_groups}') . ', repeatable = {int:repeatable}, allow_partial = {int:allow_partial},
+					add_groups = {string:additional_groups}').', repeatable = {int:repeatable}, allow_partial = {int:allow_partial},
 					email_complete = {string:email_complete}, reminder = {int:reminder}
 				WHERE id_subscribe = {int:current_subscription}',
 				array(
@@ -792,13 +792,13 @@ 
 
 	// Are we searching for people?
 	$search_string = isset($_POST['ssearch']) && !empty($_POST['sub_search']) ? ' AND COALESCE(mem.real_name, {string:guest}) LIKE {string:search}' : '';
-	$search_vars = empty($_POST['sub_search']) ? array() : array('search' => '%' . $_POST['sub_search'] . '%', 'guest' => $txt['guest']);
+	$search_vars = empty($_POST['sub_search']) ? array() : array('search' => '%'.$_POST['sub_search'].'%', 'guest' => $txt['guest']);
 
 	$listOptions = array(
 		'id' => 'subscribed_users_list',
 		'title' => sprintf($txt['view_users_subscribed'], $row['name']),
 		'items_per_page' => $modSettings['defaultMaxListItems'],
-		'base_href' => $scripturl . '?action=admin;area=paidsubscribe;sa=viewsub;sid=' . $context['sub_id'],
+		'base_href' => $scripturl.'?action=admin;area=paidsubscribe;sa=viewsub;sid='.$context['sub_id'],
 		'default_sort_col' => 'name',
 		'get_items' => array(
 			'function' => 'list_getSubscribedUsers',
@@ -826,7 +826,7 @@ 
 				'data' => array(
 					'function' => function($rowData) use ($scripturl, $txt)
 					{
-						return $rowData['id_member'] == 0 ? $txt['guest'] : '<a href="' . $scripturl . '?action=profile;u=' . $rowData['id_member'] . '">' . $rowData['name'] . '</a>';
+						return $rowData['id_member'] == 0 ? $txt['guest'] : '<a href="'.$scripturl.'?action=profile;u='.$rowData['id_member'].'">'.$rowData['name'].'</a>';
 					},
 				),
 				'sort' => array(
@@ -896,7 +896,7 @@ 
 				'data' => array(
 					'function' => function($rowData) use ($scripturl, $txt)
 					{
-						return '<a href="' . $scripturl . '?action=admin;area=paidsubscribe;sa=modifyuser;lid=' . $rowData['id'] . '">' . $txt['modify'] . '</a>';
+						return '<a href="'.$scripturl.'?action=admin;area=paidsubscribe;sa=modifyuser;lid='.$rowData['id'].'">'.$txt['modify'].'</a>';
 					},
 					'class' => 'centercol',
 				),
@@ -909,29 +909,29 @@ 
 				'data' => array(
 					'function' => function($rowData)
 					{
-						return '<input type="checkbox" name="delsub[' . $rowData['id'] . ']">';
+						return '<input type="checkbox" name="delsub['.$rowData['id'].']">';
 					},
 					'class' => 'centercol',
 				),
 			),
 		),
 		'form' => array(
-			'href' => $scripturl . '?action=admin;area=paidsubscribe;sa=modifyuser;sid=' . $context['sub_id'],
+			'href' => $scripturl.'?action=admin;area=paidsubscribe;sa=modifyuser;sid='.$context['sub_id'],
 		),
 		'additional_rows' => array(
 			array(
 				'position' => 'below_table_data',
 				'value' => '
-					<input type="submit" name="add" value="' . $txt['add_subscriber'] . '" class="button">
-					<input type="submit" name="finished" value="' . $txt['complete_selected'] . '" data-confirm="' . $txt['complete_are_sure'] . '" class="button you_sure">
-					<input type="submit" name="delete" value="' . $txt['delete_selected'] . '" data-confirm="' . $txt['delete_are_sure'] . '" class="button you_sure">
+					<input type="submit" name="add" value="' . $txt['add_subscriber'].'" class="button">
+					<input type="submit" name="finished" value="' . $txt['complete_selected'].'" data-confirm="'.$txt['complete_are_sure'].'" class="button you_sure">
+					<input type="submit" name="delete" value="' . $txt['delete_selected'].'" data-confirm="'.$txt['delete_are_sure'].'" class="button you_sure">
 				',
 			),
 			array(
 				'position' => 'top_of_list',
 				'value' => '
 					<div class="flow_auto">
-						<input type="submit" name="ssearch" value="' . $txt['search_sub'] . '" class="button" style="margin-top: 3px;">
+						<input type="submit" name="ssearch" value="' . $txt['search_sub'].'" class="button" style="margin-top: 3px;">
 						<input type="text" name="sub_search" value="" class="floatright">
 					</div>
 				',
@@ -939,7 +939,7 @@ 
 		),
 	);
 
-	require_once($sourcedir . '/Subs-List.php');
+	require_once($sourcedir.'/Subs-List.php');
 	createList($listOptions);
 
 	$context['sub_template'] = 'show_list';
@@ -964,7 +964,7 @@ 
 		SELECT COUNT(*) AS total_subs
 		FROM {db_prefix}log_subscribed AS ls
 			LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = ls.id_member)
-		WHERE ls.id_subscribe = {int:current_subscription} ' . $search_string . '
+		WHERE ls.id_subscribe = {int:current_subscription} ' . $search_string.'
 			AND (ls.end_time != {int:no_end_time} OR ls.payments_pending != {int:no_pending_payments})',
 		array_merge($search_vars, array(
 			'current_subscription' => $id_sub,
@@ -999,7 +999,7 @@ 
 			ls.status, ls.payments_pending
 		FROM {db_prefix}log_subscribed AS ls
 			LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = ls.id_member)
-		WHERE ls.id_subscribe = {int:current_subscription} ' . $search_string . '
+		WHERE ls.id_subscribe = {int:current_subscription} ' . $search_string.'
 			AND (ls.end_time != {int:no_end_time} OR ls.payments_pending != {int:no_payments_pending})
 		ORDER BY {raw:sort}
 		LIMIT {int:start}, {int:max}',
@@ -1046,7 +1046,7 @@ 
 
 	// Setup the template.
 	$context['sub_template'] = 'modify_user_subscription';
-	$context['page_title'] = $txt[$context['action_type'] . '_subscriber'];
+	$context['page_title'] = $txt[$context['action_type'].'_subscriber'];
 
 	// If we haven't been passed the subscription ID get it.
 	if ($context['log_id'] && !$context['sub_id'])
@@ -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,
@@ -1181,7 +1181,7 @@ 
 		}
 
 		// Done - redirect...
-		redirectexit('action=admin;area=paidsubscribe;sa=viewsub;sid=' . $context['sub_id']);
+		redirectexit('action=admin;area=paidsubscribe;sa=viewsub;sid='.$context['sub_id']);
 	}
 	// Deleting?
 	elseif (isset($_REQUEST['delete']) || isset($_REQUEST['finished']))
@@ -1207,7 +1207,7 @@ 
 				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']);
+		redirectexit('action=admin;area=paidsubscribe;sa=viewsub;sid='.$context['sub_id']);
 	}
 
 	// Default attributes.
@@ -1220,7 +1220,7 @@ 
 				'month' => (int) strftime('%m', time()),
 				'day' => (int) strftime('%d', time()),
 				'hour' => (int) strftime('%H', time()),
-				'min' => (int) strftime('%M', time()) < 10 ? '0' . (int) strftime('%M', time()) : (int) strftime('%M', time()),
+				'min' => (int) strftime('%M', time()) < 10 ? '0'.(int) strftime('%M', time()) : (int) strftime('%M', time()),
 				'last_day' => 0,
 			),
 			'end' => array(
@@ -1228,7 +1228,7 @@ 
 				'month' => (int) strftime('%m', time()),
 				'day' => (int) strftime('%d', time()),
 				'hour' => (int) strftime('%H', time()),
-				'min' => (int) strftime('%M', time()) < 10 ? '0' . (int) strftime('%M', time()) : (int) strftime('%M', time()),
+				'min' => (int) strftime('%M', time()) < 10 ? '0'.(int) strftime('%M', time()) : (int) strftime('%M', time()),
 				'last_day' => 0,
 			),
 			'status' => 1,
@@ -1291,7 +1291,7 @@ 
 						{
 							if ($cost != 0 && $cost == $pending[1] && $duration == $pending[2])
 								$context['pending_payments'][$id] = array(
-									'desc' => sprintf($modSettings['paid_currency_symbol'], $cost . '/' . $txt[$duration]),
+									'desc' => sprintf($modSettings['paid_currency_symbol'], $cost.'/'.$txt[$duration]),
 								);
 						}
 					}
@@ -1331,7 +1331,7 @@ 
 						);
 
 						// Reload
-						redirectexit('action=admin;area=paidsubscribe;sa=modifyuser;lid=' . $context['log_id']);
+						redirectexit('action=admin;area=paidsubscribe;sa=modifyuser;lid='.$context['log_id']);
 					}
 				}
 			}
@@ -1345,7 +1345,7 @@ 
 				'month' => (int) strftime('%m', $row['start_time']),
 				'day' => (int) strftime('%d', $row['start_time']),
 				'hour' => (int) strftime('%H', $row['start_time']),
-				'min' => (int) strftime('%M', $row['start_time']) < 10 ? '0' . (int) strftime('%M', $row['start_time']) : (int) strftime('%M', $row['start_time']),
+				'min' => (int) strftime('%M', $row['start_time']) < 10 ? '0'.(int) strftime('%M', $row['start_time']) : (int) strftime('%M', $row['start_time']),
 				'last_day' => 0,
 			),
 			'end' => array(
@@ -1353,7 +1353,7 @@ 
 				'month' => (int) strftime('%m', $row['end_time']),
 				'day' => (int) strftime('%d', $row['end_time']),
 				'hour' => (int) strftime('%H', $row['end_time']),
-				'min' => (int) strftime('%M', $row['end_time']) < 10 ? '0' . (int) strftime('%M', $row['end_time']) : (int) strftime('%M', $row['end_time']),
+				'min' => (int) strftime('%M', $row['end_time']) < 10 ? '0'.(int) strftime('%M', $row['end_time']) : (int) strftime('%M', $row['end_time']),
 				'last_day' => 0,
 			),
 			'status' => $row['status'],
@@ -1857,7 +1857,7 @@ 
 		if (isset($match[2]))
 		{
 			$num_length = $match[1];
-			$length = $match[1] . ' ';
+			$length = $match[1].' ';
 			switch ($match[2])
 			{
 				case 'D':
@@ -1952,24 +1952,24 @@ 
 	{
 		while (($file = readdir($dh)) !== false)
 		{
-			if (is_file($sourcedir . '/' . $file) && preg_match('~^Subscriptions-([A-Za-z\d]+)\.php$~', $file, $matches))
+			if (is_file($sourcedir.'/'.$file) && preg_match('~^Subscriptions-([A-Za-z\d]+)\.php$~', $file, $matches))
 			{
 				// Check this is definitely a valid gateway!
-				$fp = fopen($sourcedir . '/' . $file, 'rb');
+				$fp = fopen($sourcedir.'/'.$file, 'rb');
 				$header = fread($fp, 4096);
 				fclose($fp);
 
-				if (strpos($header, '// SMF Payment Gateway: ' . strtolower($matches[1])) !== false)
+				if (strpos($header, '// SMF Payment Gateway: '.strtolower($matches[1])) !== false)
 				{
-					require_once($sourcedir . '/' . $file);
+					require_once($sourcedir.'/'.$file);
 
 					$gateways[] = array(
 						'filename' => $file,
 						'code' => strtolower($matches[1]),
 						// Don't need anything snazzier than this yet.
-						'valid_version' => class_exists(strtolower($matches[1]) . '_payment') && class_exists(strtolower($matches[1]) . '_display'),
-						'payment_class' => strtolower($matches[1]) . '_payment',
-						'display_class' => strtolower($matches[1]) . '_display',
+						'valid_version' => class_exists(strtolower($matches[1]).'_payment') && class_exists(strtolower($matches[1]).'_display'),
+						'payment_class' => strtolower($matches[1]).'_payment',
+						'display_class' => strtolower($matches[1]).'_display',
 					);
 				}
 			}

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')
 {

Spacing +155 added lines, -155 removed lines

@@ -33,7 +33,7 @@ 
 	isAllowedTo('pm_read');
 
 	// This file contains the basic functions for sending a PM.
-	require_once($sourcedir . '/Subs-Post.php');
+	require_once($sourcedir.'/Subs-Post.php');
 
 	loadLanguage('PersonalMessage+Drafts');
 
@@ -43,7 +43,7 @@ 
 	// 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)
+	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']('', '
@@ -60,7 +60,7 @@ 
 		$context['message_limit'] = $minMessage == 0 ? 0 : $maxMessage;
 
 		// Save us doing it again!
-		cache_put_data('msgLimit:' . $user_info['id'], $context['message_limit'], 360);
+		cache_put_data('msgLimit:'.$user_info['id'], $context['message_limit'], 360);
 	}
 
 	// Prepare the context for the capacity bar.
@@ -84,7 +84,7 @@ 
 	$context['labels'] = array();
 
 	// Load the label data.
-	if ($user_settings['new_pm'] || ($context['labels'] = cache_get_data('labelCounts:' . $user_info['id'], 720)) === null)
+	if ($user_settings['new_pm'] || ($context['labels'] = cache_get_data('labelCounts:'.$user_info['id'], 720)) === null)
 	{
 		// Looks like we need to reseek!
 
@@ -145,7 +145,7 @@ 
 		$smcFunc['db_free_result']($result);
 
 		// Store it please!
-		cache_put_data('labelCounts:' . $user_info['id'], $context['labels'], 720);
+		cache_put_data('labelCounts:'.$user_info['id'], $context['labels'], 720);
 	}
 
 	// Now we have the labels, and assuming we have unsorted mail, apply our rules!
@@ -173,7 +173,7 @@ 
 	$context['folder'] = !isset($_REQUEST['f']) || $_REQUEST['f'] != 'sent' ? 'inbox' : 'sent';
 
 	// This is convenient.  Do you know how annoying it is to do this every time?!
-	$context['current_label_redirect'] = 'action=pm;f=' . $context['folder'] . (isset($_GET['start']) ? ';start=' . $_GET['start'] : '') . (isset($_REQUEST['l']) ? ';l=' . $_REQUEST['l'] : '');
+	$context['current_label_redirect'] = 'action=pm;f='.$context['folder'].(isset($_GET['start']) ? ';start='.$_GET['start'] : '').(isset($_REQUEST['l']) ? ';l='.$_REQUEST['l'] : '');
 	$context['can_issue_warning'] = allowedTo('issue_warning') && $modSettings['warning_settings'][0] == 1;
 
 	// Are PM drafts enabled?
@@ -182,7 +182,7 @@ 
 
 	// Build the linktree for all the actions...
 	$context['linktree'][] = array(
-		'url' => $scripturl . '?action=pm',
+		'url' => $scripturl.'?action=pm',
 		'name' => $txt['personal_messages']
 	);
 
@@ -235,23 +235,23 @@ 
 			'areas' => array(
 				'inbox' => array(
 					'label' => $txt['inbox'],
-					'custom_url' => $scripturl . '?action=pm',
+					'custom_url' => $scripturl.'?action=pm',
 					'amt' => 0,
 				),
 				'send' => array(
 					'label' => $txt['new_message'],
-					'custom_url' => $scripturl . '?action=pm;sa=send',
+					'custom_url' => $scripturl.'?action=pm;sa=send',
 					'permission' => 'pm_send',
 					'amt' => 0,
 				),
 				'sent' => array(
 					'label' => $txt['sent_items'],
-					'custom_url' => $scripturl . '?action=pm;f=sent',
+					'custom_url' => $scripturl.'?action=pm;f=sent',
 					'amt' => 0,
 				),
 				'drafts' => array(
 					'label' => $txt['drafts_show'],
-					'custom_url' => $scripturl . '?action=pm;sa=showpmdrafts',
+					'custom_url' => $scripturl.'?action=pm;sa=showpmdrafts',
 					'permission' => 'pm_draft',
 					'enabled' => !empty($modSettings['drafts_pm_enabled']),
 					'amt' => 0,
@@ -269,11 +269,11 @@ 
 			'areas' => array(
 				'search' => array(
 					'label' => $txt['pm_search_bar_title'],
-					'custom_url' => $scripturl . '?action=pm;sa=search',
+					'custom_url' => $scripturl.'?action=pm;sa=search',
 				),
 				'prune' => array(
 					'label' => $txt['pm_prune'],
-					'custom_url' => $scripturl . '?action=pm;sa=prune'
+					'custom_url' => $scripturl.'?action=pm;sa=prune'
 				),
 			),
 		),
@@ -282,15 +282,15 @@ 
 			'areas' => array(
 				'manlabels' => array(
 					'label' => $txt['pm_manage_labels'],
-					'custom_url' => $scripturl . '?action=pm;sa=manlabels',
+					'custom_url' => $scripturl.'?action=pm;sa=manlabels',
 				),
 				'manrules' => array(
 					'label' => $txt['pm_manage_rules'],
-					'custom_url' => $scripturl . '?action=pm;sa=manrules',
+					'custom_url' => $scripturl.'?action=pm;sa=manrules',
 				),
 				'settings' => array(
 					'label' => $txt['pm_settings'],
-					'custom_url' => $scripturl . '?action=pm;sa=settings',
+					'custom_url' => $scripturl.'?action=pm;sa=settings',
 				),
 			),
 		),
@@ -311,9 +311,9 @@ 
 			$pm_areas['labels']['amt'] += $label['unread_messages'];
 
 			// Add the label to the menu.
-			$pm_areas['labels']['areas']['label' . $label['id']] = array(
+			$pm_areas['labels']['areas']['label'.$label['id']] = array(
 				'label' => $label['name'],
-				'custom_url' => $scripturl . '?action=pm;l=' . $label['id'],
+				'custom_url' => $scripturl.'?action=pm;l='.$label['id'],
 				'amt' => $label['unread_messages'],
 				'unread_messages' => $label['unread_messages'],
 				'messages' => $label['messages'],
@@ -343,7 +343,7 @@ 
 		);
 	}
 
-	require_once($sourcedir . '/Subs-Menu.php');
+	require_once($sourcedir.'/Subs-Menu.php');
 
 	// Set a few options for the menu.
 	$menuOptions = array(
@@ -361,7 +361,7 @@ 
 
 	// Make a note of the Unique ID for this menu.
 	$context['pm_menu_id'] = $context['max_menu_id'];
-	$context['pm_menu_name'] = 'menu_data_' . $context['pm_menu_id'];
+	$context['pm_menu_name'] = 'menu_data_'.$context['pm_menu_id'];
 
 	// Set the selected item.
 	$current_area = $pm_include_data['current_area'];
@@ -436,7 +436,7 @@ 
 
 			$row['replied_to_you'] = $row['id_pm'] != $row['id_pm_head'];
 			$row['time'] = timeformat($row['timestamp']);
-			$row['pm_link'] = '<a href="' . $scripturl . '?action=pm;f=inbox;pmsg=' . $row['id_pm'] . '">' . $row['subject'] . '</a>';
+			$row['pm_link'] = '<a href="'.$scripturl.'?action=pm;f=inbox;pmsg='.$row['id_pm'].'">'.$row['subject'].'</a>';
 			$context['unread_pms'][$row['id_pm']] = $row;
 		}
 		$smcFunc['db_free_result']($request);
@@ -489,7 +489,7 @@ 
 
 		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; ' : '') . '}');
+	.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 = '';
@@ -512,7 +512,7 @@ 
 	}
 
 	// Set the index bar correct!
-	messageIndexBar($context['current_label_id'] == -1 ? $context['folder'] : 'label' . $context['current_label_id']);
+	messageIndexBar($context['current_label_id'] == -1 ? $context['folder'] : 'label'.$context['current_label_id']);
 
 	// Sorting the folder.
 	$sort_methods = array(
@@ -546,21 +546,21 @@ 
 	// Now, build the link tree!
 	if ($context['current_label_id'] == -1)
 		$context['linktree'][] = array(
-			'url' => $scripturl . '?action=pm;f=' . $context['folder'],
+			'url' => $scripturl.'?action=pm;f='.$context['folder'],
 			'name' => $pmbox
 		);
 
 	// Build it further for a label.
 	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']
+			'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']('', '
-			SELECT COUNT(' . ($context['display_mode'] == 2 ? 'DISTINCT pm.id_pm_head' : '*') . ')
+			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}
 				AND pm.deleted_by_sender = {int:not_deleted}',
@@ -571,11 +571,11 @@ 
 		);
 	else
 		$request = $smcFunc['db_query']('', '
-			SELECT COUNT(' . ($context['display_mode'] == 2 ? 'DISTINCT pm.id_pm_head' : '*') . ')
+			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 . '
+				INNER JOIN {db_prefix}personal_messages AS pm ON (pm.id_pm = pmr.id_pm)' : '').$labelJoin.'
 			WHERE pmr.id_member = {int:current_member}
-				AND pmr.deleted = {int:not_deleted}' . $labelQuery . $labelQuery2,
+				AND pmr.deleted = {int:not_deleted}' . $labelQuery.$labelQuery2,
 			array(
 				'current_member' => $user_info['id'],
 				'not_deleted' => 0,
@@ -613,11 +613,11 @@ 
 		{
 			if ($context['folder'] == 'sent')
 				$request = $smcFunc['db_query']('', '
-					SELECT COUNT(' . ($context['display_mode'] == 2 ? 'DISTINCT pm.id_pm_head' : '*') . ')
+					SELECT COUNT(' . ($context['display_mode'] == 2 ? 'DISTINCT pm.id_pm_head' : '*').')
 					FROM {db_prefix}personal_messages
 					WHERE id_member_from = {int:current_member}
 						AND deleted_by_sender = {int:not_deleted}
-						AND id_pm ' . ($descending ? '>' : '<') . ' {int:id_pm}',
+						AND id_pm ' . ($descending ? '>' : '<').' {int:id_pm}',
 					array(
 						'current_member' => $user_info['id'],
 						'not_deleted' => 0,
@@ -626,12 +626,12 @@ 
 				);
 			else
 				$request = $smcFunc['db_query']('', '
-					SELECT COUNT(' . ($context['display_mode'] == 2 ? 'DISTINCT pm.id_pm_head' : '*') . ')
+					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 . '
+						INNER JOIN {db_prefix}personal_messages AS pm ON (pm.id_pm = pmr.id_pm)' : '').$labelJoin.'
 					WHERE pmr.id_member = {int:current_member}
-						AND pmr.deleted = {int:not_deleted}' . $labelQuery . $labelQuery2 . '
-						AND pmr.id_pm ' . ($descending ? '>' : '<') . ' {int:id_pm}',
+						AND pmr.deleted = {int:not_deleted}' . $labelQuery.$labelQuery2.'
+						AND pmr.id_pm ' . ($descending ? '>' : '<').' {int:id_pm}',
 					array(
 						'current_member' => $user_info['id'],
 						'not_deleted' => 0,
@@ -657,15 +657,15 @@ 
 	}
 
 	// Set up the page index.
-	$context['page_index'] = constructPageIndex($scripturl . '?action=pm;f=' . $context['folder'] . (isset($_REQUEST['l']) ? ';l=' . (int) $_REQUEST['l'] : '') . ';sort=' . $context['sort_by'] . ($descending ? ';desc' : ''), $_GET['start'], $max_messages, $maxPerPage);
+	$context['page_index'] = constructPageIndex($scripturl.'?action=pm;f='.$context['folder'].(isset($_REQUEST['l']) ? ';l='.(int) $_REQUEST['l'] : '').';sort='.$context['sort_by'].($descending ? ';desc' : ''), $_GET['start'], $max_messages, $maxPerPage);
 	$context['start'] = $_GET['start'];
 
 	// Determine the navigation context.
 	$context['links'] = array(
-		'first' => $_GET['start'] >= $maxPerPage ? $scripturl . '?action=pm;start=0' : '',
-		'prev' => $_GET['start'] >= $maxPerPage ? $scripturl . '?action=pm;start=' . ($_GET['start'] - $maxPerPage) : '',
-		'next' => $_GET['start'] + $maxPerPage < $max_messages ? $scripturl . '?action=pm;start=' . ($_GET['start'] + $maxPerPage) : '',
-		'last' => $_GET['start'] + $maxPerPage < $max_messages ? $scripturl . '?action=pm;start=' . (floor(($max_messages - 1) / $maxPerPage) * $maxPerPage) : '',
+		'first' => $_GET['start'] >= $maxPerPage ? $scripturl.'?action=pm;start=0' : '',
+		'prev' => $_GET['start'] >= $maxPerPage ? $scripturl.'?action=pm;start='.($_GET['start'] - $maxPerPage) : '',
+		'next' => $_GET['start'] + $maxPerPage < $max_messages ? $scripturl.'?action=pm;start='.($_GET['start'] + $maxPerPage) : '',
+		'last' => $_GET['start'] + $maxPerPage < $max_messages ? $scripturl.'?action=pm;start='.(floor(($max_messages - 1) / $maxPerPage) * $maxPerPage) : '',
 		'up' => $scripturl,
 	);
 	$context['page_info'] = array(
@@ -693,14 +693,14 @@ 
 				INNER JOIN {db_prefix}pm_recipients AS pmr ON (pmr.id_pm = pm.id_pm
 					AND pmr.id_member = {int:current_member}
 					AND pmr.deleted = {int:deleted_by}
-					' . $labelQuery . ')') . $labelJoin . ($context['sort_by'] == 'name' ? ('
-				LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = {raw:pm_member})') : '') . '
+					' . $labelQuery.')').$labelJoin.($context['sort_by'] == 'name' ? ('
+				LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = {raw:pm_member})') : '').'
 				WHERE ' . ($context['folder'] == 'sent' ? 'pm.id_member_from = {int:current_member}
-					AND pm.deleted_by_sender = {int:deleted_by}' : '1=1') . (empty($pmsg) ? '' : '
-					AND pm.id_pm = {int:pmsg}') . $labelQuery2 . '
-				GROUP BY pm.id_pm_head'.($_GET['sort'] != 'pm.id_pm' ? ',' . $_GET['sort'] : '') . '
-				ORDER BY ' . ($_GET['sort'] == 'pm.id_pm' ? 'id_pm' : '{raw:sort}') . ($descending ? ' DESC' : ' ASC') . (empty($_GET['pmsg']) ? '
-				LIMIT ' . $_GET['start'] . ', ' . $maxPerPage : ''),
+					AND pm.deleted_by_sender = {int:deleted_by}' : '1=1').(empty($pmsg) ? '' : '
+					AND pm.id_pm = {int:pmsg}').$labelQuery2.'
+				GROUP BY pm.id_pm_head'.($_GET['sort'] != 'pm.id_pm' ? ','.$_GET['sort'] : '').'
+				ORDER BY ' . ($_GET['sort'] == 'pm.id_pm' ? 'id_pm' : '{raw:sort}').($descending ? ' DESC' : ' ASC').(empty($_GET['pmsg']) ? '
+				LIMIT ' . $_GET['start'].', '.$maxPerPage : ''),
 				array(
 					'current_member' => $user_info['id'],
 					'deleted_by' => 0,
@@ -716,18 +716,18 @@ 
 		// @todo SLOW This query uses a filesort. (inbox only.)
 		$request = $smcFunc['db_query']('', '
 			SELECT pm.id_pm, pm.id_pm_head, pm.id_member_from
-			FROM {db_prefix}personal_messages AS pm' . ($context['folder'] == 'sent' ? '' . ($context['sort_by'] == 'name' ? '
+			FROM {db_prefix}personal_messages AS pm' . ($context['folder'] == 'sent' ? ''.($context['sort_by'] == 'name' ? '
 				LEFT JOIN {db_prefix}pm_recipients AS pmr ON (pmr.id_pm = pm.id_pm)' : '') : '
 				INNER JOIN {db_prefix}pm_recipients AS pmr ON (pmr.id_pm = pm.id_pm
 					AND pmr.id_member = {int:current_member}
 					AND pmr.deleted = {int:is_deleted}
-					' . $labelQuery . ')') . $labelJoin . ($context['sort_by'] == 'name' ? ('
-				LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = {raw:pm_member})') : '') . '
+					' . $labelQuery.')').$labelJoin.($context['sort_by'] == 'name' ? ('
+				LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = {raw:pm_member})') : '').'
 			WHERE ' . ($context['folder'] == 'sent' ? 'pm.id_member_from = {int:current_member}
-				AND pm.deleted_by_sender = {int:is_deleted}' : '1=1') . (empty($pmsg) ? '' : '
-				AND pm.id_pm = {int:pmsg}') . $labelQuery2 . '
-			ORDER BY ' . ($_GET['sort'] == 'pm.id_pm' && $context['folder'] != 'sent' ? 'pmr.id_pm' : '{raw:sort}') . ($descending ? ' DESC' : ' ASC') . (empty($pmsg) ? '
-			LIMIT ' . $_GET['start'] . ', ' . $maxPerPage : ''),
+				AND pm.deleted_by_sender = {int:is_deleted}' : '1=1').(empty($pmsg) ? '' : '
+				AND pm.id_pm = {int:pmsg}').$labelQuery2.'
+			ORDER BY ' . ($_GET['sort'] == 'pm.id_pm' && $context['folder'] != 'sent' ? 'pmr.id_pm' : '{raw:sort}').($descending ? ' DESC' : ' ASC').(empty($pmsg) ? '
+			LIMIT ' . $_GET['start'].', '.$maxPerPage : ''),
 			array(
 				'current_member' => $user_info['id'],
 				'is_deleted' => 0,
@@ -838,7 +838,7 @@ 
 		{
 			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>';
+				$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>';
 
 				$context['folder'] == 'sent' && $context['display_mode'] != 2 ? $context['message_replied'][$row['id_pm']] = $row['is_read'] & 2 : '';
 			}
@@ -893,7 +893,7 @@ 
 			// Get the order right.
 			$orderBy = array();
 			foreach (array_reverse($pms) as $pm)
-				$orderBy[] = 'pm.id_pm = ' . $pm;
+				$orderBy[] = 'pm.id_pm = '.$pm;
 
 			// Seperate query for these bits!
 			$subjects_request = $smcFunc['db_query']('', '
@@ -902,7 +902,7 @@ 
 				FROM {db_prefix}personal_messages AS pm
 					LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = pm.id_member_from)
 				WHERE pm.id_pm IN ({array_int:pm_list})
-				ORDER BY ' . implode(', ', $orderBy) . '
+				ORDER BY ' . implode(', ', $orderBy).'
 				LIMIT {int:limit}',
 				array(
 					'pm_list' => $pms,
@@ -915,11 +915,11 @@ 
 		$messages_request = $smcFunc['db_query']('', '
 			SELECT pm.id_pm, pm.subject, pm.id_member_from, pm.body, pm.msgtime, pm.from_name
 			FROM {db_prefix}personal_messages AS pm' . ($context['folder'] == 'sent' ? '
-				LEFT JOIN {db_prefix}pm_recipients AS pmr ON (pmr.id_pm = pm.id_pm)' : '') . ($context['sort_by'] == 'name' ? '
-				LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = {raw:id_member})' : '') . '
+				LEFT JOIN {db_prefix}pm_recipients AS pmr ON (pmr.id_pm = pm.id_pm)' : '').($context['sort_by'] == 'name' ? '
+				LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = {raw:id_member})' : '').'
 			WHERE pm.id_pm IN ({array_int:display_pms})' . ($context['folder'] == 'sent' ? '
-			GROUP BY pm.id_pm, pm.subject, pm.id_member_from, pm.body, pm.msgtime, pm.from_name' : '') . '
-			ORDER BY ' . ($context['display_mode'] == 2 ? 'pm.id_pm' : '{raw:sort}') . ($descending ? ' DESC' : ' ASC') . '
+			GROUP BY pm.id_pm, pm.subject, pm.id_member_from, pm.body, pm.msgtime, pm.from_name' : '').'
+			ORDER BY ' . ($context['display_mode'] == 2 ? 'pm.id_pm' : '{raw:sort}').($descending ? ' DESC' : ' ASC').'
 			LIMIT {int:limit}',
 			array(
 				'display_pms' => $display_pms,
@@ -933,7 +933,7 @@ 
 		if ($context['display_mode'] == 2)
 		{
 			$context['conversation_buttons'] = array(
-				'delete' => array('text' => 'delete_conversation', 'image' => 'delete.png', 'url' => $scripturl . '?action=pm;sa=pmactions;pm_actions[' . $context['current_pm'] . ']=delete;conversation;f=' . $context['folder'] . ';start=' . $context['start'] . ($context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '') . ';' . $context['session_var'] . '=' . $context['session_id'], 'custom' => 'data-confirm="' . $txt['remove_conversation'] . '"', 'class' => 'you_sure'),
+				'delete' => array('text' => 'delete_conversation', 'image' => 'delete.png', 'url' => $scripturl.'?action=pm;sa=pmactions;pm_actions['.$context['current_pm'].']=delete;conversation;f='.$context['folder'].';start='.$context['start'].($context['current_label_id'] != -1 ? ';l='.$context['current_label_id'] : '').';'.$context['session_var'].'='.$context['session_id'], 'custom' => 'data-confirm="'.$txt['remove_conversation'].'"', 'class' => 'you_sure'),
 			);
 
 			// Allow mods to add additional buttons here
@@ -1002,7 +1002,7 @@ 
 			'member' => array(
 				'id' => $subject['id_member_from'],
 				'name' => $subject['from_name'],
-				'link' => ($subject['id_member_from'] != 0) ? '<a href="' . $scripturl . '?action=profile;u=' . $subject['id_member_from'] . '">' . $subject['from_name'] . '</a>' : $subject['from_name'],
+				'link' => ($subject['id_member_from'] != 0) ? '<a href="'.$scripturl.'?action=profile;u='.$subject['id_member_from'].'">'.$subject['from_name'].'</a>' : $subject['from_name'],
 			),
 			'recipients' => &$recipients[$subject['id_pm']],
 			'subject' => $subject['subject'],
@@ -1068,7 +1068,7 @@ 
 	censorText($message['subject']);
 
 	// Run UBBC interpreter on the message.
-	$message['body'] = parse_bbc($message['body'], true, 'pm' . $message['id_pm']);
+	$message['body'] = parse_bbc($message['body'], true, 'pm'.$message['id_pm']);
 
 	// Send the array.
 	$output = array(
@@ -1165,14 +1165,14 @@ 
 			if ($search_error == 'messages')
 				continue;
 
-			$context['search_errors']['messages'][] = $txt['error_' . $search_error];
+			$context['search_errors']['messages'][] = $txt['error_'.$search_error];
 		}
 	}
 
 	$context['page_title'] = $txt['pm_search_title'];
 	$context['sub_template'] = 'search';
 	$context['linktree'][] = array(
-		'url' => $scripturl . '?action=pm;sa=search',
+		'url' => $scripturl.'?action=pm;sa=search',
 		'name' => $txt['pm_search_bar_title'],
 	);
 }
@@ -1266,8 +1266,8 @@ 
 			$where_clause = array();
 			foreach ($possible_users as $k => $v)
 			{
-				$where_params['name_' . $k] = $v;
-				$where_clause[] = '{raw:real_name} LIKE {string:name_' . $k . '}';
+				$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';
 			}
@@ -1287,7 +1287,7 @@ 
 			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['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
@@ -1296,7 +1296,7 @@ 
 				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['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';
 			}
@@ -1366,7 +1366,7 @@ 
 				else
 				{
 					// Searching the inbox - PM doesn't have to be labeled
-					$labelQuery = ' AND (' . substr($labelQuery, 5) . ' OR pml.id_label IN ({array_int:labels}))';
+					$labelQuery = ' AND ('.substr($labelQuery, 5).' OR pml.id_label IN ({array_int:labels}))';
 					$labelJoin = ' LEFT JOIN {db_prefix}pm_labeled_messages AS pml ON (pml.id_pm = pmr.id_pm)';
 				}
 
@@ -1382,11 +1382,11 @@ 
 		$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);
+	preg_match_all('~(?:^|\s)([-]?)"([^"]+)"(?:$|\s)~'.($context['utf8'] ? 'u' : ''), $search_params['search'], $matches, PREG_PATTERN_ORDER);
 	$searchArray = $matches[2];
 
 	// Remove the phrase parts and extract the words.
-	$tempSearch = explode(' ', preg_replace('~(?:^|\s)(?:[-]?)"(?:[^"]+)"(?:$|\s)~' . ($context['utf8'] ? 'u' : ''), ' ', $search_params['search']));
+	$tempSearch = explode(' ', preg_replace('~(?:^|\s)(?:[-]?)"(?:[^"]+)"(?:$|\s)~'.($context['utf8'] ? 'u' : ''), ' ', $search_params['search']));
 
 	// A minus sign in front of a word excludes the word.... so...
 	$excludedWords = array();
@@ -1432,7 +1432,7 @@ 
 	// Create an array of replacements for highlighting.
 	$context['mark'] = array();
 	foreach ($searchArray as $word)
-		$context['mark'][$word] = '<strong class="highlight">' . $word . '</strong>';
+		$context['mark'][$word] = '<strong class="highlight">'.$word.'</strong>';
 
 	// This contains *everything*
 	$searchWords = array_merge($searchArray, $excludedWords);
@@ -1451,7 +1451,7 @@ 
 	// 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;
+		$context['params'][] = $k.'|\'|'.$v;
 	$context['params'] = base64_encode(implode('|"|', $context['params']));
 
 	// Compile the subject query part.
@@ -1463,10 +1463,10 @@ 
 			continue;
 
 		if ($search_params['subject_only'])
-			$andQueryParts[] = 'pm.subject' . (in_array($word, $excludedWords) ? ' NOT' : '') . ' LIKE {string:search_' . $index . '}';
+			$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('_' => '\\_', '%' => '\\%')) . '%';
+			$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';
@@ -1476,9 +1476,9 @@ 
 	// Age limits?
 	$timeQuery = '';
 	if (!empty($search_params['minage']))
-		$timeQuery .= ' AND pm.msgtime < ' . (time() - $search_params['minage'] * 86400);
+		$timeQuery .= ' AND pm.msgtime < '.(time() - $search_params['minage'] * 86400);
 	if (!empty($search_params['maxage']))
-		$timeQuery .= ' AND pm.msgtime > ' . (time() - $search_params['maxage'] * 86400);
+		$timeQuery .= ' AND pm.msgtime > '.(time() - $search_params['maxage'] * 86400);
 
 	// If we have errors - return back to the first screen...
 	if (!empty($context['search_errors']))
@@ -1492,14 +1492,14 @@ 
 		SELECT COUNT(*)
 		FROM {db_prefix}pm_recipients AS pmr
 			INNER JOIN {db_prefix}personal_messages AS pm ON (pm.id_pm = pmr.id_pm)
-			' . $labelJoin . '
+			' . $labelJoin.'
 		WHERE ' . ($context['folder'] == 'inbox' ? '
 			pmr.id_member = {int:current_member}
 			AND pmr.deleted = {int:not_deleted}' : '
 			pm.id_member_from = {int:current_member}
-			AND pm.deleted_by_sender = {int:not_deleted}') . '
-			' . $userQuery . $labelQuery . $timeQuery . '
-			AND (' . $searchQuery . ')',
+			AND pm.deleted_by_sender = {int:not_deleted}').'
+			' . $userQuery.$labelQuery.$timeQuery.'
+			AND (' . $searchQuery.')',
 		array_merge($searchq_parameters, array(
 			'current_member' => $user_info['id'],
 			'not_deleted' => 0,
@@ -1514,14 +1514,14 @@ 
 		SELECT pm.id_pm, pm.id_pm_head, pm.id_member_from
 		FROM {db_prefix}pm_recipients AS pmr
 			INNER JOIN {db_prefix}personal_messages AS pm ON (pm.id_pm = pmr.id_pm)
-			' . $labelJoin . '
+			' . $labelJoin.'
 		WHERE ' . ($context['folder'] == 'inbox' ? '
 			pmr.id_member = {int:current_member}
 			AND pmr.deleted = {int:not_deleted}' : '
 			pm.id_member_from = {int:current_member}
-			AND pm.deleted_by_sender = {int:not_deleted}') . '
-			' . $userQuery . $labelQuery . $timeQuery . '
-			AND (' . $searchQuery . ')
+			AND pm.deleted_by_sender = {int:not_deleted}').'
+			' . $userQuery.$labelQuery.$timeQuery.'
+			AND (' . $searchQuery.')
 		ORDER BY {raw:sort} {raw:sort_dir}
 		LIMIT {int:start}, {int:max}',
 		array_merge($searchq_parameters, array(
@@ -1573,7 +1573,7 @@ 
 	loadMemberData($posters);
 
 	// Sort out the page index.
-	$context['page_index'] = constructPageIndex($scripturl . '?action=pm;sa=search2;params=' . $context['params'], $_GET['start'], $numResults, $modSettings['search_results_per_page'], false);
+	$context['page_index'] = constructPageIndex($scripturl.'?action=pm;sa=search2;params='.$context['params'], $_GET['start'], $numResults, $modSettings['search_results_per_page'], false);
 
 	$context['message_labels'] = array();
 	$context['message_replied'] = array();
@@ -1596,7 +1596,7 @@ 
 		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>';
+				$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')
 			{
@@ -1673,9 +1673,9 @@ 
 			censorText($row['subject']);
 
 			// Parse out any BBC...
-			$row['body'] = parse_bbc($row['body'], true, 'pm' . $row['id_pm']);
+			$row['body'] = parse_bbc($row['body'], true, 'pm'.$row['id_pm']);
 
-			$href = $scripturl . '?action=pm;f=' . $context['folder'] . (isset($context['first_label'][$row['id_pm']]) ? ';l=' . $context['first_label'][$row['id_pm']] : '') . ';pmid=' . ($context['display_mode'] == 2 && isset($real_pm_ids[$head_pms[$row['id_pm']]]) ? $real_pm_ids[$head_pms[$row['id_pm']]] : $row['id_pm']) . '#msg' . $row['id_pm'];
+			$href = $scripturl.'?action=pm;f='.$context['folder'].(isset($context['first_label'][$row['id_pm']]) ? ';l='.$context['first_label'][$row['id_pm']] : '').';pmid='.($context['display_mode'] == 2 && isset($real_pm_ids[$head_pms[$row['id_pm']]]) ? $real_pm_ids[$head_pms[$row['id_pm']]] : $row['id_pm']).'#msg'.$row['id_pm'];
 			$context['personal_messages'][] = array(
 				'id' => $row['id_pm'],
 				'member' => &$memberContext[$row['id_member_from']],
@@ -1687,7 +1687,7 @@ 
 				'fully_labeled' => count($context['message_labels'][$row['id_pm']]) == count($context['labels']),
 				'is_replied_to' => &$context['message_replied'][$row['id_pm']],
 				'href' => $href,
-				'link' => '<a href="' . $href . '">' . $row['subject'] . '</a>',
+				'link' => '<a href="'.$href.'">'.$row['subject'].'</a>',
 				'counter' => ++$counter,
 			);
 		}
@@ -1699,9 +1699,9 @@ 
 	// Finish off the context.
 	$context['page_title'] = $txt['pm_search_title'];
 	$context['sub_template'] = 'search_results';
-	$context['menu_data_' . $context['pm_menu_id']]['current_area'] = 'search';
+	$context['menu_data_'.$context['pm_menu_id']]['current_area'] = 'search';
 	$context['linktree'][] = array(
-		'url' => $scripturl . '?action=pm;sa=search',
+		'url' => $scripturl.'?action=pm;sa=search',
 		'name' => $txt['pm_search_bar_title'],
 	);
 }
@@ -1785,11 +1785,11 @@ 
 				pm.body, pm.subject, pm.msgtime, mem.member_name, COALESCE(mem.id_member, 0) AS id_member,
 				COALESCE(mem.real_name, pm.from_name) AS real_name
 			FROM {db_prefix}personal_messages AS pm' . (!$isReceived ? '' : '
-				INNER JOIN {db_prefix}pm_recipients AS pmr ON (pmr.id_pm = {int:id_pm})') . '
+				INNER JOIN {db_prefix}pm_recipients AS pmr ON (pmr.id_pm = {int:id_pm})').'
 				LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = pm.id_member_from)
 			WHERE pm.id_pm = {int:id_pm}' . (!$isReceived ? '
 				AND pm.id_member_from = {int:current_member}' : '
-				AND pmr.id_member = {int:current_member}') . '
+				AND pmr.id_member = {int:current_member}').'
 			LIMIT 1',
 			array(
 				'current_member' => $user_info['id'],
@@ -1821,24 +1821,24 @@ 
 		}
 		$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;
+			$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']);
+			$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]';
+				$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]';
+				$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 = '';
 
 		// Do the BBC thang on the message.
-		$row_quoted['body'] = parse_bbc($row_quoted['body'], true, 'pm' . $row_quoted['id_pm']);
+		$row_quoted['body'] = parse_bbc($row_quoted['body'], true, 'pm'.$row_quoted['id_pm']);
 
 		// Set up the quoted message array.
 		$context['quoted_message'] = array(
@@ -1848,8 +1848,8 @@ 
 				'name' => $row_quoted['real_name'],
 				'username' => $row_quoted['member_name'],
 				'id' => $row_quoted['id_member'],
-				'href' => !empty($row_quoted['id_member']) ? $scripturl . '?action=profile;u=' . $row_quoted['id_member'] : '',
-				'link' => !empty($row_quoted['id_member']) ? '<a href="' . $scripturl . '?action=profile;u=' . $row_quoted['id_member'] . '">' . $row_quoted['real_name'] . '</a>' : $row_quoted['real_name'],
+				'href' => !empty($row_quoted['id_member']) ? $scripturl.'?action=profile;u='.$row_quoted['id_member'] : '',
+				'link' => !empty($row_quoted['id_member']) ? '<a href="'.$scripturl.'?action=profile;u='.$row_quoted['id_member'].'">'.$row_quoted['real_name'].'</a>' : $row_quoted['real_name'],
 			),
 			'subject' => $row_quoted['subject'],
 			'time' => timeformat($row_quoted['msgtime']),
@@ -1933,7 +1933,7 @@ 
 		$names = array();
 		foreach ($context['recipients']['to'] as $to)
 			$names[] = $to['name'];
-		$context['to_value'] = empty($names) ? '' : '&quot;' . implode('&quot;, &quot;', $names) . '&quot;';
+		$context['to_value'] = empty($names) ? '' : '&quot;'.implode('&quot;, &quot;', $names).'&quot;';
 	}
 	else
 		$context['to_value'] = '';
@@ -1945,7 +1945,7 @@ 
 
 	// And build the link tree.
 	$context['linktree'][] = array(
-		'url' => $scripturl . '?action=pm;sa=send',
+		'url' => $scripturl.'?action=pm;sa=send',
 		'name' => $txt['new_message']
 	);
 
@@ -1954,13 +1954,13 @@ 
 	// Generate a list of drafts that they can load in to the editor
 	if (!empty($context['drafts_pm_save']))
 	{
-		require_once($sourcedir . '/Drafts.php');
+		require_once($sourcedir.'/Drafts.php');
 		$pm_seed = isset($_REQUEST['pmsg']) ? $_REQUEST['pmsg'] : (isset($_REQUEST['quote']) ? $_REQUEST['quote'] : 0);
 		ShowDrafts($user_info['id'], $pm_seed, 1);
 	}
 
 	// Needed for the WYSIWYG editor.
-	require_once($sourcedir . '/Subs-Editor.php');
+	require_once($sourcedir.'/Subs-Editor.php');
 
 	// Now create the editor.
 	$editorOptions = array(
@@ -2011,7 +2011,7 @@ 
 	list ($memID) = $memberResult;
 
 	// drafts is where the functions reside
-	require_once($sourcedir . '/Drafts.php');
+	require_once($sourcedir.'/Drafts.php');
 	showPMDrafts($memID);
 }
 
@@ -2029,7 +2029,7 @@ 
 
 	if (!isset($_REQUEST['xml']))
 	{
-		$context['menu_data_' . $context['pm_menu_id']]['current_area'] = 'send';
+		$context['menu_data_'.$context['pm_menu_id']]['current_area'] = 'send';
 		$context['sub_template'] = 'send';
 		loadJavaScriptFile('PersonalMessage.js', array('defer' => false, 'minimize' => true), 'smf_pms');
 		loadJavaScriptFile('suggest.js', array('defer' => false, 'minimize' => true), 'smf_suggest');
@@ -2082,11 +2082,11 @@ 
 				pm.body, pm.subject, pm.msgtime, mem.member_name, COALESCE(mem.id_member, 0) AS id_member,
 				COALESCE(mem.real_name, pm.from_name) AS real_name
 			FROM {db_prefix}personal_messages AS pm' . ($context['folder'] == 'sent' ? '' : '
-				INNER JOIN {db_prefix}pm_recipients AS pmr ON (pmr.id_pm = {int:replied_to})') . '
+				INNER JOIN {db_prefix}pm_recipients AS pmr ON (pmr.id_pm = {int:replied_to})').'
 				LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = pm.id_member_from)
 			WHERE pm.id_pm = {int:replied_to}' . ($context['folder'] == 'sent' ? '
 				AND pm.id_member_from = {int:current_member}' : '
-				AND pmr.id_member = {int:current_member}') . '
+				AND pmr.id_member = {int:current_member}').'
 			LIMIT 1',
 			array(
 				'current_member' => $user_info['id'],
@@ -2114,19 +2114,19 @@ 
 				'name' => $row_quoted['real_name'],
 				'username' => $row_quoted['member_name'],
 				'id' => $row_quoted['id_member'],
-				'href' => !empty($row_quoted['id_member']) ? $scripturl . '?action=profile;u=' . $row_quoted['id_member'] : '',
-				'link' => !empty($row_quoted['id_member']) ? '<a href="' . $scripturl . '?action=profile;u=' . $row_quoted['id_member'] . '">' . $row_quoted['real_name'] . '</a>' : $row_quoted['real_name'],
+				'href' => !empty($row_quoted['id_member']) ? $scripturl.'?action=profile;u='.$row_quoted['id_member'] : '',
+				'link' => !empty($row_quoted['id_member']) ? '<a href="'.$scripturl.'?action=profile;u='.$row_quoted['id_member'].'">'.$row_quoted['real_name'].'</a>' : $row_quoted['real_name'],
 			),
 			'subject' => $row_quoted['subject'],
 			'time' => timeformat($row_quoted['msgtime']),
 			'timestamp' => forum_time(true, $row_quoted['msgtime']),
-			'body' => parse_bbc($row_quoted['body'], true, 'pm' . $row_quoted['id_pm']),
+			'body' => parse_bbc($row_quoted['body'], true, 'pm'.$row_quoted['id_pm']),
 		);
 	}
 
 	// Build the link tree....
 	$context['linktree'][] = array(
-		'url' => $scripturl . '?action=pm;sa=send',
+		'url' => $scripturl.'?action=pm;sa=send',
 		'name' => $txt['new_message']
 	);
 
@@ -2144,11 +2144,11 @@ 
 	foreach ($error_types as $error_type)
 	{
 		$context['post_error'][$error_type] = true;
-		if (isset($txt['error_' . $error_type]))
+		if (isset($txt['error_'.$error_type]))
 		{
 			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];
+				$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.
@@ -2157,7 +2157,7 @@ 
 	}
 
 	// We need to load the editor once more.
-	require_once($sourcedir . '/Subs-Editor.php');
+	require_once($sourcedir.'/Subs-Editor.php');
 
 	// Create it...
 	$editorOptions = array(
@@ -2179,7 +2179,7 @@ 
 	$context['require_verification'] = !$user_info['is_admin'] && !empty($modSettings['pm_posts_verification']) && $user_info['posts'] < $modSettings['pm_posts_verification'];
 	if ($context['require_verification'] && !isset($_REQUEST['xml']))
 	{
-		require_once($sourcedir . '/Subs-Editor.php');
+		require_once($sourcedir.'/Subs-Editor.php');
 		$verificationOptions = array(
 			'id' => 'pm',
 		);
@@ -2187,8 +2187,8 @@ 
 		$context['visual_verification_id'] = $verificationOptions['id'];
 	}
 
-	$context['to_value'] = empty($named_recipients['to']) ? '' : '&quot;' . implode('&quot;, &quot;', $named_recipients['to']) . '&quot;';
-	$context['bcc_value'] = empty($named_recipients['bcc']) ? '' : '&quot;' . implode('&quot;, &quot;', $named_recipients['bcc']) . '&quot;';
+	$context['to_value'] = empty($named_recipients['to']) ? '' : '&quot;'.implode('&quot;, &quot;', $named_recipients['to']).'&quot;';
+	$context['bcc_value'] = empty($named_recipients['bcc']) ? '' : '&quot;'.implode('&quot;, &quot;', $named_recipients['bcc']).'&quot;';
 
 	call_integration_hook('integrate_pm_error');
 
@@ -2208,11 +2208,11 @@ 
 	global $user_info, $modSettings, $smcFunc;
 
 	isAllowedTo('pm_send');
-	require_once($sourcedir . '/Subs-Auth.php');
+	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');
+		require_once($sourcedir.'/Drafts.php');
 
 	loadLanguage('PersonalMessage', '', false);
 
@@ -2269,9 +2269,9 @@ 
 	{
 		// First, let's see if there's user ID's given.
 		$recipientList[$recipientType] = array();
-		if (!empty($_POST['recipient_' . $recipientType]) && is_array($_POST['recipient_' . $recipientType]))
+		if (!empty($_POST['recipient_'.$recipientType]) && is_array($_POST['recipient_'.$recipientType]))
 		{
-			foreach ($_POST['recipient_' . $recipientType] as $recipient)
+			foreach ($_POST['recipient_'.$recipientType] as $recipient)
 				$recipientList[$recipientType][] = (int) $recipient;
 		}
 
@@ -2340,7 +2340,7 @@ 
 		{
 			if (!empty($namesNotFound[$recipientType]))
 			{
-				$post_errors[] = 'bad_' . $recipientType;
+				$post_errors[] = 'bad_'.$recipientType;
 
 				// Since we already have a post error, remove the previous one.
 				$post_errors = array_diff($post_errors, array('no_to'));
@@ -2372,7 +2372,7 @@ 
 	// Wrong verification code?
 	if (!$user_info['is_admin'] && !isset($_REQUEST['xml']) && !empty($modSettings['pm_posts_verification']) && $user_info['posts'] < $modSettings['pm_posts_verification'])
 	{
-		require_once($sourcedir . '/Subs-Editor.php');
+		require_once($sourcedir.'/Subs-Editor.php');
 		$verificationOptions = array(
 			'id' => 'pm',
 		);
@@ -2402,7 +2402,7 @@ 
 		censorText($context['preview_message']);
 
 		// Set a descriptive title.
-		$context['page_title'] = $txt['preview'] . ' - ' . $context['preview_subject'];
+		$context['page_title'] = $txt['preview'].' - '.$context['preview_subject'];
 
 		// Pretend they messed up but don't ignore if they really did :P.
 		return messagePostError($post_errors, $namedRecipientList, $recipientList);
@@ -2414,7 +2414,7 @@ 
 		// Maybe we couldn't find one?
 		foreach ($namesNotFound as $recipientType => $names)
 		{
-			$post_errors[] = 'bad_' . $recipientType;
+			$post_errors[] = 'bad_'.$recipientType;
 			foreach ($names as $name)
 				$context['send_log']['failed'][] = sprintf($txt['pm_error_user_not_found'], $name);
 		}
@@ -2479,7 +2479,7 @@ 
 	// Message sent successfully?
 	if (!empty($context['send_log']) && empty($context['send_log']['failed']))
 	{
-		$context['current_label_redirect'] = $context['current_label_redirect'] . ';done=sent';
+		$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']))
@@ -2751,7 +2751,7 @@ 
 
 	// Back to the folder.
 	$_SESSION['pm_selected'] = array_keys($to_label);
-	redirectexit($context['current_label_redirect'] . (count($to_label) == 1 ? '#msg' . $_SESSION['pm_selected'][0] : ''), count($to_label) == 1 && isBrowser('ie'));
+	redirectexit($context['current_label_redirect'].(count($to_label) == 1 ? '#msg'.$_SESSION['pm_selected'][0] : ''), count($to_label) == 1 && isBrowser('ie'));
 }
 
 /**
@@ -2852,7 +2852,7 @@ 
 
 	// Build the link tree elements.
 	$context['linktree'][] = array(
-		'url' => $scripturl . '?action=pm;sa=prune',
+		'url' => $scripturl.'?action=pm;sa=prune',
 		'name' => $txt['pm_prune']
 	);
 
@@ -2914,7 +2914,7 @@ 
 			SELECT id_member, COUNT(*) AS num_deleted_messages, CASE WHEN is_read & 1 >= 1 THEN 1 ELSE 0 END AS is_read
 			FROM {db_prefix}pm_recipients
 			WHERE id_member IN ({array_int:member_list})
-				AND deleted = {int:not_deleted}' . $where . '
+				AND deleted = {int:not_deleted}' . $where.'
 			GROUP BY id_member, is_read',
 			array(
 				'member_list' => $owner,
@@ -2926,9 +2926,9 @@ 
 		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']));
+				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']));
+				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'])
@@ -3035,7 +3035,7 @@ 
 	}
 
 	// Any cached numbers may be wrong now.
-	cache_put_data('labelCounts:' . $user_info['id'], null, 720);
+	cache_put_data('labelCounts:'.$user_info['id'], null, 720);
 }
 
 /**
@@ -3087,7 +3087,7 @@ 
 		SET is_read = is_read | 1
 		WHERE id_member = {int:id_member}
 			AND NOT (is_read & 1 >= 1)' . ($personal_messages !== null ? '
-			AND id_pm IN ({array_int:personal_messages})' : '') . $in_inbox,
+			AND id_pm IN ({array_int:personal_messages})' : '').$in_inbox,
 		array(
 			'personal_messages' => $personal_messages,
 			'id_member' => $owner,
@@ -3155,7 +3155,7 @@ 
 		$smcFunc['db_free_result']($result);
 
 		// Need to store all this.
-		cache_put_data('labelCounts:' . $owner, $context['labels'], 720);
+		cache_put_data('labelCounts:'.$owner, $context['labels'], 720);
 		updateMemberData($owner, array('unread_messages' => $total_unread));
 
 		// If it was for the current member, reflect this in the $user_info array too.
@@ -3173,7 +3173,7 @@ 
 
 	// Build the link tree elements...
 	$context['linktree'][] = array(
-		'url' => $scripturl . '?action=pm;sa=manlabels',
+		'url' => $scripturl.'?action=pm;sa=manlabels',
 		'name' => $txt['pm_manage_labels']
 	);
 
@@ -3398,7 +3398,7 @@ 
 		}
 
 		// Make sure we're not caching this!
-		cache_put_data('labelCounts:' . $user_info['id'], null, 720);
+		cache_put_data('labelCounts:'.$user_info['id'], null, 720);
 
 		// To make the changes appear right away, redirect.
 		redirectexit('action=pm;sa=manlabels');
@@ -3419,11 +3419,11 @@ 
 	global $scripturl, $profile_vars, $cur_profile, $user_profile;
 
 	// Need this for the display.
-	require_once($sourcedir . '/Profile.php');
-	require_once($sourcedir . '/Profile-Modify.php');
+	require_once($sourcedir.'/Profile.php');
+	require_once($sourcedir.'/Profile-Modify.php');
 
 	// We want them to submit back to here.
-	$context['profile_custom_submit_url'] = $scripturl . '?action=pm;sa=settings;save';
+	$context['profile_custom_submit_url'] = $scripturl.'?action=pm;sa=settings;save';
 
 	loadMemberData($user_info['id'], false, 'profile');
 	$cur_profile = $user_profile[$user_info['id']];
@@ -3448,7 +3448,7 @@ 
 
 	// Add our position to the linktree.
 	$context['linktree'][] = array(
-		'url' => $scripturl . '?action=pm;sa=settings',
+		'url' => $scripturl.'?action=pm;sa=settings',
 		'name' => $txt['pm_settings']
 	);
 
@@ -3554,7 +3554,7 @@ 
 		$smcFunc['db_free_result']($request);
 
 		// Remove the line breaks...
-		$body = preg_replace('~<br ?/?' . '>~i', "\n", $body);
+		$body = preg_replace('~<br ?/?'.'>~i', "\n", $body);
 
 		// Get any other recipients of the email.
 		$request = $smcFunc['db_query']('', '
@@ -3576,7 +3576,7 @@ 
 			if ($row['bcc'])
 				$hidden_recipients++;
 			else
-				$recipients[] = '[url=' . $scripturl . '?action=profile;u=' . $row['id_member_to'] . ']' . $row['to_name'] . '[/url]';
+				$recipients[] = '[url='.$scripturl.'?action=profile;u='.$row['id_member_to'].']'.$row['to_name'].'[/url]';
 		}
 		$smcFunc['db_free_result']($request);
 
@@ -3588,7 +3588,7 @@ 
 			SELECT id_member, real_name, lngfile
 			FROM {db_prefix}members
 			WHERE (id_group = {int:admin_id} OR FIND_IN_SET({int:admin_id}, additional_groups) != 0)
-				' . (empty($_POST['id_admin']) ? '' : 'AND id_member = {int:specific_admin}') . '
+				' . (empty($_POST['id_admin']) ? '' : 'AND id_member = {int:specific_admin}').'
 			ORDER BY lngfile',
 			array(
 				'admin_id' => 1,
@@ -3616,14 +3616,14 @@ 
 
 				// 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";
+				$report_body .= "\n".'[b]'.$_POST['reason'].'[/b]'."\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) ? '"' . $memberFromName . '"' : $memberFromName . ' link=action=profile;u=' . $memberFromID . ' date=' . $time) . ']' . "\n" . un_htmlspecialchars($body) . '[/quote]';
+					$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) ? '"'.$memberFromName.'"' : $memberFromName.' link=action=profile;u='.$memberFromID.' date='.$time).']'."\n".un_htmlspecialchars($body).'[/quote]';
 
 				// Plonk it in the array ;)
 				$messagesToSend[$cur_language] = array(
-					'subject' => ($smcFunc['strpos']($subject, $txt['pm_report_pm_subject']) === false ? $txt['pm_report_pm_subject'] : '') . un_htmlspecialchars($subject),
+					'subject' => ($smcFunc['strpos']($subject, $txt['pm_report_pm_subject']) === false ? $txt['pm_report_pm_subject'] : '').un_htmlspecialchars($subject),
 					'body' => $report_body,
 					'recipients' => array(
 						'to' => array(),
@@ -3659,7 +3659,7 @@ 
 
 	// The link tree - gotta have this :o
 	$context['linktree'][] = array(
-		'url' => $scripturl . '?action=pm;sa=manrules',
+		'url' => $scripturl.'?action=pm;sa=manrules',
 		'name' => $txt['pm_manage_rules']
 	);
 

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -3219,7 +3219,7 @@ 
 		// Deleting an existing label?
 		elseif (isset($_POST['delete'], $_POST['delete_label']))
 		{
-			foreach ($_POST['delete_label'] AS $label => $dummy)
+			foreach ($_POST['delete_label'] as $label => $dummy)
 			{
 				unset($the_labels[$label]);
 				$labels_to_remove[] = $label;
@@ -3260,7 +3260,7 @@ 
 		if (!empty($labels_to_add))
 		{
 			$inserts = array();
-			foreach ($labels_to_add AS $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());
@@ -3269,7 +3269,7 @@ 
 		// Update existing labels as needed
 		if (!empty($label_upates))
 		{
-			foreach ($label_updates AS $id => $name)
+			foreach ($label_updates as $id => $name)
 			{
 				$smcFunc['db_query']('', '
 					UPDATE {db_prefix}labels