refactor events

evocms-community · Dec 3, 2022 · 9f5401a · 9f5401a
1 parent 84063b9
commit 9f5401a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/Services/Users/UserEdit.php b/src/Services/Users/UserEdit.php
@@ -104,8 +104,10 @@ public function process(): \Illuminate\Database\Eloquent\Model
         // invoke OnBeforeUserFormSave event
         if ($this->events) {
             EvolutionCMS()->invokeEvent("OnBeforeUserSave", [
-                "mode" => "upd",
-                "user" => &$this->userData,
+                "mode"     => "upd",
+                "user"     => &$this->userData,
+                'userid'   => $this->userData['id'],
+                "username" => $this->userData['username'],
             ]);
         }
 

diff --git a/src/Services/Users/UserLoginById.php b/src/Services/Users/UserLoginById.php
@@ -58,6 +58,7 @@ public function process(): \Illuminate\Database\Eloquent\Model
             // invoke OnBeforeManagerLogin event
             EvolutionCMS()->invokeEvent('OnBeforeUserLogin', array(
                 'username' => $this->user->username,
+                'userpassword' => ''
             ));
         }
 

diff --git a/src/Services/Users/UserRegistration.php b/src/Services/Users/UserRegistration.php
@@ -98,6 +98,7 @@ public function process(): \Illuminate\Database\Eloquent\Model
             EvolutionCMS()->invokeEvent("OnBeforeUserSave", [
                 "mode" => "new",
                 "user" => &$this->userData,
+                'username' => $this->userData['username']
             ]);
         }