spip / SPIP

ecrire/balise/url_.php

Indentation +156 added lines, -156 removed lines

@@ -19,7 +19,7 @@ 
  **/
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 /**
@@ -37,14 +37,14 @@ 
  *     Code compilé
  **/
 function generer_generer_url($type, $p) {
-	$_id = interprete_argument_balise(1, $p);
+    $_id = interprete_argument_balise(1, $p);
 
-	if (!$_id) {
-		$primary = id_table_objet($type);
-		$_id = champ_sql($primary, $p);
-	}
+    if (!$_id) {
+        $primary = id_table_objet($type);
+        $_id = champ_sql($primary, $p);
+    }
 
-	return generer_generer_url_arg($type, $p, $_id);
+    return generer_generer_url_arg($type, $p, $_id);
 }
 
 /**
@@ -73,29 +73,29 @@ 
  *     Code compilé
  **/
 function generer_generer_url_arg($type, $p, $_id) {
-	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)) {
-			return $f($type, $_id, $s);
-		}
-		if (!$GLOBALS['connexions'][strtolower($s)]['spip_connect_version']) {
-			return null;
-		}
-		$s = _q($s);
-		# 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_fichier($_id,$s)";
-		}
-		$s = ", '', '', $s, quete_meta('type_urls', $s)";
-	} else {
-		$s = ", '', '', true";
-	}
-
-	return "urlencode_1738(generer_url_entite($_id, '$type'$s))";
+    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)) {
+            return $f($type, $_id, $s);
+        }
+        if (!$GLOBALS['connexions'][strtolower($s)]['spip_connect_version']) {
+            return null;
+        }
+        $s = _q($s);
+        # 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_fichier($_id,$s)";
+        }
+        $s = ", '', '', $s, quete_meta('type_urls', $s)";
+    } else {
+        $s = ", '', '', true";
+    }
+
+    return "urlencode_1738(generer_url_entite($_id, '$type'$s))";
 }
 
 
@@ -120,27 +120,27 @@ 
  */
 function balise_URL__dist($p) {
 
-	$nom = $p->nom_champ;
-	if ($nom === 'URL_') {
-		$msg = array('zbug_balise_sans_argument', array('balise' => ' URL_'));
-		erreur_squelette($msg, $p);
-		$p->interdire_scripts = false;
-
-		return $p;
-	} elseif ($f = charger_fonction($nom, 'balise', true)) {
-		return $f($p);
-	} else {
-		$nom = strtolower($nom);
-		$code = generer_generer_url(substr($nom, 4), $p);
-		$code = champ_sql($nom, $p, $code);
-		$p->code = $code;
-		if (!$p->etoile) {
-			$p->code = "vider_url($code)";
-		}
-		$p->interdire_scripts = false;
-
-		return $p;
-	}
+    $nom = $p->nom_champ;
+    if ($nom === 'URL_') {
+        $msg = array('zbug_balise_sans_argument', array('balise' => ' URL_'));
+        erreur_squelette($msg, $p);
+        $p->interdire_scripts = false;
+
+        return $p;
+    } elseif ($f = charger_fonction($nom, 'balise', true)) {
+        return $f($p);
+    } else {
+        $nom = strtolower($nom);
+        $code = generer_generer_url(substr($nom, 4), $p);
+        $code = champ_sql($nom, $p, $code);
+        $p->code = $code;
+        if (!$p->etoile) {
+            $p->code = "vider_url($code)";
+        }
+        $p->interdire_scripts = false;
+
+        return $p;
+    }
 }
 
 /**
@@ -164,20 +164,20 @@ 
  */
 function balise_URL_ARTICLE_dist($p) {
 
-	// Cas particulier des boucles (SYNDIC_ARTICLES)
-	if ($p->type_requete == 'syndic_articles') {
-		$code = champ_sql('url', $p);
-	} else {
-		$code = generer_generer_url('article', $p);
-	}
+    // Cas particulier des boucles (SYNDIC_ARTICLES)
+    if ($p->type_requete == 'syndic_articles') {
+        $code = champ_sql('url', $p);
+    } else {
+        $code = generer_generer_url('article', $p);
+    }
 
-	$p->code = $code;
-	if (!$p->etoile) {
-		$p->code = "vider_url($code)";
-	}
-	$p->interdire_scripts = false;
+    $p->code = $code;
+    if (!$p->etoile) {
+        $p->code = "vider_url($code)";
+    }
+    $p->interdire_scripts = false;
 
-	return $p;
+    return $p;
 }
 
 /**
@@ -197,21 +197,21 @@ 
  *     Pile complétée par le code à générer
  */
 function balise_URL_SITE_dist($p) {
-	$code = champ_sql('url_site', $p);
-	if (strpos($code, '@$Pile[0]') !== false) {
-		$code = generer_generer_url('site', $p);
-		if ($code === null) {
-			return null;
-		}
-	} else {
-		if (!$p->etoile) {
-			$code = "calculer_url($code,'','url', \$connect)";
-		}
-	}
-	$p->code = $code;
-	$p->interdire_scripts = false;
-
-	return $p;
+    $code = champ_sql('url_site', $p);
+    if (strpos($code, '@$Pile[0]') !== false) {
+        $code = generer_generer_url('site', $p);
+        if ($code === null) {
+            return null;
+        }
+    } else {
+        if (!$p->etoile) {
+            $code = "calculer_url($code,'','url', \$connect)";
+        }
+    }
+    $p->code = $code;
+    $p->interdire_scripts = false;
+
+    return $p;
 }
 
 // Autres balises URL_*, qui ne concernent pas une table
@@ -230,11 +230,11 @@ 
  *     Pile complétée par le code à générer
  */
 function balise_URL_SITE_SPIP_dist($p) {
-	$p->code = "sinon(\$GLOBALS['meta']['adresse_site'],'.')";
-	$p->code = "spip_htmlspecialchars(" . $p->code . ")";
-	$p->interdire_scripts = false;
+    $p->code = "sinon(\$GLOBALS['meta']['adresse_site'],'.')";
+    $p->code = "spip_htmlspecialchars(" . $p->code . ")";
+    $p->interdire_scripts = false;
 
-	return $p;
+    return $p;
 }
 
 
@@ -263,42 +263,42 @@ 
  */
 function balise_URL_PAGE_dist($p) {
 
-	$code = interprete_argument_balise(1, $p);
-	$args = interprete_argument_balise(2, $p);
-	if ($args == null) {
-		$args = "''";
-	}
-
-	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 ($args and $args !== "''") {
-				$code .= ", $args";
-			}
-			$code = $f('page', $code, $s);
-			$p->code = $code;
-			return $p;
-		}
-		$s = 'connect=' . addslashes($s);
-		$args = (($args and $args !== "''") ? "$args . '&$s'" : "'$s'");
-	}
-
-	if (!$code) {
-		$noentities = $p->etoile ? "'&'" : '';
-		$code = "url_de_base() . preg_replace(',^./,', '', self($noentities))";
-	} else {
-		if (!$args) {
-			$args = "''";
-		}
-		$noentities = $p->etoile ? ", true" : '';
-		$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);
-
-	#$p->interdire_scripts = true;
-	return $p;
+    $code = interprete_argument_balise(1, $p);
+    $args = interprete_argument_balise(2, $p);
+    if ($args == null) {
+        $args = "''";
+    }
+
+    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 ($args and $args !== "''") {
+                $code .= ", $args";
+            }
+            $code = $f('page', $code, $s);
+            $p->code = $code;
+            return $p;
+        }
+        $s = 'connect=' . addslashes($s);
+        $args = (($args and $args !== "''") ? "$args . '&$s'" : "'$s'");
+    }
+
+    if (!$code) {
+        $noentities = $p->etoile ? "'&'" : '';
+        $code = "url_de_base() . preg_replace(',^./,', '', self($noentities))";
+    } else {
+        if (!$args) {
+            $args = "''";
+        }
+        $noentities = $p->etoile ? ", true" : '';
+        $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);
+
+    #$p->interdire_scripts = true;
+    return $p;
 }
 
 
@@ -325,24 +325,24 @@ 
  */
 function balise_URL_ECRIRE_dist($p) {
 
-	$code = interprete_argument_balise(1, $p);
-	if (!$code) {
-		$fonc = "''";
-	} else {
-		$fonc = $code;
-		$args = interprete_argument_balise(2, $p);
-		if ($args === null) {
-			$args = "''";
-		}
-		$noentities = $p->etoile ? ", true" : '';
-		if (($args != "''") or $noentities) {
-			$fonc .= ",$args$noentities";
-		}
-	}
-	$p->code = 'generer_url_ecrire(' . $fonc . ')';
-	$p->interdire_scripts = false;
-
-	return $p;
+    $code = interprete_argument_balise(1, $p);
+    if (!$code) {
+        $fonc = "''";
+    } else {
+        $fonc = $code;
+        $args = interprete_argument_balise(2, $p);
+        if ($args === null) {
+            $args = "''";
+        }
+        $noentities = $p->etoile ? ", true" : '';
+        if (($args != "''") or $noentities) {
+            $fonc .= ",$args$noentities";
+        }
+    }
+    $p->code = 'generer_url_ecrire(' . $fonc . ')';
+    $p->interdire_scripts = false;
+
+    return $p;
 }
 
 
@@ -368,24 +368,24 @@ 
  *     Pile complétée par le code à générer
  */
 function balise_URL_ACTION_AUTEUR_dist($p) {
-	$p->descr['session'] = true;
-
-	$p->code = interprete_argument_balise(1, $p);
-
-	$args = interprete_argument_balise(2, $p);
-	if ($args != "''" && $args !== null) {
-		$p->code .= "," . $args;
-	}
-	$redirect = interprete_argument_balise(3, $p);
-	if ($redirect != "''" && $redirect !== null) {
-		if ($args == "''" || $args === null) {
-			$p->code .= ",''";
-		}
-		$p->code .= "," . $redirect;
-	}
-
-	$p->code = "generer_action_auteur(" . $p->code . ")";
-	$p->interdire_scripts = false;
-
-	return $p;
+    $p->descr['session'] = true;
+
+    $p->code = interprete_argument_balise(1, $p);
+
+    $args = interprete_argument_balise(2, $p);
+    if ($args != "''" && $args !== null) {
+        $p->code .= "," . $args;
+    }
+    $redirect = interprete_argument_balise(3, $p);
+    if ($redirect != "''" && $redirect !== null) {
+        if ($args == "''" || $args === null) {
+            $p->code .= ",''";
+        }
+        $p->code .= "," . $redirect;
+    }
+
+    $p->code = "generer_action_auteur(" . $p->code . ")";
+    $p->interdire_scripts = false;
+
+    return $p;
 }

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 @@ 
 			$p->code = $code;
 			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;
@@ -374,17 +374,17 @@ 
 
 	$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;