fix validation and setting user doc groups

evocms-community · May 6, 2022 · 712cf08 · 712cf08
1 parent 594ef70
commit 712cf08
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/Services/Users/UserLogin.php b/src/Services/Users/UserLogin.php
@@ -327,9 +327,12 @@ public function writeSession()
             $_SESSION[$this->context . 'Permissions'] = $permissionsRole;
         }
         $this->user->attributes->sessionid = $currentsessionid;
-
+        $context = $this->context == 'mgr' ? 0 : 1;
         $_SESSION[$this->context . 'Docgroups'] = \EvolutionCMS\Models\MemberGroup::query()
-            ->join('membergroup_access', 'membergroup_access.membergroup', '=', 'member_groups.user_group')
+            ->join('membergroup_access', function($join) use ($context){
+                $join->on('membergroup_access.membergroup', '=', 'member_groups.user_group');
+                $join->on('membergroup_access.context', '=', \DB::Raw($context));
+            })
             ->where('member_groups.member', $this->user->getKey())->pluck('documentgroup')->toArray();
 
 

diff --git a/src/Services/Users/UserRegistration.php b/src/Services/Users/UserRegistration.php
@@ -152,7 +152,7 @@ public function checkRules(): bool
      */
     public function validate(): bool
     {
-        $validator = \Validator::validate($this->userData, $this->validate, $this->messages);
+        $validator = \Validator::make($this->userData, $this->validate, $this->messages);
         $this->validateErrors = $validator->errors()->toArray();
         return !$validator->fails();
     }