Tweaks from feedback and phpstorm hints

modxcms · Feb 10, 2024 · 0e76364 · 0e76364
1 parent 227851a
commit 0e76364
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/core/src/Revolution/Processors/Security/User/Create.php b/core/src/Revolution/Processors/Security/User/Create.php
@@ -20,6 +20,8 @@
 use MODX\Revolution\modUserGroupMember;
 use MODX\Revolution\modUserProfile;
 use MODX\Revolution\modX;
+use MODX\Revolution\Registry\modRegister;
+use MODX\Revolution\Registry\modRegistry;
 use MODX\Revolution\Smarty\modSmarty;
 
 /**
@@ -234,8 +236,10 @@ public function sendNotificationEmail() {
             ]);
         }
 
-        if ($this->getProperty('passwordgenmethod') === 'user_email_specify' && $this->modx->getService('hashing', modHashing::class)) {
-            $activationHash = $this->modx->hashing->getHash('md5', 'hashing.modMD5', [])->hash($this->object->get('email') . '/' . $this->object->get('id'));
+        if (
+            $this->getProperty('passwordgenmethod') === 'user_email_specify'
+        ) {
+            $activationHash = bin2hex(random_bytes(32));
 
             /** @var modRegistry $registry */
             $registry = $this->modx->getService('registry', 'registry.modRegistry');

diff --git a/core/src/Revolution/Processors/Security/User/Update.php b/core/src/Revolution/Processors/Security/User/Update.php
@@ -20,6 +20,8 @@
 use MODX\Revolution\modUserGroupMember;
 use MODX\Revolution\modUserProfile;
 use MODX\Revolution\modX;
+use MODX\Revolution\Registry\modRegister;
+use MODX\Revolution\Registry\modRegistry;
 
 /**
  * Update a user.
@@ -314,8 +316,8 @@ public function fireAfterActiveStatusChange() {
      * @throws Exception
      */
     public function sendNotificationEmail() {
-        if ($this->getProperty('passwordgenmethod') === 'user_email_specify' && $this->modx->getService('hashing', modHashing::class)) {
-            $activationHash = $this->modx->hashing->getHash('md5', 'hashing.modMD5', [])->hash($this->object->get('email') . '/' . $this->object->get('id'));
+        if ($this->getProperty('passwordgenmethod') === 'user_email_specify') {
+            $activationHash = bin2hex(random_bytes(32));
 
             /** @var modRegistry $registry */
             $registry = $this->modx->getService('registry', 'registry.modRegistry');
@@ -391,7 +393,6 @@ public function cleanup()
                 $this->object
             );
         }
-
         return $this->success('', $this->object);
     }
 }