elkarte / Elkarte

sources/CurlFetchWebdata.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -124,7 +124,7 @@
 	 * - Calls _setOptions to set the curl opts array values based on the defaults and user input
 	 *
 	 * @param string $url the site we are going to fetch
-	 * @param mixed[]|string $post_data data to send in the curl request as post data
+	 * @param string $post_data data to send in the curl request as post data
 	 */
 	public function get_url_data($url, $post_data = array())
 	{

Spacing +2 added lines, -2 removed lines

@@ -222,7 +222,7 @@ 
 		$new_url_parse['query'] = isset($new_url_parse['query']) ? $new_url_parse['query'] : '';
 
 		// Build the new URL that was in the http header
-		return $new_url_parse['scheme'] . '://' . $new_url_parse['host'] . $new_url_parse['path'] . (!empty($new_url_parse['query']) ? '?' . $new_url_parse['query'] : '');
+		return $new_url_parse['scheme'].'://'.$new_url_parse['host'].$new_url_parse['path'].(!empty($new_url_parse['query']) ? '?'.$new_url_parse['query'] : '');
 	}
 
 	/**
@@ -283,7 +283,7 @@ 
 			// Build the post data, drop ones with leading @'s since those can be used to send files, we don't support that.
 			foreach ($post_data as $name => $value)
 			{
-				$postvars[] = $name . '=' . urlencode($value[0] == '@' ? '' : $value);
+				$postvars[] = $name.'='.urlencode($value[0] == '@' ? '' : $value);
 			}
 
 			return implode('&', $postvars);

sources/database/Db-mysql.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -332,7 +332,7 @@
 	 * http://www.greywyvern.com/code/php/utf8_html.phps
 	 *
 	 * @param string $c
-	 * @return integer|false
+	 * @return integer
 	 */
 	private function _uniord($c)
 	{

Spacing +42 added lines, -42 removed lines

@@ -65,9 +65,9 @@ 
 
 		// Select the database. Maybe.
 		if (empty($db_options['dont_select_db']))
-			$connection = @mysqli_connect((!empty($db_options['persist']) ? 'p:' : '') . $db_server, $db_user, $db_passwd, $db_name, $db_port);
+			$connection = @mysqli_connect((!empty($db_options['persist']) ? 'p:' : '').$db_server, $db_user, $db_passwd, $db_name, $db_port);
 		else
-			$connection = @mysqli_connect((!empty($db_options['persist']) ? 'p:' : '') . $db_server, $db_user, $db_passwd, '', $db_port);
+			$connection = @mysqli_connect((!empty($db_options['persist']) ? 'p:' : '').$db_server, $db_user, $db_passwd, '', $db_port);
 
 		// Something's wrong, show an error if its fatal (which we assume it is)
 		if (!$connection)
@@ -107,7 +107,7 @@ 
 	 */
 	public function fix_prefix($db_prefix, $db_name)
 	{
-		$db_prefix = is_numeric(substr($db_prefix, 0, 1)) ? $db_name . '.' . $db_prefix : '`' . $db_name . '`.' . $db_prefix;
+		$db_prefix = is_numeric(substr($db_prefix, 0, 1)) ? $db_name.'.'.$db_prefix : '`'.$db_name.'`.'.$db_prefix;
 
 		return $db_prefix;
 	}
@@ -153,7 +153,7 @@ 
 		{
 			// Add before LIMIT
 			if ($pos = strpos($db_string, 'LIMIT '))
-				$db_string = substr($db_string, 0, $pos) . "\t\t\tORDER BY null\n" . substr($db_string, $pos, strlen($db_string));
+				$db_string = substr($db_string, 0, $pos)."\t\t\tORDER BY null\n".substr($db_string, $pos, strlen($db_string));
 			else
 				// Append it.
 				$db_string .= "\n\t\t\tORDER BY null";
@@ -243,7 +243,7 @@ 
 				$fail = true;
 
 			if (!empty($fail) && function_exists('log_error'))
-				$this->error_backtrace('Hacking attempt...', 'Hacking attempt...' . "\n" . $db_string, E_USER_ERROR, __FILE__, __LINE__);
+				$this->error_backtrace('Hacking attempt...', 'Hacking attempt...'."\n".$db_string, E_USER_ERROR, __FILE__, __LINE__);
 		}
 
 		if ($this->_unbuffered === false)
@@ -312,11 +312,11 @@ 
 				if ($ord1 >= 240 && $ord1 <= 247)
 				{
 					// Replace it with the corresponding html entity
-					$entity = $this->_uniord(chr($ord[$i]) . chr($ord[$i + 1]) . chr($ord[$i + 2]) . chr($ord[$i + 3]));
+					$entity = $this->_uniord(chr($ord[$i]).chr($ord[$i + 1]).chr($ord[$i + 2]).chr($ord[$i + 3]));
 					if ($entity === false)
 						$result .= "\xEF\xBF\xBD";
 					else
-						$result .= '&#x' . dechex($entity) . ';';
+						$result .= '&#x'.dechex($entity).';';
 					$i += 3;
 				}
 				else
@@ -515,7 +515,7 @@ 
 
 				// Let the admin know there is a command denied issue
 				if (function_exists('log_error'))
-					Errors::instance()->log_error($txt['database_error'] . ': ' . $query_error . (!empty($modSettings['enableErrorQueryLogging']) ? "\n\n$db_string" : ''), 'database', $file, $line);
+					Errors::instance()->log_error($txt['database_error'].': '.$query_error.(!empty($modSettings['enableErrorQueryLogging']) ? "\n\n$db_string" : ''), 'database', $file, $line);
 
 				return false;
 			}
@@ -523,7 +523,7 @@ 
 
 		// Log the error.
 		if ($query_errno != 1213 && $query_errno != 1205 && function_exists('log_error'))
-			Errors::instance()->log_error($txt['database_error'] . ': ' . $query_error . (!empty($modSettings['enableErrorQueryLogging']) ? "\n\n$db_string" : ''), 'database', $file, $line);
+			Errors::instance()->log_error($txt['database_error'].': '.$query_error.(!empty($modSettings['enableErrorQueryLogging']) ? "\n\n$db_string" : ''), 'database', $file, $line);
 
 		// Database error auto fixing ;).
 		if (function_exists('Cache::instance()->get') && (!isset($modSettings['autoFixDatabase']) || $modSettings['autoFixDatabase'] == '1'))
@@ -551,7 +551,7 @@ 
 						{
 							// Now, it's still theoretically possible this could be an injection.  So backtick it!
 							if (trim($table) != '')
-								$fix_tables[] = '`' . strtr(trim($table), array('`' => '')) . '`';
+								$fix_tables[] = '`'.strtr(trim($table), array('`' => '')).'`';
 						}
 					}
 
@@ -561,13 +561,13 @@ 
 				elseif ($query_errno == 1016)
 				{
 					if (preg_match('~\'([^\.\']+)~', $query_error, $match) != 0)
-						$fix_tables = array('`' . $match[1] . '`');
+						$fix_tables = array('`'.$match[1].'`');
 				}
 				// Indexes crashed.  Should be easy to fix!
 				elseif ($query_errno == 1034 || $query_errno == 1035)
 				{
 					preg_match('~\'([^\']+?)\'~', $query_error, $match);
-					$fix_tables = array('`' . $match[1] . '`');
+					$fix_tables = array('`'.$match[1].'`');
 				}
 			}
 
@@ -576,8 +576,8 @@ 
 			{
 				// subs/Admin.subs.php for updateDbLastError(), subs/Mail.subs.php for sendmail().
 				// @todo this should go somewhere else, not into the db-mysql layer I think
-				require_once(SUBSDIR . '/Admin.subs.php');
-				require_once(SUBSDIR . '/Mail.subs.php');
+				require_once(SUBSDIR.'/Admin.subs.php');
+				require_once(SUBSDIR.'/Mail.subs.php');
 
 				// Make a note of the REPAIR...
 				Cache::instance()->put('db_last_error', time(), 600);
@@ -612,11 +612,11 @@ 
 				{
 					// Are we in SSI mode?  If so try that username and password first
 					if (ELK == 'SSI' && !empty($ssi_db_user) && !empty($ssi_db_passwd))
-						$new_connection = @mysqli_connect((!empty($db_persist) ? 'p:' : '') . $db_server, $ssi_db_user, $ssi_db_passwd, $db_name);
+						$new_connection = @mysqli_connect((!empty($db_persist) ? 'p:' : '').$db_server, $ssi_db_user, $ssi_db_passwd, $db_name);
 
 					// Fall back to the regular username and password if need be
 					if (!$new_connection)
-						$new_connection = @mysqli_connect((!empty($db_persist) ? 'p:' : '') . $db_server, $db_user, $db_passwd, $db_name);
+						$new_connection = @mysqli_connect((!empty($db_persist) ? 'p:' : '').$db_server, $db_user, $db_passwd, $db_name);
 				}
 
 				if ($new_connection)
@@ -660,16 +660,16 @@ 
 		// Show an error message, if possible.
 		$context['error_title'] = $txt['database_error'];
 		if (allowedTo('admin_forum'))
-			$context['error_message'] = nl2br($query_error) . '<br />' . $txt['file'] . ': ' . $file . '<br />' . $txt['line'] . ': ' . $line;
+			$context['error_message'] = nl2br($query_error).'<br />'.$txt['file'].': '.$file.'<br />'.$txt['line'].': '.$line;
 		else
 			$context['error_message'] = $txt['try_again'];
 
 		// Add database version that we know of, for the admin to know. (and ask for support)
 		if (allowedTo('admin_forum'))
-			$context['error_message'] .= '<br /><br />' . sprintf($txt['database_error_versions'], $modSettings['elkVersion']);
+			$context['error_message'] .= '<br /><br />'.sprintf($txt['database_error_versions'], $modSettings['elkVersion']);
 
 		if (allowedTo('admin_forum') && $db_show_debug === true)
-			$context['error_message'] .= '<br /><br />' . nl2br($db_string);
+			$context['error_message'] .= '<br /><br />'.nl2br($db_string);
 
 		// It's already been logged... don't log it again.
 		Errors::instance()->fatal_error($context['error_message'], false);
@@ -709,11 +709,11 @@ 
 		{
 			// Are we restricting the length?
 			if (strpos($type, 'string-') !== false)
-				$insertData .= sprintf('SUBSTRING({string:%1$s}, 1, ' . substr($type, 7) . '), ', $columnName);
+				$insertData .= sprintf('SUBSTRING({string:%1$s}, 1, '.substr($type, 7).'), ', $columnName);
 			else
 				$insertData .= sprintf('{%1$s:%2$s}, ', $type, $columnName);
 		}
-		$insertData = substr($insertData, 0, -2) . ')';
+		$insertData = substr($insertData, 0, -2).')';
 
 		// Create an array consisting of only the columns.
 		$indexed_columns = array_keys($columns);
@@ -730,13 +730,13 @@ 
 
 		// Do the insert.
 		$this->query('', '
-			' . $queryTitle . ' INTO ' . $table . '(`' . implode('`, `', $indexed_columns) . '`)
+			' . $queryTitle.' INTO '.$table.'(`'.implode('`, `', $indexed_columns).'`)
 			VALUES
 				' . implode(',
 				', $insertRows),
 			array(
 				'security_override' => true,
-				'db_error_skip' => $table === $db_prefix . 'log_errors',
+				'db_error_skip' => $table === $db_prefix.'log_errors',
 			),
 			$connection
 		);
@@ -791,8 +791,8 @@ 
 
 		$result = $this->query('', '
 			SELECT /*!40001 SQL_NO_CACHE */ *
-			FROM `' . $tableName . '`
-			LIMIT ' . $start . ', ' . $limit,
+			FROM `' . $tableName.'`
+			LIMIT ' . $start.', '.$limit,
 			array(
 				'security_override' => true,
 			)
@@ -811,7 +811,7 @@ 
 		}
 
 		// Start it off with the basic INSERT INTO.
-		$data = 'INSERT INTO `' . $tableName . '`' . $crlf . "\t" . '(`' . implode('`, `', $fields) . '`)' . $crlf . 'VALUES ';
+		$data = 'INSERT INTO `'.$tableName.'`'.$crlf."\t".'(`'.implode('`, `', $fields).'`)'.$crlf.'VALUES ';
 
 		// Loop through each row.
 		while ($row = $this->fetch_assoc($result))
@@ -827,14 +827,14 @@ 
 				elseif (is_numeric($item) && (int) $item == $item)
 					$field_list[] = $item;
 				else
-					$field_list[] = '\'' . $this->escape_string($item) . '\'';
+					$field_list[] = '\''.$this->escape_string($item).'\'';
 			}
 
-			$data .= '(' . implode(', ', $field_list) . '),' . $crlf . "\t";
+			$data .= '('.implode(', ', $field_list).'),'.$crlf."\t";
 		}
 
 		$this->free_result($result);
-		$data = substr(trim($data), 0, -1) . ';' . $crlf . $crlf;
+		$data = substr(trim($data), 0, -1).';'.$crlf.$crlf;
 
 		$start += $limit;
 
@@ -858,10 +858,10 @@ 
 		$crlf = "\r\n";
 
 		// Drop it if it exists.
-		$schema_create = 'DROP TABLE IF EXISTS `' . $tableName . '`;' . $crlf . $crlf;
+		$schema_create = 'DROP TABLE IF EXISTS `'.$tableName.'`;'.$crlf.$crlf;
 
 		// Start the create table...
-		$schema_create .= 'CREATE TABLE `' . $tableName . '` (' . $crlf;
+		$schema_create .= 'CREATE TABLE `'.$tableName.'` ('.$crlf;
 
 		// Find all the fields.
 		$result = $this->query('', '
@@ -874,7 +874,7 @@ 
 		while ($row = $this->fetch_assoc($result))
 		{
 			// Make the CREATE for this column.
-			$schema_create .= ' `' . $row['Field'] . '` ' . $row['Type'] . ($row['Null'] != 'YES' ? ' NOT NULL' : '');
+			$schema_create .= ' `'.$row['Field'].'` '.$row['Type'].($row['Null'] != 'YES' ? ' NOT NULL' : '');
 
 			// Add a default...?
 			if (!empty($row['Default']) || $row['Null'] !== 'YES')
@@ -889,12 +889,12 @@ 
 					$type = strtolower($row['Type']);
 					$isNumericColumn = strpos($type, 'int') !== false || strpos($type, 'bool') !== false || strpos($type, 'bit') !== false || strpos($type, 'float') !== false || strpos($type, 'double') !== false || strpos($type, 'decimal') !== false;
 
-					$schema_create .= ' default ' . ($isNumericColumn ? $row['Default'] : '\'' . $this->escape_string($row['Default']) . '\'');
+					$schema_create .= ' default '.($isNumericColumn ? $row['Default'] : '\''.$this->escape_string($row['Default']).'\'');
 				}
 			}
 
 			// And now any extra information. (such as auto_increment.)
-			$schema_create .= ($row['Extra'] != '' ? ' ' . $row['Extra'] : '') . ',' . $crlf;
+			$schema_create .= ($row['Extra'] != '' ? ' '.$row['Extra'] : '').','.$crlf;
 		}
 		$this->free_result($result);
 
@@ -913,7 +913,7 @@ 
 		while ($row = $this->fetch_assoc($result))
 		{
 			// Is this a primary key, unique index, or regular index?
-			$row['Key_name'] = $row['Key_name'] == 'PRIMARY' ? 'PRIMARY KEY' : (empty($row['Non_unique']) ? 'UNIQUE ' : ($row['Comment'] == 'FULLTEXT' || (isset($row['Index_type']) && $row['Index_type'] == 'FULLTEXT') ? 'FULLTEXT ' : 'KEY ')) . '`' . $row['Key_name'] . '`';
+			$row['Key_name'] = $row['Key_name'] == 'PRIMARY' ? 'PRIMARY KEY' : (empty($row['Non_unique']) ? 'UNIQUE ' : ($row['Comment'] == 'FULLTEXT' || (isset($row['Index_type']) && $row['Index_type'] == 'FULLTEXT') ? 'FULLTEXT ' : 'KEY ')).'`'.$row['Key_name'].'`';
 
 			// Is this the first column in the index?
 			if (empty($indexes[$row['Key_name']]))
@@ -921,9 +921,9 @@ 
 
 			// A sub part, like only indexing 15 characters of a varchar.
 			if (!empty($row['Sub_part']))
-				$indexes[$row['Key_name']][$row['Seq_in_index']] = '`' . $row['Column_name'] . '`(' . $row['Sub_part'] . ')';
+				$indexes[$row['Key_name']][$row['Seq_in_index']] = '`'.$row['Column_name'].'`('.$row['Sub_part'].')';
 			else
-				$indexes[$row['Key_name']][$row['Seq_in_index']] = '`' . $row['Column_name'] . '`';
+				$indexes[$row['Key_name']][$row['Seq_in_index']] = '`'.$row['Column_name'].'`';
 		}
 		$this->free_result($result);
 
@@ -933,7 +933,7 @@ 
 			// Ensure the columns are in proper order.
 			ksort($columns);
 
-			$schema_create .= ',' . $crlf . ' ' . $keyname . ' (' . implode(', ', $columns) . ')';
+			$schema_create .= ','.$crlf.' '.$keyname.' ('.implode(', ', $columns).')';
 		}
 
 		// Now just get the comment and type... (MyISAM, etc.)
@@ -948,7 +948,7 @@ 
 		$this->free_result($result);
 
 		// Probably MyISAM.... and it might have a comment.
-		$schema_create .= $crlf . ') ENGINE=' . (isset($row['Type']) ? $row['Type'] : $row['Engine']) . ($row['Comment'] != '' ? ' COMMENT="' . $row['Comment'] . '"' : '');
+		$schema_create .= $crlf.') ENGINE='.(isset($row['Type']) ? $row['Type'] : $row['Engine']).($row['Comment'] != '' ? ' COMMENT="'.$row['Comment'].'"' : '');
 
 		return $schema_create;
 	}
@@ -968,7 +968,7 @@ 
 
 		$db_name_str = $db_name_str == false ? $db_name : $db_name_str;
 		$db_name_str = trim($db_name_str);
-		$filter = $filter == false ? '' : ' LIKE \'' . $filter . '\'';
+		$filter = $filter == false ? '' : ' LIKE \''.$filter.'\'';
 
 		$request = $this->query('', '
 			SHOW TABLES
@@ -1083,13 +1083,13 @@ 
 		if (!empty($create))
 			$create = '(
 				' . implode('
-				', $create) . ')';
+				', $create).')';
 		else
 			$create = '';
 
 		$request = $this->query('', '
 			CREATE TABLE {raw:backup_table} {raw:create}
-			ENGINE={raw:engine}' . (empty($charset) ? '' : ' CHARACTER SET {raw:charset}' . (empty($collate) ? '' : ' COLLATE {raw:collate}')) . '
+			ENGINE={raw:engine}' . (empty($charset) ? '' : ' CHARACTER SET {raw:charset}'.(empty($collate) ? '' : ' COLLATE {raw:collate}')).'
 			SELECT *
 			FROM {raw:table}',
 			array(

sources/Errors.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
 	/**
 	 * Halts execution, optional displays an error message
 	 *
-	 * @param string|integer $error
+	 * @param integer $error
 	 */
 	protected function terminate($error = 0)
 	{

Spacing +13 added lines, -13 removed lines

@@ -133,11 +133,11 @@ 
 		$query_string = empty($_SERVER['QUERY_STRING']) ? (empty($_SERVER['REQUEST_URL']) ? '' : str_replace($scripturl, '', $_SERVER['REQUEST_URL'])) : $_SERVER['QUERY_STRING'];
 
 		// Don't log the session hash in the url twice, it's a waste.
-		$query_string = htmlspecialchars((ELK === 'SSI' ? '' : '?') . preg_replace(array('~;sesc=[^&;]+~', '~' . session_name() . '=' . session_id() . '[&;]~'), array(';sesc', ''), $query_string), ENT_COMPAT, 'UTF-8');
+		$query_string = htmlspecialchars((ELK === 'SSI' ? '' : '?').preg_replace(array('~;sesc=[^&;]+~', '~'.session_name().'='.session_id().'[&;]~'), array(';sesc', ''), $query_string), ENT_COMPAT, 'UTF-8');
 
 		// 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?$other_error_types = array();
 		$known_error_types = array(
@@ -337,7 +337,7 @@ 
 		$err_line = isset($err_line) ? $err_line : $e->getLine();
 
 		// Logged !
-		$message = $this->log_error($this->error_name . ': ' . $this->error_string, $error_type, $err_file, $err_line);
+		$message = $this->log_error($this->error_name.': '.$this->error_string, $error_type, $err_file, $err_line);
 
 		// Display debug information?
 		$this->_displayDebug();
@@ -383,7 +383,7 @@ 
 			}
 
 			// Debugging!  This should look like a PHP error message.
-			echo '<br /><strong>', $this->error_name, '</strong>: ' . $this->error_string . '<ol>' . $this->error_text . '</ol>';
+			echo '<br /><strong>', $this->error_name, '</strong>: '.$this->error_string.'<ol>'.$this->error_text.'</ol>';
 		}
 	}
 
@@ -418,9 +418,9 @@ 
 				$function = $this->_debug_error_func($error_trace, $entry, $not_thrown, $key);
 				$entry['file'] = isset($entry['file']) ? str_replace($current_directory, '', str_replace('\\', '/', $entry['file'])) : '';
 
-				$this->error_text .= '<li><strong>' . htmlspecialchars($function) . '()</strong>' . (isset($entry['file'], $entry['line'])
-						? ' in <strong>' . $entry['file'] . '</strong> at line <strong>' . $entry['line'] . '</strong>'
-						: '') . "</li>\n";
+				$this->error_text .= '<li><strong>'.htmlspecialchars($function).'()</strong>'.(isset($entry['file'], $entry['line'])
+						? ' in <strong>'.$entry['file'].'</strong> at line <strong>'.$entry['line'].'</strong>'
+						: '')."</li>\n";
 			}
 		}
 	}
@@ -439,9 +439,9 @@ 
 	{
 		// If from the error_handler, the stack is out of sync
 		if ($not_thrown)
-			$function = (isset($error_trace[$key + 1]['class']) ? $error_trace[$key + 1]['class'] . $error_trace[$key + 1]['type'] : '') . isset($error_trace[$key + 1]['function']) ? $error_trace[$key + 1]['function'] : '';
+			$function = (isset($error_trace[$key + 1]['class']) ? $error_trace[$key + 1]['class'].$error_trace[$key + 1]['type'] : '').isset($error_trace[$key + 1]['function']) ? $error_trace[$key + 1]['function'] : '';
 		else
-			$function = (isset($entry['class']) ? $entry['class'] . $entry['type'] : '') . $entry['function'];
+			$function = (isset($entry['class']) ? $entry['class'].$entry['type'] : '').$entry['function'];
 
 		return $function;
 	}
@@ -473,8 +473,8 @@ 
 		// A little something for the template
 		$context['error_title'] = isset($context['error_title']) ? $context['error_title'] : $txt['error_occurred'];
 		$context['error_message'] = isset($context['error_message']) ? $context['error_message'] : $error_message;
-		$context['error_code'] = isset($error_code) ? 'id="' . htmlspecialchars($error_code) . '" ' : '';
-		$context['page_title'] = empty($context['page_title']) ? $context['error_title'] : $context['page_title'] ;
+		$context['error_code'] = isset($error_code) ? 'id="'.htmlspecialchars($error_code).'" ' : '';
+		$context['page_title'] = empty($context['page_title']) ? $context['error_title'] : $context['page_title'];
 
 		// Load the template and set the sub template.
 		loadTemplate('Errors');
@@ -574,7 +574,7 @@ 
 
 			// Language files aren't loaded yet :'(
 			$db_error = $db->last_error($db->connection());
-			@mail($webmaster_email, $mbname . ': Database Error!', 'There has been a problem with the database!' . ($db_error == '' ? '' : "\n" . $db->db_title() . ' reported:' . "\n" . $db_error) . "\n\n" . 'This is a notice email to let you know that the system could not connect to the database, contact your host if this continues.');
+			@mail($webmaster_email, $mbname.': Database Error!', 'There has been a problem with the database!'.($db_error == '' ? '' : "\n".$db->db_title().' reported:'."\n".$db_error)."\n\n".'This is a notice email to let you know that the system 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...
@@ -631,7 +631,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.

sources/subs/BBC/Codes.class.php

Doc Comments +3 added lines

@@ -939,6 +939,9 @@
 		return $this->parsing_codes[$char];
 	}
 
+	/**
+	 * @param string $code
+	 */
 	protected function getItemCodeTag($code)
 	{
 		return array(

Spacing +19 added lines, -19 removed lines

@@ -297,7 +297,7 @@ 
 			array(
 				self::ATTR_TAG => 'code',
 				self::ATTR_TYPE => self::TYPE_UNPARSED_CONTENT,
-				self::ATTR_CONTENT => '<div class="codeheader">' . $txt['code'] . ': <a href="javascript:void(0);" onclick="return elkSelectText(this);" class="codeoperation">' . $txt['code_select'] . '</a></div><pre class="bbc_code prettyprint">$1</pre>',
+				self::ATTR_CONTENT => '<div class="codeheader">'.$txt['code'].': <a href="javascript:void(0);" onclick="return elkSelectText(this);" class="codeoperation">'.$txt['code_select'].'</a></div><pre class="bbc_code prettyprint">$1</pre>',
 				self::ATTR_VALIDATE => $this->isDisabled('code') ? null : function(&$tag, &$data, $disabled) {
 					$data = tabToHtmlTab($data);
 				},
@@ -308,7 +308,7 @@ 
 			array(
 				self::ATTR_TAG => 'code',
 				self::ATTR_TYPE => self::TYPE_UNPARSED_EQUALS_CONTENT,
-				self::ATTR_CONTENT => '<div class="codeheader">' . $txt['code'] . ': ($2) <a href="#" onclick="return elkSelectText(this);" class="codeoperation">' . $txt['code_select'] . '</a></div><pre class="bbc_code prettyprint">$1</pre>',
+				self::ATTR_CONTENT => '<div class="codeheader">'.$txt['code'].': ($2) <a href="#" onclick="return elkSelectText(this);" class="codeoperation">'.$txt['code_select'].'</a></div><pre class="bbc_code prettyprint">$1</pre>',
 				self::ATTR_VALIDATE => $this->isDisabled('code') ? null : function(&$tag, &$data, $disabled) {
 					$data[0] = tabToHtmlTab($data[0]);
 				},
@@ -397,9 +397,9 @@ 
 			array(
 				self::ATTR_TAG => 'ila',
 				self::ATTR_TYPE => self::TYPE_CLOSED,
-				self::ATTR_CONTENT => '<a href="' . $scripturl . '?action=dlattach;attach=$1;image"><img src="' . $scripturl . '?action=dlattach;attach=$1;thumb" alt="" class="bbc_img" /></a>',
+				self::ATTR_CONTENT => '<a href="'.$scripturl.'?action=dlattach;attach=$1;image"><img src="'.$scripturl.'?action=dlattach;attach=$1;thumb" alt="" class="bbc_img" /></a>',
 				self::ATTR_TEST => '(^\d+$)',
-				self::ATTR_DISABLED_CONTENT => '<a href="' . $scripturl . '?action=dlattach;attach=$1;image">(' . $scripturl . '?action=dlattach;attach=$1;image)</a>',
+				self::ATTR_DISABLED_CONTENT => '<a href="'.$scripturl.'?action=dlattach;attach=$1;image">('.$scripturl.'?action=dlattach;attach=$1;image)</a>',
 				self::ATTR_BLOCK_LEVEL => false,
 				self::ATTR_AUTOLINK => false,
 				self::ATTR_LENGTH => 3,
@@ -426,7 +426,7 @@ 
 				self::ATTR_VALIDATE => function(&$tag, &$data, $disabled) {
 					if (strpos($data, 'http://') !== 0 && strpos($data, 'https://') !== 0)
 					{
-						$data = 'http://' . $data;
+						$data = 'http://'.$data;
 					}
 				},
 				self::ATTR_DISABLED_CONTENT => '($1)',
@@ -441,7 +441,7 @@ 
 				self::ATTR_VALIDATE => function(&$tag, &$data, $disabled) {
 					if (strpos($data, 'http://') !== 0 && strpos($data, 'https://') !== 0)
 					{
-						$data = 'http://' . $data;
+						$data = 'http://'.$data;
 					}
 				},
 				self::ATTR_DISABLED_CONTENT => '($1)',
@@ -457,7 +457,7 @@ 
 					//$data = removeBr($data);
 					if (strpos($data, 'http://') !== 0 && strpos($data, 'https://') !== 0)
 					{
-						$data = 'http://' . $data;
+						$data = 'http://'.$data;
 					}
 				},
 				self::ATTR_BLOCK_LEVEL => false,
@@ -472,11 +472,11 @@ 
 				self::ATTR_VALIDATE => function(&$tag, &$data, $disabled) {
 					if ($data[0] === '#')
 					{
-						$data = '#post_' . substr($data, 1);
+						$data = '#post_'.substr($data, 1);
 					}
 					elseif (strpos($data, 'http://') !== 0 && strpos($data, 'https://') !== 0)
 					{
-						$data = 'http://' . $data;
+						$data = 'http://'.$data;
 					}
 				},
 				self::ATTR_DISALLOW_CHILDREN => array(
@@ -561,7 +561,7 @@ 
 				self::ATTR_TAG => 'member',
 				self::ATTR_TYPE => self::TYPE_UNPARSED_EQUALS,
 				self::ATTR_TEST => '[\d*]',
-				self::ATTR_BEFORE => '<span class="bbc_mention"><a href="' . $scripturl . '?action=profile;u=$1">@',
+				self::ATTR_BEFORE => '<span class="bbc_mention"><a href="'.$scripturl.'?action=profile;u=$1">@',
 				self::ATTR_AFTER => '</a></span>',
 				self::ATTR_DISABLED_BEFORE => '@',
 				self::ATTR_DISABLED_AFTER => '',
@@ -589,7 +589,7 @@ 
 			array(
 				self::ATTR_TAG => 'quote',
 				self::ATTR_TYPE => self::TYPE_PARSED_CONTENT,
-				self::ATTR_BEFORE => '<div class="quoteheader">' . $txt['quote'] . '</div><blockquote>',
+				self::ATTR_BEFORE => '<div class="quoteheader">'.$txt['quote'].'</div><blockquote>',
 				self::ATTR_AFTER => '</blockquote>',
 				self::ATTR_BLOCK_LEVEL => true,
 				self::ATTR_AUTOLINK => true,
@@ -604,7 +604,7 @@ 
 						self::PARAM_ATTR_QUOTED => self::OPTIONAL,
 					),
 				),
-				self::ATTR_BEFORE => '<div class="quoteheader">' . $txt['quote_from'] . ': {author}</div><blockquote>',
+				self::ATTR_BEFORE => '<div class="quoteheader">'.$txt['quote_from'].': {author}</div><blockquote>',
 				self::ATTR_AFTER => '</blockquote>',
 				self::ATTR_BLOCK_LEVEL => true,
 				self::ATTR_AUTOLINK => true,
@@ -613,7 +613,7 @@ 
 			array(
 				self::ATTR_TAG => 'quote',
 				self::ATTR_TYPE => self::TYPE_PARSED_EQUALS,
-				self::ATTR_BEFORE => '<div class="quoteheader">' . $txt['quote_from'] . ': $1</div><blockquote>',
+				self::ATTR_BEFORE => '<div class="quoteheader">'.$txt['quote_from'].': $1</div><blockquote>',
 				self::ATTR_AFTER => '</blockquote>',
 				self::ATTR_QUOTED => self::OPTIONAL,
 				self::ATTR_PARSED_TAGS_ALLOWED => array(
@@ -639,7 +639,7 @@ 
 						self::ATTR_VALIDATE => 'htmlTime',
 					),
 				),
-				self::ATTR_BEFORE => '<div class="quoteheader"><a href="' . $scripturl . '?{link}">' . $txt['quote_from'] . ': {author} ' . ($modSettings['todayMod'] == 3 ? ' - ' : $txt['search_on']) . ' {date}</a></div><blockquote>',
+				self::ATTR_BEFORE => '<div class="quoteheader"><a href="'.$scripturl.'?{link}">'.$txt['quote_from'].': {author} '.($modSettings['todayMod'] == 3 ? ' - ' : $txt['search_on']).' {date}</a></div><blockquote>',
 				self::ATTR_AFTER => '</blockquote>',
 				self::ATTR_BLOCK_LEVEL => true,
 				self::ATTR_AUTOLINK => true,
@@ -651,7 +651,7 @@ 
 				self::ATTR_PARAM => array(
 					'author' => array(self::PARAM_ATTR_MATCH => '(.{1,192}?)'),
 				),
-				self::ATTR_BEFORE => '<div class="quoteheader">' . $txt['quote_from'] . ': {author}</div><blockquote>',
+				self::ATTR_BEFORE => '<div class="quoteheader">'.$txt['quote_from'].': {author}</div><blockquote>',
 				self::ATTR_AFTER => '</blockquote>',
 				self::ATTR_BLOCK_LEVEL => true,
 				self::ATTR_AUTOLINK => true,
@@ -683,7 +683,7 @@ 
 				self::ATTR_AFTER => '</span>',
 				self::ATTR_VALIDATE => function(&$tag, &$data, $disabled) {
 					$sizes = array(1 => 0.7, 2 => 1.0, 3 => 1.35, 4 => 1.45, 5 => 2.0, 6 => 2.65, 7 => 3.95);
-					$data = $sizes[(int) $data] . 'em';
+					$data = $sizes[(int) $data].'em';
 				},
 				self::ATTR_DISALLOW_PARENTS => array(
 					'size' => 1,
@@ -710,7 +710,7 @@ 
 			array(
 				self::ATTR_TAG => 'spoiler',
 				self::ATTR_TYPE => self::TYPE_PARSED_CONTENT,
-				self::ATTR_BEFORE => '<span class="spoilerheader">' . $txt['spoiler'] . '</span><div class="spoiler"><div class="bbc_spoiler" style="display: none;">',
+				self::ATTR_BEFORE => '<span class="spoilerheader">'.$txt['spoiler'].'</span><div class="spoiler"><div class="bbc_spoiler" style="display: none;">',
 				self::ATTR_AFTER => '</div></div>',
 				self::ATTR_BLOCK_LEVEL => true,
 				self::ATTR_AUTOLINK => true,
@@ -821,7 +821,7 @@ 
 				self::ATTR_VALIDATE => function(&$tag, &$data, $disabled) {
 					if (strpos($data, 'http://') !== 0 && strpos($data, 'https://') !== 0)
 					{
-						$data = 'http://' . $data;
+						$data = 'http://'.$data;
 					}
 				},
 				self::ATTR_BLOCK_LEVEL => false,
@@ -836,7 +836,7 @@ 
 				self::ATTR_VALIDATE => function(&$tag, &$data, $disabled) {
 					if (strpos($data, 'http://') !== 0 && strpos($data, 'https://') !== 0)
 					{
-						$data = 'http://' . $data;
+						$data = 'http://'.$data;
 					}
 				},
 				self::ATTR_DISALLOW_CHILDREN => array(

sources/subs/Boards.subs.php

Doc Comments +1 added lines, -1 removed lines

@@ -2084,7 +2084,7 @@
  * Count boards all or specific depending on argument, redirect boards excluded by default.
  *
  * @package Boards
- * @param mixed[]|string $conditions is an associative array that holds the board or the cat IDs
+ * @param string $conditions is an associative array that holds the board or the cat IDs
  *              'categories' => an array of category IDs (it accepts a single ID too)
  *              'boards' => an array of board IDs (it accepts a single ID too)
  *              if conditions is set to 'all' (not an array) all the boards are queried

Spacing +35 added lines, -35 removed lines

@@ -183,7 +183,7 @@ 
  */
 function getMsgMemberID($messageID)
 {
-	require_once(SUBSDIR . '/Messages.subs.php');
+	require_once(SUBSDIR.'/Messages.subs.php');
 	$message_info = basicMessageInfo((int) $messageID, true);
 
 	return empty($message_info['id_member']) ? 0 : (int) $message_info['id_member'];
@@ -270,7 +270,7 @@ 
 
 		// Oops...?
 		else
-			trigger_error('modifyBoard(): The move_to value \'' . $boardOptions['move_to'] . '\' is incorrect', E_USER_ERROR);
+			trigger_error('modifyBoard(): The move_to value \''.$boardOptions['move_to'].'\' is incorrect', E_USER_ERROR);
 
 		// Get a list of children of this board.
 		$childList = array();
@@ -280,7 +280,7 @@ 
 		$childUpdates = array();
 		$levelDiff = $child_level - $boards[$board_id]['level'];
 		if ($levelDiff != 0)
-			$childUpdates[] = 'child_level = child_level ' . ($levelDiff > 0 ? '+ ' : '') . '{int:level_diff}';
+			$childUpdates[] = 'child_level = child_level '.($levelDiff > 0 ? '+ ' : '').'{int:level_diff}';
 		if ($id_cat != $boards[$board_id]['category'])
 			$childUpdates[] = 'id_cat = {int:category}';
 
@@ -289,7 +289,7 @@ 
 			$db->query('', '
 				UPDATE {db_prefix}boards
 				SET ' . implode(',
-					', $childUpdates) . '
+					', $childUpdates).'
 				WHERE id_board IN ({array_int:board_list})',
 				array(
 					'board_list' => $childList,
@@ -396,7 +396,7 @@ 
 			UPDATE {db_prefix}boards
 			SET
 				' . implode(',
-				', $boardUpdates) . '
+				', $boardUpdates).'
 			WHERE id_board = {int:selected_board}',
 			array_merge($boardUpdateParameters, array(
 				'selected_board' => $board_id,
@@ -633,7 +633,7 @@ 
 		)
 	);
 
-	require_once(SUBSDIR . '/Topic.subs.php');
+	require_once(SUBSDIR.'/Topic.subs.php');
 	removeTopics($topics, false);
 
 	// Delete the board's logs.
@@ -696,9 +696,9 @@ 
 	);
 
 	// Latest message/topic might not be there anymore.
-	require_once(SUBSDIR . '/Messages.subs.php');
+	require_once(SUBSDIR.'/Messages.subs.php');
 	updateMessageStats();
-	require_once(SUBSDIR . '/Topic.subs.php');
+	require_once(SUBSDIR.'/Topic.subs.php');
 	updateTopicStats();
 	updateSettings(array(
 		'calendar_updated' => time(),
@@ -831,10 +831,10 @@ 
 			IFNULL(b.id_board, 0) AS id_board, b.id_parent, b.name AS board_name, b.description, b.child_level,
 			b.board_order, b.count_posts, b.member_groups, b.id_theme, b.override_theme, b.id_profile, b.redirect,
 			b.num_posts, b.num_topics, b.deny_member_groups, c.id_cat, c.name AS cat_name, c.cat_order, c.can_collapse' . (!empty($query['select']) ?
-			$query['select'] : '') . '
+			$query['select'] : '').'
 		FROM {db_prefix}categories AS c
 			LEFT JOIN {db_prefix}boards AS b ON (b.id_cat = c.id_cat)' . (!empty($query['join']) ?
-			$query['join'] : '') . '
+			$query['join'] : '').'
 		ORDER BY c.cat_order, b.child_level, b.board_order',
 		array(
 		)
@@ -999,7 +999,7 @@ 
 	// Leave out the boards that the user may be ignoring
 	if (isset($boardListOptions['ignore']))
 	{
-		$select .= ',' . (!empty($boardListOptions['ignore']) ? 'b.id_board IN ({array_int:ignore_boards})' : '0') . ' AS is_ignored';
+		$select .= ','.(!empty($boardListOptions['ignore']) ? 'b.id_board IN ({array_int:ignore_boards})' : '0').' AS is_ignored';
 		$where_parameters['ignore_boards'] = $boardListOptions['ignore'];
 	}
 
@@ -1026,11 +1026,11 @@ 
 
 	// Bring all the options together and make the query
 	$request = $db->query('', '
-		SELECT c.name AS cat_name, c.id_cat, b.id_board, b.name AS board_name, b.child_level' . $select . '
+		SELECT c.name AS cat_name, c.id_cat, b.id_board, b.name AS board_name, b.child_level' . $select.'
 		FROM {db_prefix}boards AS b
-			LEFT JOIN {db_prefix}categories AS c ON (c.id_cat = b.id_cat)' . (empty($join) ? '' : implode(' ', $join)) . (empty($where) ? '' : '
+			LEFT JOIN {db_prefix}categories AS c ON (c.id_cat = b.id_cat)' . (empty($join) ? '' : implode(' ', $join)).(empty($where) ? '' : '
 		WHERE ' . implode('
-			AND ', $where)) . '
+			AND ', $where)).'
 		ORDER BY c.cat_order, b.board_order',
 		$where_parameters
 	);
@@ -1412,7 +1412,7 @@ 
 	return $db->fetchQueryCallback('
 		SELECT b.id_board
 		FROM {db_prefix}boards AS b
-		WHERE ' . $user_info[in_array($see_board, $allowed_see) ? $see_board : $allowed_see[0]] . ($hide_recycle && !empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0 ? '
+		WHERE ' . $user_info[in_array($see_board, $allowed_see) ? $see_board : $allowed_see[0]].($hide_recycle && !empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0 ? '
 			AND b.id_board != {int:recycle_board}' : ''),
 		array(
 			'recycle_board' => (int) $modSettings['recycle_board'],
@@ -1727,8 +1727,8 @@ 
 	$request = $db->query('', '
 		SELECT b.id_board, b.num_posts
 		FROM {db_prefix}boards AS b
-		WHERE ' . ($wanna_see_board ? '{query_wanna_see_board}' : '{query_see_board}') . '
-			AND b.' . implode(' OR b.', $clauses) . (!empty($removals) ? '
+		WHERE ' . ($wanna_see_board ? '{query_wanna_see_board}' : '{query_see_board}').'
+			AND b.' . implode(' OR b.', $clauses).(!empty($removals) ? '
 			AND b.' . implode(' AND b.', $removals) : ''),
 		$clauseParameters
 	);
@@ -1803,7 +1803,7 @@ 
 	);
 
 	if (!empty($params['sort_by']) && in_array($params['sort_by'], $allowed_sort))
-		$sort_by = 'ORDER BY ' . $params['sort_by'];
+		$sort_by = 'ORDER BY '.$params['sort_by'];
 	else
 		$sort_by = '';
 
@@ -1829,7 +1829,7 @@ 
 	{
 		// id_board, name, id_profile => used in admin/Reports.controller.php
 		$request = $db->query('', '
-			SELECT ' . $select . '
+			SELECT ' . $select.'
 			FROM {db_prefix}boards AS b
 			' . $sort_by,
 			array()
@@ -1857,11 +1857,11 @@ 
 			$security = $params['wanna_see_board'] ? '{query_wanna_see_board}' : '{query_see_board}';
 
 		$request = $db->query('', '
-			SELECT ' . $select . '
+			SELECT ' . $select.'
 			FROM {db_prefix}boards AS b
-			WHERE ' . $security . (!empty($clauses) ? '
-				AND b.' . implode(' OR b.', $clauses) : '') . ($params['include_recycle'] ? '' : '
-				AND b.id_board != {int:recycle_board}') . ($params['include_redirects'] ? '' : '
+			WHERE ' . $security.(!empty($clauses) ? '
+				AND b.' . implode(' OR b.', $clauses) : '').($params['include_recycle'] ? '' : '
+				AND b.id_board != {int:recycle_board}').($params['include_redirects'] ? '' : '
 				AND b.redirect = {string:empty_string}
 			' . $sort_by),
 			array_merge($clauseParameters, array(
@@ -1948,7 +1948,7 @@ 
 	{
 		if (in_array($key, $knownInts))
 		{
-			$set[] = $key . ' = ' . $key . ' + {int:' . $key . '}';
+			$set[] = $key.' = '.$key.' + {int:'.$key.'}';
 			$params[$key] = $val;
 		}
 	}
@@ -1960,7 +1960,7 @@ 
 		UPDATE {db_prefix}boards
 		SET
 			' . implode(',
-			', $set) . '
+			', $set).'
 		WHERE id_board = {int:id_board}',
 		$params
 	);
@@ -1992,7 +1992,7 @@ 
 	{
 		if (in_array($key, $knownInts))
 		{
-			$set[] = $key . ' = CASE WHEN {int:' . $key . '} > ' . $key . ' THEN 0 ELSE ' . $key . ' - {int:' . $key . '} END';
+			$set[] = $key.' = CASE WHEN {int:'.$key.'} > '.$key.' THEN 0 ELSE '.$key.' - {int:'.$key.'} END';
 			$params[$key] = $val;
 		}
 	}
@@ -2004,7 +2004,7 @@ 
 		UPDATE {db_prefix}boards
 		SET
 			' . implode(',
-			', $set) . '
+			', $set).'
 		WHERE id_board = {int:id_board}',
 		$params
 	);
@@ -2048,8 +2048,8 @@ 
 			return array(
 				'id' => $row['id_board'],
 				'name' => $row['name'],
-				'href' => $scripturl . '?board=' . $row['id_board'] . '.0',
-				'link' => '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0"><strong>' . $row['name'] . '</strong></a>',
+				'href' => $scripturl.'?board='.$row['id_board'].'.0',
+				'link' => '<a href="'.$scripturl.'?board='.$row['id_board'].'.0"><strong>'.$row['name'].'</strong></a>',
 				'new' => $row['board_read'] < $row['id_msg_updated'],
 				'checked' => 'checked="checked"',
 			);
@@ -2064,7 +2064,7 @@ 
 			LEFT JOIN {db_prefix}log_boards AS lb ON (lb.id_board = b.id_board AND lb.id_member = {int:current_member})
 		WHERE {query_see_board}
 			AND ln.id_board is null ' . (!empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0 ? '
-			AND b.id_board != {int:recycle_board}' : '') . '
+			AND b.id_board != {int:recycle_board}' : '').'
 		ORDER BY ' . $sort,
 		array(
 			'selected_member' => $memID,
@@ -2076,8 +2076,8 @@ 
 		$notification_boards[] = array(
 			'id' => $row['id_board'],
 			'name' => $row['name'],
-			'href' => $scripturl . '?board=' . $row['id_board'] . '.0',
-			'link' => '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>',
+			'href' => $scripturl.'?board='.$row['id_board'].'.0',
+			'link' => '<a href="'.$scripturl.'?board='.$row['id_board'].'.0">'.$row['name'].'</a>',
 			'new' => $row['board_read'] < $row['id_msg_updated'],
 			'checked' => '',
 		);
@@ -2141,9 +2141,9 @@ 
 		$request = $db->query('', '
 			SELECT COUNT(*)
 			FROM {db_prefix}boards AS b
-			WHERE ' . ($params['wanna_see_board'] ? '{query_wanna_see_board}' : '{query_see_board}') . (!empty($clauses) ? '
-				AND b.' . implode(' OR b.', $clauses) : '') . ($params['include_recycle'] ? '' : '
-				AND b.id_board != {int:recycle_board}') . ($params['include_redirects'] ? '' : '
+			WHERE ' . ($params['wanna_see_board'] ? '{query_wanna_see_board}' : '{query_see_board}').(!empty($clauses) ? '
+				AND b.' . implode(' OR b.', $clauses) : '').($params['include_recycle'] ? '' : '
+				AND b.id_board != {int:recycle_board}').($params['include_redirects'] ? '' : '
 				AND b.redirect = {string:empty_string}'),
 			array_merge($clauseParameters, array(
 				'recycle_board' => !empty($modSettings['recycle_board']) ? $modSettings['recycle_board'] : 0,

sources/subs/DataValidator.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -265,7 +265,7 @@
 
 	/**
 	 * Return the validation data, all or a specific key
-	 * @param integer|string|null $key int or string
+	 * @param string $key int or string
 	 */
 	public function validation_data($key = null)
 	{

Spacing +6 added lines, -6 removed lines

@@ -304,7 +304,7 @@ 
 					// Were any parameters provided for the rule, e.g. min_length[6]
 					if (preg_match('~(.*)\[(.*)\]~', $rule, $match))
 					{
-						$validation_method = '_validate_' . $match[1];
+						$validation_method = '_validate_'.$match[1];
 						$validation_parameters = $match[2];
 						$validation_function = $match[1];
 						$validation_parameters_function = explode(',', $match[2]);
@@ -312,7 +312,7 @@ 
 					// Or just a predefined rule e.g. valid_email
 					else
 					{
-						$validation_method = '_validate_' . $rule;
+						$validation_method = '_validate_'.$rule;
 						$validation_function = $rule;
 					}
 
@@ -436,7 +436,7 @@ 
 					// Were any parameters provided for the rule, e.g. Util::htmlspecialchars[ENT_QUOTES]
 					if (preg_match('~(.*)\[(.*)\]~', $rule, $match))
 					{
-						$sanitation_method = '_sanitation_' . $match[1];
+						$sanitation_method = '_sanitation_'.$match[1];
 						$sanitation_parameters = $match[2];
 						$sanitation_function = $match[1];
 						$sanitation_parameters_function = explode(',', defined($match[2]) ? constant($match[2]) : $match[2]);
@@ -444,7 +444,7 @@ 
 					// Or just a predefined rule e.g. trim
 					else
 					{
-						$sanitation_method = '_sanitation_' . $rule;
+						$sanitation_method = '_sanitation_'.$rule;
 						$sanitation_function = $rule;
 					}
 
@@ -1150,7 +1150,7 @@ 
 				$result = @eval('
 					if (false)
 					{
-						' . preg_replace('~^(?:\s*<\\?(?:php)?|\\?>\s*$)~u', '', $input[$field]) . '
+						' . preg_replace('~^(?:\s*<\\?(?:php)?|\\?>\s*$)~u', '', $input[$field]).'
 					}
 				');
 			}
@@ -1257,7 +1257,7 @@ 
 			// @todo should we force gmail.com or use $domain_name, force is safest but perhaps most confusing
 		}
 
-		return $local_name . '@' . $domain_name;
+		return $local_name.'@'.$domain_name;
 	}
 
 	/**

sources/subs/Members.subs.php

Doc Comments +1 added lines, -1 removed lines

@@ -1436,7 +1436,7 @@
  * Counts the number of members based on conditions
  *
  * @package Members
- * @param string[]|string $query see prepareMembersByQuery
+ * @param string $query see prepareMembersByQuery
  * @param mixed[] $query_params see prepareMembersByQuery
  * @param boolean $only_active see prepareMembersByQuery
  */

Spacing +63 added lines, -63 removed lines

@@ -135,14 +135,14 @@ 
 		);
 
 		// Remove any cached data if enabled.
-		Cache::instance()->remove('user_settings-' . $user[0]);
+		Cache::instance()->remove('user_settings-'.$user[0]);
 	}
 
 	// Make these peoples' posts guest posts.
 	$db->query('', '
 		UPDATE {db_prefix}messages
 		SET id_member = {int:guest_id}' . (!empty($modSettings['deleteMembersRemovesEmail']) ? ',
-		poster_email = {string:blank_email}' : '') . '
+		poster_email = {string:blank_email}' : '').'
 		WHERE id_member IN ({array_int:users})',
 		array(
 			'guest_id' => 0,
@@ -352,7 +352,7 @@ 
 	);
 
 	// Delete personal messages.
-	require_once(SUBSDIR . '/PersonalMessage.subs.php');
+	require_once(SUBSDIR.'/PersonalMessage.subs.php');
 	deleteMessages(null, null, $users);
 
 	$db->query('', '
@@ -375,7 +375,7 @@ 
 	);
 
 	// Delete avatar.
-	require_once(SUBSDIR . '/ManageAttachments.subs.php');
+	require_once(SUBSDIR.'/ManageAttachments.subs.php');
 	removeAttachments(array('id_member' => $users));
 
 	// It's over, no more moderation for you.
@@ -470,8 +470,8 @@ 
 	loadLanguage('Login');
 
 	// We'll need some external functions.
-	require_once(SUBSDIR . '/Auth.subs.php');
-	require_once(SUBSDIR . '/Mail.subs.php');
+	require_once(SUBSDIR.'/Auth.subs.php');
+	require_once(SUBSDIR.'/Mail.subs.php');
 
 	// Put any errors in here.
 	$reg_errors = Error_Context::context($error_context, 0);
@@ -517,7 +517,7 @@ 
 
 		// Password isn't legal?
 		if ($passwordError != null)
-			$reg_errors->addError('profile_error_password_' . $passwordError);
+			$reg_errors->addError('profile_error_password_'.$passwordError);
 	}
 
 	// @todo move to controller
@@ -621,7 +621,7 @@ 
 
 	if (isset($regOptions['memberGroup']))
 	{
-		require_once(SUBSDIR . '/Membergroups.subs.php');
+		require_once(SUBSDIR.'/Membergroups.subs.php');
 
 		// Make sure the id_group will be valid, if this is an administrator.
 		$regOptions['register_vars']['id_group'] = $regOptions['memberGroup'] == 1 && !allowedTo('admin_forum') ? 0 : $regOptions['memberGroup'];
@@ -714,12 +714,12 @@ 
 		'REALNAME' => $regOptions['register_vars']['real_name'],
 		'USERNAME' => $regOptions['username'],
 		'PASSWORD' => $regOptions['password'],
-		'FORGOTPASSWORDLINK' => $scripturl . '?action=reminder',
-		'ACTIVATIONLINK' => $scripturl . '?action=register;sa=activate;u=' . $memberID . ';code=' . $validation_code,
-		'ACTIVATIONLINKWITHOUTCODE' => $scripturl . '?action=register;sa=activate;u=' . $memberID,
+		'FORGOTPASSWORDLINK' => $scripturl.'?action=reminder',
+		'ACTIVATIONLINK' => $scripturl.'?action=register;sa=activate;u='.$memberID.';code='.$validation_code,
+		'ACTIVATIONLINKWITHOUTCODE' => $scripturl.'?action=register;sa=activate;u='.$memberID,
 		'ACTIVATIONCODE' => $validation_code,
 		'OPENID' => !empty($regOptions['openid']) ? $regOptions['openid'] : '',
-		'COPPALINK' => $scripturl . '?action=register;sa=coppa;u=' . $memberID,
+		'COPPALINK' => $scripturl.'?action=register;sa=coppa;u='.$memberID,
 	);
 
 	// Administrative registrations are a bit different...
@@ -748,22 +748,22 @@ 
 					'REALNAME' => $regOptions['register_vars']['real_name'],
 					'USERNAME' => $regOptions['username'],
 					'PASSWORD' => $regOptions['password'],
-					'FORGOTPASSWORDLINK' => $scripturl . '?action=reminder',
+					'FORGOTPASSWORDLINK' => $scripturl.'?action=reminder',
 					'OPENID' => !empty($regOptions['openid']) ? $regOptions['openid'] : '',
 				);
-				$emaildata = loadEmailTemplate('register_' . ($regOptions['auth_method'] == 'openid' ? 'openid_' : '') . 'immediate', $replacements);
+				$emaildata = loadEmailTemplate('register_'.($regOptions['auth_method'] == 'openid' ? 'openid_' : '').'immediate', $replacements);
 				sendmail($regOptions['email'], $emaildata['subject'], $emaildata['body'], null, null, false, 0);
 			}
 
 			// Send admin their notification.
-			require_once(SUBSDIR . '/Notification.subs.php');
+			require_once(SUBSDIR.'/Notification.subs.php');
 			sendAdminNotifications('standard', $memberID, $regOptions['username']);
 		}
 		// Need to activate their account - or fall under COPPA.
 		elseif ($regOptions['require'] == 'activation' || $regOptions['require'] == 'coppa')
 		{
 
-			$emaildata = loadEmailTemplate('register_' . ($regOptions['auth_method'] == 'openid' ? 'openid_' : '') . ($regOptions['require'] == 'activation' ? 'activate' : 'coppa'), $replacements);
+			$emaildata = loadEmailTemplate('register_'.($regOptions['auth_method'] == 'openid' ? 'openid_' : '').($regOptions['require'] == 'activation' ? 'activate' : 'coppa'), $replacements);
 
 			sendmail($regOptions['email'], $emaildata['subject'], $emaildata['body'], null, null, false, 0);
 		}
@@ -774,16 +774,16 @@ 
 				'REALNAME' => $regOptions['register_vars']['real_name'],
 				'USERNAME' => $regOptions['username'],
 				'PASSWORD' => $regOptions['password'],
-				'FORGOTPASSWORDLINK' => $scripturl . '?action=reminder',
+				'FORGOTPASSWORDLINK' => $scripturl.'?action=reminder',
 				'OPENID' => !empty($regOptions['openid']) ? $regOptions['openid'] : '',
 			);
 
-			$emaildata = loadEmailTemplate('register_' . ($regOptions['auth_method'] == 'openid' ? 'openid_' : '') . 'pending', $replacements);
+			$emaildata = loadEmailTemplate('register_'.($regOptions['auth_method'] == 'openid' ? 'openid_' : '').'pending', $replacements);
 
 			sendmail($regOptions['email'], $emaildata['subject'], $emaildata['body'], null, null, false, 0);
 
 			// Admin gets informed here...
-			require_once(SUBSDIR . '/Notification.subs.php');
+			require_once(SUBSDIR.'/Notification.subs.php');
 			sendAdminNotifications('approval', $memberID, $regOptions['username']);
 		}
 
@@ -871,7 +871,7 @@ 
 		SELECT id_member
 		FROM {db_prefix}members
 		WHERE ' . (empty($current_ID_MEMBER) ? '' : 'id_member != {int:current_member}
-			AND ') . '({raw:real_name} LIKE {string:check_name} OR {raw:member_name} LIKE {string:check_name})
+			AND ').'({raw:real_name} LIKE {string:check_name} OR {raw:member_name} LIKE {string:check_name})
 		LIMIT 1',
 		array(
 			'real_name' => defined('DB_CASE_SENSITIVE') ? 'LOWER(real_name)' : 'real_name',
@@ -956,7 +956,7 @@ 
 			$profile_id = $board_info['profile'];
 		elseif ($board_id !== 0)
 		{
-			require_once(SUBSDIR . '/Boards.subs.php');
+			require_once(SUBSDIR.'/Boards.subs.php');
 			$board_data = fetchBoardsInfo(array('boards' => $board_id), array('selects' => 'permissions'));
 
 			if (empty($board_data))
@@ -1015,9 +1015,9 @@ 
 	return $db->fetchQueryCallback('
 		SELECT mem.id_member
 		FROM {db_prefix}members AS mem' . ($include_moderators || $exclude_moderators ? '
-			LEFT JOIN {db_prefix}moderators AS mods ON (mods.id_member = mem.id_member AND mods.id_board = {int:board_id})' : '') . '
-		WHERE (' . ($include_moderators ? 'mods.id_member IS NOT NULL OR ' : '') . 'mem.id_group IN ({array_int:member_groups_allowed}) OR FIND_IN_SET({raw:member_group_allowed_implode}, mem.additional_groups) != 0 OR mem.id_post_group IN ({array_int:member_groups_allowed}))' . (empty($member_groups['denied']) ? '' : '
-			AND NOT (' . ($exclude_moderators ? 'mods.id_member IS NOT NULL OR ' : '') . 'mem.id_group IN ({array_int:member_groups_denied}) OR FIND_IN_SET({raw:member_group_denied_implode}, mem.additional_groups) != 0 OR mem.id_post_group IN ({array_int:member_groups_denied}))'),
+			LEFT JOIN {db_prefix}moderators AS mods ON (mods.id_member = mem.id_member AND mods.id_board = {int:board_id})' : '').'
+		WHERE (' . ($include_moderators ? 'mods.id_member IS NOT NULL OR ' : '').'mem.id_group IN ({array_int:member_groups_allowed}) OR FIND_IN_SET({raw:member_group_allowed_implode}, mem.additional_groups) != 0 OR mem.id_post_group IN ({array_int:member_groups_allowed}))'.(empty($member_groups['denied']) ? '' : '
+			AND NOT (' . ($exclude_moderators ? 'mods.id_member IS NOT NULL OR ' : '').'mem.id_group IN ({array_int:member_groups_denied}) OR FIND_IN_SET({raw:member_group_denied_implode}, mem.additional_groups) != 0 OR mem.id_post_group IN ({array_int:member_groups_denied}))'),
 		array(
 			'member_groups_allowed' => $member_groups['allowed'],
 			'member_groups_denied' => $member_groups['denied'],
@@ -1053,7 +1053,7 @@ 
 	// Firstly, if email and username aren't passed find out the members email address and name.
 	if ($email === false && $membername === false)
 	{
-		require_once(SUBSDIR . '/Members.subs.php');
+		require_once(SUBSDIR.'/Members.subs.php');
 		$result = getBasicMemberData($memID);
 		$email = $result['email_address'];
 		$membername = $result['member_name'];
@@ -1069,7 +1069,7 @@ 
 			WHERE m.id_member = {int:guest_id}
 				AND m.approved = {int:is_approved}
 				AND m.icon != {string:recycled_icon}' . (empty($email) ? '' : '
-				AND m.poster_email = {string:email_address}') . (empty($membername) ? '' : '
+				AND m.poster_email = {string:email_address}').(empty($membername) ? '' : '
 				AND m.poster_name = {string:member_name}'),
 			array(
 				'count_posts' => 0,
@@ -1083,7 +1083,7 @@ 
 		list ($messageCount) = $db->fetch_row($request);
 		$db->free_result($request);
 
-		updateMemberData($memID, array('posts' => 'posts + ' . $messageCount));
+		updateMemberData($memID, array('posts' => 'posts + '.$messageCount));
 	}
 
 	$query_parts = array();
@@ -1141,7 +1141,7 @@ 
 			mem.posts, mem.is_activated, mem.date_registered, mem.id_group, mem.additional_groups, mg.group_name
 		FROM {db_prefix}members AS mem
 			LEFT JOIN {db_prefix}membergroups AS mg ON (mg.id_group = mem.id_group)
-		WHERE ' . ($where == '1' ? '1=1' : $where) . '
+		WHERE ' . ($where == '1' ? '1=1' : $where).'
 		ORDER BY {raw:sort}
 		LIMIT {int:start}, {int:per_page}',
 		array_merge($where_params, array(
@@ -1252,7 +1252,7 @@ 
 		FROM {db_prefix}messages AS m
 			INNER JOIN {db_prefix}members AS mem ON (mem.id_member = m.id_member)
 		WHERE m.id_member != 0
-			' . (!empty($duplicate_ids) ? 'AND m.id_member NOT IN ({array_int:duplicate_ids})' : '') . '
+			' . (!empty($duplicate_ids) ? 'AND m.id_member NOT IN ({array_int:duplicate_ids})' : '').'
 			AND m.poster_ip IN ({array_string:ips})',
 		array(
 			'duplicate_ids' => $duplicate_ids,
@@ -1331,8 +1331,8 @@ 
 			foreach ($ip as $id_var => $ip_var)
 			{
 				$ip_var = str_replace('*', '%', $ip_var);
-				$ip_query[] = strpos($ip_var, '%') === false ? '= {string:ip_address_' . $id . '_' . $id_var . '}' : 'LIKE {string:ip_address_' . $id . '_' . $id_var . '}';
-				$ip_params['ip_address_' . $id . '_' . $id_var] = $ip_var;
+				$ip_query[] = strpos($ip_var, '%') === false ? '= {string:ip_address_'.$id.'_'.$id_var.'}' : 'LIKE {string:ip_address_'.$id.'_'.$id_var.'}';
+				$ip_params['ip_address_'.$id.'_'.$id_var] = $ip_var;
 			}
 		}
 	}
@@ -1346,7 +1346,7 @@ 
 	}
 	else
 	{
-		$where = 'member_ip ' . implode(' OR member_ip', $ip_query);
+		$where = 'member_ip '.implode(' OR member_ip', $ip_query);
 		if ($ip2 !== false)
 			$where .= '
 			OR member_ip2 ' . implode(' OR member_ip', $ip_query);
@@ -1408,10 +1408,10 @@ 
 	$members = array();
 	$request = $db->query('', '
 		SELECT id_member' . ($details ? ', member_name, real_name, email_address, member_ip, date_registered, last_login,
-				hide_email, posts, is_activated, real_name' : '') . '
+				hide_email, posts, is_activated, real_name' : '').'
 		FROM {db_prefix}members
-		WHERE ' . $query_where . (isset($query_params['start']) ? '
-		LIMIT {int:start}, {int:limit}' : '') . (!empty($query_params['order']) ? '
+		WHERE ' . $query_where.(isset($query_params['start']) ? '
+		LIMIT {int:start}, {int:limit}' : '').(!empty($query_params['order']) ? '
 		ORDER BY {raw:order}' : ''),
 		$query_params
 	);
@@ -1484,8 +1484,8 @@ 
 
 			foreach ($members['member_names'] as $key => $param)
 			{
-				$mem_query[] = (defined('DB_CASE_SENSITIVE') ? 'LOWER(real_name)' : 'real_name') . ' LIKE {string:member_names_' . $key . '}';
-				$members['member_names_' . $key] = defined('DB_CASE_SENSITIVE') ? strtolower($param) : $param;
+				$mem_query[] = (defined('DB_CASE_SENSITIVE') ? 'LOWER(real_name)' : 'real_name').' LIKE {string:member_names_'.$key.'}';
+				$members['member_names_'.$key] = defined('DB_CASE_SENSITIVE') ? strtolower($param) : $param;
 			}
 			return implode("\n\t\t\tOR ", $mem_query);
 		},
@@ -1568,7 +1568,7 @@ 
 		SELECT id_member, real_name, lngfile
 		FROM {db_prefix}members
 		WHERE (id_group = {int:admin_group} OR FIND_IN_SET({int:admin_group}, additional_groups) != 0)
-			' . (empty($id_admin) ? '' : 'AND id_member = {int:specific_admin}') . '
+			' . (empty($id_admin) ? '' : 'AND id_member = {int:specific_admin}').'
 		ORDER BY real_name, lngfile',
 		array(
 			'admin_group' => 1,
@@ -1651,13 +1651,13 @@ 
 	// Get some additional member info...
 	$request = $db->query('', '
 		SELECT id_member, member_name, real_name, email_address, hide_email, posts, id_theme' . (!empty($options['moderation']) ? ',
-		member_ip, id_group, additional_groups, last_login, id_post_group' : '') . (!empty($options['authentication']) ? ',
-		secret_answer, secret_question, openid_uri, is_activated, validation_code, passwd_flood' : '') . (!empty($options['preferences']) ? ',
-		lngfile, mod_prefs, notify_types, signature' : '') . '
+		member_ip, id_group, additional_groups, last_login, id_post_group' : '').(!empty($options['authentication']) ? ',
+		secret_answer, secret_question, openid_uri, is_activated, validation_code, passwd_flood' : '').(!empty($options['preferences']) ? ',
+		lngfile, mod_prefs, notify_types, signature' : '').'
 		FROM {db_prefix}members
 		WHERE id_member IN ({array_int:member_list})
 		' . (isset($options['sort']) ? '
-		ORDER BY {raw:sort}' : '') . '
+		ORDER BY {raw:sort}' : '').'
 		LIMIT {int:limit}',
 		array(
 			'member_list' => $member_ids,
@@ -1725,7 +1725,7 @@ 
 		SELECT id_member, id_group
 		FROM {db_prefix}members
 		WHERE {raw:real_name} LIKE {string:name}' . ($flexible ? '
-			OR {raw:member_name} LIKE {string:name}' : '') . '
+			OR {raw:member_name} LIKE {string:name}' : '').'
 		LIMIT 1',
 		array(
 			'name' => Util::strtolower($name),
@@ -1765,7 +1765,7 @@ 
 		SELECT id_member, real_name
 		FROM {db_prefix}members
 		WHERE {raw:real_name} LIKE {string:search}' . (!empty($buddies) ? '
-			AND id_member IN ({array_int:buddy_list})' : '') . '
+			AND id_member IN ({array_int:buddy_list})' : '').'
 			AND is_activated IN ({array_int:activation_status})
 		ORDER BY LENGTH(real_name), real_name
 		LIMIT {int:limit}',
@@ -1856,7 +1856,7 @@ 
 	$request = $db->query('', '
 		SELECT id_member, member_name, real_name, email_address, validation_code, lngfile
 		FROM {db_prefix}members
-		WHERE is_activated = {int:activated_status}' . implode('', $query_cond) . '
+		WHERE is_activated = {int:activated_status}' . implode('', $query_cond).'
 		ORDER BY {raw:order_by}' . $limit,
 		$conditions
 	);
@@ -1989,7 +1989,7 @@ 
 		UPDATE {db_prefix}members
 		SET validation_code = {string:validation_code}, is_activated = {int:not_activated}
 		WHERE is_activated = {int:activated_status}
-			' . implode('', $query_cond) . '
+			' . implode('', $query_cond).'
 			AND id_member = {int:selected_member}',
 		$conditions
 	);
@@ -2070,7 +2070,7 @@ 
 		FROM {db_prefix}log_online AS lo
 			LEFT JOIN {db_prefix}members AS mem ON (lo.id_member = mem.id_member)
 			LEFT JOIN {db_prefix}membergroups AS mg ON (mg.id_group = CASE WHEN mem.id_group = {int:regular_member} THEN mem.id_post_group ELSE mem.id_group END)' . (!empty($conditions) ? '
-		WHERE ' . implode(' AND ', $conditions) : '') . '
+		WHERE ' . implode(' AND ', $conditions) : '').'
 		ORDER BY {raw:sort_method} {raw:sort_direction}
 		LIMIT {int:offset}, {int:limit}',
 		array(
@@ -2166,7 +2166,7 @@ 
 		FROM {db_prefix}log_group_requests AS lgr
 			INNER JOIN {db_prefix}members AS mem ON (mem.id_member = lgr.id_member)
 			INNER JOIN {db_prefix}membergroups AS mg ON (mg.id_group = lgr.id_group)
-		WHERE ' . $where . '
+		WHERE ' . $where.'
 			AND lgr.id_request IN ({array_int:request_list})
 		ORDER BY mem.lngfile',
 		array(
@@ -2366,12 +2366,12 @@ 
 		return '1=1';
 	else
 	{
-		require_once(SUBSDIR . '/Boards.subs.php');
+		require_once(SUBSDIR.'/Boards.subs.php');
 
 		$boards_mod = boardsModerated($id_member);
-		$mod_query = empty($boards_mod) ? '' : ' OR b.id_board IN (' . implode(',', $boards_mod) . ')';
+		$mod_query = empty($boards_mod) ? '' : ' OR b.id_board IN ('.implode(',', $boards_mod).')';
 
-		return '((FIND_IN_SET(' . implode(', b.member_groups) != 0 OR FIND_IN_SET(', $groups) . ', b.member_groups) != 0)' . (!empty($modSettings['deny_boards_access']) ? ' AND (FIND_IN_SET(' . implode(', b.deny_member_groups) = 0 AND FIND_IN_SET(', $groups) . ', b.deny_member_groups) = 0)' : '') . $mod_query . ')';
+		return '((FIND_IN_SET('.implode(', b.member_groups) != 0 OR FIND_IN_SET(', $groups).', b.member_groups) != 0)'.(!empty($modSettings['deny_boards_access']) ? ' AND (FIND_IN_SET('.implode(', b.deny_member_groups) = 0 AND FIND_IN_SET(', $groups).', b.deny_member_groups) = 0)' : '').$mod_query.')';
 	}
 }
 
@@ -2480,33 +2480,33 @@ 
 		// Doing an increment?
 		if ($type == 'int' && ($val === '+' || $val === '-'))
 		{
-			$val = $var . ' ' . $val . ' 1';
+			$val = $var.' '.$val.' 1';
 			$type = 'raw';
 		}
 
 		// Ensure posts, personal_messages, and unread_messages don't overflow or underflow.
 		if (in_array($var, array('posts', 'personal_messages', 'unread_messages')))
 		{
-			if (preg_match('~^' . $var . ' (\+ |- |\+ -)([\d]+)~', $val, $match))
+			if (preg_match('~^'.$var.' (\+ |- |\+ -)([\d]+)~', $val, $match))
 			{
 				if ($match[1] != '+ ')
-					$val = 'CASE WHEN ' . $var . ' <= ' . abs($match[2]) . ' THEN 0 ELSE ' . $val . ' END';
+					$val = 'CASE WHEN '.$var.' <= '.abs($match[2]).' THEN 0 ELSE '.$val.' END';
 				$type = 'raw';
 			}
 		}
 
-		$setString .= ' ' . $var . ' = {' . $type . ':p_' . $var . '},';
-		$parameters['p_' . $var] = $val;
+		$setString .= ' '.$var.' = {'.$type.':p_'.$var.'},';
+		$parameters['p_'.$var] = $val;
 	}
 
 	$db->query('', '
 		UPDATE {db_prefix}members
-		SET' . substr($setString, 0, -1) . '
+		SET' . substr($setString, 0, -1).'
 		WHERE ' . $condition,
 		$parameters
 	);
 
-	require_once(SUBSDIR . '/Membergroups.subs.php');
+	require_once(SUBSDIR.'/Membergroups.subs.php');
 	updatePostGroupStats($members, array_keys($data));
 
 	$cache = Cache::instance();
@@ -2521,12 +2521,12 @@ 
 		{
 			if ($cache->checkLevel(3))
 			{
-				$cache->remove('member_data-profile-' . $member);
-				$cache->remove('member_data-normal-' . $member);
-				$cache->remove('member_data-minimal-' . $member);
+				$cache->remove('member_data-profile-'.$member);
+				$cache->remove('member_data-normal-'.$member);
+				$cache->remove('member_data-minimal-'.$member);
 			}
 
-			$cache->remove('user_settings-' . $member);
+			$cache->remove('user_settings-'.$member);
 		}
 	}
 }
@@ -2554,7 +2554,7 @@ 
 	);
 	$ips = array();
 	while ($row = $db->fetch_assoc($request))
-		$ips[$row['member_ip']][] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['display_name'] . '</a>';
+		$ips[$row['member_ip']][] = '<a href="'.$scripturl.'?action=profile;u='.$row['id_member'].'">'.$row['display_name'].'</a>';
 	$db->free_result($request);
 
 	ksort($ips);

sources/subs/Notifications.class.php

Doc Comments +3 added lines

@@ -52,6 +52,9 @@
 	 */
 	protected $_protect_id = true;
 
+	/**
+	 * @param Database $db
+	 */
 	public function __construct($db)
 	{
 		parent::__construct($db);

Spacing +4 added lines, -4 removed lines

@@ -84,7 +84,7 @@ 
 	 */
 	public function send()
 	{
-		Elk_Autoloader::getInstance()->register(SUBSDIR . '/MentionType', '\\ElkArte\\sources\\subs\\MentionType');
+		Elk_Autoloader::getInstance()->register(SUBSDIR.'/MentionType', '\\ElkArte\\sources\\subs\\MentionType');
 
 		$this->_notification_frequencies = array(
 			// 0 is for no notifications, so we start from 1 the counting, that saves a +1 later
@@ -154,8 +154,8 @@ 
 		$obj = new $class($this->_db);
 		$obj->setTask($task);
 
-		require_once(SUBSDIR . '/Notification.subs.php');
-		require_once(SUBSDIR . '/Mail.subs.php');
+		require_once(SUBSDIR.'/Notification.subs.php');
+		require_once(SUBSDIR.'/Mail.subs.php');
 		$notification_frequencies = filterNotificationMethods($this->_notification_frequencies, $class::getType());
 
 		// Cleanup the list of members to notify,
@@ -297,7 +297,7 @@ 
 		// The member 0 is the "default" setting
 		$query_members[] = 0;
 
-		require_once(SUBSDIR . '/Notification.subs.php');
+		require_once(SUBSDIR.'/Notification.subs.php');
 		$preferences = getUsersNotificationsPreferences($notification_type, $query_members);
 
 		$notification_types = array();

sources/subs/Package.subs.php

Doc Comments +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
  * @param bool $single_file = false
  * @param bool $overwrite = false
  * @param string[]|null $files_to_extract = null
- * @return string|false
+ * @return string
  */
 function read_tgz_file($gzfilename, $destination, $single_file = false, $overwrite = false, $files_to_extract = null)
 {
@@ -79,7 +79,7 @@ 
  * @param bool $single_file = false,
  * @param bool $overwrite = false,
  * @param string[]|null $files_to_extract = null
- * @return string|false
+ * @return string
  */
 function read_tgz_data($data, $destination, $single_file = false, $overwrite = false, $files_to_extract = null)
 {

Spacing +97 added lines, -97 removed lines

@@ -81,7 +81,7 @@ 
  */
 function read_tgz_data($data, $destination, $single_file = false, $overwrite = false, $files_to_extract = null)
 {
-	require_once(SUBSDIR . '/UnTgz.class.php');
+	require_once(SUBSDIR.'/UnTgz.class.php');
 	$untgz = new UnTgz($data, $destination, $single_file, $overwrite, $files_to_extract);
 
 	// Choose the right method for the file
@@ -108,7 +108,7 @@ 
  */
 function read_zip_data($data, $destination, $single_file = false, $overwrite = false, $files_to_extract = null)
 {
-	require_once(SUBSDIR . '/UnZip.class.php');
+	require_once(SUBSDIR.'/UnZip.class.php');
 	$unzip = new UnZip($data, $destination, $single_file, $overwrite, $files_to_extract);
 
 	return $unzip->read_zip_data();
@@ -138,7 +138,7 @@ 
 		return false;
 
 	// See if the file is where its supposed to be
-	fputs($fid, 'HEAD ' . $a_url['path'] . ' HTTP/1.0' . "\r\n" . 'Host: ' . $a_url['host'] . "\r\n\r\n");
+	fputs($fid, 'HEAD '.$a_url['path'].' HTTP/1.0'."\r\n".'Host: '.$a_url['host']."\r\n\r\n");
 	$head = fread($fid, 1024);
 	fclose($fid);
 
@@ -161,7 +161,7 @@ 
 	$db = database();
 
 	// First, check that the database is valid, installed.list is still king.
-	$install_file = implode('', file(BOARDDIR . '/packages/installed.list'));
+	$install_file = implode('', file(BOARDDIR.'/packages/installed.list'));
 	if (trim($install_file) == '')
 	{
 		$db->query('', '
@@ -230,14 +230,14 @@ 
 	else
 	{
 		// It must be in the package directory then
-		if (!file_exists(BOARDDIR . '/packages/' . $gzfilename))
+		if (!file_exists(BOARDDIR.'/packages/'.$gzfilename))
 			return 'package_get_error_not_found';
 
 		// Make sure an package.xml file is available
-		if (is_file(BOARDDIR . '/packages/' . $gzfilename))
-			$packageInfo = read_tgz_file(BOARDDIR . '/packages/' . $gzfilename, '*/package-info.xml', true);
-		elseif (file_exists(BOARDDIR . '/packages/' . $gzfilename . '/package-info.xml'))
-			$packageInfo = file_get_contents(BOARDDIR . '/packages/' . $gzfilename . '/package-info.xml');
+		if (is_file(BOARDDIR.'/packages/'.$gzfilename))
+			$packageInfo = read_tgz_file(BOARDDIR.'/packages/'.$gzfilename, '*/package-info.xml', true);
+		elseif (file_exists(BOARDDIR.'/packages/'.$gzfilename.'/package-info.xml'))
+			$packageInfo = file_get_contents(BOARDDIR.'/packages/'.$gzfilename.'/package-info.xml');
 		else
 			return 'package_get_error_missing_xml';
 	}
@@ -246,7 +246,7 @@ 
 	if (empty($packageInfo))
 	{
 		// Perhaps they are trying to install a theme, lets tell them nicely this is the wrong function
-		$packageInfo = read_tgz_file(BOARDDIR . '/packages/' . $gzfilename, '*/theme_info.xml', true);
+		$packageInfo = read_tgz_file(BOARDDIR.'/packages/'.$gzfilename, '*/theme_info.xml', true);
 		if (!empty($packageInfo))
 			return 'package_get_error_is_theme';
 		else
@@ -355,24 +355,24 @@ 
 						'function' => function($rowData) {
 							global $txt;
 
-							return $txt['package_restore_permissions_action_' . $rowData['result']];
+							return $txt['package_restore_permissions_action_'.$rowData['result']];
 						},
 						'class' => 'smalltext',
 					),
 				),
 			),
 			'form' => array(
-				'href' => !empty($chmodOptions['destination_url']) ? $chmodOptions['destination_url'] : $scripturl . '?action=admin;area=packages;sa=perms;restore;' . $context['session_var'] . '=' . $context['session_id'],
+				'href' => !empty($chmodOptions['destination_url']) ? $chmodOptions['destination_url'] : $scripturl.'?action=admin;area=packages;sa=perms;restore;'.$context['session_var'].'='.$context['session_id'],
 			),
 			'additional_rows' => array(
 				array(
 					'position' => 'below_table_data',
-					'value' => '<input type="submit" name="restore_perms" value="' . $txt['package_restore_permissions_restore'] . '" class="right_submit" />',
+					'value' => '<input type="submit" name="restore_perms" value="'.$txt['package_restore_permissions_restore'].'" class="right_submit" />',
 					'class' => 'category_header',
 				),
 				array(
 					'position' => 'after_title',
-					'value' => '<span class="smalltext">' . $txt['package_restore_permissions_desc'] . '</span>',
+					'value' => '<span class="smalltext">'.$txt['package_restore_permissions_desc'].'</span>',
 				),
 			),
 		);
@@ -380,7 +380,7 @@ 
 		// Work out what columns and the like to show.
 		if (!empty($_POST['restore_perms']))
 		{
-			$listOptions['additional_rows'][1]['value'] = sprintf($txt['package_restore_permissions_action_done'], $scripturl . '?action=admin;area=packages;sa=perms;' . $context['session_var'] . '=' . $context['session_id']);
+			$listOptions['additional_rows'][1]['value'] = sprintf($txt['package_restore_permissions_action_done'], $scripturl.'?action=admin;area=packages;sa=perms;'.$context['session_var'].'='.$context['session_id']);
 			unset($listOptions['columns']['check'], $listOptions['form'], $listOptions['additional_rows'][0]);
 
 			$context['sub_template'] = 'show_list';
@@ -585,7 +585,7 @@ 
 			'cur_perms' => substr(sprintf('%o', $file_permissions), -4),
 			'new_perms' => isset($new_permissions) ? substr(sprintf('%o', $new_permissions), -4) : '',
 			'result' => isset($result) ? $result : '',
-			'writable_message' => '<span class="' . (@is_writable($file) ? 'success' : 'alert') . '">' . (@is_writable($file) ? $txt['package_file_perms_writable'] : $txt['package_file_perms_not_writable']) . '</span>',
+			'writable_message' => '<span class="'.(@is_writable($file) ? 'success' : 'alert').'">'.(@is_writable($file) ? $txt['package_file_perms_writable'] : $txt['package_file_perms_not_writable']).'</span>',
 		);
 	}
 
@@ -863,7 +863,7 @@ 
 	$return = array();
 
 	$temp_auto = 0;
-	$temp_path = BOARDDIR . '/packages/temp/' . (isset($context['base_path']) ? $context['base_path'] : '');
+	$temp_path = BOARDDIR.'/packages/temp/'.(isset($context['base_path']) ? $context['base_path'] : '');
 
 	$context['readmes'] = array();
 	$context['licences'] = array();
@@ -884,7 +884,7 @@ 
 			// Allow for translated readme and license files.
 			if ($actionType == 'readme' || $actionType == 'license')
 			{
-				$type = $actionType . 's';
+				$type = $actionType.'s';
 				if ($action->exists('@lang'))
 				{
 					// Auto-select the language based on either request variable or current language.
@@ -920,7 +920,7 @@ 
 			// @todo Make sure the file actually exists?  Might not work when testing?
 			if ($action->exists('@type') && $action->fetch('@type') == 'inline')
 			{
-				$filename = $temp_path . '$auto_' . $temp_auto++ . (in_array($actionType, array('readme', 'redirect', 'license')) ? '.txt' : ($actionType == 'code' || $actionType == 'database' ? '.php' : '.mod'));
+				$filename = $temp_path.'$auto_'.$temp_auto++.(in_array($actionType, array('readme', 'redirect', 'license')) ? '.txt' : ($actionType == 'code' || $actionType == 'database' ? '.php' : '.mod'));
 				package_put_contents($filename, $action->fetch('.'));
 				$filename = strtr($filename, array($temp_path => ''));
 			}
@@ -1002,7 +1002,7 @@ 
 			if (substr($actionType, 0, 6) != 'remove')
 			{
 				$this_action['unparsed_destination'] = $action->fetch('@destination');
-				$this_action['destination'] = parse_path($action->fetch('@destination')) . '/' . basename($this_action['filename']);
+				$this_action['destination'] = parse_path($action->fetch('@destination')).'/'.basename($this_action['filename']);
 			}
 			else
 			{
@@ -1016,7 +1016,7 @@ 
 				if ($action->exists('@from'))
 					$this_action['source'] = parse_path($action->fetch('@from'));
 				else
-					$this_action['source'] = $temp_path . $this_action['filename'];
+					$this_action['source'] = $temp_path.$this_action['filename'];
 			}
 
 			// Check if these things can be done. (chmod's etc.)
@@ -1293,7 +1293,7 @@ 
 	{
 		// Adjust for those wild cards
 		if (strpos($for, '*') !== false)
-			$for = str_replace('*', '0', $for) . '-' . str_replace('*', '999', $for);
+			$for = str_replace('*', '0', $for).'-'.str_replace('*', '999', $for);
 
 		// If we have a range, grab the lower value, done this way so it looks normal-er to the user e.g. 1.0 vs 1.0.99
 		if (strpos($for, '-') !== false)
@@ -1334,7 +1334,7 @@ 
 	{
 		// Wild card spotted?
 		if (strpos($for, '*') !== false)
-			$for = str_replace('*', '0dev0', $for) . '-' . str_replace('*', '999', $for);
+			$for = str_replace('*', '0dev0', $for).'-'.str_replace('*', '999', $for);
 
 		// Do we have a range?
 		if (strpos($for, '-') !== false)
@@ -1442,8 +1442,8 @@ 
 		'EXTDIR' => EXTDIR,
 		'AVATARSDIR' => $modSettings['avatar_directory'],
 		'THEMEDIR' => $settings['default_theme_dir'],
-		'IMAGESDIR' => $settings['default_theme_dir'] . '/' . basename($settings['default_images_url']),
-		'LANGUAGEDIR' => $settings['default_theme_dir'] . '/languages',
+		'IMAGESDIR' => $settings['default_theme_dir'].'/'.basename($settings['default_images_url']),
+		'LANGUAGEDIR' => $settings['default_theme_dir'].'/languages',
 		'SMILEYDIR' => $modSettings['smileys_dir'],
 	);
 
@@ -1518,7 +1518,7 @@ 
 		if ($delete_dir && isset($package_ftp))
 		{
 			$ftp_file = strtr($dir, array($_SESSION['pack_ftp']['root'] => ''));
-			if (!is_writable($dir . '/'))
+			if (!is_writable($dir.'/'))
 				$package_ftp->chmod($ftp_file, 0777);
 			$package_ftp->unlink($ftp_file);
 		}
@@ -1659,24 +1659,24 @@ 
 			continue;
 
 		if (isset($package_ftp))
-			$ftp_file = strtr($destination . '/' . $entryname, array($_SESSION['pack_ftp']['root'] => ''));
+			$ftp_file = strtr($destination.'/'.$entryname, array($_SESSION['pack_ftp']['root'] => ''));
 
-		if (is_file($source . '/' . $entryname))
+		if (is_file($source.'/'.$entryname))
 		{
-			if (isset($package_ftp) && !file_exists($destination . '/' . $entryname))
+			if (isset($package_ftp) && !file_exists($destination.'/'.$entryname))
 				$package_ftp->create_file($ftp_file);
-			elseif (!file_exists($destination . '/' . $entryname))
-				@touch($destination . '/' . $entryname);
+			elseif (!file_exists($destination.'/'.$entryname))
+				@touch($destination.'/'.$entryname);
 		}
 
-		package_chmod($destination . '/' . $entryname);
+		package_chmod($destination.'/'.$entryname);
 
-		if (is_dir($source . '/' . $entryname))
-			copytree($source . '/' . $entryname, $destination . '/' . $entryname);
-		elseif (file_exists($destination . '/' . $entryname))
-			package_put_contents($destination . '/' . $entryname, package_get_contents($source . '/' . $entryname));
+		if (is_dir($source.'/'.$entryname))
+			copytree($source.'/'.$entryname, $destination.'/'.$entryname);
+		elseif (file_exists($destination.'/'.$entryname))
+			package_put_contents($destination.'/'.$entryname, package_get_contents($source.'/'.$entryname));
 		else
-			copy($source . '/' . $entryname, $destination . '/' . $entryname);
+			copy($source.'/'.$entryname, $destination.'/'.$entryname);
 	}
 
 	closedir($current_dir);
@@ -1694,7 +1694,7 @@ 
 {
 	$data = array();
 
-	$dir = @dir($path . $sub_path);
+	$dir = @dir($path.$sub_path);
 	if (!$dir)
 		return array();
 
@@ -1703,12 +1703,12 @@ 
 		if ($entry == '.' || $entry == '..')
 			continue;
 
-		if (is_dir($path . $sub_path . '/' . $entry))
-			$data = array_merge($data, listtree($path, $sub_path . '/' . $entry));
+		if (is_dir($path.$sub_path.'/'.$entry))
+			$data = array_merge($data, listtree($path, $sub_path.'/'.$entry));
 		else
 			$data[] = array(
-				'filename' => $sub_path == '' ? $entry : $sub_path . '/' . $entry,
-				'size' => filesize($path . $sub_path . '/' . $entry),
+				'filename' => $sub_path == '' ? $entry : $sub_path.'/'.$entry,
+				'size' => filesize($path.$sub_path.'/'.$entry),
 				'skipped' => false,
 			);
 	}
@@ -1768,7 +1768,7 @@ 
 			// If this filename is relative, if so take a guess at what it should be.
 			$real_filename = $filename;
 			if (strpos($filename, 'themes') === 0)
-				$real_filename = BOARDDIR . '/' . $filename;
+				$real_filename = BOARDDIR.'/'.$filename;
 
 			if (strpos($real_filename, $theme['theme_dir']) === 0)
 			{
@@ -1794,10 +1794,10 @@ 
 			foreach ($template_changes[1] as $index => $template_file)
 			{
 				// What, it exists and we haven't already got it?! Lordy, get it in!
-				if (file_exists($theme['theme_dir'] . '/' . $template_file) && (!isset($template_changes[$id]) || !in_array($template_file, $template_changes[$id])))
+				if (file_exists($theme['theme_dir'].'/'.$template_file) && (!isset($template_changes[$id]) || !in_array($template_file, $template_changes[$id])))
 				{
 					// Now let's add it to the "todo" list.
-					$custom_themes_add[$long_changes[1][$index]][$id] = $theme['theme_dir'] . '/' . $template_file;
+					$custom_themes_add[$long_changes[1][$index]][$id] = $theme['theme_dir'].'/'.$template_file;
 				}
 			}
 		}
@@ -1819,9 +1819,9 @@ 
 		{
 			if ($working_file[0] != '/' && $working_file[1] != ':')
 			{
-				trigger_error('parseModification(): The filename \'' . $working_file . '\' is not a full path!', E_USER_WARNING);
+				trigger_error('parseModification(): The filename \''.$working_file.'\' is not a full path!', E_USER_WARNING);
 
-				$working_file = BOARDDIR . '/' . $working_file;
+				$working_file = BOARDDIR.'/'.$working_file;
 			}
 
 			// Doesn't exist - give an error or what?
@@ -1927,7 +1927,7 @@ 
 							if ($search['position'] === 'before')
 								$actual_operation['searches'][$i]['search'] .= $search['add'];
 							elseif ($search['position'] === 'after')
-								$actual_operation['searches'][$i]['search'] = $search['add'] . $search['search'];
+								$actual_operation['searches'][$i]['search'] = $search['add'].$search['search'];
 						}
 
 						// ...and the search subject is now the replacement.
@@ -1968,19 +1968,19 @@ 
 					}
 
 					// Shuzzup.  This is done so we can safely use a regular expression. ($0 is bad!!)
-					$actual_operation['searches'][$i]['preg_replace'] = strtr($search['add'], array('$' => '[$PACK' . 'AGE1$]', '\\' => '[$PACK' . 'AGE2$]'));
+					$actual_operation['searches'][$i]['preg_replace'] = strtr($search['add'], array('$' => '[$PACK'.'AGE1$]', '\\' => '[$PACK'.'AGE2$]'));
 
 					// Before, so the replacement comes after the search subject :P
 					if ($search['position'] === 'before')
 					{
-						$actual_operation['searches'][$i]['preg_search'] = '(' . $actual_operation['searches'][$i]['preg_search'] . ')';
-						$actual_operation['searches'][$i]['preg_replace'] = '$1' . $actual_operation['searches'][$i]['preg_replace'];
+						$actual_operation['searches'][$i]['preg_search'] = '('.$actual_operation['searches'][$i]['preg_search'].')';
+						$actual_operation['searches'][$i]['preg_replace'] = '$1'.$actual_operation['searches'][$i]['preg_replace'];
 					}
 
 					// After, after what?
 					elseif ($search['position'] === 'after')
 					{
-						$actual_operation['searches'][$i]['preg_search'] = '(' . $actual_operation['searches'][$i]['preg_search'] . ')';
+						$actual_operation['searches'][$i]['preg_search'] = '('.$actual_operation['searches'][$i]['preg_search'].')';
 						$actual_operation['searches'][$i]['preg_replace'] .= '$1';
 					}
 
@@ -1999,7 +1999,7 @@ 
 					}
 
 					// Testing 1, 2, 3...
-					$failed = preg_match('~' . $actual_operation['searches'][$i]['preg_search'] . '~s', $working_data) === 0;
+					$failed = preg_match('~'.$actual_operation['searches'][$i]['preg_search'].'~s', $working_data) === 0;
 
 					// Nope, search pattern not found.
 					if ($failed && $actual_operation['error'] === 'fatal')
@@ -2042,7 +2042,7 @@ 
 						continue;
 
 					// Finally, we're doing some replacements.
-					$working_data = preg_replace('~' . $actual_operation['searches'][$i]['preg_search'] . '~s', $actual_operation['searches'][$i]['preg_replace'], $working_data, 1);
+					$working_data = preg_replace('~'.$actual_operation['searches'][$i]['preg_search'].'~s', $actual_operation['searches'][$i]['preg_replace'], $working_data, 1);
 
 					$actions[] = array(
 						'type' => 'replace',
@@ -2060,7 +2060,7 @@ 
 			}
 
 			// Fix any little helper symbols ;).
-			$working_data = strtr($working_data, array('[$PACK' . 'AGE1$]' => '$', '[$PACK' . 'AGE2$]' => '\\'));
+			$working_data = strtr($working_data, array('[$PACK'.'AGE1$]' => '$', '[$PACK'.'AGE2$]' => '\\'));
 
 			package_chmod($working_file);
 
@@ -2077,9 +2077,9 @@ 
 			{
 				// No, no, not Settings.php!
 				if (basename($working_file) == 'Settings.php')
-					@copy($working_file, dirname($working_file) . '/Settings_bak.php');
+					@copy($working_file, dirname($working_file).'/Settings_bak.php');
 				else
-					@copy($working_file, $working_file . '~');
+					@copy($working_file, $working_file.'~');
 			}
 
 			// Always call this, even if in testing, because it won't really be written in testing mode.
@@ -2427,16 +2427,16 @@ 
 	$base_files = array('index.php', 'SSI.php', 'agreement.txt', 'ssi_examples.php', 'ssi_examples.shtml', 'subscriptions.php', 'email_imap_cron.php', 'emailpost.php', 'emailtopic.php');
 	foreach ($base_files as $file)
 	{
-		if (file_exists(BOARDDIR . '/' . $file))
-			$files[realpath(BOARDDIR . '/' . $file)] = array(
-				empty($_REQUEST['use_full_paths']) ? $file : BOARDDIR . '/' . $file,
-				stat(BOARDDIR . '/' . $file)
+		if (file_exists(BOARDDIR.'/'.$file))
+			$files[realpath(BOARDDIR.'/'.$file)] = array(
+				empty($_REQUEST['use_full_paths']) ? $file : BOARDDIR.'/'.$file,
+				stat(BOARDDIR.'/'.$file)
 			);
 	}
 
 	// Root directory where most of our files reside
 	$dirs = array(
-		SOURCEDIR => empty($_REQUEST['use_full_paths']) ? 'sources/' : strtr(SOURCEDIR . '/', '\\', '/')
+		SOURCEDIR => empty($_REQUEST['use_full_paths']) ? 'sources/' : strtr(SOURCEDIR.'/', '\\', '/')
 	);
 
 	// Find all installed theme directories
@@ -2451,7 +2451,7 @@ 
 		)
 	);
 	while ($row = $db->fetch_assoc($request))
-		$dirs[$row['value']] = empty($_REQUEST['use_full_paths']) ? 'themes/' . basename($row['value']) . '/' : strtr($row['value'] . '/', '\\', '/');
+		$dirs[$row['value']] = empty($_REQUEST['use_full_paths']) ? 'themes/'.basename($row['value']).'/' : strtr($row['value'].'/', '\\', '/');
 	$db->free_result($request);
 
 	// While we have directory's to check
@@ -2469,42 +2469,42 @@ 
 			if (preg_match('~^(\.{1,2}|CVS|backup.*|help|images|.*\~)$~', $entry) != 0)
 				continue;
 
-			$filepath = realpath($dir . '/' . $entry);
+			$filepath = realpath($dir.'/'.$entry);
 			if (isset($files[$filepath]))
 				continue;
 
-			$stat = stat($dir . '/' . $entry);
+			$stat = stat($dir.'/'.$entry);
 
 			// If this is a directory, add it to the dir stack for processing
 			if ($stat['mode'] & 040000)
 			{
-				$files[$filepath] = array($dest . $entry . '/', $stat);
-				$dirs[$dir . '/' . $entry] = $dest . $entry . '/';
+				$files[$filepath] = array($dest.$entry.'/', $stat);
+				$dirs[$dir.'/'.$entry] = $dest.$entry.'/';
 			}
 			else
-				$files[$filepath] = array($dest . $entry, $stat);
+				$files[$filepath] = array($dest.$entry, $stat);
 		}
 
 		$listing->close();
 	}
 
 	// Make sure we have a backup directory and its writable
-	if (!file_exists(BOARDDIR . '/packages/backups'))
-		mktree(BOARDDIR . '/packages/backups', 0777);
+	if (!file_exists(BOARDDIR.'/packages/backups'))
+		mktree(BOARDDIR.'/packages/backups', 0777);
 
-	if (!is_writable(BOARDDIR . '/packages/backups'))
-		package_chmod(BOARDDIR . '/packages/backups');
+	if (!is_writable(BOARDDIR.'/packages/backups'))
+		package_chmod(BOARDDIR.'/packages/backups');
 
 	// Name the output file, yyyy-mm-dd_before_package_name.tar.gz
-	$output_file = BOARDDIR . '/packages/backups/' . strftime('%Y-%m-%d_') . preg_replace('~[$\\\\/:<>|?*"\']~', '', $id);
-	$output_ext = '.tar' . (function_exists('gzopen') ? '.gz' : '');
+	$output_file = BOARDDIR.'/packages/backups/'.strftime('%Y-%m-%d_').preg_replace('~[$\\\\/:<>|?*"\']~', '', $id);
+	$output_ext = '.tar'.(function_exists('gzopen') ? '.gz' : '');
 
-	if (file_exists($output_file . $output_ext))
+	if (file_exists($output_file.$output_ext))
 	{
 		$i = 2;
-		while (file_exists($output_file . '_' . $i . $output_ext))
+		while (file_exists($output_file.'_'.$i.$output_ext))
 			$i++;
-		$output_file = $output_file . '_' . $i . $output_ext;
+		$output_file = $output_file.'_'.$i.$output_ext;
 	}
 	else
 		$output_file .= $output_ext;
@@ -2564,7 +2564,7 @@ 
 			$checksum += ord($current[$i]);
 
 		// Write out the file header (insert the checksum we just computed)
-		$fwrite($output, substr($current, 0, 148) . pack('a8', decoct($checksum)) . substr($current, 156, 511));
+		$fwrite($output, substr($current, 0, 148).pack('a8', decoct($checksum)).substr($current, 156, 511));
 
 		// If this is a directory entry all that's needed is the header
 		if ($stat['size'] == 0)
@@ -2577,7 +2577,7 @@ 
 		fclose($fp);
 
 		// Pad the output so its on 512 boundary's
-		$fwrite($output, pack('a' . (512 - $stat['size'] % 512), ''));
+		$fwrite($output, pack('a'.(512 - $stat['size'] % 512), ''));
 	}
 
 	$fwrite($output, pack('a1024', ''));
@@ -2612,12 +2612,12 @@ 
 	elseif ($match[1] == 'ftp')
 	{
 		// Establish a connection and attempt to enable passive mode.
-		$ftp = new Ftp_Connection(($match[2] ? 'ssl://' : '') . $match[3], empty($match[5]) ? 21 : $match[5], 'anonymous', $webmaster_email);
+		$ftp = new Ftp_Connection(($match[2] ? 'ssl://' : '').$match[3], empty($match[5]) ? 21 : $match[5], 'anonymous', $webmaster_email);
 		if ($ftp->error !== false || !$ftp->passive())
 			return false;
 
 		// I want that one *points*!
-		fwrite($ftp->connection, 'RETR ' . $match[6] . "\r\n");
+		fwrite($ftp->connection, 'RETR '.$match[6]."\r\n");
 
 		// Since passive mode worked (or we would have returned already!) open the connection.
 		$fp = @fsockopen($ftp->pasv['ip'], $ftp->pasv['port'], $err, $err, 5);
@@ -2656,7 +2656,7 @@ 
 		if (empty($fp))
 		{
 			// Open the socket on the port we want...
-			$fp = @fsockopen(($match[2] ? 'ssl://' : '') . $match[3], empty($match[5]) ? ($match[2] ? 443 : 80) : $match[5], $err, $err, 5);
+			$fp = @fsockopen(($match[2] ? 'ssl://' : '').$match[3], empty($match[5]) ? ($match[2] ? 443 : 80) : $match[5], $err, $err, 5);
 			if (!$fp)
 				return false;
 		}
@@ -2670,25 +2670,25 @@ 
 		// I want this, from there, and I'm not going to be bothering you for more (probably.)
 		if (empty($post_data))
 		{
-			fwrite($fp, 'GET ' . ($match[6] !== '/' ? str_replace(' ', '%20', $match[6]) : '') . ' HTTP/1.0' . "\r\n");
-			fwrite($fp, 'Host: ' . $match[3] . (empty($match[5]) ? ($match[2] ? ':443' : '') : ':' . $match[5]) . "\r\n");
-			fwrite($fp, 'User-Agent: PHP/ELK' . "\r\n");
+			fwrite($fp, 'GET '.($match[6] !== '/' ? str_replace(' ', '%20', $match[6]) : '').' HTTP/1.0'."\r\n");
+			fwrite($fp, 'Host: '.$match[3].(empty($match[5]) ? ($match[2] ? ':443' : '') : ':'.$match[5])."\r\n");
+			fwrite($fp, 'User-Agent: PHP/ELK'."\r\n");
 			if ($keep_alive)
-				fwrite($fp, 'Connection: Keep-Alive' . "\r\n\r\n");
+				fwrite($fp, 'Connection: Keep-Alive'."\r\n\r\n");
 			else
-				fwrite($fp, 'Connection: close' . "\r\n\r\n");
+				fwrite($fp, 'Connection: close'."\r\n\r\n");
 		}
 		else
 		{
-			fwrite($fp, 'POST ' . ($match[6] !== '/' ? $match[6] : '') . ' HTTP/1.0' . "\r\n");
-			fwrite($fp, 'Host: ' . $match[3] . (empty($match[5]) ? ($match[2] ? ':443' : '') : ':' . $match[5]) . "\r\n");
-			fwrite($fp, 'User-Agent: PHP/ELK' . "\r\n");
+			fwrite($fp, 'POST '.($match[6] !== '/' ? $match[6] : '').' HTTP/1.0'."\r\n");
+			fwrite($fp, 'Host: '.$match[3].(empty($match[5]) ? ($match[2] ? ':443' : '') : ':'.$match[5])."\r\n");
+			fwrite($fp, 'User-Agent: PHP/ELK'."\r\n");
 			if ($keep_alive)
-				fwrite($fp, 'Connection: Keep-Alive' . "\r\n");
+				fwrite($fp, 'Connection: Keep-Alive'."\r\n");
 			else
-				fwrite($fp, 'Connection: close' . "\r\n");
-			fwrite($fp, 'Content-Type: application/x-www-form-urlencoded' . "\r\n");
-			fwrite($fp, 'Content-Length: ' . strlen($post_data) . "\r\n\r\n");
+				fwrite($fp, 'Connection: close'."\r\n");
+			fwrite($fp, 'Content-Type: application/x-www-form-urlencoded'."\r\n");
+			fwrite($fp, 'Content-Length: '.strlen($post_data)."\r\n\r\n");
 			fwrite($fp, $post_data);
 		}
 
@@ -2757,7 +2757,7 @@ 
 
 if (!function_exists('crc32_compat'))
 {
-	require_once(SUBSDIR . '/Compat.subs.php');
+	require_once(SUBSDIR.'/Compat.subs.php');
 }
 
 /**
@@ -2791,7 +2791,7 @@ 
 		FROM {db_prefix}log_packages
 		WHERE package_id = {string:current_package}
 			AND install_state != {int:not_installed}
-			' . (!empty($install_id) ? ' AND id_install = {int:install_id} ' : '') . '
+			' . (!empty($install_id) ? ' AND id_install = {int:install_id} ' : '').'
 		ORDER BY time_installed DESC
 		LIMIT 1',
 		array(
@@ -2945,7 +2945,7 @@ 
 		return false;
 
 	foreach ($servers as $server)
-		if (preg_match('~^' . preg_quote($server) . '~', $remote_url) == 0)
+		if (preg_match('~^'.preg_quote($server).'~', $remote_url) == 0)
 			return true;
 
 	return false;