From e47d58f4e7e612ea30dbf85c34218a1cf404a8f7 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Wed, 9 Jul 2008 10:49:35 +0000
Subject: [PATCH] #1356 coherence de l'emplacement activer/supprimer le cookie
de correspondance
---
.gitattributes | 1 +
ecrire/exec/accueil.php | 40 +++++++++++---------------
prive/images/supprimer-sansdanger.gif | Bin 0 -> 85 bytes
3 files changed, 18 insertions(+), 23 deletions(-)
create mode 100644 prive/images/supprimer-sansdanger.gif
diff --git a/.gitattributes b/.gitattributes
index 7750513cb7..104a612cf7 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -694,6 +694,7 @@ prive/images/statistiques-24.gif -text
prive/images/statistiques-48.png -text
prive/images/suivi-forum-24.gif -text
prive/images/suivi-petition-24.gif -text
+prive/images/supprimer-sansdanger.gif -text
prive/images/supprimer.gif -text
prive/images/synchro-24.gif -text
prive/images/tab.png -text
diff --git a/ecrire/exec/accueil.php b/ecrire/exec/accueil.php
index 67b15a3b73..6b3a4b48f3 100644
--- a/ecrire/exec/accueil.php
+++ b/ecrire/exec/accueil.php
@@ -193,28 +193,6 @@ function colonne_droite_neq4($id_rubrique, $activer_breves, $activer_sites, $art
}
$gadget = pipeline('accueil_gadgets',$gadget);
-//
-// Modification du cookie
-//
-
- if (!@$_COOKIE['spip_admin']) {
- $cookie = rawurlencode("@$connect_login");
- $retour = rawurlencode('./' . _SPIP_ECRIRE_SCRIPT);
- $lien = generer_url_action('cookie', "cookie_admin=$cookie&url=$retour");
- $gadget .= "<div> </div>".
- "<table width='95%'><tr>".
- "<td style='width: 100%'>".
- _T('info_activer_cookie').
- aide ("cookie").
- "</td>".
- "<td style='width: 10px'>".
- http_img_pack("rien.gif", ' ', "width='10'") .
- "</td>".
- "<td style='width: 250px'>".
- icone_horizontale(_T('icone_activer_cookie'), $lien,"cookie-24.gif", "", false).
- "</td></tr></table>";
- }
-
if (strlen($gadget) > 0) {
$gadget = "<div> </div>"
. debut_cadre_trait_couleur('', true)
@@ -256,16 +234,32 @@ function personnel_accueil($coockcookie)
// Supprimer le cookie, se deconnecter...
//
+ $res .= "<div class='info_cookie'>";
if ($coockcookie) {
$lien = generer_url_action('cookie', "cookie_admin=non&url=".rawurlencode('./'. _SPIP_ECRIRE_SCRIPT));
$t = _T('icone_supprimer_cookie');
- $t = icone_horizontale($t, $lien, "cookie-24.gif", "", false);
+ $t = icone_horizontale($t, $lien, "cookie-24.gif", "supprimer-sansdanger.gif", false);
if ($GLOBALS['spip_display'] != 1)
$t = str_replace('</td></tr></table>',
aide("cookie").'</td></tr></table>',
$t);
$res .= $t;
}
+ //
+ // Modification du cookie
+ //
+
+ else {
+ $cookie = rawurlencode("@$connect_login");
+ $retour = rawurlencode('./' . _SPIP_ECRIRE_SCRIPT);
+ $lien = generer_url_action('cookie', "cookie_admin=$cookie&url=$retour");
+ $res .=
+ _T('info_activer_cookie').
+ aide ("cookie").
+ icone_horizontale(_T('icone_activer_cookie'), $lien,"cookie-24.gif", "", false);
+ }
+ $res .= "</div>";
+
$titre_cadre = afficher_plus(generer_url_ecrire("auteur_infos","id_auteur=$connect_id_auteur"));
$titre_cadre .= majuscules(typo($GLOBALS['visiteur_session']['nom']));
diff --git a/prive/images/supprimer-sansdanger.gif b/prive/images/supprimer-sansdanger.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ba91017527d7ce18813ece5a1d0b89dbe8f350ca
GIT binary patch
literal 85
zcmZ?wbhEHblwy!zXkcXc&%p5d^=rkSEQ|~cj0`#qKmd|qVAAR7UwQg1|Kd4YZgp=y
nr|^}l#r=opl8R}8RZ(lamfm>1?}PGbVau)s+c~-9SsAPWh=m@<
literal 0
HcmV?d00001
--
GitLab