spip / SPIP

ecrire/maj/legacy/v40.php

Spacing +4 added lines, -4 removed lines

@@ -64,13 +64,13 @@
 				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
 						);
 					}
 				}

ecrire/base/create.php

Spacing +2 added lines, -2 removed lines

@@ -85,7 +85,7 @@ 
 			#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 @@ 
 		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;
 			}

ecrire/base/repair.php

Spacing +8 added lines, -8 removed lines

@@ -38,7 +38,7 @@ 
 
 	$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 @@ 
 	$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 @@ 
 		$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 @@ 
 			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>";

ecrire/index.php

Spacing +4 added lines, -4 removed lines

@@ -35,7 +35,7 @@ 
 // 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 @@ 
 			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'));
 	}

ecrire/install/etape_ldap1.php

Spacing +3 added lines, -3 removed lines

@@ -58,11 +58,11 @@ 
 					'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 @@ 
 			]
 		)
 
-		. "\n<p>" . _T('texte_acces_ldap_anonyme_1') . '</p>'
+		. "\n<p>"._T('texte_acces_ldap_anonyme_1').'</p>'
 		. fieldset(
 			_T('connexion_ldap'),
 			[

ecrire/install/etape_chmod.php

Spacing +15 added lines, -16 removed lines

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

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()));