Completed
Pull Request — master (#39)
by
unknown
09:06
created
ecrire/public/format_html.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -29,36 +29,36 @@  discard block
 block discarded – undo
29 29
 
30 30
 function format_inclure_html($file, $args, $prof) {
31 31
 	if (strpos($file, '#') === false) {
32
-		$t = $file ? ("(" . $file . ")") : "";
32
+		$t = $file ? ("(".$file.")") : "";
33 33
 	} else {
34
-		$t = "{fond=" . $file . '}';
34
+		$t = "{fond=".$file.'}';
35 35
 	}
36
-	$args = !$args ? '' : ("{" . join(", ", $args) . "}");
36
+	$args = !$args ? '' : ("{".join(", ", $args)."}");
37 37
 
38
-	return ("<INCLURE" . $t . $args . ">");
38
+	return ("<INCLURE".$t.$args.">");
39 39
 }
40 40
 
41 41
 function format_polyglotte_html($args, $prof) {
42 42
 	$contenu = array();
43 43
 	foreach ($args as $l => $t) {
44
-		$contenu[] = ($l ? "[$l]" : '') . $t;
44
+		$contenu[] = ($l ? "[$l]" : '').$t;
45 45
 	}
46 46
 
47
-	return ("<multi>" . join(" ", $contenu) . "</multi>");
47
+	return ("<multi>".join(" ", $contenu)."</multi>");
48 48
 }
49 49
 
50 50
 function format_idiome_html($nom, $module, $args, $filtres, $prof) {
51 51
 	foreach ($args as $k => $v) {
52 52
 		$args[$k] = "$k=$v";
53 53
 	}
54
-	$args = (!$args ? '' : ('{' . join(',', $args) . '}'));
54
+	$args = (!$args ? '' : ('{'.join(',', $args).'}'));
55 55
 
56
-	return ("<:" . ($module ? "$module:" : "") . $nom . $args . $filtres . ":>");
56
+	return ("<:".($module ? "$module:" : "").$nom.$args.$filtres.":>");
57 57
 }
58 58
 
59 59
 function format_champ_html($nom, $boucle, $etoile, $avant, $apres, $args, $filtres, $prof) {
60 60
 	$nom = "#"
61
-		. ($boucle ? ($boucle . ":") : "")
61
+		. ($boucle ? ($boucle.":") : "")
62 62
 		. $nom
63 63
 		. $etoile
64 64
 		. $args
@@ -88,12 +88,12 @@  discard block
 block discarded – undo
88 88
 		$critere[$k] = $crit_s;
89 89
 	}
90 90
 
91
-	return (!$critere ? "" : ("{" . join(",", $critere) . "}"));
91
+	return (!$critere ? "" : ("{".join(",", $critere)."}"));
92 92
 }
93 93
 
94 94
 function format_liste_html($fonc, $args, $prof) {
95 95
 	return ((($fonc !== '') ? "|$fonc" : $fonc)
96
-		. (!$args ? "" : ("{" . join(",", $args) . "}")));
96
+		. (!$args ? "" : ("{".join(",", $args)."}")));
97 97
 }
98 98
 
99 99
 // Concatenation sans separateur: verifier qu'on ne cree pas de faux lexemes
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
 			// si un texte se termine par ( et est suivi d'un champ
110 110
 			// ou assimiles, forcer la notation pleine
111 111
 			if ($c1 == '(' and substr($texte2, 0, 1) == '#') {
112
-				$args[$i + 1][0] = '[(' . $texte2 . ')]';
112
+				$args[$i + 1][0] = '[('.$texte2.')]';
113 113
 			}
114 114
 		} else {
115 115
 			if ($type == 'texte') {
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
 			if (($c1 == '}' and substr(ltrim($texte2), 0, 1) == '|')
122 122
 				or (preg_match('/[\w\d_*]/', $c1) and preg_match('/^[\w\d_*{|]/', $texte2))
123 123
 			) {
124
-				$args[$i][0] = '[(' . $texte . ')]';
124
+				$args[$i][0] = '[('.$texte.')]';
125 125
 			}
126 126
 		}
127 127
 	}
Please login to merge, or discard this patch.
ecrire/public/boucles.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
  **/
84 84
 function boucle_HIERARCHIE_dist($id_boucle, &$boucles) {
85 85
 	$boucle = &$boucles[$id_boucle];
86
-	$id_table = $boucle->id_table . ".id_rubrique";
86
+	$id_table = $boucle->id_table.".id_rubrique";
87 87
 
88 88
 	// Si la boucle mere est une boucle RUBRIQUES il faut ignorer la feuille
89 89
 	// sauf en presence du critere {tout} (vu par phraser_html)
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 		. '$hierarchie = calcul_hierarchie_in($id_rubrique,'
97 97
 		. (isset($boucle->modificateur['tout']) ? 'true' : 'false')
98 98
 		. ");\n\t"
99
-		. 'if (!$hierarchie) return "";' . "\n\t";
99
+		. 'if (!$hierarchie) return "";'."\n\t";
100 100
 
101 101
 	$boucle->where[] = array("'IN'", "'$id_table'", '"($hierarchie)"');
102 102
 
Please login to merge, or discard this patch.
ecrire/public/sandbox.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
  *     Texte
42 42
  */
43 43
 function sandbox_composer_texte($texte, &$p) {
44
-	$code = "'" . str_replace(array("\\", "'"), array("\\\\", "\\'"), $texte) . "'";
44
+	$code = "'".str_replace(array("\\", "'"), array("\\\\", "\\'"), $texte)."'";
45 45
 
46 46
 	return $code;
47 47
 }
@@ -162,8 +162,8 @@  discard block
 block discarded – undo
162 162
  */
163 163
 function sandbox_filtrer_squelette($skel, $corps, $filtres) {
164 164
 	$series_filtres = func_get_args();
165
-	array_shift($series_filtres);// skel
166
-	array_shift($series_filtres);// corps
165
+	array_shift($series_filtres); // skel
166
+	array_shift($series_filtres); // corps
167 167
 
168 168
 	// proteger les <INCLUDE> et tous les morceaux de php licites
169 169
 	if ($skel['process_ins'] == 'php') {
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
 	if (is_array($r)) {
212 212
 		$dst[] = $r[0];
213 213
 
214
-		return $src[] = '___' . md5($r[0]) . '___';
214
+		return $src[] = '___'.md5($r[0]).'___';
215 215
 	}
216 216
 
217 217
 	// si on recoit pas un tableau, on renvoit les couples de substitution
Please login to merge, or discard this patch.
ecrire/exec/404.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@
 block discarded – undo
42 42
 	echo pipeline('affiche_droite', array('args' => array('exec' => '404', 'exec_erreur' => $exec), 'data' => ''));
43 43
 
44 44
 	echo debut_droite('404', true);
45
-	echo "<h1 class='grostitre'>" . _T('fichier_introuvable', array('fichier' => $exec)) . '</h1>';
45
+	echo "<h1 class='grostitre'>"._T('fichier_introuvable', array('fichier' => $exec)).'</h1>';
46 46
 	echo pipeline('affiche_milieu', array('args' => array('exec' => '404', 'exec_erreur' => $exec), 'data' => ''));
47 47
 
48 48
 	echo fin_gauche(), fin_page();
Please login to merge, or discard this patch.
ecrire/exec/info_plugin.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
 		include_spip('inc/minipres');
26 26
 		echo minipres();
27 27
 	} else {
28
-		$plug = _DIR_RACINE . htmlspecialchars(_request('plugin'));
28
+		$plug = _DIR_RACINE.htmlspecialchars(_request('plugin'));
29 29
 		$get_infos = charger_fonction('get_infos', 'plugins');
30 30
 		$dir = "";
31 31
 		if (strncmp($plug, _DIR_PLUGINS, strlen(_DIR_PLUGINS)) == 0) {
Please login to merge, or discard this patch.
ecrire/exec/403.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
 		$message = _L("Vous n'avez pas le droit d'acc&eacute;der à la page <b>@exec@</b>.", array('exec' => _request('exec')));
38 38
 	}
39 39
 
40
-	$contenu = "<h1 class='grostitre'>" . _T('info_acces_interdit') . '</h1>' . $message;
40
+	$contenu = "<h1 class='grostitre'>"._T('info_acces_interdit').'</h1>'.$message;
41 41
 
42 42
 	if (_request('var_zajax')) {
43 43
 		include_spip('inc/actions');
Please login to merge, or discard this patch.
ecrire/exec/base_delete_all.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -35,12 +35,12 @@
 block discarded – undo
35 35
 			include_spip('inc/minipres');
36 36
 			spip_log("Erreur base de donnees");
37 37
 			echo minipres(_T('info_travaux_titre'),
38
-				_T('titre_probleme_technique') . "<p><tt>" . sql_errno() . " " . sql_error() . "</tt></p>");
38
+				_T('titre_probleme_technique')."<p><tt>".sql_errno()." ".sql_error()."</tt></p>");
39 39
 		} else {
40 40
 			$res = base_saisie_tables('delete', $res);
41 41
 			include_spip('inc/headers');
42
-			$res = "\n<ol style='text-align:left'><li>\n" .
43
-				join("</li>\n<li>", $res) .
42
+			$res = "\n<ol style='text-align:left'><li>\n".
43
+				join("</li>\n<li>", $res).
44 44
 				'</li></ol>';
45 45
 			$admin = charger_fonction('admin', 'inc');
46 46
 			$res = $admin('delete_all', _T('titre_page_delete_all'), $res);
Please login to merge, or discard this patch.
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.