Inspection of "Quand aucun pattern n'est fournit dans preg_files(..." - spip/SPIP - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 4a1dc4...073957 )

by cam

created 2022-04-14 09:32 UTC

Status

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

@@ -37,7 +37,7 @@  discard block
 block discarded – undo
 
 	$GLOBALS['contexte'] = calculer_contexte();
 	$page = ['contexte_implicite' => calculer_contexte_implicite()];
-	$page['contexte_implicite']['cache'] = $fond . preg_replace(
+	$page['contexte_implicite']['cache'] = $fond.preg_replace(
 		',\.[a-zA-Z0-9]*$,',
 		'',
 		preg_replace('/[?].*$/', '', $GLOBALS['REQUEST_URI'])
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
 			if ($page === '') {
 				$erreur = _T(
 					'info_erreur_squelette2',
-					['fichier' => spip_htmlspecialchars($fond) . '.' . _EXTENSION_SQUELETTES]
+					['fichier' => spip_htmlspecialchars($fond).'.'._EXTENSION_SQUELETTES]
 				);
 				erreur_squelette($erreur);
 				// eviter des erreurs strictes ensuite sur $page['cle'] en PHP >= 5.4
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
 		and !isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])
 		and !isset($page['entetes']['Last-Modified'])
 	) {
-		$page['entetes']['Last-Modified'] = gmdate('D, d M Y H:i:s', $lastmodified) . ' GMT';
+		$page['entetes']['Last-Modified'] = gmdate('D, d M Y H:i:s', $lastmodified).' GMT';
 	}
 
 	// fermer la connexion apres les headers si requete HEAD
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
 		'spip_version_code' => $GLOBALS['spip_version_code'],
 	];
 	if (isset($_SERVER['HTTP_X_FORWARDED_HOST'])) {
-		$contexte_implicite['host'] .= '|' . $_SERVER['HTTP_X_FORWARDED_HOST'];
+		$contexte_implicite['host'] .= '|'.$_SERVER['HTTP_X_FORWARDED_HOST'];
 	}
 
 	return $contexte_implicite;
@@ -579,7 +579,7 @@  discard block
 block discarded – undo
 			}
 		}
 		if (is_null($id)) {
-			$msg = "modeles/$modele : " . _T('zbug_parametres_inclus_incorrects', ['param' => "id/$primary"]);
+			$msg = "modeles/$modele : "._T('zbug_parametres_inclus_incorrects', ['param' => "id/$primary"]);
 			erreur_squelette($msg);
 			// on passe id=0 au routeur pour tomber sur le modele par defaut et eviter une seconde erreur sur un modele inexistant
 			$id = 0;
@@ -626,7 +626,7 @@  discard block
 block discarded – undo
 		}
 
 		if (preg_match(',^[a-z0-9_]+$,', $soustype)) {
-			if (!trouve_modele($fond = ($type . '_' . $soustype))) {
+			if (!trouve_modele($fond = ($type.'_'.$soustype))) {
 				$fond = '';
 				$class = $soustype;
 			}
@@ -641,7 +641,7 @@  discard block
 block discarded – undo
 
 		return false;
 	}
-	$fond = 'modeles/' . $fond;
+	$fond = 'modeles/'.$fond;
 	// Creer le contexte
 	$contexte = $env;
 	$contexte['dir_racine'] = _DIR_RACINE; # eviter de mixer un cache racine et un cache ecrire (meme si pour l'instant les modeles ne sont pas caches, le resultat etant different il faut que le contexte en tienne compte
@@ -682,7 +682,7 @@  discard block
 block discarded – undo
 	// sinon, s'il y a un lien, on l'ajoute classiquement
 	if (
 		strstr(
-			' ' . ($classes = extraire_attribut($retour, 'class')) . ' ',
+			' '.($classes = extraire_attribut($retour, 'class')).' ',
 			'spip_lien_ok'
 		)
 	) {
@@ -693,7 +693,7 @@  discard block
 block discarded – undo
 		);
 	} else {
 		if ($lien) {
-			$retour = "<a href='" . $lien['href'] . "' class='" . $lien['class'] . "'>" . $retour . '</a>';
+			$retour = "<a href='".$lien['href']."' class='".$lien['class']."'>".$retour.'</a>';
 		}
 	}
 
@@ -717,7 +717,7 @@  discard block
 block discarded – undo
 		return $page;
 	}
 	// eval $page et affecte $res
-	include _ROOT_RESTREINT . 'public/evaluer_page.php';
+	include _ROOT_RESTREINT.'public/evaluer_page.php';
 
 	// Lever un drapeau (global) si le fond utilise #SESSION
 	// a destination de public/parametrer
@@ -785,16 +785,16 @@  discard block
 block discarded – undo
 			if (($pos = strpos($head, '<head>')) !== false) {
 				$head = substr_replace($head, $base, $pos + 6, 0);
 			} elseif (preg_match(',<head[^>]*>,i', $head, $r)) {
-				$head = str_replace($r[0], $r[0] . $base, $head);
+				$head = str_replace($r[0], $r[0].$base, $head);
 			}
-			$texte = $head . substr($texte, $poshead);
+			$texte = $head.substr($texte, $poshead);
 		}
 		if ($href_base) {
 			// gerer les ancres
 			$base = $_SERVER['REQUEST_URI'];
 			// pas de guillemets ni < dans l'URL qu'on insere dans le HTML
 			if (strpos($base, "'") or strpos($base, '"') or strpos($base, '<')) {
-				$base = str_replace(["'",'"','<'], ['%27','%22','%3C'], $base);
+				$base = str_replace(["'", '"', '<'], ['%27', '%22', '%3C'], $base);
 			}
 			if (strpos($texte, "href='#") !== false) {
 				$texte = str_replace("href='#", "href='$base#", $texte);

Please login to merge, or discard this patch.

ecrire/public/boucles.php 1 patch

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

@@ -82,7 +82,7 @@  discard block
 block discarded – undo
  **/
 function boucle_HIERARCHIE_dist($id_boucle, &$boucles) {
 	$boucle = &$boucles[$id_boucle];
-	$id_table = $boucle->id_table . '.id_rubrique';
+	$id_table = $boucle->id_table.'.id_rubrique';
 
 	// Si la boucle mere est une boucle RUBRIQUES il faut ignorer la feuille
 	// sauf en presence du critere {tout} (vu par phraser_html)
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
 		. '$hierarchie = calcul_hierarchie_in($id_rubrique,'
 		. (isset($boucle->modificateur['tout']) ? 'true' : 'false')
 		. ");\n\t"
-		. 'if (!$hierarchie) return "";' . "\n\t";
+		. 'if (!$hierarchie) return "";'."\n\t";
 
 	$boucle->where[] = ["'IN'", "'$id_table'", '"($hierarchie)"'];
 

Please login to merge, or discard this patch.

ecrire/maj/legacy/v31.php 1 patch

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

@@ -33,18 +33,18 @@
 block discarded – undo
  */
 function ranger_cache_gd2() {
 	spip_log('ranger_cache_gd2');
-	$base = _DIR_VAR . 'cache-gd2/';
+	$base = _DIR_VAR.'cache-gd2/';
 	if (is_dir($base) and is_readable($base)) {
 		if ($dir = opendir($base)) {
 			while (($f = readdir($dir)) !== false) {
 				if (
-					!is_dir($base . $f) and strncmp($f, '.', 1) !== 0
+					!is_dir($base.$f) and strncmp($f, '.', 1) !== 0
 					and preg_match(',[0-9a-f]{32}\.\w+,', $f)
 				) {
 					$sub = substr($f, 0, 2);
 					$sub = sous_repertoire($base, $sub);
-					@rename($base . $f, $sub . substr($f, 2));
-					@unlink($base . $f); // au cas ou le rename a foire (collision)
+					@rename($base.$f, $sub.substr($f, 2));
+					@unlink($base.$f); // au cas ou le rename a foire (collision)
 				}
 				if (time() >= _TIME_OUT) {
 					return;

Please login to merge, or discard this patch.

ecrire/maj/legacy/v40.php 1 patch

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

@@ -64,13 +64,13 @@
 block discarded – undo
 				spip_log("Table $table TIMESTAMP incorrect", 'maj');
 				foreach ($desc['field'] as $field => $type) {
 					if ($desc['field'][$field] !== $fields_corrected[$field]) {
-						spip_log("Adaptation TIMESTAMP table $table", 'maj.' . _LOG_INFO_IMPORTANTE);
-						sql_alter("table $table change $field $field " . $fields_corrected[$field]);
+						spip_log("Adaptation TIMESTAMP table $table", 'maj.'._LOG_INFO_IMPORTANTE);
+						sql_alter("table $table change $field $field ".$fields_corrected[$field]);
 						$trouver_table('');
 						$new_desc = $trouver_table($table);
 						spip_log(
-							"Apres conversion $table : " . var_export($new_desc['field'], true),
-							'maj.' . _LOG_INFO_IMPORTANTE
+							"Apres conversion $table : ".var_export($new_desc['field'], true),
+							'maj.'._LOG_INFO_IMPORTANTE
 						);
 					}
 				}

Please login to merge, or discard this patch.

ecrire/base/create.php 1 patch

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

@@ -85,7 +85,7 @@  discard block
 block discarded – undo
 			#if (!$sql_desc) $sql_desc = false;
 			#spip_log("Resultat table=$table sql_desc:$sql_desc","dbinstall"._LOG_INFO_IMPORTANTE);
 			if (!$sql_desc) {
-				spip_log("Echec creation table $table", 'maj' . _LOG_CRITIQUE);
+				spip_log("Echec creation table $table", 'maj'._LOG_CRITIQUE);
 			}
 		}
 	} else {
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
 		if (isset($desc['field'])) {
 			foreach ($desc['field'] as $field => $type) {
 				if (!isset($sql_desc['field'][$field])) {
-					sql_alter("TABLE $table ADD $field $type" . ($last ? " AFTER $last" : ''), $serveur);
+					sql_alter("TABLE $table ADD $field $type".($last ? " AFTER $last" : ''), $serveur);
 				}
 				$last = $field;
 			}

Please login to merge, or discard this patch.

ecrire/base/repair.php 1 patch

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

@@ -38,7 +38,7 @@  discard block
 block discarded – undo
 
 	$res = admin_repair_tables();
 	if (!$res) {
-		$res = "<div class='error'>" . _T('avis_erreur_mysql') . ' ' . sql_errno() . ': ' . sql_error() . "</div>\n";
+		$res = "<div class='error'>"._T('avis_erreur_mysql').' '.sql_errno().': '.sql_error()."</div>\n";
 	} else {
 		include_spip('inc/rubriques');
 		calculer_rubriques();
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
 	$res .= pipeline('base_admin_repair', $res);
 	echo minipres(
 		_T('texte_tentative_recuperation'),
-		$res . generer_form_ecrire('accueil', '', '', _T('public:accueil_site'))
+		$res.generer_form_ecrire('accueil', '', '', _T('public:accueil_site'))
 	);
 }
 
@@ -91,12 +91,12 @@  discard block
 block discarded – undo
 		$count = sql_countsel($tab);
 
 		if ($count > 1) {
-			$m .= '(' . _T('texte_compte_elements', ['count' => $count]) . ")\n";
+			$m .= '('._T('texte_compte_elements', ['count' => $count]).")\n";
 		} else {
 			if ($count == 1) {
-				$m .= '(' . _T('texte_compte_element', ['count' => $count]) . ")\n";
+				$m .= '('._T('texte_compte_element', ['count' => $count]).")\n";
 			} else {
-				$m .= '(' . _T('texte_vide') . ")\n";
+				$m .= '('._T('texte_vide').")\n";
 			}
 		}
 
@@ -105,13 +105,13 @@  discard block
 block discarded – undo
 			and $msg = join(
 				' ',
 				(is_resource($result_repair) or is_object($result_repair)) ? sql_fetch($result_repair) : $result_repair
-			) . ' '
+			).' '
 			and strpos($msg, ' OK ') === false
 		) {
 			$class = " class='notice'";
-			$m .= '<br /><tt>' . spip_htmlentities($msg) . "</tt>\n";
+			$m .= '<br /><tt>'.spip_htmlentities($msg)."</tt>\n";
 		} else {
-			$m .= ' ' . _T('texte_table_ok');
+			$m .= ' '._T('texte_table_ok');
 		}
 
 		$res .= "<div$class>$m</div>";

Please login to merge, or discard this patch.

ecrire/index.php 1 patch

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

@@ -35,7 +35,7 @@  discard block
 block discarded – undo
 // Determiner l'action demandee
 //
 
-$exec = (string)_request('exec');
+$exec = (string) _request('exec');
 $reinstall = (!is_null(_request('reinstall'))) ? _request('reinstall') : ($exec == 'install' ? 'oui' : null);
 //
 // Les scripts d'insallation n'authentifient pas, forcement,
@@ -121,9 +121,9 @@  discard block
 block discarded – undo
 			or (isset($GLOBALS['visiteur_session']) and $GLOBALS['visiteur_session']['statut'] == '0minirezo')
 		)
 	) {
-		spip_log('Quand la meta admin vaut ' .
-			$GLOBALS['meta']['admin'] .
-			' seul un admin peut se connecter et sans AJAX.' .
+		spip_log('Quand la meta admin vaut '.
+			$GLOBALS['meta']['admin'].
+			' seul un admin peut se connecter et sans AJAX.'.
 			' En cas de probleme, detruire cette meta.');
 		die(_T('info_travaux_texte'));
 	}

Please login to merge, or discard this patch.

ecrire/install/etape_ldap1.php 1 patch

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

@@ -58,11 +58,11 @@  discard block
 block discarded – undo
 					'valeur' => $adresse_ldap
 				],
 				'port_ldap' => [
-					'label' => _T('entree_port_annuaire') . '<br />' . _T('texte_port_annuaire'),
+					'label' => _T('entree_port_annuaire').'<br />'._T('texte_port_annuaire'),
 					'valeur' => $port_ldap
 				],
 				'tls_ldap' => [
-					'label' => '<b>' . _T('tls_ldap') . '</b>',
+					'label' => '<b>'._T('tls_ldap').'</b>',
 					'valeur' => $tls_ldap,
 					'alternatives' => [
 						'non' => _T('item_non'),
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
 			]
 		)
 
-		. "\n<p>" . _T('texte_acces_ldap_anonyme_1') . '</p>'
+		. "\n<p>"._T('texte_acces_ldap_anonyme_1').'</p>'
 		. fieldset(
 			_T('connexion_ldap'),
 			[

Please login to merge, or discard this patch.

ecrire/install/etape_chmod.php 1 patch

Spacing +15 added lines, -16 removed lines patch added patch discarded remove patch

@@ -81,7 +81,7 @@  discard block
 block discarded – undo
 			$test_dir .= '/';
 		}
 		if (!in_array($test_dir, $GLOBALS['test_dirs'])) {
-			$GLOBALS['test_dirs'][] = _DIR_RACINE . $test_dir;
+			$GLOBALS['test_dirs'][] = _DIR_RACINE.$test_dir;
 		}
 	} else {
 		if (!_FILE_CONNECT) {
@@ -96,11 +96,11 @@  discard block
 block discarded – undo
 	foreach ($GLOBALS['test_dirs'] as $i => $my_dir) {
 		$test = test_ecrire($my_dir);
 		if (!$test) {
-			$m = preg_replace(',^' . _DIR_RACINE . ',', '', $my_dir);
+			$m = preg_replace(',^'._DIR_RACINE.',', '', $my_dir);
 			if (@file_exists($my_dir)) {
-				$bad_dirs['<li>' . $m . '</li>'] = 1;
+				$bad_dirs['<li>'.$m.'</li>'] = 1;
 			} else {
-				$absent_dirs['<li>' . $m . '</li>'] = 1;
+				$absent_dirs['<li>'.$m.'</li>'] = 1;
 			}
 		} else {
 			$chmod = max($chmod, $test);
@@ -110,21 +110,21 @@  discard block
 block discarded – undo
 	if ($bad_dirs or $absent_dirs) {
 		if (!_FILE_CONNECT) {
 			$titre = _T('dirs_preliminaire');
-			$continuer = ' ' . _T('dirs_commencer') . '.';
+			$continuer = ' '._T('dirs_commencer').'.';
 		} else {
 			$titre = _T('dirs_probleme_droits');
 		}
 
 
-		$res = "<div align='right'>" . menu_langues('var_lang_ecrire') . "</div>\n";
+		$res = "<div align='right'>".menu_langues('var_lang_ecrire')."</div>\n";
 
 		if ($bad_dirs) {
 			$res .=
 				_T(
 					'dirs_repertoires_suivants',
 					['bad_dirs' => join("\n", array_keys($bad_dirs))]
-				) .
-				'<b>' . _T('login_recharger') . '</b>.';
+				).
+				'<b>'._T('login_recharger').'</b>.';
 		}
 
 		if ($absent_dirs) {
@@ -132,22 +132,21 @@  discard block
 block discarded – undo
 				_T(
 					'dirs_repertoires_absents',
 					['bad_dirs' => join("\n", array_keys($absent_dirs))]
-				) .
-				'<b>' . _T('login_recharger') . '</b>.';
+				).
+				'<b>'._T('login_recharger').'</b>.';
 		}
-		$res = '<p>' . $continuer . $res . aider('install0', true) . '</p>';
+		$res = '<p>'.$continuer.$res.aider('install0', true).'</p>';
 
 		$t = _T('login_recharger');
-		$t = (!$test_dir ? '' :
-				"<input type='hidden' name='test_dir' value='" . spip_htmlspecialchars($test_dir, ENT_QUOTES) . "' />")
+		$t = (!$test_dir ? '' : "<input type='hidden' name='test_dir' value='".spip_htmlspecialchars($test_dir, ENT_QUOTES)."' />")
 			. "<input type='hidden' name='etape' value='chmod' />"
-			. "<div style='text-align: right'><input type='submit' value='" . attribut_html($t) . "' /></div>";
+			. "<div style='text-align: right'><input type='submit' value='".attribut_html($t)."' /></div>";
 
-		echo minipres($titre, $res . generer_form_ecrire('install', $t));
+		echo minipres($titre, $res.generer_form_ecrire('install', $t));
 	} else {
 		$deja = (_FILE_CONNECT and analyse_fichier_connection(_FILE_CONNECT));
 		if (!$deja) {
-			redirige_url_ecrire('install', 'etape=1&chmod=' . $chmod);
+			redirige_url_ecrire('install', 'etape=1&chmod='.$chmod);
 		} else {
 			redirige_url_ecrire();
 		}

Please login to merge, or discard this patch.

		@@ -37,7 +37,7 @@ discard block
		block discarded – undo
37	37
38	38	$GLOBALS['contexte'] = calculer_contexte();
39	39	$page = ['contexte_implicite' => calculer_contexte_implicite()];
40		- $page['contexte_implicite']['cache'] = $fond . preg_replace(
	40	+ $page['contexte_implicite']['cache'] = $fond.preg_replace(
41	41	',\.[a-zA-Z0-9]*$,',
42	42	'',
43	43	preg_replace('/[?].*$/', '', $GLOBALS['REQUEST_URI'])
		@@ -138,7 +138,7 @@ discard block
		block discarded – undo
138	138	if ($page === '') {
139	139	$erreur = _T(
140	140	'info_erreur_squelette2',
141		- ['fichier' => spip_htmlspecialchars($fond) . '.' . _EXTENSION_SQUELETTES]
	141	+ ['fichier' => spip_htmlspecialchars($fond).'.'._EXTENSION_SQUELETTES]
142	142	);
143	143	erreur_squelette($erreur);
144	144	// eviter des erreurs strictes ensuite sur $page['cle'] en PHP >= 5.4
		@@ -183,7 +183,7 @@ discard block
		block discarded – undo
183	183	and !isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])
184	184	and !isset($page['entetes']['Last-Modified'])
185	185	) {
186		- $page['entetes']['Last-Modified'] = gmdate('D, d M Y H:i:s', $lastmodified) . ' GMT';
	186	+ $page['entetes']['Last-Modified'] = gmdate('D, d M Y H:i:s', $lastmodified).' GMT';
187	187	}
188	188
189	189	// fermer la connexion apres les headers si requete HEAD
		@@ -248,7 +248,7 @@ discard block
		block discarded – undo
248	248	'spip_version_code' => $GLOBALS['spip_version_code'],
249	249	];
250	250	if (isset($_SERVER['HTTP_X_FORWARDED_HOST'])) {
251		- $contexte_implicite['host'] .= '\|' . $_SERVER['HTTP_X_FORWARDED_HOST'];
	251	+ $contexte_implicite['host'] .= '\|'.$_SERVER['HTTP_X_FORWARDED_HOST'];
252	252	}
253	253
254	254	return $contexte_implicite;
		@@ -579,7 +579,7 @@ discard block
		block discarded – undo
579	579	}
580	580	}
581	581	if (is_null($id)) {
582		- $msg = "modeles/$modele : " . _T('zbug_parametres_inclus_incorrects', ['param' => "id/$primary"]);
	582	+ $msg = "modeles/$modele : "._T('zbug_parametres_inclus_incorrects', ['param' => "id/$primary"]);
583	583	erreur_squelette($msg);
584	584	// on passe id=0 au routeur pour tomber sur le modele par defaut et eviter une seconde erreur sur un modele inexistant
585	585	$id = 0;
		@@ -626,7 +626,7 @@ discard block
		block discarded – undo
626	626	}
627	627
628	628	if (preg_match(',^[a-z0-9_]+$,', $soustype)) {
629		- if (!trouve_modele($fond = ($type . '_' . $soustype))) {
	629	+ if (!trouve_modele($fond = ($type.'_'.$soustype))) {
630	630	$fond = '';
631	631	$class = $soustype;
632	632	}
		@@ -641,7 +641,7 @@ discard block
		block discarded – undo
641	641
642	642	return false;
643	643	}
644		- $fond = 'modeles/' . $fond;
	644	+ $fond = 'modeles/'.$fond;
645	645	// Creer le contexte
646	646	$contexte = $env;
647	647	$contexte['dir_racine'] = _DIR_RACINE; # eviter de mixer un cache racine et un cache ecrire (meme si pour l'instant les modeles ne sont pas caches, le resultat etant different il faut que le contexte en tienne compte
		@@ -682,7 +682,7 @@ discard block
		block discarded – undo
682	682	// sinon, s'il y a un lien, on l'ajoute classiquement
683	683	if (
684	684	strstr(
685		- ' ' . ($classes = extraire_attribut($retour, 'class')) . ' ',
	685	+ ' '.($classes = extraire_attribut($retour, 'class')).' ',
686	686	'spip_lien_ok'
687	687	)
688	688	) {
		@@ -693,7 +693,7 @@ discard block
		block discarded – undo
693	693	);
694	694	} else {
695	695	if ($lien) {
696		- $retour = "<a href='" . $lien['href'] . "' class='" . $lien['class'] . "'>" . $retour . '</a>';
	696	+ $retour = "<a href='".$lien['href']."' class='".$lien['class']."'>".$retour.'</a>';
697	697	}
698	698	}
699	699
		@@ -717,7 +717,7 @@ discard block
		block discarded – undo
717	717	return $page;
718	718	}
719	719	// eval $page et affecte $res
720		- include _ROOT_RESTREINT . 'public/evaluer_page.php';
	720	+ include _ROOT_RESTREINT.'public/evaluer_page.php';
721	721
722	722	// Lever un drapeau (global) si le fond utilise #SESSION
723	723	// a destination de public/parametrer
		@@ -785,16 +785,16 @@ discard block
		block discarded – undo
785	785	if (($pos = strpos($head, '<head>')) !== false) {
786	786	$head = substr_replace($head, $base, $pos + 6, 0);
787	787	} elseif (preg_match(',<head[^>]*>,i', $head, $r)) {
788		- $head = str_replace($r[0], $r[0] . $base, $head);
	788	+ $head = str_replace($r[0], $r[0].$base, $head);
789	789	}
790		- $texte = $head . substr($texte, $poshead);
	790	+ $texte = $head.substr($texte, $poshead);
791	791	}
792	792	if ($href_base) {
793	793	// gerer les ancres
794	794	$base = $_SERVER['REQUEST_URI'];
795	795	// pas de guillemets ni < dans l'URL qu'on insere dans le HTML
796	796	if (strpos($base, "'") or strpos($base, '"') or strpos($base, '<')) {
797		- $base = str_replace(["'",'"','<'], ['%27','%22','%3C'], $base);
	797	+ $base = str_replace(["'", '"', '<'], ['%27', '%22', '%3C'], $base);
798	798	}
799	799	if (strpos($texte, "href='#") !== false) {
800	800	$texte = str_replace("href='#", "href='$base#", $texte);

		@@ -81,7 +81,7 @@ discard block
		block discarded – undo
81	81	$test_dir .= '/';
82	82	}
83	83	if (!in_array($test_dir, $GLOBALS['test_dirs'])) {
84		- $GLOBALS['test_dirs'][] = _DIR_RACINE . $test_dir;
	84	+ $GLOBALS['test_dirs'][] = _DIR_RACINE.$test_dir;
85	85	}
86	86	} else {
87	87	if (!_FILE_CONNECT) {
		@@ -96,11 +96,11 @@ discard block
		block discarded – undo
96	96	foreach ($GLOBALS['test_dirs'] as $i => $my_dir) {
97	97	$test = test_ecrire($my_dir);
98	98	if (!$test) {
99		- $m = preg_replace(',^' . _DIR_RACINE . ',', '', $my_dir);
	99	+ $m = preg_replace(',^'._DIR_RACINE.',', '', $my_dir);
100	100	if (@file_exists($my_dir)) {
101		- $bad_dirs['<li>' . $m . '</li>'] = 1;
	101	+ $bad_dirs['<li>'.$m.'</li>'] = 1;
102	102	} else {
103		- $absent_dirs['<li>' . $m . '</li>'] = 1;
	103	+ $absent_dirs['<li>'.$m.'</li>'] = 1;
104	104	}
105	105	} else {
106	106	$chmod = max($chmod, $test);
		@@ -110,21 +110,21 @@ discard block
		block discarded – undo
110	110	if ($bad_dirs or $absent_dirs) {
111	111	if (!_FILE_CONNECT) {
112	112	$titre = _T('dirs_preliminaire');
113		- $continuer = ' ' . _T('dirs_commencer') . '.';
	113	+ $continuer = ' '._T('dirs_commencer').'.';
114	114	} else {
115	115	$titre = _T('dirs_probleme_droits');
116	116	}
117	117
118	118
119		- $res = "<div align='right'>" . menu_langues('var_lang_ecrire') . "</div>\n";
	119	+ $res = "<div align='right'>".menu_langues('var_lang_ecrire')."</div>\n";
120	120
121	121	if ($bad_dirs) {
122	122	$res .=
123	123	_T(
124	124	'dirs_repertoires_suivants',
125	125	['bad_dirs' => join("\n", array_keys($bad_dirs))]
126		- ) .
127		- '<b>' . _T('login_recharger') . '</b>.';
	126	+ ).
	127	+ '<b>'._T('login_recharger').'</b>.';
128	128	}
129	129
130	130	if ($absent_dirs) {
		@@ -132,22 +132,21 @@ discard block
		block discarded – undo
132	132	_T(
133	133	'dirs_repertoires_absents',
134	134	['bad_dirs' => join("\n", array_keys($absent_dirs))]
135		- ) .
136		- '<b>' . _T('login_recharger') . '</b>.';
	135	+ ).
	136	+ '<b>'._T('login_recharger').'</b>.';
137	137	}
138		- $res = '<p>' . $continuer . $res . aider('install0', true) . '</p>';
	138	+ $res = '<p>'.$continuer.$res.aider('install0', true).'</p>';
139	139
140	140	$t = _T('login_recharger');
141		- $t = (!$test_dir ? '' :
142		- "<input type='hidden' name='test_dir' value='" . spip_htmlspecialchars($test_dir, ENT_QUOTES) . "' />")
	141	+ $t = (!$test_dir ? '' : "<input type='hidden' name='test_dir' value='".spip_htmlspecialchars($test_dir, ENT_QUOTES)."' />")
143	142	. "<input type='hidden' name='etape' value='chmod' />"
144		- . "<div style='text-align: right'><input type='submit' value='" . attribut_html($t) . "' /></div>";
	143	+ . "<div style='text-align: right'><input type='submit' value='".attribut_html($t)."' /></div>";
145	144
146		- echo minipres($titre, $res . generer_form_ecrire('install', $t));
	145	+ echo minipres($titre, $res.generer_form_ecrire('install', $t));
147	146	} else {
148	147	$deja = (_FILE_CONNECT and analyse_fichier_connection(_FILE_CONNECT));
149	148	if (!$deja) {
150		- redirige_url_ecrire('install', 'etape=1&chmod=' . $chmod);
	149	+ redirige_url_ecrire('install', 'etape=1&chmod='.$chmod);
151	150	} else {
152	151	redirige_url_ecrire();
153	152	}

		@@ -82,7 +82,7 @@ discard block
		block discarded – undo
82	82	**/
83	83	function boucle_HIERARCHIE_dist($id_boucle, &$boucles) {
84	84	$boucle = &$boucles[$id_boucle];
85		- $id_table = $boucle->id_table . '.id_rubrique';
	85	+ $id_table = $boucle->id_table.'.id_rubrique';
86	86
87	87	// Si la boucle mere est une boucle RUBRIQUES il faut ignorer la feuille
88	88	// sauf en presence du critere {tout} (vu par phraser_html)
		@@ -95,7 +95,7 @@ discard block
		block discarded – undo
95	95	. '$hierarchie = calcul_hierarchie_in($id_rubrique,'
96	96	. (isset($boucle->modificateur['tout']) ? 'true' : 'false')
97	97	. ");\n\t"
98		- . 'if (!$hierarchie) return "";' . "\n\t";
	98	+ . 'if (!$hierarchie) return "";'."\n\t";
99	99
100	100	$boucle->where[] = ["'IN'", "'$id_table'", '"($hierarchie)"'];
101	101

		@@ -33,18 +33,18 @@
		block discarded – undo
33	33	*/
34	34	function ranger_cache_gd2() {
35	35	spip_log('ranger_cache_gd2');
36		- $base = _DIR_VAR . 'cache-gd2/';
	36	+ $base = _DIR_VAR.'cache-gd2/';
37	37	if (is_dir($base) and is_readable($base)) {
38	38	if ($dir = opendir($base)) {
39	39	while (($f = readdir($dir)) !== false) {
40	40	if (
41		- !is_dir($base . $f) and strncmp($f, '.', 1) !== 0
	41	+ !is_dir($base.$f) and strncmp($f, '.', 1) !== 0
42	42	and preg_match(',[0-9a-f]{32}\.\w+,', $f)
43	43	) {
44	44	$sub = substr($f, 0, 2);
45	45	$sub = sous_repertoire($base, $sub);
46		- @rename($base . $f, $sub . substr($f, 2));
47		- @unlink($base . $f); // au cas ou le rename a foire (collision)
	46	+ @rename($base.$f, $sub.substr($f, 2));
	47	+ @unlink($base.$f); // au cas ou le rename a foire (collision)
48	48	}
49	49	if (time() >= _TIME_OUT) {
50	50	return;

		@@ -64,13 +64,13 @@
		block discarded – undo
64	64	spip_log("Table $table TIMESTAMP incorrect", 'maj');
65	65	foreach ($desc['field'] as $field => $type) {
66	66	if ($desc['field'][$field] !== $fields_corrected[$field]) {
67		- spip_log("Adaptation TIMESTAMP table $table", 'maj.' . _LOG_INFO_IMPORTANTE);
68		- sql_alter("table $table change $field $field " . $fields_corrected[$field]);
	67	+ spip_log("Adaptation TIMESTAMP table $table", 'maj.'._LOG_INFO_IMPORTANTE);
	68	+ sql_alter("table $table change $field $field ".$fields_corrected[$field]);
69	69	$trouver_table('');
70	70	$new_desc = $trouver_table($table);
71	71	spip_log(
72		- "Apres conversion $table : " . var_export($new_desc['field'], true),
73		- 'maj.' . _LOG_INFO_IMPORTANTE
	72	+ "Apres conversion $table : ".var_export($new_desc['field'], true),
	73	+ 'maj.'._LOG_INFO_IMPORTANTE
74	74	);
75	75	}
76	76	}

		@@ -85,7 +85,7 @@ discard block
		block discarded – undo
85	85	#if (!$sql_desc) $sql_desc = false;
86	86	#spip_log("Resultat table=$table sql_desc:$sql_desc","dbinstall"._LOG_INFO_IMPORTANTE);
87	87	if (!$sql_desc) {
88		- spip_log("Echec creation table $table", 'maj' . _LOG_CRITIQUE);
	88	+ spip_log("Echec creation table $table", 'maj'._LOG_CRITIQUE);
89	89	}
90	90	}
91	91	} else {
		@@ -97,7 +97,7 @@ discard block
		block discarded – undo
97	97	if (isset($desc['field'])) {
98	98	foreach ($desc['field'] as $field => $type) {
99	99	if (!isset($sql_desc['field'][$field])) {
100		- sql_alter("TABLE $table ADD $field $type" . ($last ? " AFTER $last" : ''), $serveur);
	100	+ sql_alter("TABLE $table ADD $field $type".($last ? " AFTER $last" : ''), $serveur);
101	101	}
102	102	$last = $field;
103	103	}

		@@ -38,7 +38,7 @@ discard block
		block discarded – undo
38	38
39	39	$res = admin_repair_tables();
40	40	if (!$res) {
41		- $res = "<div class='error'>" . _T('avis_erreur_mysql') . ' ' . sql_errno() . ': ' . sql_error() . "</div>\n";
	41	+ $res = "<div class='error'>"._T('avis_erreur_mysql').' '.sql_errno().': '.sql_error()."</div>\n";
42	42	} else {
43	43	include_spip('inc/rubriques');
44	44	calculer_rubriques();
		@@ -48,7 +48,7 @@ discard block
		block discarded – undo
48	48	$res .= pipeline('base_admin_repair', $res);
49	49	echo minipres(
50	50	_T('texte_tentative_recuperation'),
51		- $res . generer_form_ecrire('accueil', '', '', _T('public:accueil_site'))
	51	+ $res.generer_form_ecrire('accueil', '', '', _T('public:accueil_site'))
52	52	);
53	53	}
54	54
		@@ -91,12 +91,12 @@ discard block
		block discarded – undo
91	91	$count = sql_countsel($tab);
92	92
93	93	if ($count > 1) {
94		- $m .= '(' . _T('texte_compte_elements', ['count' => $count]) . ")\n";
	94	+ $m .= '('._T('texte_compte_elements', ['count' => $count]).")\n";
95	95	} else {
96	96	if ($count == 1) {
97		- $m .= '(' . _T('texte_compte_element', ['count' => $count]) . ")\n";
	97	+ $m .= '('._T('texte_compte_element', ['count' => $count]).")\n";
98	98	} else {
99		- $m .= '(' . _T('texte_vide') . ")\n";
	99	+ $m .= '('._T('texte_vide').")\n";
100	100	}
101	101	}
102	102
		@@ -105,13 +105,13 @@ discard block
		block discarded – undo
105	105	and $msg = join(
106	106	' ',
107	107	(is_resource($result_repair) or is_object($result_repair)) ? sql_fetch($result_repair) : $result_repair
108		- ) . ' '
	108	+ ).' '
109	109	and strpos($msg, ' OK ') === false
110	110	) {
111	111	$class = " class='notice'";
112		- $m .= '<br /><tt>' . spip_htmlentities($msg) . "</tt>\n";
	112	+ $m .= '<br /><tt>'.spip_htmlentities($msg)."</tt>\n";
113	113	} else {
114		- $m .= ' ' . _T('texte_table_ok');
	114	+ $m .= ' '._T('texte_table_ok');
115	115	}
116	116
117	117	$res .= "<div$class>$m</div>";

		@@ -35,7 +35,7 @@ discard block
		block discarded – undo
35	35	// Determiner l'action demandee
36	36	//
37	37
38		-$exec = (string)_request('exec');
	38	+$exec = (string) _request('exec');
39	39	$reinstall = (!is_null(_request('reinstall'))) ? _request('reinstall') : ($exec == 'install' ? 'oui' : null);
40	40	//
41	41	// Les scripts d'insallation n'authentifient pas, forcement,
		@@ -121,9 +121,9 @@ discard block
		block discarded – undo
121	121	or (isset($GLOBALS['visiteur_session']) and $GLOBALS['visiteur_session']['statut'] == '0minirezo')
122	122	)
123	123	) {
124		- spip_log('Quand la meta admin vaut ' .
125		- $GLOBALS['meta']['admin'] .
126		- ' seul un admin peut se connecter et sans AJAX.' .
	124	+ spip_log('Quand la meta admin vaut '.
	125	+ $GLOBALS['meta']['admin'].
	126	+ ' seul un admin peut se connecter et sans AJAX.'.
127	127	' En cas de probleme, detruire cette meta.');
128	128	die(_T('info_travaux_texte'));
129	129	}

		@@ -58,11 +58,11 @@ discard block
		block discarded – undo
58	58	'valeur' => $adresse_ldap
59	59	],
60	60	'port_ldap' => [
61		- 'label' => _T('entree_port_annuaire') . '<br />' . _T('texte_port_annuaire'),
	61	+ 'label' => _T('entree_port_annuaire').'<br />'._T('texte_port_annuaire'),
62	62	'valeur' => $port_ldap
63	63	],
64	64	'tls_ldap' => [
65		- 'label' => '<b>' . _T('tls_ldap') . '</b>',
	65	+ 'label' => '<b>'._T('tls_ldap').'</b>',
66	66	'valeur' => $tls_ldap,
67	67	'alternatives' => [
68	68	'non' => _T('item_non'),
		@@ -80,7 +80,7 @@ discard block
		block discarded – undo
80	80	]
81	81	)
82	82
83		- . "\n<p>" . _T('texte_acces_ldap_anonyme_1') . '</p>'
	83	+ . "\n<p>"._T('texte_acces_ldap_anonyme_1').'</p>'
84	84	. fieldset(
85	85	_T('connexion_ldap'),
86	86	[

spip / SPIP

Push — master ( 4a1dc4...073957 )

Status

Category

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

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

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

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

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

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

Spacing +15 added lines, -16 removed lines patch added patch discarded remove patch