Robin Thoni 8 роки тому
джерело
коміт
0ea31b1862

+ 3
- 3
src/Auth/Business/LuticateMiddleware.php Переглянути файл

@@ -51,16 +51,16 @@ class LuticateMiddleware
51 51
         }
52 52
 
53 53
         LuticateBusiness::setCurrentUser($user);
54
-        LuBusiness::$parameters["user"] = $user;
54
+        LuBusiness::$parameters["_user"] = $user;
55 55
 
56 56
         $permissions[] = LuticatePermissions::USER_LOGIN;
57 57
         foreach ($permissions as $permission) {
58 58
             try {
59
-                $perm = LuticatePermissionsBusiness::getEffectivePermission(LuticateBusiness::getCurrentUser()->getId(), $permission);
59
+                $perm = LuticatePermissionsBusiness::getEffectivePermission($user->getId(), $permission);
60 60
                 if (!$perm->getValue()) {
61 61
                     abort(401, "Permission denied");
62 62
                 }
63
-            }catch (\Exception $e)
63
+            } catch (\Exception $e)
64 64
             {
65 65
                 abort(401, "Permission denied");
66 66
             }

+ 2
- 2
src/Auth/Controller/LuticatePermissionsController.php Переглянути файл

@@ -17,9 +17,9 @@ class LuticatePermissionsController extends LuController {
17 17
         return LuticatePermissionsBusiness::getEffectivePermission($user_id, $permission_name);
18 18
     }
19 19
 
20
-    public function getEffectivePermissionMe($user, $permission_name)
20
+    public function getEffectivePermissionMe($_user, $permission_name)
21 21
     {
22
-        return LuticatePermissionsBusiness::getEffectivePermissionMe($user, $permission_name);
22
+        return LuticatePermissionsBusiness::getEffectivePermissionMe($_user, $permission_name);
23 23
     }
24 24
 
25 25
     public function get($permission_name)

+ 6
- 6
src/Auth/Controller/LuticateUsersController.php Переглянути файл

@@ -17,9 +17,9 @@ class LuticateUsersController extends LuController {
17 17
         return LuticateUsersBusiness::login($username, $password);
18 18
     }
19 19
 
20
-    public function logout($user)
20
+    public function logout($_user)
21 21
     {
22
-        return LuticateUsersBusiness::logout($user);
22
+        return LuticateUsersBusiness::logout($_user);
23 23
     }
24 24
 
25 25
     public function getById($user_id)
@@ -42,9 +42,9 @@ class LuticateUsersController extends LuController {
42 42
         return LuticateUsersBusiness::edit($user_id, $email);
43 43
     }
44 44
 
45
-    public function editMe($email, $user)
45
+    public function editMe($email, $_user)
46 46
     {
47
-        return LuticateUsersBusiness::edit($user->getId(), $email);
47
+        return LuticateUsersBusiness::edit($_user->getId(), $email);
48 48
     }
49 49
 
50 50
     public function setPassword($password, $user_id)
@@ -52,8 +52,8 @@ class LuticateUsersController extends LuController {
52 52
         return LuticateUsersBusiness::setPassword($user_id, $password);
53 53
     }
54 54
 
55
-    public function setPasswordMe($password, $oldPassword, $user)
55
+    public function setPasswordMe($password, $oldPassword, $_user)
56 56
     {
57
-        return LuticateUsersBusiness::setPasswordMe($password, $oldPassword, $user);
57
+        return LuticateUsersBusiness::setPasswordMe($password, $oldPassword, $_user);
58 58
     }
59 59
 }

Завантаження…
Відмінити
Зберегти