From ae277b9fca9611b4937bfa639cd6a5d4cb3385c5 Mon Sep 17 00:00:00 2001
From: Vincent Zanotti <vincent.zanotti@polytechnique.org>
Date: Sun, 27 Jul 2008 01:05:38 +0200
Subject: [PATCH] Switches suid logout code & templates to the new hruid model.

Signed-off-by: Vincent Zanotti <vincent.zanotti@polytechnique.org>
---
 modules/platal.php          | 5 ++---
 templates/skin/default.tpl  | 2 +-
 templates/skin/espace.tpl   | 2 +-
 templates/skin/humlinux.tpl | 2 +-
 templates/skin/keynote.tpl  | 2 +-
 templates/skin/linux.tpl    | 2 +-
 templates/skin/liteskin.tpl | 2 +-
 templates/skin/nbviolet.tpl | 2 +-
 templates/skin/newxorg.tpl  | 2 +-
 templates/skin/oldtimes.tpl | 2 +-
 templates/skin/openweb.tpl  | 2 +-
 templates/skin/register.tpl | 2 +-
 templates/skin/sharky.tpl   | 2 +-
 templates/skin/spectral.tpl | 2 +-
 templates/skin/trapped.tpl  | 2 +-
 15 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/modules/platal.php b/modules/platal.php
index f6ae04e..1f96e68 100644
--- a/modules/platal.php
+++ b/modules/platal.php
@@ -412,12 +412,11 @@ Adresse de secours : " . Post::v('email') : ""));
     function handler_exit(&$page, $level = null)
     {
         if (S::has('suid')) {
-            $a4l  = S::v('forlife');
             $suid = S::v('suid');
             $log  = S::v('log');
-            S::logger()->log("suid_stop", S::v('forlife') . " by " . $suid['forlife']);
+            S::logger()->log("suid_stop", S::user()->login() . " by " . $suid['hruid']);
             Platal::session()->stopSUID();
-            pl_redirect('admin/user/' . $a4l);
+            pl_redirect('admin/user/' . S::user()->login());
         }
 
         if ($level == 'forget' || $level == 'forgetall') {
diff --git a/templates/skin/default.tpl b/templates/skin/default.tpl
index 67096d0..9b509dc 100644
--- a/templates/skin/default.tpl
+++ b/templates/skin/default.tpl
@@ -33,7 +33,7 @@
     {if $smarty.session.suid}
     <div id="suid">
       <a href="exit">
-        Quitter le SU sur {$smarty.session.forlife} ({$smarty.session.perms->flags()})
+        Quitter le SU sur {$smarty.session.hruid} ({$smarty.session.perms->flags()})
       </a>
     </div>
     {/if}
diff --git a/templates/skin/espace.tpl b/templates/skin/espace.tpl
index d7f74cc..0dc1684 100644
--- a/templates/skin/espace.tpl
+++ b/templates/skin/espace.tpl
@@ -34,7 +34,7 @@
     {if $smarty.session.suid}
     <div id="suid">
       <a href="exit">
-        Quitter le SU sur {$smarty.session.forlife} ({$smarty.session.perms->flags()})
+        Quitter le SU sur {$smarty.session.hruid} ({$smarty.session.perms->flags()})
       </a>
     </div>
     {/if}
diff --git a/templates/skin/humlinux.tpl b/templates/skin/humlinux.tpl
index 4c98b24..42a6b00 100644
--- a/templates/skin/humlinux.tpl
+++ b/templates/skin/humlinux.tpl
@@ -34,7 +34,7 @@
     {if $smarty.session.suid}
     <div id="suid">
       <a href="exit">
-        Quitter le SU sur {$smarty.session.forlife} ({$smarty.session.perms->flags()})
+        Quitter le SU sur {$smarty.session.hruid} ({$smarty.session.perms->flags()})
       </a>
     </div>
     {/if}
diff --git a/templates/skin/keynote.tpl b/templates/skin/keynote.tpl
index fb21d00..f77d251 100644
--- a/templates/skin/keynote.tpl
+++ b/templates/skin/keynote.tpl
@@ -33,7 +33,7 @@
     {if $smarty.session.suid}
     <div id="suid">
       <a href="exit">
-        Quitter le SU sur {$smarty.session.forlife} ({$smarty.session.perms->flags()})
+        Quitter le SU sur {$smarty.session.hruid} ({$smarty.session.perms->flags()})
       </a>
     </div>
     {/if}
diff --git a/templates/skin/linux.tpl b/templates/skin/linux.tpl
index 0bf94c1..d1de067 100644
--- a/templates/skin/linux.tpl
+++ b/templates/skin/linux.tpl
@@ -34,7 +34,7 @@
     {if $smarty.session.suid}
     <div id="suid">
       <a href="exit">
-        Quitter le SU sur {$smarty.session.forlife} ({$smarty.session.perms->flags()})
+        Quitter le SU sur {$smarty.session.hruid} ({$smarty.session.perms->flags()})
       </a>
     </div>
     {/if}
diff --git a/templates/skin/liteskin.tpl b/templates/skin/liteskin.tpl
index aae8664..21ba9e1 100644
--- a/templates/skin/liteskin.tpl
+++ b/templates/skin/liteskin.tpl
@@ -34,7 +34,7 @@
     {if $smarty.session.suid}
     <div id="suid">
       <a href="exit">
-        Quitter le SU sur {$smarty.session.forlife} ({$smarty.session.perms->flags()})
+        Quitter le SU sur {$smarty.session.hruid} ({$smarty.session.perms->flags()})
       </a>
     </div>
     {/if}
diff --git a/templates/skin/nbviolet.tpl b/templates/skin/nbviolet.tpl
index bee60d7..730fbee 100644
--- a/templates/skin/nbviolet.tpl
+++ b/templates/skin/nbviolet.tpl
@@ -34,7 +34,7 @@
     {if $smarty.session.suid}
     <div id="suid">
       <a href="exit">
-        Quitter le SU sur {$smarty.session.forlife} ({$smarty.session.perms->flags()})
+        Quitter le SU sur {$smarty.session.hruid} ({$smarty.session.perms->flags()})
       </a>
     </div>
     {/if}
diff --git a/templates/skin/newxorg.tpl b/templates/skin/newxorg.tpl
index 41a54c4..035c0c5 100644
--- a/templates/skin/newxorg.tpl
+++ b/templates/skin/newxorg.tpl
@@ -34,7 +34,7 @@
     {if $smarty.session.suid}
     <div id="suid">
       <a href="exit">
-        Quitter le SU sur {$smarty.session.forlife} ({$smarty.session.perms->flags()})
+        Quitter le SU sur {$smarty.session.hruid} ({$smarty.session.perms->flags()})
       </a>
     </div>
     {/if}
diff --git a/templates/skin/oldtimes.tpl b/templates/skin/oldtimes.tpl
index dce826d..5c9914b 100644
--- a/templates/skin/oldtimes.tpl
+++ b/templates/skin/oldtimes.tpl
@@ -33,7 +33,7 @@
     <table id="suid" cellpadding="0" cellspacing="0">
       <tr>
         <td>
-          {$smarty.session.suid} ({$smarty.session.forlife})
+          {$smarty.session.suid} ({$smarty.session.hruid})
           [<a href="exit">exit</a>]
         </td>
       </tr>
diff --git a/templates/skin/openweb.tpl b/templates/skin/openweb.tpl
index b634ca7..9c424f1 100644
--- a/templates/skin/openweb.tpl
+++ b/templates/skin/openweb.tpl
@@ -34,7 +34,7 @@
     {if $smarty.session.suid} 
     <div id="suid"> 
       <a href="exit"> 
-        Quitter le SU sur {$smarty.session.forlife} ({$smarty.session.perms->flags()}) 
+        Quitter le SU sur {$smarty.session.hruid} ({$smarty.session.perms->flags()}) 
       </a> 
     </div> 
     {/if} 
diff --git a/templates/skin/register.tpl b/templates/skin/register.tpl
index 74049ab..8988cfd 100644
--- a/templates/skin/register.tpl
+++ b/templates/skin/register.tpl
@@ -33,7 +33,7 @@
     {if $smarty.session.suid}
     <div id="suid">
       <a href="exit">
-        Quitter le SU sur {$smarty.session.forlife} ({$smarty.session.perms->flags()})
+        Quitter le SU sur {$smarty.session.hruid} ({$smarty.session.perms->flags()})
       </a>
     </div>
     {/if}
diff --git a/templates/skin/sharky.tpl b/templates/skin/sharky.tpl
index 4696bc4..33c893b 100644
--- a/templates/skin/sharky.tpl
+++ b/templates/skin/sharky.tpl
@@ -33,7 +33,7 @@
     <table id="suid" cellpadding="0" cellspacing="0">
       <tr>
         <td>
-          {$smarty.session.suid} ({$smarty.session.forlife})
+          {$smarty.session.suid} ({$smarty.session.hruid})
           [<a href="exit">exit</a>]
         </td>
       </tr>
diff --git a/templates/skin/spectral.tpl b/templates/skin/spectral.tpl
index 9144454..8a0e715 100644
--- a/templates/skin/spectral.tpl
+++ b/templates/skin/spectral.tpl
@@ -34,7 +34,7 @@
     {if $smarty.session.suid}
     <div id="suid">
       <a href="exit">
-        Quitter le SU sur {$smarty.session.forlife} ({$smarty.session.perms->flags()})
+        Quitter le SU sur {$smarty.session.hruid} ({$smarty.session.perms->flags()})
       </a>
     </div>
     {/if}
diff --git a/templates/skin/trapped.tpl b/templates/skin/trapped.tpl
index cee1f4e..0a11efd 100644
--- a/templates/skin/trapped.tpl
+++ b/templates/skin/trapped.tpl
@@ -34,7 +34,7 @@
     {if $smarty.session.suid}
     <div id="suid">
       <a href="exit">
-        Quitter le SU sur {$smarty.session.forlife} ({$smarty.session.perms->flags()})
+        Quitter le SU sur {$smarty.session.hruid} ({$smarty.session.perms->flags()})
       </a>
     </div>
     {/if}
-- 
2.1.4