Inspection of "Merge pull request #3777 from Spuds/AllowEmailNot" - elkarte/Elkarte - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — development ( 080d06...0379dc )

by Spuds

created 2024-03-31 19:39 UTC

Status

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

@@ -50,7 +50,7 @@  discard block
 block discarded – undo
 
 	if (isset($_COOKIE[$cookiename]))
 	{
-		$array = serializeToJson($_COOKIE[$cookiename], static function ($array_from) use ($cookiename) {
+		$array = serializeToJson($_COOKIE[$cookiename], static function($array_from) use ($cookiename) {
 			global $modSettings;
 
 			require_once(SUBSDIR . '/Auth.subs.php');
@@ -421,7 +421,7 @@  discard block
 block discarded – undo
 			'recursive' => true,
 		)
 	)->fetch_callback(
-		function ($row) use (&$results, $scripturl) {
+		function($row) use (&$results, $scripturl) {
 			$results[$row['id_member']] = array(
 				'id' => (int) $row['id_member'],
 				'name' => $row['real_name'],
@@ -695,7 +695,7 @@  discard block
 block discarded – undo
 				'current_member' => User::$info->id,
 			)
 		)->fetch_callback(
-			function ($row) {
+			function($row) {
 				return $row['id_group'];
 			}
 		);
@@ -902,7 +902,7 @@  discard block
 block discarded – undo
 			'username' => $username,
 		)
 	)->fetch_callback(
-		function ($row) use (&$return) {
+		function($row) use (&$return) {
 			$return = (int) $row['id_member'];
 		}
 	);

Please login to merge, or discard this patch.

sources/ElkArte/Controller/Memberlist.php 1 patch

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

		@@ -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

		@@ -50,7 +50,7 @@ discard block
		block discarded – undo
50	50
51	51	if (isset($_COOKIE[$cookiename]))
52	52	{
53		- $array = serializeToJson($_COOKIE[$cookiename], static function ($array_from) use ($cookiename) {
	53	+ $array = serializeToJson($_COOKIE[$cookiename], static function($array_from) use ($cookiename) {
54	54	global $modSettings;
55	55
56	56	require_once(SUBSDIR . '/Auth.subs.php');
		@@ -421,7 +421,7 @@ discard block
		block discarded – undo
421	421	'recursive' => true,
422	422	)
423	423	)->fetch_callback(
424		- function ($row) use (&$results, $scripturl) {
	424	+ function($row) use (&$results, $scripturl) {
425	425	$results[$row['id_member']] = array(
426	426	'id' => (int) $row['id_member'],
427	427	'name' => $row['real_name'],
		@@ -695,7 +695,7 @@ discard block
		block discarded – undo
695	695	'current_member' => User::$info->id,
696	696	)
697	697	)->fetch_callback(
698		- function ($row) {
	698	+ function($row) {
699	699	return $row['id_group'];
700	700	}
701	701	);
		@@ -902,7 +902,7 @@ discard block
		block discarded – undo
902	902	'username' => $username,
903	903	)
904	904	)->fetch_callback(
905		- function ($row) use (&$return) {
	905	+ function($row) use (&$return) {
906	906	$return = (int) $row['id_member'];
907	907	}
908	908	);

		@@ -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	{

elkarte / Elkarte

Push — development ( 080d06...0379dc )

Status

Category

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

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

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