Completed
Push — master ( b22279...3633cd )
by cam
01:26
created
ecrire/install/etape_3.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 		= spip_connect_db($adresse_db, $port, $login_db, $pass_db, '', $server_db);
46 46
 
47 47
 	$GLOBALS['connexions'][$server_db][$GLOBALS['spip_sql_version']]
48
-		= $GLOBALS['spip_' . $server_db . '_functions_' . $GLOBALS['spip_sql_version']];
48
+		= $GLOBALS['spip_'.$server_db.'_functions_'.$GLOBALS['spip_sql_version']];
49 49
 
50 50
 	$fquery = sql_serveur('query', $server_db);
51 51
 	if ($choix_db == 'new_spip') {
@@ -55,13 +55,13 @@  discard block
 block discarded – undo
55 55
 			if (!$ok) {
56 56
 				$re = "Impossible de creer la base $re";
57 57
 				spip_log($re);
58
-				return '<p>' . _T('avis_connexion_erreur_creer_base') . "</p><!--\n$re\n-->";
58
+				return '<p>'._T('avis_connexion_erreur_creer_base')."</p><!--\n$re\n-->";
59 59
 			}
60 60
 		} else {
61 61
 			$re = "Le nom de la base doit correspondre a $re";
62 62
 			spip_log($re);
63 63
 
64
-			return '<p>' . _T('avis_connexion_erreur_nom_base') . "</p><!--\n$re\n-->";
64
+			return '<p>'._T('avis_connexion_erreur_nom_base')."</p><!--\n$re\n-->";
65 65
 		}
66 66
 	}
67 67
 
@@ -72,14 +72,14 @@  discard block
 block discarded – undo
72 72
 		= spip_connect_db($adresse_db, $port, $login_db, $pass_db, $sel_db, $server_db);
73 73
 
74 74
 	$GLOBALS['connexions'][$server_db][$GLOBALS['spip_sql_version']]
75
-		= $GLOBALS['spip_' . $server_db . '_functions_' . $GLOBALS['spip_sql_version']];
75
+		= $GLOBALS['spip_'.$server_db.'_functions_'.$GLOBALS['spip_sql_version']];
76 76
 
77 77
 	// Completer le tableau decrivant la connexion
78 78
 
79 79
 	$GLOBALS['connexions'][$server_db]['prefixe'] = $table_prefix;
80 80
 	$GLOBALS['connexions'][$server_db]['db'] = $sel_db;
81 81
 
82
-	$old = sql_showbase($table_prefix . '_meta', $server_db);
82
+	$old = sql_showbase($table_prefix.'_meta', $server_db);
83 83
 	if ($old) {
84 84
 		$old = sql_fetch($old, $server_db);
85 85
 	}
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 				$charset['charset'];
99 99
 			$charsetbase = $charset['charset'];
100 100
 		} else {
101
-			spip_log(_DEFAULT_CHARSET . ' inconnu du serveur SQL');
101
+			spip_log(_DEFAULT_CHARSET.' inconnu du serveur SQL');
102 102
 			$charsetbase = 'standard';
103 103
 		}
104 104
 		spip_log("Creation des tables. Codage $charsetbase");
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
 		if ($r) {
149 149
 			$r = sql_fetch($r, $server_db);
150 150
 		}
151
-		$version_installee = !$r ? 0 : (double)$r['valeur'];
151
+		$version_installee = !$r ? 0 : (double) $r['valeur'];
152 152
 		if (!$version_installee or ($GLOBALS['spip_version_base'] < $version_installee)) {
153 153
 			$fupdateq(
154 154
 				'spip_meta',
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
 				'',
158 158
 				$server_db
159 159
 			);
160
-			spip_log('nouvelle version installee: ' . $GLOBALS['spip_version_base']);
160
+			spip_log('nouvelle version installee: '.$GLOBALS['spip_version_base']);
161 161
 		}
162 162
 		// eliminer la derniere operation d'admin mal terminee
163 163
 		// notamment la mise a jour
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
 	if ($chmod_db) {
185 185
 		install_fichier_connexion(
186 186
 			_FILE_CHMOD_TMP,
187
-			"if (!defined('_SPIP_CHMOD')) define('_SPIP_CHMOD', " . sprintf('0%3o', $chmod_db) . ");\n"
187
+			"if (!defined('_SPIP_CHMOD')) define('_SPIP_CHMOD', ".sprintf('0%3o', $chmod_db).");\n"
188 188
 		);
189 189
 	}
190 190
 
@@ -249,16 +249,16 @@  discard block
 block discarded – undo
249 249
 
250 250
 // https://code.spip.net/@install_premier_auteur
251 251
 function install_premier_auteur($email, $login, $nom, $pass, $hidden, $auteur_obligatoire) {
252
-	return info_progression_etape(3, 'etape_', 'install/') .
252
+	return info_progression_etape(3, 'etape_', 'install/').
253 253
 	info_etape(
254 254
 		_T('info_informations_personnelles'),
255
-		'<b>' . _T('texte_informations_personnelles_1') . '</b>' .
256
-		aider('install5', true) .
257
-		'<p>' .
255
+		'<b>'._T('texte_informations_personnelles_1').'</b>'.
256
+		aider('install5', true).
257
+		'<p>'.
258 258
 		($auteur_obligatoire ?
259 259
 			''
260 260
 			:
261
-			_T('texte_informations_personnelles_2') . ' ' . _T('info_laisser_champs_vides')
261
+			_T('texte_informations_personnelles_2').' '._T('info_laisser_champs_vides')
262 262
 		)
263 263
 	)
264 264
 	. generer_form_ecrire('install', (
@@ -268,12 +268,12 @@  discard block
 block discarded – undo
268 268
 			_T('info_identification_publique'),
269 269
 			[
270 270
 				'nom' => [
271
-					'label' => '<b>' . _T('entree_signature') . "</b><br />\n" . _T('entree_nom_pseudo_1') . "\n",
271
+					'label' => '<b>'._T('entree_signature')."</b><br />\n"._T('entree_nom_pseudo_1')."\n",
272 272
 					'valeur' => $nom,
273 273
 					'required' => $auteur_obligatoire,
274 274
 				],
275 275
 				'email' => [
276
-					'label' => '<b>' . _T('entree_adresse_email') . "</b>\n",
276
+					'label' => '<b>'._T('entree_adresse_email')."</b>\n",
277 277
 					'valeur' => $email,
278 278
 				]
279 279
 			]
@@ -283,23 +283,23 @@  discard block
 block discarded – undo
283 283
 			_T('entree_identifiants_connexion'),
284 284
 			[
285 285
 				'login' => [
286
-					'label' => '<b>' . _T('entree_login') . "</b><br />\n" . _T(
286
+					'label' => '<b>'._T('entree_login')."</b><br />\n"._T(
287 287
 						'info_login_trop_court_car_pluriel',
288 288
 						['nb' => _LOGIN_TROP_COURT]
289
-					) . "\n",
289
+					)."\n",
290 290
 					'valeur' => $login,
291 291
 					'required' => $auteur_obligatoire,
292 292
 				],
293 293
 				'pass' => [
294
-					'label' => '<b>' . _T('entree_mot_passe') . "</b><br />\n" . _T(
294
+					'label' => '<b>'._T('entree_mot_passe')."</b><br />\n"._T(
295 295
 						'info_passe_trop_court_car_pluriel',
296 296
 						['nb' => _PASS_LONGUEUR_MINI]
297
-					) . "\n",
297
+					)."\n",
298 298
 					'valeur' => $pass,
299 299
 					'required' => $auteur_obligatoire,
300 300
 				],
301 301
 				'pass_verif' => [
302
-					'label' => '<b>' . _T('info_confirmer_passe') . "</b><br />\n",
302
+					'label' => '<b>'._T('info_confirmer_passe')."</b><br />\n",
303 303
 					'valeur' => $pass,
304 304
 					'required' => $auteur_obligatoire,
305 305
 				]
@@ -344,9 +344,9 @@  discard block
 block discarded – undo
344 344
 
345 345
 		if ($res) {
346 346
 			$res = info_progression_etape(2, 'etape_', 'install/', true)
347
-				. "<div class='error'><h3>" . _T('avis_operation_echec') . '</h3>'
347
+				. "<div class='error'><h3>"._T('avis_operation_echec').'</h3>'
348 348
 				. $res
349
-				. '<p>' . _T('texte_operation_echec') . '</p>'
349
+				. '<p>'._T('texte_operation_echec').'</p>'
350 350
 				. '</div>';
351 351
 		}
352 352
 	} else {
Please login to merge, or discard this patch.
ecrire/install/etape_fin.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 	// creer le repertoire cache, qui sert partout !
46 46
 	// deja fait en etape 4 en principe, on garde au cas ou
47 47
 	if (!@file_exists(_DIR_CACHE)) {
48
-		$rep = preg_replace(',' . _DIR_TMP . ',', '', _DIR_CACHE);
48
+		$rep = preg_replace(','._DIR_TMP.',', '', _DIR_CACHE);
49 49
 		$rep = sous_repertoire(_DIR_TMP, $rep, true, true);
50 50
 	}
51 51
 
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 	if ($msg) {
56 56
 		$cible = _T('public:accueil_site');
57 57
 		$cible = generer_form_ecrire('accueil', '', '', $cible);
58
-		echo minipres('AUTO', $msg . $cible);
58
+		echo minipres('AUTO', $msg.$cible);
59 59
 		// ok, deboucher dans l'espace prive
60 60
 	} else {
61 61
 		redirige_url_ecrire('accueil');
@@ -75,9 +75,9 @@  discard block
 block discarded – undo
75 75
 	$averti = _T(
76 76
 		'htaccess_a_simuler',
77 77
 		[
78
-			'htaccess' => '<tt>' . _ACCESS_FILE_NAME . '</tt>',
78
+			'htaccess' => '<tt>'._ACCESS_FILE_NAME.'</tt>',
79 79
 			'constantes' => '<tt>_DIR_TMP &amp; _DIR_CONNECT</tt>',
80
-			'document_root' => '<tt>' . $_SERVER['DOCUMENT_ROOT'] . '</tt>'
80
+			'document_root' => '<tt>'.$_SERVER['DOCUMENT_ROOT'].'</tt>'
81 81
 		]
82 82
 	);
83 83
 
Please login to merge, or discard this patch.
ecrire/install/etape_3b.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -48,9 +48,9 @@  discard block
 block discarded – undo
48 48
 		if ($echec) {
49 49
 			echo minipres(
50 50
 				'AUTO',
51
-				info_progression_etape(3, 'etape_', 'install/', true) .
52
-				"<div class='error'><h3>$echec</h3>\n" .
53
-				'<p>' . _T('avis_connexion_echec_2') . '</p>' .
51
+				info_progression_etape(3, 'etape_', 'install/', true).
52
+				"<div class='error'><h3>$echec</h3>\n".
53
+				'<p>'._T('avis_connexion_echec_2').'</p>'.
54 54
 				'</div>'
55 55
 			);
56 56
 			exit;
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 		$htpass = generer_htpass($pass);
87 87
 		$alea_actuel = creer_uniqid();
88 88
 		$alea_futur = creer_uniqid();
89
-		$shapass = spip_sha256($alea_actuel . $pass);
89
+		$shapass = spip_sha256($alea_actuel.$pass);
90 90
 		// prelablement, creer le champ webmestre si il n'existe pas (install neuve
91 91
 		// sur une vieille base
92 92
 		$t = sql_showtable('spip_auteurs', true);
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
 			@sql_alter("TABLE spip_auteurs ADD webmestre varchar(3)  DEFAULT 'non' NOT NULL");
95 95
 		}
96 96
 
97
-		$id_auteur = sql_getfetsel('id_auteur', 'spip_auteurs', 'login=' . sql_quote($login));
97
+		$id_auteur = sql_getfetsel('id_auteur', 'spip_auteurs', 'login='.sql_quote($login));
98 98
 		if ($id_auteur !== null) {
99 99
 			sql_updateq('spip_auteurs', [
100 100
 				'nom' => $nom,
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
 			!$auteur = auth_identifier_login($login, $pass)
135 135
 			or !auth_loger($auteur, true)
136 136
 		) {
137
-			spip_log("login automatique impossible $auth_spip $session" . count($row));
137
+			spip_log("login automatique impossible $auth_spip $session".count($row));
138 138
 		}
139 139
 	}
140 140
 
Please login to merge, or discard this patch.
ecrire/install/etape_2.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 	$GLOBALS['connexions'][$server_db] = $link;
51 51
 
52 52
 	$GLOBALS['connexions'][$server_db][$GLOBALS['spip_sql_version']]
53
-		= $GLOBALS['spip_' . $server_db . '_functions_' . $GLOBALS['spip_sql_version']];
53
+		= $GLOBALS['spip_'.$server_db.'_functions_'.$GLOBALS['spip_sql_version']];
54 54
 
55 55
 	echo install_debut_html();
56 56
 
@@ -68,18 +68,18 @@  discard block
 block discarded – undo
68 68
 	//echo "\n-->\n";
69 69
 
70 70
 	if (($db_connect == '0') && $link) {
71
-		echo "<div class='success'><b>" . _T('info_connexion_ok') . '</b></div>';
71
+		echo "<div class='success'><b>"._T('info_connexion_ok').'</b></div>';
72 72
 		echo info_progression_etape(2, 'etape_', 'install/');
73 73
 
74
-		echo info_etape(_T('menu_aide_installation_choix_base') . aider('install2', true));
74
+		echo info_etape(_T('menu_aide_installation_choix_base').aider('install2', true));
75 75
 
76 76
 		echo "\n", '<!-- ', sql_version($server_db), ' -->';
77 77
 		list($checked, $res) = install_etape_2_bases($login_db, $server_db);
78 78
 
79 79
 		$hidden = (defined('_SPIP_CHMOD')
80 80
 				? ''
81
-				: ("\n<input type='hidden' name='chmod' value='" . spip_htmlspecialchars($chmod) . "' />"))
82
-			. predef_ou_cache($adresse_db . ($port ? ':' . $port : ''), $login_db, $pass_db, $server_db);
81
+				: ("\n<input type='hidden' name='chmod' value='".spip_htmlspecialchars($chmod)."' />"))
82
+			. predef_ou_cache($adresse_db.($port ? ':'.$port : ''), $login_db, $pass_db, $server_db);
83 83
 
84 84
 		echo install_etape_2_form($hidden, $checked, $res, 3);
85 85
 	} else {
@@ -87,8 +87,8 @@  discard block
 block discarded – undo
87 87
 
88 88
 		echo "<div class='error'>";
89 89
 		echo info_etape(_T('info_connexion_base'));
90
-		echo '<h3>' . _T('avis_connexion_echec_1') . '</h3>';
91
-		echo '<p>' . _T('avis_connexion_echec_2') . '</p>';
90
+		echo '<h3>'._T('avis_connexion_echec_1').'</h3>';
91
+		echo '<p>'._T('avis_connexion_echec_2').'</p>';
92 92
 
93 93
 		echo "<p style='font-size: small;'>",
94 94
 		_T('avis_connexion_echec_3'),
@@ -121,8 +121,8 @@  discard block
 block discarded – undo
121 121
 			. ' '
122 122
 		];
123 123
 	}
124
-	$res = '<b>' . _T('avis_lecture_noms_bases_1') . '</b>
125
-		' . _T('avis_lecture_noms_bases_2') . '<p>';
124
+	$res = '<b>'._T('avis_lecture_noms_bases_1').'</b>
125
+		' . _T('avis_lecture_noms_bases_2').'<p>';
126 126
 
127 127
 	$checked = false;
128 128
 	if ($login_db) {
@@ -139,10 +139,10 @@  discard block
 block discarded – undo
139 139
 		if ($ok) {
140 140
 			$res .= _T('avis_lecture_noms_bases_3')
141 141
 				. '<ul>'
142
-				. '<li><input name="choix_db" value="' . $test_base . "\" type='radio' id='stand' checked='checked' />"
143
-				. "<label for='stand'>" . $test_base . "</label></li>\n"
142
+				. '<li><input name="choix_db" value="'.$test_base."\" type='radio' id='stand' checked='checked' />"
143
+				. "<label for='stand'>".$test_base."</label></li>\n"
144 144
 				. '</ul>'
145
-				. '<p>' . _T('info_ou') . ' ';
145
+				. '<p>'._T('info_ou').' ';
146 146
 			$checked = true;
147 147
 		}
148 148
 	}
@@ -156,20 +156,20 @@  discard block
 block discarded – undo
156 156
 		"\n<input type='hidden' name='etape' value='$etape' />"
157 157
 		. $hidden
158 158
 		. (defined('_INSTALL_NAME_DB')
159
-			? '<h3>' . _T('install_nom_base_hebergeur') . ' <tt>' . _INSTALL_NAME_DB . '</tt>' . '</h3>'
160
-			: "\n<fieldset><legend>" . _T('texte_choix_base_1') . "</legend>\n"
159
+			? '<h3>'._T('install_nom_base_hebergeur').' <tt>'._INSTALL_NAME_DB.'</tt>'.'</h3>'
160
+			: "\n<fieldset><legend>"._T('texte_choix_base_1')."</legend>\n"
161 161
 			. $res
162 162
 			. "\n<input name=\"choix_db\" value=\"new_spip\" type='radio' id='nou'"
163 163
 			. ($checked ? '' : " checked='checked'")
164
-			. " />\n<label for='nou'>" . _T('info_creer_base') . "</label></p>\n<p>"
164
+			. " />\n<label for='nou'>"._T('info_creer_base')."</label></p>\n<p>"
165 165
 			. "\n<input type='text' name='table_new' class='text' value=\"spip\" size='20' /></p></fieldset>\n"
166 166
 		)
167 167
 
168 168
 		. ((defined('_INSTALL_TABLE_PREFIX')
169 169
 			or $GLOBALS['table_prefix'] != 'spip')
170
-			? '<h3>' . _T('install_table_prefix_hebergeur') . '  <tt>' . $GLOBALS['table_prefix'] . '</tt>' . '</h3>'
171
-			: '<fieldset><legend>' . _T('texte_choix_table_prefix') . "</legend>\n"
172
-			. "<p><label for='table_prefix'>" . _T('info_table_prefix') . '</label></p><p>'
170
+			? '<h3>'._T('install_table_prefix_hebergeur').'  <tt>'.$GLOBALS['table_prefix'].'</tt>'.'</h3>'
171
+			: '<fieldset><legend>'._T('texte_choix_table_prefix')."</legend>\n"
172
+			. "<p><label for='table_prefix'>"._T('info_table_prefix').'</label></p><p>'
173 173
 			. "\n<input type='text' id='tprefix' name='tprefix' class='text' value='"
174 174
 			. 'spip' # valeur par defaut
175 175
 			. "' size='20' /></p></fieldset>"
Please login to merge, or discard this patch.
ecrire/install/etape_4.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 
22 22
 	// creer le repertoire cache, qui sert partout !
23 23
 	if (!@file_exists(_DIR_CACHE)) {
24
-		$rep = preg_replace(',' . _DIR_TMP . ',', '', _DIR_CACHE);
24
+		$rep = preg_replace(','._DIR_TMP.',', '', _DIR_CACHE);
25 25
 		$rep = sous_repertoire(_DIR_TMP, $rep, true, true);
26 26
 	}
27 27
 
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 	echo '<p>'
40 40
 		. _T(
41 41
 			'plugin_info_plugins_dist_1',
42
-			['plugins_dist' => '<tt>' . joli_repertoire(_DIR_PLUGINS_DIST) . '</tt>']
42
+			['plugins_dist' => '<tt>'.joli_repertoire(_DIR_PLUGINS_DIST).'</tt>']
43 43
 		)
44 44
 		. '</p>';
45 45
 
Please login to merge, or discard this patch.
ecrire/install/etape_ldap5.php 1 patch
Spacing   +6 added lines, -7 removed lines patch added patch discarded remove patch
@@ -52,29 +52,28 @@  discard block
 block discarded – undo
52 52
 	$conn = "\$GLOBALS['ldap_base'] = '$base_ldap';\n"
53 53
 		. "\$GLOBALS['ldap_link'] = @ldap_connect('$adresse_ldap','$port_ldap');\n"
54 54
 		. "@ldap_set_option(\$GLOBALS['ldap_link'],LDAP_OPT_PROTOCOL_VERSION,'$protocole_ldap');\n"
55
-		. (($tls_ldap != 'oui') ? '' :
56
-			"@ldap_start_tls(\$GLOBALS['ldap_link']);\n")
55
+		. (($tls_ldap != 'oui') ? '' : "@ldap_start_tls(\$GLOBALS['ldap_link']);\n")
57 56
 		. "@ldap_bind(\$GLOBALS['ldap_link'],'$login_ldap','$pass_ldap');\n";
58 57
 
59 58
 	$champs = is_array($GLOBALS['ldap_attributes']) ? $GLOBALS['ldap_attributes'] : [];
60 59
 	$res = '';
61 60
 	foreach ($champs as $champ => $v) {
62
-		$nom = 'ldap_' . $champ;
61
+		$nom = 'ldap_'.$champ;
63 62
 		$val = trim(_request($nom));
64 63
 		if (preg_match('/^\w*$/', $val)) {
65 64
 			if ($val) {
66 65
 				$val = _q($val);
67 66
 			}
68 67
 		} else {
69
-			$val = 'array(' . _q(preg_split('/\W+/', $val)) . ')';
68
+			$val = 'array('._q(preg_split('/\W+/', $val)).')';
70 69
 		};
71 70
 		if ($val) {
72
-			$res .= "'$champ' => " . $val . ',';
71
+			$res .= "'$champ' => ".$val.',';
73 72
 		}
74 73
 	}
75 74
 	$conn .= "\$GLOBALS['ldap_champs'] = array($res);\n";
76 75
 
77
-	install_fichier_connexion(_DIR_CONNECT . _FILE_LDAP, $conn);
76
+	install_fichier_connexion(_DIR_CONNECT._FILE_LDAP, $conn);
78 77
 }
79 78
 
80 79
 function etape_ldap5_suite() {
@@ -87,7 +86,7 @@  discard block
 block discarded – undo
87 86
 	);
88 87
 
89 88
 	echo generer_form_ecrire('install', (
90
-		"<input type='hidden' name='etape' value='3' />" .
89
+		"<input type='hidden' name='etape' value='3' />".
91 90
 		"<input type='hidden' name='ldap_present' value='true' />"
92 91
 		. bouton_suivant()));
93 92
 
Please login to merge, or discard this patch.
ecrire/genie/mail.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -51,7 +51,7 @@
 block discarded – undo
51 51
 		$headers = '';
52 52
 		if (isset($page['entetes']) and count($page['entetes'])) {
53 53
 			foreach ($page['entetes'] as $k => $v) {
54
-				$headers .= (strlen($v) ? "$k: $v" : $k) . "\n";
54
+				$headers .= (strlen($v) ? "$k: $v" : $k)."\n";
55 55
 			}
56 56
 		}
57 57
 
Please login to merge, or discard this patch.
ecrire/genie/mise_a_jour.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -29,11 +29,11 @@  discard block
 block discarded – undo
29 29
 function genie_mise_a_jour_dist($t) {
30 30
 	include_spip('inc/meta');
31 31
 	$maj = info_maj('spip', 'SPIP', $GLOBALS['spip_version_branche']);
32
-	ecrire_meta('info_maj_spip', $maj ? ($GLOBALS['spip_version_branche'] . "|$maj") : '', 'non');
32
+	ecrire_meta('info_maj_spip', $maj ? ($GLOBALS['spip_version_branche']."|$maj") : '', 'non');
33 33
 
34 34
 	mise_a_jour_ecran_securite();
35 35
 
36
-	spip_log('Verification version SPIP : ' . ($maj ? $maj : 'version a jour'), 'verifie_maj');
36
+	spip_log('Verification version SPIP : '.($maj ? $maj : 'version a jour'), 'verifie_maj');
37 37
 
38 38
 	return 1;
39 39
 }
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 	// si l'ecran n'est pas deja present ou pas updatable, sortir
59 59
 	if (
60 60
 		!_URL_ECRAN_SECURITE
61
-		or !file_exists($filename = _DIR_ETC . 'ecran_securite.php')
61
+		or !file_exists($filename = _DIR_ETC.'ecran_securite.php')
62 62
 		or !is_writable($filename)
63 63
 		or !$last_modified = filemtime($filename)
64 64
 		or !$md5 = md5_file($filename)
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 	}
68 68
 
69 69
 	include_spip('inc/distant');
70
-	$tmp_file = _DIR_TMP . 'ecran_securite.php';
70
+	$tmp_file = _DIR_TMP.'ecran_securite.php';
71 71
 	$url = parametre_url(_URL_ECRAN_SECURITE, 'md5', $md5);
72 72
 	$url = parametre_url($url, 'vspip', $GLOBALS['spip_version_branche']);
73 73
 	$res = recuperer_url($url, [
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 			include_once $tmp_file;
87 87
 			// ok, on le copie a la place de l'ecran existant
88 88
 			// en backupant l'ecran avant, au cas ou
89
-			@copy($filename, $filename . '-bck-' . date('Y-m-d-His', $last_modified));
89
+			@copy($filename, $filename.'-bck-'.date('Y-m-d-His', $last_modified));
90 90
 			@rename($tmp_file, $filename);
91 91
 		} else {
92 92
 			@unlink($tmp_file);
@@ -113,14 +113,14 @@  discard block
 block discarded – undo
113 113
 
114 114
 	list($maj, $min, $rev) = preg_split('/\D+/', $version);
115 115
 
116
-	$nom = _DIR_CACHE_XML . _VERSIONS_LISTE;
116
+	$nom = _DIR_CACHE_XML._VERSIONS_LISTE;
117 117
 	$page = !file_exists($nom) ? '' : file_get_contents($nom);
118 118
 	$page = info_maj_cache($nom, $dir, $page);
119 119
 
120 120
 	// reperer toutes les versions de numero majeur superieur ou egal
121 121
 	// (a revoir quand on arrivera a SPIP V10 ...)
122 122
 	$p = substr('0123456789', intval($maj));
123
-	$p = ',/' . $file . '\D+([' . $p . ']+)\D+(\d+)(\D+(\d+))?.*?[.]zip",i';
123
+	$p = ',/'.$file.'\D+(['.$p.']+)\D+(\d+)(\D+(\d+))?.*?[.]zip",i';
124 124
 	preg_match_all($p, $page, $m, PREG_SET_ORDER);
125 125
 	$page = $page_majeure = '';
126 126
 
@@ -129,9 +129,9 @@  discard block
 block discarded – undo
129 129
 
130 130
 	foreach ($m as $v) {
131 131
 		$v = array_pad($v, 5, 0);
132
-		list(, $maj2, $min2, , $rev2) = $v;
133
-		$branche_maj = $maj2 . '.' . $min2;
134
-		$version_maj = $maj2 . '.' . $min2 . '.' . $rev2;
132
+		list(, $maj2, $min2,, $rev2) = $v;
133
+		$branche_maj = $maj2.'.'.$min2;
134
+		$version_maj = $maj2.'.'.$min2.'.'.$rev2;
135 135
 		// d'abord les mises à jour de la même branche
136 136
 		if (
137 137
 			(spip_version_compare($version, $version_maj, '<'))
@@ -153,10 +153,10 @@  discard block
 block discarded – undo
153 153
 		return '';
154 154
 	}
155 155
 
156
-	$message = $page ? _T('nouvelle_version_spip', ['version' => $page]) . ($page_majeure ? ' | ' : '') : '';
156
+	$message = $page ? _T('nouvelle_version_spip', ['version' => $page]).($page_majeure ? ' | ' : '') : '';
157 157
 	$message .= $page_majeure ? _T('nouvelle_version_spip_majeure', ['version' => $page_majeure]) : '';
158 158
 
159
-	return "<a class='info_maj_spip' href='https://www.spip.net/fr_update' title='$page'>" . $message . '</a>';
159
+	return "<a class='info_maj_spip' href='https://www.spip.net/fr_update' title='$page'>".$message.'</a>';
160 160
 }
161 161
 
162 162
 /**
@@ -179,12 +179,12 @@  discard block
 block discarded – undo
179 179
 function info_maj_cache($nom, $dir, $page = '') {
180 180
 	include_spip('inc/acces');
181 181
 	$alea_ephemere = charger_aleas();
182
-	$re = '<archives id="a' . $alea_ephemere . '">';
182
+	$re = '<archives id="a'.$alea_ephemere.'">';
183 183
 	if (preg_match("/$re/", $page)) {
184 184
 		return $page;
185 185
 	}
186 186
 
187
-	$url = _VERSIONS_SERVEUR . $dir . '/' . _VERSIONS_LISTE;
187
+	$url = _VERSIONS_SERVEUR.$dir.'/'._VERSIONS_LISTE;
188 188
 	$a = file_exists($nom) ? filemtime($nom) : '';
189 189
 	include_spip('inc/distant');
190 190
 	$res = recuperer_url_cache($url, ['if_modified_since' => $a]);
Please login to merge, or discard this patch.
ecrire/genie/maintenance.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -107,8 +107,8 @@
 block discarded – undo
107 107
 function message_crash_tables() {
108 108
 	if ($crash = verifier_crash_tables()) {
109 109
 		return
110
-			'<strong>' . _T('texte_recuperer_base') . '</strong><br />'
111
-			. ' <tt>' . join(', ', $crash) . '</tt><br />'
110
+			'<strong>'._T('texte_recuperer_base').'</strong><br />'
111
+			. ' <tt>'.join(', ', $crash).'</tt><br />'
112 112
 			. generer_form_ecrire(
113 113
 				'base_repair',
114 114
 				_T('texte_crash_base'),
Please login to merge, or discard this patch.