No more auth_user in modules/emails.php \o/

[platal.git] / modules / auth.php

diff --git a/modules/auth.php b/modules/auth.php
index 6ac8b9a..1601c58 100644 (file)
--- a/modules/auth.php
+++ b/modules/auth.php
@@ -151,11 +151,9 @@ class AuthModule extends PLModule
 
         // mise à jour de l'heure et de la machine de dernier login sauf quand on est en suid
         $uid = S::i('uid');
-        if (!isset($_SESSION['suid'])) {
-            $logger = (isset($_SESSION['log']) && $_SESSION['log']->uid == $uid)
-                            ? $_SESSION['log'] : new PlLogger($uid);
+        if (!S::suid()) {
             global $platal;
-            S::logger()->log('connexion_auth_ext', $platal->path);
+            S::logger($uid)->log('connexion_auth_ext', $platal->path);
         }
 
         /* on parcourt les entrees de groupes_auth */
@@ -163,7 +161,8 @@ class AuthModule extends PLModule
 
         while (list($privkey,$name,$datafields,$returnurls) = $res->next()) {
             if (md5($gpex_challenge.$privkey) == $gpex_pass) {
-                if ($returnurls == "" || @preg_match($returnurls, $gpex_url)) {
+                $returnurls = trim($returnurls);
+                if (empty($returnurls) || @preg_match($returnurls, $gpex_url)) {
                     $returl = $gpex_url . gpex_make_params($gpex_challenge, $privkey, $datafields, $charset);
                     http_redirect($returl);
                 }