Inspection of "Remonter le trouver_table pour eviter de requeter..." - spip/SPIP - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 94115d...5c4b55 )

by cam

created 2021-02-10 15:07 UTC

Status

Indentation +146 added lines, -146 removed lines patch added patch discarded remove patch

@@ -17,7 +17,7 @@  discard block
 block discarded – undo
  **/
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 /**
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
  *     Pile complétée du code compilé
  **/
 function balise_FORMULAIRE_ADMIN($p) {
-	return calculer_balise_dynamique($p, 'FORMULAIRE_ADMIN', array());
+    return calculer_balise_dynamique($p, 'FORMULAIRE_ADMIN', array());
 }
 
 /**
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
  *   - chaîne vide sinon.
  */
 function balise_FORMULAIRE_ADMIN_stat($args, $context_compil) {
-	return $args;
+    return $args;
 }
 
 
@@ -84,66 +84,66 @@  discard block
 block discarded – undo
  **/
 function balise_FORMULAIRE_ADMIN_dyn($float = '', $debug = '') {
 
-	static $dejafait = false;
+    static $dejafait = false;
 
-	if (empty($_COOKIE['spip_admin'])) {
-		return '';
-	}
+    if (empty($_COOKIE['spip_admin'])) {
+        return '';
+    }
 
-	if (!is_array($debug)) {
-		if ($dejafait) {
-			return '';
-		}
-	} else {
-		if ($dejafait) {
-			if (empty($debug['sourcefile'])) {
-				return '';
-			}
-			foreach ($debug['sourcefile'] as $k => $v) {
-				if (strpos($v, 'administration.') !== false) {
-					if (isset($debug['resultat'][$k . 'tout'])) {
-						return $debug['resultat'][$k . 'tout'];
-					}
-				}
-			}
+    if (!is_array($debug)) {
+        if ($dejafait) {
+            return '';
+        }
+    } else {
+        if ($dejafait) {
+            if (empty($debug['sourcefile'])) {
+                return '';
+            }
+            foreach ($debug['sourcefile'] as $k => $v) {
+                if (strpos($v, 'administration.') !== false) {
+                    if (isset($debug['resultat'][$k . 'tout'])) {
+                        return $debug['resultat'][$k . 'tout'];
+                    }
+                }
+            }
 
-			return '';
-		}
-	}
+            return '';
+        }
+    }
 
-	include_spip('inc/autoriser');
-	include_spip('base/abstract_sql');
+    include_spip('inc/autoriser');
+    include_spip('base/abstract_sql');
 
 
-	$dejafait = true;
+    $dejafait = true;
 
-	// Preparer le #ENV des boutons
+    // Preparer le #ENV des boutons
 
-	$env = admin_objet();
+    $env = admin_objet();
 
-	// Pas de "modifier ce..." ? -> donner "acces a l'espace prive"
-	if (!$env) {
-		$env['ecrire'] = _DIR_RESTREINT_ABS;
-	}
+    // Pas de "modifier ce..." ? -> donner "acces a l'espace prive"
+    if (!$env) {
+        $env['ecrire'] = _DIR_RESTREINT_ABS;
+    }
 
-	$env['divclass'] = $float;
-	$env['lang'] = admin_lang();
-	$env['calcul'] = (_request('var_mode') ? 'recalcul' : 'calcul');
-	$env['debug'] = ((defined('_VAR_PREVIEW') and _VAR_PREVIEW) ? "" : admin_debug());
-	$env['analyser'] = (!$env['debug'] and !$GLOBALS['xhtml']) ? '' : admin_valider();
-	$env['inclure'] = ((defined('_VAR_INCLURE') and _VAR_INCLURE) ? 'inclure' : '');
+    $env['divclass'] = $float;
+    $env['lang'] = admin_lang();
+    $env['calcul'] = (_request('var_mode') ? 'recalcul' : 'calcul');
+    $env['debug'] = ((defined('_VAR_PREVIEW') and _VAR_PREVIEW) ? "" : admin_debug());
+    $env['analyser'] = (!$env['debug'] and !$GLOBALS['xhtml']) ? '' : admin_valider();
+    $env['inclure'] = ((defined('_VAR_INCLURE') and _VAR_INCLURE) ? 'inclure' : '');
 
-	if (empty($GLOBALS['use_cache'])) {
-		$env['use_cache'] = ' *';
-	}
+    if (empty($GLOBALS['use_cache'])) {
+        $env['use_cache'] = ' *';
+    }
 
-	if (isset($debug['validation'])) {
-		$env['xhtml_error'] = $debug['validation'];
-	}
+    if (isset($debug['validation'])) {
+        $env['xhtml_error'] = $debug['validation'];
+    }
 
-	$env['_pipelines']['formulaire_admin'] = array();
+    $env['_pipelines']['formulaire_admin'] = array();
 
-	return array('formulaires/administration', 0, $env);
+    return array('formulaires/administration', 0, $env);
 }
 
 
@@ -161,45 +161,45 @@  discard block
 block discarded – undo
  *     Tableau de l'environnement calculé
  **/
 function admin_objet() {
-	include_spip('inc/urls');
-	$env = array();
-
-	$trouver_table = charger_fonction('trouver_table', 'base');
-	$objets = urls_liste_objets(false);
-	$objets = array_diff($objets, array('rubrique'));
-	$objets = array_reverse($objets);
-	array_unshift($objets, 'rubrique');
-	foreach ($objets as $obj) {
-		$type = $obj;
-		if ($type == objet_type($type, false)
-			and $_id_type = id_table_objet($type)
-			and isset($GLOBALS['contexte'][$_id_type])
-			and $id = $GLOBALS['contexte'][$_id_type]
-			and !is_array($id)
-			and $id = intval($id)
-			and $desc = $trouver_table(table_objet_sql($type))
-		) {
-			$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] =
-					str_replace('&amp;', '&', generer_url_entite($id, $obj, '', '', false));
-				if (isset($desc['field']['id_rubrique'])
-					and $type != 'rubrique'
-				) {
-					unset($env['id_rubrique']);
-					unset($env['voir_rubrique']);
-					if (admin_preview($type, $id, $desc)) {
-						$env['preview'] = parametre_url(self(), 'var_mode', 'preview', '&');
-					}
-				}
-			}
-		}
-	}
-
-	return $env;
+    include_spip('inc/urls');
+    $env = array();
+
+    $trouver_table = charger_fonction('trouver_table', 'base');
+    $objets = urls_liste_objets(false);
+    $objets = array_diff($objets, array('rubrique'));
+    $objets = array_reverse($objets);
+    array_unshift($objets, 'rubrique');
+    foreach ($objets as $obj) {
+        $type = $obj;
+        if ($type == objet_type($type, false)
+            and $_id_type = id_table_objet($type)
+            and isset($GLOBALS['contexte'][$_id_type])
+            and $id = $GLOBALS['contexte'][$_id_type]
+            and !is_array($id)
+            and $id = intval($id)
+            and $desc = $trouver_table(table_objet_sql($type))
+        ) {
+            $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] =
+                    str_replace('&amp;', '&', generer_url_entite($id, $obj, '', '', false));
+                if (isset($desc['field']['id_rubrique'])
+                    and $type != 'rubrique'
+                ) {
+                    unset($env['id_rubrique']);
+                    unset($env['voir_rubrique']);
+                    if (admin_preview($type, $id, $desc)) {
+                        $env['preview'] = parametre_url(self(), 'var_mode', 'preview', '&');
+                    }
+                }
+            }
+        }
+    }
+
+    return $env;
 }
 
 
@@ -217,30 +217,30 @@  discard block
 block discarded – undo
  *     - Tableau d'un élément sinon.
  **/
 function admin_preview($type, $id, $desc = null) {
-	if (defined('_VAR_PREVIEW') and _VAR_PREVIEW) {
-		return '';
-	}
-
-	if (!$desc) {
-		$trouver_table = charger_fonction('trouver_table', 'base');
-		$desc = $trouver_table(table_objet_sql($type));
-	}
-	if (!$desc or !isset($desc['field']['statut'])) {
-		return '';
-	}
-
-	include_spip('inc/autoriser');
-	if (!autoriser('previsualiser')) {
-		return '';
-	}
-
-	$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')) . ")";
-	}
-
-	return sql_fetsel('1', table_objet_sql($type), id_table_objet($type) . "=" . $id . " AND ($notpub)");
+    if (defined('_VAR_PREVIEW') and _VAR_PREVIEW) {
+        return '';
+    }
+
+    if (!$desc) {
+        $trouver_table = charger_fonction('trouver_table', 'base');
+        $desc = $trouver_table(table_objet_sql($type));
+    }
+    if (!$desc or !isset($desc['field']['statut'])) {
+        return '';
+    }
+
+    include_spip('inc/autoriser');
+    if (!autoriser('previsualiser')) {
+        return '';
+    }
+
+    $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')) . ")";
+    }
+
+    return sql_fetsel('1', table_objet_sql($type), id_table_objet($type) . "=" . $id . " AND ($notpub)");
 }
 
 
@@ -251,25 +251,25 @@  discard block
 block discarded – undo
  *     Code de langue
  **/
 function admin_lang() {
-	$alang = '';
-	if (!empty($_COOKIE['spip_admin'])) {
-		$email_or_login = preg_replace(',^@,', '', $_COOKIE['spip_admin']);
-		$alang = sql_getfetsel('lang', 'spip_auteurs', "email=" . sql_quote($email_or_login));
-		if (!$alang) {
-			$alang = sql_getfetsel('lang', 'spip_auteurs', "login=" . sql_quote($email_or_login));
-		}
-	}
-	if (!$alang) {
-		return '';
-	}
-
-	$l = lang_select($alang);
-	$alang = $GLOBALS['spip_lang'];
-	if ($l) {
-		lang_select();
-	}
-
-	return $alang;
+    $alang = '';
+    if (!empty($_COOKIE['spip_admin'])) {
+        $email_or_login = preg_replace(',^@,', '', $_COOKIE['spip_admin']);
+        $alang = sql_getfetsel('lang', 'spip_auteurs', "email=" . sql_quote($email_or_login));
+        if (!$alang) {
+            $alang = sql_getfetsel('lang', 'spip_auteurs', "login=" . sql_quote($email_or_login));
+        }
+    }
+    if (!$alang) {
+        return '';
+    }
+
+    $l = lang_select($alang);
+    $alang = $GLOBALS['spip_lang'];
+    if ($l) {
+        lang_select();
+    }
+
+    return $alang;
 }
 
 /**
@@ -279,11 +279,11 @@  discard block
 block discarded – undo
  **/
 function admin_valider() {
 
-	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())));
+    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())));
 }
 
 /**
@@ -292,14 +292,14 @@  discard block
 block discarded – undo
  * @return string
  **/
 function admin_debug() {
-	return ((
-			(isset($GLOBALS['forcer_debug']) and $GLOBALS['forcer_debug'])
-			or (isset($GLOBALS['bouton_admin_debug']) and $GLOBALS['bouton_admin_debug'])
-			or (
-				defined('_VAR_MODE') and _VAR_MODE == 'debug'
-				and isset($_COOKIE['spip_debug']) and $_COOKIE['spip_debug']
-			)
-		) and autoriser('debug')
-	)
-		? parametre_url(self(), 'var_mode', 'debug', '&') : '';
+    return ((
+            (isset($GLOBALS['forcer_debug']) and $GLOBALS['forcer_debug'])
+            or (isset($GLOBALS['bouton_admin_debug']) and $GLOBALS['bouton_admin_debug'])
+            or (
+                defined('_VAR_MODE') and _VAR_MODE == 'debug'
+                and isset($_COOKIE['spip_debug']) and $_COOKIE['spip_debug']
+            )
+        ) and autoriser('debug')
+    )
+        ? parametre_url(self(), 'var_mode', 'debug', '&') : '';
 }

Please login to merge, or discard this patch.

Spacing +10 added lines, -11 removed lines patch added patch discarded remove patch

@@ -101,8 +101,8 @@  discard block
 block discarded – undo
 			}
 			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'];
 					}
 				}
 			}
@@ -179,12 +179,12 @@  discard block
 block discarded – undo
 			and $id = intval($id)
 			and $desc = $trouver_table(table_objet_sql($type))
 		) {
-			$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('&amp;', '&', generer_url_entite($id, $obj, '', '', false));
 				if (isset($desc['field']['id_rubrique'])
 					and $type != 'rubrique'
@@ -237,10 +237,10 @@  discard block
 block discarded – undo
 	$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)");
 }
 
 
@@ -254,9 +254,9 @@  discard block
 block discarded – undo
 	$alang = '';
 	if (!empty($_COOKIE['spip_admin'])) {
 		$email_or_login = preg_replace(',^@,', '', $_COOKIE['spip_admin']);
-		$alang = sql_getfetsel('lang', 'spip_auteurs', "email=" . sql_quote($email_or_login));
+		$alang = sql_getfetsel('lang', 'spip_auteurs', "email=".sql_quote($email_or_login));
 		if (!$alang) {
-			$alang = sql_getfetsel('lang', 'spip_auteurs', "login=" . sql_quote($email_or_login));
+			$alang = sql_getfetsel('lang', 'spip_auteurs', "login=".sql_quote($email_or_login));
 		}
 	}
 	if (!$alang) {
@@ -281,9 +281,8 @@  discard block
 block discarded – undo
 
 	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())));
 }
 
 /**

Please login to merge, or discard this patch.

		@@ -101,8 +101,8 @@ discard block
		block discarded – undo
101	101	}
102	102	foreach ($debug['sourcefile'] as $k => $v) {
103	103	if (strpos($v, 'administration.') !== false) {
104		- if (isset($debug['resultat'][$k . 'tout'])) {
105		- return $debug['resultat'][$k . 'tout'];
	104	+ if (isset($debug['resultat'][$k.'tout'])) {
	105	+ return $debug['resultat'][$k.'tout'];
106	106	}
107	107	}
108	108	}
		@@ -179,12 +179,12 @@ discard block
		block discarded – undo
179	179	and $id = intval($id)
180	180	and $desc = $trouver_table(table_objet_sql($type))
181	181	) {
182		- $id = sql_getfetsel($_id_type, table_objet_sql($type), "$_id_type=" . intval($id));
	182	+ $id = sql_getfetsel($_id_type, table_objet_sql($type), "$_id_type=".intval($id));
183	183	if ($id) {
184	184	$env[$_id_type] = $id;
185	185	$env['objet'] = $type;
186	186	$env['id_objet'] = $id;
187		- $env['voir_' . $obj] =
	187	+ $env['voir_'.$obj] =
188	188	str_replace('&', '&', generer_url_entite($id, $obj, '', '', false));
189	189	if (isset($desc['field']['id_rubrique'])
190	190	and $type != 'rubrique'
		@@ -237,10 +237,10 @@ discard block
		block discarded – undo
237	237	$notpub = sql_in("statut", array('prop', 'prive'));
238	238
239	239	if ($type == 'article' and $GLOBALS['meta']['post_dates'] != 'oui') {
240		- $notpub .= " OR (statut='publie' AND date>" . sql_quote(date('Y-m-d H:i:s')) . ")";
	240	+ $notpub .= " OR (statut='publie' AND date>".sql_quote(date('Y-m-d H:i:s')).")";
241	241	}
242	242
243		- return sql_fetsel('1', table_objet_sql($type), id_table_objet($type) . "=" . $id . " AND ($notpub)");
	243	+ return sql_fetsel('1', table_objet_sql($type), id_table_objet($type)."=".$id." AND ($notpub)");
244	244	}
245	245
246	246
		@@ -254,9 +254,9 @@ discard block
		block discarded – undo
254	254	$alang = '';
255	255	if (!empty($_COOKIE['spip_admin'])) {
256	256	$email_or_login = preg_replace(',^@,', '', $_COOKIE['spip_admin']);
257		- $alang = sql_getfetsel('lang', 'spip_auteurs', "email=" . sql_quote($email_or_login));
	257	+ $alang = sql_getfetsel('lang', 'spip_auteurs', "email=".sql_quote($email_or_login));
258	258	if (!$alang) {
259		- $alang = sql_getfetsel('lang', 'spip_auteurs', "login=" . sql_quote($email_or_login));
	259	+ $alang = sql_getfetsel('lang', 'spip_auteurs', "login=".sql_quote($email_or_login));
260	260	}
261	261	}
262	262	if (!$alang) {
		@@ -281,9 +281,8 @@ discard block
		block discarded – undo
281	281
282	282	return ((!isset($GLOBALS['xhtml']) or $GLOBALS['xhtml'] !== 'true') ?
283	283	(parametre_url(self(), 'var_mode', 'debug', '&')
284		- . '&var_mode_affiche=validation') :
285		- ('http://validator.w3.org/check?uri='
286		- . rawurlencode("http://" . $_SERVER['HTTP_HOST'] . nettoyer_uri())));
	284	+ . '&var_mode_affiche=validation') : ('http://validator.w3.org/check?uri='
	285	+ . rawurlencode("http://".$_SERVER['HTTP_HOST'].nettoyer_uri())));
287	286	}
288	287
289	288	/**

		@@ -17,7 +17,7 @@ discard block
		block discarded – undo
17	17	**/
18	18
19	19	if (!defined('_ECRIRE_INC_VERSION')) {
20		- return;
	20	+ return;
21	21	}
22	22
23	23	/**
		@@ -42,7 +42,7 @@ discard block
		block discarded – undo
42	42	* Pile complétée du code compilé
43	43	**/
44	44	function balise_FORMULAIRE_ADMIN($p) {
45		- return calculer_balise_dynamique($p, 'FORMULAIRE_ADMIN', array());
	45	+ return calculer_balise_dynamique($p, 'FORMULAIRE_ADMIN', array());
46	46	}
47	47
48	48	/**
		@@ -59,7 +59,7 @@ discard block
		block discarded – undo
59	59	* - chaîne vide sinon.
60	60	*/
61	61	function balise_FORMULAIRE_ADMIN_stat($args, $context_compil) {
62		- return $args;
	62	+ return $args;
63	63	}
64	64
65	65
		@@ -84,66 +84,66 @@ discard block
		block discarded – undo
84	84	**/
85	85	function balise_FORMULAIRE_ADMIN_dyn($float = '', $debug = '') {
86	86
87		- static $dejafait = false;
	87	+ static $dejafait = false;
88	88
89		- if (empty($_COOKIE['spip_admin'])) {
90		- return '';
91		- }
	89	+ if (empty($_COOKIE['spip_admin'])) {
	90	+ return '';
	91	+ }
92	92
93		- if (!is_array($debug)) {
94		- if ($dejafait) {
95		- return '';
96		- }
97		- } else {
98		- if ($dejafait) {
99		- if (empty($debug['sourcefile'])) {
100		- return '';
101		- }
102		- foreach ($debug['sourcefile'] as $k => $v) {
103		- if (strpos($v, 'administration.') !== false) {
104		- if (isset($debug['resultat'][$k . 'tout'])) {
105		- return $debug['resultat'][$k . 'tout'];
106		- }
107		- }
108		- }
	93	+ if (!is_array($debug)) {
	94	+ if ($dejafait) {
	95	+ return '';
	96	+ }
	97	+ } else {
	98	+ if ($dejafait) {
	99	+ if (empty($debug['sourcefile'])) {
	100	+ return '';
	101	+ }
	102	+ foreach ($debug['sourcefile'] as $k => $v) {
	103	+ if (strpos($v, 'administration.') !== false) {
	104	+ if (isset($debug['resultat'][$k . 'tout'])) {
	105	+ return $debug['resultat'][$k . 'tout'];
	106	+ }
	107	+ }
	108	+ }
109	109
110		- return '';
111		- }
112		- }
	110	+ return '';
	111	+ }
	112	+ }
113	113
114		- include_spip('inc/autoriser');
115		- include_spip('base/abstract_sql');
	114	+ include_spip('inc/autoriser');
	115	+ include_spip('base/abstract_sql');
116	116
117	117
118		- $dejafait = true;
	118	+ $dejafait = true;
119	119
120		- // Preparer le #ENV des boutons
	120	+ // Preparer le #ENV des boutons
121	121
122		- $env = admin_objet();
	122	+ $env = admin_objet();
123	123
124		- // Pas de "modifier ce..." ? -> donner "acces a l'espace prive"
125		- if (!$env) {
126		- $env['ecrire'] = _DIR_RESTREINT_ABS;
127		- }
	124	+ // Pas de "modifier ce..." ? -> donner "acces a l'espace prive"
	125	+ if (!$env) {
	126	+ $env['ecrire'] = _DIR_RESTREINT_ABS;
	127	+ }
128	128
129		- $env['divclass'] = $float;
130		- $env['lang'] = admin_lang();
131		- $env['calcul'] = (_request('var_mode') ? 'recalcul' : 'calcul');
132		- $env['debug'] = ((defined('_VAR_PREVIEW') and _VAR_PREVIEW) ? "" : admin_debug());
133		- $env['analyser'] = (!$env['debug'] and !$GLOBALS['xhtml']) ? '' : admin_valider();
134		- $env['inclure'] = ((defined('_VAR_INCLURE') and _VAR_INCLURE) ? 'inclure' : '');
	129	+ $env['divclass'] = $float;
	130	+ $env['lang'] = admin_lang();
	131	+ $env['calcul'] = (_request('var_mode') ? 'recalcul' : 'calcul');
	132	+ $env['debug'] = ((defined('_VAR_PREVIEW') and _VAR_PREVIEW) ? "" : admin_debug());
	133	+ $env['analyser'] = (!$env['debug'] and !$GLOBALS['xhtml']) ? '' : admin_valider();
	134	+ $env['inclure'] = ((defined('_VAR_INCLURE') and _VAR_INCLURE) ? 'inclure' : '');
135	135
136		- if (empty($GLOBALS['use_cache'])) {
137		- $env['use_cache'] = ' *';
138		- }
	136	+ if (empty($GLOBALS['use_cache'])) {
	137	+ $env['use_cache'] = ' *';
	138	+ }
139	139
140		- if (isset($debug['validation'])) {
141		- $env['xhtml_error'] = $debug['validation'];
142		- }
	140	+ if (isset($debug['validation'])) {
	141	+ $env['xhtml_error'] = $debug['validation'];
	142	+ }
143	143
144		- $env['_pipelines']['formulaire_admin'] = array();
	144	+ $env['_pipelines']['formulaire_admin'] = array();
145	145
146		- return array('formulaires/administration', 0, $env);
	146	+ return array('formulaires/administration', 0, $env);
147	147	}
148	148
149	149
		@@ -161,45 +161,45 @@ discard block
		block discarded – undo
161	161	* Tableau de l'environnement calculé
162	162	**/
163	163	function admin_objet() {
164		- include_spip('inc/urls');
165		- $env = array();
166		-
167		- $trouver_table = charger_fonction('trouver_table', 'base');
168		- $objets = urls_liste_objets(false);
169		- $objets = array_diff($objets, array('rubrique'));
170		- $objets = array_reverse($objets);
171		- array_unshift($objets, 'rubrique');
172		- foreach ($objets as $obj) {
173		- $type = $obj;
174		- if ($type == objet_type($type, false)
175		- and $_id_type = id_table_objet($type)
176		- and isset($GLOBALS['contexte'][$_id_type])
177		- and $id = $GLOBALS['contexte'][$_id_type]
178		- and !is_array($id)
179		- and $id = intval($id)
180		- and $desc = $trouver_table(table_objet_sql($type))
181		- ) {
182		- $id = sql_getfetsel($_id_type, table_objet_sql($type), "$_id_type=" . intval($id));
183		- if ($id) {
184		- $env[$_id_type] = $id;
185		- $env['objet'] = $type;
186		- $env['id_objet'] = $id;
187		- $env['voir_' . $obj] =
188		- str_replace('&', '&', generer_url_entite($id, $obj, '', '', false));
189		- if (isset($desc['field']['id_rubrique'])
190		- and $type != 'rubrique'
191		- ) {
192		- unset($env['id_rubrique']);
193		- unset($env['voir_rubrique']);
194		- if (admin_preview($type, $id, $desc)) {
195		- $env['preview'] = parametre_url(self(), 'var_mode', 'preview', '&');
196		- }
197		- }
198		- }
199		- }
200		- }
201		-
202		- return $env;
	164	+ include_spip('inc/urls');
	165	+ $env = array();
	166	+
	167	+ $trouver_table = charger_fonction('trouver_table', 'base');
	168	+ $objets = urls_liste_objets(false);
	169	+ $objets = array_diff($objets, array('rubrique'));
	170	+ $objets = array_reverse($objets);
	171	+ array_unshift($objets, 'rubrique');
	172	+ foreach ($objets as $obj) {
	173	+ $type = $obj;
	174	+ if ($type == objet_type($type, false)
	175	+ and $_id_type = id_table_objet($type)
	176	+ and isset($GLOBALS['contexte'][$_id_type])
	177	+ and $id = $GLOBALS['contexte'][$_id_type]
	178	+ and !is_array($id)
	179	+ and $id = intval($id)
	180	+ and $desc = $trouver_table(table_objet_sql($type))
	181	+ ) {
	182	+ $id = sql_getfetsel($_id_type, table_objet_sql($type), "$_id_type=" . intval($id));
	183	+ if ($id) {
	184	+ $env[$_id_type] = $id;
	185	+ $env['objet'] = $type;
	186	+ $env['id_objet'] = $id;
	187	+ $env['voir_' . $obj] =
	188	+ str_replace('&', '&', generer_url_entite($id, $obj, '', '', false));
	189	+ if (isset($desc['field']['id_rubrique'])
	190	+ and $type != 'rubrique'
	191	+ ) {
	192	+ unset($env['id_rubrique']);
	193	+ unset($env['voir_rubrique']);
	194	+ if (admin_preview($type, $id, $desc)) {
	195	+ $env['preview'] = parametre_url(self(), 'var_mode', 'preview', '&');
	196	+ }
	197	+ }
	198	+ }
	199	+ }
	200	+ }
	201	+
	202	+ return $env;
203	203	}
204	204
205	205
		@@ -217,30 +217,30 @@ discard block
		block discarded – undo
217	217	* - Tableau d'un élément sinon.
218	218	**/
219	219	function admin_preview($type, $id, $desc = null) {
220		- if (defined('_VAR_PREVIEW') and _VAR_PREVIEW) {
221		- return '';
222		- }
223		-
224		- if (!$desc) {
225		- $trouver_table = charger_fonction('trouver_table', 'base');
226		- $desc = $trouver_table(table_objet_sql($type));
227		- }
228		- if (!$desc or !isset($desc['field']['statut'])) {
229		- return '';
230		- }
231		-
232		- include_spip('inc/autoriser');
233		- if (!autoriser('previsualiser')) {
234		- return '';
235		- }
236		-
237		- $notpub = sql_in("statut", array('prop', 'prive'));
238		-
239		- if ($type == 'article' and $GLOBALS['meta']['post_dates'] != 'oui') {
240		- $notpub .= " OR (statut='publie' AND date>" . sql_quote(date('Y-m-d H:i:s')) . ")";
241		- }
242		-
243		- return sql_fetsel('1', table_objet_sql($type), id_table_objet($type) . "=" . $id . " AND ($notpub)");
	220	+ if (defined('_VAR_PREVIEW') and _VAR_PREVIEW) {
	221	+ return '';
	222	+ }
	223	+
	224	+ if (!$desc) {
	225	+ $trouver_table = charger_fonction('trouver_table', 'base');
	226	+ $desc = $trouver_table(table_objet_sql($type));
	227	+ }
	228	+ if (!$desc or !isset($desc['field']['statut'])) {
	229	+ return '';
	230	+ }
	231	+
	232	+ include_spip('inc/autoriser');
	233	+ if (!autoriser('previsualiser')) {
	234	+ return '';
	235	+ }
	236	+
	237	+ $notpub = sql_in("statut", array('prop', 'prive'));
	238	+
	239	+ if ($type == 'article' and $GLOBALS['meta']['post_dates'] != 'oui') {
	240	+ $notpub .= " OR (statut='publie' AND date>" . sql_quote(date('Y-m-d H:i:s')) . ")";
	241	+ }
	242	+
	243	+ return sql_fetsel('1', table_objet_sql($type), id_table_objet($type) . "=" . $id . " AND ($notpub)");
244	244	}
245	245
246	246
		@@ -251,25 +251,25 @@ discard block
		block discarded – undo
251	251	* Code de langue
252	252	**/
253	253	function admin_lang() {
254		- $alang = '';
255		- if (!empty($_COOKIE['spip_admin'])) {
256		- $email_or_login = preg_replace(',^@,', '', $_COOKIE['spip_admin']);
257		- $alang = sql_getfetsel('lang', 'spip_auteurs', "email=" . sql_quote($email_or_login));
258		- if (!$alang) {
259		- $alang = sql_getfetsel('lang', 'spip_auteurs', "login=" . sql_quote($email_or_login));
260		- }
261		- }
262		- if (!$alang) {
263		- return '';
264		- }
265		-
266		- $l = lang_select($alang);
267		- $alang = $GLOBALS['spip_lang'];
268		- if ($l) {
269		- lang_select();
270		- }
271		-
272		- return $alang;
	254	+ $alang = '';
	255	+ if (!empty($_COOKIE['spip_admin'])) {
	256	+ $email_or_login = preg_replace(',^@,', '', $_COOKIE['spip_admin']);
	257	+ $alang = sql_getfetsel('lang', 'spip_auteurs', "email=" . sql_quote($email_or_login));
	258	+ if (!$alang) {
	259	+ $alang = sql_getfetsel('lang', 'spip_auteurs', "login=" . sql_quote($email_or_login));
	260	+ }
	261	+ }
	262	+ if (!$alang) {
	263	+ return '';
	264	+ }
	265	+
	266	+ $l = lang_select($alang);
	267	+ $alang = $GLOBALS['spip_lang'];
	268	+ if ($l) {
	269	+ lang_select();
	270	+ }
	271	+
	272	+ return $alang;
273	273	}
274	274
275	275	/**
		@@ -279,11 +279,11 @@ discard block
		block discarded – undo
279	279	**/
280	280	function admin_valider() {
281	281
282		- return ((!isset($GLOBALS['xhtml']) or $GLOBALS['xhtml'] !== 'true') ?
283		- (parametre_url(self(), 'var_mode', 'debug', '&')
284		- . '&var_mode_affiche=validation') :
285		- ('http://validator.w3.org/check?uri='
286		- . rawurlencode("http://" . $_SERVER['HTTP_HOST'] . nettoyer_uri())));
	282	+ return ((!isset($GLOBALS['xhtml']) or $GLOBALS['xhtml'] !== 'true') ?
	283	+ (parametre_url(self(), 'var_mode', 'debug', '&')
	284	+ . '&var_mode_affiche=validation') :
	285	+ ('http://validator.w3.org/check?uri='
	286	+ . rawurlencode("http://" . $_SERVER['HTTP_HOST'] . nettoyer_uri())));
287	287	}
288	288
289	289	/**
		@@ -292,14 +292,14 @@ discard block
		block discarded – undo
292	292	* @return string
293	293	**/
294	294	function admin_debug() {
295		- return ((
296		- (isset($GLOBALS['forcer_debug']) and $GLOBALS['forcer_debug'])
297		- or (isset($GLOBALS['bouton_admin_debug']) and $GLOBALS['bouton_admin_debug'])
298		- or (
299		- defined('_VAR_MODE') and _VAR_MODE == 'debug'
300		- and isset($_COOKIE['spip_debug']) and $_COOKIE['spip_debug']
301		- )
302		- ) and autoriser('debug')
303		- )
304		- ? parametre_url(self(), 'var_mode', 'debug', '&') : '';
	295	+ return ((
	296	+ (isset($GLOBALS['forcer_debug']) and $GLOBALS['forcer_debug'])
	297	+ or (isset($GLOBALS['bouton_admin_debug']) and $GLOBALS['bouton_admin_debug'])
	298	+ or (
	299	+ defined('_VAR_MODE') and _VAR_MODE == 'debug'
	300	+ and isset($_COOKIE['spip_debug']) and $_COOKIE['spip_debug']
	301	+ )
	302	+ ) and autoriser('debug')
	303	+ )
	304	+ ? parametre_url(self(), 'var_mode', 'debug', '&') : '';
305	305	}

spip / SPIP

Push — master ( 94115d...5c4b55 )

Status

Category

Indentation +146 added lines, -146 removed lines patch added patch discarded remove patch

Spacing +10 added lines, -11 removed lines patch added patch discarded remove patch