From 98514a4e0037aa0879e45bbad660aeda8837c624 Mon Sep 17 00:00:00 2001
From: vincent-peugnet <v.peugnet@free.fr>
Date: Tue, 28 Apr 2020 14:20:10 +0200
Subject: add session as controller var

---
 app/class/Modeluser.php | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

(limited to 'app/class/Modeluser.php')

diff --git a/app/class/Modeluser.php b/app/class/Modeluser.php
index c9e38c6..256ad55 100644
--- a/app/class/Modeluser.php
+++ b/app/class/Modeluser.php
@@ -33,19 +33,9 @@ class Modeluser extends Modeldb
         $_SESSION['user' . Config::basepath()]['columns'] = $user->columns();
     }
 
-    public function readsession()
+
+    public function readcookie()
     {
-        $userdatas = [];
-        if (
-            array_key_exists('user' . Config::basepath(), $_SESSION)
-            && isset($_SESSION['user' . Config::basepath()]['id'])
-        ) {
-            $userdatas = $_SESSION['user' . Config::basepath()];
-            $user = new User($userdatas);
-            $user = $this->get($user);
-            return $user;
-        }
-        
         if (isset($_COOKIE['authtoken']) && strpos($_COOKIE['authtoken'], ':')) {
             list($cookietoken, $cookiemac) = explode(':', $_COOKIE['authtoken']);
             $authtokenmanager = new Modelauthtoken();
@@ -54,15 +44,11 @@ class Modeluser extends Modeldb
             if ($dbtoken !== false) {
                 if (hash_equals($cookiemac, secrethash($dbtoken->getId()))) {
                     $user = $this->get($dbtoken->user);
-                    if ($user !== false) {
-                        $this->writesession($user);
-                    }
                     return $user;
                 }
             }
         }
-
-        return new User(['id' => '', 'level' => 0]);
+        return false;
     }
 
 
-- 
cgit v1.2.3