Inspection of "Petite amelioration pour ne rechercher que sur la..." - spip/SPIP - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 6807e1...0f97dc )

by cam

created 2021-10-26 15:39 UTC

Status

Indentation +46 added lines, -46 removed lines patch added patch discarded remove patch

@@ -16,7 +16,7 @@  discard block
 block discarded – undo
  * @package SPIP\Core\Surligne
  **/
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 /**
@@ -35,43 +35,43 @@  discard block
 block discarded – undo
  *     Page HTML
  **/
 function surligner_mots($page, $surcharge_surligne = '') {
-	$surlignejs_engines = [
-		[
-			',' . str_replace(['/', '.'], ['\/', '\.'], $GLOBALS['meta']['adresse_site']) . ',i',
-			',recherche=([^&]+),i'
-		], //SPIP
-		[',^http://(www\.)?google\.,i', ',q=([^&]+),i'], // Google
-		[',^http://(www\.)?search\.yahoo\.,i', ',p=([^&]+),i'], // Yahoo
-		[',^http://(www\.)?search\.msn\.,i', ',q=([^&]+),i'], // MSN
-		[',^http://(www\.)?search\.live\.,i', ',query=([^&]+),i'], // MSN Live
-		[',^http://(www\.)?search\.aol\.,i', ',userQuery=([^&]+),i'], // AOL
-		[',^http://(www\.)?ask\.com,i', ',q=([^&]+),i'], // Ask.com
-		[',^http://(www\.)?altavista\.,i', ',q=([^&]+),i'], // AltaVista
-		[',^http://(www\.)?feedster\.,i', ',q=([^&]+),i'], // Feedster
-		[',^http://(www\.)?search\.lycos\.,i', ',q=([^&]+),i'], // Lycos
-		[',^http://(www\.)?alltheweb\.,i', ',q=([^&]+),i'], // AllTheWeb
-		[',^http://(www\.)?technorati\.com,i', ',([^\?\/]+)(?:\?.*)$,i'], // Technorati
-	];
+    $surlignejs_engines = [
+        [
+            ',' . str_replace(['/', '.'], ['\/', '\.'], $GLOBALS['meta']['adresse_site']) . ',i',
+            ',recherche=([^&]+),i'
+        ], //SPIP
+        [',^http://(www\.)?google\.,i', ',q=([^&]+),i'], // Google
+        [',^http://(www\.)?search\.yahoo\.,i', ',p=([^&]+),i'], // Yahoo
+        [',^http://(www\.)?search\.msn\.,i', ',q=([^&]+),i'], // MSN
+        [',^http://(www\.)?search\.live\.,i', ',query=([^&]+),i'], // MSN Live
+        [',^http://(www\.)?search\.aol\.,i', ',userQuery=([^&]+),i'], // AOL
+        [',^http://(www\.)?ask\.com,i', ',q=([^&]+),i'], // Ask.com
+        [',^http://(www\.)?altavista\.,i', ',q=([^&]+),i'], // AltaVista
+        [',^http://(www\.)?feedster\.,i', ',q=([^&]+),i'], // Feedster
+        [',^http://(www\.)?search\.lycos\.,i', ',q=([^&]+),i'], // Lycos
+        [',^http://(www\.)?alltheweb\.,i', ',q=([^&]+),i'], // AllTheWeb
+        [',^http://(www\.)?technorati\.com,i', ',([^\?\/]+)(?:\?.*)$,i'], // Technorati
+    ];
 
 
-	$ref = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : null;
-	//avoid a js injection
-	if ($surcharge_surligne) {
-		$surcharge_surligne = preg_replace(",(?<!\\\\)((?:(?>\\\\){2})*)('),", '$1\\\$2', $surcharge_surligne);
-		$surcharge_surligne = str_replace('\\', '\\\\', $surcharge_surligne);
-		if ($GLOBALS['meta']['charset'] == 'utf-8') {
-			include_spip('inc/charsets');
-			if (!is_utf8($surcharge_surligne)) {
-				$surcharge_surligne = utf8_encode($surcharge_surligne);
-			}
-		}
-		$surcharge_surligne = preg_replace(',\*$,', '', trim($surcharge_surligne)); # supprimer un * final
-	}
-	foreach ($surlignejs_engines as $engine) {
-		if ($surcharge_surligne || (preg_match($engine[0], $ref) && preg_match($engine[1], $ref))) {
-			//good referrer found or var_recherche is not null
-			include_spip('inc/filtres');
-			$script = "
+    $ref = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : null;
+    //avoid a js injection
+    if ($surcharge_surligne) {
+        $surcharge_surligne = preg_replace(",(?<!\\\\)((?:(?>\\\\){2})*)('),", '$1\\\$2', $surcharge_surligne);
+        $surcharge_surligne = str_replace('\\', '\\\\', $surcharge_surligne);
+        if ($GLOBALS['meta']['charset'] == 'utf-8') {
+            include_spip('inc/charsets');
+            if (!is_utf8($surcharge_surligne)) {
+                $surcharge_surligne = utf8_encode($surcharge_surligne);
+            }
+        }
+        $surcharge_surligne = preg_replace(',\*$,', '', trim($surcharge_surligne)); # supprimer un * final
+    }
+    foreach ($surlignejs_engines as $engine) {
+        if ($surcharge_surligne || (preg_match($engine[0], $ref) && preg_match($engine[1], $ref))) {
+            //good referrer found or var_recherche is not null
+            include_spip('inc/filtres');
+            $script = "
       <script type='text/javascript' src='" . url_absolue(find_in_path('javascript/SearchHighlight.js')) . "'></script>
       <script type='text/javascript'>
        var highlighter = function() {
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
             engines:[/^" . str_replace(['/', '.'], ['\/', '\.'], $GLOBALS['meta']['adresse_site']) . "/i,/recherche=([^&]+)/i],
             highlight:'.surlignable',
             nohighlight:'.pas_surlignable'" .
-				($surcharge_surligne ? ",
+                ($surcharge_surligne ? ",
             keys:'$surcharge_surligne'" : '') . ',
             min_length: 3
           });
@@ -94,14 +94,14 @@  discard block
 block discarded – undo
       };
       </script>
       ';
-			// on l'insere juste avant </head>, sinon tout en bas
-			if (is_null($l = strpos($page, '</head>'))) {
-				$l = strlen($page);
-			}
-			$page = substr_replace($page, $script, $l, 0);
-			break;
-		}
-	}
+            // on l'insere juste avant </head>, sinon tout en bas
+            if (is_null($l = strpos($page, '</head>'))) {
+                $l = strlen($page);
+            }
+            $page = substr_replace($page, $script, $l, 0);
+            break;
+        }
+    }
 
-	return $page;
+    return $page;
 }

Please login to merge, or discard this patch.

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

@@ -37,7 +37,7 @@  discard block
 block discarded – undo
 function surligner_mots($page, $surcharge_surligne = '') {
 	$surlignejs_engines = [
 		[
-			',' . str_replace(['/', '.'], ['\/', '\.'], $GLOBALS['meta']['adresse_site']) . ',i',
+			','.str_replace(['/', '.'], ['\/', '\.'], $GLOBALS['meta']['adresse_site']).',i',
 			',recherche=([^&]+),i'
 		], //SPIP
 		[',^http://(www\.)?google\.,i', ',q=([^&]+),i'], // Google
@@ -72,19 +72,19 @@  discard block
 block discarded – undo
 			//good referrer found or var_recherche is not null
 			include_spip('inc/filtres');
 			$script = "
-      <script type='text/javascript' src='" . url_absolue(find_in_path('javascript/SearchHighlight.js')) . "'></script>
+      <script type='text/javascript' src='" . url_absolue(find_in_path('javascript/SearchHighlight.js'))."'></script>
       <script type='text/javascript'>
        var highlighter = function() {
 		  jQuery(this).SearchHighlight({
-            tag_name:'" . (html5_permis() ? 'mark' : 'span') . "',
+            tag_name:'" . (html5_permis() ? 'mark' : 'span')."',
             style_name:'spip_surligne',
             exact:'whole',
             style_name_suffix:false,
-            engines:[/^" . str_replace(['/', '.'], ['\/', '\.'], $GLOBALS['meta']['adresse_site']) . "/i,/recherche=([^&]+)/i],
+            engines:[/^" . str_replace(['/', '.'], ['\/', '\.'], $GLOBALS['meta']['adresse_site'])."/i,/recherche=([^&]+)/i],
             highlight:'.surlignable',
             nohighlight:'.pas_surlignable'" .
 				($surcharge_surligne ? ",
-            keys:'$surcharge_surligne'" : '') . ',
+            keys:'$surcharge_surligne'" : '').',
             min_length: 3
           });
 	  }

Please login to merge, or discard this patch.

		@@ -16,7 +16,7 @@ discard block
		block discarded – undo
16	16	* @package SPIP\Core\Surligne
17	17	**/
18	18	if (!defined('_ECRIRE_INC_VERSION')) {
19		- return;
	19	+ return;
20	20	}
21	21
22	22	/**
		@@ -35,43 +35,43 @@ discard block
		block discarded – undo
35	35	* Page HTML
36	36	**/
37	37	function surligner_mots($page, $surcharge_surligne = '') {
38		- $surlignejs_engines = [
39		- [
40		- ',' . str_replace(['/', '.'], ['\/', '\.'], $GLOBALS['meta']['adresse_site']) . ',i',
41		- ',recherche=([^&]+),i'
42		- ], //SPIP
43		- [',^http://(www\.)?google\.,i', ',q=([^&]+),i'], // Google
44		- [',^http://(www\.)?search\.yahoo\.,i', ',p=([^&]+),i'], // Yahoo
45		- [',^http://(www\.)?search\.msn\.,i', ',q=([^&]+),i'], // MSN
46		- [',^http://(www\.)?search\.live\.,i', ',query=([^&]+),i'], // MSN Live
47		- [',^http://(www\.)?search\.aol\.,i', ',userQuery=([^&]+),i'], // AOL
48		- [',^http://(www\.)?ask\.com,i', ',q=([^&]+),i'], // Ask.com
49		- [',^http://(www\.)?altavista\.,i', ',q=([^&]+),i'], // AltaVista
50		- [',^http://(www\.)?feedster\.,i', ',q=([^&]+),i'], // Feedster
51		- [',^http://(www\.)?search\.lycos\.,i', ',q=([^&]+),i'], // Lycos
52		- [',^http://(www\.)?alltheweb\.,i', ',q=([^&]+),i'], // AllTheWeb
53		- [',^http://(www\.)?technorati\.com,i', ',([^\?\/]+)(?:\?.*)$,i'], // Technorati
54		- ];
	38	+ $surlignejs_engines = [
	39	+ [
	40	+ ',' . str_replace(['/', '.'], ['\/', '\.'], $GLOBALS['meta']['adresse_site']) . ',i',
	41	+ ',recherche=([^&]+),i'
	42	+ ], //SPIP
	43	+ [',^http://(www\.)?google\.,i', ',q=([^&]+),i'], // Google
	44	+ [',^http://(www\.)?search\.yahoo\.,i', ',p=([^&]+),i'], // Yahoo
	45	+ [',^http://(www\.)?search\.msn\.,i', ',q=([^&]+),i'], // MSN
	46	+ [',^http://(www\.)?search\.live\.,i', ',query=([^&]+),i'], // MSN Live
	47	+ [',^http://(www\.)?search\.aol\.,i', ',userQuery=([^&]+),i'], // AOL
	48	+ [',^http://(www\.)?ask\.com,i', ',q=([^&]+),i'], // Ask.com
	49	+ [',^http://(www\.)?altavista\.,i', ',q=([^&]+),i'], // AltaVista
	50	+ [',^http://(www\.)?feedster\.,i', ',q=([^&]+),i'], // Feedster
	51	+ [',^http://(www\.)?search\.lycos\.,i', ',q=([^&]+),i'], // Lycos
	52	+ [',^http://(www\.)?alltheweb\.,i', ',q=([^&]+),i'], // AllTheWeb
	53	+ [',^http://(www\.)?technorati\.com,i', ',([^\?\/]+)(?:\?.*)$,i'], // Technorati
	54	+ ];
55	55
56	56
57		- $ref = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : null;
58		- //avoid a js injection
59		- if ($surcharge_surligne) {
60		- $surcharge_surligne = preg_replace(",(?<!\\\\)((?:(?>\\\\){2})*)('),", '$1\\\$2', $surcharge_surligne);
61		- $surcharge_surligne = str_replace('\\', '\\\\', $surcharge_surligne);
62		- if ($GLOBALS['meta']['charset'] == 'utf-8') {
63		- include_spip('inc/charsets');
64		- if (!is_utf8($surcharge_surligne)) {
65		- $surcharge_surligne = utf8_encode($surcharge_surligne);
66		- }
67		- }
68		- $surcharge_surligne = preg_replace(',\$,', '', trim($surcharge_surligne)); # supprimer un final
69		- }
70		- foreach ($surlignejs_engines as $engine) {
71		- if ($surcharge_surligne \|\| (preg_match($engine[0], $ref) && preg_match($engine[1], $ref))) {
72		- //good referrer found or var_recherche is not null
73		- include_spip('inc/filtres');
74		- $script = "
	57	+ $ref = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : null;
	58	+ //avoid a js injection
	59	+ if ($surcharge_surligne) {
	60	+ $surcharge_surligne = preg_replace(",(?<!\\\\)((?:(?>\\\\){2})*)('),", '$1\\\$2', $surcharge_surligne);
	61	+ $surcharge_surligne = str_replace('\\', '\\\\', $surcharge_surligne);
	62	+ if ($GLOBALS['meta']['charset'] == 'utf-8') {
	63	+ include_spip('inc/charsets');
	64	+ if (!is_utf8($surcharge_surligne)) {
	65	+ $surcharge_surligne = utf8_encode($surcharge_surligne);
	66	+ }
	67	+ }
	68	+ $surcharge_surligne = preg_replace(',\$,', '', trim($surcharge_surligne)); # supprimer un final
	69	+ }
	70	+ foreach ($surlignejs_engines as $engine) {
	71	+ if ($surcharge_surligne \|\| (preg_match($engine[0], $ref) && preg_match($engine[1], $ref))) {
	72	+ //good referrer found or var_recherche is not null
	73	+ include_spip('inc/filtres');
	74	+ $script = "
75	75	<script type='text/javascript' src='" . url_absolue(find_in_path('javascript/SearchHighlight.js')) . "'></script>
76	76	<script type='text/javascript'>
77	77	var highlighter = function() {
		@@ -83,7 +83,7 @@ discard block
		block discarded – undo
83	83	engines:[/^" . str_replace(['/', '.'], ['\/', '\.'], $GLOBALS['meta']['adresse_site']) . "/i,/recherche=([^&]+)/i],
84	84	highlight:'.surlignable',
85	85	nohighlight:'.pas_surlignable'" .
86		- ($surcharge_surligne ? ",
	86	+ ($surcharge_surligne ? ",
87	87	keys:'$surcharge_surligne'" : '') . ',
88	88	min_length: 3
89	89	});
		@@ -94,14 +94,14 @@ discard block
		block discarded – undo
94	94	};
95	95	</script>
96	96	';
97		- // on l'insere juste avant </head>, sinon tout en bas
98		- if (is_null($l = strpos($page, '</head>'))) {
99		- $l = strlen($page);
100		- }
101		- $page = substr_replace($page, $script, $l, 0);
102		- break;
103		- }
104		- }
	97	+ // on l'insere juste avant </head>, sinon tout en bas
	98	+ if (is_null($l = strpos($page, '</head>'))) {
	99	+ $l = strlen($page);
	100	+ }
	101	+ $page = substr_replace($page, $script, $l, 0);
	102	+ break;
	103	+ }
	104	+ }
105	105
106		- return $page;
	106	+ return $page;
107	107	}

		@@ -37,7 +37,7 @@ discard block
		block discarded – undo
37	37	function surligner_mots($page, $surcharge_surligne = '') {
38	38	$surlignejs_engines = [
39	39	[
40		- ',' . str_replace(['/', '.'], ['\/', '\.'], $GLOBALS['meta']['adresse_site']) . ',i',
	40	+ ','.str_replace(['/', '.'], ['\/', '\.'], $GLOBALS['meta']['adresse_site']).',i',
41	41	',recherche=([^&]+),i'
42	42	], //SPIP
43	43	[',^http://(www\.)?google\.,i', ',q=([^&]+),i'], // Google
		@@ -72,19 +72,19 @@ discard block
		block discarded – undo
72	72	//good referrer found or var_recherche is not null
73	73	include_spip('inc/filtres');
74	74	$script = "
75		- <script type='text/javascript' src='" . url_absolue(find_in_path('javascript/SearchHighlight.js')) . "'></script>
	75	+ <script type='text/javascript' src='" . url_absolue(find_in_path('javascript/SearchHighlight.js'))."'></script>
76	76	<script type='text/javascript'>
77	77	var highlighter = function() {
78	78	jQuery(this).SearchHighlight({
79		- tag_name:'" . (html5_permis() ? 'mark' : 'span') . "',
	79	+ tag_name:'" . (html5_permis() ? 'mark' : 'span')."',
80	80	style_name:'spip_surligne',
81	81	exact:'whole',
82	82	style_name_suffix:false,
83		- engines:[/^" . str_replace(['/', '.'], ['\/', '\.'], $GLOBALS['meta']['adresse_site']) . "/i,/recherche=([^&]+)/i],
	83	+ engines:[/^" . str_replace(['/', '.'], ['\/', '\.'], $GLOBALS['meta']['adresse_site'])."/i,/recherche=([^&]+)/i],
84	84	highlight:'.surlignable',
85	85	nohighlight:'.pas_surlignable'" .
86	86	($surcharge_surligne ? ",
87		- keys:'$surcharge_surligne'" : '') . ',
	87	+ keys:'$surcharge_surligne'" : '').',
88	88	min_length: 3
89	89	});
90	90	}

spip / SPIP

Push — master ( 6807e1...0f97dc )

Status

Category

Indentation +46 added lines, -46 removed lines patch added patch discarded remove patch

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