albertlast / SMF2.1

Sources/ManageSettings.php

Spacing +8 added lines, -8 removed lines

@@ -353,8 +353,8 @@ 
 		}
 
 		// Clean up tags with children
-		foreach($bbcTagsChildren as $parent_tag => $children)
-			foreach($children as $index => $child_tag)
+		foreach ($bbcTagsChildren as $parent_tag => $children)
+			foreach ($children as $index => $child_tag)
 			{
 				// Remove entries where parent and child tag is the same
 				if ($child_tag == $parent_tag)
@@ -1877,25 +1877,25 @@ 
 		$fields = array();
 		$new_sort = array();
 
-		while($row = $smcFunc['db_fetch_assoc']($request))
+		while ($row = $smcFunc['db_fetch_assoc']($request))
 				$fields[] = $row['id_field'];
 		$smcFunc['db_free_result']($request);
 
 		$idx = array_search($context['fid'], $fields);
 
-		if ($_GET['move'] == 'down' && count($fields) - 1 > $idx )
+		if ($_GET['move'] == 'down' && count($fields) - 1 > $idx)
 		{
-				$new_sort = array_slice($fields ,0 ,$idx ,true);
+				$new_sort = array_slice($fields, 0, $idx, true);
 				$new_sort[] = $fields[$idx + 1];
 				$new_sort[] = $fields[$idx];
-				$new_sort += array_slice($fields ,$idx + 2 ,count($fields) ,true);
+				$new_sort += array_slice($fields, $idx + 2, count($fields), true);
 		}
 		elseif ($context['fid'] > 0 and $idx < count($fields))
 		{
-				$new_sort = array_slice($fields ,0 ,($idx - 1) ,true);
+				$new_sort = array_slice($fields, 0, ($idx - 1), true);
 				$new_sort[] = $fields[$idx];
 				$new_sort[] = $fields[$idx - 1];
-				$new_sort += array_slice($fields ,($idx + 1) ,count($fields) ,true);
+				$new_sort += array_slice($fields, ($idx + 1), count($fields), true);
 		}
 		else
 			redirectexit('action=admin;area=featuresettings;sa=profile'); // @todo implement an error handler

Sources/Display.php

Spacing +17 added lines, -17 removed lines

@@ -1535,14 +1535,14 @@ 
 	$output['quickbuttons'] = array(
 		'quote' => array(
 			'label' => $txt['quote_action'],
-			'href' => $scripturl.'?action=post;quote='.$output['id'].';topic='.$context['current_topic'], '.'.$context['start'].';last_msg='.$context['topic_last_message'],
-			'javascript' => 'onclick="return oQuickReply.quote('.$output['id'].');"',
+			'href' => $scripturl . '?action=post;quote=' . $output['id'] . ';topic=' . $context['current_topic'], '.' . $context['start'] . ';last_msg=' . $context['topic_last_message'],
+			'javascript' => 'onclick="return oQuickReply.quote(' . $output['id'] . ');"',
 			'icon' => 'quote',
 			'show' => $context['can_quote']
 		),
 		'quote_selected' => array(
 			'label' => $txt['quote_selected_action'],
-			'id' => 'quoteSelected_'. $output['id'],
+			'id' => 'quoteSelected_' . $output['id'],
 			'href' => 'javascript:void(0)',
 			'custom' => 'style="display:none"',
 			'icon' => 'quote_selected',
@@ -1551,74 +1551,74 @@ 
 		'quick_edit' => array(
 			'label' => $txt['quick_edit'],
 			'class' => 'quick_edit',
-			'id' => 'modify_button_'. $output['id'],
-			'custom' => 'onclick="oQuickModify.modifyMsg(\''.$output['id'].'\', \''.!empty($modSettings['toggle_subject']).'\')"',
+			'id' => 'modify_button_' . $output['id'],
+			'custom' => 'onclick="oQuickModify.modifyMsg(\'' . $output['id'] . '\', \'' . !empty($modSettings['toggle_subject']) . '\')"',
 			'icon' => 'quick_edit_button',
 			'show' => $output['can_modify']
 		),
 		'more' => array(
 			'modify' => array(
 				'label' => $txt['modify'],
-				'href' => $scripturl.'?action=post;msg='.$output['id'].';topic='.$context['current_topic'].'.'.$context['start'],
+				'href' => $scripturl . '?action=post;msg=' . $output['id'] . ';topic=' . $context['current_topic'] . '.' . $context['start'],
 				'icon' => 'modify_button',
 				'show' => $output['can_modify']
 			),
 			'remove_topic' => array(
 				'label' => $txt['remove_topic'],
-				'href' => $scripturl.'?action=removetopic2;topic='.$context['current_topic'].'.'.$context['start'].';'.$context['session_var'].'='.$context['session_id'],
-				'javascript' => 'data-confirm="'.$txt['are_sure_remove_topic'].'"',
+				'href' => $scripturl . '?action=removetopic2;topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'],
+				'javascript' => 'data-confirm="' . $txt['are_sure_remove_topic'] . '"',
 				'class' => 'you_sure',
 				'icon' => 'remove_button',
 				'show' => $context['can_delete'] && ($context['topic_first_message'] == $output['id'])
 			),
 			'remove' => array(
 				'label' => $txt['remove'],
-				'href' => $scripturl.'?action=deletemsg;topic='.$context['current_topic'].'.'.$context['start'].';msg='.$output['id'].';'.$context['session_var'].'='.$context['session_id'],
-				'javascript' => 'data-confirm="'.$txt['remove_message_question'].'"',
+				'href' => $scripturl . '?action=deletemsg;topic=' . $context['current_topic'] . '.' . $context['start'] . ';msg=' . $output['id'] . ';' . $context['session_var'] . '=' . $context['session_id'],
+				'javascript' => 'data-confirm="' . $txt['remove_message_question'] . '"',
 				'class' => 'you_sure',
 				'icon' => 'remove_button',
 				'show' => $output['can_remove'] && ($context['topic_first_message'] != $output['id'])
 			),
 			'split' => array(
 				'label' => $txt['split'],
-				'href' => $scripturl.'?action=splittopics;topic='.$context['current_topic'].'.0;at='.$output['id'],
+				'href' => $scripturl . '?action=splittopics;topic=' . $context['current_topic'] . '.0;at=' . $output['id'],
 				'icon' => 'split_button',
 				'show' => $context['can_split'] && !empty($context['real_num_replies'])
 			),
 			'report' => array(
 				'label' => $txt['report_to_mod'],
-				'href' => $scripturl.'?action=reporttm;topic='.$context['current_topic'].'.'.$output['counter'].';msg='.$output['id'],
+				'href' => $scripturl . '?action=reporttm;topic=' . $context['current_topic'] . '.' . $output['counter'] . ';msg=' . $output['id'],
 				'icon' => 'error',
 				'show' => $context['can_report_moderator']
 			),
 			'warn' => array(
 				'label' => $txt['issue_warning'],
-				'href' => $scripturl.'?action=profile;area=issuewarning;u='.$output['member']['id'].';msg='.$output['id'],
+				'href' => $scripturl . '?action=profile;area=issuewarning;u=' . $output['member']['id'] . ';msg=' . $output['id'],
 				'icon' => 'warn_button',
 				'show' => $context['can_issue_warning'] && !$output['is_message_author'] && !$output['member']['is_guest']
 			),
 			'restore' => array(
 				'label' => $txt['restore_message'],
-				'href' => $scripturl.'?action=restoretopic;msgs='.$output['id'].';'.$context['session_var'].'='.$context['session_id'],
+				'href' => $scripturl . '?action=restoretopic;msgs=' . $output['id'] . ';' . $context['session_var'] . '=' . $context['session_id'],
 				'icon' => 'restore_button',
 				'show' => $context['can_restore_msg']
 			),
 			'approve' => array(
 				'label' => $txt['approve'],
-				'href' => $scripturl.'?action=moderate;area=postmod;sa=approve;topic='.$context['current_topic'].'.'.$context['start'].';msg='.$output['id'].';'.$context['session_var'].'='.$context['session_id'],
+				'href' => $scripturl . '?action=moderate;area=postmod;sa=approve;topic=' . $context['current_topic'] . '.' . $context['start'] . ';msg=' . $output['id'] . ';' . $context['session_var'] . '=' . $context['session_id'],
 				'icon' => 'approve_button',
 				'show' => $output['can_approve']
 			),
 			'unapprove' => array(
 				'label' => $txt['unapprove'],
-				'href' => $scripturl.'?action=moderate;area=postmod;sa=approve;topic='.$context['current_topic'].'.'.$context['start'].';msg='.$output['id'].';'.$context['session_var'].'='.$context['session_id'],
+				'href' => $scripturl . '?action=moderate;area=postmod;sa=approve;topic=' . $context['current_topic'] . '.' . $context['start'] . ';msg=' . $output['id'] . ';' . $context['session_var'] . '=' . $context['session_id'],
 				'icon' => 'unapprove_button',
 				'show' => $output['can_unapprove']
 			),
 		),
 		'quickmod' => array(
 			'class' => 'inline_mod_check',
-			'id' => 'in_topic_mod_check_'. $output['id'],
+			'id' => 'in_topic_mod_check_' . $output['id'],
 			'custom' => 'style="display: none;"',
 			'content' => '',
 			'show' => !empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && $output['can_remove']

Themes/default/Profile.template.php

Spacing +2 added lines, -3 removed lines

@@ -1721,7 +1721,7 @@ 
 		{
 			// Avoid double separators and empty titled sections
 			$empty_section = true;
-			for ($j=$i+1; $j < count($context['theme_options']); $j++)
+			for ($j = $i + 1; $j < count($context['theme_options']); $j++)
 			{
 				// Found another separator, so we're done
 				if (!is_array($context['theme_options'][$j]))
@@ -2700,8 +2700,7 @@ 
 		foreach ($context['post_errors'] as $error)
 		{
 			$text_key_error = $error == 'password_short' ?
-				sprintf($txt['profile_error_' . $error], (empty($modSettings['password_strength']) ? 4 : 8)) :
-				(isset($txt['profile_error_' . $error]) ? $txt['profile_error_' . $error] : '');
+				sprintf($txt['profile_error_' . $error], (empty($modSettings['password_strength']) ? 4 : 8)) : (isset($txt['profile_error_' . $error]) ? $txt['profile_error_' . $error] : '');
 
 			echo '
 				<li>', isset($txt['profile_error_' . $error]) ? $text_key_error : $error, '</li>';

Sources/ManageSearchEngines.php

Braces +2 added lines, -1 removed lines

@@ -807,7 +807,8 @@
 			{
 				$context['spider_logs']['rows'][$k]['data']['viewing']['value'] = $txt[$new_url['label']];
 				$context['spider_logs']['rows'][$k]['data']['viewing']['class'] = $new_url['class'];
-			} else
+			}
+			else
 				$context['spider_logs']['rows'][$k]['data']['viewing']['value'] = $new_url;
 		}
 	}

Sources/MessageIndex.php

Spacing +1 added lines, -1 removed lines

@@ -340,7 +340,7 @@
 		WHERE t.id_board = {int:current_board} '
 			. (!$modSettings['postmod_active'] || $context['can_approve_posts'] ? '' : '
 			AND (t.approved = {int:is_approved}' . ($user_info['is_guest'] ? '' : ' OR t.id_member_started = {int:current_member}') . ')') . (!empty($message_index_topic_wheres) ? '
-			AND ' . implode("\n\t\t\t\tAND ", $message_index_topic_wheres) : ''). '
+			AND ' . implode("\n\t\t\t\tAND ", $message_index_topic_wheres) : '') . '
 		ORDER BY is_sticky' . ($fake_ascending ? '' : ' DESC') . ', ' . $_REQUEST['sort'] . ($ascending ? '' : ' DESC') . '
 		LIMIT {int:maxindex}
 			OFFSET {int:start} ';

Sources/Post.php

Spacing +1 added lines, -1 removed lines

@@ -1283,7 +1283,7 @@
 	if ($context['can_post_attachment'])
 	{
 		$acceptedFiles = empty($context['allowed_extensions']) ? '' : implode(',', array_map(
-			function ($val) use ($smcFunc)
+			function($val) use ($smcFunc)
 			{
 				return !empty($val) ? ('.' . $smcFunc['htmltrim']($val)) : '';
 			},

Sources/News.php

Indentation +1 added lines, -1 removed lines

@@ -2205,7 +2205,7 @@
 					function($a, $b)
 					{
 						if ($a['filesize'] == $b['filesize'])
-					        return 0;
+							return 0;
 
 						return ($a['filesize'] < $b['filesize']) ? -1 : 1;
 					}

Spacing +8 added lines, -8 removed lines

@@ -91,7 +91,7 @@ 
 	);
 	foreach (array('action', 'sa', 'type', 'board', 'boards', 'c', 'u', 'limit', 'offset') as $var)
 		if (isset($_GET[$var]))
-			$feed_meta['self'] .= ($feed_meta['self'] === $scripturl ? '?' : ';' ) . $var . '=' . $_GET[$var];
+			$feed_meta['self'] .= ($feed_meta['self'] === $scripturl ? '?' : ';') . $var . '=' . $_GET[$var];
 
 	// Handle the cases where a board, boards, or category is asked for.
 	$query_this_board = 1;
@@ -303,17 +303,17 @@ 
 	 * namespaces, which could cause it to mangle the XML horrifically
 	 * during processing.
 	 */
-	$smf_ns = 'htt'.'p:/'.'/ww'.'w.simple'.'machines.o'.'rg/xml/' . $subaction;
+	$smf_ns = 'htt' . 'p:/' . '/ww' . 'w.simple' . 'machines.o' . 'rg/xml/' . $subaction;
 
 	// Allow mods to add extra namespaces and tags to the feed/channel
 	$namespaces = array(
 		'rss' => array(),
-		'rss2' => array('atom' => 'htt'.'p:/'.'/ww'.'w.w3.o'.'rg/2005/Atom'),
-		'atom' => array('' => 'htt'.'p:/'.'/ww'.'w.w3.o'.'rg/2005/Atom'),
+		'rss2' => array('atom' => 'htt' . 'p:/' . '/ww' . 'w.w3.o' . 'rg/2005/Atom'),
+		'atom' => array('' => 'htt' . 'p:/' . '/ww' . 'w.w3.o' . 'rg/2005/Atom'),
 		'rdf' => array(
-			'' => 'htt'.'p:/'.'/purl.o'.'rg/rss/1.0/',
-			'rdf' => 'htt'.'p:/'.'/ww'.'w.w3.o'.'rg/1999/02/22-rdf-syntax-ns#',
-			'dc' => 'htt'.'p:/'.'/purl.o'.'rg/dc/elements/1.1/',
+			'' => 'htt' . 'p:/' . '/purl.o' . 'rg/rss/1.0/',
+			'rdf' => 'htt' . 'p:/' . '/ww' . 'w.w3.o' . 'rg/1999/02/22-rdf-syntax-ns#',
+			'dc' => 'htt' . 'p:/' . '/purl.o' . 'rg/dc/elements/1.1/',
 		),
 		'smf' => array(
 			'smf' => $smf_ns,
@@ -2141,7 +2141,7 @@ 
 			m.id_msg, m.id_topic, m.id_board, m.id_member, m.poster_email, m.poster_ip,
 			m.poster_time, m.subject, m.modified_time, m.modified_name, m.modified_reason, m.body,
 			m.likes, m.approved, m.smileys_enabled
-		FROM {db_prefix}messages AS m' . ($modSettings['postmod_active'] && !$show_all ?'
+		FROM {db_prefix}messages AS m' . ($modSettings['postmod_active'] && !$show_all ? '
 			INNER JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic)' : '') . '
 		WHERE m.id_member = {int:uid}
 			AND m.id_msg > {int:start_after}

Sources/ManagePermissions.php

Spacing +1 added lines, -1 removed lines

@@ -1840,7 +1840,7 @@
 		// Make sure this is an array of integers
 		$excluded_groups = array_filter(
 			(array) $excluded_groups,
-			function ($v)
+			function($v)
 			{
 				return is_int($v) || is_string($v) && (string) intval($v) === $v;
 			}

Sources/tasks/CreatePost-Notify.php

Braces +2 added lines, -1 removed lines

@@ -174,7 +174,8 @@
 			}
 		}
 
-		$unnotified = array_filter($this->members['watching'], function ($member) {
+		$unnotified = array_filter($this->members['watching'], function ($member)
+		{
 			return empty($member['sent']);
 		});
 

Spacing +4 added lines, -6 removed lines

@@ -187,7 +187,7 @@ 
 			}
 		}
 
-		$unnotified = array_filter($this->members['watching'], function ($member) {
+		$unnotified = array_filter($this->members['watching'], function($member) {
 			return empty($member['sent']);
 		});
 
@@ -196,7 +196,7 @@ 
 		if ($type == 'edit' || !empty($this->_details['respawns']))
 		{
 			// Notifications about modified posts only go to members who were mentioned or quoted
-			$this->members['watching'] = $type == 'edit' ? array(): $unnotified;
+			$this->members['watching'] = $type == 'edit' ? array() : $unnotified;
 
 			// If this post has no quotes or mentions, just delete any obsolete alerts and bail out.
 			if (empty($this->members['quoted']) && empty($this->members['mentioned']))
@@ -512,8 +512,7 @@ 
 			if (!empty($member_data['id_topic']) && $type != 'topic' && !empty($this->prefs[$member_id]))
 			{
 				$pref = !empty($this->prefs[$member_id]['topic_notify_' . $topicOptions['id']]) ?
-					$this->prefs[$member_id]['topic_notify_' . $topicOptions['id']] :
-					(!empty($this->prefs[$member_id]['topic_notify']) ? $this->prefs[$member_id]['topic_notify'] : 0);
+					$this->prefs[$member_id]['topic_notify_' . $topicOptions['id']] : (!empty($this->prefs[$member_id]['topic_notify']) ? $this->prefs[$member_id]['topic_notify'] : 0);
 
 				$message_type = 'notification_' . $type;
 
@@ -532,8 +531,7 @@ 
 			elseif ($type == 'topic')
 			{
 				$pref = !empty($this->prefs[$member_id]['board_notify_' . $topicOptions['board']]) ?
-					$this->prefs[$member_id]['board_notify_' . $topicOptions['board']] :
-					(!empty($this->prefs[$member_id]['board_notify']) ? $this->prefs[$member_id]['board_notify'] : 0);
+					$this->prefs[$member_id]['board_notify_' . $topicOptions['board']] : (!empty($this->prefs[$member_id]['board_notify']) ? $this->prefs[$member_id]['board_notify'] : 0);
 
 				$content_type = 'board';