LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

(js) Respect security preferences in mail editor

pull/240/head
Francis Lachapelle 2018-01-23 22:23:14 -05:00
parent 7ebdac5525
commit 8e35becd93
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
UI/Templates/MailerUI/UIxMailEditor.wox
View File

@ -187,7 +187,7 @@
</sg-checkmark> </sg-checkmark>
</md-menu-item> </md-menu-item>
<md-menu-item> <md-menu-item>
<md-button class="md-primary" ng-disabled="true"><var:string label:value="Security"/></md-button> <md-button class="md-primary" ng-disabled="true" ng-bind="::'Security' | loc"><!-- Security --></md-button>
</md-menu-item> </md-menu-item>
<md-menu-item> <md-menu-item>
<sg-checkmark ng-model="editor.message.editable.sign"> <sg-checkmark ng-model="editor.message.editable.sign">

7
UI/WebServerResources/js/Mailer/Account.service.js
View File

@ -358,6 +358,13 @@
}).then(function(message) { }).then(function(message) {
// Fetch draft initial data // Fetch draft initial data
return Account.$$resource.fetch(message.$absolutePath({asDraft: true}), 'edit').then(function(data) { return Account.$$resource.fetch(message.$absolutePath({asDraft: true}), 'edit').then(function(data) {
var accountDefaults = Account.$Preferences.defaults.AuxiliaryMailAccounts[_this.id];
if (accountDefaults.security) {
if (accountDefaults.security.alwaysSign)
data.sign = true;
if (accountDefaults.security.alwaysEncrypt)
data.encrypt = true;
}
Account.$log.debug('New message (edit): ' + JSON.stringify(data, undefined, 2)); Account.$log.debug('New message (edit): ' + JSON.stringify(data, undefined, 2));
angular.extend(message.editable, data); angular.extend(message.editable, data);
message.isNew = true; message.isNew = true;

8
UI/WebServerResources/js/Mailer/Message.service.js
View File

@ -46,6 +46,7 @@
$timeout: $timeout, $timeout: $timeout,
$log: $log, $log: $log,
$$resource: new Resource(Settings.activeUser('folderURL') + 'Mail', Settings.activeUser()), $$resource: new Resource(Settings.activeUser('folderURL') + 'Mail', Settings.activeUser()),
$Preferences: Preferences,
$avatar: angular.bind(Preferences, Preferences.avatar) $avatar: angular.bind(Preferences, Preferences.avatar)
}); });
@ -396,6 +397,13 @@
}); });
if (identity) if (identity)
data.from = identity.full; data.from = identity.full;
var accountDefaults = Message.$Preferences.defaults.AuxiliaryMailAccounts[_this.$mailbox.$account.id];
if (accountDefaults.security) {
if (accountDefaults.security.alwaysSign)
data.sign = true;
if (accountDefaults.security.alwaysEncrypt)
data.encrypt = true;
}
Message.$log.debug('editable = ' + JSON.stringify(data, undefined, 2)); Message.$log.debug('editable = ' + JSON.stringify(data, undefined, 2));
angular.extend(_this.editable, data); angular.extend(_this.editable, data);
return data.text; return data.text;