SimpleMachines / SMF2.1

Sources/Xml.php

Doc Comments +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 /**
  * Handles retrieving previews of news items, newsletters, signatures and warnings.
  * Calls the appropriate function based on $_POST['item']
- * @return void|bool Returns false if $_POST['item'] isn't set or isn't valid
+ * @return false|null Returns false if $_POST['item'] isn't set or isn't valid
  */
 function RetrievePreview()
 {

Indentation +7 added lines, -7 removed lines

@@ -272,13 +272,13 @@
 				$context['post_error']['messages'][] = $txt['mc_warning_template_error_no_body'];
 			// Add in few replacements.
 			/**
-			* These are the defaults:
-			* - {MEMBER} - Member Name. => current user for review
-			* - {MESSAGE} - Link to Offending Post. (If Applicable) => not applicable here, so not replaced
-			* - {FORUMNAME} - Forum Name.
-			* - {SCRIPTURL} - Web address of forum.
-			* - {REGARDS} - Standard email sign-off.
-			*/
+			 * These are the defaults:
+			 * - {MEMBER} - Member Name. => current user for review
+			 * - {MESSAGE} - Link to Offending Post. (If Applicable) => not applicable here, so not replaced
+			 * - {FORUMNAME} - Forum Name.
+			 * - {SCRIPTURL} - Web address of forum.
+			 * - {REGARDS} - Standard email sign-off.
+			 */
 			$find = array(
 				'{MEMBER}',
 				'{FORUMNAME}',

Braces +55 added lines, -42 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The main handler and designator for AJAX stuff - jumpto, message icons and previews
@@ -32,8 +33,9 @@ 
 	// Easy adding of sub actions.
 	call_integration_hook('integrate_XMLhttpMain_subActions', array(&$subActions));
 
-	if (!isset($_REQUEST['sa'], $subActions[$_REQUEST['sa']]))
-		fatal_lang_error('no_access', false);
+	if (!isset($_REQUEST['sa'], $subActions[$_REQUEST['sa']])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	call_helper($subActions[$_REQUEST['sa']]);
 }
@@ -57,8 +59,9 @@ 
 	foreach ($context['jump_to'] as $id_cat => $cat)
 	{
 		$context['jump_to'][$id_cat]['name'] = un_htmlspecialchars(strip_tags($cat['name']));
-		foreach ($cat['boards'] as $id_board => $board)
-			$context['jump_to'][$id_cat]['boards'][$id_board]['name'] = un_htmlspecialchars(strip_tags($board['name']));
+		foreach ($cat['boards'] as $id_board => $board) {
+					$context['jump_to'][$id_cat]['boards'][$id_board]['name'] = un_htmlspecialchars(strip_tags($board['name']));
+		}
 	}
 
 	$context['sub_template'] = 'jump_to';
@@ -95,8 +98,9 @@ 
 
 	$context['sub_template'] = 'generic_xml';
 
-	if (!isset($_POST['item']) || !in_array($_POST['item'], $items))
-		return false;
+	if (!isset($_POST['item']) || !in_array($_POST['item'], $items)) {
+			return false;
+	}
 
 	$_POST['item']();
 }
@@ -112,10 +116,11 @@ 
 
 	$errors = array();
 	$news = !isset($_POST['news']) ? '' : $smcFunc['htmlspecialchars']($_POST['news'], ENT_QUOTES);
-	if (empty($news))
-		$errors[] = array('value' => 'no_news');
-	else
-		preparsecode($news);
+	if (empty($news)) {
+			$errors[] = array('value' => 'no_news');
+	} else {
+			preparsecode($news);
+	}
 
 	$context['xml_data'] = array(
 		'news' => array(
@@ -148,10 +153,12 @@ 
 	$context['send_pm'] = !empty($_POST['send_pm']) ? 1 : 0;
 	$context['send_html'] = !empty($_POST['send_html']) ? 1 : 0;
 
-	if (empty($_POST['subject']))
-		$context['post_error']['messages'][] = $txt['error_no_subject'];
-	if (empty($_POST['message']))
-		$context['post_error']['messages'][] = $txt['error_no_message'];
+	if (empty($_POST['subject'])) {
+			$context['post_error']['messages'][] = $txt['error_no_subject'];
+	}
+	if (empty($_POST['message'])) {
+			$context['post_error']['messages'][] = $txt['error_no_message'];
+	}
 
 	prepareMailingForPreview();
 
@@ -196,38 +203,41 @@ 
 		$preview_signature = !empty($_POST['signature']) ? $_POST['signature'] : $txt['no_signature_preview'];
 		$validation = profileValidateSignature($preview_signature);
 
-		if ($validation !== true && $validation !== false)
-			$errors[] = array('value' => $txt['profile_error_' . $validation], 'attributes' => array('type' => 'error'));
+		if ($validation !== true && $validation !== false) {
+					$errors[] = array('value' => $txt['profile_error_' . $validation], 'attributes' => array('type' => 'error'));
+		}
 
 		censorText($preview_signature);
 		$preview_signature = parse_bbc($preview_signature, true, 'sig' . $user);
-	}
-	elseif (!$can_change)
+	} elseif (!$can_change)
 	{
-		if ($is_owner)
-			$errors[] = array('value' => $txt['cannot_profile_extra_own'], 'attributes' => array('type' => 'error'));
-		else
-			$errors[] = array('value' => $txt['cannot_profile_extra_any'], 'attributes' => array('type' => 'error'));
+		if ($is_owner) {
+					$errors[] = array('value' => $txt['cannot_profile_extra_own'], 'attributes' => array('type' => 'error'));
+		} else {
+					$errors[] = array('value' => $txt['cannot_profile_extra_any'], 'attributes' => array('type' => 'error'));
+		}
+	} else {
+			$errors[] = array('value' => $txt['no_user_selected'], 'attributes' => array('type' => 'error'));
 	}
-	else
-		$errors[] = array('value' => $txt['no_user_selected'], 'attributes' => array('type' => 'error'));
 
 	$context['xml_data']['signatures'] = array(
 			'identifier' => 'signature',
 			'children' => array()
 		);
-	if (isset($current_signature))
-		$context['xml_data']['signatures']['children'][] = array(
+	if (isset($current_signature)) {
+			$context['xml_data']['signatures']['children'][] = array(
 					'value' => $current_signature,
 					'attributes' => array('type' => 'current'),
 				);
-	if (isset($preview_signature))
-		$context['xml_data']['signatures']['children'][] = array(
+	}
+	if (isset($preview_signature)) {
+			$context['xml_data']['signatures']['children'][] = array(
 					'value' => $preview_signature,
 					'attributes' => array('type' => 'preview'),
 				);
-	if (!empty($errors))
-		$context['xml_data']['errors'] = array(
+	}
+	if (!empty($errors)) {
+			$context['xml_data']['errors'] = array(
 			'identifier' => 'error',
 			'children' => array_merge(
 				array(
@@ -239,7 +249,8 @@ 
 				$errors
 			),
 		);
-}
+	}
+	}
 
 /**
  * Handles previewing user warnings
@@ -259,15 +270,17 @@ 
 		$context['preview_subject'] = !empty($_POST['title']) ? trim($smcFunc['htmlspecialchars']($_POST['title'])) : '';
 		if (isset($_POST['issuing']))
 		{
-			if (empty($_POST['title']) || empty($_POST['body']))
-				$context['post_error']['messages'][] = $txt['warning_notify_blank'];
-		}
-		else
+			if (empty($_POST['title']) || empty($_POST['body'])) {
+							$context['post_error']['messages'][] = $txt['warning_notify_blank'];
+			}
+		} else
 		{
-			if (empty($_POST['title']))
-				$context['post_error']['messages'][] = $txt['mc_warning_template_error_no_title'];
-			if (empty($_POST['body']))
-				$context['post_error']['messages'][] = $txt['mc_warning_template_error_no_body'];
+			if (empty($_POST['title'])) {
+							$context['post_error']['messages'][] = $txt['mc_warning_template_error_no_title'];
+			}
+			if (empty($_POST['body'])) {
+							$context['post_error']['messages'][] = $txt['mc_warning_template_error_no_body'];
+			}
 			// Add in few replacements.
 			/**
 			* These are the defaults:
@@ -298,9 +311,9 @@ 
 			$warning_body = parse_bbc($warning_body, true);
 		}
 		$context['preview_message'] = $warning_body;
+	} else {
+			$context['post_error']['messages'][] = array('value' => $txt['cannot_issue_warning'], 'attributes' => array('type' => 'error'));
 	}
-	else
-		$context['post_error']['messages'][] = array('value' => $txt['cannot_issue_warning'], 'attributes' => array('type' => 'error'));
 
 	$context['sub_template'] = 'warning';
 }

SSI.php

Doc Comments +5 added lines, -5 removed lines

@@ -1717,7 +1717,7 @@ 
 /**
  * Show today's birthdays.
  * @param string $output_method The output method. If 'echo', displays a list of users, otherwise returns an array of info about them.
- * @return void|array Displays a list of users or returns an array of info about them depending on output_method.
+ * @return null|string Displays a list of users or returns an array of info about them depending on output_method.
  */
 function ssi_todaysBirthdays($output_method = 'echo')
 {
@@ -1746,7 +1746,7 @@ 
 /**
  * Shows today's holidays.
  * @param string $output_method The output method. If 'echo', displays a list of holidays, otherwise returns an array of info about them.
- * @return void|array Displays a list of holidays or returns an array of info about them depending on output_method
+ * @return null|string Displays a list of holidays or returns an array of info about them depending on output_method
  */
 function ssi_todaysHolidays($output_method = 'echo')
 {
@@ -1773,7 +1773,7 @@ 
 
 /**
  * @param string $output_method The output method. If 'echo', displays a list of events, otherwise returns an array of info about them.
- * @return void|array Displays a list of events or returns an array of info about them depending on output_method
+ * @return null|string Displays a list of events or returns an array of info about them depending on output_method
  */
 function ssi_todaysEvents($output_method = 'echo')
 {
@@ -1807,7 +1807,7 @@ 
 /**
  * Shows today's calendar items (events, birthdays and holidays)
  * @param string $output_method The output method. If 'echo', displays a list of calendar items, otherwise returns an array of info about them.
- * @return void|array Displays a list of calendar items or returns an array of info about them depending on output_method
+ * @return null|string Displays a list of calendar items or returns an array of info about them depending on output_method
  */
 function ssi_todaysCalendar($output_method = 'echo')
 {
@@ -2198,7 +2198,7 @@ 
  * @param int|string $id The ID or username of a user
  * @param string $password The password to check
  * @param bool $is_username If true, treats $id as a username rather than a user ID
- * @return bool Whether or not the password is correct.
+ * @return null|boolean Whether or not the password is correct.
  */
 function ssi_checkPassword($id = null, $password = null, $is_username = false)
 {

Braces +426 added lines, -304 removed lines

@@ -12,8 +12,9 @@ 
  */
 
 // Don't do anything if SMF is already loaded.
-if (defined('SMF'))
+if (defined('SMF')) {
 	return true;
+}
 
 define('SMF', 'SSI');
 
@@ -28,16 +29,18 @@ 
 $time_start = microtime();
 
 // Just being safe...
-foreach (array('db_character_set', 'cachedir') as $variable)
+foreach (array('db_character_set', 'cachedir') as $variable) {
 	if (isset($GLOBALS[$variable]))
 		unset($GLOBALS[$variable]);
+}
 
 // Get the forum's settings for database and file paths.
 require_once(dirname(__FILE__) . '/Settings.php');
 
 // Make absolutely sure the cache directory is defined.
-if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir . '/cache'))
+if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir . '/cache')) {
 	$cachedir = $boarddir . '/cache';
+}
 
 $ssi_error_reporting = error_reporting(defined('E_STRICT') ? E_ALL | E_STRICT : E_ALL);
 /* Set this to one of three values depending on what you want to happen in the case of a fatal error.
@@ -48,12 +51,14 @@ 
 $ssi_on_error_method = false;
 
 // Don't do john didley if the forum's been shut down completely.
-if ($maintenance == 2 && (!isset($ssi_maintenance_off) || $ssi_maintenance_off !== true))
+if ($maintenance == 2 && (!isset($ssi_maintenance_off) || $ssi_maintenance_off !== true)) {
 	die($mmessage);
+}
 
 // Fix for using the current directory as a path.
-if (substr($sourcedir, 0, 1) == '.' && substr($sourcedir, 1, 1) != '.')
+if (substr($sourcedir, 0, 1) == '.' && substr($sourcedir, 1, 1) != '.') {
 	$sourcedir = dirname(__FILE__) . substr($sourcedir, 1);
+}
 
 // Load the important includes.
 require_once($sourcedir . '/QueryString.php');
@@ -78,34 +83,38 @@ 
 cleanRequest();
 
 // Seed the random generator?
-if (empty($modSettings['rand_seed']) || mt_rand(1, 250) == 69)
+if (empty($modSettings['rand_seed']) || mt_rand(1, 250) == 69) {
 	smf_seed_generator();
+}
 
 // Check on any hacking attempts.
-if (isset($_REQUEST['GLOBALS']) || isset($_COOKIE['GLOBALS']))
+if (isset($_REQUEST['GLOBALS']) || isset($_COOKIE['GLOBALS'])) {
 	die('No direct access...');
-elseif (isset($_REQUEST['ssi_theme']) && (int) $_REQUEST['ssi_theme'] == (int) $ssi_theme)
+} elseif (isset($_REQUEST['ssi_theme']) && (int) $_REQUEST['ssi_theme'] == (int) $ssi_theme) {
 	die('No direct access...');
-elseif (isset($_COOKIE['ssi_theme']) && (int) $_COOKIE['ssi_theme'] == (int) $ssi_theme)
+} elseif (isset($_COOKIE['ssi_theme']) && (int) $_COOKIE['ssi_theme'] == (int) $ssi_theme) {
 	die('No direct access...');
-elseif (isset($_REQUEST['ssi_layers'], $ssi_layers) && (@get_magic_quotes_gpc() ? stripslashes($_REQUEST['ssi_layers']) : $_REQUEST['ssi_layers']) == $ssi_layers)
+} elseif (isset($_REQUEST['ssi_layers'], $ssi_layers) && (@get_magic_quotes_gpc() ? stripslashes($_REQUEST['ssi_layers']) : $_REQUEST['ssi_layers']) == $ssi_layers) {
 	die('No direct access...');
-if (isset($_REQUEST['context']))
+}
+if (isset($_REQUEST['context'])) {
 	die('No direct access...');
+}
 
 // Gzip output? (because it must be boolean and true, this can't be hacked.)
-if (isset($ssi_gzip) && $ssi_gzip === true && ini_get('zlib.output_compression') != '1' && ini_get('output_handler') != 'ob_gzhandler' && version_compare(PHP_VERSION, '4.2.0', '>='))
+if (isset($ssi_gzip) && $ssi_gzip === true && ini_get('zlib.output_compression') != '1' && ini_get('output_handler') != 'ob_gzhandler' && version_compare(PHP_VERSION, '4.2.0', '>=')) {
 	ob_start('ob_gzhandler');
-else
+} else {
 	$modSettings['enableCompressedOutput'] = '0';
+}
 
 // Primarily, this is to fix the URLs...
 ob_start('ob_sessrewrite');
 
 // Start the session... known to scramble SSI includes in cases...
-if (!headers_sent())
+if (!headers_sent()) {
 	loadSession();
-else
+} else
 {
 	if (isset($_COOKIE[session_name()]) || isset($_REQUEST[session_name()]))
 	{
@@ -139,12 +148,14 @@ 
 loadTheme(isset($ssi_theme) ? (int) $ssi_theme : 0);
 
 // @todo: probably not the best place, but somewhere it should be set...
-if (!headers_sent())
+if (!headers_sent()) {
 	header('Content-Type: text/html; charset=' . (empty($modSettings['global_character_set']) ? (empty($txt['lang_character_set']) ? 'ISO-8859-1' : $txt['lang_character_set']) : $modSettings['global_character_set']));
+}
 
 // Take care of any banning that needs to be done.
-if (isset($_REQUEST['ssi_ban']) || (isset($ssi_ban) && $ssi_ban === true))
+if (isset($_REQUEST['ssi_ban']) || (isset($ssi_ban) && $ssi_ban === true)) {
 	is_not_banned();
+}
 
 // Do we allow guests in here?
 if (empty($ssi_guest_access) && empty($modSettings['allow_guestAccess']) && $user_info['is_guest'] && basename($_SERVER['PHP_SELF']) != 'SSI.php')
@@ -159,17 +170,19 @@ 
 {
 	$context['template_layers'] = $ssi_layers;
 	template_header();
-}
-else
+} else {
 	setupThemeContext();
+}
 
 // Make sure they didn't muss around with the settings... but only if it's not cli.
-if (isset($_SERVER['REMOTE_ADDR']) && !isset($_SERVER['is_cli']) && session_id() == '')
+if (isset($_SERVER['REMOTE_ADDR']) && !isset($_SERVER['is_cli']) && session_id() == '') {
 	trigger_error($txt['ssi_session_broken'], E_USER_NOTICE);
+}
 
 // Without visiting the forum this session variable might not be set on submit.
-if (!isset($_SESSION['USER_AGENT']) && (!isset($_GET['ssi_function']) || $_GET['ssi_function'] !== 'pollVote'))
+if (!isset($_SESSION['USER_AGENT']) && (!isset($_GET['ssi_function']) || $_GET['ssi_function'] !== 'pollVote')) {
 	$_SESSION['USER_AGENT'] = $_SERVER['HTTP_USER_AGENT'];
+}
 
 // Have the ability to easily add functions to SSI.
 call_integration_hook('integrate_SSI');
@@ -178,11 +191,13 @@ 
 if (basename($_SERVER['PHP_SELF']) == 'SSI.php')
 {
 	// You shouldn't just access SSI.php directly by URL!!
-	if (!isset($_GET['ssi_function']))
-		die(sprintf($txt['ssi_not_direct'], $user_info['is_admin'] ? '\'' . addslashes(__FILE__) . '\'' : '\'SSI.php\''));
+	if (!isset($_GET['ssi_function'])) {
+			die(sprintf($txt['ssi_not_direct'], $user_info['is_admin'] ? '\'' . addslashes(__FILE__) . '\'' : '\'SSI.php\''));
+	}
 	// Call a function passed by GET.
-	if (function_exists('ssi_' . $_GET['ssi_function']) && (!empty($modSettings['allow_guestAccess']) || !$user_info['is_guest']))
-		call_user_func('ssi_' . $_GET['ssi_function']);
+	if (function_exists('ssi_' . $_GET['ssi_function']) && (!empty($modSettings['allow_guestAccess']) || !$user_info['is_guest'])) {
+			call_user_func('ssi_' . $_GET['ssi_function']);
+	}
 	exit;
 }
 
@@ -199,9 +214,10 @@ 
  */
 function ssi_shutdown()
 {
-	if (!isset($_GET['ssi_function']) || $_GET['ssi_function'] != 'shutdown')
-		template_footer();
-}
+	if (!isset($_GET['ssi_function']) || $_GET['ssi_function'] != 'shutdown') {
+			template_footer();
+	}
+	}
 
 /**
  * Display a welcome message, like: Hey, User, you have 0 messages, 0 are new.
@@ -214,15 +230,17 @@ 
 
 	if ($output_method == 'echo')
 	{
-		if ($context['user']['is_guest'])
-			echo sprintf($txt[$context['can_register'] ? 'welcome_guest_register' : 'welcome_guest'], $txt['guest_title'], $context['forum_name_html_safe'], $scripturl . '?action=login', 'return reqOverlayDiv(this.href, ' . JavaScriptEscape($txt['login']) . ');', $scripturl . '?action=signup');
-		else
-			echo $txt['hello_member'], ' <strong>', $context['user']['name'], '</strong>', allowedTo('pm_read') ? ', ' . (empty($context['user']['messages']) ? $txt['msg_alert_no_messages'] : (($context['user']['messages'] == 1 ? sprintf($txt['msg_alert_one_message'], $scripturl . '?action=pm') : sprintf($txt['msg_alert_many_message'], $scripturl . '?action=pm', $context['user']['messages'])) . ', ' . ($context['user']['unread_messages'] == 1 ? $txt['msg_alert_one_new'] : sprintf($txt['msg_alert_many_new'], $context['user']['unread_messages'])))) : '';
+		if ($context['user']['is_guest']) {
+					echo sprintf($txt[$context['can_register'] ? 'welcome_guest_register' : 'welcome_guest'], $txt['guest_title'], $context['forum_name_html_safe'], $scripturl . '?action=login', 'return reqOverlayDiv(this.href, ' . JavaScriptEscape($txt['login']) . ');', $scripturl . '?action=signup');
+		} else {
+					echo $txt['hello_member'], ' <strong>', $context['user']['name'], '</strong>', allowedTo('pm_read') ? ', ' . (empty($context['user']['messages']) ? $txt['msg_alert_no_messages'] : (($context['user']['messages'] == 1 ? sprintf($txt['msg_alert_one_message'], $scripturl . '?action=pm') : sprintf($txt['msg_alert_many_message'], $scripturl . '?action=pm', $context['user']['messages'])) . ', ' . ($context['user']['unread_messages'] == 1 ? $txt['msg_alert_one_new'] : sprintf($txt['msg_alert_many_new'], $context['user']['unread_messages'])))) : '';
+		}
 	}
 	// Don't echo... then do what?!
-	else
-		return $context['user'];
-}
+	else {
+			return $context['user'];
+	}
+	}
 
 /**
  * Display a menu bar, like is displayed at the top of the forum.
@@ -233,12 +251,14 @@ 
 {
 	global $context;
 
-	if ($output_method == 'echo')
-		template_menu();
+	if ($output_method == 'echo') {
+			template_menu();
+	}
 	// What else could this do?
-	else
-		return $context['menu_buttons'];
-}
+	else {
+			return $context['menu_buttons'];
+	}
+	}
 
 /**
  * Show a logout link.
@@ -250,20 +270,23 @@ 
 {
 	global $context, $txt, $scripturl;
 
-	if ($redirect_to != '')
-		$_SESSION['logout_url'] = $redirect_to;
+	if ($redirect_to != '') {
+			$_SESSION['logout_url'] = $redirect_to;
+	}
 
 	// Guests can't log out.
-	if ($context['user']['is_guest'])
-		return false;
+	if ($context['user']['is_guest']) {
+			return false;
+	}
 
 	$link = '<a href="' . $scripturl . '?action=logout;' . $context['session_var'] . '=' . $context['session_id'] . '">' . $txt['logout'] . '</a>';
 
-	if ($output_method == 'echo')
-		echo $link;
-	else
-		return $link;
-}
+	if ($output_method == 'echo') {
+			echo $link;
+	} else {
+			return $link;
+	}
+	}
 
 /**
  * Recent post list:   [board] Subject by Poster    Date
@@ -279,17 +302,17 @@ 
 	global $modSettings, $context;
 
 	// Excluding certain boards...
-	if ($exclude_boards === null && !empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0)
-		$exclude_boards = array($modSettings['recycle_board']);
-	else
-		$exclude_boards = empty($exclude_boards) ? array() : (is_array($exclude_boards) ? $exclude_boards : array($exclude_boards));
+	if ($exclude_boards === null && !empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0) {
+			$exclude_boards = array($modSettings['recycle_board']);
+	} else {
+			$exclude_boards = empty($exclude_boards) ? array() : (is_array($exclude_boards) ? $exclude_boards : array($exclude_boards));
+	}
 
 	// What about including certain boards - note we do some protection here as pre-2.0 didn't have this parameter.
 	if (is_array($include_boards) || (int) $include_boards === $include_boards)
 	{
 		$include_boards = is_array($include_boards) ? $include_boards : array($include_boards);
-	}
-	elseif ($include_boards != null)
+	} elseif ($include_boards != null)
 	{
 		$include_boards = array();
 	}
@@ -326,8 +349,9 @@ 
 {
 	global $modSettings;
 
-	if (empty($post_ids))
-		return;
+	if (empty($post_ids)) {
+			return;
+	}
 
 	// Allow the user to request more than one - why not?
 	$post_ids = is_array($post_ids) ? $post_ids : array($post_ids);
@@ -362,8 +386,9 @@ 
 	global $scripturl, $txt, $user_info;
 	global $modSettings, $smcFunc, $context;
 
-	if (!empty($modSettings['enable_likes']))
-		$context['can_like'] = allowedTo('likes_like');
+	if (!empty($modSettings['enable_likes'])) {
+			$context['can_like'] = allowedTo('likes_like');
+	}
 
 	// Find all the posts. Newer ones will have higher IDs.
 	$request = $smcFunc['db_query']('substring', '
@@ -429,12 +454,13 @@ 
 		);
 
 		// Get the likes for each message.
-		if (!empty($modSettings['enable_likes']))
-			$posts[$row['id_msg']]['likes'] = array(
+		if (!empty($modSettings['enable_likes'])) {
+					$posts[$row['id_msg']]['likes'] = array(
 				'count' => $row['likes'],
 				'you' => in_array($row['id_msg'], prepareLikesContext($row['id_topic'])),
 				'can_like' => !$context['user']['is_guest'] && $row['id_member'] != $context['user']['id'] && !empty($context['can_like']),
 			);
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -442,13 +468,14 @@ 
 	call_integration_hook('integrate_ssi_queryPosts', array(&$posts));
 
 	// Just return it.
-	if ($output_method != 'echo' || empty($posts))
-		return $posts;
+	if ($output_method != 'echo' || empty($posts)) {
+			return $posts;
+	}
 
 	echo '
 		<table style="border: none" class="ssi_table">';
-	foreach ($posts as $post)
-		echo '
+	foreach ($posts as $post) {
+			echo '
 			<tr>
 				<td style="text-align: right; vertical-align: top; white-space: nowrap">
 					[', $post['board']['link'], ']
@@ -462,6 +489,7 @@ 
 					', $post['time'], '
 				</td>
 			</tr>';
+	}
 	echo '
 		</table>';
 }
@@ -479,25 +507,26 @@ 
 	global $settings, $scripturl, $txt, $user_info;
 	global $modSettings, $smcFunc, $context;
 
-	if ($exclude_boards === null && !empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0)
-		$exclude_boards = array($modSettings['recycle_board']);
-	else
-		$exclude_boards = empty($exclude_boards) ? array() : (is_array($exclude_boards) ? $exclude_boards : array($exclude_boards));
+	if ($exclude_boards === null && !empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0) {
+			$exclude_boards = array($modSettings['recycle_board']);
+	} else {
+			$exclude_boards = empty($exclude_boards) ? array() : (is_array($exclude_boards) ? $exclude_boards : array($exclude_boards));
+	}
 
 	// Only some boards?.
 	if (is_array($include_boards) || (int) $include_boards === $include_boards)
 	{
 		$include_boards = is_array($include_boards) ? $include_boards : array($include_boards);
-	}
-	elseif ($include_boards != null)
+	} elseif ($include_boards != null)
 	{
 		$output_method = $include_boards;
 		$include_boards = array();
 	}
 
 	$icon_sources = array();
-	foreach ($context['stable_icons'] as $icon)
-		$icon_sources[$icon] = 'images_url';
+	foreach ($context['stable_icons'] as $icon) {
+			$icon_sources[$icon] = 'images_url';
+	}
 
 	// Find all the posts in distinct topics.  Newer ones will have higher IDs.
 	$request = $smcFunc['db_query']('substring', '
@@ -522,13 +551,15 @@ 
 		)
 	);
 	$topics = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$topics[$row['id_topic']] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$topics[$row['id_topic']] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Did we find anything? If not, bail.
-	if (empty($topics))
-		return array();
+	if (empty($topics)) {
+			return array();
+	}
 
 	$recycle_board = !empty($modSettings['recycle_enable']) && !empty($modSettings['recycle_board']) ? (int) $modSettings['recycle_board'] : 0;
 
@@ -556,19 +587,22 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		$row['body'] = strip_tags(strtr(parse_bbc($row['body'], $row['smileys_enabled'], $row['id_msg']), array('<br>' => '&#10;')));
-		if ($smcFunc['strlen']($row['body']) > 128)
-			$row['body'] = $smcFunc['substr']($row['body'], 0, 128) . '...';
+		if ($smcFunc['strlen']($row['body']) > 128) {
+					$row['body'] = $smcFunc['substr']($row['body'], 0, 128) . '...';
+		}
 
 		// Censor the subject.
 		censorText($row['subject']);
 		censorText($row['body']);
 
 		// Recycled icon
-		if (!empty($recycle_board) && $topics[$row['id_topic']]['id_board'])
-			$row['icon'] = 'recycled';
+		if (!empty($recycle_board) && $topics[$row['id_topic']]['id_board']) {
+					$row['icon'] = 'recycled';
+		}
 
-		if (!empty($modSettings['messageIconChecks_enable']) && !isset($icon_sources[$row['icon']]))
-			$icon_sources[$row['icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['icon'] . '.png') ? 'images_url' : 'default_images_url';
+		if (!empty($modSettings['messageIconChecks_enable']) && !isset($icon_sources[$row['icon']])) {
+					$icon_sources[$row['icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['icon'] . '.png') ? 'images_url' : 'default_images_url';
+		}
 
 		// Build the array.
 		$posts[] = array(
@@ -607,13 +641,14 @@ 
 	call_integration_hook('integrate_ssi_recentTopics', array(&$posts));
 
 	// Just return it.
-	if ($output_method != 'echo' || empty($posts))
-		return $posts;
+	if ($output_method != 'echo' || empty($posts)) {
+			return $posts;
+	}
 
 	echo '
 		<table style="border: none" class="ssi_table">';
-	foreach ($posts as $post)
-		echo '
+	foreach ($posts as $post) {
+			echo '
 			<tr>
 				<td style="text-align: right; vertical-align: top; white-space: nowrap">
 					[', $post['board']['link'], ']
@@ -627,6 +662,7 @@ 
 					', $post['time'], '
 				</td>
 			</tr>';
+	}
 	echo '
 		</table>';
 }
@@ -651,27 +687,30 @@ 
 		)
 	);
 	$return = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$return[] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$return[] = array(
 			'id' => $row['id_member'],
 			'name' => $row['real_name'],
 			'href' => $scripturl . '?action=profile;u=' . $row['id_member'],
 			'link' => '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>',
 			'posts' => $row['posts']
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	// If mods want to do somthing with this list of members, let them do that now.
 	call_integration_hook('integrate_ssi_topPoster', array(&$return));
 
 	// Just return all the top posters.
-	if ($output_method != 'echo')
-		return $return;
+	if ($output_method != 'echo') {
+			return $return;
+	}
 
 	// Make a quick array to list the links in.
 	$temp_array = array();
-	foreach ($return as $member)
-		$temp_array[] = $member['link'];
+	foreach ($return as $member) {
+			$temp_array[] = $member['link'];
+	}
 
 	echo implode(', ', $temp_array);
 }
@@ -703,8 +742,8 @@ 
 		)
 	);
 	$boards = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$boards[] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$boards[] = array(
 			'id' => $row['id_board'],
 			'num_posts' => $row['num_posts'],
 			'num_topics' => $row['num_topics'],
@@ -713,14 +752,16 @@ 
 			'href' => $scripturl . '?board=' . $row['id_board'] . '.0',
 			'link' => '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>'
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	// If mods want to do somthing with this list of boards, let them do that now.
 	call_integration_hook('integrate_ssi_topBoards', array(&$boards));
 
 	// If we shouldn't output or have nothing to output, just jump out.
-	if ($output_method != 'echo' || empty($boards))
-		return $boards;
+	if ($output_method != 'echo' || empty($boards)) {
+			return $boards;
+	}
 
 	echo '
 		<table class="ssi_table">
@@ -729,13 +770,14 @@ 
 				<th style="text-align: left">', $txt['board_topics'], '</th>
 				<th style="text-align: left">', $txt['posts'], '</th>
 			</tr>';
-	foreach ($boards as $sBoard)
-		echo '
+	foreach ($boards as $sBoard) {
+			echo '
 			<tr>
 				<td>', $sBoard['link'], $sBoard['new'] ? ' <a href="' . $sBoard['href'] . '"><span class="new_posts">' . $txt['new'] . '</span></a>' : '', '</td>
 				<td style="text-align: right">', comma_format($sBoard['num_topics']), '</td>
 				<td style="text-align: right">', comma_format($sBoard['num_posts']), '</td>
 			</tr>';
+	}
 	echo '
 		</table>';
 }
@@ -768,12 +810,13 @@ 
 			)
 		);
 		$topic_ids = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$topic_ids[] = $row['id_topic'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$topic_ids[] = $row['id_topic'];
+		}
 		$smcFunc['db_free_result']($request);
+	} else {
+			$topic_ids = array();
 	}
-	else
-		$topic_ids = array();
 
 	$request = $smcFunc['db_query']('', '
 		SELECT m.subject, m.id_topic, t.num_views, t.num_replies
@@ -812,8 +855,9 @@ 
 	// If mods want to do somthing with this list of topics, let them do that now.
 	call_integration_hook('integrate_ssi_topTopics', array(&$topics, $type));
 
-	if ($output_method != 'echo' || empty($topics))
-		return $topics;
+	if ($output_method != 'echo' || empty($topics)) {
+			return $topics;
+	}
 
 	echo '
 		<table class="ssi_table">
@@ -822,8 +866,8 @@ 
 				<th style="text-align: left">', $txt['views'], '</th>
 				<th style="text-align: left">', $txt['replies'], '</th>
 			</tr>';
-	foreach ($topics as $sTopic)
-		echo '
+	foreach ($topics as $sTopic) {
+			echo '
 			<tr>
 				<td style="text-align: left">
 					', $sTopic['link'], '
@@ -831,6 +875,7 @@ 
 				<td style="text-align: right">', comma_format($sTopic['num_views']), '</td>
 				<td style="text-align: right">', comma_format($sTopic['num_replies']), '</td>
 			</tr>';
+	}
 	echo '
 		</table>';
 }
@@ -866,12 +911,13 @@ 
 {
 	global $txt, $context;
 
-	if ($output_method == 'echo')
-		echo '
+	if ($output_method == 'echo') {
+			echo '
 	', sprintf($txt['welcome_newest_member'], $context['common_stats']['latest_member']['link']), '<br>';
-	else
-		return $context['common_stats']['latest_member'];
-}
+	} else {
+			return $context['common_stats']['latest_member'];
+	}
+	}
 
 /**
  * Fetches a random member.
@@ -920,8 +966,9 @@ 
 	}
 
 	// Just to be sure put the random generator back to something... random.
-	if ($random_type != '')
-		mt_srand(time());
+	if ($random_type != '') {
+			mt_srand(time());
+	}
 
 	return $result;
 }
@@ -934,8 +981,9 @@ 
  */
 function ssi_fetchMember($member_ids = array(), $output_method = 'echo')
 {
-	if (empty($member_ids))
-		return;
+	if (empty($member_ids)) {
+			return;
+	}
 
 	// Can have more than one member if you really want...
 	$member_ids = is_array($member_ids) ? $member_ids : array($member_ids);
@@ -960,8 +1008,9 @@ 
  */
 function ssi_fetchGroupMembers($group_id = null, $output_method = 'echo')
 {
-	if ($group_id === null)
-		return;
+	if ($group_id === null) {
+			return;
+	}
 
 	$query_where = '
 		id_group = {int:id_group}
@@ -988,8 +1037,9 @@ 
 {
 	global $smcFunc, $memberContext;
 
-	if ($query_where === null)
-		return;
+	if ($query_where === null) {
+			return;
+	}
 
 	// Fetch the members in question.
 	$request = $smcFunc['db_query']('', '
@@ -1002,12 +1052,14 @@ 
 		))
 	);
 	$members = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$members[] = $row['id_member'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$members[] = $row['id_member'];
+	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($members))
-		return array();
+	if (empty($members)) {
+			return array();
+	}
 
 	// If mods want to do somthing with this list of members, let them do that now.
 	call_integration_hook('integrate_ssi_queryMembers', array(&$members));
@@ -1016,23 +1068,25 @@ 
 	loadMemberData($members);
 
 	// Draw the table!
-	if ($output_method == 'echo')
-		echo '
+	if ($output_method == 'echo') {
+			echo '
 		<table style="border: none" class="ssi_table">';
+	}
 
 	$query_members = array();
 	foreach ($members as $member)
 	{
 		// Load their context data.
-		if (!loadMemberContext($member))
-			continue;
+		if (!loadMemberContext($member)) {
+					continue;
+		}
 
 		// Store this member's information.
 		$query_members[$member] = $memberContext[$member];
 
 		// Only do something if we're echo'ing.
-		if ($output_method == 'echo')
-			echo '
+		if ($output_method == 'echo') {
+					echo '
 			<tr>
 				<td style="text-align: right; vertical-align: top; white-space: nowrap">
 					', $query_members[$member]['link'], '
@@ -1040,12 +1094,14 @@ 
 					<br>', $query_members[$member]['avatar']['image'], '
 				</td>
 			</tr>';
+		}
 	}
 
 	// End the table if appropriate.
-	if ($output_method == 'echo')
-		echo '
+	if ($output_method == 'echo') {
+			echo '
 		</table>';
+	}
 
 	// Send back the data.
 	return $query_members;
@@ -1060,8 +1116,9 @@ 
 {
 	global $txt, $scripturl, $modSettings, $smcFunc;
 
-	if (!allowedTo('view_stats'))
-		return;
+	if (!allowedTo('view_stats')) {
+			return;
+	}
 
 	$totals = array(
 		'members' => $modSettings['totalMembers'],
@@ -1090,8 +1147,9 @@ 
 	// If mods want to do somthing with the board stats, let them do that now.
 	call_integration_hook('integrate_ssi_boardStats', array(&$totals));
 
-	if ($output_method != 'echo')
-		return $totals;
+	if ($output_method != 'echo') {
+			return $totals;
+	}
 
 	echo '
 		', $txt['total_members'], ': <a href="', $scripturl . '?action=mlist">', comma_format($totals['members']), '</a><br>
@@ -1120,8 +1178,8 @@ 
 	call_integration_hook('integrate_ssi_whosOnline', array(&$return));
 
 	// Add some redundancy for backwards compatibility reasons.
-	if ($output_method != 'echo')
-		return $return + array(
+	if ($output_method != 'echo') {
+			return $return + array(
 			'users' => $return['users_online'],
 			'guests' => $return['num_guests'],
 			'hidden' => $return['num_users_hidden'],
@@ -1129,29 +1187,35 @@ 
 			'num_users' => $return['num_users_online'],
 			'total_users' => $return['num_users_online'] + $return['num_guests'],
 		);
+	}
 
 	echo '
 		', comma_format($return['num_guests']), ' ', $return['num_guests'] == 1 ? $txt['guest'] : $txt['guests'], ', ', comma_format($return['num_users_online']), ' ', $return['num_users_online'] == 1 ? $txt['user'] : $txt['users'];
 
 	$bracketList = array();
-	if (!empty($user_info['buddies']))
-		$bracketList[] = comma_format($return['num_buddies']) . ' ' . ($return['num_buddies'] == 1 ? $txt['buddy'] : $txt['buddies']);
-	if (!empty($return['num_spiders']))
-		$bracketList[] = comma_format($return['num_spiders']) . ' ' . ($return['num_spiders'] == 1 ? $txt['spider'] : $txt['spiders']);
-	if (!empty($return['num_users_hidden']))
-		$bracketList[] = comma_format($return['num_users_hidden']) . ' ' . $txt['hidden'];
+	if (!empty($user_info['buddies'])) {
+			$bracketList[] = comma_format($return['num_buddies']) . ' ' . ($return['num_buddies'] == 1 ? $txt['buddy'] : $txt['buddies']);
+	}
+	if (!empty($return['num_spiders'])) {
+			$bracketList[] = comma_format($return['num_spiders']) . ' ' . ($return['num_spiders'] == 1 ? $txt['spider'] : $txt['spiders']);
+	}
+	if (!empty($return['num_users_hidden'])) {
+			$bracketList[] = comma_format($return['num_users_hidden']) . ' ' . $txt['hidden'];
+	}
 
-	if (!empty($bracketList))
-		echo ' (' . implode(', ', $bracketList) . ')';
+	if (!empty($bracketList)) {
+			echo ' (' . implode(', ', $bracketList) . ')';
+	}
 
 	echo '<br>
 			', implode(', ', $return['list_users_online']);
 
 	// Showing membergroups?
-	if (!empty($settings['show_group_key']) && !empty($return['membergroups']))
-		echo '<br>
+	if (!empty($settings['show_group_key']) && !empty($return['membergroups'])) {
+			echo '<br>
 			[' . implode(']&nbsp;&nbsp;[', $return['membergroups']) . ']';
-}
+	}
+	}
 
 /**
  * Just like whosOnline except it also logs the online presence.
@@ -1162,11 +1226,12 @@ 
 {
 	writeLog();
 
-	if ($output_method != 'echo')
-		return ssi_whosOnline($output_method);
-	else
-		ssi_whosOnline($output_method);
-}
+	if ($output_method != 'echo') {
+			return ssi_whosOnline($output_method);
+	} else {
+			ssi_whosOnline($output_method);
+	}
+	}
 
 // Shows a login box.
 /**
@@ -1179,11 +1244,13 @@ 
 {
 	global $scripturl, $txt, $user_info, $context;
 
-	if ($redirect_to != '')
-		$_SESSION['login_url'] = $redirect_to;
+	if ($redirect_to != '') {
+			$_SESSION['login_url'] = $redirect_to;
+	}
 
-	if ($output_method != 'echo' || !$user_info['is_guest'])
-		return $user_info['is_guest'];
+	if ($output_method != 'echo' || !$user_info['is_guest']) {
+			return $user_info['is_guest'];
+	}
 
 	// Create a login token
 	createToken('login');
@@ -1235,8 +1302,9 @@ 
 
 	$boardsAllowed = array_intersect(boardsAllowedTo('poll_view'), boardsAllowedTo('poll_vote'));
 
-	if (empty($boardsAllowed))
-		return array();
+	if (empty($boardsAllowed)) {
+			return array();
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT p.id_poll, p.question, t.id_topic, p.max_votes, p.guest_vote, p.hide_results, p.expire_time
@@ -1269,12 +1337,14 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// This user has voted on all the polls.
-	if (empty($row) || !is_array($row))
-		return array();
+	if (empty($row) || !is_array($row)) {
+			return array();
+	}
 
 	// If this is a guest who's voted we'll through ourselves to show poll to show the results.
-	if ($user_info['is_guest'] && (!$row['guest_vote'] || (isset($_COOKIE['guest_poll_vote']) && in_array($row['id_poll'], explode(',', $_COOKIE['guest_poll_vote'])))))
-		return ssi_showPoll($row['id_topic'], $output_method);
+	if ($user_info['is_guest'] && (!$row['guest_vote'] || (isset($_COOKIE['guest_poll_vote']) && in_array($row['id_poll'], explode(',', $_COOKIE['guest_poll_vote']))))) {
+			return ssi_showPoll($row['id_topic'], $output_method);
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT COUNT(DISTINCT id_member)
@@ -1338,8 +1408,9 @@ 
 	// If mods want to do somthing with this list of polls, let them do that now.
 	call_integration_hook('integrate_ssi_recentPoll', array(&$return, $topPollInstead));
 
-	if ($output_method != 'echo')
-		return $return;
+	if ($output_method != 'echo') {
+			return $return;
+	}
 
 	if ($allow_view_results)
 	{
@@ -1348,19 +1419,20 @@ 
 			<strong>', $return['question'], '</strong><br>
 			', !empty($return['allowed_warning']) ? $return['allowed_warning'] . '<br>' : '';
 
-		foreach ($return['options'] as $option)
-			echo '
+		foreach ($return['options'] as $option) {
+					echo '
 			<label for="', $option['id'], '">', $option['vote_button'], ' ', $option['option'], '</label><br>';
+		}
 
 		echo '
 			<input type="submit" value="', $txt['poll_vote'], '" class="button_submit">
 			<input type="hidden" name="poll" value="', $return['id'], '">
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 		</form>';
+	} else {
+			echo $txt['poll_cannot_see'];
+	}
 	}
-	else
-		echo $txt['poll_cannot_see'];
-}
 
 /**
  * Shows the poll from the specified topic
@@ -1374,13 +1446,15 @@ 
 
 	$boardsAllowed = boardsAllowedTo('poll_view');
 
-	if (empty($boardsAllowed))
-		return array();
+	if (empty($boardsAllowed)) {
+			return array();
+	}
 
-	if ($topic === null && isset($_REQUEST['ssi_topic']))
-		$topic = (int) $_REQUEST['ssi_topic'];
-	else
-		$topic = (int) $topic;
+	if ($topic === null && isset($_REQUEST['ssi_topic'])) {
+			$topic = (int) $_REQUEST['ssi_topic'];
+	} else {
+			$topic = (int) $topic;
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT
@@ -1401,17 +1475,18 @@ 
 	);
 
 	// Either this topic has no poll, or the user cannot view it.
-	if ($smcFunc['db_num_rows']($request) == 0)
-		return array();
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			return array();
+	}
 
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
 	// Check if they can vote.
 	$already_voted = false;
-	if (!empty($row['expire_time']) && $row['expire_time'] < time())
-		$allow_vote = false;
-	elseif ($user_info['is_guest'])
+	if (!empty($row['expire_time']) && $row['expire_time'] < time()) {
+			$allow_vote = false;
+	} elseif ($user_info['is_guest'])
 	{
 		// There's a difference between "allowed to vote" and "already voted"...
 		$allow_vote = $row['guest_vote'];
@@ -1421,10 +1496,9 @@ 
 		{
 			$already_voted = true;
 		}
-	}
-	elseif (!empty($row['voting_locked']) || !allowedTo('poll_vote', $row['id_board']))
-		$allow_vote = false;
-	else
+	} elseif (!empty($row['voting_locked']) || !allowedTo('poll_vote', $row['id_board'])) {
+			$allow_vote = false;
+	} else
 	{
 		$request = $smcFunc['db_query']('', '
 			SELECT id_member
@@ -1506,8 +1580,9 @@ 
 	// If mods want to do somthing with this poll, let them do that now.
 	call_integration_hook('integrate_ssi_showPoll', array(&$return));
 
-	if ($output_method != 'echo')
-		return $return;
+	if ($output_method != 'echo') {
+			return $return;
+	}
 
 	if ($return['allow_vote'])
 	{
@@ -1516,17 +1591,17 @@ 
 				<strong>', $return['question'], '</strong><br>
 				', !empty($return['allowed_warning']) ? $return['allowed_warning'] . '<br>' : '';
 
-		foreach ($return['options'] as $option)
-			echo '
+		foreach ($return['options'] as $option) {
+					echo '
 				<label for="', $option['id'], '">', $option['vote_button'], ' ', $option['option'], '</label><br>';
+		}
 
 		echo '
 				<input type="submit" value="', $txt['poll_vote'], '" class="button_submit">
 				<input type="hidden" name="poll" value="', $return['id'], '">
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 			</form>';
-	}
-	else
+	} else
 	{
 		echo '
 			<div class="ssi_poll">
@@ -1606,27 +1681,32 @@ 
 			'is_approved' => 1,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		die;
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			die;
+	}
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
-	if (!empty($row['voting_locked']) || ($row['selected'] != -1 && !$user_info['is_guest']) || (!empty($row['expire_time']) && time() > $row['expire_time']))
-		redirectexit('topic=' . $row['id_topic'] . '.0');
+	if (!empty($row['voting_locked']) || ($row['selected'] != -1 && !$user_info['is_guest']) || (!empty($row['expire_time']) && time() > $row['expire_time'])) {
+			redirectexit('topic=' . $row['id_topic'] . '.0');
+	}
 
 	// Too many options checked?
-	if (count($_REQUEST['options']) > $row['max_votes'])
-		redirectexit('topic=' . $row['id_topic'] . '.0');
+	if (count($_REQUEST['options']) > $row['max_votes']) {
+			redirectexit('topic=' . $row['id_topic'] . '.0');
+	}
 
 	// It's a guest who has already voted?
 	if ($user_info['is_guest'])
 	{
 		// Guest voting disabled?
-		if (!$row['guest_vote'])
-			redirectexit('topic=' . $row['id_topic'] . '.0');
+		if (!$row['guest_vote']) {
+					redirectexit('topic=' . $row['id_topic'] . '.0');
+		}
 		// Already voted?
-		elseif (isset($_COOKIE['guest_poll_vote']) && in_array($row['id_poll'], explode(',', $_COOKIE['guest_poll_vote'])))
-			redirectexit('topic=' . $row['id_topic'] . '.0');
+		elseif (isset($_COOKIE['guest_poll_vote']) && in_array($row['id_poll'], explode(',', $_COOKIE['guest_poll_vote']))) {
+					redirectexit('topic=' . $row['id_topic'] . '.0');
+		}
 	}
 
 	$sOptions = array();
@@ -1680,11 +1760,13 @@ 
 {
 	global $scripturl, $txt, $context;
 
-	if (!allowedTo('search_posts'))
-		return;
+	if (!allowedTo('search_posts')) {
+			return;
+	}
 
-	if ($output_method != 'echo')
-		return $scripturl . '?action=search';
+	if ($output_method != 'echo') {
+			return $scripturl . '?action=search';
+	}
 
 	echo '
 		<form action="', $scripturl, '?action=search2" method="post" accept-charset="', $context['character_set'], '">
@@ -1706,8 +1788,9 @@ 
 	// If mods want to do somthing with the news, let them do that now. Don't need to pass the news line itself, since it is already in $context.
 	call_integration_hook('integrate_ssi_news');
 
-	if ($output_method != 'echo')
-		return $context['random_news_line'];
+	if ($output_method != 'echo') {
+			return $context['random_news_line'];
+	}
 
 	echo $context['random_news_line'];
 }
@@ -1721,8 +1804,9 @@ 
 {
 	global $scripturl, $modSettings, $user_info;
 
-	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view') || !allowedTo('profile_view'))
-		return;
+	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view') || !allowedTo('profile_view')) {
+			return;
+	}
 
 	$eventOptions = array(
 		'include_birthdays' => true,
@@ -1733,13 +1817,15 @@ 
 	// The ssi_todaysCalendar variants all use the same hook and just pass on $eventOptions so the hooked code can distinguish different cases if necessary
 	call_integration_hook('integrate_ssi_calendar', array(&$return, $eventOptions));
 
-	if ($output_method != 'echo')
-		return $return['calendar_birthdays'];
+	if ($output_method != 'echo') {
+			return $return['calendar_birthdays'];
+	}
 
-	foreach ($return['calendar_birthdays'] as $member)
-		echo '
+	foreach ($return['calendar_birthdays'] as $member) {
+			echo '
 			<a href="', $scripturl, '?action=profile;u=', $member['id'], '"><span class="fix_rtl_names">' . $member['name'] . '</span>' . (isset($member['age']) ? ' (' . $member['age'] . ')' : '') . '</a>' . (!$member['is_last'] ? ', ' : '');
-}
+	}
+	}
 
 /**
  * Shows today's holidays.
@@ -1750,8 +1836,9 @@ 
 {
 	global $modSettings, $user_info;
 
-	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view'))
-		return;
+	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view')) {
+			return;
+	}
 
 	$eventOptions = array(
 		'include_holidays' => true,
@@ -1762,8 +1849,9 @@ 
 	// The ssi_todaysCalendar variants all use the same hook and just pass on $eventOptions so the hooked code can distinguish different cases if necessary
 	call_integration_hook('integrate_ssi_calendar', array(&$return, $eventOptions));
 
-	if ($output_method != 'echo')
-		return $return['calendar_holidays'];
+	if ($output_method != 'echo') {
+			return $return['calendar_holidays'];
+	}
 
 	echo '
 		', implode(', ', $return['calendar_holidays']);
@@ -1777,8 +1865,9 @@ 
 {
 	global $modSettings, $user_info;
 
-	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view'))
-		return;
+	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view')) {
+			return;
+	}
 
 	$eventOptions = array(
 		'include_events' => true,
@@ -1789,14 +1878,16 @@ 
 	// The ssi_todaysCalendar variants all use the same hook and just pass on $eventOptions so the hooked code can distinguish different cases if necessary
 	call_integration_hook('integrate_ssi_calendar', array(&$return, $eventOptions));
 
-	if ($output_method != 'echo')
-		return $return['calendar_events'];
+	if ($output_method != 'echo') {
+			return $return['calendar_events'];
+	}
 
 	foreach ($return['calendar_events'] as $event)
 	{
-		if ($event['can_edit'])
-			echo '
+		if ($event['can_edit']) {
+					echo '
 	<a href="' . $event['modify_href'] . '" style="color: #ff0000;">*</a> ';
+		}
 		echo '
 	' . $event['link'] . (!$event['is_last'] ? ', ' : '');
 	}
@@ -1811,8 +1902,9 @@ 
 {
 	global $modSettings, $txt, $scripturl, $user_info;
 
-	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view'))
-		return;
+	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view')) {
+			return;
+	}
 
 	$eventOptions = array(
 		'include_birthdays' => allowedTo('profile_view'),
@@ -1825,19 +1917,22 @@ 
 	// The ssi_todaysCalendar variants all use the same hook and just pass on $eventOptions so the hooked code can distinguish different cases if necessary
 	call_integration_hook('integrate_ssi_calendar', array(&$return, $eventOptions));
 
-	if ($output_method != 'echo')
-		return $return;
+	if ($output_method != 'echo') {
+			return $return;
+	}
 
-	if (!empty($return['calendar_holidays']))
-		echo '
+	if (!empty($return['calendar_holidays'])) {
+			echo '
 			<span class="holiday">' . $txt['calendar_prompt'] . ' ' . implode(', ', $return['calendar_holidays']) . '<br></span>';
+	}
 	if (!empty($return['calendar_birthdays']))
 	{
 		echo '
 			<span class="birthday">' . $txt['birthdays_upcoming'] . '</span> ';
-		foreach ($return['calendar_birthdays'] as $member)
-			echo '
+		foreach ($return['calendar_birthdays'] as $member) {
+					echo '
 			<a href="', $scripturl, '?action=profile;u=', $member['id'], '"><span class="fix_rtl_names">', $member['name'], '</span>', isset($member['age']) ? ' (' . $member['age'] . ')' : '', '</a>', !$member['is_last'] ? ', ' : '';
+		}
 		echo '
 			<br>';
 	}
@@ -1847,9 +1942,10 @@ 
 			<span class="event">' . $txt['events_upcoming'] . '</span> ';
 		foreach ($return['calendar_events'] as $event)
 		{
-			if ($event['can_edit'])
-				echo '
+			if ($event['can_edit']) {
+							echo '
 			<a href="' . $event['modify_href'] . '" style="color: #ff0000;">*</a> ';
+			}
 			echo '
 			' . $event['link'] . (!$event['is_last'] ? ', ' : '');
 		}
@@ -1873,25 +1969,29 @@ 
 	loadLanguage('Stats');
 
 	// Must be integers....
-	if ($limit === null)
-		$limit = isset($_GET['limit']) ? (int) $_GET['limit'] : 5;
-	else
-		$limit = (int) $limit;
-
-	if ($start === null)
-		$start = isset($_GET['start']) ? (int) $_GET['start'] : 0;
-	else
-		$start = (int) $start;
-
-	if ($board !== null)
-		$board = (int) $board;
-	elseif (isset($_GET['board']))
-		$board = (int) $_GET['board'];
-
-	if ($length === null)
-		$length = isset($_GET['length']) ? (int) $_GET['length'] : 0;
-	else
-		$length = (int) $length;
+	if ($limit === null) {
+			$limit = isset($_GET['limit']) ? (int) $_GET['limit'] : 5;
+	} else {
+			$limit = (int) $limit;
+	}
+
+	if ($start === null) {
+			$start = isset($_GET['start']) ? (int) $_GET['start'] : 0;
+	} else {
+			$start = (int) $start;
+	}
+
+	if ($board !== null) {
+			$board = (int) $board;
+	} elseif (isset($_GET['board'])) {
+			$board = (int) $_GET['board'];
+	}
+
+	if ($length === null) {
+			$length = isset($_GET['length']) ? (int) $_GET['length'] : 0;
+	} else {
+			$length = (int) $length;
+	}
 
 	$limit = max(0, $limit);
 	$start = max(0, $start);
@@ -1909,17 +2009,19 @@ 
 	);
 	if ($smcFunc['db_num_rows']($request) == 0)
 	{
-		if ($output_method == 'echo')
-			die($txt['ssi_no_guests']);
-		else
-			return array();
+		if ($output_method == 'echo') {
+					die($txt['ssi_no_guests']);
+		} else {
+					return array();
+		}
 	}
 	list ($board) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
 	$icon_sources = array();
-	foreach ($context['stable_icons'] as $icon)
-		$icon_sources[$icon] = 'images_url';
+	foreach ($context['stable_icons'] as $icon) {
+			$icon_sources[$icon] = 'images_url';
+	}
 
 	if (!empty($modSettings['enable_likes']))
 	{
@@ -1943,12 +2045,14 @@ 
 		)
 	);
 	$posts = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$posts[] = $row['id_first_msg'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$posts[] = $row['id_first_msg'];
+	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($posts))
-		return array();
+	if (empty($posts)) {
+			return array();
+	}
 
 	// Find the posts.
 	$request = $smcFunc['db_query']('', '
@@ -1978,24 +2082,28 @@ 
 			$last_space = strrpos($row['body'], ' ');
 			$last_open = strrpos($row['body'], '<');
 			$last_close = strrpos($row['body'], '>');
-			if (empty($last_space) || ($last_space == $last_open + 3 && (empty($last_close) || (!empty($last_close) && $last_close < $last_open))) || $last_space < $last_open || $last_open == $length - 6)
-				$cutoff = $last_open;
-			elseif (empty($last_close) || $last_close < $last_open)
-				$cutoff = $last_space;
+			if (empty($last_space) || ($last_space == $last_open + 3 && (empty($last_close) || (!empty($last_close) && $last_close < $last_open))) || $last_space < $last_open || $last_open == $length - 6) {
+							$cutoff = $last_open;
+			} elseif (empty($last_close) || $last_close < $last_open) {
+							$cutoff = $last_space;
+			}
 
-			if ($cutoff !== false)
-				$row['body'] = $smcFunc['substr']($row['body'], 0, $cutoff);
+			if ($cutoff !== false) {
+							$row['body'] = $smcFunc['substr']($row['body'], 0, $cutoff);
+			}
 			$row['body'] .= '...';
 		}
 
 		$row['body'] = parse_bbc($row['body'], $row['smileys_enabled'], $row['id_msg']);
 
-		if (!empty($recycle_board) && $row['id_board'] == $recycle_board)
-			$row['icon'] = 'recycled';
+		if (!empty($recycle_board) && $row['id_board'] == $recycle_board) {
+					$row['icon'] = 'recycled';
+		}
 
 		// Check that this message icon is there...
-		if (!empty($modSettings['messageIconChecks_enable']) && !isset($icon_sources[$row['icon']]))
-			$icon_sources[$row['icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['icon'] . '.png') ? 'images_url' : 'default_images_url';
+		if (!empty($modSettings['messageIconChecks_enable']) && !isset($icon_sources[$row['icon']])) {
+					$icon_sources[$row['icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['icon'] . '.png') ? 'images_url' : 'default_images_url';
+		}
 
 		censorText($row['subject']);
 		censorText($row['body']);
@@ -2032,16 +2140,18 @@ 
 	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($return))
-		return $return;
+	if (empty($return)) {
+			return $return;
+	}
 
 	$return[count($return) - 1]['is_last'] = true;
 
 	// If mods want to do somthing with this list of posts, let them do that now.
 	call_integration_hook('integrate_ssi_boardNews', array(&$return));
 
-	if ($output_method != 'echo')
-		return $return;
+	if ($output_method != 'echo') {
+			return $return;
+	}
 
 	foreach ($return as $news)
 	{
@@ -2093,9 +2203,10 @@ 
 		echo '
 			</div>';
 
-		if (!$news['is_last'])
-			echo '
+		if (!$news['is_last']) {
+					echo '
 			<hr>';
+		}
 	}
 }
 
@@ -2109,8 +2220,9 @@ 
 {
 	global $user_info, $scripturl, $modSettings, $txt, $context, $smcFunc;
 
-	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view'))
-		return;
+	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view')) {
+			return;
+	}
 
 	// Find all events which are happening in the near future that the member can see.
 	$request = $smcFunc['db_query']('', '
@@ -2136,20 +2248,23 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Check if we've already come by an event linked to this same topic with the same title... and don't display it if we have.
-		if (!empty($duplicates[$row['title'] . $row['id_topic']]))
-			continue;
+		if (!empty($duplicates[$row['title'] . $row['id_topic']])) {
+					continue;
+		}
 
 		// Censor the title.
 		censorText($row['title']);
 
-		if ($row['start_date'] < strftime('%Y-%m-%d', forum_time(false)))
-			$date = strftime('%Y-%m-%d', forum_time(false));
-		else
-			$date = $row['start_date'];
+		if ($row['start_date'] < strftime('%Y-%m-%d', forum_time(false))) {
+					$date = strftime('%Y-%m-%d', forum_time(false));
+		} else {
+					$date = $row['start_date'];
+		}
 
 		// If the topic it is attached to is not approved then don't link it.
-		if (!empty($row['id_first_msg']) && !$row['approved'])
-			$row['id_board'] = $row['id_topic'] = $row['id_first_msg'] = 0;
+		if (!empty($row['id_first_msg']) && !$row['approved']) {
+					$row['id_board'] = $row['id_topic'] = $row['id_first_msg'] = 0;
+		}
 
 		$allday = (empty($row['start_time']) || empty($row['end_time']) || empty($row['timezone']) || !in_array($row['timezone'], timezone_identifiers_list(DateTimeZone::ALL_WITH_BC))) ? true : false;
 
@@ -2175,24 +2290,27 @@ 
 	}
 	$smcFunc['db_free_result']($request);
 
-	foreach ($return as $mday => $array)
-		$return[$mday][count($array) - 1]['is_last'] = true;
+	foreach ($return as $mday => $array) {
+			$return[$mday][count($array) - 1]['is_last'] = true;
+	}
 
 	// If mods want to do somthing with this list of events, let them do that now.
 	call_integration_hook('integrate_ssi_recentEvents', array(&$return));
 
-	if ($output_method != 'echo' || empty($return))
-		return $return;
+	if ($output_method != 'echo' || empty($return)) {
+			return $return;
+	}
 
 	// Well the output method is echo.
 	echo '
 			<span class="event">' . $txt['events'] . '</span> ';
-	foreach ($return as $mday => $array)
-		foreach ($array as $event)
+	foreach ($return as $mday => $array) {
+			foreach ($array as $event)
 		{
 			if ($event['can_edit'])
 				echo '
 				<a href="' . $event['modify_href'] . '" style="color: #ff0000;">*</a> ';
+	}
 
 			echo '
 				' . $event['link'] . (!$event['is_last'] ? ', ' : '');
@@ -2211,8 +2329,9 @@ 
 	global $smcFunc;
 
 	// If $id is null, this was most likely called from a query string and should do nothing.
-	if ($id === null)
-		return;
+	if ($id === null) {
+			return;
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT passwd, member_name, is_activated
@@ -2244,8 +2363,9 @@ 
 	$attachments_boards = boardsAllowedTo('view_attachments');
 
 	// No boards?  Adios amigo.
-	if (empty($attachments_boards))
-		return array();
+	if (empty($attachments_boards)) {
+			return array();
+	}
 
 	// Is it an array?
 	$attachment_ext = (array) $attachment_ext;
@@ -2329,8 +2449,9 @@ 
 	call_integration_hook('integrate_ssi_recentAttachments', array(&$attachments));
 
 	// So you just want an array?  Here you can have it.
-	if ($output_method == 'array' || empty($attachments))
-		return $attachments;
+	if ($output_method == 'array' || empty($attachments)) {
+			return $attachments;
+	}
 
 	// Give them the default.
 	echo '
@@ -2341,14 +2462,15 @@ 
 				<th style="text-align: left; padding: 2">', $txt['downloads'], '</th>
 				<th style="text-align: left; padding: 2">', $txt['filesize'], '</th>
 			</tr>';
-	foreach ($attachments as $attach)
-		echo '
+	foreach ($attachments as $attach) {
+			echo '
 			<tr>
 				<td>', $attach['file']['link'], '</td>
 				<td>', $attach['member']['link'], '</td>
 				<td style="text-align: center">', $attach['file']['downloads'], '</td>
 				<td>', $attach['file']['filesize'], '</td>
 			</tr>';
+	}
 	echo '
 		</table>';
 }

Themes/default/GenericControls.template.php

Doc Comments +1 added lines, -1 removed lines

@@ -227,7 +227,7 @@
  * @param int|string $verify_id The verification control ID
  * @param string $display_type What type to display. Can be 'single' to only show one verification option or 'all' to show all of them
  * @param bool $reset Whether to reset the internal tracking counter
- * @return bool False if there's nothing else to show, true if $display_type is 'single', nothing otherwise
+ * @return boolean|null False if there's nothing else to show, true if $display_type is 'single', nothing otherwise
  */
 function template_control_verification($verify_id, $display_type = 'all', $reset = false)
 {

Braces +76 added lines, -58 removed lines

@@ -53,14 +53,15 @@ 
 			foreach ($context['smileys'] as $location => $smileyRows)
 			{
 				$countLocations--;
-				if ($location == 'postform')
-					echo '
+				if ($location == 'postform') {
+									echo '
 						dropdown:
 						{';
-				elseif ($location == 'popup')
-					echo '
+				} elseif ($location == 'popup') {
+									echo '
 						popup:
 						{';
+				}
 
 				$numRows = count($smileyRows);
 				// This is needed because otherwise the editor will remove all the duplicate (empty) keys and leave only 1 additional line
@@ -72,21 +73,22 @@ 
 						echo '
 								', JavaScriptEscape($smiley['code']), ': ', JavaScriptEscape($settings['smileys_url'] . '/' . $smiley['filename']), empty($smiley['isLast']) ? ',' : '';
 					}
-					if (empty($smileyRow['isLast']) && $numRows != 1)
-						echo ',
+					if (empty($smileyRow['isLast']) && $numRows != 1) {
+											echo ',
 						\'-', $emptyPlaceholder++, '\': \'\',';
+					}
 				}
 				echo '
 						}', $countLocations != 0 ? ',' : '';
 			}
 			echo '
 					}';
-		}
-		else
-			echo ',
+		} else {
+					echo ',
 					emoticons:
 					{},
 					emoticonsEnabled:false';
+		}
 
 		if ($context['show_bbc'] && $bbcContainer !== null)
 		{
@@ -97,15 +99,16 @@ 
 			{
 				echo implode('|', $buttonRow);
 				$count_tags--;
-				if (!empty($count_tags))
-					echo '||';
+				if (!empty($count_tags)) {
+									echo '||';
+				}
 			}
 
 			echo '",';
-		}
-		else
-			echo ',
+		} else {
+					echo ',
 					toolbar: "",';
+		}
 
 		echo '
 				});
@@ -146,43 +149,48 @@ 
 		</span>';
 
 	$tempTab = $context['tabindex'];
-	if (!empty($context['drafts_pm_save']))
-		$tempTab++;
-	elseif (!empty($context['drafts_save']))
-		$tempTab++;
-	elseif ($editor_context['preview_type'])
-		$tempTab++;
-	elseif ($context['show_spellchecking'])
-		$tempTab++;
+	if (!empty($context['drafts_pm_save'])) {
+			$tempTab++;
+	} elseif (!empty($context['drafts_save'])) {
+			$tempTab++;
+	} elseif ($editor_context['preview_type']) {
+			$tempTab++;
+	} elseif ($context['show_spellchecking']) {
+			$tempTab++;
+	}
 
 	$tempTab++;
 	$context['tabindex'] = $tempTab;
 
-	if (!empty($context['drafts_pm_save']))
-		echo '
+	if (!empty($context['drafts_pm_save'])) {
+			echo '
 		<input type="submit" name="save_draft" value="', $txt['draft_save'], '" tabindex="', --$tempTab, '" onclick="submitThisOnce(this);" accesskey="d" class="button_submit">
 		<input type="hidden" id="id_pm_draft" name="id_pm_draft" value="', empty($context['id_pm_draft']) ? 0 : $context['id_pm_draft'], '">';
+	}
 
-	if (!empty($context['drafts_save']))
-		echo '
+	if (!empty($context['drafts_save'])) {
+			echo '
 		<input type="submit" name="save_draft" value="', $txt['draft_save'], '" tabindex="', --$tempTab, '" onclick="return confirm(' . JavaScriptEscape($txt['draft_save_note']) . ') && submitThisOnce(this);" accesskey="d" class="button_submit">
 		<input type="hidden" id="id_draft" name="id_draft" value="', empty($context['id_draft']) ? 0 : $context['id_draft'], '">';
+	}
 
-	if ($context['show_spellchecking'])
-		echo '
+	if ($context['show_spellchecking']) {
+			echo '
 		<input type="button" value="', $txt['spell_check'], '" tabindex="', --$tempTab, '" onclick="oEditorHandle_', $editor_id, '.spellCheckStart();" class="button_submit">';
+	}
 
-	if ($editor_context['preview_type'])
-		echo '
+	if ($editor_context['preview_type']) {
+			echo '
 		<input type="submit" name="preview" value="', isset($editor_context['labels']['preview_button']) ? $editor_context['labels']['preview_button'] : $txt['preview'], '" tabindex="', --$tempTab, '" onclick="', $editor_context['preview_type'] == 2 ? 'return event.ctrlKey || previewPost();' : 'return submitThisOnce(this);', '" accesskey="p" class="button_submit">';
+	}
 
 
 	echo '
 		<input type="submit" value="', isset($editor_context['labels']['post_button']) ? $editor_context['labels']['post_button'] : $txt['post'], '" name="post" tabindex="', --$tempTab, '" onclick="return submitThisOnce(this);" accesskey="s" class="button_submit">';
 
 	// Load in the PM autosaver if it's enabled
-	if (!empty($context['drafts_pm_save']) && !empty($context['drafts_autosave']))
-		echo '
+	if (!empty($context['drafts_pm_save']) && !empty($context['drafts_autosave'])) {
+			echo '
 		<span class="righttext padding" style="display: block">
 			<span id="throbber" style="display:none"><img src="' . $settings['images_url'] . '/loading_sm.gif" alt="" class="centericon">&nbsp;</span>
 			<span id="draft_lastautosave" ></span>
@@ -200,10 +208,11 @@ 
 				iFreq: ', (empty($modSettings['drafts_autosave_frequency']) ? 60000 : $modSettings['drafts_autosave_frequency'] * 1000), '
 			});
 		</script>';
+	}
 
 	// Start an instance of the auto saver if its enabled
-	if (!empty($context['drafts_save']) && !empty($context['drafts_autosave']))
-		echo '
+	if (!empty($context['drafts_save']) && !empty($context['drafts_autosave'])) {
+			echo '
 		<span class="righttext padding" style="display: block">
 			<span id="throbber" style="display:none"><img src="' . $settings['images_url'] . '/loading_sm.gif" alt="" class="centericon">&nbsp;</span>
 			<span id="draft_lastautosave" ></span>
@@ -220,7 +229,8 @@ 
 				iFreq: ', $context['drafts_autosave_frequency'], '
 			});
 		</script>';
-}
+	}
+	}
 
 /**
  * This template displays a verification form
@@ -237,51 +247,57 @@ 
 	$verify_context = &$context['controls']['verification'][$verify_id];
 
 	// Keep track of where we are.
-	if (empty($verify_context['tracking']) || $reset)
-		$verify_context['tracking'] = 0;
+	if (empty($verify_context['tracking']) || $reset) {
+			$verify_context['tracking'] = 0;
+	}
 
 	// How many items are there to display in total.
 	$total_items = count($verify_context['questions']) + ($verify_context['show_visual'] || $verify_context['can_recaptcha'] ? 1 : 0);
 
 	// If we've gone too far, stop.
-	if ($verify_context['tracking'] > $total_items)
-		return false;
+	if ($verify_context['tracking'] > $total_items) {
+			return false;
+	}
 
 	// Loop through each item to show them.
 	for ($i = 0; $i < $total_items; $i++)
 	{
 		// If we're after a single item only show it if we're in the right place.
-		if ($display_type == 'single' && $verify_context['tracking'] != $i)
-			continue;
+		if ($display_type == 'single' && $verify_context['tracking'] != $i) {
+					continue;
+		}
 
-		if ($display_type != 'single')
-			echo '
+		if ($display_type != 'single') {
+					echo '
 			<div id="verification_control_', $i, '" class="verification_control">';
+		}
 
 		// Display empty field, but only if we have one, and it's the first time.
-		if ($verify_context['empty_field'] && empty($i))
-			echo '
+		if ($verify_context['empty_field'] && empty($i)) {
+					echo '
 				<div class="smalltext vv_special">
 					', $txt['visual_verification_hidden'], ':
 					<input type="text" name="', $_SESSION[$verify_id . '_vv']['empty_field'], '" autocomplete="off" size="30" value="">
 				</div>';
+		}
 
 		// Do the actual stuff
 		if ($i == 0 && ($verify_context['show_visual'] || $verify_context['can_recaptcha']))
 		{
 			if ($verify_context['show_visual'])
 			{
-				if ($context['use_graphic_library'])
-					echo '
+				if ($context['use_graphic_library']) {
+									echo '
 				<img src="', $verify_context['image_href'], '" alt="', $txt['visual_verification_description'], '" id="verification_image_', $verify_id, '">';
-				else
-					echo '
+				} else {
+									echo '
 				<img src="', $verify_context['image_href'], ';letter=1" alt="', $txt['visual_verification_description'], '" id="verification_image_', $verify_id, '_1">
 				<img src="', $verify_context['image_href'], ';letter=2" alt="', $txt['visual_verification_description'], '" id="verification_image_', $verify_id, '_2">
 				<img src="', $verify_context['image_href'], ';letter=3" alt="', $txt['visual_verification_description'], '" id="verification_image_', $verify_id, '_3">
 				<img src="', $verify_context['image_href'], ';letter=4" alt="', $txt['visual_verification_description'], '" id="verification_image_', $verify_id, '_4">
 				<img src="', $verify_context['image_href'], ';letter=5" alt="', $txt['visual_verification_description'], '" id="verification_image_', $verify_id, '_5">
 				<img src="', $verify_context['image_href'], ';letter=6" alt="', $txt['visual_verification_description'], '" id="verification_image_', $verify_id, '_6">';
+				}
 
 				echo '
 				<div class="smalltext" style="margin: 4px 0 8px 0;">
@@ -297,8 +313,7 @@ 
 				<div class="g-recaptcha centertext" data-sitekey="' . $verify_context['recaptcha_site_key'] . '" data-theme="' . $verify_context['recaptcha_theme'] . '"></div><br>
 				<script type="text/javascript" src="https://www.google.com/recaptcha/api.js"></script>';
 			}
-		}
-		else
+		} else
 		{
 			// Where in the question array is this question?
 			$qIndex = $verify_context['show_visual'] ? $i - 1 : $i;
@@ -310,21 +325,24 @@ 
 				</div>';
 		}
 
-		if ($display_type != 'single')
-			echo '
+		if ($display_type != 'single') {
+					echo '
 			</div>';
+		}
 
 		// If we were displaying just one and we did it, break.
-		if ($display_type == 'single' && $verify_context['tracking'] == $i)
-			break;
+		if ($display_type == 'single' && $verify_context['tracking'] == $i) {
+					break;
+		}
 	}
 
 	// Assume we found something, always,
 	$verify_context['tracking']++;
 
 	// Tell something displaying piecemeal to keep going.
-	if ($display_type == 'single')
-		return true;
-}
+	if ($display_type == 'single') {
+			return true;
+	}
+	}
 
 ?>
\ No newline at end of file

Themes/default/MoveTopic.template.php

Doc Comments +1 added lines

@@ -83,6 +83,7 @@
  * Redirection topic options
  *
  * @var string $type What type of topic this is for - currently 'merge' or 'move'. Used to display appropriate text strings...
+ * @param string $type
  */
 function template_redirect_options($type)
 {

Indentation +3 added lines, -3 removed lines

@@ -63,7 +63,7 @@ 
 	// Stick our "create a redirection topic" template in here...
 	template_redirect_options('move');
 
-    echo '
+	echo '
 					<input type="submit" value="', $txt['move_topic'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button_submit">
 				</div>
 			</div>';
@@ -86,9 +86,9 @@ 
  */
 function template_redirect_options($type)
 {
-    global $txt, $context, $modSettings;
+	global $txt, $context, $modSettings;
 
-    echo '
+	echo '
 					<label for="postRedirect"><input type="checkbox" name="postRedirect" id="postRedirect"', $context['is_approved'] ? ' checked' : '', ' onclick="', $context['is_approved'] ? '' : 'if (this.checked && !confirm(\'' . $txt[$type . '_topic_unapproved_js'] . '\')) return false; ', 'document.getElementById(\'reasonArea\').style.display = this.checked ? \'block\' : \'none\';" class="input_check"> ', $txt['post_redirection'], '.</label>
 					<fieldset id="reasonArea" style="margin-top: 1ex;', $context['is_approved'] ? '' : 'display: none;', '">
 						<dl class="settings">

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 
 		foreach ($category['boards'] as $board)
 			echo '
-									<option value="', $board['id'], '"', $board['selected'] ? ' selected' : '', $board['id'] == $context['current_board'] ? ' disabled' : '', '>', $board['child_level'] > 0 ? str_repeat('==', $board['child_level']-1) . '=&gt; ' : '', $board['name'], '</option>';
+									<option value="', $board['id'], '"', $board['selected'] ? ' selected' : '', $board['id'] == $context['current_board'] ? ' disabled' : '', '>', $board['child_level'] > 0 ? str_repeat('==', $board['child_level'] - 1) . '=&gt; ' : '', $board['name'], '</option>';
 		echo '
 								</optgroup>';
 	}

Braces +25 added lines, -20 removed lines

@@ -37,9 +37,10 @@ 
 		echo '
 								<optgroup label="', $category['name'], '">';
 
-		foreach ($category['boards'] as $board)
-			echo '
+		foreach ($category['boards'] as $board) {
+					echo '
 									<option value="', $board['id'], '"', $board['selected'] ? ' selected' : '', $board['id'] == $context['current_board'] ? ' disabled' : '', '>', $board['child_level'] > 0 ? str_repeat('==', $board['child_level']-1) . '=&gt; ' : '', $board['name'], '</option>';
+		}
 		echo '
 								</optgroup>';
 	}
@@ -68,9 +69,10 @@ 
 				</div>
 			</div>';
 
-	if ($context['back_to_topic'])
-		echo '
+	if ($context['back_to_topic']) {
+			echo '
 			<input type="hidden" name="goback" value="1">';
+	}
 
 	echo '
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -120,8 +122,7 @@ 
 									<option value="86400">', $txt['two_months'], '</option>
 								</select>
 							</dd>';
-	}
-	else
+	} else
 	{
 		echo '
 							<input type="hidden" name="redirect_expires" value="0">';
@@ -217,9 +218,9 @@ 
 						<input type="submit" value="', $txt['go'], '" class="button_submit">
 					</form>';
 
+	} else {
+			echo $txt['target_below'];
 	}
-	else
-		echo $txt['target_below'];
 
 	echo '				</h4>
 			</div>';
@@ -237,12 +238,13 @@ 
 
 		$merge_button = create_button('merge', 'merge', '');
 
-		foreach ($context['topics'] as $topic)
-			echo '
+		foreach ($context['topics'] as $topic) {
+					echo '
 						<li>
 							<a href="', $scripturl, '?action=mergetopics;sa=options;board=', $context['current_board'], '.0;from=', $context['origin_topic'], ';to=', $topic['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $merge_button, '</a>&nbsp;
 							<a href="', $scripturl, '?topic=', $topic['id'], '.0" target="_blank" class="new_win">', $topic['subject'], '</a> ', $txt['started_by'], ' ', $topic['poster']['link'], '
 						</li>';
+		}
 
 		echo '
 					</ul>
@@ -251,8 +253,7 @@ 
 				<div class="pagesection">
 					', $context['page_index'], '
 				</div>';
-	}
-	else
+	} else
 	{
 		// Just a nice "There aren't any topics" message
 		echo '
@@ -306,8 +307,8 @@ 
 					</tr>
 				</thead>
 				<tbody>';
-		foreach ($context['topics'] as $topic)
-			echo '
+		foreach ($context['topics'] as $topic) {
+					echo '
 					<tr class="windowbg">
 						<td>
 							<input type="checkbox" class="input_check" name="topics[]" value="' . $topic['id'] . '" checked>
@@ -327,6 +328,7 @@ 
 							<input type="checkbox" class="input_check" name="notifications[]" value="' . $topic['id'] . '" checked>
 						</td>
 					</tr>';
+		}
 		echo '
 				</tbody>
 			</table>
@@ -337,9 +339,10 @@ 
 				<fieldset id="merge_subject" class="merge_options">
 					<legend>', $txt['merge_select_subject'], '</legend>
 					<select name="subject" onchange="this.form.custom_subject.style.display = (this.options[this.selectedIndex].value != 0) ? \'none\': \'\' ;">';
-	foreach ($context['topics'] as $topic)
-		echo '
+	foreach ($context['topics'] as $topic) {
+			echo '
 						<option value="', $topic['id'], '"' . ($topic['selected'] ? ' selected' : '') . '>', $topic['subject'], '</option>';
+	}
 	echo '
 						<option value="0">', $txt['merge_custom_subject'], ':</option>
 					</select>
@@ -357,11 +360,12 @@ 
 				<fieldset id="merge_board" class="merge_options">
 					<legend>', $txt['merge_select_target_board'], '</legend>
 					<ul>';
-		foreach ($context['boards'] as $board)
-			echo '
+		foreach ($context['boards'] as $board) {
+					echo '
 						<li>
 							<input type="radio" name="board" value="' . $board['id'] . '"' . ($board['selected'] ? ' checked' : '') . ' class="input_radio"> ' . $board['name'] . '
 						</li>';
+		}
 		echo '
 					</ul>
 				</fieldset>';
@@ -372,11 +376,12 @@ 
 				<fieldset id="merge_poll" class="merge_options">
 					<legend>' . $txt['merge_select_poll'] . '</legend>
 					<ul>';
-		foreach ($context['polls'] as $poll)
-			echo '
+		foreach ($context['polls'] as $poll) {
+					echo '
 						<li>
 							<input type="radio" name="poll" value="' . $poll['id'] . '"' . ($poll['selected'] ? ' checked' : '') . ' class="input_radio"> ' . $poll['question'] . ' (' . $txt['topic'] . ': <a href="' . $scripturl . '?topic=' . $poll['topic']['id'] . '.0" target="_blank" class="new_win">' . $poll['topic']['subject'] . '</a>)
 						</li>';
+		}
 		echo '
 						<li>
 							<input type="radio" name="poll" value="-1" class="input_radio"> (' . $txt['merge_no_poll'] . ')

Themes/default/Packages.template.php

Doc Comments +1 added lines, -1 removed lines

@@ -1096,7 +1096,7 @@
 /**
  * CHMOD control form
  *
- * @return bool False if nothing to do.
+ * @return false|null False if nothing to do.
  */
 function template_control_chmod()
 {

Braces +144 added lines, -104 removed lines

@@ -31,12 +31,13 @@ 
 		</div>
 		<div class="information">';
 
-	if ($context['is_installed'])
-		echo '
+	if ($context['is_installed']) {
+			echo '
 			<strong>', $txt['package_installed_warning1'], '</strong><br>
 			<br>
 			', $txt['package_installed_warning2'], '<br>
 			<br>';
+	}
 
 	echo $txt['package_installed_warning3'], '
 		</div><br>';
@@ -63,8 +64,9 @@ 
 				', $context['package_readme'], '
 				<span class="floatright">', $txt['package_available_readme_language'], '
 					<select name="readme_language" id="readme_language" onchange="if (this.options[this.selectedIndex].value) window.location.href = smf_prepareScriptUrl(smf_scripturl + \'', '?action=admin;area=packages;sa=', $context['uninstalling'] ? 'uninstall' : 'install', ';package=', $context['filename'], ';readme=\' + this.options[this.selectedIndex].value + \';license=\' + get_selected(\'license_language\'));">';
-						foreach ($context['readmes'] as $a => $b)
-							echo '<option value="', $b, '"', $a === 'selected' ? ' selected' : '', '>', $b == 'default' ? $txt['package_readme_default'] : ucfirst($b), '</option>';
+						foreach ($context['readmes'] as $a => $b) {
+													echo '<option value="', $b, '"', $a === 'selected' ? ' selected' : '', '>', $b == 'default' ? $txt['package_readme_default'] : ucfirst($b), '</option>';
+						}
 			echo '
 					</select>
 				</span>
@@ -83,8 +85,9 @@ 
 				', $context['package_license'], '
 				<span class="floatright">', $txt['package_available_license_language'], '
 					<select name="license_language" id="license_language" onchange="if (this.options[this.selectedIndex].value) window.location.href = smf_prepareScriptUrl(smf_scripturl + \'', '?action=admin;area=packages;sa=install', ';package=', $context['filename'], ';license=\' + this.options[this.selectedIndex].value + \';readme=\' + get_selected(\'readme_language\'));">';
-						foreach ($context['licenses'] as $a => $b)
-							echo '<option value="', $b, '"', $a === 'selected' ? ' selected' : '', '>', $b == 'default' ? $txt['package_license_default'] : ucfirst($b), '</option>';
+						foreach ($context['licenses'] as $a => $b) {
+													echo '<option value="', $b, '"', $a === 'selected' ? ' selected' : '', '>', $b == 'default' ? $txt['package_license_default'] : ucfirst($b), '</option>';
+						}
 			echo '
 					</select>
 				</span>
@@ -110,9 +113,10 @@ 
 					', $txt['package_db_uninstall_actions'], ':
 					<ul>';
 
-		foreach ($context['database_changes'] as $change)
-			echo '
+		foreach ($context['database_changes'] as $change) {
+					echo '
 						<li>', $change, '</li>';
+		}
 		echo '
 					</ul>
 				</div>
@@ -122,14 +126,14 @@ 
 	echo '
 			<div class="information">';
 
-	if (empty($context['actions']) && empty($context['database_changes']))
-		echo '
+	if (empty($context['actions']) && empty($context['database_changes'])) {
+			echo '
 				<br>
 				<div class="errorbox">
 					', $txt['corrupt_compatible'], '
 				</div>
 			</div>';
-	else
+	} else
 	{
 		echo '
 					', $txt['perform_actions'], '
@@ -229,9 +233,10 @@ 
 					<tr class="title_bar">
 						<td></td>
 						<td>';
-				if (!empty($context['themes_locked']))
-					echo '
+				if (!empty($context['themes_locked'])) {
+									echo '
 							<input type="hidden" name="custom_theme[]" value="', $id, '">';
+				}
 				echo '
 							<input type="checkbox" name="custom_theme[]" id="custom_theme_', $id, '" value="', $id, '" class="input_check" onclick="', (!empty($theme['has_failure']) ? 'if (this.form.custom_theme_' . $id . '.checked && !confirm(\'' . $txt['package_theme_failure_warning'] . '\')) return false;' : ''), 'invertAll(this, this.form, \'dummy_theme_', $id, '\', true);"', !empty($context['themes_locked']) ? ' disabled checked' : '', '>
 						</td>
@@ -372,14 +377,15 @@ 
 	</script>';
 
 	// And a bit more for database changes.
-	if (!empty($context['database_changes']))
-		echo '
+	if (!empty($context['database_changes'])) {
+			echo '
 	<script>
 		var database_changes_area = document.getElementById(\'db_changes_div\');
 		var db_vis = false;
 		database_changes_area.style.display = "none";
 	</script>';
-}
+	}
+	}
 
 /**
  * Extract package contents
@@ -411,12 +417,12 @@ 
 				<h3 class="catbg">', $context['uninstalling'] ? $txt['uninstall'] : $txt['extracting'], '</h3>
 			</div>
 			<div class="information">', $txt['package_installed_extract'], '</div>';
-	}
-	else
-		echo '
+	} else {
+			echo '
 			<div class="cat_bar">
 				<h3 class="catbg">', $txt['package_installed_redirecting'], '</h3>
 			</div>';
+	}
 
 	echo '
 		<div class="windowbg">';
@@ -427,25 +433,25 @@ 
 		echo '
 			', $context['redirect_text'], '<br><br>
 			<a href="', $context['redirect_url'], '">', $txt['package_installed_redirect_go_now'], '</a> | <a href="', $scripturl, '?action=admin;area=packages;sa=browse">', $txt['package_installed_redirect_cancel'], '</a>';
-	}
-	elseif ($context['uninstalling'])
-		echo '
+	} elseif ($context['uninstalling']) {
+			echo '
 			', $txt['package_uninstall_done'];
-	elseif ($context['install_finished'])
+	} elseif ($context['install_finished'])
 	{
-		if ($context['extract_type'] == 'avatar')
-			echo '
+		if ($context['extract_type'] == 'avatar') {
+					echo '
 				', $txt['avatars_extracted'];
-		elseif ($context['extract_type'] == 'language')
-			echo '
+		} elseif ($context['extract_type'] == 'language') {
+					echo '
 				', $txt['language_extracted'];
-		else
-			echo '
+		} else {
+					echo '
 				', $txt['package_installed_done'];
-	}
-	else
-		echo '
+		}
+	} else {
+			echo '
 			', $txt['corrupt_compatible'];
+	}
 
 	echo '
 		</div>';
@@ -479,9 +485,10 @@ 
 		<div class="windowbg">
 			<ol>';
 
-	foreach ($context['files'] as $fileinfo)
-		echo '
+	foreach ($context['files'] as $fileinfo) {
+			echo '
 				<li><a href="', $scripturl, '?action=admin;area=packages;sa=examine;package=', $context['filename'], ';file=', $fileinfo['filename'], '" title="', $txt['view'], '">', $fileinfo['filename'], '</a> (', $fileinfo['size'], ' ', $txt['package_bytes'], ')</li>';
+	}
 
 	echo '
 			</ol>
@@ -545,9 +552,10 @@ 
 			</script>
 			<div id="yourVersion" style="display:none">', $context['forum_version'], '</div>';
 
-	if (empty($modSettings['disable_smf_js']))
-		echo '
+	if (empty($modSettings['disable_smf_js'])) {
+			echo '
 			<script src="', $scripturl, '?action=viewsmfile;filename=latest-news.js"></script>';
+	}
 
 	// This sets the announcements and current versions themselves ;).
 	echo '
@@ -586,12 +594,13 @@ 
 		}
 	}
 
-	if (!$mods_available)
-		echo '
+	if (!$mods_available) {
+			echo '
 		<div class="noticebox">', $txt['no_packages'], '</div>';
-	else
-		echo '
+	} else {
+			echo '
 		<br>';
+	}
 
 	// the advanced (emulation) box, collapsed by default
 	echo '
@@ -680,11 +689,12 @@ 
 {
 	global $context, $txt, $scripturl;
 
-	if (!empty($context['package_ftp']['error']))
-			echo '
+	if (!empty($context['package_ftp']['error'])) {
+				echo '
 					<div class="errorbox">
 						<pre>', $context['package_ftp']['error'], '</pre>
 					</div>';
+	}
 
 	echo '
 	<div id="admin_form_wrapper">
@@ -765,13 +775,14 @@ 
 				<fieldset>
 					<legend>' . $txt['package_servers'] . '</legend>
 					<ul class="package_servers">';
-	foreach ($context['servers'] as $server)
-		echo '
+	foreach ($context['servers'] as $server) {
+			echo '
 						<li class="flow_auto">
 							<span class="floatleft">' . $server['name'] . '</span>
 							<span class="package_server floatright"><a href="' . $scripturl . '?action=admin;area=packages;get;sa=remove;server=' . $server['id'] . ';', $context['session_var'], '=', $context['session_id'], '">[ ' . $txt['delete'] . ' ]</a></span>
 							<span class="package_server floatright"><a href="' . $scripturl . '?action=admin;area=packages;get;sa=browse;server=' . $server['id'] . '">[ ' . $txt['package_browse'] . ' ]</a></span>
 						</li>';
+	}
 	echo '
 					</ul>
 				</fieldset>
@@ -858,11 +869,12 @@ 
 		<div class="windowbg2">';
 
 	// No packages, as yet.
-	if (empty($context['package_list']))
-		echo '
+	if (empty($context['package_list'])) {
+			echo '
 			<ul>
 				<li>', $txt['no_packages'], '</li>
 			</ul>';
+	}
 	// List out the packages...
 	else
 	{
@@ -874,11 +886,12 @@ 
 				<li>
 					<strong><span id="ps_img_', $i, '" class="toggle_up" alt="*" style="display: none;"></span> ', $packageSection['title'], '</strong>';
 
-			if (!empty($packageSection['text']))
-				echo '
+			if (!empty($packageSection['text'])) {
+							echo '
 					<div class="sub_bar">
 						<h3 class="subbg">', $packageSection['text'], '</h3>
 					</div>';
+			}
 
 			echo '
 					<', $context['list_type'], ' id="package_section_', $i, '" class="packages">';
@@ -888,13 +901,15 @@ 
 				echo '
 						<li>';
 				// Textual message. Could be empty just for a blank line...
-				if ($package['is_text'])
-					echo '
+				if ($package['is_text']) {
+									echo '
 							', empty($package['name']) ? '&nbsp;' : $package['name'];
+				}
 				// This is supposed to be a rule..
-				elseif ($package['is_line'])
-					echo '
+				elseif ($package['is_line']) {
+									echo '
 						<hr>';
+				}
 				// A remote link.
 				elseif ($package['is_remote'])
 				{
@@ -916,21 +931,25 @@ 
 						<ul id="package_section_', $i, '_pkg_', $id, '" class="package_section">';
 
 					// Show the mod type?
-					if ($package['type'] != '')
-						echo '
+					if ($package['type'] != '') {
+											echo '
 							<li class="package_section">', $txt['package_type'], ':&nbsp; ', $smcFunc['ucwords']($smcFunc['strtolower']($package['type'])), '</li>';
+					}
 					// Show the version number?
-					if ($package['version'] != '')
-						echo '
+					if ($package['version'] != '') {
+											echo '
 							<li class="package_section">', $txt['mod_version'], ':&nbsp; ', $package['version'], '</li>';
+					}
 					// How 'bout the author?
-					if (!empty($package['author']) && $package['author']['name'] != '' && isset($package['author']['link']))
-						echo '
+					if (!empty($package['author']) && $package['author']['name'] != '' && isset($package['author']['link'])) {
+											echo '
 							<li class="package_section">', $txt['mod_author'], ':&nbsp; ', $package['author']['link'], '</li>';
+					}
 					// The homepage....
-					if ($package['author']['website']['link'] != '')
-						echo '
+					if ($package['author']['website']['link'] != '') {
+											echo '
 							<li class="package_section">', $txt['author_website'], ':&nbsp; ', $package['author']['website']['link'], '</li>';
+					}
 
 					// Desciption: bleh bleh!
 					// Location of file: http://someplace/.
@@ -983,8 +1002,8 @@ 
 
 				foreach ($ps['items'] as $id => $package)
 				{
-					if (!$package['is_text'] && !$package['is_line'] && !$package['is_remote'])
-						echo '
+					if (!$package['is_text'] && !$package['is_line'] && !$package['is_remote']) {
+											echo '
 				var oPackageToggle_', $section, '_pkg_', $id, ' = new smc_Toggle({
 					bToggleEnabled: true,
 					bCurrentlyCollapsed: true,
@@ -999,6 +1018,7 @@ 
 						}
 					]
 				});';
+					}
 				}
 			}
 			echo '
@@ -1039,9 +1059,10 @@ 
 {
 	global $context, $txt, $scripturl;
 
-	if (!empty($context['saved_successful']))
-		echo '
+	if (!empty($context['saved_successful'])) {
+			echo '
 	<div class="infobox">', $txt['settings_saved'], '</div>';
+	}
 
 	echo '
 	<div id="admincenter">
@@ -1103,8 +1124,9 @@ 
 	global $context, $txt;
 
 	// Nothing to do? Brilliant!
-	if (empty($context['package_ftp']))
-		return false;
+	if (empty($context['package_ftp'])) {
+			return false;
+	}
 
 	if (empty($context['package_ftp']['form_elements_only']))
 	{
@@ -1113,19 +1135,21 @@ 
 				<div id="need_writable_list" class="smalltext">
 					', $txt['package_ftp_why_file_list'], '
 					<ul style="display: inline;">';
-		if (!empty($context['notwritable_files']))
-			foreach ($context['notwritable_files'] as $file)
+		if (!empty($context['notwritable_files'])) {
+					foreach ($context['notwritable_files'] as $file)
 				echo '
 						<li>', $file, '</li>';
+		}
 
 		echo '
 					</ul>';
 
-		if (!$context['server']['is_windows'])
-			echo '
+		if (!$context['server']['is_windows']) {
+					echo '
 				<hr>
 				', $txt['package_chmod_linux'], '<br />
 				<tt># chmod a+w ', implode(' ', $context['notwritable_files']), '</tt>';
+		}
 
 		echo '
 				</div>';
@@ -1136,9 +1160,10 @@ 
 					<tt id="ftp_error_message">', !empty($context['package_ftp']['error']) ? $context['package_ftp']['error'] : '', '</tt>
 				</div></div>';
 
-	if (!empty($context['package_ftp']['destination']))
-		echo '
+	if (!empty($context['package_ftp']['destination'])) {
+			echo '
 				<form action="', $context['package_ftp']['destination'], '" method="post" accept-charset="', $context['character_set'], '" style="margin: 0;">';
+	}
 
 	echo '
 					<fieldset>
@@ -1171,25 +1196,28 @@ 
 					</dl>
 					</fieldset>';
 
-	if (empty($context['package_ftp']['form_elements_only']))
-		echo '
+	if (empty($context['package_ftp']['form_elements_only'])) {
+			echo '
 
 					<div class="righttext" style="margin: 1ex;">
 						<span id="test_ftp_placeholder_full"></span>
 						<input type="submit" value="', $txt['package_proceed'], '" class="button_submit">
 					</div>';
+	}
 
-	if (!empty($context['package_ftp']['destination']))
-		echo '
+	if (!empty($context['package_ftp']['destination'])) {
+			echo '
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 				</form>';
+	}
 
 	// Hide the details of the list.
-	if (empty($context['package_ftp']['form_elements_only']))
-		echo '
+	if (empty($context['package_ftp']['form_elements_only'])) {
+			echo '
 		<script>
 			document.getElementById(\'need_writable_list\').style.display = \'none\';
 		</script>';
+	}
 
 	// Quick generate the test button.
 	echo '
@@ -1545,9 +1573,10 @@ 
 				<tr class="windowbg">
 					<td width="30%"><strong>';
 
-				if (!empty($dir['type']) && ($dir['type'] == 'dir' || $dir['type'] == 'dir_recursive'))
-					echo '
+				if (!empty($dir['type']) && ($dir['type'] == 'dir' || $dir['type'] == 'dir_recursive')) {
+									echo '
 						<span class="generic_icons folder"></span>';
+				}
 
 				echo '
 						', $name, '
@@ -1564,8 +1593,9 @@ 
 				</tr>
 			';
 
-		if (!empty($dir['contents']))
-			template_permission_show_contents($name, $dir['contents'], 1);
+		if (!empty($dir['contents'])) {
+					template_permission_show_contents($name, $dir['contents'], 1);
+		}
 	}
 
 	echo '
@@ -1601,13 +1631,14 @@ 
 			</fieldset>';
 
 	// Likely to need FTP?
-	if (empty($context['ftp_connected']))
-		echo '
+	if (empty($context['ftp_connected'])) {
+			echo '
 			<p>
 				', $txt['package_file_perms_ftp_details'], ':
 			</p>
 			', template_control_chmod(), '
 			<div class="noticebox">', $txt['package_file_perms_ftp_retain'], '</div>';
+	}
 
 	echo '
 			<span id="test_ftp_placeholder_full"></span>
@@ -1616,9 +1647,10 @@ 
 		</div>';
 
 	// Any looks fors we've already done?
-	foreach ($context['look_for'] as $path)
-		echo '
+	foreach ($context['look_for'] as $path) {
+			echo '
 			<input type="hidden" name="back_look[]" value="', $path, '">';
+	}
 	echo '
 	</form><br>';
 }
@@ -1657,9 +1689,10 @@ 
 				<td class="smalltext" width="30%">' . str_repeat('&nbsp;', $level * 5), '
 					', (!empty($dir['type']) && $dir['type'] == 'dir_recursive') || !empty($dir['list_contents']) ? '<a id="link_' . $cur_ident . '" href="' . $scripturl . '?action=admin;area=packages;sa=perms;find=' . base64_encode($ident . '/' . $name) . ';back_look=' . $context['back_look_data'] . ';' . $context['session_var'] . '=' . $context['session_id'] . '#fol_' . $cur_ident . '" onclick="return expandFolder(\'' . $cur_ident . '\', \'' . addcslashes($ident . '/' . $name, "'\\") . '\');">' : '';
 
-			if (!empty($dir['type']) && ($dir['type'] == 'dir' || $dir['type'] == 'dir_recursive'))
-				echo '
+			if (!empty($dir['type']) && ($dir['type'] == 'dir' || $dir['type'] == 'dir_recursive')) {
+							echo '
 						<span class="generic_icons folder"></span>';
+			}
 
 			echo '
 					', $name, '
@@ -1685,14 +1718,15 @@ 
 	}
 
 	// We have more files to show?
-	if ($has_more)
-		echo '
+	if ($has_more) {
+			echo '
 	<tr class="windowbg" id="content_', $js_ident, '_more">
 		<td class="smalltext" width="40%">' . str_repeat('&nbsp;', $level * 5), '
 			&#171; <a href="' . $scripturl . '?action=admin;area=packages;sa=perms;find=' . base64_encode($ident) . ';fileoffset=', ($context['file_offset'] + $context['file_limit']), ';' . $context['session_var'] . '=' . $context['session_id'] . '#fol_' . preg_replace('~[^A-Za-z0-9_\-=:]~', ':-:', $ident) . '">', $txt['package_file_perms_more_files'], '</a> &#187;
 		</td>
 		<td colspan="6"></td>
 	</tr>';
+	}
 
 	if ($drawn_div)
 	{
@@ -1700,15 +1734,17 @@ 
 		$isFound = false;
 		foreach ($context['look_for'] as $tree)
 		{
-			if (substr($tree, 0, strlen($ident)) == $ident)
-				$isFound = true;
+			if (substr($tree, 0, strlen($ident)) == $ident) {
+							$isFound = true;
+			}
 		}
 
-		if ($level > 1 && !$isFound)
-			echo '
+		if ($level > 1 && !$isFound) {
+					echo '
 		<script>
 			expandFolder(\'', $js_ident, '\', \'\');
 		</script>';
+		}
 	}
 }
 
@@ -1728,11 +1764,12 @@ 
 				<h3 class="catbg">', $txt['package_file_perms_applying'], '</h3>
 			</div>';
 
-	if (!empty($context['skip_ftp']))
-		echo '
+	if (!empty($context['skip_ftp'])) {
+			echo '
 			<div class="errorbox">
 				', $txt['package_file_perms_skipping_ftp'], '
 			</div>';
+	}
 
 	// How many have we done?
 	$remaining_items = count($context['method'] == 'individual' ? $context['to_process'] : $context['directory_list']);
@@ -1770,28 +1807,31 @@ 
 				<br>';
 
 	// Put out the right hidden data.
-	if ($context['method'] == 'individual')
-		echo '
+	if ($context['method'] == 'individual') {
+			echo '
 				<input type="hidden" name="custom_value" value="', $context['custom_value'], '">
 				<input type="hidden" name="totalItems" value="', $context['total_items'], '">
 				<input type="hidden" name="toProcess" value="', base64_encode(json_encode($context['to_process'])), '">';
-	else
-		echo '
+	} else {
+			echo '
 				<input type="hidden" name="predefined" value="', $context['predefined_type'], '">
 				<input type="hidden" name="fileOffset" value="', $context['file_offset'], '">
 				<input type="hidden" name="totalItems" value="', $context['total_items'], '">
 				<input type="hidden" name="dirList" value="', base64_encode(json_encode($context['directory_list'])), '">
 				<input type="hidden" name="specialFiles" value="', base64_encode(json_encode($context['special_files'])), '">';
+	}
 
 	// Are we not using FTP for whatever reason.
-	if (!empty($context['skip_ftp']))
-		echo '
+	if (!empty($context['skip_ftp'])) {
+			echo '
 				<input type="hidden" name="skip_ftp" value="1">';
+	}
 
 	// Retain state.
-	foreach ($context['back_look_data'] as $path)
-		echo '
+	foreach ($context['back_look_data'] as $path) {
+			echo '
 				<input type="hidden" name="back_look[]" value="', $path, '">';
+	}
 
 	echo '
 				<input type="hidden" name="method" value="', $context['method'], '">

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

Packages/backups/index.php

Braces +3 added lines, -2 removed lines

@@ -1,9 +1,10 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
+if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) {
 	include (dirname(dirname(__FILE__)) . '/index.php');
-else
+} else {
 	exit;
+}
 
 ?>
\ No newline at end of file

ssi_examples.php

Braces +4 added lines, -4 removed lines

@@ -583,8 +583,7 @@ 
 	{
 		$header = '<?php require("' . ($user_info['is_admin'] ? addslashes(realpath($boarddir . '/SSI.php')) : 'SSI.php') . '"); ?>' . "\n" . $header;
 		return $header . template_homepage_sample1_html() . $footer;
-	}
-	else
+	} else
 	{
 		echo $header;
 		template_homepage_sample1_php();
@@ -599,9 +598,10 @@ 
 
 	$topics = ssi_recentTopics(8, null, null, 'array');
 
-	foreach ($topics as $topic)
-		echo '
+	foreach ($topics as $topic) {
+			echo '
 			<li><a href="', $topic['href'], '">', $topic['subject'], '</a> ', $txt['by'], ' ', $topic['poster']['link'], '</li>';
+	}
 
 	unset($topics);
 

other/Settings.php

Braces +8 added lines, -4 removed lines

@@ -186,8 +186,9 @@ 
 
 ########## Error-Catching ##########
 # Note: You shouldn't touch these settings.
-if (file_exists(dirname(__FILE__) . '/db_last_error.php'))
+if (file_exists(dirname(__FILE__) . '/db_last_error.php')) {
 	include(dirname(__FILE__) . '/db_last_error.php');
+}
 
 if (!isset($db_last_error))
 {
@@ -202,11 +203,14 @@ 
 }
 
 # Make sure the paths are correct... at least try to fix them.
-if (!file_exists($boarddir) && file_exists(dirname(__FILE__) . '/agreement.txt'))
+if (!file_exists($boarddir) && file_exists(dirname(__FILE__) . '/agreement.txt')) {
 	$boarddir = dirname(__FILE__);
-if (!file_exists($sourcedir) && file_exists($boarddir . '/Sources'))
+}
+if (!file_exists($sourcedir) && file_exists($boarddir . '/Sources')) {
 	$sourcedir = $boarddir . '/Sources';
-if (!file_exists($cachedir) && file_exists($boarddir . '/cache'))
+}
+if (!file_exists($cachedir) && file_exists($boarddir . '/cache')) {
 	$cachedir = $boarddir . '/cache';
+}
 
 ?>
\ No newline at end of file