Monotone-Parent: f36908690fb1287e17d7bb0eb4155ddc4c6f6a55

Monotone-Revision: 3ea5e4c3ab43c68fb675c5144a1c3378da620a48

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2008-08-22T06:44:27
Monotone-Branch: ca.inverse.sogo

UI/Contacts/UIxContactEditor.h

@@ -38,6 +38,7 @@
   NSString *item;
   NGVCard *card;
   NSMutableDictionary *snapshot; /* contains the values for editing */
+  SOGoContactFolder *componentAddressBook;
 }
 
 - (void) setAddressBookItem: (id) _item;

UI/Contacts/UIxContactEditor.m

@@ -204,6 +204,12 @@
   return folder;
 }
 
+- (void) setComponentAddressBook: (SOGoContactFolder *) _componentAddressBook
+{
+  ASSIGN (componentAddressBook, _componentAddressBook);
+}
+
+
 - (NSString *) addressBookDisplayName
 {
   NSString *fDisplayName;
@@ -595,6 +601,8 @@
   SOGoContactGCSEntry *contact;
   id result;
   NSString *jsRefreshMethod;
+  SoSecurityManager *sm;
+  NSException *ex;
 
   contact = [self clientObject];
   card = [contact vCard];
@@ -604,6 +612,20 @@
       [self _saveSnapshot];
       [contact save];
 
+      if (componentAddressBook && componentAddressBook != [self componentAddressBook])
+	{
+	  sm = [SoSecurityManager sharedSecurityManager];
+	  if (![sm validatePermission: SoPerm_DeleteObjects
+		   onObject: componentAddressBook
+		   inContext: context])
+	    {
+	      if (![sm validatePermission: SoPerm_AddDocumentsImagesAndFiles
+		       onObject: componentAddressBook
+		       inContext: context])
+		ex = [contact moveToFolder: componentAddressBook];
+	    }
+	}
+      
       if ([[[[self context] request] formValueForKey: @"nojs"] intValue])
         result = [self redirectToLocation: [self applicationPath]];
       else