albertlast / SMF2.1

Sources/ManageErrors.php

Spacing +2 added lines, -2 removed lines

@@ -355,8 +355,8 @@
 	elseif (isset($_POST['delall']) && isset($filter))
 	{
 		// ip need a different placeholder type
-		$filter_type = $filter['variable'] == 'ip'? 'inet' : 'string';
-		$filter_op = $filter['variable'] == 'ip'? '=' : 'LIKE';
+		$filter_type = $filter['variable'] == 'ip' ? 'inet' : 'string';
+		$filter_op = $filter['variable'] == 'ip' ? '=' : 'LIKE';
 		$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}log_errors
 			WHERE ' . $filter['variable'] . ' ' . $filter_op . ' {' . $filter_type . ':filter}',

Sources/Help.php

Braces +2 added lines, -1 removed lines

@@ -163,7 +163,8 @@
 	else
 		$context['help_text'] = $_GET['help'];
 
-	switch ($_GET['help']) {
+	switch ($_GET['help'])
+	{
 		case 'cal_short_months':
 			$context['help_text'] = sprintf($context['help_text'], $txt['months_short'][1], $txt['months_titles'][1]);
 			break;

Sources/Profile-View.php

Spacing +5 added lines, -5 removed lines

@@ -261,7 +261,7 @@ 
 			AND a.is_read = 0' : '') . (!empty($alertIDs) ? '
 			AND a.id_alert IN ({array_int:alertIDs})' : '') . '
 		ORDER BY id_alert DESC' . (!empty($limit) ? '
-		LIMIT {int:limit}' : '') . (!empty($offset) ?'
+		LIMIT {int:limit}' : '') . (!empty($offset) ? '
 		OFFSET {int:offset}' : ''),
 		array(
 			'id_member' => $memID,
@@ -1160,20 +1160,20 @@ 
 		$context['posts'][$key]['quickbuttons'] = array(
 			'reply' => array(
 				'label' => $txt['reply'],
-				'href' => $scripturl.'?action=post;topic='.$post['topic'].'.'.$post['start'],
+				'href' => $scripturl . '?action=post;topic=' . $post['topic'] . '.' . $post['start'],
 				'icon' => 'reply_button',
 				'show' => $post['can_reply']
 			),
 			'quote' => array(
 				'label' => $txt['quote_action'],
-				'href' => $scripturl.'?action=post;topic='.$post['topic'].'.'.$post['start'].';quote='.$post['id'],
+				'href' => $scripturl . '?action=post;topic=' . $post['topic'] . '.' . $post['start'] . ';quote=' . $post['id'],
 				'icon' => 'quote',
 				'show' => $post['can_quote']
 			),
 			'remove' => array(
 				'label' => $txt['remove'],
-				'href' => $scripturl.'?action=deletemsg;msg='.$post['id'].';topic='.$post['topic'].';profile;u='.$context['member']['id'].';start='.$context['start'].';'.$context['session_var'].'='.$context['session_id'],
-				'javascript' => 'data-confirm="'.$txt['remove_message'].'"',
+				'href' => $scripturl . '?action=deletemsg;msg=' . $post['id'] . ';topic=' . $post['topic'] . ';profile;u=' . $context['member']['id'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'],
+				'javascript' => 'data-confirm="' . $txt['remove_message'] . '"',
 				'class' => 'you_sure',
 				'icon' => 'remove_button',
 				'show' => $post['can_delete']

Sources/tasks/ExportProfileData.php

Spacing +2 added lines, -2 removed lines

@@ -203,7 +203,7 @@ 
 
 		$feed_meta = array(
 			'title' => sprintf($txt['profile_of_username'], $user_profile[$uid]['real_name']),
-			'desc' => sentence_list(array_map(function ($datatype) use ($txt) { return $txt[$datatype]; }, array_keys($included))),
+			'desc' => sentence_list(array_map(function($datatype) use ($txt) { return $txt[$datatype]; }, array_keys($included))),
 			'author' => $mbname,
 			'source' => $scripturl . '?action=profile;u=' . $uid,
 			'self' => '', // Unused, but can't be null.
@@ -723,7 +723,7 @@ 
 					'src' => 'src="' . $currentAttachment['href'] . '" onerror="$(\'.dlattach_' . $currentAttachment['id'] . '\').show(); $(\'.dlattach_' . $currentAttachment['id'] . '\').css({\'position\': \'absolute\'});"',
 				),
 				$returnContext
-			) . $hidden_orig_link . '</span>' ;
+			) . $hidden_orig_link . '</span>';
 		}
 		elseif (strpos($currentAttachment['mime_type'], 'video/') === 0)
 		{

Braces +3 added lines, -1 removed lines

@@ -203,7 +203,9 @@
 
 		$feed_meta = array(
 			'title' => sprintf($txt['profile_of_username'], $user_profile[$uid]['real_name']),
-			'desc' => sentence_list(array_map(function ($datatype) use ($txt) { return $txt[$datatype]; }, array_keys($included))),
+			'desc' => sentence_list(array_map(function ($datatype) use ($txt)
+			{
+return $txt[$datatype]; }, array_keys($included))),
 			'author' => $mbname,
 			'source' => $scripturl . '?action=profile;u=' . $uid,
 			'self' => '', // Unused, but can't be null.

Themes/default/ModerationCenter.template.php

Spacing +4 added lines, -4 removed lines

@@ -393,17 +393,17 @@ 
 		$quickbuttons = array(
 			'approve' => array(
 				'label' => $txt['approve'],
-				'href' => $scripturl.'?action=moderate;area=postmod;sa='.$context['current_view'].';start='.$context['start'].';'.$context['session_var'].'='.$context['session_id'].';approve='.$item['id'],
+				'href' => $scripturl . '?action=moderate;area=postmod;sa=' . $context['current_view'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';approve=' . $item['id'],
 				'icon' => 'approve',
 			),
 			'delete' => array(
 				'label' => $txt['remove'],
-				'href' => $scripturl.'?action=moderate;area=postmod;sa='.$context['current_view'].';start='.$context['start'].';'.$context['session_var'].'='.$context['session_id'].';delete='.$item['id'],
+				'href' => $scripturl . '?action=moderate;area=postmod;sa=' . $context['current_view'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';delete=' . $item['id'],
 				'icon' => 'remove_button',
 				'show' => $item['can_delete']
 			),
 			'quickmod' => array(
-				'content' => '<input type="checkbox" name="item[]" value="'.$item['id'].'" checked>',
+				'content' => '<input type="checkbox" name="item[]" value="' . $item['id'] . '" checked>',
 				'show' => !empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1
 			),
 		);
@@ -468,7 +468,7 @@ 
 	$quickbuttons = array(
 		'delete' => array(
 			'label' => $txt['remove_message'],
-			'href' => $scripturl.'?action=moderate;area=userwatch;sa=post;delete='.$post['id'].';start='.$context['start'].';'.$context['session_var'].'='.$context['session_id'],
+			'href' => $scripturl . '?action=moderate;area=userwatch;sa=post;delete=' . $post['id'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'],
 			'javascript' => 'data-confirm="' . $txt['mc_watched_users_delete_post'] . '"',
 			'class' => 'you_sure',
 			'icon' => 'remove_button',

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)) :
-				$txt['profile_error_' . $error];
+				sprintf($txt['profile_error_' . $error], (empty($modSettings['password_strength']) ? 4 : 8)) : $txt['profile_error_' . $error];
 
 			echo '
 				<li>', isset($txt['profile_error_' . $error]) ? $text_key_error : $error, '</li>';

Sources/Load.php

Braces +1 added lines, -4 removed lines

@@ -104,7 +104,7 @@ 
 	// Set a list of common functions.
 	$ent_list = '&(?:#' . (empty($modSettings['disableEntityCheck']) ? '\d{1,7}' : '021') . '|quot|amp|lt|gt|nbsp);';
 	$ent_check = empty($modSettings['disableEntityCheck']) ? function($string)
-		{
+	{
 			$string = preg_replace_callback('~(&#(\d{1,7}|x[0-9a-fA-F]{1,6});)~', 'entity_fix__callback', $string);
 			return $string;
 		} : function($string)
@@ -929,7 +929,6 @@ 
 			$user_info_min[$row['id_member']]['time_offset'] = ($tz_user->getOffset($time_user) -
 					$tz_system->getOffset($time_system)) / 3600;
 		}
-
 		else
 			$user_info_min[$row['id_member']]['time_offset'] = empty($row['time_offset']) ? 0 : $row['time_offset'];
 	}
@@ -1657,7 +1656,6 @@ 
 			$time_user = new DateTime('now', $tz_user);
 			$profile['time_offset'] = ($tz_user->getOffset($time_user) - $tz_system->getOffset($time_system)) / 3600;
 		}
-
 		else
 		{
 			// !!! Compatibility.
@@ -2351,7 +2349,6 @@ 
 		loadLanguage('index+Modifications');
 		$context['template_layers'] = array();
 	}
-
 	else
 	{
 		// Custom templates to load, or just default?

Spacing +3 added lines, -6 removed lines

@@ -2718,8 +2718,7 @@ 
 		$context['css_files_order'] = array();
 
 	$params['seed'] = (!array_key_exists('seed', $params) || (array_key_exists('seed', $params) && $params['seed'] === true)) ?
-		(array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') :
-		(is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : '');
+		(array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') : (is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : '');
 	$params['force_current'] = isset($params['force_current']) ? $params['force_current'] : false;
 	$themeRef = !empty($params['default_theme']) ? 'default_theme' : 'theme';
 	$params['minimize'] = isset($params['minimize']) ? $params['minimize'] : true;
@@ -2833,8 +2832,7 @@ 
 	global $settings, $context, $modSettings;
 
 	$params['seed'] = (!array_key_exists('seed', $params) || (array_key_exists('seed', $params) && $params['seed'] === true)) ?
-		(array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') :
-		(is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : '');
+		(array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') : (is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : '');
 	$params['force_current'] = isset($params['force_current']) ? $params['force_current'] : false;
 	$themeRef = !empty($params['default_theme']) ? 'default_theme' : 'theme';
 	$params['async'] = isset($params['async']) ? $params['async'] : false;
@@ -3577,8 +3575,7 @@ 
 
 	// What accelerator we are going to try.
 	$cache_class_name = !empty($cache_accelerator) ? $cache_accelerator : CacheApi::APIS_DEFAULT;
-	$fully_qualified_class_name = !empty($overrideCache) ? $overrideCache :
-		CacheApi::APIS_NAMESPACE . $cache_class_name;
+	$fully_qualified_class_name = !empty($overrideCache) ? $overrideCache : CacheApi::APIS_NAMESPACE . $cache_class_name;
 
 	// Do some basic tests.
 	if (class_exists($fully_qualified_class_name))

Sources/ManageSettings.php

Spacing +6 added lines, -6 removed lines

@@ -1860,25 +1860,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/LogInOut.php

Spacing +1 added lines, -1 removed lines

@@ -320,7 +320,7 @@
 		{
 			// PHPBB 3 check this function exists in PHP 5.5 or higher
 			if (function_exists('password_verify'))
-				$other_passwords[] = password_verify($_POST['passwrd'],$user_settings['password_salt']);
+				$other_passwords[] = password_verify($_POST['passwrd'], $user_settings['password_salt']);
 
 			// PHP-Fusion
 			$other_passwords[] = hash_hmac('sha256', $_POST['passwrd'], $user_settings['password_salt']);