From 70eeca818a70108d5121e4110def9b6a3389f49e Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 4 Mar 2022 12:36:06 +0000
Subject: [PATCH] wip #5144 @1.5

---
 .htaccess                         |  1 +
 inc/commons/class.common.core.php | 13 -------------
 inc/commons/class.common.url.php  |  4 +---
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/.htaccess b/.htaccess
index 8c9a08701..ecfb4187f 100644
--- a/.htaccess
+++ b/.htaccess
@@ -68,6 +68,7 @@ AddCharset UTF-8 log
     RewriteRule ^viewers/([0-9a-f\-]+)_([0-9a-fA-F]+)_([0-9]+)/(.+)$ index.php/relayfb/$1/$2/$4 [L]
 
 	RewriteRule ^(fluidbook/cache/exportpdf/.*)$ - [L]
+	RewriteRule ^(fluidbook/packager/download/.*)$ - [L]
 	RewriteRule ^(fluidbook/.*)$ index.php/relay/$1 [L]
 
 	RewriteRule ^ajax/supprimeFichier/([0-9]+)/(.*)$ index.php/ajax/supprimeFichier/$1/$2 [L]
diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php
index b3d6fe26c..12ed7f190 100644
--- a/inc/commons/class.common.core.php
+++ b/inc/commons/class.common.core.php
@@ -4,9 +4,6 @@ class commonCore extends cubeCore
 {
 
     public $grades;
-    /**
-     * @var commonUtilisateur
-     */
     public $user;
     public $agences;
     public $categories;
@@ -77,34 +74,26 @@ class commonCore extends cubeCore
         // Si c'est le cas, on les copie dans la session
         $_SESSION['errorLogin'] = false;
         if (isset($_REQUEST['user_email'])) {
-            $_SESSION['u'] = null;
             $_SESSION['user_email'] = $_REQUEST['user_email'];
         }
 
         if (isset($_REQUEST['user_password']) || isset($_REQUEST['api_token'])) {
-            $_SESSION['u'] = null;
             $_SESSION['user_password'] = $_REQUEST['user_password'] ?? $_REQUEST['api_token'];
         }
         // Maintenant on vérifie si ces variables sont présentes dans la session
         if (!isset($_SESSION['user_email']) || !isset($_SESSION['user_password']) || empty($_SESSION['user_email']) || empty($_SESSION['user_password'])) {
             // Ce n'est pas le cas, on place la variable connected à false
             // Et on s'arrête là
-            $_SESSION['u'] = null;
             $this->user = null;
             return;
         }
 
-        if (isset($_SESSION['u']) && $_SESSION['u']) {
-            $this->user = unserialize($_SESSION['u']);
-            return;
-        }
         // Les variables sont présentes on vérifie la validité des informations
         // Dans la base de données
         // Utilisateur connecté à l'interface
         $dao = new commonDAOUtilisateur($this->con);
         $this->user = $dao->selectByLoginPassword($_SESSION['user_email'], $_SESSION['user_password']);
         if ($this->user == false) {
-            $_SESSION['u'] = null;
             $_SESSION['errorLogin'] = true;
             return;
         }
@@ -112,8 +101,6 @@ class commonCore extends cubeCore
             $daoClient = new commonDAOClient($this->con);
             $this->user->collegues = $daoClient->getColleguesList($this->user->utilisateur_id);
         }
-        $_SESSION['u'] = serialize($this->user);
-
     }
 
     /**
diff --git a/inc/commons/class.common.url.php b/inc/commons/class.common.url.php
index 5bcd92ff7..044dab30e 100644
--- a/inc/commons/class.common.url.php
+++ b/inc/commons/class.common.url.php
@@ -196,8 +196,6 @@ class commonUrl
     {
         global $core;
 
-        fb('!!!!');
-
         if (isset($_GET['q'])) {
             $args[2] = $_GET['q'];
         }
@@ -227,7 +225,7 @@ class commonUrl
         } elseif ($args[1] == 'wsuser') {
             $dao = new commonDAOUtilisateur($core->con);
             $dao->setSearch($q, true);
-            $clients = $dao->getListe('utilisateur_id', 'ASC', null, ' AND ws_grade>0', $core->user);
+            $clients = $dao->getListe('utilisateur_id', 'DESCs', null, ' AND ws_grade>0', $core->user);
             foreach ($clients as $client) {
                 $suggestions[] = $client->utilisateur_id . ' - ' . $client->rs . ' (' . $client->prenom . ' ' . $client->nom . ')';
             }
-- 
2.39.5