Completed
Pull Request — master (#32)
by
unknown
05:57
created
ecrire/exec/upgrade.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 			. _T('texte_nouvelle_version_spip_1')
43 43
 			. "</b><p> "
44 44
 			. _T('texte_nouvelle_version_spip_2',
45
-				array('connect' => '<tt>' . _FILE_CONNECT . '</tt>'))
45
+				array('connect' => '<tt>'._FILE_CONNECT.'</tt>'))
46 46
 			. generer_form_ecrire('upgrade', "<input type='hidden' name='reinstall' value='non' />", '',
47 47
 				_T('bouton_relancer_installation')));
48 48
 		echo $r;
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 			$GLOBALS['meta']['version_installee'] = 0.0;
59 59
 		} else {
60 60
 			$GLOBALS['meta']['version_installee'] =
61
-				(double)str_replace(',', '.', $GLOBALS['meta']['version_installee']);
61
+				(double) str_replace(',', '.', $GLOBALS['meta']['version_installee']);
62 62
 		}
63 63
 		# NB: str_replace car, sur club-internet, il semble que version_installe soit
64 64
 		# enregistree au format '1,812' et non '1.812'
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 			$commentaire = _T('texte_mise_a_niveau_base_1');
73 73
 		}
74 74
 
75
-		$commentaire .= "<br />[" . $GLOBALS['meta']['version_installee'] . "/" . $GLOBALS['spip_version_base'] . "]";
75
+		$commentaire .= "<br />[".$GLOBALS['meta']['version_installee']."/".$GLOBALS['spip_version_base']."]";
76 76
 
77 77
 		$_POST['reinstall'] = 'non'; // pour copy_request dans admin
78 78
 		include_spip('inc/headers');
Please login to merge, or discard this patch.
ecrire/exec/demande_mise_a_jour.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -46,8 +46,8 @@
 block discarded – undo
46 46
 
47 47
 	echo debut_grand_cadre(true);
48 48
 	echo boite_ouvrir(_T('info_message_technique'), 'notice');
49
-	echo "<p>" . _T('info_procedure_maj_version') . "</p>",
50
-		"<p>" . _T('info_administrateur_site_01') . "</p>";
49
+	echo "<p>"._T('info_procedure_maj_version')."</p>",
50
+		"<p>"._T('info_administrateur_site_01')."</p>";
51 51
 	echo bouton_action(_T('bouton_mettre_a_jour_base'), generer_url_ecrire("upgrade", "reinstall=non"));
52 52
 	echo boite_fermer();
53 53
 	// masquer les erreurs sql sur cette page car proviennent de la base pas a jour !
Please login to merge, or discard this patch.
ecrire/exec/rechercher.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -67,15 +67,15 @@  discard block
 block discarded – undo
67 67
 	$where = preg_split(",\s+,", $type);
68 68
 	if ($where) {
69 69
 		foreach ($where as $k => $v) {
70
-			$where[$k] = "'%" . substr(str_replace("%", "\%", sql_quote($v, '', 'string')), 1, -1) . "%'";
70
+			$where[$k] = "'%".substr(str_replace("%", "\%", sql_quote($v, '', 'string')), 1, -1)."%'";
71 71
 		}
72
-		$where_titre = ("(titre LIKE " . join(" AND titre LIKE ", $where) . ")");
73
-		$where_desc = ("(descriptif LIKE " . join(" AND descriptif LIKE ", $where) . ")");
74
-		$where_id = ("(id_rubrique = " . intval($type) . ")");
72
+		$where_titre = ("(titre LIKE ".join(" AND titre LIKE ", $where).")");
73
+		$where_desc = ("(descriptif LIKE ".join(" AND descriptif LIKE ", $where).")");
74
+		$where_id = ("(id_rubrique = ".intval($type).")");
75 75
 
76 76
 		if ($exclus) {
77 77
 			include_spip('inc/rubriques');
78
-			$where_exclus = " AND " . sql_in('id_rubrique', calcul_branche_in($exclus), 'NOT');
78
+			$where_exclus = " AND ".sql_in('id_rubrique', calcul_branche_in($exclus), 'NOT');
79 79
 		} else {
80 80
 			$where_exclus = '';
81 81
 		}
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
 
104 104
 	if ($points) {
105 105
 		arsort($points);
106
-		$style = " style='background-image: url(" . chemin_image('secteur-12.png') . ")'";
106
+		$style = " style='background-image: url(".chemin_image('secteur-12.png').")'";
107 107
 		foreach ($rub as $k => $v) {
108 108
 			$rub[$k]['atts'] = ($v["id_parent"] ? $style : '')
109 109
 				. " class='petite-rubrique'";
@@ -136,13 +136,13 @@  discard block
 block discarded – undo
136 136
 	if (!$ids) {
137 137
 		return "<br /><br /><div style='padding: 5px; color: red;'><b>"
138 138
 		. spip_htmlentities($type)
139
-		. "</b> :  " . _T('avis_aucun_resultat') . "</div>";
139
+		. "</b> :  "._T('avis_aucun_resultat')."</div>";
140 140
 	}
141 141
 
142 142
 	$ret = '';
143 143
 	$info = generer_url_ecrire('informer', "type=rubrique&rac=$rac&id=");
144 144
 
145
-	$onClick = "aff_selection(this.firstChild.title,'$rac" . "_selection','$info', event)";
145
+	$onClick = "aff_selection(this.firstChild.title,'$rac"."_selection','$info', event)";
146 146
 
147 147
 	$ondbClick = "$do(this.firstChild.firstChild.nodeValue,this.firstChild.title,'selection_rubrique', 'id_parent');";
148 148
 
Please login to merge, or discard this patch.
ecrire/exec/fond.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
 
27 27
 
28 28
 $fond = _request('exec');
29
-$GLOBALS['delais'] = 0;// pas de cache !
29
+$GLOBALS['delais'] = 0; // pas de cache !
30 30
 // Securite
31 31
 if (strstr($fond, '/')) {
32 32
 	if (!include_spip('inc/autoriser')
Please login to merge, or discard this patch.
ecrire/exec/admin_plugin.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -139,11 +139,11 @@  discard block
 block discarded – undo
139 139
 	if ($quoi !== 'actifs') {
140 140
 		$lpf = liste_plugin_files();
141 141
 		if ($lpf) {
142
-			echo "<p>" . _T('texte_presente_plugin') . "</p>";
142
+			echo "<p>"._T('texte_presente_plugin')."</p>";
143 143
 		} else {
144 144
 			if (!@is_dir(_DIR_PLUGINS)) {
145
-				echo "<p>" . _T('plugin_info_automatique_ftp', array('rep' => joli_repertoire(_DIR_PLUGINS)))
146
-					. " &mdash; " . _T('plugin_info_automatique_creer') . "</p>";
145
+				echo "<p>"._T('plugin_info_automatique_ftp', array('rep' => joli_repertoire(_DIR_PLUGINS)))
146
+					. " &mdash; "._T('plugin_info_automatique_creer')."</p>";
147 147
 			}
148 148
 		}
149 149
 		$lcpaffiche = $lpf;
@@ -164,8 +164,8 @@  discard block
 block discarded – undo
164 164
 		if (defined('_DIR_PLUGINS_SUPPL')) {
165 165
 			$nb += count($lcpas);
166 166
 		}
167
-		echo "<h3>" . sinon(singulier_ou_pluriel($nb, 'plugins_actif_un', 'plugins_actifs', 'count'),
168
-				_T('plugins_actif_aucun')) . "</h3>";
167
+		echo "<h3>".sinon(singulier_ou_pluriel($nb, 'plugins_actif_un', 'plugins_actifs', 'count'),
168
+				_T('plugins_actif_aucun'))."</h3>";
169 169
 	}
170 170
 
171 171
 	if (empty($format)) {
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
 
183 183
 	if ($corps) {
184 184
 		$corps .= "\n<div class='boutons' style='display:none;'>"
185
-			. "<input type='submit' class='submit save' value='" . _T('bouton_enregistrer')
185
+			. "<input type='submit' class='submit save' value='"._T('bouton_enregistrer')
186 186
 			. "' />"
187 187
 			. "</div>";
188 188
 	}
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
255 255
 		. debut_cadre_trait_couleur('', true, '', _T('plugins_liste_dist'), 'liste_plugins_dist')
256 256
 		. "<p>"
257 257
 		. _T('plugin_info_plugins_dist_1', array('plugins_dist' => joli_repertoire(_DIR_PLUGINS_DIST)))
258
-		. '<br />' . _T('plugin_info_plugins_dist_2')
258
+		. '<br />'._T('plugin_info_plugins_dist_2')
259 259
 		. "</p>"
260 260
 		. $liste
261 261
 		. fin_cadre_trait_couleur(true)
@@ -278,7 +278,7 @@  discard block
 block discarded – undo
278 278
 	$res = debut_cadre_enfonce('', true, '', _T('plugin_librairies_installees'));
279 279
 	$res .= '<dl>';
280 280
 	foreach ($libs as $lib => $rep) {
281
-		$res .= "<dt>$lib</dt><dd>" . joli_repertoire($rep) . "</dd>\n";
281
+		$res .= "<dt>$lib</dt><dd>".joli_repertoire($rep)."</dd>\n";
282 282
 	}
283 283
 	$res .= '</dl>';
284 284
 	$res .= fin_cadre_enfonce(true);
@@ -296,7 +296,7 @@  discard block
 block discarded – undo
296 296
 function liste_librairies() {
297 297
 	$libs = array();
298 298
 	foreach (array_reverse(creer_chemin()) as $d) {
299
-		if (is_dir($dir = $d . 'lib/')
299
+		if (is_dir($dir = $d.'lib/')
300 300
 			and $t = opendir($dir)
301 301
 		) {
302 302
 			while (($f = readdir($t)) !== false) {
Please login to merge, or discard this patch.
ecrire/inc/securiser_action.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 		if ($mode === -1) {
103 103
 			return array('action' => $action, 'arg' => $arg, 'hash' => $hash);
104 104
 		} else {
105
-			return generer_url_action($action, "arg=" . rawurlencode($arg) . "&hash=$hash" . (!$r ? '' : "&redirect=$r"),
105
+			return generer_url_action($action, "arg=".rawurlencode($arg)."&hash=$hash".(!$r ? '' : "&redirect=$r"),
106 106
 				$mode, $public);
107 107
 		}
108 108
 	}
@@ -111,9 +111,9 @@  discard block
 block discarded – undo
111 111
 	$hash = calculer_action_auteur("$action-$arg");
112 112
 	$att .= " style='margin: 0px; border: 0px'";
113 113
 	if ($redirect) {
114
-		$redirect = "\n\t\t<input name='redirect' type='hidden' value='" . str_replace("'", '&#39;', $redirect) . "' />";
114
+		$redirect = "\n\t\t<input name='redirect' type='hidden' value='".str_replace("'", '&#39;', $redirect)."' />";
115 115
 	}
116
-	$mode .= $redirect . "
116
+	$mode .= $redirect."
117 117
 <input name='hash' type='hidden' value='$hash' />
118 118
 <input name='arg' type='hidden' value='$arg' />";
119 119
 
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
183 183
  */
184 184
 function _action_auteur($action, $id_auteur, $pass, $alea) {
185 185
 	static $sha = array();
186
-	if (!isset($sha[$id_auteur . $pass . $alea])) {
186
+	if (!isset($sha[$id_auteur.$pass.$alea])) {
187 187
 		if (!isset($GLOBALS['meta'][$alea]) and _request('exec') !== 'install') {
188 188
 			include_spip('inc/acces');
189 189
 			charger_aleas();
@@ -195,12 +195,12 @@  discard block
 block discarded – undo
195 195
 			}
196 196
 		}
197 197
 		include_spip('auth/sha256.inc');
198
-		$sha[$id_auteur . $pass . $alea] = _nano_sha256($id_auteur . $pass . @$GLOBALS['meta'][$alea]);
198
+		$sha[$id_auteur.$pass.$alea] = _nano_sha256($id_auteur.$pass.@$GLOBALS['meta'][$alea]);
199 199
 	}
200 200
 	if (function_exists('sha1')) {
201
-		return sha1($action . $sha[$id_auteur . $pass . $alea]);
201
+		return sha1($action.$sha[$id_auteur.$pass.$alea]);
202 202
 	} else {
203
-		return md5($action . $sha[$id_auteur . $pass . $alea]);
203
+		return md5($action.$sha[$id_auteur.$pass.$alea]);
204 204
 	}
205 205
 }
206 206
 
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
261 261
 		include_spip('inc/acces');
262 262
 		include_spip('auth/sha256.inc');
263 263
 		ecrire_meta('secret_du_site',
264
-			_nano_sha256($_SERVER["DOCUMENT_ROOT"] . $_SERVER["SERVER_SIGNATURE"] . creer_uniqid()), 'non');
264
+			_nano_sha256($_SERVER["DOCUMENT_ROOT"].$_SERVER["SERVER_SIGNATURE"].creer_uniqid()), 'non');
265 265
 		lire_metas(); // au cas ou ecrire_meta() ne fonctionne pas
266 266
 	}
267 267
 
@@ -276,9 +276,9 @@  discard block
 block discarded – undo
276 276
  */
277 277
 function calculer_cle_action($action) {
278 278
 	if (function_exists('sha1')) {
279
-		return sha1($action . secret_du_site());
279
+		return sha1($action.secret_du_site());
280 280
 	} else {
281
-		return md5($action . secret_du_site());
281
+		return md5($action.secret_du_site());
282 282
 	}
283 283
 }
284 284
 
@@ -318,7 +318,7 @@  discard block
 block discarded – undo
318 318
 	// On nettoie l’URL de tous les var_.
319 319
 	$url = nettoyer_uri_var($url);
320 320
 
321
-	$token = _action_auteur('previsualiser-' . $url, $id_auteur, null, $alea);
321
+	$token = _action_auteur('previsualiser-'.$url, $id_auteur, null, $alea);
322 322
 	return "$id_auteur-$token";
323 323
 }
324 324
 
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
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 		}
65 65
 	}
66 66
 
67
-	$texte = $x . $texte;
67
+	$texte = $x.$texte;
68 68
 
69 69
 	return $texte;
70 70
 }
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 	if (isset($_SERVER['HTTP_REFERER'])) {
102 102
 		$_SERVER['HTTP_REFERER'] = preg_replace(',[^\w\,/#&;-]+,', ' ', $_SERVER['HTTP_REFERER']);
103 103
 	}
104
-	if ($rech){
104
+	if ($rech) {
105 105
 		$rech = preg_replace(',[^\w\,/#&;-]+,', ' ', $rech);
106 106
 	}
107 107
 
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
 	|| ($pos = 0);
177 177
 
178 178
 	if (false === strpos(substr($texte, 0, $pos), '<!-- insert_head -->')) {
179
-		$insert = "\n" . pipeline('insert_head', '<!-- f_insert_head -->') . "\n";
179
+		$insert = "\n".pipeline('insert_head', '<!-- f_insert_head -->')."\n";
180 180
 		$texte = substr_replace($texte, $insert, $pos, 0);
181 181
 	}
182 182
 
@@ -272,7 +272,7 @@  discard block
 block discarded – undo
272 272
 
273 273
 	// inserer avant le </body> fermant si on peut, a la fin de la page sinon
274 274
 	if (($p = strpos($texte, '</body>')) !== false) {
275
-		$texte = substr($texte, 0, $p) . $code . substr($texte, $p);
275
+		$texte = substr($texte, 0, $p).$code.substr($texte, $p);
276 276
 	} else {
277 277
 		$texte .= $code;
278 278
 	}
Please login to merge, or discard this patch.
ecrire/inc/cvt_multietapes.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -298,9 +298,9 @@
 block discarded – undo
298 298
 		and ($e = $flux['args']['contexte']['_etape']) > 1
299 299
 		and $ext = $flux['args']['ext']
300 300
 		and $f = $flux['data']
301
-		and file_exists($f . "_$e.$ext")
301
+		and file_exists($f."_$e.$ext")
302 302
 	) {
303
-		$flux['data'] = $f . "_$e";
303
+		$flux['data'] = $f."_$e";
304 304
 	}
305 305
 
306 306
 	return $flux;
Please login to merge, or discard this patch.
ecrire/inc/puce_statut.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -420,7 +420,7 @@
 block discarded – undo
420 420
 	$h = "selec_statut('$id', '$type', $n, jQuery('img',this).attr('src'), '$h');return false;";
421 421
 	$t = supprimer_tags($titre);
422 422
 
423
-	return "<a href=\"#\" onclick=\"$h\" title=\"$t\"$act>" . http_img_pack($img, $t) . "</a>";
423
+	return "<a href=\"#\" onclick=\"$h\" title=\"$t\"$act>".http_img_pack($img, $t)."</a>";
424 424
 }
425 425
 
426 426
 // compat
Please login to merge, or discard this patch.