spip / SPIP

ecrire/xml/interfaces.php

Spacing +13 added lines, -13 removed lines

@@ -23,23 +23,23 @@
 
 define('_SUB_REGEXP_SYMBOL', '[\w_:.-]');
 
-define('_REGEXP_NMTOKEN', '/^' . _SUB_REGEXP_SYMBOL . '+$/');
+define('_REGEXP_NMTOKEN', '/^'._SUB_REGEXP_SYMBOL.'+$/');
 
-define('_REGEXP_NMTOKENS', '/^(' . _SUB_REGEXP_SYMBOL . '+\s*)*$/');
+define('_REGEXP_NMTOKENS', '/^('._SUB_REGEXP_SYMBOL.'+\s*)*$/');
 
-define('_REGEXP_ID', '/^[A-Za-z_:]' . _SUB_REGEXP_SYMBOL . '*$/');
+define('_REGEXP_ID', '/^[A-Za-z_:]'._SUB_REGEXP_SYMBOL.'*$/');
 
-define('_REGEXP_ENTITY_USE', '/%(' . _SUB_REGEXP_SYMBOL . '+);/');
-define('_REGEXP_ENTITY_DEF', '/^%(' . _SUB_REGEXP_SYMBOL . '+);/');
+define('_REGEXP_ENTITY_USE', '/%('._SUB_REGEXP_SYMBOL.'+);/');
+define('_REGEXP_ENTITY_DEF', '/^%('._SUB_REGEXP_SYMBOL.'+);/');
 define('_REGEXP_TYPE_XML', 'PUBLIC|SYSTEM|INCLUDE|IGNORE|CDATA');
-define('_REGEXP_ENTITY_DECL', '/^<!ENTITY\s+(%?)\s*(' .
-	_SUB_REGEXP_SYMBOL .
-	'+;?)\s+(' .
-	_REGEXP_TYPE_XML .
-	')?\s*(' .
-	"('([^']*)')" .
-	'|("([^"]*)")' .
-	'|\s*(%' . _SUB_REGEXP_SYMBOL . '+;)\s*' .
+define('_REGEXP_ENTITY_DECL', '/^<!ENTITY\s+(%?)\s*('.
+	_SUB_REGEXP_SYMBOL.
+	'+;?)\s+('.
+	_REGEXP_TYPE_XML.
+	')?\s*('.
+	"('([^']*)')".
+	'|("([^"]*)")'.
+	'|\s*(%'._SUB_REGEXP_SYMBOL.'+;)\s*'.
 	')\s*(--.*?--)?("([^"]*)")?\s*>\s*(.*)$/s');
 
 define('_REGEXP_INCLUDE_USE', '/^<!\[\s*%\s*([^;]*);\s*\[\s*(.*)$/s');

ecrire/public/admin.php

Spacing +2 added lines, -2 removed lines

@@ -37,11 +37,11 @@
 	include_spip('inc/filtres');
 
 	// Inserer le css d'admin
-	$css = "<link rel='stylesheet' href='" . url_absolue(direction_css(find_in_path('spip_admin.css')))
+	$css = "<link rel='stylesheet' href='".url_absolue(direction_css(find_in_path('spip_admin.css')))
 		. "' type='text/css' />\n";
 	if ($f = find_in_path('spip_admin_perso.css')) {
 		$css .= "<link rel='stylesheet' href='"
-			. url_absolue(direction_css($f)) . "' type='text/css' />\n";
+			. url_absolue(direction_css($f))."' type='text/css' />\n";
 	}
 
 	($pos = stripos($contenu, '</head>'))

ecrire/inc/cvt_multietapes.php

Spacing +2 added lines, -2 removed lines

@@ -298,9 +298,9 @@
 		and ($e = $flux['args']['contexte']['_etape']) > 1
 		and $ext = $flux['args']['ext']
 		and $f = $flux['data']
-		and file_exists($f . "_$e.$ext")
+		and file_exists($f."_$e.$ext")
 	) {
-		$flux['data'] = $f . "_$e";
+		$flux['data'] = $f."_$e";
 	}
 
 	return $flux;

ecrire/inc/journal.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 		return;
 	}
 	if ($opt) {
-		$phrase .= ' :: ' . str_replace("\n", ' ', join(', ', $opt));
+		$phrase .= ' :: '.str_replace("\n", ' ', join(', ', $opt));
 	}
 	spip_log($phrase, 'journal');
 }

ecrire/inc/json.php

Spacing +7 added lines, -7 removed lines

@@ -31,11 +31,11 @@ 
 		case is_null($var):
 			return 'null';
 		case is_string($var):
-			return '"' . addcslashes($var, "\"\\\n\r/") . '"';
+			return '"'.addcslashes($var, "\"\\\n\r/").'"';
 		case is_bool($var):
 			return $var ? 'true' : 'false';
 		case is_scalar($var):
-			return (string)$var;
+			return (string) $var;
 		case is_object($var):// blam
 			$var = get_object_vars($var);
 			$asso = true;
@@ -50,19 +50,19 @@ 
 			if ($asso) {
 				$ret = '{';
 				foreach ($var as $key => $elt) {
-					$ret .= $sep . '"' . $key . '":' . var2js($elt);
+					$ret .= $sep.'"'.$key.'":'.var2js($elt);
 					$sep = ',';
 				}
 
-				return $ret . '}';
+				return $ret.'}';
 			} else {
 				$ret = '[';
 				foreach ($var as $elt) {
-					$ret .= $sep . var2js($elt);
+					$ret .= $sep.var2js($elt);
 					$sep = ',';
 				}
 
-				return $ret . ']';
+				return $ret.']';
 			}
 	}
 
@@ -82,7 +82,7 @@ 
 	// flag indiquant qu'on est en iframe et qu'il faut proteger nos
 	// donnees dans un <textarea> ; attention $_FILES a ete vide par array_pop
 	if (defined('FILE_UPLOAD')) {
-		return '<textarea>' . spip_htmlspecialchars($var) . '</textarea>';
+		return '<textarea>'.spip_htmlspecialchars($var).'</textarea>';
 	} else {
 		return $var;
 	}

ecrire/inc/lien_court.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 	$coupe_url = defined('_MAX_COUPE_URL') ? _MAX_COUPE_URL : 35;
 
 	if (strlen($url) > $long_url) {
-		$url = substr($url, 0, $coupe_url) . '...';
+		$url = substr($url, 0, $coupe_url).'...';
 	}
 
 	return $url;

ecrire/inc/simplexml_to_array.php

Spacing +7 added lines, -7 removed lines

@@ -57,8 +57,8 @@ 
 			$namespace[null] = null;
 		}
 
-		$name = strtolower((string)$obj->getName());
-		$text = trim((string)$obj);
+		$name = strtolower((string) $obj->getName());
+		$text = trim((string) $obj);
 		if (strlen($text) <= 0) {
 			$text = null;
 		}
@@ -71,10 +71,10 @@ 
 			// attributes
 			$objAttributes = $obj->attributes($ns, true);
 			foreach ($objAttributes as $attributeName => $attributeValue) {
-				$attribName = strtolower(trim((string)$attributeName));
-				$attribVal = trim((string)$attributeValue);
+				$attribName = strtolower(trim((string) $attributeName));
+				$attribVal = trim((string) $attributeValue);
 				if (!empty($ns)) {
-					$attribName = $ns . ':' . $attribName;
+					$attribName = $ns.':'.$attribName;
 				}
 				$attributes[$attribName] = $attribVal;
 			}
@@ -82,9 +82,9 @@ 
 			// children
 			$objChildren = $obj->children($ns, true);
 			foreach ($objChildren as $childName => $child) {
-				$childName = strtolower((string)$childName);
+				$childName = strtolower((string) $childName);
 				if (!empty($ns)) {
-					$childName = $ns . ':' . $childName;
+					$childName = $ns.':'.$childName;
 				}
 				$children[$childName][] = xmlObjToArr($child, $namespace);
 			}

ecrire/base/delete_all.php

Spacing +1 added lines, -1 removed lines

@@ -51,5 +51,5 @@
 	}
 	$d = count($delete);
 	$r = count($res);
-	spip_log("Tables detruites: $r sur $d: " . join(', ', $res), _LOG_INFO_IMPORTANTE);
+	spip_log("Tables detruites: $r sur $d: ".join(', ', $res), _LOG_INFO_IMPORTANTE);
 }

ecrire/inc/actions.php

Spacing +5 added lines, -5 removed lines

@@ -78,7 +78,7 @@ 
  *     Code HTML du formulaire
  */
 function redirige_action_auteur($action, $arg, $ret, $gra = '', $mode = false, $atts = '', $public = false) {
-	$r = ($public ? _DIR_RESTREINT_ABS : _DIR_RESTREINT) . generer_url_ecrire($ret, $gra, true, true);
+	$r = ($public ? _DIR_RESTREINT_ABS : _DIR_RESTREINT).generer_url_ecrire($ret, $gra, true, true);
 
 	return generer_action_auteur($action, $arg, $r, $mode, $atts, $public);
 }
@@ -105,9 +105,9 @@ 
  *     URL, code HTML du formulaire ou tableau (action, arg, hash)
  */
 function redirige_action_post($action, $arg, $ret, $gra, $corps, $att = '') {
-	$r = _DIR_RESTREINT . generer_url_ecrire($ret, $gra, false, true);
+	$r = _DIR_RESTREINT.generer_url_ecrire($ret, $gra, false, true);
 
-	return generer_action_auteur($action, $arg, $r, $corps, $att . " method='post'");
+	return generer_action_auteur($action, $arg, $r, $corps, $att." method='post'");
 }
 
 
@@ -138,8 +138,8 @@ 
 	}
 
 	$c = $GLOBALS['meta']['charset'];
-	header('Content-Type: ' . $content_type . '; charset=' . $c);
-	$debut = (($xml and strlen(trim($corps))) ? '<' . "?xml version='1.0' encoding='" . $c . "'?" . ">\n" : '');
+	header('Content-Type: '.$content_type.'; charset='.$c);
+	$debut = (($xml and strlen(trim($corps))) ? '<'."?xml version='1.0' encoding='".$c."'?".">\n" : '');
 	$fin = '';
 
 	echo $debut, $corps, $fin, $e;