Merge pull request #7518 from christianbeeznest/GH-7506-2

Internal: Improve registration email confirmation layout - refs #7506

Author: christianbeeznest

public/main/inc/lib/usermanager.lib.php

@@ -5672,19 +5672,29 @@ public static function sendUserConfirmationMail(User $user)
         $siteName = api_get_setting('platform.site_name');
         $mailSubject = sprintf(get_lang('[%s] Confirm your e-mail'), $siteName);
         $firstName = $user->getFirstname();
-        $mailBody = sprintf(get_lang('Dear %s,'), $firstName)
-            ."\n\n"
-            .sprintf(get_lang('To verify your e-mail and enable your account on %s, please click the link below.'), $siteName)
-            ."\n\n"
-            .Display::url($url, $url)
-            ."\n\n"
-            .get_lang('If you did not register this account, you can ignore this e-mail. No action will be taken.');
+        $greeting = sprintf(get_lang('Dear %s,'), $firstName);
+        $intro = sprintf(
+            get_lang('To verify your e-mail and enable your account on %s, please click the link below.'),
+            $siteName
+        );
+        $outro = get_lang('If you did not register this account, you can ignore this e-mail. No action will be taken.');
+
+        $tpl = Container::getTwig();
+        $mailBodyHtml = $tpl->render(
+            '@ChamiloCore/Mailer/Legacy/user_email_confirmation.html.twig',
+            [
+                'greeting' => $greeting,
+                'intro' => $intro,
+                'outro' => $outro,
+                'url' => $url,
+            ]
+        );
 
         api_mail_html(
             self::formatUserFullName($user),
             $user->getEmail(),
             $mailSubject,
-            $mailBody
+            $mailBodyHtml
         );
         Display::addFlash(Display::return_message(get_lang('Check your e-mail and follow the instructions.')));
     }

src/CoreBundle/Resources/views/Mailer/Legacy/user_email_confirmation.html.twig

@@ -0,0 +1,9 @@
+<p>{{ greeting }}</p>
+
+<p>{{ intro }}</p>
+
+<p><a href="{{ url }}">{{ url }}</a></p>
+
+<p>{{ outro }}</p>
+
+{% include '@ChamiloCore/Mailer/Legacy/_admin_signature_footer.html.twig' %}