[6.0] Notification email on admin registration approval

administrator/components/com_users/src/Controller/UserController.php

@@ -11,8 +11,10 @@
 namespace Joomla\Component\Users\Administrator\Controller;
 
 use Joomla\CMS\Access\Access;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
+use Joomla\CMS\Response\JsonResponse;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Uri\Uri;
 
@@ -160,4 +162,34 @@ public function batch($model = null)
     protected function postSaveHook(BaseDatabaseModel $model, $validData = array())
     {
     }
+
+    /**
+     * Get the XHR request for active a user
+     *
+     * @return void
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function active(): void
+    {
+        // Get the ID of the user sended trought media/com_users/js/active-user-send-mail
+        $userId          = $this->input->getString('userid', '');
+
+        // Prepare the default response
+        $responseError   = false;
+        $responseData    = [$userId];
+        $responseMessage = null;
+
+        // Set the model
+        $model           = $this->getModel('User', 'Administrator', []);
+
+        // Active the user and send the email
+        $responseError   = $model->activate($userId);
+
+        if (!$responseError) {
+            $responseMessage = $model->getError();
+        }
+
+        echo new JsonResponse($responseData, $responseMessage, $responseError);
+    }
 }

administrator/components/com_users/src/Model/UserModel.php

@@ -221,10 +221,10 @@ protected function preprocessForm(Form $form, $data, $group = 'user')
      */
     public function save($data)
     {
-        $pk   = (!empty($data['id'])) ? $data['id'] : (int) $this->getState('user.id');
-        $user = User::getInstance($pk);
+        $pk            = (!empty($data['id'])) ? $data['id'] : (int) $this->getState('user.id');
+        $user          = User::getInstance($pk);
 
-        $my = $this->getCurrentUser();
+        $my            = $this->getCurrentUser();
         $iAmSuperAdmin = $my->authorise('core.admin');
 
         // User cannot modify own user groups
@@ -252,7 +252,7 @@ public function save($data)
         if ($iAmSuperAdmin && $my->get('id') == $pk) {
             // Check that at least one of our new groups is Super Admin
             $stillSuperAdmin = false;
-            $myNewGroups = $data['groups'];
+            $myNewGroups     = $data['groups'];
 
             foreach ($myNewGroups as $group) {
                 $stillSuperAdmin = $stillSuperAdmin ?: Access::checkGroup($group, 'core.admin');
@@ -301,9 +301,9 @@ public function save($data)
      */
     public function delete(&$pks)
     {
-        $user  = $this->getCurrentUser();
-        $table = $this->getTable();
-        $pks   = (array) $pks;
+        $user          = $this->getCurrentUser();
+        $table         = $this->getTable();
+        $pks           = (array) $pks;
 
         // Check if I am a Super Admin
         $iAmSuperAdmin = $user->authorise('core.admin');
@@ -368,8 +368,8 @@ public function delete(&$pks)
      */
     public function block(&$pks, $value = 1)
     {
-        $app        = Factory::getApplication();
-        $user       = $this->getCurrentUser();
+        $app           = Factory::getApplication();
+        $user          = $this->getCurrentUser();
 
         // Check if I am a Super Admin
         $iAmSuperAdmin = $user->authorise('core.admin');
@@ -467,31 +467,74 @@ public function block(&$pks, $value = 1)
      *
      * @return  boolean  True on success.
      *
-     * @since   1.6
+     * @since   __DEPLOY_VERSION__
      * @throws  \Exception
      */
     public function activate(&$pks)
     {
-        $user = $this->getCurrentUser();
+        $app           = Factory::getApplication();
+        $user          = $app->getIdentity();
 
-        // Check if I am a Super Admin
+        // Check if I am a super admin
         $iAmSuperAdmin = $user->authorise('core.admin');
+
+        // Load user table
         $table         = $this->getTable();
         $pks           = (array) $pks;
 
+        // Compile the user activated notification mail values.
+        $sendMailTo    = function ($userMail) use ($app)
+        {
+            $mailData             = [];
+            $mailData['fromname'] = $app->get('fromname');
+            $mailData['mailfrom'] = $app->get('mailfrom');
+            $mailData['sitename'] = $app->get('sitename');
+            $mailData['siteurl'] = \Joomla\CMS\Uri\Uri::base();
+
+            $mailer = new \Joomla\CMS\Mail\MailTemplate('com_users.registration.user.admin_activated', $app->getLanguage()->getTag());
+            $mailer->addTemplateData($mailData);
+            $mailer->addRecipient($userMail);
+
+            try {
+                $return = $mailer->send();
+            } catch (\Exception $exception) {
+                try {
+                    \Joomla\CMS\Log\Log::add(Text::_($exception->getMessage()), \Joomla\CMS\Log\Log::WARNING, 'jerror');
+
+                    $return = false;
+                } catch (\RuntimeException $exception) {
+                    $app->enqueueMessage(Text::_($exception->errorMessage()), 'warning');
+
+                    $return = false;
+                }
+            }
+
+            // Check for an error.
+            if ($return !== true) {
+                $this->setError(Text::_('COM_USERS_REGISTRATION_ACTIVATION_NOTIFY_SEND_MAIL_FAILED'));
+
+                return false;
+            }
+        };
+
         PluginHelper::importPlugin($this->events_map['save']);
 
-        // Access checks.
+        // Activate and send the notification email
         foreach ($pks as $i => $pk) {
             if ($table->load($pk)) {
-                $old   = $table->getProperties();
-                $allow = $user->authorise('core.edit.state', 'com_users');
+                $prevUserData = $table->getProperties();
+                $allow        = $user->authorise('core.edit.state', 'com_users');
 
-                // Don't allow non-super-admin to delete a super admin
-                $allow = (!$iAmSuperAdmin && Access::check($pk, 'core.admin')) ? false : $allow;
+                // Don't allow non-super-admin to edit the active status of a super admin
+                $allow        = (!$iAmSuperAdmin && Access::check($pk, 'core.admin')) ? false : $allow;
 
+                // Ignore activated accounts but check if we can still
+                // resend the notification email
                 if (empty($table->activation)) {
-                    // Ignore activated accounts.
+                    if (\is_null($table->lastvisitDate)) {
+                        $sendMailTo($prevUserData['email']);
+                    }
+
                     unset($pks[$i]);
                 } elseif ($allow) {
                     $table->block      = 0;
@@ -506,7 +549,7 @@ public function activate(&$pks)
                         }
 
                         // Trigger the before save event.
-                        $result = Factory::getApplication()->triggerEvent($this->event_before_save, array($old, false, $table->getProperties()));
+                        $result = Factory::getApplication()->triggerEvent($this->event_before_save, array($prevUserData, false, $table->getProperties()));
 
                         if (in_array(false, $result, true)) {
                             // Plugin will have to raise it's own error or throw an exception.
@@ -522,6 +565,9 @@ public function activate(&$pks)
 
                         // Fire the after save event
                         Factory::getApplication()->triggerEvent($this->event_after_save, [$table->getProperties(), false, true, null]);
+
+                        // Send the email
+                        $sendMailTo($prevUserData['email']);
                     } catch (\Exception $e) {
                         $this->setError($e->getMessage());
 
@@ -530,7 +576,7 @@ public function activate(&$pks)
                 } else {
                     // Prune items that you can't change.
                     unset($pks[$i]);
-                    Factory::getApplication()->enqueueMessage(Text::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED'), 'error');
+                    $app->enqueueMessage(Text::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED'), 'error');
                 }
             }
         }
@@ -610,7 +656,7 @@ public function batch($commands, $pks, $contexts)
      */
     public function batchReset($userIds, $action)
     {
-        $userIds = ArrayHelper::toInteger($userIds);
+        $userIds       = ArrayHelper::toInteger($userIds);
 
         // Check if I am a Super Admin
         $iAmSuperAdmin = $this->getCurrentUser()->authorise('core.admin');
@@ -639,11 +685,11 @@ public function batchReset($userIds, $action)
         }
 
         // Get the DB object
-        $db = $this->getDatabase();
+        $db      = $this->getDatabase();
 
         $userIds = ArrayHelper::toInteger($userIds);
 
-        $query = $db->getQuery(true);
+        $query   = $db->getQuery(true);
 
         // Update the reset flag
         $query->update($db->quoteName('#__users'))
@@ -677,7 +723,7 @@ public function batchReset($userIds, $action)
      */
     public function batchUser($groupId, $userIds, $action)
     {
-        $userIds = ArrayHelper::toInteger($userIds);
+        $userIds       = ArrayHelper::toInteger($userIds);
 
         // Check if I am a Super Admin
         $iAmSuperAdmin = $this->getCurrentUser()->authorise('core.admin');
@@ -721,10 +767,10 @@ public function batchUser($groupId, $userIds, $action)
         // Remove the users from the group if requested.
         if (isset($doDelete)) {
             /*
-            * First we need to check that the user is part of more than one group
-            * otherwise we will end up with a user that is not part of any group
-            * unless we are moving the user to a new group.
-            */
+             * First we need to check that the user is part of more than one group
+             * otherwise we will end up with a user that is not part of any group
+             * unless we are moving the user to a new group.
+             */
             if ($doDelete === 'group') {
                 $query = $db->getQuery(true);
                 $query->select($db->quoteName('user_id'))
@@ -865,8 +911,8 @@ public function getAssignedGroups($userId = null)
         $userId = (!empty($userId)) ? $userId : (int) $this->getState('user.id');
 
         if (empty($userId)) {
-            $result   = array();
-            $form     = $this->getForm();
+            $result = array();
+            $form   = $this->getForm();
 
             if ($form) {
                 $groupsIDs = $form->getValue('groups');

administrator/components/com_users/src/View/User/HtmlView.php

@@ -17,6 +17,7 @@
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Toolbar\ToolbarHelper;
+use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\User\User;
 use Joomla\CMS\User\UserFactoryInterface;
 use Joomla\Component\Users\Administrator\Helper\Mfa;
@@ -150,6 +151,7 @@ protected function addToolbar()
         $canDo     = ContentHelper::getActions('com_users');
         $isNew     = ($this->item->id == 0);
         $isProfile = $this->item->id == $user->id;
+        $toolbar   = Toolbar::getInstance();
 
         ToolbarHelper::title(
             Text::_(
@@ -180,6 +182,25 @@ protected function addToolbar()
             ToolbarHelper::cancel('user.cancel', 'JTOOLBAR_CLOSE');
         }
 
+        $userIsActived = empty($this->item->activation);
+
+        if (!$userIsActived || \is_null($this->item->lastvisitDate)) {
+            $buttonText = !$userIsActived
+                ? Text::_('COM_USERS_USER_ACTIVATE_AND_MAIL')
+                : Text::_('COM_USERS_USER_ACTIVATION_REMINDER');
+
+            $toolbar->standardButton('activate', $buttonText)
+                ->buttonClass('btn activate-send-mail')
+                ->attributes([
+                    'data-option' => 'com_users',
+                    'data-task'   => 'user.active',
+                    'data-format' => 'json',
+                    'data-userid' => $this->item->id,
+                ])
+                ->icon('icon-mail')
+                ->onclick('');
+        }
+
         ToolbarHelper::divider();
         ToolbarHelper::help('Users:_Edit_Profile');
     }

administrator/components/com_users/tmpl/user/edit.php

@@ -19,9 +19,11 @@
 /** @var Joomla\Component\Users\Administrator\View\User\HtmlView $this */
 
 /** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+
 $wa = $this->document->getWebAssetManager();
 $wa->useScript('keepalive')
-    ->useScript('form.validate');
+    ->useScript('form.validate')
+    ->useScript('com_users.active-user-send-mail');
 
 $input = Factory::getApplication()->getInput();
 

administrator/language/en-GB/com_users.ini

@@ -397,6 +397,8 @@ COM_USERS_USERS_N_ITEMS_DELETED="%d users deleted."
 COM_USERS_USERS_N_ITEMS_DELETED_1="User deleted."
 COM_USERS_USERS_TABLE_CAPTION="Users"
 COM_USERS_USER_ACCOUNT_DETAILS="Account Details"
+COM_USERS_USER_ACTIVATE_AND_MAIL="Activate and send email"
+COM_USERS_USER_ACTIVATION_REMINDER="Send activation reminder"
 COM_USERS_USER_BACKUPCODE="Backup Code"
 COM_USERS_USER_BACKUPCODES="Backup Codes"
 COM_USERS_USER_BACKUPCODES_CAPTIVE_PROMPT="If you do not have access to your usual Multi-factor Authentication method use any of your Backup Codes in the field below. Please remember that this emergency backup code cannot be reused."