diff --git a/ecrire/articles.php3 b/ecrire/articles.php3
index 5581608f9c1a23fa45d1bbc9d46e5f0ffa94c511..75619f6376a63783d6b928e5b9ae6f97ca04e55c 100644
--- a/ecrire/articles.php3
+++ b/ecrire/articles.php3
@@ -23,7 +23,8 @@ if ($id_article==0 AND $new=='oui') {
spip_query("INSERT INTO spip_auteurs_articles (id_auteur, id_article) VALUES ($connect_id_auteur, $id_article)");
}
-$requete_fichier = "articles.php3?id_article=$id_article";
+$clean_link = new Link("articles.php3?id_article=$id_article");
+
// Initialiser doublons pour documents (completes par "propre($texte)")
$id_doublons['documents'] = "0";
@@ -1056,7 +1057,7 @@ if (mysql_num_rows($result)) {
$ifond = $ifond ^ 1;
$couleur = ($ifond) ? '#FFFFFF' : $couleur_claire;
- $url_auteur = "auteurs_edit.php3?id_auteur=$id_auteur&redirect=".rawurlencode("articles.php3?id_article=$id_article");
+ $url_auteur = "auteurs_edit.php3?id_auteur=$id_auteur";
echo "<TR BGCOLOR='$couleur' WIDTH=\"100%\">";
echo "<TD WIDTH=23>";
diff --git a/ecrire/inc_admin.php3 b/ecrire/inc_admin.php3
index 2c5acd8ecdc66961e8a4212c99d829015051c4c2..fbc783e1be7b0e1f718e515780233b35e02098f1 100644
--- a/ecrire/inc_admin.php3
+++ b/ecrire/inc_admin.php3
@@ -12,13 +12,10 @@ function fichier_admin($action) {
}
function debut_admin($action, $commentaire='') {
- global $REQUEST_URI;
+ global $clean_link;
global $connect_statut;
- if (!$requete_fichier) {
- $requete_fichier = substr($REQUEST_URI, strrpos($REQUEST_URI, '/') + 1);
- }
- $lien = $requete_fichier;
+ $lien = $clean_link->getUrl();
if ((!$action) || ($connect_statut != "0minirezo")) {
include_ecrire ("inc_presentation.php3");
diff --git a/ecrire/inc_presentation.php3 b/ecrire/inc_presentation.php3
index 1cd18a9e3d78efbfc0c6bf4245149bdd66b63045..c021f3989ef3f3f423f283da7d8190dc1709f249 100644
--- a/ecrire/inc_presentation.php3
+++ b/ecrire/inc_presentation.php3
@@ -1312,7 +1312,6 @@ function debut_page($titre = "", $rubrique = "asuivre", $sous_rubrique = "asuivr
global $connect_statut;
global $connect_activer_messagerie;
global $connect_toutes_rubriques;
- global $REQUEST_URI;
global $auth_can_disconnect, $connect_login;
global $options, $spip_display, $spip_ecran;
$activer_messagerie = lire_meta("activer_messagerie");
@@ -1613,9 +1612,7 @@ function fin_cadre_formulaire(){
function debut_gauche($rubrique = "asuivre") {
global $connect_statut, $cookie_admin;
- global $REQUEST_URI;
global $options;
- global $requete_fichier;
global $connect_id_auteur;
global $spip_ecran;
global $flag_3_colonnes, $flag_centre_large;
@@ -1628,7 +1625,7 @@ function debut_gauche($rubrique = "asuivre") {
$largeur_ecran = 974;
// Si edition de texte, formulaires larges
- if (ereg('((articles|breves|rubriques)_edit|forum_envoi)\.php3', $REQUEST_URI)) {
+ if (ereg('((articles|breves|rubriques)_edit|forum_envoi)\.php3', $GLOBALS['REQUEST_URI'])) {
$flag_centre_large = true;
}
@@ -1740,9 +1737,7 @@ function creer_colonne_droite(){
global $connect_activer_messagerie;
global $connect_activer_imessage;
global $connect_statut, $cookie_admin;
- global $REQUEST_URI;
global $options;
- global $requete_fichier;
global $connect_id_auteur, $spip_ecran;
global $flag_3_colonnes, $flag_centre_large;
@@ -1954,7 +1949,7 @@ function fin_html() {
}
-function fin_page() {
+function fin_page($credits='') {
global $spip_version_affichee;
global $connect_id_auteur;
@@ -1970,9 +1965,8 @@ debut_grand_cadre();
est un logiciel libre distribué <a href='copyright_fr.html'>sous licence GPL.</a>
<?php
-if (ereg("index\.php3", $GLOBALS['REQUEST_URI']) || !ereg("\.php3", $GLOBALS['REQUEST_URI'])) {
+if (ereg("jimmac", $credits))
echo "<br>Les icones de l'interface sont de <a href='http://jimmac.musichall.cz/'>Jakub 'Jimmac' Steiner</a>.";
-}
?>
<p>
</font></div>
diff --git a/ecrire/index.php3 b/ecrire/index.php3
index 2de3013c7e57fd863df85e18ff50fc0dbac2ca39..a04d9d4baa5f2549d1be0bd7c3837c16c92764a4 100644
--- a/ecrire/index.php3
+++ b/ecrire/index.php3
@@ -230,7 +230,7 @@ if ($meta["debut_restauration"]) {
debut_boite_alerte();
echo "<font FACE='Verdana,Arial,Helvetica,sans-serif' SIZE=4 color='black'><B>$texte_boite</B></font>";
fin_boite_alerte();
- fin_page();
+ fin_page("jimmac");
echo "</HTML><font color='white'>\n<!--";
@flush();
$gz = $flag_gz;
@@ -421,7 +421,7 @@ if ($options == 'avancees') {
}
-fin_page();
+fin_page("jimmac");
//
diff --git a/ecrire/naviguer.php3 b/ecrire/naviguer.php3
index 70740431b598cc8099eb1c9c019e5a944087b349..3e55a76b1433cd2f56b5adaa489cf16a046ed4ae 100644
--- a/ecrire/naviguer.php3
+++ b/ecrire/naviguer.php3
@@ -488,7 +488,7 @@ if ($options == "avancees"){
$link = new Link('sites_edit.php3');
$link->addVar('id_rubrique', $coll);
$link->addVar('target', 'sites.php3');
- $link->addVar('redirect', $this_link->getUrl());
+ $link->addVar('redirect', $clean_link->getUrl());
echo "<div align='right'>";
icone("Référencer un site", $link->getUrl(), "site-24.gif", "creer.gif");
diff --git a/ecrire/sites.php3 b/ecrire/sites.php3
index 0c1bc674d6320612d632b8faf7768ca9e9151fd5..fd6e8fefa573b90537d702a35d946ce254ef5e46 100644
--- a/ecrire/sites.php3
+++ b/ecrire/sites.php3
@@ -324,7 +324,7 @@ echo "</td>";
if ($flag_editable) {
$link = new Link('sites_edit.php3');
$link->addVar('id_syndic');
- $link->addVar('target', $this_link->getUrl());
+ $link->addVar('target', $clean_link->getUrl());
echo "<td><img src='img_pack/rien.gif' width=5></td>\n";
echo "<td align='right'>";
icone("Modifier ce site", $link->getUrl(), "site-24.gif", "edit.gif");
diff --git a/ecrire/sites_edit.php3 b/ecrire/sites_edit.php3
index 22d3dcb203d39da1500eea4603df87e610799fa0..88216345a462afee33f169596d41cd54c8531d98 100644
--- a/ecrire/sites_edit.php3
+++ b/ecrire/sites_edit.php3
@@ -142,7 +142,7 @@ if ($new == 'oui'){
$link = new Link('sites.php3');
$link->addVar('id_rubrique', $id_rubrique);
$link->addVar('new', 'oui');
- $link->addVar('redirect', $this_link->getUrl());
+ $link->addVar('redirect', $clean_link->getUrl());
$link->addVar('analyser_site', 'oui');
echo $link->getForm();
diff --git a/ecrire/sites_tous.php3 b/ecrire/sites_tous.php3
index d26be81c96ec5a6b8b3fbdee60fbce4714dc5fad..a47340666990a09a2c5c26b0e9814a0657c4f4d3 100644
--- a/ecrire/sites_tous.php3
+++ b/ecrire/sites_tous.php3
@@ -35,7 +35,7 @@ if ($connect_statut == '0minirezo' OR $proposer_sites > 0) {
echo "<div align='right'>";
$link = new Link('sites_edit.php3');
$link->addVar('target', 'sites.php3');
- $link->addVar('redirect', $this_link->getUrl());
+ $link->addVar('redirect', $clean_link->getUrl());
icone("Référencer un nouveau site", $link->getUrl(), "site-24.gif", "creer.gif");
echo "</div>";
}