albertlast / SMF2.1

cron.php

Indentation +1 added lines, -1 removed lines

@@ -310,7 +310,7 @@
 {
 	/**
 	 * Constants for notification types.
-	*/
+	 */
 	const RECEIVE_NOTIFY_EMAIL = 0x02;
 	const RECEIVE_NOTIFY_ALERT = 0x01;
 

Braces -1 removed lines

@@ -93,7 +93,6 @@
 	if ($ts <= 0 || $ts % 15 != 0 || time() - $ts < 0 || time() - $ts > 20)
 		obExit_cron();
 }
-
 else
 	$_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.0';
 

Sources/News.php

Indentation +1 added lines, -1 removed lines

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

Spacing +7 added lines, -7 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,

Braces +2 added lines, -1 removed lines

@@ -2167,7 +2167,8 @@
 			// Sort the attachments by size to make things easier below
 			if (!empty($loaded_attachments))
 			{
-				uasort($loaded_attachments, function($a, $b) {
+				uasort($loaded_attachments, function($a, $b)
+				{
 					if ($a['filesize'] == $b['filesize'])
 					        return 0;
 					return ($a['filesize'] < $b['filesize']) ? -1 : 1;

Sources/Profile-Export.php

Spacing +9 added lines, -9 removed lines

@@ -468,7 +468,7 @@ 
 
 	// Figure out the filename we'll tell the browser.
 	$datatypes = file_exists($progressfile) ? array_keys($smcFunc['json_decode'](file_get_contents($progressfile), true)) : array('profile');
-	$included_desc = array_map(function ($datatype) use ($txt) { return $txt[$datatype]; }, $datatypes);
+	$included_desc = array_map(function($datatype) use ($txt) { return $txt[$datatype]; }, $datatypes);
 
 	$dlfilename = array_merge(array($context['forum_name'], $context['member']['username']), $included_desc);
 	$dlfilename = preg_replace('/[^\p{L}\p{M}\p{N}_]+/u', '-', str_replace('"', '', un_htmlspecialchars(strip_tags(implode('_', $dlfilename)))));
@@ -783,9 +783,9 @@ 
 	$xslt_variables = array();
 
 	// Do not change any of these to HTTPS URLs. For explanation, see comments in the buildXmlFeed() function.
-	$smf_ns = 'htt'.'p:/'.'/ww'.'w.simple'.'machines.o'.'rg/xml/profile';
-	$xslt_ns = 'htt'.'p:/'.'/ww'.'w.w3.o'.'rg/1999/XSL/Transform';
-	$html_ns = 'htt'.'p:/'.'/ww'.'w.w3.o'.'rg/1999/xhtml';
+	$smf_ns = 'htt' . 'p:/' . '/ww' . 'w.simple' . 'machines.o' . 'rg/xml/profile';
+	$xslt_ns = 'htt' . 'p:/' . '/ww' . 'w.w3.o' . 'rg/1999/XSL/Transform';
+	$html_ns = 'htt' . 'p:/' . '/ww' . 'w.w3.o' . 'rg/1999/xhtml';
 
 	require_once($sourcedir . DIRECTORY_SEPARATOR . 'News.php');
 
@@ -1690,14 +1690,14 @@ 
 
 		if (!empty($context['export_css_header']))
 		{
-			$stylesheet['css_js'] .=  '
+			$stylesheet['css_js'] .= '
 			<style><![CDATA[' . "\n" . implode("\n", $context['export_css_header']) . "\n" . ']]>
 			</style>';
 		}
 
 		if (!empty($context['export_javascript_vars']))
 		{
-			$stylesheet['css_js'] .=  '
+			$stylesheet['css_js'] .= '
 			<script><![CDATA[';
 
 			foreach ($context['export_javascript_vars'] as $var => $val)
@@ -1733,7 +1733,7 @@ 
 
 		if (!empty($context['export_javascript_inline']['standard']))
 		{
-			$stylesheet['css_js'] .=  '
+			$stylesheet['css_js'] .= '
 			<script><![CDATA[' . "\n" . implode("\n", $context['export_javascript_inline']['standard']) . "\n" . ']]>
 			</script>';
 		}
@@ -1745,7 +1745,7 @@ 
 
 			$stylesheet['css_js'] .= "\n\t" . str_replace("\n", "\n\t", implode("\n", $context['export_javascript_inline']['defer']));
 
-			$stylesheet['css_js'] .= "\n" . '});'. "\n" . ']]>
+			$stylesheet['css_js'] .= "\n" . '});' . "\n" . ']]>
 			</script>';
 		}
 
@@ -1826,7 +1826,7 @@ 
 	$css_to_minify = array();
 	$normal_css_files = array();
 
-	usort($context['css_files'], function ($a, $b)
+	usort($context['css_files'], function($a, $b)
 	{
 		return $a['options']['order_pos'] < $b['options']['order_pos'] ? -1 : ($a['options']['order_pos'] > $b['options']['order_pos'] ? 1 : 0);
 	});

Braces +3 added lines, -1 removed lines

@@ -468,7 +468,9 @@
 
 	// Figure out the filename we'll tell the browser.
 	$datatypes = file_exists($progressfile) ? array_keys($smcFunc['json_decode'](file_get_contents($progressfile), true)) : array('profile');
-	$included_desc = array_map(function ($datatype) use ($txt) { return $txt[$datatype]; }, $datatypes);
+	$included_desc = array_map(function ($datatype) use ($txt)
+	{
+return $txt[$datatype]; }, $datatypes);
 
 	$dlfilename = array_merge(array($context['forum_name'], $context['member']['username']), $included_desc);
 	$dlfilename = preg_replace('/[^\p{L}\p{M}\p{N}_]+/u', '-', str_replace('"', '', un_htmlspecialchars(strip_tags(implode('_', $dlfilename)))));

Sources/Drafts.php

Spacing +6 added lines, -6 removed lines

@@ -644,13 +644,13 @@ 
 			'quickbuttons' => array(
 				'edit' => array(
 					'label' => $txt['draft_edit'],
-					'href' => $scripturl.'?action=post;'.(empty($row['id_topic']) ? 'board='.$row['id_board'] : 'topic='.$row['id_topic']).'.0;id_draft='.$row['id_draft'],
+					'href' => $scripturl . '?action=post;' . (empty($row['id_topic']) ? 'board=' . $row['id_board'] : 'topic=' . $row['id_topic']) . '.0;id_draft=' . $row['id_draft'],
 					'icon' => 'modify_button'
 				),
 				'delete' => array(
 					'label' => $txt['draft_delete'],
-					'href' => $scripturl.'?action=profile;u='.$context['member']['id'].';area=showdrafts;delete='.$row['id_draft'].';'.$context['session_var'].'='.$context['session_id'],
-					'javascript' => 'data-confirm="'.$txt['draft_remove'].'"',
+					'href' => $scripturl . '?action=profile;u=' . $context['member']['id'] . ';area=showdrafts;delete=' . $row['id_draft'] . ';' . $context['session_var'] . '=' . $context['session_id'],
+					'javascript' => 'data-confirm="' . $txt['draft_remove'] . '"',
 					'class' => 'you_sure',
 					'icon' => 'remove_button'
 				),
@@ -837,13 +837,13 @@ 
 			'quickbuttons' => array(
 				'edit' => array(
 					'label' => $txt['draft_edit'],
-					'href' => $scripturl.'?action=pm;sa=showpmdrafts;id_draft='.$row['id_draft'].';'.$context['session_var'].'='.$context['session_id'],
+					'href' => $scripturl . '?action=pm;sa=showpmdrafts;id_draft=' . $row['id_draft'] . ';' . $context['session_var'] . '=' . $context['session_id'],
 					'icon' => 'modify_button'
 				),
 				'delete' => array(
 					'label' => $txt['draft_delete'],
-					'href' => $scripturl.'?action=pm;sa=showpmdrafts;delete='.$row['id_draft'].';'.$context['session_var'].'='.$context['session_id'],
-					'javascript' => 'data-confirm="'.$txt['draft_remove'].'?"',
+					'href' => $scripturl . '?action=pm;sa=showpmdrafts;delete=' . $row['id_draft'] . ';' . $context['session_var'] . '=' . $context['session_id'],
+					'javascript' => 'data-confirm="' . $txt['draft_remove'] . '?"',
 					'class' => 'you_sure',
 					'icon' => 'remove_button'
 				),

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

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 +6 added lines, -9 removed lines

@@ -814,7 +814,7 @@ 
 			'filename' => empty($user_settings['filename']) ? '' : $user_settings['filename'],
 			'custom_dir' => !empty($user_settings['attachment_type']) && $user_settings['attachment_type'] == 1,
 			'id_attach' => isset($user_settings['id_attach']) ? $user_settings['id_attach'] : 0,
-			'width' => isset($user_settings['attachment_width']) > 0 ? $user_settings['attachment_width']: 0,
+			'width' => isset($user_settings['attachment_width']) > 0 ? $user_settings['attachment_width'] : 0,
 			'height' => isset($user_settings['attachment_height']) > 0 ? $user_settings['attachment_height'] : 0,
 		),
 		'smiley_set' => isset($user_settings['smiley_set']) ? $user_settings['smiley_set'] : '',
@@ -1755,7 +1755,7 @@ 
 		if (!empty($image))
 			$memberContext[$user]['avatar'] = array(
 				'name' => $profile['avatar'],
-				'image' => '<img class="avatar" src="' . $image . '" alt="" loading="lazy" width="' . $profile['attachment_width'] . '" height = "'. $profile['attachment_height'] . '">',
+				'image' => '<img class="avatar" src="' . $image . '" alt="" loading="lazy" width="' . $profile['attachment_width'] . '" height = "' . $profile['attachment_height'] . '">',
 				'href' => $image,
 				'url' => $image,
 			);
@@ -2720,8 +2720,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;
@@ -2835,8 +2834,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;
@@ -3579,8 +3577,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))
@@ -3884,7 +3881,7 @@ 
 			$auth_secret = hash_file('sha256', $boarddir . '/Settings.php');
 
 			// Set the last error to now, but only every 15 minutes.  Don't need to flood the logs.
-			if (empty($db_last_error) || ($db_last_error + 60*15) <= time())
+			if (empty($db_last_error) || ($db_last_error + 60 * 15) <= time())
 			{
 				updateDbLastError(time());
 				loadLanguage('Errors');

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']);

Braces +3 added lines, -6 removed lines

@@ -64,8 +64,7 @@ 
 			&& !empty($_SERVER['HTTP_X_SMF_AJAX'])
 			&& isset($_REQUEST['ajax'])
 		)
-	)
-	{
+	) {
 		$context['from_ajax'] = true;
 		$context['template_layers'] = array();
 	}
@@ -137,8 +136,7 @@ 
 			&& !empty($_SERVER['HTTP_X_SMF_AJAX'])
 			&& isset($_REQUEST['ajax'])
 		)
-	)
-	{
+	) {
 		$context['from_ajax'] = true;
 		$context['template_layers'] = array();
 	}
@@ -517,8 +515,7 @@ 
 			&& !empty($_SERVER['HTTP_X_SMF_AJAX'])
 			&& isset($_REQUEST['ajax'])
 		)
-	)
-	{
+	) {
 		$context['from_ajax'] = true;
 		$context['template_layers'] = array();
 	}