Inspection of "A few theme fixes" - elkarte/Elkarte - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Pull Request — development (#3792)

by Spuds

created 2024-04-24 01:13 UTC

Status

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -229,7 +229,7 @@  discard block
 block discarded – undo
 		call_integration_hook('integrate_memberlist_buttons');
 
 		// Drop columns they do not have permissions to see/search
-		if (!$context['can_send_email'] )
+		if (!$context['can_send_email'])
 		{
 			unset($context['columns']['email_address']);
 		}
@@ -543,7 +543,7 @@  discard block
 block discarded – undo
 			// Search for an email address?
 			if (in_array('email', $input_fields))
 			{
-				$fields += [2 => $context['can_send_email']  ? 'email_address' : ''];
+				$fields += [2 => $context['can_send_email'] ? 'email_address' : ''];
 				$condition = allowedTo('moderate_forum') ? '' : ')';
 			}
 			else

Please login to merge, or discard this patch.

sources/ElkArte/Controller/Emailmoderator.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -685,7 +685,7 @@
 block discarded – undo
 			// Maybe they don't want to know?!
 			if (!empty($row['mod_prefs']))
 			{
-				[, , $pref_binary] = explode('|', $row['mod_prefs']);
+				[,, $pref_binary] = explode('|', $row['mod_prefs']);
 				if (!($pref_binary & 1) && (!($pref_binary & 2) || !in_array($row['id_member'], $real_mods)))
 				{
 					continue;

Please login to merge, or discard this patch.

sources/ElkArte/Profile/ProfileFields.php 1 patch

Spacing +23 added lines, -23 removed lines patch added patch discarded remove patch

@@ -281,7 +281,7 @@  discard block
 block discarded – undo
 				'type' => 'callback',
 				'callback_func' => 'birthdate',
 				'permission' => 'profile_extra',
-				'preload' => static function () {
+				'preload' => static function() {
 					global $cur_profile, $context;
 
 					// Split up the birth date....
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
 
 					return true;
 				},
-				'input_validate' => static function (&$value) {
+				'input_validate' => static function(&$value) {
 					global $profile_vars, $cur_profile;
 
 					if (isset($_POST['bday1']))
@@ -330,7 +330,7 @@  discard block
 block discarded – undo
 				'label' => $txt['date_registered'],
 				'log_change' => true,
 				'permission' => 'moderate_forum',
-				'input_validate' => static function (&$value) {
+				'input_validate' => static function(&$value) {
 					global $txt, $modSettings, $cur_profile;
 
 					// Bad date!  Go try again - please?
@@ -360,7 +360,7 @@  discard block
 block discarded – undo
 				'subtext' => $txt['valid_email'],
 				'log_change' => true,
 				'permission' => 'profile_identity',
-				'input_validate' => function ($value) {
+				'input_validate' => function($value) {
 					global $context, $old_profile, $profile_vars, $modSettings;
 
 					if (strtolower($value) === strtolower($old_profile['email_address']))
@@ -398,7 +398,7 @@  discard block
 block discarded – undo
 				'callback_func' => 'theme_pick',
 				'permission' => 'profile_extra',
 				'enabled' => empty($settings['disable_user_variant']) || !empty($modSettings['theme_allow']) || allowedTo('admin_forum'),
-				'preload' => static function () {
+				'preload' => static function() {
 					global $context, $cur_profile, $txt;
 
 					$db = database();
@@ -421,7 +421,7 @@  discard block
 block discarded – undo
 
 					return true;
 				},
-				'input_validate' => static function (&$value) {
+				'input_validate' => static function(&$value) {
 					$value = (int) $value;
 					return true;
 				},
@@ -431,7 +431,7 @@  discard block
 block discarded – undo
 				'callback_func' => 'karma_modify',
 				'permission' => 'admin_forum',
 				// Set karma_bad too!
-				'input_validate' => static function (&$value) {
+				'input_validate' => static function(&$value) {
 					global $profile_vars, $cur_profile;
 
 					$value = (int) $value;
@@ -443,7 +443,7 @@  discard block
 block discarded – undo
 
 					return true;
 				},
-				'preload' => static function () {
+				'preload' => static function() {
 					global $context, $cur_profile;
 
 					$context['member']['karma'] = [
@@ -463,7 +463,7 @@  discard block
 block discarded – undo
 				'preload' => 'profileLoadLanguages',
 				'enabled' => !empty($modSettings['userLanguage']),
 				'value' => empty($cur_profile['lngfile']) ? $language : $cur_profile['lngfile'],
-				'input_validate' => static function (&$value) {
+				'input_validate' => static function(&$value) {
 					global $context, $cur_profile;
 
 					// Load the languages.
@@ -491,7 +491,7 @@  discard block
 block discarded – undo
 				'log_change' => true,
 				'permission' => 'profile_identity',
 				'prehtml' => allowedTo('admin_forum') && isset($_GET['changeusername']) ? '<div class="warningbox">' . $txt['username_warning'] . '</div>' : '',
-				'input_validate' => static function (&$value) {
+				'input_validate' => static function(&$value) {
 					global $context, $cur_profile;
 
 					if (allowedTo('admin_forum'))
@@ -548,7 +548,7 @@  discard block
 block discarded – undo
 				'permission' => 'profile_identity',
 				'save_key' => 'passwd',
 				// Note this will only work if passwrd2 also exists!
-				'input_validate' => static function (&$value) {
+				'input_validate' => static function(&$value) {
 					global $cur_profile;
 
 					// If we didn't try it then ignore it!
@@ -617,7 +617,7 @@  discard block
 block discarded – undo
 				],
 				'subtext' => $txt['receive_from_description'],
 				'value' => empty($cur_profile['receive_from']) ? 0 : $cur_profile['receive_from'],
-				'input_validate' => static function (&$value) {
+				'input_validate' => static function(&$value) {
 					global $cur_profile, $profile_vars;
 
 					// Simple validate and apply the two "sub settings"
@@ -633,7 +633,7 @@  discard block
 block discarded – undo
 				'callback_func' => 'pm_settings',
 				'permission' => 'pm_read',
 				'save_key' => 'pm_prefs',
-				'preload' => static function () {
+				'preload' => static function() {
 					global $context, $cur_profile;
 
 					$context['display_mode'] = $cur_profile['pm_prefs'] & 3;
@@ -641,7 +641,7 @@  discard block
 block discarded – undo
 
 					return true;
 				},
-				'input_validate' => static function (&$value) {
+				'input_validate' => static function(&$value) {
 					global $cur_profile, $profile_vars;
 
 					// Simple validate and apply the two "sub settings"
@@ -657,7 +657,7 @@  discard block
 block discarded – undo
 				'log_change' => true,
 				'size' => 7,
 				'permission' => 'moderate_forum',
-				'input_validate' => static function (&$value) {
+				'input_validate' => static function(&$value) {
 					// Account for comma_format presentation up front
 					$check = strtr($value, [',' => '', '.' => '', ' ' => '']);
 					if (!is_numeric($check))
@@ -677,7 +677,7 @@  discard block
 block discarded – undo
 				'input_attr' => ['maxlength="60"'],
 				'permission' => 'profile_identity',
 				'enabled' => !empty($modSettings['allow_editDisplayName']) || allowedTo('moderate_forum'),
-				'input_validate' => static function (&$value) {
+				'input_validate' => static function(&$value) {
 					global $context, $cur_profile;
 
 					$value = trim(preg_replace('~\s~u', ' ', $value));
@@ -718,7 +718,7 @@  discard block
 block discarded – undo
 				'postinput' => '<span class="smalltext" style="margin-left: 4ex;">[<a href="' . $scripturl . '?action=quickhelp;help=secret_why_blank" onclick="return reqOverlayDiv(this.href);">' . $txt['secret_why_blank'] . '</a>]</span>',
 				'value' => '',
 				'permission' => 'profile_identity',
-				'input_validate' => static function (&$value) {
+				'input_validate' => static function(&$value) {
 					global $cur_profile;
 
 					if (empty($value))
@@ -764,7 +764,7 @@  discard block
 block discarded – undo
 				'callback_func' => 'theme_settings',
 				'permission' => 'profile_extra',
 				'is_dummy' => true,
-				'preload' => static function () {
+				'preload' => static function() {
 					global $context;
 
 					Txt::load('Settings');
@@ -783,7 +783,7 @@  discard block
 block discarded – undo
 				'type' => 'callback',
 				'callback_func' => 'timeformat_modify',
 				'permission' => 'profile_extra',
-				'preload' => static function () {
+				'preload' => static function() {
 					global $context, $txt, $cur_profile, $modSettings;
 
 					$context['easy_timeformats'] = [
@@ -806,14 +806,14 @@  discard block
 block discarded – undo
 				'type' => 'callback',
 				'callback_func' => 'timeoffset_modify',
 				'permission' => 'profile_extra',
-				'preload' => static function () {
+				'preload' => static function() {
 					global $context, $cur_profile;
 
 					$context['member']['time_offset'] = $cur_profile['time_offset'];
 
 					return true;
 				},
-				'input_validate' => static function (&$value) {
+				'input_validate' => static function(&$value) {
 					// Validate the time_offset...
 					$value = (float) str_replace(',', '.', $value);
 					if ($value < -23.5 || $value > 23.5)
@@ -832,7 +832,7 @@  discard block
 block discarded – undo
 				'size' => 50,
 				'permission' => 'profile_title',
 				'enabled' => !empty($modSettings['titlesEnable']),
-				'input_validate' => static function ($value) {
+				'input_validate' => static function($value) {
 					if (Util::strlen($value) > 50)
 					{
 						return 'user_title_too_long';
@@ -856,7 +856,7 @@  discard block
 block discarded – undo
 				'size' => 50,
 				'permission' => 'profile_extra',
 				// Fix the URL...
-				'input_validate' => static function (&$value) {
+				'input_validate' => static function(&$value) {
 					$value = addProtocol($value, ['http://', 'https://', 'ftp://', 'ftps://']);
 					if (strlen($value) < 8)
 					{

Please login to merge, or discard this patch.

sources/ElkArte/Search/API/Custom.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -137,7 +137,7 @@
 block discarded – undo
 		// We can't do anything without this
 		$db_search = db_search();
 
-		$query_select = ['id_msg' => 'm.id_msg',];
+		$query_select = ['id_msg' => 'm.id_msg', ];
 		$query_inner_join = [];
 		$query_left_join = [];
 		$query_where = [];

Please login to merge, or discard this patch.

sources/ElkArte/Search/Search.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -315,7 +315,7 @@
 block discarded – undo
 				'no_member' => 0,
 			]
 		)->fetch_callback(
-			static function ($row) use (&$posters) {
+			static function($row) use (&$posters) {
 				$posters[] = (int) $row['id_member'];
 			}
 		);

Please login to merge, or discard this patch.

sources/ElkArte/Search/SearchParams.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -88,7 +88,7 @@  discard block
 block discarded – undo
 
 		// Test for gzuncompress failing, our ErrorException will die on any E_WARNING with no
 		// Exception, so turn it off/on for this check.
-		set_error_handler(static function () { /* ignore errors */ });
+		set_error_handler(static function() { /* ignore errors */ });
 		try
 		{
 			$check = gzuncompress($temp_params);
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
 
 		// Due to some potential browser/server limitations, attempt to compress
 		// old IE's 2083 character limit, we have to compress long search
-		set_error_handler(static function () { /* ignore errors */ });
+		set_error_handler(static function() { /* ignore errors */ });
 		try
 		{
 			$compressed = gzcompress($encoded);
@@ -557,7 +557,7 @@  discard block
 block discarded – undo
 	 */
 	public function setSortAndDirection($params)
 	{
-		$sort_columns = ['relevance', 'num_replies', 'id_msg',];
+		$sort_columns = ['relevance', 'num_replies', 'id_msg', ];
 
 		// Allow integration to add additional sort columns
 		call_integration_hook('integrate_search_sort_columns', [&$sort_columns]);

Please login to merge, or discard this patch.

sources/subs/About.subs.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -44,7 +44,7 @@  discard block
 block discarded – undo
 				'empty' => '',
 			]
 		)->fetch_callback(
-			function ($row) use (&$credits) {
+			function($row) use (&$credits) {
 				global $txt;
 
 				$credit_info = Util::unserialize($row['credits']);
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
 			'<a href="https://github.com/googlefonts/noto-emoji">Noto Emoji</a> | &copy; Googlefonts | Licensed under <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>',
 			'<a href="https://openmoji.org">OpenMoji</a> | &copy; OpenMoji | Licensed under <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0</a>',
 			'<a href="https://github.com/KDE/oxygen-icons">Oxygen Icons</a> | These icons are licensed under <a href="https://creativecommons.org/licenses/by-sa/3.0/">CC BY-SA 3.0</a>',
-			'<a href="https://github.com/twitter/twemoji">Twitter Emoji</a> | &copy; Twitter, Inc and other contributors | Licensed under <a href="https://github.com/twitter/twemoji/blob/master/LICENSE/">MIT</a>',],
+			'<a href="https://github.com/twitter/twemoji">Twitter Emoji</a> | &copy; Twitter, Inc and other contributors | Licensed under <a href="https://github.com/twitter/twemoji/blob/master/LICENSE/">MIT</a>', ],
 		'fonts' => [
 			'<a href="https://fontawesome.com/v4/get-started/">Font Awesome</a> | Created by Dave Gandy | This font is licensed under the SIL Open Font License, Version 1.1',
 			'<a href="https://www.fontsquirrel.com/fonts/open-sans">Open Sans</a> | &copy; Ascender Fonts | <a href="https://opensource.org/licenses/Apache-2.0">Apache License, Version 2.0',

Please login to merge, or discard this patch.

themes/default/About.template.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -204,7 +204,7 @@
 block discarded – undo
 			<p>', $context['coppa']['body'], '</p>
 			<p>
 				<span>
-					<a class="linkbutton new_win" href="', getUrl('action', ['action' => 'about', 'sa' => 'coppa', 'form', 'member' => $context['coppa']['id']]), '" target="_blank">', $txt['coppa_form_link_popup'], '</a> | <a class="linkbutton" href="', getUrl('action', ['action' => 'about', 'sa' => 'coppa', 'form' , 'dl', 'member' => $context['coppa']['id']]), '">', $txt['coppa_form_link_download'], '</a>
+					<a class="linkbutton new_win" href="', getUrl('action', ['action' => 'about', 'sa' => 'coppa', 'form', 'member' => $context['coppa']['id']]), '" target="_blank">', $txt['coppa_form_link_popup'], '</a> | <a class="linkbutton" href="', getUrl('action', ['action' => 'about', 'sa' => 'coppa', 'form', 'dl', 'member' => $context['coppa']['id']]), '">', $txt['coppa_form_link_download'], '</a>
 				</span>
 			</p>
 			<p>', $context['coppa']['many_options'] ? $txt['coppa_send_to_two_options'] : $txt['coppa_send_to_one_option'], '</p>

Please login to merge, or discard this patch.

sources/ElkArte/BBC/Codes.php 1 patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -317,7 +317,7 @@  discard block
 block discarded – undo
 				self::ATTR_TAG => 'code',
 				self::ATTR_TYPE => self::TYPE_UNPARSED_CONTENT,
 				self::ATTR_CONTENT => '<div class="codeheader">' . $txt['code'] . ': <a href="#" onclick="return elkSelectText(this);" class="codeoperation">' . $txt['code_select'] . '</a></div><pre class="bbc_code prettyprint">$1</pre>',
-				self::ATTR_VALIDATE => $this->isDisabled('code') ? null : static function (&$data) {
+				self::ATTR_VALIDATE => $this->isDisabled('code') ? null : static function(&$data) {
 					$data = tabToHtmlTab(strtr($data, array('[' => '&#91;', ']' => '&#93;')));
 				},
 				self::ATTR_BLOCK_LEVEL => true,
@@ -328,7 +328,7 @@  discard block
 block discarded – undo
 				self::ATTR_TAG => 'code',
 				self::ATTR_TYPE => self::TYPE_UNPARSED_EQUALS_CONTENT,
 				self::ATTR_CONTENT => '<div class="codeheader">' . $txt['code'] . ': ($2) <a href="#" onclick="return elkSelectText(this);" class="codeoperation">' . $txt['code_select'] . '</a></div><pre class="bbc_code prettyprint">$1</pre>',
-				self::ATTR_VALIDATE => $this->isDisabled('code') ? null : static function (&$data) {
+				self::ATTR_VALIDATE => $this->isDisabled('code') ? null : static function(&$data) {
 					$data[0] = tabToHtmlTab(strtr($data[0], array('[' => '&#91;', ']' => '&#93;')));
 				},
 				self::ATTR_BLOCK_LEVEL => true,
@@ -418,7 +418,7 @@  discard block
 block discarded – undo
 				self::ATTR_TAG => 'icode',
 				self::ATTR_TYPE => self::TYPE_UNPARSED_CONTENT,
 				self::ATTR_CONTENT => '<span class="bbc_code_inline">$1</span>',
-				self::ATTR_VALIDATE => $this->isDisabled('icode') ? null : static function (&$data) {
+				self::ATTR_VALIDATE => $this->isDisabled('icode') ? null : static function(&$data) {
 					$data = strtr($data, array('[' => '&#91;', ']' => '&#93;'));
 				},
 				self::ATTR_BLOCK_LEVEL => false,
@@ -449,7 +449,7 @@  discard block
 block discarded – undo
 					),
 				),
 				self::ATTR_CONTENT => '<img src="$1" title="{title}" alt="{alt}" style="{width}{height}" class="bbc_img resized" />',
-				self::ATTR_VALIDATE => static function (&$data) {
+				self::ATTR_VALIDATE => static function(&$data) {
 					$data = addProtocol($data);
 				},
 				self::ATTR_DISABLED_CONTENT => '($1)',
@@ -461,7 +461,7 @@  discard block
 block discarded – undo
 				self::ATTR_TAG => 'img',
 				self::ATTR_TYPE => self::TYPE_UNPARSED_CONTENT,
 				self::ATTR_CONTENT => '<img src="$1" alt="" class="bbc_img" />',
-				self::ATTR_VALIDATE => static function (&$data) {
+				self::ATTR_VALIDATE => static function(&$data) {
 					$data = addProtocol($data);
 				},
 				self::ATTR_DISABLED_CONTENT => '($1)',
@@ -473,7 +473,7 @@  discard block
 block discarded – undo
 				self::ATTR_TAG => 'iurl',
 				self::ATTR_TYPE => self::TYPE_UNPARSED_CONTENT,
 				self::ATTR_CONTENT => '<a href="$1" class="bbc_link">$1</a>',
-				self::ATTR_VALIDATE => static function (&$data) {
+				self::ATTR_VALIDATE => static function(&$data) {
 					//$data = removeBr($data);
 					$data = addProtocol($data);
 				},
@@ -486,7 +486,7 @@  discard block
 block discarded – undo
 				self::ATTR_TYPE => self::TYPE_UNPARSED_EQUALS,
 				self::ATTR_BEFORE => '<a href="$1" class="bbc_link">',
 				self::ATTR_AFTER => '</a>',
-				self::ATTR_VALIDATE => static function (&$data) {
+				self::ATTR_VALIDATE => static function(&$data) {
 					$data = $data[0] === '#' ? '#post_' . substr($data, 1) : addProtocol($data);
 				},
 				self::ATTR_DISALLOW_CHILDREN => array(
@@ -693,7 +693,7 @@  discard block
 block discarded – undo
 				self::ATTR_TEST => '[1-7]{1}',
 				self::ATTR_BEFORE => '<span style="font-size: $1;" class="bbc_size">',
 				self::ATTR_AFTER => '</span>',
-				self::ATTR_VALIDATE => static function (&$data) {
+				self::ATTR_VALIDATE => static function(&$data) {
 					$sizes = array(1 => 0.7, 2 => 1.0, 3 => 1.35, 4 => 1.45, 5 => 2.0, 6 => 2.65, 7 => 3.95);
 					$data = $sizes[(int) $data] . 'em';
 				},
@@ -830,7 +830,7 @@  discard block
 block discarded – undo
 				self::ATTR_TAG => 'url',
 				self::ATTR_TYPE => self::TYPE_UNPARSED_CONTENT,
 				self::ATTR_CONTENT => &self::$contentTag,
-				self::ATTR_VALIDATE => static function (&$data) {
+				self::ATTR_VALIDATE => static function(&$data) {
 					$data = addProtocol($data);
 
 					self::$contentTag = '<a href="$1" class="bbc_link" target="_blank"';
@@ -846,7 +846,7 @@  discard block
 block discarded – undo
 				self::ATTR_TYPE => self::TYPE_UNPARSED_EQUALS,
 				self::ATTR_BEFORE => &self::$contentTag,
 				self::ATTR_AFTER => '</a>',
-				self::ATTR_VALIDATE => static function (&$data) {
+				self::ATTR_VALIDATE => static function(&$data) {
 					$data = addProtocol($data);
 
 					self::$contentTag = '<a href="$1" class="bbc_link" target="_blank"';

Please login to merge, or discard this patch.

		@@ -229,7 +229,7 @@ discard block
		block discarded – undo
229	229	call_integration_hook('integrate_memberlist_buttons');
230	230
231	231	// Drop columns they do not have permissions to see/search
232		- if (!$context['can_send_email'] )
	232	+ if (!$context['can_send_email'])
233	233	{
234	234	unset($context['columns']['email_address']);
235	235	}
		@@ -543,7 +543,7 @@ discard block
		block discarded – undo
543	543	// Search for an email address?
544	544	if (in_array('email', $input_fields))
545	545	{
546		- $fields += [2 => $context['can_send_email'] ? 'email_address' : ''];
	546	+ $fields += [2 => $context['can_send_email'] ? 'email_address' : ''];
547	547	$condition = allowedTo('moderate_forum') ? '' : ')';
548	548	}
549	549	else

		@@ -685,7 +685,7 @@
		block discarded – undo
685	685	// Maybe they don't want to know?!
686	686	if (!empty($row['mod_prefs']))
687	687	{
688		- [, , $pref_binary] = explode('\|', $row['mod_prefs']);
	688	+ [,, $pref_binary] = explode('\|', $row['mod_prefs']);
689	689	if (!($pref_binary & 1) && (!($pref_binary & 2) \|\| !in_array($row['id_member'], $real_mods)))
690	690	{
691	691	continue;

		@@ -137,7 +137,7 @@
		block discarded – undo
137	137	// We can't do anything without this
138	138	$db_search = db_search();
139	139
140		- $query_select = ['id_msg' => 'm.id_msg',];
	140	+ $query_select = ['id_msg' => 'm.id_msg', ];
141	141	$query_inner_join = [];
142	142	$query_left_join = [];
143	143	$query_where = [];

		@@ -281,7 +281,7 @@ discard block
		block discarded – undo
281	281	'type' => 'callback',
282	282	'callback_func' => 'birthdate',
283	283	'permission' => 'profile_extra',
284		- 'preload' => static function () {
	284	+ 'preload' => static function() {
285	285	global $cur_profile, $context;
286	286
287	287	// Split up the birth date....
		@@ -294,7 +294,7 @@ discard block
		block discarded – undo
294	294
295	295	return true;
296	296	},
297		- 'input_validate' => static function (&$value) {
	297	+ 'input_validate' => static function(&$value) {
298	298	global $profile_vars, $cur_profile;
299	299
300	300	if (isset($_POST['bday1']))
		@@ -330,7 +330,7 @@ discard block
		block discarded – undo
330	330	'label' => $txt['date_registered'],
331	331	'log_change' => true,
332	332	'permission' => 'moderate_forum',
333		- 'input_validate' => static function (&$value) {
	333	+ 'input_validate' => static function(&$value) {
334	334	global $txt, $modSettings, $cur_profile;
335	335
336	336	// Bad date! Go try again - please?
		@@ -360,7 +360,7 @@ discard block
		block discarded – undo
360	360	'subtext' => $txt['valid_email'],
361	361	'log_change' => true,
362	362	'permission' => 'profile_identity',
363		- 'input_validate' => function ($value) {
	363	+ 'input_validate' => function($value) {
364	364	global $context, $old_profile, $profile_vars, $modSettings;
365	365
366	366	if (strtolower($value) === strtolower($old_profile['email_address']))
		@@ -398,7 +398,7 @@ discard block
		block discarded – undo
398	398	'callback_func' => 'theme_pick',
399	399	'permission' => 'profile_extra',
400	400	'enabled' => empty($settings['disable_user_variant']) \|\| !empty($modSettings['theme_allow']) \|\| allowedTo('admin_forum'),
401		- 'preload' => static function () {
	401	+ 'preload' => static function() {
402	402	global $context, $cur_profile, $txt;
403	403
404	404	$db = database();
		@@ -421,7 +421,7 @@ discard block
		block discarded – undo
421	421
422	422	return true;
423	423	},
424		- 'input_validate' => static function (&$value) {
	424	+ 'input_validate' => static function(&$value) {
425	425	$value = (int) $value;
426	426	return true;
427	427	},
		@@ -431,7 +431,7 @@ discard block
		block discarded – undo
431	431	'callback_func' => 'karma_modify',
432	432	'permission' => 'admin_forum',
433	433	// Set karma_bad too!
434		- 'input_validate' => static function (&$value) {
	434	+ 'input_validate' => static function(&$value) {
435	435	global $profile_vars, $cur_profile;
436	436
437	437	$value = (int) $value;
		@@ -443,7 +443,7 @@ discard block
		block discarded – undo
443	443
444	444	return true;
445	445	},
446		- 'preload' => static function () {
	446	+ 'preload' => static function() {
447	447	global $context, $cur_profile;
448	448
449	449	$context['member']['karma'] = [
		@@ -463,7 +463,7 @@ discard block
		block discarded – undo
463	463	'preload' => 'profileLoadLanguages',
464	464	'enabled' => !empty($modSettings['userLanguage']),
465	465	'value' => empty($cur_profile['lngfile']) ? $language : $cur_profile['lngfile'],
466		- 'input_validate' => static function (&$value) {
	466	+ 'input_validate' => static function(&$value) {
467	467	global $context, $cur_profile;
468	468
469	469	// Load the languages.
		@@ -491,7 +491,7 @@ discard block
		block discarded – undo
491	491	'log_change' => true,
492	492	'permission' => 'profile_identity',
493	493	'prehtml' => allowedTo('admin_forum') && isset($_GET['changeusername']) ? '<div class="warningbox">' . $txt['username_warning'] . '</div>' : '',
494		- 'input_validate' => static function (&$value) {
	494	+ 'input_validate' => static function(&$value) {
495	495	global $context, $cur_profile;
496	496
497	497	if (allowedTo('admin_forum'))
		@@ -548,7 +548,7 @@ discard block
		block discarded – undo
548	548	'permission' => 'profile_identity',
549	549	'save_key' => 'passwd',
550	550	// Note this will only work if passwrd2 also exists!
551		- 'input_validate' => static function (&$value) {
	551	+ 'input_validate' => static function(&$value) {
552	552	global $cur_profile;
553	553
554	554	// If we didn't try it then ignore it!
		@@ -617,7 +617,7 @@ discard block
		block discarded – undo
617	617	],
618	618	'subtext' => $txt['receive_from_description'],
619	619	'value' => empty($cur_profile['receive_from']) ? 0 : $cur_profile['receive_from'],
620		- 'input_validate' => static function (&$value) {
	620	+ 'input_validate' => static function(&$value) {
621	621	global $cur_profile, $profile_vars;
622	622
623	623	// Simple validate and apply the two "sub settings"
		@@ -633,7 +633,7 @@ discard block
		block discarded – undo
633	633	'callback_func' => 'pm_settings',
634	634	'permission' => 'pm_read',
635	635	'save_key' => 'pm_prefs',
636		- 'preload' => static function () {
	636	+ 'preload' => static function() {
637	637	global $context, $cur_profile;
638	638
639	639	$context['display_mode'] = $cur_profile['pm_prefs'] & 3;
		@@ -641,7 +641,7 @@ discard block
		block discarded – undo
641	641
642	642	return true;
643	643	},
644		- 'input_validate' => static function (&$value) {
	644	+ 'input_validate' => static function(&$value) {
645	645	global $cur_profile, $profile_vars;
646	646
647	647	// Simple validate and apply the two "sub settings"
		@@ -657,7 +657,7 @@ discard block
		block discarded – undo
657	657	'log_change' => true,
658	658	'size' => 7,
659	659	'permission' => 'moderate_forum',
660		- 'input_validate' => static function (&$value) {
	660	+ 'input_validate' => static function(&$value) {
661	661	// Account for comma_format presentation up front
662	662	$check = strtr($value, [',' => '', '.' => '', ' ' => '']);
663	663	if (!is_numeric($check))
		@@ -677,7 +677,7 @@ discard block
		block discarded – undo
677	677	'input_attr' => ['maxlength="60"'],
678	678	'permission' => 'profile_identity',
679	679	'enabled' => !empty($modSettings['allow_editDisplayName']) \|\| allowedTo('moderate_forum'),
680		- 'input_validate' => static function (&$value) {
	680	+ 'input_validate' => static function(&$value) {
681	681	global $context, $cur_profile;
682	682
683	683	$value = trim(preg_replace('~\s~u', ' ', $value));
		@@ -718,7 +718,7 @@ discard block
		block discarded – undo
718	718	'postinput' => '<span class="smalltext" style="margin-left: 4ex;">[<a href="' . $scripturl . '?action=quickhelp;help=secret_why_blank" onclick="return reqOverlayDiv(this.href);">' . $txt['secret_why_blank'] . '</a>]</span>',
719	719	'value' => '',
720	720	'permission' => 'profile_identity',
721		- 'input_validate' => static function (&$value) {
	721	+ 'input_validate' => static function(&$value) {
722	722	global $cur_profile;
723	723
724	724	if (empty($value))
		@@ -764,7 +764,7 @@ discard block
		block discarded – undo
764	764	'callback_func' => 'theme_settings',
765	765	'permission' => 'profile_extra',
766	766	'is_dummy' => true,
767		- 'preload' => static function () {
	767	+ 'preload' => static function() {
768	768	global $context;
769	769
770	770	Txt::load('Settings');
		@@ -783,7 +783,7 @@ discard block
		block discarded – undo
783	783	'type' => 'callback',
784	784	'callback_func' => 'timeformat_modify',
785	785	'permission' => 'profile_extra',
786		- 'preload' => static function () {
	786	+ 'preload' => static function() {
787	787	global $context, $txt, $cur_profile, $modSettings;
788	788
789	789	$context['easy_timeformats'] = [
		@@ -806,14 +806,14 @@ discard block
		block discarded – undo
806	806	'type' => 'callback',
807	807	'callback_func' => 'timeoffset_modify',
808	808	'permission' => 'profile_extra',
809		- 'preload' => static function () {
	809	+ 'preload' => static function() {
810	810	global $context, $cur_profile;
811	811
812	812	$context['member']['time_offset'] = $cur_profile['time_offset'];
813	813
814	814	return true;
815	815	},
816		- 'input_validate' => static function (&$value) {
	816	+ 'input_validate' => static function(&$value) {
817	817	// Validate the time_offset...
818	818	$value = (float) str_replace(',', '.', $value);
819	819	if ($value < -23.5 \|\| $value > 23.5)
		@@ -832,7 +832,7 @@ discard block
		block discarded – undo
832	832	'size' => 50,
833	833	'permission' => 'profile_title',
834	834	'enabled' => !empty($modSettings['titlesEnable']),
835		- 'input_validate' => static function ($value) {
	835	+ 'input_validate' => static function($value) {
836	836	if (Util::strlen($value) > 50)
837	837	{
838	838	return 'user_title_too_long';
		@@ -856,7 +856,7 @@ discard block
		block discarded – undo
856	856	'size' => 50,
857	857	'permission' => 'profile_extra',
858	858	// Fix the URL...
859		- 'input_validate' => static function (&$value) {
	859	+ 'input_validate' => static function(&$value) {
860	860	$value = addProtocol($value, ['http://', 'https://', 'ftp://', 'ftps://']);
861	861	if (strlen($value) < 8)
862	862	{

		@@ -315,7 +315,7 @@
		block discarded – undo
315	315	'no_member' => 0,
316	316	]
317	317	)->fetch_callback(
318		- static function ($row) use (&$posters) {
	318	+ static function($row) use (&$posters) {
319	319	$posters[] = (int) $row['id_member'];
320	320	}
321	321	);

		@@ -88,7 +88,7 @@ discard block
		block discarded – undo
88	88
89	89	// Test for gzuncompress failing, our ErrorException will die on any E_WARNING with no
90	90	// Exception, so turn it off/on for this check.
91		- set_error_handler(static function () { /* ignore errors */ });
	91	+ set_error_handler(static function() { /* ignore errors */ });
92	92	try
93	93	{
94	94	$check = gzuncompress($temp_params);
		@@ -127,7 +127,7 @@ discard block
		block discarded – undo
127	127
128	128	// Due to some potential browser/server limitations, attempt to compress
129	129	// old IE's 2083 character limit, we have to compress long search
130		- set_error_handler(static function () { /* ignore errors */ });
	130	+ set_error_handler(static function() { /* ignore errors */ });
131	131	try
132	132	{
133	133	$compressed = gzcompress($encoded);
		@@ -557,7 +557,7 @@ discard block
		block discarded – undo
557	557	*/
558	558	public function setSortAndDirection($params)
559	559	{
560		- $sort_columns = ['relevance', 'num_replies', 'id_msg',];
	560	+ $sort_columns = ['relevance', 'num_replies', 'id_msg', ];
561	561
562	562	// Allow integration to add additional sort columns
563	563	call_integration_hook('integrate_search_sort_columns', [&$sort_columns]);

		@@ -44,7 +44,7 @@ discard block
		block discarded – undo
44	44	'empty' => '',
45	45	]
46	46	)->fetch_callback(
47		- function ($row) use (&$credits) {
	47	+ function($row) use (&$credits) {
48	48	global $txt;
49	49
50	50	$credit_info = Util::unserialize($row['credits']);
		@@ -107,7 +107,7 @@ discard block
		block discarded – undo
107	107	'<a href="https://github.com/googlefonts/noto-emoji">Noto Emoji</a> \| © Googlefonts \| Licensed under <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>',
108	108	'<a href="https://openmoji.org">OpenMoji</a> \| © OpenMoji \| Licensed under <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0</a>',
109	109	'<a href="https://github.com/KDE/oxygen-icons">Oxygen Icons</a> \| These icons are licensed under <a href="https://creativecommons.org/licenses/by-sa/3.0/">CC BY-SA 3.0</a>',
110		- '<a href="https://github.com/twitter/twemoji">Twitter Emoji</a> \| © Twitter, Inc and other contributors \| Licensed under <a href="https://github.com/twitter/twemoji/blob/master/LICENSE/">MIT</a>',],
	110	+ '<a href="https://github.com/twitter/twemoji">Twitter Emoji</a> \| © Twitter, Inc and other contributors \| Licensed under <a href="https://github.com/twitter/twemoji/blob/master/LICENSE/">MIT</a>', ],
111	111	'fonts' => [
112	112	'<a href="https://fontawesome.com/v4/get-started/">Font Awesome</a> \| Created by Dave Gandy \| This font is licensed under the SIL Open Font License, Version 1.1',
113	113	'<a href="https://www.fontsquirrel.com/fonts/open-sans">Open Sans</a> \| © Ascender Fonts \| <a href="https://opensource.org/licenses/Apache-2.0">Apache License, Version 2.0',

		@@ -204,7 +204,7 @@
		block discarded – undo
204	204	<p>', $context['coppa']['body'], '</p>
205	205	<p>
206	206	<span>
207		- <a class="linkbutton new_win" href="', getUrl('action', ['action' => 'about', 'sa' => 'coppa', 'form', 'member' => $context['coppa']['id']]), '" target="_blank">', $txt['coppa_form_link_popup'], '</a> \| <a class="linkbutton" href="', getUrl('action', ['action' => 'about', 'sa' => 'coppa', 'form' , 'dl', 'member' => $context['coppa']['id']]), '">', $txt['coppa_form_link_download'], '</a>
	207	+ <a class="linkbutton new_win" href="', getUrl('action', ['action' => 'about', 'sa' => 'coppa', 'form', 'member' => $context['coppa']['id']]), '" target="_blank">', $txt['coppa_form_link_popup'], '</a> \| <a class="linkbutton" href="', getUrl('action', ['action' => 'about', 'sa' => 'coppa', 'form', 'dl', 'member' => $context['coppa']['id']]), '">', $txt['coppa_form_link_download'], '</a>
208	208	</span>
209	209	</p>
210	210	<p>', $context['coppa']['many_options'] ? $txt['coppa_send_to_two_options'] : $txt['coppa_send_to_one_option'], '</p>

		@@ -317,7 +317,7 @@ discard block
		block discarded – undo
317	317	self::ATTR_TAG => 'code',
318	318	self::ATTR_TYPE => self::TYPE_UNPARSED_CONTENT,
319	319	self::ATTR_CONTENT => '<div class="codeheader">' . $txt['code'] . ': <a href="#" onclick="return elkSelectText(this);" class="codeoperation">' . $txt['code_select'] . '</a></div><pre class="bbc_code prettyprint">$1</pre>',
320		- self::ATTR_VALIDATE => $this->isDisabled('code') ? null : static function (&$data) {
	320	+ self::ATTR_VALIDATE => $this->isDisabled('code') ? null : static function(&$data) {
321	321	$data = tabToHtmlTab(strtr($data, array('[' => '[', ']' => ']')));
322	322	},
323	323	self::ATTR_BLOCK_LEVEL => true,
		@@ -328,7 +328,7 @@ discard block
		block discarded – undo
328	328	self::ATTR_TAG => 'code',
329	329	self::ATTR_TYPE => self::TYPE_UNPARSED_EQUALS_CONTENT,
330	330	self::ATTR_CONTENT => '<div class="codeheader">' . $txt['code'] . ': ($2) <a href="#" onclick="return elkSelectText(this);" class="codeoperation">' . $txt['code_select'] . '</a></div><pre class="bbc_code prettyprint">$1</pre>',
331		- self::ATTR_VALIDATE => $this->isDisabled('code') ? null : static function (&$data) {
	331	+ self::ATTR_VALIDATE => $this->isDisabled('code') ? null : static function(&$data) {
332	332	$data[0] = tabToHtmlTab(strtr($data[0], array('[' => '[', ']' => ']')));
333	333	},
334	334	self::ATTR_BLOCK_LEVEL => true,
		@@ -418,7 +418,7 @@ discard block
		block discarded – undo
418	418	self::ATTR_TAG => 'icode',
419	419	self::ATTR_TYPE => self::TYPE_UNPARSED_CONTENT,
420	420	self::ATTR_CONTENT => '<span class="bbc_code_inline">$1</span>',
421		- self::ATTR_VALIDATE => $this->isDisabled('icode') ? null : static function (&$data) {
	421	+ self::ATTR_VALIDATE => $this->isDisabled('icode') ? null : static function(&$data) {
422	422	$data = strtr($data, array('[' => '[', ']' => ']'));
423	423	},
424	424	self::ATTR_BLOCK_LEVEL => false,
		@@ -449,7 +449,7 @@ discard block
		block discarded – undo
449	449	),
450	450	),
451	451	self::ATTR_CONTENT => '<img src="$1" title="{title}" alt="{alt}" style="{width}{height}" class="bbc_img resized" />',
452		- self::ATTR_VALIDATE => static function (&$data) {
	452	+ self::ATTR_VALIDATE => static function(&$data) {
453	453	$data = addProtocol($data);
454	454	},
455	455	self::ATTR_DISABLED_CONTENT => '($1)',
		@@ -461,7 +461,7 @@ discard block
		block discarded – undo
461	461	self::ATTR_TAG => 'img',
462	462	self::ATTR_TYPE => self::TYPE_UNPARSED_CONTENT,
463	463	self::ATTR_CONTENT => '<img src="$1" alt="" class="bbc_img" />',
464		- self::ATTR_VALIDATE => static function (&$data) {
	464	+ self::ATTR_VALIDATE => static function(&$data) {
465	465	$data = addProtocol($data);
466	466	},
467	467	self::ATTR_DISABLED_CONTENT => '($1)',
		@@ -473,7 +473,7 @@ discard block
		block discarded – undo
473	473	self::ATTR_TAG => 'iurl',
474	474	self::ATTR_TYPE => self::TYPE_UNPARSED_CONTENT,
475	475	self::ATTR_CONTENT => '<a href="$1" class="bbc_link">$1</a>',
476		- self::ATTR_VALIDATE => static function (&$data) {
	476	+ self::ATTR_VALIDATE => static function(&$data) {
477	477	//$data = removeBr($data);
478	478	$data = addProtocol($data);
479	479	},
		@@ -486,7 +486,7 @@ discard block
		block discarded – undo
486	486	self::ATTR_TYPE => self::TYPE_UNPARSED_EQUALS,
487	487	self::ATTR_BEFORE => '<a href="$1" class="bbc_link">',
488	488	self::ATTR_AFTER => '</a>',
489		- self::ATTR_VALIDATE => static function (&$data) {
	489	+ self::ATTR_VALIDATE => static function(&$data) {
490	490	$data = $data[0] === '#' ? '#post_' . substr($data, 1) : addProtocol($data);
491	491	},
492	492	self::ATTR_DISALLOW_CHILDREN => array(
		@@ -693,7 +693,7 @@ discard block
		block discarded – undo
693	693	self::ATTR_TEST => '[1-7]{1}',
694	694	self::ATTR_BEFORE => '<span style="font-size: $1;" class="bbc_size">',
695	695	self::ATTR_AFTER => '</span>',
696		- self::ATTR_VALIDATE => static function (&$data) {
	696	+ self::ATTR_VALIDATE => static function(&$data) {
697	697	$sizes = array(1 => 0.7, 2 => 1.0, 3 => 1.35, 4 => 1.45, 5 => 2.0, 6 => 2.65, 7 => 3.95);
698	698	$data = $sizes[(int) $data] . 'em';
699	699	},
		@@ -830,7 +830,7 @@ discard block
		block discarded – undo
830	830	self::ATTR_TAG => 'url',
831	831	self::ATTR_TYPE => self::TYPE_UNPARSED_CONTENT,
832	832	self::ATTR_CONTENT => &self::$contentTag,
833		- self::ATTR_VALIDATE => static function (&$data) {
	833	+ self::ATTR_VALIDATE => static function(&$data) {
834	834	$data = addProtocol($data);
835	835
836	836	self::$contentTag = '<a href="$1" class="bbc_link" target="_blank"';
		@@ -846,7 +846,7 @@ discard block
		block discarded – undo
846	846	self::ATTR_TYPE => self::TYPE_UNPARSED_EQUALS,
847	847	self::ATTR_BEFORE => &self::$contentTag,
848	848	self::ATTR_AFTER => '</a>',
849		- self::ATTR_VALIDATE => static function (&$data) {
	849	+ self::ATTR_VALIDATE => static function(&$data) {
850	850	$data = addProtocol($data);
851	851
852	852	self::$contentTag = '<a href="$1" class="bbc_link" target="_blank"';

elkarte / Elkarte

Pull Request — development (#3792)

Status

Category

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +23 added lines, -23 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch