Skip to content

fix(mail): Fix big logos in mail templates for Outlook - #46419

Merged
nickvergessen merged 1 commit into
masterfrom
bugfix/noid/limit-logo-size-for-outlook
Jul 17, 2024
Merged

fix(mail): Fix big logos in mail templates for Outlook#46419
nickvergessen merged 1 commit into
masterfrom
bugfix/noid/limit-logo-size-for-outlook

Conversation

@nickvergessen

@nickvergessennickvergessen commented Jul 10, 2024

Copy link
Copy Markdown
Member
CaseBeforeAfter
Huge image3308-1758-max2188-710-max
Mini image2188-740-max2

Todo

  • Create repair step to cache the image size on update
  • Adjustments for enterprise logo

Checklist

Comment threadapps/theming/lib/ImageManager.php Fixed
@nickvergessen
nickvergessenforce-pushed the bugfix/noid/limit-logo-size-for-outlook branch from ec3f2a7 to 7e6ce49CompareJuly 11, 2024 06:54
@nickvergessen

Copy link
Copy Markdown
MemberAuthor

Added the repair step and pinged the release crew to ask about the enterprise logo

}

if ($key === 'logo') {
$this->config->deleteAppValue('theming', 'logoDimensions');

Check notice

Code scanning / Psalm

DeprecatedMethod

The method OCP\IConfig::deleteAppValue has been marked as deprecated
@nickvergessen
nickvergessenforce-pushed the bugfix/noid/limit-logo-size-for-outlook branch from 7e6ce49 to 0252003CompareJuly 16, 2024 14:08
if ($key === 'logo') {
$newImage = @imagecreatefromstring(file_get_contents($tmpFile));
if ($newImage !== false) {
$this->config->setAppValue('theming', 'logoDimensions', imagesx($newImage) . 'x' . imagesy($newImage));

Check notice

Code scanning / Psalm

DeprecatedMethod

The method OCP\IConfig::setAppValue has been marked as deprecated
Comment threadapps/theming/lib/ImageManager.php Fixed
@nickvergessen
nickvergessenforce-pushed the bugfix/noid/limit-logo-size-for-outlook branch from 0252003 to c9842b6CompareJuly 17, 2024 06:57
} 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

The method OCP\IConfig::setAppValue has been marked as deprecated
$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

The method OCP\IConfig::deleteAppValue has been marked as deprecated
}
} 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

The method OCP\IConfig::deleteAppValue has been marked as deprecated
@nickvergessen
nickvergessenforce-pushed the bugfix/noid/limit-logo-size-for-outlook branch from c9842b6 to 37154e2CompareJuly 17, 2024 07:18
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
nickvergessenforce-pushed the bugfix/noid/limit-logo-size-for-outlook branch from 37154e2 to 693a81bCompareJuly 17, 2024 07:25
@nickvergessen
nickvergessen merged commit 0588899 into masterJul 17, 2024
@nickvergessen
nickvergessen deleted the bugfix/noid/limit-logo-size-for-outlook branch July 17, 2024 09:54
@nickvergessen

Copy link
Copy Markdown
MemberAuthor

/backport to stable29

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@nickvergessen@SystemKeeper@susnux@github-advanced-security