Kh/dev/mail adjustments #17
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,12 +7,16 @@ | |
| use OC\Mail\EMailTemplate as ParentTemplate; | ||
| use OCA\NcwMailtemplate\AppInfo\Application; | ||
| use OCP\Defaults; | ||
| use OCP\IConfig; | ||
| use OCP\IL10N; | ||
| use OCP\IURLGenerator; | ||
| use OCP\IUser; | ||
| use OCP\IUserManager; | ||
| use OCP\L10N\IFactory; | ||
|
|
||
| class EMailTemplate extends ParentTemplate { | ||
| private IL10N $l; | ||
| private ?IUser $user = null; | ||
|
|
||
| // Generated asset URLs (filled in constructor) | ||
| private string $spacerUrl = ''; | ||
|
|
@@ -54,17 +58,97 @@ public function __construct( | |
| ?int $logoHeight, | ||
| string $emailId, | ||
| array $data = [], | ||
| ) { | ||
| // Initialize parent first to set up basic properties | ||
| parent::__construct($defaults, $urlGenerator, $l10nFactory, $logoWidth, $logoHeight, $emailId, $data); | ||
|
|
||
| // Try to get user from various sources (for recipient's language) | ||
| $this->user = $this->determineUser($this->data); | ||
|
|
||
| // Get language: user's preference, or system default | ||
| if ($this->user) { | ||
| $lang = $this->l10nFactory->getUserLanguage($this->user); | ||
| } else { | ||
| $config = \OC::$server->get(IConfig::class); | ||
| $lang = $config->getSystemValue('default_language', 'en'); | ||
| } | ||
| $this->l = $this->l10nFactory->get(Application::APP_ID, $lang); | ||
|
|
||
| // Generate URLs for template assets | ||
| $this->generateTemplateAssetUrls($urlGenerator); | ||
|
|
||
| // Load all HTML template files - this will override parent's head and tail | ||
| $this->loadHtmlTemplateFiles(); | ||
|
|
||
| // Replace the parent's htmlBody that was set with the parent's head | ||
| // with our custom head | ||
| $this->htmlBody = $this->head; | ||
| } | ||
|
|
||
| /** | ||
| * Determine the user for this email template | ||
| * Tries multiple sources: data array keys, current logged-in user, etc. | ||
| * | ||
| * Supported data keys (from various email types): | ||
| * - userid: from settings.Welcome | ||
| * - emailAddress: from settings.PasswordChanged, settings.EmailChanged | ||
| * - newEMailAddress: from settings.EmailChanged | ||
| * - shareWith: from file sharing emails (can be email or user ID) | ||
| * - displayname: from various emails | ||
| * - attendee_name: from calendar invitation emails | ||
| * | ||
| * @param array $data | ||
| * @return IUser|null | ||
| */ | ||
| private function determineUser(array $data): ?IUser { | ||
| $userManager = \OC::$server->get(IUserManager::class); | ||
|
bromiesTM marked this conversation as resolved.
|
||
|
|
||
| // Priority 1: Try to get recipient by user ID (most direct) | ||
| $userIdKeys = ['userid', 'userId', 'uid']; | ||
| foreach ($userIdKeys as $key) { | ||
| if (isset($data[$key]) && is_string($data[$key])) { | ||
| $user = $userManager->get($data[$key]); | ||
| if ($user instanceof IUser) { | ||
| return $user; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // Priority 2: Try to get recipient by email address | ||
| $emailKeys = ['emailAddress', 'newEMailAddress', 'shareWith']; | ||
| foreach ($emailKeys as $key) { | ||
| if (isset($data[$key]) && is_string($data[$key]) && str_contains($data[$key], '@')) { | ||
| $value = $data[$key]; | ||
|
|
||
| // Try to get user by email address | ||
| $users = $userManager->getByEmail($value); | ||
| if (!empty($users)) { | ||
| return reset($users); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // Priority 3: Try attendee_name or displayname as user ID or display name search | ||
| $nameKeys = ['attendee_name', 'displayname']; | ||
| foreach ($nameKeys as $key) { | ||
| if (isset($data[$key]) && is_string($data[$key])) { | ||
| $value = $data[$key]; | ||
|
|
||
| // First try as user ID | ||
| $user = $userManager->get($value); | ||
| if ($user instanceof IUser) { | ||
| return $user; | ||
| } | ||
|
|
||
| // Then try as display name search | ||
| $users = $userManager->searchDisplayName($value, 1); | ||
| if (!empty($users)) { | ||
| return reset($users); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return null; | ||
|
Comment on lines
+103
to
+151
There was a problem hiding this comment. lgtm. But the whole concept of this file html breaking needs to updated for a proper solution maybe in a later PR. Also, a minor improvement can be made. 'Sharewith' check can be moved in the Priority 1 check, as it is same for the And is 3rd priority to find with Also the email lookup can be made if there is an "@" in data, so the lookup is more faster and won't pass any other data to Code snippet:
This comment was marked as duplicate.
Sorry, something went wrong.
Contributor
Author
There was a problem hiding this comment. @Arsalanulhaq regarding strat 3 with Also
Thats why I had it in the strat 2 |
||
| } | ||
|
|
||
| /** | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,133 +1,15 @@ | ||
| <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> | ||
| <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en" style="-webkit-font-smoothing:antialiased;background:#fff!important"> | ||
| <head> | ||
| <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> | ||
| <meta name="viewport" content="width=device-width"> | ||
| <title></title> | ||
| <style type="text/css">@media only screen{html{min-height:100%;background:#fff}}@media only screen and (max-width:610px){table.body img{width:auto;height:auto}table.body center{min-width:0!important}table.body .container{width:95%!important}table.body .columns{height:auto!important;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;padding-left:30px!important;padding-right:30px!important}th.small-12{display:inline-block!important;width:100%!important}table.menu{width:100%!important}table.menu td,table.menu th{width:auto!important;display:inline-block!important}table.menu.vertical td,table.menu.vertical th{display:block!important}table.menu[align=center]{width:auto!important}}</style> | ||
| </head> | ||
| <body style="-moz-box-sizing:border-box;-ms-text-size-adjust:100%;-webkit-box-sizing:border-box;-webkit-font-smoothing:antialiased;-webkit-text-size-adjust:100%;margin:0;background:#fff!important;box-sizing:border-box;color:#0a0a0a;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;min-width:100%;padding:0;text-align:left;width:100%!important"> | ||
| <span class="preheader" style="color:#F5F5F5;display:none!important;font-size:1px;line-height:1px;max-height:0;max-width:0;mso-hide:all!important;opacity:0;overflow:hidden;visibility:hidden"> | ||
| </span> | ||
| <table class="body" style="-webkit-font-smoothing:antialiased;margin:0;background:#fff;border-collapse:collapse;border-spacing:0;color:#0a0a0a;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0;text-align:left;vertical-align:top;width:100%"> | ||
| <tr style="padding:0;text-align:left;vertical-align:top"> | ||
| <td class="center" align="center" valign="top" style="-moz-hyphens:auto;-webkit-hyphens:auto;Margin:0;border-collapse:collapse!important;color:#0a0a0a;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;hyphens:auto;line-height:1.3;margin:0;padding:0;text-align:left;vertical-align:top;word-wrap:break-word"> | ||
| <center data-parsed="" style="width:100%;max-width:740px;margin:auto"> |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.