Completed
Push — master ( 50b3ed...23131e )
by cam
01:07
created
ecrire/plugins/afficher_plugin.php 1 patch
Spacing   +34 added lines, -35 removed lines patch added patch discarded remove patch
@@ -64,9 +64,9 @@  discard block
 block discarded – undo
64 64
 			" class='picto_err'",
65 65
 			_T('plugin_info_erreur_xml')
66 66
 		)
67
-			. "<div class='erreur'>" . join('<br >', $info['erreur']) . '</div>';
67
+			. "<div class='erreur'>".join('<br >', $info['erreur']).'</div>';
68 68
 		$checkable = false;
69
-	} elseif (isset($GLOBALS['erreurs_activation_raw'][$dir_plugins . $plug_file])) {
69
+	} elseif (isset($GLOBALS['erreurs_activation_raw'][$dir_plugins.$plug_file])) {
70 70
 		$class_li .= ' error';
71 71
 		$erreur = http_img_pack(
72 72
 			'plugin-err-32.png',
@@ -74,10 +74,10 @@  discard block
 block discarded – undo
74 74
 			" class='picto_err'",
75 75
 			_T('plugin_impossible_activer', ['plugin' => $nom])
76 76
 		)
77
-			. "<div class='erreur'>" . implode(
77
+			. "<div class='erreur'>".implode(
78 78
 				'<br />',
79
-				$GLOBALS['erreurs_activation_raw'][$dir_plugins . $plug_file]
80
-			) . '</div>';
79
+				$GLOBALS['erreurs_activation_raw'][$dir_plugins.$plug_file]
80
+			).'</div>';
81 81
 	} else {
82 82
 		$cfg = $actif ? plugin_bouton_config($plug_file, $info, $dir_plugins) : '';
83 83
 		if (defined('_DEV_VERSION_SPIP_COMPAT') and !plugin_version_compatible($info['compatibilite'], $GLOBALS['spip_version_branche'])) {
@@ -94,11 +94,11 @@  discard block
 block discarded – undo
94 94
 	// numerotons les occurrences d'un meme prefix
95 95
 	$versions[$prefix] = $id = isset($versions[$prefix]) ? intval($versions[$prefix]) + 1 : '';
96 96
 
97
-	$class_li .= ($actif ? ' actif' : '') . ($expose ? ' on' : '');
97
+	$class_li .= ($actif ? ' actif' : '').($expose ? ' on' : '');
98 98
 
99 99
 	return "<li id='$prefix$id' class='$class_li'>"
100 100
 	. ((!$checkable and !$checked)
101
-		? '' : plugin_checkbox(++$id_input, $dir_plugins . $plug_file, $checked))
101
+		? '' : plugin_checkbox(++$id_input, $dir_plugins.$plug_file, $checked))
102 102
 	. plugin_resume($info, $dir_plugins, $plug_file, $url_page)
103 103
 	. $cfg
104 104
 	. $erreur
@@ -117,9 +117,9 @@  discard block
 block discarded – undo
117 117
 	// si paquet.xml fournit un squelette, le prendre
118 118
 	if (isset($infos['config']) and $infos['config']) {
119 119
 		return recuperer_fond(
120
-			"$dir$nom/" . $infos['config'],
120
+			"$dir$nom/".$infos['config'],
121 121
 			[
122
-				'script' => 'configurer_' . $prefix,
122
+				'script' => 'configurer_'.$prefix,
123 123
 				'nom' => $nom
124 124
 			]
125 125
 		);
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
 	return recuperer_fond(
139 139
 		'prive/squelettes/inclure/cfg',
140 140
 		[
141
-			'script' => 'configurer_' . $prefix,
141
+			'script' => 'configurer_'.$prefix,
142 142
 			'nom' => $nom
143 143
 		]
144 144
 	);
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
 	. "<input type='checkbox' name='s$name' id='label_$id_input'"
155 155
 	. ($actif ? " checked='checked'" : '')
156 156
 	. " class='checkbox'  value='O' />"
157
-	. "\n<label for='label_$id_input'>" . _T('activer_plugin') . '</label>'
157
+	. "\n<label for='label_$id_input'>"._T('activer_plugin').'</label>'
158 158
 	. '</div>';
159 159
 }
160 160
 
@@ -209,11 +209,11 @@  discard block
 block discarded – undo
209 209
 	. "<h3><a href='$url' rel='info'>"
210 210
 	. $nom
211 211
 	. '</a></h3>'
212
-	. " <span class='version'>" . $info['version'] . '</span>'
212
+	. " <span class='version'>".$info['version'].'</span>'
213 213
 	. " <span class='etat'> - "
214 214
 	. plugin_etat_en_clair($info['etat'])
215 215
 	. '</span>'
216
-	. "<div class='short'>" . $slogan . '</div>'
216
+	. "<div class='short'>".$slogan.'</div>'
217 217
 	. $i
218 218
 	. '</div>';
219 219
 }
@@ -228,7 +228,7 @@  discard block
 block discarded – undo
228 228
 	$text2 = _T('info_desinstaller_plugin');
229 229
 	$file = basename($plug_file);
230 230
 
231
-	return "<div class='actions'>[" .
231
+	return "<div class='actions'>[".
232 232
 	"<a href='$action'
233 233
 		onclick='return confirm(\"$text $nom ?\\n$text2\")'>"
234 234
 	. $text
@@ -250,7 +250,7 @@  discard block
 block discarded – undo
250 250
 		$etat = 'developpement';
251 251
 	}
252 252
 
253
-	return _T('plugin_etat_' . $etat);
253
+	return _T('plugin_etat_'.$etat);
254 254
 }
255 255
 
256 256
 // https://code.spip.net/@plugin_propre
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
 		$module = substr($module, strlen(_DIR_RACINE));
261 261
 	}
262 262
 	if (preg_match('|^\w+_[\w_]+$|', $texte)) {
263
-		$texte = _T(($module ? "$module:" : '') . $texte, [], ['force' => false]);
263
+		$texte = _T(($module ? "$module:" : '').$texte, [], ['force' => false]);
264 264
 	}
265 265
 
266 266
 	return $propre($texte);
@@ -293,9 +293,9 @@  discard block
 block discarded – undo
293 293
 		isset($info['documentation'])
294 294
 		and $lien = $info['documentation']
295 295
 	) {
296
-		$description .= "<p><em class='site'><a href='$lien' class='spip_out'>" . _T('en_savoir_plus') . '</a></em></p>';
296
+		$description .= "<p><em class='site'><a href='$lien' class='spip_out'>"._T('en_savoir_plus').'</a></em></p>';
297 297
 	}
298
-	$s .= "<dd class='desc'>" . $description . "</dd>\n";
298
+	$s .= "<dd class='desc'>".$description."</dd>\n";
299 299
 
300 300
 	if (isset($info['auteur'])) {
301 301
 		if (is_array($info['auteur'])) {
@@ -305,19 +305,19 @@  discard block
 block discarded – undo
305 305
 			$a = trim($info['auteur']);
306 306
 		}
307 307
 		if ($a) {
308
-			$s .= "<dt class='auteurs'>" . _T('public:par_auteur') . "</dt><dd class='auteurs'>" . PtoBR(propre(
308
+			$s .= "<dt class='auteurs'>"._T('public:par_auteur')."</dt><dd class='auteurs'>".PtoBR(propre(
309 309
 				$a,
310 310
 				$dir
311
-			)) . "</dd>\n";
311
+			))."</dd>\n";
312 312
 		}
313 313
 	}
314 314
 
315 315
 	if (isset($info['credit'])) {
316 316
 		if ($a = formater_credits($info['credit'], ', ')) {
317
-			$s .= "<dt class='credits'>" . _T('plugin_info_credit') . "</dt><dd class='credits'>" . PtoBR(propre(
317
+			$s .= "<dt class='credits'>"._T('plugin_info_credit')."</dt><dd class='credits'>".PtoBR(propre(
318 318
 				$a,
319 319
 				$dir
320
-			)) . "</dd>\n";
320
+			))."</dd>\n";
321 321
 		}
322 322
 	}
323 323
 
@@ -329,10 +329,10 @@  discard block
 block discarded – undo
329 329
 			$a = trim($info['licence']);
330 330
 		}
331 331
 		if ($a) {
332
-			$s .= "<dt class='licence'>" . _T('intitule_licence') . "</dt><dd class='licence'>" . PtoBR(propre(
332
+			$s .= "<dt class='licence'>"._T('intitule_licence')."</dt><dd class='licence'>".PtoBR(propre(
333 333
 				$a,
334 334
 				$dir
335
-			)) . "</dd>\n";
335
+			))."</dd>\n";
336 336
 		}
337 337
 	}
338 338
 
@@ -343,25 +343,24 @@  discard block
 block discarded – undo
343 343
 	//
344 344
 	$infotech = [];
345 345
 
346
-	$version = '<dt>' . _T('version') . '</dt><dd>' . $info['version'];
346
+	$version = '<dt>'._T('version').'</dt><dd>'.$info['version'];
347 347
 	// Version VCS
348
-	if ($vcs = version_vcs_courante($dir_plugins . $plug_file)) {
349
-		$version .= ' ' . $vcs;
348
+	if ($vcs = version_vcs_courante($dir_plugins.$plug_file)) {
349
+		$version .= ' '.$vcs;
350 350
 	}
351 351
 	$version .= '</dd>';
352 352
 	$infotech[] = $version;
353
-	$infotech[] = '<dt>' . _T('repertoire_plugins') . '</dt><dd>' . joli_repertoire("$dir_plugins$plug_file") . '</dd>';
353
+	$infotech[] = '<dt>'._T('repertoire_plugins').'</dt><dd>'.joli_repertoire("$dir_plugins$plug_file").'</dd>';
354 354
 	// source zip le cas echeant
355
-	$infotech[] = (lire_fichier($dir_plugins . $plug_file . '/install.log', $log)
355
+	$infotech[] = (lire_fichier($dir_plugins.$plug_file.'/install.log', $log)
356 356
 		and preg_match(',^source:(.*)$,m', $log, $r))
357
-		? '<dt>' . _T('plugin_source') . '</dt><dd>' . trim($r[1]) . '</dd>'
357
+		? '<dt>'._T('plugin_source').'</dt><dd>'.trim($r[1]).'</dd>'
358 358
 		: '';
359 359
 
360
-	$infotech[] = !$info['necessite'] ? '' :
361
-		('<dt>' . _T('plugin_info_necessite') . '</dt><dd>' . join(
360
+	$infotech[] = !$info['necessite'] ? '' : ('<dt>'._T('plugin_info_necessite').'</dt><dd>'.join(
362 361
 			' ',
363 362
 			array_map('array_shift', $info['necessite'])
364
-		) . '</dd>');
363
+		).'</dd>');
365 364
 
366 365
 	$s .= "<dl class='tech'>"
367 366
 		. join('', $infotech)
@@ -382,8 +381,8 @@  discard block
 block discarded – undo
382 381
 		$texte .=
383 382
 			(!is_array($_credit))
384 383
 				? PtoBR(propre($_credit))
385
-				: ($_credit['url'] ? '<a href="' . $_credit['url'] . '">' : '') .
386
-				$_credit['nom'] .
384
+				: ($_credit['url'] ? '<a href="'.$_credit['url'].'">' : '').
385
+				$_credit['nom'].
387 386
 				($_credit['url'] ? '</a>' : '');
388 387
 	}
389 388
 
Please login to merge, or discard this patch.
ecrire/plugins/afficher_repertoires.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -60,10 +60,10 @@  discard block
 block discarded – undo
60 60
 				$id = substr(md5($plug), 0, 16);
61 61
 				$res .= $ligne_plug(
62 62
 					$url_page,
63
-					str_replace(_DIR_PLUGINS, '', _DIR_RACINE . $plug),
63
+					str_replace(_DIR_PLUGINS, '', _DIR_RACINE.$plug),
64 64
 					$actif,
65 65
 					'menu-entree'
66
-				) . "\n";
66
+				)."\n";
67 67
 				unset($liste_plugins[$key]);
68 68
 			}
69 69
 		}
@@ -105,12 +105,12 @@  discard block
 block discarded – undo
105 105
 	}
106 106
 	$chemin = '';
107 107
 	if (count($tcom)) {
108
-		$chemin .= implode('/', $tcom) . '/';
108
+		$chemin .= implode('/', $tcom).'/';
109 109
 	}
110 110
 	// ouvrir les repertoires jusqu'a la cible
111 111
 	while ($open = array_shift($ttarg)) {
112
-		$visible = @isset($deplie[$chemin . $open]);
113
-		$chemin .= $open . '/';
112
+		$visible = @isset($deplie[$chemin.$open]);
113
+		$chemin .= $open.'/';
114 114
 		$output .= '<li>';
115 115
 		$output .= bouton_block_depliable($chemin, $visible);
116 116
 		$output .= debut_block_depliable($visible);
Please login to merge, or discard this patch.
ecrire/plugins/afficher_liste.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
65 65
 	asort($liste_plugins);
66 66
 	$exposed = urldecode(_request('plugin'));
67 67
 
68
-	$block_par_lettre = false;//count($liste_plugins)>10;
68
+	$block_par_lettre = false; //count($liste_plugins)>10;
69 69
 	$fast_liste_plugins_actifs = [];
70 70
 	$fast_liste_plugins_checked = [];
71 71
 	if (is_array($liste_plugins_actifs)) {
@@ -90,11 +90,11 @@  discard block
 block discarded – undo
90 90
 		$actif = isset($fast_liste_plugins_actifs[$plug]);
91 91
 		$checked = isset($fast_liste_plugins_checked[$plug]);
92 92
 		$block_actif = $block_actif | $actif;
93
-		$expose = ($exposed and ($exposed == $plug or $exposed == $dir_plugins . $plug or $exposed == substr(
93
+		$expose = ($exposed and ($exposed == $plug or $exposed == $dir_plugins.$plug or $exposed == substr(
94 94
 			$dir_plugins,
95 95
 			strlen(_DIR_RACINE)
96
-		) . $plug));
97
-		$block .= $ligne_plug($url_page, $plug, $checked, $actif, $expose, 'item', $dir_plugins) . "\n";
96
+		).$plug));
97
+		$block .= $ligne_plug($url_page, $plug, $checked, $actif, $expose, 'item', $dir_plugins)."\n";
98 98
 	}
99 99
 	$res .= $block_par_lettre ? affiche_block_initiale($initiale, $block, $block_actif) : $block;
100 100
 	$class = basename($dir_plugins);
Please login to merge, or discard this patch.
ecrire/plugins/infos_paquet.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
  * @return array
26 26
  */
27 27
 function plugins_infos_paquet($desc, $plug = '', $dir_plugins = _DIR_PLUGINS) {
28
-	static $process = [ // tableau constant
28
+	static $process = [// tableau constant
29 29
 		'debut' => 'paquet_debutElement',
30 30
 		'fin' => 'paquet_finElement',
31 31
 		'text' => 'paquet_textElement'
@@ -47,8 +47,8 @@  discard block
 block discarded – undo
47 47
 			unset($tree['']);
48 48
 		}
49 49
 
50
-		$tree['slogan'] = $tree['prefix'] . '_slogan';
51
-		$tree['description'] = $tree['prefix'] . '_description';
50
+		$tree['slogan'] = $tree['prefix'].'_slogan';
51
+		$tree['description'] = $tree['prefix'].'_description';
52 52
 		paquet_readable_files($tree, "$dir_plugins$plug/");
53 53
 		if (!$tree['chemin']) {
54 54
 			$tree['chemin'] = [];
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
 	// Prendre les messages d'erreur sans les numeros de lignes
81 81
 	$msg = array_column($vxml->err, 0);
82 82
 	$t = _T('plugins_erreur', ['plugins' => $plug]);
83
-	array_unshift($msg, $t . " <ul class='erreur_xml'><li>" . reset($msg) . '</li></ul>');
83
+	array_unshift($msg, $t." <ul class='erreur_xml'><li>".reset($msg).'</li></ul>');
84 84
 
85 85
 	return ['erreur' => $msg];
86 86
 }
@@ -96,9 +96,9 @@  discard block
 block discarded – undo
96 96
 function paquet_readable_files(&$tree, $dir) {
97 97
 	$prefix = strtolower($tree['prefix']);
98 98
 
99
-	$tree['options'] = (is_readable($dir . $f = ($prefix . '_options.php'))) ? [$f] : [];
100
-	$tree['fonctions'] = (is_readable($dir . $f = ($prefix . '_fonctions.php'))) ? [$f] : [];
101
-	$tree['install'] = (is_readable($dir . $f = ($prefix . '_administrations.php'))) ? [$f] : [];
99
+	$tree['options'] = (is_readable($dir.$f = ($prefix.'_options.php'))) ? [$f] : [];
100
+	$tree['fonctions'] = (is_readable($dir.$f = ($prefix.'_fonctions.php'))) ? [$f] : [];
101
+	$tree['install'] = (is_readable($dir.$f = ($prefix.'_administrations.php'))) ? [$f] : [];
102 102
 }
103 103
 
104 104
 /**
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
 	$texte = trim($phraseur->versions[$n]['']);
187 187
 	$phraseur->versions[$n][''] = '';
188 188
 
189
-	$f = 'info_paquet_' . $name;
189
+	$f = 'info_paquet_'.$name;
190 190
 	if (function_exists($f)) {
191 191
 		$f($phraseur, $attrs, $texte);
192 192
 	} elseif (!$attrs) {
Please login to merge, or discard this patch.
ecrire/plugins/afficher_nom_plugin.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 
39 39
 	// numerotons les occurences d'un meme prefix
40 40
 	$versions[$info['prefix']] = isset($versions[$info['prefix']]) ? $versions[$info['prefix']] + 1 : '';
41
-	$id = $info['prefix'] . $versions[$info['prefix']];
41
+	$id = $info['prefix'].$versions[$info['prefix']];
42 42
 
43 43
 	$class = $class_li;
44 44
 	$class .= $actif ? ' actif' : '';
@@ -55,15 +55,15 @@  discard block
 block discarded – undo
55 55
 	$prefix = $info['prefix'];
56 56
 	$dir = "$dir_plugins$plug_file/lang/$prefix";
57 57
 	$desc = plugin_propre($info['description'], $dir);
58
-	$url_stat = parametre_url($url_page, 'plugin', $dir_plugins . $plug_file);
58
+	$url_stat = parametre_url($url_page, 'plugin', $dir_plugins.$plug_file);
59 59
 
60
-	$s .= "<strong class='nom'>" . typo($info['nom']) . '</strong>';
61
-	$s .= " <span class='version'>" . $info['version'] . '</span>';
62
-	$s .= " <span class='etat'> - " . plugin_etat_en_clair($info['etat']) . '</span>';
60
+	$s .= "<strong class='nom'>".typo($info['nom']).'</strong>';
61
+	$s .= " <span class='version'>".$info['version'].'</span>';
62
+	$s .= " <span class='etat'> - ".plugin_etat_en_clair($info['etat']).'</span>';
63 63
 	$s .= '</div>';
64 64
 
65 65
 	if ($erreur) {
66
-		$s .= "<div class='erreur'>" . join('<br >', $info['erreur']) . '</div>';
66
+		$s .= "<div class='erreur'>".join('<br >', $info['erreur']).'</div>';
67 67
 	}
68 68
 
69 69
 	$s .= '</li>';
Please login to merge, or discard this patch.
ecrire/plugins/get_infos.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 	static $filecache = '';
38 38
 
39 39
 	if ($cache === '') {
40
-		$filecache = _DIR_TMP . 'plugin_xml_cache.gz';
40
+		$filecache = _DIR_TMP.'plugin_xml_cache.gz';
41 41
 		if (is_file($filecache)) {
42 42
 			lire_fichier($filecache, $contenu);
43 43
 			$cache = unserialize($contenu);
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 	if (isset($ret['prefix']) and $ret['prefix'] == 'spip') {
129 129
 		$ret['procure']['php'] = ['nom' => 'php', 'version' => phpversion()];
130 130
 		foreach (get_loaded_extensions() as $ext) {
131
-			$ret['procure']['php:' . $ext] = ['nom' => 'php:' . $ext, 'version' => phpversion($ext)];
131
+			$ret['procure']['php:'.$ext] = ['nom' => 'php:'.$ext, 'version' => phpversion($ext)];
132 132
 		}
133 133
 	}
134 134
 	$diff = ($ret != $pcache);
Please login to merge, or discard this patch.
ecrire/base/abstract_sql.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -53,10 +53,10 @@  discard block
 block discarded – undo
53 53
 
54 54
 	if ($compil_info) {
55 55
 		$contexte_compil = [
56
-			$trace[0]['file'],// sourcefile
56
+			$trace[0]['file'], // sourcefile
57 57
 			'', //nom
58
-			(isset($trace[1]) ? $trace[1]['function'] . "(){\n" : '')
59
-			. $trace[0]['function'] . '();'
58
+			(isset($trace[1]) ? $trace[1]['function']."(){\n" : '')
59
+			. $trace[0]['function'].'();'
60 60
 			. (isset($trace[1]) ? "\n}" : ''), //id_boucle
61 61
 			$trace[0]['line'], // ligne
62 62
 			$GLOBALS['spip_lang'], // lang
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 		return $contexte_compil;
66 66
 	}
67 67
 
68
-	$message = count($trace) ? $trace[0]['file'] . ' L' . $trace[0]['line'] : '';
68
+	$message = count($trace) ? $trace[0]['file'].' L'.$trace[0]['line'] : '';
69 69
 	$f = [];
70 70
 	while (count($trace) and $t = array_shift($trace)) {
71 71
 		if (in_array($t['function'], ['include_once', 'include_spip', 'find_in_path'])) {
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 		$f[] = $t['function'];
75 75
 	}
76 76
 	if (count($f)) {
77
-		$message .= ' [' . implode('(),', $f) . '()]';
77
+		$message .= ' ['.implode('(),', $f).'()]';
78 78
 	}
79 79
 
80 80
 	return $message;
@@ -266,8 +266,8 @@  discard block
 block discarded – undo
266 266
 		}
267 267
 		// le debug, c'est pour ce qui a ete produit par le compilateur
268 268
 		if (isset($GLOBALS['debug']['aucasou'])) {
269
-			list($table, $id, ) = $GLOBALS['debug']['aucasou'];
270
-			$nom = $GLOBALS['debug_objets']['courant'] . $id;
269
+			list($table, $id,) = $GLOBALS['debug']['aucasou'];
270
+			$nom = $GLOBALS['debug_objets']['courant'].$id;
271 271
 			$GLOBALS['debug_objets']['requete'][$nom] = $query;
272 272
 		}
273 273
 		$res = $f($select, $from, $where, $groupby, $orderby, $limit, $having, $serveur, true);
@@ -1144,7 +1144,7 @@  discard block
 block discarded – undo
1144 1144
 	// la globale n'est remplie qu'apres l'appel de sql_serveur.
1145 1145
 	if ($spip == null) {
1146 1146
 		$connexion = $GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0];
1147
-		$spip = $connexion['prefixe'] . '\_%';
1147
+		$spip = $connexion['prefixe'].'\_%';
1148 1148
 	}
1149 1149
 
1150 1150
 	return $f($spip, $serveur, $option !== false);
@@ -2034,7 +2034,7 @@  discard block
 block discarded – undo
2034 2034
 	}
2035 2035
 
2036 2036
 	// sql_quote produit une chaine dans tous les cas
2037
-	$valeurs = array_filter($valeurs, function ($v) {
2037
+	$valeurs = array_filter($valeurs, function($v) {
2038 2038
  return !is_array($v);
2039 2039
 	});
2040 2040
 	$valeurs = array_unique($valeurs);
@@ -2261,9 +2261,9 @@  discard block
 block discarded – undo
2261 2261
 		$jour = 0;
2262 2262
 	}
2263 2263
 
2264
-	return sprintf('%04u', $annee) . '-' . sprintf('%02u', $mois) . '-'
2265
-	. sprintf('%02u', $jour) . ' ' . sprintf('%02u', $h) . ':'
2266
-	. sprintf('%02u', $m) . ':' . sprintf('%02u', $s);
2264
+	return sprintf('%04u', $annee).'-'.sprintf('%02u', $mois).'-'
2265
+	. sprintf('%02u', $jour).' '.sprintf('%02u', $h).':'
2266
+	. sprintf('%02u', $m).':'.sprintf('%02u', $s);
2267 2267
 }
2268 2268
 
2269 2269
 
@@ -2325,7 +2325,7 @@  discard block
 block discarded – undo
2325 2325
  */
2326 2326
 function prefixer_table_spip($table, $prefixe) {
2327 2327
 	if ($prefixe) {
2328
-		$table = preg_replace('/^spip_/', $prefixe . '_', $table);
2328
+		$table = preg_replace('/^spip_/', $prefixe.'_', $table);
2329 2329
 	}
2330 2330
 	return $table;
2331 2331
 }
Please login to merge, or discard this patch.
ecrire/action/menu_rubriques.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -39,12 +39,12 @@  discard block
 block discarded – undo
39 39
 	// on renvoi un 401 qui fait echouer la requete ajax silencieusement
40 40
 	if (!autoriser('ecrire')) {
41 41
 		$retour =
42
-		'<ul class="deroulant__sous-menu" data-profondeur="1">' .
43
-			'<li class="deroulant__item deroulant__item_plan plan_site" data-profondeur="1">' .
44
-				'<a class="deroulant__lien" href="' . generer_url_ecrire('accueil') . '" data-profondeur="1">' .
45
-					'<span class="libelle">' . _T('public:lien_connecter') . '</span>' .
46
-				'</a>' .
47
-			'</li>' .
42
+		'<ul class="deroulant__sous-menu" data-profondeur="1">'.
43
+			'<li class="deroulant__item deroulant__item_plan plan_site" data-profondeur="1">'.
44
+				'<a class="deroulant__lien" href="'.generer_url_ecrire('accueil').'" data-profondeur="1">'.
45
+					'<span class="libelle">'._T('public:lien_connecter').'</span>'.
46
+				'</a>'.
47
+			'</li>'.
48 48
 		'</ul>';
49 49
 		include_spip('inc/actions');
50 50
 		ajax_retour($retour);
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 	}
53 53
 
54 54
 	if ($date = intval(_request('date'))) {
55
-		header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $date) . ' GMT');
55
+		header('Last-Modified: '.gmdate('D, d M Y H:i:s', $date).' GMT');
56 56
 	}
57 57
 
58 58
 	$r = gen_liste_rubriques();
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 		and !strstr($_SERVER['SERVER_SOFTWARE'], 'IIS/')
63 63
 	) {
64 64
 		include_spip('inc/headers');
65
-		header('Content-Type: text/html; charset=' . $GLOBALS['meta']['charset']);
65
+		header('Content-Type: text/html; charset='.$GLOBALS['meta']['charset']);
66 66
 		http_response_code(304);
67 67
 		exit;
68 68
 	} else {
@@ -85,8 +85,8 @@  discard block
 block discarded – undo
85 85
  **/
86 86
 function menu_rubriques($complet = true) {
87 87
 	$ret = '<li class="deroulant__item deroulant__item_tout toutsite" data-profondeur="1">'
88
-		. '<a class="deroulant__lien" href="' . generer_url_ecrire('plan') . '" data-profondeur="1">'
89
-		. '<span class="libelle">' . _T('info_tout_site') . '</span>'
88
+		. '<a class="deroulant__lien" href="'.generer_url_ecrire('plan').'" data-profondeur="1">'
89
+		. '<span class="libelle">'._T('info_tout_site').'</span>'
90 90
 		. '</a>'
91 91
 		. '</li>';
92 92
 
@@ -145,8 +145,8 @@  discard block
 block discarded – undo
145 145
 	static $zmax = 6;
146 146
 	$profondeur_next = $profondeur + 1;
147 147
 
148
-	$nav = '<a class="deroulant__lien" href="' . generer_url_entite($id_rubrique, 'rubrique', '', '', false) . "\" data-profondeur=\"$profondeur\">"
149
-		. '<span class="libelle">' . supprimer_tags(preg_replace(',[\x00-\x1f]+,', ' ', $titre_rubrique)) . '</span>'
148
+	$nav = '<a class="deroulant__lien" href="'.generer_url_entite($id_rubrique, 'rubrique', '', '', false)."\" data-profondeur=\"$profondeur\">"
149
+		. '<span class="libelle">'.supprimer_tags(preg_replace(',[\x00-\x1f]+,', ' ', $titre_rubrique)).'</span>'
150 150
 		. "</a>\n";
151 151
 
152 152
 	// Limiter volontairement le nombre de sous-menus
Please login to merge, or discard this patch.
ecrire/action/cookie.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 	if ($change_session == 'oui') {
60 60
 		$session = charger_fonction('session', 'inc');
61 61
 		$session(true);
62
-		spip_log('statut 204 pour ' . $_SERVER['REQUEST_URI']);
62
+		spip_log('statut 204 pour '.$_SERVER['REQUEST_URI']);
63 63
 		http_response_code(204); // No Content
64 64
 		return;
65 65
 	}
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 				_T('info_connexion_refusee'),
80 80
 				_T('login_login_pass_incorrect'),
81 81
 				_T('login_retour_site'),
82
-				'url=' . rawurlencode($redirect),
82
+				'url='.rawurlencode($redirect),
83 83
 				_T('login_nouvelle_tentative'),
84 84
 				(strpos($url, _DIR_RESTREINT_ABS) !== false)
85 85
 			);
Please login to merge, or discard this patch.