[5.4] Fix registration error notification (joomla#45656)

On email error the user is no longer redirected to the registration form

Author: bembelimen

components/com_users/src/Model/RegistrationModel.php

@@ -11,6 +11,7 @@
 namespace Joomla\Component\Users\Site\Model;
 
 use Joomla\CMS\Application\ApplicationHelper;
+use Joomla\CMS\Application\CMSApplicationInterface;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Date\Date;
 use Joomla\CMS\Factory;
@@ -462,6 +463,7 @@ public function register($temp)
             return false;
         }
 
+        // From this moment the user is registered, so we don't return false anymore
         $app   = Factory::getApplication();
         $db    = $this->getDatabase();
         $query = $db->getQuery(true);
@@ -514,18 +516,15 @@ public function register($temp)
             $mailer->addTemplateData($data);
             $mailer->addRecipient($data['email']);
             $mailer->addUnsafeTags(['username', 'password_clear', 'name']);
+
             $return = $mailer->send();
         } catch (\Exception $exception) {
-            try {
-                Log::add(Text::_($exception->getMessage()), Log::WARNING, 'jerror');
+            $return = false;
 
-                $return = false;
+            try {
+                Log::add(Text::_($exception->getMessage()), Log::WARNING, 'joomla_registration');
             } catch (\RuntimeException $exception) {
-                Factory::getApplication()->enqueueMessage(Text::_($exception->errorMessage()), 'warning');
-
-                $this->setError(Text::_('COM_MESSAGES_ERROR_MAIL_FAILED'));
-
-                $return = false;
+                // We set the error message below but we don't need to notify the user that we can't add logs
             }
         }
 
@@ -543,9 +542,7 @@ public function register($temp)
             try {
                 $rows = $db->loadObjectList();
             } catch (\RuntimeException $e) {
-                $this->setError(Text::sprintf('COM_USERS_DATABASE_ERROR', $e->getMessage()));
-
-                return false;
+                $rows = [];
             }
 
             // Send mail to all superadministrators id
@@ -561,31 +558,21 @@ public function register($temp)
                     $mailer->addTemplateData($data);
                     $mailer->addRecipient($row->email);
                     $mailer->addUnsafeTags(['username', 'name']);
-                    $return = $mailer->send();
+
+                    $mailer->send();
                 } catch (\Exception $exception) {
                     try {
-                        Log::add(Text::_($exception->getMessage()), Log::WARNING, 'jerror');
-
-                        $return = false;
+                        Log::add(Text::_($exception->getMessage()), Log::WARNING, 'joomla_registration');
                     } catch (\RuntimeException $exception) {
-                        Factory::getApplication()->enqueueMessage(Text::_($exception->errorMessage()), 'warning');
-
-                        $return = false;
+                        // No message to frontend user
                     }
                 }
-
-                // Check for an error.
-                if ($return !== true) {
-                    $this->setError(Text::_('COM_USERS_REGISTRATION_ACTIVATION_NOTIFY_SEND_MAIL_FAILED'));
-
-                    return false;
-                }
             }
         }
 
         // Check for an error.
         if ($return !== true) {
-            $this->setError(Text::_('COM_USERS_REGISTRATION_SEND_MAIL_FAILED'));
+            $app->enqueueMessage(Text::_('COM_USERS_REGISTRATION_SEND_MAIL_FAILED'), CMSApplicationInterface::MSG_WARNING);
 
             // Send a system message to administrators receiving system mails
             $db = $this->getDatabase();
@@ -599,9 +586,12 @@ public function register($temp)
             try {
                 $userids = $db->loadColumn();
             } catch (\RuntimeException $e) {
-                $this->setError(Text::sprintf('COM_USERS_DATABASE_ERROR', $e->getMessage()));
+                $userids = [];
 
-                return false;
+                try {
+                    Log::add(Text::sprintf('COM_USERS_DATABASE_ERROR', $e->getMessage()), Log::WARNING, 'joomla_registration');
+                } catch (\RuntimeException $exception) {
+                }
             }
 
             if (\count($userids) > 0) {
@@ -634,14 +624,13 @@ public function register($temp)
                     try {
                         $db->execute();
                     } catch (\RuntimeException $e) {
-                        $this->setError(Text::sprintf('COM_USERS_DATABASE_ERROR', $e->getMessage()));
-
-                        return false;
+                        try {
+                            Log::add(Text::sprintf('COM_USERS_DATABASE_ERROR', $e->getMessage()), Log::WARNING, 'joomla_registration');
+                        } catch (\RuntimeException $exception) {
+                        }
                     }
                 }
             }
-
-            return false;
         }
 
         if ($useractivation == 1) {