SimpleMachines / SMF2.1

Themes/index.php

Braces +2 added lines, -1 removed lines

@@ -12,7 +12,8 @@
 	header('location: ' . $boardurl);
 }
 // Can't find it... just forget it.
-else
+else {
 	exit;
+}
 
 ?>
\ No newline at end of file

Sources/Session.php

Braces +37 added lines, -25 removed lines

@@ -17,8 +17,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Attempt to start the session, unless it already has been.
@@ -38,8 +39,9 @@ 
 	{
 		$parsed_url = parse_url($boardurl);
 
-		if (preg_match('~^\d{1,3}(\.\d{1,3}){3}$~', $parsed_url['host']) == 0 && preg_match('~(?:[^\.]+\.)?([^\.]{2,}\..+)\z~i', $parsed_url['host'], $parts) == 1)
-			@ini_set('session.cookie_domain', '.' . $parts[1]);
+		if (preg_match('~^\d{1,3}(\.\d{1,3}){3}$~', $parsed_url['host']) == 0 && preg_match('~(?:[^\.]+\.)?([^\.]{2,}\..+)\z~i', $parsed_url['host'], $parts) == 1) {
+					@ini_set('session.cookie_domain', '.' . $parts[1]);
+		}
 	}
 	// @todo Set the session cookie path?
 
@@ -47,8 +49,9 @@ 
 	if ((ini_get('session.auto_start') == 1 && !empty($modSettings['databaseSession_enable'])) || session_id() == '')
 	{
 		// Attempt to end the already-started session.
-		if (ini_get('session.auto_start') == 1)
-			session_write_close();
+		if (ini_get('session.auto_start') == 1) {
+					session_write_close();
+		}
 
 		// This is here to stop people from using bad junky PHPSESSIDs.
 		if (isset($_REQUEST[session_name()]) && preg_match('~^[A-Za-z0-9,-]{16,64}$~', $_REQUEST[session_name()]) == 0 && !isset($_COOKIE[session_name()]))
@@ -63,23 +66,26 @@ 
 		if (!empty($modSettings['databaseSession_enable']))
 		{
 			@ini_set('session.serialize_handler', 'php_serialize');
-			if (ini_get('session.serialize_handler') != 'php_serialize')
-				@ini_set('session.serialize_handler', 'php');
+			if (ini_get('session.serialize_handler') != 'php_serialize') {
+							@ini_set('session.serialize_handler', 'php');
+			}
 			session_set_save_handler('sessionOpen', 'sessionClose', 'sessionRead', 'sessionWrite', 'sessionDestroy', 'sessionGC');
 			@ini_set('session.gc_probability', '1');
+		} elseif (ini_get('session.gc_maxlifetime') <= 1440 && !empty($modSettings['databaseSession_lifetime'])) {
+					@ini_set('session.gc_maxlifetime', max($modSettings['databaseSession_lifetime'], 60));
 		}
-		elseif (ini_get('session.gc_maxlifetime') <= 1440 && !empty($modSettings['databaseSession_lifetime']))
-			@ini_set('session.gc_maxlifetime', max($modSettings['databaseSession_lifetime'], 60));
 
 		// Use cache setting sessions?
-		if (empty($modSettings['databaseSession_enable']) && !empty($modSettings['cache_enable']) && php_sapi_name() != 'cli')
-			call_integration_hook('integrate_session_handlers');
+		if (empty($modSettings['databaseSession_enable']) && !empty($modSettings['cache_enable']) && php_sapi_name() != 'cli') {
+					call_integration_hook('integrate_session_handlers');
+		}
 
 		session_start();
 
 		// Change it so the cache settings are a little looser than default.
-		if (!empty($modSettings['databaseSession_loose']))
-			header('cache-control: private');
+		if (!empty($modSettings['databaseSession_loose'])) {
+					header('cache-control: private');
+		}
 	}
 
 	// Set the randomly generated code.
@@ -125,8 +131,9 @@ 
 {
 	global $smcFunc;
 
-	if (preg_match('~^[A-Za-z0-9,-]{16,64}$~', $session_id) == 0)
-		return '';
+	if (preg_match('~^[A-Za-z0-9,-]{16,64}$~', $session_id) == 0) {
+			return '';
+	}
 
 	// Look for it in the database.
 	$result = $smcFunc['db_query']('', '
@@ -155,8 +162,9 @@ 
 {
 	global $smcFunc, $db_connection, $db_server, $db_name, $db_user, $db_passwd, $db_prefix, $db_persist, $db_port;
 
-	if (preg_match('~^[A-Za-z0-9,-]{16,64}$~', $session_id) == 0)
-		return false;
+	if (preg_match('~^[A-Za-z0-9,-]{16,64}$~', $session_id) == 0) {
+			return false;
+	}
 
 	// php < 7.0 need this
 	if (empty($db_connection))
@@ -164,8 +172,9 @@ 
 		$db_options = array();
 
 		// Add in the port if needed
-		if (!empty($db_port))
-			$db_options['port'] = $db_port;
+		if (!empty($db_port)) {
+					$db_options['port'] = $db_port;
+		}
 		$options = array_merge($db_options, array('persist' => $db_persist, 'dont_select_db' => SMF == 'SSI'));
 
 		$db_connection = smf_db_initiate($db_server, $db_name, $db_user, $db_passwd, $db_prefix, $options);
@@ -184,13 +193,14 @@ 
 	);
 
 	// If that didn't work, try inserting a new one.
-	if ($smcFunc['db_affected_rows']() == 0)
-		$smcFunc['db_insert']('ignore',
+	if ($smcFunc['db_affected_rows']() == 0) {
+			$smcFunc['db_insert']('ignore',
 			'{db_prefix}sessions',
 			array('session_id' => 'string', 'data' => 'string', 'last_update' => 'int'),
 			array($session_id, $data, time()),
 			array('session_id')
 		);
+	}
 
 	return ($smcFunc['db_affected_rows']() == 0 ? false : true);
 }
@@ -205,8 +215,9 @@ 
 {
 	global $smcFunc;
 
-	if (preg_match('~^[A-Za-z0-9,-]{16,64}$~', $session_id) == 0)
-		return false;
+	if (preg_match('~^[A-Za-z0-9,-]{16,64}$~', $session_id) == 0) {
+			return false;
+	}
 
 	// Just delete the row...
 	$smcFunc['db_query']('', '
@@ -232,8 +243,9 @@ 
 	global $modSettings, $smcFunc;
 
 	// Just set to the default or lower?  Ignore it for a higher value. (hopefully)
-	if (!empty($modSettings['databaseSession_lifetime']) && ($max_lifetime <= 1440 || $modSettings['databaseSession_lifetime'] > $max_lifetime))
-		$max_lifetime = max($modSettings['databaseSession_lifetime'], 60);
+	if (!empty($modSettings['databaseSession_lifetime']) && ($max_lifetime <= 1440 || $modSettings['databaseSession_lifetime'] > $max_lifetime)) {
+			$max_lifetime = max($modSettings['databaseSession_lifetime'], 60);
+	}
 
 	// Clean up after yerself ;).
 	$smcFunc['db_query']('', '

Sources/DbExtra-mysql.php

Braces +72 added lines, -51 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Add the functions implemented in this file to the $smcFunc array.
@@ -23,8 +24,8 @@ 
 {
 	global $smcFunc;
 
-	if (!isset($smcFunc['db_backup_table']) || $smcFunc['db_backup_table'] != 'smf_db_backup_table')
-		$smcFunc += array(
+	if (!isset($smcFunc['db_backup_table']) || $smcFunc['db_backup_table'] != 'smf_db_backup_table') {
+			$smcFunc += array(
 			'db_backup_table' => 'smf_db_backup_table',
 			'db_optimize_table' => 'smf_db_optimize_table',
 			'db_table_sql' => 'smf_db_table_sql',
@@ -33,7 +34,8 @@ 
 			'db_get_vendor' => 'smf_db_get_vendor',
 			'db_allow_persistent' => 'smf_db_allow_persistent',
 		);
-}
+	}
+	}
 
 /**
  * Backup $table to $backup_table.
@@ -75,8 +77,9 @@ 
 			));
 
 		// Old school or no school?
-		if ($request)
-			return $request;
+		if ($request) {
+					return $request;
+		}
 	}
 
 	// At this point, the quick method failed.
@@ -100,8 +103,9 @@ 
 	foreach ($create as $k => $l)
 	{
 		// Get the name of the auto_increment column.
-		if (strpos($l, 'auto_increment'))
-			$auto_inc = trim($l);
+		if (strpos($l, 'auto_increment')) {
+					$auto_inc = trim($l);
+		}
 
 		// For the engine type, see if we can work out what it is.
 		if (strpos($l, 'ENGINE') !== false || strpos($l, 'TYPE') !== false)
@@ -109,30 +113,36 @@ 
 			// Extract the engine type.
 			preg_match('~(ENGINE|TYPE)=(\w+)(\sDEFAULT)?(\sCHARSET=(\w+))?(\sCOLLATE=(\w+))?~', $l, $match);
 
-			if (!empty($match[1]))
-				$engine = $match[1];
+			if (!empty($match[1])) {
+							$engine = $match[1];
+			}
 
-			if (!empty($match[2]))
-				$engine = $match[2];
+			if (!empty($match[2])) {
+							$engine = $match[2];
+			}
 
-			if (!empty($match[5]))
-				$charset = $match[5];
+			if (!empty($match[5])) {
+							$charset = $match[5];
+			}
 
-			if (!empty($match[7]))
-				$collate = $match[7];
+			if (!empty($match[7])) {
+							$collate = $match[7];
+			}
 		}
 
 		// Skip everything but keys...
-		if (strpos($l, 'KEY') === false)
-			unset($create[$k]);
+		if (strpos($l, 'KEY') === false) {
+					unset($create[$k]);
+		}
 	}
 
-	if (!empty($create))
-		$create = '(
+	if (!empty($create)) {
+			$create = '(
 			' . implode('
 			', $create) . ')';
-	else
-		$create = '';
+	} else {
+			$create = '';
+	}
 
 	$request = $smcFunc['db_query']('', '
 		CREATE TABLE {raw:backup_table} {raw:create}
@@ -151,8 +161,9 @@ 
 
 	if ($auto_inc != '')
 	{
-		if (preg_match('~\`(.+?)\`\s~', $auto_inc, $match) != 0 && substr($auto_inc, -1, 1) == ',')
-			$auto_inc = substr($auto_inc, 0, -1);
+		if (preg_match('~\`(.+?)\`\s~', $auto_inc, $match) != 0 && substr($auto_inc, -1, 1) == ',') {
+					$auto_inc = substr($auto_inc, 0, -1);
+		}
 
 		$smcFunc['db_query']('', '
 			ALTER TABLE {raw:backup_table}
@@ -196,8 +207,9 @@ 
 				'table' => $table,
 			)
 		);
-	if (!$request)
-		return -1;
+	if (!$request) {
+			return -1;
+	}
 
 	// How much left?
 	$request = $smcFunc['db_query']('', '
@@ -240,8 +252,9 @@ 
 		)
 	);
 	$tables = array();
-	while ($row = $smcFunc['db_fetch_row']($request))
-		$tables[] = $row[0];
+	while ($row = $smcFunc['db_fetch_row']($request)) {
+			$tables[] = $row[0];
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $tables;
@@ -285,8 +298,9 @@ 
 		if (!empty($row['Default']) || $row['Null'] !== 'YES')
 		{
 			// Make a special case of auto-timestamp.
-			if ($row['Default'] == 'CURRENT_TIMESTAMP')
-				$schema_create .= ' /*!40102 NOT NULL default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP */';
+			if ($row['Default'] == 'CURRENT_TIMESTAMP') {
+							$schema_create .= ' /*!40102 NOT NULL default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP */';
+			}
 			// Text shouldn't have a default.
 			elseif ($row['Default'] !== null)
 			{
@@ -321,14 +335,16 @@ 
 		$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']]))
-			$indexes[$row['Key_name']] = array();
+		if (empty($indexes[$row['Key_name']])) {
+					$indexes[$row['Key_name']] = array();
+		}
 
 		// 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'] . ')';
-		else
-			$indexes[$row['Key_name']][$row['Seq_in_index']] = '`' . $row['Column_name'] . '`';
+		if (!empty($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'] . '`';
+		}
 	}
 	$smcFunc['db_free_result']($result);
 
@@ -366,8 +382,9 @@ 
 {
 	static $ver;
 
-	if (!empty($ver))
-		return $ver;
+	if (!empty($ver)) {
+			return $ver;
+	}
 
 	global $smcFunc;
 
@@ -392,8 +409,9 @@ 
 	global $smcFunc;
 	static $db_type;
 
-	if (!empty($db_type))
-		return $db_type;
+	if (!empty($db_type)) {
+			return $db_type;
+	}
 
 	$request = $smcFunc['db_query']('', 'SELECT @@version_comment');
 	list ($comment) = $smcFunc['db_fetch_row']($request);
@@ -402,13 +420,15 @@ 
 	// Skip these if we don't have a comment.
 	if (!empty($comment))
 	{
-		if (stripos($comment, 'percona') !== false)
-			return 'Percona';
-		if (stripos($comment, 'mariadb') !== false)
-			return 'MariaDB';
+		if (stripos($comment, 'percona') !== false) {
+					return 'Percona';
+		}
+		if (stripos($comment, 'mariadb') !== false) {
+					return 'MariaDB';
+		}
+	} else {
+			return 'fail';
 	}
-	else
-		return 'fail';
 
 	return 'MySQL';
 }
@@ -421,10 +441,11 @@ 
 function smf_db_allow_persistent()
 {
 	$value = ini_get('mysqli.allow_persistent');
-	if ($value == 'on' || $value == 'true')
-		return true;
-	else
-		return false;
-}
+	if ($value == 'on' || $value == 'true') {
+			return true;
+	} else {
+			return false;
+	}
+	}
 
 ?>
\ No newline at end of file

proxy.php

Spacing +1 added lines, -1 removed lines

@@ -140,7 +140,7 @@
 		$max_age = $time - $cached['time'] + (5 * 86400);
 		header('content-type: ' . $cached['content_type']);
 		header('content-length: ' . $cached['size']);
-		header('cache-control: public, max-age=' . $max_age );
+		header('cache-control: public, max-age=' . $max_age);
 		header('last-modified: ' . gmdate('D, d M Y H:i:s', $cached['time']) . ' GMT');
 		header('etag: ' . $eTag);
 		echo base64_decode($cached['body']);

Braces +27 added lines, -18 removed lines

@@ -70,26 +70,31 @@ 
 	 */
 	public function checkRequest()
 	{
-		if (!$this->enabled)
-			return false;
+		if (!$this->enabled) {
+					return false;
+		}
 
 		// Try to create the image cache directory if it doesn't exist
-		if (!file_exists($this->cache))
-			if (!mkdir($this->cache) || !copy(dirname($this->cache) . '/index.php', $this->cache . '/index.php'))
+		if (!file_exists($this->cache)) {
+					if (!mkdir($this->cache) || !copy(dirname($this->cache) . '/index.php', $this->cache . '/index.php'))
 				return false;
+		}
 
-		if (empty($_GET['hash']) || empty($_GET['request']) || ($_GET['request'] === "http:") || ($_GET['request'] === "https:"))
-			return false;
+		if (empty($_GET['hash']) || empty($_GET['request']) || ($_GET['request'] === "http:") || ($_GET['request'] === "https:")) {
+					return false;
+		}
 
 		$hash = $_GET['hash'];
 		$request = $_GET['request'];
 
-		if (md5($request . $this->secret) != $hash)
-			return false;
+		if (md5($request . $this->secret) != $hash) {
+					return false;
+		}
 
 		// Attempt to cache the request if it doesn't exist
-		if (!$this->isCached($request))
-			return $this->cacheImage($request);
+		if (!$this->isCached($request)) {
+					return $this->cacheImage($request);
+		}
 
 		return true;
 	}
@@ -126,8 +131,9 @@ 
 		if (!$cached || time() - $cached['time'] > ($this->maxDays * 86400))
 		{
 			@unlink($cached_file);
-			if ($this->checkRequest())
-				$this->serve();
+			if ($this->checkRequest()) {
+							$this->serve();
+			}
 			$this::redirectexit($request);
 		}
 
@@ -140,8 +146,9 @@ 
 
 		// Make sure we're serving an image
 		$contentParts = explode('/', !empty($cached['content_type']) ? $cached['content_type'] : '');
-		if ($contentParts[0] != 'image')
-			exit;
+		if ($contentParts[0] != 'image') {
+					exit;
+		}
 
 		$max_age = $time - $cached['time'] + (5 * 86400);
 		header('content-type: ' . $cached['content_type']);
@@ -200,12 +207,14 @@ 
 
 		// Make sure the url is returning an image
 		$contentParts = explode('/', !empty($headers['content-type']) ? $headers['content-type'] : '');
-		if ($contentParts[0] != 'image')
-			return -1;
+		if ($contentParts[0] != 'image') {
+					return -1;
+		}
 
 		// Validate the filesize
-		if ($response['size'] > ($this->maxSize * 1024))
-			return 0;
+		if ($response['size'] > ($this->maxSize * 1024)) {
+					return 0;
+		}
 
 		$time = $this->getTime();