the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2024-09-20 07:35:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect mailto format #1521

Browse source
This commit is contained in:
RainLoop 2017-10-06 21:52:00 +03:00
parent 71718db8f0
commit 90a3d2b62a
5 changed files with 42 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
dev/Common/Utils.js
View file

@ -1542,9 +1542,34 @@ export function mailToHelper(mailToUrl, PopupComposeViewModel)
query = mailToUrl.replace(/^[^\?]*\?/, ''),
EmailModel = require('Model/Email').default;
to = EmailModel.parseEmailLine(email);
params = simpleQueryParser(query);
if (!isUnd(params.to))
{
to = EmailModel.parseEmailLine(decodeURIComponent(email + ',' + params.to));
to = _.values(to.reduce((result, value) => {
if (value)
{
if (result[value.email])
{
if (!result[value.email].name)
{
result[value.email] = value;
}
}
else
{
result[value.email] = value;
}
}
return result;
}, {}));
}
else
{
to = EmailModel.parseEmailLine(email);
}
if (!isUnd(params.cc))
{
cc = EmailModel.parseEmailLine(decodeURIComponent(params.cc));

12
dev/Model/Email.js
View file

@ -112,8 +112,10 @@ class EmailModel
{
if (friendlyView && '' !== this.name)
{
result = wrapWithLink ? '<a href="mailto:' + encodeHtml('"' + this.name + '" <' + this.email + '>') +
result = wrapWithLink ? '<a href="mailto:' + encodeHtml(this.email) + '?to=' + encodeHtml('"' + this.name + '" <' + this.email + '>') +
'" target="_blank" tabindex="-1">' + encodeHtml(this.name) + '</a>' : (useEncodeHtml ? encodeHtml(this.name) : this.name);
// result = wrapWithLink ? '<a href="mailto:' + encodeHtml('"' + this.name + '" <' + this.email + '>') +
// '" target="_blank" tabindex="-1">' + encodeHtml(this.name) + '</a>' : (useEncodeHtml ? encodeHtml(this.name) : this.name);
}
else
{
@ -123,11 +125,17 @@ class EmailModel
if (wrapWithLink)
{
result = encodeHtml('"' + this.name + '" <') + '<a href="mailto:' +
encodeHtml('"' + this.name + '" <' + this.email + '>') +
encodeHtml(this.email) + '?to=' + encodeHtml('"' + this.name + '" <' + this.email + '>') +
'" target="_blank" tabindex="-1">' +
encodeHtml(result) +
'</a>' +
encodeHtml('>');
// result = encodeHtml('"' + this.name + '" <') + '<a href="mailto:' +
// encodeHtml('"' + this.name + '" <' + this.email + '>') +
// '" target="_blank" tabindex="-1">' +
// encodeHtml(result) +
// '</a>' +
// encodeHtml('>');
}
else
{

8
dev/Stores/Admin/App.js
View file

@ -1,4 +1,6 @@
import window from 'window';
import $ from '$';
import ko from 'ko';
import {settingsGet} from 'Storage/Settings';
import {AbstractAppStore} from 'Stores/AbstractApp';
@ -27,13 +29,9 @@ class AppAdminStore extends AbstractAppStore
this.useLocalProxyForExternalImages(!!settingsGet('UseLocalProxyForExternalImages'));
if (settingsGet('Auth')) {
this.checkDataFolder();
$.get('./data/VERSION?' + window.Math.random()).then(() => this.dataFolderAccess(true));
}
}
checkDataFolder() {
$.get('./data/VERSION?' + window.Math.random()).then((value) => this.dataFolderAccess(true));
}
}
export default new AppAdminStore();

1
gulpfile.js
View file

@ -640,6 +640,7 @@ gulp.task('watch', ['css:main', 'js:validate'], function() {
});
// aliases
gulp.task('lint', ['js:eslint']);
gulp.task('build', ['rainloop']);
gulp.task('all', function(callback) {

3
rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html
View file

@ -12,7 +12,8 @@
<br />
<span data-i18n="TAB_GENERAL/ALERT_DATA_ACCESS"></span>
&nbsp;
<strong><a href="https://rainloop.net/docs/installation/#notice">https://rainloop.net/docs/installation</a></strong>
<a href="https://www.rainloop.net/docs/installation/#notice"
target="_blank"><strong>https://www.rainloop.net/docs/installation</strong></a>
</div>
</div>
<div class="form-horizontal">