Merge branch 'master' of github.com:chamilo/chamilo-lms

Author: ywarnier

config/packages/security.yaml

@@ -76,7 +76,7 @@ security:
             context: main
             provider: app_user_provider
             json_login:
-                check_path: authentication_token
+                check_path: /api/authentication_token
                 success_handler: lexik_jwt_authentication.handler.authentication_success
                 failure_handler: lexik_jwt_authentication.handler.authentication_failure
 #            guard:

public/main/inc/lib/api.lib.php

@@ -7111,59 +7111,6 @@ function api_format_time($time, $originFormat = 'php')
     return $formattedTime;
 }
 
-function api_set_noreply_and_from_address_to_mailer(
-    TemplatedEmail $email,
-    array $sender,
-    array $replyToAddress = []
-): void {
-    $validator = Container::getLegacyHelper()->getValidator();
-    $emailConstraint = new Assert\Email();
-
-    $noReplyAddress = api_get_setting('noreply_email_address');
-    $avoidReplyToAddress = false;
-
-    if (!empty($noReplyAddress)) {
-        // $avoidReplyToAddress = api_get_configuration_value('mail_no_reply_avoid_reply_to');
-    }
-
-    // Default values
-    $notification = new Notification();
-    $defaultSenderName = $notification->getDefaultPlatformSenderName();
-    $defaultSenderEmail = $notification->getDefaultPlatformSenderEmail();
-
-    // If the parameter is set don't use the admin.
-    $senderName = !empty($sender['name']) ? $sender['name'] : $defaultSenderName;
-    $senderEmail = !empty($sender['email']) ? $sender['email'] : $defaultSenderEmail;
-
-    // Send errors to the platform admin
-    $adminEmail = api_get_setting('admin.administrator_email');
-
-    $adminEmailValidation = $validator->validate($adminEmail, $emailConstraint);
-
-    if (!empty($adminEmail) && 0 === $adminEmailValidation->count()) {
-        $email
-            ->getHeaders()
-            ->addIdHeader('Errors-To', $adminEmail)
-        ;
-    }
-
-    if (!$avoidReplyToAddress && !empty($replyToAddress)) {
-        $replyToEmailValidation = $validator->validate($replyToAddress['mail'], $emailConstraint);
-
-        if (0 === $replyToEmailValidation->count()) {
-            $email->addReplyTo(new Address($replyToAddress['mail'], $replyToAddress['name']));
-        }
-    }
-
-    $senderName = $defaultSenderName;
-    $senderEmail = $defaultSenderEmail;
-    $email->sender(new Address($senderEmail, $senderName));
-
-    if ($senderEmail) {
-        $email->from(new Address($senderEmail, $senderName));
-    }
-}
-
 /**
  * Sends an email
  * Sender name and email can be specified, if not specified

public/main/inc/lib/notification.lib.php

@@ -73,7 +73,7 @@ public function __construct()
             }
         } else {
             // Default no-reply email
-            $this->adminEmail = api_get_setting('mail.noreply_email_address');
+            $this->adminEmail = api_get_setting('mail.mailer_from_email');
             $this->adminName = api_get_setting('platform.site_name');
             $this->titlePrefix = '['.api_get_setting('platform.site_name').'] ';
 

public/main/survey/surveyUtil.class.php

@@ -2660,19 +2660,10 @@ public static function sendInvitationMail(
         }
 
         // Sending the mail
-        $sender_name = api_get_person_name($_user['firstName'], $_user['lastName'], null, PERSON_NAME_EMAIL_ADDRESS);
-        $sender_email = $_user['mail'];
         $sender_user_id = api_get_user_id();
 
-        $replyto = [];
         if ('noreply' === api_get_setting('survey_email_sender_noreply')) {
-            $noreply = api_get_setting('noreply_email_address');
-            if (!empty($noreply)) {
-                $replyto['Reply-to'] = $noreply;
-                $sender_name = $noreply;
-                $sender_email = $noreply;
-                $sender_user_id = null;
-            }
+            $sender_user_id = null;
         }
 
         // Optionally: finding the e-mail of the course user
@@ -2696,9 +2687,6 @@ public static function sendInvitationMail(
                 $invitedUser,
                 $invitation_title,
                 $full_invitation_text,
-                $sender_name,
-                $sender_email,
-                $replyto
             );
         }
     }

src/CoreBundle/DataFixtures/SettingsCurrentFixtures.php

@@ -1187,11 +1187,6 @@ public static function getExistingSettings(): array
                     'title' => 'Mail: XOAuth2 options',
                     'comment' => 'If you use some XOAuth2-based e-mail service, use this setting in JSON to save your specific configuration (see example) and select XOAuth2 in the mail service setting.',
                 ],
-                [
-                    'name' => 'noreply_email_address',
-                    'title' => 'No-reply e-mail address',
-                    'comment' => 'This is the e-mail address to be used when an e-mail has to be sent specifically requesting that no answer be sent in return. Generally, this e-mail address should be configured on your server to drop/ignore any incoming e-mail.',
-                ],
             ],
             'search' => [
                 [

src/CoreBundle/Helpers/MailHelper.php

@@ -6,22 +6,68 @@
 
 namespace Chamilo\CoreBundle\Helpers;
 
+use Chamilo\CoreBundle\Settings\SettingsManager;
 use Exception;
+use Notification;
 use Symfony\Bridge\Twig\Mime\TemplatedEmail;
 use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
 use Symfony\Component\Mailer\MailerInterface;
 use Symfony\Component\Mime\Address;
 use Symfony\Component\Mime\BodyRendererInterface;
 use Symfony\Component\Mime\Part\DataPart;
+use Symfony\Component\Validator\Constraints as Assert;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
 
 final class MailHelper
 {
     public function __construct(
         private readonly MailerInterface $mailer,
         private readonly BodyRendererInterface $bodyRenderer,
         private readonly ThemeHelper $themeHelper,
+        private readonly ValidatorInterface $validator,
+        private readonly SettingsManager $settingsManager,
     ) {}
 
+    private function setNoreplyAndFromAddress(
+        TemplatedEmail $email,
+        array $sender,
+        array $replyToAddress = []
+    ): void {
+        $emailConstraint = new Assert\Email();
+
+        // Default values
+        $notification = new Notification();
+        $defaultSenderName = $notification->getDefaultPlatformSenderName();
+        $defaultSenderEmail = $notification->getDefaultPlatformSenderEmail();
+
+        // If the parameter is set, don't use the admin.
+        $senderName = !empty($sender['name']) ? $sender['name'] : $defaultSenderName;
+        $senderEmail = !empty($sender['email']) ? $sender['email'] : $defaultSenderEmail;
+
+        // Send errors to the platform admin
+        $adminEmail = $this->settingsManager->getSetting('admin.administrator_email');
+
+        $adminEmailValidation = $this->validator->validate($adminEmail, $emailConstraint);
+
+        if (!empty($adminEmail) && 0 === $adminEmailValidation->count()) {
+            $email
+                ->getHeaders()
+                ->addIdHeader('Errors-To', $adminEmail)
+            ;
+        }
+
+        // Reply to first
+        if (!empty($replyToAddress)) {
+            $replyToEmailValidation = $this->validator->validate($replyToAddress['mail'], $emailConstraint);
+
+            if (0 === $replyToEmailValidation->count()) {
+                $email->addReplyTo(new Address($replyToAddress['mail'], $replyToAddress['name']));
+            }
+        }
+
+        $email->from(new Address($senderEmail, $senderName));
+    }
+
     public function send(
         string $recipientName,
         string $recipientEmail,
@@ -41,7 +87,7 @@ public function send(
 
         $templatedEmail = new TemplatedEmail();
 
-        api_set_noreply_and_from_address_to_mailer(
+        $this->setNoreplyAndFromAddress(
             $templatedEmail,
             ['name' => $senderName, 'email' => $senderEmail],
             !empty($extra_headers['reply_to']) ? $extra_headers['reply_to'] : []
@@ -86,12 +132,7 @@ public function send(
                 }
             }
 
-            $noReply = api_get_setting('noreply_email_address');
-            $automaticEmailText = '';
-
-            if (!empty($noReply)) {
-                $automaticEmailText = '<br />'.get_lang('This is an automatic email message. Please do not reply to it.');
-            }
+            $automaticEmailText = '<br />'.get_lang('This is an automatic email message. Please do not reply to it.');
 
             $params = [
                 'mail_header_style' => api_get_setting('mail.mail_header_style'),

src/CoreBundle/Migrations/Schema/V200/Version20250725104800.php

@@ -0,0 +1,23 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\Migrations\Schema\V200;
+
+use Chamilo\CoreBundle\Migrations\AbstractMigrationChamilo;
+use Doctrine\DBAL\Schema\Schema;
+
+class Version20250725104800 extends AbstractMigrationChamilo
+{
+    public function getDescription(): string
+    {
+        return "Remove noreply_email_address setting";
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql("DELETE FROM settings WHERE variable = 'noreply_email_address'");
+    }
+}

src/CoreBundle/Settings/MailSettingsSchema.php

@@ -18,7 +18,6 @@ class MailSettingsSchema extends AbstractSettingsSchema
     public function buildSettings(AbstractSettingsBuilder $builder): void
     {
         $builder->setDefaults([
-            'noreply_email_address' => 'no_reply@example.com',
             'update_users_email_to_dummy_except_admins' => 'false',
             'mail_header_style' => '',
             'mail_content_style' => '',
@@ -45,7 +44,6 @@ public function buildSettings(AbstractSettingsBuilder $builder): void
     public function buildForm(FormBuilderInterface $builder): void
     {
         $builder
-            ->add('noreply_email_address', EmailType::class)
             ->add('update_users_email_to_dummy_except_admins', YesNoType::class)
             ->add('mail_header_style', TextType::class)
             ->add('mail_content_style', TextType::class)

src/CoreBundle/Settings/SettingsManager.php

@@ -605,7 +605,6 @@ private function getVariablesAndCategories(): array
             'show_tabs' => 'Platform',
             'default_forum_view' => 'Course',
             'platform_charset' => 'Languages',
-            'noreply_email_address' => 'Platform',
             'survey_email_sender_noreply' => 'Course',
             'gradebook_enable' => 'Gradebook',
             'gradebook_score_display_coloring' => 'Gradebook',