From ca302ba59345cc349f0cd9b67e41200af8de5034 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Thu, 5 Jan 2006 16:22:12 +0000
Subject: [PATCH] confusion entre generer_url_ecrire/public dans certains
endroits (pas toujours un pb, mais incompatible avec la genericite visee a
terme)
---
ecrire/inc_flock.php3 | 7 ++-----
ecrire/inc_getdocument.php3 | 4 ++--
ecrire/inc_mail.php3 | 4 ++--
ecrire/inc_session.php3 | 5 ++---
ecrire/inc_signatures.php3 | 8 ++++----
ecrire/inc_synchro.php | 24 +++++++++++-------------
6 files changed, 23 insertions(+), 29 deletions(-)
diff --git a/ecrire/inc_flock.php3 b/ecrire/inc_flock.php3
index f754261e04..c8d2f515a4 100644
--- a/ecrire/inc_flock.php3
+++ b/ecrire/inc_flock.php3
@@ -149,11 +149,8 @@ function creer_repertoire($base, $subdir) {
include("$path/.test");
@unlink("$path/.test");
}
- if (!$ok) {
- redirige_par_entete(generer_url_ecrire("spip_test_dirs",""));
- }
- return ($ok? "$subdir/" : '');
+ if ($ok) return "$subdir/";
+ redirige_par_entete(generer_url_public('spip_test_dirs'));
}
-
?>
diff --git a/ecrire/inc_getdocument.php3 b/ecrire/inc_getdocument.php3
index 83dd10d8a0..fb2590099a 100644
--- a/ecrire/inc_getdocument.php3
+++ b/ecrire/inc_getdocument.php3
@@ -90,7 +90,7 @@ function deplacer_fichier_upload($source, $dest) {
if ($f) {
fclose ($f);
} else {
- redirige_par_entete(generer_url_ecrire("spip_test_dirs"),
+ redirige_par_entete(generer_url_public('spip_test_dirs'),
"?test_dir=". dirname($dest));
}
@unlink($dest);
@@ -464,7 +464,7 @@ function examiner_les_fichiers($files, $mode, $type, $id, $id_document, $hash, $
'chemin' => $zip,
'doc' => $mode,
'type' => $type),
- generer_url_ecrire("spip_image","id_article=$id"));
+ generer_url_public('spip_image',"id_article=$id"));
// a tout de suite en joindre5 ou joindre6
exit;
}
diff --git a/ecrire/inc_mail.php3 b/ecrire/inc_mail.php3
index cb9df93af3..00f1d179af 100644
--- a/ecrire/inc_mail.php3
+++ b/ecrire/inc_mail.php3
@@ -167,7 +167,7 @@ function extrait_article($row) {
include_ecrire("inc_texte");
$adresse_site = $GLOBALS['meta']["adresse_site"];
-
+
$id_article = $row[0];
$titre = $row[2];
$chapo = $row[6];
@@ -192,7 +192,7 @@ function extrait_article($row) {
$extrait .= "\n\n".textebrut(propre(couper_intro("$chapo<p>$texte", 700)))."\n\n";
if ($statut == 'publie')
$extrait .= "-> ".
- generer_url_ecrire($adresse_site."/spip_redirect", "id_article=$id_article") .
+ generer_url_public('spip_redirect', "id_article=$id_article") .
"\n\n";
return $extrait;
}
diff --git a/ecrire/inc_session.php3 b/ecrire/inc_session.php3
index 03b394a995..7cde75a485 100644
--- a/ecrire/inc_session.php3
+++ b/ecrire/inc_session.php3
@@ -63,8 +63,7 @@ function ajouter_session($auteur, $id_session) {
fputs($f, $texte);
fclose($f);
} else {
- redirige_par_entete(generer_url_ecrire($GLOBALS['meta']["adresse_site"] .
- "/spip_test_dirs"));
+ redirige_par_entete(generer_url_public('spip_test_dirs'));
}
}
@@ -215,7 +214,7 @@ function ask_php_auth($pb, $raison, $retour, $url='', $re='', $lien='') {
@Header("HTTP/1.0 401 Unauthorized");
echo "<b>$pb</b><p>$raison</p>[<a href='./'>$retour</a>] ";
if ($url) {
- echo "[<a href='", generer_url_ecrire('spip_cookie',"essai_auth_http=oui&$url"), "'>$re</a>]";
+ echo "[<a href='", generer_url_public('spip_cookie',"essai_auth_http=oui&$url"), "'>$re</a>]";
}
if ($lien)
diff --git a/ecrire/inc_signatures.php3 b/ecrire/inc_signatures.php3
index 9a71933a32..517810bd2d 100644
--- a/ecrire/inc_signatures.php3
+++ b/ecrire/inc_signatures.php3
@@ -86,10 +86,10 @@ function controle_signatures($script, $id, $debut, $where, $order, $limit=10) {
$id_article,
" </b></span>";
- echo "<a href='", generer_url_ecrire((($statut == 'publie') ?
- "../spip_redirect" :
- "articles"),
- "id_article=$id_article"),
+ echo "<a href='",
+ (($statut == 'publie') ?
+ generer_url_public('spip_redirect', "id_article=$id_article") :
+ generer_url_ecrire('articles', "id_article=$id_article")),
"'>",
typo($titre),
"</a>";
diff --git a/ecrire/inc_synchro.php b/ecrire/inc_synchro.php
index 70e1dd4d02..60a8575815 100644
--- a/ecrire/inc_synchro.php
+++ b/ecrire/inc_synchro.php
@@ -17,20 +17,19 @@ include_ecrire("inc_urls");
include_ecrire("inc_acces"); // pour low_sec (iCal)
function afficher_liens_calendrier($lien, $args, $icone, $texte) {
- $adresse_site=$GLOBALS['meta']["adresse_site"];
+
echo debut_cadre_enfonce($icone);
echo $texte;
echo "<table style='width: 100%;><tr'><td style='width: 200px;'>";
- icone_horizontale (_T('ical_methode_http'),
- generer_url_ecrire("$adresse_site/$lien", $args),
- "calendrier-24.gif");
+ icone_horizontale (_T('ical_methode_http'),
+ generer_url_public($lien, $args),
+ "calendrier-24.gif");
echo "</td>";
echo "<td> </td>";
echo "<td style='width: 200px;'>";
- $webcal = ereg_replace("https?://", "webcal://", $adresse_site);
- icone_horizontale (_T('ical_methode_webcal'),
- generer_url_ecrire("$webcal/$lien", $args),
- "calendrier-24.gif");
+ icone_horizontale (_T('ical_methode_webcal'),
+ ereg_replace("https?://", "webcal://", generer_url_public($lien, $args)),
+ "calendrier-24.gif");
echo "</td></tr></table>";
echo fin_cadre_enfonce();
}
@@ -116,8 +115,7 @@ echo _T('ical_texte_rss');
echo "<p>"._T("ical_texte_rss_articles")."</p>";
- echo propre("<ul><cadre>".generer_url_ecrire($adresse_site."/backend") .
- "</cadre></ul>");
+echo propre("<ul><cadre>" . generer_url_public('backend') . "</cadre></ul>");
echo "<p>"._T("ical_texte_rss_articles2")."</p>";
@@ -133,7 +131,7 @@ echo "<p>"._T("ical_texte_rss_articles2")."</p>";
$titre_rubrique = typo($row['titre']);
$titre = htmlspecialchars($titre_rubrique);
- echo "<li>", http_href(generer_url_ecrire($adresse_site."/backend", "id_rubrique=$id_rubrique"),
+ echo "<li>", http_href( generer_url_public('backend', "id_rubrique=$id_rubrique"),
'<span class="rss-button">RSS</span> ' . $titre_rubrique,
$titre),
"</li>\n";
@@ -147,7 +145,7 @@ echo "<p>"._T("ical_texte_rss_articles2")."</p>";
if ($activer_breves == "oui") {
echo "<p>"._T("ical_texte_rss_breves")."</p>";
- echo propre('<ul><cadre>'.generer_url_ecrire($adresse_site."/backend-breves"). "</cadre></ul>");
+ echo propre('<ul><cadre>' . generer_url_ecrire('backend-breves'). "</cadre></ul>");
}
@@ -164,7 +162,7 @@ debut_cadre_relief("doc-24.gif", false, "", _T('ical_titre_js'));
echo _T('ical_texte_js').'<p />';
echo propre('<cadre><script type="text/javascript" src="'.
- generer_url_ecrire($adresse_site."/distrib") .
+ generer_url_ecrire('distrib') .
'"></script></cadre>');
fin_cadre_relief();
--
GitLab