Completed
Pull Request — master (#36)
by
unknown
06:08
created
ecrire/genie/mail.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@
 block discarded – undo
48 48
 		$headers = "";
49 49
 		if (isset($page['entetes']) and count($page['entetes'])) {
50 50
 			foreach ($page['entetes'] as $k => $v) {
51
-				$headers .= (strlen($v) ? "$k: $v" : $k) . "\n";
51
+				$headers .= (strlen($v) ? "$k: $v" : $k)."\n";
52 52
 			}
53 53
 		}
54 54
 
Please login to merge, or discard this patch.
ecrire/typographie/fr.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@
 block discarded – undo
70 70
 
71 71
 	$cherche2 = array(
72 72
 		'/([^-\n]|^)--([^-]|$)/S',
73
-		',(' . _PROTOCOLES_STD . ')~((://[^"\'\s\[\]\}\)<>]+)~([?]))?,S',
73
+		',('._PROTOCOLES_STD.')~((://[^"\'\s\[\]\}\)<>]+)~([?]))?,S',
74 74
 		'/~/'
75 75
 	);
76 76
 	$remplace2 = array(
Please login to merge, or discard this patch.
ecrire/index.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 // Determiner l'action demandee
36 36
 //
37 37
 
38
-$exec = (string)_request('exec');
38
+$exec = (string) _request('exec');
39 39
 $reinstall = (!is_null(_request('reinstall'))) ? _request('reinstall') : ($exec == 'install' ? 'oui' : null);
40 40
 //
41 41
 // Les scripts d'insallation n'authentifient pas, forcement,
@@ -82,10 +82,10 @@  discard block
 block discarded – undo
82 82
 }
83 83
 // securiser les redirect du back-office
84 84
 if (_request('redirect')) {
85
-	if (!function_exists('securiser_redirect_action')){
85
+	if (!function_exists('securiser_redirect_action')) {
86 86
 		include_spip('public/aiguiller');
87 87
 	}
88
-	set_request('redirect',securiser_redirect_action(_request('redirect')));
88
+	set_request('redirect', securiser_redirect_action(_request('redirect')));
89 89
 }
90 90
 
91 91
 
@@ -118,9 +118,9 @@  discard block
 block discarded – undo
118 118
 			or (isset($GLOBALS['visiteur_session']) and $GLOBALS['visiteur_session']['statut'] == '0minirezo')
119 119
 		)
120 120
 	) {
121
-		spip_log("Quand la meta admin vaut " .
122
-			$GLOBALS['meta']["admin"] .
123
-			" seul un admin peut se connecter et sans AJAX." .
121
+		spip_log("Quand la meta admin vaut ".
122
+			$GLOBALS['meta']["admin"].
123
+			" seul un admin peut se connecter et sans AJAX.".
124 124
 			" En cas de probleme, detruire cette meta.");
125 125
 		die(_T('info_travaux_texte'));
126 126
 	}
Please login to merge, or discard this patch.
ecrire/balise/url_logout.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -73,5 +73,5 @@
 block discarded – undo
73 73
 		return '';
74 74
 	}
75 75
 
76
-	return generer_url_action('logout', "logout=public&url=" . rawurlencode($cible ? $cible : self('&')));
76
+	return generer_url_action('logout', "logout=public&url=".rawurlencode($cible ? $cible : self('&')));
77 77
 }
Please login to merge, or discard this patch.
ecrire/balise/info_.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
 		return $p;
52 52
 	} else {
53 53
 		$info_sql = strtolower(substr($info, 5));
54
-		$code = "generer_info_entite($id_objet, $type_objet, '$info_sql'" . ($p->etoile ? "," . _q($p->etoile) : "") . ")";
54
+		$code = "generer_info_entite($id_objet, $type_objet, '$info_sql'".($p->etoile ? ","._q($p->etoile) : "").")";
55 55
 		$p->code = champ_sql($info, $p, $code);
56 56
 		$p->interdire_scripts = true;
57 57
 
Please login to merge, or discard this patch.
ecrire/balise/formulaire_.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -223,9 +223,9 @@
 block discarded – undo
223 223
 	if (isset($valeurs['_action'])) {
224 224
 		$securiser_action = charger_fonction('securiser_action', 'inc');
225 225
 		$secu = $securiser_action(reset($valeurs['_action']), end($valeurs['_action']), '', -1);
226
-		$valeurs['_hidden'] = (isset($valeurs['_hidden']) ? $valeurs['_hidden'] : '') .
227
-			"<input type='hidden' name='arg' value='" . $secu['arg'] . "' />"
228
-			. "<input type='hidden' name='hash' value='" . $secu['hash'] . "' />";
226
+		$valeurs['_hidden'] = (isset($valeurs['_hidden']) ? $valeurs['_hidden'] : '').
227
+			"<input type='hidden' name='arg' value='".$secu['arg']."' />"
228
+			. "<input type='hidden' name='hash' value='".$secu['hash']."' />";
229 229
 	}
230 230
 
231 231
 	// empiler la lang en tant que premier argument implicite du CVT
Please login to merge, or discard this patch.
ecrire/balise/menu_lang_ecrire.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -99,9 +99,9 @@  discard block
 block discarded – undo
99 99
 	include_spip('inc/lang');
100 100
 
101 101
 	if ($GLOBALS['spip_lang'] <> $default) {
102
-		$opt = lang_select($default);  # et remplace
102
+		$opt = lang_select($default); # et remplace
103 103
 		if ($GLOBALS['spip_lang'] <> $default) {
104
-			$default = '';  # annule tout choix par defaut
104
+			$default = ''; # annule tout choix par defaut
105 105
 			if ($opt) {
106 106
 				lang_select();
107 107
 			}
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 
111 111
 	# lien a partir de /
112 112
 	$cible = parametre_url(self(), 'lang', '', '&');
113
-	$post = generer_url_action('converser', 'redirect=' . rawurlencode($cible), '&');
113
+	$post = generer_url_action('converser', 'redirect='.rawurlencode($cible), '&');
114 114
 
115 115
 	return array(
116 116
 		'formulaires/menu_lang',
Please login to merge, or discard this patch.
ecrire/balise/configurer_metas.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -88,5 +88,5 @@
 block discarded – undo
88 88
 		return $contexte;
89 89
 	}
90 90
 
91
-	return array('formulaires/' . $form, 3600, $contexte);
91
+	return array('formulaires/'.$form, 3600, $contexte);
92 92
 }
Please login to merge, or discard this patch.
ecrire/balise/formulaire_ecrire_auteur.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@
 block discarded – undo
84 84
 			"A.email != '' AND L.id_objet=$id");
85 85
 		foreach ($s as $row) {
86 86
 			if (email_valide($row['email'])) {
87
-				$r .= ', ' . $row['email'];
87
+				$r .= ', '.$row['email'];
88 88
 			}
89 89
 		}
90 90
 		$args[2] = substr($r, 2);
Please login to merge, or discard this patch.