spip / SPIP

ecrire/genie/mail.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 		$headers = "";
 		if (isset($page['entetes']) and count($page['entetes'])) {
 			foreach ($page['entetes'] as $k => $v) {
-				$headers .= (strlen($v) ? "$k: $v" : $k) . "\n";
+				$headers .= (strlen($v) ? "$k: $v" : $k)."\n";
 			}
 		}
 

ecrire/typographie/fr.php

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
 
 	$cherche2 = array(
 		'/([^-\n]|^)--([^-]|$)/S',
-		',(' . _PROTOCOLES_STD . ')~((://[^"\'\s\[\]\}\)<>]+)~([?]))?,S',
+		',('._PROTOCOLES_STD.')~((://[^"\'\s\[\]\}\)<>]+)~([?]))?,S',
 		'/~/'
 	);
 	$remplace2 = array(

ecrire/balise/url_logout.php

Spacing +1 added lines, -1 removed lines

@@ -73,5 +73,5 @@
 		return '';
 	}
 
-	return generer_url_action('logout', "logout=public&url=" . rawurlencode($cible ? $cible : self('&')));
+	return generer_url_action('logout', "logout=public&url=".rawurlencode($cible ? $cible : self('&')));
 }

ecrire/balise/menu_lang_ecrire.php

Spacing +3 added lines, -3 removed lines

@@ -99,9 +99,9 @@ 
 	include_spip('inc/lang');
 
 	if ($GLOBALS['spip_lang'] <> $default) {
-		$opt = lang_select($default);  # et remplace
+		$opt = lang_select($default); # et remplace
 		if ($GLOBALS['spip_lang'] <> $default) {
-			$default = '';  # annule tout choix par defaut
+			$default = ''; # annule tout choix par defaut
 			if ($opt) {
 				lang_select();
 			}
@@ -110,7 +110,7 @@ 
 
 	# lien a partir de /
 	$cible = parametre_url(self(), 'lang', '', '&');
-	$post = generer_url_action('converser', 'redirect=' . rawurlencode($cible), '&');
+	$post = generer_url_action('converser', 'redirect='.rawurlencode($cible), '&');
 
 	return array(
 		'formulaires/menu_lang',

ecrire/balise/formulaire_ecrire_auteur.php

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
 			"A.email != '' AND L.id_objet=$id");
 		foreach ($s as $row) {
 			if (email_valide($row['email'])) {
-				$r .= ', ' . $row['email'];
+				$r .= ', '.$row['email'];
 			}
 		}
 		$args[2] = substr($r, 2);

ecrire/auth/ldap.php

Spacing +5 added lines, -5 removed lines

@@ -68,7 +68,7 @@ 
 	$credentials_ldap = array('ldap_dn' => $dn, 'ldap_password' => $pass);
 
 	// Si l'utilisateur figure deja dans la base, y recuperer les infos
-	$r = sql_fetsel("*", "spip_auteurs", "login=" . sql_quote($login) . " AND source='ldap'", '', '', '', '', $serveur);
+	$r = sql_fetsel("*", "spip_auteurs", "login=".sql_quote($login)." AND source='ldap'", '', '', '', '', $serveur);
 
 	if ($r) {
 		return array_merge($r, $credentials_ldap);
@@ -91,7 +91,7 @@ 
 	if ($r) {
 		return array_merge(
 			$credentials_ldap,
-			sql_fetsel("*", "spip_auteurs", "id_auteur=" . intval($r), '', '', '', '', $serveur)
+			sql_fetsel("*", "spip_auteurs", "id_auteur=".intval($r), '', '', '', '', $serveur)
 		);
 	}
 
@@ -120,7 +120,7 @@ 
 	$connexion = spip_connect($serveur);
 	if (!is_array($connexion['ldap'])) {
 		if ($connexion['authentification']['ldap']) {
-			$f = _DIR_CONNECT . $connexion['authentification']['ldap'];
+			$f = _DIR_CONNECT.$connexion['authentification']['ldap'];
 			unset($GLOBALS['ldap_link']);
 			if (is_readable($f)) {
 				include_once($f);
@@ -168,7 +168,7 @@ 
 
 	$ldap_link = isset($ldap['link']) ? $ldap['link'] : null;
 	$ldap_base = isset($ldap['base']) ? $ldap['base'] : null;
-	$desc = isset($ldap['attributes']) && $ldap['attributes'] ? $ldap['attributes'] : $GLOBALS['ldap_attributes'] ;
+	$desc = isset($ldap['attributes']) && $ldap['attributes'] ? $ldap['attributes'] : $GLOBALS['ldap_attributes'];
 
 	$logins = is_array($desc['login']) ? $desc['login'] : array($desc['login']);
 
@@ -333,7 +333,7 @@ 
 	if (!ldap_bind($link, $dn, session_get('ldap_password'))) {
 		return false;
 	}
-	$encoded_pass = "{MD5}" . base64_encode(pack("H*", md5($new_pass)));
+	$encoded_pass = "{MD5}".base64_encode(pack("H*", md5($new_pass)));
 	$success = ldap_mod_replace($link, $dn, array('userPassword' => $encoded_pass));
 
 	return $success;

ecrire/plugins/afficher_nom_plugin.php

Spacing +6 added lines, -6 removed lines

@@ -38,7 +38,7 @@ 
 
 	// numerotons les occurences d'un meme prefix
 	$versions[$info['prefix']] = isset($versions[$info['prefix']]) ? $versions[$info['prefix']] + 1 : '';
-	$id = $info['prefix'] . $versions[$info['prefix']];
+	$id = $info['prefix'].$versions[$info['prefix']];
 
 	$class = $class_li;
 	$class .= $actif ? " actif" : "";
@@ -55,15 +55,15 @@ 
 	$prefix = $info['prefix'];
 	$dir = "$dir_plugins$plug_file/lang/$prefix";
 	$desc = plugin_propre($info['description'], $dir);
-	$url_stat = parametre_url($url_page, "plugin", $dir_plugins . $plug_file);
+	$url_stat = parametre_url($url_page, "plugin", $dir_plugins.$plug_file);
 
-	$s .= "<strong class='nom'>" . typo($info['nom']) . "</strong>";
-	$s .= " <span class='version'>" . $info['version'] . "</span>";
-	$s .= " <span class='etat'> - " . plugin_etat_en_clair($info['etat']) . "</span>";
+	$s .= "<strong class='nom'>".typo($info['nom'])."</strong>";
+	$s .= " <span class='version'>".$info['version']."</span>";
+	$s .= " <span class='etat'> - ".plugin_etat_en_clair($info['etat'])."</span>";
 	$s .= "</div>";
 
 	if ($erreur) {
-		$s .= "<div class='erreur'>" . join('<br >', $info['erreur']) . "</div>";
+		$s .= "<div class='erreur'>".join('<br >', $info['erreur'])."</div>";
 	}
 
 	$s .= "</li>";

ecrire/plugins/verifie_conformite.php

Spacing +11 added lines, -11 removed lines

@@ -47,7 +47,7 @@ 
 		}
 	}
 	if (is_null($p)) {
-		$arbre = array('erreur' => array(_T('erreur_plugin_tag_plugin_absent') . " : $plug"));
+		$arbre = array('erreur' => array(_T('erreur_plugin_tag_plugin_absent')." : $plug"));
 		$silence = true;
 	} else {
 		$arbre = $p;
@@ -82,15 +82,15 @@ 
 		if (isset($arbre['etat'])) {
 			$etat = trim(end($arbre['etat']));
 			if (!in_array($etat, $etats)) {
-				$arbre['erreur'][] = _T('erreur_plugin_etat_inconnu') . " : '$etat'";
+				$arbre['erreur'][] = _T('erreur_plugin_etat_inconnu')." : '$etat'";
 			}
 		}
 		if (isset($arbre['options'])) {
 			foreach ($arbre['options'] as $optfile) {
 				$optfile = trim($optfile);
-				if (!@is_readable($dir_plugins . "$plug/$optfile")) {
+				if (!@is_readable($dir_plugins."$plug/$optfile")) {
 					if (!$silence) {
-						$arbre['erreur'][] = _T('erreur_plugin_fichier_absent') . " : $optfile";
+						$arbre['erreur'][] = _T('erreur_plugin_fichier_absent')." : $optfile";
 					}
 				}
 			}
@@ -98,9 +98,9 @@ 
 		if (isset($arbre['fonctions'])) {
 			foreach ($arbre['fonctions'] as $optfile) {
 				$optfile = trim($optfile);
-				if (!@is_readable($dir_plugins . "$plug/$optfile")) {
+				if (!@is_readable($dir_plugins."$plug/$optfile")) {
 					if (!$silence) {
-						$arbre['erreur'][] = _T('erreur_plugin_fichier_absent') . " : $optfile";
+						$arbre['erreur'][] = _T('erreur_plugin_fichier_absent')." : $optfile";
 					}
 				}
 			}
@@ -134,14 +134,14 @@ 
 			// verif que la methode a un nom autorise
 			if (in_array(strtolower($action), $liste_methodes_reservees)) {
 				if (!$silence) {
-					$arbre['erreur'][] = _T("erreur_plugin_nom_fonction_interdit") . " : $action";
+					$arbre['erreur'][] = _T("erreur_plugin_nom_fonction_interdit")." : $action";
 				}
 			}
 			if (isset($pipe['inclure'])) {
-				$inclure = $dir_plugins . "$plug/" . $pipe['inclure'];
+				$inclure = $dir_plugins."$plug/".$pipe['inclure'];
 				if (!@is_readable($inclure)) {
 					if (!$silence) {
-						$arbre['erreur'][] = _T('erreur_plugin_fichier_absent') . " : $inclure";
+						$arbre['erreur'][] = _T('erreur_plugin_fichier_absent')." : $inclure";
 					}
 				}
 			}
@@ -207,9 +207,9 @@ 
 			foreach ($arbre['noisette'] as $k => $nut) {
 				$nut = preg_replace(',[.]html$,uims', '', trim($nut));
 				$arbre['noisette'][$k] = $nut;
-				if (!@is_readable($dir_plugins . "$plug/$nut.html")) {
+				if (!@is_readable($dir_plugins."$plug/$nut.html")) {
 					if (!$silence) {
-						$arbre['erreur'][] = _T('erreur_plugin_fichier_absent') . " : $nut";
+						$arbre['erreur'][] = _T('erreur_plugin_fichier_absent')." : $nut";
 					}
 				}
 			}

ecrire/plugins/afficher_repertoires.php

Spacing +5 added lines, -5 removed lines

@@ -58,8 +58,8 @@ 
 				$plug = $liste_plugins[$key];
 				$actif = @isset($fast_liste_plugins_actifs[$plug]);
 				$id = substr(md5($plug), 0, 16);
-				$res .= $ligne_plug($url_page, str_replace(_DIR_PLUGINS, '', _DIR_RACINE . $plug), $actif,
-						'menu-entree') . "\n";
+				$res .= $ligne_plug($url_page, str_replace(_DIR_PLUGINS, '', _DIR_RACINE.$plug), $actif,
+						'menu-entree')."\n";
 				unset($liste_plugins[$key]);
 			}
 		}
@@ -101,12 +101,12 @@ 
 	}
 	$chemin = "";
 	if (count($tcom)) {
-		$chemin .= implode("/", $tcom) . "/";
+		$chemin .= implode("/", $tcom)."/";
 	}
 	// ouvrir les repertoires jusqu'a la cible
 	while ($open = array_shift($ttarg)) {
-		$visible = @isset($deplie[$chemin . $open]);
-		$chemin .= $open . "/";
+		$visible = @isset($deplie[$chemin.$open]);
+		$chemin .= $open."/";
 		$output .= "<li>";
 		$output .= bouton_block_depliable($chemin, $visible);
 		$output .= debut_block_depliable($visible);