Inspection of "fix: éviter notices : en cas d'échec de getimagesi..." - spip/SPIP - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( f50317...15d2e0 )

by cam

created 2022-12-31 11:04 UTC

Status

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

@@ -111,13 +111,13 @@  discard block
 block discarded – undo
 
 function chrono_requete($temps) {
 	$total = 0;
-	$hors = '<i>' . _T('zbug_hors_compilation') . '</i>';
+	$hors = '<i>'._T('zbug_hors_compilation').'</i>';
 	$t = $q = $n = $d = [];
 	// Totaliser les temps et completer le Explain
 	foreach ($temps as $key => $v) {
 		[$dt, $nb, $boucle, $query, $explain, $res, $contexte] = $v;
 		if (is_array($contexte)) {
-			$k = ($contexte[0] . " $boucle");
+			$k = ($contexte[0]." $boucle");
 			include_spip('public/compiler');
 			$env = reconstruire_contexte_compil($contexte);
 		} else {
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
 	// Fabriquer les liens de navigations dans le tableau des temps
 	foreach ($temps as $k => $v) {
 		$titre = strip_tags($v[2]);
-		$href = quote_amp($GLOBALS['REQUEST_URI']) . "#req$i";
+		$href = quote_amp($GLOBALS['REQUEST_URI'])."#req$i";
 		$href = str_replace("\\'", '&#39;', $href);
 
 		if (!isset($t[$v[2]])) {
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
 	unset($d['']);
 	// Fabriquer le tableau des liens de navigation dans le grand tableau
 	foreach ($d as $k => $v) {
-		$d[$k] = $n[$k] . "</td><td>$k</td><td class='time'>$v</td><td class='liste-reqs'>"
+		$d[$k] = $n[$k]."</td><td>$k</td><td class='time'>$v</td><td class='liste-reqs'>"
 			. join('', $t[$k]);
 	}
 
@@ -193,7 +193,7 @@  discard block
 block discarded – undo
 		. join("</td></tr>\n<tr><td>", $d)
 		. "</td></tr>\n"
 		. (# _request('var_mode_objet') ? '' :
-		('<tr><td>' . (is_countable($temps) ? count($temps) : 0) . '</td><td>' . _T('info_total') . '</td><td class="time">' . $total . '</td><td></td></tr>'))
+		('<tr><td>'.(is_countable($temps) ? count($temps) : 0).'</td><td>'._T('info_total').'</td><td class="time">'.$total.'</td><td></td></tr>'))
 	];
 
 	return [$temps, $navigation];

Please login to merge, or discard this patch.

ecrire/exec/demande_mise_a_jour.php 1 patch

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

@@ -45,8 +45,8 @@
 block discarded – undo
 
 	echo debut_grand_cadre();
 	echo boite_ouvrir(_T('info_message_technique'), 'notice');
-	echo '<p>' . _T('info_procedure_maj_version') . '</p>',
-		'<p>' . _T('info_administrateur_site_01') . '</p>';
+	echo '<p>'._T('info_procedure_maj_version').'</p>',
+		'<p>'._T('info_administrateur_site_01').'</p>';
 	echo bouton_action(_T('bouton_mettre_a_jour_base'), generer_url_ecrire('upgrade', 'reinstall=non'));
 	echo boite_fermer();
 	// masquer les erreurs sql sur cette page car proviennent de la base pas a jour !

Please login to merge, or discard this patch.

ecrire/exec/404.php 1 patch

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

@@ -42,7 +42,7 @@
 block discarded – undo
 	echo pipeline('affiche_droite', ['args' => ['exec' => '404', 'exec_erreur' => $exec], 'data' => '']);
 
 	echo debut_droite();
-	echo "<h1 class='grostitre'>" . _T('fichier_introuvable', ['fichier' => $exec]) . '</h1>';
+	echo "<h1 class='grostitre'>"._T('fichier_introuvable', ['fichier' => $exec]).'</h1>';
 	echo pipeline('affiche_milieu', ['args' => ['exec' => '404', 'exec_erreur' => $exec], 'data' => '']);
 
 	echo fin_gauche(), fin_page();

Please login to merge, or discard this patch.

ecrire/inc/minipres.php 1 patch

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

@@ -74,7 +74,7 @@  discard block
 block discarded – undo
 			lire_fichier($file, $c);
 			$css .= $c;
 		}
-		$css = "<style type='text/css'>" . $css . '</style>';
+		$css = "<style type='text/css'>".$css.'</style>';
 	} else {
 		foreach ($files as $name) {
 			$file = direction_css(find_in_theme($name));
@@ -87,19 +87,19 @@  discard block
 block discarded – undo
 		define('_DOCTYPE_ECRIRE', '');
 	}
 
-	return _DOCTYPE_ECRIRE .
-	html_lang_attributes() .
-	"<head>\n" .
-	'<title>' .
-	textebrut($titre) .
-	"</title>\n" .
-	"<meta name='viewport' content='width=device-width' />\n" .
-	$css .
+	return _DOCTYPE_ECRIRE.
+	html_lang_attributes().
+	"<head>\n".
+	'<title>'.
+	textebrut($titre).
+	"</title>\n".
+	"<meta name='viewport' content='width=device-width' />\n".
+	$css.
 	'</head>
-<body' . $onLoad . " class='minipres'>
+<body' . $onLoad." class='minipres'>
 	<div id='minipres'>
 	<h1>" .
-	$titre .
+	$titre.
 	"</h1>
 	<div>\n";
 }
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
 
 		$titre = ($titre == 'install')
 			? _T('avis_espace_interdit')
-			: $titre . '&nbsp;: ' . _T('info_acces_interdit');
+			: $titre.'&nbsp;: '._T('info_acces_interdit');
 
 		$statut = $GLOBALS['visiteur_session']['statut'] ?? '';
 		$nom = $GLOBALS['visiteur_session']['nom'] ?? '';
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
 			$corps = bouton_action(_T('public:accueil_site'), $GLOBALS['meta']['adresse_site']);
 		}
 		$corps = "<div class='boutons'>$corps</div>";
-		spip_log($nom . " $titre " . $_SERVER['REQUEST_URI']);
+		spip_log($nom." $titre ".$_SERVER['REQUEST_URI']);
 	}
 
 	if (!_AJAX) {
@@ -219,6 +219,6 @@  discard block
 block discarded – undo
 		foreach ($_POST as $v => $c) {
 			$url = parametre_url($url, $v, $c, '&');
 		}
-		ajax_retour('<div>' . $titre . redirige_formulaire($url) . '</div>', false);
+		ajax_retour('<div>'.$titre.redirige_formulaire($url).'</div>', false);
 	}
 }

Please login to merge, or discard this patch.

ecrire/inc/nfslock.php 1 patch

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

@@ -106,7 +106,7 @@  discard block
 block discarded – undo
 	if (!$max_age) {
 		$max_age = _DEFAULT_LOCKTIME;
 	}
-	$lock_file = _DIR_TMP . _NAME_LOCK . '-' . substr(md5($fichier), 0, 8);
+	$lock_file = _DIR_TMP._NAME_LOCK.'-'.substr(md5($fichier), 0, 8);
 
 
 	/*
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
 	 */
 
 	$id = creer_uniqid();
-	$tpath = _DIR_TMP . "slock.$id";
+	$tpath = _DIR_TMP."slock.$id";
 	$tmpfd = @fopen($tpath, 'w'); // hum, le 'x' necessite php4,3,2 ...
 	if (!$tmpfd) {  /* open failed */
 		@fclose($tmpfd);
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
 	 *    thinks the current time is (our_tmp.st_ctime)..
 	 */
 
-	$tpath = _DIR_TMP . "stime.$id";
+	$tpath = _DIR_TMP."stime.$id";
 	$tmpfd = @fopen($tpath, 'w');
 	if (
 		(!$tmpfd)
@@ -255,14 +255,14 @@  discard block
 block discarded – undo
 		return false; //(NFSL_SYSF);
 	}
 
-	@fclose($tmpfd);    /* We don't need this once we have our_tmp.st_ctime. */
+	@fclose($tmpfd); /* We don't need this once we have our_tmp.st_ctime. */
 	spip_unlink($tpath);
 
 	/*
 	 * 2. make fullpath, a buffer for the full pathname of the lock file
 	 */
 
-	$lock_file = _DIR_TMP . _NAME_LOCK . '-' . substr(md5($fichier), 0, 8);
+	$lock_file = _DIR_TMP._NAME_LOCK.'-'.substr(md5($fichier), 0, 8);
 
 	/*
 	 * 3. If the ctime hasn't been modified, unlink the file and return. If the
@@ -282,10 +282,10 @@  discard block
 block discarded – undo
 			if (!$test) {
 				return false;
 			} //(NFSL_LOST);
-			sleep(1 + (random_int(0, 4)));    /* so sleep a bit */
+			sleep(1 + (random_int(0, 4))); /* so sleep a bit */
 		}
 
-		return true;//(NFSL_OK);			/* success */
+		return true; //(NFSL_OK);			/* success */
 	}
 
 	/*

Please login to merge, or discard this patch.

ecrire/inc/csv.php 1 patch

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

@@ -87,12 +87,12 @@
 block discarded – undo
 	}
 	// si une seule colonne, en faire le titre
 	if (preg_match("/^([^$sep]+)$sep+\$/", $entete, $l)) {
-		$caption = "\n||" . $l[1] . '|';
+		$caption = "\n||".$l[1].'|';
 		[$entete, $corps] = explode("\n", $corps, 2);
 	}
 	// si premiere colonne vide, le raccourci doit quand meme produire <th...
 	if ($entete[0] == $sep) {
-		$entete = ' ' . $entete;
+		$entete = ' '.$entete;
 	}
 
 	$lignes = explode("\n", $corps);

Please login to merge, or discard this patch.

ecrire/inc/math.php 1 patch

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

@@ -37,16 +37,16 @@  discard block
 block discarded – undo
 	}
 
 	// Regarder dans le repertoire local des images TeX et blocs MathML
-	if (!@is_dir($dir_tex = _DIR_VAR . 'cache-TeX/')) {
+	if (!@is_dir($dir_tex = _DIR_VAR.'cache-TeX/')) {
 		@mkdir($dir_tex, _SPIP_CHMOD);
 	}
-	$fichier = $dir_tex . md5(trim($tex)) . $ext;
+	$fichier = $dir_tex.md5(trim($tex)).$ext;
 
 
 	if (!@file_exists($fichier)) {
 		// Aller chercher l'image sur le serveur
 		if ($server) {
-			spip_log($url = $server . '?' . rawurlencode($tex));
+			spip_log($url = $server.'?'.rawurlencode($tex));
 			include_spip('inc/distant');
 			recuperer_url($url, ['file' => $fichier]);
 		}
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
 			return implode('', file($fichier));
 		} // TeX
 		else {
-			[, , , $size] = @spip_getimagesize($fichier);
+			[,,, $size] = @spip_getimagesize($fichier);
 			$alt = "alt=\"$tex\" title=\"$tex\"";
 
 			return "<img src=\"$fichier\" style=\"vertical-align:middle;\" $size $alt />";
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
 			if ($defaire_amp) {
 				$expression = str_replace('&amp;', '&', $expression);
 			}
-			$echap = "\n<p class=\"spip\" style=\"text-align: center;\">" . produire_image_math($expression) . "</p>\n";
+			$echap = "\n<p class=\"spip\" style=\"text-align: center;\">".produire_image_math($expression)."</p>\n";
 			$pos = strpos($texte_milieu, (string) $regs[0]);
 			$texte_milieu = substr($texte_milieu, 0, $pos)
 				. code_echappement($echap, $source)
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
 				. substr($texte_milieu, $pos + strlen($regs[0]));
 		}
 
-		$texte_a_voir = $texte_debut . $texte_milieu . $texte_fin;
+		$texte_a_voir = $texte_debut.$texte_milieu.$texte_fin;
 	}
 
 	return $texte_a_voir;

Please login to merge, or discard this patch.

ecrire/inc/svg.php 1 patch

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

@@ -56,7 +56,7 @@  discard block
 block discarded – undo
 		return $fichier;
 	}
 	if (!file_exists($fichier)) {
-		$fichier  = supprimer_timestamp($fichier);
+		$fichier = supprimer_timestamp($fichier);
 		if (!file_exists($fichier)) {
 			return false;
 		}
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
 function svg_change_balise_svg($svg, $old_balise_svg, $attributs) {
 	$new_balise_svg = '<svg';
 	foreach ($attributs as $k => $v) {
-		$new_balise_svg .= " $k=\"" . entites_html($v) . '"';
+		$new_balise_svg .= " $k=\"".entites_html($v).'"';
 	}
 	$new_balise_svg .= '>';
 
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
 function svg_insert_shapes($svg, $shapes, $start = true) {
 
 	if ($start === false or $start === 'end') {
-		$svg = str_replace('</svg>', $shapes . '</svg>', $svg);
+		$svg = str_replace('</svg>', $shapes.'</svg>', $svg);
 	}
 	else {
 		$p = stripos($svg, '<svg');
@@ -210,10 +210,10 @@  discard block
 block discarded – undo
  */
 function svg_clip_in_box($svg, $x, $y, $width, $height) {
 	$rect = "<rect x=\"$x\" y=\"$y\" width=\"$width\" height=\"$height\" />";
-	$id = 'clip-' . substr(md5($rect . strlen($svg)), 0, 8);
+	$id = 'clip-'.substr(md5($rect.strlen($svg)), 0, 8);
 	$clippath = "<clipPath id=\"$id\">$rect</clipPath>";
 	$g = "<g clip-path=\"url(#$id)\">";
-	$svg = svg_insert_shapes($svg, $clippath . $g);
+	$svg = svg_insert_shapes($svg, $clippath.$g);
 	$svg = svg_insert_shapes($svg, '</g>', false);
 	return $svg;
 }
@@ -232,7 +232,7 @@  discard block
 block discarded – undo
 	) {
 		[$balise_svg, $attributs] = $svg_infos;
 		if (!isset($attributs['viewBox'])) {
-			$attributs['viewBox'] = '0 0 ' . $attributs['width'] . ' ' . $attributs['height'];
+			$attributs['viewBox'] = '0 0 '.$attributs['width'].' '.$attributs['height'];
 		}
 		$attributs['width'] = strval($new_width);
 		$attributs['height'] = strval($new_height);
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
 	else {
 		$couleur = couleur_html_to_hex($couleur);
 	}
-	$couleur = '#' . ltrim($couleur, '#');
+	$couleur = '#'.ltrim($couleur, '#');
 	return $couleur;
 }
 
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
 function svg_couleur_to_rgb($couleur) {
 	if (strpos($couleur, 'rgb(') === 0) {
 		$c = explode(',', substr($couleur, 4));
-		return ['red' => intval($c[0]),'green' => intval($c[1]),'blue' => intval($c[2])];
+		return ['red' => intval($c[0]), 'green' => intval($c[1]), 'blue' => intval($c[2])];
 	}
 	return _couleur_hex_to_dec($couleur);
 }
@@ -474,7 +474,7 @@  discard block
 block discarded – undo
 			$background_color = svg_couleur_to_hexa($background_color);
 			if (isset($attributs['viewBox'])) {
 				$viewBox = explode(' ', $attributs['viewBox']);
-				$rect = '<rect x="' . $viewBox[0] . '" y="' . $viewBox[1] . '" width="' . $viewBox[2] . '" height="' . $viewBox[3] . "\" fill=\"$background_color\"/>";
+				$rect = '<rect x="'.$viewBox[0].'" y="'.$viewBox[1].'" width="'.$viewBox[2].'" height="'.$viewBox[3]."\" fill=\"$background_color\"/>";
 			}
 			else {
 				$rect = "<rect width=\"100%\" height=\"100%\" fill=\"$background_color\"/>";
@@ -504,7 +504,7 @@  discard block
 block discarded – undo
 			$background_color = svg_couleur_to_hexa($background_color);
 			if (isset($attributs['viewBox'])) {
 				$viewBox = explode(' ', $attributs['viewBox']);
-				$rect = '<rect x="' . $viewBox[0] . '" y="' . $viewBox[1] . '" width="' . $viewBox[2] . '" height="' . $viewBox[3] . "\" fill=\"$background_color\" opacity=\"$opacity\"/>";
+				$rect = '<rect x="'.$viewBox[0].'" y="'.$viewBox[1].'" width="'.$viewBox[2].'" height="'.$viewBox[3]."\" fill=\"$background_color\" opacity=\"$opacity\"/>";
 			}
 			else {
 				$rect = "<rect width=\"100%\" height=\"100%\" fill=\"$background_color\"/>";
@@ -533,7 +533,7 @@  discard block
 block discarded – undo
 			$g = '<g';
 			foreach ($attributs as $k => $v) {
 				if (strlen($v)) {
-					$g .= " $k=\"" . attribut_html($v) . '"';
+					$g .= " $k=\"".attribut_html($v).'"';
 				}
 			}
 			if (strlen($g) > 2) {
@@ -561,10 +561,10 @@  discard block
 block discarded – undo
 	) {
 		if ($filter_def) {
 			[$balise_svg, ] = $svg_infos;
-			$filter_id = 'filter-' . substr(md5($filter_def . strlen($svg)), 0, 8);
+			$filter_id = 'filter-'.substr(md5($filter_def.strlen($svg)), 0, 8);
 			$filter = "<defs><filter id=\"$filter_id\">$filter_def</filter></defs>";
 			$g = "<g filter=\"url(#$filter_id)\">";
-			$svg = svg_insert_shapes($svg, $filter . $g);
+			$svg = svg_insert_shapes($svg, $filter.$g);
 			$svg = svg_insert_shapes($svg, '</g>', false);
 		}
 		return $svg;

Please login to merge, or discard this patch.

ecrire/inc/rechercher.php 1 patch

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

@@ -100,7 +100,7 @@  discard block
 block discarded – undo
 	if (substr($recherche, 0, 1) == '/' and substr($recherche, -1, 1) == '/' and strlen($recherche) > 2) {
 		// c'est une preg
 		$recherche_trans = translitteration($recherche);
-		$preg = $recherche_trans . $options['preg_flags'];
+		$preg = $recherche_trans.$options['preg_flags'];
 		$is_preg = true;
 	} else {
 		// s'il y a plusieurs mots il faut les chercher tous : oblige REGEXP,
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
 			}
 		}
 
-		if (preg_match(',\s+,' . $u, $recherche_mod)) {
+		if (preg_match(',\s+,'.$u, $recherche_mod)) {
 			$is_preg = true;
 
 			$recherche_inter = '|';
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
 			foreach ($recherche_mots as $mot) {
 				if (strlen($mot) >= $min_long) {
 					// echapper les caracteres de regexp qui sont eventuellement dans la recherche
-					$recherche_inter .= preg_quote($mot) . ' ';
+					$recherche_inter .= preg_quote($mot).' ';
 					$petits_mots = false;
 				}
 			}
@@ -138,14 +138,14 @@  discard block
 block discarded – undo
 
 			// mais on cherche quand même l'expression complète, même si elle
 			// comporte des mots de moins de quatre lettres
-			$recherche = trim(preg_replace(',\s+,' . $u, '|', $recherche_inter), '|');
+			$recherche = trim(preg_replace(',\s+,'.$u, '|', $recherche_inter), '|');
 			if (!$recherche or $petits_mots) {
 				$recherche = preg_quote($recherche_org);
 			}
 			$recherche_trans = translitteration($recherche);
 		}
 
-		$preg = '/' . str_replace('/', '\\/', $recherche_trans) . '/' . $options['preg_flags'];
+		$preg = '/'.str_replace('/', '\\/', $recherche_trans).'/'.$options['preg_flags'];
 	}
 
 	// Si la chaine est inactive, on va utiliser LIKE pour aller plus vite
@@ -185,11 +185,11 @@  discard block
 block discarded – undo
 		}
 		$q = sql_quote(
 			'%'
-			. preg_replace(',\s+,' . $u, '%', $q)
+			. preg_replace(',\s+,'.$u, '%', $q)
 			. '%'
 		);
 
-		$preg = '/' . preg_replace(',\s+,' . $u, '.+', trim($recherche_mod)) . '/' . $options['preg_flags'];
+		$preg = '/'.preg_replace(',\s+,'.$u, '.+', trim($recherche_mod)).'/'.$options['preg_flags'];
 	} else {
 		$methode = 'REGEXP';
 		$q = sql_quote(trim($recherche, '/'));
@@ -311,7 +311,7 @@  discard block
 block discarded – undo
 	foreach ($tables as $table => $champs) {
 		# lock via memoization, si dispo
 		if (function_exists('cache_lock')) {
-			cache_lock($lock = _RECHERCHE_LOCK_KEY . ' ' . $table . ' ' . $recherche);
+			cache_lock($lock = _RECHERCHE_LOCK_KEY.' '.$table.' '.$recherche);
 		}
 
 		spip_timer('rech');
@@ -326,7 +326,7 @@  discard block
 block discarded – undo
 
 
 		spip_log(
-			"recherche $table ($recherche) : " . (is_countable($results[$table]) ? count($results[$table]) : 0) . ' resultats ' . spip_timer('rech'),
+			"recherche $table ($recherche) : ".(is_countable($results[$table]) ? count($results[$table]) : 0).' resultats '.spip_timer('rech'),
 			'recherche'
 		);
 
@@ -361,7 +361,7 @@  discard block
 block discarded – undo
 
 	$results = recherche_en_base($recherche, $tables, $options);
 
-	$preg = '/' . str_replace('/', '\\/', $recherche) . '/' . $options['preg_flags'];
+	$preg = '/'.str_replace('/', '\\/', $recherche).'/'.$options['preg_flags'];
 
 	foreach ($results as $table => $r) {
 		$_id_table = id_table_objet($table);

Please login to merge, or discard this patch.

		@@ -106,7 +106,7 @@ discard block
		block discarded – undo
106	106	if (!$max_age) {
107	107	$max_age = _DEFAULT_LOCKTIME;
108	108	}
109		- $lock_file = _DIR_TMP . _NAME_LOCK . '-' . substr(md5($fichier), 0, 8);
	109	+ $lock_file = _DIR_TMP._NAME_LOCK.'-'.substr(md5($fichier), 0, 8);
110	110
111	111
112	112	/*
		@@ -115,7 +115,7 @@ discard block
		block discarded – undo
115	115	*/
116	116
117	117	$id = creer_uniqid();
118		- $tpath = _DIR_TMP . "slock.$id";
	118	+ $tpath = _DIR_TMP."slock.$id";
119	119	$tmpfd = @fopen($tpath, 'w'); // hum, le 'x' necessite php4,3,2 ...
120	120	if (!$tmpfd) { /* open failed */
121	121	@fclose($tmpfd);
		@@ -241,7 +241,7 @@ discard block
		block discarded – undo
241	241	* thinks the current time is (our_tmp.st_ctime)..
242	242	*/
243	243
244		- $tpath = _DIR_TMP . "stime.$id";
	244	+ $tpath = _DIR_TMP."stime.$id";
245	245	$tmpfd = @fopen($tpath, 'w');
246	246	if (
247	247	(!$tmpfd)
		@@ -255,14 +255,14 @@ discard block
		block discarded – undo
255	255	return false; //(NFSL_SYSF);
256	256	}
257	257
258		- @fclose($tmpfd); /* We don't need this once we have our_tmp.st_ctime. */
	258	+ @fclose($tmpfd); /* We don't need this once we have our_tmp.st_ctime. */
259	259	spip_unlink($tpath);
260	260
261	261	/*
262	262	* 2. make fullpath, a buffer for the full pathname of the lock file
263	263	*/
264	264
265		- $lock_file = _DIR_TMP . _NAME_LOCK . '-' . substr(md5($fichier), 0, 8);
	265	+ $lock_file = _DIR_TMP._NAME_LOCK.'-'.substr(md5($fichier), 0, 8);
266	266
267	267	/*
268	268	* 3. If the ctime hasn't been modified, unlink the file and return. If the
		@@ -282,10 +282,10 @@ discard block
		block discarded – undo
282	282	if (!$test) {
283	283	return false;
284	284	} //(NFSL_LOST);
285		- sleep(1 + (random_int(0, 4))); /* so sleep a bit */
	285	+ sleep(1 + (random_int(0, 4))); /* so sleep a bit */
286	286	}
287	287
288		- return true;//(NFSL_OK); /* success */
	288	+ return true; //(NFSL_OK); /* success */
289	289	}
290	290
291	291	/*

		@@ -56,7 +56,7 @@ discard block
		block discarded – undo
56	56	return $fichier;
57	57	}
58	58	if (!file_exists($fichier)) {
59		- $fichier = supprimer_timestamp($fichier);
	59	+ $fichier = supprimer_timestamp($fichier);
60	60	if (!file_exists($fichier)) {
61	61	return false;
62	62	}
		@@ -170,7 +170,7 @@ discard block
		block discarded – undo
170	170	function svg_change_balise_svg($svg, $old_balise_svg, $attributs) {
171	171	$new_balise_svg = '<svg';
172	172	foreach ($attributs as $k => $v) {
173		- $new_balise_svg .= " $k=\"" . entites_html($v) . '"';
	173	+ $new_balise_svg .= " $k=\"".entites_html($v).'"';
174	174	}
175	175	$new_balise_svg .= '>';
176	176
		@@ -189,7 +189,7 @@ discard block
		block discarded – undo
189	189	function svg_insert_shapes($svg, $shapes, $start = true) {
190	190
191	191	if ($start === false or $start === 'end') {
192		- $svg = str_replace('</svg>', $shapes . '</svg>', $svg);
	192	+ $svg = str_replace('</svg>', $shapes.'</svg>', $svg);
193	193	}
194	194	else {
195	195	$p = stripos($svg, '<svg');
		@@ -210,10 +210,10 @@ discard block
		block discarded – undo
210	210	*/
211	211	function svg_clip_in_box($svg, $x, $y, $width, $height) {
212	212	$rect = "<rect x=\"$x\" y=\"$y\" width=\"$width\" height=\"$height\" />";
213		- $id = 'clip-' . substr(md5($rect . strlen($svg)), 0, 8);
	213	+ $id = 'clip-'.substr(md5($rect.strlen($svg)), 0, 8);
214	214	$clippath = "<clipPath id=\"$id\">$rect</clipPath>";
215	215	$g = "<g clip-path=\"url(#$id)\">";
216		- $svg = svg_insert_shapes($svg, $clippath . $g);
	216	+ $svg = svg_insert_shapes($svg, $clippath.$g);
217	217	$svg = svg_insert_shapes($svg, '</g>', false);
218	218	return $svg;
219	219	}
		@@ -232,7 +232,7 @@ discard block
		block discarded – undo
232	232	) {
233	233	[$balise_svg, $attributs] = $svg_infos;
234	234	if (!isset($attributs['viewBox'])) {
235		- $attributs['viewBox'] = '0 0 ' . $attributs['width'] . ' ' . $attributs['height'];
	235	+ $attributs['viewBox'] = '0 0 '.$attributs['width'].' '.$attributs['height'];
236	236	}
237	237	$attributs['width'] = strval($new_width);
238	238	$attributs['height'] = strval($new_height);
		@@ -257,7 +257,7 @@ discard block
		block discarded – undo
257	257	else {
258	258	$couleur = couleur_html_to_hex($couleur);
259	259	}
260		- $couleur = '#' . ltrim($couleur, '#');
	260	+ $couleur = '#'.ltrim($couleur, '#');
261	261	return $couleur;
262	262	}
263	263
		@@ -269,7 +269,7 @@ discard block
		block discarded – undo
269	269	function svg_couleur_to_rgb($couleur) {
270	270	if (strpos($couleur, 'rgb(') === 0) {
271	271	$c = explode(',', substr($couleur, 4));
272		- return ['red' => intval($c[0]),'green' => intval($c[1]),'blue' => intval($c[2])];
	272	+ return ['red' => intval($c[0]), 'green' => intval($c[1]), 'blue' => intval($c[2])];
273	273	}
274	274	return _couleur_hex_to_dec($couleur);
275	275	}
		@@ -474,7 +474,7 @@ discard block
		block discarded – undo
474	474	$background_color = svg_couleur_to_hexa($background_color);
475	475	if (isset($attributs['viewBox'])) {
476	476	$viewBox = explode(' ', $attributs['viewBox']);
477		- $rect = '<rect x="' . $viewBox[0] . '" y="' . $viewBox[1] . '" width="' . $viewBox[2] . '" height="' . $viewBox[3] . "\" fill=\"$background_color\"/>";
	477	+ $rect = '<rect x="'.$viewBox[0].'" y="'.$viewBox[1].'" width="'.$viewBox[2].'" height="'.$viewBox[3]."\" fill=\"$background_color\"/>";
478	478	}
479	479	else {
480	480	$rect = "<rect width=\"100%\" height=\"100%\" fill=\"$background_color\"/>";
		@@ -504,7 +504,7 @@ discard block
		block discarded – undo
504	504	$background_color = svg_couleur_to_hexa($background_color);
505	505	if (isset($attributs['viewBox'])) {
506	506	$viewBox = explode(' ', $attributs['viewBox']);
507		- $rect = '<rect x="' . $viewBox[0] . '" y="' . $viewBox[1] . '" width="' . $viewBox[2] . '" height="' . $viewBox[3] . "\" fill=\"$background_color\" opacity=\"$opacity\"/>";
	507	+ $rect = '<rect x="'.$viewBox[0].'" y="'.$viewBox[1].'" width="'.$viewBox[2].'" height="'.$viewBox[3]."\" fill=\"$background_color\" opacity=\"$opacity\"/>";
508	508	}
509	509	else {
510	510	$rect = "<rect width=\"100%\" height=\"100%\" fill=\"$background_color\"/>";
		@@ -533,7 +533,7 @@ discard block
		block discarded – undo
533	533	$g = '<g';
534	534	foreach ($attributs as $k => $v) {
535	535	if (strlen($v)) {
536		- $g .= " $k=\"" . attribut_html($v) . '"';
	536	+ $g .= " $k=\"".attribut_html($v).'"';
537	537	}
538	538	}
539	539	if (strlen($g) > 2) {
		@@ -561,10 +561,10 @@ discard block
		block discarded – undo
561	561	) {
562	562	if ($filter_def) {
563	563	[$balise_svg, ] = $svg_infos;
564		- $filter_id = 'filter-' . substr(md5($filter_def . strlen($svg)), 0, 8);
	564	+ $filter_id = 'filter-'.substr(md5($filter_def.strlen($svg)), 0, 8);
565	565	$filter = "<defs><filter id=\"$filter_id\">$filter_def</filter></defs>";
566	566	$g = "<g filter=\"url(#$filter_id)\">";
567		- $svg = svg_insert_shapes($svg, $filter . $g);
	567	+ $svg = svg_insert_shapes($svg, $filter.$g);
568	568	$svg = svg_insert_shapes($svg, '</g>', false);
569	569	}
570	570	return $svg;

		@@ -100,7 +100,7 @@ discard block
		block discarded – undo
100	100	if (substr($recherche, 0, 1) == '/' and substr($recherche, -1, 1) == '/' and strlen($recherche) > 2) {
101	101	// c'est une preg
102	102	$recherche_trans = translitteration($recherche);
103		- $preg = $recherche_trans . $options['preg_flags'];
	103	+ $preg = $recherche_trans.$options['preg_flags'];
104	104	$is_preg = true;
105	105	} else {
106	106	// s'il y a plusieurs mots il faut les chercher tous : oblige REGEXP,
		@@ -120,7 +120,7 @@ discard block
		block discarded – undo
120	120	}
121	121	}
122	122
123		- if (preg_match(',\s+,' . $u, $recherche_mod)) {
	123	+ if (preg_match(',\s+,'.$u, $recherche_mod)) {
124	124	$is_preg = true;
125	125
126	126	$recherche_inter = '\|';
		@@ -130,7 +130,7 @@ discard block
		block discarded – undo
130	130	foreach ($recherche_mots as $mot) {
131	131	if (strlen($mot) >= $min_long) {
132	132	// echapper les caracteres de regexp qui sont eventuellement dans la recherche
133		- $recherche_inter .= preg_quote($mot) . ' ';
	133	+ $recherche_inter .= preg_quote($mot).' ';
134	134	$petits_mots = false;
135	135	}
136	136	}
		@@ -138,14 +138,14 @@ discard block
		block discarded – undo
138	138
139	139	// mais on cherche quand même l'expression complète, même si elle
140	140	// comporte des mots de moins de quatre lettres
141		- $recherche = trim(preg_replace(',\s+,' . $u, '\|', $recherche_inter), '\|');
	141	+ $recherche = trim(preg_replace(',\s+,'.$u, '\|', $recherche_inter), '\|');
142	142	if (!$recherche or $petits_mots) {
143	143	$recherche = preg_quote($recherche_org);
144	144	}
145	145	$recherche_trans = translitteration($recherche);
146	146	}
147	147
148		- $preg = '/' . str_replace('/', '\\/', $recherche_trans) . '/' . $options['preg_flags'];
	148	+ $preg = '/'.str_replace('/', '\\/', $recherche_trans).'/'.$options['preg_flags'];
149	149	}
150	150
151	151	// Si la chaine est inactive, on va utiliser LIKE pour aller plus vite
		@@ -185,11 +185,11 @@ discard block
		block discarded – undo
185	185	}
186	186	$q = sql_quote(
187	187	'%'
188		- . preg_replace(',\s+,' . $u, '%', $q)
	188	+ . preg_replace(',\s+,'.$u, '%', $q)
189	189	. '%'
190	190	);
191	191
192		- $preg = '/' . preg_replace(',\s+,' . $u, '.+', trim($recherche_mod)) . '/' . $options['preg_flags'];
	192	+ $preg = '/'.preg_replace(',\s+,'.$u, '.+', trim($recherche_mod)).'/'.$options['preg_flags'];
193	193	} else {
194	194	$methode = 'REGEXP';
195	195	$q = sql_quote(trim($recherche, '/'));
		@@ -311,7 +311,7 @@ discard block
		block discarded – undo
311	311	foreach ($tables as $table => $champs) {
312	312	# lock via memoization, si dispo
313	313	if (function_exists('cache_lock')) {
314		- cache_lock($lock = _RECHERCHE_LOCK_KEY . ' ' . $table . ' ' . $recherche);
	314	+ cache_lock($lock = _RECHERCHE_LOCK_KEY.' '.$table.' '.$recherche);
315	315	}
316	316
317	317	spip_timer('rech');
		@@ -326,7 +326,7 @@ discard block
		block discarded – undo
326	326
327	327
328	328	spip_log(
329		- "recherche $table ($recherche) : " . (is_countable($results[$table]) ? count($results[$table]) : 0) . ' resultats ' . spip_timer('rech'),
	329	+ "recherche $table ($recherche) : ".(is_countable($results[$table]) ? count($results[$table]) : 0).' resultats '.spip_timer('rech'),
330	330	'recherche'
331	331	);
332	332
		@@ -361,7 +361,7 @@ discard block
		block discarded – undo
361	361
362	362	$results = recherche_en_base($recherche, $tables, $options);
363	363
364		- $preg = '/' . str_replace('/', '\\/', $recherche) . '/' . $options['preg_flags'];
	364	+ $preg = '/'.str_replace('/', '\\/', $recherche).'/'.$options['preg_flags'];
365	365
366	366	foreach ($results as $table => $r) {
367	367	$_id_table = id_table_objet($table);

		@@ -111,13 +111,13 @@ discard block
		block discarded – undo
111	111
112	112	function chrono_requete($temps) {
113	113	$total = 0;
114		- $hors = '<i>' . _T('zbug_hors_compilation') . '</i>';
	114	+ $hors = '<i>'._T('zbug_hors_compilation').'</i>';
115	115	$t = $q = $n = $d = [];
116	116	// Totaliser les temps et completer le Explain
117	117	foreach ($temps as $key => $v) {
118	118	[$dt, $nb, $boucle, $query, $explain, $res, $contexte] = $v;
119	119	if (is_array($contexte)) {
120		- $k = ($contexte[0] . " $boucle");
	120	+ $k = ($contexte[0]." $boucle");
121	121	include_spip('public/compiler');
122	122	$env = reconstruire_contexte_compil($contexte);
123	123	} else {
		@@ -162,7 +162,7 @@ discard block
		block discarded – undo
162	162	// Fabriquer les liens de navigations dans le tableau des temps
163	163	foreach ($temps as $k => $v) {
164	164	$titre = strip_tags($v[2]);
165		- $href = quote_amp($GLOBALS['REQUEST_URI']) . "#req$i";
	165	+ $href = quote_amp($GLOBALS['REQUEST_URI'])."#req$i";
166	166	$href = str_replace("\\'", ''', $href);
167	167
168	168	if (!isset($t[$v[2]])) {
		@@ -183,7 +183,7 @@ discard block
		block discarded – undo
183	183	unset($d['']);
184	184	// Fabriquer le tableau des liens de navigation dans le grand tableau
185	185	foreach ($d as $k => $v) {
186		- $d[$k] = $n[$k] . "</td><td>$k</td><td class='time'>$v</td><td class='liste-reqs'>"
	186	+ $d[$k] = $n[$k]."</td><td>$k</td><td class='time'>$v</td><td class='liste-reqs'>"
187	187	. join('', $t[$k]);
188	188	}
189	189
		@@ -193,7 +193,7 @@ discard block
		block discarded – undo
193	193	. join("</td></tr>\n<tr><td>", $d)
194	194	. "</td></tr>\n"
195	195	. (# _request('var_mode_objet') ? '' :
196		- ('<tr><td>' . (is_countable($temps) ? count($temps) : 0) . '</td><td>' . _T('info_total') . '</td><td class="time">' . $total . '</td><td></td></tr>'))
	196	+ ('<tr><td>'.(is_countable($temps) ? count($temps) : 0).'</td><td>'._T('info_total').'</td><td class="time">'.$total.'</td><td></td></tr>'))
197	197	];
198	198
199	199	return [$temps, $navigation];

		@@ -45,8 +45,8 @@
		block discarded – undo
45	45
46	46	echo debut_grand_cadre();
47	47	echo boite_ouvrir(_T('info_message_technique'), 'notice');
48		- echo '<p>' . _T('info_procedure_maj_version') . '</p>',
49		- '<p>' . _T('info_administrateur_site_01') . '</p>';
	48	+ echo '<p>'._T('info_procedure_maj_version').'</p>',
	49	+ '<p>'._T('info_administrateur_site_01').'</p>';
50	50	echo bouton_action(_T('bouton_mettre_a_jour_base'), generer_url_ecrire('upgrade', 'reinstall=non'));
51	51	echo boite_fermer();
52	52	// masquer les erreurs sql sur cette page car proviennent de la base pas a jour !

		@@ -42,7 +42,7 @@
		block discarded – undo
42	42	echo pipeline('affiche_droite', ['args' => ['exec' => '404', 'exec_erreur' => $exec], 'data' => '']);
43	43
44	44	echo debut_droite();
45		- echo "<h1 class='grostitre'>" . _T('fichier_introuvable', ['fichier' => $exec]) . '</h1>';
	45	+ echo "<h1 class='grostitre'>"._T('fichier_introuvable', ['fichier' => $exec]).'</h1>';
46	46	echo pipeline('affiche_milieu', ['args' => ['exec' => '404', 'exec_erreur' => $exec], 'data' => '']);
47	47
48	48	echo fin_gauche(), fin_page();

		@@ -74,7 +74,7 @@ discard block
		block discarded – undo
74	74	lire_fichier($file, $c);
75	75	$css .= $c;
76	76	}
77		- $css = "<style type='text/css'>" . $css . '</style>';
	77	+ $css = "<style type='text/css'>".$css.'</style>';
78	78	} else {
79	79	foreach ($files as $name) {
80	80	$file = direction_css(find_in_theme($name));
		@@ -87,19 +87,19 @@ discard block
		block discarded – undo
87	87	define('_DOCTYPE_ECRIRE', '');
88	88	}
89	89
90		- return _DOCTYPE_ECRIRE .
91		- html_lang_attributes() .
92		- "<head>\n" .
93		- '<title>' .
94		- textebrut($titre) .
95		- "</title>\n" .
96		- "<meta name='viewport' content='width=device-width' />\n" .
97		- $css .
	90	+ return _DOCTYPE_ECRIRE.
	91	+ html_lang_attributes().
	92	+ "<head>\n".
	93	+ '<title>'.
	94	+ textebrut($titre).
	95	+ "</title>\n".
	96	+ "<meta name='viewport' content='width=device-width' />\n".
	97	+ $css.
98	98	'</head>
99		-<body' . $onLoad . " class='minipres'>
	99	+<body' . $onLoad." class='minipres'>
100	100	<div id='minipres'>
101	101	<h1>" .
102		- $titre .
	102	+ $titre.
103	103	"</h1>
104	104	<div>\n";
105	105	}
		@@ -182,7 +182,7 @@ discard block
		block discarded – undo
182	182
183	183	$titre = ($titre == 'install')
184	184	? _T('avis_espace_interdit')
185		- : $titre . ' : ' . _T('info_acces_interdit');
	185	+ : $titre.' : '._T('info_acces_interdit');
186	186
187	187	$statut = $GLOBALS['visiteur_session']['statut'] ?? '';
188	188	$nom = $GLOBALS['visiteur_session']['nom'] ?? '';
		@@ -201,7 +201,7 @@ discard block
		block discarded – undo
201	201	$corps = bouton_action(_T('public:accueil_site'), $GLOBALS['meta']['adresse_site']);
202	202	}
203	203	$corps = "<div class='boutons'>$corps</div>";
204		- spip_log($nom . " $titre " . $_SERVER['REQUEST_URI']);
	204	+ spip_log($nom." $titre ".$_SERVER['REQUEST_URI']);
205	205	}
206	206
207	207	if (!_AJAX) {
		@@ -219,6 +219,6 @@ discard block
		block discarded – undo
219	219	foreach ($_POST as $v => $c) {
220	220	$url = parametre_url($url, $v, $c, '&');
221	221	}
222		- ajax_retour('<div>' . $titre . redirige_formulaire($url) . '</div>', false);
	222	+ ajax_retour('<div>'.$titre.redirige_formulaire($url).'</div>', false);
223	223	}
224	224	}

		@@ -87,12 +87,12 @@
		block discarded – undo
87	87	}
88	88	// si une seule colonne, en faire le titre
89	89	if (preg_match("/^([^$sep]+)$sep+\$/", $entete, $l)) {
90		- $caption = "\n\|\|" . $l[1] . '\|';
	90	+ $caption = "\n\|\|".$l[1].'\|';
91	91	[$entete, $corps] = explode("\n", $corps, 2);
92	92	}
93	93	// si premiere colonne vide, le raccourci doit quand meme produire <th...
94	94	if ($entete[0] == $sep) {
95		- $entete = ' ' . $entete;
	95	+ $entete = ' '.$entete;
96	96	}
97	97
98	98	$lignes = explode("\n", $corps);

		@@ -37,16 +37,16 @@ discard block
		block discarded – undo
37	37	}
38	38
39	39	// Regarder dans le repertoire local des images TeX et blocs MathML
40		- if (!@is_dir($dir_tex = _DIR_VAR . 'cache-TeX/')) {
	40	+ if (!@is_dir($dir_tex = _DIR_VAR.'cache-TeX/')) {
41	41	@mkdir($dir_tex, _SPIP_CHMOD);
42	42	}
43		- $fichier = $dir_tex . md5(trim($tex)) . $ext;
	43	+ $fichier = $dir_tex.md5(trim($tex)).$ext;
44	44
45	45
46	46	if (!@file_exists($fichier)) {
47	47	// Aller chercher l'image sur le serveur
48	48	if ($server) {
49		- spip_log($url = $server . '?' . rawurlencode($tex));
	49	+ spip_log($url = $server.'?'.rawurlencode($tex));
50	50	include_spip('inc/distant');
51	51	recuperer_url($url, ['file' => $fichier]);
52	52	}
		@@ -61,7 +61,7 @@ discard block
		block discarded – undo
61	61	return implode('', file($fichier));
62	62	} // TeX
63	63	else {
64		- [, , , $size] = @spip_getimagesize($fichier);
	64	+ [,,, $size] = @spip_getimagesize($fichier);
65	65	$alt = "alt=\"$tex\" title=\"$tex\"";
66	66
67	67	return "<img src=\"$fichier\" style=\"vertical-align:middle;\" $size $alt />";
		@@ -128,7 +128,7 @@ discard block
		block discarded – undo
128	128	if ($defaire_amp) {
129	129	$expression = str_replace('&', '&', $expression);
130	130	}
131		- $echap = "\n<p class=\"spip\" style=\"text-align: center;\">" . produire_image_math($expression) . "</p>\n";
	131	+ $echap = "\n<p class=\"spip\" style=\"text-align: center;\">".produire_image_math($expression)."</p>\n";
132	132	$pos = strpos($texte_milieu, (string) $regs[0]);
133	133	$texte_milieu = substr($texte_milieu, 0, $pos)
134	134	. code_echappement($echap, $source)
		@@ -148,7 +148,7 @@ discard block
		block discarded – undo
148	148	. substr($texte_milieu, $pos + strlen($regs[0]));
149	149	}
150	150
151		- $texte_a_voir = $texte_debut . $texte_milieu . $texte_fin;
	151	+ $texte_a_voir = $texte_debut.$texte_milieu.$texte_fin;
152	152	}
153	153
154	154	return $texte_a_voir;

spip / SPIP

Push — master ( f50317...15d2e0 )

Status

Category

Spacing +5 added lines, -5 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 +14 added lines, -14 removed lines patch added patch discarded remove patch

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

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

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

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

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