From 8ded5a8aaff1e7b4025b6ffe35e3e36d64ebd687 Mon Sep 17 00:00:00 2001
From: Alexandre Cloutier <acloutier@inverse.ca>
Date: Fri, 4 Jul 2014 09:51:41 -0400
Subject: [PATCH 01/14] Prevent Invitations and whitelist GUI

---
 .../Appointments/SOGoAppointmentObject.m      | 378 ++++++-----
 UI/PreferencesUI/UIxPreferences.h             |   1 +
 UI/PreferencesUI/UIxPreferences.m             |  18 +
 UI/Templates/ContactsUI/UIxListEditor.wox     | 129 ++--
 UI/Templates/PreferencesUI/UIxPreferences.wox | 593 ++++++++--------
 UI/WebServerResources/SOGoAutoCompletion.js   | 641 ++++++++++--------
 UI/WebServerResources/UIxPreferences.css      |  50 +-
 UI/WebServerResources/UIxPreferences.js       | 309 ++++++---
 8 files changed, 1264 insertions(+), 855 deletions(-)

diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m
index 584c62cc4..16732e7c4 100644
--- a/SoObjects/Appointments/SOGoAppointmentObject.m
+++ b/SoObjects/Appointments/SOGoAppointmentObject.m
@@ -412,6 +412,73 @@
                            withType: @"calendar:invitation-update"];
 }
 
+// This methods scans the list of attendees.
+- (NSException *) _handleAttendeeAvalability: (NSArray *) theAttendees
+                                    forEvent: (iCalEvent *) theEvent
+{
+  iCalPerson *currentAttendee;
+  NSMutableArray *attendees, *unavailableAttendees;
+  NSEnumerator *enumerator;
+  NSString *currentUID, *buffer;
+  NSMutableString *reason;
+  NSDictionary *values;
+  NSMutableDictionary *value;
+  SOGoUser *user, *currentUser, *ownerUser;
+  NSException *e;
+  int count = 0, i = 0;
+  
+  // Build a list of the attendees uids without the ressources
+  attendees = [NSMutableArray arrayWithCapacity: [theAttendees count]];
+  unavailableAttendees = [[NSMutableArray alloc] init];
+  enumerator = [theAttendees objectEnumerator];
+  while ((currentAttendee = [enumerator nextObject]))
+  {
+    currentUID = [currentAttendee uid];
+    if (currentUID)
+    {
+      user = [SOGoUser userWithLogin: currentUID];
+      if (![user isResource])
+      {
+        // Check if the user can be invited to an event.
+        if ([[user userSettings] objectForKey:@"PreventInvitations"])
+        {
+          values = [NSDictionary dictionaryWithObject:[user cn] forKey:@"Cn"];
+          [unavailableAttendees addObject:values];
+        }
+      }
+    }
+  }
+  count = [unavailableAttendees count];
+  if (count > 0)
+  {
+    if (count > 1)
+    {
+      reason = [NSMutableString stringWithString:[self labelForKey: @"These persons cannot be invited :"]];
+      for (i = 0; i < count; i++)
+      {
+        value = [unavailableAttendees objectAtIndex:i];
+        [reason appendString:[value keysWithFormat: @"\n %{Cn}"]];
+        if (!(i == (count - 1)))
+        {
+          [reason appendString:@" &"];
+        }
+      }
+    }
+    else
+    {
+      value = [unavailableAttendees objectAtIndex:0];
+      reason = [self labelForKey: @"This person cannot be invited:"];
+      [reason appendString:[value keysWithFormat: @"\n %{Cn}"]];
+    }
+    [unavailableAttendees release];
+    return [NSException exceptionWithHTTPStatus:403 reason: reason];
+  }
+  else {
+    [unavailableAttendees release];
+    return nil;
+  }
+}
+
 //
 // This methods scans the list of attendees. If they are
 // considered as resource, it checks for conflicting
@@ -435,172 +502,172 @@
   NSEnumerator *enumerator;
   NSString *currentUID;
   SOGoUser *user, *currentUser, *ownerUser;
-
+  
   // Build a list of the attendees uids
   attendees = [NSMutableArray arrayWithCapacity: [theAttendees count]];
   enumerator = [theAttendees objectEnumerator];
   while ((currentAttendee = [enumerator nextObject]))
+  {
+    currentUID = [currentAttendee uid];
+    if (currentUID)
     {
-      currentUID = [currentAttendee uid];
-      if (currentUID)
-        {
-          [attendees addObject: currentUID];
-        }
+      [attendees addObject: currentUID];
     }
-
+  }
+  
   // If the active user is not the owner of the calendar, check possible conflict when
   // the owner is a resource
   currentUser = [context activeUser];
   if (!activeUserIsOwner && ![currentUser isSuperUser])
-    {
-      [attendees addObject: owner];
-    }
-
+  {
+    [attendees addObject: owner];
+  }
+  
   enumerator = [attendees objectEnumerator];
   while ((currentUID = [enumerator nextObject]))
-    {
+  {
 	  user = [SOGoUser userWithLogin: currentUID];
 	  
 	  if ([user isResource])
-	    {
-	      SOGoAppointmentFolder *folder;
-	      NSCalendarDate *start, *end;
-	      NGCalendarDateRange *range;
-	      NSMutableArray *fbInfo;
-	      NSArray *allOccurences;
-  
-	      BOOL must_delete;
-  	      int i, j;
-
-	      // We get the start/end date for our conflict range. If the event to be added is recurring, we
-	      // check for at least a year to start with.
-	      start = [[theEvent startDate] dateByAddingYears: 0  months: 0  days: 0  hours: 0  minutes: 0  seconds: 1];
-	      end = [[theEvent endDate] dateByAddingYears: ([theEvent isRecurrent] ? 1 : 0)  months: 0  days: 0  hours: 0  minutes: 0  seconds: -1];
-
-	      folder = [user personalCalendarFolderInContext: context];
-
-	      // Deny access to the resource if the ACLs don't allow the user
-	      if (![folder aclSQLListingFilter])
-	        {
-		  NSDictionary *values;
-		  NSString *reason;
-
-		  values = [NSDictionary dictionaryWithObjectsAndKeys:
-		  		[user cn], @"Cn",
-				[user systemEmail], @"SystemEmail"];
-		  reason = [values keysWithFormat: [self labelForKey: @"Cannot access resource: \"%{Cn} %{SystemEmail}\""]];
-	      	  return [NSException exceptionWithHTTPStatus:403 reason: reason];
-	      	}
-
-	      fbInfo = [NSMutableArray arrayWithArray: [folder fetchFreeBusyInfosFrom: start
-							       to: end]];
-
-	      // We first remove any occurences in the freebusy that corresponds to the
-	      // current event. We do this to avoid raising a conflict if we move a 1 hour
-	      // meeting from 12:00-13:00 to 12:15-13:15. We would overlap on ourself otherwise.
-	      //
-	      // We must also check here for repetitive events that don't overlap our event.
-	      // We remove all events that don't overlap. The events here are already
-	      // decomposed.
-	      //
-	      if ([theEvent isRecurrent])
-		allOccurences = [theEvent recurrenceRangesWithinCalendarDateRange: [NGCalendarDateRange calendarDateRangeWithStartDate: start
-															       endDate: end]
-						   firstInstanceCalendarDateRange: [NGCalendarDateRange calendarDateRangeWithStartDate: [theEvent startDate]
-															       endDate: [theEvent endDate]]];
-	      else
-		allOccurences = nil;
-	      
-	      for (i = [fbInfo count]-1; i >= 0; i--)
-		{
-		  range = [NGCalendarDateRange calendarDateRangeWithStartDate: [[fbInfo objectAtIndex: i] objectForKey: @"startDate"]
-								      endDate: [[fbInfo objectAtIndex: i] objectForKey: @"endDate"]];
-		  
-		  if ([[[fbInfo objectAtIndex: i] objectForKey: @"c_uid"] compare: [theEvent uid]] == NSOrderedSame)
+    {
+      SOGoAppointmentFolder *folder;
+      NSCalendarDate *start, *end;
+      NGCalendarDateRange *range;
+      NSMutableArray *fbInfo;
+      NSArray *allOccurences;
+      
+      BOOL must_delete;
+      int i, j;
+      
+      // We get the start/end date for our conflict range. If the event to be added is recurring, we
+      // check for at least a year to start with.
+      start = [[theEvent startDate] dateByAddingYears: 0  months: 0  days: 0  hours: 0  minutes: 0  seconds: 1];
+      end = [[theEvent endDate] dateByAddingYears: ([theEvent isRecurrent] ? 1 : 0)  months: 0  days: 0  hours: 0  minutes: 0  seconds: -1];
+      
+      folder = [user personalCalendarFolderInContext: context];
+      
+      // Deny access to the resource if the ACLs don't allow the user
+      if (![folder aclSQLListingFilter])
+      {
+        NSDictionary *values;
+        NSString *reason;
+        
+        values = [NSDictionary dictionaryWithObjectsAndKeys:
+                  [user cn], @"Cn",
+                  [user systemEmail], @"SystemEmail"];
+        reason = [values keysWithFormat: [self labelForKey: @"Cannot access resource: \"%{Cn} %{SystemEmail}\""]];
+        return [NSException exceptionWithHTTPStatus:403 reason: reason];
+      }
+      
+      fbInfo = [NSMutableArray arrayWithArray: [folder fetchFreeBusyInfosFrom: start
+                                                                           to: end]];
+      
+      // We first remove any occurences in the freebusy that corresponds to the
+      // current event. We do this to avoid raising a conflict if we move a 1 hour
+      // meeting from 12:00-13:00 to 12:15-13:15. We would overlap on ourself otherwise.
+      //
+      // We must also check here for repetitive events that don't overlap our event.
+      // We remove all events that don't overlap. The events here are already
+      // decomposed.
+      //
+      if ([theEvent isRecurrent])
+        allOccurences = [theEvent recurrenceRangesWithinCalendarDateRange: [NGCalendarDateRange calendarDateRangeWithStartDate: start
+                                                                                                                       endDate: end]
+                                           firstInstanceCalendarDateRange: [NGCalendarDateRange calendarDateRangeWithStartDate: [theEvent startDate]
+                                                                                                                       endDate: [theEvent endDate]]];
+      else
+        allOccurences = nil;
+      
+      for (i = [fbInfo count]-1; i >= 0; i--)
+      {
+        range = [NGCalendarDateRange calendarDateRangeWithStartDate: [[fbInfo objectAtIndex: i] objectForKey: @"startDate"]
+                                                            endDate: [[fbInfo objectAtIndex: i] objectForKey: @"endDate"]];
+        
+        if ([[[fbInfo objectAtIndex: i] objectForKey: @"c_uid"] compare: [theEvent uid]] == NSOrderedSame)
 		    {
 		      [fbInfo removeObjectAtIndex: i];
 		      continue;
 		    }
-		  
-		  // No need to check if the event isn't recurrent here as it's handled correctly
-		  // when we compute the "end" date.
-		  if ([allOccurences count])
+        
+        // No need to check if the event isn't recurrent here as it's handled correctly
+        // when we compute the "end" date.
+        if ([allOccurences count])
 		    {
 		      must_delete = YES;
-
+          
 		      for (j = 0; j < [allOccurences count]; j++)
-			{
-			  if ([range doesIntersectWithDateRange: [allOccurences objectAtIndex: j]])
-			    {
-			      must_delete = NO;
-			      break;
-			    }
-			}
+          {
+            if ([range doesIntersectWithDateRange: [allOccurences objectAtIndex: j]])
+            {
+              must_delete = NO;
+              break;
+            }
+          }
 		      
 		      if (must_delete)
-			[fbInfo removeObjectAtIndex: i];
+            [fbInfo removeObjectAtIndex: i];
 		    }
-		}
-
-              // Find the attendee associated to the current UID
-              for (i = 0; i < [theAttendees count]; i++)
-                {
-                  currentAttendee = [theAttendees objectAtIndex: i];
-                  if ([[currentAttendee uid] isEqualToString: currentUID])
-                    break;
-                  else
-                    currentAttendee = nil;
-                }
-
-              if ([fbInfo count])
-                {
-                  // If we always force the auto-accept if numberOfSimultaneousBookings == 0 (ie., no limit
-                  // is imposed) or if numberOfSimultaneousBookings is greater than the number of
-                  // overlapping events
-                  if ([user numberOfSimultaneousBookings] == 0 ||
-                      [user numberOfSimultaneousBookings] > [fbInfo count])
-                    {
-                      if (currentAttendee)
-                        {
-                          [[currentAttendee attributes] removeObjectForKey: @"RSVP"];
-                          [currentAttendee setParticipationStatus: iCalPersonPartStatAccepted];
-                        }
-                    }
-                  else
-                    {
-                      iCalCalendar *calendar;
-                      NSDictionary *values;
-                      NSString *reason;
-                      iCalEvent *event;
-
-                      calendar =  [iCalCalendar parseSingleFromSource: [[fbInfo objectAtIndex: 0] objectForKey: @"c_content"]];
-                      event = [[calendar events] lastObject];
-
-                      values = [NSDictionary dictionaryWithObjectsAndKeys:
-                                             [NSString stringWithFormat: @"%d", [user numberOfSimultaneousBookings]], @"NumberOfSimultaneousBookings",
-                                             [user cn], @"Cn",
-                                             [user systemEmail], @"SystemEmail",
-                                             ([event summary] ? [event summary] : @""), @"EventTitle",
-                                             [[fbInfo objectAtIndex: 0] objectForKey: @"startDate"], @"StartDate",
-                                             nil];
-
-                      reason = [values keysWithFormat: [self labelForKey: @"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\". The conflicting event is \"%{EventTitle}\", and starts on %{StartDate}."]];
-
-                      return [NSException exceptionWithHTTPStatus: 403
-                                                           reason: reason];
-                    }
-                }
-              else if (currentAttendee)
-                {
-                  // No conflict, we auto-accept. We do this for resources automatically if no
-                  // double-booking is observed. If it's not the desired behavior, just don't
-                  // set the resource as one!
-                  [[currentAttendee attributes] removeObjectForKey: @"RSVP"];
-                  [currentAttendee setParticipationStatus: iCalPersonPartStatAccepted];
-                }
-            }
+      }
+      
+      // Find the attendee associated to the current UID
+      for (i = 0; i < [theAttendees count]; i++)
+      {
+        currentAttendee = [theAttendees objectAtIndex: i];
+        if ([[currentAttendee uid] isEqualToString: currentUID])
+          break;
+        else
+          currentAttendee = nil;
+      }
+      
+      if ([fbInfo count])
+      {
+        // If we always force the auto-accept if numberOfSimultaneousBookings == 0 (ie., no limit
+        // is imposed) or if numberOfSimultaneousBookings is greater than the number of
+        // overlapping events
+        if ([user numberOfSimultaneousBookings] == 0 ||
+            [user numberOfSimultaneousBookings] > [fbInfo count])
+        {
+          if (currentAttendee)
+          {
+            [[currentAttendee attributes] removeObjectForKey: @"RSVP"];
+            [currentAttendee setParticipationStatus: iCalPersonPartStatAccepted];
+          }
+        }
+        else
+        {
+          iCalCalendar *calendar;
+          NSDictionary *values;
+          NSString *reason;
+          iCalEvent *event;
+          
+          calendar =  [iCalCalendar parseSingleFromSource: [[fbInfo objectAtIndex: 0] objectForKey: @"c_content"]];
+          event = [[calendar events] lastObject];
+          
+          values = [NSDictionary dictionaryWithObjectsAndKeys:
+                    [NSString stringWithFormat: @"%d", [user numberOfSimultaneousBookings]], @"NumberOfSimultaneousBookings",
+                    [user cn], @"Cn",
+                    [user systemEmail], @"SystemEmail",
+                    ([event summary] ? [event summary] : @""), @"EventTitle",
+                    [[fbInfo objectAtIndex: 0] objectForKey: @"startDate"], @"StartDate",
+                    nil];
+          
+          reason = [values keysWithFormat: [self labelForKey: @"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\". The conflicting event is \"%{EventTitle}\", and starts on %{StartDate}."]];
+          
+          return [NSException exceptionWithHTTPStatus: 403
+                                               reason: reason];
+        }
+      }
+      else if (currentAttendee)
+      {
+        // No conflict, we auto-accept. We do this for resources automatically if no
+        // double-booking is observed. If it's not the desired behavior, just don't
+        // set the resource as one!
+        [[currentAttendee attributes] removeObjectForKey: @"RSVP"];
+        [currentAttendee setParticipationStatus: iCalPersonPartStatAccepted];
+      }
     }
-
+  }
+  
   return nil;
 }
 
@@ -608,27 +675,29 @@
 //
 //
 - (NSException *) _handleAddedUsers: (NSArray *) attendees
-		          fromEvent: (iCalEvent *) newEvent
+                          fromEvent: (iCalEvent *) newEvent
 {
   iCalPerson *currentAttendee;
   NSEnumerator *enumerator;
   NSString *currentUID;
   NSException *e;
-
+  
   // We check for conflicts
   if ((e = [self _handleResourcesConflicts: attendees  forEvent: newEvent]))
     return e;
-
+  if ((e = [self _handleAttendeeAvalability: attendees  forEvent: newEvent]))
+    return e;
+  
   enumerator = [attendees objectEnumerator];
   while ((currentAttendee = [enumerator nextObject]))
-    {
-      currentUID = [currentAttendee uid];
-      if (currentUID)
-	[self _addOrUpdateEvent: newEvent
-			 forUID: currentUID
-			  owner: owner];
-    }
-
+  {
+    currentUID = [currentAttendee uid];
+    if (currentUID)
+      [self _addOrUpdateEvent: newEvent
+                       forUID: currentUID
+                        owner: owner];
+  }
+  
   return nil;
 }
 
@@ -709,8 +778,9 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
                                withType: @"calendar:cancellation"];
     }
   
-  if ((ex = [self _handleResourcesConflicts: [newEvent attendees]
-                                   forEvent: newEvent]))
+  if ((ex = [self _handleResourcesConflicts: [newEvent attendees] forEvent: newEvent]))
+    return ex;
+  if ((ex = [self _handleAttendeeAvalability: [newEvent attendees] forEvent: newEvent]))
     return ex;
 
   addedAttendees = [changes insertedAttendees];
@@ -783,7 +853,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
 //       +------------> _handleUpdatedEvent:fromOldEvent: ---> _addOrUpdateEvent:forUID:owner:  <-----------+
 //                               |           |                   ^                                          |
 //                               v           v                   |                                          |
-//  _handleRemovedUsers:withRecurrenceId:  _handleSequenceUpdateInEvent:ignoringAttendees:fromOldEvent:      |
+//  _handleRemovedUsers:withRecurrenceId:  _handleSequenceUpdateInEvent:ignoringAttendees:fromOldEvent:     |
 //                     |                                                                                    |
 //                     |             [DELETEAction:]                                                        |
 //                     |                    |              {_handleAdded/Updated...}<--+                    |
diff --git a/UI/PreferencesUI/UIxPreferences.h b/UI/PreferencesUI/UIxPreferences.h
index bbbb0a2b1..0164d247f 100644
--- a/UI/PreferencesUI/UIxPreferences.h
+++ b/UI/PreferencesUI/UIxPreferences.h
@@ -33,6 +33,7 @@
 {
   id item;
   SOGoUser *user;
+  SOGoUserSettings *us;
   NGSieveClient *client;
 
   // Addressbook
diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index 0900c4d3a..096ae7b97 100644
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -41,6 +41,7 @@
 #import <SOGo/NSString+Utilities.h>
 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoUserDefaults.h>
+#import <SOGo/SOGoUserSettings.h>
 #import <SOGo/SOGoDomainDefaults.h>
 #import <SOGo/SOGoSieveManager.h>
 #import <SOGo/SOGoSystemDefaults.h>
@@ -638,6 +639,23 @@ static NSArray *reminderValues = nil;
   return [userDefaults busyOffHours];
 }
 
+- (void) setPreventInvitations: (BOOL) preventInvitations
+{
+  SOGoUserSettings *us;
+  
+  us = [user userSettings];
+  [us setBool: preventInvitations forKey: @"PreventInvitations"];
+  [us synchronize];
+}
+
+- (BOOL) preventInvitations
+{
+  SOGoUserSettings *us;
+  us = [user userSettings];
+  
+  return [[us objectForKey: @"PreventInvitations"] boolValue];
+}
+
 - (NSArray *) firstWeekList
 {
   return [NSArray arrayWithObjects:
diff --git a/UI/Templates/ContactsUI/UIxListEditor.wox b/UI/Templates/ContactsUI/UIxListEditor.wox
index d82e9cc89..4d265c28d 100644
--- a/UI/Templates/ContactsUI/UIxListEditor.wox
+++ b/UI/Templates/ContactsUI/UIxListEditor.wox
@@ -1,37 +1,42 @@
 <?xml version='1.0' standalone='yes'?>
-  <var:component
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:var="http://www.skyrix.com/od/binding"
-    xmlns:const="http://www.skyrix.com/od/constant"
-    xmlns:rsrc="OGo:url"
-    xmlns:label="OGo:label"
-    xmlns:uix="OGo:uix"
-    className="UIxPageFrame"
-    title="name"
-    const:popup="YES"
-    const:jsFiles="UIxMailEditor.js,SOGoAutoCompletion.js"
-    >
-    <script type="text/javascript">
-      var activeAddressBook = '<var:string value="clientObject.container.nameInContainer"/>';
-    </script>
-    <div class="popupMenu" id="contactsMenu">
-      <ul></ul>
-    </div>
-    <form var:href="saveURL" name="editform" id="mainForm">
-      <div id="listEditor">
-        <span class="caption"><var:string label:value="List details" /></span>
-        <table class="frame"><tr><td width="35%"><var:string label:value="List name:"/></td>
-            <td><input type="text" const:id="listName" const:name="listName"
-                var:value="listName" class="textField" /></td></tr>
-          <tr><td><var:string label:value="List nickname:"/></td>
-            <td><input type="text" const:id="nickname" const:name="nickname"
-                var:value="nickname" class="textField" /></td></tr>
-          <tr><td><var:string label:value="List description:"/></td>
-            <td><input type="text" const:id="description" const:name="description"
-                var:value="description" class="textField" /></td></tr>
-        </table>
-        <span class="caption"><var:string label:value="Members" /></span>
-        <table class="frame"><tr><td>
+<var:component
+  xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:var="http://www.skyrix.com/od/binding"
+  xmlns:const="http://www.skyrix.com/od/constant"
+  xmlns:rsrc="OGo:url"
+  xmlns:label="OGo:label"
+  xmlns:uix="OGo:uix"
+  className="UIxPageFrame"
+  title="name"
+  const:popup="YES"
+  const:jsFiles="UIxMailEditor.js,SOGoAutoCompletion.js"
+  >
+  <script type="text/javascript">
+    var activeAddressBook = '<var:string value="clientObject.container.nameInContainer"/>';
+  </script>
+  <div class="popupMenu" id="contactsMenu">
+    <ul></ul>
+  </div>
+  <form var:href="saveURL" name="editform" id="mainForm">
+    <div id="listEditor">
+      <span class="caption"><var:string label:value="List details" /></span>
+      <table class="frame">
+        <tr>
+          <td width="35%"><var:string label:value="List name:"/></td>
+          <td>
+            <input type="text" const:id="listName" const:name="listName" var:value="listName" class="textField" /></td></tr>
+        <tr>
+          <td><var:string label:value="List nickname:"/></td>
+          <td>
+            <input type="text" const:id="nickname" const:name="nickname" var:value="nickname" class="textField" /></td></tr>
+        <tr>
+          <td><var:string label:value="List description:"/></td>
+          <td>
+            <input type="text" const:id="description" const:name="description" var:value="description" class="textField" /></td></tr>
+      </table>
+      
+      <span class="caption"><var:string label:value="Members" /></span>
+      <table class="frame"><tr><td>
         <div id="referenceListWrapper">
           <table id="referenceList" cellspacing="0">
             <thead>
@@ -44,40 +49,40 @@
             <tbody>
               <var:foreach list="references" item="reference">
                 <tr const:class="referenceListRow">
-		  <td const:class="referenceListCell">
-		    <input var:uid="reference.id"
-			   var:value="reference.name"
-			   const:style="display: none"/>
+                  <td const:class="referenceListCell">
+                    <input var:uid="reference.id"
+                    var:value="reference.name"
+                    const:style="display: none"/>
                     <span><var:string var:value="reference.name"/></span>
-                </td></tr>
+                  </td></tr>
               </var:foreach>
             </tbody>
           </table>
         </div>
-        </td></tr>
-        <tr><td>
-            <div class="bottomToolbar">
-            <a const:id="referenceAdd" class="bottomButton" href="#">
-              <span><img rsrc:src="add-icon.png" label:title="Add" />
+      </td></tr>
+      <tr><td>
+        <div class="bottomToolbar">
+          <a const:id="referenceAdd" class="bottomButton" href="#">
+            <span><img rsrc:src="add-icon.png" label:title="Add" />
             </span></a>
-            <a const:id="referenceDelete" class="bottomButton" href="#">
-              <span><img rsrc:src="remove-icon.png" label:title="Delete" />
+          <a const:id="referenceDelete" class="bottomButton" href="#">
+            <span><img rsrc:src="remove-icon.png" label:title="Delete" />
             </span></a>
-          </div>
-        </td></tr>
-        </table>
-      </div>
-      <input type="hidden" name="referencesValue" id="referencesValue"
-        var:value="referencesValue" />
-      <div id="buttons">
-        <var:if condition="canCreateOrModify"
-          ><a class="button actionButton" name="submit" 
-            id="submitButton" href="#" >
-            <span><var:string label:value="Save"/></span>
+        </div>
+      </td></tr>
+      </table>
+    </div>
+    <input type="hidden" name="referencesValue" id="referencesValue"
+    var:value="referencesValue" />
+    <div id="buttons">
+      <var:if condition="canCreateOrModify"
+        ><a class="button actionButton" name="submit"
+          id="submitButton" href="#" >
+          <span><var:string label:value="Save"/></span>
         </a></var:if>
-        <a const:id="cancelButton" class="button" name="cancel" href="#">
-            <span><var:string label:value="Cancel"/></span>
-        </a>
-      </div>
-    </form>
-  </var:component>
+      <a const:id="cancelButton" class="button" name="cancel" href="#">
+        <span><var:string label:value="Cancel"/></span>
+      </a>
+    </div>
+  </form>
+</var:component>
diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index 9cc6675a2..287029d40 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -11,11 +11,14 @@
   title="title"
   const:popup="YES"
   const:cssFiles="datepicker.css"
-  const:jsFiles="RowEditionController.js,PasswordPolicy.js,ckeditor/ckeditor.js,datepicker.js"
+  const:jsFiles="RowEditionController.js,PasswordPolicy.js,ckeditor/ckeditor.js,datepicker.js, SOGoAutoCompletion.js"
   >
   <script type="text/javascript">
     var localeCode = '<var:string value="localeCode"/>';
   </script>
+  <div class="popupMenu" id="contactsMenu">
+    <ul></ul>
+  </div>
 
   <div id="colorPickerDialog" style="display: none;" class="dialog right bottom">
     <div>
@@ -91,33 +94,33 @@
       <span class="blc-99FF99"><!-- --></span>
     </div>
   </div>
-
+  
   <form id="mainForm" var:href="ownPath">
     <div class="tabsContainer" id="preferencesTabs">
       <ul>
         <li target="generalView"><span>
-            <var:string label:value="General" /></span></li>
-	<var:if condition="userHasCalendarAccess">
+          <var:string label:value="General" /></span></li>
+        <var:if condition="userHasCalendarAccess">
           <li target="calendarOptionsView"><span><var:string
-                label:value="Calendar Options"/></span></li>
-	</var:if
-          ><li target="contactsOptionsView"><span><var:string
-              label:value="Contacts Options"/></span></li
-          ><var:if condition="userHasMailAccess">
+            label:value="Calendar Options"/></span></li>
+          </var:if
+        ><li target="contactsOptionsView"><span><var:string
+          label:value="Contacts Options"/></span></li
+        ><var:if condition="userHasMailAccess">
           <li target="mailOptionsView"><span><var:string
-                label:value="Mail Options"/></span></li>
+            label:value="Mail Options"/></span></li>
           <li target="mailAccountsView"><span><var:string
-                label:value="IMAP Accounts"/></span></li>
+            label:value="IMAP Accounts"/></span></li>
           <var:if condition="isVacationEnabled"><li target="vacationView"><span><var:string
-                  label:value="Vacation"/></span></li></var:if
-            ><var:if condition="isForwardEnabled"><li target="forwardView"><span><var:string
-                  label:value="Forward"/></span></li></var:if>
-	</var:if
-          ><var:if condition="shouldDisplayAdditionalPreferences">
+            label:value="Vacation"/></span></li></var:if
+          ><var:if condition="isForwardEnabled"><li target="forwardView"><span><var:string
+            label:value="Forward"/></span></li></var:if>
+          </var:if
+        ><var:if condition="shouldDisplayAdditionalPreferences">
           <li target="additionalView"><span>
-              <var:string label:value="Additional Parameters"/></span></li>
- 	</var:if
-          ><var:if condition="shouldDisplayPasswordChange">
+            <var:string label:value="Additional Parameters"/></span></li>
+          </var:if
+        ><var:if condition="shouldDisplayPasswordChange">
           <li target="passwordView"><span><var:string label:value="Password"/></span></li>
         </var:if>
       </ul>
@@ -128,38 +131,38 @@
             <dd><var:string value="sogoVersion"/></dd>
             <dt><var:string label:value="Language :"/></dt>
             <dd><var:popup list="languages" item="item"
-                  const:id="language"
-                  const:name="language"
-                  string="languageText" 
-                  selection="language"
-                  label:noSelectionString="choose" /></dd>
+              const:id="language"
+              const:name="language"
+              string="languageText"
+              selection="language"
+              label:noSelectionString="choose" /></dd>
             <dt><var:string label:value="Current Time Zone :"/></dt>
             <dd><var:popup list="timeZonesList" item="item"
-                  const:id="timezone"
-                  const:name="timezone"
-                  string="item" selection="userTimeZone" /></dd>
+              const:id="timezone"
+              const:name="timezone"
+              string="item" selection="userTimeZone" /></dd>
             <dt><var:string label:value="Short Date Format :"/></dt>
             <dd><var:popup list="shortDateFormatsList" item="item"
-                  const:id="shortDateFormat"
-                  const:name="shortDateFormat"
-                  string="itemShortDateFormatText" selection="userShortDateFormat"/></dd>
+              const:id="shortDateFormat"
+              const:name="shortDateFormat"
+              string="itemShortDateFormatText" selection="userShortDateFormat"/></dd>
             <dt><var:string label:value="Long Date Format :"/></dt>
             <dd><var:popup list="longDateFormatsList" item="item"
-                  const:id="longDateFormat"
-                  const:name="longDateFormat"
-                  string="itemLongDateFormatText" selection="userLongDateFormat"
-                  /></dd>
+              const:id="longDateFormat"
+              const:name="longDateFormat"
+              string="itemLongDateFormatText" selection="userLongDateFormat"
+              /></dd>
             <dt><var:string label:value="Time Format :"/></dt>
             <dd><var:popup list="timeFormatsList" item="item"
-                  const:id="timeFormat"
-                  const:name="timeFormat"
-                  string="itemTimeFormatText" selection="userTimeFormat"
-                  /></dd>
+              const:id="timeFormat"
+              const:name="timeFormat"
+              string="itemTimeFormatText" selection="userTimeFormat"
+              /></dd>
             <dt><var:string label:value="Default module :"/></dt>
             <dd><var:popup list="availableModules" item="item"
-                  const:id="defaultModule"
-                  const:name="defaultModule"
-                  string="itemModuleText" selection="userDefaultModule"/></dd>
+              const:id="defaultModule"
+              const:name="defaultModule"
+              string="itemModuleText" selection="userDefaultModule"/></dd>
           </dl>
         </div>
         <var:if condition="userHasCalendarAccess">
@@ -167,73 +170,103 @@
             <dl class="dl-horizontal">
               <dt><var:string label:value="Week begins on :"/></dt>
               <dd><var:popup list="daysList" item="item"
-                    const:id="weekStartDay"
-                    const:name="weekStartDay"
-                    string="itemWeekStartDay" selection="userWeekStartDay"/></dd>
+                const:id="weekStartDay"
+                const:name="weekStartDay"
+                string="itemWeekStartDay" selection="userWeekStartDay"/></dd>
               <dt><var:string label:value="Day start time :"/></dt>
               <dd><var:popup list="hoursList" item="item"
-                    const:id="dayStartTime"
-                    const:name="dayStartTime"
-                    string="item" selection="userDayStartTime"/></dd>
+                const:id="dayStartTime"
+                const:name="dayStartTime"
+                string="item" selection="userDayStartTime"/></dd>
               <dt><var:string label:value="Day end time :"/></dt>
               <dd><var:popup list="hoursList" item="item"
-                    const:id="dayEndTime"
-                    const:name="dayEndTime"
-                    string="item" selection="userDayEndTime"/></dd>
+                const:id="dayEndTime"
+                const:name="dayEndTime"
+                string="item" selection="userDayEndTime"/></dd>
               <dt></dt>
-              <dd><input type="checkbox" 
-                    const:name="busyOffHours"
-                    const:id="busyOffHours"
-                    var:checked="busyOffHours" />
+              <dd><input type="checkbox"
+                const:name="busyOffHours"
+                const:id="busyOffHours"
+                var:checked="busyOffHours" />
                 <var:string label:value="Show time as busy outside working hours"/></dd>
-            <dt><var:string label:value="First week of year :"/></dt>
-            <dd><var:popup list="firstWeekList" item="item"
-                  const:id="firstWeek"
-                  const:name="firstWeek"
-                  string="itemFirstWeekText" selection="userFirstWeek"/></dd>
-            <dt><var:string label:value="Default calendar :"/></dt>
-            <dd><var:popup list="defaultCalendarList" item="item"
-                  const:id="defaultCalendar"
-                  const:name="defaultCalendar"
-                  string="itemCalendarText" selection="userDefaultCalendar"/></dd>
-            <dt><var:string label:value="Default events classification :"/></dt>
-            <dd><var:popup list="calendarClassificationsList" item="item"
-                  const:id="eventsClassification"
-                  const:name="eventsClassification"
-                  string="itemClassificationText" selection="eventsDefaultClassification"/></dd>
-            <dt><var:string label:value="Default tasks classification :"/></dt>
-            <dd><var:popup list="calendarClassificationsList" item="item"
-                  const:id="tasksClassification"
-                  const:name="tasksClassification"
-                  string="itemClassificationText" selection="tasksDefaultClassification"/></dd>
-            <dt><var:string label:value="Default reminder :"/></dt>
-            <dd><var:popup list="reminderList" item="item"
-                  const:disabledValue="-"
-                  label:noSelectionString="reminder_NONE"
-                  const:name="reminderList"
-                  const:id="reminderList"
-                  string="itemReminderText" var:selection="reminder"/></dd>
+              <dt><var:string label:value="First week of year :"/></dt>
+              <dd><var:popup list="firstWeekList" item="item"
+                const:id="firstWeek"
+                const:name="firstWeek"
+                string="itemFirstWeekText" selection="userFirstWeek"/></dd>
+              <dt><var:string label:value="Default calendar :"/></dt>
+              <dd><var:popup list="defaultCalendarList" item="item"
+                const:id="defaultCalendar"
+                const:name="defaultCalendar"
+                string="itemCalendarText" selection="userDefaultCalendar"/></dd>
+              <dt><var:string label:value="Default events classification :"/></dt>
+              <dd><var:popup list="calendarClassificationsList" item="item"
+                const:id="eventsClassification"
+                const:name="eventsClassification"
+                string="itemClassificationText" selection="eventsDefaultClassification"/></dd>
+              <dt><var:string label:value="Default tasks classification :"/></dt>
+              <dd><var:popup list="calendarClassificationsList" item="item"
+                const:id="tasksClassification"
+                const:name="tasksClassification"
+                string="itemClassificationText" selection="tasksDefaultClassification"/></dd>
+              <dt><var:string label:value="Default reminder :"/></dt>
+              <dd><var:popup list="reminderList" item="item"
+                const:disabledValue="-"
+                label:noSelectionString="reminder_NONE"
+                const:name="reminderList"
+                const:id="reminderList"
+                string="itemReminderText" var:selection="reminder"/></dd>
+              <dt><var:string label:value="Appointments invitations:"/></dt>
+              <dd><input type="checkbox"
+                const:name="preventInvitations"
+                const:id="preventInvitations"
+                var:checked="preventInvitations" />
+                <var:string label:value="Prevent from being invited to appointments"/></dd>
             </dl>
-
-            <label><var:string label:value="Categories"/></label>
-            <div id="calendarCategoriesListWrapper" class="listWrapper"
-              ><table class="categoriesList" cellspacing="0">
+            
+            <label id="whiteListLabel"><var:string label:value="White list for appointments invitations:"/></label>
+            <div id="appointmentsWhiteListWrapper" class="listWrapper">
+              <table class="tableview" id="tableViewWhiteList">
                 <thead>
-                  <tr class="tableview"
-                    ><th const:class="tbtv_headercell" const:id="nameTableHeader"
-                      ><var:string label:value="Name"/></th
-                      ><th const:class="tbtv_headercell" const:id="colorTableHeader"
-                      ><var:string label:value="Color"/></th
-                      ></tr
-                    ></thead>
+                  <tr class="tableview">
+                    <th const:class="tbtv_headercell" const:id="whiteListTableHeader">
+                      <var:string label:value="Contacts names"/></th>
+                  </tr></thead>
+                <tbody>
+                  <var:foreach list="appointmentsWhiteList" item="contact">
+                    <tr const:class="whiteListRow">
+                      <td const:class="whiteListCell">
+                        <var:string var:value="contact"/></td>
+                    </tr>
+                  </var:foreach>
+                </tbody>
+              </table>
+            </div>
+            <div id="whiteListToolbar">
+              <a const:id="appointmentsWhiteListAdd" href="#">
+                  <img rsrc:src="add-icon.png" label:title="Add" id="WhiteListAdd"/></a>
+              <a const:id="appointmentsWhiteListDelete" href="#">
+                  <img rsrc:src="remove-icon.png" label:title="Delete" id="WhiteListDelete" /></a>
+            </div>
+            
+            <label id="calendarCategoriesLabel"><var:string label:value="Categories"/></label>
+            <div id="calendarCategoriesListWrapper" class="listWrapper">
+              <table class="categoriesList" cellspacing="0">
+                <thead>
+                  <tr class="tableview">
+                    <th const:class="tbtv_headercell" const:id="nameTableHeader">
+                      <var:string label:value="Name"/></th>
+                    <th const:class="tbtv_headercell" const:id="colorTableHeader">
+                      <var:string label:value="Color"/></th>
+                  </tr></thead>
                 <tbody>
                   <var:foreach list="calendarCategoryList" item="category">
-                    <tr const:class="categoryListRow"
-                      ><td const:class="categoryListCell"
-                        ><var:string var:value="category"/></td
-                        ><td const:class="categoryListCell"
-                        ><div const:class="colorBox" var:data-color="categoryColor"><entity name="nbsp"/></div></td
-                        ></tr>
+                    <tr const:class="categoryListRow">
+                      <td const:class="categoryListCell">
+                        <var:string var:value="category"/></td>
+                      <td const:class="categoryListCell">
+                        <div const:class="colorBox" var:data-color="categoryColor"><entity name="nbsp"/></div></td>
+                    </tr>
                   </var:foreach>
                 </tbody>
               </table>
@@ -246,8 +279,8 @@
                 <span><img rsrc:src="remove-icon.png" label:title="Delete" />
                 </span></a>
             </div>
-            <input type="hidden" const:id="calendarCategoriesValue" 
-              const:name="calendarCategoriesValue" var:value="calendarCategoriesValue"/>
+            <input type="hidden" const:id="calendarCategoriesValue"
+            const:name="calendarCategoriesValue" var:value="calendarCategoriesValue"/>
           </div>
         </var:if>
         <div id="contactsOptionsView" class="tab">
@@ -258,14 +291,14 @@
                 <tr class="tableview"
                   ><th const:class="tbtv_headercell" const:id="nameTableHeader"
                     ><var:string label:value="Name"/></th
-                    ></tr
-                  ></thead>
+                  ></tr
+                ></thead>
               <tbody>
                 <var:foreach list="contactsCategoryList" item="category">
                   <tr const:class="categoryListRow"
                     ><td const:class="categoryListCell"
                       ><var:string var:value="category"/></td
-                      ></tr>
+                    ></tr>
                 </var:foreach>
               </tbody>
             </table>
@@ -278,135 +311,135 @@
               <span><img rsrc:src="remove-icon.png" label:title="Delete" />
               </span></a>
           </div>
-          <input type="hidden" const:id="contactsCategoriesValue" 
-            const:name="contactsCategoriesValue" var:value="contactsCategoriesValue"/>
+          <input type="hidden" const:id="contactsCategoriesValue"
+          const:name="contactsCategoriesValue" var:value="contactsCategoriesValue"/>
         </div>
         <var:if condition="userHasMailAccess">
           <div id="mailOptionsView" class="tab">
             <dl class="dl-horizontal">
               <dt></dt>
-              <dd><input type="checkbox" 
-                    const:name="subscribedFoldersOnly"
-                    const:id="subscribedFoldersOnly"
-                    var:checked="showSubscribedFoldersOnly" />
-                  <var:string label:value="Show subscribed mailboxes only"/></dd>
-              <dt></dt>
-              <dd><input type="checkbox" 
-                    const:name="sortByThreads"
-                    const:id="sortByThreads"
-                    var:checked="sortByThreads" />
-                  <var:string label:value="Sort messages by threads"/></dd>
               <dd><input type="checkbox"
-                    const:name="addOutgoingAddresses"
-                    const:id="addOutgoingAddresses"
-                    var:checked="addOutgoingAddresses"
-                    onChange = "onAddOutgoingAddressesCheck(this);"/>
-                    <var:string label:value="When sending mail, add unknown recipients to my"/><br/>
-                    <var:popup list="addressBookList" item="item"
-                         const:id="addressBookList"
-                         const:name="addressBookList"
-                         string="itemAddressBookText" selection="userAddressBook"/></dd>
+                const:name="subscribedFoldersOnly"
+                const:id="subscribedFoldersOnly"
+                var:checked="showSubscribedFoldersOnly" />
+                <var:string label:value="Show subscribed mailboxes only"/></dd>
+              <dt></dt>
+              <dd><input type="checkbox"
+                const:name="sortByThreads"
+                const:id="sortByThreads"
+                var:checked="sortByThreads" />
+                <var:string label:value="Sort messages by threads"/></dd>
+              <dd><input type="checkbox"
+                const:name="addOutgoingAddresses"
+                const:id="addOutgoingAddresses"
+                var:checked="addOutgoingAddresses"
+                onChange = "onAddOutgoingAddressesCheck(this);"/>
+                <var:string label:value="When sending mail, add unknown recipients to my"/><br/>
+                <var:popup list="addressBookList" item="item"
+                const:id="addressBookList"
+                const:name="addressBookList"
+                string="itemAddressBookText" selection="userAddressBook"/></dd>
               <dt></dt>
               <dt><var:string label:value="Check for new mail:"/></dt>
               <dd><var:popup list="messageCheckList" item="item"
-                    const:id="messageCheck"
-                    const:name="messageCheck"
-                    string="itemMessageCheckText" selection="userMessageCheck"/></dd>
+                const:id="messageCheck"
+                const:name="messageCheck"
+                string="itemMessageCheckText" selection="userMessageCheck"/></dd>
               <dt><var:string label:value="Forward messages:"/></dt>
               <dd><var:popup list="messageForwardingList" item="item"
-                    const:id="messageForwarding"
-                    const:name="messageForwarding"
-                    string="itemMessageForwardingText"
-                    selection="userMessageForwarding"/></dd>
+                const:id="messageForwarding"
+                const:name="messageForwarding"
+                string="itemMessageForwardingText"
+                selection="userMessageForwarding"/></dd>
               <dt><var:string label:value="When replying to a message:"/></dt>
               <dd><var:popup list="replyPlacementList" item="item"
-                    const:id="replyPlacementList"
-                    const:name="replyPlacementList"
-                    string="itemReplyPlacementText"
-                    selection="userReplyPlacement"/></dd>
+                const:id="replyPlacementList"
+                const:name="replyPlacementList"
+                string="itemReplyPlacementText"
+                selection="userReplyPlacement"/></dd>
               <dt><var:string label:value="And place my signature"/></dt>
               <dd><var:popup list="signaturePlacementList" item="item"
-                    const:id="signaturePlacementList"
-                    const:name="signaturePlacementList"
-                    string="itemSignaturePlacementText"
-                    selection="userSignaturePlacement"/></dd>
+                const:id="signaturePlacementList"
+                const:name="signaturePlacementList"
+                string="itemSignaturePlacementText"
+                selection="userSignaturePlacement"/></dd>
               <dt><var:string label:value="Compose messages in"/></dt>
               <dd><var:popup list="composeMessagesType" item="item"
-                    const:id="composeMessagesType"
-                    const:name="composeMessagesType"
-                    string="itemComposeMessagesText"
-                    selection="userComposeMessagesType"/></dd>
+                const:id="composeMessagesType"
+                const:name="composeMessagesType"
+                string="itemComposeMessagesText"
+                selection="userComposeMessagesType"/></dd>
               <dt><var:string label:value="Display remote inline images"/></dt>
               <dd><var:popup list="displayRemoteInlineImages" item="item"
-                    const:id="displayRemoteInlineImages"
-                    const:name="displayRemoteInlineImages"
-                    string="itemDisplayRemoteInlineImagesText"
-                    selection="userDisplayRemoteInlineImages"/></dd>
+                const:id="displayRemoteInlineImages"
+                const:name="displayRemoteInlineImages"
+                string="itemDisplayRemoteInlineImagesText"
+                selection="userDisplayRemoteInlineImages"/></dd>
             </dl>
-
+            
             <div class="tabsContainer" id="mailOptionsTabs">
               <ul>
                 <var:if condition="isSieveScriptsEnabled"
-                ><li target="mailFiltersView"><span><var:string
-                      label:value="Filters"/></span></li
-                ></var:if>
+                  ><li target="mailFiltersView"><span><var:string
+                    label:value="Filters"/></span></li
+                  ></var:if>
                 <li target="mailLabelsView"><span><var:string
-                      label:value="Labels"/></span></li>
+                  label:value="Labels"/></span></li>
               </ul>
               <div class="tabs">
                 <var:if condition="isSieveScriptsEnabled"
-                ><div id="mailFiltersView" class="tab">
-                  <script type="text/javascript">
-                    var sieveCapabilities = <var:string value="sieveCapabilities" const:escapeHTML="NO"/>;
-                  </script>
-                  <div id="filtersListWrapper" class="listWrapper">
-                    <table id="filtersList" cellspacing="0">
-                      <thead>
-                        <tr class="tableview">
-                          <th const:class="tbtv_headercell" const:id="nameTableHeader"
+                  ><div id="mailFiltersView" class="tab">
+                    <script type="text/javascript">
+                      var sieveCapabilities = <var:string value="sieveCapabilities" const:escapeHTML="NO"/>;
+                    </script>
+                    <div id="filtersListWrapper" class="listWrapper">
+                      <table id="filtersList" cellspacing="0">
+                        <thead>
+                          <tr class="tableview">
+                            <th const:class="tbtv_headercell" const:id="nameTableHeader"
                               ><var:string label:value="Name" /></th>
-                          <th const:class="tbtv_headercell" const:id="activeTableHeader"
+                            <th const:class="tbtv_headercell" const:id="activeTableHeader"
                               ><var:string label:value="Active" /></th>
-                        </tr>
-                      </thead>
-                      <tbody><!--space --></tbody>
-                    </table>
-                    <input type="hidden" const:name="sieveFilters" const:id="sieveFilters"
-                           var:value="sieveFiltersValue"/>
-                  </div><!-- #filtersListWrapper -->
-                  <div class="bottomToolbar">
-                    <a const:id="filterAdd" class="bottomButton" href="#">
-                      <span><img rsrc:src="add-icon.png" label:title="Add" /></span></a>
-                    <a const:id="filterDelete" class="bottomButton" href="#">
-                      <span><img rsrc:src="remove-icon.png" label:title="Delete" /></span></a>
-                    <a const:id="filterMoveUp" class="bottomButton" href="#">
-                      <span><img rsrc:src="up-icon.png" label:title="Move Up" /></span></a>
-                    <a const:id="filterMoveDown" class="bottomButton" href="#">
-                      <span><img rsrc:src="down-icon.png" label:title="Move Down" /></span></a>
-                  </div><!-- .bottomToolbar -->
-                </div
-                ></var:if><!-- #mailFiltersView -->
-
+                          </tr>
+                        </thead>
+                        <tbody><!--space --></tbody>
+                      </table>
+                      <input type="hidden" const:name="sieveFilters" const:id="sieveFilters"
+                      var:value="sieveFiltersValue"/>
+                    </div><!-- #filtersListWrapper -->
+                    <div class="bottomToolbar">
+                      <a const:id="filterAdd" class="bottomButton" href="#">
+                        <span><img rsrc:src="add-icon.png" label:title="Add" /></span></a>
+                      <a const:id="filterDelete" class="bottomButton" href="#">
+                        <span><img rsrc:src="remove-icon.png" label:title="Delete" /></span></a>
+                      <a const:id="filterMoveUp" class="bottomButton" href="#">
+                        <span><img rsrc:src="up-icon.png" label:title="Move Up" /></span></a>
+                      <a const:id="filterMoveDown" class="bottomButton" href="#">
+                        <span><img rsrc:src="down-icon.png" label:title="Move Down" /></span></a>
+                    </div><!-- .bottomToolbar -->
+                    </div
+                  ></var:if><!-- #mailFiltersView -->
+                
                 <div id="mailLabelsView" class="tab">
                   <div id="mailLabelsListWrapper" class="listWrapper">
                     <table id="labelsList" cellspacing="0">
                       <thead>
                         <tr class="tableview">
                           <th const:class="tbtv_headercell" const:id="labelTableHeader"
-                              ><var:string label:value="Label"/></th>
+                            ><var:string label:value="Label"/></th>
                           <th const:class="tbtv_headercell" const:id="colorTableHeader"
-                              ><var:string label:value="Color"/></th>
+                            ><var:string label:value="Color"/></th>
                         </tr>
                       </thead>
                       <tbody>
                         <var:foreach list="mailLabelList" item="label"
-                        ><tr var:data-name="label.name" const:class="labelListRow">
-                          <td const:class="labelListCell"
+                          ><tr var:data-name="label.name" const:class="labelListRow">
+                            <td const:class="labelListCell"
                               ><var:string var:value="label.label"/></td>
-                          <td const:class="labelListCell">
-                            <div const:class="colorBox" var:data-color="label.color"><entity name="nbsp"/></div>
-                          </td>
-                        </tr>
+                            <td const:class="labelListCell">
+                              <div const:class="colorBox" var:data-color="label.color"><entity name="nbsp"/></div>
+                            </td>
+                          </tr>
                         </var:foreach>
                       </tbody>
                     </table>
@@ -414,33 +447,33 @@
                   <div class="bottomToolbar">
                     <a const:id="mailLabelAdd" class="bottomButton" href="#">
                       <span><img rsrc:src="add-icon.png" label:title="Add" />
-                    </span></a>
+                      </span></a>
                     <a const:id="mailLabelDelete" class="bottomButton" href="#">
                       <span><img rsrc:src="remove-icon.png" label:title="Delete" />
-                    </span></a>
+                      </span></a>
                   </div><!-- .bottomToolbar -->
                   <input type="hidden" const:id="mailLabelsValue"
-                         const:name="mailLabelsValue" var:value="mailLabelsValue"/>
+                  const:name="mailLabelsValue" var:value="mailLabelsValue"/>
                 </div><!-- #mailLabelsView -->
               </div><!-- .tabs -->
             </div><!-- #mailOptionsTabs -->
           </div><!-- #mailOptionsView -->
-
+          
           <div id="mailAccountsView" class="tab">
             <input type="hidden" const:name="mailAccountsJSON" const:id="mailAccountsJSON"
-              var:value="mailAccounts"/>
+            var:value="mailAccounts"/>
             <div id="mailAccountsListWrapper" class="listWrapper"
-                 ><ul id="mailAccountsList"
-                      ><!-- space --></ul
-                      ></div>
+              ><ul id="mailAccountsList"
+                ><!-- space --></ul
+              ></div>
             <var:if condition="mailAuxiliaryUserAccountsEnabled">
               <div const:id="mailAccountsToolbar" class="bottomToolbar">
                 <a const:id="mailAccountAdd" class="bottomButton" href="#">
                   <span><img rsrc:src="add-icon.png" label:title="Add" />
-                </span></a>
+                  </span></a>
                 <a const:id="mailAccountDelete" class="bottomButton" href="#">
                   <span><img rsrc:src="remove-icon.png" label:title="Delete" />
-                </span></a>
+                  </span></a>
               </div>
             </var:if>
             <div id="mailAccountEditor">
@@ -448,15 +481,15 @@
                 <dl class="dl-horizontal">
                   <dt><var:string label:value="Server Name:"/></dt>
                   <dd><input const:name="serverName" const:id="serverName" type="text" const:value=""/>
-                      <var:string label:value="Port:"/>
-                      <input const:name="port" const:id="port" type="text" const:value=""/></dd>
+                    <var:string label:value="Port:"/>
+                    <input const:name="port" const:id="port" type="text" const:value=""/></dd>
                   <dt><var:string label:value="Encryption:"/></dt>
                   <dd><input const:name="encryption" type="radio" const:value="none"/>
-                      <var:string label:value="None"/>
-                      <input const:name="encryption" type="radio" const:value="ssl"/>
-                      <var:string label:value="SSL"/>
-                      <input const:name="encryption" type="radio" const:value="tls"/>
-                      <var:string label:value="TLS"/></dd>
+                    <var:string label:value="None"/>
+                    <input const:name="encryption" type="radio" const:value="ssl"/>
+                    <var:string label:value="SSL"/>
+                    <input const:name="encryption" type="radio" const:value="tls"/>
+                    <var:string label:value="TLS"/></dd>
                   <dt><var:string label:value="User Name:"/></dt>
                   <dd><input const:name="userName" const:id="userName" type="text" const:value=""/></dd>
                   <dt><var:string label:value="Password:"/></dt>
@@ -464,11 +497,11 @@
                 </dl>
                 <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">
                 <dl class="dl-horizontal">
                   <dt><var:string label:value="Full Name:"/></dt>
@@ -481,40 +514,40 @@
                   <dd><span id="actSignature"><!--space --></span></dd>
                 </dl>
               </fieldset>
-
+              
               <fieldset const:id="returnReceiptsInfo">
                 <var:string
-                    label:value="When I receive a request for a return receipt:"
-                    /><br/>
+                label:value="When I receive a request for a return receipt:"
+                /><br/>
                 <label><input const:name="receipt-action" const:id="receipt-action-ignore"
-                    type="radio" const:value="ignore"/>
+                  type="radio" const:value="ignore"/>
                   <var:string
-                    label:value="Never send a return receipt"/></label
-                  ><br/>
+                  label:value="Never send a return receipt"/></label
+                ><br/>
                 <label><input const:name="receipt-action" const:id="receipt-action-allow"
-                    type="radio" const:value="allow"/>
+                  type="radio" const:value="allow"/>
                   <var:string
-                    label:value="Allow return receipts for some messages"/></label
-                  ><br/>
+                  label:value="Allow return receipts for some messages"/></label
+                ><br/>
                 <div id="receiptOptions">
                   <var:string
-                    label:value="If I'm not in the To or Cc of the message:"/>
+                  label:value="If I'm not in the To or Cc of the message:"/>
                   <select name="receipt-non-recipient-action" id="receipt-non-recipient-action">
                     <option const:value="ignore"><var:string label:value="Never send"/></option>
                     <option const:value="send"><var:string label:value="Always send"/></option>
                     <option const:value="ask"><var:string label:value="Ask me"/></option>
                   </select><br/>
-
+                  
                   <var:string
-                    label:value="If the sender is outside my domain:"/>
+                  label:value="If the sender is outside my domain:"/>
                   <select name="receipt-outside-domain-action" id="receipt-outside-domain-action">
                     <option const:value="ignore"><var:string label:value="Never send"/></option>
                     <option const:value="send"><var:string label:value="Always send"/></option>
                     <option const:value="ask"><var:string label:value="Ask me"/></option>
                   </select><br/>
-
+                  
                   <var:string
-                    label:value="In all other cases:"/>
+                  label:value="In all other cases:"/>
                   <select name="receipt-any-action" id="receipt-any-action">
                     <option const:value="ignore"><var:string label:value="Never send"/></option>
                     <option const:value="send"><var:string label:value="Always send"/></option>
@@ -524,79 +557,79 @@
               </fieldset>
             </div>
           </div>
-
+          
           <var:if condition="isVacationEnabled">
             <div id="vacationView" class="tab">
-              <label><input type="checkbox" 
-                  const:name="enableVacation"
-                  const:id="enableVacation"
-                  var:checked="enableVacation" />
+              <label><input type="checkbox"
+                const:name="enableVacation"
+                const:id="enableVacation"
+                var:checked="enableVacation" />
                 <var:string label:value="Enable vacation auto reply"/></label>
               <div id="vacation">
                 <label><var:string label:value="Auto reply message :"/><br/>
                   <textarea const:name="autoReplyText"
-                    const:id="autoReplyText"
-                    var:value="autoReplyText"/>
+                  const:id="autoReplyText"
+                  var:value="autoReplyText"/>
                 </label><br/>
                 
                 <label><var:string label:value="Email addresses (separated by commas) :"/><br/>
                   <input type="hidden"
-                    const:id="defaultEmailAddresses"
-                    var:value="defaultEmailAddresses" />
+                  const:id="defaultEmailAddresses"
+                  var:value="defaultEmailAddresses" />
                   <textarea const:name="autoReplyEmailAddresses"
-                    const:id="autoReplyEmailAddresses"
-                    var:value="autoReplyEmailAddresses" /><br/>
+                  const:id="autoReplyEmailAddresses"
+                  var:value="autoReplyEmailAddresses" /><br/>
                   <span><a href="#" class="button" id="addDefaultEmailAddresses"><span>
-                        <var:string label:value="Add default email addresses" /></span></a>
+                    <var:string label:value="Add default email addresses" /></span></a>
                   </span>
                 </label><br/>
-
-                <label><var:string label:value="Days between responses :"/> 
+                
+                <label><var:string label:value="Days between responses :"/>
                   <var:popup list="daysBetweenResponsesList" item="item"
-                    const:id="daysBetweenResponsesList"
-                    const:name="daysBetweenResponsesList"
-                    string="item" 
-                    selection="daysBetweenResponses" /></label><br/>
-
-                <label><input type="checkbox" 
-                    const:name="ignoreLists"
-                    const:id="ignoreLists"
-                    var:checked="ignoreLists" />
+                  const:id="daysBetweenResponsesList"
+                  const:name="daysBetweenResponsesList"
+                  string="item"
+                  selection="daysBetweenResponses" /></label><br/>
+                
+                <label><input type="checkbox"
+                  const:name="ignoreLists"
+                  const:id="ignoreLists"
+                  var:checked="ignoreLists" />
                   <var:string label:value="Do not send responses to mailing lists" /></label><br/>
-
+                
                 <label class="timeDate"><input var:checked="enableVacationEndDate"
-                    const:name="enableVacationEndDate" const:id="enableVacationEndDate" type="checkbox" class="checkBox"
-                /><var:string label:value="Disable auto reply on" /></label><var:component className="UIxTimeDateControl"
-                    const:displayTimeControl="0"
-                    var:disabled="disableVacationEndDate"
-                    const:controlID="vacationEndDate"
-                    date="vacationEndDate"
-                    const:dayStartHour="0"
-                    const:dayEndHour="23"
+                  const:name="enableVacationEndDate" const:id="enableVacationEndDate" type="checkbox" class="checkBox"
+                  /><var:string label:value="Disable auto reply on" /></label><var:component className="UIxTimeDateControl"
+                const:displayTimeControl="0"
+                var:disabled="disableVacationEndDate"
+                const:controlID="vacationEndDate"
+                date="vacationEndDate"
+                const:dayStartHour="0"
+                const:dayEndHour="23"
                 />
-
+                
               </div>
             </div>
-          </var:if
-            ><var:if condition="isForwardEnabled">
+            </var:if
+          ><var:if condition="isForwardEnabled">
             <div id="forwardView" class="tab">
-              <label><input type="checkbox" 
-                  const:name="enableForward"
-                  const:id="enableForward"
-                  var:checked="enableForward" />
+              <label><input type="checkbox"
+                const:name="enableForward"
+                const:id="enableForward"
+                var:checked="enableForward" />
                 <var:string label:value="Forward incoming messages"/></label><br/>
               
               <div id="forward">
                 <label><var:string label:value="Email addresses (separated by commas) :"/><br/>
                   <textarea const:name="forwardAddress"
-                    const:id="forwardAddress"
-                    var:value="forwardAddress" />
+                  const:id="forwardAddress"
+                  var:value="forwardAddress" />
                 </label><br/>
-
-                <label><input type="checkbox" 
-                    const:name="forwardKeepCopy"
-                    const:id="forwardKeepCopy"
-                    var:checked="forwardKeepCopy" />
+                
+                <label><input type="checkbox"
+                  const:name="forwardKeepCopy"
+                  const:id="forwardKeepCopy"
+                  var:checked="forwardKeepCopy" />
                   <var:string label:value="Keep a copy" /></label><br/>
               </div>
             </div>
@@ -605,23 +638,23 @@
         <var:if condition="shouldDisplayPasswordChange">
           <div id="passwordView" class="tab">
             <p id="passwordFields"><label><var:string label:value="New password:"
-                  /><input const:id="newPasswordField" class="textField"
-                  type="password" const:value=""/></label><br/>
-              <label><var:string label:value="Confirmation:"
-                  /><input const:id="newPasswordConfirmationField" class="textField"
-                  type="password" const:value=""/></label><br/>
-              <a href="#" class="button" id="changePasswordBtn"
-                ><span><var:string label:value="Change"/></span></a><br/>
+              /><input const:id="newPasswordField" class="textField"
+              type="password" const:value=""/></label><br/>
+            <label><var:string label:value="Confirmation:"
+              /><input const:id="newPasswordConfirmationField" class="textField"
+              type="password" const:value=""/></label><br/>
+            <a href="#" class="button" id="changePasswordBtn"
+              ><span><var:string label:value="Change"/></span></a><br/>
             </p>
             <p id="passwordError"><!-- space --></p>
           </div>
-        </var:if
-          ><var:if condition="shouldDisplayAdditionalPreferences"
+          </var:if
+        ><var:if condition="shouldDisplayAdditionalPreferences"
           ><div id="additionalView" class="tab">
             <var:component className="UIxAdditionalPreferences"/>
           </div></var:if>
         <input type="hidden" id="hasChanged" name="hasChanged"
-          var:value="hasChanged"/>
+        var:value="hasChanged"/>
       </div>
     </div>
   </form>
diff --git a/UI/WebServerResources/SOGoAutoCompletion.js b/UI/WebServerResources/SOGoAutoCompletion.js
index 45cf10424..0434f2175 100644
--- a/UI/WebServerResources/SOGoAutoCompletion.js
+++ b/UI/WebServerResources/SOGoAutoCompletion.js
@@ -2,277 +2,384 @@
 
 //  NOTE: The popup menu with id "contactsMenu" must exist before
 //  using this interface.
-// 
+//
 //  This interface fires two events:
 //   - autocompletion:changed : fired when a new contact is selected
 //   - autocompletion:changedlist : fired when a new list is selected
 //
 var SOGoAutoCompletionInterface = {
-
-    // Attributes that could be changed from the object
-    // inheriting the inteface
-    uidField: "c_name",
-    addressBook: null,
-    excludeGroups: false,
-    excludeLists: false,
-
-    // Internal attributes
-    animationParent: null,
-    selectedIndex: -1,
-    delay: 0.750,
-    delayedSearch: false,
-    menu: null,
-
-    bind: function () {
-        this.menu = $('contactsMenu');
-        this.writeAttribute("autocomplete", "off");
-        this.writeAttribute("container", null);
-        this.confirmedValue = null;
-        this.observe("keydown", this.onKeydown.bindAsEventListener(this));
-        this.observe("blur", this.onBlur.bindAsEventListener(this));
-    },
-    
-    onKeydown: function (event) {
-        if (event.ctrlKey || event.metaKey) {
-            this.focussed = true;
-            return;
-        }
-        if (event.keyCode == Event.KEY_TAB) {
-            if (this.confirmedValue)
-                this.value = this.confirmedValue;
-            else
-                this.writeAttribute("uid", null);
-             if (document.currentPopupMenu)
-                hideMenu(document.currentPopupMenu);
-        }
-        else if (event.keyCode == 0
-                 || event.keyCode == Event.KEY_BACKSPACE
-                 || event.keyCode == Event.KEY_DELETE
-                 || event.keyCode == 32  // Space
-                 || event.keyCode > 47) {
-            this.confirmedValue = null;
-            this.selectedIndex = -1;
-            if (this.delayedSearch)
-                window.clearTimeout(this.delayedSearch);
-            this.delayedSearch = this.performSearch.delay(this.delay, this);
-        }
-        else if (event.keyCode == Event.KEY_RETURN) {
-            preventDefault(event);
-            if (this.confirmedValue)
-                this.value = this.confirmedValue;
-            else
-                this.writeAttribute("uid", null);
-            if (document.currentPopupMenu)
-                hideMenu(document.currentPopupMenu);
-            this.selectedIndex = -1;
-            if (this.readAttribute("container")) {
-                this.confirmedValue = null;
-                this.fire("autocompletion:changedlist", this.readAttribute("container"));
-            }
-            else
-                this.fire("autocompletion:changed", event.keyCode);
-        }
-        else if (this.menu.getStyle('visibility') == 'visible') {
-            if (event.keyCode == Event.KEY_UP) { // Up arrow
-                if (this.selectedIndex > 0) {
-                    var contacts = this.menu.select("li");
-                    contacts[this.selectedIndex--].removeClassName("selected");
-                    this.value = contacts[this.selectedIndex].readAttribute("address");
-                    this.confirmedValue = this.value;
-                    this.writeAttribute("uid", contacts[this.selectedIndex].readAttribute("uid"));
-                    contacts[this.selectedIndex].addClassName("selected");
-                    var container = contacts[this.selectedIndex].readAttribute("container");
-                    if (container)
-                        this.writeAttribute("container", container);
-                }
-            }
-            else if (event.keyCode == Event.KEY_DOWN) { // Down arrow
-                var contacts = this.menu.select("li");
-                if (contacts.size() - 1 > this.selectedIndex) {
-                    if (this.selectedIndex >= 0)
-                        contacts[this.selectedIndex].removeClassName("selected");
-                    this.selectedIndex++;
-                    this.value = contacts[this.selectedIndex].readAttribute("address");
-                    this.confirmedValue = this.value;
-                    this.writeAttribute("uid", contacts[this.selectedIndex].readAttribute("uid"));
-                    contacts[this.selectedIndex].addClassName("selected");
-                    var container = contacts[this.selectedIndex].readAttribute("container");
-                    if (container)
-                        this.writeAttribute("container", container);
-                }
-            }
-        }
-    },
-
-    onBlur: function (event) {
-        if (this.delayedSearch)
-            window.clearTimeout(this.delayedSearch);
-        if (this.confirmedValue) {
-            this.value = this.confirmedValue;
-            if (this.readAttribute("container"))
-                this.fire("autocompletion:changedlist", this.readAttribute("container"));
-            else
-                this.fire("autocompletion:changed", event.keyCode);
-        }
-        else
-            this.writeAttribute("uid", null);
-    },
-
-    performSearch: function (input) {
-        // Perform address completion
-        if (document.contactLookupAjaxRequest) {
-            // Abort any pending request
-            document.contactLookupAjaxRequest.aborted = true;
-            document.contactLookupAjaxRequest.abort();
-        }
-        if (input.value.trim().length > minimumSearchLength) {
-            var urlstr = UserFolderURL + "Contacts/";
-            if (input.addressBook)
-                urlstr += input.addressBook + "/contact";
-            else
-                urlstr += "allContact";
-            urlstr += "Search?search=" + encodeURIComponent(input.value);
-            if (input.excludeGroups)
-                urlstr += "&excludeGroups=1";
-            if (input.excludeLists)
-                urlstr += "&excludeLists=1";
-            if (input.animationParent)
-                startAnimation(input.animationParent);
-            document.contactLookupAjaxRequest =
-                triggerAjaxRequest(urlstr, input.performSearchCallback.bind(input), input);
-        }
-        else {
-            if (document.currentPopupMenu)
-                hideMenu(document.currentPopupMenu);
-        }
-    },
-
-    performSearchCallback: function (http) {
-        if (http.readyState == 4) {
-            var list = this.menu.down("ul");
-
-            var input = http.callbackData;
-
-            if (http.status == 200) {
-                var start = input.value.length;
-                var data = http.responseText.evalJSON(true);
-
-                if (data.contacts.length > 1) {
-                    list.select("li").each(function(item) {
-                            item.stopObserving("mousedown");
-                            item.remove();
-                        });
-
-                    // Populate popup menu
-                    for (var i = 0; i < data.contacts.length; i++) {
-                        var contact = data.contacts[i];
-                        var completeEmail = contact["c_cn"];
-                        var uid = "" + contact[this.uidField];
-                        var c_name = "" + contact['c_name'];
-                        if (contact["c_mail"])
-                            completeEmail += " <" + contact["c_mail"] + ">";
-                        var node = new Element('li', { 'address': completeEmail,
-                                                       'uid': uid });
-                        var matchPosition = completeEmail.toLowerCase().indexOf(data.searchText.toLowerCase());
-                        if (matchPosition > -1) {
-                            var matchBefore = completeEmail.substring(0, matchPosition);
-                            var matchText = completeEmail.substring(matchPosition, matchPosition + data.searchText.length);
-                            var matchAfter = completeEmail.substring(matchPosition + data.searchText.length);
-                            node.appendChild(document.createTextNode(matchBefore));
-                            node.appendChild(new Element('strong').update(matchText));
-                            node.appendChild(document.createTextNode(matchAfter));
-                        }
-                        else {
-                            node.appendChild(document.createTextNode(completeEmail));
-                        }
-                        list.appendChild(node);
-                        if (c_name.endsWith(".vlf")) {
-                            // Keep track of list containers
-                            node.writeAttribute("container", contact['container']);
-                        }
-                        if (contact["contactInfo"])
-                            node.appendChild(document.createTextNode(" (" + contact["contactInfo"] + ")"));
-                        $(node).observe("mousedown", this.onAddressResultClick.bindAsEventListener(this));
-                    }
-
-                    // Show popup menu
-                    var offsetScroll = Element.cumulativeScrollOffset(input);
-                    var offset = Element.positionedOffset(input);
-                    if ($(document.body).hasClassName("popup") && typeof initPopupMailer == 'undefined')
-                    // Hack for some situations where the offset must be computed differently
-                         offset = Element.cumulativeOffset(input);
-                    var top = offset.top - offsetScroll.top + node.offsetHeight + 3;
-                    var height = 'auto';
-                    var heightDiff = window.height() - offset[1];
-                    var nodeHeight = node.getHeight();
-
-                    if ((data.contacts.length * nodeHeight) > heightDiff)
-                        // Limit the size of the popup to the window height, minus 12 pixels
-                        height = parseInt(heightDiff/nodeHeight) * nodeHeight - 12 + 'px';
-
-                    this.menu.setStyle({ top: top + "px",
-                                left: offset[0] + "px",
-                                height: height,
-                                maxWidth: (window.width() - offset[0] - 12) + "px",
-                                visibility: "visible" });
-                    this.menu.scrollTop = 0;
-
-                    document.currentPopupMenu = this.menu;
-                    $(document.body).stopObserving("click");
-                    $(document.body).observe("click", onBodyClickMenuHandler);
-                }
-                else {
-                    if (document.currentPopupMenu)
-                        hideMenu(document.currentPopupMenu);
-
-                    if (data.contacts.length == 1) {
-                        // Single result
-                        var contact = data.contacts[0];
-                        var uid = "" + contact[this.uidField];
-                        var c_name = "" + contact['c_name'];
-                        input.writeAttribute("uid", uid);
-                        if (c_name.endsWith(".vlf")) {
-                            this.writeAttribute("container", contact['container']);
-                        }
-                        var completeEmail = contact["c_cn"];
-                        if (contact["c_mail"])
-                            completeEmail += " <" + contact["c_mail"] + ">";
-                        if (contact["c_cn"].substring(0, input.value.length).toUpperCase()
-                            == input.value.toUpperCase())
-                            input.value = completeEmail;
-                        else
-                            // The result matches email address, not user name
-                            input.value += ' >> ' + completeEmail;
-                        input.confirmedValue = completeEmail;
-                        
-                        var end = input.value.length;
-                        $(input).selectText(start, end);
-                        
-                        this.selectedIndex = -1;
-                    }
-                }
-            }
-            else
-                if (document.currentPopupMenu)
-                    hideMenu(document.currentPopupMenu);
-            document.contactLookupAjaxRequest = null;
-        }
-    },
-
-    onAddressResultClick: function(event) {
-        var e = Event.element(event);
-        if (e.tagName != 'LI')
-            e = e.up('LI');
-        if (e) {
-            preventDefault(event);
-            this.value = e.readAttribute("address");
-            this.writeAttribute("uid", e.readAttribute("uid"));
-            if (e.readAttribute("container"))
-                this.fire("autocompletion:changedlist", e.readAttribute("container"));
-            else {
-                this.confirmedValue = this.value;
-                this.fire("autocompletion:changed", Event.KEY_RETURN);
-            }
-        }
+  
+  // Attributes that could be changed from the object
+  // inheriting the inteface
+uidField: "c_name",
+addressBook: null,
+SOGoUsersSearch: false,
+excludeGroups: false,
+excludeLists: false,
+  
+  // Internal attributes
+animationParent: null,
+selectedIndex: -1,
+delay: 0.750,
+delayedSearch: false,
+menu: null,
+  
+bind: function () {
+  this.menu = $('contactsMenu');
+  this.writeAttribute("autocomplete", "off");
+  this.writeAttribute("container", null);
+  this.confirmedValue = null;
+  this.observe("keydown", this.onKeydown.bindAsEventListener(this));
+  this.observe("blur", this.onBlur.bindAsEventListener(this));
+},
+  
+onKeydown: function (event) {
+  if (event.ctrlKey || event.metaKey) {
+    this.focussed = true;
+    return;
+  }
+  if (event.keyCode == Event.KEY_TAB) {
+    if (this.confirmedValue)
+      this.value = this.confirmedValue;
+    else
+      this.writeAttribute("uid", null);
+    if (document.currentPopupMenu)
+      hideMenu(document.currentPopupMenu);
+  }
+  else if (event.keyCode == 0
+           || event.keyCode == Event.KEY_BACKSPACE
+           || event.keyCode == Event.KEY_DELETE
+           || event.keyCode == 32  // Space
+           || event.keyCode > 47) {
+    this.confirmedValue = null;
+    this.selectedIndex = -1;
+    if (this.delayedSearch)
+      window.clearTimeout(this.delayedSearch);
+    this.delayedSearch = this.performSearch.delay(this.delay, this);
+  }
+  else if (event.keyCode == Event.KEY_RETURN) {
+    preventDefault(event);
+    if (this.confirmedValue)
+      this.value = this.confirmedValue;
+    else
+      this.writeAttribute("uid", null);
+    if (document.currentPopupMenu)
+      hideMenu(document.currentPopupMenu);
+    this.selectedIndex = -1;
+    if (this.readAttribute("container")) {
+      this.confirmedValue = null;
+      this.fire("autocompletion:changedlist", this.readAttribute("container"));
     }
+    else
+      this.fire("autocompletion:changed", event.keyCode);
+  }
+  else if (this.menu.getStyle('visibility') == 'visible') {
+    if (event.keyCode == Event.KEY_UP) { // Up arrow
+      if (this.selectedIndex > 0) {
+        var contacts = this.menu.select("li");
+        contacts[this.selectedIndex--].removeClassName("selected");
+        this.value = contacts[this.selectedIndex].readAttribute("address");
+        this.confirmedValue = this.value;
+        this.writeAttribute("uid", contacts[this.selectedIndex].readAttribute("uid"));
+        contacts[this.selectedIndex].addClassName("selected");
+        var container = contacts[this.selectedIndex].readAttribute("container");
+        if (container)
+          this.writeAttribute("container", container);
+      }
+    }
+    else if (event.keyCode == Event.KEY_DOWN) { // Down arrow
+      var contacts = this.menu.select("li");
+      if (contacts.size() - 1 > this.selectedIndex) {
+        if (this.selectedIndex >= 0)
+          contacts[this.selectedIndex].removeClassName("selected");
+        this.selectedIndex++;
+        this.value = contacts[this.selectedIndex].readAttribute("address");
+        this.confirmedValue = this.value;
+        this.writeAttribute("uid", contacts[this.selectedIndex].readAttribute("uid"));
+        contacts[this.selectedIndex].addClassName("selected");
+        var container = contacts[this.selectedIndex].readAttribute("container");
+        if (container)
+          this.writeAttribute("container", container);
+      }
+    }
+  }
+},
+  
+onBlur: function (event) {
+  if (this.delayedSearch)
+    window.clearTimeout(this.delayedSearch);
+  if (this.confirmedValue) {
+    this.value = this.confirmedValue;
+    if (this.readAttribute("container"))
+      this.fire("autocompletion:changedlist", this.readAttribute("container"));
+    else
+      this.fire("autocompletion:changed", event.keyCode);
+  }
+  else
+    this.writeAttribute("uid", null);
+},
+  
+performSearch: function (input) {
+  // Perform address completion
+  if (document.contactLookupAjaxRequest) {
+    // Abort any pending request
+    document.contactLookupAjaxRequest.aborted = true;
+    document.contactLookupAjaxRequest.abort();
+  }
+  if (input.value.trim().length > minimumSearchLength) {
+    if (input.SOGoUsersSearch) {
+      var urlstr = UserFolderURL + "usersSearch?search=" + encodeURIComponent(input.value);
+      document.contactLookupAjaxRequest =
+        triggerAjaxRequest(urlstr, input.performUsersSearchCallback.bind(input), input);
+    }
+    else {
+      var urlstr = UserFolderURL + "Contacts/";
+      if (input.addressBook)
+        urlstr += input.addressBook + "/contact";
+      else
+        urlstr += "allContact";
+      urlstr += "Search?search=" + encodeURIComponent(input.value);
+      if (input.excludeGroups)
+        urlstr += "&excludeGroups=1";
+      if (input.excludeLists)
+        urlstr += "&excludeLists=1";
+      if (input.animationParent)
+        startAnimation(input.animationParent);
+      document.contactLookupAjaxRequest =
+      triggerAjaxRequest(urlstr, input.performSearchCallback.bind(input), input);
+    }
+  }
+  else {
+    if (document.currentPopupMenu)
+      hideMenu(document.currentPopupMenu);
+  }
+},
+  
+performSearchCallback: function (http) {
+  if (http.readyState == 4) {
+    var list = this.menu.down("ul");
+    
+    var input = http.callbackData;
+    
+    if (http.status == 200) {
+      var start = input.value.length;
+      var data = http.responseText.evalJSON(true);
+      
+      if (data.contacts.length > 1) {
+        list.select("li").each(function(item) {
+                               item.stopObserving("mousedown");
+                               item.remove();
+                               });
+        
+        // Populate popup menu
+        for (var i = 0; i < data.contacts.length; i++) {
+          var contact = data.contacts[i];
+          var completeEmail = contact["c_cn"];
+          var uid = "" + contact[this.uidField];
+          var c_name = "" + contact['c_name'];
+          if (contact["c_mail"])
+            completeEmail += " <" + contact["c_mail"] + ">";
+          var node = new Element('li', { 'address': completeEmail,
+                                 'uid': uid });
+          var matchPosition = completeEmail.toLowerCase().indexOf(data.searchText.toLowerCase());
+          if (matchPosition > -1) {
+            var matchBefore = completeEmail.substring(0, matchPosition);
+            var matchText = completeEmail.substring(matchPosition, matchPosition + data.searchText.length);
+            var matchAfter = completeEmail.substring(matchPosition + data.searchText.length);
+            node.appendChild(document.createTextNode(matchBefore));
+            node.appendChild(new Element('strong').update(matchText));
+            node.appendChild(document.createTextNode(matchAfter));
+          }
+          else {
+            node.appendChild(document.createTextNode(completeEmail));
+          }
+          list.appendChild(node);
+          if (c_name.endsWith(".vlf")) {
+            // Keep track of list containers
+            node.writeAttribute("container", contact['container']);
+          }
+          if (contact["contactInfo"])
+            node.appendChild(document.createTextNode(" (" + contact["contactInfo"] + ")"));
+          $(node).observe("mousedown", this.onAddressResultClick.bindAsEventListener(this));
+        }
+        
+        // Show popup menu
+        var offsetScroll = Element.cumulativeScrollOffset(input);
+        var offset = Element.positionedOffset(input);
+        if ($(document.body).hasClassName("popup") && typeof initPopupMailer == 'undefined')
+          // Hack for some situations where the offset must be computed differently
+          offset = Element.cumulativeOffset(input);
+        var top = offset.top - offsetScroll.top + node.offsetHeight + 3;
+        var height = 'auto';
+        var heightDiff = window.height() - offset[1];
+        var nodeHeight = node.getHeight();
+        
+        if ((data.contacts.length * nodeHeight) > heightDiff)
+          // Limit the size of the popup to the window height, minus 12 pixels
+          height = parseInt(heightDiff/nodeHeight) * nodeHeight - 12 + 'px';
+        
+        this.menu.setStyle({ top: top + "px",
+                           left: offset[0] + "px",
+                           height: height,
+                           maxWidth: (window.width() - offset[0] - 12) + "px",
+                           visibility: "visible" });
+        this.menu.scrollTop = 0;
+        
+        document.currentPopupMenu = this.menu;
+        $(document.body).stopObserving("click");
+        $(document.body).observe("click", onBodyClickMenuHandler);
+      }
+      else {
+        if (document.currentPopupMenu)
+          hideMenu(document.currentPopupMenu);
+        
+        if (data.contacts.length == 1) {
+          // Single result
+          var contact = data.contacts[0];
+          var uid = "" + contact[this.uidField];
+          var c_name = "" + contact['c_name'];
+          input.writeAttribute("uid", uid);
+          if (c_name.endsWith(".vlf")) {
+            this.writeAttribute("container", contact['container']);
+          }
+          var completeEmail = contact["c_cn"];
+          if (contact["c_mail"])
+            completeEmail += " <" + contact["c_mail"] + ">";
+          if (contact["c_cn"].substring(0, input.value.length).toUpperCase()
+              == input.value.toUpperCase())
+            input.value = completeEmail;
+          else
+            // The result matches email address, not user name
+            input.value += ' >> ' + completeEmail;
+          input.confirmedValue = completeEmail;
+          
+          var end = input.value.length;
+          $(input).selectText(start, end);
+          
+          this.selectedIndex = -1;
+        }
+      }
+    }
+    else
+      if (document.currentPopupMenu)
+        hideMenu(document.currentPopupMenu);
+    document.contactLookupAjaxRequest = null;
+  }
+},
+  
+performUsersSearchCallback: function (http) {
+  if (http.readyState == 4) {
+    var list = this.menu.down("ul");
+    var input = http.callbackData;
+    if (http.status == 200) {
+      var response = http.responseText.evalJSON();
+      
+      if (response.length > 1) {
+        list.select("li").each(function(item) {
+                               item.stopObserving("mousedown");
+                               item.remove();
+                               });
+        
+        // Populate popup menu
+        for (var i = 0; i < response.length; i++) {
+          var c_name = response[i][1];
+          var completeEmail = c_name;
+          var c_mail = response[i][2];
+          var uid = response[i][3];
+          if (c_mail)
+            completeEmail += " <" + c_mail + ">";
+          var node = new Element('li', { 'address': completeEmail,
+                                 'uid': uid });
+          var matchPosition = completeEmail.toLowerCase().indexOf(input.getValue().toLowerCase());
+          if (matchPosition > -1) {
+            var matchBefore = completeEmail.substring(0, matchPosition);
+            var matchText = completeEmail.substring(matchPosition, matchPosition + input.getValue().length);
+            var matchAfter = completeEmail.substring(matchPosition + input.getValue().length);
+            node.appendChild(document.createTextNode(matchBefore));
+            node.appendChild(new Element('strong').update(matchText));
+            node.appendChild(document.createTextNode(matchAfter));
+          }
+          else {
+            node.appendChild(document.createTextNode(completeEmail));
+          }
+          list.appendChild(node);
+          $(node).observe("mousedown", this.onAddressResultClick.bindAsEventListener(this));
+        }
+        
+        // Show popup menu
+        var offsetScroll = Element.cumulativeScrollOffset(input);
+        var offset = Element.positionedOffset(input);
+        if ($(document.body).hasClassName("popup") && typeof initPopupMailer == 'undefined')
+          // Hack for some situations where the offset must be computed differently
+          offset = Element.cumulativeOffset(input);
+        var top = offset.top - offsetScroll.top + node.offsetHeight + 3;
+        var height = 'auto';
+        var heightDiff = window.height() - offset[1];
+        var nodeHeight = node.getHeight();
+        
+        if ((response.length * nodeHeight) > heightDiff)
+          // Limit the size of the popup to the window height, minus 12 pixels
+          height = parseInt(heightDiff/nodeHeight) * nodeHeight - 12 + 'px';
+        
+        this.menu.setStyle({ top: top + "px",
+                           left: offset[0] + "px",
+                           height: height,
+                           maxWidth: (window.width() - offset[0] - 12) + "px",
+                           visibility: "visible" });
+        this.menu.scrollTop = 0;
+        
+        document.currentPopupMenu = this.menu;
+        $(document.body).stopObserving("click");
+        $(document.body).observe("click", onBodyClickMenuHandler);
+      }
+      else {
+        if (document.currentPopupMenu)
+          hideMenu(document.currentPopupMenu);
+        
+        if (response.length == 1) {
+          // Single result
+          var c_name = response[0][1];
+          var completeEmail = c_name;
+          var c_mail = response[0][2];
+          var c_uid = response[0][0];
+          input.writeAttribute("uid", c_uid);
+          if (c_mail)
+            completeEmail += " <" + c_mail + ">";
+          if (c_uid.substring(0, input.getValue().length).toUpperCase() == input.getValue().toUpperCase())
+            input.value = completeEmail;
+          else
+            // The result matches email address, not user name
+            input.value += ' >> ' + completeEmail;
+          input.confirmedValue = completeEmail;
+          
+          var end = input.getValue().length;
+          $(input).selectText(start, end);
+          
+          this.selectedIndex = -1;
+        }
+      }
+    }
+    else
+      if (document.currentPopupMenu)
+        hideMenu(document.currentPopupMenu);
+    document.contactLookupAjaxRequest = null;
+  }
+},
+
+onAddressResultClick: function(event) {
+  var e = Event.element(event);
+  if (e.tagName != 'LI')
+    e = e.up('LI');
+  if (e) {
+    preventDefault(event);
+    this.value = e.readAttribute("address");
+    this.writeAttribute("uid", e.readAttribute("uid"));
+    if (e.readAttribute("container"))
+      this.fire("autocompletion:changedlist", e.readAttribute("container"));
+    else {
+      this.confirmedValue = this.value;
+      this.fire("autocompletion:changed", Event.KEY_RETURN);
+    }
+  }
+}
 };
diff --git a/UI/WebServerResources/UIxPreferences.css b/UI/WebServerResources/UIxPreferences.css
index a09d6f92b..0e525dad5 100644
--- a/UI/WebServerResources/UIxPreferences.css
+++ b/UI/WebServerResources/UIxPreferences.css
@@ -13,6 +13,23 @@ DIV.bottomToolbar
   left: 2em;
   right: 2em;
   bottom: 8px; }
+  
+#whiteListToolbar
+{ position: absolute;
+  height: 20px;
+  top: 286px;
+  width: 275px;
+  left: 235px;
+  background-image: url("thead_bg.png");
+  border: 1px solid #9B9B9B;
+  background-color: #E6E7E6;
+}
+
+#WhiteListAdd, #WhiteListDelete
+{
+  border-bottom: 1px solid #9B9B9B;
+  border-right: 1px solid #9B9B9B;
+}
 
 #mailAccountsToolbar
 { left: 5px;
@@ -47,17 +64,48 @@ DIV.listWrapper
   padding: 0px;
   margin-top: 2px;
   border-left: 1px solid #9b9b9b;
+  border-right: 1px solid #9b9b9b;
   background: #ccddec;}
 
 .listWrapper TABLE TD
 { height: 22px; }
 
+#whiteListLabel 
+{
+  position: absolute;
+  left: 12px;
+}
+
+#calendarCategoriesLabel
+{
+  position: absolute;
+  top: 305px;
+  left:0;
+}
+
 #calendarCategoriesListWrapper
-{ top: 232px;
+{ top: 320px;
   bottom: 30px;
   right: 2em;
   left: 2em; }
 
+#appointmentsWhiteListWrapper
+{ top: 230px;
+  height: 54px;
+  left:235px;
+  width:275px;
+
+ }
+ 
+#tableViewWhiteList
+{
+  width: 100%;
+}
+ 
+#whiteListTableHeader
+{
+}
+
 #contactsCategoriesListWrapper
 { overflow: auto;
   position: absolute;
diff --git a/UI/WebServerResources/UIxPreferences.js b/UI/WebServerResources/UIxPreferences.js
index c21dcf88b..dba91eea2 100644
--- a/UI/WebServerResources/UIxPreferences.js
+++ b/UI/WebServerResources/UIxPreferences.js
@@ -9,6 +9,9 @@ function savePreferences(sender) {
   if (sigList)
     sigList.disabled = false;
   
+ // if ($("appointmentsWhiteListWrapper"))
+ //   serializeAppointmentsWhiteList();
+  
   if ($("calendarCategoriesListWrapper"))
     serializeCalendarCategories();
   
@@ -201,97 +204,110 @@ function addDefaultEmailAddresses(event) {
 }
 
 function initPreferences() {
-    var tabsContainer = $("preferencesTabs");
-    var controller = new SOGoTabsController();
-    controller.attachToTabsContainer(tabsContainer);
-
-    // Inner tabs on the mail module tab
-    tabsContainer = $('mailOptionsTabs');
-    if (tabsContainer) {
-        var mailController = new SOGoTabsController();
-        mailController.attachToTabsContainer(tabsContainer);
-    }
-
-    _setupEvents();
-
-    // Optional function called when initializing the preferences
-    // Typically defined inline in the UIxAdditionalPreferences.wox template
-    if (typeof (initAdditionalPreferences) != "undefined")
-        initAdditionalPreferences();
-
-    // Color picker
-    $('colorPickerDialog').on('click', 'span', onColorPickerChoice);
-    $(document.body).on("click", onBodyClickHandler);
-
-    // Calender categories
-    var wrapper = $("calendarCategoriesListWrapper");
-    if (wrapper) {
-        var table = wrapper.childNodesWithTag("table")[0];
-        resetCalendarCategoriesColors(null);
-        var r = $$("#calendarCategoriesListWrapper tbody tr");
-        for (var i= 0; i < r.length; i++)
-            r[i].identify();
-        table.multiselect = true;
-        resetCalendarTableActions();
-        $("calendarCategoryAdd").observe("click", onCalendarCategoryAdd);
-        $("calendarCategoryDelete").observe("click", onCalendarCategoryDelete);
-        wrapper.observe("scroll", onBodyClickHandler);
-    }
-
-    // Mail labels/tags
-    var wrapper = $("mailLabelsListWrapper");
-    if (wrapper) {
-        var table = wrapper.childNodesWithTag("table")[0];
-        resetMailLabelsColors(null);
-        var r = $$("#mailLabelsListWrapper tbody tr");
-        for (var i= 0; i < r.length; i++)
-            r[i].identify();
-        table.multiselect = true;
-        resetMailTableActions();
-        $("mailLabelAdd").observe("click", onMailLabelAdd);
-        $("mailLabelDelete").observe("click", onMailLabelDelete);
-    }
-
-    // Contact categories
-    wrapper = $("contactsCategoriesListWrapper");
-    if (wrapper) {
-        var table = wrapper.childNodesWithTag("table")[0];
-        var r = $$("#contactsCategoriesListWrapper tbody tr");
-        for (var i= 0; i < r.length; i++)
-            r[i].identify();
-        table.multiselect = true;
-        resetContactsTableActions();
-        $("contactsCategoryAdd").observe("click", onContactsCategoryAdd);
-        $("contactsCategoryDelete").observe("click", onContactsCategoryDelete);
-    }
-
-    if ($("replyPlacementList"))
-        onReplyPlacementListChange();
-
-    var button = $("addDefaultEmailAddresses");
-    if (button)
-        button.observe("click", addDefaultEmailAddresses);
-
-    button = $("changePasswordBtn");
-    if (button)
-        button.observe("click", onChangePasswordClick);
-
-    initSieveFilters();
-
-    initMailAccounts();
-
-    button = $("enableVacationEndDate");
-    if (button) {
-        jQuery("#vacationEndDate_date").closest(".date").datepicker(
-            { autoclose: true, position: 'above', weekStart: $('weekStartDay').getValue() });
-        button.on("click", function(event) {
-            if (this.checked)
-                $("vacationEndDate_date").enable();
-            else
-                $("vacationEndDate_date").disable();
-        });
-    }
-    onAddOutgoingAddressesCheck();
+  var tabsContainer = $("preferencesTabs");
+  var controller = new SOGoTabsController();
+  controller.attachToTabsContainer(tabsContainer);
+  
+  // Inner tabs on the mail module tab
+  tabsContainer = $('mailOptionsTabs');
+  if (tabsContainer) {
+    var mailController = new SOGoTabsController();
+    mailController.attachToTabsContainer(tabsContainer);
+  }
+  
+  _setupEvents();
+  
+  // Optional function called when initializing the preferences
+  // Typically defined inline in the UIxAdditionalPreferences.wox template
+  if (typeof (initAdditionalPreferences) != "undefined")
+    initAdditionalPreferences();
+  
+  // Color picker
+  $('colorPickerDialog').on('click', 'span', onColorPickerChoice);
+  $(document.body).on("click", onBodyClickHandler);
+  
+  // Calendar whiteList
+  var whiteList = $("appointmentsWhiteListWrapper");
+  if(whiteList) {
+    var table = whiteList.childNodesWithTag("table")[0];
+    var r = $$("#appointmentsWhiteListWrapper tbody tr");
+    for (var i= 0; i < r.length; i++)
+      r[i].identify();
+    table.multiselect = true;
+    $("appointmentsWhiteListAdd").observe("click", onAppointmentsWhiteListAdd);
+    $("appointmentsWhiteListDelete").observe("click", onAppointmentsWhiteListDelete);
+    whiteList.observe("scroll", onBodyClickHandler);
+  }
+  
+  // Calendar categories
+  var wrapper = $("calendarCategoriesListWrapper");
+  if (wrapper) {
+    var table = wrapper.childNodesWithTag("table")[0];
+    resetCalendarCategoriesColors(null);
+    var r = $$("#calendarCategoriesListWrapper tbody tr");
+    for (var i= 0; i < r.length; i++)
+      r[i].identify();
+    table.multiselect = true;
+    resetCalendarTableActions();
+    $("calendarCategoryAdd").observe("click", onCalendarCategoryAdd);
+    $("calendarCategoryDelete").observe("click", onCalendarCategoryDelete);
+    wrapper.observe("scroll", onBodyClickHandler);
+  }
+  
+  // Mail labels/tags
+  var wrapper = $("mailLabelsListWrapper");
+  if (wrapper) {
+    var table = wrapper.childNodesWithTag("table")[0];
+    resetMailLabelsColors(null);
+    var r = $$("#mailLabelsListWrapper tbody tr");
+    for (var i= 0; i < r.length; i++)
+      r[i].identify();
+    table.multiselect = true;
+    resetMailTableActions();
+    $("mailLabelAdd").observe("click", onMailLabelAdd);
+    $("mailLabelDelete").observe("click", onMailLabelDelete);
+  }
+  
+  // Contact categories
+  wrapper = $("contactsCategoriesListWrapper");
+  if (wrapper) {
+    var table = wrapper.childNodesWithTag("table")[0];
+    var r = $$("#contactsCategoriesListWrapper tbody tr");
+    for (var i= 0; i < r.length; i++)
+      r[i].identify();
+    table.multiselect = true;
+    resetContactsTableActions();
+    $("contactsCategoryAdd").observe("click", onContactsCategoryAdd);
+    $("contactsCategoryDelete").observe("click", onContactsCategoryDelete);
+  }
+  
+  if ($("replyPlacementList"))
+    onReplyPlacementListChange();
+  
+  var button = $("addDefaultEmailAddresses");
+  if (button)
+    button.observe("click", addDefaultEmailAddresses);
+  
+  button = $("changePasswordBtn");
+  if (button)
+    button.observe("click", onChangePasswordClick);
+  
+  initSieveFilters();
+  
+  initMailAccounts();
+  
+  button = $("enableVacationEndDate");
+  if (button) {
+    jQuery("#vacationEndDate_date").closest(".date").datepicker(
+                                                                { autoclose: true, position: 'above', weekStart: $('weekStartDay').getValue() });
+    button.on("click", function(event) {
+              if (this.checked)
+              $("vacationEndDate_date").enable();
+              else
+              $("vacationEndDate_date").disable();
+              });
+  }
+  onAddOutgoingAddressesCheck();
 }
 
 function initSieveFilters() {
@@ -977,6 +993,117 @@ function onCalendarColorEdit(e) {
     onCCE(e, "calendarCategoriesListWrapper");
 }
 
+function makeEditable (element) {
+  element.addClassName("editing");
+  element.removeClassName("whiteListCell");
+  
+  var span = element.down("SPAN");
+  span.update();
+  
+  var textField = element.down("INPUT");
+  textField.show();
+  textField.focus();
+  textField.select();
+  
+  return true;
+}
+
+function endAllEditables (e) {
+  var r = $$("TABLE#tableViewWhiteList TBODY TR TD");
+  for (var i = 0; i < r.length; i++) {
+    var element = $(r[i]);
+    if (r[i] != this && element.hasClassName("editing"))
+      endEditable(null, element.down("INPUT"));
+  }
+}
+
+function onNameEdit (e) {
+  endAllEditables();
+  if (!this.hasClassName("editing")) {
+    makeEditable (this);
+  }
+}
+
+function endEditable(event, textField) {
+  if (!textField)
+    textField = this;
+  
+  var uid = textField.readAttribute("uid");
+  var cell = textField.up("TD");
+  var textSpan = cell.down("SPAN");
+  
+  cell.removeClassName("editing");
+  cell.addClassName("whiteListCell");
+  textField.hide();
+  
+  var tmp = textField.value;
+  tmp = tmp.replace (/</, "&lt;");
+  tmp = tmp.replace (/>/, "&gt;");
+  if (!uid)
+    cell.up("TR").addClassName("notfound");
+  if (tmp)
+    textSpan.update(tmp);
+  else
+    cell.up("TR").remove();
+  
+  if (event)
+    Event.stop(event);
+  
+  return false;
+}
+
+function onAppointmentsWhiteListAdd(e) {
+  var tablebody = $("appointmentsWhiteListWrapper").childNodesWithTag("table")[0].tBodies[0];
+  var row = new Element("tr");
+  var td = new Element("td").update("");
+  var textField = new Element("input");
+  var span = new Element("span");
+  
+  row.addClassName("whiteListRow");
+  row.observe("mousedown", onRowClick);
+  td.addClassName ("whiteListCell");
+  td.observe("mousedown", endAllEditables);
+  td.observe("dblclick", onNameEdit);
+  textField.addInterface(SOGoAutoCompletionInterface);
+  textField.SOGoUsersSearch = true;
+  textField.observe("autocompletion:changed", endEditable);
+  textField.addClassName("textField");
+
+  td.appendChild(textField);
+  td.appendChild(span);
+  row.appendChild (td);
+  tablebody.appendChild(row);
+  $(tablebody).deselectAll();
+  row.selectElement();
+  
+  makeEditable(td);
+}
+
+function onAppointmentsWhiteListDelete(e) {
+  var list = $('appointmentsWhiteListWrapper').down("TABLE").down("TBODY");
+  var rows = list.getSelectedNodes();
+  var count = rows.length;
+  
+  for (var i=0; i < count; i++) {
+    rows[i].editionController = null;
+    rows[i].remove();
+  }
+}
+
+function serializeAppointmentsWhiteList() {
+  var r = $$("#appointmentsWhiteListWrapper TBODY TR");
+  
+  var values = [];
+  for (var i = 0; i < r.length; i++) {
+    var tds = r[i].childElements();
+    var name  = $(tds.first()).innerHTML;
+    var email = "";
+    values.push("\"" + name + "\": \"" + color + "\"");
+  }
+  
+  //$("calendarCategoriesValue").value = "{ " + values.join(",\n") + "}";
+}
+
 function onCalendarCategoryAdd(e) {
     var row = new Element("tr");
     var nametd = new Element("td").update("");

From 16d02455bdcb5e8d2e2c5b4dc160b294895da82c Mon Sep 17 00:00:00 2001
From: Alexandre Cloutier <acloutier@inverse.ca>
Date: Mon, 7 Jul 2014 10:00:16 -0400
Subject: [PATCH 02/14] Serialization of the whiteList

---
 UI/PreferencesUI/UIxPreferences.m             | 20 +++++++++++++++++++
 UI/Templates/PreferencesUI/UIxPreferences.wox | 12 ++++++-----
 UI/WebServerResources/UIxPreferences.js       | 20 +++++++++----------
 3 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index 096ae7b97..96e91f0e6 100644
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -639,6 +639,26 @@ static NSArray *reminderValues = nil;
   return [userDefaults busyOffHours];
 }
 
+- (NSString *) whiteListValue
+{
+  SOGoUserSettings *us;
+  id *whiteListValue;
+  
+  us = [user userSettings];
+  whiteListValue = [us objectForKey:@"whiteListInvitations"];
+
+  return whiteListValue;
+}
+
+- (void) setWhiteListValue: (NSArray *) whiteList
+{
+  SOGoUserSettings *us;
+  
+  us = [user userSettings];
+  [us setObject: whiteList forKey: @"whiteListInvitations"];
+  [us synchronize];
+}
+
 - (void) setPreventInvitations: (BOOL) preventInvitations
 {
   SOGoUserSettings *us;
diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index 287029d40..fcef5e7ff 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -19,7 +19,7 @@
   <div class="popupMenu" id="contactsMenu">
     <ul></ul>
   </div>
-
+  
   <div id="colorPickerDialog" style="display: none;" class="dialog right bottom">
     <div>
       <span class="blc-FFFFFF"><!-- --></span>
@@ -223,7 +223,6 @@
                 var:checked="preventInvitations" />
                 <var:string label:value="Prevent from being invited to appointments"/></dd>
             </dl>
-            
             <label id="whiteListLabel"><var:string label:value="White list for appointments invitations:"/></label>
             <div id="appointmentsWhiteListWrapper" class="listWrapper">
               <table class="tableview" id="tableViewWhiteList">
@@ -231,7 +230,8 @@
                   <tr class="tableview">
                     <th const:class="tbtv_headercell" const:id="whiteListTableHeader">
                       <var:string label:value="Contacts names"/></th>
-                  </tr></thead>
+                  </tr>
+                </thead>
                 <tbody>
                   <var:foreach list="appointmentsWhiteList" item="contact">
                     <tr const:class="whiteListRow">
@@ -244,10 +244,12 @@
             </div>
             <div id="whiteListToolbar">
               <a const:id="appointmentsWhiteListAdd" href="#">
-                  <img rsrc:src="add-icon.png" label:title="Add" id="WhiteListAdd"/></a>
+                <img rsrc:src="add-icon.png" label:title="Add" id="WhiteListAdd"/></a>
               <a const:id="appointmentsWhiteListDelete" href="#">
-                  <img rsrc:src="remove-icon.png" label:title="Delete" id="WhiteListDelete" /></a>
+                <img rsrc:src="remove-icon.png" label:title="Delete" id="WhiteListDelete" /></a>
             </div>
+            <input type="hidden" const:id="whiteListValue"
+            const:name="whiteListValue" var:value="whiteListValue"/>
             
             <label id="calendarCategoriesLabel"><var:string label:value="Categories"/></label>
             <div id="calendarCategoriesListWrapper" class="listWrapper">
diff --git a/UI/WebServerResources/UIxPreferences.js b/UI/WebServerResources/UIxPreferences.js
index dba91eea2..8086879f3 100644
--- a/UI/WebServerResources/UIxPreferences.js
+++ b/UI/WebServerResources/UIxPreferences.js
@@ -9,8 +9,8 @@ function savePreferences(sender) {
   if (sigList)
     sigList.disabled = false;
   
- // if ($("appointmentsWhiteListWrapper"))
- //   serializeAppointmentsWhiteList();
+  if ($("appointmentsWhiteListWrapper"))
+    serializeAppointmentsWhiteList();
   
   if ($("calendarCategoriesListWrapper"))
     serializeCalendarCategories();
@@ -236,10 +236,9 @@ function initPreferences() {
     table.multiselect = true;
     $("appointmentsWhiteListAdd").observe("click", onAppointmentsWhiteListAdd);
     $("appointmentsWhiteListDelete").observe("click", onAppointmentsWhiteListDelete);
-    whiteList.observe("scroll", onBodyClickHandler);
   }
   
-  // Calendar categories
+  // Calender categories
   var wrapper = $("calendarCategoriesListWrapper");
   if (wrapper) {
     var table = wrapper.childNodesWithTag("table")[0];
@@ -1095,13 +1094,12 @@ function serializeAppointmentsWhiteList() {
   
   var values = [];
   for (var i = 0; i < r.length; i++) {
-    var tds = r[i].childElements();
-    var name  = $(tds.first()).innerHTML;
-    var email = "";
-    values.push("\"" + name + "\": \"" + color + "\"");
+    var tds = r[i].childElements().first().down("INPUT");
+    var uid  = tds.getAttribute("uid");
+    values.push(uid);
   }
   
-  //$("calendarCategoriesValue").value = "{ " + values.join(",\n") + "}";
+  $("whiteListValue").value = values;
 }
 
 function onCalendarCategoryAdd(e) {
@@ -1143,7 +1141,7 @@ function serializeCalendarCategories() {
     var values = [];
     for (var i = 0; i < r.length; i++) {
         var tds = r[i].childElements();
-        var name  = $(tds.first()).innerHTML;
+        var name  = $(tds.first()).innerHTML.trim();
         var color = $(tds.last().childElements().first()).readAttribute('data-color');
         values.push("\"" + name + "\": \"" + color + "\"");
     }
@@ -1271,7 +1269,7 @@ function onContactsCategoryAdd(e) {
     var list = $('contactsCategoriesListWrapper').down("TABLE").down("TBODY");
     list.appendChild(row);
 
-    resetContactsTableActions ();
+    resetContactsTableActions();
     nametd.editionController.startEditing();
 }
 

From f0b8eb8dfb6d19fdc82fe92a796c9e2b9a9c2aa3 Mon Sep 17 00:00:00 2001
From: Alexandre Cloutier <acloutier@inverse.ca>
Date: Mon, 7 Jul 2014 13:38:37 -0400
Subject: [PATCH 03/14] server side code to integrate the whitelist

---
 .../English.lproj/Localizable.strings         |  1 +
 .../Appointments/SOGoAppointmentObject.m      | 51 +++++++++++--------
 UI/PreferencesUI/UIxPreferences.m             |  4 +-
 UI/WebServerResources/UIxPreferences.js       | 43 ++++++++++++++--
 4 files changed, 71 insertions(+), 28 deletions(-)

diff --git a/SoObjects/Appointments/English.lproj/Localizable.strings b/SoObjects/Appointments/English.lproj/Localizable.strings
index ba3b942f1..3fbab4be3 100644
--- a/SoObjects/Appointments/English.lproj/Localizable.strings
+++ b/SoObjects/Appointments/English.lproj/Localizable.strings
@@ -1,3 +1,4 @@
+"This or these persons cannot be invited:" = "This or these persons cannot be invited:";
 "Personal Calendar" = "Personal Calendar";
 vevent_class0 = "(Public event)";
 vevent_class1 = "(Private event)";
diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m
index 16732e7c4..623bd1de6 100644
--- a/SoObjects/Appointments/SOGoAppointmentObject.m
+++ b/SoObjects/Appointments/SOGoAppointmentObject.m
@@ -25,6 +25,7 @@
 #import <Foundation/NSEnumerator.h>
 #import <Foundation/NSTimeZone.h>
 #import <Foundation/NSValue.h>
+#import <Foundation/NSPredicate.h>
 
 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
@@ -52,6 +53,7 @@
 #import <SOGo/SOGoPermissions.h>
 #import <SOGo/SOGoGroup.h>
 #import <SOGo/SOGoUser.h>
+#import <SOGo/SOGoUserSettings.h>
 #import <SOGo/SOGoDomainDefaults.h>
 #import <SOGo/SOGoWebDAVValue.h>
 #import <SOGo/WORequest+SOGo.h>
@@ -424,51 +426,56 @@
   NSDictionary *values;
   NSMutableDictionary *value;
   SOGoUser *user, *currentUser, *ownerUser;
+  SOGoUserSettings *us;
   NSException *e;
   int count = 0, i = 0;
+  NSMutableArray *whiteList;
+  NSPredicate *predicate;
   
-  // Build a list of the attendees uids without the ressources
+  // Build list of the attendees uids without ressources
   attendees = [NSMutableArray arrayWithCapacity: [theAttendees count]];
   unavailableAttendees = [[NSMutableArray alloc] init];
   enumerator = [theAttendees objectEnumerator];
+  
   while ((currentAttendee = [enumerator nextObject]))
   {
     currentUID = [currentAttendee uid];
     if (currentUID)
     {
       user = [SOGoUser userWithLogin: currentUID];
+      us = [user userSettings];
       if (![user isResource])
       {
-        // Check if the user can be invited to an event.
-        if ([[user userSettings] objectForKey:@"PreventInvitations"])
+        // Check if the user prevented his account from beeing invited to events
+        if ([[us objectForKey:@"PreventInvitations"] boolValue])
         {
-          values = [NSDictionary dictionaryWithObject:[user cn] forKey:@"Cn"];
-          [unavailableAttendees addObject:values];
+          // Check if the user have a whiteList
+          whiteList = [NSMutableArray arrayWithObject:[us objectForKey:@"whiteListInvitations"]];
+          predicate = [NSPredicate predicateWithFormat:@"SELF CONTAINS[cd] %@", @"sogo1"];
+          [whiteList filterUsingPredicate:predicate];
+          
+          // If the filter have a hit, do not add the currentUID to the unavailableAttendees array
+          if ([whiteList count] == 0)
+          {
+            values = [NSDictionary dictionaryWithObject:[user cn] forKey:@"Cn"];
+            [unavailableAttendees addObject:values];
+          }
         }
       }
     }
   }
+
   count = [unavailableAttendees count];
-  if (count > 0)
+  if ([unavailableAttendees count] > 0)
   {
-    if (count > 1)
+    reason = [NSMutableString stringWithString:[self labelForKey: @"This or these persons cannot be invited:"]];
+    // Add all the unavailable users in the warning message
+    for (i = 0; i < count; i++)
     {
-      reason = [NSMutableString stringWithString:[self labelForKey: @"These persons cannot be invited :"]];
-      for (i = 0; i < count; i++)
-      {
-        value = [unavailableAttendees objectAtIndex:i];
-        [reason appendString:[value keysWithFormat: @"\n %{Cn}"]];
-        if (!(i == (count - 1)))
-        {
-          [reason appendString:@" &"];
-        }
-      }
-    }
-    else
-    {
-      value = [unavailableAttendees objectAtIndex:0];
-      reason = [self labelForKey: @"This person cannot be invited:"];
+      value = [unavailableAttendees objectAtIndex:i];
       [reason appendString:[value keysWithFormat: @"\n %{Cn}"]];
+      if (!(i == (count - 1)))
+        [reason appendString:@" &"];
     }
     [unavailableAttendees release];
     return [NSException exceptionWithHTTPStatus:403 reason: reason];
diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index 96e91f0e6..86416ed11 100644
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -639,10 +639,10 @@ static NSArray *reminderValues = nil;
   return [userDefaults busyOffHours];
 }
 
-- (NSString *) whiteListValue
+- (NSArray *) whiteListValue
 {
   SOGoUserSettings *us;
-  id *whiteListValue;
+  NSArray *whiteListValue;
   
   us = [user userSettings];
   whiteListValue = [us objectForKey:@"whiteListInvitations"];
diff --git a/UI/WebServerResources/UIxPreferences.js b/UI/WebServerResources/UIxPreferences.js
index 8086879f3..17685a533 100644
--- a/UI/WebServerResources/UIxPreferences.js
+++ b/UI/WebServerResources/UIxPreferences.js
@@ -229,10 +229,42 @@ function initPreferences() {
   // Calendar whiteList
   var whiteList = $("appointmentsWhiteListWrapper");
   if(whiteList) {
+    var whiteListValue = $("whiteListValue").getValue().split(",");
+    if (whiteListValue.length != 0)
+    {
+      var tablebody = $("appointmentsWhiteListWrapper").childNodesWithTag("table")[0].tBodies[0];
+      for (i = 0; i < whiteListValue.length; i++)
+      {
+        var elements = whiteListValue[i].split("=");
+        var row = new Element("tr");
+        var td = new Element("td").update("");
+        var textField = new Element("input");
+        var span = new Element("span");
+        
+        row.addClassName("whiteListRow");
+        row.observe("mousedown", onRowClick);
+        td.addClassName ("whiteListCell");
+        td.observe("mousedown", endAllEditables);
+        td.observe("dblclick", onNameEdit);
+        textField.addInterface(SOGoAutoCompletionInterface);
+        textField.SOGoUsersSearch = true;
+        textField.observe("autocompletion:changed", endEditable);
+        textField.addClassName("textField");
+        textField.value = elements[1];
+        textField.setAttribute("uid", elements[0]);
+        textField.hide();
+        span.innerText = elements[1];
+        
+        td.appendChild(textField);
+        td.appendChild(span);
+        row.appendChild (td);
+        tablebody.appendChild(row);
+        $(tablebody).deselectAll();
+        
+      }
+    }
+    
     var table = whiteList.childNodesWithTag("table")[0];
-    var r = $$("#appointmentsWhiteListWrapper tbody tr");
-    for (var i= 0; i < r.length; i++)
-      r[i].identify();
     table.multiselect = true;
     $("appointmentsWhiteListAdd").observe("click", onAppointmentsWhiteListAdd);
     $("appointmentsWhiteListDelete").observe("click", onAppointmentsWhiteListDelete);
@@ -1076,6 +1108,7 @@ function onAppointmentsWhiteListAdd(e) {
   row.selectElement();
   
   makeEditable(td);
+  
 }
 
 function onAppointmentsWhiteListDelete(e) {
@@ -1096,7 +1129,9 @@ function serializeAppointmentsWhiteList() {
   for (var i = 0; i < r.length; i++) {
     var tds = r[i].childElements().first().down("INPUT");
     var uid  = tds.getAttribute("uid");
-    values.push(uid);
+    var value = tds.getValue();
+    var user = uid + "=" + value;
+    values.push(user);
   }
   
   $("whiteListValue").value = values;

From b5c0363400a48610f782c06dd0fdba21cc7cc478 Mon Sep 17 00:00:00 2001
From: Alexandre Cloutier <acloutier@inverse.ca>
Date: Mon, 7 Jul 2014 17:42:43 -0400
Subject: [PATCH 04/14] applied comment and refactor code

---
 .../Appointments/SOGoAppointmentObject.m      | 22 ++++++++--------
 UI/PreferencesUI/UIxPreferences.h             |  1 -
 UI/PreferencesUI/UIxPreferences.m             | 25 +++++++++++--------
 UI/WebServerResources/UIxPreferences.js       |  6 ++---
 4 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m
index 623bd1de6..32f06a965 100644
--- a/SoObjects/Appointments/SOGoAppointmentObject.m
+++ b/SoObjects/Appointments/SOGoAppointmentObject.m
@@ -419,23 +419,23 @@
                                     forEvent: (iCalEvent *) theEvent
 {
   iCalPerson *currentAttendee;
-  NSMutableArray *attendees, *unavailableAttendees;
+  NSMutableArray *attendees, *unavailableAttendees, *whiteList;
   NSEnumerator *enumerator;
-  NSString *currentUID, *buffer;
+  NSPredicate *predicate;
+  NSString *currentUID, *ownerUID;
   NSMutableString *reason;
   NSDictionary *values;
-  NSMutableDictionary *value;
-  SOGoUser *user, *currentUser, *ownerUser;
+  NSMutableDictionary *value, *moduleSettings;
+  SOGoUser *user;
   SOGoUserSettings *us;
-  NSException *e;
   int count = 0, i = 0;
-  NSMutableArray *whiteList;
-  NSPredicate *predicate;
+  
   
   // Build list of the attendees uids without ressources
   attendees = [NSMutableArray arrayWithCapacity: [theAttendees count]];
   unavailableAttendees = [[NSMutableArray alloc] init];
   enumerator = [theAttendees objectEnumerator];
+  ownerUID = [[[self context] activeUser] login];
   
   while ((currentAttendee = [enumerator nextObject]))
   {
@@ -444,16 +444,16 @@
     {
       user = [SOGoUser userWithLogin: currentUID];
       us = [user userSettings];
+      moduleSettings = [us objectForKey:@"Calendar"];
       if (![user isResource])
       {
         // Check if the user prevented his account from beeing invited to events
-        if ([[us objectForKey:@"PreventInvitations"] boolValue])
+        if ([[moduleSettings objectForKey:@"PreventInvitations"] boolValue])
         {
           // Check if the user have a whiteList
-          whiteList = [NSMutableArray arrayWithObject:[us objectForKey:@"whiteListInvitations"]];
-          predicate = [NSPredicate predicateWithFormat:@"SELF CONTAINS[cd] %@", @"sogo1"];
+          whiteList = [NSMutableArray arrayWithObject:[moduleSettings objectForKey:@"PreventInvitationsWhitelist"]];
+          predicate = [NSPredicate predicateWithFormat:@"SELF CONTAINS[cd] %@", ownerUID];
           [whiteList filterUsingPredicate:predicate];
-          
           // If the filter have a hit, do not add the currentUID to the unavailableAttendees array
           if ([whiteList count] == 0)
           {
diff --git a/UI/PreferencesUI/UIxPreferences.h b/UI/PreferencesUI/UIxPreferences.h
index 0164d247f..bbbb0a2b1 100644
--- a/UI/PreferencesUI/UIxPreferences.h
+++ b/UI/PreferencesUI/UIxPreferences.h
@@ -33,7 +33,6 @@
 {
   id item;
   SOGoUser *user;
-  SOGoUserSettings *us;
   NGSieveClient *client;
 
   // Addressbook
diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index 86416ed11..7e176c591 100644
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -19,6 +19,7 @@
  */
 
 #import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSDictionary.h>
 #import <Foundation/NSPropertyList.h>
 #import <Foundation/NSString.h>
 #import <Foundation/NSTimeZone.h>
@@ -642,38 +643,42 @@ static NSArray *reminderValues = nil;
 - (NSArray *) whiteListValue
 {
   SOGoUserSettings *us;
-  NSArray *whiteListValue;
+  NSMutableDictionary *moduleSettings;
+  NSArray *whiteList;
   
   us = [user userSettings];
-  whiteListValue = [us objectForKey:@"whiteListInvitations"];
-
-  return whiteListValue;
+  moduleSettings = [us objectForKey: @"Calendar"];
+  whiteList = [moduleSettings objectForKey:@"PreventInvitationsWhitelist"];
+  return whiteList;
 }
 
 - (void) setWhiteListValue: (NSArray *) whiteList
 {
   SOGoUserSettings *us;
-  
+  NSMutableDictionary *moduleSettings;
   us = [user userSettings];
-  [us setObject: whiteList forKey: @"whiteListInvitations"];
+  moduleSettings = [us objectForKey: @"Calendar"];
+  [moduleSettings setObject: whiteList forKey: @"PreventInvitationsWhitelist"];
   [us synchronize];
 }
 
 - (void) setPreventInvitations: (BOOL) preventInvitations
 {
   SOGoUserSettings *us;
-  
+  NSMutableDictionary *moduleSettings;
   us = [user userSettings];
-  [us setBool: preventInvitations forKey: @"PreventInvitations"];
+  moduleSettings = [us objectForKey: @"Calendar"];
+  [moduleSettings setObject: [NSNumber numberWithBool: preventInvitations] forKey: @"PreventInvitations"];
   [us synchronize];
 }
 
 - (BOOL) preventInvitations
 {
   SOGoUserSettings *us;
+  NSMutableDictionary *moduleSettings;
   us = [user userSettings];
-  
-  return [[us objectForKey: @"PreventInvitations"] boolValue];
+  moduleSettings = [us objectForKey: @"Calendar"];
+  return [[moduleSettings objectForKey: @"PreventInvitations"] boolValue];
 }
 
 - (NSArray *) firstWeekList
diff --git a/UI/WebServerResources/UIxPreferences.js b/UI/WebServerResources/UIxPreferences.js
index 17685a533..04166ffb5 100644
--- a/UI/WebServerResources/UIxPreferences.js
+++ b/UI/WebServerResources/UIxPreferences.js
@@ -229,9 +229,9 @@ function initPreferences() {
   // Calendar whiteList
   var whiteList = $("appointmentsWhiteListWrapper");
   if(whiteList) {
-    var whiteListValue = $("whiteListValue").getValue().split(",");
-    if (whiteListValue.length != 0)
-    {
+    var whiteListValue = $("whiteListValue").getValue();
+    if (whiteListValue != "") {
+      whiteListValue = whiteListValue.split(",");
       var tablebody = $("appointmentsWhiteListWrapper").childNodesWithTag("table")[0].tBodies[0];
       for (i = 0; i < whiteListValue.length; i++)
       {

From ef20108e3297b5d644044307ba84fd2a6c6fbdbc Mon Sep 17 00:00:00 2001
From: Alexandre Cloutier <acloutier@inverse.ca>
Date: Wed, 9 Jul 2014 17:26:41 -0400
Subject: [PATCH 05/14] fix bug where the user could enter any names in the
 whitelist

---
 UI/WebServerResources/UIxPreferences.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UI/WebServerResources/UIxPreferences.js b/UI/WebServerResources/UIxPreferences.js
index 04166ffb5..3fd286882 100644
--- a/UI/WebServerResources/UIxPreferences.js
+++ b/UI/WebServerResources/UIxPreferences.js
@@ -1131,8 +1131,8 @@ function serializeAppointmentsWhiteList() {
     var uid  = tds.getAttribute("uid");
     var value = tds.getValue();
     var user = uid + "=" + value;
-    values.push(user);
-  }
+    if (uid != null)
+      values.push(user);
   
   $("whiteListValue").value = values;
 }

From 05fb7ae0c88a1f9b47d636caabaab96bea426309 Mon Sep 17 00:00:00 2001
From: Alexandre Cloutier <acloutier@inverse.ca>
Date: Thu, 10 Jul 2014 11:13:07 -0400
Subject: [PATCH 06/14] applied comments

---
 SoObjects/Appointments/SOGoAppointmentObject.m | 6 ++----
 UI/PreferencesUI/UIxPreferences.m              | 4 ++--
 UI/Templates/PreferencesUI/UIxPreferences.wox  | 4 ++--
 UI/WebServerResources/UIxPreferences.js        | 6 +++---
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m
index 32f06a965..e65f95c3d 100644
--- a/SoObjects/Appointments/SOGoAppointmentObject.m
+++ b/SoObjects/Appointments/SOGoAppointmentObject.m
@@ -480,10 +480,8 @@
     [unavailableAttendees release];
     return [NSException exceptionWithHTTPStatus:403 reason: reason];
   }
-  else {
-    [unavailableAttendees release];
-    return nil;
-  }
+  [unavailableAttendees release];
+  return nil;
 }
 
 //
diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index 7e176c591..ffd641912 100644
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -640,7 +640,7 @@ static NSArray *reminderValues = nil;
   return [userDefaults busyOffHours];
 }
 
-- (NSArray *) whiteListValue
+- (NSArray *) whiteList
 {
   SOGoUserSettings *us;
   NSMutableDictionary *moduleSettings;
@@ -652,7 +652,7 @@ static NSArray *reminderValues = nil;
   return whiteList;
 }
 
-- (void) setWhiteListValue: (NSArray *) whiteList
+- (void) setWhiteList: (NSArray *) whiteList
 {
   SOGoUserSettings *us;
   NSMutableDictionary *moduleSettings;
diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index fcef5e7ff..e29a95b88 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -248,8 +248,8 @@
               <a const:id="appointmentsWhiteListDelete" href="#">
                 <img rsrc:src="remove-icon.png" label:title="Delete" id="WhiteListDelete" /></a>
             </div>
-            <input type="hidden" const:id="whiteListValue"
-            const:name="whiteListValue" var:value="whiteListValue"/>
+            <input type="hidden" const:id="whiteList"
+            const:name="whiteList" var:value="whiteList"/>
             
             <label id="calendarCategoriesLabel"><var:string label:value="Categories"/></label>
             <div id="calendarCategoriesListWrapper" class="listWrapper">
diff --git a/UI/WebServerResources/UIxPreferences.js b/UI/WebServerResources/UIxPreferences.js
index 3fd286882..f4a6d65ec 100644
--- a/UI/WebServerResources/UIxPreferences.js
+++ b/UI/WebServerResources/UIxPreferences.js
@@ -229,7 +229,7 @@ function initPreferences() {
   // Calendar whiteList
   var whiteList = $("appointmentsWhiteListWrapper");
   if(whiteList) {
-    var whiteListValue = $("whiteListValue").getValue();
+    var whiteListValue = $("whiteList").getValue();
     if (whiteListValue != "") {
       whiteListValue = whiteListValue.split(",");
       var tablebody = $("appointmentsWhiteListWrapper").childNodesWithTag("table")[0].tBodies[0];
@@ -1133,8 +1133,8 @@ function serializeAppointmentsWhiteList() {
     var user = uid + "=" + value;
     if (uid != null)
       values.push(user);
-  
-  $("whiteListValue").value = values;
+  }
+  $("whiteList").value = values;
 }
 
 function onCalendarCategoryAdd(e) {

From 7c3e85f517a56ca66f540a8468b75010a5943f5f Mon Sep 17 00:00:00 2001
From: Alexandre Cloutier <acloutier@inverse.ca>
Date: Tue, 15 Jul 2014 17:34:49 -0400
Subject: [PATCH 07/14] applied comments

---
 .../Appointments/SOGoAppointmentObject.m      | 33 +++++++++----------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m
index e65f95c3d..239153fb4 100644
--- a/SoObjects/Appointments/SOGoAppointmentObject.m
+++ b/SoObjects/Appointments/SOGoAppointmentObject.m
@@ -414,8 +414,8 @@
                            withType: @"calendar:invitation-update"];
 }
 
-// This methods scans the list of attendees.
-- (NSException *) _handleAttendeeAvalability: (NSArray *) theAttendees
+// This method scans the list of attendees.
+- (NSException *) _handleAttendeeAvailability: (NSArray *) theAttendees
                                     forEvent: (iCalEvent *) theEvent
 {
   iCalPerson *currentAttendee;
@@ -445,28 +445,25 @@
       user = [SOGoUser userWithLogin: currentUID];
       us = [user userSettings];
       moduleSettings = [us objectForKey:@"Calendar"];
-      if (![user isResource])
+      // Check if the user prevented his account from beeing invited to events
+      if (![user isResource] && [[moduleSettings objectForKey:@"PreventInvitations"] boolValue])
       {
-        // Check if the user prevented his account from beeing invited to events
-        if ([[moduleSettings objectForKey:@"PreventInvitations"] boolValue])
+        // Check if the user have a whiteList
+        whiteList = [NSMutableArray arrayWithObject:[moduleSettings objectForKey:@"PreventInvitationsWhitelist"]];
+        predicate = [NSPredicate predicateWithFormat:@"SELF CONTAINS[cd] %@", ownerUID];
+        [whiteList filterUsingPredicate:predicate];
+        // If the filter have a hit, do not add the currentUID to the unavailableAttendees array
+        if ([whiteList count] == 0)
         {
-          // Check if the user have a whiteList
-          whiteList = [NSMutableArray arrayWithObject:[moduleSettings objectForKey:@"PreventInvitationsWhitelist"]];
-          predicate = [NSPredicate predicateWithFormat:@"SELF CONTAINS[cd] %@", ownerUID];
-          [whiteList filterUsingPredicate:predicate];
-          // If the filter have a hit, do not add the currentUID to the unavailableAttendees array
-          if ([whiteList count] == 0)
-          {
-            values = [NSDictionary dictionaryWithObject:[user cn] forKey:@"Cn"];
-            [unavailableAttendees addObject:values];
-          }
+          values = [NSDictionary dictionaryWithObject:[user cn] forKey:@"Cn"];
+          [unavailableAttendees addObject:values];
         }
       }
     }
   }
 
   count = [unavailableAttendees count];
-  if ([unavailableAttendees count] > 0)
+  if (count > 0)
   {
     reason = [NSMutableString stringWithString:[self labelForKey: @"This or these persons cannot be invited:"]];
     // Add all the unavailable users in the warning message
@@ -690,7 +687,7 @@
   // We check for conflicts
   if ((e = [self _handleResourcesConflicts: attendees  forEvent: newEvent]))
     return e;
-  if ((e = [self _handleAttendeeAvalability: attendees  forEvent: newEvent]))
+  if ((e = [self _handleAttendeeAvailability: attendees  forEvent: newEvent]))
     return e;
   
   enumerator = [attendees objectEnumerator];
@@ -785,7 +782,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
   
   if ((ex = [self _handleResourcesConflicts: [newEvent attendees] forEvent: newEvent]))
     return ex;
-  if ((ex = [self _handleAttendeeAvalability: [newEvent attendees] forEvent: newEvent]))
+  if ((ex = [self _handleAttendeeAvailability: [newEvent attendees] forEvent: newEvent]))
     return ex;
 
   addedAttendees = [changes insertedAttendees];

From 89d116363ca6a27b08b3b3e6812669ebbbd69ea0 Mon Sep 17 00:00:00 2001
From: Alexandre Cloutier <acloutier@inverse.ca>
Date: Wed, 16 Jul 2014 10:03:13 -0400
Subject: [PATCH 08/14] replace ampersands with commas

---
 SoObjects/Appointments/SOGoAppointmentObject.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m
index 239153fb4..589374bb6 100644
--- a/SoObjects/Appointments/SOGoAppointmentObject.m
+++ b/SoObjects/Appointments/SOGoAppointmentObject.m
@@ -472,7 +472,7 @@
       value = [unavailableAttendees objectAtIndex:i];
       [reason appendString:[value keysWithFormat: @"\n %{Cn}"]];
       if (!(i == (count - 1)))
-        [reason appendString:@" &"];
+        [reason appendString:@", "];
     }
     [unavailableAttendees release];
     return [NSException exceptionWithHTTPStatus:403 reason: reason];

From 17319cc8dd39c46a3f0c7c48e1ef9d182d06a663 Mon Sep 17 00:00:00 2001
From: Alexandre Cloutier <acloutier@inverse.ca>
Date: Wed, 16 Jul 2014 10:37:27 -0400
Subject: [PATCH 09/14] reverted UIxListEditor.wox

---
 UI/Templates/ContactsUI/UIxListEditor.wox | 129 +++++++++++-----------
 1 file changed, 62 insertions(+), 67 deletions(-)

diff --git a/UI/Templates/ContactsUI/UIxListEditor.wox b/UI/Templates/ContactsUI/UIxListEditor.wox
index 4d265c28d..d82e9cc89 100644
--- a/UI/Templates/ContactsUI/UIxListEditor.wox
+++ b/UI/Templates/ContactsUI/UIxListEditor.wox
@@ -1,42 +1,37 @@
 <?xml version='1.0' standalone='yes'?>
-<var:component
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:var="http://www.skyrix.com/od/binding"
-  xmlns:const="http://www.skyrix.com/od/constant"
-  xmlns:rsrc="OGo:url"
-  xmlns:label="OGo:label"
-  xmlns:uix="OGo:uix"
-  className="UIxPageFrame"
-  title="name"
-  const:popup="YES"
-  const:jsFiles="UIxMailEditor.js,SOGoAutoCompletion.js"
-  >
-  <script type="text/javascript">
-    var activeAddressBook = '<var:string value="clientObject.container.nameInContainer"/>';
-  </script>
-  <div class="popupMenu" id="contactsMenu">
-    <ul></ul>
-  </div>
-  <form var:href="saveURL" name="editform" id="mainForm">
-    <div id="listEditor">
-      <span class="caption"><var:string label:value="List details" /></span>
-      <table class="frame">
-        <tr>
-          <td width="35%"><var:string label:value="List name:"/></td>
-          <td>
-            <input type="text" const:id="listName" const:name="listName" var:value="listName" class="textField" /></td></tr>
-        <tr>
-          <td><var:string label:value="List nickname:"/></td>
-          <td>
-            <input type="text" const:id="nickname" const:name="nickname" var:value="nickname" class="textField" /></td></tr>
-        <tr>
-          <td><var:string label:value="List description:"/></td>
-          <td>
-            <input type="text" const:id="description" const:name="description" var:value="description" class="textField" /></td></tr>
-      </table>
-      
-      <span class="caption"><var:string label:value="Members" /></span>
-      <table class="frame"><tr><td>
+  <var:component
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:var="http://www.skyrix.com/od/binding"
+    xmlns:const="http://www.skyrix.com/od/constant"
+    xmlns:rsrc="OGo:url"
+    xmlns:label="OGo:label"
+    xmlns:uix="OGo:uix"
+    className="UIxPageFrame"
+    title="name"
+    const:popup="YES"
+    const:jsFiles="UIxMailEditor.js,SOGoAutoCompletion.js"
+    >
+    <script type="text/javascript">
+      var activeAddressBook = '<var:string value="clientObject.container.nameInContainer"/>';
+    </script>
+    <div class="popupMenu" id="contactsMenu">
+      <ul></ul>
+    </div>
+    <form var:href="saveURL" name="editform" id="mainForm">
+      <div id="listEditor">
+        <span class="caption"><var:string label:value="List details" /></span>
+        <table class="frame"><tr><td width="35%"><var:string label:value="List name:"/></td>
+            <td><input type="text" const:id="listName" const:name="listName"
+                var:value="listName" class="textField" /></td></tr>
+          <tr><td><var:string label:value="List nickname:"/></td>
+            <td><input type="text" const:id="nickname" const:name="nickname"
+                var:value="nickname" class="textField" /></td></tr>
+          <tr><td><var:string label:value="List description:"/></td>
+            <td><input type="text" const:id="description" const:name="description"
+                var:value="description" class="textField" /></td></tr>
+        </table>
+        <span class="caption"><var:string label:value="Members" /></span>
+        <table class="frame"><tr><td>
         <div id="referenceListWrapper">
           <table id="referenceList" cellspacing="0">
             <thead>
@@ -49,40 +44,40 @@
             <tbody>
               <var:foreach list="references" item="reference">
                 <tr const:class="referenceListRow">
-                  <td const:class="referenceListCell">
-                    <input var:uid="reference.id"
-                    var:value="reference.name"
-                    const:style="display: none"/>
+		  <td const:class="referenceListCell">
+		    <input var:uid="reference.id"
+			   var:value="reference.name"
+			   const:style="display: none"/>
                     <span><var:string var:value="reference.name"/></span>
-                  </td></tr>
+                </td></tr>
               </var:foreach>
             </tbody>
           </table>
         </div>
-      </td></tr>
-      <tr><td>
-        <div class="bottomToolbar">
-          <a const:id="referenceAdd" class="bottomButton" href="#">
-            <span><img rsrc:src="add-icon.png" label:title="Add" />
+        </td></tr>
+        <tr><td>
+            <div class="bottomToolbar">
+            <a const:id="referenceAdd" class="bottomButton" href="#">
+              <span><img rsrc:src="add-icon.png" label:title="Add" />
             </span></a>
-          <a const:id="referenceDelete" class="bottomButton" href="#">
-            <span><img rsrc:src="remove-icon.png" label:title="Delete" />
+            <a const:id="referenceDelete" class="bottomButton" href="#">
+              <span><img rsrc:src="remove-icon.png" label:title="Delete" />
             </span></a>
-        </div>
-      </td></tr>
-      </table>
-    </div>
-    <input type="hidden" name="referencesValue" id="referencesValue"
-    var:value="referencesValue" />
-    <div id="buttons">
-      <var:if condition="canCreateOrModify"
-        ><a class="button actionButton" name="submit"
-          id="submitButton" href="#" >
-          <span><var:string label:value="Save"/></span>
+          </div>
+        </td></tr>
+        </table>
+      </div>
+      <input type="hidden" name="referencesValue" id="referencesValue"
+        var:value="referencesValue" />
+      <div id="buttons">
+        <var:if condition="canCreateOrModify"
+          ><a class="button actionButton" name="submit" 
+            id="submitButton" href="#" >
+            <span><var:string label:value="Save"/></span>
         </a></var:if>
-      <a const:id="cancelButton" class="button" name="cancel" href="#">
-        <span><var:string label:value="Cancel"/></span>
-      </a>
-    </div>
-  </form>
-</var:component>
+        <a const:id="cancelButton" class="button" name="cancel" href="#">
+            <span><var:string label:value="Cancel"/></span>
+        </a>
+      </div>
+    </form>
+  </var:component>

From 5217bed5ae3e298adc48a4c2e8c94ca1ab0e4891 Mon Sep 17 00:00:00 2001
From: Alexandre Cloutier <acloutier@inverse.ca>
Date: Wed, 16 Jul 2014 14:01:50 -0400
Subject: [PATCH 10/14] Organized the categories and appointments invitations
 inside a tabContainer

---
 UI/Templates/PreferencesUI/UIxPreferences.wox | 146 ++++++++++--------
 UI/WebServerResources/UIxPreferences.css      |  52 ++-----
 UI/WebServerResources/UIxPreferences.js       |   7 +
 UI/WebServerResources/generic.css             |   5 +-
 4 files changed, 103 insertions(+), 107 deletions(-)

diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index e29a95b88..f087316a3 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -216,74 +216,86 @@
                 const:name="reminderList"
                 const:id="reminderList"
                 string="itemReminderText" var:selection="reminder"/></dd>
-              <dt><var:string label:value="Appointments invitations:"/></dt>
-              <dd><input type="checkbox"
-                const:name="preventInvitations"
-                const:id="preventInvitations"
-                var:checked="preventInvitations" />
-                <var:string label:value="Prevent from being invited to appointments"/></dd>
             </dl>
-            <label id="whiteListLabel"><var:string label:value="White list for appointments invitations:"/></label>
-            <div id="appointmentsWhiteListWrapper" class="listWrapper">
-              <table class="tableview" id="tableViewWhiteList">
-                <thead>
-                  <tr class="tableview">
-                    <th const:class="tbtv_headercell" const:id="whiteListTableHeader">
-                      <var:string label:value="Contacts names"/></th>
-                  </tr>
-                </thead>
-                <tbody>
-                  <var:foreach list="appointmentsWhiteList" item="contact">
-                    <tr const:class="whiteListRow">
-                      <td const:class="whiteListCell">
-                        <var:string var:value="contact"/></td>
-                    </tr>
-                  </var:foreach>
-                </tbody>
-              </table>
-            </div>
-            <div id="whiteListToolbar">
-              <a const:id="appointmentsWhiteListAdd" href="#">
-                <img rsrc:src="add-icon.png" label:title="Add" id="WhiteListAdd"/></a>
-              <a const:id="appointmentsWhiteListDelete" href="#">
-                <img rsrc:src="remove-icon.png" label:title="Delete" id="WhiteListDelete" /></a>
-            </div>
-            <input type="hidden" const:id="whiteList"
-            const:name="whiteList" var:value="whiteList"/>
-            
-            <label id="calendarCategoriesLabel"><var:string label:value="Categories"/></label>
-            <div id="calendarCategoriesListWrapper" class="listWrapper">
-              <table class="categoriesList" cellspacing="0">
-                <thead>
-                  <tr class="tableview">
-                    <th const:class="tbtv_headercell" const:id="nameTableHeader">
-                      <var:string label:value="Name"/></th>
-                    <th const:class="tbtv_headercell" const:id="colorTableHeader">
-                      <var:string label:value="Color"/></th>
-                  </tr></thead>
-                <tbody>
-                  <var:foreach list="calendarCategoryList" item="category">
-                    <tr const:class="categoryListRow">
-                      <td const:class="categoryListCell">
-                        <var:string var:value="category"/></td>
-                      <td const:class="categoryListCell">
-                        <div const:class="colorBox" var:data-color="categoryColor"><entity name="nbsp"/></div></td>
-                    </tr>
-                  </var:foreach>
-                </tbody>
-              </table>
-            </div>
-            <div class="bottomToolbar">
-              <a const:id="calendarCategoryAdd" class="bottomButton" href="#">
-                <span><img rsrc:src="add-icon.png" label:title="Add" />
-                </span></a>
-              <a const:id="calendarCategoryDelete" class="bottomButton" href="#">
-                <span><img rsrc:src="remove-icon.png" label:title="Delete" />
-                </span></a>
-            </div>
-            <input type="hidden" const:id="calendarCategoriesValue"
-            const:name="calendarCategoriesValue" var:value="calendarCategoriesValue"/>
-          </div>
+            <div class="tabsContainer" id="calendarOptionsTabs">
+              <ul>
+                <li target="calendarCategoriesView">
+                  <span><var:string label:value="Categories"/></span></li>
+                <li target="calendarAppointmentsInvitationsView">
+                  <span><var:string label:value="Appointments invitations"/></span></li>
+              </ul>
+              <div class="tabs">
+                <div id="calendarCategoriesView" class="tab">
+                  <div id="calendarCategoriesListWrapper" class="listWrapper">
+                    <table class="categoriesList" cellspacing="0">
+                      <thead>
+                        <tr class="tableview">
+                          <th const:class="tbtv_headercell" const:id="nameTableHeader">
+                            <var:string label:value="Name"/></th>
+                          <th const:class="tbtv_headercell" const:id="colorTableHeader">
+                            <var:string label:value="Color"/></th>
+                        </tr>
+                      </thead>
+                      <tbody>
+                        <var:foreach list="calendarCategoryList" item="category">
+                          <tr const:class="categoryListRow">
+                            <td const:class="categoryListCell">
+                              <var:string var:value="category"/></td>
+                            <td const:class="categoryListCell">
+                              <div const:class="colorBox" var:data-color="categoryColor"><entity name="nbsp"/></div></td>
+                          </tr>
+                        </var:foreach>
+                      </tbody>
+                    </table>
+                  </div><!-- #calendarCategoriesListWrapper -->
+                  <div class="bottomToolbar">
+                    <a const:id="calendarCategoryAdd" class="bottomButton" href="#">
+                      <span><img rsrc:src="add-icon.png" label:title="Add" /></span></a>
+                    <a const:id="calendarCategoryDelete" class="bottomButton" href="#">
+                      <span><img rsrc:src="remove-icon.png" label:title="Delete" /> </span></a>
+                  </div><!-- .bottomToolbar -->
+                  <input type="hidden" const:id="calendarCategoriesValue"
+                         const:name="calendarCategoriesValue" var:value="calendarCategoriesValue"/>
+                </div><!-- #calendarCategoriesView -->
+                
+                <div id="calendarAppointmentsInvitationsView" class="tab">
+                  <div><input type="checkbox"
+                              const:name="preventInvitations"
+                              const:id="preventInvitations"
+                              var:checked="preventInvitations" />
+                  <var:string label:value="Prevent from being invited to appointments"/></div>
+                  <hr />
+                  <var:string label:value="White list for appointments invitations:"/>
+                  <div id="appointmentsWhiteListWrapper" class="listWrapper">
+                    <table id="tableViewWhiteList" cellspacing="0">
+                      <thead>
+                        <tr class="tableview">
+                          <th const:class="tbtv_headercell" const:id="whiteListTableHeader">
+                            <var:string label:value="Contacts names"/></th>
+                        </tr>
+                      </thead>
+                      <tbody>
+                        <var:foreach list="appointmentsWhiteList" item="contact">
+                          <tr const:class="whiteListRow">
+                            <td const:class="whiteListCell">
+                              <var:string var:value="contact"/></td>
+                          </tr>
+                        </var:foreach>
+                      </tbody>
+                    </table>
+                  </div><!-- #appointmentsWhiteListWrapper -->
+                  <div class="bottomToolbar">
+                    <a const:id="appointmentsWhiteListAdd" class="bottomButton" href="#">
+                      <span><img rsrc:src="add-icon.png" label:title="Add" /></span></a>
+                    <a const:id="appointmentsWhiteListDelete" class="bottomButton" href="#">
+                      <span><img rsrc:src="remove-icon.png" label:title="Delete" /></span></a>
+                  </div><!-- .bottomToolbar -->
+                  <input type="hidden" const:id="whiteList"
+                         const:name="whiteList" var:value="whiteList"/>
+                </div><!-- #calendarAppointmentsInvitationsView -->
+              </div><!-- .tabs -->
+            </div><!-- #calendarOptionsTabs -->
+          </div><!-- #calendarOptionsView -->
         </var:if>
         <div id="contactsOptionsView" class="tab">
           <label><var:string label:value="Categories"/></label>
diff --git a/UI/WebServerResources/UIxPreferences.css b/UI/WebServerResources/UIxPreferences.css
index 0e525dad5..d9ab197ee 100644
--- a/UI/WebServerResources/UIxPreferences.css
+++ b/UI/WebServerResources/UIxPreferences.css
@@ -13,17 +13,6 @@ DIV.bottomToolbar
   left: 2em;
   right: 2em;
   bottom: 8px; }
-  
-#whiteListToolbar
-{ position: absolute;
-  height: 20px;
-  top: 286px;
-  width: 275px;
-  left: 235px;
-  background-image: url("thead_bg.png");
-  border: 1px solid #9B9B9B;
-  background-color: #E6E7E6;
-}
 
 #WhiteListAdd, #WhiteListDelete
 {
@@ -70,40 +59,27 @@ DIV.listWrapper
 .listWrapper TABLE TD
 { height: 22px; }
 
-#whiteListLabel 
-{
-  position: absolute;
-  left: 12px;
-}
-
-#calendarCategoriesLabel
-{
-  position: absolute;
-  top: 305px;
-  left:0;
-}
-
 #calendarCategoriesListWrapper
-{ top: 320px;
+{ top:1em;
   bottom: 30px;
   right: 2em;
   left: 2em; }
 
 #appointmentsWhiteListWrapper
-{ top: 230px;
-  height: 54px;
-  left:235px;
-  width:275px;
+{ top:4.5em;
+  bottom: 30px;
+  right: 2em;
+  left: 2em; }
 
- }
- 
-#tableViewWhiteList
-{
-  width: 100%;
-}
- 
-#whiteListTableHeader
-{
+#tableViewWhiteList 
+{ width:100%; }
+
+DIV#calendarOptionsTabs 
+{ position: absolute;
+  top: 225px;
+  left: 0px;
+  right: 0px;
+  bottom: 0px;
 }
 
 #contactsCategoriesListWrapper
diff --git a/UI/WebServerResources/UIxPreferences.js b/UI/WebServerResources/UIxPreferences.js
index f4a6d65ec..996e3a502 100644
--- a/UI/WebServerResources/UIxPreferences.js
+++ b/UI/WebServerResources/UIxPreferences.js
@@ -215,6 +215,13 @@ function initPreferences() {
     mailController.attachToTabsContainer(tabsContainer);
   }
   
+  // Inner tabs on the calendar module tab
+  tabsContainer = $('calendarOptionsTabs');
+  if (tabsContainer) {
+    var mailController = new SOGoTabsController();
+    mailController.attachToTabsContainer(tabsContainer);
+  }
+  
   _setupEvents();
   
   // Optional function called when initializing the preferences
diff --git a/UI/WebServerResources/generic.css b/UI/WebServerResources/generic.css
index 64dd2dd35..1564af868 100644
--- a/UI/WebServerResources/generic.css
+++ b/UI/WebServerResources/generic.css
@@ -374,7 +374,7 @@ TH.tbtv_navcell
   text-align: left;
   font-weight: normal;
   background-color: #E7E7E7;
-  height: 20px; }
+  height: 20px;}
 
 TD.sortableTableHeader:active,
 TH.sortableTableHeader:active
@@ -410,7 +410,8 @@ TH.tbtv_headercell IMG.tbtv_sortcell
   text-align: right;
   border: 0px;
   width: 12px;
-  height: 12px; }
+  height: 12px; 
+  top:0;}
 
 .tableview
 { cursor: default;

From eaec5a614d713d397b032f58f6d56ac3034165c6 Mon Sep 17 00:00:00 2001
From: Alexandre Cloutier <acloutier@inverse.ca>
Date: Wed, 16 Jul 2014 14:08:39 -0400
Subject: [PATCH 11/14] Change exception 403 to 409 and fix indentation in the
 javascript

---
 .../Appointments/SOGoAppointmentObject.m      |    2 +-
 UI/WebServerResources/UIxPreferences.js       | 1168 ++++++++---------
 2 files changed, 585 insertions(+), 585 deletions(-)

diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m
index 589374bb6..54de1997c 100644
--- a/SoObjects/Appointments/SOGoAppointmentObject.m
+++ b/SoObjects/Appointments/SOGoAppointmentObject.m
@@ -475,7 +475,7 @@
         [reason appendString:@", "];
     }
     [unavailableAttendees release];
-    return [NSException exceptionWithHTTPStatus:403 reason: reason];
+    return [NSException exceptionWithHTTPStatus:409 reason: reason];
   }
   [unavailableAttendees release];
   return nil;
diff --git a/UI/WebServerResources/UIxPreferences.js b/UI/WebServerResources/UIxPreferences.js
index 996e3a502..d0dc0e737 100644
--- a/UI/WebServerResources/UIxPreferences.js
+++ b/UI/WebServerResources/UIxPreferences.js
@@ -3,114 +3,114 @@ var mailAccounts = null;
 var dialogs = {};
 
 function savePreferences(sender) {
-  var sendForm = true;
-  
-  var sigList = $("signaturePlacementList");
-  if (sigList)
-    sigList.disabled = false;
-  
-  if ($("appointmentsWhiteListWrapper"))
-    serializeAppointmentsWhiteList();
-  
-  if ($("calendarCategoriesListWrapper"))
-    serializeCalendarCategories();
-  
-  if ($("contactsCategoriesListWrapper"))
-    serializeContactsCategories();
-  
-  if ($("mailLabelsListWrapper"))
-    serializeMailLabels();
-  
-  if (typeof mailCustomFromEnabled !== "undefined" && !emailRE.test($("email").value)) {
-    showAlertDialog(_("Please specify a valid sender address."));
-    sendForm = false;
-  }
-  
-  if ($("replyTo")) {
-    var replyTo = $("replyTo").value;
-    if (!replyTo.blank() && !emailRE.test(replyTo)) {
-      showAlertDialog(_("Please specify a valid reply-to address."));
-      sendForm = false;
-    }
-  }
-  
-  if ($("dayStartTime")) {
-    var start = $("dayStartTime");
-    var selectedStart = parseInt(start.options[start.selectedIndex].value);
-    var end = $("dayEndTime");
-    var selectedEnd = parseInt(end.options[end.selectedIndex].value);
+    var sendForm = true;
     
-    if (selectedStart >= selectedEnd) {
-      showAlertDialog (_("Day start time must be prior to day end time."));
-      sendForm = false;
-    }
-  }
-  
-  if ($("enableVacation") && $("enableVacation").checked) {
-    if ($("autoReplyText").value.strip().length == 0 || $("autoReplyEmailAddresses").value.strip().length == 0) {
-      showAlertDialog(_("Please specify your message and your email addresses for which you want to enable auto reply."));
-      sendForm = false;
-    }
+    var sigList = $("signaturePlacementList");
+    if (sigList)
+        sigList.disabled = false;
     
-    if ($("autoReplyText").value.strip().endsWith('\n.')) {
-      showAlertDialog(_("Your vacation message must not end with a single dot on a line."));
-	    sendForm = false;
-    }
+    if ($("appointmentsWhiteListWrapper"))
+        serializeAppointmentsWhiteList();
     
-    if ($("enableVacationEndDate") && $("enableVacationEndDate").checked) {
-      var e = $("vacationEndDate_date");
-      var endDate = e.inputAsDate();
-      var now = new Date();
-      if (isNaN(endDate.getTime()) || endDate.getTime() < now.getTime()) {
-        showAlertDialog(_("End date of your auto reply must be in the future."));
+    if ($("calendarCategoriesListWrapper"))
+        serializeCalendarCategories();
+    
+    if ($("contactsCategoriesListWrapper"))
+        serializeContactsCategories();
+    
+    if ($("mailLabelsListWrapper"))
+        serializeMailLabels();
+    
+    if (typeof mailCustomFromEnabled !== "undefined" && !emailRE.test($("email").value)) {
+        showAlertDialog(_("Please specify a valid sender address."));
         sendForm = false;
-      }
     }
-  }
-  
-  if ($("enableForward") && $("enableForward").checked) {
-    var addresses = $("forwardAddress").value.split(",");
-    for (var i = 0; i < addresses.length && sendForm; i++)
-      if (!emailRE.test(addresses[i].strip())) {
-        showAlertDialog(_("Please specify an address to which you want to forward your messages."));
-        sendForm = false;
-      }
-  }
-  
-  if (typeof sieveCapabilities != "undefined") {
-    var jsonFilters = prototypeIfyFilters();
-    $("sieveFilters").setValue(Object.toJSON(jsonFilters));
-  }
-  
-  if (sendForm) {
-    saveMailAccounts();
     
-    triggerAjaxRequest($("mainForm").readAttribute("action"), function (http) {
-      if (http.readyState == 4) {
-        var response = http.responseText.evalJSON(true);
-        if (http.status == 503) {
-          showAlertDialog(_(response.textStatus));
+    if ($("replyTo")) {
+        var replyTo = $("replyTo").value;
+        if (!replyTo.blank() && !emailRE.test(replyTo)) {
+            showAlertDialog(_("Please specify a valid reply-to address."));
+            sendForm = false;
         }
-        else if (http.status == 200) {
-          if (response.hasChanged == 1) {
-            window.opener.location.reload();
-            window.close();
-          }
-          else {
-            window.close();
-          }
+    }
+    
+    if ($("dayStartTime")) {
+        var start = $("dayStartTime");
+        var selectedStart = parseInt(start.options[start.selectedIndex].value);
+        var end = $("dayEndTime");
+        var selectedEnd = parseInt(end.options[end.selectedIndex].value);
+        
+        if (selectedStart >= selectedEnd) {
+            showAlertDialog (_("Day start time must be prior to day end time."));
+            sendForm = false;
         }
-        else {
-          showAlertDialog(_(response.textStatus));
+    }
+    
+    if ($("enableVacation") && $("enableVacation").checked) {
+        if ($("autoReplyText").value.strip().length == 0 || $("autoReplyEmailAddresses").value.strip().length == 0) {
+            showAlertDialog(_("Please specify your message and your email addresses for which you want to enable auto reply."));
+            sendForm = false;
         }
-      }
-    },
-    null,
-    Form.serialize($("mainForm")), // excludes the file input
-    { "Content-type": "application/x-www-form-urlencoded"}
-    );
+        
+        if ($("autoReplyText").value.strip().endsWith('\n.')) {
+            showAlertDialog(_("Your vacation message must not end with a single dot on a line."));
+            sendForm = false;
+        }
+        
+        if ($("enableVacationEndDate") && $("enableVacationEndDate").checked) {
+            var e = $("vacationEndDate_date");
+            var endDate = e.inputAsDate();
+            var now = new Date();
+            if (isNaN(endDate.getTime()) || endDate.getTime() < now.getTime()) {
+                showAlertDialog(_("End date of your auto reply must be in the future."));
+                sendForm = false;
+            }
+        }
+    }
+    
+    if ($("enableForward") && $("enableForward").checked) {
+        var addresses = $("forwardAddress").value.split(",");
+        for (var i = 0; i < addresses.length && sendForm; i++)
+            if (!emailRE.test(addresses[i].strip())) {
+                showAlertDialog(_("Please specify an address to which you want to forward your messages."));
+                sendForm = false;
+            }
+    }
+    
+    if (typeof sieveCapabilities != "undefined") {
+        var jsonFilters = prototypeIfyFilters();
+        $("sieveFilters").setValue(Object.toJSON(jsonFilters));
+    }
+    
+    if (sendForm) {
+        saveMailAccounts();
+        
+        triggerAjaxRequest($("mainForm").readAttribute("action"), function (http) {
+                           if (http.readyState == 4) {
+                           var response = http.responseText.evalJSON(true);
+                           if (http.status == 503) {
+                           showAlertDialog(_(response.textStatus));
+                           }
+                           else if (http.status == 200) {
+                           if (response.hasChanged == 1) {
+                           window.opener.location.reload();
+                           window.close();
+                           }
+                           else {
+                           window.close();
+                           }
+                           }
+                           else {
+                           showAlertDialog(_(response.textStatus));
+                           }
+                           }
+                           },
+                           null,
+                           Form.serialize($("mainForm")), // excludes the file input
+                           { "Content-type": "application/x-www-form-urlencoded"}
+                           );
 	}
-  return false;
+    return false;
 }
 
 function prototypeIfyFilters() {
@@ -121,14 +121,14 @@ function prototypeIfyFilters() {
         newFilter.name = filter.name;
         newFilter.match = filter.match;
         newFilter.active = filter.active;
-
+        
         if (filter.rules) {
             newFilter.rules = $([]);
             for (var j = 0; j < filter.rules.length; j++) {
                 newFilter.rules.push($(filter.rules[j]));
             }
         }
-
+        
         if (filter.actions) {
             newFilter.actions = $([]);
             for (var j = 0; j < filter.actions.length; j++) {
@@ -137,31 +137,31 @@ function prototypeIfyFilters() {
         }
         newFilters.push(newFilter);
     }
-
+    
     return newFilters;
 }
 
 function _setupEvents() {
     var widgets = [ "timezone", "shortDateFormat", "longDateFormat",
-                    "timeFormat", "weekStartDay", "dayStartTime", "dayEndTime",
-                    "firstWeek", "messageCheck", "sortByThreads", "displayRemoteInlineImages",
-                    "subscribedFoldersOnly", "language", "defaultCalendar",
-                    "enableVacation" ];
+                   "timeFormat", "weekStartDay", "dayStartTime", "dayEndTime",
+                   "firstWeek", "messageCheck", "sortByThreads", "displayRemoteInlineImages",
+                   "subscribedFoldersOnly", "language", "defaultCalendar",
+                   "enableVacation" ];
     for (var i = 0; i < widgets.length; i++) {
         var widget = $(widgets[i]);
         if (widget) {
             widget.observe("change", onChoiceChanged);
         }
     }
-
+    
     // We check for non-null elements as replyPlacementList and composeMessagesType
     // might not be present if ModulesConstraints disable those elements
     if ($("replyPlacementList"))
         $("replyPlacementList").on("change", onReplyPlacementListChange);
-
+    
     if ($("composeMessagesType"))
         $("composeMessagesType").on("change", onComposeMessagesTypeChange);
-
+    
     // Note: we also monitor changes to the calendar categories.
     // See functions endEditable and onColorPickerChoice.
     var valueInputs = [ "calendarCategoriesValue", "calendarCategoriesValue" ];
@@ -186,166 +186,166 @@ function onChoiceChanged(event) {
 function addDefaultEmailAddresses(event) {
     var defaultAddresses = $("defaultEmailAddresses").value.split(/, */);
     var addresses = $("autoReplyEmailAddresses").value.trim();
-
+    
     if (addresses) addresses = addresses.split(/, */);
     else addresses = new Array();
-
+    
     defaultAddresses.each(function(adr) {
-        for (var i = 0; i < addresses.length; i++)
-            if (adr == addresses[i])
-                break;
-        if (i == addresses.length)
-            addresses.push(adr);
-    });
-
+                          for (var i = 0; i < addresses.length; i++)
+                          if (adr == addresses[i])
+                          break;
+                          if (i == addresses.length)
+                          addresses.push(adr);
+                          });
+    
     $("autoReplyEmailAddresses").value = addresses.join(", ");
-
+    
     event.stop();
 }
 
 function initPreferences() {
-  var tabsContainer = $("preferencesTabs");
-  var controller = new SOGoTabsController();
-  controller.attachToTabsContainer(tabsContainer);
-  
-  // Inner tabs on the mail module tab
-  tabsContainer = $('mailOptionsTabs');
-  if (tabsContainer) {
-    var mailController = new SOGoTabsController();
-    mailController.attachToTabsContainer(tabsContainer);
-  }
-  
-  // Inner tabs on the calendar module tab
-  tabsContainer = $('calendarOptionsTabs');
-  if (tabsContainer) {
-    var mailController = new SOGoTabsController();
-    mailController.attachToTabsContainer(tabsContainer);
-  }
-  
-  _setupEvents();
-  
-  // Optional function called when initializing the preferences
-  // Typically defined inline in the UIxAdditionalPreferences.wox template
-  if (typeof (initAdditionalPreferences) != "undefined")
-    initAdditionalPreferences();
-  
-  // Color picker
-  $('colorPickerDialog').on('click', 'span', onColorPickerChoice);
-  $(document.body).on("click", onBodyClickHandler);
-  
-  // Calendar whiteList
-  var whiteList = $("appointmentsWhiteListWrapper");
-  if(whiteList) {
-    var whiteListValue = $("whiteList").getValue();
-    if (whiteListValue != "") {
-      whiteListValue = whiteListValue.split(",");
-      var tablebody = $("appointmentsWhiteListWrapper").childNodesWithTag("table")[0].tBodies[0];
-      for (i = 0; i < whiteListValue.length; i++)
-      {
-        var elements = whiteListValue[i].split("=");
-        var row = new Element("tr");
-        var td = new Element("td").update("");
-        var textField = new Element("input");
-        var span = new Element("span");
-        
-        row.addClassName("whiteListRow");
-        row.observe("mousedown", onRowClick);
-        td.addClassName ("whiteListCell");
-        td.observe("mousedown", endAllEditables);
-        td.observe("dblclick", onNameEdit);
-        textField.addInterface(SOGoAutoCompletionInterface);
-        textField.SOGoUsersSearch = true;
-        textField.observe("autocompletion:changed", endEditable);
-        textField.addClassName("textField");
-        textField.value = elements[1];
-        textField.setAttribute("uid", elements[0]);
-        textField.hide();
-        span.innerText = elements[1];
-        
-        td.appendChild(textField);
-        td.appendChild(span);
-        row.appendChild (td);
-        tablebody.appendChild(row);
-        $(tablebody).deselectAll();
-        
-      }
+    var tabsContainer = $("preferencesTabs");
+    var controller = new SOGoTabsController();
+    controller.attachToTabsContainer(tabsContainer);
+    
+    // Inner tabs on the mail module tab
+    tabsContainer = $('mailOptionsTabs');
+    if (tabsContainer) {
+        var mailController = new SOGoTabsController();
+        mailController.attachToTabsContainer(tabsContainer);
     }
     
-    var table = whiteList.childNodesWithTag("table")[0];
-    table.multiselect = true;
-    $("appointmentsWhiteListAdd").observe("click", onAppointmentsWhiteListAdd);
-    $("appointmentsWhiteListDelete").observe("click", onAppointmentsWhiteListDelete);
-  }
-  
-  // Calender categories
-  var wrapper = $("calendarCategoriesListWrapper");
-  if (wrapper) {
-    var table = wrapper.childNodesWithTag("table")[0];
-    resetCalendarCategoriesColors(null);
-    var r = $$("#calendarCategoriesListWrapper tbody tr");
-    for (var i= 0; i < r.length; i++)
-      r[i].identify();
-    table.multiselect = true;
-    resetCalendarTableActions();
-    $("calendarCategoryAdd").observe("click", onCalendarCategoryAdd);
-    $("calendarCategoryDelete").observe("click", onCalendarCategoryDelete);
-    wrapper.observe("scroll", onBodyClickHandler);
-  }
-  
-  // Mail labels/tags
-  var wrapper = $("mailLabelsListWrapper");
-  if (wrapper) {
-    var table = wrapper.childNodesWithTag("table")[0];
-    resetMailLabelsColors(null);
-    var r = $$("#mailLabelsListWrapper tbody tr");
-    for (var i= 0; i < r.length; i++)
-      r[i].identify();
-    table.multiselect = true;
-    resetMailTableActions();
-    $("mailLabelAdd").observe("click", onMailLabelAdd);
-    $("mailLabelDelete").observe("click", onMailLabelDelete);
-  }
-  
-  // Contact categories
-  wrapper = $("contactsCategoriesListWrapper");
-  if (wrapper) {
-    var table = wrapper.childNodesWithTag("table")[0];
-    var r = $$("#contactsCategoriesListWrapper tbody tr");
-    for (var i= 0; i < r.length; i++)
-      r[i].identify();
-    table.multiselect = true;
-    resetContactsTableActions();
-    $("contactsCategoryAdd").observe("click", onContactsCategoryAdd);
-    $("contactsCategoryDelete").observe("click", onContactsCategoryDelete);
-  }
-  
-  if ($("replyPlacementList"))
-    onReplyPlacementListChange();
-  
-  var button = $("addDefaultEmailAddresses");
-  if (button)
-    button.observe("click", addDefaultEmailAddresses);
-  
-  button = $("changePasswordBtn");
-  if (button)
-    button.observe("click", onChangePasswordClick);
-  
-  initSieveFilters();
-  
-  initMailAccounts();
-  
-  button = $("enableVacationEndDate");
-  if (button) {
-    jQuery("#vacationEndDate_date").closest(".date").datepicker(
-                                                                { autoclose: true, position: 'above', weekStart: $('weekStartDay').getValue() });
-    button.on("click", function(event) {
-              if (this.checked)
-              $("vacationEndDate_date").enable();
-              else
-              $("vacationEndDate_date").disable();
-              });
-  }
-  onAddOutgoingAddressesCheck();
+    // Inner tabs on the calendar module tab
+    tabsContainer = $('calendarOptionsTabs');
+    if (tabsContainer) {
+        var mailController = new SOGoTabsController();
+        mailController.attachToTabsContainer(tabsContainer);
+    }
+    
+    _setupEvents();
+    
+    // Optional function called when initializing the preferences
+    // Typically defined inline in the UIxAdditionalPreferences.wox template
+    if (typeof (initAdditionalPreferences) != "undefined")
+        initAdditionalPreferences();
+    
+    // Color picker
+    $('colorPickerDialog').on('click', 'span', onColorPickerChoice);
+    $(document.body).on("click", onBodyClickHandler);
+    
+    // Calendar whiteList
+    var whiteList = $("appointmentsWhiteListWrapper");
+    if(whiteList) {
+        var whiteListValue = $("whiteList").getValue();
+        if (whiteListValue != "") {
+            whiteListValue = whiteListValue.split(",");
+            var tablebody = $("appointmentsWhiteListWrapper").childNodesWithTag("table")[0].tBodies[0];
+            for (i = 0; i < whiteListValue.length; i++)
+              {
+                var elements = whiteListValue[i].split("=");
+                var row = new Element("tr");
+                var td = new Element("td").update("");
+                var textField = new Element("input");
+                var span = new Element("span");
+                
+                row.addClassName("whiteListRow");
+                row.observe("mousedown", onRowClick);
+                td.addClassName ("whiteListCell");
+                td.observe("mousedown", endAllEditables);
+                td.observe("dblclick", onNameEdit);
+                textField.addInterface(SOGoAutoCompletionInterface);
+                textField.SOGoUsersSearch = true;
+                textField.observe("autocompletion:changed", endEditable);
+                textField.addClassName("textField");
+                textField.value = elements[1];
+                textField.setAttribute("uid", elements[0]);
+                textField.hide();
+                span.innerText = elements[1];
+                
+                td.appendChild(textField);
+                td.appendChild(span);
+                row.appendChild (td);
+                tablebody.appendChild(row);
+                $(tablebody).deselectAll();
+                
+              }
+        }
+        
+        var table = whiteList.childNodesWithTag("table")[0];
+        table.multiselect = true;
+        $("appointmentsWhiteListAdd").observe("click", onAppointmentsWhiteListAdd);
+        $("appointmentsWhiteListDelete").observe("click", onAppointmentsWhiteListDelete);
+    }
+    
+    // Calender categories
+    var wrapper = $("calendarCategoriesListWrapper");
+    if (wrapper) {
+        var table = wrapper.childNodesWithTag("table")[0];
+        resetCalendarCategoriesColors(null);
+        var r = $$("#calendarCategoriesListWrapper tbody tr");
+        for (var i= 0; i < r.length; i++)
+            r[i].identify();
+        table.multiselect = true;
+        resetCalendarTableActions();
+        $("calendarCategoryAdd").observe("click", onCalendarCategoryAdd);
+        $("calendarCategoryDelete").observe("click", onCalendarCategoryDelete);
+        wrapper.observe("scroll", onBodyClickHandler);
+    }
+    
+    // Mail labels/tags
+    var wrapper = $("mailLabelsListWrapper");
+    if (wrapper) {
+        var table = wrapper.childNodesWithTag("table")[0];
+        resetMailLabelsColors(null);
+        var r = $$("#mailLabelsListWrapper tbody tr");
+        for (var i= 0; i < r.length; i++)
+            r[i].identify();
+        table.multiselect = true;
+        resetMailTableActions();
+        $("mailLabelAdd").observe("click", onMailLabelAdd);
+        $("mailLabelDelete").observe("click", onMailLabelDelete);
+    }
+    
+    // Contact categories
+    wrapper = $("contactsCategoriesListWrapper");
+    if (wrapper) {
+        var table = wrapper.childNodesWithTag("table")[0];
+        var r = $$("#contactsCategoriesListWrapper tbody tr");
+        for (var i= 0; i < r.length; i++)
+            r[i].identify();
+        table.multiselect = true;
+        resetContactsTableActions();
+        $("contactsCategoryAdd").observe("click", onContactsCategoryAdd);
+        $("contactsCategoryDelete").observe("click", onContactsCategoryDelete);
+    }
+    
+    if ($("replyPlacementList"))
+        onReplyPlacementListChange();
+    
+    var button = $("addDefaultEmailAddresses");
+    if (button)
+        button.observe("click", addDefaultEmailAddresses);
+    
+    button = $("changePasswordBtn");
+    if (button)
+        button.observe("click", onChangePasswordClick);
+    
+    initSieveFilters();
+    
+    initMailAccounts();
+    
+    button = $("enableVacationEndDate");
+    if (button) {
+        jQuery("#vacationEndDate_date").closest(".date").datepicker(
+                                                                    { autoclose: true, position: 'above', weekStart: $('weekStartDay').getValue() });
+        button.on("click", function(event) {
+                  if (this.checked)
+                  $("vacationEndDate_date").enable();
+                  else
+                  $("vacationEndDate_date").disable();
+                  });
+    }
+    onAddOutgoingAddressesCheck();
 }
 
 function initSieveFilters() {
@@ -369,11 +369,11 @@ function appendSieveFilterRow(filterTable, number, filter) {
     var row = createElement("tr");
     row.observe("mousedown", onRowClick);
     row.observe("dblclick", onFilterEdit.bindAsEventListener(row));
-
+    
     var nameColumn = createElement("td");
     nameColumn.appendChild(document.createTextNode(filter["name"]));
     row.appendChild(nameColumn);
-
+    
     var activeColumn = createElement("td", null, "activeColumn");
     var cb = createElement("input", null, "checkBox",
                            { type: "checkbox" },
@@ -382,7 +382,7 @@ function appendSieveFilterRow(filterTable, number, filter) {
     var bound = onScriptActiveCheck.bindAsEventListener(cb);
     cb.observe("click", bound);
     row.appendChild(activeColumn);
-
+    
     filterTable.tBodies[0].appendChild(row);
 }
 
@@ -399,7 +399,7 @@ function updateSieveFilterRow(filterTable, number, filter) {
         nameColumn.removeChild(nameColumn.firstChild);
     }
     nameColumn.appendChild(document.createTextNode(filter.name));
-
+    
     var activeColumn = columns[1];
     var cb = activeColumn.childNodesWithTag("input");
     cb[0].checked = filter.active;
@@ -478,7 +478,7 @@ function onFilterMoveDown(event) {
 function onFilterEdit(event) {
     _editFilter(this.rowIndex - 1);
     event.stop();
-
+    
     return false;
 }
 
@@ -497,7 +497,7 @@ function copyFilter(originalFilter) {
     for (var i = 0; i < originalFilter.actions.length; i++) {
         newFilter.actions.push(_copyFilterElement(originalFilter.actions[i]));
     }
-
+    
     return newFilter;
 }
 
@@ -509,7 +509,7 @@ function _copyFilterElement(filterElement) { /* element = rule or action */
             newElement[k] = value;
         }
     }
-
+    
     return newElement;
 }
 
@@ -527,7 +527,7 @@ function setupMailboxesFromJSON(jsonResponse) {
     userMailboxes = $([]);
     for (var i = 0; i < responseMboxes.length; i++) {
         var mbox = { 'displayName': responseMboxes[i].displayName.substr(1),
-                     'path': responseMboxes[i].path.substr(1) };
+            'path': responseMboxes[i].path.substr(1) };
         userMailboxes.push(mbox);
     }
 }
@@ -540,7 +540,7 @@ function updateFilterFromEditor(filterId, filterJSON) {
             sanitized[k] = filter[k];
         }
     }
-
+    
     var table = $("filtersList");
     if (filterId == "new") {
         var newNumber = filters.length;
@@ -557,7 +557,7 @@ function initMailAccounts() {
     var mailAccountsJSON = $("mailAccountsJSON");
     if (mailAccountsJSON) {
         mailAccounts = mailAccountsJSON.value.evalJSON();
-
+        
         var mailAccountsList = $("mailAccountsList");
         if (mailAccountsList) {
             var li = createMailAccountLI(mailAccounts[0], true);
@@ -569,7 +569,7 @@ function initMailAccounts() {
             var lis = mailAccountsList.childNodesWithTag("li");
             lis[0].readOnly = true;
             lis[0].selectElement();
-
+            
             var button = $("mailAccountAdd");
             if (button) {
                 button.observe("click", onMailAccountAdd);
@@ -579,19 +579,19 @@ function initMailAccounts() {
                 button.observe("click", onMailAccountDelete);
             }
         }
-
+        
         var inputs = $$("#accountInfo input");
         for (var i = 0; i < inputs.length; i++) {
             $(inputs[i]).observe("change", onMailAccountInfoChange);
         }
-
+        
         inputs = $$("#identityInfo input");
         for (var i = 0; i < inputs.length; i++) {
             $(inputs[i]).observe("change", onMailIdentityInfoChange);
         }
         $("actSignature").observe("click", onMailIdentitySignatureClick);
         displayMailAccount(mailAccounts[0], true);
-
+        
         inputs = $$("#returnReceiptsInfo input");
         for (var i = 0; i < inputs.length; i++) {
             $(inputs[i]).observe("change", onMailReceiptInfoChange);
@@ -625,10 +625,10 @@ function onMailReceiptInfoChange(event) {
     }
     var keyName = this.name.cssIdToHungarianId();
     this.mailAccount["receipts"][keyName] = this.value;
-
+    
     var popupIds = [ "receipt-non-recipient-action",
-                     "receipt-outside-domain-action",
-                     "receipt-any-action" ];
+                    "receipt-outside-domain-action",
+                    "receipt-any-action" ];
     var receiptActionsDisable = (this.value == "ignore");
     for (var i = 0; i < popupIds.length; i++) {
         var actionPopup = $(popupIds[i]);
@@ -664,19 +664,19 @@ function onMailIdentitySignatureClick(event) {
             if (Prototype.Browser.IE)
                 // Overwrite some fixes from iefixes.css
                 dialog.setStyle({ width: 'auto', marginLeft: 'auto' });
-
+            
             document.body.appendChild(dialog);
             dialogs[dialogId] = dialog;
-
+            
             if ($("composeMessagesType").value != 0) {
                 CKEDITOR.replace('signature',
                                  { height: "150px",
-                                   toolbar: [['Bold', 'Italic', '-', 'Link',
-                                              'Font','FontSize','-','TextColor',
-                                              'BGColor']
-                                            ],
-                                   language: localeCode,
-                                   scayt_sLang: localeCode });
+                                 toolbar: [['Bold', 'Italic', '-', 'Link',
+                                            'Font','FontSize','-','TextColor',
+                                            'BGColor']
+                                           ],
+                                 language: localeCode,
+                                 scayt_sLang: localeCode });
             }
         }
         dialog.mailAccount = this.mailAccount;
@@ -689,16 +689,16 @@ function onMailIdentitySignatureClick(event) {
             area.value = identity["signature"];
         else
             area.value = "";
-
+        
         $("bgDialogDiv").show();
         if (Prototype.Browser.IE)
             jQuery('#bgDialogDiv').css('opacity', 0.4);
         jQuery(dialog).fadeIn('fast', function() {
-            if (CKEDITOR.instances["signature"])
-                focusCKEditor();
-            else
-                area.focus();
-        });
+                              if (CKEDITOR.instances["signature"])
+                              focusCKEditor();
+                              else
+                              area.focus();
+                              });
         Event.stop(event);
     }
 }
@@ -708,7 +708,7 @@ function focusCKEditor() {
         setTimeout("focusCKEditor()", 100);
     else
         CKEDITOR.instances.signature.focus()
-}
+        }
 
 function hideSignature() {
     if (CKEDITOR.status != 'loaded')
@@ -724,7 +724,7 @@ function onMailIdentitySignatureOK(event) {
         mailAccount["identities"] = [{}];
     }
     var identity = mailAccount["identities"][0];
-
+    
     var content = (CKEDITOR.instances["signature"]
                    ? CKEDITOR.instances["signature"].getData()
                    : $("signature").value);
@@ -753,7 +753,7 @@ function createMailAccountLI(mailAccount, readOnly) {
         li.editionController = editionCtlr;
     }
     li.mailAccount = mailAccount;
-
+    
     return li;
 }
 
@@ -764,10 +764,10 @@ function onMailAccountEntryClick(event) {
 function displayMailAccount(mailAccount, readOnly) {
     var inputs = $$("#accountInfo input");
     inputs.each(function(i) {
-        i.disabled = readOnly;
-        i.mailAccount = mailAccount;
-    });
-
+                i.disabled = readOnly;
+                i.mailAccount = mailAccount;
+                });
+    
     inputs = $$("#identityInfo input");
     inputs.each(function(i) { i.mailAccount = mailAccount; });
     if (!mailCustomFromEnabled) {
@@ -775,16 +775,16 @@ function displayMailAccount(mailAccount, readOnly) {
             inputs[i].disabled = readOnly;
         }
     }
-
+    
     var form = $("mainForm");
-
+    
     var encryption = "none";
     var encRadioValues = [ "none", "ssl", "tls" ];
     if (mailAccount["encryption"]) {
         encryption = mailAccount["encryption"];
     }
     form.setRadioValue("encryption", encRadioValues.indexOf(encryption));
-
+    
     var port;
     if (mailAccount["port"]) {
         port = mailAccount["port"];
@@ -798,20 +798,20 @@ function displayMailAccount(mailAccount, readOnly) {
         }
     }
     $("port").value = port;
-
+    
     $("serverName").value = mailAccount["serverName"];
     $("userName").value = mailAccount["userName"];
     $("password").value = mailAccount["password"];
-
+    
     var identity = (mailAccount["identities"]
                     ? mailAccount["identities"][0]
                     : {} );
     $("fullName").value = identity["fullName"] || "";
     $("email").value = identity["email"] || "";
     $("replyTo").value = identity["replyTo"] || "";
-
+    
     displayAccountSignature(mailAccount);
-
+    
     var receiptAction = "ignore";
     var receiptActionValues = [ "ignore", "allow" ];
     if (mailAccount["receipts"] &&  mailAccount["receipts"]["receiptAction"]) {
@@ -825,8 +825,8 @@ function displayMailAccount(mailAccount, readOnly) {
     form.setRadioValue("receipt-action",
                        receiptActionValues.indexOf(receiptAction));
     var popupIds = [ "receipt-non-recipient-action",
-                     "receipt-outside-domain-action",
-                     "receipt-any-action" ];
+                    "receipt-outside-domain-action",
+                    "receipt-any-action" ];
     var receiptActionsDisable = (receiptAction == "ignore");
     for (var i = 0; i < popupIds.length; i++) {
         var actionPopup = $(popupIds[i]);
@@ -844,7 +844,7 @@ function displayMailAccount(mailAccount, readOnly) {
 function displayAccountSignature(mailAccount) {
     var actSignature = $("actSignature");
     actSignature.mailAccount = mailAccount;
-
+    
     var actSignatureValue;
     var identity = (mailAccount["identities"]
                     ? mailAccount["identities"][0]
@@ -876,13 +876,13 @@ function createMailAccount() {
         newIdentity[k] = firstIdentity[k];
     }
     delete newIdentity["isDefault"];
-
+    
     var newMailAccount = { name: _("New Mail Account"),
-                           serverName: "mailserver",
-                           userName: UserLogin,
-                           password: "",
-                           identities: [ newIdentity ] };
-
+    serverName: "mailserver",
+    userName: UserLogin,
+    password: "",
+        identities: [ newIdentity ] };
+    
     return newMailAccount;
 }
 
@@ -899,10 +899,10 @@ function onMailAccountAdd(event) {
     displayMailAccount(newMailAccount, false);
     li.selectElement();
     li.editionController.startEditing();
-
+    
     var hasChanged = $("hasChanged");
     hasChanged.value = "1";
-
+    
     event.stop();
 }
 
@@ -923,7 +923,7 @@ function onMailAccountDelete(event) {
             mailAccounts.splice(index, 1);
             next.selectElement();
             displayMailAccount(next.mailAccount, next.readOnly);
-
+            
             var hasChanged = $("hasChanged");
             hasChanged.value = "1";
         }
@@ -933,26 +933,26 @@ function onMailAccountDelete(event) {
 
 function saveMailAccounts() {
     /* This removal enables us to avoid a few warning from SOPE for the inputs
-       that were created dynamically. */
+     that were created dynamically. */
     var editor = $("mailAccountEditor");
-
+    
     // Could be null if ModuleConstraints disables email access
     if (editor)
     	//Instead of removing the modules, we disable it. This will prevent the window to crash if we have a connection error.
-      editor.select('input, select').each(function(i) { i.disable(); })
-
-    compactMailAccounts();
+        editor.select('input, select').each(function(i) { i.disable(); })
+        
+        compactMailAccounts();
     var mailAccountsJSON = $("mailAccountsJSON");
-
+    
     if (mailAccountsJSON)
         mailAccountsJSON.value = Object.toJSON(mailAccounts);
 }
 
 function compactMailAccounts() {
-
+    
     if (!mailAccounts)
         return;
-
+    
     for (var i = 1; i < mailAccounts.length; i++) {
         var account = mailAccounts[i];
         var encryption = account["encryption"];
@@ -977,12 +977,12 @@ function compactMailAccounts() {
 /* common function between calendar categories and mail labels */
 function onColorEdit(e, target) {
     var view = $(target);
-
+    
     view.select('div.colorEditing').each(function(box) {
-        box.removeClassName('colorEditing');
-    });
+                                         box.removeClassName('colorEditing');
+                                         });
     this.addClassName("colorEditing");
-
+    
     var cellPosition = this.cumulativeOffset();
     var cellDimensions = this.getDimensions();
     var div = $('colorPickerDialog');
@@ -999,17 +999,17 @@ function onColorPickerChoice(event) {
     var dialog = span.up('.dialog');
     var target = dialog.readAttribute('data-target');
     var newColor = "#" + span.className.substr(4);
-
+    
     var wrapper = $(target);
     var div = wrapper.select("div.colorEditing").first();
-
+    
     div.writeAttribute('data-color', newColor);
     div.style.background = newColor;
     if (parseInt($("hasChanged").value) == 0) {
         var hasChanged = $("hasChanged");
         hasChanged.value = "1";
     }
-
+    
     dialog.hide();
 }
 
@@ -1032,116 +1032,116 @@ function onCalendarColorEdit(e) {
 }
 
 function makeEditable (element) {
-  element.addClassName("editing");
-  element.removeClassName("whiteListCell");
-  
-  var span = element.down("SPAN");
-  span.update();
-  
-  var textField = element.down("INPUT");
-  textField.show();
-  textField.focus();
-  textField.select();
-  
-  return true;
+    element.addClassName("editing");
+    element.removeClassName("whiteListCell");
+    
+    var span = element.down("SPAN");
+    span.update();
+    
+    var textField = element.down("INPUT");
+    textField.show();
+    textField.focus();
+    textField.select();
+    
+    return true;
 }
 
 function endAllEditables (e) {
-  var r = $$("TABLE#tableViewWhiteList TBODY TR TD");
-  for (var i = 0; i < r.length; i++) {
-    var element = $(r[i]);
-    if (r[i] != this && element.hasClassName("editing"))
-      endEditable(null, element.down("INPUT"));
-  }
+    var r = $$("TABLE#tableViewWhiteList TBODY TR TD");
+    for (var i = 0; i < r.length; i++) {
+        var element = $(r[i]);
+        if (r[i] != this && element.hasClassName("editing"))
+            endEditable(null, element.down("INPUT"));
+    }
 }
 
 function onNameEdit (e) {
-  endAllEditables();
-  if (!this.hasClassName("editing")) {
-    makeEditable (this);
-  }
+    endAllEditables();
+    if (!this.hasClassName("editing")) {
+        makeEditable (this);
+    }
 }
 
 function endEditable(event, textField) {
-  if (!textField)
-    textField = this;
-  
-  var uid = textField.readAttribute("uid");
-  var cell = textField.up("TD");
-  var textSpan = cell.down("SPAN");
-  
-  cell.removeClassName("editing");
-  cell.addClassName("whiteListCell");
-  textField.hide();
-  
-  var tmp = textField.value;
-  tmp = tmp.replace (/</, "&lt;");
-  tmp = tmp.replace (/>/, "&gt;");
-  if (!uid)
-    cell.up("TR").addClassName("notfound");
-  if (tmp)
-    textSpan.update(tmp);
-  else
-    cell.up("TR").remove();
-  
-  if (event)
-    Event.stop(event);
-  
-  return false;
+    if (!textField)
+        textField = this;
+    
+    var uid = textField.readAttribute("uid");
+    var cell = textField.up("TD");
+    var textSpan = cell.down("SPAN");
+    
+    cell.removeClassName("editing");
+    cell.addClassName("whiteListCell");
+    textField.hide();
+    
+    var tmp = textField.value;
+    tmp = tmp.replace (/</, "&lt;");
+    tmp = tmp.replace (/>/, "&gt;");
+    if (!uid)
+        cell.up("TR").addClassName("notfound");
+    if (tmp)
+        textSpan.update(tmp);
+    else
+        cell.up("TR").remove();
+    
+    if (event)
+        Event.stop(event);
+    
+    return false;
 }
 
 function onAppointmentsWhiteListAdd(e) {
-  var tablebody = $("appointmentsWhiteListWrapper").childNodesWithTag("table")[0].tBodies[0];
-  var row = new Element("tr");
-  var td = new Element("td").update("");
-  var textField = new Element("input");
-  var span = new Element("span");
-  
-  row.addClassName("whiteListRow");
-  row.observe("mousedown", onRowClick);
-  td.addClassName ("whiteListCell");
-  td.observe("mousedown", endAllEditables);
-  td.observe("dblclick", onNameEdit);
-  textField.addInterface(SOGoAutoCompletionInterface);
-  textField.SOGoUsersSearch = true;
-  textField.observe("autocompletion:changed", endEditable);
-  textField.addClassName("textField");
-
-  td.appendChild(textField);
-  td.appendChild(span);
-  row.appendChild (td);
-  tablebody.appendChild(row);
-  $(tablebody).deselectAll();
-  row.selectElement();
-  
-  makeEditable(td);
-  
+    var tablebody = $("appointmentsWhiteListWrapper").childNodesWithTag("table")[0].tBodies[0];
+    var row = new Element("tr");
+    var td = new Element("td").update("");
+    var textField = new Element("input");
+    var span = new Element("span");
+    
+    row.addClassName("whiteListRow");
+    row.observe("mousedown", onRowClick);
+    td.addClassName ("whiteListCell");
+    td.observe("mousedown", endAllEditables);
+    td.observe("dblclick", onNameEdit);
+    textField.addInterface(SOGoAutoCompletionInterface);
+    textField.SOGoUsersSearch = true;
+    textField.observe("autocompletion:changed", endEditable);
+    textField.addClassName("textField");
+    
+    td.appendChild(textField);
+    td.appendChild(span);
+    row.appendChild (td);
+    tablebody.appendChild(row);
+    $(tablebody).deselectAll();
+    row.selectElement();
+    
+    makeEditable(td);
+    
 }
 
 function onAppointmentsWhiteListDelete(e) {
-  var list = $('appointmentsWhiteListWrapper').down("TABLE").down("TBODY");
-  var rows = list.getSelectedNodes();
-  var count = rows.length;
-  
-  for (var i=0; i < count; i++) {
-    rows[i].editionController = null;
-    rows[i].remove();
-  }
+    var list = $('appointmentsWhiteListWrapper').down("TABLE").down("TBODY");
+    var rows = list.getSelectedNodes();
+    var count = rows.length;
+    
+    for (var i=0; i < count; i++) {
+        rows[i].editionController = null;
+        rows[i].remove();
+    }
 }
 
 function serializeAppointmentsWhiteList() {
-  var r = $$("#appointmentsWhiteListWrapper TBODY TR");
-  
-  var values = [];
-  for (var i = 0; i < r.length; i++) {
-    var tds = r[i].childElements().first().down("INPUT");
-    var uid  = tds.getAttribute("uid");
-    var value = tds.getValue();
-    var user = uid + "=" + value;
-    if (uid != null)
-      values.push(user);
-  }
-  $("whiteList").value = values;
+    var r = $$("#appointmentsWhiteListWrapper TBODY TR");
+    
+    var values = [];
+    for (var i = 0; i < r.length; i++) {
+        var tds = r[i].childElements().first().down("INPUT");
+        var uid  = tds.getAttribute("uid");
+        var value = tds.getValue();
+        var user = uid + "=" + value;
+        if (uid != null)
+            values.push(user);
+    }
+    $("whiteList").value = values;
 }
 
 function onCalendarCategoryAdd(e) {
@@ -1149,19 +1149,19 @@ function onCalendarCategoryAdd(e) {
     var nametd = new Element("td").update("");
     var colortd = new Element("td");
     var colordiv = new Element("div", {"class": "colorBox", dataColor: "#F0F0F0"});
-
+    
     row.identify();
     row.addClassName("categoryListRow");
-
+    
     nametd.addClassName("categoryListCell");
     colortd.addClassName("categoryListCell");
     colordiv.setStyle({backgroundColor: "#F0F0F0"});
-
+    
     colortd.appendChild(colordiv);
     row.appendChild(nametd);
     row.appendChild(colortd);
     $("calendarCategoriesListWrapper").childNodesWithTag("table")[0].tBodies[0].appendChild(row);
-
+    
     resetCalendarTableActions();
     nametd.editionController.startEditing();
 }
@@ -1170,7 +1170,7 @@ function onCalendarCategoryDelete(e) {
     var list = $('calendarCategoriesListWrapper').down("TABLE").down("TBODY");
     var rows = list.getSelectedNodes();
     var count = rows.length;
-
+    
     for (var i=0; i < count; i++) {
         rows[i].editionController = null;
         rows[i].remove();
@@ -1179,7 +1179,7 @@ function onCalendarCategoryDelete(e) {
 
 function serializeCalendarCategories() {
     var r = $$("#calendarCategoriesListWrapper TBODY TR");
-
+    
     var values = [];
     for (var i = 0; i < r.length; i++) {
         var tds = r[i].childElements();
@@ -1187,7 +1187,7 @@ function serializeCalendarCategories() {
         var color = $(tds.last().childElements().first()).readAttribute('data-color');
         values.push("\"" + name + "\": \"" + color + "\"");
     }
-
+    
     $("calendarCategoriesValue").value = "{ " + values.join(",\n") + "}";
 }
 
@@ -1226,19 +1226,19 @@ function onMailLabelAdd(e) {
     var nametd = new Element("td").update("");
     var colortd = new Element("td");
     var colordiv = new Element("div", {"class": "colorBox", dataColor: "#F0F0F0"});
-
+    
     row.identify();
     row.addClassName("labelListRow");
-
+    
     nametd.addClassName("labelListCell");
     colortd.addClassName("labelListCell");
     colordiv.setStyle({backgroundColor: "#F0F0F0"});
-
+    
     colortd.appendChild(colordiv);
     row.appendChild(nametd);
     row.appendChild(colortd);
     $("mailLabelsListWrapper").childNodesWithTag("table")[0].tBodies[0].appendChild(row);
-
+    
     resetMailTableActions();
     nametd.editionController.startEditing();
 }
@@ -1247,7 +1247,7 @@ function onMailLabelDelete(e) {
     var list = $('mailLabelsListWrapper').down("TABLE").down("TBODY");
     var rows = list.getSelectedNodes();
     var count = rows.length;
-
+    
     for (var i=0; i < count; i++) {
         rows[i].editionController = null;
         rows[i].remove();
@@ -1266,164 +1266,164 @@ function resetMailLabelsColors(e) {
 
 function serializeMailLabels() {
     var r = $$("#mailLabelsListWrapper TBODY TR");
-
+    
     var values = [];
     for (var i = 0; i < r.length; i++) {
         var tds = r[i].childElements();
-        var name = r[i].readAttribute("data-name"); 
+        var name = r[i].readAttribute("data-name");
         var label  = $(tds.first()).innerHTML;
         var color = $(tds.last().childElements().first()).readAttribute('data-color');
         
         /* if name is null, that's because we've just added a new tag */
         if (!name) {
             name = label.replace(/[ \(\)\/\{%\*<>\\\"]/g, "_");
-        }
-
-        values.push("\"" + name + "\": [\"" + label + "\", \"" + color + "\"]");
-    }
-
-    $("mailLabelsValue").value = "{ " + values.join(",\n") + "}";
-}
-
-/* /mail label/tags */
-
-
-/* contacts categories */
-function resetContactsTableActions() {
-    var r = $$("#contactsCategoriesListWrapper tbody tr");
-    for (var i = 0; i < r.length; i++) {
-        var row = $(r[i]);
-        row.observe("mousedown", onRowClick);
-        var tds = row.childElements();
-        var editionCtlr = new RowEditionController();
-        editionCtlr.attachToRowElement(tds[0]);
-    }
-}
-
-function onContactsCategoryAdd(e) {
-    var row = new Element("tr");
-    row.identify();
-    row.addClassName("categoryListRow");
-
-    var nametd = new Element("td").update("");
-    nametd.addClassName("categoryListCell");
-    row.appendChild(nametd);
-    var list = $('contactsCategoriesListWrapper').down("TABLE").down("TBODY");
-    list.appendChild(row);
-
-    resetContactsTableActions();
-    nametd.editionController.startEditing();
-}
-
-function onContactsCategoryDelete(e) {
-    var list = $('contactsCategoriesListWrapper').down("TABLE").down("TBODY");
-    var rows = list.getSelectedNodes();
-    var count = rows.length;
-
-    for (var i = 0; i < count; i++) {
-        rows[i].editionController = null;
-        rows[i].remove();
-    }
-}
-
-function serializeContactsCategories() {
-    var values = [];
-
-    var tds = $$("#contactsCategoriesListWrapper TBODY TD");
-
-    for (var i = 0; i < tds.length; i++) {
-        var td = $(tds[i]);
-        values.push(td.allTextContent());
-    }
-
-    $("contactsCategoriesValue").value = Object.toJSON(values);
-}
-
-/* / contact categories */
+                                   }
                                    
-function onAddOutgoingAddressesCheck(checkBox) {
-  if (!checkBox) {
-    checkBox = $("addOutgoingAddresses");
-  }
-  $("addressBookList").disabled = !checkBox.checked;
-  
-}
+                                   values.push("\"" + name + "\": [\"" + label + "\", \"" + color + "\"]");
+                                   }
                                    
-function onReplyPlacementListChange() {
-    if ($("replyPlacementList").value == 0) {
-        // Reply placement is above quote, signature can be place before of after quote
-        $("signaturePlacementList").disabled = false;
-    }
-    else {
-        // Reply placement is bellow quote, signature is unconditionally placed after quote
-        $("signaturePlacementList").value = 1;
-        $("signaturePlacementList").disabled = true;
-    }
-}
-
-function onComposeMessagesTypeChange(event) {
-    // var textArea = $('signature');
-
-    if (this.value == 0) /* text */ {
-        if (CKEDITOR.instances["signature"]) {
-            var content = CKEDITOR.instances["signature"].getData();
-            var htmlEditorWidget = $('cke_signature');
-            htmlEditorWidget.parentNode.removeChild(htmlEditorWidget);
-            delete CKEDITOR.instances["signature"];
-            var textArea = $("signature");
-            textArea.value = content;
-            textArea.style.display = "";
-            textArea.style.visibility = "";
-        }
-    } else {
-        if ($("signature") && !CKEDITOR.instances["signature"]) {
-            CKEDITOR.replace('signature',
-                             {
-                                 height: "70px",
-                                 toolbar: [['Bold', 'Italic', '-', 'Link',
-                                            'Font','FontSize','-','TextColor',
-                                            'BGColor']
-                                          ],
-                                 language: localeCode,
-                                 scayt_sLang: localeCode
-                             }
-                            );
-        }
-    }
-}
-
-function onChangePasswordClick(event) {
-    var field = $("newPasswordField");
-    var confirmationField = $("newPasswordConfirmationField");
-    if (field && confirmationField) {
-        var password = field.value;
-        if (password == confirmationField.value) {
-            if (password.length > 0) {
-                var loginValues = readLoginCookie();
-                var policy = new PasswordPolicy(loginValues[0],
-                                                loginValues[1]);
-                policy.setCallbacks(onPasswordChangeSuccess,
-                                    onPasswordChangeFailure);
-                policy.changePassword(password);
-            }
-            else
-                SetLogMessage("passwordError", _("Password must not be empty."), "error");
-        }
-        else {
-            SetLogMessage("passwordError", _("The passwords do not match. Please try again."), "error");
-            field.focus();
-            field.select();
-        }
-    }
-    event.stop();
-}
-
-function onPasswordChangeSuccess(message) {
-    SetLogMessage("passwordError", message, "info");
-}
-
-function onPasswordChangeFailure(code, message) {
-    SetLogMessage("passwordError", message, "error");
-}
-
-document.observe("dom:loaded", initPreferences);
+                                   $("mailLabelsValue").value = "{ " + values.join(",\n") + "}";
+                                   }
+                                   
+            /* /mail label/tags */
+                                   
+                                   
+            /* contacts categories */
+                                   function resetContactsTableActions() {
+                                   var r = $$("#contactsCategoriesListWrapper tbody tr");
+                                   for (var i = 0; i < r.length; i++) {
+                                   var row = $(r[i]);
+                                   row.observe("mousedown", onRowClick);
+                                   var tds = row.childElements();
+                                   var editionCtlr = new RowEditionController();
+                                   editionCtlr.attachToRowElement(tds[0]);
+                                   }
+                                   }
+                                   
+                                   function onContactsCategoryAdd(e) {
+                                   var row = new Element("tr");
+                                   row.identify();
+                                   row.addClassName("categoryListRow");
+                                   
+                                   var nametd = new Element("td").update("");
+                                   nametd.addClassName("categoryListCell");
+                                   row.appendChild(nametd);
+                                   var list = $('contactsCategoriesListWrapper').down("TABLE").down("TBODY");
+                                   list.appendChild(row);
+                                   
+                                   resetContactsTableActions();
+                                   nametd.editionController.startEditing();
+                                   }
+                                   
+                                   function onContactsCategoryDelete(e) {
+                                   var list = $('contactsCategoriesListWrapper').down("TABLE").down("TBODY");
+                                   var rows = list.getSelectedNodes();
+                                   var count = rows.length;
+                                   
+                                   for (var i = 0; i < count; i++) {
+                                   rows[i].editionController = null;
+                                   rows[i].remove();
+                                   }
+                                   }
+                                   
+                                   function serializeContactsCategories() {
+                                   var values = [];
+                                   
+                                   var tds = $$("#contactsCategoriesListWrapper TBODY TD");
+                                   
+                                   for (var i = 0; i < tds.length; i++) {
+                                   var td = $(tds[i]);
+                                   values.push(td.allTextContent());
+                                   }
+                                   
+                                   $("contactsCategoriesValue").value = Object.toJSON(values);
+                                   }
+                                   
+            /* / contact categories */
+                                   
+                                   function onAddOutgoingAddressesCheck(checkBox) {
+                                   if (!checkBox) {
+                                   checkBox = $("addOutgoingAddresses");
+                                   }
+                                   $("addressBookList").disabled = !checkBox.checked;
+                                   
+                                   }
+                                   
+                                   function onReplyPlacementListChange() {
+                                   if ($("replyPlacementList").value == 0) {
+                                   // Reply placement is above quote, signature can be place before of after quote
+                                   $("signaturePlacementList").disabled = false;
+                                   }
+                                   else {
+                                   // Reply placement is bellow quote, signature is unconditionally placed after quote
+                                   $("signaturePlacementList").value = 1;
+                                   $("signaturePlacementList").disabled = true;
+                                   }
+                                   }
+                                   
+                                   function onComposeMessagesTypeChange(event) {
+                                   // var textArea = $('signature');
+                                   
+                                   if (this.value == 0) /* text */ {
+                                   if (CKEDITOR.instances["signature"]) {
+                                   var content = CKEDITOR.instances["signature"].getData();
+                                   var htmlEditorWidget = $('cke_signature');
+                                   htmlEditorWidget.parentNode.removeChild(htmlEditorWidget);
+                                   delete CKEDITOR.instances["signature"];
+                                   var textArea = $("signature");
+                                   textArea.value = content;
+                                   textArea.style.display = "";
+                                   textArea.style.visibility = "";
+                                   }
+                                   } else {
+                                   if ($("signature") && !CKEDITOR.instances["signature"]) {
+                                   CKEDITOR.replace('signature',
+                                                    {
+                                                    height: "70px",
+                                                    toolbar: [['Bold', 'Italic', '-', 'Link',
+                                                               'Font','FontSize','-','TextColor',
+                                                               'BGColor']
+                                                              ],
+                                                    language: localeCode,
+                                                    scayt_sLang: localeCode
+                                                    }
+                                                    );
+                                   }
+                                   }
+                                   }
+                                   
+                                   function onChangePasswordClick(event) {
+                                   var field = $("newPasswordField");
+                                   var confirmationField = $("newPasswordConfirmationField");
+                                   if (field && confirmationField) {
+                                   var password = field.value;
+                                   if (password == confirmationField.value) {
+                                   if (password.length > 0) {
+                                   var loginValues = readLoginCookie();
+                                   var policy = new PasswordPolicy(loginValues[0],
+                                                                   loginValues[1]);
+                                   policy.setCallbacks(onPasswordChangeSuccess,
+                                                       onPasswordChangeFailure);
+                                   policy.changePassword(password);
+                                   }
+                                   else
+                                   SetLogMessage("passwordError", _("Password must not be empty."), "error");
+                                   }
+                                   else {
+                                   SetLogMessage("passwordError", _("The passwords do not match. Please try again."), "error");
+                                   field.focus();
+                                   field.select();
+                                   }
+                                   }
+                                   event.stop();
+                                   }
+                                   
+                                   function onPasswordChangeSuccess(message) {
+                                   SetLogMessage("passwordError", message, "info");
+                                   }
+                                   
+                                   function onPasswordChangeFailure(code, message) {
+                                   SetLogMessage("passwordError", message, "error");
+                                   }
+                                   
+                                   document.observe("dom:loaded", initPreferences);

From a71013eebf8e7dd088a55cd18554d4de9c69369b Mon Sep 17 00:00:00 2001
From: Alexandre Cloutier <acloutier@inverse.ca>
Date: Wed, 16 Jul 2014 14:26:30 -0400
Subject: [PATCH 12/14] javascript indentation

---
 UI/WebServerResources/UIxPreferences.js | 558 ++++++++++++------------
 1 file changed, 278 insertions(+), 280 deletions(-)

diff --git a/UI/WebServerResources/UIxPreferences.js b/UI/WebServerResources/UIxPreferences.js
index d0dc0e737..797031279 100644
--- a/UI/WebServerResources/UIxPreferences.js
+++ b/UI/WebServerResources/UIxPreferences.js
@@ -84,33 +84,33 @@ function savePreferences(sender) {
     
     if (sendForm) {
         saveMailAccounts();
-        
+    
         triggerAjaxRequest($("mainForm").readAttribute("action"), function (http) {
-                           if (http.readyState == 4) {
-                           var response = http.responseText.evalJSON(true);
-                           if (http.status == 503) {
-                           showAlertDialog(_(response.textStatus));
-                           }
-                           else if (http.status == 200) {
-                           if (response.hasChanged == 1) {
-                           window.opener.location.reload();
-                           window.close();
-                           }
-                           else {
-                           window.close();
-                           }
-                           }
-                           else {
-                           showAlertDialog(_(response.textStatus));
-                           }
-                           }
-                           },
-                           null,
-                           Form.serialize($("mainForm")), // excludes the file input
-                           { "Content-type": "application/x-www-form-urlencoded"}
-                           );
+            if (http.readyState == 4) {
+                var response = http.responseText.evalJSON(true);
+                if (http.status == 503) {
+                    showAlertDialog(_(response.textStatus));
+                }
+                else if (http.status == 200) {
+                    if (response.hasChanged == 1) {
+                        window.opener.location.reload();
+                        window.close();
+                    }
+                    else {
+                        window.close();
+                    }
+                }
+                else {
+                    showAlertDialog(_(response.textStatus));
+                }
+            }
+        },
+        null,
+        Form.serialize($("mainForm")), // excludes the file input
+        { "Content-type": "application/x-www-form-urlencoded"}
+        );
 	}
-    return false;
+  return false;
 }
 
 function prototypeIfyFilters() {
@@ -143,25 +143,25 @@ function prototypeIfyFilters() {
 
 function _setupEvents() {
     var widgets = [ "timezone", "shortDateFormat", "longDateFormat",
-                   "timeFormat", "weekStartDay", "dayStartTime", "dayEndTime",
-                   "firstWeek", "messageCheck", "sortByThreads", "displayRemoteInlineImages",
-                   "subscribedFoldersOnly", "language", "defaultCalendar",
-                   "enableVacation" ];
+                    "timeFormat", "weekStartDay", "dayStartTime", "dayEndTime",
+                    "firstWeek", "messageCheck", "sortByThreads", "displayRemoteInlineImages",
+                    "subscribedFoldersOnly", "language", "defaultCalendar",
+                    "enableVacation" ];
     for (var i = 0; i < widgets.length; i++) {
         var widget = $(widgets[i]);
         if (widget) {
             widget.observe("change", onChoiceChanged);
         }
     }
-    
+
     // We check for non-null elements as replyPlacementList and composeMessagesType
     // might not be present if ModulesConstraints disable those elements
     if ($("replyPlacementList"))
         $("replyPlacementList").on("change", onReplyPlacementListChange);
-    
+
     if ($("composeMessagesType"))
         $("composeMessagesType").on("change", onComposeMessagesTypeChange);
-    
+
     // Note: we also monitor changes to the calendar categories.
     // See functions endEditable and onColorPickerChoice.
     var valueInputs = [ "calendarCategoriesValue", "calendarCategoriesValue" ];
@@ -186,20 +186,20 @@ function onChoiceChanged(event) {
 function addDefaultEmailAddresses(event) {
     var defaultAddresses = $("defaultEmailAddresses").value.split(/, */);
     var addresses = $("autoReplyEmailAddresses").value.trim();
-    
+
     if (addresses) addresses = addresses.split(/, */);
     else addresses = new Array();
-    
+
     defaultAddresses.each(function(adr) {
-                          for (var i = 0; i < addresses.length; i++)
-                          if (adr == addresses[i])
-                          break;
-                          if (i == addresses.length)
-                          addresses.push(adr);
-                          });
-    
+        for (var i = 0; i < addresses.length; i++)
+            if (adr == addresses[i])
+                break;
+        if (i == addresses.length)
+            addresses.push(adr);
+    });
+
     $("autoReplyEmailAddresses").value = addresses.join(", ");
-    
+
     event.stop();
 }
 
@@ -336,13 +336,12 @@ function initPreferences() {
     
     button = $("enableVacationEndDate");
     if (button) {
-        jQuery("#vacationEndDate_date").closest(".date").datepicker(
-                                                                    { autoclose: true, position: 'above', weekStart: $('weekStartDay').getValue() });
+        jQuery("#vacationEndDate_date").closest(".date").datepicker({ autoclose: true, position: 'above', weekStart: $('weekStartDay').getValue() });
         button.on("click", function(event) {
                   if (this.checked)
-                  $("vacationEndDate_date").enable();
+                      $("vacationEndDate_date").enable();
                   else
-                  $("vacationEndDate_date").disable();
+                      $("vacationEndDate_date").disable();
                   });
     }
     onAddOutgoingAddressesCheck();
@@ -369,11 +368,11 @@ function appendSieveFilterRow(filterTable, number, filter) {
     var row = createElement("tr");
     row.observe("mousedown", onRowClick);
     row.observe("dblclick", onFilterEdit.bindAsEventListener(row));
-    
+
     var nameColumn = createElement("td");
     nameColumn.appendChild(document.createTextNode(filter["name"]));
     row.appendChild(nameColumn);
-    
+
     var activeColumn = createElement("td", null, "activeColumn");
     var cb = createElement("input", null, "checkBox",
                            { type: "checkbox" },
@@ -382,7 +381,7 @@ function appendSieveFilterRow(filterTable, number, filter) {
     var bound = onScriptActiveCheck.bindAsEventListener(cb);
     cb.observe("click", bound);
     row.appendChild(activeColumn);
-    
+
     filterTable.tBodies[0].appendChild(row);
 }
 
@@ -399,7 +398,7 @@ function updateSieveFilterRow(filterTable, number, filter) {
         nameColumn.removeChild(nameColumn.firstChild);
     }
     nameColumn.appendChild(document.createTextNode(filter.name));
-    
+
     var activeColumn = columns[1];
     var cb = activeColumn.childNodesWithTag("input");
     cb[0].checked = filter.active;
@@ -478,7 +477,7 @@ function onFilterMoveDown(event) {
 function onFilterEdit(event) {
     _editFilter(this.rowIndex - 1);
     event.stop();
-    
+
     return false;
 }
 
@@ -497,7 +496,7 @@ function copyFilter(originalFilter) {
     for (var i = 0; i < originalFilter.actions.length; i++) {
         newFilter.actions.push(_copyFilterElement(originalFilter.actions[i]));
     }
-    
+
     return newFilter;
 }
 
@@ -509,7 +508,7 @@ function _copyFilterElement(filterElement) { /* element = rule or action */
             newElement[k] = value;
         }
     }
-    
+
     return newElement;
 }
 
@@ -527,7 +526,7 @@ function setupMailboxesFromJSON(jsonResponse) {
     userMailboxes = $([]);
     for (var i = 0; i < responseMboxes.length; i++) {
         var mbox = { 'displayName': responseMboxes[i].displayName.substr(1),
-            'path': responseMboxes[i].path.substr(1) };
+                     'path': responseMboxes[i].path.substr(1) };
         userMailboxes.push(mbox);
     }
 }
@@ -540,7 +539,7 @@ function updateFilterFromEditor(filterId, filterJSON) {
             sanitized[k] = filter[k];
         }
     }
-    
+
     var table = $("filtersList");
     if (filterId == "new") {
         var newNumber = filters.length;
@@ -557,7 +556,7 @@ function initMailAccounts() {
     var mailAccountsJSON = $("mailAccountsJSON");
     if (mailAccountsJSON) {
         mailAccounts = mailAccountsJSON.value.evalJSON();
-        
+
         var mailAccountsList = $("mailAccountsList");
         if (mailAccountsList) {
             var li = createMailAccountLI(mailAccounts[0], true);
@@ -569,7 +568,7 @@ function initMailAccounts() {
             var lis = mailAccountsList.childNodesWithTag("li");
             lis[0].readOnly = true;
             lis[0].selectElement();
-            
+
             var button = $("mailAccountAdd");
             if (button) {
                 button.observe("click", onMailAccountAdd);
@@ -579,19 +578,19 @@ function initMailAccounts() {
                 button.observe("click", onMailAccountDelete);
             }
         }
-        
+
         var inputs = $$("#accountInfo input");
         for (var i = 0; i < inputs.length; i++) {
             $(inputs[i]).observe("change", onMailAccountInfoChange);
         }
-        
+
         inputs = $$("#identityInfo input");
         for (var i = 0; i < inputs.length; i++) {
             $(inputs[i]).observe("change", onMailIdentityInfoChange);
         }
         $("actSignature").observe("click", onMailIdentitySignatureClick);
         displayMailAccount(mailAccounts[0], true);
-        
+
         inputs = $$("#returnReceiptsInfo input");
         for (var i = 0; i < inputs.length; i++) {
             $(inputs[i]).observe("change", onMailReceiptInfoChange);
@@ -625,10 +624,10 @@ function onMailReceiptInfoChange(event) {
     }
     var keyName = this.name.cssIdToHungarianId();
     this.mailAccount["receipts"][keyName] = this.value;
-    
+
     var popupIds = [ "receipt-non-recipient-action",
-                    "receipt-outside-domain-action",
-                    "receipt-any-action" ];
+                     "receipt-outside-domain-action",
+                     "receipt-any-action" ];
     var receiptActionsDisable = (this.value == "ignore");
     for (var i = 0; i < popupIds.length; i++) {
         var actionPopup = $(popupIds[i]);
@@ -664,19 +663,19 @@ function onMailIdentitySignatureClick(event) {
             if (Prototype.Browser.IE)
                 // Overwrite some fixes from iefixes.css
                 dialog.setStyle({ width: 'auto', marginLeft: 'auto' });
-            
+
             document.body.appendChild(dialog);
             dialogs[dialogId] = dialog;
-            
+
             if ($("composeMessagesType").value != 0) {
                 CKEDITOR.replace('signature',
                                  { height: "150px",
-                                 toolbar: [['Bold', 'Italic', '-', 'Link',
-                                            'Font','FontSize','-','TextColor',
-                                            'BGColor']
-                                           ],
-                                 language: localeCode,
-                                 scayt_sLang: localeCode });
+                                   toolbar: [['Bold', 'Italic', '-', 'Link',
+                                              'Font','FontSize','-','TextColor',
+                                              'BGColor']
+                                            ],
+                                   language: localeCode,
+                                   scayt_sLang: localeCode });
             }
         }
         dialog.mailAccount = this.mailAccount;
@@ -689,16 +688,16 @@ function onMailIdentitySignatureClick(event) {
             area.value = identity["signature"];
         else
             area.value = "";
-        
+
         $("bgDialogDiv").show();
         if (Prototype.Browser.IE)
             jQuery('#bgDialogDiv').css('opacity', 0.4);
         jQuery(dialog).fadeIn('fast', function() {
-                              if (CKEDITOR.instances["signature"])
-                              focusCKEditor();
-                              else
-                              area.focus();
-                              });
+            if (CKEDITOR.instances["signature"])
+                focusCKEditor();
+            else
+                area.focus();
+        });
         Event.stop(event);
     }
 }
@@ -708,7 +707,7 @@ function focusCKEditor() {
         setTimeout("focusCKEditor()", 100);
     else
         CKEDITOR.instances.signature.focus()
-        }
+}
 
 function hideSignature() {
     if (CKEDITOR.status != 'loaded')
@@ -724,7 +723,7 @@ function onMailIdentitySignatureOK(event) {
         mailAccount["identities"] = [{}];
     }
     var identity = mailAccount["identities"][0];
-    
+
     var content = (CKEDITOR.instances["signature"]
                    ? CKEDITOR.instances["signature"].getData()
                    : $("signature").value);
@@ -753,7 +752,7 @@ function createMailAccountLI(mailAccount, readOnly) {
         li.editionController = editionCtlr;
     }
     li.mailAccount = mailAccount;
-    
+
     return li;
 }
 
@@ -764,10 +763,10 @@ function onMailAccountEntryClick(event) {
 function displayMailAccount(mailAccount, readOnly) {
     var inputs = $$("#accountInfo input");
     inputs.each(function(i) {
-                i.disabled = readOnly;
-                i.mailAccount = mailAccount;
-                });
-    
+        i.disabled = readOnly;
+        i.mailAccount = mailAccount;
+    });
+
     inputs = $$("#identityInfo input");
     inputs.each(function(i) { i.mailAccount = mailAccount; });
     if (!mailCustomFromEnabled) {
@@ -775,16 +774,16 @@ function displayMailAccount(mailAccount, readOnly) {
             inputs[i].disabled = readOnly;
         }
     }
-    
+
     var form = $("mainForm");
-    
+
     var encryption = "none";
     var encRadioValues = [ "none", "ssl", "tls" ];
     if (mailAccount["encryption"]) {
         encryption = mailAccount["encryption"];
     }
     form.setRadioValue("encryption", encRadioValues.indexOf(encryption));
-    
+
     var port;
     if (mailAccount["port"]) {
         port = mailAccount["port"];
@@ -798,20 +797,20 @@ function displayMailAccount(mailAccount, readOnly) {
         }
     }
     $("port").value = port;
-    
+
     $("serverName").value = mailAccount["serverName"];
     $("userName").value = mailAccount["userName"];
     $("password").value = mailAccount["password"];
-    
+
     var identity = (mailAccount["identities"]
                     ? mailAccount["identities"][0]
                     : {} );
     $("fullName").value = identity["fullName"] || "";
     $("email").value = identity["email"] || "";
     $("replyTo").value = identity["replyTo"] || "";
-    
+
     displayAccountSignature(mailAccount);
-    
+
     var receiptAction = "ignore";
     var receiptActionValues = [ "ignore", "allow" ];
     if (mailAccount["receipts"] &&  mailAccount["receipts"]["receiptAction"]) {
@@ -825,8 +824,8 @@ function displayMailAccount(mailAccount, readOnly) {
     form.setRadioValue("receipt-action",
                        receiptActionValues.indexOf(receiptAction));
     var popupIds = [ "receipt-non-recipient-action",
-                    "receipt-outside-domain-action",
-                    "receipt-any-action" ];
+                     "receipt-outside-domain-action",
+                     "receipt-any-action" ];
     var receiptActionsDisable = (receiptAction == "ignore");
     for (var i = 0; i < popupIds.length; i++) {
         var actionPopup = $(popupIds[i]);
@@ -844,7 +843,7 @@ function displayMailAccount(mailAccount, readOnly) {
 function displayAccountSignature(mailAccount) {
     var actSignature = $("actSignature");
     actSignature.mailAccount = mailAccount;
-    
+
     var actSignatureValue;
     var identity = (mailAccount["identities"]
                     ? mailAccount["identities"][0]
@@ -876,13 +875,13 @@ function createMailAccount() {
         newIdentity[k] = firstIdentity[k];
     }
     delete newIdentity["isDefault"];
-    
+
     var newMailAccount = { name: _("New Mail Account"),
-    serverName: "mailserver",
-    userName: UserLogin,
-    password: "",
-        identities: [ newIdentity ] };
-    
+                           serverName: "mailserver",
+                           userName: UserLogin,
+                           password: "",
+                           identities: [ newIdentity ] };
+
     return newMailAccount;
 }
 
@@ -899,10 +898,10 @@ function onMailAccountAdd(event) {
     displayMailAccount(newMailAccount, false);
     li.selectElement();
     li.editionController.startEditing();
-    
+
     var hasChanged = $("hasChanged");
     hasChanged.value = "1";
-    
+
     event.stop();
 }
 
@@ -923,7 +922,7 @@ function onMailAccountDelete(event) {
             mailAccounts.splice(index, 1);
             next.selectElement();
             displayMailAccount(next.mailAccount, next.readOnly);
-            
+
             var hasChanged = $("hasChanged");
             hasChanged.value = "1";
         }
@@ -933,26 +932,26 @@ function onMailAccountDelete(event) {
 
 function saveMailAccounts() {
     /* This removal enables us to avoid a few warning from SOPE for the inputs
-     that were created dynamically. */
+       that were created dynamically. */
     var editor = $("mailAccountEditor");
-    
+
     // Could be null if ModuleConstraints disables email access
     if (editor)
     	//Instead of removing the modules, we disable it. This will prevent the window to crash if we have a connection error.
-        editor.select('input, select').each(function(i) { i.disable(); })
-        
-        compactMailAccounts();
+      editor.select('input, select').each(function(i) { i.disable(); })
+
+    compactMailAccounts();
     var mailAccountsJSON = $("mailAccountsJSON");
-    
+
     if (mailAccountsJSON)
         mailAccountsJSON.value = Object.toJSON(mailAccounts);
 }
 
 function compactMailAccounts() {
-    
+
     if (!mailAccounts)
         return;
-    
+
     for (var i = 1; i < mailAccounts.length; i++) {
         var account = mailAccounts[i];
         var encryption = account["encryption"];
@@ -977,12 +976,12 @@ function compactMailAccounts() {
 /* common function between calendar categories and mail labels */
 function onColorEdit(e, target) {
     var view = $(target);
-    
+
     view.select('div.colorEditing').each(function(box) {
-                                         box.removeClassName('colorEditing');
-                                         });
+        box.removeClassName('colorEditing');
+    });
     this.addClassName("colorEditing");
-    
+
     var cellPosition = this.cumulativeOffset();
     var cellDimensions = this.getDimensions();
     var div = $('colorPickerDialog');
@@ -999,17 +998,17 @@ function onColorPickerChoice(event) {
     var dialog = span.up('.dialog');
     var target = dialog.readAttribute('data-target');
     var newColor = "#" + span.className.substr(4);
-    
+
     var wrapper = $(target);
     var div = wrapper.select("div.colorEditing").first();
-    
+
     div.writeAttribute('data-color', newColor);
     div.style.background = newColor;
     if (parseInt($("hasChanged").value) == 0) {
         var hasChanged = $("hasChanged");
         hasChanged.value = "1";
     }
-    
+
     dialog.hide();
 }
 
@@ -1149,19 +1148,19 @@ function onCalendarCategoryAdd(e) {
     var nametd = new Element("td").update("");
     var colortd = new Element("td");
     var colordiv = new Element("div", {"class": "colorBox", dataColor: "#F0F0F0"});
-    
+
     row.identify();
     row.addClassName("categoryListRow");
-    
+
     nametd.addClassName("categoryListCell");
     colortd.addClassName("categoryListCell");
     colordiv.setStyle({backgroundColor: "#F0F0F0"});
-    
+
     colortd.appendChild(colordiv);
     row.appendChild(nametd);
     row.appendChild(colortd);
     $("calendarCategoriesListWrapper").childNodesWithTag("table")[0].tBodies[0].appendChild(row);
-    
+
     resetCalendarTableActions();
     nametd.editionController.startEditing();
 }
@@ -1170,7 +1169,7 @@ function onCalendarCategoryDelete(e) {
     var list = $('calendarCategoriesListWrapper').down("TABLE").down("TBODY");
     var rows = list.getSelectedNodes();
     var count = rows.length;
-    
+
     for (var i=0; i < count; i++) {
         rows[i].editionController = null;
         rows[i].remove();
@@ -1179,7 +1178,7 @@ function onCalendarCategoryDelete(e) {
 
 function serializeCalendarCategories() {
     var r = $$("#calendarCategoriesListWrapper TBODY TR");
-    
+
     var values = [];
     for (var i = 0; i < r.length; i++) {
         var tds = r[i].childElements();
@@ -1187,7 +1186,7 @@ function serializeCalendarCategories() {
         var color = $(tds.last().childElements().first()).readAttribute('data-color');
         values.push("\"" + name + "\": \"" + color + "\"");
     }
-    
+
     $("calendarCategoriesValue").value = "{ " + values.join(",\n") + "}";
 }
 
@@ -1226,19 +1225,19 @@ function onMailLabelAdd(e) {
     var nametd = new Element("td").update("");
     var colortd = new Element("td");
     var colordiv = new Element("div", {"class": "colorBox", dataColor: "#F0F0F0"});
-    
+
     row.identify();
     row.addClassName("labelListRow");
-    
+
     nametd.addClassName("labelListCell");
     colortd.addClassName("labelListCell");
     colordiv.setStyle({backgroundColor: "#F0F0F0"});
-    
+
     colortd.appendChild(colordiv);
     row.appendChild(nametd);
     row.appendChild(colortd);
     $("mailLabelsListWrapper").childNodesWithTag("table")[0].tBodies[0].appendChild(row);
-    
+
     resetMailTableActions();
     nametd.editionController.startEditing();
 }
@@ -1247,7 +1246,7 @@ function onMailLabelDelete(e) {
     var list = $('mailLabelsListWrapper').down("TABLE").down("TBODY");
     var rows = list.getSelectedNodes();
     var count = rows.length;
-    
+
     for (var i=0; i < count; i++) {
         rows[i].editionController = null;
         rows[i].remove();
@@ -1266,164 +1265,163 @@ function resetMailLabelsColors(e) {
 
 function serializeMailLabels() {
     var r = $$("#mailLabelsListWrapper TBODY TR");
-    
+
     var values = [];
     for (var i = 0; i < r.length; i++) {
         var tds = r[i].childElements();
-        var name = r[i].readAttribute("data-name");
+        var name = r[i].readAttribute("data-name"); 
         var label  = $(tds.first()).innerHTML;
         var color = $(tds.last().childElements().first()).readAttribute('data-color');
         
         /* if name is null, that's because we've just added a new tag */
         if (!name) {
             name = label.replace(/[ \(\)\/\{%\*<>\\\"]/g, "_");
-                                   }
+        }
+
+        values.push("\"" + name + "\": [\"" + label + "\", \"" + color + "\"]");
+    }
+
+    $("mailLabelsValue").value = "{ " + values.join(",\n") + "}";
+}
+
+/* /mail label/tags */
+
+
+/* contacts categories */
+function resetContactsTableActions() {
+    var r = $$("#contactsCategoriesListWrapper tbody tr");
+    for (var i = 0; i < r.length; i++) {
+        var row = $(r[i]);
+        row.observe("mousedown", onRowClick);
+        var tds = row.childElements();
+        var editionCtlr = new RowEditionController();
+        editionCtlr.attachToRowElement(tds[0]);
+    }
+}
+
+function onContactsCategoryAdd(e) {
+    var row = new Element("tr");
+    row.identify();
+    row.addClassName("categoryListRow");
+
+    var nametd = new Element("td").update("");
+    nametd.addClassName("categoryListCell");
+    row.appendChild(nametd);
+    var list = $('contactsCategoriesListWrapper').down("TABLE").down("TBODY");
+    list.appendChild(row);
+
+    resetContactsTableActions();
+    nametd.editionController.startEditing();
+}
+
+function onContactsCategoryDelete(e) {
+    var list = $('contactsCategoriesListWrapper').down("TABLE").down("TBODY");
+    var rows = list.getSelectedNodes();
+    var count = rows.length;
+
+    for (var i = 0; i < count; i++) {
+        rows[i].editionController = null;
+        rows[i].remove();
+    }
+}
+
+function serializeContactsCategories() {
+    var values = [];
+
+    var tds = $$("#contactsCategoriesListWrapper TBODY TD");
+
+    for (var i = 0; i < tds.length; i++) {
+        var td = $(tds[i]);
+        values.push(td.allTextContent());
+    }
+
+    $("contactsCategoriesValue").value = Object.toJSON(values);
+}
+
+/* / contact categories */
                                    
-                                   values.push("\"" + name + "\": [\"" + label + "\", \"" + color + "\"]");
-                                   }
+function onAddOutgoingAddressesCheck(checkBox) {
+    if (!checkBox) {
+        checkBox = $("addOutgoingAddresses");
+    }
+    $("addressBookList").disabled = !checkBox.checked;
+}
                                    
-                                   $("mailLabelsValue").value = "{ " + values.join(",\n") + "}";
-                                   }
-                                   
-            /* /mail label/tags */
-                                   
-                                   
-            /* contacts categories */
-                                   function resetContactsTableActions() {
-                                   var r = $$("#contactsCategoriesListWrapper tbody tr");
-                                   for (var i = 0; i < r.length; i++) {
-                                   var row = $(r[i]);
-                                   row.observe("mousedown", onRowClick);
-                                   var tds = row.childElements();
-                                   var editionCtlr = new RowEditionController();
-                                   editionCtlr.attachToRowElement(tds[0]);
-                                   }
-                                   }
-                                   
-                                   function onContactsCategoryAdd(e) {
-                                   var row = new Element("tr");
-                                   row.identify();
-                                   row.addClassName("categoryListRow");
-                                   
-                                   var nametd = new Element("td").update("");
-                                   nametd.addClassName("categoryListCell");
-                                   row.appendChild(nametd);
-                                   var list = $('contactsCategoriesListWrapper').down("TABLE").down("TBODY");
-                                   list.appendChild(row);
-                                   
-                                   resetContactsTableActions();
-                                   nametd.editionController.startEditing();
-                                   }
-                                   
-                                   function onContactsCategoryDelete(e) {
-                                   var list = $('contactsCategoriesListWrapper').down("TABLE").down("TBODY");
-                                   var rows = list.getSelectedNodes();
-                                   var count = rows.length;
-                                   
-                                   for (var i = 0; i < count; i++) {
-                                   rows[i].editionController = null;
-                                   rows[i].remove();
-                                   }
-                                   }
-                                   
-                                   function serializeContactsCategories() {
-                                   var values = [];
-                                   
-                                   var tds = $$("#contactsCategoriesListWrapper TBODY TD");
-                                   
-                                   for (var i = 0; i < tds.length; i++) {
-                                   var td = $(tds[i]);
-                                   values.push(td.allTextContent());
-                                   }
-                                   
-                                   $("contactsCategoriesValue").value = Object.toJSON(values);
-                                   }
-                                   
-            /* / contact categories */
-                                   
-                                   function onAddOutgoingAddressesCheck(checkBox) {
-                                   if (!checkBox) {
-                                   checkBox = $("addOutgoingAddresses");
-                                   }
-                                   $("addressBookList").disabled = !checkBox.checked;
-                                   
-                                   }
-                                   
-                                   function onReplyPlacementListChange() {
-                                   if ($("replyPlacementList").value == 0) {
-                                   // Reply placement is above quote, signature can be place before of after quote
-                                   $("signaturePlacementList").disabled = false;
-                                   }
-                                   else {
-                                   // Reply placement is bellow quote, signature is unconditionally placed after quote
-                                   $("signaturePlacementList").value = 1;
-                                   $("signaturePlacementList").disabled = true;
-                                   }
-                                   }
-                                   
-                                   function onComposeMessagesTypeChange(event) {
-                                   // var textArea = $('signature');
-                                   
-                                   if (this.value == 0) /* text */ {
-                                   if (CKEDITOR.instances["signature"]) {
-                                   var content = CKEDITOR.instances["signature"].getData();
-                                   var htmlEditorWidget = $('cke_signature');
-                                   htmlEditorWidget.parentNode.removeChild(htmlEditorWidget);
-                                   delete CKEDITOR.instances["signature"];
-                                   var textArea = $("signature");
-                                   textArea.value = content;
-                                   textArea.style.display = "";
-                                   textArea.style.visibility = "";
-                                   }
-                                   } else {
-                                   if ($("signature") && !CKEDITOR.instances["signature"]) {
-                                   CKEDITOR.replace('signature',
-                                                    {
-                                                    height: "70px",
-                                                    toolbar: [['Bold', 'Italic', '-', 'Link',
-                                                               'Font','FontSize','-','TextColor',
-                                                               'BGColor']
-                                                              ],
-                                                    language: localeCode,
-                                                    scayt_sLang: localeCode
-                                                    }
-                                                    );
-                                   }
-                                   }
-                                   }
-                                   
-                                   function onChangePasswordClick(event) {
-                                   var field = $("newPasswordField");
-                                   var confirmationField = $("newPasswordConfirmationField");
-                                   if (field && confirmationField) {
-                                   var password = field.value;
-                                   if (password == confirmationField.value) {
-                                   if (password.length > 0) {
-                                   var loginValues = readLoginCookie();
-                                   var policy = new PasswordPolicy(loginValues[0],
-                                                                   loginValues[1]);
-                                   policy.setCallbacks(onPasswordChangeSuccess,
-                                                       onPasswordChangeFailure);
-                                   policy.changePassword(password);
-                                   }
-                                   else
-                                   SetLogMessage("passwordError", _("Password must not be empty."), "error");
-                                   }
-                                   else {
-                                   SetLogMessage("passwordError", _("The passwords do not match. Please try again."), "error");
-                                   field.focus();
-                                   field.select();
-                                   }
-                                   }
-                                   event.stop();
-                                   }
-                                   
-                                   function onPasswordChangeSuccess(message) {
-                                   SetLogMessage("passwordError", message, "info");
-                                   }
-                                   
-                                   function onPasswordChangeFailure(code, message) {
-                                   SetLogMessage("passwordError", message, "error");
-                                   }
-                                   
-                                   document.observe("dom:loaded", initPreferences);
+function onReplyPlacementListChange() {
+    if ($("replyPlacementList").value == 0) {
+        // Reply placement is above quote, signature can be place before of after quote
+        $("signaturePlacementList").disabled = false;
+    }
+    else {
+        // Reply placement is bellow quote, signature is unconditionally placed after quote
+        $("signaturePlacementList").value = 1;
+        $("signaturePlacementList").disabled = true;
+    }
+}
+
+function onComposeMessagesTypeChange(event) {
+    // var textArea = $('signature');
+
+    if (this.value == 0) /* text */ {
+        if (CKEDITOR.instances["signature"]) {
+            var content = CKEDITOR.instances["signature"].getData();
+            var htmlEditorWidget = $('cke_signature');
+            htmlEditorWidget.parentNode.removeChild(htmlEditorWidget);
+            delete CKEDITOR.instances["signature"];
+            var textArea = $("signature");
+            textArea.value = content;
+            textArea.style.display = "";
+            textArea.style.visibility = "";
+        }
+    } else {
+        if ($("signature") && !CKEDITOR.instances["signature"]) {
+            CKEDITOR.replace('signature',
+                             {
+                                 height: "70px",
+                                 toolbar: [['Bold', 'Italic', '-', 'Link',
+                                            'Font','FontSize','-','TextColor',
+                                            'BGColor']
+                                          ],
+                                 language: localeCode,
+                                 scayt_sLang: localeCode
+                             }
+                            );
+        }
+    }
+}
+
+function onChangePasswordClick(event) {
+    var field = $("newPasswordField");
+    var confirmationField = $("newPasswordConfirmationField");
+    if (field && confirmationField) {
+        var password = field.value;
+        if (password == confirmationField.value) {
+            if (password.length > 0) {
+                var loginValues = readLoginCookie();
+                var policy = new PasswordPolicy(loginValues[0],
+                                                loginValues[1]);
+                policy.setCallbacks(onPasswordChangeSuccess,
+                                    onPasswordChangeFailure);
+                policy.changePassword(password);
+            }
+            else
+                SetLogMessage("passwordError", _("Password must not be empty."), "error");
+        }
+        else {
+            SetLogMessage("passwordError", _("The passwords do not match. Please try again."), "error");
+            field.focus();
+            field.select();
+        }
+    }
+    event.stop();
+}
+
+function onPasswordChangeSuccess(message) {
+    SetLogMessage("passwordError", message, "info");
+}
+
+function onPasswordChangeFailure(code, message) {
+    SetLogMessage("passwordError", message, "error");
+}
+
+document.observe("dom:loaded", initPreferences);

From ce6a31dd38aa50736eae48eb073deb991b87173a Mon Sep 17 00:00:00 2001
From: Alexandre Cloutier <acloutier@inverse.ca>
Date: Fri, 18 Jul 2014 09:26:02 -0400
Subject: [PATCH 13/14] Adjust line of code to make it easier to read

---
 SoObjects/Appointments/SOGoAppointmentObject.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m
index 54de1997c..13be87eb6 100644
--- a/SoObjects/Appointments/SOGoAppointmentObject.m
+++ b/SoObjects/Appointments/SOGoAppointmentObject.m
@@ -471,7 +471,7 @@
     {
       value = [unavailableAttendees objectAtIndex:i];
       [reason appendString:[value keysWithFormat: @"\n %{Cn}"]];
-      if (!(i == (count - 1)))
+      if (i < count-2)
         [reason appendString:@", "];
     }
     [unavailableAttendees release];

From c2027f072d0b59944882ca39fc97f573a2157fd7 Mon Sep 17 00:00:00 2001
From: Alexandre Cloutier <acloutier@inverse.ca>
Date: Fri, 18 Jul 2014 13:57:18 -0400
Subject: [PATCH 14/14] indentation

---
 .../Appointments/SOGoAppointmentObject.m      | 1525 ++++++++---------
 1 file changed, 750 insertions(+), 775 deletions(-)

diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m
index 13be87eb6..7f14eee77 100644
--- a/SoObjects/Appointments/SOGoAppointmentObject.m
+++ b/SoObjects/Appointments/SOGoAppointmentObject.m
@@ -128,13 +128,12 @@
 }
 
 - (iCalRepeatableEntityObject *) lookupOccurrence: (NSString *) recID
-
 {
   return [[self calendar: NO secure: NO] eventWithRecurrenceID: recID];
 }
 
 - (SOGoAppointmentObject *) _lookupEvent: (NSString *) eventUID
-				  forUID: (NSString *) uid
+				                          forUID: (NSString *) uid
 {
   SOGoAppointmentFolder *folder;
   SOGoAppointmentObject *object;
@@ -148,30 +147,30 @@
   while ( object == nil && (folder = [e nextObject]) )
     {
       object = [folder lookupName: nameInContainer
-		       inContext: context 
-		       acquire: NO];
+                        inContext: context
+                          acquire: NO];
       if ([object isKindOfClass: [NSException class]] || [object isNew])
-	{
-	  possibleName = [folder resourceNameForEventUID: eventUID];
-	  if (possibleName)
-	    {
-	      object = [folder lookupName: possibleName
-			       inContext: context acquire: NO];
-	      if ([object isKindOfClass: [NSException class]] || [object isNew])
-		object = nil;
-	    }
-	  else
-	    object = nil;
-	}
+        {
+          possibleName = [folder resourceNameForEventUID: eventUID];
+          if (possibleName)
+            {
+              object = [folder lookupName: possibleName
+                                inContext: context acquire: NO];
+              if ([object isKindOfClass: [NSException class]] || [object isNew])
+                object = nil;
+            }
+          else
+	          object = nil;
+        }
     }
-
+  
   if (!object)
     {
       // Create the event in the user's personal calendar.
       folder = [[SOGoUser userWithLogin: uid]
                  personalCalendarFolderInContext: context];
       object = [SOGoAppointmentObject objectWithName: nameInContainer
-				      inContainer: folder];
+				                                 inContainer: folder];
       [object setIsNew: YES];
     }
 
@@ -182,60 +181,60 @@
 //
 //
 - (void) _addOrUpdateEvent: (iCalEvent *) theEvent
-		    forUID: (NSString *) theUID
-		     owner: (NSString *) theOwner
+		                forUID: (NSString *) theUID
+		                 owner: (NSString *) theOwner
 {
   if (![theUID isEqualToString: theOwner])
     {
       SOGoAppointmentObject *attendeeObject;
       NSString *iCalString;
-
+      
       iCalString = nil;
       attendeeObject = [self _lookupEvent: [theEvent uid] forUID: theUID];
       
       // We must add an occurence to a non-existing event. We have
       // to handle this with care, as in the postCalDAVEventRequestTo:from:
       if ([attendeeObject isNew] && [theEvent recurrenceId])
-	{
-	  iCalEvent *ownerEvent;
-	  iCalPerson *person;
-	  SOGoUser *user;
-
-	  // We check if the attendee that was added to a single occurence is
-	  // present in the master component. If not, we add it with a participation
-	  // status set to "DECLINED".
-	  ownerEvent = [[[theEvent parent] events] objectAtIndex: 0];
-	  user = [SOGoUser userWithLogin: theUID];
-	  if (![ownerEvent userAsAttendee: user])
-	    {
-	      // Update the master event in the owner's calendar with the
-	      // status of the new attendee set as "DECLINED".
+	      {
+          iCalEvent *ownerEvent;
+          iCalPerson *person;
+          SOGoUser *user;
+          
+          // We check if the attendee that was added to a single occurence is
+          // present in the master component. If not, we add it with a participation
+          // status set to "DECLINED".
+          ownerEvent = [[[theEvent parent] events] objectAtIndex: 0];
+          user = [SOGoUser userWithLogin: theUID];
+          if (![ownerEvent userAsAttendee: user])
+            {
+              // Update the master event in the owner's calendar with the
+              // status of the new attendee set as "DECLINED".
               person = [iCalPerson elementWithTag: @"attendee"];
               [person setCn: [user cn]];
               [person setEmail: [[user allEmails] objectAtIndex: 0]];
               [person setParticipationStatus: iCalPersonPartStatDeclined];
               [person setRsvp: @"TRUE"];
               [person setRole: @"REQ-PARTICIPANT"];
-	      [ownerEvent addToAttendees: person];
-
+              [ownerEvent addToAttendees: person];
+              
               iCalString = [[ownerEvent parent] versitString];
-	    }
-	}
+            }
+        }
       else
-	{
-	  // TODO : if [theEvent recurrenceId], only update this occurrence
-	  // in attendee's calendar
-
-	  // TODO : when updating the master event, handle exception dates
-	  // in attendee's calendar (add exception dates and remove matching
-	  // occurrences) -- see _updateRecurrenceIDsWithEvent:
-	  
-	  iCalString = [[theEvent parent] versitString];
-	}
+        {
+          // TODO : if [theEvent recurrenceId], only update this occurrence
+          // in attendee's calendar
+          
+          // TODO : when updating the master event, handle exception dates
+          // in attendee's calendar (add exception dates and remove matching
+          // occurrences) -- see _updateRecurrenceIDsWithEvent:
+          
+          iCalString = [[theEvent parent] versitString];
+        }
       
       // Save the event in the attendee's calendar
       if (iCalString)
-        [attendeeObject saveContentString: iCalString];
+      [attendeeObject saveContentString: iCalString];
     }
 }
 
@@ -244,7 +243,7 @@
 //
 - (void) _removeEventFromUID: (NSString *) theUID
                        owner: (NSString *) theOwner
-	    withRecurrenceId: (NSCalendarDate *) recurrenceId
+            withRecurrenceId: (NSCalendarDate *) recurrenceId
 {
   if (![theUID isEqualToString: theOwner])
     {
@@ -261,46 +260,46 @@
       // Invitations are always written to the personal folder; it's not necessay
       // to look into all folders of the user
       folder = [[SOGoUser userWithLogin: theUID]
-                 personalCalendarFolderInContext: context];
+                personalCalendarFolderInContext: context];
       object = [folder lookupName: nameInContainer
                         inContext: context acquire: NO];
       if (![object isKindOfClass: [NSException class]])
-	{
-	  if (recurrenceId == nil)
-	    [object delete];
-	  else
-	    {
-	      calendar = [object calendar: NO secure: NO];
-	      
-	      // If recurrenceId is defined, remove the occurence from
-	      // the repeating event.
-	      occurences = [calendar events];
-	      max = [occurences count];
-	      count = 1;
-	      while (count < max)
-		{
-		  currentOccurence = [occurences objectAtIndex: count];
-		  currentId = [currentOccurence recurrenceId];
-		  if ([currentId compare: recurrenceId] == NSOrderedSame)
-		    {
-		      [[calendar children] removeObject: currentOccurence];
-		      break;
-		    }
-		  count++;
-		}
-	      
-	      // Add an date exception.
-	      event = (iCalRepeatableEntityObject*)[calendar firstChildWithTag: [object componentTag]];
-	      [event addToExceptionDates: recurrenceId];
-	      
-	      [event increaseSequence];
-	      
-	      // We generate the updated iCalendar file and we save it
-	      // in the database.
-	      calendarContent = [calendar versitString];
-	      [object saveContentString: calendarContent];
-	    }
-	}
+        {
+          if (recurrenceId == nil)
+          [object delete];
+          else
+            {
+              calendar = [object calendar: NO secure: NO];
+              
+              // If recurrenceId is defined, remove the occurence from
+              // the repeating event.
+              occurences = [calendar events];
+              max = [occurences count];
+              count = 1;
+              while (count < max)
+                {
+                  currentOccurence = [occurences objectAtIndex: count];
+                  currentId = [currentOccurence recurrenceId];
+                  if ([currentId compare: recurrenceId] == NSOrderedSame)
+                    {
+                      [[calendar children] removeObject: currentOccurence];
+                      break;
+                    }
+                  count++;
+                }
+              
+              // Add an date exception.
+              event = (iCalRepeatableEntityObject*)[calendar firstChildWithTag: [object componentTag]];
+              [event addToExceptionDates: recurrenceId];
+              
+              [event increaseSequence];
+              
+              // We generate the updated iCalendar file and we save it
+              // in the database.
+              calendarContent = [calendar versitString];
+              [object saveContentString: calendarContent];
+            }
+        }
     }
 }
 
@@ -319,8 +318,8 @@
     {
       currentUID = [currentAttendee uid];
       if (currentUID)
-	[self _removeEventFromUID: currentUID
-	      owner: owner
+        [self _removeEventFromUID: currentUID
+                            owner: owner
 	      withRecurrenceId: recurrenceId];
     }
 }
@@ -345,9 +344,7 @@
           [event removeFromAttendees: delegate];
         }
       else
-        [self errorWithFormat:
-               @"broken chain: delegate with email '%@' was not found",
-              mailTo];
+        [self errorWithFormat:@"broken chain: delegate with email '%@' was not found", mailTo];
     }
 }
 
@@ -402,9 +399,9 @@
     {
       currentUID = [currentAttendee uid];
       if (currentUID)
-	[self _addOrUpdateEvent: newEvent
-			 forUID: currentUID
-			  owner: owner];
+	      [self _addOrUpdateEvent: newEvent
+			                   forUID: currentUID
+			                    owner: owner];
     }
 
   [self sendEMailUsingTemplateNamed: @"Update"
@@ -438,45 +435,45 @@
   ownerUID = [[[self context] activeUser] login];
   
   while ((currentAttendee = [enumerator nextObject]))
-  {
-    currentUID = [currentAttendee uid];
-    if (currentUID)
     {
-      user = [SOGoUser userWithLogin: currentUID];
-      us = [user userSettings];
-      moduleSettings = [us objectForKey:@"Calendar"];
-      // Check if the user prevented his account from beeing invited to events
-      if (![user isResource] && [[moduleSettings objectForKey:@"PreventInvitations"] boolValue])
-      {
-        // Check if the user have a whiteList
-        whiteList = [NSMutableArray arrayWithObject:[moduleSettings objectForKey:@"PreventInvitationsWhitelist"]];
-        predicate = [NSPredicate predicateWithFormat:@"SELF CONTAINS[cd] %@", ownerUID];
-        [whiteList filterUsingPredicate:predicate];
-        // If the filter have a hit, do not add the currentUID to the unavailableAttendees array
-        if ([whiteList count] == 0)
+      currentUID = [currentAttendee uid];
+      if (currentUID)
         {
-          values = [NSDictionary dictionaryWithObject:[user cn] forKey:@"Cn"];
-          [unavailableAttendees addObject:values];
+          user = [SOGoUser userWithLogin: currentUID];
+          us = [user userSettings];
+          moduleSettings = [us objectForKey:@"Calendar"];
+          // Check if the user prevented his account from beeing invited to events
+          if (![user isResource] && [[moduleSettings objectForKey:@"PreventInvitations"] boolValue])
+            {
+              // Check if the user have a whiteList
+              whiteList = [NSMutableArray arrayWithObject:[moduleSettings objectForKey:@"PreventInvitationsWhitelist"]];
+              predicate = [NSPredicate predicateWithFormat:@"SELF CONTAINS[cd] %@", ownerUID];
+              [whiteList filterUsingPredicate:predicate];
+              // If the filter have a hit, do not add the currentUID to the unavailableAttendees array
+              if ([whiteList count] == 0)
+                {
+                  values = [NSDictionary dictionaryWithObject:[user cn] forKey:@"Cn"];
+                  [unavailableAttendees addObject:values];
+                }
+            }
         }
-      }
     }
-  }
 
   count = [unavailableAttendees count];
   if (count > 0)
-  {
-    reason = [NSMutableString stringWithString:[self labelForKey: @"This or these persons cannot be invited:"]];
-    // Add all the unavailable users in the warning message
-    for (i = 0; i < count; i++)
     {
-      value = [unavailableAttendees objectAtIndex:i];
-      [reason appendString:[value keysWithFormat: @"\n %{Cn}"]];
-      if (i < count-2)
-        [reason appendString:@", "];
+      reason = [NSMutableString stringWithString:[self labelForKey: @"This or these persons cannot be invited:"]];
+      // Add all the unavailable users in the warning message
+      for (i = 0; i < count; i++)
+        {
+          value = [unavailableAttendees objectAtIndex:i];
+          [reason appendString:[value keysWithFormat: @"\n %{Cn}"]];
+          if (i < count-2)
+            [reason appendString:@", "];
+        }
+      [unavailableAttendees release];
+      return [NSException exceptionWithHTTPStatus:409 reason: reason];
     }
-    [unavailableAttendees release];
-    return [NSException exceptionWithHTTPStatus:409 reason: reason];
-  }
   [unavailableAttendees release];
   return nil;
 }
@@ -509,167 +506,167 @@
   attendees = [NSMutableArray arrayWithCapacity: [theAttendees count]];
   enumerator = [theAttendees objectEnumerator];
   while ((currentAttendee = [enumerator nextObject]))
-  {
-    currentUID = [currentAttendee uid];
-    if (currentUID)
     {
-      [attendees addObject: currentUID];
+      currentUID = [currentAttendee uid];
+      if (currentUID)
+        {
+          [attendees addObject: currentUID];
+        }
     }
-  }
-  
+      
   // If the active user is not the owner of the calendar, check possible conflict when
   // the owner is a resource
   currentUser = [context activeUser];
   if (!activeUserIsOwner && ![currentUser isSuperUser])
-  {
-    [attendees addObject: owner];
-  }
+    {
+      [attendees addObject: owner];
+    }
   
   enumerator = [attendees objectEnumerator];
   while ((currentUID = [enumerator nextObject]))
-  {
-	  user = [SOGoUser userWithLogin: currentUID];
-	  
-	  if ([user isResource])
     {
-      SOGoAppointmentFolder *folder;
-      NSCalendarDate *start, *end;
-      NGCalendarDateRange *range;
-      NSMutableArray *fbInfo;
-      NSArray *allOccurences;
+      user = [SOGoUser userWithLogin: currentUID];
       
-      BOOL must_delete;
-      int i, j;
-      
-      // We get the start/end date for our conflict range. If the event to be added is recurring, we
-      // check for at least a year to start with.
-      start = [[theEvent startDate] dateByAddingYears: 0  months: 0  days: 0  hours: 0  minutes: 0  seconds: 1];
-      end = [[theEvent endDate] dateByAddingYears: ([theEvent isRecurrent] ? 1 : 0)  months: 0  days: 0  hours: 0  minutes: 0  seconds: -1];
-      
-      folder = [user personalCalendarFolderInContext: context];
-      
-      // Deny access to the resource if the ACLs don't allow the user
-      if (![folder aclSQLListingFilter])
-      {
-        NSDictionary *values;
-        NSString *reason;
-        
-        values = [NSDictionary dictionaryWithObjectsAndKeys:
-                  [user cn], @"Cn",
-                  [user systemEmail], @"SystemEmail"];
-        reason = [values keysWithFormat: [self labelForKey: @"Cannot access resource: \"%{Cn} %{SystemEmail}\""]];
-        return [NSException exceptionWithHTTPStatus:403 reason: reason];
-      }
-      
-      fbInfo = [NSMutableArray arrayWithArray: [folder fetchFreeBusyInfosFrom: start
-                                                                           to: end]];
-      
-      // We first remove any occurences in the freebusy that corresponds to the
-      // current event. We do this to avoid raising a conflict if we move a 1 hour
-      // meeting from 12:00-13:00 to 12:15-13:15. We would overlap on ourself otherwise.
-      //
-      // We must also check here for repetitive events that don't overlap our event.
-      // We remove all events that don't overlap. The events here are already
-      // decomposed.
-      //
-      if ([theEvent isRecurrent])
-        allOccurences = [theEvent recurrenceRangesWithinCalendarDateRange: [NGCalendarDateRange calendarDateRangeWithStartDate: start
-                                                                                                                       endDate: end]
-                                           firstInstanceCalendarDateRange: [NGCalendarDateRange calendarDateRangeWithStartDate: [theEvent startDate]
-                                                                                                                       endDate: [theEvent endDate]]];
-      else
-        allOccurences = nil;
-      
-      for (i = [fbInfo count]-1; i >= 0; i--)
-      {
-        range = [NGCalendarDateRange calendarDateRangeWithStartDate: [[fbInfo objectAtIndex: i] objectForKey: @"startDate"]
-                                                            endDate: [[fbInfo objectAtIndex: i] objectForKey: @"endDate"]];
-        
-        if ([[[fbInfo objectAtIndex: i] objectForKey: @"c_uid"] compare: [theEvent uid]] == NSOrderedSame)
-		    {
-		      [fbInfo removeObjectAtIndex: i];
-		      continue;
-		    }
-        
-        // No need to check if the event isn't recurrent here as it's handled correctly
-        // when we compute the "end" date.
-        if ([allOccurences count])
-		    {
-		      must_delete = YES;
+      if ([user isResource])
+        {
+          SOGoAppointmentFolder *folder;
+          NSCalendarDate *start, *end;
+          NGCalendarDateRange *range;
+          NSMutableArray *fbInfo;
+          NSArray *allOccurences;
           
-		      for (j = 0; j < [allOccurences count]; j++)
-          {
-            if ([range doesIntersectWithDateRange: [allOccurences objectAtIndex: j]])
+          BOOL must_delete;
+          int i, j;
+          
+          // We get the start/end date for our conflict range. If the event to be added is recurring, we
+          // check for at least a year to start with.
+          start = [[theEvent startDate] dateByAddingYears: 0  months: 0  days: 0  hours: 0  minutes: 0  seconds: 1];
+          end = [[theEvent endDate] dateByAddingYears: ([theEvent isRecurrent] ? 1 : 0)  months: 0  days: 0  hours: 0  minutes: 0  seconds: -1];
+          
+          folder = [user personalCalendarFolderInContext: context];
+          
+          // Deny access to the resource if the ACLs don't allow the user
+          if (![folder aclSQLListingFilter])
             {
-              must_delete = NO;
-              break;
+              NSDictionary *values;
+              NSString *reason;
+              
+              values = [NSDictionary dictionaryWithObjectsAndKeys:
+                        [user cn], @"Cn",
+                        [user systemEmail], @"SystemEmail"];
+              reason = [values keysWithFormat: [self labelForKey: @"Cannot access resource: \"%{Cn} %{SystemEmail}\""]];
+              return [NSException exceptionWithHTTPStatus:403 reason: reason];
+            }
+          
+          fbInfo = [NSMutableArray arrayWithArray: [folder fetchFreeBusyInfosFrom: start
+                                                                               to: end]];
+          
+          // We first remove any occurences in the freebusy that corresponds to the
+          // current event. We do this to avoid raising a conflict if we move a 1 hour
+          // meeting from 12:00-13:00 to 12:15-13:15. We would overlap on ourself otherwise.
+          //
+          // We must also check here for repetitive events that don't overlap our event.
+          // We remove all events that don't overlap. The events here are already
+          // decomposed.
+          //
+          if ([theEvent isRecurrent])
+            allOccurences = [theEvent recurrenceRangesWithinCalendarDateRange: [NGCalendarDateRange calendarDateRangeWithStartDate: start
+                                                                                                                           endDate: end]
+                                               firstInstanceCalendarDateRange: [NGCalendarDateRange calendarDateRangeWithStartDate: [theEvent startDate]
+                                                                                                                           endDate: [theEvent endDate]]];
+          else
+            allOccurences = nil;
+          
+          for (i = [fbInfo count]-1; i >= 0; i--)
+            {
+              range = [NGCalendarDateRange calendarDateRangeWithStartDate: [[fbInfo objectAtIndex: i] objectForKey: @"startDate"]
+                                                                  endDate: [[fbInfo objectAtIndex: i] objectForKey: @"endDate"]];
+              
+              if ([[[fbInfo objectAtIndex: i] objectForKey: @"c_uid"] compare: [theEvent uid]] == NSOrderedSame)
+                {
+                  [fbInfo removeObjectAtIndex: i];
+                  continue;
+                }
+              
+              // No need to check if the event isn't recurrent here as it's handled correctly
+              // when we compute the "end" date.
+              if ([allOccurences count])
+                {
+                  must_delete = YES;
+                  
+                  for (j = 0; j < [allOccurences count]; j++)
+                    {
+                      if ([range doesIntersectWithDateRange: [allOccurences objectAtIndex: j]])
+                        {
+                          must_delete = NO;
+                          break;
+                        }
+                    }
+                  
+                  if (must_delete)
+                    [fbInfo removeObjectAtIndex: i];
+                }
+            }
+          
+          // Find the attendee associated to the current UID
+          for (i = 0; i < [theAttendees count]; i++)
+            {
+              currentAttendee = [theAttendees objectAtIndex: i];
+              if ([[currentAttendee uid] isEqualToString: currentUID])
+              break;
+              else
+              currentAttendee = nil;
+            }
+          
+          if ([fbInfo count])
+            {
+              // If we always force the auto-accept if numberOfSimultaneousBookings == 0 (ie., no limit
+              // is imposed) or if numberOfSimultaneousBookings is greater than the number of
+              // overlapping events
+              if ([user numberOfSimultaneousBookings] == 0 ||
+                  [user numberOfSimultaneousBookings] > [fbInfo count])
+                {
+                  if (currentAttendee)
+                    {
+                      [[currentAttendee attributes] removeObjectForKey: @"RSVP"];
+                      [currentAttendee setParticipationStatus: iCalPersonPartStatAccepted];
+                    }
+                }
+              else
+                {
+                  iCalCalendar *calendar;
+                  NSDictionary *values;
+                  NSString *reason;
+                  iCalEvent *event;
+                  
+                  calendar =  [iCalCalendar parseSingleFromSource: [[fbInfo objectAtIndex: 0] objectForKey: @"c_content"]];
+                  event = [[calendar events] lastObject];
+                  
+                  values = [NSDictionary dictionaryWithObjectsAndKeys:
+                            [NSString stringWithFormat: @"%d", [user numberOfSimultaneousBookings]], @"NumberOfSimultaneousBookings",
+                            [user cn], @"Cn",
+                            [user systemEmail], @"SystemEmail",
+                            ([event summary] ? [event summary] : @""), @"EventTitle",
+                            [[fbInfo objectAtIndex: 0] objectForKey: @"startDate"], @"StartDate",
+                            nil];
+                  
+                  reason = [values keysWithFormat: [self labelForKey: @"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\". The conflicting event is \"%{EventTitle}\", and starts on %{StartDate}."]];
+                  
+                  return [NSException exceptionWithHTTPStatus: 403
+                                                       reason: reason];
+                }
+            }
+          else if (currentAttendee)
+            {
+              // No conflict, we auto-accept. We do this for resources automatically if no
+              // double-booking is observed. If it's not the desired behavior, just don't
+              // set the resource as one!
+              [[currentAttendee attributes] removeObjectForKey: @"RSVP"];
+              [currentAttendee setParticipationStatus: iCalPersonPartStatAccepted];
             }
-          }
-		      
-		      if (must_delete)
-            [fbInfo removeObjectAtIndex: i];
-		    }
-      }
-      
-      // Find the attendee associated to the current UID
-      for (i = 0; i < [theAttendees count]; i++)
-      {
-        currentAttendee = [theAttendees objectAtIndex: i];
-        if ([[currentAttendee uid] isEqualToString: currentUID])
-          break;
-        else
-          currentAttendee = nil;
-      }
-      
-      if ([fbInfo count])
-      {
-        // If we always force the auto-accept if numberOfSimultaneousBookings == 0 (ie., no limit
-        // is imposed) or if numberOfSimultaneousBookings is greater than the number of
-        // overlapping events
-        if ([user numberOfSimultaneousBookings] == 0 ||
-            [user numberOfSimultaneousBookings] > [fbInfo count])
-        {
-          if (currentAttendee)
-          {
-            [[currentAttendee attributes] removeObjectForKey: @"RSVP"];
-            [currentAttendee setParticipationStatus: iCalPersonPartStatAccepted];
-          }
         }
-        else
-        {
-          iCalCalendar *calendar;
-          NSDictionary *values;
-          NSString *reason;
-          iCalEvent *event;
-          
-          calendar =  [iCalCalendar parseSingleFromSource: [[fbInfo objectAtIndex: 0] objectForKey: @"c_content"]];
-          event = [[calendar events] lastObject];
-          
-          values = [NSDictionary dictionaryWithObjectsAndKeys:
-                    [NSString stringWithFormat: @"%d", [user numberOfSimultaneousBookings]], @"NumberOfSimultaneousBookings",
-                    [user cn], @"Cn",
-                    [user systemEmail], @"SystemEmail",
-                    ([event summary] ? [event summary] : @""), @"EventTitle",
-                    [[fbInfo objectAtIndex: 0] objectForKey: @"startDate"], @"StartDate",
-                    nil];
-          
-          reason = [values keysWithFormat: [self labelForKey: @"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\". The conflicting event is \"%{EventTitle}\", and starts on %{StartDate}."]];
-          
-          return [NSException exceptionWithHTTPStatus: 403
-                                               reason: reason];
-        }
-      }
-      else if (currentAttendee)
-      {
-        // No conflict, we auto-accept. We do this for resources automatically if no
-        // double-booking is observed. If it's not the desired behavior, just don't
-        // set the resource as one!
-        [[currentAttendee attributes] removeObjectForKey: @"RSVP"];
-        [currentAttendee setParticipationStatus: iCalPersonPartStatAccepted];
-      }
     }
-  }
-  
+      
   return nil;
 }
 
@@ -692,13 +689,13 @@
   
   enumerator = [attendees objectEnumerator];
   while ((currentAttendee = [enumerator nextObject]))
-  {
-    currentUID = [currentAttendee uid];
-    if (currentUID)
+    {
+      currentUID = [currentAttendee uid];
+      if (currentUID)
       [self _addOrUpdateEvent: newEvent
                        forUID: currentUID
                         owner: owner];
-  }
+    }
   
   return nil;
 }
@@ -727,12 +724,11 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
     {
       e = [events objectAtIndex: i];
       if ([e recurrenceId])
-	for (j = 0; j < [theAttendees count]; j++)
-	  if (shouldAdd)
-	    [e addToAttendees: [theAttendees objectAtIndex: j]];
-	  else
-	    [e removeFromAttendees: [theAttendees objectAtIndex: j]];
-
+        for (j = 0; j < [theAttendees count]; j++)
+          if (shouldAdd)
+	          [e addToAttendees: [theAttendees objectAtIndex: j]];
+      else
+        [e removeFromAttendees: [theAttendees objectAtIndex: j]];
     }
 }
 		       
@@ -791,7 +787,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
   // the attendees were added to the master event.
   [self _addOrDeleteAttendees: addedAttendees
 	inRecurrenceExceptionsForEvent: newEvent
-			  add: YES];
+			                       add: YES];
 
   if ([changes sequenceShouldBeIncreased])
     {
@@ -807,29 +803,29 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
       // If other attributes have changed, update the event
       // in each attendee's calendar
       if ([[changes updatedProperties] count])
-	{
-	  NSEnumerator *enumerator;
-	  iCalPerson *currentAttendee;
-	  NSString *currentUID;
-	  
+        {
+          NSEnumerator *enumerator;
+          iCalPerson *currentAttendee;
+          NSString *currentUID;
+          
           updatedAttendees = [newEvent attendees];
-	  enumerator = [updatedAttendees objectEnumerator];
-	  while ((currentAttendee = [enumerator nextObject]))
-	    {
-	      currentUID = [currentAttendee uid];
-	      if (currentUID)
-		[self _addOrUpdateEvent: newEvent
-				 forUID: currentUID
-				  owner: owner];
-	    }
-	}
+          enumerator = [updatedAttendees objectEnumerator];
+          while ((currentAttendee = [enumerator nextObject]))
+            {
+              currentUID = [currentAttendee uid];
+              if (currentUID)
+                [self _addOrUpdateEvent: newEvent
+                                 forUID: currentUID
+                                  owner: owner];
+            }
+        }
     }
 
   if ([addedAttendees count])
     {
       // Send an invitation to new attendees
       if ((ex = [self _handleAddedUsers: addedAttendees fromEvent: newEvent]))
-	return ex;
+        return ex;
       
       [self sendEMailUsingTemplateNamed: @"Invitation"
                               forObject: [newEvent itipEntryWithMethod: @"request"]
@@ -837,12 +833,12 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
                             toAttendees: addedAttendees
                                withType: @"calendar:invitation"];
     }
-
-  [self sendReceiptEmailForObject: newEvent
-		   addedAttendees: addedAttendees
-		 deletedAttendees: deletedAttendees
-		 updatedAttendees: updatedAttendees
-			operation: EventUpdated];
+      
+      [self sendReceiptEmailForObject: newEvent
+                       addedAttendees: addedAttendees
+                     deletedAttendees: deletedAttendees
+                     updatedAttendees: updatedAttendees
+                            operation: EventUpdated];
 
   return nil;
 }
@@ -894,57 +890,56 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
     {
       // New event -- send invitation to all attendees
       attendees = [newEvent attendeesWithoutUser: ownerUser];
-
+      
       // We catch conflicts and abort the save process immediately
       // in case of one with resources
       if ((ex = [self _handleAddedUsers: attendees fromEvent: newEvent]))
         return ex;
-
+      
       if ([attendees count])
-	{
-	  [self sendEMailUsingTemplateNamed: @"Invitation"
-				  forObject: [newEvent itipEntryWithMethod: @"request"]
-			     previousObject: nil
-				toAttendees: attendees
+        {
+          [self sendEMailUsingTemplateNamed: @"Invitation"
+                                  forObject: [newEvent itipEntryWithMethod: @"request"]
+                             previousObject: nil
+                                toAttendees: attendees
                                    withType: @"calendar:invitation"];
-	}
-
+        }
+      
       [self sendReceiptEmailForObject: newEvent
-		       addedAttendees: attendees
-		     deletedAttendees: nil
-		     updatedAttendees: nil
-			    operation: EventCreated];
+                       addedAttendees: attendees
+                     deletedAttendees: nil
+                     updatedAttendees: nil
+                            operation: EventCreated];
     }
-  else
+      else
     {
       BOOL hasOrganizer;
-
+      
       // Event is modified -- sent update status to all attendees
       // and modify their calendars.
       recurrenceId = [newEvent recurrenceId];
       if (recurrenceId == nil)
-	oldEvent = [self component: NO secure: NO];
+        oldEvent = [self component: NO secure: NO];
       else
-	{
-	  // If recurrenceId is defined, find the specified occurence
-	  // within the repeating vEvent.
-	  recurrenceTime = [NSString stringWithFormat: @"%f", [recurrenceId timeIntervalSince1970]];
-	  oldEvent = (iCalEvent*)[self lookupOccurrence: recurrenceTime];
-	  if (oldEvent == nil)
-	    // If no occurence found, create one
-	    oldEvent = (iCalEvent *)[self newOccurenceWithID: recurrenceTime];
-	}
-
+        {
+          // If recurrenceId is defined, find the specified occurence
+          // within the repeating vEvent.
+          recurrenceTime = [NSString stringWithFormat: @"%f", [recurrenceId timeIntervalSince1970]];
+          oldEvent = (iCalEvent*)[self lookupOccurrence: recurrenceTime];
+          if (oldEvent == nil) // If no occurence found, create one
+            oldEvent = (iCalEvent *)[self newOccurenceWithID: recurrenceTime];
+        }
+      
       oldMasterEvent = (iCalEvent *)[[oldEvent parent] firstChildWithTag: [self componentTag]];
       hasOrganizer = [[[oldMasterEvent organizer] email] length];
-
+      
       if (!hasOrganizer || [oldMasterEvent userIsOrganizer: ownerUser])
-	// The owner is the organizer of the event; handle the modifications. We aslo
-	// catch conflicts just like when the events are created
-	if ((ex = [self _handleUpdatedEvent: newEvent fromOldEvent: oldEvent]))
-	  return ex;
+      // The owner is the organizer of the event; handle the modifications. We aslo
+      // catch conflicts just like when the events are created
+        if ((ex = [self _handleUpdatedEvent: newEvent fromOldEvent: oldEvent]))
+          return ex;
     }
-
+      
   [super saveComponent: newEvent];
   [self flush];
 
@@ -966,11 +961,11 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
 - (NSException *) _updateAttendee: (iCalPerson *) attendee
                      withDelegate: (iCalPerson *) delegate
                         ownerUser: (SOGoUser *) theOwnerUser
-		      forEventUID: (NSString *) eventUID
-		 withRecurrenceId: (NSCalendarDate *) recurrenceId
-		     withSequence: (NSNumber *) sequence
-			   forUID: (NSString *) uid
-	          shouldAddSentBy: (BOOL) b
+		                  forEventUID: (NSString *) eventUID
+		             withRecurrenceId: (NSCalendarDate *) recurrenceId
+		                 withSequence: (NSNumber *) sequence
+			                     forUID: (NSString *) uid
+                  shouldAddSentBy: (BOOL) b
 {
   SOGoAppointmentObject *eventObject;
   iCalCalendar *calendar;
@@ -986,30 +981,30 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
   if (![eventObject isNew])
     {
       if (recurrenceId == nil)
-	{
-	  // We must update main event and all its occurences (if any).
-	  calendar = [eventObject calendar: NO secure: NO];
-	  event = (iCalEntityObject*)[calendar firstChildWithTag: [self componentTag]];
-	}
+        {
+          // We must update main event and all its occurences (if any).
+          calendar = [eventObject calendar: NO secure: NO];
+          event = (iCalEntityObject*)[calendar firstChildWithTag: [self componentTag]];
+        }
       else
-	{
-	  // If recurrenceId is defined, find the specified occurence
-	  // within the repeating vEvent.
-	  recurrenceTime = [NSString stringWithFormat: @"%f", [recurrenceId timeIntervalSince1970]];
-	  event = [eventObject lookupOccurrence: recurrenceTime];
-	  
-	  if (event == nil)
-	    // If no occurence found, create one
-	    event = [eventObject newOccurenceWithID: recurrenceTime];
-	}
+        {
+          // If recurrenceId is defined, find the specified occurence
+          // within the repeating vEvent.
+          recurrenceTime = [NSString stringWithFormat: @"%f", [recurrenceId timeIntervalSince1970]];
+          event = [eventObject lookupOccurrence: recurrenceTime];
+          
+          if (event == nil)
+          // If no occurence found, create one
+          event = [eventObject newOccurenceWithID: recurrenceTime];
+        }
       
       if ([[event sequence] intValue] <= [sequence intValue])
-	{
-	  SOGoUser *currentUser;
-
-	  currentUser = [context activeUser];
-	  otherAttendee = [event userAsAttendee: theOwnerUser];
-
+        {
+          SOGoUser *currentUser;
+          
+          currentUser = [context activeUser];
+          otherAttendee = [event userAsAttendee: theOwnerUser];
+          
           delegateEmail = [otherAttendee delegatedTo];
           if ([delegateEmail length])
             delegateEmail = [delegateEmail rfc822Email];
@@ -1017,7 +1012,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
             otherDelegate = [event findAttendeeWithEmail: delegateEmail];
           else
             otherDelegate = NO;
-
+          
           /* we handle the addition/deletion of delegate users */
           addDelegate = NO;
           removeDelegate = NO;
@@ -1032,68 +1027,67 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
                     }
                 }
               else
-                addDelegate = YES;
+              addDelegate = YES;
             }
           else
             {
               if (otherDelegate)
-                removeDelegate = YES;
+              removeDelegate = YES;
             }
-
+          
           if (removeDelegate)
-	    {
-	      while (otherDelegate)
-		{
-		  [event removeFromAttendees: otherDelegate];
-		  
-		  // Verify if the delegate was already delegate
-		  delegateEmail = [otherDelegate delegatedTo];
-		  if ([delegateEmail length])
-		    delegateEmail = [delegateEmail rfc822Email];
-		  
-		  if ([delegateEmail length])
-		    otherDelegate = [event findAttendeeWithEmail: delegateEmail];
-		  else
-		    otherDelegate = NO;
-		}
-	    }
+            {
+              while (otherDelegate)
+                {
+                  [event removeFromAttendees: otherDelegate];
+                  
+                  // Verify if the delegate was already delegate
+                  delegateEmail = [otherDelegate delegatedTo];
+                  if ([delegateEmail length])
+                    delegateEmail = [delegateEmail rfc822Email];
+                  
+                  if ([delegateEmail length])
+                    otherDelegate = [event findAttendeeWithEmail: delegateEmail];
+                  else
+                    otherDelegate = NO;
+                }
+            }
           if (addDelegate)
             [event addToAttendees: delegate];
-
-	  [otherAttendee setPartStat: [attendee partStat]];
+          
+          [otherAttendee setPartStat: [attendee partStat]];
           [otherAttendee setDelegatedTo: [attendee delegatedTo]];
           [otherAttendee setDelegatedFrom: [attendee delegatedFrom]];
-
+          
           // Remove the RSVP attribute, as an action from the attendee
           // was actually performed, and this confuses iCal (bug #1850)
           [[otherAttendee attributes] removeObjectForKey: @"RSVP"];
-
-	  // If one has accepted / declined an invitation on behalf of
-	  // the attendee, we add the user to the SENT-BY attribute.
-	  if (b && ![[currentUser login] isEqualToString: [theOwnerUser login]])
-	    {
-	      NSString *currentEmail, *quotedEmail;
-	      currentEmail = [[currentUser allEmails] objectAtIndex: 0];
-              quotedEmail = [NSString stringWithFormat: @"\"MAILTO:%@\"",
-                                      currentEmail];
-	      [otherAttendee setValue: 0 ofAttribute: @"SENT-BY"
+          
+          // If one has accepted / declined an invitation on behalf of
+          // the attendee, we add the user to the SENT-BY attribute.
+          if (b && ![[currentUser login] isEqualToString: [theOwnerUser login]])
+            {
+              NSString *currentEmail, *quotedEmail;
+              currentEmail = [[currentUser allEmails] objectAtIndex: 0];
+              quotedEmail = [NSString stringWithFormat: @"\"MAILTO:%@\"", currentEmail];
+              [otherAttendee setValue: 0 ofAttribute: @"SENT-BY"
                                    to: quotedEmail];
-	    }
-	  else
-	    {
-	      // We must REMOVE any SENT-BY here. This is important since if A accepted
-	      // the event for B and then, B changes by himself his participation status,
-	      // we don't want to keep the previous SENT-BY attribute there.
-	      [(NSMutableDictionary *)[otherAttendee attributes] removeObjectForKey: @"SENT-BY"];
-	    }
-	}
+            }
+          else
+            {
+              // We must REMOVE any SENT-BY here. This is important since if A accepted
+              // the event for B and then, B changes by himself his participation status,
+              // we don't want to keep the previous SENT-BY attribute there.
+              [(NSMutableDictionary *)[otherAttendee attributes] removeObjectForKey: @"SENT-BY"];
+            }
+        }
       
       // We generate the updated iCalendar file and we save it
       // in the database.
       iCalString = [[event parent] versitString];
       error = [eventObject saveContentString: iCalString];
     }
-  
+      
   return error;
 }
 
@@ -1107,8 +1101,8 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
 - (NSException *) _handleAttendee: (iCalPerson *) attendee
                      withDelegate: (iCalPerson *) delegate
                         ownerUser: (SOGoUser *) theOwnerUser
-		     statusChange: (NSString *) newStatus
-			  inEvent: (iCalEvent *) event
+		                 statusChange: (NSString *) newStatus
+			                    inEvent: (iCalEvent *) event
 {
   NSString *currentStatus, *organizerUID;
   SOGoUser *ownerUser, *currentUser;
@@ -1139,29 +1133,28 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
   if (delegate)
     {
       if (otherDelegate)
-	{
-	  // There was already a delegate
-	  if (![delegate hasSameEmailAddress: otherDelegate])
-	    {
-	      // The delegate has changed
-	      removeDelegate = YES;
-	      addDelegate = YES;
-	    }
-	}
+        {
+          // There was already a delegate
+          if (![delegate hasSameEmailAddress: otherDelegate])
+            {
+              // The delegate has changed
+              removeDelegate = YES;
+              addDelegate = YES;
+            }
+        }
       else
-	// There was no previous delegate
-	addDelegate = YES;
+        // There was no previous delegate
+        addDelegate = YES;
     }
   else
     {
       if (otherDelegate)
-	// The user has removed the delegate
-	removeDelegate = YES;
+        // The user has removed the delegate
+        removeDelegate = YES;
     }
  
   if (addDelegate || removeDelegate
-      || [currentStatus caseInsensitiveCompare: newStatus]
-      != NSOrderedSame)
+                  || [currentStatus caseInsensitiveCompare: newStatus] != NSOrderedSame)
     {
       NSMutableArray *delegates;
       NSString *delegatedUID;
@@ -1173,106 +1166,105 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
       // the attendee, we add the user to the SENT-BY attribute.
       currentUser = [context activeUser];
       if (![[currentUser login] isEqualToString: [theOwnerUser login]])
-	{
+        {
           NSString *currentEmail, *quotedEmail;
           currentEmail = [[currentUser allEmails] objectAtIndex: 0];
-          quotedEmail = [NSString stringWithFormat: @"\"MAILTO:%@\"",
-                                  currentEmail];
+          quotedEmail = [NSString stringWithFormat: @"\"MAILTO:%@\"", currentEmail];
           [attendee setValue: 0 ofAttribute: @"SENT-BY"
                           to: quotedEmail];
-	}
+        }
       else
-	{
-	  // We must REMOVE any SENT-BY here. This is important since if A accepted
-	  // the event for B and then, B changes by himself his participation status,
-	  // we don't want to keep the previous SENT-BY attribute there.
-	  [(NSMutableDictionary *)[attendee attributes] removeObjectForKey: @"SENT-BY"];
-	}
- 
+        {
+          // We must REMOVE any SENT-BY here. This is important since if A accepted
+          // the event for B and then, B changes by himself his participation status,
+          // we don't want to keep the previous SENT-BY attribute there.
+          [(NSMutableDictionary *)[attendee attributes] removeObjectForKey: @"SENT-BY"];
+        }
+      
       [attendee setDelegatedTo: [delegate email]];
-
+      
       if (removeDelegate)
-	{
-	  delegates = [NSMutableArray array];
-
-	  while (otherDelegate)
-	    {
-	      [delegates addObject: otherDelegate];
-
-	      delegatedUID = [otherDelegate uid];
-	      if (delegatedUID)
-		// Delegate attendee is a local user; remove event from his calendar
-		[self _removeEventFromUID: delegatedUID
-				    owner: [theOwnerUser login]
-			 withRecurrenceId: [event recurrenceId]];
-	      
-	      [event removeFromAttendees: otherDelegate];
-
-	      // Verify if the delegate was already delegated
-	      delegateEmail = [otherDelegate delegatedTo];
-	      if ([delegateEmail length])
-		delegateEmail = [delegateEmail rfc822Email];
-	      
-	      if ([delegateEmail length])
-		otherDelegate = [event findAttendeeWithEmail: delegateEmail];
-	      else
-		otherDelegate = NO;
-	    }
-	  
-	  [self sendEMailUsingTemplateNamed: @"Deletion"
-				  forObject: [event itipEntryWithMethod: @"cancel"]
-			     previousObject: nil
-				toAttendees: delegates
+        {
+          delegates = [NSMutableArray array];
+          
+          while (otherDelegate)
+            {
+              [delegates addObject: otherDelegate];
+              
+              delegatedUID = [otherDelegate uid];
+              if (delegatedUID)
+                // Delegate attendee is a local user; remove event from his calendar
+                [self _removeEventFromUID: delegatedUID
+                                    owner: [theOwnerUser login]
+                         withRecurrenceId: [event recurrenceId]];
+              
+              [event removeFromAttendees: otherDelegate];
+              
+              // Verify if the delegate was already delegated
+              delegateEmail = [otherDelegate delegatedTo];
+              if ([delegateEmail length])
+                delegateEmail = [delegateEmail rfc822Email];
+              
+              if ([delegateEmail length])
+                otherDelegate = [event findAttendeeWithEmail: delegateEmail];
+              else
+                otherDelegate = NO;
+            }
+          
+          [self sendEMailUsingTemplateNamed: @"Deletion"
+                                  forObject: [event itipEntryWithMethod: @"cancel"]
+                             previousObject: nil
+                                toAttendees: delegates
                                    withType: @"calendar:cancellation"];
-	} // if (removeDelegate)
-
+        } // if (removeDelegate)
+      
       if (addDelegate)
-	{
-	  delegatedUID = [delegate uid];
-	  delegates = [NSArray arrayWithObject: delegate];
-	  [event addToAttendees: delegate];
-	
-	  if (delegatedUID)
-	    // Delegate attendee is a local user; add event to his calendar
-	    [self _addOrUpdateEvent: event
-			     forUID: delegatedUID
-			      owner: [theOwnerUser login]];
-
-	  [self sendEMailUsingTemplateNamed: @"Invitation"
-				  forObject: [event itipEntryWithMethod: @"request"]
-			     previousObject: nil
-				toAttendees: delegates
+        {
+          delegatedUID = [delegate uid];
+          delegates = [NSArray arrayWithObject: delegate];
+          [event addToAttendees: delegate];
+          
+          if (delegatedUID)
+            // Delegate attendee is a local user; add event to his calendar
+            [self _addOrUpdateEvent: event
+                             forUID: delegatedUID
+                              owner: [theOwnerUser login]];
+          
+          [self sendEMailUsingTemplateNamed: @"Invitation"
+                                  forObject: [event itipEntryWithMethod: @"request"]
+                             previousObject: nil
+                                toAttendees: delegates
                                    withType: @"calendar:invitation"];
-	} // if (addDelegate)
+        } // if (addDelegate)
       
       // If the current user isn't the organizer of the event
       // that has just been updated, we update the event and
       // send a notification
       ownerUser = [SOGoUser userWithLogin: owner];
       if (!(ex || [event userIsOrganizer: ownerUser]))
-	{
-	  if ([event isStillRelevant])
-	    [self sendResponseToOrganizer: event
+        {
+          if ([event isStillRelevant])
+            [self sendResponseToOrganizer: event
                                      from: ownerUser];
-	  
-	  organizerUID = [[event organizer] uid];
-
-	  // Event is an exception to a recurring event; retrieve organizer from master event
-	  if (!organizerUID)
-	    organizerUID = [[(iCalEntityObject*)[[event parent] firstChildWithTag: [self componentTag]] organizer] uid];
-
-	  if (organizerUID)
-	    // Update the attendee in organizer's calendar.
-	    ex = [self _updateAttendee: attendee
+          
+          organizerUID = [[event organizer] uid];
+          
+          // Event is an exception to a recurring event; retrieve organizer from master event
+          if (!organizerUID)
+            organizerUID = [[(iCalEntityObject*)[[event parent] firstChildWithTag: [self componentTag]] organizer] uid];
+          
+          if (organizerUID)
+            // Update the attendee in organizer's calendar.
+            ex = [self _updateAttendee: attendee
                           withDelegate: delegate
                              ownerUser: theOwnerUser
                            forEventUID: [event uid]
                       withRecurrenceId: [event recurrenceId]
                           withSequence: [event sequence]
                                 forUID: organizerUID
-		       shouldAddSentBy: YES];
-	}
-
+                       shouldAddSentBy: YES];
+        }
+      
       // We update the calendar of all attendees that are
       // local to the system. This is useful in case user A accepts
       // invitation from organizer B and users C, D, E who are also
@@ -1281,15 +1273,13 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
       iCalPerson *att;
       NSString *uid;
       int i;
-
+      
       attendees = [event attendees];
       for (i = 0; i < [attendees count]; i++)
-	{
-	  att = [attendees objectAtIndex: i];
-	  uid = [att uid];
-          if (uid
-	      && att != attendee
-	      && ![uid isEqualToString: delegatedUID])
+        {
+          att = [attendees objectAtIndex: i];
+          uid = [att uid];
+          if (uid && att != attendee && ![uid isEqualToString: delegatedUID])
             [self _updateAttendee: attendee
                      withDelegate: delegate
                         ownerUser: theOwnerUser
@@ -1298,9 +1288,9 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
                      withSequence: [event sequence]
                            forUID: uid
                   shouldAddSentBy: YES];
-	}
+        }
     }
-
+      
   return ex;
 }
 
@@ -1310,13 +1300,9 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
   NSDictionary *code;
 
   element = [NSMutableArray array];
-  [element addObject: davElementWithContent (@"recipient", XMLNS_CALDAV,
-					     recipient)];
-  [element addObject: davElementWithContent (@"request-status",
-					     XMLNS_CALDAV,
-					     @"2.0;Success")];
-  code = davElementWithContent (@"response", XMLNS_CALDAV,
-				element);
+  [element addObject: davElementWithContent (@"recipient", XMLNS_CALDAV, recipient)];
+  [element addObject: davElementWithContent (@"request-status", XMLNS_CALDAV, @"2.0;Success")];
+  code = davElementWithContent (@"response", XMLNS_CALDAV, element);
 
   return code;
 }
@@ -1326,7 +1312,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
 // advertise for its support but we do everything within the calendar-auto-scheduling code
 // 
 - (NSArray *) postCalDAVEventRequestTo: (NSArray *) recipients
-				  from: (NSString *) originator
+                                  from: (NSString *) originator
 {
   NSEnumerator *recipientsEnum;
   NSMutableArray *elements;
@@ -1339,14 +1325,14 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
   while ((recipient = [recipientsEnum nextObject]))
     if ([[recipient lowercaseString] hasPrefix: @"mailto:"])
       {
-	[elements addObject: [self _caldavSuccessCodeWithRecipient: recipient]];
+        [elements addObject: [self _caldavSuccessCodeWithRecipient: recipient]];
       }
 
   return elements;
 }
 
 - (NSArray *) postCalDAVEventCancelTo: (NSArray *) recipients
-				 from: (NSString *) originator
+                                 from: (NSString *) originator
 {
   NSEnumerator *recipientsEnum;
   NSMutableArray *elements;
@@ -1360,14 +1346,14 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
   while ((recipient = [recipientsEnum nextObject]))
     if ([[recipient lowercaseString] hasPrefix: @"mailto:"])
       {
-	[elements addObject: [self _caldavSuccessCodeWithRecipient: recipient]];
+        [elements addObject: [self _caldavSuccessCodeWithRecipient: recipient]];
       }
 
   return elements;
 }
 
 - (NSArray *) postCalDAVEventReplyTo: (NSArray *) recipients
-				from: (NSString *) originator
+                                from: (NSString *) originator
 {
   NSEnumerator *recipientsEnum;
   NSMutableArray *elements;
@@ -1379,7 +1365,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
   while ((recipient = [recipientsEnum nextObject]))
     if ([[recipient lowercaseString] hasPrefix: @"mailto:"])
       {
-	[elements addObject: [self _caldavSuccessCodeWithRecipient: recipient]];
+        [elements addObject: [self _caldavSuccessCodeWithRecipient: recipient]];
       }
 
   return elements;
@@ -1392,7 +1378,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
                                withDelegate: (iCalPerson *) delegate
 {
   return [self changeParticipationStatus: status
-			    withDelegate: delegate
+                            withDelegate: delegate
                          forRecurrenceId: nil];
 }
 
@@ -1443,15 +1429,14 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
       attendee = [event userAsAttendee: ownerUser];
       if (attendee)
         {
-          if (delegate
-              && ![[delegate email] isEqualToString: [attendee delegatedTo]])
+          if (delegate && ![[delegate email] isEqualToString: [attendee delegatedTo]])
             {
               delegatedUid = [delegate uid];
               if (delegatedUid)
                 delegatedUser = [SOGoUser userWithLogin: delegatedUid];
               if (delegatedUser != nil && [event userIsOrganizer: delegatedUser])
                 ex = [NSException exceptionWithHTTPStatus: 403
-                                                   reason: @"delegate is organizer"];		
+                                                   reason: @"delegate is organizer"];
               if ([event isAttendee: [[delegate email] rfc822Email]])
                 ex = [NSException exceptionWithHTTPStatus: 403
                                                    reason: @"delegate is a participant"];
@@ -1477,9 +1462,8 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
               // the database. We do this ONLY when using SOGo from the
               // Web interface or over ActiveSync.
               // Over DAV, it'll be handled directly in PUTAction:
-              if (![context request]
-                  || [[context request] handledByDefaultHandler]
-                  || [[[context request] requestHandlerKey] isEqualToString: @"Microsoft-Server-ActiveSync"])
+              if (![context request] || [[context request] handledByDefaultHandler]
+                                     || [[[context request] requestHandlerKey] isEqualToString: @"Microsoft-Server-ActiveSync"])
                 ex = [self saveContentString: [[event parent] versitString]];
             }
         }
@@ -1487,9 +1471,9 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
         ex = [NSException exceptionWithHTTPStatus: 404 // Not Found
                                            reason: @"user does not participate in this calendar event"];
     }
-  else
-    ex = [NSException exceptionWithHTTPStatus: 500 // Server Error
-                                       reason: @"unable to parse event record"];
+      else
+        ex = [NSException exceptionWithHTTPStatus: 500 // Server Error
+                                           reason: @"unable to parse event record"];
   
   return ex;
 }
@@ -1510,20 +1494,20 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
   if (theOrganizer && (v = [theOrganizer value: 0  ofAttribute: @"SCHEDULE-AGENT"]))
     {
       if ([v caseInsensitiveCompare: @"NONE"] == NSOrderedSame ||
-	  [v caseInsensitiveCompare: @"CLIENT"] == NSOrderedSame)
-	b = NO;
+          [v caseInsensitiveCompare: @"CLIENT"] == NSOrderedSame)
+        b = NO;
     }
-
-  //
-  // If we have to deal with Thunderbird/Lightning, we always send invitation
-  // reponses, as Lightning v2.6 (at least this version) sets SCHEDULE-AGENT
-  // to NONE/CLIENT when responding to an external invitation received by
-  // SOGo - so no invitation responses are ever sent by Lightning. See
-  // https://bugzilla.mozilla.org/show_bug.cgi?id=865726 and
-  // https://bugzilla.mozilla.org/show_bug.cgi?id=997784
-  //
-  userAgents = [[context request] headersForKey: @"User-Agent"];
-  
+      
+      //
+      // If we have to deal with Thunderbird/Lightning, we always send invitation
+      // reponses, as Lightning v2.6 (at least this version) sets SCHEDULE-AGENT
+      // to NONE/CLIENT when responding to an external invitation received by
+      // SOGo - so no invitation responses are ever sent by Lightning. See
+      // https://bugzilla.mozilla.org/show_bug.cgi?id=865726 and
+      // https://bugzilla.mozilla.org/show_bug.cgi?id=997784
+      //
+      userAgents = [[context request] headersForKey: @"User-Agent"];
+      
   for (i = 0; i < [userAgents count]; i++)
     {
       if ([[userAgents objectAtIndex: i] rangeOfString: @"Thunderbird"].location != NSNotFound &&
@@ -1576,36 +1560,36 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
       
 #warning Make sure this is correct ..
       if (![attendees count] && event != occurence)
-	attendees = [event attendeesWithoutUser: currentUser];
+        attendees = [event attendeesWithoutUser: currentUser];
       
       if ([attendees count])
-	{
-	  // Remove the event from all attendees calendars
-	  // and send them an email.
-	  [self _handleRemovedUsers: attendees
-		withRecurrenceId: recurrenceId];
-	  [self sendEMailUsingTemplateNamed: @"Deletion"
+        {
+          // Remove the event from all attendees calendars
+          // and send them an email.
+          [self _handleRemovedUsers: attendees
+                   withRecurrenceId: recurrenceId];
+          [self sendEMailUsingTemplateNamed: @"Deletion"
                                   forObject: [occurence itipEntryWithMethod: @"cancel"]
                              previousObject: nil
                                 toAttendees: attendees
                                    withType: @"calendar:cancellation"];
-	}
+        }
     }
   else if ([occurence userIsAttendee: ownerUser])
     {
       // The current user deletes the occurence; let the organizer know that
       // the user has declined this occurence.
       [self changeParticipationStatus: @"DECLINED" withDelegate: nil
-		      forRecurrenceId: recurrenceId];
+                      forRecurrenceId: recurrenceId];
       send_receipt = NO;
     }
-
-  if (send_receipt)
-    [self sendReceiptEmailForObject: event
-		     addedAttendees: nil
-		   deletedAttendees: nil
-		   updatedAttendees: nil
-			  operation: EventDeleted];
+      
+      if (send_receipt)
+        [self sendReceiptEmailForObject: event
+                         addedAttendees: nil
+                       deletedAttendees: nil
+                       updatedAttendees: nil
+                              operation: EventDeleted];
 }
 
 - (NSException *) prepareDelete
@@ -1688,9 +1672,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
     {
       event = [allEvents objectAtIndex: i];
       if ([event isAllDay] && [event isOpaque])
-	{
-	  [event setTransparency: @"TRANSPARENT"];
-        }
+          [event setTransparency: @"TRANSPARENT"];
     }
 }
 
@@ -1762,10 +1744,10 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
       event = [allEvents objectAtIndex: i];
       
       if ([event recurrenceId] && !theRecurrenceId)
-	return event;
-
+        return event;
+      
       if ([event recurrenceId] && [[event recurrenceId] compare: theRecurrenceId] == NSOrderedSame)
-	return event;
+        return event;
     }
 
   return nil;
@@ -1816,12 +1798,9 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
   NSArray *roles;
   SOGoUser *ownerUser;
 
-  if (calendar == fullCalendar
-      || calendar == safeCalendar
-      || calendar == originalCalendar)
-    [NSException raise: NSInvalidArgumentException
-                format: @"the 'calendar' argument must be a distinct instance"
-                 @" from the original object"];
+  if (calendar == fullCalendar || calendar == safeCalendar
+                               || calendar == originalCalendar)
+    [NSException raise: NSInvalidArgumentException format: @"the 'calendar' argument must be a distinct instance" @" from the original object"];
 
   ownerUser = [SOGoUser userWithLogin: owner];
 
@@ -1832,24 +1811,21 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
   // responding to one of our invitation. In this case, _setupResponseCalendarInRequest
   // will only take the new attendee status and actually discard any other modifications.
   //
-  if ([roles containsObject: @"ComponentResponder"]
-      && ![roles containsObject: @"ComponentModifier"])
+  if ([roles containsObject: @"ComponentResponder"] && ![roles containsObject: @"ComponentModifier"])
     calendar = [self _setupResponseInRequestCalendar: calendar];
   else
     {
-      if (![[rq headersForKey: @"X-SOGo"]
-             containsObject: @"NoGroupsDecomposition"])
+      if (![[rq headersForKey: @"X-SOGo"] containsObject: @"NoGroupsDecomposition"])
         [self _decomposeGroupsInRequestCalendar: calendar];
-
-      if ([[ownerUser domainDefaults] iPhoneForceAllDayTransparency]
-	  && [rq isIPhone])
-	{
-	  [self _adjustTransparencyInRequestCalendar: calendar];
-	}
-
+      
+      if ([[ownerUser domainDefaults] iPhoneForceAllDayTransparency] && [rq isIPhone])
+        {
+          [self _adjustTransparencyInRequestCalendar: calendar];
+        }
+      
       [self _adjustEventsInRequestCalendar: calendar];
     }
-
+      
   //
   // We first check if it's a new event
   //
@@ -1870,46 +1846,46 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
       // TODO: send out a no-uid-conflict (DAV:href) xml element (rfc4791 section 5.3.2.1)
       if ([container resourceNameForEventUID: eventUID])
         {
-	  return [NSException exceptionWithHTTPStatus: 403
-					       reason: [NSString stringWithFormat: @"Event UID already in use. (%s)", eventUID]];
+          return [NSException exceptionWithHTTPStatus: 403
+                                               reason: [NSString stringWithFormat: @"Event UID already in use. (%s)", eventUID]];
         }
      
       //
       // New event and we're the organizer -- send invitation to all attendees
       //
       if (scheduling && [event userIsOrganizer: ownerUser])
-	{ 
-	  attendees = [event attendeesWithoutUser: ownerUser];
-	  if ([attendees count])
-	    {
-	      if ((ex = [self _handleAddedUsers: attendees fromEvent: event]))
-		return ex;
-	      else
-		{
-		  // We might have auto-accepted resources here. If that's the
-		  // case, let's regenerate the versitstring and replace the
-		  // one from the request.
-		  [rq setContent: [[[event parent] versitString] dataUsingEncoding: [rq contentEncoding]]];
-		}
-
-	      [self sendEMailUsingTemplateNamed: @"Invitation"
-                                      forObject: [event itipEntryWithMethod: @"request"]
-                                 previousObject: nil
-                                    toAttendees: attendees
-                                       withType: @"calendar:invitation"];
-	    }
-	}
+      {
+        attendees = [event attendeesWithoutUser: ownerUser];
+        if ([attendees count])
+          {
+            if ((ex = [self _handleAddedUsers: attendees fromEvent: event]))
+              return ex;
+            else
+              {
+                // We might have auto-accepted resources here. If that's the
+                // case, let's regenerate the versitstring and replace the
+                // one from the request.
+                [rq setContent: [[[event parent] versitString] dataUsingEncoding: [rq contentEncoding]]];
+              }
+            
+            [self sendEMailUsingTemplateNamed: @"Invitation"
+                                    forObject: [event itipEntryWithMethod: @"request"]
+                               previousObject: nil
+                                  toAttendees: attendees
+                                     withType: @"calendar:invitation"];
+          }
+      }
       //
       // We aren't the organizer but we're an attendee. That can happen when
       // we receive an external invitation (IMIP/ITIP) and we accept it
       // from a CUA - it gets added to a specific CalDAV calendar using a PUT
       //
       else if (scheduling && [event userIsAttendee: ownerUser])
-	{
-          [self sendResponseToOrganizer: event
-                                   from: ownerUser];
-	}
-
+        {
+          [self sendIMIPReplyForEvent: event
+                                 from: ownerUser
+                                   to: [event organizer]];
+        }
       	      
       [self sendReceiptEmailForObject: event
 		       addedAttendees: attendees
@@ -1936,198 +1912,197 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
       recurrenceId = nil;
 
       for (i = [newEvents count]-1; i >= 0; i--)
-	{
-	  newEvent = [newEvents objectAtIndex: i];
-	  
-	  if ([newEvent recurrenceId])
-	    {
-	      // Find the corresponding RECURRENCE-ID in the old calendar
-	      // If not present, we assume it was created before the PUT
-	      oldEvent = [self _eventFromRecurrenceId: [newEvent recurrenceId]
-			       events: oldEvents];
-
-	      if (oldEvent == nil)
-		{
-		  NSString *recurrenceTime;
-		  recurrenceTime = [NSString stringWithFormat: @"%f", [[newEvent recurrenceId] timeIntervalSince1970]];
-		  oldEvent = (iCalEvent *)[self newOccurenceWithID: recurrenceTime];
-		}
-	
-	      // If present, we look for changes
-	      changes = [iCalEventChanges changesFromEvent: oldEvent  toEvent: newEvent];
-	      
-	      if ([changes sequenceShouldBeIncreased] | [changes hasAttendeeChanges])
-		{
-		  // We found a RECURRENCE-ID with changes, we consider it
-		  recurrenceId = [newEvent recurrenceId];
-		  break;
-		}
-	      else
-		{
+        {
+          newEvent = [newEvents objectAtIndex: i];
+          
+          if ([newEvent recurrenceId])
+            {
+              // Find the corresponding RECURRENCE-ID in the old calendar
+              // If not present, we assume it was created before the PUT
+              oldEvent = [self _eventFromRecurrenceId: [newEvent recurrenceId]
+                                               events: oldEvents];
+              
+              if (oldEvent == nil)
+                {
+                  NSString *recurrenceTime;
+                  recurrenceTime = [NSString stringWithFormat: @"%f", [[newEvent recurrenceId] timeIntervalSince1970]];
+                  oldEvent = (iCalEvent *)[self newOccurenceWithID: recurrenceTime];
+                }
+              
+              // If present, we look for changes
+              changes = [iCalEventChanges changesFromEvent: oldEvent  toEvent: newEvent];
+              
+              if ([changes sequenceShouldBeIncreased] | [changes hasAttendeeChanges])
+                {
+                  // We found a RECURRENCE-ID with changes, we consider it
+                  recurrenceId = [newEvent recurrenceId];
+                  break;
+                }
+              else
+                {
                   [newEvents removeObject: newEvent];
                   [oldEvents removeObject: oldEvent];
-		}
-	    }
-	  
-	  oldEvent = nil;
-	  newEvent = nil;
-	}
+                }
+            }
+          
+          oldEvent = nil;
+          newEvent = nil;
+        }
 
       // If no changes were observed, let's see if we have any left overs
       // in the oldEvents or in the newEvents array
       if (!oldEvent && !newEvent)
-	{
-	  // We check if we only have to deal with the MASTER event
-	  if ([newEvents count] == [oldEvents count])
-	    {
-	      oldEvent = [oldEvents objectAtIndex: 0];
-	      newEvent = [newEvents objectAtIndex: 0];
-	    }
-	  // A RECURRENCE-ID was added
-	  else if ([newEvents count] > [oldEvents count])
-	    {
-	      oldEvent = nil;
-	      newEvent = [self _eventFromRecurrenceId: nil  events: newEvents];
-	      recurrenceId = [newEvent recurrenceId];		
-	    }
-	  // A RECURRENCE-ID was removed
-	  else
-	    {
-	      oldEvent = [self _eventFromRecurrenceId: nil  events: oldEvents];
-	      newEvent = nil;
-	      recurrenceId = [oldEvent recurrenceId];
-	    }
-	}
-
+        {
+          // We check if we only have to deal with the MASTER event
+          if ([newEvents count] == [oldEvents count])
+            {
+              oldEvent = [oldEvents objectAtIndex: 0];
+              newEvent = [newEvents objectAtIndex: 0];
+            }
+          // A RECURRENCE-ID was added
+          else if ([newEvents count] > [oldEvents count])
+            {
+              oldEvent = nil;
+              newEvent = [self _eventFromRecurrenceId: nil  events: newEvents];
+              recurrenceId = [newEvent recurrenceId];
+            }
+          // A RECURRENCE-ID was removed
+          else
+            {
+              oldEvent = [self _eventFromRecurrenceId: nil  events: oldEvents];
+              newEvent = nil;
+              recurrenceId = [oldEvent recurrenceId];
+            }
+        }
+      
       // We check if the PUT call is actually an PART-STATE change
       // from one of the attendees - here's the logic :
       //
-      // if owner == organizer 
+      // if owner == organizer
       //
       //    if [context activeUser] == organizer
       //      [send the invitation update]
       //    else
       //      [react on SENT-BY as someone else is acting for the organizer]
-      //   
-      // 
+      //
+      //
       if ([[newEvent attendees] count] || [[oldEvent attendees] count])
-	{
-	  NSString *uid;
+        {
+          NSString *uid;
           
           // newEvent might be nil here, if we're deleting a RECURRENCE-ID with attendees
           // If that's the case, we use the oldEvent for now just to obtain the organizer
           // and we'll swap it back to nil once we're done.
           if (!newEvent)
             newEvent = oldEvent;
-
-	  // We fetch the organizer's uid. Sometimes, the recurrence-id will
-	  // have it, sometimes not. If it doesn't, we fetch it from the master event.
-	  uid = [[newEvent organizer] uid];
-	  
-	  if (!uid && !recurrenceId)
-	    uid = [[[[[newEvent parent] events] objectAtIndex: 0] organizer] uid];
-	  	  
-	  // With Thunderbird 10, if you create a recurring event with an exception
-	  // occurence, and invite someone, the PUT will have the organizer in the
-	  // recurrence-id and not in the master event. We must fix this, otherwise
-	  // SOGo will break.
-	  if (!recurrenceId && ![[[[[newEvent parent] events] objectAtIndex: 0] organizer] uid])
-	    [[[[newEvent parent] events] objectAtIndex: 0]
-	      setOrganizer: [newEvent organizer]];
-
+          
+          // We fetch the organizer's uid. Sometimes, the recurrence-id will
+          // have it, sometimes not. If it doesn't, we fetch it from the master event.
+          uid = [[newEvent organizer] uid];
+          
+          if (!uid && !recurrenceId)
+            uid = [[[[[newEvent parent] events] objectAtIndex: 0] organizer] uid];
+          
+          // With Thunderbird 10, if you create a recurring event with an exception
+          // occurence, and invite someone, the PUT will have the organizer in the
+          // recurrence-id and not in the master event. We must fix this, otherwise
+          // SOGo will break.
+          if (!recurrenceId && ![[[[[newEvent parent] events] objectAtIndex: 0] organizer] uid])
+            [[[[newEvent parent] events] objectAtIndex: 0] setOrganizer: [newEvent organizer]];
+          
           if (newEvent == oldEvent)
             newEvent = nil;
-
-	  if (uid && [uid caseInsensitiveCompare: owner] == NSOrderedSame)
-	    {
+          
+          if (uid && [uid caseInsensitiveCompare: owner] == NSOrderedSame)
+            {
               // A RECCURENCE-ID was removed
               if (!newEvent && oldEvent)
                 [self prepareDeleteOccurence: oldEvent];
               // The master event was changed, A RECCURENCE-ID was added or modified
               else if ((ex = [self _handleUpdatedEvent: newEvent  fromOldEvent: oldEvent]))
-		return ex;
-	    }
-	  //
-	  // else => attendee is responding
-	  //
-	  //   if [context activeUser] == attendee
-	  //       [we change the PART-STATE]
-	  //   else
-	  //      [react on SENT-BY as someone else is acting for the attendee]
-	  else
-	    {
-	      iCalPerson *attendee, *delegate;
-	      NSString *delegateEmail;
-	      
-	      attendee = [newEvent userAsAttendee: [SOGoUser userWithLogin: owner]];
-
-	      // We first check of the sequences are alright. We don't accept attendees
-	      // accepting "old" invitations. If that's the case, we return a 403
+                return ex;
+            }
+          //
+          // else => attendee is responding
+          //
+          //   if [context activeUser] == attendee
+          //       [we change the PART-STATE]
+          //   else
+          //      [react on SENT-BY as someone else is acting for the attendee]
+          else
+            {
+              iCalPerson *attendee, *delegate;
+              NSString *delegateEmail;
+              
+              attendee = [newEvent userAsAttendee: [SOGoUser userWithLogin: owner]];
+              
+              // We first check of the sequences are alright. We don't accept attendees
+              // accepting "old" invitations. If that's the case, we return a 403
               if ([[newEvent sequence] intValue] < [[oldEvent sequence] intValue])
-		return [NSException exceptionWithHTTPStatus:403
-				    reason: @"sequences don't match"];
-	      
+                return [NSException exceptionWithHTTPStatus:403
+                                                     reason: @"sequences don't match"];
+              
               // Remove the RSVP attribute, as an action from the attendee
               // was actually performed, and this confuses iCal (bug #1850)
-              [[attendee attributes] removeObjectForKey: @"RSVP"]; 
-
-	      delegate = nil;
-	      delegateEmail = [attendee delegatedTo];
-	      
-	      if ([delegateEmail length])
-		{
-		  delegateEmail = [delegateEmail substringFromIndex: 7];
-		  if ([delegateEmail length])
-		    delegate = [newEvent findAttendeeWithEmail: delegateEmail];
-		}
-	      
-	      changes = [iCalEventChanges changesFromEvent: oldEvent  toEvent: newEvent];
-	      
-	      // The current user deletes the occurence; let the organizer know that
-	      // the user has declined this occurence.
-	      if ([[changes updatedProperties] containsObject: @"exdate"])
-	      	{
-		  [self changeParticipationStatus: @"DECLINED"
-			withDelegate: nil // FIXME (specify delegate?)
-			forRecurrenceId: [self _addedExDate: oldEvent  newEvent: newEvent]];
-		}
-	      else if (attendee)
-		{
-		  [self changeParticipationStatus: [attendee partStat]
-				     withDelegate: delegate
-				  forRecurrenceId: recurrenceId];
-		}
-	      // All attendees and the organizer field were removed. Apple iCal does
-	      // that when we remove the last attendee of an event.
-	      //
-	      // We must update previous's attendees' calendars to actually
-	      // remove the event in each of them.
-	      else 
-		{
-		  [self _handleRemovedUsers: [changes deletedAttendees]
-			   withRecurrenceId: recurrenceId];
-		}
-	    }  
-	} // if ([[newEvent attendees] count] || [[oldEvent attendees] count])
+              [[attendee attributes] removeObjectForKey: @"RSVP"];
+              
+              delegate = nil;
+              delegateEmail = [attendee delegatedTo];
+              
+              if ([delegateEmail length])
+                {
+                  delegateEmail = [delegateEmail substringFromIndex: 7];
+                  if ([delegateEmail length])
+                    delegate = [newEvent findAttendeeWithEmail: delegateEmail];
+                }
+              
+              changes = [iCalEventChanges changesFromEvent: oldEvent  toEvent: newEvent];
+              
+              // The current user deletes the occurence; let the organizer know that
+              // the user has declined this occurence.
+              if ([[changes updatedProperties] containsObject: @"exdate"])
+                {
+                  [self changeParticipationStatus: @"DECLINED"
+                                     withDelegate: nil // FIXME (specify delegate?)
+                                  forRecurrenceId: [self _addedExDate: oldEvent  newEvent: newEvent]];
+                }
+              else if (attendee)
+                {
+                  [self changeParticipationStatus: [attendee partStat]
+                                     withDelegate: delegate
+                                  forRecurrenceId: recurrenceId];
+                }
+              // All attendees and the organizer field were removed. Apple iCal does
+              // that when we remove the last attendee of an event.
+              //
+              // We must update previous's attendees' calendars to actually
+              // remove the event in each of them.
+              else
+                {
+                  [self _handleRemovedUsers: [changes deletedAttendees]
+                           withRecurrenceId: recurrenceId];
+                }
+            }  
+        } // if ([[newEvent attendees] count] || [[oldEvent attendees] count])
       else
-	{
-	  [self sendReceiptEmailForObject: newEvent
-			   addedAttendees: nil
-			 deletedAttendees: nil
-			 updatedAttendees: nil
-				operation: EventUpdated];
-	}
+        {
+          [self sendReceiptEmailForObject: newEvent
+                           addedAttendees: nil
+                         deletedAttendees: nil
+                         updatedAttendees: nil
+                                operation: EventUpdated];
+        }
     }  // else of if (isNew) ...
-
+      
   unsigned int baseVersion;
   // We must NOT invoke [super PUTAction:] here as it'll resave
   // the content string and we could have etag mismatches.
   baseVersion = (isNew ? 0 : version);
-
+      
   ex = [self saveContentString: [calendar versitString]
-		   baseVersion: baseVersion];
-
-  return ex;  
+                   baseVersion: baseVersion];
+      
+  return ex;
 }
 
 //
@@ -2157,24 +2132,24 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
       //
       ex = [self matchesRequestConditionInContext: context];
       if (ex)
-	return ex;
+        return ex;
     }
-
-  ex = [self updateContentWithCalendar: rqCalendar fromRequest: rq];
-  if (ex)
-    response = (WOResponse *) ex;
+      
+      ex = [self updateContentWithCalendar: rqCalendar fromRequest: rq];
+      if (ex)
+        response = (WOResponse *) ex;
   else
     {
       response = [_ctx response];
       if (isNew)
-	[response setStatus: 201 /* Created */];
+        [response setStatus: 201 /* Created */];
       else
-	[response setStatus: 204 /* No Content */];
+        [response setStatus: 204 /* No Content */];
       etag = [self davEntityTag];
       if (etag)
-	[response setHeader: etag forKey: @"etag"];
+        [response setHeader: etag forKey: @"etag"];
     }
-
+      
   return response;
 }