Completed
Pull Request — master (#36)
by
unknown
06:08
created
prive/formulaires/editer_liens.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
 
105 105
 	// L'éditabilité :) est définie par un test permanent (par exemple "associermots") ET le 4ème argument
106 106
 	include_spip('inc/autoriser');
107
-	$editable = ($editable and autoriser('associer' . $table_source, $objet, $id_objet)
107
+	$editable = ($editable and autoriser('associer'.$table_source, $objet, $id_objet)
108 108
 		and autoriser('modifier', $objet, $id_objet));
109 109
 
110 110
 	if (!$editable and !count(objet_trouver_liens(
@@ -116,15 +116,15 @@  discard block
 block discarded – undo
116 116
 
117 117
 	// squelettes de vue et de d'association
118 118
 	// ils sont différents si des rôles sont définis.
119
-	$skel_vue = $table_source . '_lies';
120
-	$skel_ajout = $table_source . '_associer';
119
+	$skel_vue = $table_source.'_lies';
120
+	$skel_ajout = $table_source.'_associer';
121 121
 
122 122
 	// description des roles
123 123
 	include_spip('inc/roles');
124 124
 	if ($roles = roles_presents($objet_source, $objet)) {
125 125
 		// on demande de nouveaux squelettes en conséquence
126
-		$skel_vue = $table_source . '_roles_lies';
127
-		$skel_ajout = $table_source . '_roles_associer';
126
+		$skel_vue = $table_source.'_roles_lies';
127
+		$skel_ajout = $table_source.'_roles_associer';
128 128
 	}
129 129
 
130 130
 	$valeurs = array(
@@ -374,7 +374,7 @@  discard block
 block discarded – undo
374 374
 function lien_retrouver_qualif($objet_lien, $lien) {
375 375
 	// un role est défini dans la liaison
376 376
 	$defs = explode('-', $lien);
377
-	list($objet1, , $objet2, , $role) = $defs;
377
+	list($objet1,, $objet2,, $role) = $defs;
378 378
 	if ($objet_lien == $objet1) {
379 379
 		$colonne_role = roles_colonne($objet1, $objet2);
380 380
 	} else {
Please login to merge, or discard this patch.
prive/formulaires/rediriger_article.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 		return false;
22 22
 	}
23 23
 
24
-	$row = sql_fetsel('id_article,virtuel', 'spip_articles', 'id_article=' . intval($id_article));
24
+	$row = sql_fetsel('id_article,virtuel', 'spip_articles', 'id_article='.intval($id_article));
25 25
 	if (!$row['id_article']) {
26 26
 		return false;
27 27
 	}
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 function formulaires_rediriger_article_verifier_dist($id_article, $retour = '') {
49 49
 	$erreurs = array();
50 50
 
51
-	if (($redirection = _request('redirection')) == $id_article || $redirection == 'art' . $id_article) {
51
+	if (($redirection = _request('redirection')) == $id_article || $redirection == 'art'.$id_article) {
52 52
 		$erreurs['redirection'] = _T('info_redirection_boucle');
53 53
 	}
54 54
 
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 	$js = _AJAX ? '<script type="text/javascript">if (window.ajaxReload) ajaxReload("wysiwyg");</script>' : '';
69 69
 
70 70
 	return array(
71
-		'message_ok' => ($url ? _T('info_redirection_activee') : _T('info_redirection_desactivee')) . $js,
71
+		'message_ok' => ($url ? _T('info_redirection_activee') : _T('info_redirection_desactivee')).$js,
72 72
 		'editable' => true
73 73
 	);
74 74
 }
Please login to merge, or discard this patch.
prive/formulaires/configurer_relayeur.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 				include_spip('inc/texte'); // pour aide, couper, lang
49 49
 				$info = '';
50 50
 				if (!need_proxy($t['host'], $http_proxy, $http_noproxy)) {
51
-					$info = '<strong>' . _T('page_pas_proxy') . '</strong><br />';
51
+					$info = '<strong>'._T('page_pas_proxy').'</strong><br />';
52 52
 				}
53 53
 
54 54
 				// il faut fausser le proxy actuel pour faire le test !
@@ -60,14 +60,14 @@  discard block
 block discarded – undo
60 60
 				$GLOBALS['meta']['http_proxy'] = $cur_http_proxy;
61 61
 				$GLOBALS['meta']['http_noproxy'] = $cur_http_noproxy;
62 62
 				if ($page) {
63
-					$erreurs['message_ok'] = _T('info_proxy_ok') . "<br />$info\n<tt>" . couper(entites_html($page), 300) . '</tt>';
63
+					$erreurs['message_ok'] = _T('info_proxy_ok')."<br />$info\n<tt>".couper(entites_html($page), 300).'</tt>';
64 64
 					$erreurs['message_erreur'] = '';
65 65
 				} else {
66
-					$erreurs['message_erreur'] = $info . _T(
66
+					$erreurs['message_erreur'] = $info._T(
67 67
 						'info_impossible_lire_page',
68 68
 						array('test_proxy' => "<tt>$test_proxy</tt>")
69 69
 					)
70
-						. ' <b><tt>' . no_password_proxy_url($http_proxy) . '</tt></b>.'
70
+						. ' <b><tt>'.no_password_proxy_url($http_proxy).'</tt></b>.'
71 71
 						. aider('confhttpproxy');
72 72
 				}
73 73
 			}
@@ -111,23 +111,23 @@  discard block
 block discarded – undo
111 111
 		return false;
112 112
 	}
113 113
 	// scheme
114
-	$uri = (!empty($url['scheme'])) ? $url['scheme'] . '://' : '';
114
+	$uri = (!empty($url['scheme'])) ? $url['scheme'].'://' : '';
115 115
 	// user & pass
116 116
 	if (!empty($url['user'])) {
117
-		$uri .= $url['user'] . ':' . $url['pass'] . '@';
117
+		$uri .= $url['user'].':'.$url['pass'].'@';
118 118
 	}
119 119
 	// host
120 120
 	$uri .= $url['host'];
121 121
 	// port
122
-	$port = (!empty($url['port'])) ? ':' . $url['port'] : '';
122
+	$port = (!empty($url['port'])) ? ':'.$url['port'] : '';
123 123
 	$uri .= $port;
124 124
 	// path
125 125
 	$uri .= $url['path'];
126 126
 // fragment or query
127 127
 	if (isset($url['fragment'])) {
128
-		$uri .= '#' . $url['fragment'];
128
+		$uri .= '#'.$url['fragment'];
129 129
 	} elseif (isset($url['query'])) {
130
-		$uri .= '?' . $url['query'];
130
+		$uri .= '?'.$url['query'];
131 131
 	}
132 132
 
133 133
 	return $uri;
Please login to merge, or discard this patch.
prive/formulaires/configurer_reducteur.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -142,5 +142,5 @@
 block discarded – undo
142 142
 			break;
143 143
 	}
144 144
 
145
-	return generer_url_action('tester', "arg=$process&time=" . time());
145
+	return generer_url_action('tester', "arg=$process&time=".time());
146 146
 }
Please login to merge, or discard this patch.
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.