SimpleMachines / SMF2.1

Sources/ManageRegistration.php

Braces +27 added lines, -19 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Entrance point for the registration center, it checks permissions and forwards
@@ -31,8 +32,9 @@ 
 	global $context, $txt;
 
 	// Old templates might still request this.
-	if (isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'browse')
-		redirectexit('action=admin;area=viewmembers;sa=browse' . (isset($_REQUEST['type']) ? ';type=' . $_REQUEST['type'] : ''));
+	if (isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'browse') {
+			redirectexit('action=admin;area=viewmembers;sa=browse' . (isset($_REQUEST['type']) ? ';type=' . $_REQUEST['type'] : ''));
+	}
 
 	$subActions = array(
 		'register' => array('AdminRegister', 'moderate_forum'),
@@ -99,9 +101,10 @@ 
 		checkSession();
 		validateToken('admin-regc');
 
-		foreach ($_POST as $key => $value)
-			if (!is_array($_POST[$key]))
+		foreach ($_POST as $key => $value) {
+					if (!is_array($_POST[$key]))
 				$_POST[$key] = htmltrim__recursive(str_replace(array("\n", "\r"), '', $_POST[$key]));
+		}
 
 		$regOptions = array(
 			'interface' => 'admin',
@@ -161,12 +164,13 @@ 
 			)
 		);
 		$context['member_groups'] = array(0 => $txt['admin_register_group_none']);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$context['member_groups'][$row['id_group']] = $row['group_name'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$context['member_groups'][$row['id_group']] = $row['group_name'];
+		}
 		$smcFunc['db_free_result']($request);
+	} else {
+			$context['member_groups'] = array();
 	}
-	else
-		$context['member_groups'] = array();
 
 	// Basic stuff.
 	$context['sub_template'] = 'admin_register';
@@ -207,8 +211,9 @@ 
 		{
 			$context['editable_agreements']['.' . $lang['filename']] = $lang['name'];
 			// Are we editing this?
-			if (isset($_POST['agree_lang']) && $_POST['agree_lang'] == '.' . $lang['filename'])
-				$context['current_agreement'] = '.' . $lang['filename'];
+			if (isset($_POST['agree_lang']) && $_POST['agree_lang'] == '.' . $lang['filename']) {
+							$context['current_agreement'] = '.' . $lang['filename'];
+			}
 		}
 	}
 
@@ -223,10 +228,11 @@ 
 
 		updateSettings(array('requireAgreement' => !empty($_POST['requireAgreement'])));
 
-		if ($bytes == strlen($to_write))
-			$context['saved_successful'] = true;
-		else
-			$context['could_not_save'] = true;
+		if ($bytes == strlen($to_write)) {
+					$context['saved_successful'] = true;
+		} else {
+					$context['could_not_save'] = true;
+		}
 	}
 
 	$context['agreement'] = file_exists($boarddir . '/agreement' . $context['current_agreement'] . '.txt') ? $smcFunc['htmlspecialchars'](file_get_contents($boarddir . '/agreement' . $context['current_agreement'] . '.txt')) : '';
@@ -310,8 +316,9 @@ 
 
 	call_integration_hook('integrate_modify_registration_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Setup the template
 	$context['sub_template'] = 'show_settings';
@@ -322,8 +329,9 @@ 
 		checkSession();
 
 		// Are there some contacts missing?
-		if (!empty($_POST['coppaAge']) && !empty($_POST['coppaType']) && empty($_POST['coppaPost']) && empty($_POST['coppaFax']))
-			fatal_lang_error('admin_setting_coppa_require_contact');
+		if (!empty($_POST['coppaAge']) && !empty($_POST['coppaType']) && empty($_POST['coppaPost']) && empty($_POST['coppaFax'])) {
+					fatal_lang_error('admin_setting_coppa_require_contact');
+		}
 
 		// Post needs to take into account line breaks.
 		$_POST['coppaPost'] = str_replace("\n", '<br>', empty($_POST['coppaPost']) ? '' : $_POST['coppaPost']);

Sources/ReportedContent.php

Braces +61 added lines, -46 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Sets and call a function based on the given subaction. Acts as a dispatcher function.
@@ -54,8 +55,9 @@ 
 	);
 
 	// This comes under the umbrella of moderating posts.
-	if ($context['report_type'] == 'members' || $user_info['mod_cache']['bq'] == '0=1')
-		isAllowedTo('moderate_forum');
+	if ($context['report_type'] == 'members' || $user_info['mod_cache']['bq'] == '0=1') {
+			isAllowedTo('moderate_forum');
+	}
 
 	$subActions = array(
 		'show' => 'ShowReports',
@@ -70,11 +72,11 @@ 
 	call_integration_hook('integrate_reported_' . $context['report_type'], array(&$subActions));
 
 	// By default we call the open sub-action.
-	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']]))
-		$context['sub_action'] = $smcFunc['htmltrim']($smcFunc['htmlspecialchars']($_REQUEST['sa']), ENT_QUOTES);
-
-	else
-		$context['sub_action'] = 'show';
+	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']])) {
+			$context['sub_action'] = $smcFunc['htmltrim']($smcFunc['htmlspecialchars']($_REQUEST['sa']), ENT_QUOTES);
+	} else {
+			$context['sub_action'] = 'show';
+	}
 
 	// Hi Ho Silver Away!
 	call_helper($subActions[$context['sub_action']]);
@@ -116,11 +118,13 @@ 
 
 		// All the ones to update...
 		$toClose = array();
-		foreach ($_POST['close'] as $rid)
-			$toClose[] = (int) $rid;
+		foreach ($_POST['close'] as $rid) {
+					$toClose[] = (int) $rid;
+		}
 
-		if (!empty($toClose))
-			updateReport('closed', 1, $toClose);
+		if (!empty($toClose)) {
+					updateReport('closed', 1, $toClose);
+		}
 
 		// Set the confirmation message.
 		$_SESSION['rc_confirmation'] = 'close_all';
@@ -175,8 +179,9 @@ 
 	global $context, $sourcedir, $scripturl, $txt;
 
 	// Have to at least give us something to work with.
-	if (empty($_REQUEST['rid']))
-		fatal_lang_error('mc_reportedp_none_found');
+	if (empty($_REQUEST['rid'])) {
+			fatal_lang_error('mc_reportedp_none_found');
+	}
 
 	// Integers only please
 	$report_id = (int) $_REQUEST['rid'];
@@ -184,8 +189,9 @@ 
 	// Get the report details.
 	$report = getReportDetails($report_id);
 
-	if (!$report)
-		fatal_lang_error('mc_no_modreport_found');
+	if (!$report) {
+			fatal_lang_error('mc_no_modreport_found');
+	}
 
 	// Build the report data - basic details first, then extra stuff based on the type
 	$context['report'] = array(
@@ -211,8 +217,7 @@ 
 				'href' => $scripturl . '?action=profile;u=' . $report['id_user'],
 			),
 		);
-	}
-	else
+	} else
 	{
 		$extraDetails = array(
 			'topic_id' => $report['id_topic'],
@@ -235,8 +240,9 @@ 
 
 	$reportComments = getReportComments($report_id);
 
-	if (!empty($reportComments))
-		$context['report'] = array_merge($context['report'], $reportComments);
+	if (!empty($reportComments)) {
+			$context['report'] = array_merge($context['report'], $reportComments);
+	}
 
 	// What have the other moderators done to this message?
 	require_once($sourcedir . '/Modlog.php');
@@ -257,8 +263,7 @@ 
 			1,
 			true,
 		);
-	}
-	else
+	} else
 	{
 		$params = array(
 			'lm.id_topic = {int:id_topic}
@@ -358,16 +363,16 @@ 
 	createList($listOptions);
 
 	// Make sure to get the correct tab selected.
-	if ($context['report']['closed'])
-		$context[$context['moderation_menu_name']]['current_subsection'] = 'closed';
+	if ($context['report']['closed']) {
+			$context[$context['moderation_menu_name']]['current_subsection'] = 'closed';
+	}
 
 	// Finally we are done :P
 	if ($context['report_type'] == 'members')
 	{
 		$context['page_title'] = sprintf($txt['mc_viewmemberreport'], $context['report']['user']['name']);
 		$context['sub_template'] = 'viewmemberreport';
-	}
-	else
+	} else
 	{
 		$context['page_title'] = sprintf($txt['mc_viewmodreport'], $context['report']['subject'], $context['report']['author']['name']);
 		$context['sub_template'] = 'viewmodreport';
@@ -390,8 +395,9 @@ 
 	global $smcFunc, $scripturl, $user_info, $context;
 
 	// The report ID is a must.
-	if (empty($_REQUEST['rid']))
-		fatal_lang_error('mc_reportedp_none_found');
+	if (empty($_REQUEST['rid'])) {
+			fatal_lang_error('mc_reportedp_none_found');
+	}
 
 	// Integers only please.
 	$report_id = (int) $_REQUEST['rid'];
@@ -416,8 +422,9 @@ 
 		checkSession('get');
 		validateToken('mod-reportC-delete', 'get');
 
-		if (empty($_REQUEST['mid']))
-			fatal_lang_error('mc_reportedp_comment_none_found');
+		if (empty($_REQUEST['mid'])) {
+					fatal_lang_error('mc_reportedp_comment_none_found');
+		}
 
 		$comment_id = (int) $_REQUEST['mid'];
 
@@ -425,15 +432,17 @@ 
 		$comment = getCommentModDetails($comment_id);
 
 		// Perhaps somebody else already deleted this fine gem...
-		if (empty($comment))
-			fatal_lang_error('report_action_message_delete_issue');
+		if (empty($comment)) {
+					fatal_lang_error('report_action_message_delete_issue');
+		}
 
 		// Can you actually do this?
 		$comment_owner = $user_info['id'] == $comment['id_member'];
 
 		// Nope! sorry.
-		if (!allowedTo('admin_forum') && !$comment_owner)
-			fatal_lang_error('report_action_message_delete_cannot');
+		if (!allowedTo('admin_forum') && !$comment_owner) {
+					fatal_lang_error('report_action_message_delete_cannot');
+		}
 
 		// All good!
 		deleteModComment($comment_id);
@@ -458,11 +467,13 @@ 
 	checkSession(isset($_REQUEST['save']) ? 'post' : 'get');
 
 	// The report ID is a must.
-	if (empty($_REQUEST['rid']))
-		fatal_lang_error('mc_reportedp_none_found');
+	if (empty($_REQUEST['rid'])) {
+			fatal_lang_error('mc_reportedp_none_found');
+	}
 
-	if (empty($_REQUEST['mid']))
-		fatal_lang_error('mc_reportedp_comment_none_found');
+	if (empty($_REQUEST['mid'])) {
+			fatal_lang_error('mc_reportedp_comment_none_found');
+	}
 
 	// Integers only please.
 	$context['report_id'] = (int) $_REQUEST['rid'];
@@ -470,8 +481,9 @@ 
 
 	$context['comment'] = getCommentModDetails($context['comment_id']);
 
-	if (empty($context['comment']))
-		fatal_lang_error('mc_reportedp_comment_none_found');
+	if (empty($context['comment'])) {
+			fatal_lang_error('mc_reportedp_comment_none_found');
+	}
 
 	// Set up the comforting bits...
 	$context['page_title'] = $txt['mc_reported_posts'];
@@ -482,15 +494,17 @@ 
 		validateToken('mod-reportC-edit');
 
 		// Make sure there is some data to edit on the DB.
-		if (empty($context['comment']))
-			fatal_lang_error('report_action_message_edit_issue');
+		if (empty($context['comment'])) {
+					fatal_lang_error('report_action_message_edit_issue');
+		}
 
 		// Still there, good, now lets see if you can actually edit it...
 		$comment_owner = $user_info['id'] == $context['comment']['id_member'];
 
 		// So, you aren't neither an admin or the comment owner huh? that's too bad.
-		if (!allowedTo('admin_forum') && !$comment_owner)
-			fatal_lang_error('report_action_message_edit_cannot');
+		if (!allowedTo('admin_forum') && !$comment_owner) {
+					fatal_lang_error('report_action_message_edit_cannot');
+		}
 
 		// All good!
 		$edited_comment = trim($smcFunc['htmlspecialchars']($_POST['mod_comment']));
@@ -516,8 +530,9 @@ 
 	checkSession('get');
 
 	// We need to do something!
-	if (empty($_GET['rid']) && (!isset($_GET['ignore']) || !isset($_GET['closed'])))
-		fatal_lang_error('mc_reportedp_none_found');
+	if (empty($_GET['rid']) && (!isset($_GET['ignore']) || !isset($_GET['closed']))) {
+			fatal_lang_error('mc_reportedp_none_found');
+	}
 
 	// What are we gonna do?
 	$action = isset($_GET['ignore']) ? 'ignore' : 'closed';

Sources/Topic.php

Braces +31 added lines, -21 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Locks a topic... either by way of a moderator or the topic starter.
@@ -32,8 +33,9 @@ 
 	global $topic, $user_info, $sourcedir, $board, $smcFunc;
 
 	// Just quit if there's no topic to lock.
-	if (empty($topic))
-		fatal_lang_error('not_a_topic', false);
+	if (empty($topic)) {
+			fatal_lang_error('not_a_topic', false);
+	}
 
 	checkSession('get');
 
@@ -55,23 +57,28 @@ 
 
 	// Can you lock topics here, mister?
 	$user_lock = !allowedTo('lock_any');
-	if ($user_lock && $starter == $user_info['id'])
-		isAllowedTo('lock_own');
-	else
-		isAllowedTo('lock_any');
+	if ($user_lock && $starter == $user_info['id']) {
+			isAllowedTo('lock_own');
+	} else {
+			isAllowedTo('lock_any');
+	}
 
 	// Locking with high privileges.
-	if ($locked == '0' && !$user_lock)
-		$locked = '1';
+	if ($locked == '0' && !$user_lock) {
+			$locked = '1';
+	}
 	// Locking with low privileges.
-	elseif ($locked == '0')
-		$locked = '2';
+	elseif ($locked == '0') {
+			$locked = '2';
+	}
 	// Unlocking - make sure you don't unlock what you can't.
-	elseif ($locked == '2' || ($locked == '1' && !$user_lock))
-		$locked = '0';
+	elseif ($locked == '2' || ($locked == '1' && !$user_lock)) {
+			$locked = '0';
+	}
 	// You cannot unlock this!
-	else
-		fatal_lang_error('locked_by_admin', 'user');
+	else {
+			fatal_lang_error('locked_by_admin', 'user');
+	}
 
 	// Actually lock the topic in the database with the new value.
 	$smcFunc['db_query']('', '
@@ -85,8 +92,9 @@ 
 	);
 
 	// If they are allowed a "moderator" permission, log it in the moderator log.
-	if (!$user_lock)
-		logAction($locked ? 'lock' : 'unlock', array('topic' => $topic, 'board' => $board));
+	if (!$user_lock) {
+			logAction($locked ? 'lock' : 'unlock', array('topic' => $topic, 'board' => $board));
+	}
 	// Notify people that this topic has been locked?
 	sendNotifications($topic, empty($locked) ? 'unlock' : 'lock');
 
@@ -112,8 +120,9 @@ 
 	isAllowedTo('make_sticky');
 
 	// You can't sticky a board or something!
-	if (empty($topic))
-		fatal_lang_error('not_a_topic', false);
+	if (empty($topic)) {
+			fatal_lang_error('not_a_topic', false);
+	}
 
 	checkSession('get');
 
@@ -147,8 +156,9 @@ 
 	// Log this sticky action - always a moderator thing.
 	logAction(empty($is_sticky) ? 'sticky' : 'unsticky', array('topic' => $topic, 'board' => $board));
 	// Notify people that this topic has been stickied?
-	if (empty($is_sticky))
-		sendNotifications($topic, 'sticky');
+	if (empty($is_sticky)) {
+			sendNotifications($topic, 'sticky');
+	}
 
 	// Take them back to the now stickied topic.
 	redirectexit('topic=' . $topic . '.' . $_REQUEST['start'] . ';moderate');

Sources/CacheAPI-apcu.php

Braces +10 added lines, -7 removed lines

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

Sources/Printpage.php

Braces +30 added lines, -23 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Format a topic to be printer friendly.
@@ -32,8 +33,9 @@ 
 	global $board_info, $smcFunc, $modSettings;
 
 	// Redirect to the boardindex if no valid topic id is provided.
-	if (empty($topic))
-		redirectexit();
+	if (empty($topic)) {
+			redirectexit();
+	}
 
 	if (!empty($modSettings['disable_print_topic']))
 	{
@@ -59,8 +61,9 @@ 
 		)
 	);
 	// Redirect to the boardindex if no valid topic id is provided.
-	if ($smcFunc['db_num_rows']($request) == 0)
-		redirectexit();
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			redirectexit();
+	}
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -134,20 +137,21 @@ 
 				foreach ($guestinfo as $i => $guestvoted)
 				{
 					$guestvoted = explode(',', $guestvoted);
-					if ($guestvoted[0] == $row['id_poll'])
-						break;
+					if ($guestvoted[0] == $row['id_poll']) {
+											break;
+					}
 				}
 				// Has the poll been reset since guest voted?
 				if ($pollinfo['reset_poll'] > $guestvoted[1])
 				{
 					// Remove the poll info from the cookie to allow guest to vote again
 					unset($guestinfo[$i]);
-					if (!empty($guestinfo))
-						$_COOKIE['guest_poll_vote'] = ';' . implode(';', $guestinfo);
-					else
-						unset($_COOKIE['guest_poll_vote']);
-				}
-				else
+					if (!empty($guestinfo)) {
+											$_COOKIE['guest_poll_vote'] = ';' . implode(';', $guestinfo);
+					} else {
+											unset($_COOKIE['guest_poll_vote']);
+					}
+				} else
 				{
 					// What did they vote for?
 					unset($guestvoted[0], $guestvoted[1]);
@@ -233,8 +237,9 @@ 
 	$context['poster_name'] = $row['poster_name'];
 	$context['post_time'] = timeformat($row['poster_time'], false);
 	$context['parent_boards'] = array();
-	foreach ($board_info['parent_boards'] as $parent)
-		$context['parent_boards'][] = $parent['name'];
+	foreach ($board_info['parent_boards'] as $parent) {
+			$context['parent_boards'][] = $parent['name'];
+	}
 
 	// Split the topics up so we can print them.
 	$request = $smcFunc['db_query']('', '
@@ -266,8 +271,9 @@ 
 			'id_msg' => $row['id_msg'],
 		);
 
-		if (!isset($context['topic_subject']))
-			$context['topic_subject'] = $row['subject'];
+		if (!isset($context['topic_subject'])) {
+					$context['topic_subject'] = $row['subject'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -275,8 +281,9 @@ 
 	if (isset($_REQUEST['images']) && !empty($modSettings['attachmentEnable']) && allowedTo('view_attachments'))
 	{
 		$messages = array();
-		foreach ($context['posts'] as $temp)
-			$messages[] = $temp['id_msg'];
+		foreach ($context['posts'] as $temp) {
+					$messages[] = $temp['id_msg'];
+		}
 
 		// build the request
 		$request = $smcFunc['db_query']('', '
@@ -295,8 +302,9 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
 			$temp[$row['id_attach']] = $row;
-			if (!isset($context['printattach'][$row['id_msg']]))
-				$context['printattach'][$row['id_msg']] = array();
+			if (!isset($context['printattach'][$row['id_msg']])) {
+							$context['printattach'][$row['id_msg']] = array();
+			}
 		}
 		$smcFunc['db_free_result']($request);
 		ksort($temp);
@@ -313,8 +321,7 @@ 
 						$row['height'] = floor($row['height'] * ($modSettings['max_image_width'] / $row['width']));
 						$row['width'] = $modSettings['max_image_width'];
 					}
-				}
-				elseif (!empty($modSettings['max_image_width']))
+				} elseif (!empty($modSettings['max_image_width']))
 				{
 					if ($row['height'] > $modSettings['max_image_height'])
 					{

Sources/ManageCalendar.php

Spacing +2 added lines, -2 removed lines

@@ -136,7 +136,7 @@ 
 					'value' => $txt['date'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($txt)
+					'function' => function($rowData) use ($txt)
 					{
 						// Recurring every year or just a single year?
 						$year = $rowData['year'] == '1004' ? sprintf('(%1$s)', $txt['every_year']) : $rowData['year'];
@@ -218,7 +218,7 @@ 
 		checkSession();
 
 		// Not too long good sir?
-		$_REQUEST['title'] =  $smcFunc['substr']($_REQUEST['title'], 0, 60);
+		$_REQUEST['title'] = $smcFunc['substr']($_REQUEST['title'], 0, 60);
 		$_REQUEST['holiday'] = isset($_REQUEST['holiday']) ? (int) $_REQUEST['holiday'] : 0;
 
 		if (isset($_REQUEST['delete']))

Braces +37 added lines, -28 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The main controlling function doesn't have much to do... yet.
@@ -43,8 +44,7 @@ 
 			'settings' => 'ModifyCalendarSettings'
 		);
 		$default = 'holidays';
-	}
-	else
+	} else
 	{
 		$subActions = array(
 			'settings' => 'ModifyCalendarSettings'
@@ -60,8 +60,8 @@ 
 		'help' => 'calendar',
 		'description' => $txt['calendar_settings_desc'],
 	);
-	if (!empty($modSettings['cal_enabled']))
-		$context[$context['admin_menu_name']]['tab_data']['tabs'] = array(
+	if (!empty($modSettings['cal_enabled'])) {
+			$context[$context['admin_menu_name']]['tab_data']['tabs'] = array(
 			'holidays' => array(
 				'description' => $txt['manage_holidays_desc'],
 			),
@@ -69,6 +69,7 @@ 
 				'description' => $txt['calendar_settings_desc'],
 			),
 		);
+	}
 
 	call_integration_hook('integrate_manage_calendar', array(&$subActions));
 
@@ -88,8 +89,9 @@ 
 		checkSession();
 		validateToken('admin-mc');
 
-		foreach ($_REQUEST['holiday'] as $id => $value)
-			$_REQUEST['holiday'][$id] = (int) $id;
+		foreach ($_REQUEST['holiday'] as $id => $value) {
+					$_REQUEST['holiday'][$id] = (int) $id;
+		}
 
 		// Now the IDs are "safe" do the delete...
 		require_once($sourcedir . '/Subs-Calendar.php');
@@ -209,8 +211,9 @@ 
 	$context['sub_template'] = 'edit_holiday';
 
 	// Cast this for safety...
-	if (isset($_REQUEST['holiday']))
-		$_REQUEST['holiday'] = (int) $_REQUEST['holiday'];
+	if (isset($_REQUEST['holiday'])) {
+			$_REQUEST['holiday'] = (int) $_REQUEST['holiday'];
+	}
 
 	// Submitting?
 	if (isset($_POST[$context['session_var']]) && (isset($_REQUEST['delete']) || $_REQUEST['title'] != ''))
@@ -221,19 +224,19 @@ 
 		$_REQUEST['title'] =  $smcFunc['substr']($_REQUEST['title'], 0, 60);
 		$_REQUEST['holiday'] = isset($_REQUEST['holiday']) ? (int) $_REQUEST['holiday'] : 0;
 
-		if (isset($_REQUEST['delete']))
-			$smcFunc['db_query']('', '
+		if (isset($_REQUEST['delete'])) {
+					$smcFunc['db_query']('', '
 				DELETE FROM {db_prefix}calendar_holidays
 				WHERE id_holiday = {int:selected_holiday}',
 				array(
 					'selected_holiday' => $_REQUEST['holiday'],
 				)
 			);
-		else
+		} else
 		{
 			$date = strftime($_REQUEST['year'] <= 1004 ? '1004-%m-%d' : '%Y-%m-%d', mktime(0, 0, 0, $_REQUEST['month'], $_REQUEST['day'], $_REQUEST['year']));
-			if (isset($_REQUEST['edit']))
-				$smcFunc['db_query']('', '
+			if (isset($_REQUEST['edit'])) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}calendar_holidays
 					SET event_date = {date:holiday_date}, title = {string:holiday_title}
 					WHERE id_holiday = {int:selected_holiday}',
@@ -243,8 +246,8 @@ 
 						'holiday_title' => $_REQUEST['title'],
 					)
 				);
-			else
-				$smcFunc['db_insert']('',
+			} else {
+							$smcFunc['db_insert']('',
 					'{db_prefix}calendar_holidays',
 					array(
 						'event_date' => 'date', 'title' => 'string-60',
@@ -254,6 +257,7 @@ 
 					),
 					array('id_holiday')
 				);
+			}
 		}
 
 		updateSettings(array(
@@ -265,14 +269,15 @@ 
 	}
 
 	// Default states...
-	if ($context['is_new'])
-		$context['holiday'] = array(
+	if ($context['is_new']) {
+			$context['holiday'] = array(
 			'id' => 0,
 			'day' => date('d'),
 			'month' => date('m'),
 			'year' => '0000',
 			'title' => ''
 		);
+	}
 	// If it's not new load the data.
 	else
 	{
@@ -285,14 +290,15 @@ 
 				'selected_holiday' => $_REQUEST['holiday'],
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$context['holiday'] = array(
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$context['holiday'] = array(
 				'id' => $row['id_holiday'],
 				'day' => $row['day'],
 				'month' => $row['month'],
 				'year' => $row['year'] <= 4 ? 0 : $row['year'],
 				'title' => $row['title']
 			);
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -319,16 +325,17 @@ 
 		array(
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$boards[$row['id_board']] = $row['cat_name'] . ' - ' . $row['board_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$boards[$row['id_board']] = $row['cat_name'] . ' - ' . $row['board_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	require_once($sourcedir . '/Subs-Boards.php');
 	sortBoards($boards);
 
 	// Look, all the calendar settings - of which there are many!
-	if (!empty($modSettings['cal_enabled']))
-		$config_vars = array(
+	if (!empty($modSettings['cal_enabled'])) {
+			$config_vars = array(
 				array('check', 'cal_enabled'),
 			'',
 				// All the permissions:
@@ -371,14 +378,16 @@ 
 				array('check', 'cal_short_days'),
 				array('check', 'cal_short_months'),
 		);
-	else
-		$config_vars = array(
+	} else {
+			$config_vars = array(
 			array('check', 'cal_enabled'),
 		);
+	}
 
 	call_integration_hook('integrate_modify_calendar_settings', array(&$config_vars));
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Get the settings template fired up.
 	require_once($sourcedir . '/ManageServer.php');

other/upgrade-helper.php

Doc Comments +2 added lines, -2 removed lines

@@ -81,7 +81,7 @@ 
 /**
  * Make files writable. First try to use regular chmod, but if that fails, try to use FTP.
  *
- * @param $files
+ * @param string[] $files
  * @return bool
  */
 function makeFilesWritable(&$files)
@@ -322,7 +322,7 @@ 
 /**
  * Prints an error to stderr.
  *
- * @param $message
+ * @param string $message
  * @param bool $fatal
  */
 function print_error($message, $fatal = false)

Braces +96 added lines, -68 removed lines

@@ -13,8 +13,9 @@ 
  * This file contains helper functions for upgrade.php
  */
 
-if (!defined('SMF_VERSION'))
+if (!defined('SMF_VERSION')) {
 	die('No direct access!');
+}
 
 /**
  * Clean the cache using the SMF 2.1 CacheAPI.
@@ -45,8 +46,9 @@ 
 	global $smcFunc;
 	static $member_groups = array();
 
-	if (!empty($member_groups))
-		return $member_groups;
+	if (!empty($member_groups)) {
+			return $member_groups;
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT group_name, id_group
@@ -71,8 +73,9 @@ 
 			)
 		);
 	}
-	while ($row = $smcFunc['db_fetch_row']($request))
-		$member_groups[trim($row[0])] = $row[1];
+	while ($row = $smcFunc['db_fetch_row']($request)) {
+			$member_groups[trim($row[0])] = $row[1];
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $member_groups;
@@ -88,8 +91,9 @@ 
 {
 	global $upcontext, $boarddir, $sourcedir;
 
-	if (empty($files))
-		return true;
+	if (empty($files)) {
+			return true;
+	}
 
 	$failure = false;
 	// On linux, it's easy - just use is_writable!
@@ -100,22 +104,25 @@ 
 		foreach ($files as $k => $file)
 		{
 			// Some files won't exist, try to address up front
-			if (!file_exists($file))
-				@touch($file);
+			if (!file_exists($file)) {
+							@touch($file);
+			}
 			// NOW do the writable check...
 			if (!is_writable($file))
 			{
 				@chmod($file, 0755);
 
 				// Well, 755 hopefully worked... if not, try 777.
-				if (!is_writable($file) && !@chmod($file, 0777))
-					$failure = true;
+				if (!is_writable($file) && !@chmod($file, 0777)) {
+									$failure = true;
+				}
 				// Otherwise remove it as it's good!
-				else
-					unset($files[$k]);
+				else {
+									unset($files[$k]);
+				}
+			} else {
+							unset($files[$k]);
 			}
-			else
-				unset($files[$k]);
 		}
 	}
 	// Windows is trickier.  Let's try opening for r+...
@@ -126,30 +133,35 @@ 
 		foreach ($files as $k => $file)
 		{
 			// Folders can't be opened for write... but the index.php in them can ;).
-			if (is_dir($file))
-				$file .= '/index.php';
+			if (is_dir($file)) {
+							$file .= '/index.php';
+			}
 
 			// Funny enough, chmod actually does do something on windows - it removes the read only attribute.
 			@chmod($file, 0777);
 			$fp = @fopen($file, 'r+');
 
 			// Hmm, okay, try just for write in that case...
-			if (!$fp)
-				$fp = @fopen($file, 'w');
+			if (!$fp) {
+							$fp = @fopen($file, 'w');
+			}
 
-			if (!$fp)
-				$failure = true;
-			else
-				unset($files[$k]);
+			if (!$fp) {
+							$failure = true;
+			} else {
+							unset($files[$k]);
+			}
 			@fclose($fp);
 		}
 	}
 
-	if (empty($files))
-		return true;
+	if (empty($files)) {
+			return true;
+	}
 
-	if (!isset($_SERVER))
-		return !$failure;
+	if (!isset($_SERVER)) {
+			return !$failure;
+	}
 
 	// What still needs to be done?
 	$upcontext['chmod']['files'] = $files;
@@ -201,36 +213,40 @@ 
 
 		if (!isset($ftp) || $ftp->error !== false)
 		{
-			if (!isset($ftp))
-				$ftp = new ftp_connection(null);
+			if (!isset($ftp)) {
+							$ftp = new ftp_connection(null);
+			}
 			// Save the error so we can mess with listing...
-			elseif ($ftp->error !== false && !isset($upcontext['chmod']['ftp_error']))
-				$upcontext['chmod']['ftp_error'] = $ftp->last_message === null ? '' : $ftp->last_message;
+			elseif ($ftp->error !== false && !isset($upcontext['chmod']['ftp_error'])) {
+							$upcontext['chmod']['ftp_error'] = $ftp->last_message === null ? '' : $ftp->last_message;
+			}
 
 			list ($username, $detect_path, $found_path) = $ftp->detect_path(dirname(__FILE__));
 
-			if ($found_path || !isset($upcontext['chmod']['path']))
-				$upcontext['chmod']['path'] = $detect_path;
+			if ($found_path || !isset($upcontext['chmod']['path'])) {
+							$upcontext['chmod']['path'] = $detect_path;
+			}
 
-			if (!isset($upcontext['chmod']['username']))
-				$upcontext['chmod']['username'] = $username;
+			if (!isset($upcontext['chmod']['username'])) {
+							$upcontext['chmod']['username'] = $username;
+			}
 
 			// Don't forget the login token.
 			$upcontext += createToken('login');
 
 			return false;
-		}
-		else
+		} else
 		{
 			// We want to do a relative path for FTP.
 			if (!in_array($upcontext['chmod']['path'], array('', '/')))
 			{
 				$ftp_root = strtr($boarddir, array($upcontext['chmod']['path'] => ''));
-				if (substr($ftp_root, -1) == '/' && ($upcontext['chmod']['path'] == '' || $upcontext['chmod']['path'][0] === '/'))
-					$ftp_root = substr($ftp_root, 0, -1);
+				if (substr($ftp_root, -1) == '/' && ($upcontext['chmod']['path'] == '' || $upcontext['chmod']['path'][0] === '/')) {
+									$ftp_root = substr($ftp_root, 0, -1);
+				}
+			} else {
+							$ftp_root = $boarddir;
 			}
-			else
-				$ftp_root = $boarddir;
 
 			// Save the info for next time!
 			$_SESSION['installer_temp_ftp'] = array(
@@ -244,10 +260,12 @@ 
 
 			foreach ($files as $k => $file)
 			{
-				if (!is_writable($file))
-					$ftp->chmod($file, 0755);
-				if (!is_writable($file))
-					$ftp->chmod($file, 0777);
+				if (!is_writable($file)) {
+									$ftp->chmod($file, 0755);
+				}
+				if (!is_writable($file)) {
+									$ftp->chmod($file, 0777);
+				}
 
 				// Assuming that didn't work calculate the path without the boarddir.
 				if (!is_writable($file))
@@ -256,19 +274,23 @@ 
 					{
 						$ftp_file = strtr($file, array($_SESSION['installer_temp_ftp']['root'] => ''));
 						$ftp->chmod($ftp_file, 0755);
-						if (!is_writable($file))
-							$ftp->chmod($ftp_file, 0777);
+						if (!is_writable($file)) {
+													$ftp->chmod($ftp_file, 0777);
+						}
 						// Sometimes an extra slash can help...
 						$ftp_file = '/' . $ftp_file;
-						if (!is_writable($file))
-							$ftp->chmod($ftp_file, 0755);
-						if (!is_writable($file))
-							$ftp->chmod($ftp_file, 0777);
+						if (!is_writable($file)) {
+													$ftp->chmod($ftp_file, 0755);
+						}
+						if (!is_writable($file)) {
+													$ftp->chmod($ftp_file, 0777);
+						}
 					}
 				}
 
-				if (is_writable($file))
-					unset($files[$k]);
+				if (is_writable($file)) {
+									unset($files[$k]);
+				}
 			}
 
 			$ftp->close();
@@ -278,8 +300,9 @@ 
 	// What remains?
 	$upcontext['chmod']['files'] = $files;
 
-	if (empty($files))
-		return true;
+	if (empty($files)) {
+			return true;
+	}
 
 	return false;
 }
@@ -293,12 +316,14 @@ 
 function quickFileWritable($file)
 {
 	// Some files won't exist, try to address up front
-	if (!file_exists($file))
-		@touch($file);
+	if (!file_exists($file)) {
+			@touch($file);
+	}
 
 	// NOW do the writable check...
-	if (is_writable($file))
-		return true;
+	if (is_writable($file)) {
+			return true;
+	}
 
 	@chmod($file, 0755);
 
@@ -308,10 +333,11 @@ 
 	foreach ($chmod_values as $val)
 	{
 		// If it's writable, break out of the loop
-		if (is_writable($file))
-			break;
-		else
-			@chmod($file, $val);
+		if (is_writable($file)) {
+					break;
+		} else {
+					@chmod($file, $val);
+		}
 	}
 
 	return is_writable($file);
@@ -338,14 +364,16 @@ 
 {
 	static $fp = null;
 
-	if ($fp === null)
-		$fp = fopen('php://stderr', 'wb');
+	if ($fp === null) {
+			$fp = fopen('php://stderr', 'wb');
+	}
 
 	fwrite($fp, $message . "\n");
 
-	if ($fatal)
-		exit;
-}
+	if ($fatal) {
+			exit;
+	}
+	}
 
 /**
  * Throws a graphical error message.

Sources/ManageSearchEngines.php

Braces +109 added lines, -77 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Entry point for this section.
@@ -38,8 +39,7 @@ 
 			'stats' => 'SpiderStats',
 		);
 		$default = 'stats';
-	}
-	else
+	} else
 	{
 		$subActions = array(
 			'settings' => 'ManageSearchEngineSettings',
@@ -90,11 +90,12 @@ 
 		{
 			disabledState = document.getElementById(\'spider_mode\').value == 0;';
 
-	foreach ($config_vars as $variable)
-		if ($variable[1] != 'spider_mode')
+	foreach ($config_vars as $variable) {
+			if ($variable[1] != 'spider_mode')
 			$javascript_function .= '
 			if (document.getElementById(\'' . $variable[1] . '\'))
 				document.getElementById(\'' . $variable[1] . '\').disabled = disabledState;';
+	}
 
 	$javascript_function .= '
 		}
@@ -102,8 +103,9 @@ 
 
 	call_integration_hook('integrate_modify_search_engine_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// We need to load the groups for the spider group thingy.
 	$request = $smcFunc['db_query']('', '
@@ -116,13 +118,15 @@ 
 			'moderator_group' => 3,
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$config_vars['spider_group'][2][$row['id_group']] = $row['group_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$config_vars['spider_group'][2][$row['id_group']] = $row['group_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Make sure it's valid - note that regular members are given id_group = 1 which is reversed in Load.php - no admins here!
-	if (isset($_POST['spider_group']) && !isset($config_vars['spider_group'][2][$_POST['spider_group']]))
-		$_POST['spider_group'] = 0;
+	if (isset($_POST['spider_group']) && !isset($config_vars['spider_group'][2][$_POST['spider_group']])) {
+			$_POST['spider_group'] = 0;
+	}
 
 	// We'll want this for our easy save.
 	require_once($sourcedir . '/ManageServer.php');
@@ -166,8 +170,9 @@ 
 	}
 
 	// Are we adding a new one?
-	if (!empty($_POST['addSpider']))
-		return EditSpider();
+	if (!empty($_POST['addSpider'])) {
+			return EditSpider();
+	}
 	// User pressed the 'remove selection button'.
 	elseif (!empty($_POST['removeSpiders']) && !empty($_POST['remove']) && is_array($_POST['remove']))
 	{
@@ -175,8 +180,9 @@ 
 		validateToken('admin-ser');
 
 		// Make sure every entry is a proper integer.
-		foreach ($_POST['remove'] as $index => $spider_id)
-			$_POST['remove'][(int) $index] = (int) $spider_id;
+		foreach ($_POST['remove'] as $index => $spider_id) {
+					$_POST['remove'][(int) $index] = (int) $spider_id;
+		}
 
 		// Delete them all!
 		$smcFunc['db_query']('', '
@@ -215,8 +221,9 @@ 
 	);
 
 	$context['spider_last_seen'] = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['spider_last_seen'][$row['id_spider']] = $row['last_seen_time'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['spider_last_seen'][$row['id_spider']] = $row['last_seen_time'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	createToken('admin-ser');
@@ -346,8 +353,9 @@ 
 		)
 	);
 	$spiders = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$spiders[$row['id_spider']] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$spiders[$row['id_spider']] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $spiders;
@@ -397,14 +405,15 @@ 
 		foreach ($ip_sets as $set)
 		{
 			$test = ip2range(trim($set));
-			if (!empty($test))
-				$ips[] = $set;
+			if (!empty($test)) {
+							$ips[] = $set;
+			}
 		}
 		$ips = implode(',', $ips);
 
 		// Goes in as it is...
-		if ($context['id_spider'])
-			$smcFunc['db_query']('', '
+		if ($context['id_spider']) {
+					$smcFunc['db_query']('', '
 				UPDATE {db_prefix}spiders
 				SET spider_name = {string:spider_name}, user_agent = {string:spider_agent},
 					ip_info = {string:ip_info}
@@ -416,8 +425,8 @@ 
 					'ip_info' => $ips,
 				)
 			);
-		else
-			$smcFunc['db_insert']('insert',
+		} else {
+					$smcFunc['db_insert']('insert',
 				'{db_prefix}spiders',
 				array(
 					'spider_name' => 'string', 'user_agent' => 'string', 'ip_info' => 'string',
@@ -427,6 +436,7 @@ 
 				),
 				array('id_spider')
 			);
+		}
 
 
 		cache_put_data('spider_search', null);
@@ -454,13 +464,14 @@ 
 				'current_spider' => $context['id_spider'],
 			)
 		);
-		if ($row = $smcFunc['db_fetch_assoc']($request))
-			$context['spider'] = array(
+		if ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$context['spider'] = array(
 				'id' => $row['id_spider'],
 				'name' => $row['spider_name'],
 				'agent' => $row['user_agent'],
 				'ip_info' => $row['ip_info'],
 			);
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -477,8 +488,9 @@ 
 {
 	global $modSettings, $smcFunc;
 
-	if (isset($_SESSION['id_robot']))
-		unset($_SESSION['id_robot']);
+	if (isset($_SESSION['id_robot'])) {
+			unset($_SESSION['id_robot']);
+	}
 	$_SESSION['robot_check'] = time();
 
 	// We cache the spider data for ten minutes if we can.
@@ -492,15 +504,17 @@ 
 			)
 		);
 		$spider_data = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$spider_data[] = $row;
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$spider_data[] = $row;
+		}
 		$smcFunc['db_free_result']($request);
 
 		cache_put_data('spider_search', $spider_data, 600);
 	}
 
-	if (empty($spider_data))
-		return false;
+	if (empty($spider_data)) {
+			return false;
+	}
 
 	// Only do these bits once.
 	$ci_user_agent = strtolower($_SERVER['HTTP_USER_AGENT']);
@@ -508,33 +522,38 @@ 
 	foreach ($spider_data as $spider)
 	{
 		// User agent is easy.
-		if (!empty($spider['user_agent']) && strpos($ci_user_agent, strtolower($spider['user_agent'])) !== false)
-			$_SESSION['id_robot'] = $spider['id_spider'];
+		if (!empty($spider['user_agent']) && strpos($ci_user_agent, strtolower($spider['user_agent'])) !== false) {
+					$_SESSION['id_robot'] = $spider['id_spider'];
+		}
 		// IP stuff is harder.
 		elseif ($_SERVER['REMOTE_ADDR'])
 		{
 			$ips = explode(',', $spider['ip_info']);
 			foreach ($ips as $ip)
 			{
-				if ($ip === '')
-					continue;
+				if ($ip === '') {
+									continue;
+				}
 
 				$ip = ip2range($ip);
 				if (!empty($ip))
 				{
-					if (inet_ptod($ip['low']) <= inet_ptod($_SERVER['REMOTE_ADDR']) && inet_ptod($ip['high']) >= inet_ptod($_SERVER['REMOTE_ADDR']))
-						$_SESSION['id_robot'] = $spider['id_spider'];
+					if (inet_ptod($ip['low']) <= inet_ptod($_SERVER['REMOTE_ADDR']) && inet_ptod($ip['high']) >= inet_ptod($_SERVER['REMOTE_ADDR'])) {
+											$_SESSION['id_robot'] = $spider['id_spider'];
+					}
 				}
 			}
 		}
 
-		if (isset($_SESSION['id_robot']))
-			break;
+		if (isset($_SESSION['id_robot'])) {
+					break;
+		}
 	}
 
 	// If this is low server tracking then log the spider here as opposed to the main logging function.
-	if (!empty($modSettings['spider_mode']) && $modSettings['spider_mode'] == 1 && !empty($_SESSION['id_robot']))
-		logSpider();
+	if (!empty($modSettings['spider_mode']) && $modSettings['spider_mode'] == 1 && !empty($_SESSION['id_robot'])) {
+			logSpider();
+	}
 
 	return !empty($_SESSION['id_robot']) ? $_SESSION['id_robot'] : 0;
 }
@@ -548,8 +567,9 @@ 
 {
 	global $smcFunc, $modSettings, $context;
 
-	if (empty($modSettings['spider_mode']) || empty($_SESSION['id_robot']))
-		return;
+	if (empty($modSettings['spider_mode']) || empty($_SESSION['id_robot'])) {
+			return;
+	}
 
 	// Attempt to update today's entry.
 	if ($modSettings['spider_mode'] == 1)
@@ -590,9 +610,9 @@ 
 			$url = $_GET + array('USER_AGENT' => $_SERVER['HTTP_USER_AGENT']);
 			unset($url['sesc'], $url[$context['session_var']]);
 			$url = $smcFunc['json_encode']($url);
+		} else {
+					$url = '';
 		}
-		else
-			$url = '';
 
 		$smcFunc['db_insert']('insert',
 			'{db_prefix}log_spider_hits',
@@ -620,12 +640,14 @@ 
 		)
 	);
 	$spider_hits = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$spider_hits[] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$spider_hits[] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($spider_hits))
-		return;
+	if (empty($spider_hits)) {
+			return;
+	}
 
 	// Attempt to update the master data.
 	$stat_inserts = array();
@@ -646,18 +668,20 @@ 
 				'hits' => $stat['num_hits'],
 			)
 		);
-		if ($smcFunc['db_affected_rows']() == 0)
-			$stat_inserts[] = array($date, $stat['id_spider'], $stat['num_hits'], $stat['last_seen']);
+		if ($smcFunc['db_affected_rows']() == 0) {
+					$stat_inserts[] = array($date, $stat['id_spider'], $stat['num_hits'], $stat['last_seen']);
+		}
 	}
 
 	// New stats?
-	if (!empty($stat_inserts))
-		$smcFunc['db_insert']('ignore',
+	if (!empty($stat_inserts)) {
+			$smcFunc['db_insert']('ignore',
 			'{db_prefix}log_spider_stats',
 			array('stat_date' => 'date', 'id_spider' => 'int', 'page_hits' => 'int', 'last_seen' => 'int'),
 			$stat_inserts,
 			array('stat_date', 'id_spider')
 		);
+	}
 
 	// All processed.
 	$smcFunc['db_query']('', '
@@ -700,8 +724,7 @@ 
 					'delete_period' => $deleteTime,
 				)
 			);
-		}
-		else
+		} else
 		{
 			// Deleting all of them
 			$smcFunc['db_query']('', '
@@ -791,10 +814,11 @@ 
 		foreach ($context['spider_logs']['rows'] as $k => $row)
 		{
 			// Feature disabled?
-			if (empty($row['data']['viewing']['value']) && isset($modSettings['spider_mode']) && $modSettings['spider_mode'] < 3)
-				$context['spider_logs']['rows'][$k]['viewing']['value'] = '<em>' . $txt['spider_disabled'] . '</em>';
-			else
-				$urls[$k] = array($row['data']['viewing']['value'], -1);
+			if (empty($row['data']['viewing']['value']) && isset($modSettings['spider_mode']) && $modSettings['spider_mode'] < 3) {
+							$context['spider_logs']['rows'][$k]['viewing']['value'] = '<em>' . $txt['spider_disabled'] . '</em>';
+			} else {
+							$urls[$k] = array($row['data']['viewing']['value'], -1);
+			}
 		}
 
 		// Now stick in the new URLs.
@@ -836,8 +860,9 @@ 
 		)
 	);
 	$spider_logs = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$spider_logs[] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$spider_logs[] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $spider_logs;
@@ -913,14 +938,18 @@ 
 
 	// Prepare the dates for the drop down.
 	$date_choices = array();
-	for ($y = $min_year; $y <= $max_year; $y++)
-		for ($m = 1; $m <= 12; $m++)
+	for ($y = $min_year; $y <= $max_year; $y++) {
+			for ($m = 1;
+	}
+	$m <= 12; $m++)
 		{
 			// This doesn't count?
-			if ($y == $min_year && $m < $min_month)
-				continue;
-			if ($y == $max_year && $m > $max_month)
-				break;
+			if ($y == $min_year && $m < $min_month) {
+							continue;
+			}
+			if ($y == $max_year && $m > $max_month) {
+							break;
+			}
 
 			$date_choices[$y . $m] = $txt['months_short'][$m] . ' ' . $y;
 		}
@@ -933,13 +962,14 @@ 
 		' . $txt['spider_stats_select_month'] . ':
 		<select name="new_date" onchange="document.spider_stat_list.submit();">';
 
-	if (empty($date_choices))
-		$date_select .= '
+	if (empty($date_choices)) {
+			$date_select .= '
 			<option></option>';
-	else
-		foreach ($date_choices as $id => $text)
+	} else {
+			foreach ($date_choices as $id => $text)
 			$date_select .= '
 			<option value="' . $id . '"' . ($current_date == $id ? ' selected' : '') . '>' . $text . '</option>';
+	}
 
 	$date_select .= '
 		</select>
@@ -1063,8 +1093,9 @@ 
 		)
 	);
 	$spider_stats = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$spider_stats[] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$spider_stats[] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $spider_stats;
@@ -1105,8 +1136,9 @@ 
 		array()
 	);
 	$spiders = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$spiders[$row['id_spider']] = $row['spider_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$spiders[$row['id_spider']] = $row['spider_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	updateSettings(array('spider_name_cache' => $smcFunc['json_encode']($spiders)));

Sources/Who.php

Braces +126 added lines, -95 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Who's online, and what are they doing?
@@ -35,8 +36,9 @@ 
 	isAllowedTo('who_view');
 
 	// You can't do anything if this is off.
-	if (empty($modSettings['who_enabled']))
-		fatal_lang_error('who_off', false);
+	if (empty($modSettings['who_enabled'])) {
+			fatal_lang_error('who_off', false);
+	}
 
 	// Load the 'Who' template.
 	loadTemplate('Who');
@@ -71,9 +73,9 @@ 
 		$show_methods['spiders'] = '(lo.id_member = 0 AND lo.id_spider > 0)';
 		$show_methods['guests'] = '(lo.id_member = 0 AND lo.id_spider = 0)';
 		$context['show_methods']['spiders'] = $txt['who_show_spiders_only'];
+	} elseif (empty($modSettings['show_spider_online']) && isset($_SESSION['who_online_filter']) && $_SESSION['who_online_filter'] == 'spiders') {
+			unset($_SESSION['who_online_filter']);
 	}
-	elseif (empty($modSettings['show_spider_online']) && isset($_SESSION['who_online_filter']) && $_SESSION['who_online_filter'] == 'spiders')
-		unset($_SESSION['who_online_filter']);
 
 	// Does the user prefer a different sort direction?
 	if (isset($_REQUEST['sort']) && isset($sort_methods[$_REQUEST['sort']]))
@@ -97,20 +99,24 @@ 
 	$context['sort_direction'] = isset($_REQUEST['asc']) || (isset($_REQUEST['sort_dir']) && $_REQUEST['sort_dir'] == 'asc') ? 'up' : 'down';
 
 	$conditions = array();
-	if (!allowedTo('moderate_forum'))
-		$conditions[] = '(COALESCE(mem.show_online, 1) = 1)';
+	if (!allowedTo('moderate_forum')) {
+			$conditions[] = '(COALESCE(mem.show_online, 1) = 1)';
+	}
 
 	// Fallback to top filter?
-	if (isset($_REQUEST['submit_top']) && isset($_REQUEST['show_top']))
-		$_REQUEST['show'] = $_REQUEST['show_top'];
+	if (isset($_REQUEST['submit_top']) && isset($_REQUEST['show_top'])) {
+			$_REQUEST['show'] = $_REQUEST['show_top'];
+	}
 	// Does the user wish to apply a filter?
-	if (isset($_REQUEST['show']) && isset($show_methods[$_REQUEST['show']]))
-		$context['show_by'] = $_SESSION['who_online_filter'] = $_REQUEST['show'];
+	if (isset($_REQUEST['show']) && isset($show_methods[$_REQUEST['show']])) {
+			$context['show_by'] = $_SESSION['who_online_filter'] = $_REQUEST['show'];
+	}
 	// Perhaps we saved a filter earlier in the session?
-	elseif (isset($_SESSION['who_online_filter']))
-		$context['show_by'] = $_SESSION['who_online_filter'];
-	else
-		$context['show_by'] = 'members';
+	elseif (isset($_SESSION['who_online_filter'])) {
+			$context['show_by'] = $_SESSION['who_online_filter'];
+	} else {
+			$context['show_by'] = 'members';
+	}
 
 	$conditions[] = $show_methods[$context['show_by']];
 
@@ -156,8 +162,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		$actions = $smcFunc['json_decode']($row['url'], true);
-		if ($actions === false)
-			continue;
+		if ($actions === false) {
+					continue;
+		}
 
 		// Send the information to the template.
 		$context['members'][$row['session']] = array(
@@ -195,8 +202,8 @@ 
 	$spiderContext = array();
 	if (!empty($modSettings['show_spider_online']) && ($modSettings['show_spider_online'] == 2 || allowedTo('admin_forum')) && !empty($modSettings['spider_name_cache']))
 	{
-		foreach ($smcFunc['json_decode']($modSettings['spider_name_cache'], true) as $id => $name)
-			$spiderContext[$id] = array(
+		foreach ($smcFunc['json_decode']($modSettings['spider_name_cache'], true) as $id => $name) {
+					$spiderContext[$id] = array(
 				'id' => 0,
 				'name' => $name,
 				'group' => $txt['spiders'],
@@ -205,6 +212,7 @@ 
 				'email' => $name,
 				'is_guest' => true
 			);
+		}
 	}
 
 	$url_data = determineActions($url_data);
@@ -219,16 +227,18 @@ 
 	// Put it in the context variables.
 	foreach ($context['members'] as $i => $member)
 	{
-		if ($member['id'] != 0)
-			$member['id'] = loadMemberContext($member['id']) ? $member['id'] : 0;
+		if ($member['id'] != 0) {
+					$member['id'] = loadMemberContext($member['id']) ? $member['id'] : 0;
+		}
 
 		// Keep the IP that came from the database.
 		$memberContext[$member['id']]['ip'] = $member['ip'];
 		$context['members'][$i]['action'] = isset($url_data[$i]) ? $url_data[$i] : $txt['who_hidden'];
-		if ($member['id'] == 0 && isset($spiderContext[$member['id_spider']]))
-			$context['members'][$i] += $spiderContext[$member['id_spider']];
-		else
-			$context['members'][$i] += $memberContext[$member['id']];
+		if ($member['id'] == 0 && isset($spiderContext[$member['id_spider']])) {
+					$context['members'][$i] += $spiderContext[$member['id_spider']];
+		} else {
+					$context['members'][$i] += $memberContext[$member['id']];
+		}
 	}
 
 	// Some people can't send personal messages...
@@ -263,8 +273,9 @@ 
 {
 	global $txt, $user_info, $modSettings, $smcFunc;
 
-	if (!allowedTo('who_view'))
-		return array();
+	if (!allowedTo('who_view')) {
+			return array();
+	}
 	loadLanguage('Who');
 
 	// Actions that require a specific permission level.
@@ -292,10 +303,11 @@ 
 	);
 	call_integration_hook('who_allowed', array(&$allowedActions));
 
-	if (!is_array($urls))
-		$url_list = array(array($urls, $user_info['id']));
-	else
-		$url_list = $urls;
+	if (!is_array($urls)) {
+			$url_list = array(array($urls, $user_info['id']));
+	} else {
+			$url_list = $urls;
+	}
 
 	// These are done to later query these in large chunks. (instead of one by one.)
 	$topic_ids = array();
@@ -307,12 +319,14 @@ 
 	{
 		// Get the request parameters..
 		$actions = $smcFunc['json_decode']($url[0], true);
-		if ($actions === false)
-			continue;
+		if ($actions === false) {
+					continue;
+		}
 
 		// If it's the admin or moderation center, and there is an area set, use that instead.
-		if (isset($actions['action']) && ($actions['action'] == 'admin' || $actions['action'] == 'moderate') && isset($actions['area']))
-			$actions['action'] = $actions['area'];
+		if (isset($actions['action']) && ($actions['action'] == 'admin' || $actions['action'] == 'moderate') && isset($actions['area'])) {
+					$actions['action'] = $actions['area'];
+		}
 
 		// Check if there was no action or the action is display.
 		if (!isset($actions['action']) || $actions['action'] == 'display')
@@ -332,12 +346,14 @@ 
 				$board_ids[$actions['board']][$k] = $txt['who_board'];
 			}
 			// It's the board index!!  It must be!
-			else
-				$data[$k] = $txt['who_index'];
+			else {
+							$data[$k] = $txt['who_index'];
+			}
 		}
 		// Probably an error or some goon?
-		elseif ($actions['action'] == '')
-			$data[$k] = $txt['who_index'];
+		elseif ($actions['action'] == '') {
+					$data[$k] = $txt['who_index'];
+		}
 		// Some other normal action...?
 		else
 		{
@@ -345,23 +361,25 @@ 
 			if ($actions['action'] == 'profile')
 			{
 				// Whose?  Their own?
-				if (empty($actions['u']))
-					$actions['u'] = $url[1];
+				if (empty($actions['u'])) {
+									$actions['u'] = $url[1];
+				}
 
 				$data[$k] = $txt['who_hidden'];
 				$profile_ids[(int) $actions['u']][$k] = $actions['u'] == $url[1] ? $txt['who_viewownprofile'] : $txt['who_viewprofile'];
-			}
-			elseif (($actions['action'] == 'post' || $actions['action'] == 'post2') && empty($actions['topic']) && isset($actions['board']))
+			} elseif (($actions['action'] == 'post' || $actions['action'] == 'post2') && empty($actions['topic']) && isset($actions['board']))
 			{
 				$data[$k] = $txt['who_hidden'];
 				$board_ids[(int) $actions['board']][$k] = isset($actions['poll']) ? $txt['who_poll'] : $txt['who_post'];
 			}
 			// A subaction anyone can view... if the language string is there, show it.
-			elseif (isset($actions['sa']) && isset($txt['whoall_' . $actions['action'] . '_' . $actions['sa']]))
-				$data[$k] = $preferred_prefix && isset($txt[$preferred_prefix . $actions['action'] . '_' . $actions['sa']]) ? $txt[$preferred_prefix . $actions['action'] . '_' . $actions['sa']] : $txt['whoall_' . $actions['action'] . '_' . $actions['sa']];
+			elseif (isset($actions['sa']) && isset($txt['whoall_' . $actions['action'] . '_' . $actions['sa']])) {
+							$data[$k] = $preferred_prefix && isset($txt[$preferred_prefix . $actions['action'] . '_' . $actions['sa']]) ? $txt[$preferred_prefix . $actions['action'] . '_' . $actions['sa']] : $txt['whoall_' . $actions['action'] . '_' . $actions['sa']];
+			}
 			// An action any old fellow can look at. (if ['whoall_' . $action] exists, we know everyone can see it.)
-			elseif (isset($txt['whoall_' . $actions['action']]))
-				$data[$k] = $preferred_prefix && isset($txt[$preferred_prefix . $actions['action']]) ? $txt[$preferred_prefix . $actions['action']] : $txt['whoall_' . $actions['action']];
+			elseif (isset($txt['whoall_' . $actions['action']])) {
+							$data[$k] = $preferred_prefix && isset($txt[$preferred_prefix . $actions['action']]) ? $txt[$preferred_prefix . $actions['action']] : $txt['whoall_' . $actions['action']];
+			}
 			// Viewable if and only if they can see the board...
 			elseif (isset($txt['whotopic_' . $actions['action']]))
 			{
@@ -370,8 +388,7 @@ 
 
 				$data[$k] = $txt['who_hidden'];
 				$topic_ids[$topic][$k] = $txt['whotopic_' . $actions['action']];
-			}
-			elseif (isset($txt['whopost_' . $actions['action']]))
+			} elseif (isset($txt['whopost_' . $actions['action']]))
 			{
 				// Find out what message they are accessing.
 				$msgid = (int) (isset($actions['msg']) ? $actions['msg'] : (isset($actions['quote']) ? $actions['quote'] : 0));
@@ -394,41 +411,46 @@ 
 				$data[$k] = sprintf($txt['whopost_' . $actions['action']], $id_topic, $subject);
 				$smcFunc['db_free_result']($result);
 
-				if (empty($id_topic))
-					$data[$k] = $txt['who_hidden'];
+				if (empty($id_topic)) {
+									$data[$k] = $txt['who_hidden'];
+				}
 			}
 			// Viewable only by administrators.. (if it starts with whoadmin, it's admin only!)
-			elseif (allowedTo('moderate_forum') && isset($txt['whoadmin_' . $actions['action']]))
-				$data[$k] = $txt['whoadmin_' . $actions['action']];
+			elseif (allowedTo('moderate_forum') && isset($txt['whoadmin_' . $actions['action']])) {
+							$data[$k] = $txt['whoadmin_' . $actions['action']];
+			}
 			// Viewable by permission level.
 			elseif (isset($allowedActions[$actions['action']]))
 			{
-				if (allowedTo($allowedActions[$actions['action']]))
-					$data[$k] = $txt['whoallow_' . $actions['action']];
-				elseif (in_array('moderate_forum', $allowedActions[$actions['action']]))
-					$data[$k] = $txt['who_moderate'];
-				elseif (in_array('admin_forum', $allowedActions[$actions['action']]))
-					$data[$k] = $txt['who_admin'];
-				else
-					$data[$k] = $txt['who_hidden'];
+				if (allowedTo($allowedActions[$actions['action']])) {
+									$data[$k] = $txt['whoallow_' . $actions['action']];
+				} elseif (in_array('moderate_forum', $allowedActions[$actions['action']])) {
+									$data[$k] = $txt['who_moderate'];
+				} elseif (in_array('admin_forum', $allowedActions[$actions['action']])) {
+									$data[$k] = $txt['who_admin'];
+				} else {
+									$data[$k] = $txt['who_hidden'];
+				}
+			} elseif (!empty($actions['action'])) {
+							$data[$k] = $txt['who_generic'] . ' ' . $actions['action'];
+			} else {
+							$data[$k] = $txt['who_unknown'];
 			}
-			elseif (!empty($actions['action']))
-				$data[$k] = $txt['who_generic'] . ' ' . $actions['action'];
-			else
-				$data[$k] = $txt['who_unknown'];
 		}
 
 		if (isset($actions['error']))
 		{
-			if (isset($txt[$actions['error']]))
-				$error_message = str_replace('"', '"', empty($actions['who_error_params']) ? $txt[$actions['error']] : vsprintf($txt[$actions['error']], $actions['who_error_params']));
-			elseif ($actions['error'] == 'guest_login')
-				$error_message = str_replace('"', '"', $txt['who_guest_login']);
-			else
-				$error_message = str_replace('"', '"', $actions['error']);
-
-			if (!empty($error_message))
-				$data[$k] .= ' <span class="generic_icons error" title="' . $error_message . '"></span>';
+			if (isset($txt[$actions['error']])) {
+							$error_message = str_replace('"', '&quot;', empty($actions['who_error_params']) ? $txt[$actions['error']] : vsprintf($txt[$actions['error']], $actions['who_error_params']));
+			} elseif ($actions['error'] == 'guest_login') {
+							$error_message = str_replace('"', '&quot;', $txt['who_guest_login']);
+			} else {
+							$error_message = str_replace('"', '&quot;', $actions['error']);
+			}
+
+			if (!empty($error_message)) {
+							$data[$k] .= ' <span class="generic_icons error" title="' . $error_message . '"></span>';
+			}
 		}
 
 		// Maybe the action is integrated into another system?
@@ -439,12 +461,15 @@ 
 				if (!empty($integrate_action))
 				{
 					$data[$k] = $integrate_action;
-					if (isset($actions['topic']) && isset($topic_ids[(int) $actions['topic']][$k]))
-						$topic_ids[(int) $actions['topic']][$k] = $integrate_action;
-					if (isset($actions['board']) && isset($board_ids[(int) $actions['board']][$k]))
-						$board_ids[(int) $actions['board']][$k] = $integrate_action;
-					if (isset($actions['u']) && isset($profile_ids[(int) $actions['u']][$k]))
-						$profile_ids[(int) $actions['u']][$k] = $integrate_action;
+					if (isset($actions['topic']) && isset($topic_ids[(int) $actions['topic']][$k])) {
+											$topic_ids[(int) $actions['topic']][$k] = $integrate_action;
+					}
+					if (isset($actions['board']) && isset($board_ids[(int) $actions['board']][$k])) {
+											$board_ids[(int) $actions['board']][$k] = $integrate_action;
+					}
+					if (isset($actions['u']) && isset($profile_ids[(int) $actions['u']][$k])) {
+											$profile_ids[(int) $actions['u']][$k] = $integrate_action;
+					}
 					break;
 				}
 			}
@@ -472,8 +497,9 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($result))
 		{
 			// Show the topic's subject for each of the actions.
-			foreach ($topic_ids[$row['id_topic']] as $k => $session_text)
-				$data[$k] = sprintf($session_text, $row['id_topic'], censorText($row['subject']));
+			foreach ($topic_ids[$row['id_topic']] as $k => $session_text) {
+							$data[$k] = sprintf($session_text, $row['id_topic'], censorText($row['subject']));
+			}
 		}
 		$smcFunc['db_free_result']($result);
 	}
@@ -495,8 +521,9 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($result))
 		{
 			// Put the board name into the string for each member...
-			foreach ($board_ids[$row['id_board']] as $k => $session_text)
-				$data[$k] = sprintf($session_text, $row['id_board'], $row['name']);
+			foreach ($board_ids[$row['id_board']] as $k => $session_text) {
+							$data[$k] = sprintf($session_text, $row['id_board'], $row['name']);
+			}
 		}
 		$smcFunc['db_free_result']($result);
 	}
@@ -518,23 +545,26 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($result))
 		{
 			// If they aren't allowed to view this person's profile, skip it.
-			if (!$allow_view_any && ($user_info['id'] != $row['id_member']))
-				continue;
+			if (!$allow_view_any && ($user_info['id'] != $row['id_member'])) {
+							continue;
+			}
 
 			// Set their action on each - session/text to sprintf.
-			foreach ($profile_ids[$row['id_member']] as $k => $session_text)
-				$data[$k] = sprintf($session_text, $row['id_member'], $row['real_name']);
+			foreach ($profile_ids[$row['id_member']] as $k => $session_text) {
+							$data[$k] = sprintf($session_text, $row['id_member'], $row['real_name']);
+			}
 		}
 		$smcFunc['db_free_result']($result);
 	}
 
 	call_integration_hook('whos_online_after', array(&$urls, &$data));
 
-	if (!is_array($urls))
-		return isset($data[0]) ? $data[0] : false;
-	else
-		return $data;
-}
+	if (!is_array($urls)) {
+			return isset($data[0]) ? $data[0] : false;
+	} else {
+			return $data;
+	}
+	}
 
 /**
  * It prepares credit and copyright information for the credits page or the admin page
@@ -710,8 +740,8 @@ 
 	);
 
 	// Give the translators some credit for their hard work.
-	if (!empty($txt['translation_credits']))
-		$context['credits'][] = array(
+	if (!empty($txt['translation_credits'])) {
+			$context['credits'][] = array(
 			'title' => $txt['credits_groups_translation'],
 			'groups' => array(
 				array(
@@ -720,6 +750,7 @@ 
 				),
 			),
 		);
+	}
 
 	$context['credits'][] = array(
 		'title' => $txt['credits_special'],

Spacing +3 added lines, -3 removed lines

@@ -592,7 +592,7 @@ 
 						'Jessica "Suki" González',
 						'Karl "RegularExpression" Benson',
 						'Matthew "Labradoodle-360" Kerle',
-						$user_info['is_admin'] ? 'Matt "Grudge" Wolf': 'Grudge',
+						$user_info['is_admin'] ? 'Matt "Grudge" Wolf' : 'Grudge',
 						'Michael "Thantos" Miller',
 						'Norv',
 						'Peter "Arantor" Spicer',
@@ -824,13 +824,13 @@ 
 			$credit_info = $smcFunc['json_decode']($row['credits'], true);
 
 			$copyright = empty($credit_info['copyright']) ? '' : $txt['credits_copyright'] . ' © ' . $smcFunc['htmlspecialchars']($credit_info['copyright']);
-			$license = empty($credit_info['license']) ? '' : $txt['credits_license'] . ': ' . (!empty($credit_info['licenseurl']) ? '<a href="'. $smcFunc['htmlspecialchars']($credit_info['licenseurl']) .'">'. $smcFunc['htmlspecialchars']($credit_info['license']) .'</a>' : $smcFunc['htmlspecialchars']($credit_info['license']));
+			$license = empty($credit_info['license']) ? '' : $txt['credits_license'] . ': ' . (!empty($credit_info['licenseurl']) ? '<a href="' . $smcFunc['htmlspecialchars']($credit_info['licenseurl']) . '">' . $smcFunc['htmlspecialchars']($credit_info['license']) . '</a>' : $smcFunc['htmlspecialchars']($credit_info['license']));
 			$version = $txt['credits_version'] . ' ' . $row['version'];
 			$title = (empty($credit_info['title']) ? $row['name'] : $smcFunc['htmlspecialchars']($credit_info['title'])) . ': ' . $version;
 
 			// build this one out and stash it away
 			$mod_name = empty($credit_info['url']) ? $title : '<a href="' . $credit_info['url'] . '">' . $title . '</a>';
-			$mods[] = $mod_name . (!empty($license) ? ' | ' . $license  : '') . (!empty($copyright) ? ' | ' . $copyright  : '');
+			$mods[] = $mod_name . (!empty($license) ? ' | ' . $license : '') . (!empty($copyright) ? ' | ' . $copyright : '');
 		}
 		cache_put_data('mods_credits', $mods, 86400);
 	}