albertlast / SMF2.1

Sources/Post.php

Spacing +1 added lines, -1 removed lines

@@ -1282,7 +1282,7 @@
 	// File Upload.
 	if ($context['can_post_attachment'])
 	{
-		$acceptedFiles = implode(',', array_map(function ($val) use ($smcFunc)
+		$acceptedFiles = implode(',', array_map(function($val) use ($smcFunc)
 		{
 			return '.' . $smcFunc['htmltrim']($val);
 		}, explode(',', $context['allowed_extensions'])));

Sources/Profile.php

Spacing +1 added lines, -1 removed lines

@@ -619,7 +619,7 @@
 			if (!empty($modSettings['force_ssl']) && empty($maintenance) && !httpsOn())
 				fatal_lang_error('login_ssl_required', false);
 
-			$password = isset($_POST['oldpasswrd']) ? $_POST['oldpasswrd'] :  '';
+			$password = isset($_POST['oldpasswrd']) ? $_POST['oldpasswrd'] : '';
 
 			// You didn't even enter a password!
 			if (trim($password) == '')

Sources/Profile-View.php

Spacing +11 added lines, -11 removed lines

@@ -422,7 +422,7 @@ 
 		{
 			$extra = $alerts[$id_alert]['extra'];
 			$search = array('{member_link}', '{scripturl}');
-			$repl = array(!empty($alert['sender_id']) && $alert['show_links'] ? '<a href="' . $scripturl . '?action=profile;u=' . $alert['sender_id'] . '">' . $alert['sender_name'] . '</a>' : '<strong>'.$alert['sender_name'].'</strong>', $scripturl);
+			$repl = array(!empty($alert['sender_id']) && $alert['show_links'] ? '<a href="' . $scripturl . '?action=profile;u=' . $alert['sender_id'] . '">' . $alert['sender_name'] . '</a>' : '<strong>' . $alert['sender_name'] . '</strong>', $scripturl);
 
 			if (is_array($extra))
 			{
@@ -453,7 +453,7 @@ 
 	// Are we opening a specific alert ?
 	if (!empty($_REQUEST['alert']))
 	{
-		$alert_id = (int)$_REQUEST['alert'];
+		$alert_id = (int) $_REQUEST['alert'];
 		$request = $smcFunc['db_query']('', '
 			SELECT id_member, id_member_started, content_type, content_action, content_id, is_read, extra
 			FROM {db_prefix}user_alerts
@@ -466,10 +466,10 @@ 
 		$smcFunc['db_free_result']($request);
 
 		// Can the user see this alert ?
-		if($memID != $alert['id_member'])
+		if ($memID != $alert['id_member'])
 			redirectexit();
 
-		if(!empty($alert['extra']))
+		if (!empty($alert['extra']))
 			$alert['extra'] = $smcFunc['json_decode']($alert['extra'], true);
 
 		// Determine where the alert takes
@@ -540,17 +540,17 @@ 
 		$context['alerts'][$id]['quickbuttons'] = array(
 			'delete' => array(
 				'label' => $txt['delete'],
-				'href' => $scripturl.'?action=profile;u='.$context['id_member'].';area=showalerts;do=remove;aid='.$id.';'.$context['session_var'].'='.$context['session_id'],
+				'href' => $scripturl . '?action=profile;u=' . $context['id_member'] . ';area=showalerts;do=remove;aid=' . $id . ';' . $context['session_var'] . '=' . $context['session_id'],
 				'javascript' => 'class="you_sure"',
 				'icon' => 'remove_button'
 			),
 			'mark' => array(
 				'label' => $alert['is_read'] != 0 ? $txt['mark_unread'] : $txt['mark_read_short'],
-				'href' => $scripturl.'?action=profile;u='.$context['id_member'].';area=showalerts;do='.($alert['is_read'] != 0 ? 'unread' : 'read').';aid='.$id.';'.$context['session_var'].'='.$context['session_id'],
+				'href' => $scripturl . '?action=profile;u=' . $context['id_member'] . ';area=showalerts;do=' . ($alert['is_read'] != 0 ? 'unread' : 'read') . ';aid=' . $id . ';' . $context['session_var'] . '=' . $context['session_id'],
 				'icon' => $alert['is_read'] != 0 ? 'unread_button' : 'read_button',
 			),
 			'quickmod' => array(
-				'content' => '<input type="checkbox" name="mark['.$id.']" value="'.$id.'">',
+				'content' => '<input type="checkbox" name="mark[' . $id . ']" value="' . $id . '">',
 				'show' => $context['showCheckboxes']
 			)
 		);
@@ -963,20 +963,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'].'" class="you_sure"',
+				'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/Subs.php

Braces +3 added lines, -6 removed lines

@@ -302,7 +302,6 @@ 
 		$condition = 'id_member IN ({array_int:members})';
 		$parameters['members'] = $members;
 	}
-
 	elseif ($members === null)
 		$condition = '1=1';
 
@@ -1970,7 +1969,7 @@ 
 			'tag' => 'cowsay',
 			'parameters' => array(
 				'e' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => 'oo', 'validate' => function ($eyes) use ($smcFunc)
-					{
+				{
 						static $css_added;
 
 						if (empty($css_added))
@@ -1987,7 +1986,7 @@ 
 					},
 				),
 				't' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => '  ', 'validate' => function ($tongue) use ($smcFunc)
-					{
+				{
 						return $smcFunc['substr']($tongue . '  ', 0, 2);
 					},
 				),
@@ -3105,7 +3104,7 @@ 
 
 	// Replace away!
 	$message = preg_replace_callback($smileyPregSearch, function($matches) use ($smileyPregReplacements)
-		{
+	{
 			return $smileyPregReplacements[$matches[1]];
 		}, $message);
 }
@@ -3892,7 +3891,6 @@ 
 				if (!isset($minSeed) && isset($js_file['options']['seed']))
 					$minSeed = $js_file['options']['seed'];
 			}
-
 			else
 			{
 				echo '
@@ -6070,7 +6068,6 @@ 
 			$isWritable = true;
 			break;
 		}
-
 		else
 			@chmod($file, $val);
 	}

Spacing +32 added lines, -32 removed lines

@@ -391,7 +391,7 @@ 
 			{
 				$val = 'CASE ';
 				foreach ($members as $k => $v)
-					$val .= 'WHEN id_member = ' . $v . ' THEN '. alert_count($v, true) . ' ';
+					$val .= 'WHEN id_member = ' . $v . ' THEN ' . alert_count($v, true) . ' ';
 				$val = $val . ' END';
 				$type = 'raw';
 			}
@@ -979,11 +979,11 @@ 
 			// Anything that isn't a specification, punctuation mark, or whitespace.
 			'~(?<!%)\p{L}|[^\p{L}\p{P}\s]~u',
 			// A series of punctuation marks (except %), possibly separated by whitespace.
-			'~([^%\P{P}])(\s*)(?'.'>(\1|[^%\P{Po}])\s*(?!$))*~u',
+			'~([^%\P{P}])(\s*)(?' . '>(\1|[^%\P{Po}])\s*(?!$))*~u',
 			// Unwanted trailing punctuation and whitespace.
-			'~(?'.'>([\p{Pd}\p{Ps}\p{Pi}\p{Pc}]|[^%\P{Po}])\s*)*$~u',
+			'~(?' . '>([\p{Pd}\p{Ps}\p{Pi}\p{Pc}]|[^%\P{Po}])\s*)*$~u',
 			// Unwanted opening punctuation and whitespace.
-			'~^\s*(?'.'>([\p{Pd}\p{Pe}\p{Pf}\p{Pc}]|[^%\P{Po}])\s*)*~u',
+			'~^\s*(?' . '>([\p{Pd}\p{Pe}\p{Pf}\p{Pc}]|[^%\P{Po}])\s*)*~u',
 		),
 		array(
 			'',
@@ -1520,7 +1520,7 @@ 
 				'type' => 'unparsed_commas_content',
 				'test' => '\d+,\d+\]',
 				'content' => '<a href="$1" target="_blank" rel="noopener">$1</a>',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					$scheme = parse_url($data[0], PHP_URL_SCHEME);
 					if (empty($scheme))
@@ -2082,7 +2082,7 @@ 
 		$codes[] = array(
 			'tag' => 'cowsay',
 			'parameters' => array(
-				'e' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => 'oo', 'validate' => function ($eyes) use ($smcFunc)
+				'e' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => 'oo', 'validate' => function($eyes) use ($smcFunc)
 					{
 						static $css_added;
 
@@ -2099,7 +2099,7 @@ 
 						return $smcFunc['substr']($eyes . 'oo', 0, 2);
 					},
 				),
-				't' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => '  ', 'validate' => function ($tongue) use ($smcFunc)
+				't' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => '  ', 'validate' => function($tongue) use ($smcFunc)
 					{
 						return $smcFunc['substr']($tongue . '  ', 0, 2);
 					},
@@ -4070,7 +4070,7 @@ 
 	$toMinify = array();
 	$normal = 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);
 	});
@@ -5519,15 +5519,15 @@ 
 
 	// UTF-8 occurences of MS special characters
 	$findchars_utf8 = array(
-		"\xe2\x80\x9a",	// single low-9 quotation mark
-		"\xe2\x80\x9e",	// double low-9 quotation mark
-		"\xe2\x80\xa6",	// horizontal ellipsis
-		"\xe2\x80\x98",	// left single curly quote
-		"\xe2\x80\x99",	// right single curly quote
-		"\xe2\x80\x9c",	// left double curly quote
-		"\xe2\x80\x9d",	// right double curly quote
-		"\xe2\x80\x93",	// en dash
-		"\xe2\x80\x94",	// em dash
+		"\xe2\x80\x9a", // single low-9 quotation mark
+		"\xe2\x80\x9e", // double low-9 quotation mark
+		"\xe2\x80\xa6", // horizontal ellipsis
+		"\xe2\x80\x98", // left single curly quote
+		"\xe2\x80\x99", // right single curly quote
+		"\xe2\x80\x9c", // left double curly quote
+		"\xe2\x80\x9d", // right double curly quote
+		"\xe2\x80\x93", // en dash
+		"\xe2\x80\x94", // em dash
 	);
 
 	// windows 1252 / iso equivalents
@@ -5545,15 +5545,15 @@ 
 
 	// safe replacements
 	$replacechars = array(
-		',',	// &sbquo;
-		',,',	// &bdquo;
-		'...',	// &hellip;
-		"'",	// &lsquo;
-		"'",	// &rsquo;
-		'"',	// &ldquo;
-		'"',	// &rdquo;
-		'-',	// &ndash;
-		'--',	// &mdash;
+		',', // &sbquo;
+		',,', // &bdquo;
+		'...', // &hellip;
+		"'", // &lsquo;
+		"'", // &rsquo;
+		'"', // &ldquo;
+		'"', // &rdquo;
+		'-', // &ndash;
+		'--', // &mdash;
 	);
 
 	if ($context['utf8'])
@@ -6683,7 +6683,7 @@ 
 			EXISTS (
 				SELECT bpv.id_board
 				FROM ' . $db_prefix . 'board_permissions_view AS bpv
-				WHERE bpv.id_group IN ('. implode(',', $groups) .')
+				WHERE bpv.id_group IN ('. implode(',', $groups) . ')
 					AND bpv.deny = 0
 					AND bpv.id_board = b.id_board
 			)';
@@ -6693,7 +6693,7 @@ 
 			AND NOT EXISTS (
 				SELECT bpv.id_board
 				FROM ' . $db_prefix . 'board_permissions_view AS bpv
-				WHERE bpv.id_group IN ( '. implode(',', $groups) .')
+				WHERE bpv.id_group IN ( '. implode(',', $groups) . ')
 					AND bpv.deny = 1
 					AND bpv.id_board = b.id_board
 			)';
@@ -6956,8 +6956,8 @@ 
 	$i = 0;
 	while (empty($done))
 	{
-		if (strpos($format, '{'. --$i . '}') !== false)
-			$replacements['{'. $i . '}'] = array_pop($list);
+		if (strpos($format, '{' . --$i . '}') !== false)
+			$replacements['{' . $i . '}'] = array_pop($list);
 		else
 			$done = true;
 	}
@@ -6967,8 +6967,8 @@ 
 	$i = 0;
 	while (empty($done))
 	{
-		if (strpos($format, '{'. ++$i . '}') !== false)
-			$replacements['{'. $i . '}'] = array_shift($list);
+		if (strpos($format, '{' . ++$i . '}') !== false)
+			$replacements['{' . $i . '}'] = array_shift($list);
 		else
 			$done = true;
 	}

Themes/default/GenericControls.template.php

Braces +8 added lines, -4 removed lines

@@ -100,18 +100,22 @@
 	$tempTab++;
 	$context['tabindex'] = $tempTab;
 
-	foreach ($context['richedit_buttons'] as $name => $button) {
-		if ($name == 'spell_check') {
+	foreach ($context['richedit_buttons'] as $name => $button)
+	{
+		if ($name == 'spell_check')
+		{
 			$button['onclick'] = 'oEditorHandle_' . $editor_id . '.spellCheckStart();';
 		}
 
-		if ($name == 'preview') {
+		if ($name == 'preview')
+		{
 			$button['value'] = isset($editor_context['labels']['preview_button']) ? $editor_context['labels']['preview_button'] : $button['value'];
 			$button['onclick'] = $editor_context['preview_type'] == 2 ? '' : 'return submitThisOnce(this);';
 			$button['show'] = $editor_context['preview_type'];
 		}
 
-		if ($button['show']) {
+		if ($button['show'])
+		{
 			echo '
 		<input type="', $button['type'], '"', $button['type'] == 'hidden' ? ' id="' . $name . '"' : '', ' name="', $name, '" value="', $button['value'], '"', $button['type'] != 'hidden' ? ' tabindex="' . --$tempTab . '"' : '', !empty($button['onclick']) ? ' onclick="' . $button['onclick'] . '"' : '', !empty($button['accessKey']) ? ' accesskey="' . $button['accessKey'] . '"' : '', $button['type'] != 'hidden' ? ' class="button"' : '', '>';
 		}