spip / SPIP

ecrire/balise/url_.php

Spacing +11 added lines, -11 removed lines

@@ -76,7 +76,7 @@ 
 	if ($s = trouver_nom_serveur_distant($p)) {
 
 		// si une fonction de generation des url a ete definie pour ce connect l'utiliser
-		if (function_exists($f = 'generer_generer_url_' . $s)) {
+		if (function_exists($f = 'generer_generer_url_'.$s)) {
 			return $f($type, $_id, $s);
 		}
 		if (!$GLOBALS['connexions'][strtolower($s)]['spip_connect_version']) {
@@ -86,8 +86,8 @@ 
 		# exception des urls de documents sur un serveur distant...
 		if ($type == 'document') {
 			return
-				"quete_meta('adresse_site', $s) . '/' .\n\t" .
-				"quete_meta('dir_img', $s) . \n\t" .
+				"quete_meta('adresse_site', $s) . '/' .\n\t".
+				"quete_meta('dir_img', $s) . \n\t".
 				"quete_fichier($_id,$s)";
 		}
 		$s = ", '', '', $s, quete_meta('type_urls', $s)";
@@ -231,7 +231,7 @@ 
  */
 function balise_URL_SITE_SPIP_dist($p) {
 	$p->code = "sinon(\$GLOBALS['meta']['adresse_site'],'.')";
-	$p->code = "spip_htmlspecialchars(" . $p->code . ")";
+	$p->code = "spip_htmlspecialchars(".$p->code.")";
 	$p->interdire_scripts = false;
 
 	return $p;
@@ -272,7 +272,7 @@ 
 	if ($s = trouver_nom_serveur_distant($p)) {
 		// si une fonction de generation des url a ete definie pour ce connect l'utiliser
 		// elle devra aussi traiter le cas derogatoire type=page
-		if (function_exists($f = 'generer_generer_url_' . $s)) {
+		if (function_exists($f = 'generer_generer_url_'.$s)) {
 			if ($args and $args !== "''") {
 				$code .= ", $args";
 			}
@@ -280,7 +280,7 @@ 
 
 			return $p;
 		}
-		$s = 'connect=' . addslashes($s);
+		$s = 'connect='.addslashes($s);
 		$args = (($args and $args !== "''") ? "$args . '&$s'" : "'$s'");
 	}
 
@@ -295,7 +295,7 @@ 
 		$code = "generer_url_public($code, $args$noentities)";
 	}
 	$p->code = $code;
-	spip_log("Calcul url page : connect vaut $s ca donne :" . $p->code . " args $args", _LOG_INFO);
+	spip_log("Calcul url page : connect vaut $s ca donne :".$p->code." args $args", _LOG_INFO);
 
 	#$p->interdire_scripts = true;
 	return $p;
@@ -339,7 +339,7 @@ 
 			$fonc .= ",$args$noentities";
 		}
 	}
-	$p->code = 'generer_url_ecrire(' . $fonc . ')';
+	$p->code = 'generer_url_ecrire('.$fonc.')';
 	$p->interdire_scripts = false;
 
 	return $p;
@@ -373,17 +373,17 @@ 
 	$p->code = interprete_argument_balise(1, $p);
 	$args = interprete_argument_balise(2, $p);
 	if ($args != "''" && $args !== null) {
-		$p->code .= "," . $args;
+		$p->code .= ",".$args;
 	}
 	$redirect = interprete_argument_balise(3, $p);
 	if ($redirect != "''" && $redirect !== null) {
 		if ($args == "''" || $args === null) {
 			$p->code .= ",''";
 		}
-		$p->code .= "," . $redirect;
+		$p->code .= ",".$redirect;
 	}
 
-	$p->code = "generer_action_auteur(" . $p->code . ")";
+	$p->code = "generer_action_auteur(".$p->code.")";
 	$p->interdire_scripts = false;
 
 	return $p;

ecrire/balise/formulaire_admin.php

Spacing +9 added lines, -10 removed lines

@@ -101,8 +101,8 @@ 
 			}
 			foreach ($debug['sourcefile'] as $k => $v) {
 				if (strpos($v, 'administration.') !== false) {
-					if (isset($debug['resultat'][$k . 'tout'])) {
-						return $debug['resultat'][$k . 'tout'];
+					if (isset($debug['resultat'][$k.'tout'])) {
+						return $debug['resultat'][$k.'tout'];
 					}
 				}
 			}
@@ -178,12 +178,12 @@ 
 			and !is_array($id)
 			and $id = intval($id)
 		) {
-			$id = sql_getfetsel($_id_type, table_objet_sql($type), "$_id_type=" . intval($id));
+			$id = sql_getfetsel($_id_type, table_objet_sql($type), "$_id_type=".intval($id));
 			if ($id) {
 				$env[$_id_type] = $id;
 				$env['objet'] = $type;
 				$env['id_objet'] = $id;
-				$env['voir_' . $obj] =
+				$env['voir_'.$obj] =
 					str_replace('&', '&', generer_url_entite($id, $obj, '', '', false));
 				if ($desc = $trouver_table(table_objet_sql($type))
 					and isset($desc['field']['id_rubrique'])
@@ -237,10 +237,10 @@ 
 	$notpub = sql_in("statut", array('prop', 'prive'));
 
 	if ($type == 'article' and $GLOBALS['meta']['post_dates'] != 'oui') {
-		$notpub .= " OR (statut='publie' AND date>" . sql_quote(date('Y-m-d H:i:s')) . ")";
+		$notpub .= " OR (statut='publie' AND date>".sql_quote(date('Y-m-d H:i:s')).")";
 	}
 
-	return sql_fetsel('1', table_objet_sql($type), id_table_objet($type) . "=" . $id . " AND ($notpub)");
+	return sql_fetsel('1', table_objet_sql($type), id_table_objet($type)."=".$id." AND ($notpub)");
 }
 
 
@@ -252,7 +252,7 @@ 
  **/
 function admin_lang() {
 	$alang = sql_getfetsel('lang', 'spip_auteurs',
-		"login=" . sql_quote(preg_replace(',^@,', '', @$_COOKIE['spip_admin'])));
+		"login=".sql_quote(preg_replace(',^@,', '', @$_COOKIE['spip_admin'])));
 	if (!$alang) {
 		return '';
 	}
@@ -275,9 +275,8 @@ 
 
 	return ((!isset($GLOBALS['xhtml']) or $GLOBALS['xhtml'] !== 'true') ?
 		(parametre_url(self(), 'var_mode', 'debug', '&')
-			. '&var_mode_affiche=validation') :
-		('http://validator.w3.org/check?uri='
-			. rawurlencode("http://" . $_SERVER['HTTP_HOST'] . nettoyer_uri())));
+			. '&var_mode_affiche=validation') : ('http://validator.w3.org/check?uri='
+			. rawurlencode("http://".$_SERVER['HTTP_HOST'].nettoyer_uri())));
 }
 
 /**

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/auth/sha256.inc.php

Spacing +114 added lines, -114 removed lines

@@ -98,7 +98,7 @@ 
 				: ((defined('_NANO_SHA2_UPPER')) ? true : false);
 
 			// Deteremine if the system is 32 or 64 bit.
-			$tmpInt = (int)4294967295;
+			$tmpInt = (int) 4294967295;
 			$this->platform = ($tmpInt > 0) ? 64 : 32;
 		}
 
@@ -116,15 +116,15 @@ 
 
 			if ($x < 0) {
 				$x &= 0x7FFFFFFF;
-				$x = (float)$x+$mask;
+				$x = (float) $x + $mask;
 			}
 
 			if ($y < 0) {
 				$y &= 0x7FFFFFFF;
-				$y = (float)$y+$mask;
+				$y = (float) $y + $mask;
 			}
 
-			$r = $x+$y;
+			$r = $x + $y;
 
 			if ($r >= $n) {
 				while ($r >= $n) {
@@ -132,7 +132,7 @@ 
 				}
 			}
 
-			return (int)$r;
+			return (int) $r;
 		}
 
 		/**
@@ -145,23 +145,23 @@ 
 		function SHR($x, $n)        // x >> n
 		{
 			if ($n >= 32) {      // impose some limits to keep it 32-bit
-				return (int)0;
+				return (int) 0;
 			}
 
 			if ($n <= 0) {
-				return (int)$x;
+				return (int) $x;
 			}
 
 			$mask = 0x40000000;
 
 			if ($x < 0) {
 				$x &= 0x7FFFFFFF;
-				$mask = $mask >> ($n-1);
+				$mask = $mask >> ($n - 1);
 
 				return ($x >> $n) | $mask;
 			}
 
-			return (int)$x >> (int)$n;
+			return (int) $x >> (int) $n;
 		}
 
 		/** ROTR
@@ -170,7 +170,7 @@ 
 		 * @param int $n
 		 * @return int
 		 */
-		function ROTR($x, $n) { return (int)(($this->SHR($x, $n) | ($x << (32-$n)) & 0xFFFFFFFF)); }
+		function ROTR($x, $n) { return (int) (($this->SHR($x, $n) | ($x << (32 - $n)) & 0xFFFFFFFF)); }
 
 		/** Ch
 		 *
@@ -195,28 +195,28 @@ 
 		 * @param int $x
 		 * @return int
 		 */
-		function Sigma0($x) { return (int)($this->ROTR($x, 2) ^ $this->ROTR($x, 13) ^ $this->ROTR($x, 22)); }
+		function Sigma0($x) { return (int) ($this->ROTR($x, 2) ^ $this->ROTR($x, 13) ^ $this->ROTR($x, 22)); }
 
 		/** Sigma1
 		 *
 		 * @param int $x
 		 * @return int
 		 */
-		function Sigma1($x) { return (int)($this->ROTR($x, 6) ^ $this->ROTR($x, 11) ^ $this->ROTR($x, 25)); }
+		function Sigma1($x) { return (int) ($this->ROTR($x, 6) ^ $this->ROTR($x, 11) ^ $this->ROTR($x, 25)); }
 
 		/** Sigma_0
 		 *
 		 * @param int $x
 		 * @return int
 		 */
-		function sigma_0($x) { return (int)($this->ROTR($x, 7) ^ $this->ROTR($x, 18) ^ $this->SHR($x, 3)); }
+		function sigma_0($x) { return (int) ($this->ROTR($x, 7) ^ $this->ROTR($x, 18) ^ $this->SHR($x, 3)); }
 
 		/** Sigma_1
 		 *
 		 * @param int $x
 		 * @return int
 		 */
-		function sigma_1($x) { return (int)($this->ROTR($x, 17) ^ $this->ROTR($x, 19) ^ $this->SHR($x, 10)); }
+		function sigma_1($x) { return (int) ($this->ROTR($x, 17) ^ $this->ROTR($x, 19) ^ $this->SHR($x, 10)); }
 
 		/** String 2 ord UTF8
 		 *
@@ -271,23 +271,23 @@ 
 
 					return $h;
 				} else {
-					if ($h <= 0xDF && $index < $len-1) {
+					if ($h <= 0xDF && $index < $len - 1) {
 						$bytes = 2;
 
-						return ($h & 0x1F) << 6 | (ord($c{$index+1}) & 0x3F);
+						return ($h & 0x1F) << 6 | (ord($c{$index + 1}) & 0x3F);
 					} else {
-						if ($h <= 0xEF && $index < $len-2) {
+						if ($h <= 0xEF && $index < $len - 2) {
 							$bytes = 3;
 
-							return ($h & 0x0F) << 12 | (ord($c{$index+1}) & 0x3F) << 6
-							| (ord($c{$index+2}) & 0x3F);
+							return ($h & 0x0F) << 12 | (ord($c{$index + 1}) & 0x3F) << 6
+							| (ord($c{$index + 2}) & 0x3F);
 						} else {
-							if ($h <= 0xF4 && $index < $len-3) {
+							if ($h <= 0xF4 && $index < $len - 3) {
 								$bytes = 4;
 
-								return ($h & 0x0F) << 18 | (ord($c{$index+1}) & 0x3F) << 12
-								| (ord($c{$index+2}) & 0x3F) << 6
-								| (ord($c{$index+3}) & 0x3F);
+								return ($h & 0x0F) << 18 | (ord($c{$index + 1}) & 0x3F) << 12
+								| (ord($c{$index + 2}) & 0x3F) << 6
+								| (ord($c{$index + 3}) & 0x3F);
 							} else {
 								// pas utf mais renvoyer quand meme ce qu'on a
 								$bytes = 1;
@@ -309,19 +309,19 @@ 
 		function string2binint($str, $npad = 512) {
 			$bin = array();
 			$ords = $this->string2ordUTF8($str, $this->bytesString);
-			$npad = $npad/$this->bytesString;
+			$npad = $npad / $this->bytesString;
 			$length = count($ords);
 			$ords[] = 0x80; // append the "1" bit followed by 7 0's
-			$pad = ceil(($length+1+32/$this->bytesString)/$npad)*$npad-32/$this->bytesString;
+			$pad = ceil(($length + 1 + 32 / $this->bytesString) / $npad) * $npad - 32 / $this->bytesString;
 			$ords = array_pad($ords, $pad, 0);
-			$mask = (1 << $this->bytesString)-1;
-			for ($i = 0; $i < count($ords)*$this->bytesString; $i += $this->bytesString) {
+			$mask = (1 << $this->bytesString) - 1;
+			for ($i = 0; $i < count($ords) * $this->bytesString; $i += $this->bytesString) {
 				if (!isset($bin[$i >> 5])) {
 					$bin[$i >> 5] = 0;
 				} // pour eviter des notices.
-				$bin[$i >> 5] |= ($ords[$i/$this->bytesString] & $mask) << (24-$i%32);
+				$bin[$i >> 5] |= ($ords[$i / $this->bytesString] & $mask) << (24 - $i % 32);
 			}
-			$bin[] = $length*$this->bytesString;
+			$bin[] = $length * $this->bytesString;
 
 			return $bin;
 		}
@@ -357,8 +357,8 @@ 
 		 * @return string Hexadecimal representation of the message digest
 		 */
 		function hash($str, $ig_func = true) {
-			unset($binStr);     // binary representation of input string
-			unset($hexStr);     // 256-bit message digest in readable hex format
+			unset($binStr); // binary representation of input string
+			unset($hexStr); // 256-bit message digest in readable hex format
 
 			// check for php's internal sha256 function, ignore if ig_func==true
 			if ($ig_func == false) {
@@ -378,70 +378,70 @@ 
 			 *  of the first sixtyfour prime numbers.
 			 */
 			$K = array(
-				(int)0x428a2f98,
-				(int)0x71374491,
-				(int)0xb5c0fbcf,
-				(int)0xe9b5dba5,
-				(int)0x3956c25b,
-				(int)0x59f111f1,
-				(int)0x923f82a4,
-				(int)0xab1c5ed5,
-				(int)0xd807aa98,
-				(int)0x12835b01,
-				(int)0x243185be,
-				(int)0x550c7dc3,
-				(int)0x72be5d74,
-				(int)0x80deb1fe,
-				(int)0x9bdc06a7,
-				(int)0xc19bf174,
-				(int)0xe49b69c1,
-				(int)0xefbe4786,
-				(int)0x0fc19dc6,
-				(int)0x240ca1cc,
-				(int)0x2de92c6f,
-				(int)0x4a7484aa,
-				(int)0x5cb0a9dc,
-				(int)0x76f988da,
-				(int)0x983e5152,
-				(int)0xa831c66d,
-				(int)0xb00327c8,
-				(int)0xbf597fc7,
-				(int)0xc6e00bf3,
-				(int)0xd5a79147,
-				(int)0x06ca6351,
-				(int)0x14292967,
-				(int)0x27b70a85,
-				(int)0x2e1b2138,
-				(int)0x4d2c6dfc,
-				(int)0x53380d13,
-				(int)0x650a7354,
-				(int)0x766a0abb,
-				(int)0x81c2c92e,
-				(int)0x92722c85,
-				(int)0xa2bfe8a1,
-				(int)0xa81a664b,
-				(int)0xc24b8b70,
-				(int)0xc76c51a3,
-				(int)0xd192e819,
-				(int)0xd6990624,
-				(int)0xf40e3585,
-				(int)0x106aa070,
-				(int)0x19a4c116,
-				(int)0x1e376c08,
-				(int)0x2748774c,
-				(int)0x34b0bcb5,
-				(int)0x391c0cb3,
-				(int)0x4ed8aa4a,
-				(int)0x5b9cca4f,
-				(int)0x682e6ff3,
-				(int)0x748f82ee,
-				(int)0x78a5636f,
-				(int)0x84c87814,
-				(int)0x8cc70208,
-				(int)0x90befffa,
-				(int)0xa4506ceb,
-				(int)0xbef9a3f7,
-				(int)0xc67178f2
+				(int) 0x428a2f98,
+				(int) 0x71374491,
+				(int) 0xb5c0fbcf,
+				(int) 0xe9b5dba5,
+				(int) 0x3956c25b,
+				(int) 0x59f111f1,
+				(int) 0x923f82a4,
+				(int) 0xab1c5ed5,
+				(int) 0xd807aa98,
+				(int) 0x12835b01,
+				(int) 0x243185be,
+				(int) 0x550c7dc3,
+				(int) 0x72be5d74,
+				(int) 0x80deb1fe,
+				(int) 0x9bdc06a7,
+				(int) 0xc19bf174,
+				(int) 0xe49b69c1,
+				(int) 0xefbe4786,
+				(int) 0x0fc19dc6,
+				(int) 0x240ca1cc,
+				(int) 0x2de92c6f,
+				(int) 0x4a7484aa,
+				(int) 0x5cb0a9dc,
+				(int) 0x76f988da,
+				(int) 0x983e5152,
+				(int) 0xa831c66d,
+				(int) 0xb00327c8,
+				(int) 0xbf597fc7,
+				(int) 0xc6e00bf3,
+				(int) 0xd5a79147,
+				(int) 0x06ca6351,
+				(int) 0x14292967,
+				(int) 0x27b70a85,
+				(int) 0x2e1b2138,
+				(int) 0x4d2c6dfc,
+				(int) 0x53380d13,
+				(int) 0x650a7354,
+				(int) 0x766a0abb,
+				(int) 0x81c2c92e,
+				(int) 0x92722c85,
+				(int) 0xa2bfe8a1,
+				(int) 0xa81a664b,
+				(int) 0xc24b8b70,
+				(int) 0xc76c51a3,
+				(int) 0xd192e819,
+				(int) 0xd6990624,
+				(int) 0xf40e3585,
+				(int) 0x106aa070,
+				(int) 0x19a4c116,
+				(int) 0x1e376c08,
+				(int) 0x2748774c,
+				(int) 0x34b0bcb5,
+				(int) 0x391c0cb3,
+				(int) 0x4ed8aa4a,
+				(int) 0x5b9cca4f,
+				(int) 0x682e6ff3,
+				(int) 0x748f82ee,
+				(int) 0x78a5636f,
+				(int) 0x84c87814,
+				(int) 0x8cc70208,
+				(int) 0x90befffa,
+				(int) 0xa4506ceb,
+				(int) 0xbef9a3f7,
+				(int) 0xc67178f2
 			);
 
 			// Pre-processing: Padding the string
@@ -451,14 +451,14 @@ 
 			$M = $this->array_split($binStr, 16);
 
 			// Set the initial hash values
-			$h[0] = (int)0x6a09e667;
-			$h[1] = (int)0xbb67ae85;
-			$h[2] = (int)0x3c6ef372;
-			$h[3] = (int)0xa54ff53a;
-			$h[4] = (int)0x510e527f;
-			$h[5] = (int)0x9b05688c;
-			$h[6] = (int)0x1f83d9ab;
-			$h[7] = (int)0x5be0cd19;
+			$h[0] = (int) 0x6a09e667;
+			$h[1] = (int) 0xbb67ae85;
+			$h[2] = (int) 0x3c6ef372;
+			$h[3] = (int) 0xa54ff53a;
+			$h[4] = (int) 0x510e527f;
+			$h[5] = (int) 0x9b05688c;
+			$h[6] = (int) 0x1f83d9ab;
+			$h[7] = (int) 0x5be0cd19;
 
 			// loop through message blocks and compute hash. ( For i=1 to N : )
 			$N = count($M);
@@ -467,14 +467,14 @@ 
 				$MI = $M[$i];
 
 				// Initialize working variables
-				$_a = (int)$h[0];
-				$_b = (int)$h[1];
-				$_c = (int)$h[2];
-				$_d = (int)$h[3];
-				$_e = (int)$h[4];
-				$_f = (int)$h[5];
-				$_g = (int)$h[6];
-				$_h = (int)$h[7];
+				$_a = (int) $h[0];
+				$_b = (int) $h[1];
+				$_c = (int) $h[2];
+				$_d = (int) $h[3];
+				$_e = (int) $h[4];
+				$_f = (int) $h[5];
+				$_g = (int) $h[6];
+				$_h = (int) $h[7];
 				unset($_s0);
 				unset($_s1);
 				unset($_T1);
@@ -504,12 +504,12 @@ 
 
 				for (; $t < 64; $t++) {
 					// Continue building the message schedule as we loop
-					$_s0 = $W[($t+1) & 0x0F];
+					$_s0 = $W[($t + 1) & 0x0F];
 					$_s0 = $this->sigma_0($_s0);
-					$_s1 = $W[($t+14) & 0x0F];
+					$_s1 = $W[($t + 14) & 0x0F];
 					$_s1 = $this->sigma_1($_s1);
 
-					$W[$t & 0xF] = $this->addmod2n($this->addmod2n($this->addmod2n($W[$t & 0xF], $_s0), $_s1), $W[($t+9) & 0x0F]);
+					$W[$t & 0xF] = $this->addmod2n($this->addmod2n($this->addmod2n($W[$t & 0xF], $_s0), $_s1), $W[($t + 9) & 0x0F]);
 
 					// Compute hash
 					$_T1 = $this->addmod2n($this->addmod2n($this->addmod2n($this->addmod2n($_h, $this->Sigma1($_e)),

ecrire/prive.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 		// On reexecute pour deboucher sur le include public.
 		// autrement on insiste
 		if (is_array($var_auth)) {
-			$var_auth = '../?' . $_SERVER['QUERY_STRING'];
+			$var_auth = '../?'.$_SERVER['QUERY_STRING'];
 			spip_setcookie('spip_session', $_COOKIE['spip_session'], time() + 3600 * 24 * 14);
 		}
 		include_spip('inc/headers');

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/installer.php

Spacing +6 added lines, -6 removed lines

@@ -65,14 +65,14 @@ 
 	}
 	$dir = constant($dir);
 	foreach ($infos['install'] as $file) {
-		$file = $dir . $plug . "/" . trim($file);
+		$file = $dir.$plug."/".trim($file);
 		if (file_exists($file)) {
 			include_once($file);
 		}
 	}
 	$version = isset($infos['schema']) ? $infos['schema'] : '';
 	$arg = $infos;
-	$f = $infos['prefix'] . "_install";
+	$f = $infos['prefix']."_install";
 	if (!function_exists($f)) {
 		$f = isset($infos['schema']) ? 'spip_plugin_install' : '';
 	} else {
@@ -94,7 +94,7 @@ 
 		return true;
 	}
 	// Si install et que l'on a la meta d'installation, c'est un upgrade
-	if ($action == 'install' && !is_null(lire_meta($infos['prefix'] . '_base_version'))) {
+	if ($action == 'install' && !is_null(lire_meta($infos['prefix'].'_base_version'))) {
 		$infos['upgrade'] = true;
 	}
 
@@ -120,7 +120,7 @@ 
 	if (isset($infos['meta']) and (($table = $infos['meta']) !== 'meta')) {
 		$nom_meta = "base_version";
 	} else {
-		$nom_meta = $prefix . "_base_version";
+		$nom_meta = $prefix."_base_version";
 		$table = 'meta';
 	}
 	switch ($action) {
@@ -130,12 +130,12 @@ 
 				and spip_version_compare($GLOBALS[$table][$nom_meta], $version_cible, '>='));
 			break;
 		case 'install':
-			if (function_exists($upgrade = $prefix . "_upgrade")) {
+			if (function_exists($upgrade = $prefix."_upgrade")) {
 				$upgrade($nom_meta, $version_cible, $table);
 			}
 			break;
 		case 'uninstall':
-			if (function_exists($vider_tables = $prefix . "_vider_tables")) {
+			if (function_exists($vider_tables = $prefix."_vider_tables")) {
 				$vider_tables($nom_meta, $table);
 			}
 			break;

ecrire/plugins/infos_plugin.php

Spacing +1 added lines, -1 removed lines

@@ -122,7 +122,7 @@
 	if (isset($arbre['erreur'])) {
 		$ret['erreur'] = $arbre['erreur'];
 		if ($plug) {
-			spip_log("infos_plugin $plug " . @join(' ', $arbre['erreur']));
+			spip_log("infos_plugin $plug ".@join(' ', $arbre['erreur']));
 		}
 	}
 

ecrire/plugins/get_infos.php

Spacing +5 added lines, -5 removed lines

@@ -37,7 +37,7 @@ 
 	static $filecache = '';
 
 	if ($cache === '') {
-		$filecache = _DIR_TMP . "plugin_xml_cache.gz";
+		$filecache = _DIR_TMP."plugin_xml_cache.gz";
 		if (is_file($filecache)) {
 			lire_fichier($filecache, $contenu);
 			$cache = unserialize($contenu);
@@ -90,8 +90,8 @@ 
 
 
 function plugins_get_infos_un($plug, $reload, $dir, &$cache) {
-	if (!is_readable($file = "$dir$plug/" . ($desc = "paquet") . ".xml")) {
-		if (!is_readable($file = "$dir$plug/" . ($desc = "plugin") . ".xml")) {
+	if (!is_readable($file = "$dir$plug/".($desc = "paquet").".xml")) {
+		if (!is_readable($file = "$dir$plug/".($desc = "plugin").".xml")) {
 			return false;
 		}
 	}
@@ -118,7 +118,7 @@ 
 		return false;
 	}
 
-	$f = charger_fonction('infos_' . $desc, 'plugins');
+	$f = charger_fonction('infos_'.$desc, 'plugins');
 	$ret = $f($texte, $plug, $dir);
 	$ret['filemtime'] = $time;
 	$ret['md5_file'] = $md5;
@@ -128,7 +128,7 @@ 
 	if (isset($ret['prefix']) and $ret['prefix'] == 'spip') {
 		$ret['procure']['php'] = array('nom' => 'php', 'version' => phpversion());
 		foreach (get_loaded_extensions() as $ext) {
-			$ret['procure']['php:' . $ext] = array('nom' => 'php:' . $ext, 'version' => phpversion($ext));
+			$ret['procure']['php:'.$ext] = array('nom' => 'php:'.$ext, 'version' => phpversion($ext));
 		}
 	}
 	$diff = ($ret != $pcache);