the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2025-02-24 23:08:08 +08:00
Code Issues Projects Releases Packages Wiki Activity

Resolve #950

Browse source
This commit is contained in:
the-djmaze 2023-02-12 01:02:55 +01:00
parent 98d686bc14
commit 6237a3691b
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dev/Model/Email.js
View file

@ -302,7 +302,7 @@ export class EmailModel extends AbstractModel {
* @returns {string} * @returns {string}
*/ */
hash(withoutName = false) { hash(withoutName = false) {
return '#' + (withoutName ? '' : this.name) + '#' + this.email + '#'; return '#' + (withoutName ? '' : this.name) + '#' + (this.email || this.name) + '#';
} }
/** /**
@ -328,8 +328,8 @@ export class EmailModel extends AbstractModel {
* @returns {string} * @returns {string}
*/ */
toLine(friendlyView, wrapWithLink) { toLine(friendlyView, wrapWithLink) {
let result = this.email, let name = this.name,
name = this.name, result = this.email || name,
toLink = text => toLink = text =>
'<a href="mailto:' '<a href="mailto:'
+ encodeHtml(result) + (name ? '?to=' + encodeURIComponent('"' + name + '" <' + result + '>') : '') + encodeHtml(result) + (name ? '?to=' + encodeURIComponent('"' + name + '" <' + result + '>') : '')

2
snappymail/v/0.0.0/app/libraries/MailSo/Mime/Email.php
View file

@ -28,7 +28,7 @@ class Email implements \JsonSerializable
*/ */
function __construct(string $sEmail, string $sDisplayName = '') function __construct(string $sEmail, string $sDisplayName = '')
{ {
if (!\strlen(\trim($sEmail))) { if (!\strlen(\trim($sEmail)) && !\strlen(\trim($sDisplayName))) {
throw new \InvalidArgumentException; throw new \InvalidArgumentException;
} }

2
snappymail/v/0.0.0/app/libraries/MailSo/Mime/HeaderCollection.php
View file

@ -81,7 +81,7 @@ class HeaderCollection extends \MailSo\Base\Collection
if (\strlen($sValue)) { if (\strlen($sValue)) {
$oResult = new EmailCollection($sValue); $oResult = new EmailCollection($sValue);
} }
return $oResult && $oResult->count() ? $oResult : null; return $oResult;
} }
public function ParametersByName(string $sHeaderName) : ?ParameterCollection public function ParametersByName(string $sHeaderName) : ?ParameterCollection