albertlast / SMF2.1

Sources/CacheAPI-smf.php

Doc Comments +1 added lines, -1 removed lines

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

Braces +36 added lines, -26 removed lines

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

Sources/CacheAPI-xcache.php

Braces +19 added lines, -13 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 /**
  * Our Cache API class
@@ -46,8 +47,9 @@ 
 
 		$supported = function_exists('xcache_get') && function_exists('xcache_set') && ini_get('xcache.var_size') > 0;
 
-		if ($test)
-			return $supported;
+		if ($test) {
+					return $supported;
+		}
 		return parent::isSupported() && $supported;
 	}
 
@@ -68,10 +70,11 @@ 
 	{
 		$key = $this->prefix . strtr($key, ':/', '-_');
 
-		if ($value === null)
-			return xcache_unset($key);
-		else
-			return xcache_set($key, $value, $ttl);
+		if ($value === null) {
+					return xcache_unset($key);
+		} else {
+					return xcache_set($key, $value, $ttl);
+		}
 	}
 
 	/**
@@ -90,10 +93,12 @@ 
 		}
 
 		// if passed a type, clear that type out
-		if ($type === '' || $type === 'user')
-			xcache_clear_cache(XC_TYPE_VAR, 0);
-		if ($type === '' || $type === 'data')
-			xcache_clear_cache(XC_TYPE_PHP, 0);
+		if ($type === '' || $type === 'user') {
+					xcache_clear_cache(XC_TYPE_VAR, 0);
+		}
+		if ($type === '' || $type === 'data') {
+					xcache_clear_cache(XC_TYPE_PHP, 0);
+		}
 
 		$this->invalidateCache();
 		return true;
@@ -112,8 +117,9 @@ 
 		// While we could md5 this when saving, this could be tricky to be sure it doesn't get corrupted on additional saves.
 		$config_vars[] = array('xcache_adminpass', $txt['cache_xcache_adminpass'], 'db', 'text', 0);
 
-		if (!isset($context['settings_post_javascript']))
-			$context['settings_post_javascript'] = '';
+		if (!isset($context['settings_post_javascript'])) {
+					$context['settings_post_javascript'] = '';
+		}
 
 		$context['settings_post_javascript'] .= '
 			$("#cache_accelerator").change(function (e) {

Sources/CacheAPI-zend.php

Braces +15 added lines, -11 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 /**
  * Our Cache API class
@@ -29,8 +30,9 @@ 
 
 		$supported = function_exists('zend_shm_cache_fetch') || function_exists('output_cache_get');
 
-		if ($test)
-			return $supported;
+		if ($test) {
+					return $supported;
+		}
 		return parent::isSupported() && $supported;
 	}
 
@@ -42,10 +44,11 @@ 
 		$key = $this->prefix . strtr($key, ':/', '-_');
 
 		// Zend's pricey stuff.
-		if (function_exists('zend_shm_cache_fetch'))
-			return zend_shm_cache_fetch('SMF::' . $key);
-		elseif (function_exists('output_cache_get'))
-			return output_cache_get($key, $ttl);
+		if (function_exists('zend_shm_cache_fetch')) {
+					return zend_shm_cache_fetch('SMF::' . $key);
+		} elseif (function_exists('output_cache_get')) {
+					return output_cache_get($key, $ttl);
+		}
 	}
 
 	/**
@@ -55,10 +58,11 @@ 
 	{
 		$key = $this->prefix . strtr($key, ':/', '-_');
 
-		if (function_exists('zend_shm_cache_store'))
-			return zend_shm_cache_store('SMF::' . $key, $value, $ttl);
-		elseif (function_exists('output_cache_put'))
-			return output_cache_put($key, $value);
+		if (function_exists('zend_shm_cache_store')) {
+					return zend_shm_cache_store('SMF::' . $key, $value, $ttl);
+		} elseif (function_exists('output_cache_put')) {
+					return output_cache_put($key, $value);
+		}
 	}
 
 	/**

Sources/CacheAPI-memcache.php

Braces +19 added lines, -14 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 /**
  * Our Cache API class
@@ -34,8 +35,9 @@ 
 
 		$supported = class_exists('memcache');
 
-		if ($test)
-			return $supported;
+		if ($test) {
+					return $supported;
+		}
 		return parent::isSupported() && $supported && !empty($cache_memcached);
 	}
 
@@ -61,9 +63,9 @@ 
 			$server = trim($servers[array_rand($servers)]);
 
 			// Normal host names do not contain slashes, while e.g. unix sockets do. Assume alternative transport pipe with port 0.
-			if (strpos($server,'/') !== false)
-				$host = $server;
-			else
+			if (strpos($server,'/') !== false) {
+							$host = $server;
+			} else
 			{
 				$server = explode(':', $server);
 				$host = $server[0];
@@ -71,10 +73,11 @@ 
 			}
 
 			// Don't wait too long: yes, we want the server, but we might be able to run the query faster!
-			if (empty($db_persist))
-				$connected = $this->memcache->connect($host, $port);
-			else
-				$connected = $this->memcache->pconnect($host, $port);
+			if (empty($db_persist)) {
+							$connected = $this->memcache->connect($host, $port);
+			} else {
+							$connected = $this->memcache->pconnect($host, $port);
+			}
 		}
 
 		return $connected;
@@ -90,8 +93,9 @@ 
 		$value = $this->memcache->get($key);
 
 		// $value should return either data or false (from failure, key not found or empty array).
-		if ($value === false)
-			return null;
+		if ($value === false) {
+					return null;
+		}
 		return $value;
 	}
 
@@ -132,8 +136,9 @@ 
 		$config_vars[] = $txt['cache_memcache_settings'];
 		$config_vars[] = array('cache_memcached', $txt['cache_memcache_servers'], 'file', 'text', 0, 'cache_memcached', 'postinput' => '<br /><div class="smalltext"><em>' . $txt['cache_memcache_servers_subtext'] . '</em></div>');
 
-		if (!isset($context['settings_post_javascript']))
-			$context['settings_post_javascript'] = '';
+		if (!isset($context['settings_post_javascript'])) {
+					$context['settings_post_javascript'] = '';
+		}
 
 		$context['settings_post_javascript'] .= '
 			$("#cache_accelerator").change(function (e) {

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 		$currentServers = $this->memcached->getServerList();
 		foreach ($servers as $server)
 		{
-			if (strpos($server,'/') !== false)
+			if (strpos($server, '/') !== false)
 				$tempServer = array($server, 0);
 			else
 			{

Sources/PackageGet.php

Spacing +5 added lines, -5 removed lines

@@ -181,14 +181,14 @@ 
 		{
 			collapsedDiv.show(\'slow\');
 			icon.removeClass(\'toggle_down\').addClass(\'toggle_up\');
-			icon.prop(\'title\', '. JavaScriptEscape($txt['hide']) .');
+			icon.prop(\'title\', '. JavaScriptEscape($txt['hide']) . ');
 		}
 
 		else
 		{
 			collapsedDiv.hide(\'slow\');
 			icon.removeClass(\'toggle_up\').addClass(\'toggle_down\');
-			icon.prop(\'title\', '. JavaScriptEscape($txt['show']) .');
+			icon.prop(\'title\', '. JavaScriptEscape($txt['show']) . ');
 		}
 
 	});', true);
@@ -641,7 +641,7 @@ 
 
 	// Setup the correct template, even though I'll admit we ain't downloading ;)
 	$context['sub_template'] = 'downloaded';
-	$allowext = array('.zip','.tgz','.gz');
+	$allowext = array('.zip', '.tgz', '.gz');
 	// @todo Use FTP if the Packages directory is not writable.
 
 	// Check the file was even sent!
@@ -653,13 +653,13 @@ 
 	// Make sure it has a sane filename.
 	$_FILES['package']['name'] = preg_replace(array('/\s/', '/\.[\.]+/', '/[^\w_\.\-]/'), array('_', '.', ''), $_FILES['package']['name']);
 	$extension = substr(strrchr(strtolower($_FILES['package']['name']), '.'), 0);
-	if(!in_array($extension, $allowext))
+	if (!in_array($extension, $allowext))
 	{
 		fatal_lang_error('package_upload_error_supports', false, array('zip, tgz, tar.gz'));
 	}
 	
 	// We only need the filename...
-	$extension = ($extension == '.gz') ? '.tar.gz' : $extension ;
+	$extension = ($extension == '.gz') ? '.tar.gz' : $extension;
 	$packageName = time() . $extension;
 
 	// Setup the destination and throw an error if the file is already there!

Braces +197 added lines, -154 removed lines

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

Sources/Class-CacheAPI.php

Braces +13 added lines, -9 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 /**
  * Interface cache_api_interface
@@ -186,8 +187,9 @@ 
 	{
 		global $cache_enable;
 
-		if ($test)
-			return true;
+		if ($test) {
+					return true;
+		}
 		return !empty($cache_enable);
 	}
 
@@ -206,10 +208,11 @@ 
 		global $boardurl, $cachedir;
 
 		// Set the default if no prefix was specified.
-		if (empty($prefix))
-			$this->prefix = md5($boardurl . filemtime($cachedir . '/' . 'index.php')) . '-SMF-';
-		else
-			$this->prefix = $prefix;
+		if (empty($prefix)) {
+					$this->prefix = md5($boardurl . filemtime($cachedir . '/' . 'index.php')) . '-SMF-';
+		} else {
+					$this->prefix = $prefix;
+		}
 
 		return true;
 	}
@@ -272,8 +275,9 @@ 
 
 		// Invalidate cache, to be sure!
 		// ... as long as index.php can be modified, anyway.
-		if (is_writable($cachedir . '/' . 'index.php'))
-			@touch($cachedir . '/' . 'index.php');
+		if (is_writable($cachedir . '/' . 'index.php')) {
+					@touch($cachedir . '/' . 'index.php');
+		}
 
 		return true;
 	}

Sources/CacheAPI-apc.php

Braces +12 added lines, -9 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 /**
  * Our Cache API class
@@ -29,8 +30,9 @@ 
 
 		$supported = function_exists('apc_fetch') && function_exists('apc_store');
 
-		if ($test)
-			return $supported;
+		if ($test) {
+					return $supported;
+		}
 		return parent::isSupported() && $supported;
 	}
 
@@ -52,10 +54,11 @@ 
 		$key = $this->prefix . strtr($key, ':/', '-_');
 
 		// An extended key is needed to counteract a bug in APC.
-		if ($value === null)
-			return apc_delete($key . 'smf');
-		else
-			return apc_store($key . 'smf', $value, $ttl);
+		if ($value === null) {
+					return apc_delete($key . 'smf');
+		} else {
+					return apc_store($key . 'smf', $value, $ttl);
+		}
 	}
 
 	/**
@@ -69,9 +72,9 @@ 
 			// Always returns true.
 			apc_clear_cache('user');
 			apc_clear_cache('system');
+		} elseif ($type === 'user') {
+					apc_clear_cache('user');
 		}
-		elseif ($type === 'user')
-			apc_clear_cache('user');
 
 		$this->invalidateCache();
 		return true;

Sources/CacheAPI-apcu.php

Braces +10 added lines, -7 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 /**
  * Our Cache API class
@@ -29,8 +30,9 @@ 
 
 		$supported = function_exists('apcu_fetch') && function_exists('apcu_store');
 
-		if ($test)
-			return $supported;
+		if ($test) {
+					return $supported;
+		}
 		return parent::isSupported() && $supported;
 	}
 
@@ -52,10 +54,11 @@ 
 		$key = $this->prefix . strtr($key, ':/', '-_');
 
 		// An extended key is needed to counteract a bug in APC.
-		if ($value === null)
-			return apcu_delete($key . 'smf');
-		else
-			return apcu_store($key . 'smf', $value, $ttl);
+		if ($value === null) {
+					return apcu_delete($key . 'smf');
+		} else {
+					return apcu_store($key . 'smf', $value, $ttl);
+		}
 	}
 
 	/**

Sources/CacheAPI-memcached.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 		$currentServers = $this->memcached->getServerList();
 		foreach ($servers as $server)
 		{
-			if (strpos($server,'/') !== false)
+			if (strpos($server, '/') !== false)
 				$tempServer = array($server, 0);
 			else
 			{

Braces +17 added lines, -12 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 /**
  * Our Cache API class
@@ -34,8 +35,9 @@ 
 
 		$supported = class_exists('memcached');
 
-		if ($test)
-			return $supported;
+		if ($test) {
+					return $supported;
+		}
 		return parent::isSupported() && $supported && !empty($cache_memcached);
 	}
 
@@ -54,9 +56,9 @@ 
 		$currentServers = $this->memcached->getServerList();
 		foreach ($servers as $server)
 		{
-			if (strpos($server,'/') !== false)
-				$tempServer = array($server, 0);
-			else
+			if (strpos($server,'/') !== false) {
+							$tempServer = array($server, 0);
+			} else
 			{
 				$server = explode(':', $server);
 				$tempServer = array($server[0], isset($server[1]) ? $server[1] : 11211);
@@ -74,8 +76,9 @@ 
 			}
 
 			// Found it?
-			if (empty($foundServer))
-				$this->memcached->addServer($tempServer[0], $tempServer[1]);
+			if (empty($foundServer)) {
+							$this->memcached->addServer($tempServer[0], $tempServer[1]);
+			}
 		}
 
 		// Best guess is this worked.
@@ -92,8 +95,9 @@ 
 		$value = $this->memcached->get($key);
 
 		// $value should return either data or false (from failure, key not found or empty array).
-		if ($value === false)
-			return null;
+		if ($value === false) {
+					return null;
+		}
 		return $value;
 	}
 
@@ -136,8 +140,9 @@ 
 		$config_vars[] = $txt['cache_memcache_settings'];
 		$config_vars[] = array('cache_memcached', $txt['cache_memcache_servers'], 'file', 'text', 0, 'cache_memcached', 'postinput' => '<br /><div class="smalltext"><em>' . $txt['cache_memcache_servers_subtext'] . '</em></div>');
 
-		if (!isset($context['settings_post_javascript']))
-			$context['settings_post_javascript'] = '';
+		if (!isset($context['settings_post_javascript'])) {
+					$context['settings_post_javascript'] = '';
+		}
 
 		$context['settings_post_javascript'] .= '
 			$("#cache_accelerator").change(function (e) {