Changeset 3103:fff9fac482c6

Timestamp:

09/28/15 19:33:21 (9 years ago)

Author:

Dsls

Branch:

2.8

Children:

3104:60d91f58d63e, 3110:9f158da42dca

Message:

User id retrieval simplification, should fix #2097.

File:

• admin/auth.php (modified) (1 diff)

admin/auth.php

@@ -144 +144 @@
           }
 
-     # Check login informations
-     $check_user = false;
-     if (isset($data['cookie_admin']) && strlen($data['cookie_admin']) == 104)
-     {
-          $user_id = substr($data['cookie_admin'],40);
-          $user_id = @unpack('a32',@pack('H*',$user_id));
-          if (is_array($user_id))
+          # Check login informations
+          $check_user = false;
+          if (isset($data['cookie_admin']) && strlen($data['cookie_admin']) == 104)
           {
-               $user_id = $user_id[1];
-               $user_key = substr($data['cookie_admin'],0,40);
-               $check_user = $core->auth->checkUser($user_id,null,$user_key) === true;
-          }
-     }
+               $user_id = substr($data['cookie_admin'],40);
+               $user_id = @unpack('a32',@pack('H*',$user_id));
+               if (is_array($user_id))
+               {
+                    $user_id = $data['user_id'];
+                    $user_key = substr($data['cookie_admin'],0,40);
+                    $check_user = $core->auth->checkUser($user_id,null,$user_key) === true;
+               }
+          }
 
           if (!$core->auth->allowPassChange() || !$check_user) {