Monotone-Parent: 0869cb2e3bedff16fb0985d9bde1c2c2a5c80820

Monotone-Revision: ac0d12f89b420e5f1e825cebddb440417e76ce4b

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-20T13:37:46

UI/PreferencesUI/UIxPreferences.h

@@ -45,6 +45,7 @@
   NSArray *daysOfWeek, *daysBetweenResponsesList;
   NSArray *sieveFilters;
   NSMutableDictionary *vacationOptions, *forwardOptions;
+  BOOL mailCustomFromEnabled;
   BOOL hasChanged;
 }
 

UI/PreferencesUI/UIxPreferences.m

@@ -106,6 +106,8 @@
             forwardOptions = [NSMutableDictionary new];
 	}
 
+      mailCustomFromEnabled = [dd mailCustomFromEnabled];
+
       hasChanged = NO;
     }
 
@@ -1285,6 +1287,29 @@
       if (!value)
         value = @"";
       [userDefaults setMailSignature: value];
+
+      if (mailCustomFromEnabled)
+        {
+          value = [[identity objectForKey: @"email"]
+                    stringByTrimmingSpaces];
+
+          /* We make sure that the "custom" value is different from the values
+             returned by the user directory service. */
+          if ([value length] == 0
+              || [[user allEmails] containsObject: value])
+            {
+              [userDefaults setMailCustomEmail: nil];
+              [userDefaults setMailCustomFullName: nil];
+            }
+          else
+            {
+              [userDefaults setMailCustomEmail: value];
+              value = [[identity objectForKey: @"fullName"]
+                        stringByTrimmingSpaces];
+              [userDefaults setMailCustomFullName: value];
+            }
+        }
+
       value = [[identity objectForKey: @"replyTo"]
                 stringByTrimmingSpaces];
       [userDefaults setMailReplyTo: value];
@@ -1528,4 +1553,9 @@
   return [accounts jsonRepresentation];
 }
 
+- (NSString *) mailCustomFromEnabled
+{
+  return (mailCustomFromEnabled ? @"true" : @"false");
+}
+
 @end

UI/Templates/PreferencesUI/UIxPreferences.wox

@@ -318,6 +318,11 @@
 
                   <input const:name="encryption" type="hidden" const:value="none"/>
               </fieldset>
+
+              <script type="text/javascript">
+                var mailCustomFromEnabled = <var:string value="mailCustomFromEnabled" const:escapeHTML="NO"/>;
+              </script>
+
               <fieldset const:id="identityInfo">
                 <label><var:string label:value="Full Name:"/>
                   <input const:name="fullName" const:id="fullName" type="text" const:value=""

UI/WebServerResources/UIxPreferences.js

@@ -664,8 +664,10 @@ function displayMailAccount(mailAccount, readOnly) {
     fieldSet = $("identityInfo");
     inputs = $(fieldSet.getElementsByTagName("input"));
     inputs.each(function (i) { i.mailAccount = mailAccount; });
-    for (var i = 0; i < 2; i++) {
-        inputs[i].disabled = readOnly;
+    if (!mailCustomFromEnabled) {
+        for (var i = 0; i < 2; i++) {
+            inputs[i].disabled = readOnly;
+        }
     }
 
     var form = $("mainForm");