From 757c7074aeb4d82d8e9dfec74e3b37f342aebfae Mon Sep 17 00:00:00 2001
From: Benjamin Sonntag <benjamin@alternc.org>
Date: Sun, 27 Mar 2011 13:45:51 +0000
Subject: [PATCH] on peut annuler la possibilite de revenir a l'admin

---
 .gitattributes                               |  1 +
 bureau/admin/adm_cancel.php                  | 35 ++++++++++++++++++++
 bureau/admin/adm_login.php                   |  4 +--
 bureau/locales/fr_FR/LC_MESSAGES/messages.po |  5 ++-
 4 files changed, 40 insertions(+), 5 deletions(-)
 create mode 100644 bureau/admin/adm_cancel.php

diff --git a/.gitattributes b/.gitattributes
index d8b84c21..345d3245 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -13,6 +13,7 @@ aide/sommaire.sgml -text
 aide/stats.sgml -text
 aide/test.sgml -text
 bureau/admin/adm_add.php -text
+bureau/admin/adm_cancel.php -text
 bureau/admin/adm_deactivate.php -text
 bureau/admin/adm_defquotas.php -text
 bureau/admin/adm_del.php -text
diff --git a/bureau/admin/adm_cancel.php b/bureau/admin/adm_cancel.php
new file mode 100644
index 00000000..6a6494ad
--- /dev/null
+++ b/bureau/admin/adm_cancel.php
@@ -0,0 +1,35 @@
+<?php
+/*
+ $Id: adm_login.php,v 1.4 2005/04/01 17:13:10 benjamin Exp $
+ ----------------------------------------------------------------------
+ AlternC - Web Hosting System
+ Copyright (C) 2002 by the AlternC Development Team.
+ http://alternc.org/
+ ----------------------------------------------------------------------
+ Based on:
+ Valentin Lacambre's web hosting softwares: http://altern.org/
+ ----------------------------------------------------------------------
+ LICENSE
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License (GPL)
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ To read the license please visit http://www.gnu.org/copyleft/gpl.html
+ ----------------------------------------------------------------------
+ Original Author of file: Benjamin Sonntag
+ Purpose of file: Connect a super-user to another account
+ ----------------------------------------------------------------------
+*/
+require_once("../class/config.php");
+
+setcookie('oldid','',0,'/');
+
+require_once("main.php");
+
diff --git a/bureau/admin/adm_login.php b/bureau/admin/adm_login.php
index d6cbfe89..e6406299 100644
--- a/bureau/admin/adm_login.php
+++ b/bureau/admin/adm_login.php
@@ -32,7 +32,7 @@ require_once("../class/config.php");
 // If we just want to return to our previous session
 $oldid=intval($_COOKIE['oldid']);
 if ($oldid) {
-  setcookie('oldid','',0,'/admin/');
+  setcookie('oldid','',0,'/');
 
   $db->query("select lastip from membres where uid='$oldid';");
   $db->next_record();
@@ -71,7 +71,7 @@ if ($subadmin==0 && !$admin->checkcreator($id)) {
 if (!$r=$admin->get($id)) {
   $error=$err->errstr();
 } else {
-  setcookie('oldid',$cuid,0,'/admin/');
+  setcookie('oldid',$cuid,0,'/');
   if (!$mem->setid($id)) {
     $error=$err->errstr();
     include("index.php");
diff --git a/bureau/locales/fr_FR/LC_MESSAGES/messages.po b/bureau/locales/fr_FR/LC_MESSAGES/messages.po
index f826755e..06621445 100644
--- a/bureau/locales/fr_FR/LC_MESSAGES/messages.po
+++ b/bureau/locales/fr_FR/LC_MESSAGES/messages.po
@@ -3833,9 +3833,8 @@ msgstr "Cacher les options avanc
 
 #: ../admin/head.php:50
 msgid ""
-"Invited session. Clic <a href='adm_login.php'>here</a> to return to your "
-"previous session."
-msgstr "Session invité <a href='adm_login.php'>Cliquez ici</a> pour revenir a votre session précédente"
+"Administrator session. you may <a href='adm_login.php'>return to your account</a> or <a href='adm_cancel.php'>cancel this feature</a>"
+msgstr "Session administrateur. Vous pouvez <a href='adm_login.php'>revenir à votre compte</a> ou <a href='adm_cancel.php'>annuler cette possibilité</a>"
 
 #: ../admin/adm_passpolicy.php:120
 msgid ""