VERSION

@@ -1 +1 @@
-v3.9.4
+v3.9.2

controllers/internals/Tool.php

@@ -463,28 +463,4 @@ use BenMorel\GsmCharsetConverter\Converter;
             $converter = new Converter();
             return $converter->cleanUpUtf8String($text, true, '?');
         }
-
-        /**
-         * Encode some data into the URL version of Base64 encoding
-         * 
-         * @param string $data Input data
-         * @return string A Base64 (URL-safe) encoded string
-         */
-        public static function url_base64_encode(string $data): string
-        {
-            return rtrim(strtr(base64_encode($data), '+/', '-_'), '=');
-        }
-
-        /**
-         * Decode a URL-safe Base64 encoded string
-         * 
-         * @param string $data Encoded data
-         * @return string Decoded original data
-         */
-        public static function url_base64_decode(string $data): string
-        {
-            $replaced = strtr($data, '-_', '+/');
-            $padded = str_pad($replaced, mb_strlen($replaced) % 4 === 0 ? mb_strlen($replaced) : mb_strlen($replaced) + 4 - mb_strlen($replaced) % 4, '=', STR_PAD_RIGHT);
-            return base64_decode($padded);
-        }
     }

controllers/internals/Webhook.php

@@ -115,7 +115,6 @@ class Webhook extends StandardController
             return false;
         }
 
-        $success = false;
         $webhooks = $this->gets_for_type_and_user($id_user, $type);
         foreach ($webhooks as $webhook)
         {

controllers/publics/Connect.php

@@ -11,8 +11,6 @@
 
 namespace controllers\publics;
 
-use controllers\internals\Tool;
-
     /**
      * Page de connexion.
      */
@@ -119,9 +117,8 @@ use controllers\internals\Tool;
 
             $Tokenista = new \Ingenerator\Tokenista(APP_SECRET);
             $token = $Tokenista->generate(3600, ['id_user' => $user['id']]);
-            $encoded_token = Tool::url_base64_encode($token);
 
-            $reset_link = \descartes\Router::url('Connect', 'reset_password', ['id_user' => $user['id'], 'token' => $encoded_token]);
+            $reset_link = \descartes\Router::url('Connect', 'reset_password', ['id_user' => $user['id'], 'token' => $token]);
 
             $mailer = new \controllers\internals\Mailer();
             $email_send = $mailer->enqueue($email, EMAIL_RESET_PASSWORD, ['reset_link' => $reset_link]);
@@ -142,8 +139,7 @@ use controllers\internals\Tool;
 
             $Tokenista = new \Ingenerator\Tokenista(APP_SECRET);
 
-            $decoded_token = Tool::url_base64_decode($token);
+            if (!$Tokenista->isValid($token, ['id_user' => $id_user]))
-            if (!$Tokenista->validate($decoded_token, ['id_user' => $id_user]))
             {
                 return $this->render('connect/reset-password-invalid');
             }