SimpleMachines / SMF2.1

Sources/Profile-View.php

Doc Comments +1 added lines, -1 removed lines

@@ -2605,7 +2605,7 @@
  * @param int $start Which item to start with (for pagination purposes)
  * @param int $items_per_page How many items to show on each page
  * @param string $sort A string indicating how to sort the results
- * @param int $memID The ID of the member
+ * @param string $memID The ID of the member
  * @return array An array of information about the user's group requests
  */
 function list_getGroupRequests($start, $items_per_page, $sort, $memID)

Spacing +150 added lines, -150 removed lines

@@ -37,7 +37,7 @@ 
 	$context['member'] = &$memberContext[$memID];
 
 	// Set a canonical URL for this page.
-	$context['canonical_url'] = $scripturl . '?action=profile;u=' . $memID;
+	$context['canonical_url'] = $scripturl.'?action=profile;u='.$memID;
 
 	// Are there things we don't show?
 	$context['disabled_fields'] = isset($modSettings['disabled_profile_fields']) ? array_flip(explode(',', $modSettings['disabled_profile_fields'])) : array();
@@ -100,7 +100,7 @@ 
 
 	if (!empty($modSettings['who_enabled']) && $context['member']['show_last_login'])
 	{
-		include_once($sourcedir . '/Who.php');
+		include_once($sourcedir.'/Who.php');
 		$action = determineActions($user_profile[$memID]['url']);
 
 		if ($action !== false)
@@ -115,13 +115,13 @@ 
 		$context['activate_link_text'] = in_array($context['member']['is_activated'], array(3, 4, 5, 13, 14, 15)) ? $txt['account_approve'] : $txt['account_activate'];
 
 		// Should we show a custom message?
-		$context['activate_message'] = isset($txt['account_activate_method_' . $context['member']['is_activated'] % 10]) ? $txt['account_activate_method_' . $context['member']['is_activated'] % 10] : $txt['account_not_activated'];
+		$context['activate_message'] = isset($txt['account_activate_method_'.$context['member']['is_activated'] % 10]) ? $txt['account_activate_method_'.$context['member']['is_activated'] % 10] : $txt['account_not_activated'];
 
 		// If they can be approved, we need to set up a token for them.
-		$context['token_check'] = 'profile-aa' . $memID;
+		$context['token_check'] = 'profile-aa'.$memID;
 		createToken($context['token_check'], 'get');
 
-		$context['activate_link'] = $scripturl . '?action=profile;save;area=activateaccount;u=' . $context['id_member'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';' . $context[$context['token_check'] . '_token_var'] . '=' . $context[$context['token_check'] . '_token'];
+		$context['activate_link'] = $scripturl.'?action=profile;save;area=activateaccount;u='.$context['id_member'].';'.$context['session_var'].'='.$context['session_id'].';'.$context[$context['token_check'].'_token_var'].'='.$context[$context['token_check'].'_token'];
 	}
 
 	// Is the signature even enabled on this forum?
@@ -135,7 +135,7 @@ 
 
 		if (!empty($sig_limits[5]) || !empty($sig_limits[6]))
 			addInlineCss('
-	.signature img { ' . (!empty($sig_limits[5]) ? 'max-width: ' . (int) $sig_limits[5] . 'px; ' : '') . (!empty($sig_limits[6]) ? 'max-height: ' . (int) $sig_limits[6] . 'px; ' : '') . '}');
+	.signature img { ' . (!empty($sig_limits[5]) ? 'max-width: '.(int) $sig_limits[5].'px; ' : '').(!empty($sig_limits[6]) ? 'max-height: '.(int) $sig_limits[6].'px; ' : '').'}');
 	}
 
 	// How about, are they banned?
@@ -149,7 +149,7 @@ 
 		$ban_query_vars = array(
 			'time' => time(),
 		);
-		$ban_query[] = 'id_member = ' . $context['member']['id'];
+		$ban_query[] = 'id_member = '.$context['member']['id'];
 		$ban_query[] = ' {inet:ip} BETWEEN bi.ip_low and bi.ip_high';
 		$ban_query_vars['ip'] = $memberContext[$memID]['ip'];
 		// Do we have a hostname already?
@@ -171,7 +171,7 @@ 
 				bg.cannot_login, bg.reason
 			FROM {db_prefix}ban_items AS bi
 				INNER JOIN {db_prefix}ban_groups AS bg ON (bg.id_ban_group = bi.id_ban_group AND (bg.expire_time IS NULL OR bg.expire_time > {int:time}))
-			WHERE (' . implode(' OR ', $ban_query) . ')',
+			WHERE (' . implode(' OR ', $ban_query).')',
 			$ban_query_vars
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
@@ -179,18 +179,18 @@ 
 			// Work out what restrictions we actually have.
 			$ban_restrictions = array();
 			foreach (array('access', 'login', 'post') as $type)
-				if ($row['cannot_' . $type])
-					$ban_restrictions[] = $txt['ban_type_' . $type];
+				if ($row['cannot_'.$type])
+					$ban_restrictions[] = $txt['ban_type_'.$type];
 
 			// No actual ban in place?
 			if (empty($ban_restrictions))
 				continue;
 
 			// Prepare the link for context.
-			$ban_explanation = sprintf($txt['user_cannot_due_to'], implode(', ', $ban_restrictions), '<a href="' . $scripturl . '?action=admin;area=ban;sa=edit;bg=' . $row['id_ban_group'] . '">' . $row['name'] . '</a>');
+			$ban_explanation = sprintf($txt['user_cannot_due_to'], implode(', ', $ban_restrictions), '<a href="'.$scripturl.'?action=admin;area=ban;sa=edit;bg='.$row['id_ban_group'].'">'.$row['name'].'</a>');
 
 			$context['member']['bans'][$row['id_ban_group']] = array(
-				'reason' => empty($row['reason']) ? '' : '<br><br><strong>' . $txt['ban_reason'] . ':</strong> ' . $row['reason'],
+				'reason' => empty($row['reason']) ? '' : '<br><br><strong>'.$txt['ban_reason'].':</strong> '.$row['reason'],
 				'cannot' => array(
 					'access' => !empty($row['cannot_access']),
 					'post' => !empty($row['cannot_post']),
@@ -245,9 +245,9 @@ 
 		FROM {db_prefix}user_alerts AS ua
 			LEFT JOIN {db_prefix}members AS mem ON (ua.id_member_started = mem.id_member)
 		WHERE ua.id_member = {int:id_member}' . (!$all ? '
-			AND is_read = 0' : '') . '
+			AND is_read = 0' : '').'
 		ORDER BY id_alert DESC' . (!empty($counter) && empty($pagination) ? '
-		LIMIT {int:counter}' : '') . (!empty($pagination) && empty($counter) ? '
+		LIMIT {int:counter}' : '').(!empty($pagination) && empty($counter) ? '
 		LIMIT {int:start}, {int:maxIndex}' : ''),
 		array(
 			'id_member' => $memID,
@@ -270,7 +270,7 @@ 
 	}
 	$smcFunc['db_free_result']($request);
 
-	if($withSender)
+	if ($withSender)
 	{
 		$senders = loadMemberData($senders);
 		foreach ($senders as $member)
@@ -303,14 +303,14 @@ 
 		$request = $smcFunc['db_query']('', '
 			SELECT id_board, name
 			FROM {db_prefix}boards AS b
-			WHERE ' . $query_see_board . '
+			WHERE ' . $query_see_board.'
 				AND id_board IN ({array_int:boards})',
 			array(
 				'boards' => array_keys($boards),
 			)
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$boards[$row['id_board']] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
+			$boards[$row['id_board']] = '<a href="'.$scripturl.'?board='.$row['id_board'].'.0">'.$row['name'].'</a>';
 	}
 	if (!empty($topics))
 	{
@@ -319,14 +319,14 @@ 
 			FROM {db_prefix}topics AS t
 				INNER JOIN {db_prefix}messages AS m ON (t.id_first_msg = m.id_msg)
 				INNER JOIN {db_prefix}boards AS b ON (t.id_board = b.id_board)
-			WHERE ' . $query_see_board . '
+			WHERE ' . $query_see_board.'
 				AND t.id_topic IN ({array_int:topics})',
 			array(
 				'topics' => array_keys($topics),
 			)
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$topics[$row['id_topic']] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0">' . $row['subject'] . '</a>';
+			$topics[$row['id_topic']] = '<a href="'.$scripturl.'?topic='.$row['id_topic'].'.0">'.$row['subject'].'</a>';
 	}
 	if (!empty($msgs))
 	{
@@ -335,14 +335,14 @@ 
 			FROM {db_prefix}messages AS m
 				INNER JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic)
 				INNER JOIN {db_prefix}boards AS b ON (m.id_board = b.id_board)
-			WHERE ' . $query_see_board . '
+			WHERE ' . $query_see_board.'
 				AND m.id_msg IN ({array_int:msgs})',
 			array(
 				'msgs' => array_keys($msgs),
 			)
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$msgs[$row['id_msg']] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'] . '">' . $row['subject'] . '</a>';
+			$msgs[$row['id_msg']] = '<a href="'.$scripturl.'?topic='.$row['id_topic'].'.msg'.$row['id_msg'].'#msg'.$row['id_msg'].'">'.$row['subject'].'</a>';
 	}
 
 	// Now to go back through the alerts, reattach this extra information and then try to build the string out of it (if a hook didn't already)
@@ -375,20 +375,20 @@ 
 			else
 				$alerts[$id_alert]['extra']['msg_msg'] = $msgs[$alert['content_id']];
 		if ($alert['content_type'] == 'profile')
-			$alerts[$id_alert]['extra']['profile_msg'] = '<a href="' . $scripturl . '?action=profile;u=' . $alerts[$id_alert]['content_id'] . '">' . $alerts[$id_alert]['extra']['user_name'] . '</a>';
+			$alerts[$id_alert]['extra']['profile_msg'] = '<a href="'.$scripturl.'?action=profile;u='.$alerts[$id_alert]['content_id'].'">'.$alerts[$id_alert]['extra']['user_name'].'</a>';
 
 		if (!empty($memberContext[$alert['sender_id']]))
 			$alerts[$id_alert]['sender'] = &$memberContext[$alert['sender_id']];
 
-		$string = 'alert_' . $alert['content_type'] . '_' . $alert['content_action'];
+		$string = 'alert_'.$alert['content_type'].'_'.$alert['content_action'];
 		if (isset($txt[$string]))
 		{
 			$extra = $alerts[$id_alert]['extra'];
 			$search = array('{member_link}', '{scripturl}');
-			$repl = array(!empty($alert['sender_id']) ? '<a href="' . $scripturl . '?action=profile;u=' . $alert['sender_id'] . '">' . $alert['sender_name'] . '</a>' : $alert['sender_name'], $scripturl);
+			$repl = array(!empty($alert['sender_id']) ? '<a href="'.$scripturl.'?action=profile;u='.$alert['sender_id'].'">'.$alert['sender_name'].'</a>' : $alert['sender_name'], $scripturl);
 			foreach ($extra as $k => $v)
 			{
-				$search[] = '{' . $k . '}';
+				$search[] = '{'.$k.'}';
 				$repl[] = $v;
 			}
 			$alerts[$id_alert]['text'] = str_replace($search, $repl, $txt[$string]);
@@ -409,7 +409,7 @@ 
 {
 	global $context, $smcFunc, $txt, $sourcedir, $scripturl, $options;
 
-	require_once($sourcedir . '/Profile-Modify.php');
+	require_once($sourcedir.'/Profile-Modify.php');
 
 	// Prepare the pagination vars.
 	$maxIndex = 10;
@@ -425,7 +425,7 @@ 
 	$context['showCheckboxes'] = !empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1;
 
 	// Create the pagination.
-	$context['pagination'] = constructPageIndex($scripturl . '?action=profile;area=showalerts;u=' . $memID, $start, $count, $maxIndex, false);
+	$context['pagination'] = constructPageIndex($scripturl.'?action=profile;area=showalerts;u='.$memID, $start, $count, $maxIndex, false);
 
 	// Set some JavaScript for checking all alerts at once.
 	if ($context['showCheckboxes'])
@@ -482,7 +482,7 @@ 
 		$_SESSION['update_message'] = true;
 
 		// Redirect.
-		redirectexit('action=profile;area=showalerts;u=' . $memID);
+		redirectexit('action=profile;area=showalerts;u='.$memID);
 	}
 }
 
@@ -527,11 +527,11 @@ 
 
 	// Set the page title
 	if (isset($_GET['sa']) && array_key_exists($_GET['sa'], $title))
-		$context['page_title'] = $txt['show' . $title[$_GET['sa']]];
+		$context['page_title'] = $txt['show'.$title[$_GET['sa']]];
 	else
 		$context['page_title'] = $txt['showPosts'];
 
-	$context['page_title'] .= ' - ' . $user_profile[$memID]['real_name'];
+	$context['page_title'] .= ' - '.$user_profile[$memID]['real_name'];
 
 	// Is the load average too high to allow searching just now?
 	if (!empty($context['load_average']) && !empty($modSettings['loadavg_show_posts']) && $context['load_average'] >= $modSettings['loadavg_show_posts'])
@@ -566,10 +566,10 @@ 
 
 		// Trying to remove a message that doesn't exist.
 		if (empty($info))
-			redirectexit('action=profile;u=' . $memID . ';area=showposts;start=' . $_GET['start']);
+			redirectexit('action=profile;u='.$memID.';area=showposts;start='.$_GET['start']);
 
 		// We can be lazy, since removeMessage() will check the permissions for us.
-		require_once($sourcedir . '/RemoveTopic.php');
+		require_once($sourcedir.'/RemoveTopic.php');
 		removeMessage((int) $_GET['delete']);
 
 		// Add it to the mod log.
@@ -577,7 +577,7 @@ 
 			logAction('delete', array('topic' => $info[2], 'subject' => $info[0], 'member' => $info[1], 'board' => $info[3]));
 
 		// Back to... where we are now ;).
-		redirectexit('action=profile;u=' . $memID . ';area=showposts;start=' . $_GET['start']);
+		redirectexit('action=profile;u='.$memID.';area=showposts;start='.$_GET['start']);
 	}
 
 	// Default to 10.
@@ -588,9 +588,9 @@ 
 		$request = $smcFunc['db_query']('', '
 			SELECT COUNT(*)
 			FROM {db_prefix}topics AS t' . ($user_info['query_see_board'] == '1=1' ? '' : '
-				INNER JOIN {db_prefix}boards AS b ON (b.id_board = t.id_board AND {query_see_board})') . '
+				INNER JOIN {db_prefix}boards AS b ON (b.id_board = t.id_board AND {query_see_board})').'
 			WHERE t.id_member_started = {int:current_member}' . (!empty($board) ? '
-				AND t.id_board = {int:board}' : '') . (!$modSettings['postmod_active'] || $context['user']['is_owner'] ? '' : '
+				AND t.id_board = {int:board}' : '').(!$modSettings['postmod_active'] || $context['user']['is_owner'] ? '' : '
 				AND t.approved = {int:is_approved}'),
 			array(
 				'current_member' => $memID,
@@ -602,9 +602,9 @@ 
 		$request = $smcFunc['db_query']('', '
 			SELECT COUNT(*)
 			FROM {db_prefix}messages AS m' . ($user_info['query_see_board'] == '1=1' ? '' : '
-				INNER JOIN {db_prefix}boards AS b ON (b.id_board = m.id_board AND {query_see_board})') . '
+				INNER JOIN {db_prefix}boards AS b ON (b.id_board = m.id_board AND {query_see_board})').'
 			WHERE m.id_member = {int:current_member}' . (!empty($board) ? '
-				AND m.id_board = {int:board}' : '') . (!$modSettings['postmod_active'] || $context['user']['is_owner'] ? '' : '
+				AND m.id_board = {int:board}' : '').(!$modSettings['postmod_active'] || $context['user']['is_owner'] ? '' : '
 				AND m.approved = {int:is_approved}'),
 			array(
 				'current_member' => $memID,
@@ -619,7 +619,7 @@ 
 		SELECT MIN(id_msg), MAX(id_msg)
 		FROM {db_prefix}messages AS m
 		WHERE m.id_member = {int:current_member}' . (!empty($board) ? '
-			AND m.id_board = {int:board}' : '') . (!$modSettings['postmod_active'] || $context['user']['is_owner'] ? '' : '
+			AND m.id_board = {int:board}' : '').(!$modSettings['postmod_active'] || $context['user']['is_owner'] ? '' : '
 			AND m.approved = {int:is_approved}'),
 		array(
 			'current_member' => $memID,
@@ -640,7 +640,7 @@ 
 	$maxIndex = $maxPerPage;
 
 	// Make sure the starting place makes sense and construct our friend the page index.
-	$context['page_index'] = constructPageIndex($scripturl . '?action=profile;u=' . $memID . ';area=showposts' . ($context['is_topics'] ? ';sa=topics' : '') . (!empty($board) ? ';board=' . $board : ''), $context['start'], $msgCount, $maxIndex);
+	$context['page_index'] = constructPageIndex($scripturl.'?action=profile;u='.$memID.';area=showposts'.($context['is_topics'] ? ';sa=topics' : '').(!empty($board) ? ';board='.$board : ''), $context['start'], $msgCount, $maxIndex);
 	$context['current_page'] = $context['start'] / $maxIndex;
 
 	// Reverse the query if we're past 50% of the pages for better performance.
@@ -660,10 +660,10 @@ 
 		if ($context['is_topics'])
 		{
 			$margin *= 5;
-			$range_limit = $reverse ? 't.id_first_msg < ' . ($min_msg_member + $margin) : 't.id_first_msg > ' . ($max_msg_member - $margin);
+			$range_limit = $reverse ? 't.id_first_msg < '.($min_msg_member + $margin) : 't.id_first_msg > '.($max_msg_member - $margin);
 		}
 		else
-			$range_limit = $reverse ? 'm.id_msg < ' . ($min_msg_member + $margin) : 'm.id_msg > ' . ($max_msg_member - $margin);
+			$range_limit = $reverse ? 'm.id_msg < '.($min_msg_member + $margin) : 'm.id_msg > '.($max_msg_member - $margin);
 	}
 
 	// Find this user's posts.  The left join on categories somehow makes this faster, weird as it looks.
@@ -681,11 +681,11 @@ 
 					LEFT JOIN {db_prefix}categories AS c ON (c.id_cat = b.id_cat)
 					INNER JOIN {db_prefix}messages AS m ON (m.id_msg = t.id_first_msg)
 				WHERE t.id_member_started = {int:current_member}' . (!empty($board) ? '
-					AND t.id_board = {int:board}' : '') . (empty($range_limit) ? '' : '
-					AND ' . $range_limit) . '
+					AND t.id_board = {int:board}' : '').(empty($range_limit) ? '' : '
+					AND ' . $range_limit).'
 					AND {query_see_board}' . (!$modSettings['postmod_active'] || $context['user']['is_owner'] ? '' : '
-					AND t.approved = {int:is_approved} AND m.approved = {int:is_approved}') . '
-				ORDER BY t.id_first_msg ' . ($reverse ? 'ASC' : 'DESC') . '
+					AND t.approved = {int:is_approved} AND m.approved = {int:is_approved}').'
+				ORDER BY t.id_first_msg ' . ($reverse ? 'ASC' : 'DESC').'
 				LIMIT {int:start}, {int:max}',
 				array(
 					'current_member' => $memID,
@@ -708,11 +708,11 @@ 
 					INNER JOIN {db_prefix}boards AS b ON (b.id_board = t.id_board)
 					LEFT JOIN {db_prefix}categories AS c ON (c.id_cat = b.id_cat)
 				WHERE m.id_member = {int:current_member}' . (!empty($board) ? '
-					AND b.id_board = {int:board}' : '') . (empty($range_limit) ? '' : '
-					AND ' . $range_limit) . '
+					AND b.id_board = {int:board}' : '').(empty($range_limit) ? '' : '
+					AND ' . $range_limit).'
 					AND {query_see_board}' . (!$modSettings['postmod_active'] || $context['user']['is_owner'] ? '' : '
-					AND t.approved = {int:is_approved} AND m.approved = {int:is_approved}') . '
-				ORDER BY m.id_msg ' . ($reverse ? 'ASC' : 'DESC') . '
+					AND t.approved = {int:is_approved} AND m.approved = {int:is_approved}').'
+				ORDER BY m.id_msg ' . ($reverse ? 'ASC' : 'DESC').'
 				LIMIT {int:start}, {int:max}',
 				array(
 					'current_member' => $memID,
@@ -758,7 +758,7 @@ 
 			),
 			'topic' => $row['id_topic'],
 			'subject' => $row['subject'],
-			'start' => 'msg' . $row['id_msg'],
+			'start' => 'msg'.$row['id_msg'],
 			'time' => timeformat($row['poster_time']),
 			'timestamp' => forum_time(true, $row['poster_time']),
 			'id' => $row['id_msg'],
@@ -857,7 +857,7 @@ 
 	if (empty($boardsAllowed))
 		$boardsAllowed = array(-1);
 
-	require_once($sourcedir . '/Subs-List.php');
+	require_once($sourcedir.'/Subs-List.php');
 
 	// This is all the information required to list attachments.
 	$listOptions = array(
@@ -865,7 +865,7 @@ 
 		'width' => '100%',
 		'items_per_page' => $modSettings['defaultMaxListItems'],
 		'no_items_label' => $txt['show_attachments_none'],
-		'base_href' => $scripturl . '?action=profile;area=showposts;sa=attach;u=' . $memID,
+		'base_href' => $scripturl.'?action=profile;area=showposts;sa=attach;u='.$memID,
 		'default_sort_col' => 'filename',
 		'get_items' => array(
 			'function' => 'list_getAttachments',
@@ -896,7 +896,7 @@ 
 				),
 				'data' => array(
 					'sprintf' => array(
-						'format' => '<a href="' . $scripturl . '?action=dlattach;topic=%1$d.0;attach=%2$d">%3$s</a>',
+						'format' => '<a href="'.$scripturl.'?action=dlattach;topic=%1$d.0;attach=%2$d">%3$s</a>',
 						'params' => array(
 							'topic' => true,
 							'id' => true,
@@ -931,7 +931,7 @@ 
 				),
 				'data' => array(
 					'sprintf' => array(
-						'format' => '<a href="' . $scripturl . '?msg=%1$d">%2$s</a>',
+						'format' => '<a href="'.$scripturl.'?msg=%1$d">%2$s</a>',
 						'params' => array(
 							'msg' => true,
 							'subject' => false,
@@ -988,9 +988,9 @@ 
 		WHERE a.attachment_type = {int:attachment_type}
 			AND a.id_msg != {int:no_message}
 			AND m.id_member = {int:current_member}' . (!empty($board) ? '
-			AND b.id_board = {int:board}' : '') . (!in_array(0, $boardsAllowed) ? '
-			AND b.id_board IN ({array_int:boards_list})' : '') . (!$modSettings['postmod_active'] || $context['user']['is_owner'] ? '' : '
-			AND m.approved = {int:is_approved}') . '
+			AND b.id_board = {int:board}' : '').(!in_array(0, $boardsAllowed) ? '
+			AND b.id_board IN ({array_int:boards_list})' : '').(!$modSettings['postmod_active'] || $context['user']['is_owner'] ? '' : '
+			AND m.approved = {int:is_approved}').'
 		ORDER BY {raw:sort}
 		LIMIT {int:offset}, {int:limit}',
 		array(
@@ -1045,8 +1045,8 @@ 
 		WHERE a.attachment_type = {int:attachment_type}
 			AND a.id_msg != {int:no_message}
 			AND m.id_member = {int:current_member}' . (!empty($board) ? '
-			AND b.id_board = {int:board}' : '') . (!in_array(0, $boardsAllowed) ? '
-			AND b.id_board IN ({array_int:boards_list})' : '') . (!$modSettings['postmod_active'] || $context['user']['is_owner'] ? '' : '
+			AND b.id_board = {int:board}' : '').(!in_array(0, $boardsAllowed) ? '
+			AND b.id_board IN ({array_int:boards_list})' : '').(!$modSettings['postmod_active'] || $context['user']['is_owner'] ? '' : '
 			AND m.approved = {int:is_approved}'),
 		array(
 			'boards_list' => $boardsAllowed,
@@ -1076,7 +1076,7 @@ 
 	if ($user_info['id'] != $memID)
 		return;
 
-	require_once($sourcedir . '/Subs-List.php');
+	require_once($sourcedir.'/Subs-List.php');
 
 	// And here they are: the topics you don't like
 	$listOptions = array(
@@ -1084,7 +1084,7 @@ 
 		'width' => '100%',
 		'items_per_page' => (empty($modSettings['disableCustomPerPage']) && !empty($options['topics_per_page'])) ? $options['topics_per_page'] : $modSettings['defaultMaxTopics'],
 		'no_items_label' => $txt['unwatched_topics_none'],
-		'base_href' => $scripturl . '?action=profile;area=showposts;sa=unwatchedtopics;u=' . $memID,
+		'base_href' => $scripturl.'?action=profile;area=showposts;sa=unwatchedtopics;u='.$memID,
 		'default_sort_col' => 'started_on',
 		'get_items' => array(
 			'function' => 'list_getUnwatched',
@@ -1107,7 +1107,7 @@ 
 				),
 				'data' => array(
 					'sprintf' => array(
-						'format' => '<a href="' . $scripturl . '?topic=%1$d.0">%2$s</a>',
+						'format' => '<a href="'.$scripturl.'?topic=%1$d.0">%2$s</a>',
 						'params' => array(
 							'id_topic' => false,
 							'subject' => false,
@@ -1205,7 +1205,7 @@ 
 			LEFT JOIN {db_prefix}topics as t ON (lt.id_topic = t.id_topic)
 			LEFT JOIN {db_prefix}boards as b ON (t.id_board = b.id_board)
 			LEFT JOIN {db_prefix}messages as m ON (t.id_first_msg = m.id_msg)' . (in_array($sort, array('mem.real_name', 'mem.real_name DESC', 'mem.poster_time', 'mem.poster_time DESC')) ? '
-			LEFT JOIN {db_prefix}members as mem ON (m.id_member = mem.id_member)' : '') . '
+			LEFT JOIN {db_prefix}members as mem ON (m.id_member = mem.id_member)' : '').'
 		WHERE lt.id_member = {int:current_member}
 			AND unwatched = 1
 			AND {query_see_board}
@@ -1287,7 +1287,7 @@ 
 {
 	global $txt, $scripturl, $context, $user_profile, $user_info, $modSettings, $smcFunc;
 
-	$context['page_title'] = $txt['statPanel_showStats'] . ' ' . $user_profile[$memID]['real_name'];
+	$context['page_title'] = $txt['statPanel_showStats'].' '.$user_profile[$memID]['real_name'];
 
 	// Is the load average too high to allow searching just now?
 	if (!empty($context['load_average']) && !empty($modSettings['loadavg_userstats']) && $context['load_average'] >= $modSettings['loadavg_userstats'])
@@ -1296,11 +1296,11 @@ 
 	// General user statistics.
 	$timeDays = floor($user_profile[$memID]['total_time_logged_in'] / 86400);
 	$timeHours = floor(($user_profile[$memID]['total_time_logged_in'] % 86400) / 3600);
-	$context['time_logged_in'] = ($timeDays > 0 ? $timeDays . $txt['totalTimeLogged2'] : '') . ($timeHours > 0 ? $timeHours . $txt['totalTimeLogged3'] : '') . floor(($user_profile[$memID]['total_time_logged_in'] % 3600) / 60) . $txt['totalTimeLogged4'];
+	$context['time_logged_in'] = ($timeDays > 0 ? $timeDays.$txt['totalTimeLogged2'] : '').($timeHours > 0 ? $timeHours.$txt['totalTimeLogged3'] : '').floor(($user_profile[$memID]['total_time_logged_in'] % 3600) / 60).$txt['totalTimeLogged4'];
 	$context['num_posts'] = comma_format($user_profile[$memID]['posts']);
 	// Menu tab
 	$context[$context['profile_menu_name']]['tab_data'] = array(
-		'title' => $txt['statPanel_generalStats'] . ' - ' . $context['member']['name'],
+		'title' => $txt['statPanel_generalStats'].' - '.$context['member']['name'],
 		'icon' => 'stats_info.png'
 	);
 
@@ -1359,8 +1359,8 @@ 
 		$context['popular_boards'][$row['id_board']] = array(
 			'id' => $row['id_board'],
 			'posts' => $row['message_count'],
-			'href' => $scripturl . '?board=' . $row['id_board'] . '.0',
-			'link' => '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>',
+			'href' => $scripturl.'?board='.$row['id_board'].'.0',
+			'link' => '<a href="'.$scripturl.'?board='.$row['id_board'].'.0">'.$row['name'].'</a>',
 			'posts_percent' => $user_profile[$memID]['posts'] == 0 ? 0 : ($row['message_count'] * 100) / $user_profile[$memID]['posts'],
 			'total_posts' => $row['num_posts'],
 			'total_posts_member' => $user_profile[$memID]['posts'],
@@ -1390,8 +1390,8 @@ 
 		$context['board_activity'][$row['id_board']] = array(
 			'id' => $row['id_board'],
 			'posts' => $row['message_count'],
-			'href' => $scripturl . '?board=' . $row['id_board'] . '.0',
-			'link' => '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>',
+			'href' => $scripturl.'?board='.$row['id_board'].'.0',
+			'link' => '<a href="'.$scripturl.'?board='.$row['id_board'].'.0">'.$row['name'].'</a>',
 			'percent' => comma_format((float) $row['percentage'], 2),
 			'posts_percent' => (float) $row['percentage'],
 			'total_posts' => $row['num_posts'],
@@ -1406,7 +1406,7 @@ 
 			COUNT(*) AS post_count
 		FROM {db_prefix}messages
 		WHERE id_member = {int:current_member}' . ($modSettings['totalMessages'] > 100000 ? '
-			AND id_topic > {int:top_ten_thousand_topics}' : '') . '
+			AND id_topic > {int:top_ten_thousand_topics}' : '').'
 		GROUP BY hour',
 		array(
 			'current_member' => $memID,
@@ -1471,18 +1471,18 @@ 
 			'text' => $context['time_logged_in'],
 		),
 		'total_posts' => array(
-			'text' => $context['num_posts'] . ' ' . $txt['statPanel_posts'],
-			'url' => $scripturl . '?action=profile;area=showposts;sa=messages;u=' . $memID
+			'text' => $context['num_posts'].' '.$txt['statPanel_posts'],
+			'url' => $scripturl.'?action=profile;area=showposts;sa=messages;u='.$memID
 		),
 		'total_topics' => array(
-			'text' => $context['num_topics'] . ' ' . $txt['statPanel_topics'],
-			'url' => $scripturl . '?action=profile;area=showposts;sa=topics;u=' . $memID
+			'text' => $context['num_topics'].' '.$txt['statPanel_topics'],
+			'url' => $scripturl.'?action=profile;area=showposts;sa=topics;u='.$memID
 		),
 		'users_polls' => array(
-			'text' => $context['num_polls'] . ' ' . $txt['statPanel_polls'],
+			'text' => $context['num_polls'].' '.$txt['statPanel_polls'],
 		),
 		'users_votes' => array(
-			'text' => $context['num_votes'] . ' ' . $txt['statPanel_votes']
+			'text' => $context['num_votes'].' '.$txt['statPanel_votes']
 		)
 	);
 
@@ -1543,7 +1543,7 @@ 
 	$context['tracking_area'] = isset($_GET['sa']) && isset($subActions[$_GET['sa']]) ? $_GET['sa'] : $default;
 
 	// Set a page title.
-	$context['page_title'] = $txt['trackUser'] . ' - ' . $subActions[$context['tracking_area']][1] . ' - ' . $user_profile[$memID]['real_name'];
+	$context['page_title'] = $txt['trackUser'].' - '.$subActions[$context['tracking_area']][1].' - '.$user_profile[$memID]['real_name'];
 
 	// Pass on to the actual function.
 	$context['sub_template'] = $subActions[$context['tracking_area']][0];
@@ -1574,10 +1574,10 @@ 
 	// Set the options for the list component.
 	$listOptions = array(
 		'id' => 'track_user_list',
-		'title' => $txt['errors_by'] . ' ' . $context['member']['name'],
+		'title' => $txt['errors_by'].' '.$context['member']['name'],
 		'items_per_page' => $modSettings['defaultMaxListItems'],
 		'no_items_label' => $txt['no_errors_from_user'],
-		'base_href' => $scripturl . '?action=profile;area=tracking;sa=user;u=' . $memID,
+		'base_href' => $scripturl.'?action=profile;area=tracking;sa=user;u='.$memID,
 		'default_sort_col' => 'date',
 		'get_items' => array(
 			'function' => 'list_getUserErrors',
@@ -1600,7 +1600,7 @@ 
 				),
 				'data' => array(
 					'sprintf' => array(
-						'format' => '<a href="' . $scripturl . '?action=profile;area=tracking;sa=ip;searchip=%1$s;u=' . $memID . '">%1$s</a>',
+						'format' => '<a href="'.$scripturl.'?action=profile;area=tracking;sa=ip;searchip=%1$s;u='.$memID.'">%1$s</a>',
 						'params' => array(
 							'ip' => false,
 						),
@@ -1647,7 +1647,7 @@ 
 	);
 
 	// Create the list for viewing.
-	require_once($sourcedir . '/Subs-List.php');
+	require_once($sourcedir.'/Subs-List.php');
 	createList($listOptions);
 
 	// @todo cache this
@@ -1682,7 +1682,7 @@ 
 		FROM {db_prefix}messages
 		WHERE id_member = {int:current_member}
 		' . (isset($min_msg_member) ? '
-			AND id_msg >= {int:min_msg_member} AND id_msg <= {int:max_msg_member}' : '') . '
+			AND id_msg >= {int:min_msg_member} AND id_msg <= {int:max_msg_member}' : '').'
 		GROUP BY poster_ip',
 		array(
 			'current_member' => $memID,
@@ -1693,7 +1693,7 @@ 
 	$context['ips'] = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		$context['ips'][] = '<a href="' . $scripturl . '?action=profile;area=tracking;sa=ip;searchip=' . inet_dtop($row['poster_ip']) . ';u=' . $memID . '">' . inet_dtop($row['poster_ip']) . '</a>';
+		$context['ips'][] = '<a href="'.$scripturl.'?action=profile;area=tracking;sa=ip;searchip='.inet_dtop($row['poster_ip']).';u='.$memID.'">'.inet_dtop($row['poster_ip']).'</a>';
 		$ips[] = inet_dtop($row['poster_ip']);
 	}
 	$smcFunc['db_free_result']($request);
@@ -1712,7 +1712,7 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		$row['ip'] = inet_dtop($row['ip']);
-		$context['error_ips'][] = '<a href="' . $scripturl . '?action=profile;area=tracking;sa=ip;searchip=' . $row['ip'] . ';u=' . $memID . '">' . $row['ip'] . '</a>';
+		$context['error_ips'][] = '<a href="'.$scripturl.'?action=profile;area=tracking;sa=ip;searchip='.$row['ip'].';u='.$memID.'">'.$row['ip'].'</a>';
 		$ips[] = $row['ip'];
 	}
 	$smcFunc['db_free_result']($request);
@@ -1752,7 +1752,7 @@ 
 				)
 			);
 			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$context['members_in_range'][$row['id_member']] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+				$context['members_in_range'][$row['id_member']] = '<a href="'.$scripturl.'?action=profile;u='.$row['id_member'].'">'.$row['real_name'].'</a>';
 			$smcFunc['db_free_result']($request);
 		}
 
@@ -1767,7 +1767,7 @@ 
 			)
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$context['members_in_range'][$row['id_member']] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+			$context['members_in_range'][$row['id_member']] = '<a href="'.$scripturl.'?action=profile;u='.$row['id_member'].'">'.$row['real_name'].'</a>';
 		$smcFunc['db_free_result']($request);
 	}
 }
@@ -1816,7 +1816,7 @@ 
 			COALESCE(mem.real_name, {string:guest_title}) AS display_name, mem.member_name
 		FROM {db_prefix}log_errors AS le
 			LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = le.id_member)
-		WHERE ' . $where . '
+		WHERE ' . $where.'
 		ORDER BY {raw:sort}
 		LIMIT {int:start}, {int:max}',
 		array_merge($where_vars, array(
@@ -1830,7 +1830,7 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 		$error_messages[] = array(
 			'ip' => inet_dtop($row['ip']),
-			'member_link' => $row['id_member'] > 0 ? '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['display_name'] . '</a>' : $row['display_name'],
+			'member_link' => $row['id_member'] > 0 ? '<a href="'.$scripturl.'?action=profile;u='.$row['id_member'].'">'.$row['display_name'].'</a>' : $row['display_name'],
 			'message' => strtr($row['message'], array('&lt;span class=&quot;remove&quot;&gt;' => '', '&lt;/span&gt;' => '')),
 			'url' => $row['url'],
 			'time' => timeformat($row['log_time']),
@@ -1888,7 +1888,7 @@ 
 		FROM {db_prefix}messages AS m
 			INNER JOIN {db_prefix}boards AS b ON (b.id_board = m.id_board)
 			LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = m.id_member)
-		WHERE {query_see_board} AND ' . $where . '
+		WHERE {query_see_board} AND ' . $where.'
 		ORDER BY {raw:sort}
 		LIMIT {int:start}, {int:max}',
 		array_merge($where_vars, array(
@@ -1901,10 +1901,10 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 		$messages[] = array(
 			'ip' => inet_dtop($row['poster_ip']),
-			'member_link' => empty($row['id_member']) ? $row['display_name'] : '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['display_name'] . '</a>',
+			'member_link' => empty($row['id_member']) ? $row['display_name'] : '<a href="'.$scripturl.'?action=profile;u='.$row['id_member'].'">'.$row['display_name'].'</a>',
 			'board' => array(
 				'id' => $row['id_board'],
-				'href' => $scripturl . '?board=' . $row['id_board']
+				'href' => $scripturl.'?board='.$row['id_board']
 			),
 			'topic' => $row['id_topic'],
 			'id' => $row['id_msg'],
@@ -1937,12 +1937,12 @@ 
 		loadLanguage('Profile');
 		$context['sub_template'] = 'trackIP';
 		$context['page_title'] = $txt['profile'];
-		$context['base_url'] = $scripturl . '?action=trackip';
+		$context['base_url'] = $scripturl.'?action=trackip';
 	}
 	else
 	{
 		$context['ip'] = ip2range($user_profile[$memID]['member_ip']);
-		$context['base_url'] = $scripturl . '?action=profile;area=tracking;sa=ip;u=' . $memID;
+		$context['base_url'] = $scripturl.'?action=profile;area=tracking;sa=ip;u='.$memID;
 	}
 
 	// Searching?
@@ -1952,7 +1952,7 @@ 
 	if (count($context['ip']) !== 2)
 		fatal_lang_error('invalid_tracking_ip', false);
 
-	$ip_string = array('{inet:ip_address_low}','{inet:ip_address_high}');
+	$ip_string = array('{inet:ip_address_low}', '{inet:ip_address_high}');
 	$fields = array(
 			'ip_address_low' => $context['ip']['low'],
 			'ip_address_high' => $context['ip']['high'],
@@ -1960,23 +1960,23 @@ 
 
 	$ip_var = $context['ip'];
 
-	if ($context['ip']['low'] !==  $context['ip']['high'])
-		$context['ip'] = $context['ip']['low'] . ' - ' . $context['ip']['high'];
+	if ($context['ip']['low'] !== $context['ip']['high'])
+		$context['ip'] = $context['ip']['low'].' - '.$context['ip']['high'];
 	else
 		$context['ip'] = $context['ip']['low'];
 
 	if (empty($context['tracking_area']))
-		$context['page_title'] = $txt['trackIP'] . ' - ' . $context['ip'];
+		$context['page_title'] = $txt['trackIP'].' - '.$context['ip'];
 
 	$request = $smcFunc['db_query']('', '
 		SELECT id_member, real_name AS display_name, member_ip
 		FROM {db_prefix}members
-		WHERE member_ip >= ' . $ip_string[0] . ' and member_ip <= ' . $ip_string[1],
+		WHERE member_ip >= ' . $ip_string[0].' and member_ip <= '.$ip_string[1],
 		$fields
 	);
 	$context['ips'] = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['ips'][inet_dtop($row['member_ip'])][] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['display_name'] . '</a>';
+		$context['ips'][inet_dtop($row['member_ip'])][] = '<a href="'.$scripturl.'?action=profile;u='.$row['id_member'].'">'.$row['display_name'].'</a>';
 	$smcFunc['db_free_result']($request);
 
 	ksort($context['ips']);
@@ -1985,28 +1985,28 @@ 
 	$maxPerPage = empty($modSettings['disableCustomPerPage']) && !empty($options['messages_per_page']) ? $options['messages_per_page'] : $modSettings['defaultMaxMessages'];
 
 	// Gonna want this for the list.
-	require_once($sourcedir . '/Subs-List.php');
+	require_once($sourcedir.'/Subs-List.php');
 
 	// Start with the user messages.
 	$listOptions = array(
 		'id' => 'track_message_list',
-		'title' => $txt['messages_from_ip'] . ' ' . $context['ip'],
+		'title' => $txt['messages_from_ip'].' '.$context['ip'],
 		'start_var_name' => 'messageStart',
 		'items_per_page' => $maxPerPage,
 		'no_items_label' => $txt['no_messages_from_ip'],
-		'base_href' => $context['base_url'] . ';searchip=' . $context['ip'],
+		'base_href' => $context['base_url'].';searchip='.$context['ip'],
 		'default_sort_col' => 'date',
 		'get_items' => array(
 			'function' => 'list_getIPMessages',
 			'params' => array(
-				'm.poster_ip >= ' . $ip_string[0] . ' and m.poster_ip <= ' . $ip_string[1],
+				'm.poster_ip >= '.$ip_string[0].' and m.poster_ip <= '.$ip_string[1],
 				$fields,
 			),
 		),
 		'get_count' => array(
 			'function' => 'list_getIPMessageCount',
 			'params' => array(
-				'm.poster_ip >= ' . $ip_string[0] . ' and m.poster_ip <= ' . $ip_string[1],
+				'm.poster_ip >= '.$ip_string[0].' and m.poster_ip <= '.$ip_string[1],
 				$fields,
 			),
 		),
@@ -2017,7 +2017,7 @@ 
 				),
 				'data' => array(
 					'sprintf' => array(
-						'format' => '<a href="' . $context['base_url'] . ';searchip=%1$s">%1$s</a>',
+						'format' => '<a href="'.$context['base_url'].';searchip=%1$s">%1$s</a>',
 						'params' => array(
 							'ip' => false,
 						),
@@ -2042,7 +2042,7 @@ 
 				),
 				'data' => array(
 					'sprintf' => array(
-						'format' => '<a href="' . $scripturl . '?topic=%1$s.msg%2$s#msg%2$s" rel="nofollow">%3$s</a>',
+						'format' => '<a href="'.$scripturl.'?topic=%1$s.msg%2$s#msg%2$s" rel="nofollow">%3$s</a>',
 						'params' => array(
 							'topic' => false,
 							'id' => false,
@@ -2078,23 +2078,23 @@ 
 	// Set the options for the error lists.
 	$listOptions = array(
 		'id' => 'track_user_list',
-		'title' => $txt['errors_from_ip'] . ' ' . $context['ip'],
+		'title' => $txt['errors_from_ip'].' '.$context['ip'],
 		'start_var_name' => 'errorStart',
 		'items_per_page' => $modSettings['defaultMaxListItems'],
 		'no_items_label' => $txt['no_errors_from_ip'],
-		'base_href' => $context['base_url'] . ';searchip=' . $context['ip'],
+		'base_href' => $context['base_url'].';searchip='.$context['ip'],
 		'default_sort_col' => 'date2',
 		'get_items' => array(
 			'function' => 'list_getUserErrors',
 			'params' => array(
-				'le.ip >= ' . $ip_string[0] . ' and le.ip <= ' . $ip_string[1],
+				'le.ip >= '.$ip_string[0].' and le.ip <= '.$ip_string[1],
 				$fields,
 			),
 		),
 		'get_count' => array(
 			'function' => 'list_getUserErrorCount',
 			'params' => array(
-				'ip >= ' . $ip_string[0] . ' and ip <= ' . $ip_string[1],
+				'ip >= '.$ip_string[0].' and ip <= '.$ip_string[1],
 				$fields,
 			),
 		),
@@ -2105,7 +2105,7 @@ 
 				),
 				'data' => array(
 					'sprintf' => array(
-						'format' => '<a href="' . $context['base_url'] . ';searchip=%1$s">%1$s</a>',
+						'format' => '<a href="'.$context['base_url'].';searchip=%1$s">%1$s</a>',
 						'params' => array(
 							'ip' => false,
 						),
@@ -2172,23 +2172,23 @@ 
 		$context['whois_servers'] = array(
 			'afrinic' => array(
 				'name' => $txt['whois_afrinic'],
-				'url' => 'https://www.afrinic.net/cgi-bin/whois?searchtext=' . $context['ip'],
+				'url' => 'https://www.afrinic.net/cgi-bin/whois?searchtext='.$context['ip'],
 			),
 			'apnic' => array(
 				'name' => $txt['whois_apnic'],
-				'url' => 'https://wq.apnic.net/apnic-bin/whois.pl?searchtext=' . $context['ip'],
+				'url' => 'https://wq.apnic.net/apnic-bin/whois.pl?searchtext='.$context['ip'],
 			),
 			'arin' => array(
 				'name' => $txt['whois_arin'],
-				'url' => 'https://whois.arin.net/rest/ip/' . $context['ip'],
+				'url' => 'https://whois.arin.net/rest/ip/'.$context['ip'],
 			),
 			'lacnic' => array(
 				'name' => $txt['whois_lacnic'],
-				'url' => 'https://lacnic.net/cgi-bin/lacnic/whois?query=' . $context['ip'],
+				'url' => 'https://lacnic.net/cgi-bin/lacnic/whois?query='.$context['ip'],
 			),
 			'ripe' => array(
 				'name' => $txt['whois_ripe'],
-				'url' => 'https://apps.db.ripe.net/search/query.html?searchtext=' . $context['ip'],
+				'url' => 'https://apps.db.ripe.net/search/query.html?searchtext='.$context['ip'],
 			),
 		);
 	}
@@ -2204,12 +2204,12 @@ 
 	global $scripturl, $txt, $sourcedir, $context;
 
 	// Gonna want this for the list.
-	require_once($sourcedir . '/Subs-List.php');
+	require_once($sourcedir.'/Subs-List.php');
 
 	if ($memID == 0)
-		$context['base_url'] = $scripturl . '?action=trackip';
+		$context['base_url'] = $scripturl.'?action=trackip';
 	else
-		$context['base_url'] = $scripturl . '?action=profile;area=tracking;sa=ip;u=' . $memID;
+		$context['base_url'] = $scripturl.'?action=profile;area=tracking;sa=ip;u='.$memID;
 
 	// Start with the user messages.
 	$listOptions = array(
@@ -2246,7 +2246,7 @@ 
 				),
 				'data' => array(
 					'sprintf' => array(
-						'format' => '<a href="' . $context['base_url'] . ';searchip=%1$s">%1$s</a> (<a href="' . $context['base_url'] . ';searchip=%2$s">%2$s</a>) ',
+						'format' => '<a href="'.$context['base_url'].';searchip=%1$s">%1$s</a> (<a href="'.$context['base_url'].';searchip=%2$s">%2$s</a>) ',
 						'params' => array(
 							'ip' => false,
 							'ip2' => false
@@ -2339,7 +2339,7 @@ 
 {
 	global $scripturl, $txt, $modSettings, $sourcedir, $context, $smcFunc;
 
-	require_once($sourcedir . '/Subs-List.php');
+	require_once($sourcedir.'/Subs-List.php');
 
 	// Get the names of any custom fields.
 	$request = $smcFunc['db_query']('', '
@@ -2350,7 +2350,7 @@ 
 	);
 	$context['custom_field_titles'] = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['custom_field_titles']['customfield_' . $row['col_name']] = array(
+		$context['custom_field_titles']['customfield_'.$row['col_name']] = array(
 			'title' => $row['field_name'],
 			'parse_bbc' => $row['bbc'],
 		);
@@ -2362,7 +2362,7 @@ 
 		'title' => $txt['trackEdits'],
 		'items_per_page' => $modSettings['defaultMaxListItems'],
 		'no_items_label' => $txt['trackEdit_no_edits'],
-		'base_href' => $scripturl . '?action=profile;area=tracking;sa=edits;u=' . $memID,
+		'base_href' => $scripturl.'?action=profile;area=tracking;sa=edits;u='.$memID,
 		'default_sort_col' => 'time',
 		'get_items' => array(
 			'function' => 'list_getProfileEdits',
@@ -2496,8 +2496,8 @@ 
 			$members[] = $extra['applicator'];
 
 		// Work out what the name of the action is.
-		if (isset($txt['trackEdit_action_' . $row['action']]))
-			$action_text = $txt['trackEdit_action_' . $row['action']];
+		if (isset($txt['trackEdit_action_'.$row['action']]))
+			$action_text = $txt['trackEdit_action_'.$row['action']];
 		elseif (isset($txt[$row['action']]))
 			$action_text = $txt[$row['action']];
 		// Custom field?
@@ -2542,7 +2542,7 @@ 
 
 		foreach ($edits as $key => $value)
 			if (isset($members[$value['id_member']]))
-				$edits[$key]['member_link'] = '<a href="' . $scripturl . '?action=profile;u=' . $value['id_member'] . '">' . $members[$value['id_member']] . '</a>';
+				$edits[$key]['member_link'] = '<a href="'.$scripturl.'?action=profile;u='.$value['id_member'].'">'.$members[$value['id_member']].'</a>';
 	}
 
 	return $edits;
@@ -2557,7 +2557,7 @@ 
 {
 	global $scripturl, $txt, $modSettings, $sourcedir, $context;
 
-	require_once($sourcedir . '/Subs-List.php');
+	require_once($sourcedir.'/Subs-List.php');
 
 	// Set the options for the error lists.
 	$listOptions = array(
@@ -2565,7 +2565,7 @@ 
 		'title' => sprintf($txt['trackGroupRequests_title'], $context['member']['name']),
 		'items_per_page' => $modSettings['defaultMaxListItems'],
 		'no_items_label' => $txt['requested_none'],
-		'base_href' => $scripturl . '?action=profile;area=tracking;sa=groupreq;u=' . $memID,
+		'base_href' => $scripturl.'?action=profile;area=tracking;sa=groupreq;u='.$memID,
 		'default_sort_col' => 'time_applied',
 		'get_items' => array(
 			'function' => 'list_getGroupRequests',
@@ -2641,7 +2641,7 @@ 
 		SELECT COUNT(*) AS req_count
 		FROM {db_prefix}log_group_requests AS lgr
 		WHERE id_member = {int:memID}
-			AND ' . ($user_info['mod_cache']['gq'] == '1=1' ? $user_info['mod_cache']['gq'] : 'lgr.' . $user_info['mod_cache']['gq']),
+			AND ' . ($user_info['mod_cache']['gq'] == '1=1' ? $user_info['mod_cache']['gq'] : 'lgr.'.$user_info['mod_cache']['gq']),
 		array(
 			'memID' => $memID,
 		)
@@ -2675,7 +2675,7 @@ 
 			LEFT JOIN {db_prefix}members AS ma ON (lgr.id_member_acted = ma.id_member)
 			INNER JOIN {db_prefix}membergroups AS mg ON (lgr.id_group = mg.id_group)
 		WHERE lgr.id_member = {int:memID}
-			AND ' . ($user_info['mod_cache']['gq'] == '1=1' ? $user_info['mod_cache']['gq'] : 'lgr.' . $user_info['mod_cache']['gq']) . '
+			AND ' . ($user_info['mod_cache']['gq'] == '1=1' ? $user_info['mod_cache']['gq'] : 'lgr.'.$user_info['mod_cache']['gq']).'
 		ORDER BY {raw:sort}
 		LIMIT {int:start}, {int:max}',
 		array(
@@ -2688,7 +2688,7 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		$this_req = array(
-			'group_name' => empty($row['online_color']) ? $row['group_name'] : '<span style="color:' . $row['online_color'] . '">' . $row['group_name'] . '</span>',
+			'group_name' => empty($row['online_color']) ? $row['group_name'] : '<span style="color:'.$row['online_color'].'">'.$row['group_name'].'</span>',
 			'group_reason' => $row['reason'],
 			'time_applied' => $row['time_applied'],
 		);
@@ -2698,11 +2698,11 @@ 
 				$this_req['outcome'] = $txt['outcome_pending'];
 				break;
 			case 1:
-				$member_link = empty($row['id_member_acted']) ? $row['act_name'] : '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member_acted'] . '">' . $row['act_name'] . '</a>';
+				$member_link = empty($row['id_member_acted']) ? $row['act_name'] : '<a href="'.$scripturl.'?action=profile;u='.$row['id_member_acted'].'">'.$row['act_name'].'</a>';
 				$this_req['outcome'] = sprintf($txt['outcome_approved'], $member_link, timeformat($row['time_acted']));
 				break;
 			case 2:
-				$member_link = empty($row['id_member_acted']) ? $row['act_name'] : '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member_acted'] . '">' . $row['act_name'] . '</a>';
+				$member_link = empty($row['id_member_acted']) ? $row['act_name'] : '<a href="'.$scripturl.'?action=profile;u='.$row['id_member_acted'].'">'.$row['act_name'].'</a>';
 				$this_req['outcome'] = sprintf(!empty($row['act_reason']) ? $txt['outcome_refused_reason'] : $txt['outcome_refused'], $member_link, timeformat($row['time_acted']), $row['act_reason']);
 				break;
 		}
@@ -2732,7 +2732,7 @@ 
 	loadTemplate('ManageMembers');
 
 	// Load all the permission profiles.
-	require_once($sourcedir . '/ManagePermissions.php');
+	require_once($sourcedir.'/ManagePermissions.php');
 	loadPermissionProfiles();
 
 	$context['member']['id'] = $memID;
@@ -2783,7 +2783,7 @@ 
 	}
 	$smcFunc['db_free_result']($request);
 
-	require_once($sourcedir . '/Subs-Boards.php');
+	require_once($sourcedir.'/Subs-Boards.php');
 	sortBoards($context['boards']);
 
 	if (!empty($context['no_access_boards']))
@@ -2816,17 +2816,17 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($result))
 	{
 		// We don't know about this permission, it doesn't exist :P.
-		if (!isset($txt['permissionname_' . $row['permission']]))
+		if (!isset($txt['permissionname_'.$row['permission']]))
 			continue;
 
 		if (empty($row['add_deny']))
 			$denied[] = $row['permission'];
 
 		// Permissions that end with _own or _any consist of two parts.
-		if (in_array(substr($row['permission'], -4), array('_own', '_any')) && isset($txt['permissionname_' . substr($row['permission'], 0, -4)]))
-			$name = $txt['permissionname_' . substr($row['permission'], 0, -4)] . ' - ' . $txt['permissionname_' . $row['permission']];
+		if (in_array(substr($row['permission'], -4), array('_own', '_any')) && isset($txt['permissionname_'.substr($row['permission'], 0, -4)]))
+			$name = $txt['permissionname_'.substr($row['permission'], 0, -4)].' - '.$txt['permissionname_'.$row['permission']];
 		else
-			$name = $txt['permissionname_' . $row['permission']];
+			$name = $txt['permissionname_'.$row['permission']];
 
 		// Add this permission if it doesn't exist yet.
 		if (!isset($context['member']['permissions']['general'][$row['permission']]))
@@ -2852,11 +2852,11 @@ 
 	$request = $smcFunc['db_query']('', '
 		SELECT
 			bp.add_deny, bp.permission, bp.id_group, mg.group_name' . (empty($board) ? '' : ',
-			b.id_profile, CASE WHEN (mods.id_member IS NULL AND modgs.id_group IS NULL) THEN 0 ELSE 1 END AS is_moderator') . '
+			b.id_profile, CASE WHEN (mods.id_member IS NULL AND modgs.id_group IS NULL) THEN 0 ELSE 1 END AS is_moderator').'
 		FROM {db_prefix}board_permissions AS bp' . (empty($board) ? '' : '
 			INNER JOIN {db_prefix}boards AS b ON (b.id_board = {int:current_board})
 			LEFT JOIN {db_prefix}moderators AS mods ON (mods.id_board = b.id_board AND mods.id_member = {int:current_member})
-			LEFT JOIN {db_prefix}moderator_groups AS modgs ON (modgs.id_board = b.id_board AND modgs.id_group IN ({array_int:group_list}))') . '
+			LEFT JOIN {db_prefix}moderator_groups AS modgs ON (modgs.id_board = b.id_board AND modgs.id_group IN ({array_int:group_list}))').'
 			LEFT JOIN {db_prefix}membergroups AS mg ON (mg.id_group = bp.id_group)
 		WHERE bp.id_profile = {raw:current_profile}
 			AND bp.id_group IN ({array_int:group_list}' . (empty($board) ? ')' : ', {int:moderator_group})
@@ -2873,14 +2873,14 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// We don't know about this permission, it doesn't exist :P.
-		if (!isset($txt['permissionname_' . $row['permission']]))
+		if (!isset($txt['permissionname_'.$row['permission']]))
 			continue;
 
 		// The name of the permission using the format 'permission name' - 'own/any topic/event/etc.'.
-		if (in_array(substr($row['permission'], -4), array('_own', '_any')) && isset($txt['permissionname_' . substr($row['permission'], 0, -4)]))
-			$name = $txt['permissionname_' . substr($row['permission'], 0, -4)] . ' - ' . $txt['permissionname_' . $row['permission']];
+		if (in_array(substr($row['permission'], -4), array('_own', '_any')) && isset($txt['permissionname_'.substr($row['permission'], 0, -4)]))
+			$name = $txt['permissionname_'.substr($row['permission'], 0, -4)].' - '.$txt['permissionname_'.$row['permission']];
 		else
-			$name = $txt['permissionname_' . $row['permission']];
+			$name = $txt['permissionname_'.$row['permission']];
 
 		// Create the structure for this permission.
 		if (!isset($context['member']['permissions']['board'][$row['permission']]))
@@ -2921,15 +2921,15 @@ 
 	$modSettings['warning_mute'] = !empty($modSettings['warning_mute']) ? $modSettings['warning_mute'] : 110;
 
 	// Let's use a generic list to get all the current warnings, and use the issue warnings grab-a-granny thing.
-	require_once($sourcedir . '/Subs-List.php');
-	require_once($sourcedir . '/Profile-Actions.php');
+	require_once($sourcedir.'/Subs-List.php');
+	require_once($sourcedir.'/Profile-Actions.php');
 
 	$listOptions = array(
 		'id' => 'view_warnings',
 		'title' => $txt['profile_viewwarning_previous_warnings'],
 		'items_per_page' => $modSettings['defaultMaxListItems'],
 		'no_items_label' => $txt['profile_viewwarning_no_warnings'],
-		'base_href' => $scripturl . '?action=profile;area=viewwarning;sa=user;u=' . $memID,
+		'base_href' => $scripturl.'?action=profile;area=viewwarning;sa=user;u='.$memID,
 		'default_sort_col' => 'log_time',
 		'get_items' => array(
 			'function' => 'list_getUserWarnings',
@@ -2989,7 +2989,7 @@ 
 	);
 
 	// Create the list for viewing.
-	require_once($sourcedir . '/Subs-List.php');
+	require_once($sourcedir.'/Subs-List.php');
 	createList($listOptions);
 
 	// Create some common text bits for the template.

Sources/RemoveTopic.php

Doc Comments +1 added lines, -1 removed lines

@@ -1491,7 +1491,7 @@
 
 /**
  * Try to determine if the topic has already been deleted by another user.
- * @return bool False if it can't be deleted (recycling not enabled or no recycling board set), true if we've confirmed it can be deleted. Dies with an error if it's already been deleted.
+ * @return boolean|null False if it can't be deleted (recycling not enabled or no recycling board set), true if we've confirmed it can be deleted. Dies with an error if it's already been deleted.
  */
 function removeDeleteConcurrence()
 {

Spacing +31 added lines, -31 removed lines

@@ -34,7 +34,7 @@ 
 	checkSession('get');
 
 	// This file needs to be included for sendNotifications().
-	require_once($sourcedir . '/Subs-Post.php');
+	require_once($sourcedir.'/Subs-Post.php');
 
 	// Trying to fool us around, are we?
 	if (empty($topic))
@@ -80,7 +80,7 @@ 
 	if (allowedTo('remove_any') || (allowedTo('remove_own') && $starter == $user_info['id']))
 		logAction('remove', array((empty($modSettings['recycle_enable']) || $modSettings['recycle_board'] != $board ? 'topic' : 'old_topic_id') => $topic, 'subject' => $subject, 'member' => $starter, 'board' => $board));
 
-	redirectexit('board=' . $board . '.0');
+	redirectexit('board='.$board.'.0');
 }
 
 /**
@@ -148,11 +148,11 @@ 
 	elseif (isset($_REQUEST['recent']))
 		redirectexit('action=recent');
 	elseif (isset($_REQUEST['profile'], $_REQUEST['start'], $_REQUEST['u']))
-		redirectexit('action=profile;u=' . $_REQUEST['u'] . ';area=showposts;start=' . $_REQUEST['start']);
+		redirectexit('action=profile;u='.$_REQUEST['u'].';area=showposts;start='.$_REQUEST['start']);
 	elseif ($full_topic)
-		redirectexit('board=' . $board . '.0');
+		redirectexit('board='.$board.'.0');
 	else
-		redirectexit('topic=' . $topic . '.' . $_REQUEST['start']);
+		redirectexit('topic='.$topic.'.'.$_REQUEST['start']);
 }
 
 /**
@@ -217,7 +217,7 @@ 
 		FROM {db_prefix}topics AS t
 			INNER JOIN {db_prefix}messages AS m ON (m.id_msg = t.id_last_msg)
 		WHERE
-			m.poster_time < {int:poster_time}' . $condition . '
+			m.poster_time < {int:poster_time}' . $condition.'
 			AND t.id_board IN ({array_int:boards})',
 		$condition_params
 	);
@@ -263,7 +263,7 @@ 
 			FROM {db_prefix}messages AS m
 				INNER JOIN {db_prefix}boards AS b ON (b.id_board = m.id_board)
 			WHERE m.id_topic IN ({array_int:topics})' . (!empty($recycle_board) ? '
-				AND m.id_board != {int:recycled_board}' : '') . '
+				AND m.id_board != {int:recycled_board}' : '').'
 				AND b.count_posts = {int:do_count_posts}
 				AND m.approved = {int:is_approved}
 			GROUP BY m.id_member',
@@ -277,7 +277,7 @@ 
 		if ($smcFunc['db_num_rows']($requestMembers) > 0)
 		{
 			while ($rowMembers = $smcFunc['db_fetch_assoc']($requestMembers))
-				updateMemberData($rowMembers['id_member'], array('posts' => 'posts - ' . $rowMembers['posts']));
+				updateMemberData($rowMembers['id_member'], array('posts' => 'posts - '.$rowMembers['posts']));
 		}
 		$smcFunc['db_free_result']($requestMembers);
 	}
@@ -323,11 +323,11 @@ 
 			$smcFunc['db_free_result']($request);
 
 			// Move the topics to the recycle board.
-			require_once($sourcedir . '/MoveTopic.php');
+			require_once($sourcedir.'/MoveTopic.php');
 			moveTopics($recycleTopics, $modSettings['recycle_board']);
 
 			// Close reports that are being recycled.
-			require_once($sourcedir . '/ModerationCenter.php');
+			require_once($sourcedir.'/ModerationCenter.php');
 
 			$smcFunc['db_query']('', '
 				UPDATE {db_prefix}log_reported
@@ -341,7 +341,7 @@ 
 
 			updateSettings(array('last_mod_report_action' => time()));
 
-			require_once($sourcedir . '/Subs-ReportedContent.php');
+			require_once($sourcedir.'/Subs-ReportedContent.php');
 			recountOpenReports('posts');
 
 			// Topics that were recycled don't need to be deleted, so subtract them.
@@ -356,7 +356,7 @@ 
 		return;
 
 	// Callback for search APIs to do their thing
-	require_once($sourcedir . '/Search.php');
+	require_once($sourcedir.'/Search.php');
 	$searchAPI = findSearchAPI();
 	if ($searchAPI->supportsMethod('topicsRemoved'))
 		$searchAPI->topicsRemoved($topics);
@@ -468,7 +468,7 @@ 
 	}
 
 	// Get rid of the attachment, if it exists.
-	require_once($sourcedir . '/ManageAttachments.php');
+	require_once($sourcedir.'/ManageAttachments.php');
 	$attachmentQuery = array(
 		'attachment_type' => 0,
 		'id_topic' => $topics,
@@ -567,7 +567,7 @@ 
 		'calendar_updated' => time(),
 	));
 
-	require_once($sourcedir . '/Subs-Post.php');
+	require_once($sourcedir.'/Subs-Post.php');
 	$updates = array();
 	foreach ($adjustBoards as $stats)
 		$updates[] = $stats['id_board'];
@@ -594,7 +594,7 @@ 
 
 	$request = $smcFunc['db_query']('', '
 		SELECT
-			m.id_member, m.icon, m.poster_time, m.subject,' . (empty($modSettings['search_custom_index_config']) ? '' : ' m.body,') . '
+			m.id_member, m.icon, m.poster_time, m.subject,' . (empty($modSettings['search_custom_index_config']) ? '' : ' m.body,').'
 			m.approved, t.id_topic, t.id_first_msg, t.id_last_msg, t.num_replies, t.id_board,
 			t.id_member_started AS id_member_poster,
 			b.count_posts
@@ -727,7 +727,7 @@ 
 			FROM {db_prefix}messages
 			WHERE id_topic = {int:id_topic}
 				AND id_msg != {int:id_msg}
-			ORDER BY ' . ($modSettings['postmod_active'] ? 'approved DESC, ' : '') . 'id_msg DESC
+			ORDER BY ' . ($modSettings['postmod_active'] ? 'approved DESC, ' : '').'id_msg DESC
 			LIMIT 1',
 			array(
 				'id_topic' => $row['id_topic'],
@@ -743,7 +743,7 @@ 
 				id_last_msg = {int:id_last_msg},
 				id_member_updated = {int:id_member_updated}' . (!$modSettings['postmod_active'] || $row['approved'] ? ',
 				num_replies = CASE WHEN num_replies = {int:no_replies} THEN 0 ELSE num_replies - 1 END' : ',
-				unapproved_posts = CASE WHEN unapproved_posts = {int:no_unapproved} THEN 0 ELSE unapproved_posts - 1 END') . '
+				unapproved_posts = CASE WHEN unapproved_posts = {int:no_unapproved} THEN 0 ELSE unapproved_posts - 1 END').'
 			WHERE id_topic = {int:id_topic}',
 			array(
 				'id_last_msg' => $row2['id_msg'],
@@ -760,7 +760,7 @@ 
 			UPDATE {db_prefix}topics
 			SET ' . ($row['approved'] ? '
 				num_replies = CASE WHEN num_replies = {int:no_replies} THEN 0 ELSE num_replies - 1 END' : '
-				unapproved_posts = CASE WHEN unapproved_posts = {int:no_unapproved} THEN 0 ELSE unapproved_posts - 1 END') . '
+				unapproved_posts = CASE WHEN unapproved_posts = {int:no_unapproved} THEN 0 ELSE unapproved_posts - 1 END').'
 			WHERE id_topic = {int:id_topic}',
 			array(
 				'no_replies' => 0,
@@ -881,7 +881,7 @@ 
 				SET
 					num_topics = num_topics + {int:num_topics_inc},
 					num_posts = num_posts + 1' .
-						($message > $last_board_msg ? ', id_last_msg = {int:id_merged_msg}' : '') . '
+						($message > $last_board_msg ? ', id_last_msg = {int:id_merged_msg}' : '').'
 				WHERE id_board = {int:recycle_board}',
 				array(
 					'num_topics_inc' => empty($id_recycle_topic) ? 1 : 0,
@@ -895,8 +895,8 @@ 
 				$smcFunc['db_query']('', '
 					UPDATE {db_prefix}topics
 					SET num_replies = num_replies + 1' .
-						($message > $last_topic_msg ? ', id_last_msg = {int:id_merged_msg}' : '') .
-						($message < $first_topic_msg ? ', id_first_msg = {int:id_merged_msg}' : '') . '
+						($message > $last_topic_msg ? ', id_last_msg = {int:id_merged_msg}' : '').
+						($message < $first_topic_msg ? ', id_first_msg = {int:id_merged_msg}' : '').'
 					WHERE id_topic = {int:id_recycle_topic}',
 					array(
 						'id_recycle_topic' => $id_recycle_topic,
@@ -928,7 +928,7 @@ 
 		UPDATE {db_prefix}boards
 		SET ' . ($row['approved'] ? '
 			num_posts = CASE WHEN num_posts = {int:no_posts} THEN 0 ELSE num_posts - 1 END' : '
-			unapproved_posts = CASE WHEN unapproved_posts = {int:no_unapproved} THEN 0 ELSE unapproved_posts - 1 END') . '
+			unapproved_posts = CASE WHEN unapproved_posts = {int:no_unapproved} THEN 0 ELSE unapproved_posts - 1 END').'
 		WHERE id_board = {int:id_board}',
 		array(
 			'no_posts' => 0,
@@ -946,7 +946,7 @@ 
 	if (!$recycle)
 	{
 		// Callback for search APIs to do their thing
-		require_once($sourcedir . '/Search.php');
+		require_once($sourcedir.'/Search.php');
 		$searchAPI = findSearchAPI();
 		if ($searchAPI->supportsMethod('postRemoved'))
 			$searchAPI->postRemoved($message);
@@ -977,7 +977,7 @@ 
 		}
 
 		// Delete attachment(s) if they exist.
-		require_once($sourcedir . '/ManageAttachments.php');
+		require_once($sourcedir.'/ManageAttachments.php');
 		$attachmentQuery = array(
 			'attachment_type' => 0,
 			'id_msg' => $message,
@@ -996,7 +996,7 @@ 
 	));
 
 	// And now to update the last message of each board we messed with.
-	require_once($sourcedir . '/Subs-Post.php');
+	require_once($sourcedir.'/Subs-Post.php');
 	if ($recycle)
 		updateLastMessages(array($row['id_board'], $modSettings['recycle_board']));
 	else
@@ -1014,7 +1014,7 @@ 
 	);
 	if ($smcFunc['db_affected_rows']() != 0)
 	{
-		require_once($sourcedir . '/ModerationCenter.php');
+		require_once($sourcedir.'/ModerationCenter.php');
 		updateSettings(array('last_mod_report_action' => time()));
 		recountOpenReports('posts');
 	}
@@ -1040,7 +1040,7 @@ 
 	isAllowedTo('move_any', $modSettings['recycle_board']);
 
 	// We need this file.
-	require_once($sourcedir . '/MoveTopic.php');
+	require_once($sourcedir.'/MoveTopic.php');
 
 	$unfound_messages = array();
 	$topics_to_restore = array();
@@ -1215,7 +1215,7 @@ 
 				);
 
 				while ($member = $smcFunc['db_fetch_assoc']($request2))
-					updateMemberData($member['id_member'], array('posts' => 'posts + ' . $member['post_count']));
+					updateMemberData($member['id_member'], array('posts' => 'posts + '.$member['post_count']));
 				$smcFunc['db_free_result']($request2);
 			}
 
@@ -1459,7 +1459,7 @@ 
 	);
 
 	// Need it to update some stats.
-	require_once($sourcedir . '/Subs-Post.php');
+	require_once($sourcedir.'/Subs-Post.php');
 
 	// Update stats.
 	updateStats('topic');
@@ -1512,9 +1512,9 @@ 
 	if ($modSettings['recycle_board'] != $board)
 		return true;
 	elseif (isset($_REQUEST['msg']))
-		$confirm_url = $scripturl . '?action=deletemsg;confirm_delete;topic=' . $context['current_topic'] . '.0;msg=' . $_REQUEST['msg'] . ';' . $context['session_var'] . '=' . $context['session_id'];
+		$confirm_url = $scripturl.'?action=deletemsg;confirm_delete;topic='.$context['current_topic'].'.0;msg='.$_REQUEST['msg'].';'.$context['session_var'].'='.$context['session_id'];
 	else
-		$confirm_url = $scripturl . '?action=removetopic2;confirm_delete;topic=' . $context['current_topic'] . '.0;' . $context['session_var'] . '=' . $context['session_id'];
+		$confirm_url = $scripturl.'?action=removetopic2;confirm_delete;topic='.$context['current_topic'].'.0;'.$context['session_var'].'='.$context['session_id'];
 
 	fatal_lang_error('post_already_deleted', false, array($confirm_url));
 }

Sources/Reports.php

Doc Comments +1 added lines, -1 removed lines

@@ -1013,7 +1013,7 @@
  * @param string $title The title of the separator
  * @param null|string $custom_table The ID of the custom table
  *
- * @return void|bool Returns false if there are no tables
+ * @return null|false Returns false if there are no tables
  */
 function addSeparator($title = '', $custom_table = null)
 {

Spacing +32 added lines, -32 removed lines

@@ -72,8 +72,8 @@ 
 	foreach ($context['report_types'] as $k => $temp)
 		$context['report_types'][$k] = array(
 			'id' => $k,
-			'title' => isset($txt['gr_type_' . $k]) ? $txt['gr_type_' . $k] : $k,
-			'description' => isset($txt['gr_type_desc_' . $k]) ? $txt['gr_type_desc_' . $k] : null,
+			'title' => isset($txt['gr_type_'.$k]) ? $txt['gr_type_'.$k] : $k,
+			'description' => isset($txt['gr_type_desc_'.$k]) ? $txt['gr_type_desc_'.$k] : null,
 			'function' => $temp,
 			'is_first' => $is_first++ == 0,
 		);
@@ -107,12 +107,12 @@ 
 	}
 
 	// Make the page title more descriptive.
-	$context['page_title'] .= ' - ' . (isset($txt['gr_type_' . $context['report_type']]) ? $txt['gr_type_' . $context['report_type']] : $context['report_type']);
+	$context['page_title'] .= ' - '.(isset($txt['gr_type_'.$context['report_type']]) ? $txt['gr_type_'.$context['report_type']] : $context['report_type']);
 
 	// Build the reports button array.
 	$context['report_buttons'] = array(
-		'generate_reports' => array('text' => 'generate_reports', 'image' => 'print.png', 'url' => $scripturl . '?action=admin;area=reports', 'active' => true),
-		'print' => array('text' => 'print', 'image' => 'print.png', 'url' => $scripturl . '?action=admin;area=reports;rt=' . $context['report_type'] . ';st=print', 'custom' => 'target="_blank"'),
+		'generate_reports' => array('text' => 'generate_reports', 'image' => 'print.png', 'url' => $scripturl.'?action=admin;area=reports', 'active' => true),
+		'print' => array('text' => 'print', 'image' => 'print.png', 'url' => $scripturl.'?action=admin;area=reports;rt='.$context['report_type'].';st=print', 'custom' => 'target="_blank"'),
 	);
 
 	// Allow mods to add additional buttons here
@@ -138,7 +138,7 @@ 
 	global $context, $txt, $sourcedir, $smcFunc, $modSettings;
 
 	// Load the permission profiles.
-	require_once($sourcedir . '/ManagePermissions.php');
+	require_once($sourcedir.'/ManagePermissions.php');
 	loadLanguage('ManagePermissions');
 	loadPermissionProfiles();
 
@@ -177,7 +177,7 @@ 
 	);
 	$groups = array(-1 => $txt['guest_title'], 0 => $txt['full_member']);
 	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$groups[$row['id_group']] = empty($row['online_color']) ? $row['group_name'] : '<span style="color: ' . $row['online_color'] . '">' . $row['group_name'] . '</span>';
+		$groups[$row['id_group']] = empty($row['online_color']) ? $row['group_name'] : '<span style="color: '.$row['online_color'].'">'.$row['group_name'].'</span>';
 	$smcFunc['db_free_result']($request);
 
 	// All the fields we'll show.
@@ -321,7 +321,7 @@ 
 	$request = $smcFunc['db_query']('', '
 		SELECT id_board, name, id_profile
 		FROM {db_prefix}boards
-		WHERE ' . $board_clause . '
+		WHERE ' . $board_clause.'
 		ORDER BY id_board',
 		array(
 			'boards' => isset($_REQUEST['boards']) ? $_REQUEST['boards'] : array(),
@@ -344,7 +344,7 @@ 
 	$request = $smcFunc['db_query']('', '
 		SELECT id_board, id_group
 		FROM {db_prefix}moderator_groups
-		WHERE ' . $board_clause . ' AND ' . $group_clause,
+		WHERE ' . $board_clause.' AND '.$group_clause,
 		array(
 		)
 	);
@@ -358,9 +358,9 @@ 
 	$request = $smcFunc['db_query']('', '
 		SELECT id_group, group_name
 		FROM {db_prefix}membergroups
-		WHERE ' . $group_clause . '
+		WHERE ' . $group_clause.'
 			AND id_group != {int:admin_group}' . (empty($modSettings['permission_enable_postgroups']) ? '
-			AND min_posts = {int:min_posts}' : '') . '
+			AND min_posts = {int:min_posts}' : '').'
 		ORDER BY min_posts, CASE WHEN id_group < {int:newbie_group} THEN id_group ELSE 4 END, group_name',
 		array(
 			'admin_group' => 1,
@@ -400,8 +400,8 @@ 
 		SELECT id_profile, id_group, add_deny, permission
 		FROM {db_prefix}board_permissions
 		WHERE id_profile IN ({array_int:profile_list})
-			AND ' . $group_clause . (empty($modSettings['permission_enable_deny']) ? '
-			AND add_deny = {int:not_deny}' : '') . '
+			AND ' . $group_clause.(empty($modSettings['permission_enable_deny']) ? '
+			AND add_deny = {int:not_deny}' : '').'
 		ORDER BY id_profile, permission',
 		array(
 			'profile_list' => $profiles,
@@ -423,7 +423,7 @@ 
 		{
 			// This will be reused on other boards.
 			$permissions[$row['permission']] = array(
-				'title' => isset($txt['board_perms_name_' . $row['permission']]) ? $txt['board_perms_name_' . $row['permission']] : $row['permission'],
+				'title' => isset($txt['board_perms_name_'.$row['permission']]) ? $txt['board_perms_name_'.$row['permission']] : $row['permission'],
 			);
 		}
 	}
@@ -475,15 +475,15 @@ 
 
 				// Now actually make the data for the group look right.
 				if (empty($curData[$id_group]))
-					$curData[$id_group] = '<span class="red">' . $txt['board_perms_deny'] . '</span>';
+					$curData[$id_group] = '<span class="red">'.$txt['board_perms_deny'].'</span>';
 				elseif ($curData[$id_group] == 1)
-					$curData[$id_group] = '<span style="color: darkgreen;">' . $txt['board_perms_allow'] . '</span>';
+					$curData[$id_group] = '<span style="color: darkgreen;">'.$txt['board_perms_allow'].'</span>';
 				else
 					$curData[$id_group] = 'x';
 
 				// Embolden those permissions different from global (makes it a lot easier!)
 				if (@$board_permissions[0][$id_group][$ID_PERM] != @$group_permissions[$ID_PERM])
-					$curData[$id_group] = '<strong>' . $curData[$id_group] . '</strong>';
+					$curData[$id_group] = '<strong>'.$curData[$id_group].'</strong>';
 			}
 
 			// Now add the data for this permission.
@@ -546,7 +546,7 @@ 
 
 	// Add on the boards!
 	foreach ($boards as $board)
-		$mgSettings['board_' . $board['id']] = $board['name'];
+		$mgSettings['board_'.$board['id']] = $board['name'];
 
 	// Add all the membergroup settings, plus we'll be adding in columns!
 	setKeys('cols', $mgSettings);
@@ -601,15 +601,15 @@ 
 
 		$group = array(
 			'name' => $row['group_name'],
-			'color' => empty($row['online_color']) ? '-' : '<span style="color: ' . $row['online_color'] . ';">' . $row['online_color'] . '</span>',
+			'color' => empty($row['online_color']) ? '-' : '<span style="color: '.$row['online_color'].';">'.$row['online_color'].'</span>',
 			'min_posts' => $row['min_posts'] == -1 ? 'N/A' : $row['min_posts'],
 			'max_messages' => $row['max_messages'],
-			'icons' => !empty($row['icons'][0]) && !empty($row['icons'][1]) ? str_repeat('<img src="' . $settings['images_url'] . '/membericons/' . $row['icons'][1] . '" alt="*">', $row['icons'][0]) : '',
+			'icons' => !empty($row['icons'][0]) && !empty($row['icons'][1]) ? str_repeat('<img src="'.$settings['images_url'].'/membericons/'.$row['icons'][1].'" alt="*">', $row['icons'][0]) : '',
 		);
 
 		// Board permissions.
 		foreach ($boards as $board)
-			$group['board_' . $board['id']] = in_array($row['id_group'], $board['groups']) ? '<span class="success">' . $txt['board_perms_allow'] . '</span>' : (!empty($modSettings['deny_boards_access']) && in_array($row['id_group'], $board['deny_groups']) ? '<span class="alert">' . $txt['board_perms_deny'] . '</span>' : 'x');
+			$group['board_'.$board['id']] = in_array($row['id_group'], $board['groups']) ? '<span class="success">'.$txt['board_perms_allow'].'</span>' : (!empty($modSettings['deny_boards_access']) && in_array($row['id_group'], $board['deny_groups']) ? '<span class="alert">'.$txt['board_perms_deny'].'</span>' : 'x');
 
 		addData($group);
 	}
@@ -644,9 +644,9 @@ 
 	$request = $smcFunc['db_query']('', '
 		SELECT id_group, group_name
 		FROM {db_prefix}membergroups
-		WHERE ' . $clause . '
+		WHERE ' . $clause.'
 			AND id_group != {int:admin_group}' . (empty($modSettings['permission_enable_postgroups']) ? '
-			AND min_posts = {int:min_posts}' : '') . '
+			AND min_posts = {int:min_posts}' : '').'
 		ORDER BY min_posts, CASE WHEN id_group < {int:newbie_group} THEN id_group ELSE 4 END, group_name',
 		array(
 			'admin_group' => 1,
@@ -694,8 +694,8 @@ 
 	$request = $smcFunc['db_query']('', '
 		SELECT id_group, add_deny, permission
 		FROM {db_prefix}permissions
-		WHERE ' . $clause . (empty($modSettings['permission_enable_deny']) ? '
-			AND add_deny = {int:not_denied}' : '') . '
+		WHERE ' . $clause.(empty($modSettings['permission_enable_deny']) ? '
+			AND add_deny = {int:not_denied}' : '').'
 		ORDER BY permission',
 		array(
 			'not_denied' => 1,
@@ -718,16 +718,16 @@ 
 				addData($curData);
 
 			// Add the permission name in the left column.
-			$curData = array('col' => isset($txt['group_perms_name_' . $row['permission']]) ? $txt['group_perms_name_' . $row['permission']] : $row['permission']);
+			$curData = array('col' => isset($txt['group_perms_name_'.$row['permission']]) ? $txt['group_perms_name_'.$row['permission']] : $row['permission']);
 
 			$lastPermission = $row['permission'];
 		}
 
 		// Good stuff - add the permission to the list!
 		if ($row['add_deny'])
-			$curData[$row['id_group']] = '<span style="color: darkgreen;">' . $txt['board_perms_allow'] . '</span>';
+			$curData[$row['id_group']] = '<span style="color: darkgreen;">'.$txt['board_perms_allow'].'</span>';
 		else
-			$curData[$row['id_group']] = '<span class="red">' . $txt['board_perms_deny'] . '</span>';
+			$curData[$row['id_group']] = '<span class="red">'.$txt['board_perms_deny'].'</span>';
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -747,7 +747,7 @@ 
 {
 	global $sourcedir, $txt, $smcFunc;
 
-	require_once($sourcedir . '/Subs-Members.php');
+	require_once($sourcedir.'/Subs-Members.php');
 
 	// Fetch all the board names.
 	$request = $smcFunc['db_query']('', '
@@ -820,7 +820,7 @@ 
 	);
 	$groups = array(0 => $txt['full_member']);
 	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$groups[$row['id_group']] = empty($row['online_color']) ? $row['group_name'] : '<span style="color: ' . $row['online_color'] . '">' . $row['group_name'] . '</span>';
+		$groups[$row['id_group']] = empty($row['online_color']) ? $row['group_name'] : '<span style="color: '.$row['online_color'].'">'.$row['group_name'].'</span>';
 	$smcFunc['db_free_result']($request);
 
 	// All the fields we'll show.
@@ -862,7 +862,7 @@ 
 
 		// What do they moderate?
 		if (in_array($row['id_member'], $global_mods))
-			$staffData['moderates'] = '<em>' . $txt['report_staff_all_boards'] . '</em>';
+			$staffData['moderates'] = '<em>'.$txt['report_staff_all_boards'].'</em>';
 		elseif (isset($moderators[$row['id_member']]))
 		{
 			// Get the names
@@ -873,7 +873,7 @@ 
 			$staffData['moderates'] = implode(', ', $staffData['moderates']);
 		}
 		else
-			$staffData['moderates'] = '<em>' . $txt['report_staff_no_boards'] . '</em>';
+			$staffData['moderates'] = '<em>'.$txt['report_staff_no_boards'].'</em>';
 
 		// Next add the main data.
 		addData($staffData);

Sources/ScheduledTasks.php

Doc Comments +1 added lines, -1 removed lines

@@ -807,7 +807,7 @@
 /**
  * Send a group of emails from the mail queue.
  *
- * @param bool|int $number The number to send each loop through or false to use the standard limits
+ * @param integer $number The number to send each loop through or false to use the standard limits
  * @param bool $override_limit Whether to bypass the limit
  * @param bool $force_send Whether to forcibly send the messages now (useful when using cron jobs)
  * @return bool Whether things were sent

Spacing +41 added lines, -41 removed lines

@@ -85,8 +85,8 @@ 
 				$task_string = $row['callable'];
 
 			// Default SMF task or old mods?
-			elseif (function_exists('scheduled_' . $row['task']))
-				$task_string = 'scheduled_' . $row['task'];
+			elseif (function_exists('scheduled_'.$row['task']))
+				$task_string = 'scheduled_'.$row['task'];
 
 			// One last resource, the task name.
 			elseif (!empty($row['task']))
@@ -153,7 +153,7 @@ 
 
 	// Finally, send some stuff...
 	header('expires: Mon, 26 Jul 1997 05:00:00 GMT');
-	header('last-modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+	header('last-modified: '.gmdate('D, d M Y H:i:s').' GMT');
 	header('content-type: image/gif');
 	die("\x47\x49\x46\x38\x39\x61\x01\x00\x01\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x21\xF9\x04\x01\x00\x00\x00\x00\x2C\x00\x00\x00\x00\x01\x00\x01\x00\x00\x02\x02\x44\x01\x00\x3B");
 }
@@ -195,7 +195,7 @@ 
 		// Add it to the array otherwise.
 		$notices[$row['id_board']][$type][] = array(
 			'subject' => $row['subject'],
-			'href' => $scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'],
+			'href' => $scripturl.'?topic='.$row['id_topic'].'.msg'.$row['id_msg'].'#msg'.$row['id_msg'],
 		);
 
 		// Store the profile for a bit later.
@@ -268,7 +268,7 @@ 
 		FROM {db_prefix}members
 		WHERE id_group IN ({array_int:additional_group_list})
 			OR FIND_IN_SET({raw:additional_group_list_implode}, additional_groups) != 0' . (empty($members) ? '' : '
-			OR id_member IN ({array_int:member_list})') . '
+			OR id_member IN ({array_int:member_list})').'
 		ORDER BY lngfile',
 		array(
 			'additional_group_list' => $addGroups,
@@ -298,7 +298,7 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Get the mailing stuff.
-	require_once($sourcedir . '/Subs-Post.php');
+	require_once($sourcedir.'/Subs-Post.php');
 	// Need the below for loadLanguage to work!
 	loadEssentialThemeData();
 
@@ -345,11 +345,11 @@ 
 			foreach ($notice as $type => $items)
 			{
 				// Build up the top of this section.
-				$emailbody .= $txt['scheduled_approval_email_' . $type] . "\n" .
-					'------------------------------------------------------' . "\n";
+				$emailbody .= $txt['scheduled_approval_email_'.$type]."\n".
+					'------------------------------------------------------'."\n";
 
 				foreach ($items as $item)
-					$emailbody .= $item['subject'] . ' - ' . $item['href'] . "\n";
+					$emailbody .= $item['subject'].' - '.$item['href']."\n";
 
 				$emailbody .= "\n";
 			}
@@ -384,7 +384,7 @@ 
 	clean_cache();
 
 	// If warning decrement is enabled and we have people who have not had a new warning in 24 hours, lower their warning level.
-	list (, , $modSettings['warning_decrement']) = explode(',', $modSettings['warning_settings']);
+	list (,, $modSettings['warning_decrement']) = explode(',', $modSettings['warning_settings']);
 	if ($modSettings['warning_decrement'])
 	{
 		// Find every member who has a warning level...
@@ -446,7 +446,7 @@ 
 	// Do any spider stuff.
 	if (!empty($modSettings['spider_mode']) && $modSettings['spider_mode'] > 1)
 	{
-		require_once($sourcedir . '/ManageSearchEngines.php');
+		require_once($sourcedir.'/ManageSearchEngines.php');
 		consolidateSpiderStats();
 	}
 
@@ -464,7 +464,7 @@ 
 		global $proxyhousekeeping;
 		$proxyhousekeeping = true;
 
-		require_once($boarddir . '/proxy.php');
+		require_once($boarddir.'/proxy.php');
 		$proxy = new ProxyServer();
 		$proxy->housekeeping();
 
@@ -483,7 +483,7 @@ 
 	global $is_weekly, $txt, $mbname, $scripturl, $sourcedir, $smcFunc, $context, $modSettings;
 
 	// We'll want this...
-	require_once($sourcedir . '/Subs-Post.php');
+	require_once($sourcedir.'/Subs-Post.php');
 	loadEssentialThemeData();
 
 	$is_weekly = !empty($is_weekly) ? 1 : 0;
@@ -619,9 +619,9 @@ 
 		loadLanguage('index', $lang);
 		loadLanguage('EmailTemplates', $lang);
 		$langtxt[$lang] = array(
-			'subject' => $txt['digest_subject_' . ($is_weekly ? 'weekly' : 'daily')],
+			'subject' => $txt['digest_subject_'.($is_weekly ? 'weekly' : 'daily')],
 			'char_set' => $txt['lang_character_set'],
-			'intro' => sprintf($txt['digest_intro_' . ($is_weekly ? 'weekly' : 'daily')], $mbname),
+			'intro' => sprintf($txt['digest_intro_'.($is_weekly ? 'weekly' : 'daily')], $mbname),
 			'new_topics' => $txt['digest_new_topics'],
 			'topic_lines' => $txt['digest_new_topics_line'],
 			'new_replies' => $txt['digest_new_replies'],
@@ -640,7 +640,7 @@ 
 	}
 
 	// The preferred way...
-	require_once($sourcedir . '/Subs-Notify.php');
+	require_once($sourcedir.'/Subs-Notify.php');
 	$prefs = getNotifyPrefs(array_keys($members), array('msg_notify_type', 'msg_notify_pref'), true);
 
 	// Right - send out the silly things - this will take quite some space!
@@ -659,8 +659,8 @@ 
 
 		// Do the start stuff!
 		$email = array(
-			'subject' => $mbname . ' - ' . $langtxt[$lang]['subject'],
-			'body' => $member['name'] . ',' . "\n\n" . $langtxt[$lang]['intro'] . "\n" . $scripturl . '?action=profile;area=notification;u=' . $member['id'] . "\n",
+			'subject' => $mbname.' - '.$langtxt[$lang]['subject'],
+			'body' => $member['name'].','."\n\n".$langtxt[$lang]['intro']."\n".$scripturl.'?action=profile;area=notification;u='.$member['id']."\n",
 			'email' => $member['email'],
 		);
 
@@ -674,10 +674,10 @@ 
 					{
 						if (!$titled)
 						{
-							$email['body'] .= "\n" . $langtxt[$lang]['new_topics'] . ':' . "\n" . '-----------------------------------------------';
+							$email['body'] .= "\n".$langtxt[$lang]['new_topics'].':'."\n".'-----------------------------------------------';
 							$titled = true;
 						}
-						$email['body'] .= "\n" . sprintf($langtxt[$lang]['topic_lines'], $topic['subject'], $board['name']);
+						$email['body'] .= "\n".sprintf($langtxt[$lang]['topic_lines'], $topic['subject'], $board['name']);
 					}
 			if ($titled)
 				$email['body'] .= "\n";
@@ -693,10 +693,10 @@ 
 					{
 						if (!$titled)
 						{
-							$email['body'] .= "\n" . $langtxt[$lang]['new_replies'] . ':' . "\n" . '-----------------------------------------------';
+							$email['body'] .= "\n".$langtxt[$lang]['new_replies'].':'."\n".'-----------------------------------------------';
 							$titled = true;
 						}
-						$email['body'] .= "\n" . ($topic['count'] == 1 ? sprintf($langtxt[$lang]['replies_one'], $topic['subject']) : sprintf($langtxt[$lang]['replies_many'], $topic['count'], $topic['subject']));
+						$email['body'] .= "\n".($topic['count'] == 1 ? sprintf($langtxt[$lang]['replies_one'], $topic['subject']) : sprintf($langtxt[$lang]['replies_many'], $topic['count'], $topic['subject']));
 					}
 
 			if ($titled)
@@ -718,10 +718,10 @@ 
 						{
 							if (!$titled)
 							{
-								$email['body'] .= "\n" . $langtxt[$lang]['mod_actions'] . ':' . "\n" . '-----------------------------------------------';
+								$email['body'] .= "\n".$langtxt[$lang]['mod_actions'].':'."\n".'-----------------------------------------------';
 								$titled = true;
 							}
-							$email['body'] .= "\n" . sprintf($langtxt[$lang][$note_type], $topic['subject']);
+							$email['body'] .= "\n".sprintf($langtxt[$lang][$note_type], $topic['subject']);
 						}
 			}
 		}
@@ -729,7 +729,7 @@ 
 			$email['body'] .= "\n";
 
 		// Then just say our goodbyes!
-		$email['body'] .= "\n\n" . $txt['regards_team'];
+		$email['body'] .= "\n\n".$txt['regards_team'];
 
 		// Send it - low priority!
 		sendmail($email['email'], $email['subject'], $email['body'], null, 'digest', false, 4);
@@ -873,7 +873,7 @@ 
 			return false;
 
 		// Reflect that we're about to send some, do it now to be safe.
-		updateSettings(array('mail_recent' => $mt . '|' . $mn));
+		updateSettings(array('mail_recent' => $mt.'|'.$mn));
 	}
 
 	// Now we know how many we're sending, let's send them.
@@ -934,7 +934,7 @@ 
 		return false;
 
 	if (!empty($modSettings['mail_type']) && $modSettings['smtp_host'] != '')
-		require_once($sourcedir . '/Subs-Post.php');
+		require_once($sourcedir.'/Subs-Post.php');
 
 	// Send each email, yea!
 	$failed_emails = array();
@@ -1174,7 +1174,7 @@ 
 
 		// Is this the default theme?
 		if (in_array($row['variable'], array('theme_dir', 'theme_url', 'images_url')) && $row['id_theme'] == '1')
-			$settings['default_' . $row['variable']] = $row['value'];
+			$settings['default_'.$row['variable']] = $row['value'];
 	}
 	$smcFunc['db_free_result']($result);
 
@@ -1198,8 +1198,8 @@ 
 	// Check loadLanguage actually exists!
 	if (!function_exists('loadLanguage'))
 	{
-		require_once($sourcedir . '/Load.php');
-		require_once($sourcedir . '/Subs.php');
+		require_once($sourcedir.'/Load.php');
+		require_once($sourcedir.'/Subs.php');
 	}
 
 	loadLanguage('index+Modifications');
@@ -1249,7 +1249,7 @@ 
 	{
 		// Create the url
 		$server = empty($file['path']) || (substr($file['path'], 0, 7) != 'http://' && substr($file['path'], 0, 8) != 'https://') ? 'https://www.simplemachines.org' : '';
-		$url = $server . (!empty($file['path']) ? $file['path'] : $file['path']) . $file['filename'] . (!empty($file['parameters']) ? '?' . $file['parameters'] : '');
+		$url = $server.(!empty($file['path']) ? $file['path'] : $file['path']).$file['filename'].(!empty($file['parameters']) ? '?'.$file['parameters'] : '');
 
 		// Get the file
 		$file_data = fetch_web_data($url);
@@ -1515,7 +1515,7 @@ 
 	);
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		require_once($sourcedir . '/ManagePaid.php');
+		require_once($sourcedir.'/ManagePaid.php');
 		removeSubscription($row['id_subscribe'], $row['id_member']);
 	}
 	$smcFunc['db_free_result']($request);
@@ -1544,7 +1544,7 @@ 
 		// If this is the first one load the important bits.
 		if (empty($subs_reminded))
 		{
-			require_once($sourcedir . '/Subs-Post.php');
+			require_once($sourcedir.'/Subs-Post.php');
 			// Need the below for loadLanguage to work!
 			loadEssentialThemeData();
 		}
@@ -1555,13 +1555,13 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Load alert preferences
-	require_once($sourcedir . '/Subs-Notify.php');
+	require_once($sourcedir.'/Subs-Notify.php');
 	$notifyPrefs = getNotifyPrefs(array_keys($members), 'paidsubs_expiring', true);
 	$alert_rows = array();
 	foreach ($members as $row)
 	{
 		$replacements = array(
-			'PROFILE_LINK' => $scripturl . '?action=profile;area=subscriptions;u=' . $row['id_member'],
+			'PROFILE_LINK' => $scripturl.'?action=profile;area=subscriptions;u='.$row['id_member'],
 			'REALNAME' => $row['member_name'],
 			'SUBSCRIPTION' => $row['name'],
 			'END_DATE' => strip_tags(timeformat($row['end_time'])),
@@ -1647,8 +1647,8 @@ 
 		{
 			loadEssentialThemeData();
 			loadLanguage('Post');
-			$context['scheduled_errors']['remove_temp_attachments'][] = $txt['cant_access_upload_path'] . ' (' . $attach_dir . ')';
-			log_error($txt['cant_access_upload_path'] . ' (' . $attach_dir . ')', 'critical');
+			$context['scheduled_errors']['remove_temp_attachments'][] = $txt['cant_access_upload_path'].' ('.$attach_dir.')';
+			log_error($txt['cant_access_upload_path'].' ('.$attach_dir.')', 'critical');
 			return false;
 		}
 
@@ -1660,8 +1660,8 @@ 
 			if (strpos($file, 'post_tmp_') !== false)
 			{
 				// Temp file is more than 5 hours old!
-				if (filemtime($attach_dir . '/' . $file) < time() - 18000)
-					@unlink($attach_dir . '/' . $file);
+				if (filemtime($attach_dir.'/'.$file) < time() - 18000)
+					@unlink($attach_dir.'/'.$file);
 			}
 		}
 		closedir($dir);
@@ -1701,7 +1701,7 @@ 
 	// Zap, your gone
 	if (count($topics) > 0)
 	{
-		require_once($sourcedir . '/RemoveTopic.php');
+		require_once($sourcedir.'/RemoveTopic.php');
 		removeTopics($topics, false, true);
 	}
 
@@ -1741,7 +1741,7 @@ 
 	// If we have old one, remove them
 	if (count($drafts) > 0)
 	{
-		require_once($sourcedir . '/Drafts.php');
+		require_once($sourcedir.'/Drafts.php');
 		DeleteDraft($drafts, false);
 	}
 

Sources/Subs-Admin.php

Doc Comments +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 
 /**
  * Get a list of versions that are currently installed on the server.
- * @param array $checkFor An array of what to check versions for - can contain one or more of 'gd', 'imagemagick', 'db_server', 'phpa', 'memcache', 'xcache', 'apc', 'php' or 'server'
+ * @param string[] $checkFor An array of what to check versions for - can contain one or more of 'gd', 'imagemagick', 'db_server', 'phpa', 'memcache', 'xcache', 'apc', 'php' or 'server'
  * @return array An array of versions (keys are same as what was in $checkFor, values are the versions)
  */
 function getServerVersions($checkFor)

Spacing +45 added lines, -45 removed lines

@@ -44,17 +44,17 @@ 
 			$temp = New Imagick;
 			$temp2 = $temp->getVersion();
 			$im_version = $temp2['versionString'];
-			$extension_version = 'Imagick ' . phpversion('Imagick');
+			$extension_version = 'Imagick '.phpversion('Imagick');
 		}
 		else
 		{
 			$im_version = MagickGetVersionString();
-			$extension_version = 'MagickWand ' . phpversion('MagickWand');
+			$extension_version = 'MagickWand '.phpversion('MagickWand');
 		}
 
 		// We already know it's ImageMagick and the website isn't needed...
 		$im_version = str_replace(array('ImageMagick ', ' https://www.imagemagick.org'), '', $im_version);
-		$versions['imagemagick'] = array('title' => $txt['support_versions_imagemagick'], 'version' => $im_version . ' (' . $extension_version . ')');
+		$versions['imagemagick'] = array('title' => $txt['support_versions_imagemagick'], 'version' => $im_version.' ('.$extension_version.')');
 	}
 
 	// Now lets check for the Database.
@@ -114,7 +114,7 @@ 
 	global $boarddir, $sourcedir, $settings, $tasksdir;
 
 	// Default place to find the languages would be the default theme dir.
-	$lang_dir = $settings['default_theme_dir'] . '/languages';
+	$lang_dir = $settings['default_theme_dir'].'/languages';
 
 	$version_info = array(
 		'file_versions' => array(),
@@ -125,9 +125,9 @@ 
 	);
 
 	// Find the version in SSI.php's file header.
-	if (!empty($versionOptions['include_ssi']) && file_exists($boarddir . '/SSI.php'))
+	if (!empty($versionOptions['include_ssi']) && file_exists($boarddir.'/SSI.php'))
 	{
-		$fp = fopen($boarddir . '/SSI.php', 'rb');
+		$fp = fopen($boarddir.'/SSI.php', 'rb');
 		$header = fread($fp, 4096);
 		fclose($fp);
 
@@ -140,9 +140,9 @@ 
 	}
 
 	// Do the paid subscriptions handler?
-	if (!empty($versionOptions['include_subscriptions']) && file_exists($boarddir . '/subscriptions.php'))
+	if (!empty($versionOptions['include_subscriptions']) && file_exists($boarddir.'/subscriptions.php'))
 	{
-		$fp = fopen($boarddir . '/subscriptions.php', 'rb');
+		$fp = fopen($boarddir.'/subscriptions.php', 'rb');
 		$header = fread($fp, 4096);
 		fclose($fp);
 
@@ -158,10 +158,10 @@ 
 	$sources_dir = dir($sourcedir);
 	while ($entry = $sources_dir->read())
 	{
-		if (substr($entry, -4) === '.php' && !is_dir($sourcedir . '/' . $entry) && $entry !== 'index.php')
+		if (substr($entry, -4) === '.php' && !is_dir($sourcedir.'/'.$entry) && $entry !== 'index.php')
 		{
 			// Read the first 4k from the file.... enough for the header.
-			$fp = fopen($sourcedir . '/' . $entry, 'rb');
+			$fp = fopen($sourcedir.'/'.$entry, 'rb');
 			$header = fread($fp, 4096);
 			fclose($fp);
 
@@ -181,10 +181,10 @@ 
 		$tasks_dir = dir($tasksdir);
 		while ($entry = $tasks_dir->read())
 		{
-			if (substr($entry, -4) === '.php' && !is_dir($tasksdir . '/' . $entry) && $entry !== 'index.php')
+			if (substr($entry, -4) === '.php' && !is_dir($tasksdir.'/'.$entry) && $entry !== 'index.php')
 			{
 				// Read the first 4k from the file.... enough for the header.
-				$fp = fopen($tasksdir . '/' . $entry, 'rb');
+				$fp = fopen($tasksdir.'/'.$entry, 'rb');
 				$header = fread($fp, 4096);
 				fclose($fp);
 
@@ -209,10 +209,10 @@ 
 		$this_dir = dir($dirname);
 		while ($entry = $this_dir->read())
 		{
-			if (substr($entry, -12) == 'template.php' && !is_dir($dirname . '/' . $entry))
+			if (substr($entry, -12) == 'template.php' && !is_dir($dirname.'/'.$entry))
 			{
 				// Read the first 768 bytes from the file.... enough for the header.
-				$fp = fopen($dirname . '/' . $entry, 'rb');
+				$fp = fopen($dirname.'/'.$entry, 'rb');
 				$header = fread($fp, 768);
 				fclose($fp);
 
@@ -231,10 +231,10 @@ 
 	$this_dir = dir($lang_dir);
 	while ($entry = $this_dir->read())
 	{
-		if (substr($entry, -4) == '.php' && $entry != 'index.php' && !is_dir($lang_dir . '/' . $entry))
+		if (substr($entry, -4) == '.php' && $entry != 'index.php' && !is_dir($lang_dir.'/'.$entry))
 		{
 			// Read the first 768 bytes from the file.... enough for the header.
-			$fp = fopen($lang_dir . '/' . $entry, 'rb');
+			$fp = fopen($lang_dir.'/'.$entry, 'rb');
 			$header = fread($fp, 768);
 			fclose($fp);
 
@@ -242,7 +242,7 @@ 
 			list ($name, $language) = explode('.', $entry);
 
 			// Look for the version comment in the file header.
-			if (preg_match('~(?://|/\*)\s*Version:\s+(.+?);\s*' . preg_quote($name, '~') . '(?:[\s]{2}|\*/)~i', $header, $match) == 1)
+			if (preg_match('~(?://|/\*)\s*Version:\s+(.+?);\s*'.preg_quote($name, '~').'(?:[\s]{2}|\*/)~i', $header, $match) == 1)
 				$version_info['default_language_versions'][$language][$name] = $match[1];
 			// It wasn't found, but the file was... show a '??'.
 			else
@@ -298,10 +298,10 @@ 
 	}
 
 	// When was Settings.php last changed?
-	$last_settings_change = filemtime($boarddir . '/Settings.php');
+	$last_settings_change = filemtime($boarddir.'/Settings.php');
 
 	// Load the settings file.
-	$settingsArray = trim(file_get_contents($boarddir . '/Settings.php'));
+	$settingsArray = trim(file_get_contents($boarddir.'/Settings.php'));
 
 	// Break it up based on \r or \n, and then clean out extra characters.
 	if (strpos($settingsArray, "\n") !== false)
@@ -317,7 +317,7 @@ 
 
 	// remove any /r's that made there way in here
 	foreach ($settingsArray as $k => $dummy)
-		$settingsArray[$k] = strtr($dummy, array("\r" => '')) . "\n";
+		$settingsArray[$k] = strtr($dummy, array("\r" => ''))."\n";
 
 	// go line by line and see whats changing
 	for ($i = 0, $n = count($settingsArray); $i < $n; $i++)
@@ -326,7 +326,7 @@ 
 		if (substr($settingsArray[$i], 0, 1) != '$')
 			continue;
 
-		$settingsArray[$i] = trim($settingsArray[$i]) . "\n";
+		$settingsArray[$i] = trim($settingsArray[$i])."\n";
 
 		// Look through the variables to set....
 		foreach ($config_vars as $var => $val)
@@ -337,10 +337,10 @@ 
 				updateDbLastError($val);
 				unset($config_vars[$var]);
 			}
-			elseif (strncasecmp($settingsArray[$i], '$' . $var, 1 + strlen($var)) == 0)
+			elseif (strncasecmp($settingsArray[$i], '$'.$var, 1 + strlen($var)) == 0)
 			{
 				$comment = strstr(substr($settingsArray[$i], strpos($settingsArray[$i], ';')), '#');
-				$settingsArray[$i] = '$' . $var . ' = ' . $val . ';' . ($comment == '' ? '' : "\t\t" . rtrim($comment)) . "\n";
+				$settingsArray[$i] = '$'.$var.' = '.$val.';'.($comment == '' ? '' : "\t\t".rtrim($comment))."\n";
 
 				// This one's been 'used', so to speak.
 				unset($config_vars[$var]);
@@ -348,7 +348,7 @@ 
 		}
 
 		// End of the file ... maybe
-		if (substr(trim($settingsArray[$i]), 0, 2) == '?' . '>')
+		if (substr(trim($settingsArray[$i]), 0, 2) == '?'.'>')
 			$end = $i;
 	}
 
@@ -359,16 +359,16 @@ 
 	// Still more variables to go?  Then lets add them at the end.
 	if (!empty($config_vars))
 	{
-		if (trim($settingsArray[$end]) == '?' . '>')
+		if (trim($settingsArray[$end]) == '?'.'>')
 			$settingsArray[$end++] = '';
 		else
 			$end++;
 
 		// Add in any newly defined vars that were passed
 		foreach ($config_vars as $var => $val)
-			$settingsArray[$end++] = '$' . $var . ' = ' . $val . ';' . "\n";
+			$settingsArray[$end++] = '$'.$var.' = '.$val.';'."\n";
 
-		$settingsArray[$end] = '?' . '>';
+		$settingsArray[$end] = '?'.'>';
 	}
 	else
 		$settingsArray[$end] = trim($settingsArray[$end]);
@@ -383,15 +383,15 @@ 
 	//
 	// Check before you act: if cache is enabled, we can do a simple write test
 	// to validate that we even write things on this filesystem.
-	if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir . '/cache'))
-		$cachedir = $boarddir . '/cache';
+	if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir.'/cache'))
+		$cachedir = $boarddir.'/cache';
 
-	$test_fp = @fopen($cachedir . '/settings_update.tmp', "w+");
+	$test_fp = @fopen($cachedir.'/settings_update.tmp', "w+");
 	if ($test_fp)
 	{
 		fclose($test_fp);
-		$written_bytes = file_put_contents($cachedir . '/settings_update.tmp', 'test', LOCK_EX);
-		@unlink($cachedir . '/settings_update.tmp');
+		$written_bytes = file_put_contents($cachedir.'/settings_update.tmp', 'test', LOCK_EX);
+		@unlink($cachedir.'/settings_update.tmp');
 
 		if ($written_bytes !== 4)
 		{
@@ -403,15 +403,15 @@ 
 
 	// Protect me from what I want! :P
 	clearstatcache();
-	if (filemtime($boarddir . '/Settings.php') === $last_settings_change)
+	if (filemtime($boarddir.'/Settings.php') === $last_settings_change)
 	{
 		// save the old before we do anything
-		$settings_backup_fail = !@is_writable($boarddir . '/Settings_bak.php') || !@copy($boarddir . '/Settings.php', $boarddir . '/Settings_bak.php');
-		$settings_backup_fail = !$settings_backup_fail ? (!file_exists($boarddir . '/Settings_bak.php') || filesize($boarddir . '/Settings_bak.php') === 0) : $settings_backup_fail;
+		$settings_backup_fail = !@is_writable($boarddir.'/Settings_bak.php') || !@copy($boarddir.'/Settings.php', $boarddir.'/Settings_bak.php');
+		$settings_backup_fail = !$settings_backup_fail ? (!file_exists($boarddir.'/Settings_bak.php') || filesize($boarddir.'/Settings_bak.php') === 0) : $settings_backup_fail;
 
 		// write out the new
 		$write_settings = implode('', $settingsArray);
-		$written_bytes = file_put_contents($boarddir . '/Settings.php', $write_settings, LOCK_EX);
+		$written_bytes = file_put_contents($boarddir.'/Settings.php', $write_settings, LOCK_EX);
 
 		// survey says ...
 		if ($written_bytes !== strlen($write_settings) && !$settings_backup_fail)
@@ -419,15 +419,15 @@ 
 			// Well this is not good at all, lets see if we can save this
 			$context['settings_message'] = 'settings_error';
 
-			if (file_exists($boarddir . '/Settings_bak.php'))
-				@copy($boarddir . '/Settings_bak.php', $boarddir . '/Settings.php');
+			if (file_exists($boarddir.'/Settings_bak.php'))
+				@copy($boarddir.'/Settings_bak.php', $boarddir.'/Settings.php');
 		}
 	}
 
 	// Even though on normal installations the filemtime should prevent this being used by the installer incorrectly
 	// it seems that there are times it might not. So let's MAKE it dump the cache.
 	if (function_exists('opcache_invalidate'))
-		opcache_invalidate($boarddir . '/Settings.php', true);
+		opcache_invalidate($boarddir.'/Settings.php', true);
 }
 
 /**
@@ -443,8 +443,8 @@ 
 	global $boarddir, $cachedir;
 
 	// Write out the db_last_error file with the error timestamp
-	file_put_contents($cachedir . '/db_last_error.php', '<' . '?' . "php\n" . '$db_last_error = ' . $time . ';' . "\n" . '?' . '>', LOCK_EX);
-	@touch($boarddir . '/' . 'Settings.php');
+	file_put_contents($cachedir.'/db_last_error.php', '<'.'?'."php\n".'$db_last_error = '.$time.';'."\n".'?'.'>', LOCK_EX);
+	@touch($boarddir.'/'.'Settings.php');
 }
 /**
  * Saves the admin's current preferences to the database.
@@ -480,7 +480,7 @@ 
 	);
 
 	// Make sure we invalidate any cache.
-	cache_put_data('theme_settings-' . $settings['theme_id'] . ':' . $user_info['id'], null, 0);
+	cache_put_data('theme_settings-'.$settings['theme_id'].':'.$user_info['id'], null, 0);
 }
 
 /**
@@ -498,14 +498,14 @@ 
 	global $smcFunc, $sourcedir, $language, $modSettings;
 
 	// We certainly want this.
-	require_once($sourcedir . '/Subs-Post.php');
+	require_once($sourcedir.'/Subs-Post.php');
 
 	// Load all members which are effectively admins.
-	require_once($sourcedir . '/Subs-Members.php');
+	require_once($sourcedir.'/Subs-Members.php');
 	$members = membersAllowedTo('admin_forum');
 
 	// Load their alert preferences
-	require_once($sourcedir . '/Subs-Notify.php');
+	require_once($sourcedir.'/Subs-Notify.php');
 	$prefs = getNotifyPrefs($members, 'announcements', true);
 
 	$request = $smcFunc['db_query']('', '

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 	{
 		if (class_exists('Imagick'))
 		{
-			$temp = New Imagick;
+			$temp = new Imagick;
 			$temp2 = $temp->getVersion();
 			$im_version = $temp2['versionString'];
 			$extension_version = 'Imagick ' . phpversion('Imagick');

Sources/Subs-Graphics.php

Doc Comments +1 added lines, -1 removed lines

@@ -170,7 +170,7 @@
  *
  * @param string $fileName The path to the file
  * @param int $preferred_format The preferred format - 0 to automatically determine, 1 for gif, 2 for jpg, 3 for png, 6 for bmp and 15 for wbmp
- * @return boolean Whether the reencoding was successful
+ * @return false|null Whether the reencoding was successful
  */
 function reencodeImage($fileName, $preferred_format = 0)
 {

Indentation -2 removed lines

@@ -523,7 +523,6 @@ 
 /**
  * Copy image.
  * Used when imagecopyresample() is not available.
-
  * @param resource $dst_img The destination image - a GD image resource
  * @param resource $src_img The source image - a GD image resource
  * @param int $dst_x The "x" coordinate of the destination image
@@ -754,7 +753,6 @@ 
 
 /**
  * Writes a gif file to disk as a png file.
-
  * @param resource $gif A gif image resource
  * @param string $lpszFileName The name of the file
  * @param int $background_color The background color

Spacing +27 added lines, -27 removed lines

@@ -41,13 +41,13 @@ 
 	global $modSettings, $sourcedir, $smcFunc;
 
 	$ext = !empty($modSettings['avatar_download_png']) ? 'png' : 'jpeg';
-	$destName = 'avatar_' . $memID . '_' . time() . '.' . $ext;
+	$destName = 'avatar_'.$memID.'_'.time().'.'.$ext;
 
 	// Just making sure there is a non-zero member.
 	if (empty($memID))
 		return false;
 
-	require_once($sourcedir . '/ManageAttachments.php');
+	require_once($sourcedir.'/ManageAttachments.php');
 	removeAttachments(array('id_member' => $memID));
 
 	$id_folder = 1;
@@ -73,7 +73,7 @@ 
 		'type' => 1,
 	);
 
-	$destName = $modSettings['custom_avatar_dir'] . '/' . $destName . '.tmp';
+	$destName = $modSettings['custom_avatar_dir'].'/'.$destName.'.tmp';
 
 	// Resize it.
 	if (!empty($modSettings['avatar_download_png']))
@@ -87,11 +87,11 @@ 
 	if ($success)
 	{
 		// Remove the .tmp extension from the attachment.
-		if (rename($destName . '.tmp', empty($avatar_hash) ? $destName : $path . '/' . $attachID . '_' . $avatar_hash . '.dat'))
+		if (rename($destName.'.tmp', empty($avatar_hash) ? $destName : $path.'/'.$attachID.'_'.$avatar_hash.'.dat'))
 		{
-			$destName = empty($avatar_hash) ? $destName : $path . '/' . $attachID . '_' . $avatar_hash . '.dat';
+			$destName = empty($avatar_hash) ? $destName : $path.'/'.$attachID.'_'.$avatar_hash.'.dat';
 			list ($width, $height) = getimagesize($destName);
-			$mime_type = 'image/' . $ext;
+			$mime_type = 'image/'.$ext;
 
 			// Write filesize in the database.
 			$smcFunc['db_query']('', '
@@ -122,7 +122,7 @@ 
 			)
 		);
 
-		@unlink($destName . '.tmp');
+		@unlink($destName.'.tmp');
 		return false;
 	}
 }
@@ -141,7 +141,7 @@ 
 {
 	global $modSettings;
 
-	$destName = $source . '_thumb.tmp';
+	$destName = $source.'_thumb.tmp';
 
 	// Do the actual resize.
 	if (!empty($modSettings['attachment_thumb_png']))
@@ -152,11 +152,11 @@ 
 	// Okay, we're done with the temporary stuff.
 	$destName = substr($destName, 0, -4);
 
-	if ($success && @rename($destName . '.tmp', $destName))
+	if ($success && @rename($destName.'.tmp', $destName))
 		return true;
 	else
 	{
-		@unlink($destName . '.tmp');
+		@unlink($destName.'.tmp');
 		@touch($destName);
 		return false;
 	}
@@ -174,10 +174,10 @@ 
  */
 function reencodeImage($fileName, $preferred_format = 0)
 {
-	if (!resizeImageFile($fileName, $fileName . '.tmp', null, null, $preferred_format))
+	if (!resizeImageFile($fileName, $fileName.'.tmp', null, null, $preferred_format))
 	{
-		if (file_exists($fileName . '.tmp'))
-			unlink($fileName . '.tmp');
+		if (file_exists($fileName.'.tmp'))
+			unlink($fileName.'.tmp');
 
 		return false;
 	}
@@ -185,7 +185,7 @@ 
 	if (!unlink($fileName))
 		return false;
 
-	if (!rename($fileName . '.tmp', $fileName))
+	if (!rename($fileName.'.tmp', $fileName))
 		return false;
 }
 
@@ -213,7 +213,7 @@ 
 		{
 			// Paranoid check.  Use this if you have reason to distrust your host's security config.
 			// Will result in MANY false positives, and is not suitable for photography sites.
-			if (preg_match('~(iframe|\\<\\?|\\<%|html|eval|body|script\W|(?-i)[CFZ]WS[\x01-\x0E])~i', $prev_chunk . $cur_chunk) === 1)
+			if (preg_match('~(iframe|\\<\\?|\\<%|html|eval|body|script\W|(?-i)[CFZ]WS[\x01-\x0E])~i', $prev_chunk.$cur_chunk) === 1)
 			{
 				fclose($fp);
 				return false;
@@ -223,7 +223,7 @@ 
 		{
 			// Check for potential infection - focus on clues for inline php & flash.
 			// Will result in significantly fewer false positives than the paranoid check.
-			if (preg_match('~(\\<\\?php\s|(?-i)[CFZ]WS[\x01-\x0E])~i', $prev_chunk . $cur_chunk) === 1)
+			if (preg_match('~(\\<\\?php\s|(?-i)[CFZ]WS[\x01-\x0E])~i', $prev_chunk.$cur_chunk) === 1)
 			{
 				fclose($fp);
 				return false;
@@ -372,9 +372,9 @@ 
 	{
 		return resizeImage(null, $destination, null, null, $max_width, $max_height, true, $preferred_format);
 	}
-	elseif (checkGD() && isset($default_formats[$sizes[2]]) && function_exists('imagecreatefrom' . $default_formats[$sizes[2]]))
+	elseif (checkGD() && isset($default_formats[$sizes[2]]) && function_exists('imagecreatefrom'.$default_formats[$sizes[2]]))
 	{
-		$imagecreatefrom = 'imagecreatefrom' . $default_formats[$sizes[2]];
+		$imagecreatefrom = 'imagecreatefrom'.$default_formats[$sizes[2]];
 		if ($src_img = @$imagecreatefrom($destination))
 		{
 			return resizeImage($src_img, $destination, imagesx($src_img), imagesy($src_img), $max_width === null ? imagesx($src_img) : $max_width, $max_height === null ? imagesy($src_img) : $max_height, true, $preferred_format);
@@ -853,11 +853,11 @@ 
 			$foreground_color = $settings['verification_foreground'];
 	}
 
-	if (!is_dir($settings['default_theme_dir'] . '/fonts'))
+	if (!is_dir($settings['default_theme_dir'].'/fonts'))
 		return false;
 
 	// Get a list of the available fonts.
-	$font_dir = dir($settings['default_theme_dir'] . '/fonts');
+	$font_dir = dir($settings['default_theme_dir'].'/fonts');
 	$font_list = array();
 	$ttfont_list = array();
 	$endian = unpack('v', pack('S', 0x00FF)) === 0x00FF;
@@ -901,7 +901,7 @@ 
 
 	// Load all fonts and determine the maximum font height.
 	foreach ($loaded_fonts as $font_index => $dummy)
-		$loaded_fonts[$font_index] = imageloadfont($settings['default_theme_dir'] . '/fonts/' . $font_list[$font_index]);
+		$loaded_fonts[$font_index] = imageloadfont($settings['default_theme_dir'].'/fonts/'.$font_list[$font_index]);
 
 	// Determine the dimensions of each character.
 	if ($imageType == 4 || $imageType == 5)
@@ -1004,7 +1004,7 @@ 
 
 				// What font face?
 				if (!empty($ttfont_list))
-					$fontface = $settings['default_theme_dir'] . '/fonts/' . $ttfont_list[mt_rand(0, count($ttfont_list) - 1)];
+					$fontface = $settings['default_theme_dir'].'/fonts/'.$ttfont_list[mt_rand(0, count($ttfont_list) - 1)];
 
 				// What color are we to do it in?
 				$is_reverse = $showReverseChars ? mt_rand(0, 1) : false;
@@ -1132,14 +1132,14 @@ 
 {
 	global $settings;
 
-	if (!is_dir($settings['default_theme_dir'] . '/fonts'))
+	if (!is_dir($settings['default_theme_dir'].'/fonts'))
 		return false;
 
 	// Get a list of the available font directories.
-	$font_dir = dir($settings['default_theme_dir'] . '/fonts');
+	$font_dir = dir($settings['default_theme_dir'].'/fonts');
 	$font_list = array();
 	while ($entry = $font_dir->read())
-		if ($entry[0] !== '.' && is_dir($settings['default_theme_dir'] . '/fonts/' . $entry) && file_exists($settings['default_theme_dir'] . '/fonts/' . $entry . '.gdf'))
+		if ($entry[0] !== '.' && is_dir($settings['default_theme_dir'].'/fonts/'.$entry) && file_exists($settings['default_theme_dir'].'/fonts/'.$entry.'.gdf'))
 			$font_list[] = $entry;
 
 	if (empty($font_list))
@@ -1149,12 +1149,12 @@ 
 	$random_font = $font_list[array_rand($font_list)];
 
 	// Check if the given letter exists.
-	if (!file_exists($settings['default_theme_dir'] . '/fonts/' . $random_font . '/' . $letter . '.png'))
+	if (!file_exists($settings['default_theme_dir'].'/fonts/'.$random_font.'/'.$letter.'.png'))
 		return false;
 
 	// Include it!
 	header('content-type: image/png');
-	include($settings['default_theme_dir'] . '/fonts/' . $random_font . '/' . $letter . '.png');
+	include($settings['default_theme_dir'].'/fonts/'.$random_font.'/'.$letter.'.png');
 
 	// Nothing more to come.
 	die();

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -419,7 +419,7 @@
 
 		if (checkImagick())
 		{
-			$imagick = New Imagick($destName);
+			$imagick = new Imagick($destName);
 			$src_width = empty($src_width) ? $imagick->getImageWidth() : $src_width;
 			$src_height = empty($src_height) ? $imagick->getImageHeight() : $src_height;
 			$dest_width = empty($max_width) ? $src_width : $max_width;

Sources/Subs-Membergroups.php

Doc Comments +1 added lines

@@ -243,6 +243,7 @@
  * @param null|array The groups to remove the member(s) from. If null, the specified members are stripped from all their membergroups.
  * @param bool $permissionCheckDone Whether we've already checked permissions prior to calling this function
  * @param bool $ignoreProtected Whether to ignore protected groups
+ * @param integer $groups
  * @return bool Whether the operation was successful
  */
 function removeMembersFromGroups($members, $groups = null, $permissionCheckDone = false, $ignoreProtected = false)

Spacing +12 added lines, -12 removed lines

@@ -439,7 +439,7 @@ 
 	// Do the log.
 	if (!empty($log_inserts) && !empty($modSettings['modlog_enabled']))
 	{
-		require_once($sourcedir . '/Logging.php');
+		require_once($sourcedir.'/Logging.php');
 		foreach ($log_inserts as $extra)
 			logAction('removed_from_group', $extra, 'admin');
 	}
@@ -555,7 +555,7 @@ 
 				'member_list' => $members,
 				'id_group' => $group,
 				'id_group_string' => (string) $group,
-				'id_group_string_extend' => ',' . $group,
+				'id_group_string_extend' => ','.$group,
 				'blank_string' => '',
 			)
 		);
@@ -589,12 +589,12 @@ 
 				'id_group' => $group,
 				'blank_string' => '',
 				'id_group_string' => (string) $group,
-				'id_group_string_extend' => ',' . $group,
+				'id_group_string_extend' => ','.$group,
 			)
 		);
 	// Ack!!?  What happened?
 	else
-		trigger_error('addMembersToGroup(): Unknown type \'' . $type . '\'', E_USER_WARNING);
+		trigger_error('addMembersToGroup(): Unknown type \''.$type.'\'', E_USER_WARNING);
 
 	call_integration_hook('integrate_add_members_to_group', array($members, $group, &$group_names));
 
@@ -602,7 +602,7 @@ 
 	updateStats('postgroups', $members);
 
 	// Log the data.
-	require_once($sourcedir . '/Logging.php');
+	require_once($sourcedir.'/Logging.php');
 	foreach ($members as $member)
 		logAction('added_to_group', array('group' => $group_names[$group], 'member_affected' => $member), 'admin');
 
@@ -633,7 +633,7 @@ 
 	);
 	$members = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$members[$row['id_member']] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+		$members[$row['id_member']] = '<a href="'.$scripturl.'?action=profile;u='.$row['id_member'].'">'.$row['real_name'].'</a>';
 	$smcFunc['db_free_result']($request);
 
 	// If there are more than $limit members, add a 'more' link.
@@ -670,13 +670,13 @@ 
 	);
 	$groupCache = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$groupCache[] = '<a href="' . $scripturl . '?action=groups;sa=members;group=' . $row['id_group'] . '" ' . ($row['online_color'] ? 'style="color: ' . $row['online_color'] . '"' : '') . '>' . $row['group_name'] . '</a>';
+		$groupCache[] = '<a href="'.$scripturl.'?action=groups;sa=members;group='.$row['id_group'].'" '.($row['online_color'] ? 'style="color: '.$row['online_color'].'"' : '').'>'.$row['group_name'].'</a>';
 	$smcFunc['db_free_result']($request);
 
 	return array(
 		'data' => $groupCache,
 		'expires' => time() + 3600,
-		'refresh_eval' => 'return $GLOBALS[\'modSettings\'][\'settings_updated\'] > ' . time() . ';',
+		'refresh_eval' => 'return $GLOBALS[\'modSettings\'][\'settings_updated\'] > '.time().';',
 	);
 }
 
@@ -699,11 +699,11 @@ 
 		FROM {db_prefix}membergroups AS mg
 			LEFT JOIN {db_prefix}group_moderators AS gm ON (gm.id_group = mg.id_group AND gm.id_member = {int:current_member})
 		WHERE mg.min_posts {raw:min_posts}' . (allowedTo('admin_forum') ? '' : '
-			AND mg.id_group != {int:mod_group}') . '
+			AND mg.id_group != {int:mod_group}').'
 		ORDER BY {raw:sort}',
 		array(
 			'current_member' => $user_info['id'],
-			'min_posts' => ($membergroup_type === 'post_count' ? '!= ' : '= ') . -1,
+			'min_posts' => ($membergroup_type === 'post_count' ? '!= ' : '= ').-1,
 			'mod_group' => 3,
 			'sort' => $sort,
 		)
@@ -730,7 +730,7 @@ 
 			'type' => $row['group_type'],
 			'num_members' => $row['num_members'],
 			'moderators' => array(),
-			'icons' => !empty($row['icons'][0]) && !empty($row['icons'][1]) ? str_repeat('<img src="' . $settings['images_url'] . '/membericons/' . $row['icons'][1] . '" alt="*">', $row['icons'][0]) : '',
+			'icons' => !empty($row['icons'][0]) && !empty($row['icons'][1]) ? str_repeat('<img src="'.$settings['images_url'].'/membericons/'.$row['icons'][1].'" alt="*">', $row['icons'][0]) : '',
 		);
 
 		$context['can_moderate'] |= $row['can_moderate'];
@@ -804,7 +804,7 @@ 
 			)
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($query))
-			$groups[$row['id_group']]['moderators'][] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+			$groups[$row['id_group']]['moderators'][] = '<a href="'.$scripturl.'?action=profile;u='.$row['id_member'].'">'.$row['real_name'].'</a>';
 		$smcFunc['db_free_result']($query);
 	}
 

Braces -1 removed lines

@@ -756,7 +756,6 @@
 				$groups[$row['id_group']]['num_members'] += $row['num_members'];
 			$smcFunc['db_free_result']($query);
 		}
-
 		else
 		{
 			$query = $smcFunc['db_query']('', '

Sources/Subs-Menu.php

Doc Comments +1 added lines, -1 removed lines

@@ -286,7 +286,7 @@
 /**
  * Delete a menu.
  * @param string $menu_id The ID of the menu to destroy or 'last' for the most recent one
- * @return bool|void False if the menu doesn't exist, nothing otherwise
+ * @return false|null False if the menu doesn't exist, nothing otherwise
  */
 function destroyMenu($menu_id = 'last')
 {

Spacing +22 added lines, -22 removed lines

@@ -57,15 +57,15 @@ 
 	$context['max_menu_id'] = isset($context['max_menu_id']) ? $context['max_menu_id'] + 1 : 1;
 
 	// This will be all the data for this menu - and we'll make a shortcut to it to aid readability here.
-	$context['menu_data_' . $context['max_menu_id']] = array();
-	$menu_context = &$context['menu_data_' . $context['max_menu_id']];
+	$context['menu_data_'.$context['max_menu_id']] = array();
+	$menu_context = &$context['menu_data_'.$context['max_menu_id']];
 
 	// What is the general action of this menu (i.e. $scripturl?action=XXXX.
 	$menu_context['current_action'] = isset($menuOptions['action']) ? $menuOptions['action'] : $context['current_action'];
 
 	// Allow extend *any* menu with a single hook
 	if (!empty($menu_context['current_action']))
-		call_integration_hook('integrate_' . $menu_context['current_action'] . '_areas', array(&$menuData));
+		call_integration_hook('integrate_'.$menu_context['current_action'].'_areas', array(&$menuData));
 
 	// What is the current area selected?
 	if (isset($menuOptions['current_area']) || isset($_GET['area']))
@@ -75,11 +75,11 @@ 
 	$menu_context['extra_parameters'] = '';
 	if (!empty($menuOptions['extra_url_parameters']))
 		foreach ($menuOptions['extra_url_parameters'] as $key => $value)
-			$menu_context['extra_parameters'] .= ';' . $key . '=' . $value;
+			$menu_context['extra_parameters'] .= ';'.$key.'='.$value;
 
 	// Only include the session ID in the URL if it's strictly necessary.
 	if (empty($menuOptions['disable_url_session_check']))
-		$menu_context['extra_parameters'] .= ';' . $context['session_var'] . '=' . $context['session_id'];
+		$menu_context['extra_parameters'] .= ';'.$context['session_var'].'='.$context['session_id'];
 
 	$include_data = array();
 
@@ -135,42 +135,42 @@ 
 						}
 						elseif (isset($area['icon']))
 						{
-							if (file_exists($settings['theme_dir'] . '/images/admin/' . $area['icon']))
+							if (file_exists($settings['theme_dir'].'/images/admin/'.$area['icon']))
 							{
-								$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<img src="' . $settings['images_url'] . '/admin/' . $area['icon'] . '" alt="">';
+								$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<img src="'.$settings['images_url'].'/admin/'.$area['icon'].'" alt="">';
 							}
-							elseif (file_exists($settings['default_theme_dir'] . '/images/admin/' . $area['icon']))
+							elseif (file_exists($settings['default_theme_dir'].'/images/admin/'.$area['icon']))
 							{
-								$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<img src="' . $settings['default_images_url'] . '/admin/' . $area['icon'] . '" alt="">';
+								$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<img src="'.$settings['default_images_url'].'/admin/'.$area['icon'].'" alt="">';
 							}
 							else
-								$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<span class="generic_icons ' . $area['icon'] . '"></span>';
+								$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<span class="generic_icons '.$area['icon'].'"></span>';
 						}
 						else
-							$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<span class="generic_icons ' . $area_id . '"></span>';
+							$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<span class="generic_icons '.$area_id.'"></span>';
 
 						if (isset($area['icon_class']) && empty($menu_context['sections'][$section_id]['areas'][$area_id]['icon']))
 						{
-							$menu_context['sections'][$section_id]['areas'][$area_id]['icon_class'] = $menu_context['current_action'] . '_menu_icon ' . $area['icon_class'];
+							$menu_context['sections'][$section_id]['areas'][$area_id]['icon_class'] = $menu_context['current_action'].'_menu_icon '.$area['icon_class'];
 						}
 						elseif (isset($area['icon']))
 						{
 							if (substr($area['icon'], -4) === '.png' || substr($area['icon'], -4) === '.gif')
 							{
-								if (file_exists($settings['theme_dir'] . '/images/admin/big/' . $area['icon']))
+								if (file_exists($settings['theme_dir'].'/images/admin/big/'.$area['icon']))
 								{
-									$menu_context['sections'][$section_id]['areas'][$area_id]['icon_file'] = $settings['theme_url'] . '/images/admin/big/' . $area['icon'];
+									$menu_context['sections'][$section_id]['areas'][$area_id]['icon_file'] = $settings['theme_url'].'/images/admin/big/'.$area['icon'];
 								}
-								elseif (file_exists($settings['default_theme_dir'] . '/images/admin/big/' . $area['icon']))
+								elseif (file_exists($settings['default_theme_dir'].'/images/admin/big/'.$area['icon']))
 								{
-									$menu_context['sections'][$section_id]['areas'][$area_id]['icon_file'] = $settings['default_theme_url'] . '/images/admin/big/' . $area['icon'];
+									$menu_context['sections'][$section_id]['areas'][$area_id]['icon_file'] = $settings['default_theme_url'].'/images/admin/big/'.$area['icon'];
 								}
 							}
 
-							$menu_context['sections'][$section_id]['areas'][$area_id]['icon_class'] = $menu_context['current_action'] . '_menu_icon ' . str_replace(array('.png', '.gif'), '', $area['icon']);
+							$menu_context['sections'][$section_id]['areas'][$area_id]['icon_class'] = $menu_context['current_action'].'_menu_icon '.str_replace(array('.png', '.gif'), '', $area['icon']);
 						}
 						else
-							$menu_context['sections'][$section_id]['areas'][$area_id]['icon_class'] = $menu_context['current_action'] . '_menu_icon ' . str_replace(array('.png', '.gif'), '', $area_id);
+							$menu_context['sections'][$section_id]['areas'][$area_id]['icon_class'] = $menu_context['current_action'].'_menu_icon '.str_replace(array('.png', '.gif'), '', $area_id);
 
 						// This is a shortcut for Font-Icon users so they don't have to re-do whole CSS.
 						$menu_context['sections'][$section_id]['areas'][$area_id]['plain_class'] = !empty($area['icon']) ? $area['icon'] : '';
@@ -260,7 +260,7 @@ 
 	}
 
 	// Should we use a custom base url, or use the default?
-	$menu_context['base_url'] = isset($menuOptions['base_url']) ? $menuOptions['base_url'] : $scripturl . '?action=' . $menu_context['current_action'];
+	$menu_context['base_url'] = isset($menuOptions['base_url']) ? $menuOptions['base_url'] : $scripturl.'?action='.$menu_context['current_action'];
 
 	// If we didn't find the area we were looking for go to a default one.
 	if (isset($backup_area) && empty($found_section))
@@ -279,7 +279,7 @@ 
 			{
 				if (!isset($menu_context['sections'][$section_id]['url']))
 				{
-					$menu_context['sections'][$section_id]['url'] = isset($area['url']) ? $area['url'] : $menu_context['base_url'] . ';area=' . $area_id;
+					$menu_context['sections'][$section_id]['url'] = isset($area['url']) ? $area['url'] : $menu_context['base_url'].';area='.$area_id;
 					break;
 				}
 			}
@@ -298,7 +298,7 @@ 
 
 	// Almost there - load the template and add to the template layers.
 	loadTemplate(isset($menuOptions['template_name']) ? $menuOptions['template_name'] : 'GenericMenu');
-	$menu_context['layer_name'] = (isset($menuOptions['layer_name']) ? $menuOptions['layer_name'] : 'generic_menu') . '_dropdown';
+	$menu_context['layer_name'] = (isset($menuOptions['layer_name']) ? $menuOptions['layer_name'] : 'generic_menu').'_dropdown';
 	$context['template_layers'][] = $menu_context['layer_name'];
 
 	// Check we had something - for sanity sake.
@@ -325,7 +325,7 @@ 
 {
 	global $context;
 
-	$menu_name = $menu_id == 'last' && isset($context['max_menu_id']) && isset($context['menu_data_' . $context['max_menu_id']]) ? 'menu_data_' . $context['max_menu_id'] : 'menu_data_' . $menu_id;
+	$menu_name = $menu_id == 'last' && isset($context['max_menu_id']) && isset($context['menu_data_'.$context['max_menu_id']]) ? 'menu_data_'.$context['max_menu_id'] : 'menu_data_'.$menu_id;
 	if (!isset($context[$menu_name]))
 		return false;
 

Sources/Subs-Post.php

Doc Comments +4 added lines, -4 removed lines

@@ -1451,7 +1451,7 @@ 
  * @param resource $socket Socket to send on
  * @param string $code The expected response code
  * @param string $response The response from the SMTP server
- * @return bool Whether it responded as such.
+ * @return string|boolean Whether it responded as such.
  */
 function server_parse($message, $socket, $code, &$response = null)
 {
@@ -2265,7 +2265,7 @@ 
  * @param array $msgs Array of message ids
  * @param bool $approve Whether to approve the posts (if false, posts are unapproved)
  * @param bool $notify Whether to notify users
- * @return bool Whether the operation was successful
+ * @return null|boolean Whether the operation was successful
  */
 function approvePosts($msgs, $approve = true, $notify = true)
 {
@@ -2518,7 +2518,7 @@ 
  *
  * @param array $topics Array of topic ids
  * @param bool $approve Whether to approve the topics. If false, unapproves them instead
- * @return bool Whether the operation was successful
+ * @return null|boolean Whether the operation was successful
  */
 function approveTopics($topics, $approve = true)
 {
@@ -2908,7 +2908,7 @@ 
  *
  * @param resource $dict An enchant or pspell dictionary resource set up by {@link spell_init()}
  * @param string $word A word to check the spelling of
- * @return bool Whether or not the specified word is spelled properly
+ * @return boolean|null Whether or not the specified word is spelled properly
  */
 function spell_check($dict, $word)
 {

Spacing +133 added lines, -133 removed lines

@@ -37,7 +37,7 @@ 
 	// Clean up after nobbc ;).
 	$message = preg_replace_callback('~\[nobbc\](.+?)\[/nobbc\]~is', function($a)
 	{
-		return '[nobbc]' . strtr($a[1], array('[' => '[', ']' => ']', ':' => ':', '@' => '@')) . '[/nobbc]';
+		return '[nobbc]'.strtr($a[1], array('[' => '[', ']' => ']', ':' => ':', '@' => '@')).'[/nobbc]';
 	}, $message);
 
 	// Remove \r's... they're evil!
@@ -83,7 +83,7 @@ 
 		$message .= '[/code]';
 	// Open any ones that need to be open, only if we've never had a tag.
 	if ($codeopen && !$had_tag)
-		$message = '[code]' . $message;
+		$message = '[code]'.$message;
 
 	// Replace code BBC with placeholders. We'll restore them at the end.
 	$parts = preg_split('~(\[/code\]|\[code(?:=[^\]]+)?\])~i', $message, -1, PREG_SPLIT_DELIM_CAPTURE);
@@ -92,8 +92,8 @@ 
 		// It goes 0 = outside, 1 = begin tag, 2 = inside, 3 = close tag, repeat.
 		if ($i % 4 == 2)
 		{
-			$code_tag = $parts[$i - 1] . $parts[$i] . $parts[$i + 1];
-			$substitute = $parts[$i - 1] . $i . $parts[$i + 1];
+			$code_tag = $parts[$i - 1].$parts[$i].$parts[$i + 1];
+			$substitute = $parts[$i - 1].$i.$parts[$i + 1];
 			$code_tags[$substitute] = $code_tag;
 			$parts[$i] = $i;
 		}
@@ -109,15 +109,15 @@ 
 
 	// Replace /me.+?\n with [me=name]dsf[/me]\n.
 	if (strpos($user_info['name'], '[') !== false || strpos($user_info['name'], ']') !== false || strpos($user_info['name'], '\'') !== false || strpos($user_info['name'], '"') !== false)
-		$message = preg_replace('~(\A|\n)/me(?: | )([^\n]*)(?:\z)?~i', '$1[me="' . $user_info['name'] . '"]$2[/me]', $message);
+		$message = preg_replace('~(\A|\n)/me(?: | )([^\n]*)(?:\z)?~i', '$1[me="'.$user_info['name'].'"]$2[/me]', $message);
 	else
-		$message = preg_replace('~(\A|\n)/me(?: | )([^\n]*)(?:\z)?~i', '$1[me=' . $user_info['name'] . ']$2[/me]', $message);
+		$message = preg_replace('~(\A|\n)/me(?: | )([^\n]*)(?:\z)?~i', '$1[me='.$user_info['name'].']$2[/me]', $message);
 
 	if (!$previewing && strpos($message, '[html]') !== false)
 	{
 		if (allowedTo('admin_forum'))
 			$message = preg_replace_callback('~\[html\](.+?)\[/html\]~is', function($m) {
-				return '[html]' . strtr(un_htmlspecialchars($m[1]), array("\n" => '
', '  ' => '  ', '[' => '[', ']' => ']')) . '[/html]';
+				return '[html]'.strtr(un_htmlspecialchars($m[1]), array("\n" => '
', '  ' => '  ', '[' => '[', ']' => ']')).'[/html]';
 			}, $message);
 
 		// We should edit them out, or else if an admin edits the message they will get shown...
@@ -131,7 +131,7 @@ 
 	// Let's look at the time tags...
 	$message = preg_replace_callback('~\[time(?:=(absolute))*\](.+?)\[/time\]~i', function($m) use ($modSettings, $user_info)
 	{
-		return "[time]" . (is_numeric("$m[2]") || @strtotime("$m[2]") == 0 ? "$m[2]" : strtotime("$m[2]") - ("$m[1]" == "absolute" ? 0 : (($modSettings["time_offset"] + $user_info["time_offset"]) * 3600))) . "[/time]";
+		return "[time]".(is_numeric("$m[2]") || @strtotime("$m[2]") == 0 ? "$m[2]" : strtotime("$m[2]") - ("$m[1]" == "absolute" ? 0 : (($modSettings["time_offset"] + $user_info["time_offset"]) * 3600)))."[/time]";
 	}, $message);
 
 	// Change the color specific tags to [color=the color].
@@ -141,37 +141,37 @@ 
 	// Make sure all tags are lowercase.
 	$message = preg_replace_callback('~\[([/]?)(list|li|table|tr|td)((\s[^\]]+)*)\]~i', function($m)
 	{
-		return "[$m[1]" . strtolower("$m[2]") . "$m[3]]";
+		return "[$m[1]".strtolower("$m[2]")."$m[3]]";
 	}, $message);
 
 	$list_open = substr_count($message, '[list]') + substr_count($message, '[list ');
 	$list_close = substr_count($message, '[/list]');
 	if ($list_close - $list_open > 0)
-		$message = str_repeat('[list]', $list_close - $list_open) . $message;
+		$message = str_repeat('[list]', $list_close - $list_open).$message;
 	if ($list_open - $list_close > 0)
-		$message = $message . str_repeat('[/list]', $list_open - $list_close);
+		$message = $message.str_repeat('[/list]', $list_open - $list_close);
 
 	$mistake_fixes = array(
 		// Find [table]s not followed by [tr].
-		'~\[table\](?![\s' . $non_breaking_space . ']*\[tr\])~s' . ($context['utf8'] ? 'u' : '') => '[table][tr]',
+		'~\[table\](?![\s'.$non_breaking_space.']*\[tr\])~s'.($context['utf8'] ? 'u' : '') => '[table][tr]',
 		// Find [tr]s not followed by [td].
-		'~\[tr\](?![\s' . $non_breaking_space . ']*\[td\])~s' . ($context['utf8'] ? 'u' : '') => '[tr][td]',
+		'~\[tr\](?![\s'.$non_breaking_space.']*\[td\])~s'.($context['utf8'] ? 'u' : '') => '[tr][td]',
 		// Find [/td]s not followed by something valid.
-		'~\[/td\](?![\s' . $non_breaking_space . ']*(?:\[td\]|\[/tr\]|\[/table\]))~s' . ($context['utf8'] ? 'u' : '') => '[/td][/tr]',
+		'~\[/td\](?![\s'.$non_breaking_space.']*(?:\[td\]|\[/tr\]|\[/table\]))~s'.($context['utf8'] ? 'u' : '') => '[/td][/tr]',
 		// Find [/tr]s not followed by something valid.
-		'~\[/tr\](?![\s' . $non_breaking_space . ']*(?:\[tr\]|\[/table\]))~s' . ($context['utf8'] ? 'u' : '') => '[/tr][/table]',
+		'~\[/tr\](?![\s'.$non_breaking_space.']*(?:\[tr\]|\[/table\]))~s'.($context['utf8'] ? 'u' : '') => '[/tr][/table]',
 		// Find [/td]s incorrectly followed by [/table].
-		'~\[/td\][\s' . $non_breaking_space . ']*\[/table\]~s' . ($context['utf8'] ? 'u' : '') => '[/td][/tr][/table]',
+		'~\[/td\][\s'.$non_breaking_space.']*\[/table\]~s'.($context['utf8'] ? 'u' : '') => '[/td][/tr][/table]',
 		// Find [table]s, [tr]s, and [/td]s (possibly correctly) followed by [td].
-		'~\[(table|tr|/td)\]([\s' . $non_breaking_space . ']*)\[td\]~s' . ($context['utf8'] ? 'u' : '') => '[$1]$2[_td_]',
+		'~\[(table|tr|/td)\]([\s'.$non_breaking_space.']*)\[td\]~s'.($context['utf8'] ? 'u' : '') => '[$1]$2[_td_]',
 		// Now, any [td]s left should have a [tr] before them.
 		'~\[td\]~s' => '[tr][td]',
 		// Look for [tr]s which are correctly placed.
-		'~\[(table|/tr)\]([\s' . $non_breaking_space . ']*)\[tr\]~s' . ($context['utf8'] ? 'u' : '') => '[$1]$2[_tr_]',
+		'~\[(table|/tr)\]([\s'.$non_breaking_space.']*)\[tr\]~s'.($context['utf8'] ? 'u' : '') => '[$1]$2[_tr_]',
 		// Any remaining [tr]s should have a [table] before them.
 		'~\[tr\]~s' => '[table][tr]',
 		// Look for [/td]s followed by [/tr].
-		'~\[/td\]([\s' . $non_breaking_space . ']*)\[/tr\]~s' . ($context['utf8'] ? 'u' : '') => '[/td]$1[_/tr_]',
+		'~\[/td\]([\s'.$non_breaking_space.']*)\[/tr\]~s'.($context['utf8'] ? 'u' : '') => '[/td]$1[_/tr_]',
 		// Any remaining [/tr]s should have a [/td].
 		'~\[/tr\]~s' => '[/td][/tr]',
 		// Look for properly opened [li]s which aren't closed.
@@ -179,14 +179,14 @@ 
 		'~\[li\]([^\[\]]+?)\[/list\]~s' => '[_li_]$1[_/li_][/list]',
 		'~\[li\]([^\[\]]+?)$~s' => '[li]$1[/li]',
 		// Lists - find correctly closed items/lists.
-		'~\[/li\]([\s' . $non_breaking_space . ']*)\[/list\]~s' . ($context['utf8'] ? 'u' : '') => '[_/li_]$1[/list]',
+		'~\[/li\]([\s'.$non_breaking_space.']*)\[/list\]~s'.($context['utf8'] ? 'u' : '') => '[_/li_]$1[/list]',
 		// Find list items closed and then opened.
-		'~\[/li\]([\s' . $non_breaking_space . ']*)\[li\]~s' . ($context['utf8'] ? 'u' : '') => '[_/li_]$1[_li_]',
+		'~\[/li\]([\s'.$non_breaking_space.']*)\[li\]~s'.($context['utf8'] ? 'u' : '') => '[_/li_]$1[_li_]',
 		// Now, find any [list]s or [/li]s followed by [li].
-		'~\[(list(?: [^\]]*?)?|/li)\]([\s' . $non_breaking_space . ']*)\[li\]~s' . ($context['utf8'] ? 'u' : '') => '[$1]$2[_li_]',
+		'~\[(list(?: [^\]]*?)?|/li)\]([\s'.$non_breaking_space.']*)\[li\]~s'.($context['utf8'] ? 'u' : '') => '[$1]$2[_li_]',
 		// Allow for sub lists.
-		'~\[/li\]([\s' . $non_breaking_space . ']*)\[list\]~' . ($context['utf8'] ? 'u' : '') => '[_/li_]$1[list]',
-		'~\[/list\]([\s' . $non_breaking_space . ']*)\[li\]~' . ($context['utf8'] ? 'u' : '') => '[/list]$1[_li_]',
+		'~\[/li\]([\s'.$non_breaking_space.']*)\[list\]~'.($context['utf8'] ? 'u' : '') => '[_/li_]$1[list]',
+		'~\[/list\]([\s'.$non_breaking_space.']*)\[li\]~'.($context['utf8'] ? 'u' : '') => '[/list]$1[_li_]',
 		// Any remaining [li]s weren't inside a [list].
 		'~\[li\]~' => '[list][li]',
 		// Any remaining [/li]s weren't before a [/list].
@@ -207,17 +207,17 @@ 
 		'td',
 	);
 
-	require_once($sourcedir . '/Subs.php');
+	require_once($sourcedir.'/Subs.php');
 
 	$alltags = array();
 	foreach (($codes = parse_bbc(false)) as $code)
 		if (!in_array($code['tag'], $allowedEmpty))
 			$alltags[] = $code['tag'];
 
-	$alltags_regex = '\b' . implode("\b|\b", array_unique($alltags)) . '\b';
+	$alltags_regex = '\b'.implode("\b|\b", array_unique($alltags)).'\b';
 
-	while (preg_match('~\[(' . $alltags_regex . ')[^\]]*\]\s*\[/\1\]\s?~i', $message))
-		$message = preg_replace('~\[(' . $alltags_regex . ')[^\]]*\]\s*\[/\1\]\s?~i', '', $message);
+	while (preg_match('~\[('.$alltags_regex.')[^\]]*\]\s*\[/\1\]\s?~i', $message))
+		$message = preg_replace('~\[('.$alltags_regex.')[^\]]*\]\s*\[/\1\]\s?~i', '', $message);
 
 	// Restore code blocks
 	if (!empty($code_tags))
@@ -250,8 +250,8 @@ 
 		// If $i is a multiple of four (0, 4, 8, ...) then it's not a code section...
 		if ($i % 4 == 2)
 		{
-			$code_tag = $parts[$i - 1] . $parts[$i] . $parts[$i + 1];
-			$substitute = $parts[$i - 1] . $i . $parts[$i + 1];
+			$code_tag = $parts[$i - 1].$parts[$i].$parts[$i + 1];
+			$substitute = $parts[$i - 1].$i.$parts[$i + 1];
 			$code_tags[$substitute] = $code_tag;
 			$parts[$i] = $i;
 		}
@@ -261,20 +261,20 @@ 
 
 	$message = preg_replace_callback('~\[html\](.+?)\[/html\]~i', function($m) use ($smcFunc)
 	{
-		return "[html]" . strtr($smcFunc['htmlspecialchars']("$m[1]", ENT_QUOTES), array("\\&quot;" => "&quot;", "&amp;#13;" => "<br>", "&amp;#32;" => " ", "&amp;#91;" => "[", "&amp;#93;" => "]")) . "[/html]";
+		return "[html]".strtr($smcFunc['htmlspecialchars']("$m[1]", ENT_QUOTES), array("\\&quot;" => "&quot;", "&amp;#13;" => "<br>", "&amp;#32;" => " ", "&amp;#91;" => "[", "&amp;#93;" => "]"))."[/html]";
 	}, $message);
 
 	// Attempt to un-parse the time to something less awful.
 	$message = preg_replace_callback('~\[time\](\d{0,10})\[/time\]~i', function($m)
 	{
-		return "[time]" . timeformat("$m[1]", false) . "[/time]";
+		return "[time]".timeformat("$m[1]", false)."[/time]";
 	}, $message);
 
 	if (!empty($code_tags))
 		$message = str_replace(array_keys($code_tags), array_values($code_tags), $message);
 
 	// Change breaks back to \n's and &nsbp; back to spaces.
-	return preg_replace('~<br( /)?' . '>~', "\n", str_replace('&nbsp;', ' ', $message));
+	return preg_replace('~<br( /)?'.'>~', "\n", str_replace('&nbsp;', ' ', $message));
 }
 
 /**
@@ -358,7 +358,7 @@ 
 	// Now fix possible security problems with images loading links automatically...
 	$message = preg_replace_callback('~(\[img.*?\])(.+?)\[/img\]~is', function($m)
 	{
-		return "$m[1]" . preg_replace("~action(=|%3d)(?!dlattach)~i", "action-", "$m[2]") . "[/img]";
+		return "$m[1]".preg_replace("~action(=|%3d)(?!dlattach)~i", "action-", "$m[2]")."[/img]";
 	}, $message);
 
 }
@@ -381,19 +381,19 @@ 
 	if (preg_match('~^([^:]+://[^/]+)~', $boardurl, $match) != 0)
 		$domain_url = $match[1];
 	else
-		$domain_url = $boardurl . '/';
+		$domain_url = $boardurl.'/';
 
 	$replaces = array();
 
 	if ($hasEqualSign && $embeddedUrl)
 	{
-		$quoted = preg_match('~\[(' . $myTag . ')=&quot;~', $message);
-		preg_match_all('~\[(' . $myTag . ')=' . ($quoted ? '&quot;(.*?)&quot;' : '([^\]]*?)') . '\](?:(.+?)\[/(' . $myTag . ')\])?~is', $message, $matches);
+		$quoted = preg_match('~\[('.$myTag.')=&quot;~', $message);
+		preg_match_all('~\[('.$myTag.')='.($quoted ? '&quot;(.*?)&quot;' : '([^\]]*?)').'\](?:(.+?)\[/('.$myTag.')\])?~is', $message, $matches);
 	}
 	elseif ($hasEqualSign)
-		preg_match_all('~\[(' . $myTag . ')=([^\]]*?)\](?:(.+?)\[/(' . $myTag . ')\])?~is', $message, $matches);
+		preg_match_all('~\[('.$myTag.')=([^\]]*?)\](?:(.+?)\[/('.$myTag.')\])?~is', $message, $matches);
 	else
-		preg_match_all('~\[(' . $myTag . ($hasExtra ? '(?:[^\]]*?)' : '') . ')\](.+?)\[/(' . $myTag . ')\]~is', $message, $matches);
+		preg_match_all('~\[('.$myTag.($hasExtra ? '(?:[^\]]*?)' : '').')\](.+?)\[/('.$myTag.')\]~is', $message, $matches);
 
 	foreach ($matches[0] as $k => $dummy)
 	{
@@ -405,7 +405,7 @@ 
 		$found = false;
 		foreach ($protocols as $protocol)
 		{
-			$found = strncasecmp($replace, $protocol . '://', strlen($protocol) + 3) === 0;
+			$found = strncasecmp($replace, $protocol.'://', strlen($protocol) + 3) === 0;
 			if ($found)
 				break;
 		}
@@ -413,31 +413,31 @@ 
 		if (!$found && $protocols[0] == 'http')
 		{
 			if (substr($replace, 0, 1) == '/' && substr($replace, 0, 2) != '//')
-				$replace = $domain_url . $replace;
+				$replace = $domain_url.$replace;
 			elseif (substr($replace, 0, 1) == '?')
-				$replace = $scripturl . $replace;
+				$replace = $scripturl.$replace;
 			elseif (substr($replace, 0, 1) == '#' && $embeddedUrl)
 			{
-				$replace = '#' . preg_replace('~[^A-Za-z0-9_\-#]~', '', substr($replace, 1));
+				$replace = '#'.preg_replace('~[^A-Za-z0-9_\-#]~', '', substr($replace, 1));
 				$this_tag = 'iurl';
 				$this_close = 'iurl';
 			}
 			elseif (substr($replace, 0, 2) != '//')
-				$replace = $protocols[0] . '://' . $replace;
+				$replace = $protocols[0].'://'.$replace;
 		}
 		elseif (!$found && $protocols[0] == 'ftp')
-			$replace = $protocols[0] . '://' . preg_replace('~^(?!ftps?)[^:]+://~', '', $replace);
+			$replace = $protocols[0].'://'.preg_replace('~^(?!ftps?)[^:]+://~', '', $replace);
 		elseif (!$found)
-			$replace = $protocols[0] . '://' . $replace;
+			$replace = $protocols[0].'://'.$replace;
 
 		if ($hasEqualSign && $embeddedUrl)
-			$replaces[$matches[0][$k]] = '[' . $this_tag . '=&quot;' . $replace . '&quot;]' . (empty($matches[4][$k]) ? '' : $matches[3][$k] . '[/' . $this_close . ']');
+			$replaces[$matches[0][$k]] = '['.$this_tag.'=&quot;'.$replace.'&quot;]'.(empty($matches[4][$k]) ? '' : $matches[3][$k].'[/'.$this_close.']');
 		elseif ($hasEqualSign)
-			$replaces['[' . $matches[1][$k] . '=' . $matches[2][$k] . ']'] = '[' . $this_tag . '=' . $replace . ']';
+			$replaces['['.$matches[1][$k].'='.$matches[2][$k].']'] = '['.$this_tag.'='.$replace.']';
 		elseif ($embeddedUrl)
-			$replaces['[' . $matches[1][$k] . ']' . $matches[2][$k] . '[/' . $matches[3][$k] . ']'] = '[' . $this_tag . '=' . $replace . ']' . $matches[2][$k] . '[/' . $this_close . ']';
+			$replaces['['.$matches[1][$k].']'.$matches[2][$k].'[/'.$matches[3][$k].']'] = '['.$this_tag.'='.$replace.']'.$matches[2][$k].'[/'.$this_close.']';
 		else
-			$replaces['[' . $matches[1][$k] . ']' . $matches[2][$k] . '[/' . $matches[3][$k] . ']'] = '[' . $this_tag . ']' . $replace . '[/' . $this_close . ']';
+			$replaces['['.$matches[1][$k].']'.$matches[2][$k].'[/'.$matches[3][$k].']'] = '['.$this_tag.']'.$replace.'[/'.$this_close.']';
 	}
 
 	foreach ($replaces as $k => $v)
@@ -530,22 +530,22 @@ 
 	if ($hotmail_fix && !$send_html)
 	{
 		$send_html = true;
-		$message = strtr($message, array($line_break => '<br>' . $line_break));
-		$message = preg_replace('~(' . preg_quote($scripturl, '~') . '(?:[?/][\w\-_%\.,\?&;=#]+)?)~', '<a href="$1">$1</a>', $message);
+		$message = strtr($message, array($line_break => '<br>'.$line_break));
+		$message = preg_replace('~('.preg_quote($scripturl, '~').'(?:[?/][\w\-_%\.,\?&;=#]+)?)~', '<a href="$1">$1</a>', $message);
 	}
 
 	list (, $from_name) = mimespecialchars(addcslashes($from !== null ? $from : $context['forum_name'], '<>()\'\\"'), true, $hotmail_fix, $line_break);
 	list (, $subject) = mimespecialchars($subject, true, $hotmail_fix, $line_break);
 
 	// Construct the mail headers...
-	$headers = 'From: ' . $from_name . ' <' . (empty($modSettings['mail_from']) ? $webmaster_email : $modSettings['mail_from']) . '>' . $line_break;
-	$headers .= $from !== null ? 'Reply-To: <' . $from . '>' . $line_break : '';
-	$headers .= 'Return-Path: ' . (empty($modSettings['mail_from']) ? $webmaster_email : $modSettings['mail_from']) . $line_break;
-	$headers .= 'Date: ' . gmdate('D, d M Y H:i:s') . ' -0000' . $line_break;
+	$headers = 'From: '.$from_name.' <'.(empty($modSettings['mail_from']) ? $webmaster_email : $modSettings['mail_from']).'>'.$line_break;
+	$headers .= $from !== null ? 'Reply-To: <'.$from.'>'.$line_break : '';
+	$headers .= 'Return-Path: '.(empty($modSettings['mail_from']) ? $webmaster_email : $modSettings['mail_from']).$line_break;
+	$headers .= 'Date: '.gmdate('D, d M Y H:i:s').' -0000'.$line_break;
 
 	if ($message_id !== null && empty($modSettings['mail_no_message_id']))
-		$headers .= 'Message-ID: <' . md5($scripturl . microtime()) . '-' . $message_id . strstr(empty($modSettings['mail_from']) ? $webmaster_email : $modSettings['mail_from'], '@') . '>' . $line_break;
-	$headers .= 'X-Mailer: SMF' . $line_break;
+		$headers .= 'Message-ID: <'.md5($scripturl.microtime()).'-'.$message_id.strstr(empty($modSettings['mail_from']) ? $webmaster_email : $modSettings['mail_from'], '@').'>'.$line_break;
+	$headers .= 'X-Mailer: SMF'.$line_break;
 
 	// Pass this to the integration before we start modifying the output -- it'll make it easier later.
 	if (in_array(false, call_integration_hook('integrate_outgoing_email', array(&$subject, &$message, &$headers, &$to_array)), true))
@@ -555,12 +555,12 @@ 
 	$orig_message = $message;
 
 	// The mime boundary separates the different alternative versions.
-	$mime_boundary = 'SMF-' . md5($message . time());
+	$mime_boundary = 'SMF-'.md5($message.time());
 
 	// Using mime, as it allows to send a plain unencoded alternative.
-	$headers .= 'Mime-Version: 1.0' . $line_break;
-	$headers .= 'content-type: multipart/alternative; boundary="' . $mime_boundary . '"' . $line_break;
-	$headers .= 'content-transfer-encoding: 7bit' . $line_break;
+	$headers .= 'Mime-Version: 1.0'.$line_break;
+	$headers .= 'content-type: multipart/alternative; boundary="'.$mime_boundary.'"'.$line_break;
+	$headers .= 'content-transfer-encoding: 7bit'.$line_break;
 
 	// Sending HTML?  Let's plop in some basic stuff, then.
 	if ($send_html)
@@ -569,32 +569,32 @@ 
 
 		// But, then, dump it and use a plain one for dinosaur clients.
 		list(, $plain_message) = mimespecialchars($no_html_message, false, true, $line_break);
-		$message = $plain_message . $line_break . '--' . $mime_boundary . $line_break;
+		$message = $plain_message.$line_break.'--'.$mime_boundary.$line_break;
 
 		// This is the plain text version.  Even if no one sees it, we need it for spam checkers.
 		list($charset, $plain_charset_message, $encoding) = mimespecialchars($no_html_message, false, false, $line_break);
-		$message .= 'content-type: text/plain; charset=' . $charset . $line_break;
-		$message .= 'content-transfer-encoding: ' . $encoding . $line_break . $line_break;
-		$message .= $plain_charset_message . $line_break . '--' . $mime_boundary . $line_break;
+		$message .= 'content-type: text/plain; charset='.$charset.$line_break;
+		$message .= 'content-transfer-encoding: '.$encoding.$line_break.$line_break;
+		$message .= $plain_charset_message.$line_break.'--'.$mime_boundary.$line_break;
 
 		// This is the actual HTML message, prim and proper.  If we wanted images, they could be inlined here (with multipart/related, etc.)
 		list($charset, $html_message, $encoding) = mimespecialchars($orig_message, false, $hotmail_fix, $line_break);
-		$message .= 'content-type: text/html; charset=' . $charset . $line_break;
-		$message .= 'content-transfer-encoding: ' . ($encoding == '' ? '7bit' : $encoding) . $line_break . $line_break;
-		$message .= $html_message . $line_break . '--' . $mime_boundary . '--';
+		$message .= 'content-type: text/html; charset='.$charset.$line_break;
+		$message .= 'content-transfer-encoding: '.($encoding == '' ? '7bit' : $encoding).$line_break.$line_break;
+		$message .= $html_message.$line_break.'--'.$mime_boundary.'--';
 	}
 	// Text is good too.
 	else
 	{
 		// Send a plain message first, for the older web clients.
 		list(, $plain_message) = mimespecialchars($orig_message, false, true, $line_break);
-		$message = $plain_message . $line_break . '--' . $mime_boundary . $line_break;
+		$message = $plain_message.$line_break.'--'.$mime_boundary.$line_break;
 
 		// Now add an encoded message using the forum's character set.
 		list ($charset, $encoded_message, $encoding) = mimespecialchars($orig_message, false, false, $line_break);
-		$message .= 'content-type: text/plain; charset=' . $charset . $line_break;
-		$message .= 'content-transfer-encoding: ' . $encoding . $line_break . $line_break;
-		$message .= $encoded_message . $line_break . '--' . $mime_boundary . '--';
+		$message .= 'content-type: text/plain; charset='.$charset.$line_break;
+		$message .= 'content-transfer-encoding: '.$encoding.$line_break.$line_break;
+		$message .= $encoded_message.$line_break.'--'.$mime_boundary.'--';
 	}
 
 	// Are we using the mail queue, if so this is where we butt in...
@@ -606,9 +606,9 @@ 
 	{
 		list ($last_mail_time, $mails_this_minute) = @explode('|', $modSettings['mail_recent']);
 		if (empty($mails_this_minute) || time() > $last_mail_time + 60)
-			$new_queue_stat = time() . '|' . 1;
+			$new_queue_stat = time().'|'.1;
 		else
-			$new_queue_stat = $last_mail_time . '|' . ((int) $mails_this_minute + 1);
+			$new_queue_stat = $last_mail_time.'|'.((int) $mails_this_minute + 1);
 
 		updateSettings(array('mail_recent' => $new_queue_stat));
 	}
@@ -643,7 +643,7 @@ 
 					$mail_result = false;
 				}
 			}
-			catch(ErrorException $e)
+			catch (ErrorException $e)
 			{
 				log_error($e->getMessage(), 'general', $e->getFile(), $e->getLine());
 				log_error(sprintf($txt['mail_send_unable'], $to));
@@ -831,7 +831,7 @@ 
 		$request = $smcFunc['db_query']('pm_find_username', '
 			SELECT id_member, member_name
 			FROM {db_prefix}members
-			WHERE ' . ($smcFunc['db_case_sensitive'] ? 'LOWER(member_name)' : 'member_name') . ' IN ({array_string:usernames})',
+			WHERE ' . ($smcFunc['db_case_sensitive'] ? 'LOWER(member_name)' : 'member_name').' IN ({array_string:usernames})',
 			array(
 				'usernames' => array_keys($usernames),
 			)
@@ -919,14 +919,14 @@ 
 	}
 
 	// Load the groups that are allowed to read PMs.
-	require_once($sourcedir . '/Subs-Members.php');
+	require_once($sourcedir.'/Subs-Members.php');
 	$pmReadGroups = groupsAllowedTo('pm_read');
 
 	if (empty($modSettings['permission_enable_deny']))
 		$pmReadGroups['denied'] = array();
 
 	// Load their alert preferences
-	require_once($sourcedir . '/Subs-Notify.php');
+	require_once($sourcedir.'/Subs-Notify.php');
 	$notifyPrefs = getNotifyPrefs($all_to, array('pm_new', 'pm_reply', 'pm_notify'), true);
 
 	$request = $smcFunc['db_query']('', '
@@ -935,7 +935,7 @@ 
 			instant_messages,' . (allowedTo('moderate_forum') ? ' 0' : '
 			(pm_receive_from = {int:admins_only}' . (empty($modSettings['enable_buddylist']) ? '' : ' OR
 			(pm_receive_from = {int:buddies_only} AND FIND_IN_SET({string:from_id}, buddy_list) = 0) OR
-			(pm_receive_from = {int:not_on_ignore_list} AND FIND_IN_SET({string:from_id}, pm_ignore_list) != 0)') . ')') . ' AS ignored,
+			(pm_receive_from = {int:not_on_ignore_list} AND FIND_IN_SET({string:from_id}, pm_ignore_list) != 0)').')').' AS ignored,
 			FIND_IN_SET({string:from_id}, buddy_list) != 0 AS is_buddy, is_activated,
 			additional_groups, id_group, id_post_group
 		FROM {db_prefix}members
@@ -1114,18 +1114,18 @@ 
 		'SUBJECT' => $subject,
 		'MESSAGE' => $message,
 		'SENDER' => un_htmlspecialchars($from['name']),
-		'READLINK' => $scripturl . '?action=pm;pmsg=' . $id_pm . '#msg' . $id_pm,
-		'REPLYLINK' => $scripturl . '?action=pm;sa=send;f=inbox;pmsg=' . $id_pm . ';quote;u=' . $from['id'],
+		'READLINK' => $scripturl.'?action=pm;pmsg='.$id_pm.'#msg'.$id_pm,
+		'REPLYLINK' => $scripturl.'?action=pm;sa=send;f=inbox;pmsg='.$id_pm.';quote;u='.$from['id'],
 		'TOLIST' => implode(', ', $to_names),
 	);
-	$email_template = 'new_pm' . (empty($modSettings['disallow_sendBody']) ? '_body' : '') . (!empty($to_names) ? '_tolist' : '');
+	$email_template = 'new_pm'.(empty($modSettings['disallow_sendBody']) ? '_body' : '').(!empty($to_names) ? '_tolist' : '');
 
 	foreach ($notifications as $lang => $notification_list)
 	{
 		$emaildata = loadEmailTemplate($email_template, $replacements, $lang);
 
 		// Off the notification email goes!
-		sendmail($notification_list, $emaildata['subject'], $emaildata['body'], null, 'p' . $id_pm, $emaildata['is_html'], 2, null, true);
+		sendmail($notification_list, $emaildata['subject'], $emaildata['body'], null, 'p'.$id_pm, $emaildata['is_html'], 2, null, true);
 	}
 
 	// Integrated After PMs
@@ -1212,11 +1212,11 @@ 
 			if (strlen($c) === 1 && ord($c[0]) <= 0x7F)
 				return $c;
 			elseif (strlen($c) === 2 && ord($c[0]) >= 0xC0 && ord($c[0]) <= 0xDF)
-				return "&#" . (((ord($c[0]) ^ 0xC0) << 6) + (ord($c[1]) ^ 0x80)) . ";";
+				return "&#".(((ord($c[0]) ^ 0xC0) << 6) + (ord($c[1]) ^ 0x80)).";";
 			elseif (strlen($c) === 3 && ord($c[0]) >= 0xE0 && ord($c[0]) <= 0xEF)
-				return "&#" . (((ord($c[0]) ^ 0xE0) << 12) + ((ord($c[1]) ^ 0x80) << 6) + (ord($c[2]) ^ 0x80)) . ";";
+				return "&#".(((ord($c[0]) ^ 0xE0) << 12) + ((ord($c[1]) ^ 0x80) << 6) + (ord($c[2]) ^ 0x80)).";";
 			elseif (strlen($c) === 4 && ord($c[0]) >= 0xF0 && ord($c[0]) <= 0xF7)
-				return "&#" . (((ord($c[0]) ^ 0xF0) << 18) + ((ord($c[1]) ^ 0x80) << 12) + ((ord($c[2]) ^ 0x80) << 6) + (ord($c[3]) ^ 0x80)) . ";";
+				return "&#".(((ord($c[0]) ^ 0xF0) << 18) + ((ord($c[1]) ^ 0x80) << 12) + ((ord($c[2]) ^ 0x80) << 6) + (ord($c[3]) ^ 0x80)).";";
 			else
 				return "";
 		};
@@ -1233,7 +1233,7 @@ 
 
 		// Show the characterset and the transfer-encoding for header strings.
 		if ($with_charset)
-			$string = '=?' . $charset . '?B?' . $string . '?=';
+			$string = '=?'.$charset.'?B?'.$string.'?=';
 
 		// Break it up in lines (mail body).
 		else
@@ -1276,11 +1276,11 @@ 
 		if ($socket)
 		{
 			fgets($socket, 256);
-			fputs($socket, 'USER ' . $modSettings['smtp_username'] . "\r\n");
+			fputs($socket, 'USER '.$modSettings['smtp_username']."\r\n");
 			fgets($socket, 256);
-			fputs($socket, 'PASS ' . base64_decode($modSettings['smtp_password']) . "\r\n");
+			fputs($socket, 'PASS '.base64_decode($modSettings['smtp_password'])."\r\n");
 			fgets($socket, 256);
-			fputs($socket, 'QUIT' . "\r\n");
+			fputs($socket, 'QUIT'."\r\n");
 
 			fclose($socket);
 		}
@@ -1303,7 +1303,7 @@ 
 		// Unable to connect!  Don't show any error message, but just log one and try to continue anyway.
 		if (!$socket)
 		{
-			log_error($txt['smtp_no_connect'] . ': ' . $errno . ' : ' . $errstr);
+			log_error($txt['smtp_no_connect'].': '.$errno.' : '.$errstr);
 			return false;
 		}
 	}
@@ -1323,7 +1323,7 @@ 
 			$helo = php_uname('n');
 
 		// If the hostname isn't a fully qualified domain name, we can use the host name from $boardurl instead
-		if (empty($helo) || strpos($helo, '.') === false || substr_compare($helo, '.local', -6) === 0 || (!empty($modSettings['tld_regex']) && !preg_match('/\.' . $modSettings['tld_regex'] . '$/u', $helo)))
+		if (empty($helo) || strpos($helo, '.') === false || substr_compare($helo, '.local', -6) === 0 || (!empty($modSettings['tld_regex']) && !preg_match('/\.'.$modSettings['tld_regex'].'$/u', $helo)))
 			$helo = parse_url($boardurl, PHP_URL_HOST);
 
 		// This is one of those situations where 'www.' is undesirable
@@ -1335,7 +1335,7 @@ 
 	if (in_array($modSettings['mail_type'], array(1, 2)) && $modSettings['smtp_username'] != '' && $modSettings['smtp_password'] != '')
 	{
 		// EHLO could be understood to mean encrypted hello...
-		if (server_parse('EHLO ' . $helo, $socket, null, $response) == '250')
+		if (server_parse('EHLO '.$helo, $socket, null, $response) == '250')
 		{
 			// Are we using STARTTLS and does the server support STARTTLS?
 			if ($modSettings['mail_type'] == 2 && preg_match("~250( |-)STARTTLS~mi", $response))
@@ -1356,7 +1356,7 @@ 
 				if (!@stream_socket_enable_crypto($socket, true, $crypto_method))
 					return false;
 				// Send the EHLO command again
-				if (!server_parse('EHLO ' . $helo, $socket, null) == '250')
+				if (!server_parse('EHLO '.$helo, $socket, null) == '250')
 					return false;
 			}
 
@@ -1369,18 +1369,18 @@ 
 			if (!server_parse($modSettings['smtp_password'], $socket, '235'))
 				return false;
 		}
-		elseif (!server_parse('HELO ' . $helo, $socket, '250'))
+		elseif (!server_parse('HELO '.$helo, $socket, '250'))
 			return false;
 	}
 	else
 	{
 		// Just say "helo".
-		if (!server_parse('HELO ' . $helo, $socket, '250'))
+		if (!server_parse('HELO '.$helo, $socket, '250'))
 			return false;
 	}
 
 	// Fix the message for any lines beginning with a period! (the first is ignored, you see.)
-	$message = strtr($message, array("\r\n" . '.' => "\r\n" . '..'));
+	$message = strtr($message, array("\r\n".'.' => "\r\n".'..'));
 
 	// !! Theoretically, we should be able to just loop the RCPT TO.
 	$mail_to_array = array_values($mail_to_array);
@@ -1394,17 +1394,17 @@ 
 		}
 
 		// From, to, and then start the data...
-		if (!server_parse('MAIL FROM: <' . (empty($modSettings['mail_from']) ? $webmaster_email : $modSettings['mail_from']) . '>', $socket, '250'))
+		if (!server_parse('MAIL FROM: <'.(empty($modSettings['mail_from']) ? $webmaster_email : $modSettings['mail_from']).'>', $socket, '250'))
 			return false;
-		if (!server_parse('RCPT TO: <' . $mail_to . '>', $socket, '250'))
+		if (!server_parse('RCPT TO: <'.$mail_to.'>', $socket, '250'))
 			return false;
 		if (!server_parse('DATA', $socket, '354'))
 			return false;
-		fputs($socket, 'Subject: ' . $subject . "\r\n");
+		fputs($socket, 'Subject: '.$subject."\r\n");
 		if (strlen($mail_to) > 0)
-			fputs($socket, 'To: <' . $mail_to . '>' . "\r\n");
-		fputs($socket, $headers . "\r\n\r\n");
-		fputs($socket, $message . "\r\n");
+			fputs($socket, 'To: <'.$mail_to.'>'."\r\n");
+		fputs($socket, $headers."\r\n\r\n");
+		fputs($socket, $message."\r\n");
 
 		// Send a ., or in other words "end of data".
 		if (!server_parse('.', $socket, '250'))
@@ -1415,7 +1415,7 @@ 
 		if (function_exists('apache_reset_timeout'))
 			@apache_reset_timeout();
 	}
-	fputs($socket, 'QUIT' . "\r\n");
+	fputs($socket, 'QUIT'."\r\n");
 	fclose($socket);
 
 	return true;
@@ -1438,7 +1438,7 @@ 
 	global $txt;
 
 	if ($message !== null)
-		fputs($socket, $message . "\r\n");
+		fputs($socket, $message."\r\n");
 
 	// No response yet.
 	$server_response = '';
@@ -1459,7 +1459,7 @@ 
 
 	if (substr($server_response, 0, 3) != $code)
 	{
-		log_error($txt['smtp_error'] . $server_response);
+		log_error($txt['smtp_error'].$server_response);
 		return false;
 	}
 
@@ -1490,7 +1490,7 @@ 
 
 	// Construct a bit of Javascript code.
 	$context['spell_js'] = '
-		var txt = {"done": "' . $txt['spellcheck_done'] . '"};
+		var txt = {"done": "' . $txt['spellcheck_done'].'"};
 		var mispstr = window.opener.spellCheckGetText(spell_fieldname);
 		var misps = Array(';
 
@@ -1512,7 +1512,7 @@ 
 
 		// Add on the javascript for this misspelling.
 		$context['spell_js'] .= '
-			new misp("' . strtr($check_word[0], array('\\' => '\\\\', '"' => '\\"', '<' => '', '&gt;' => '')) . '", ' . (int) $check_word[1] . ', ' . (int) $check_word[2] . ', [';
+			new misp("' . strtr($check_word[0], array('\\' => '\\\\', '"' => '\\"', '<' => '', '&gt;' => '')).'", '.(int) $check_word[1].', '.(int) $check_word[2].', [';
 
 		// If there are suggestions, add them in...
 		$suggestions = spell_suggest($dict, $check_word[0]);
@@ -1524,7 +1524,7 @@ 
 					unset($suggestions[$k]);
 
 			if (!empty($suggestions))
-				$context['spell_js'] .= '"' . implode('", "', $suggestions) . '"';
+				$context['spell_js'] .= '"'.implode('", "', $suggestions).'"';
 		}
 
 		$context['spell_js'] .= ']),';
@@ -1644,7 +1644,7 @@ 
 {
 	global $user_info, $txt, $modSettings, $smcFunc, $sourcedir;
 
-	require_once($sourcedir . '/Mentions.php');
+	require_once($sourcedir.'/Mentions.php');
 
 	// Set optional parameters to the default value.
 	$msgOptions['icon'] = empty($msgOptions['icon']) ? 'xx' : $msgOptions['icon'];
@@ -1704,7 +1704,7 @@ 
 			// Couldn't find the current poster?
 			if ($smcFunc['db_num_rows']($request) == 0)
 			{
-				trigger_error('createPost(): Invalid member id ' . $posterOptions['id'], E_USER_NOTICE);
+				trigger_error('createPost(): Invalid member id '.$posterOptions['id'], E_USER_NOTICE);
 				$posterOptions['id'] = 0;
 				$posterOptions['name'] = $txt['guest_title'];
 				$posterOptions['email'] = '';
@@ -1733,7 +1733,7 @@ 
 	$new_topic = empty($topicOptions['id']);
 
 	$message_columns = array(
-		'id_board' => 'int', 'id_topic' => 'int', 'id_member' => 'int', 'subject' => 'string-255', 'body' => (!empty($modSettings['max_messageLength']) && $modSettings['max_messageLength'] > 65534 ? 'string-' . $modSettings['max_messageLength'] : (empty($modSettings['max_messageLength']) ? 'string' : 'string-65534')),
+		'id_board' => 'int', 'id_topic' => 'int', 'id_member' => 'int', 'subject' => 'string-255', 'body' => (!empty($modSettings['max_messageLength']) && $modSettings['max_messageLength'] > 65534 ? 'string-'.$modSettings['max_messageLength'] : (empty($modSettings['max_messageLength']) ? 'string' : 'string-65534')),
 		'poster_name' => 'string-255', 'poster_email' => 'string-255', 'poster_time' => 'int', 'poster_ip' => 'inet',
 		'smileys_enabled' => 'int', 'modified_name' => 'string', 'icon' => 'string-16', 'approved' => 'int',
 	);
@@ -1868,7 +1868,7 @@ 
 		$smcFunc['db_query']('', '
 			UPDATE {db_prefix}topics
 			SET
-				' . implode(', ', $topics_columns) . '
+				' . implode(', ', $topics_columns).'
 			WHERE id_topic = {int:id_topic}',
 			$update_parameters
 		);
@@ -1892,7 +1892,7 @@ 
 	if ($msgOptions['approved'])
 		$smcFunc['db_query']('', '
 			UPDATE {db_prefix}boards
-			SET num_posts = num_posts + 1' . ($new_topic ? ', num_topics = num_topics + 1' : '') . '
+			SET num_posts = num_posts + 1' . ($new_topic ? ', num_topics = num_topics + 1' : '').'
 			WHERE id_board = {int:id_board}',
 			array(
 				'id_board' => $topicOptions['board'],
@@ -1902,7 +1902,7 @@ 
 	{
 		$smcFunc['db_query']('', '
 			UPDATE {db_prefix}boards
-			SET unapproved_posts = unapproved_posts + 1' . ($new_topic ? ', unapproved_topics = unapproved_topics + 1' : '') . '
+			SET unapproved_posts = unapproved_posts + 1' . ($new_topic ? ', unapproved_topics = unapproved_topics + 1' : '').'
 			WHERE id_board = {int:id_board}',
 			array(
 				'id_board' => $topicOptions['board'],
@@ -1983,7 +1983,7 @@ 
 		);
 
 	// If there's a custom search index, it may need updating...
-	require_once($sourcedir . '/Search.php');
+	require_once($sourcedir.'/Search.php');
 	$searchAPI = findSearchAPI();
 	if (is_callable(array($searchAPI, 'postCreated')))
 		$searchAPI->postCreated($msgOptions, $topicOptions, $posterOptions);
@@ -2094,14 +2094,14 @@ 
 	);
 
 	// Update search api
-	require_once($sourcedir . '/Search.php');
+	require_once($sourcedir.'/Search.php');
 	$searchAPI = findSearchAPI();
 	if ($searchAPI->supportsMethod('postRemoved'))
 		$searchAPI->postRemoved($msgOptions['id']);
 
 	if (!empty($modSettings['enable_mentions']) && isset($msgOptions['body']))
 	{
-		require_once($sourcedir . '/Mentions.php');
+		require_once($sourcedir.'/Mentions.php');
 
 		$oldmentions = array();
 
@@ -2150,8 +2150,8 @@ 
 
 	foreach ($messages_columns as $var => $val)
 	{
-		$messages_columns[$var] = $var . ' = {' . (in_array($var, $messageInts) ? 'int' : 'string') . ':var_' . $var . '}';
-		$update_parameters['var_' . $var] = $val;
+		$messages_columns[$var] = $var.' = {'.(in_array($var, $messageInts) ? 'int' : 'string').':var_'.$var.'}';
+		$update_parameters['var_'.$var] = $val;
 	}
 
 	// Nothing to do?
@@ -2161,7 +2161,7 @@ 
 	// Change the post.
 	$smcFunc['db_query']('', '
 		UPDATE {db_prefix}messages
-		SET ' . implode(', ', $messages_columns) . '
+		SET ' . implode(', ', $messages_columns).'
 		WHERE id_msg = {int:id_msg}',
 		$update_parameters
 	);
@@ -2215,7 +2215,7 @@ 
 	}
 
 	// If there's a custom search index, it needs to be modified...
-	require_once($sourcedir . '/Search.php');
+	require_once($sourcedir.'/Search.php');
 	$searchAPI = findSearchAPI();
 	if (is_callable(array($searchAPI, 'postModified')))
 		$searchAPI->postModified($msgOptions, $topicOptions, $posterOptions);
@@ -2492,7 +2492,7 @@ 
 	// Post count for the members?
 	if (!empty($member_post_changes))
 		foreach ($member_post_changes as $id_member => $count_change)
-			updateMemberData($id_member, array('posts' => 'posts ' . ($approve ? '+' : '-') . ' ' . $count_change));
+			updateMemberData($id_member, array('posts' => 'posts '.($approve ? '+' : '-').' '.$count_change));
 
 	return true;
 }
@@ -2634,15 +2634,15 @@ 
 
 	foreach ($lastMsg as $id => $msg)
 	{
-		if (!isset($board_updates[$msg . '-' . $lastModified[$id]]))
-			$board_updates[$msg . '-' . $lastModified[$id]] = array(
+		if (!isset($board_updates[$msg.'-'.$lastModified[$id]]))
+			$board_updates[$msg.'-'.$lastModified[$id]] = array(
 				'id' => $msg,
 				'updated' => $lastModified[$id],
 				'boards' => array($id)
 			);
 
 		else
-			$board_updates[$msg . '-' . $lastModified[$id]]['boards'][] = $id;
+			$board_updates[$msg.'-'.$lastModified[$id]]['boards'][] = $id;
 	}
 
 	// Now commit the changes!
@@ -2737,13 +2737,13 @@ 
 	if ($loadLang)
 		loadLanguage('EmailTemplates', $lang);
 
-	if (!isset($txt[$template . '_subject']) || !isset($txt[$template . '_body']))
+	if (!isset($txt[$template.'_subject']) || !isset($txt[$template.'_body']))
 		fatal_lang_error('email_no_template', 'template', array($template));
 
 	$ret = array(
-		'subject' => $txt[$template . '_subject'],
-		'body' => $txt[$template . '_body'],
-		'is_html' => !empty($txt[$template . '_html']),
+		'subject' => $txt[$template.'_subject'],
+		'body' => $txt[$template.'_body'],
+		'is_html' => !empty($txt[$template.'_html']),
 	);
 
 	// Add in the default replacements.
@@ -2762,7 +2762,7 @@ 
 
 	foreach ($replacements as $f => $r)
 	{
-		$find[] = '{' . $f . '}';
+		$find[] = '{'.$f.'}';
 		$replace[] = $r;
 	}
 
@@ -2942,7 +2942,7 @@ 
 			foreach ($suggestions as $index => $suggestion)
 			{
 				// //TRANSLIT makes it use similar-looking characters for incompatible ones...
-				$suggestions[$index] = iconv('UTF-8', $txt['lang_character_set'] . '//TRANSLIT', $suggestion);
+				$suggestions[$index] = iconv('UTF-8', $txt['lang_character_set'].'//TRANSLIT', $suggestion);
 			}
 
 			return $suggestions;

Braces +5 added lines, -4 removed lines

@@ -116,7 +116,8 @@ 
 	if (!$previewing && strpos($message, '[html]') !== false)
 	{
 		if (allowedTo('admin_forum'))
-			$message = preg_replace_callback('~\[html\](.+?)\[/html\]~is', function($m) {
+			$message = preg_replace_callback('~\[html\](.+?)\[/html\]~is', function($m)
+			{
 				return '[html]' . strtr(un_htmlspecialchars($m[1]), array("\n" => '
', '  ' => '  ', '[' => '[', ']' => ']')) . '[/html]';
 			}, $message);
 
@@ -626,9 +627,10 @@ 
 		foreach ($to_array as $to)
 		{
 			set_error_handler(function($errno, $errstr, $errfile, $errline)
-				{
+			{
 					// error was suppressed with the @-operator
-					if (0 === error_reporting()) {
+					if (0 === error_reporting())
+					{
 						return false;
 					}
 
@@ -1241,7 +1243,6 @@ 
 
 		return array($charset, $string, 'base64');
 	}
-
 	else
 		return array($charset, $string, '7bit');
 }