Internal: Restoring mail conf variables #5462
Conversation
![codeclimate[bot]](https://avatars.githubusercontent.com/in/9403?s=60&v=4){kind=small}
AngelFQC
force-pushed
the
BT21613
branch
2 times, most recently
from
b3a67d5
to
8183c3b
Compare
| use Chamilo\CoreBundle\Migrations\AbstractMigrationChamilo; | ||
| use Doctrine\DBAL\Schema\Schema; | ||
|
|
||
| class Version20240506164100 extends AbstractMigrationChamilo |
|
|
||
| $this->addSql("INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url, access_url_changeable, access_url_locked) VALUES ('smtp_from_name', null, null, 'mail', '$selectedMailValue', 'smtp_from_name', null, '', null, 1, 1, 1)"); | ||
| } | ||
| } |
There was a problem hiding this comment.
Expected 1 newline at end of file; 0 found
| @@ -163,6 +163,21 @@ public function getConfigurationValue($variable, $configuration = null) | |||
| return false; | |||
| } | |||
|
|
|||
| public function getMailConfigurationValue(string $variable, array $configuration = []): mixed | |||
| @@ -163,6 +163,21 @@ | |||
| return false; | |||
| } | |||
|
|
|||
| public function getMailConfigurationValue(string $variable, array $configuration = []): mixed | |||
| { | |||
| global $platform_email; | |||
There was a problem hiding this comment.
Variable "platform_email" is not in valid camel caps format
| global $platform_email; | ||
|
|
||
| if ($configuration) { | ||
| $platform_email = $configuration; |
There was a problem hiding this comment.
Variable "platform_email" is not in valid camel caps format
|
|
||
| /* For licensing terms, see /license.txt */ | ||
|
|
||
| declare(strict_types=1); |
There was a problem hiding this comment.
Add a single space around assignment operators
| $platform_email = $configuration; | ||
| } | ||
|
|
||
| if (isset($platform_email[$variable])) { |
There was a problem hiding this comment.
Variable "platform_email" is not in valid camel caps format
| } | ||
|
|
||
| if (isset($platform_email[$variable])) { | ||
| return $platform_email[$variable]; |
There was a problem hiding this comment.
Variable "platform_email" is not in valid camel caps format
| @@ -332,4 +347,28 @@ | |||
|
|
|||
| return $this->entityManager->find(Session::class, $id); | |||
| } | |||
|
|
|||
| public function getMailConfigurationValueFromFile(string $variable): ?string | |||
|
|
||
| public function getMailConfigurationValueFromFile(string $variable): ?string | ||
| { | ||
| global $platform_email; |
There was a problem hiding this comment.
Variable "platform_email" is not in valid camel caps format
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #5462 +/- ##
============================================
+ Coverage 39.78% 40.22% +0.43%
+ Complexity 10602 10352 -250
============================================
Files 842 823 -19
Lines 44320 43573 -747
============================================
- Hits 17634 17526 -108
+ Misses 26686 26047 -639 ☔ View full report in Codecov by Sentry. |
…_FROM_NAME - refs BT#21613
…ction - refs BT#21613
…tings - refs BT#21613
Also might affect other e-mail sending processes. Was using global platform sender setting before, no matter what.
…sting a message - refs BT#21613
…ler.yaml - refs BT#21613
…/messenger.yaml - refs BT#21613
…ssenger.yaml - refs BT#21613
…fs BT#21613 The text content for mails will be generated from HTML content with league/html-to-markdown
…ss - refs BT#21613
| $body, | ||
| $senderName, | ||
| $senderEmail, | ||
| $extra_headers, |
There was a problem hiding this comment.
Variable "extra_headers" is not in valid camel caps format
| $senderName, | ||
| $senderEmail, | ||
| $extra_headers, | ||
| $data_file, |
There was a problem hiding this comment.
Variable "data_file" is not in valid camel caps format
| include_once $oldConfigPath; | ||
| } | ||
|
|
||
| $settingValue = $this->getConfigurationValue($variable, $platform_email); |
There was a problem hiding this comment.
Variable "platform_email" is not in valid camel caps format
|
|
||
| /* For licensing terms, see /license.txt */ | ||
|
|
||
| declare(strict_types=1); |
There was a problem hiding this comment.
Add a single space around assignment operators
| use Symfony\Component\Mime\Address; | ||
| use Symfony\Component\Mime\BodyRendererInterface; | ||
|
|
||
| final class MailHelper |
|
|
||
| final class MailHelper | ||
| { | ||
| public function __construct( |
| final class MailHelper | ||
| { | ||
| public function __construct( | ||
| private readonly MailerInterface $mailer, |
There was a problem hiding this comment.
Line indented incorrectly; expected 4 spaces, found 8
| { | ||
| public function __construct( | ||
| private readonly MailerInterface $mailer, | ||
| private readonly BodyRendererInterface $bodyRenderer, |
There was a problem hiding this comment.
Line indented incorrectly; expected 4 spaces, found 8
| public function __construct( | ||
| private readonly MailerInterface $mailer, | ||
| private readonly BodyRendererInterface $bodyRenderer, | ||
| ) {} |
There was a problem hiding this comment.
Closing brace must be on a line by itself
| public function __construct( | ||
| private readonly MailerInterface $mailer, | ||
| private readonly BodyRendererInterface $bodyRenderer, | ||
| ) {} |
There was a problem hiding this comment.
Closing brace must be on a line by itself
|
An error occurred when fetching issues. View more on Code Climate. |
Refs BT#21613