spip / SPIP

prive/objets/liste/auteurs_fonctions.php

Spacing +1 added lines, -1 removed lines

@@ -154,7 +154,7 @@
 	) {
 		return parametre_url(parametre_url(generer_url_ecrire('message_edit', 'new=oui'), 'to', $id_auteur), 'redirect', self());
 	} elseif (strlen($email) and autoriser('voir', 'auteur', $id_auteur)) {
-		return 'mailto:' . $email;
+		return 'mailto:'.$email;
 	} else {
 		return '';
 	}

prive/formulaires/configurer_reducteur.php

Spacing +1 added lines, -1 removed lines

@@ -142,5 +142,5 @@
 			break;
 	}
 
-	return generer_url_action('tester', "arg=$process&time=" . time());
+	return generer_url_action('tester', "arg=$process&time=".time());
 }

prive/formulaires/configurer_langage.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 		$checked = ($l == $selected) ? ' checked=\'checked\'' : '';
 		$ret .= "<div class='choix'>"
 			. "<input type='radio' name='$name' id='{$id}_$l' value='$l'$checked />"
-			. "<label for='{$id}_$l'>" . traduire_nom_langue($l) . '</label>'
+			. "<label for='{$id}_$l'>".traduire_nom_langue($l).'</label>'
 			. '</div>';
 	}
 

ecrire/action/session.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 	) {
 		if ($_SERVER['REQUEST_METHOD'] == 'POST') {
 			include_spip('inc/session');
-			session_set('session_' . $var, $val = _request('val'));
+			session_set('session_'.$var, $val = _request('val'));
 			#spip_log("autosave:$var:$val",'autosave');
 		}
 	}

ecrire/install/etape_ldap2.php

Spacing +5 added lines, -5 removed lines

@@ -66,7 +66,7 @@ 
 		echo info_etape(
 			_T('titre_connexion_ldap'),
 			info_progression_etape(2, 'etape_ldap', 'install/')
-		),  _T('info_connexion_ldap_ok');
+		), _T('info_connexion_ldap_ok');
 		echo generer_form_ecrire('install', (
 			"\n<input type='hidden' name='etape' value='ldap3' />"
 			. "\n<input type='hidden' name='adresse_ldap' value=\"$adresse_ldap\" />"
@@ -78,10 +78,10 @@ 
 			. bouton_suivant()));
 	} else {
 		echo info_etape(_T('titre_connexion_ldap')), info_progression_etape(1, 'etape_ldap', 'install/', true),
-			"<div class='error'><p>" . _T('avis_connexion_ldap_echec_1') . '</p>',
-			'<p>' . _T('avis_connexion_ldap_echec_2') .
-			"<br />\n" . _T('avis_connexion_ldap_echec_3') .
-			'<br /><br />' . $erreur . '<b> ?</b></p></div>';
+			"<div class='error'><p>"._T('avis_connexion_ldap_echec_1').'</p>',
+			'<p>'._T('avis_connexion_ldap_echec_2').
+			"<br />\n"._T('avis_connexion_ldap_echec_3').
+			'<br /><br />'.$erreur.'<b> ?</b></p></div>';
 	}
 
 	echo install_fin_html();

ecrire/install/etape_ldap3.php

Spacing +5 added lines, -5 removed lines

@@ -45,7 +45,7 @@ 
 	$checked = false;
 	$res = '';
 	if (is_array($info) and $info['count'] > 0) {
-		$res .= '<p>' . _T('info_selection_chemin_acces') . '</p>';
+		$res .= '<p>'._T('info_selection_chemin_acces').'</p>';
 		$res .= '<ul>';
 		$n = 0;
 		for ($i = 0; $i < $info['count']; $i++) {
@@ -53,18 +53,18 @@ 
 			if (is_array($names)) {
 				for ($j = 0; $j < $names['count']; $j++) {
 					$n++;
-					$res .= '<li><input name="base_ldap" value="' . spip_htmlspecialchars($names[$j]) . "\" type='radio' id='tab$n'";
+					$res .= '<li><input name="base_ldap" value="'.spip_htmlspecialchars($names[$j])."\" type='radio' id='tab$n'";
 					if (!$checked) {
 						$res .= ' checked="checked"';
 						$checked = true;
 					}
 					$res .= ' />';
-					$res .= "<label for='tab$n'>" . spip_htmlspecialchars($names[$j]) . "</label></li>\n";
+					$res .= "<label for='tab$n'>".spip_htmlspecialchars($names[$j])."</label></li>\n";
 				}
 			}
 		}
 		$res .= '</ul>';
-		$res .= _T('info_ou') . ' ';
+		$res .= _T('info_ou').' ';
 	}
 	$res .= "<br />\n<input name=\"base_ldap\" value=\"\" type='radio' id='manuel'";
 	if (!$checked) {
@@ -73,7 +73,7 @@ 
 	}
 
 	$res .= ' />'
-		. "\n<label for='manuel'>" . _T('entree_chemin_acces') . '</label> '
+		. "\n<label for='manuel'>"._T('entree_chemin_acces').'</label> '
 		. "\n<fieldset>"
 		. "<input type='text' name='base_ldap_text' class='text' value=\"$base_ldap_text\" size='40' />"
 		. "\n</fieldset>"

ecrire/install/etape_.php

Spacing +5 added lines, -5 removed lines

@@ -34,11 +34,11 @@
 	} else {
 		include_spip('inc/presentation'); // pour info_copyright
 
-		$res = "<div class='petit-centre'><img alt='SPIP' class='logo' src='" . chemin_image('logo-spip.png') . "' />\n" .
-			"<p class='small'>" . info_copyright() . "</p></div>\n" .
-			'<p>' . _T('install_select_langue') . '</p>' .
-			'<div>' . $menu_langues . "</div>\n" .
-			generer_form_ecrire('install', "<input type='hidden' name='etape' value='chmod' />" . bouton_suivant());
+		$res = "<div class='petit-centre'><img alt='SPIP' class='logo' src='".chemin_image('logo-spip.png')."' />\n".
+			"<p class='small'>".info_copyright()."</p></div>\n".
+			'<p>'._T('install_select_langue').'</p>'.
+			'<div>'.$menu_langues."</div>\n".
+			generer_form_ecrire('install', "<input type='hidden' name='etape' value='chmod' />".bouton_suivant());
 		echo minipres('AUTO', $res);
 	}
 }

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

Braces +1 added lines, -2 removed lines

@@ -2884,8 +2884,7 @@
 	$_const = interprete_argument_balise(1, $p);
 	if (!strlen($_const)) {
 		$p->code = "''";
-	}
-	else {
+	} else {
 		$p->code = "(defined($_const)?constant($_const):'')";
 	}
 	$p->interdire_scripts = false;

Spacing +51 added lines, -51 removed lines

@@ -364,7 +364,7 @@ 
  */
 function balise_DOSSIER_SQUELETTE_dist($p) {
 	$code = substr(addslashes(dirname($p->descr['sourcefile'])), strlen(_DIR_RACINE));
-	$p->code = "_DIR_RACINE . '$code'" .
+	$p->code = "_DIR_RACINE . '$code'".
 		$p->interdire_scripts = false;
 
 	return $p;
@@ -383,7 +383,7 @@ 
  */
 function balise_SQUELETTE_dist($p) {
 	$code = addslashes($p->descr['sourcefile']);
-	$p->code = "'$code'" .
+	$p->code = "'$code'".
 		$p->interdire_scripts = false;
 
 	return $p;
@@ -435,9 +435,9 @@ 
  **/
 function balise_NOM_SITE_dist($p) {
 	if (!$p->etoile) {
-		$p->code = 'supprimer_numero(calculer_url(' .
-			champ_sql('url_site', $p) . ',' .
-			champ_sql('nom_site', $p) .
+		$p->code = 'supprimer_numero(calculer_url('.
+			champ_sql('url_site', $p).','.
+			champ_sql('nom_site', $p).
 			", 'titre', \$connect, false))";
 	} else {
 		$p->code = champ_sql('nom_site', $p);
@@ -588,8 +588,8 @@ 
  *     Pile complétée par le code à générer
  **/
 function balise_POPULARITE_ABSOLUE_dist($p) {
-	$p->code = 'ceil(' .
-		champ_sql('popularite', $p) .
+	$p->code = 'ceil('.
+		champ_sql('popularite', $p).
 		')';
 	$p->interdire_scripts = false;
 
@@ -670,7 +670,7 @@ 
 	$p->code = index_pile($p->id_boucle, 'valeur', $p->boucles, $b);
 ;
 	if (($v = interprete_argument_balise(1, $p)) !== null) {
-		$p->code = 'table_valeur(' . $p->code . ', ' . $v . ')';
+		$p->code = 'table_valeur('.$p->code.', '.$v.')';
 	}
 	$p->interdire_scripts = true;
 
@@ -809,16 +809,16 @@ 
 	$trouver_table = charger_fonction('trouver_table', 'base');
 	if ($desc = $trouver_table(table_objet_sql($type_objet))) {
 		if (isset($desc['field']['descriptif'])) {
-			$_ligne .= "'descriptif' => " . champ_sql('descriptif', $p) . ',';
+			$_ligne .= "'descriptif' => ".champ_sql('descriptif', $p).',';
 		}
 		if (isset($desc['field']['texte'])) {
-			$_ligne .= "'texte' => " . champ_sql('texte', $p) . ',';
+			$_ligne .= "'texte' => ".champ_sql('texte', $p).',';
 		}
 		if (isset($desc['field']['chapo'])) {
-			$_ligne .= "'chapo' => " . champ_sql('chapo', $p) . ',';
+			$_ligne .= "'chapo' => ".champ_sql('chapo', $p).',';
 		}
 		if (isset($desc['introduction_longueur'])) {
-			$_introduction_longueur = "'" . $desc['introduction_longueur'] . "'";
+			$_introduction_longueur = "'".$desc['introduction_longueur']."'";
 		}
 	}
 	$_ligne .= ')';
@@ -917,10 +917,10 @@ 
 		$p->code = sprintf(
 			CODE_RECUPERER_FOND,
 			"'modeles/lesauteurs'",
-			"array('objet'=>'" . $objet .
-			"','id_objet' => " . champ_sql($id_table_objet, $p) .
-			",'$id_table_objet' => " . champ_sql($id_table_objet, $p) .
-			($objet == 'article' ? '' : ",'id_article' => " . champ_sql('id_article', $p)) .
+			"array('objet'=>'".$objet.
+			"','id_objet' => ".champ_sql($id_table_objet, $p).
+			",'$id_table_objet' => ".champ_sql($id_table_objet, $p).
+			($objet == 'article' ? '' : ",'id_article' => ".champ_sql('id_article', $p)).
 			')',
 			"'trim'=>true, 'compil'=>array($c)",
 			_q($connect)
@@ -989,7 +989,7 @@ 
 					$m = trim($m);
 					if ($m != "''") {
 						if (!preg_match(',\W,', $m)) {
-							$m = $boucle->id_table . ".$m";
+							$m = $boucle->id_table.".$m";
 						}
 
 						$m .= ' AS titre_rang';
@@ -1150,7 +1150,7 @@ 
 	$f_pagination = chercher_filtre('pagination');
 	$type = $p->boucles[$b]->modificateur['debut_nom'];
 	$modif = ($type[0] !== "'") ? "'debut'.$type"
-		: ("'debut" . substr($type, 1));
+		: ("'debut".substr($type, 1));
 
 	$p->code = sprintf(
 		CODE_PAGINATION,
@@ -1294,7 +1294,7 @@ 
 		$msg = ['zbug_balise_sans_argument', ['balise' => ' CHEMIN']];
 		erreur_squelette($msg, $p);
 	} else {
-		$p->code = 'find_in_path(' . $arg . ')';
+		$p->code = 'find_in_path('.$arg.')';
 	}
 
 	$p->interdire_scripts = false;
@@ -1329,7 +1329,7 @@ 
 		$msg = ['zbug_balise_sans_argument', ['balise' => ' CHEMIN_IMAGE']];
 		erreur_squelette($msg, $p);
 	} else {
-		$p->code = 'chemin_image(' . $arg . ')';
+		$p->code = 'chemin_image('.$arg.')';
 	}
 
 	$p->interdire_scripts = false;
@@ -1383,7 +1383,7 @@ 
 		// cas de #ENV sans argument : on retourne le serialize() du tableau
 		// une belle fonction [(#ENV|affiche_env)] serait pratique
 		if ($src) {
-			$p->code = '(is_array($a = (' . $src . ')) ? serialize($a) : "")';
+			$p->code = '(is_array($a = ('.$src.')) ? serialize($a) : "")';
 		} else {
 			$p->code = 'serialize($Pile[0]??[])';
 		}
@@ -1436,8 +1436,8 @@ 
 	$_sinon = interprete_argument_balise(2, $p);
 	$_unserialize = sinon(interprete_argument_balise(3, $p), 'false');
 
-	$p->code = '(include_spip(\'inc/config\')?lire_config(' . $arg . ',' .
-		($_sinon && $_sinon != "''" ? $_sinon : 'null') . ',' . $_unserialize . "):'')";
+	$p->code = '(include_spip(\'inc/config\')?lire_config('.$arg.','.
+		($_sinon && $_sinon != "''" ? $_sinon : 'null').','.$_unserialize."):'')";
 
 	return $p;
 }
@@ -1530,7 +1530,7 @@ 
 		$err_b_s_a = ['zbug_balise_sans_argument', ['balise' => 'SESSION_SET']];
 		erreur_squelette($err_b_s_a, $p);
 	} else {
-		$p->code = '(include_spip("inc/session") AND session_set(' . $_nom . ',' . $_val . '))';
+		$p->code = '(include_spip("inc/session") AND session_set('.$_nom.','.$_val.'))';
 	}
 
 	$p->interdire_scripts = false;
@@ -1578,7 +1578,7 @@ 
 			)
 		) {
 			$p->code = /* $r[1]. */
-				'(' . $r[2] . ')';
+				'('.$r[2].')';
 		} else {
 			$p->code = "eval('return '.$php.';')";
 		}
@@ -1822,9 +1822,9 @@ 
 
 		// noter la duree du cache dans un entete proprietaire
 
-		$code = "'<'.'" . '?php header("X-Spip-Cache: '
+		$code = "'<'.'".'?php header("X-Spip-Cache: '
 			. $duree
-			. '"); ?' . "'.'>'";
+			. '"); ?'."'.'>'";
 
 		// Remplir le header Cache-Control
 		// cas #CACHE{0}
@@ -1845,9 +1845,9 @@ 
 				$pa == 'cache-client'
 				and $duree > 0
 			) {
-				$code .= ".'<'.'" . '?php header("Cache-Control: max-age='
+				$code .= ".'<'.'".'?php header("Cache-Control: max-age='
 					. $duree
-					. '"); ?' . "'.'>'";
+					. '"); ?'."'.'>'";
 				// il semble logique, si on cache-client, de ne pas invalider
 				$pa = 'statique';
 			}
@@ -1856,7 +1856,7 @@ 
 				$pa == 'statique'
 				and $duree > 0
 			) {
-				$code .= ".'<'.'" . '?php header("X-Spip-Statique: oui"); ?' . "'.'>'";
+				$code .= ".'<'.'".'?php header("X-Spip-Statique: oui"); ?'."'.'>'";
 			}
 		}
 	} else {
@@ -2020,9 +2020,9 @@ 
 		if ($p->etoile) {
 			$_options[] = "'etoile'=>true";
 		}
-		$_options[] = "'compil'=>array(" . memoriser_contexte_compil($p) . ')';
+		$_options[] = "'compil'=>array(".memoriser_contexte_compil($p).')';
 
-		$_l = 'array(' . join(",\n\t", $_contexte) . ')';
+		$_l = 'array('.join(",\n\t", $_contexte).')';
 		if ($flag_env) {
 			$_l = "array_merge(\$Pile[0],$_l)";
 		}
@@ -2032,7 +2032,7 @@ 
 		$msg = ['zbug_balise_sans_argument', ['balise' => ' INCLURE']];
 		erreur_squelette($msg, $p);
 	} else {
-		$p->code = 'charge_scripts(' . $_contexte[1] . ',false)';
+		$p->code = 'charge_scripts('.$_contexte[1].',false)';
 	}
 
 	$p->interdire_scripts = false; // la securite est assuree par recuperer_fond
@@ -2080,7 +2080,7 @@ 
 		unset($_contexte[1]);
 
 		if (preg_match("/^\s*'[^']*'/s", $nom)) {
-			$nom = "'modeles/" . substr($nom, 1);
+			$nom = "'modeles/".substr($nom, 1);
 		} else {
 			$nom = "'modeles/' . $nom";
 		}
@@ -2097,8 +2097,8 @@ 
 			$primary = $p->boucles[$p->id_boucle]->primary;
 			if (!strpos($primary, ',')) {
 				$id = champ_sql($primary, $p);
-				$_contexte[] = "'$primary'=>" . $id;
-				$_contexte[] = "'id'=>" . $id;
+				$_contexte[] = "'$primary'=>".$id;
+				$_contexte[] = "'id'=>".$id;
 			}
 		}
 		$_contexte[] = "'recurs'=>(++\$recurs)";
@@ -2110,11 +2110,11 @@ 
 		$_options = memoriser_contexte_compil($p);
 		$_options = "'compil'=>array($_options), 'trim'=>true";
 		if (isset($_contexte['ajax'])) {
-			$_options .= ', ' . preg_replace(',=>(.*)$,ims', '=> ($v=(\\1))?$v:true', $_contexte['ajax']);
+			$_options .= ', '.preg_replace(',=>(.*)$,ims', '=> ($v=(\\1))?$v:true', $_contexte['ajax']);
 			unset($_contexte['ajax']);
 		}
 
-		$_l = 'array(' . join(",\n\t", $_contexte) . ')';
+		$_l = 'array('.join(",\n\t", $_contexte).')';
 		if ($flag_env) {
 			$_l = "array_merge(\$Pile[0],$_l)";
 		}
@@ -2224,12 +2224,12 @@ 
 function balise_DOUBLONS_dist($p) {
 	if ($type = interprete_argument_balise(1, $p)) {
 		if ($famille = interprete_argument_balise(2, $p)) {
-			$type .= '.' . $famille;
+			$type .= '.'.$famille;
 		}
-		$p->code = '(isset($doublons[' . $type . ']) ? $doublons[' . $type . '] : "")';
+		$p->code = '(isset($doublons['.$type.']) ? $doublons['.$type.'] : "")';
 		if (!$p->etoile) {
 			$p->code = 'array_filter(array_map("intval",explode(",",'
-				. $p->code . ')))';
+				. $p->code.')))';
 		}
 	} else {
 		$p->code = '$doublons';
@@ -2358,7 +2358,7 @@ 
 			$_code[] = "$_key => $_val";
 		}
 	} while ($_key && $_val);
-	$p->code = 'array(' . join(', ', $_code) . ')';
+	$p->code = 'array('.join(', ', $_code).')';
 	$p->interdire_scripts = false;
 
 	return $p;
@@ -2385,7 +2385,7 @@ 
 	while ($_val = interprete_argument_balise($n++, $p)) {
 		$_code[] = $_val;
 	}
-	$p->code = 'array(' . join(', ', $_code) . ')';
+	$p->code = 'array('.join(', ', $_code).')';
 	$p->interdire_scripts = false;
 
 	return $p;
@@ -2430,10 +2430,10 @@ 
 		$_code[] = $_v;
 	}
 
-	$p->code = '((function_exists("autoriser")||include_spip("inc/autoriser"))&&autoriser(' . join(
+	$p->code = '((function_exists("autoriser")||include_spip("inc/autoriser"))&&autoriser('.join(
 		', ',
 		$_code
-	) . ')?" ":"")';
+	).')?" ":"")';
 	$p->interdire_scripts = false;
 
 	return $p;
@@ -2466,7 +2466,7 @@ 
 	$type_info = isset($type_info) ? str_replace('\'', '"', $type_info) : '"est_actif"';
 
 	$f = chercher_filtre('info_plugin');
-	$p->code = $f . '(' . $plugin . ', ' . $type_info . ')';
+	$p->code = $f.'('.$plugin.', '.$type_info.')';
 
 	return $p;
 }
@@ -2716,12 +2716,12 @@ 
 	$_issens = "in_array($_champ,array('>','<'))";
 	$_sens = "(strpos('< >',$_champ)-1)";
 
-	$_variable = "((\$s=$_issens)?'sens':'tri')." . $boucle->modificateur['tri_nom'];
+	$_variable = "((\$s=$_issens)?'sens':'tri').".$boucle->modificateur['tri_nom'];
 	$_url = "parametre_url(self(),$_variable,\$s?$_sens:$_champ)";
-	$_url = "parametre_url($_url,'var_memotri',strncmp(" . $boucle->modificateur['tri_nom'] . ",'session',7)==0?$_variable:'')";
-	$_on = '$s?(' . $boucle->modificateur['tri_sens'] . "==$_sens" . '):(' . $boucle->modificateur['tri_champ'] . "==$_champ)";
+	$_url = "parametre_url($_url,'var_memotri',strncmp(".$boucle->modificateur['tri_nom'].",'session',7)==0?$_variable:'')";
+	$_on = '$s?('.$boucle->modificateur['tri_sens']."==$_sens".'):('.$boucle->modificateur['tri_champ']."==$_champ)";
 
-	$p->code = "lien_ou_expose($_url,$_libelle,$_on" . ($_class ? ",$_class" : '') . ')';
+	$p->code = "lien_ou_expose($_url,$_libelle,$_on".($_class ? ",$_class" : '').')';
 	//$p->code = "''";
 	$p->interdire_scripts = false;
 
@@ -2795,7 +2795,7 @@ 
 		$connect = $p->boucles[$p->id_boucle]->sql_serveur;
 	}
 
-	$p->code = '(objet_test_si_publie(' . $_type . ',intval(' . $_id . '),' . _q($connect) . ")?' ':'')";
+	$p->code = '(objet_test_si_publie('.$_type.',intval('.$_id.'),'._q($connect).")?' ':'')";
 	$p->interdire_scripts = false;
 
 	return $p;