Inspection of "Éviter une notice PHP sur le débuggeur dans certai..." - spip/SPIP - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( a04e6b...ef338c )

by cam

created 2021-11-09 14:02 UTC

Status

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 = isset($GLOBALS['visiteur_session']['statut']) ? $GLOBALS['visiteur_session']['statut'] : '';
 		$nom = isset($GLOBALS['visiteur_session']['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/boutons.php 1 patch

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

@@ -102,8 +102,8 @@  discard block
 block discarded – undo
 			&& autoriser('onglet', "_$id")
 		) {
 			$onglets[$id] = new Bouton(
-				isset($infos['icone']) ? find_in_theme($infos['icone']) : '',  // icone
-				$infos['titre'],  // titre
+				isset($infos['icone']) ? find_in_theme($infos['icone']) : '', // icone
+				$infos['titre'], // titre
 				(isset($infos['action']) and $infos['action'])
 					? generer_url_ecrire(
 						$infos['action'],
@@ -142,5 +142,5 @@  discard block
 block discarded – undo
 		$res .= onglet(_T($onglet->libelle), $url, $exec, $ongletCourant, $onglet->icone);
 	}
 
-	return !$res ? '' : (debut_onglet($class) . $res . fin_onglet());
+	return !$res ? '' : (debut_onglet($class).$res.fin_onglet());
 }

Please login to merge, or discard this patch.

ecrire/inc/layer.php 1 patch

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

@@ -55,7 +55,7 @@  discard block
 block discarded – undo
 		$class = ' blocreplie';
 	}
 
-	return '<div ' . ($id ? "id='$id' " : '') . "class='bloc_depliable$class'>";
+	return '<div '.($id ? "id='$id' " : '')."class='bloc_depliable$class'>";
 }
 
 // https://code.spip.net/@fin_block
@@ -68,12 +68,12 @@  discard block
 block discarded – undo
 // $ids : id des div lies au bouton (facultatif, par defaut c'est le div.bloc_depliable qui suit)
 // https://code.spip.net/@bouton_block_depliable
 function bouton_block_depliable($texte, $deplie, $ids = '') {
-	$bouton_id = 'b' . substr(md5($texte . microtime()), 0, 8);
+	$bouton_id = 'b'.substr(md5($texte.microtime()), 0, 8);
 
 	$class = ($deplie === true) ? ' deplie' : (($deplie == -1) ? ' impliable' : ' replie');
 	if (strlen($ids)) {
 		$cible = explode(',', $ids);
-		$cible = '#' . implode(',#', $cible);
+		$cible = '#'.implode(',#', $cible);
 	} else {
 		$cible = "#$bouton_id + div.bloc_depliable";
 	}

Please login to merge, or discard this patch.

ecrire/inc/pipelines.php 1 patch

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

@@ -65,7 +65,7 @@  discard block
 block discarded – undo
 		}
 	}
 
-	$texte = $x . $texte;
+	$texte = $x.$texte;
 
 	return $texte;
 }
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
 	|| ($pos = 0);
 
 	if (false === strpos(substr($texte, 0, $pos), '<!-- insert_head -->')) {
-		$insert = "\n" . pipeline('insert_head', '<!-- f_insert_head -->') . "\n";
+		$insert = "\n".pipeline('insert_head', '<!-- f_insert_head -->')."\n";
 		$texte = substr_replace($texte, $insert, $pos, 0);
 	}
 
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
 		}
 		$texte = substr_replace($texte, $x, $pos, 0);
 		// pas de preview en fenetre enfant
-		$x = "<script type='text/javascript'>const frameEl = window.frameElement;if (frameEl) {frameEl.sandbox='sandbox';window.location.href='" . addslashes($GLOBALS['meta']['adresse_site']) . "';}</script>";
+		$x = "<script type='text/javascript'>const frameEl = window.frameElement;if (frameEl) {frameEl.sandbox='sandbox';window.location.href='".addslashes($GLOBALS['meta']['adresse_site'])."';}</script>";
 		if (!$pos = stripos($texte, '<head') or !$pos = strpos($texte, '>', $pos)) {
 			$pos = -1;
 		}
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
 
 	// inserer avant le </body> fermant si on peut, a la fin de la page sinon
 	if (($p = strpos($texte, '</body>')) !== false) {
-		$texte = substr($texte, 0, $p) . $code . substr($texte, $p);
+		$texte = substr($texte, 0, $p).$code.substr($texte, $p);
 	} else {
 		$texte .= $code;
 	}

Please login to merge, or discard this patch.

ecrire/inc/recherche_to_array.php 1 patch

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

@@ -67,7 +67,7 @@  discard block
 block discarded – undo
 		$_id_table = reset($_id_table);
 	}
 
-	$requete['SELECT'][] = 't.' . $_id_table;
+	$requete['SELECT'][] = 't.'.$_id_table;
 	$a = [];
 	// Recherche fulltext
 	foreach ($champs as $champ => $poids) {
@@ -78,13 +78,13 @@  discard block
 block discarded – undo
 				$champ = "t.$champ";
 			}
 			$requete['SELECT'][] = $champ;
-			$a[] = $champ . ' ' . $methode . ' ' . $q;
+			$a[] = $champ.' '.$methode.' '.$q;
 		}
 	}
 	if ($a) {
 		$requete['WHERE'][] = join(' OR ', $a);
 	}
-	$requete['FROM'][] = table_objet_sql($table) . ' AS t';
+	$requete['FROM'][] = table_objet_sql($table).' AS t';
 
 	$results = [];
 
@@ -252,8 +252,8 @@  discard block
 block discarded – undo
 					);
 				} // cas table de liaison generique spip_xxx_yyy
 				elseif (
-					$t = $trouver_table($table_arrivee . '_' . $table_depart, $serveur)
-					or $t = $trouver_table($table_depart . '_' . $table_arrivee, $serveur)
+					$t = $trouver_table($table_arrivee.'_'.$table_depart, $serveur)
+					or $t = $trouver_table($table_depart.'_'.$table_arrivee, $serveur)
 				) {
 					$s = sql_select(
 						"$cle_depart,$cle_arrivee",
@@ -292,12 +292,12 @@  discard block
 block discarded – undo
 				}
 				if (isset($joint['champs']) and $joint['champs']) {
 					foreach ($joint['champs'] as $c => $val) {
-						$results[$id]['champs'][$table_liee . '.' . $c] = $val;
+						$results[$id]['champs'][$table_liee.'.'.$c] = $val;
 					}
 				}
 				if (isset($joint['matches']) and $joint['matches']) {
 					foreach ($joint['matches'] as $c => $val) {
-						$results[$id]['matches'][$table_liee . '.' . $c] = $val;
+						$results[$id]['matches'][$table_liee.'.'.$c] = $val;
 					}
 				}
 			}

Please login to merge, or discard this patch.

ecrire/inc/install.php 1 patch

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

@@ -43,10 +43,10 @@  discard block
 block discarded – undo
  * @return void
  **/
 function install_fichier_connexion($nom, $texte) {
-	$texte = '<' . "?php\n"
+	$texte = '<'."?php\n"
 		. "if (!defined(\"_ECRIRE_INC_VERSION\")) return;\n"
 		. $texte
-		. '?' . '>';
+		. '?'.'>';
 
 	ecrire_fichier($nom, $texte);
 }
@@ -113,10 +113,10 @@  discard block
 block discarded – undo
 		return $regs;
 	} else {
 		$ar = '\s*\'([^\']*)\'';
-		$r = '\s*,' . $ar;
+		$r = '\s*,'.$ar;
 		$r = "#spip_connect_db[(]$ar$r$r$r$r(?:$r(?:$r(?:$r(?:$r)?)?)?)?#";
 		if (preg_match($r, $s, $regs)) {
-			$regs[2] = $regs[1] . (!$regs[2] ? '' : ':' . $regs[2] . ';');
+			$regs[2] = $regs[1].(!$regs[2] ? '' : ':'.$regs[2].';');
 			array_shift($regs);
 			array_shift($regs);
 
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
 	// Si on n'a pas la bonne version de PHP, c'est la fin
 	if ($err) {
 		die("<div class='error'>"
-			. '<h3>' . _T('avis_attention') . '</h3><p>' . _T('install_echec_annonce') . "</p><ul class='spip'>"
+			. '<h3>'._T('avis_attention').'</h3><p>'._T('install_echec_annonce')."</p><ul class='spip'>"
 			. "<li><strong>{$err[0]}</strong></li>\n</ul></div>");
 	}
 
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
 
 	if ($err) {
 		echo "<div class='error'>"
-			. '<h3>' . _T('avis_attention') . '</h3><p>' . _T('install_echec_annonce') . "</p><ul class='spip'>";
+			. '<h3>'._T('avis_attention').'</h3><p>'._T('install_echec_annonce')."</p><ul class='spip'>";
 		foreach ($err as $e) {
 			echo "<li><strong>$e</strong></li>\n";
 		}
@@ -235,8 +235,8 @@  discard block
 block discarded – undo
 
 // https://code.spip.net/@info_etape
 function info_etape($titre, $complement = '') {
-	return '<h2>' . $titre . "</h2>\n" .
-	($complement ? '' . $complement . "\n" : '');
+	return '<h2>'.$titre."</h2>\n".
+	($complement ? ''.$complement."\n" : '');
 }
 
 /**
@@ -250,18 +250,18 @@  discard block
 block discarded – undo
 		$code = _T('bouton_suivant');
 	}
 	static $suivant = 0;
-	$id = 'suivant' . (($suivant > 0) ? strval($suivant) : '');
+	$id = 'suivant'.(($suivant > 0) ? strval($suivant) : '');
 	$suivant += 1;
 
-	return "\n<p class='boutons suivant'><input id='" . $id . "' type='submit'\nvalue=\"" .
-	$code .
+	return "\n<p class='boutons suivant'><input id='".$id."' type='submit'\nvalue=\"".
+	$code.
 	" >>\" /></p>\n";
 }
 
 // https://code.spip.net/@info_progression_etape
 function info_progression_etape($en_cours, $phase, $dir, $erreur = false) {
 	//$en_cours = _request('etape')?_request('etape'):"";
-	$liste = find_all_in_path($dir, $phase . '(([0-9])+|fin)[.]php$');
+	$liste = find_all_in_path($dir, $phase.'(([0-9])+|fin)[.]php$');
 	$debut = 1;
 	$etat = 'ok';
 	$last = count($liste);
@@ -300,7 +300,7 @@  discard block
 block discarded – undo
 
 			$aff_etapes .= "<li class='$class'><div class='fond'>";
 			$aff_etapes .= ($debut == $en_cours) ? '<strong>' : '';
-			$aff_etapes .= '<em>' . _T('etape') . " </em><span class='numero_etape'>$debut</span><em>&nbsp;: </em>";
+			$aff_etapes .= '<em>'._T('etape')." </em><span class='numero_etape'>$debut</span><em>&nbsp;: </em>";
 			$aff_etapes .= $intitule_etat["$phase"][$debut];
 			$aff_etapes .= ($debut == $en_cours) ? '</strong>' : '';
 			$aff_etapes .= '</div></li>';
@@ -316,11 +316,11 @@  discard block
 block discarded – undo
 
 // https://code.spip.net/@fieldset
 function fieldset($legend, $champs = [], $apres = '', $avant = '') {
-	return "<fieldset>\n" .
-	$avant .
-	($legend ? '<legend>' . $legend . "</legend>\n" : '') .
-	fieldset_champs($champs) .
-	$apres .
+	return "<fieldset>\n".
+	$avant.
+	($legend ? '<legend>'.$legend."</legend>\n" : '').
+	fieldset_champs($champs).
+	$apres.
 	"</fieldset>\n";
 }
 
@@ -330,18 +330,18 @@  discard block
 block discarded – undo
 		$type = isset($contenu['hidden']) ? 'hidden' : (preg_match(',^pass,', $nom) ? 'password' : 'text');
 		$class = isset($contenu['hidden']) ? '' : "class='formo' size='40' ";
 		if (isset($contenu['alternatives'])) {
-			$fieldset .= $contenu['label'] . "\n";
+			$fieldset .= $contenu['label']."\n";
 			foreach ($contenu['alternatives'] as $valeur => $label) {
-				$fieldset .= "<input type='radio' name='" . $nom .
+				$fieldset .= "<input type='radio' name='".$nom.
 					"' id='$nom-$valeur' value='$valeur'"
 					. (($valeur == $contenu['valeur']) ? "\nchecked='checked'" : '')
 					. "/>\n";
-				$fieldset .= "<label for='$nom-$valeur'>" . $label . "</label>\n";
+				$fieldset .= "<label for='$nom-$valeur'>".$label."</label>\n";
 			}
 			$fieldset .= "<br />\n";
 		} else {
-			$fieldset .= "<label for='" . $nom . "'>" . $contenu['label'] . "</label>\n";
-			$fieldset .= '<input ' . $class . "type='" . $type . "' id='" . $nom . "' name='" . $nom . "'\nvalue='" . $contenu['valeur'] . "'"
+			$fieldset .= "<label for='".$nom."'>".$contenu['label']."</label>\n";
+			$fieldset .= '<input '.$class."type='".$type."' id='".$nom."' name='".$nom."'\nvalue='".$contenu['valeur']."'"
 				. (preg_match(',^(pass|login),', $nom) ? " autocomplete='off'" : '')
 				. ((isset($contenu['required']) and $contenu['required']) ? " required='required'" : '')
 				. " />\n";
@@ -353,7 +353,7 @@  discard block
 block discarded – undo
 
 function install_select_serveur() {
 	$options = [];
-	$dir = _DIR_RESTREINT . 'req/';
+	$dir = _DIR_RESTREINT.'req/';
 	$d = opendir($dir);
 	if (!$d) {
 		return [];
@@ -361,17 +361,17 @@  discard block
 block discarded – undo
 	while (($f = readdir($d)) !== false) {
 		if (
 			(preg_match('/^(.*)[.]php$/', $f, $s))
-			and is_readable($f = $dir . $f)
+			and is_readable($f = $dir.$f)
 		) {
 			require_once($f);
 			$s = $s[1];
-			$v = 'spip_versions_' . $s;
+			$v = 'spip_versions_'.$s;
 			if (function_exists($v) and $v()) {
 				$titre = _T("install_select_type_$s");
 				// proposer mysql par defaut si dispo
 				$checked = ($s == 'mysql' ? " checked='checked'" : '');
 				$options[$s] = "<li><input type='radio' id='$s' value='$s' name='server_db'$checked>"
-					. "<label for='$s'>" . ($titre ? $titre : $s) . '</label></li>';
+					. "<label for='$s'>".($titre ? $titre : $s).'</label></li>';
 			} else {
 				spip_log("$s: portage indisponible");
 			}
@@ -390,8 +390,8 @@  discard block
 block discarded – undo
 		"\n<input type='hidden' name='etape' value='$etape' />"
 		. $hidden
 		. (_request('echec') ?
-			('<p><b>' . _T('avis_connexion_echec_1') .
-				'</b></p><p>' . _T('avis_connexion_echec_2') . "</p><p style='font-size: small;'>" . _T('avis_connexion_echec_3') . '</p>')
+			('<p><b>'._T('avis_connexion_echec_1').
+				'</b></p><p>'._T('avis_connexion_echec_2')."</p><p style='font-size: small;'>"._T('avis_connexion_echec_3').'</p>')
 			: '')
 
 		. ($jquery ? http_script('', 'jquery.js') : '')
@@ -429,9 +429,9 @@  discard block
 block discarded – undo
 		});')
 
 		. ($server_db
-			? '<input type="hidden" name="server_db" value="' . $server_db . '" />'
+			? '<input type="hidden" name="server_db" value="'.$server_db.'" />'
 			. (($predef[0])
-				? ('<h3>' . _T('install_serveur_hebergeur') . '</h3>')
+				? ('<h3>'._T('install_serveur_hebergeur').'</h3>')
 				: '')
 			: ('<fieldset><legend>'
 				. _T('install_select_type_db')
@@ -446,9 +446,9 @@  discard block
 block discarded – undo
 				. "\n</ul>\n</div></fieldset>")
 		)
 		. '<div id="install_adresse_base_hebergeur">'
-		. '<p>' . _T('texte_connexion_mysql') . '</p>'
+		. '<p>'._T('texte_connexion_mysql').'</p>'
 		. ($predef[1]
-			? '<h3>' . _T('install_adresse_base_hebergeur') . '</h3>'
+			? '<h3>'._T('install_adresse_base_hebergeur').'</h3>'
 			: fieldset(
 				_T('entree_base_donnee_1'),
 				[
@@ -463,7 +463,7 @@  discard block
 block discarded – undo
 
 		. '<div id="install_login_base_hebergeur">'
 		. ($predef[2]
-			? '<h3>' . _T('install_login_base_hebergeur') . '</h3>'
+			? '<h3>'._T('install_login_base_hebergeur').'</h3>'
 			: fieldset(
 				_T('entree_login_connexion_1'),
 				[
@@ -478,7 +478,7 @@  discard block
 block discarded – undo
 
 		. '<div id="install_pass_base_hebergeur">'
 		. ($predef[3]
-			? '<h3>' . _T('install_pass_base_hebergeur') . '</h3>'
+			? '<h3>'._T('install_pass_base_hebergeur').'</h3>'
 			: fieldset(
 				_T('entree_mot_passe_1'),
 				[
@@ -501,20 +501,20 @@  discard block
 block discarded – undo
 function predef_ou_cache($adresse_db, $login_db, $pass_db, $server_db) {
 	return ((defined('_INSTALL_HOST_DB'))
 		? ''
-		: "\n<input type='hidden' name='adresse_db'  value=\"" . spip_htmlspecialchars($adresse_db) . '" />'
+		: "\n<input type='hidden' name='adresse_db'  value=\"".spip_htmlspecialchars($adresse_db).'" />'
 	)
 	. ((defined('_INSTALL_USER_DB'))
 		? ''
-		: "\n<input type='hidden' name='login_db' value=\"" . spip_htmlspecialchars($login_db) . '" />'
+		: "\n<input type='hidden' name='login_db' value=\"".spip_htmlspecialchars($login_db).'" />'
 	)
 	. ((defined('_INSTALL_PASS_DB'))
 		? ''
-		: "\n<input type='hidden' name='pass_db' value=\"" . spip_htmlspecialchars($pass_db) . '" />'
+		: "\n<input type='hidden' name='pass_db' value=\"".spip_htmlspecialchars($pass_db).'" />'
 	)
 
 	. ((defined('_INSTALL_SERVER_DB'))
 		? ''
-		: "\n<input type='hidden' name='server_db' value=\"" . spip_htmlspecialchars($server_db) . '" />'
+		: "\n<input type='hidden' name='server_db' value=\"".spip_htmlspecialchars($server_db).'" />'
 	);
 }
 

Please login to merge, or discard this patch.

ecrire/inc/icone_renommer.php 1 patch

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

@@ -47,13 +47,13 @@  discard block
 block discarded – undo
 
 	$dir = 'images/';
 	$f = "$type-$size.png";
-	if ($icone = find_in_theme($dir . $f)) {
+	if ($icone = find_in_theme($dir.$f)) {
 		$dir = dirname($icone);
 		$fond = $icone;
 
 		if (
 			$rtl
-			and $fr = $dir . '/' . str_replace("$type-", "$type-rtl-", basename($icone))
+			and $fr = $dir.'/'.str_replace("$type-", "$type-rtl-", basename($icone))
 			and file_exists($fr)
 		) {
 			$fond = $fr;
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
 		}
 
 		$fonction = '';
-		if (in_array($action, ['add','del', 'new', 'edit', 'config'])) {
+		if (in_array($action, ['add', 'del', 'new', 'edit', 'config'])) {
 			$fonction = $action;
 		}
 

Please login to merge, or discard this patch.

ecrire/inc/presenter_enfants.php 1 patch

Spacing +25 added lines, -26 removed lines patch added patch discarded remove patch

@@ -43,7 +43,7 @@  discard block
 block discarded – undo
 	$result = sql_select(
 		'id_rubrique, id_parent, titre, descriptif, lang',
 		'spip_rubriques',
-		'id_parent=' . intval($collection),
+		'id_parent='.intval($collection),
 		'',
 		'0+titre,titre',
 		"$debut,$limite"
@@ -74,19 +74,18 @@  discard block
 block discarded – undo
 				}
 			}
 
-			$lib_bouton = (!acces_restreint_rubrique($id_rubrique) ? '' :
-					http_img_pack(
+			$lib_bouton = (!acces_restreint_rubrique($id_rubrique) ? '' : http_img_pack(
 						'auteur-0minirezo-16.png',
 						'',
 						" width='16' height='16'",
 						_T('image_administrer_rubrique')
-					)) .
-				" <a class='titremlien' dir='$lang_dir'" .
-				($row['lang'] !== $GLOBALS['spip_lang'] ? " hreflang='" . $row['lang'] . "'" : '') .
-				" href='" .
-				generer_url_entite($id_rubrique, 'rubrique') .
-				"'><span class='titre'>" .
-				$rang . $titre
+					)).
+				" <a class='titremlien' dir='$lang_dir'".
+				($row['lang'] !== $GLOBALS['spip_lang'] ? " hreflang='".$row['lang']."'" : '').
+				" href='".
+				generer_url_entite($id_rubrique, 'rubrique').
+				"'><span class='titre'>".
+				$rang.$titre
 				. '</span>'
 				. (is_string($logo) ? $logo : '')
 				. '</a>';
@@ -96,8 +95,8 @@  discard block
 block discarded – undo
 				;
 
 			$res[] =
-				debut_cadre_sous_rub(($id_parent ? 'rubrique-24.png' : 'secteur-24.png'), true, '', $titre) .
-				$les_sous_enfants .
+				debut_cadre_sous_rub(($id_parent ? 'rubrique-24.png' : 'secteur-24.png'), true, '', $titre).
+				$les_sous_enfants.
 				fin_cadre_sous_rub(true);
 		}
 	}
@@ -116,7 +115,7 @@  discard block
 block discarded – undo
  *  Le contenu du bloc dépliable
  */
 function sous_enfant_rub($collection2) {
-	$nb = sql_countsel('spip_rubriques', 'id_parent=' . intval($collection2));
+	$nb = sql_countsel('spip_rubriques', 'id_parent='.intval($collection2));
 
 	$retour = '';
 	$pagination = '';
@@ -128,23 +127,23 @@  discard block
 block discarded – undo
 	 * Si > 500 on affiche une pagination
 	 */
 	if ($nb > $limite) {
-		$debut = _request('debut_rubrique' . $collection2) ? _request('debut_rubrique' . $collection2) : $debut;
+		$debut = _request('debut_rubrique'.$collection2) ? _request('debut_rubrique'.$collection2) : $debut;
 		$pagination = chercher_filtre('pagination');
-		$pagination = '<p class="pagination">' . $pagination(
+		$pagination = '<p class="pagination">'.$pagination(
 			$nb,
-			'_rubrique' . $collection2,
+			'_rubrique'.$collection2,
 			$debut,
 			$limite,
 			true,
 			'prive'
-		) . '</p>';
+		).'</p>';
 		$limite = $debut + $limite;
 	}
 
 	$result = sql_select(
 		'id_rubrique, id_parent, titre, lang',
 		'spip_rubriques',
-		'id_parent=' . intval($collection2),
+		'id_parent='.intval($collection2),
 		'',
 		'0+titre,titre',
 		"$debut,$limite"
@@ -164,14 +163,14 @@  discard block
 block discarded – undo
 		changer_typo($row['lang']);
 		$lang_dir = lang_dir($row['lang']);
 		if (autoriser('voir', 'rubrique', $id_rubrique2)) {
-			$retour .= "\n<li class='item' dir='$lang_dir'><a href='" . generer_url_entite(
+			$retour .= "\n<li class='item' dir='$lang_dir'><a href='".generer_url_entite(
 				$id_rubrique2,
 				'rubrique'
-			) . "'>" . $rang2 . $titre2 . "</a></li>\n";
+			)."'>".$rang2.$titre2."</a></li>\n";
 		}
 	}
 
-	$retour = $pagination . $retour . $pagination;
+	$retour = $pagination.$retour.$pagination;
 
 	if (!$retour) {
 		return '';
@@ -180,7 +179,7 @@  discard block
 block discarded – undo
 	return debut_block_depliable($debut > 0 ? true : false, "enfants$collection2")
 	. "\n<ul class='liste-items sous-sous-rub'>\n"
 	. $retour
-	. "</ul>\n" . fin_block() . "\n\n";
+	. "</ul>\n".fin_block()."\n\n";
 }
 
 /**
@@ -199,13 +198,13 @@  discard block
 block discarded – undo
 	$debut = 0;
 	$limite = 500;
 
-	$nb = sql_countsel('spip_rubriques', 'id_parent=' . intval($id_rubrique));
+	$nb = sql_countsel('spip_rubriques', 'id_parent='.intval($id_rubrique));
 
 	if ($nb > $limite) {
-		$debut = _request('debut_rubrique' . $id_rubrique) ? _request('debut_rubrique' . $id_rubrique) : $debut;
+		$debut = _request('debut_rubrique'.$id_rubrique) ? _request('debut_rubrique'.$id_rubrique) : $debut;
 		$pagination = chercher_filtre('pagination');
-		$pagination = '<br class="nettoyeur"><p class="pagination">' .
-			$pagination($nb, '_rubrique' . $id_rubrique, $debut, $limite, true, 'prive') .
+		$pagination = '<br class="nettoyeur"><p class="pagination">'.
+			$pagination($nb, '_rubrique'.$id_rubrique, $debut, $limite, true, 'prive').
 		'</p>';
 	}
 

Please login to merge, or discard this patch.

ecrire/inc/charsets.php 1 patch

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

		@@ -73,7 +73,7 @@ discard block
		block discarded – undo
73	73	}
74	74	}
75	75
76		- if (find_in_path($charset . '.php', 'charsets/', true)) {
	76	+ if (find_in_path($charset.'.php', 'charsets/', true)) {
77	77	return $charset;
78	78	} else {
79	79	spip_log("Erreur: pas de fichier de conversion 'charsets/$charset'");
		@@ -160,7 +160,7 @@ discard block
		block discarded – undo
160	160	static $pcre_ok = 0;
161	161
162	162	if (!$pcre_ok) {
163		- $s = ' ' . chr(195) . chr(169) . 't' . chr(195) . chr(169) . ' ';
	163	+ $s = ' '.chr(195).chr(169).'t'.chr(195).chr(169).' ';
164	164	if (preg_match(',\W...\W,u', $s)) {
165	165	$pcre_ok = 1;
166	166	} else {
		@@ -261,38 +261,38 @@ discard block
		block discarded – undo
261	261
262	262	if (!isset($trans[$charset][$charset_cible])) {
263	263	$trans[$charset][$charset_cible] = [
264		- $p . chr(128) => '€',
265		- $p . chr(129) => ' ', # pas affecte
266		- $p . chr(130) => '‚',
267		- $p . chr(131) => 'ƒ',
268		- $p . chr(132) => '„',
269		- $p . chr(133) => '…',
270		- $p . chr(134) => '†',
271		- $p . chr(135) => '‡',
272		- $p . chr(136) => 'ˆ',
273		- $p . chr(137) => '‰',
274		- $p . chr(138) => 'Š',
275		- $p . chr(139) => '‹',
276		- $p . chr(140) => 'Œ',
277		- $p . chr(141) => ' ', # pas affecte
278		- $p . chr(142) => 'Ž',
279		- $p . chr(143) => ' ', # pas affecte
280		- $p . chr(144) => ' ', # pas affecte
281		- $p . chr(145) => '‘',
282		- $p . chr(146) => '’',
283		- $p . chr(147) => '“',
284		- $p . chr(148) => '”',
285		- $p . chr(149) => '•',
286		- $p . chr(150) => '–',
287		- $p . chr(151) => '—',
288		- $p . chr(152) => '˜',
289		- $p . chr(153) => '™',
290		- $p . chr(154) => 'š',
291		- $p . chr(155) => '›',
292		- $p . chr(156) => 'œ',
293		- $p . chr(157) => ' ', # pas affecte
294		- $p . chr(158) => 'ž',
295		- $p . chr(159) => 'Ÿ',
	264	+ $p.chr(128) => '€',
	265	+ $p.chr(129) => ' ', # pas affecte
	266	+ $p.chr(130) => '‚',
	267	+ $p.chr(131) => 'ƒ',
	268	+ $p.chr(132) => '„',
	269	+ $p.chr(133) => '…',
	270	+ $p.chr(134) => '†',
	271	+ $p.chr(135) => '‡',
	272	+ $p.chr(136) => 'ˆ',
	273	+ $p.chr(137) => '‰',
	274	+ $p.chr(138) => 'Š',
	275	+ $p.chr(139) => '‹',
	276	+ $p.chr(140) => 'Œ',
	277	+ $p.chr(141) => ' ', # pas affecte
	278	+ $p.chr(142) => 'Ž',
	279	+ $p.chr(143) => ' ', # pas affecte
	280	+ $p.chr(144) => ' ', # pas affecte
	281	+ $p.chr(145) => '‘',
	282	+ $p.chr(146) => '’',
	283	+ $p.chr(147) => '“',
	284	+ $p.chr(148) => '”',
	285	+ $p.chr(149) => '•',
	286	+ $p.chr(150) => '–',
	287	+ $p.chr(151) => '—',
	288	+ $p.chr(152) => '˜',
	289	+ $p.chr(153) => '™',
	290	+ $p.chr(154) => 'š',
	291	+ $p.chr(155) => '›',
	292	+ $p.chr(156) => 'œ',
	293	+ $p.chr(157) => ' ', # pas affecte
	294	+ $p.chr(158) => 'ž',
	295	+ $p.chr(159) => 'Ÿ',
296	296	];
297	297	if ($charset_cible != 'unicode') {
298	298	foreach ($trans[$charset][$charset_cible] as $k => $c) {
		@@ -433,7 +433,7 @@ discard block
		block discarded – undo
433	433	and is_array($GLOBALS['CHARSET'][$cset])
434	434	) {
435	435	foreach ($GLOBALS['CHARSET'][$cset] as $key => $val) {
436		- $trans[$charset][chr($key)] = '&#' . $val . ';';
	436	+ $trans[$charset][chr($key)] = '&#'.$val.';';
437	437	}
438	438	}
439	439	}
		@@ -500,11 +500,11 @@ discard block
		block discarded – undo
500	500	$h = dechex($e);
501	501	if ($s = isset($CHARSET_REVERSE[$charset][$e])) {
502	502	$s = $CHARSET_REVERSE[$charset][$e];
503		- $t['&#' . $e . ';'] = $t['&#0' . $e . ';'] = $t['&#00' . $e . ';'] = chr($s);
504		- $t['&#x' . $h . ';'] = $t['&#x0' . $h . ';'] = $t['&#x00' . $h . ';'] = chr($s);
	503	+ $t['&#'.$e.';'] = $t['&#0'.$e.';'] = $t['&#00'.$e.';'] = chr($s);
	504	+ $t['&#x'.$h.';'] = $t['&#x0'.$h.';'] = $t['&#x00'.$h.';'] = chr($s);
505	505	} else {
506		- $t['&#' . $e . ';'] = $t['&#0' . $e . ';'] = $t['&#00' . $e . ';'] = chr($e);
507		- $t['&#x' . $h . ';'] = $t['&#x0' . $h . ';'] = $t['&#x00' . $h . ';'] = chr($e);
	506	+ $t['&#'.$e.';'] = $t['&#0'.$e.';'] = $t['&#00'.$e.';'] = chr($e);
	507	+ $t['&#x'.$h.';'] = $t['&#x0'.$h.';'] = $t['&#x00'.$h.';'] = chr($e);
508	508	}
509	509	}
510	510	}
		@@ -550,7 +550,7 @@ discard block
		block discarded – undo
550	550	and is_array($GLOBALS['CHARSET'][$cset])
551	551	) {
552	552	foreach ($GLOBALS['CHARSET'][$cset] as $key => $val) {
553		- $trans[$charset][chr($key)] = unicode2charset('&#' . $val . ';');
	553	+ $trans[$charset][chr($key)] = unicode2charset('&#'.$val.';');
554	554	}
555	555	}
556	556	}
		@@ -657,7 +657,7 @@ discard block
		block discarded – undo
657	657	}
658	658	$thisPos++;
659	659	}
660		- $encodedLetter = '&#' . preg_replace('/^0+/', '', $decimalCode) . ';';
	660	+ $encodedLetter = '&#'.preg_replace('/^0+/', '', $decimalCode).';';
661	661	$encodedString .= $encodedLetter;
662	662	}
663	663	}
		@@ -700,7 +700,7 @@ discard block
		block discarded – undo
700	700	} // ignorer le BOM - http://www.unicode.org/faq/utf_bom.html
701	701	else {
702	702	if ($word != 65279) {
703		- $texte .= '&#' . $word . ';';
	703	+ $texte .= '&#'.$word.';';
704	704	}
705	705	}
706	706	}
		@@ -728,13 +728,13 @@ discard block
		block discarded – undo
728	728	return chr($num);
729	729	}
730	730	if ($num < 2048) {
731		- return chr(($num >> 6) + 192) . chr(($num & 63) + 128);
	731	+ return chr(($num >> 6) + 192).chr(($num & 63) + 128);
732	732	}
733	733	if ($num < 65536) {
734		- return chr(($num >> 12) + 224) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
	734	+ return chr(($num >> 12) + 224).chr((($num >> 6) & 63) + 128).chr(($num & 63) + 128);
735	735	}
736	736	if ($num < 1114112) {
737		- return chr(($num >> 18) + 240) . chr((($num >> 12) & 63) + 128) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
	737	+ return chr(($num >> 18) + 240).chr((($num >> 12) & 63) + 128).chr((($num >> 6) & 63) + 128).chr(($num & 63) + 128);
738	738	}
739	739
740	740	return '';
		@@ -801,7 +801,7 @@ discard block
		block discarded – undo
801	801	while (preg_match(',&#0*([0-9]+);,S', $texte, $regs) and !isset($vu[$regs[1]])) {
802	802	$num = $regs[1];
803	803	$vu[$num] = true;
804		- $s = '\u' . sprintf('%04x', $num);
	804	+ $s = '\u'.sprintf('%04x', $num);
805	805	$texte = str_replace($regs[0], $s, $texte);
806	806	}
807	807
		@@ -818,7 +818,7 @@ discard block
		block discarded – undo
818	818	**/
819	819	function javascript_to_unicode($texte) {
820	820	while (preg_match(',%u([0-9A-F][0-9A-F][0-9A-F][0-9A-F]),', $texte, $regs)) {
821		- $texte = str_replace($regs[0], '&#' . hexdec($regs[1]) . ';', $texte);
	821	+ $texte = str_replace($regs[0], '&#'.hexdec($regs[1]).';', $texte);
822	822	}
823	823
824	824	return $texte;
		@@ -863,7 +863,7 @@ discard block
		block discarded – undo
863	863	return $texte;
864	864	}
865	865
866		- $table_translit = 'translit' . $complexe;
	866	+ $table_translit = 'translit'.$complexe;
867	867
868	868	// 2. Translitterer grace a la table predefinie
869	869	if (!isset($trans[$complexe])) {
		@@ -924,7 +924,7 @@ discard block
		block discarded – undo
924	924	if ($chiffres) {
925	925	$texte = preg_replace_callback(
926	926	"/[aeiuoyd]['`?~.^+(-]{1,2}/S",
927		- function ($m) {
	927	+ function($m) {
928	928	return translitteration_chiffree($m[0]);
929	929	},
930	930	$texte
		@@ -956,7 +956,7 @@ discard block
		block discarded – undo
956	956	* true s'il a un BOM
957	957	**/
958	958	function bom_utf8($texte) {
959		- return (substr($texte, 0, 3) == chr(0xEF) . chr(0xBB) . chr(0xBF));
	959	+ return (substr($texte, 0, 3) == chr(0xEF).chr(0xBB).chr(0xBF));
960	960	}
961	961
962	962	/**
		@@ -1152,7 +1152,7 @@ discard block
		block discarded – undo
1152	1152	// on prend n fois la longueur desiree, pour etre surs d'avoir tout
1153	1153	// (un caractere utf-8 prenant au maximum n bytes)
1154	1154	$n = 0;
1155		- while (preg_match(',[\x80-\xBF]{' . (++$n) . '},', $c)) {
	1155	+ while (preg_match(',[\x80-\xBF]{'.(++$n).'},', $c)) {
1156	1156	;
1157	1157	}
1158	1158	$c = substr($c, 0, $n * $length);
		@@ -1186,7 +1186,7 @@ discard block
		block discarded – undo
1186	1186
1187	1187	$lettre1 = mb_strtoupper(spip_substr($c, 0, 1));
1188	1188
1189		- return $lettre1 . spip_substr($c, 1);
	1189	+ return $lettre1.spip_substr($c, 1);
1190	1190	}
1191	1191
1192	1192	/**

Please login to merge, or discard this patch.

		@@ -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 = isset($GLOBALS['visiteur_session']['statut']) ? $GLOBALS['visiteur_session']['statut'] : '';
188	188	$nom = isset($GLOBALS['visiteur_session']['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	}

		@@ -102,8 +102,8 @@ discard block
		block discarded – undo
102	102	&& autoriser('onglet', "_$id")
103	103	) {
104	104	$onglets[$id] = new Bouton(
105		- isset($infos['icone']) ? find_in_theme($infos['icone']) : '', // icone
106		- $infos['titre'], // titre
	105	+ isset($infos['icone']) ? find_in_theme($infos['icone']) : '', // icone
	106	+ $infos['titre'], // titre
107	107	(isset($infos['action']) and $infos['action'])
108	108	? generer_url_ecrire(
109	109	$infos['action'],
		@@ -142,5 +142,5 @@ discard block
		block discarded – undo
142	142	$res .= onglet(_T($onglet->libelle), $url, $exec, $ongletCourant, $onglet->icone);
143	143	}
144	144
145		- return !$res ? '' : (debut_onglet($class) . $res . fin_onglet());
	145	+ return !$res ? '' : (debut_onglet($class).$res.fin_onglet());
146	146	}

		@@ -55,7 +55,7 @@ discard block
		block discarded – undo
55	55	$class = ' blocreplie';
56	56	}
57	57
58		- return '<div ' . ($id ? "id='$id' " : '') . "class='bloc_depliable$class'>";
	58	+ return '<div '.($id ? "id='$id' " : '')."class='bloc_depliable$class'>";
59	59	}
60	60
61	61	// https://code.spip.net/@fin_block
		@@ -68,12 +68,12 @@ discard block
		block discarded – undo
68	68	// $ids : id des div lies au bouton (facultatif, par defaut c'est le div.bloc_depliable qui suit)
69	69	// https://code.spip.net/@bouton_block_depliable
70	70	function bouton_block_depliable($texte, $deplie, $ids = '') {
71		- $bouton_id = 'b' . substr(md5($texte . microtime()), 0, 8);
	71	+ $bouton_id = 'b'.substr(md5($texte.microtime()), 0, 8);
72	72
73	73	$class = ($deplie === true) ? ' deplie' : (($deplie == -1) ? ' impliable' : ' replie');
74	74	if (strlen($ids)) {
75	75	$cible = explode(',', $ids);
76		- $cible = '#' . implode(',#', $cible);
	76	+ $cible = '#'.implode(',#', $cible);
77	77	} else {
78	78	$cible = "#$bouton_id + div.bloc_depliable";
79	79	}

		@@ -65,7 +65,7 @@ discard block
		block discarded – undo
65	65	}
66	66	}
67	67
68		- $texte = $x . $texte;
	68	+ $texte = $x.$texte;
69	69
70	70	return $texte;
71	71	}
		@@ -179,7 +179,7 @@ discard block
		block discarded – undo
179	179	\|\| ($pos = 0);
180	180
181	181	if (false === strpos(substr($texte, 0, $pos), '<!-- insert_head -->')) {
182		- $insert = "\n" . pipeline('insert_head', '<!-- f_insert_head -->') . "\n";
	182	+ $insert = "\n".pipeline('insert_head', '<!-- f_insert_head -->')."\n";
183	183	$texte = substr_replace($texte, $insert, $pos, 0);
184	184	}
185	185
		@@ -211,7 +211,7 @@ discard block
		block discarded – undo
211	211	}
212	212	$texte = substr_replace($texte, $x, $pos, 0);
213	213	// pas de preview en fenetre enfant
214		- $x = "<script type='text/javascript'>const frameEl = window.frameElement;if (frameEl) {frameEl.sandbox='sandbox';window.location.href='" . addslashes($GLOBALS['meta']['adresse_site']) . "';}</script>";
	214	+ $x = "<script type='text/javascript'>const frameEl = window.frameElement;if (frameEl) {frameEl.sandbox='sandbox';window.location.href='".addslashes($GLOBALS['meta']['adresse_site'])."';}</script>";
215	215	if (!$pos = stripos($texte, '<head') or !$pos = strpos($texte, '>', $pos)) {
216	216	$pos = -1;
217	217	}
		@@ -282,7 +282,7 @@ discard block
		block discarded – undo
282	282
283	283	// inserer avant le </body> fermant si on peut, a la fin de la page sinon
284	284	if (($p = strpos($texte, '</body>')) !== false) {
285		- $texte = substr($texte, 0, $p) . $code . substr($texte, $p);
	285	+ $texte = substr($texte, 0, $p).$code.substr($texte, $p);
286	286	} else {
287	287	$texte .= $code;
288	288	}

		@@ -67,7 +67,7 @@ discard block
		block discarded – undo
67	67	$_id_table = reset($_id_table);
68	68	}
69	69
70		- $requete['SELECT'][] = 't.' . $_id_table;
	70	+ $requete['SELECT'][] = 't.'.$_id_table;
71	71	$a = [];
72	72	// Recherche fulltext
73	73	foreach ($champs as $champ => $poids) {
		@@ -78,13 +78,13 @@ discard block
		block discarded – undo
78	78	$champ = "t.$champ";
79	79	}
80	80	$requete['SELECT'][] = $champ;
81		- $a[] = $champ . ' ' . $methode . ' ' . $q;
	81	+ $a[] = $champ.' '.$methode.' '.$q;
82	82	}
83	83	}
84	84	if ($a) {
85	85	$requete['WHERE'][] = join(' OR ', $a);
86	86	}
87		- $requete['FROM'][] = table_objet_sql($table) . ' AS t';
	87	+ $requete['FROM'][] = table_objet_sql($table).' AS t';
88	88
89	89	$results = [];
90	90
		@@ -252,8 +252,8 @@ discard block
		block discarded – undo
252	252	);
253	253	} // cas table de liaison generique spip_xxx_yyy
254	254	elseif (
255		- $t = $trouver_table($table_arrivee . '_' . $table_depart, $serveur)
256		- or $t = $trouver_table($table_depart . '_' . $table_arrivee, $serveur)
	255	+ $t = $trouver_table($table_arrivee.'_'.$table_depart, $serveur)
	256	+ or $t = $trouver_table($table_depart.'_'.$table_arrivee, $serveur)
257	257	) {
258	258	$s = sql_select(
259	259	"$cle_depart,$cle_arrivee",
		@@ -292,12 +292,12 @@ discard block
		block discarded – undo
292	292	}
293	293	if (isset($joint['champs']) and $joint['champs']) {
294	294	foreach ($joint['champs'] as $c => $val) {
295		- $results[$id]['champs'][$table_liee . '.' . $c] = $val;
	295	+ $results[$id]['champs'][$table_liee.'.'.$c] = $val;
296	296	}
297	297	}
298	298	if (isset($joint['matches']) and $joint['matches']) {
299	299	foreach ($joint['matches'] as $c => $val) {
300		- $results[$id]['matches'][$table_liee . '.' . $c] = $val;
	300	+ $results[$id]['matches'][$table_liee.'.'.$c] = $val;
301	301	}
302	302	}
303	303	}

		@@ -43,10 +43,10 @@ discard block
		block discarded – undo
43	43	* @return void
44	44	**/
45	45	function install_fichier_connexion($nom, $texte) {
46		- $texte = '<' . "?php\n"
	46	+ $texte = '<'."?php\n"
47	47	. "if (!defined(\"_ECRIRE_INC_VERSION\")) return;\n"
48	48	. $texte
49		- . '?' . '>';
	49	+ . '?'.'>';
50	50
51	51	ecrire_fichier($nom, $texte);
52	52	}
		@@ -113,10 +113,10 @@ discard block
		block discarded – undo
113	113	return $regs;
114	114	} else {
115	115	$ar = '\s\'([^\'])\'';
116		- $r = '\s*,' . $ar;
	116	+ $r = '\s*,'.$ar;
117	117	$r = "#spip_connect_db[(]$ar$r$r$r$r(?:$r(?:$r(?:$r(?:$r)?)?)?)?#";
118	118	if (preg_match($r, $s, $regs)) {
119		- $regs[2] = $regs[1] . (!$regs[2] ? '' : ':' . $regs[2] . ';');
	119	+ $regs[2] = $regs[1].(!$regs[2] ? '' : ':'.$regs[2].';');
120	120	array_shift($regs);
121	121	array_shift($regs);
122	122
		@@ -174,7 +174,7 @@ discard block
		block discarded – undo
174	174	// Si on n'a pas la bonne version de PHP, c'est la fin
175	175	if ($err) {
176	176	die("<div class='error'>"
177		- . '<h3>' . _T('avis_attention') . '</h3><p>' . _T('install_echec_annonce') . "</p><ul class='spip'>"
	177	+ . '<h3>'._T('avis_attention').'</h3><p>'._T('install_echec_annonce')."</p><ul class='spip'>"
178	178	. "<li><strong>{$err[0]}</strong></li>\n</ul></div>");
179	179	}
180	180
		@@ -201,7 +201,7 @@ discard block
		block discarded – undo
201	201
202	202	if ($err) {
203	203	echo "<div class='error'>"
204		- . '<h3>' . _T('avis_attention') . '</h3><p>' . _T('install_echec_annonce') . "</p><ul class='spip'>";
	204	+ . '<h3>'._T('avis_attention').'</h3><p>'._T('install_echec_annonce')."</p><ul class='spip'>";
205	205	foreach ($err as $e) {
206	206	echo "<li><strong>$e</strong></li>\n";
207	207	}
		@@ -235,8 +235,8 @@ discard block
		block discarded – undo
235	235
236	236	// https://code.spip.net/@info_etape
237	237	function info_etape($titre, $complement = '') {
238		- return '<h2>' . $titre . "</h2>\n" .
239		- ($complement ? '' . $complement . "\n" : '');
	238	+ return '<h2>'.$titre."</h2>\n".
	239	+ ($complement ? ''.$complement."\n" : '');
240	240	}
241	241
242	242	/**
		@@ -250,18 +250,18 @@ discard block
		block discarded – undo
250	250	$code = _T('bouton_suivant');
251	251	}
252	252	static $suivant = 0;
253		- $id = 'suivant' . (($suivant > 0) ? strval($suivant) : '');
	253	+ $id = 'suivant'.(($suivant > 0) ? strval($suivant) : '');
254	254	$suivant += 1;
255	255
256		- return "\n<p class='boutons suivant'><input id='" . $id . "' type='submit'\nvalue=\"" .
257		- $code .
	256	+ return "\n<p class='boutons suivant'><input id='".$id."' type='submit'\nvalue=\"".
	257	+ $code.
258	258	" >>\" /></p>\n";
259	259	}
260	260
261	261	// https://code.spip.net/@info_progression_etape
262	262	function info_progression_etape($en_cours, $phase, $dir, $erreur = false) {
263	263	//$en_cours = _request('etape')?_request('etape'):"";
264		- $liste = find_all_in_path($dir, $phase . '(([0-9])+\|fin)[.]php$');
	264	+ $liste = find_all_in_path($dir, $phase.'(([0-9])+\|fin)[.]php$');
265	265	$debut = 1;
266	266	$etat = 'ok';
267	267	$last = count($liste);
		@@ -300,7 +300,7 @@ discard block
		block discarded – undo
300	300
301	301	$aff_etapes .= "<li class='$class'><div class='fond'>";
302	302	$aff_etapes .= ($debut == $en_cours) ? '<strong>' : '';
303		- $aff_etapes .= '<em>' . _T('etape') . " </em><span class='numero_etape'>$debut</span><em> : </em>";
	303	+ $aff_etapes .= '<em>'._T('etape')." </em><span class='numero_etape'>$debut</span><em> : </em>";
304	304	$aff_etapes .= $intitule_etat["$phase"][$debut];
305	305	$aff_etapes .= ($debut == $en_cours) ? '</strong>' : '';
306	306	$aff_etapes .= '</div></li>';
		@@ -316,11 +316,11 @@ discard block
		block discarded – undo
316	316
317	317	// https://code.spip.net/@fieldset
318	318	function fieldset($legend, $champs = [], $apres = '', $avant = '') {
319		- return "<fieldset>\n" .
320		- $avant .
321		- ($legend ? '<legend>' . $legend . "</legend>\n" : '') .
322		- fieldset_champs($champs) .
323		- $apres .
	319	+ return "<fieldset>\n".
	320	+ $avant.
	321	+ ($legend ? '<legend>'.$legend."</legend>\n" : '').
	322	+ fieldset_champs($champs).
	323	+ $apres.
324	324	"</fieldset>\n";
325	325	}
326	326
		@@ -330,18 +330,18 @@ discard block
		block discarded – undo
330	330	$type = isset($contenu['hidden']) ? 'hidden' : (preg_match(',^pass,', $nom) ? 'password' : 'text');
331	331	$class = isset($contenu['hidden']) ? '' : "class='formo' size='40' ";
332	332	if (isset($contenu['alternatives'])) {
333		- $fieldset .= $contenu['label'] . "\n";
	333	+ $fieldset .= $contenu['label']."\n";
334	334	foreach ($contenu['alternatives'] as $valeur => $label) {
335		- $fieldset .= "<input type='radio' name='" . $nom .
	335	+ $fieldset .= "<input type='radio' name='".$nom.
336	336	"' id='$nom-$valeur' value='$valeur'"
337	337	. (($valeur == $contenu['valeur']) ? "\nchecked='checked'" : '')
338	338	. "/>\n";
339		- $fieldset .= "<label for='$nom-$valeur'>" . $label . "</label>\n";
	339	+ $fieldset .= "<label for='$nom-$valeur'>".$label."</label>\n";
340	340	}
341	341	$fieldset .= "<br />\n";
342	342	} else {
343		- $fieldset .= "<label for='" . $nom . "'>" . $contenu['label'] . "</label>\n";
344		- $fieldset .= '<input ' . $class . "type='" . $type . "' id='" . $nom . "' name='" . $nom . "'\nvalue='" . $contenu['valeur'] . "'"
	343	+ $fieldset .= "<label for='".$nom."'>".$contenu['label']."</label>\n";
	344	+ $fieldset .= '<input '.$class."type='".$type."' id='".$nom."' name='".$nom."'\nvalue='".$contenu['valeur']."'"
345	345	. (preg_match(',^(pass\|login),', $nom) ? " autocomplete='off'" : '')
346	346	. ((isset($contenu['required']) and $contenu['required']) ? " required='required'" : '')
347	347	. " />\n";
		@@ -353,7 +353,7 @@ discard block
		block discarded – undo
353	353
354	354	function install_select_serveur() {
355	355	$options = [];
356		- $dir = _DIR_RESTREINT . 'req/';
	356	+ $dir = _DIR_RESTREINT.'req/';
357	357	$d = opendir($dir);
358	358	if (!$d) {
359	359	return [];
		@@ -361,17 +361,17 @@ discard block
		block discarded – undo
361	361	while (($f = readdir($d)) !== false) {
362	362	if (
363	363	(preg_match('/^(.*)[.]php$/', $f, $s))
364		- and is_readable($f = $dir . $f)
	364	+ and is_readable($f = $dir.$f)
365	365	) {
366	366	require_once($f);
367	367	$s = $s[1];
368		- $v = 'spip_versions_' . $s;
	368	+ $v = 'spip_versions_'.$s;
369	369	if (function_exists($v) and $v()) {
370	370	$titre = _T("install_select_type_$s");
371	371	// proposer mysql par defaut si dispo
372	372	$checked = ($s == 'mysql' ? " checked='checked'" : '');
373	373	$options[$s] = "<li><input type='radio' id='$s' value='$s' name='server_db'$checked>"
374		- . "<label for='$s'>" . ($titre ? $titre : $s) . '</label></li>';
	374	+ . "<label for='$s'>".($titre ? $titre : $s).'</label></li>';
375	375	} else {
376	376	spip_log("$s: portage indisponible");
377	377	}
		@@ -390,8 +390,8 @@ discard block
		block discarded – undo
390	390	"\n<input type='hidden' name='etape' value='$etape' />"
391	391	. $hidden
392	392	. (_request('echec') ?
393		- ('<p><b>' . _T('avis_connexion_echec_1') .
394		- '</b></p><p>' . _T('avis_connexion_echec_2') . "</p><p style='font-size: small;'>" . _T('avis_connexion_echec_3') . '</p>')
	393	+ ('<p><b>'._T('avis_connexion_echec_1').
	394	+ '</b></p><p>'._T('avis_connexion_echec_2')."</p><p style='font-size: small;'>"._T('avis_connexion_echec_3').'</p>')
395	395	: '')
396	396
397	397	. ($jquery ? http_script('', 'jquery.js') : '')
		@@ -429,9 +429,9 @@ discard block
		block discarded – undo
429	429	});')
430	430
431	431	. ($server_db
432		- ? '<input type="hidden" name="server_db" value="' . $server_db . '" />'
	432	+ ? '<input type="hidden" name="server_db" value="'.$server_db.'" />'
433	433	. (($predef[0])
434		- ? ('<h3>' . _T('install_serveur_hebergeur') . '</h3>')
	434	+ ? ('<h3>'._T('install_serveur_hebergeur').'</h3>')
435	435	: '')
436	436	: ('<fieldset><legend>'
437	437	. _T('install_select_type_db')
		@@ -446,9 +446,9 @@ discard block
		block discarded – undo
446	446	. "\n</ul>\n</div></fieldset>")
447	447	)
448	448	. '<div id="install_adresse_base_hebergeur">'
449		- . '<p>' . _T('texte_connexion_mysql') . '</p>'
	449	+ . '<p>'._T('texte_connexion_mysql').'</p>'
450	450	. ($predef[1]
451		- ? '<h3>' . _T('install_adresse_base_hebergeur') . '</h3>'
	451	+ ? '<h3>'._T('install_adresse_base_hebergeur').'</h3>'
452	452	: fieldset(
453	453	_T('entree_base_donnee_1'),
454	454	[
		@@ -463,7 +463,7 @@ discard block
		block discarded – undo
463	463
464	464	. '<div id="install_login_base_hebergeur">'
465	465	. ($predef[2]
466		- ? '<h3>' . _T('install_login_base_hebergeur') . '</h3>'
	466	+ ? '<h3>'._T('install_login_base_hebergeur').'</h3>'
467	467	: fieldset(
468	468	_T('entree_login_connexion_1'),
469	469	[
		@@ -478,7 +478,7 @@ discard block
		block discarded – undo
478	478
479	479	. '<div id="install_pass_base_hebergeur">'
480	480	. ($predef[3]
481		- ? '<h3>' . _T('install_pass_base_hebergeur') . '</h3>'
	481	+ ? '<h3>'._T('install_pass_base_hebergeur').'</h3>'
482	482	: fieldset(
483	483	_T('entree_mot_passe_1'),
484	484	[
		@@ -501,20 +501,20 @@ discard block
		block discarded – undo
501	501	function predef_ou_cache($adresse_db, $login_db, $pass_db, $server_db) {
502	502	return ((defined('_INSTALL_HOST_DB'))
503	503	? ''
504		- : "\n<input type='hidden' name='adresse_db' value=\"" . spip_htmlspecialchars($adresse_db) . '" />'
	504	+ : "\n<input type='hidden' name='adresse_db' value=\"".spip_htmlspecialchars($adresse_db).'" />'
505	505	)
506	506	. ((defined('_INSTALL_USER_DB'))
507	507	? ''
508		- : "\n<input type='hidden' name='login_db' value=\"" . spip_htmlspecialchars($login_db) . '" />'
	508	+ : "\n<input type='hidden' name='login_db' value=\"".spip_htmlspecialchars($login_db).'" />'
509	509	)
510	510	. ((defined('_INSTALL_PASS_DB'))
511	511	? ''
512		- : "\n<input type='hidden' name='pass_db' value=\"" . spip_htmlspecialchars($pass_db) . '" />'
	512	+ : "\n<input type='hidden' name='pass_db' value=\"".spip_htmlspecialchars($pass_db).'" />'
513	513	)
514	514
515	515	. ((defined('_INSTALL_SERVER_DB'))
516	516	? ''
517		- : "\n<input type='hidden' name='server_db' value=\"" . spip_htmlspecialchars($server_db) . '" />'
	517	+ : "\n<input type='hidden' name='server_db' value=\"".spip_htmlspecialchars($server_db).'" />'
518	518	);
519	519	}
520	520

		@@ -47,13 +47,13 @@ discard block
		block discarded – undo
47	47
48	48	$dir = 'images/';
49	49	$f = "$type-$size.png";
50		- if ($icone = find_in_theme($dir . $f)) {
	50	+ if ($icone = find_in_theme($dir.$f)) {
51	51	$dir = dirname($icone);
52	52	$fond = $icone;
53	53
54	54	if (
55	55	$rtl
56		- and $fr = $dir . '/' . str_replace("$type-", "$type-rtl-", basename($icone))
	56	+ and $fr = $dir.'/'.str_replace("$type-", "$type-rtl-", basename($icone))
57	57	and file_exists($fr)
58	58	) {
59	59	$fond = $fr;
		@@ -69,7 +69,7 @@ discard block
		block discarded – undo
69	69	}
70	70
71	71	$fonction = '';
72		- if (in_array($action, ['add','del', 'new', 'edit', 'config'])) {
	72	+ if (in_array($action, ['add', 'del', 'new', 'edit', 'config'])) {
73	73	$fonction = $action;
74	74	}
75	75

		@@ -43,7 +43,7 @@ discard block
		block discarded – undo
43	43	$result = sql_select(
44	44	'id_rubrique, id_parent, titre, descriptif, lang',
45	45	'spip_rubriques',
46		- 'id_parent=' . intval($collection),
	46	+ 'id_parent='.intval($collection),
47	47	'',
48	48	'0+titre,titre',
49	49	"$debut,$limite"
		@@ -74,19 +74,18 @@ discard block
		block discarded – undo
74	74	}
75	75	}
76	76
77		- $lib_bouton = (!acces_restreint_rubrique($id_rubrique) ? '' :
78		- http_img_pack(
	77	+ $lib_bouton = (!acces_restreint_rubrique($id_rubrique) ? '' : http_img_pack(
79	78	'auteur-0minirezo-16.png',
80	79	'',
81	80	" width='16' height='16'",
82	81	_T('image_administrer_rubrique')
83		- )) .
84		- " <a class='titremlien' dir='$lang_dir'" .
85		- ($row['lang'] !== $GLOBALS['spip_lang'] ? " hreflang='" . $row['lang'] . "'" : '') .
86		- " href='" .
87		- generer_url_entite($id_rubrique, 'rubrique') .
88		- "'><span class='titre'>" .
89		- $rang . $titre
	82	+ )).
	83	+ " <a class='titremlien' dir='$lang_dir'".
	84	+ ($row['lang'] !== $GLOBALS['spip_lang'] ? " hreflang='".$row['lang']."'" : '').
	85	+ " href='".
	86	+ generer_url_entite($id_rubrique, 'rubrique').
	87	+ "'><span class='titre'>".
	88	+ $rang.$titre
90	89	. '</span>'
91	90	. (is_string($logo) ? $logo : '')
92	91	. '</a>';
		@@ -96,8 +95,8 @@ discard block
		block discarded – undo
96	95	;
97	96
98	97	$res[] =
99		- debut_cadre_sous_rub(($id_parent ? 'rubrique-24.png' : 'secteur-24.png'), true, '', $titre) .
100		- $les_sous_enfants .
	98	+ debut_cadre_sous_rub(($id_parent ? 'rubrique-24.png' : 'secteur-24.png'), true, '', $titre).
	99	+ $les_sous_enfants.
101	100	fin_cadre_sous_rub(true);
102	101	}
103	102	}
		@@ -116,7 +115,7 @@ discard block
		block discarded – undo
116	115	* Le contenu du bloc dépliable
117	116	*/
118	117	function sous_enfant_rub($collection2) {
119		- $nb = sql_countsel('spip_rubriques', 'id_parent=' . intval($collection2));
	118	+ $nb = sql_countsel('spip_rubriques', 'id_parent='.intval($collection2));
120	119
121	120	$retour = '';
122	121	$pagination = '';
		@@ -128,23 +127,23 @@ discard block
		block discarded – undo
128	127	* Si > 500 on affiche une pagination
129	128	*/
130	129	if ($nb > $limite) {
131		- $debut = _request('debut_rubrique' . $collection2) ? _request('debut_rubrique' . $collection2) : $debut;
	130	+ $debut = _request('debut_rubrique'.$collection2) ? _request('debut_rubrique'.$collection2) : $debut;
132	131	$pagination = chercher_filtre('pagination');
133		- $pagination = '<p class="pagination">' . $pagination(
	132	+ $pagination = '<p class="pagination">'.$pagination(
134	133	$nb,
135		- '_rubrique' . $collection2,
	134	+ '_rubrique'.$collection2,
136	135	$debut,
137	136	$limite,
138	137	true,
139	138	'prive'
140		- ) . '</p>';
	139	+ ).'</p>';
141	140	$limite = $debut + $limite;
142	141	}
143	142
144	143	$result = sql_select(
145	144	'id_rubrique, id_parent, titre, lang',
146	145	'spip_rubriques',
147		- 'id_parent=' . intval($collection2),
	146	+ 'id_parent='.intval($collection2),
148	147	'',
149	148	'0+titre,titre',
150	149	"$debut,$limite"
		@@ -164,14 +163,14 @@ discard block
		block discarded – undo
164	163	changer_typo($row['lang']);
165	164	$lang_dir = lang_dir($row['lang']);
166	165	if (autoriser('voir', 'rubrique', $id_rubrique2)) {
167		- $retour .= "\n<li class='item' dir='$lang_dir'><a href='" . generer_url_entite(
	166	+ $retour .= "\n<li class='item' dir='$lang_dir'><a href='".generer_url_entite(
168	167	$id_rubrique2,
169	168	'rubrique'
170		- ) . "'>" . $rang2 . $titre2 . "</a></li>\n";
	169	+ )."'>".$rang2.$titre2."</a></li>\n";
171	170	}
172	171	}
173	172
174		- $retour = $pagination . $retour . $pagination;
	173	+ $retour = $pagination.$retour.$pagination;
175	174
176	175	if (!$retour) {
177	176	return '';
		@@ -180,7 +179,7 @@ discard block
		block discarded – undo
180	179	return debut_block_depliable($debut > 0 ? true : false, "enfants$collection2")
181	180	. "\n<ul class='liste-items sous-sous-rub'>\n"
182	181	. $retour
183		- . "</ul>\n" . fin_block() . "\n\n";
	182	+ . "</ul>\n".fin_block()."\n\n";
184	183	}
185	184
186	185	/**
		@@ -199,13 +198,13 @@ discard block
		block discarded – undo
199	198	$debut = 0;
200	199	$limite = 500;
201	200
202		- $nb = sql_countsel('spip_rubriques', 'id_parent=' . intval($id_rubrique));
	201	+ $nb = sql_countsel('spip_rubriques', 'id_parent='.intval($id_rubrique));
203	202
204	203	if ($nb > $limite) {
205		- $debut = _request('debut_rubrique' . $id_rubrique) ? _request('debut_rubrique' . $id_rubrique) : $debut;
	204	+ $debut = _request('debut_rubrique'.$id_rubrique) ? _request('debut_rubrique'.$id_rubrique) : $debut;
206	205	$pagination = chercher_filtre('pagination');
207		- $pagination = '<br class="nettoyeur"><p class="pagination">' .
208		- $pagination($nb, '_rubrique' . $id_rubrique, $debut, $limite, true, 'prive') .
	206	+ $pagination = '<br class="nettoyeur"><p class="pagination">'.
	207	+ $pagination($nb, '_rubrique'.$id_rubrique, $debut, $limite, true, 'prive').
209	208	'</p>';
210	209	}
211	210

spip / SPIP

Push — master ( a04e6b...ef338c )

Status

Category

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

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

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

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

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

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

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

Spacing +25 added lines, -26 removed lines patch added patch discarded remove patch

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