refactor events

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

Hide file tree

Showing 8 changed files with 12 additions and 156 deletions.
diff --git a/src/Services/UserManager.php b/src/Services/UserManager.php
@@ -55,12 +55,6 @@ public function repairPassword($userData, bool $events = true, bool $cache = tru
         return $userHash->process();
     }
 
-    public function changeManagerPassword($userData, bool $events = true, bool $cache = true)
-    {
-        $user = new UserManagerChangePassword($userData, $events, $cache);
-        return $user->process();
-    }
-
     public function changePassword($userData, bool $events = true, bool $cache = true)
     {
         $user = new UserChangePassword($userData, $events, $cache);

diff --git a/src/Services/Users/UserDelete.php b/src/Services/Users/UserDelete.php
@@ -93,7 +93,7 @@ public function process(): string
 
         if ($this->events) {
             // invoke OnBeforeWUsrFormDelete event
-            EvolutionCMS()->invokeEvent("OnBeforeWUsrFormDelete",
+            EvolutionCMS()->invokeEvent("OnBeforeUserDelete",
                 array(
                     "id"	=> $this->userData['id']
                 ));
@@ -106,17 +106,11 @@ public function process(): string
         \EvolutionCMS\Models\UserValue::query()->where('userid', $this->userData['id'])->delete();
         if ($this->events) {
             // invoke OnWebDeleteUser event
-            EvolutionCMS()->invokeEvent("OnWebDeleteUser",
+            EvolutionCMS()->invokeEvent("OnUserDelete",
                 array(
                     "userid"		=> $this->userData['id'],
                     "username"		=> $username
                 ));
-
-            // invoke OnWUsrFormDelete event
-            EvolutionCMS()->invokeEvent("OnWUsrFormDelete",
-                array(
-                    "id"	=> $this->userData['id']
-                ));
         }
 
         if ($this->cache) {

diff --git a/src/Services/Users/UserEdit.php b/src/Services/Users/UserEdit.php
@@ -135,8 +135,8 @@ public function process(): \Illuminate\Database\Eloquent\Model
         if ($this->events) {
             EvolutionCMS()->invokeEvent("OnUserSave", [
                 "mode"         => "upd",
-                "user"         => $this->userData,
                 "userid"       => $user->getKey(),
+                "user"         => $this->userData,
                 "username"     => $user->username,
                 "userpassword" => isset($this->userData['clearPassword']) ? $this->userData['clearPassword'] : '',
                 "useremail"    => $user->attributes->email,
@@ -169,4 +169,4 @@ public function validate(): bool
         return !$validator->fails();
     }
 
-}
+}
diff --git a/src/Services/Users/UserLogin.php b/src/Services/Users/UserLogin.php
@@ -129,7 +129,7 @@ public function process(): \Illuminate\Database\Eloquent\Model
 
         if ($this->events) {
             // invoke OnBeforeManagerLogin event
-            EvolutionCMS()->invokeEvent('OnBeforeManagerLogin', array(
+            EvolutionCMS()->invokeEvent('OnBeforeUserLogin', array(
                 'username' => $this->userData['username'],
                 'userpassword' => $this->userData['password'],
                 'rememberme' => $this->userData['rememberme'] ?? false
@@ -151,7 +151,7 @@ public function process(): \Illuminate\Database\Eloquent\Model
 
         if ($this->events) {
             // invoke OnManagerLogin event
-            EvolutionCMS()->invokeEvent('OnManagerLogin', array(
+            EvolutionCMS()->invokeEvent('OnUserLogin', array(
                 'userid' => $this->user->getKey(),
                 'username' => $this->user->username,
                 'userpassword' => $this->userData['password'],
@@ -400,7 +400,7 @@ public function checkPassword()
     {
         if ($this->events) {
             // invoke OnManagerAuthentication event
-            $rt = EvolutionCMS()->invokeEvent('OnManagerAuthentication', array(
+            $rt = EvolutionCMS()->invokeEvent('OnUserAuthentication', array(
                 'userid' => $this->user->getKey(),
                 'username' => $this->user->username,
                 'userpassword' => $this->userData['password'],

diff --git a/src/Services/Users/UserLoginById.php b/src/Services/Users/UserLoginById.php
@@ -56,7 +56,7 @@ public function process(): \Illuminate\Database\Eloquent\Model
         }
         if ($this->events) {
             // invoke OnBeforeManagerLogin event
-            EvolutionCMS()->invokeEvent('OnBeforeManagerLogin', array(
+            EvolutionCMS()->invokeEvent('OnBeforeUserLogin', array(
                 'username' => $this->user->username,
             ));
         }
@@ -70,7 +70,7 @@ public function process(): \Illuminate\Database\Eloquent\Model
 
         if ($this->events) {
             // invoke OnManagerLogin event
-            EvolutionCMS()->invokeEvent('OnManagerLogin', array(
+            EvolutionCMS()->invokeEvent('OnUserLogin', array(
                 'userid' => $this->user->getKey(),
                 'username' => $this->user->username,
             ));

diff --git a/src/Services/Users/UserLogout.php b/src/Services/Users/UserLogout.php
@@ -133,7 +133,7 @@ public function process(): string
             $sid = EvolutionCMS()->sid;
             if ($this->events) {
                 // invoke OnBeforeManagerLogout event
-                EvolutionCMS()->invokeEvent("OnBeforeManagerLogout",
+                EvolutionCMS()->invokeEvent("OnBeforeUserLogout",
                     array(
                         "userid" => $internalKey,
                         "username" => $username
@@ -149,7 +149,7 @@ public function process(): string
 
         if ($this->events) {
             // invoke OnManagerLogout event
-            EvolutionCMS()->invokeEvent("OnManagerLogout",
+            EvolutionCMS()->invokeEvent("OnUserLogout",
                 array(
                     "userid" => $internalKey,
                     "username" => $username

diff --git a/src/Services/Users/UserManagerChangePassword.php b/src/Services/Users/UserManagerChangePassword.php
diff --git a/src/Services/Users/UserRegistration.php b/src/Services/Users/UserRegistration.php
@@ -125,7 +125,7 @@ public function process(): \Illuminate\Database\Eloquent\Model
             EvolutionCMS()->invokeEvent("OnUserSave", [
                 "mode"         => "new",
                 "userid"       => $user->getKey(),
-                'user'         => $this->userData,
+                "user"         => $this->userData,
                 "username"     => $user->username,
                 "userpassword" => $this->userData['clearPassword'],
                 "useremail"    => $user->attributes->email,