Skip to content

Separate Email Logo #26871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
brueckner wants to merge 3 commits into from
Closed

Separate Email Logo #26871

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f6edb03
Add a new email logo upload field in the theme settings
brueckner May 4, 2021
5d98dac
Revert changes to getLogo method prior to moving the code to separate…
brueckner May 31, 2021
317dd23
Implement extracted getEmailLogo method
brueckner May 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Revert changes to getLogo method prior to moving the code to separate… 
… getEmailLogo method
  • Loading branch information
@brueckner
brueckner committed May 31, 2021
commit 5d98dacc8d5cf62fdaf05a93dd6ef6df16877fd5
23 changes: 6 additions & 17 deletions apps/theming/lib/ThemingDefaults.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,10 +223,8 @@ public function getColorPrimary() {
* @param bool $useSvg Whether to point to the SVG image or a fallback
* @return string
*/
public function getLogo($useSvg = true, $emailLogo = false): string {
$logoKey = $emailLogo ? 'emailLogo' : 'logo';
$logo = $this->config->getAppValue('theming', $logoKey . 'Mime', '');
$cacheBusterCounter = $this->config->getAppValue('theming', 'cachebuster', '0');
public function getLogo($useSvg = true): string {
$logo = $this->config->getAppValue('theming', 'logoMime', '');

// short cut to avoid setting up the filesystem just to check if the logo is there
//
Expand All @@ -237,24 +235,15 @@ public function getLogo($useSvg = true, $emailLogo = false): string {
$logoExists = true;
} else {
try {
$this->imageManager->getImage($logoKey, $useSvg);
$this->imageManager->getImage('logo', $useSvg);
$logoExists = true;
} catch (\Exception $e) {
$logoExists = false;
}

if (!$logoExists) {
try {
$logoKey = 'logo';
$logo = $this->config->getAppValue('theming', $logoKey . 'Mime', '');
$this->imageManager->getImage($logoKey, $useSvg);
$logoExists = true;
} catch (\Exception $e) {
$logoExists = false;
}
}
}

$cacheBusterCounter = $this->config->getAppValue('theming', 'cachebuster', '0');

if (!$logo || !$logoExists) {
if ($useSvg) {
$logo = $this->urlGenerator->imagePath('core', 'logo/logo.svg');
Expand All @@ -264,7 +253,7 @@ public function getLogo($useSvg = true, $emailLogo = false): string {
return $logo . '?v=' . $cacheBusterCounter;
}

return $this->urlGenerator->linkToRoute('theming.Theming.getImage', [ 'key' => $logoKey, 'useSvg' => $useSvg, 'v' => $cacheBusterCounter ]);
return $this->urlGenerator->linkToRoute('theming.Theming.getImage', [ 'key' => 'logo', 'useSvg' => $useSvg, 'v' => $cacheBusterCounter ]);
}

/**
Expand Down