[stable29] fix(mail): Fix big logos in mail templates for Outlook #46627
Conversation
![backportbot[bot]](https://avatars.githubusercontent.com/in/60201?s=60&v=4){kind=small}
Signed-off-by: Joas Schilling <coding@schilljs.com>
backportbot
bot
added
bug
3. to review
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| @@ -209,6 +209,10 @@ | |||
| } catch (NotFoundException $e) { | |||
| } catch (NotPermittedException $e) { | |||
| } | |||
|
|
|||
| if ($key === 'logo') { | |||
| $this->config->deleteAppValue('theming', 'logoDimensions'); | |||
Check notice
Code scanning / Psalm
DeprecatedMethod Note
| $content = file_get_contents($tmpFile); | ||
| $newImage = @imagecreatefromstring($content); | ||
| if ($newImage !== false) { | ||
| $this->config->setAppValue('theming', 'logoDimensions', imagesx($newImage) . 'x' . imagesy($newImage)); |
Check notice
Code scanning / Psalm
DeprecatedMethod Note
| } elseif (str_starts_with($detectedMimeType, 'image/svg')) { | ||
| $matched = preg_match('/viewbox=["\']\d* \d* (\d*\.?\d*) (\d*\.?\d*)["\']/i', $content, $matches); | ||
| if ($matched) { | ||
| $this->config->setAppValue('theming', 'logoDimensions', $matches[1] . 'x' . $matches[2]); |
Check notice
Code scanning / Psalm
DeprecatedMethod Note
| $this->config->setAppValue('theming', 'logoDimensions', $matches[1] . 'x' . $matches[2]); | ||
| } else { | ||
| $this->logger->warning('Could not read logo image dimensions to optimize for mail header'); | ||
| $this->config->deleteAppValue('theming', 'logoDimensions'); |
Check notice
Code scanning / Psalm
DeprecatedMethod Note
| } | ||
| } else { | ||
| $this->logger->warning('Could not read logo image dimensions to optimize for mail header'); | ||
| $this->config->deleteAppValue('theming', 'logoDimensions'); |
Check notice
Code scanning / Psalm
DeprecatedMethod Note
| $content = file_get_contents($tmpFile); | ||
| $newImage = @imagecreatefromstring($content); | ||
| if ($newImage !== false) { | ||
| $this->config->setAppValue('theming', 'logoDimensions', imagesx($newImage) . 'x' . imagesy($newImage)); |
Check notice
Code scanning / Psalm
PossiblyFalseOperand Note
| $content = file_get_contents($tmpFile); | ||
| $newImage = @imagecreatefromstring($content); | ||
| if ($newImage !== false) { | ||
| $this->config->setAppValue('theming', 'logoDimensions', imagesx($newImage) . 'x' . imagesy($newImage)); |
Check notice
Code scanning / Psalm
PossiblyFalseOperand Note
Backport of PR #46419