spip / SPIP

ecrire/install/etape_fin.php

Spacing +4 added lines, -4 removed lines

@@ -45,7 +45,7 @@ 
 	// creer le repertoire cache, qui sert partout !
 	// deja fait en etape 4 en principe, on garde au cas ou
 	if (!@file_exists(_DIR_CACHE)) {
-		$rep = preg_replace(',' . _DIR_TMP . ',', '', _DIR_CACHE);
+		$rep = preg_replace(','._DIR_TMP.',', '', _DIR_CACHE);
 		$rep = sous_repertoire(_DIR_TMP, $rep, true, true);
 	}
 
@@ -55,7 +55,7 @@ 
 	if ($msg) {
 		$cible = _T('public:accueil_site');
 		$cible = generer_form_ecrire('accueil', '', '', $cible);
-		echo minipres('AUTO', $msg . $cible);
+		echo minipres('AUTO', $msg.$cible);
 		// ok, deboucher dans l'espace prive
 	} else {
 		redirige_url_ecrire('accueil');
@@ -75,9 +75,9 @@ 
 	$averti = _T(
 		'htaccess_a_simuler',
 		[
-			'htaccess' => '<tt>' . _ACCESS_FILE_NAME . '</tt>',
+			'htaccess' => '<tt>'._ACCESS_FILE_NAME.'</tt>',
 			'constantes' => '<tt>_DIR_TMP &amp; _DIR_CONNECT</tt>',
-			'document_root' => '<tt>' . $_SERVER['DOCUMENT_ROOT'] . '</tt>'
+			'document_root' => '<tt>'.$_SERVER['DOCUMENT_ROOT'].'</tt>'
 		]
 	);
 

ecrire/install/etape_4.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
 
 	// creer le repertoire cache, qui sert partout !
 	if (!@file_exists(_DIR_CACHE)) {
-		$rep = preg_replace(',' . _DIR_TMP . ',', '', _DIR_CACHE);
+		$rep = preg_replace(','._DIR_TMP.',', '', _DIR_CACHE);
 		$rep = sous_repertoire(_DIR_TMP, $rep, true, true);
 	}
 
@@ -39,7 +39,7 @@ 
 	echo '<p>'
 		. _T(
 			'plugin_info_plugins_dist_1',
-			['plugins_dist' => '<tt>' . joli_repertoire(_DIR_PLUGINS_DIST) . '</tt>']
+			['plugins_dist' => '<tt>'.joli_repertoire(_DIR_PLUGINS_DIST).'</tt>']
 		)
 		. '</p>';
 

ecrire/install/etape_ldap5.php

Spacing +6 added lines, -7 removed lines

@@ -52,29 +52,28 @@ 
 	$conn = "\$GLOBALS['ldap_base'] = '$base_ldap';\n"
 		. "\$GLOBALS['ldap_link'] = @ldap_connect('$adresse_ldap','$port_ldap');\n"
 		. "@ldap_set_option(\$GLOBALS['ldap_link'],LDAP_OPT_PROTOCOL_VERSION,'$protocole_ldap');\n"
-		. (($tls_ldap != 'oui') ? '' :
-			"@ldap_start_tls(\$GLOBALS['ldap_link']);\n")
+		. (($tls_ldap != 'oui') ? '' : "@ldap_start_tls(\$GLOBALS['ldap_link']);\n")
 		. "@ldap_bind(\$GLOBALS['ldap_link'],'$login_ldap','$pass_ldap');\n";
 
 	$champs = is_array($GLOBALS['ldap_attributes']) ? $GLOBALS['ldap_attributes'] : [];
 	$res = '';
 	foreach ($champs as $champ => $v) {
-		$nom = 'ldap_' . $champ;
+		$nom = 'ldap_'.$champ;
 		$val = trim(_request($nom));
 		if (preg_match('/^\w*$/', $val)) {
 			if ($val) {
 				$val = _q($val);
 			}
 		} else {
-			$val = 'array(' . _q(preg_split('/\W+/', $val)) . ')';
+			$val = 'array('._q(preg_split('/\W+/', $val)).')';
 		};
 		if ($val) {
-			$res .= "'$champ' => " . $val . ',';
+			$res .= "'$champ' => ".$val.',';
 		}
 	}
 	$conn .= "\$GLOBALS['ldap_champs'] = array($res);\n";
 
-	install_fichier_connexion(_DIR_CONNECT . _FILE_LDAP, $conn);
+	install_fichier_connexion(_DIR_CONNECT._FILE_LDAP, $conn);
 }
 
 function etape_ldap5_suite() {
@@ -87,7 +86,7 @@ 
 	);
 
 	echo generer_form_ecrire('install', (
-		"<input type='hidden' name='etape' value='3' />" .
+		"<input type='hidden' name='etape' value='3' />".
 		"<input type='hidden' name='ldap_present' value='true' />"
 		. bouton_suivant()));
 

ecrire/genie/maintenance.php

Spacing +2 added lines, -2 removed lines

@@ -107,8 +107,8 @@
 function message_crash_tables() {
 	if ($crash = verifier_crash_tables()) {
 		return
-			'<strong>' . _T('texte_recuperer_base') . '</strong><br />'
-			. ' <tt>' . join(', ', $crash) . '</tt><br />'
+			'<strong>'._T('texte_recuperer_base').'</strong><br />'
+			. ' <tt>'.join(', ', $crash).'</tt><br />'
 			. generer_form_ecrire(
 				'base_repair',
 				_T('texte_crash_base'),

ecrire/inc/puce_statut.php

Spacing +1 added lines, -1 removed lines

@@ -416,7 +416,7 @@
 	$h = generer_action_auteur('instituer_objet', "$type-$id-$statut");
 	$t = supprimer_tags($titre);
 
-	return "<a href=\"#\" data-puce-id=\"$id\" data-puce-type=\"$type\" data-puce-decal=\"$n\" data-puce-action=\"$h\" title=\"$t\"$act>" . http_img_pack($img, $t) . '</a>';
+	return "<a href=\"#\" data-puce-id=\"$id\" data-puce-type=\"$type\" data-puce-decal=\"$n\" data-puce-action=\"$h\" title=\"$t\"$act>".http_img_pack($img, $t).'</a>';
 }
 
 // compat

ecrire/inc/boutons.php

Spacing +3 added lines, -3 removed lines

@@ -102,8 +102,8 @@ 
 			&& 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 @@ 
 		$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());
 }

ecrire/inc/recherche_to_array.php

Spacing +7 added lines, -7 removed lines

@@ -67,7 +67,7 @@ 
 		$_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 @@ 
 				$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 @@ 
 					);
 				} // 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 @@ 
 				}
 				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;
 					}
 				}
 			}

ecrire/inc/icone_renommer.php

Spacing +3 added lines, -3 removed lines

@@ -47,13 +47,13 @@ 
 
 	$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 @@ 
 		}
 
 		$fonction = '';
-		if (in_array($action, ['add','del', 'new', 'edit', 'config'])) {
+		if (in_array($action, ['add', 'del', 'new', 'edit', 'config'])) {
 			$fonction = $action;
 		}
 

ecrire/inc/prepare_recherche.php

Spacing +4 added lines, -4 removed lines

@@ -82,12 +82,12 @@ 
 	$where_resultat_recent = sql_date_proche('maj', (0 - ($delai_fraicheur + 100)), ' SECOND');
 	if (!isset($cache[$serveur][$table][$recherche])) {
 		$hash_serv = ($serveur ? substr(md5($serveur), 0, 16) : '');
-		$hash = substr(md5($recherche . $table), 0, 16);
-		$where = "(resultats.recherche='$hash' AND resultats.table_objet=" . sql_quote($table) . " AND resultats.serveur='$hash_serv')";
+		$hash = substr(md5($recherche.$table), 0, 16);
+		$where = "(resultats.recherche='$hash' AND resultats.table_objet=".sql_quote($table)." AND resultats.serveur='$hash_serv')";
 		$row = sql_fetsel(
 			'recherche',
 			'spip_resultats AS resultats',
-			$where . " AND $where_resultat_recent",
+			$where." AND $where_resultat_recent",
 			'',
 			'',
 			'0,1'
@@ -196,7 +196,7 @@ 
 		}
 
 		foreach ($listes_ids as $p => $ids) {
-			$select .= "+$p*(" .
+			$select .= "+$p*(".
 				sql_in("$table.$primary", $ids, '', $serveur)
 				. ') ';
 		}