Completed
Push — master ( 83f68a...f8a052 )
by cam
01:04
created
prive/formulaires/configurer_annonces.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -90,7 +90,7 @@
 block discarded – undo
90 90
 		$id_job = job_queue_add('mail', 'Test Envoi des nouveautes', array(0), 'genie/');
91 91
 		include_spip('inc/queue');
92 92
 		queue_schedule(array($id_job));
93
-		$res['message_ok'] .= '<br />' . _T('info_liste_nouveautes_envoyee');
93
+		$res['message_ok'] .= '<br />'._T('info_liste_nouveautes_envoyee');
94 94
 	}
95 95
 
96 96
 	return $res;
Please login to merge, or discard this patch.
prive/formulaires/declarer_bases.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -25,10 +25,10 @@  discard block
 block discarded – undo
25 25
 	if (defined('_DECLARER_CHOIX_DB')) {
26 26
 		$nom_connect = _DECLARER_CHOIX_DB;
27 27
 		$n = '';
28
-		while (in_array($nom_connect . $n, $deja)) {
28
+		while (in_array($nom_connect.$n, $deja)) {
29 29
 			$n = ($n ? $n + 1 : 1);
30 30
 		}
31
-		$nom_connect = $nom_connect . $n;
31
+		$nom_connect = $nom_connect.$n;
32 32
 	}
33 33
 
34 34
 	$valeurs = array(
@@ -55,18 +55,18 @@  discard block
 block discarded – undo
55 55
 
56 56
 function liste_serveurs() {
57 57
 	$options = array();
58
-	$dir = _DIR_RESTREINT . 'req/';
58
+	$dir = _DIR_RESTREINT.'req/';
59 59
 	$d = opendir($dir);
60 60
 	if (!$d) {
61 61
 		return array();
62 62
 	}
63 63
 	while ($f = readdir($d)) {
64 64
 		if ((preg_match('/^(.*)[.]php$/', $f, $s))
65
-			and is_readable($f = $dir . $f)
65
+			and is_readable($f = $dir.$f)
66 66
 		) {
67 67
 			require_once($f);
68 68
 			$s = $s[1];
69
-			$v = 'spip_versions_' . $s;
69
+			$v = 'spip_versions_'.$s;
70 70
 			if (function_exists($v) and $v()) {
71 71
 				$options[$s] = "install_select_type_$s";
72 72
 			} else {
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
 
140 140
 	$link = spip_connect_db($adresse_db, '', $login_db, $pass_db, '@test@', $serveur_db);
141 141
 	if ($link) {
142
-		$GLOBALS['connexions'][$serveur_db][$GLOBALS['spip_sql_version']] = $GLOBALS['spip_' . $serveur_db . '_functions_' . $GLOBALS['spip_sql_version']];
142
+		$GLOBALS['connexions'][$serveur_db][$GLOBALS['spip_sql_version']] = $GLOBALS['spip_'.$serveur_db.'_functions_'.$GLOBALS['spip_sql_version']];
143 143
 		$GLOBALS['connexions'][$serveur_db] = $link;
144 144
 		define('_DECLARER_SERVEUR_DB', $serveur_db);
145 145
 		define('_DECLARER_ADRESSE_DB', $adresse_db);
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
 		$f = preg_replace(',[^\w],', '', $nom_connect);
190 190
 		if ($f !== $nom_connect) {
191 191
 			$erreurs['nom_connect'] = _T('erreur_nom_connect_incorrect');
192
-		} elseif (file_exists(_DIR_CONNECT . $nom_connect . '.php')) {
192
+		} elseif (file_exists(_DIR_CONNECT.$nom_connect.'.php')) {
193 193
 			$erreurs['nom_connect'] = _T('erreur_connect_deja_existant');
194 194
 		} else {
195 195
 			define('_DECLARER_NOM_CONNECT', $nom_connect);
@@ -223,9 +223,9 @@  discard block
 block discarded – undo
223 223
 			''
224 224
 		);
225 225
 
226
-	install_fichier_connexion(_DIR_CONNECT . _DECLARER_NOM_CONNECT . '.php', $conn);
226
+	install_fichier_connexion(_DIR_CONNECT._DECLARER_NOM_CONNECT.'.php', $conn);
227 227
 
228 228
 	return array(
229
-		'message_ok' => _T('install_connect_ok', array('connect' => '<strong>' . _DECLARER_NOM_CONNECT . '</strong>'))
229
+		'message_ok' => _T('install_connect_ok', array('connect' => '<strong>'._DECLARER_NOM_CONNECT.'</strong>'))
230 230
 	);
231 231
 }
Please login to merge, or discard this patch.
prive/formulaires/configurer_langage.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
 		$checked = ($l == $selected) ? ' checked=\'checked\'' : '';
52 52
 		$ret .= "<div class='choix'>"
53 53
 			. "<input type='radio' name='$name' id='{$id}_$l' value='$l'$checked />"
54
-			. "<label for='{$id}_$l'>" . traduire_nom_langue($l) . '</label>'
54
+			. "<label for='{$id}_$l'>".traduire_nom_langue($l).'</label>'
55 55
 			. '</div>';
56 56
 	}
57 57
 
Please login to merge, or discard this patch.
prive/formulaires/configurer_previsualiseur.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@
 block discarded – undo
27 27
 	$res = array('editable' => true);
28 28
 
29 29
 	if ($i = _request('preview') and is_array($i)) {
30
-		$i = ',' . implode(',', $i) . ',';
30
+		$i = ','.implode(',', $i).',';
31 31
 	}
32 32
 
33 33
 	ecrire_meta('preview', $i);
Please login to merge, or discard this patch.
prive/formulaires/configurer_langue.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@
 block discarded – undo
31 31
 	foreach ($langues as $l) {
32 32
 		$res .= "<option value='$l'"
33 33
 			. ($l == $l_site ? " selected='selected'" : '')
34
-			. '>' . traduire_nom_langue($l) . "</option>\n";
34
+			. '>'.traduire_nom_langue($l)."</option>\n";
35 35
 	}
36 36
 
37 37
 	$valeurs = array(
Please login to merge, or discard this patch.
prive/rss/a_suivre_fonctions.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@
 block discarded – undo
15 15
 			}
16 16
 		}
17 17
 		krsort($items);
18
-		$texte = str_replace($placeholder, implode("\n\t", $items) . "\n", $texte);
18
+		$texte = str_replace($placeholder, implode("\n\t", $items)."\n", $texte);
19 19
 	}
20 20
 
21 21
 	return $texte;
Please login to merge, or discard this patch.
ecrire/action/calculer_taille_cache.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -42,16 +42,16 @@
 block discarded – undo
42 42
 		$res = _T('ecrire:taille_cache_image',
43 43
 			array(
44 44
 				'dir' => joli_repertoire(_DIR_VAR),
45
-				'taille' => "<b>" . (taille_en_octets($taille) > 0 ? taille_en_octets($taille) : "0 octet") . "</b>"
45
+				'taille' => "<b>".(taille_en_octets($taille) > 0 ? taille_en_octets($taille) : "0 octet")."</b>"
46 46
 			)
47 47
 		);
48 48
 	} else {
49 49
 		include_spip('inc/invalideur');
50 50
 		$taille =
51 51
 			calculer_taille_dossier(_DIR_CACHE_XML)
52
-			+ calculer_taille_dossier(_DIR_CACHE . 'skel/')
53
-			+ calculer_taille_dossier(_DIR_CACHE . 'wheels/')
54
-			+ calculer_taille_dossier(_DIR_CACHE . 'contextes/');
52
+			+ calculer_taille_dossier(_DIR_CACHE.'skel/')
53
+			+ calculer_taille_dossier(_DIR_CACHE.'wheels/')
54
+			+ calculer_taille_dossier(_DIR_CACHE.'contextes/');
55 55
 		$taille += intval(taille_du_cache());
56 56
 		if ($taille <= 150000) {
57 57
 			$res = _T('taille_cache_vide');
Please login to merge, or discard this patch.
ecrire/action/tester_taille.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 		$t = ($GLOBALS['taille_min'] * $GLOBALS['taille_min']);
77 77
 		if ($GLOBALS['taille_min'] !== $GLOBALS['taille_max']) {
78 78
 			$t = $t * 0.9; // marge de securite
79
-			echo round($t / 1000000, 3) . ' Mpx';
79
+			echo round($t / 1000000, 3).' Mpx';
80 80
 		} else {
81 81
 			// c'est un cas "on a reussi la borne max initiale, donc on a pas de limite connue"
82 82
 			$t = 0;
@@ -111,18 +111,18 @@  discard block
 block discarded – undo
111 111
 	$i = _request('i') + 1;
112 112
 	$image_source = chemin_image("test.png");
113 113
 	$GLOBALS['redirect'] = generer_url_action("tester_taille",
114
-		"i=$i&arg=" . $GLOBALS['taille_min'] . "-" . $GLOBALS['taille_test']);
114
+		"i=$i&arg=".$GLOBALS['taille_min']."-".$GLOBALS['taille_test']);
115 115
 
116 116
 	ob_start('action_tester_taille_error_handler');
117 117
 	filtrer('image_recadre', $image_source, $taille, $taille);
118
-	$GLOBALS['redirect'] = generer_url_action("tester_taille", "i=$i&arg=$taille-" . $GLOBALS['taille_max']);
118
+	$GLOBALS['redirect'] = generer_url_action("tester_taille", "i=$i&arg=$taille-".$GLOBALS['taille_max']);
119 119
 
120 120
 	// si la valeur intermediaire a reussi, on teste la valeur maxi qui est peut etre sous estimee
121 121
 	// si $GLOBALS['taille_min']==0 (car on est au premier coup)
122 122
 	if ($GLOBALS['taille_min'] == 0) {
123 123
 		$taille = $GLOBALS['taille_max'];
124 124
 		filtrer('image_recadre', $image_source, $taille, $taille);
125
-		$GLOBALS['redirect'] = generer_url_action("tester_taille", "i=$i&arg=$taille-" . $GLOBALS['taille_max']);
125
+		$GLOBALS['redirect'] = generer_url_action("tester_taille", "i=$i&arg=$taille-".$GLOBALS['taille_max']);
126 126
 	}
127 127
 	ob_end_clean();
128 128
 
Please login to merge, or discard this patch.
ecrire/action/editer_article.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
 	);
107 107
 
108 108
 	// Si l'article est publie, invalider les caches et demander sa reindexation
109
-	$t = sql_getfetsel("statut", "spip_articles", "id_article=" . intval($id_article));
109
+	$t = sql_getfetsel("statut", "spip_articles", "id_article=".intval($id_article));
110 110
 	$invalideur = $indexation = false;
111 111
 	if ($t == 'publie') {
112 112
 		$invalideur = "id='article/$id_article'";
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 	if ($err = objet_modifier_champs('article', $id_article,
117 117
 		array(
118 118
 			'data' => $set,
119
-			'nonvide' => array('titre' => _T('info_nouvel_article') . " " . _T('info_numero_abbreviation') . $id_article),
119
+			'nonvide' => array('titre' => _T('info_nouvel_article')." "._T('info_numero_abbreviation').$id_article),
120 120
 			'invalideur' => $invalideur,
121 121
 			'indexation' => $indexation,
122 122
 			'date_modif' => 'date_modif' // champ a mettre a date('Y-m-d H:i:s') s'il y a modif
@@ -298,7 +298,7 @@  discard block
 block discarded – undo
298 298
 			if (autoriser('modifier', 'article', $id_article) and $s != 'publie') {
299 299
 				$statut = $champs['statut'] = $s;
300 300
 			} else {
301
-				spip_log("editer_article $id_article refus " . join(' ', $c));
301
+				spip_log("editer_article $id_article refus ".join(' ', $c));
302 302
 			}
303 303
 		}
304 304
 
@@ -322,7 +322,7 @@  discard block
 block discarded – undo
322 322
 	if (isset($c['id_parent'])
323 323
 		and $id_parent = $c['id_parent']
324 324
 		and $id_parent != $id_rubrique
325
-		and (sql_fetsel('1', "spip_rubriques", "id_rubrique=" . intval($id_parent)))
325
+		and (sql_fetsel('1', "spip_rubriques", "id_rubrique=".intval($id_parent)))
326 326
 	) {
327 327
 		$champs['id_rubrique'] = $id_parent;
328 328
 
@@ -419,12 +419,12 @@  discard block
 block discarded – undo
419 419
 	//  changer aussi son secteur et sa langue (si heritee)
420 420
 	if (isset($champs['id_rubrique'])) {
421 421
 
422
-		$row_rub = sql_fetsel("id_secteur, lang", "spip_rubriques", "id_rubrique=" . sql_quote($champs['id_rubrique']));
422
+		$row_rub = sql_fetsel("id_secteur, lang", "spip_rubriques", "id_rubrique=".sql_quote($champs['id_rubrique']));
423 423
 
424 424
 		$langue = $row_rub['lang'];
425 425
 		$champs['id_secteur'] = $row_rub['id_secteur'];
426 426
 		if (sql_fetsel('1', 'spip_articles',
427
-			"id_article=" . intval($id_article) . " AND langue_choisie<>'oui' AND lang<>" . sql_quote($langue))) {
427
+			"id_article=".intval($id_article)." AND langue_choisie<>'oui' AND lang<>".sql_quote($langue))) {
428 428
 			$champs['lang'] = $langue;
429 429
 		}
430 430
 	}
@@ -433,7 +433,7 @@  discard block
 block discarded – undo
433 433
 		return;
434 434
 	}
435 435
 
436
-	sql_updateq('spip_articles', $champs, "id_article=" . intval($id_article));
436
+	sql_updateq('spip_articles', $champs, "id_article=".intval($id_article));
437 437
 
438 438
 	// Changer le statut des rubriques concernees 
439 439
 
@@ -454,7 +454,7 @@  discard block
 block discarded – undo
454 454
 		foreach ($plus as $n => $t) {
455 455
 			$plus[$n] = preg_replace(",<!--SPIP-->[\n\r]*,", "", $t);
456 456
 		}
457
-		set_request('texte', join('', $plus) . _request('texte'));
457
+		set_request('texte', join('', $plus)._request('texte'));
458 458
 	}
459 459
 }
460 460
 
Please login to merge, or discard this patch.