git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1015 d1b88da0-ebda-0310...

diff --git a/ChangeLog b/ChangeLog
index 4c84b8a948c7371c14c5faa7e69ec9054a8d36f6..516357d9a8534634f12cb6942f02ce4d7101efca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2007-02-02  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+       * UI/Contacts/UIxContactEditor.m: display and handle the new
+       Freebusy URL entry.
+
+       * SoObjects/Contacts/SOGoContactLDAPFolder.m
+       ([SOGoContactLDAPFolder -_searchAttributes]): retrieve "calFBURL"
+       from the server.
+
+       * SoObjects/Contacts/SOGoContactLDAPEntry.m ([SOGoContactLDAPEntry
+       -vCard]): put the LDAP "calFBURL" field in the vCard's "FBURL"
+       entry.
+
 2007-01-31  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
        * SoObjects/Appointments/SOGoCalendarComponent.m

diff --git a/SOPE/NGCards/ChangeLog b/SOPE/NGCards/ChangeLog
index 9a889262896f2847992f24bfbbeef4d6ba306843..2d156fe27cab9df251d9ffd613bf60f7dc16a201 100644 (file)
--- a/SOPE/NGCards/ChangeLog
+++ b/SOPE/NGCards/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-02  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+       * NGVCard.m ([NGVCard -classForTag:classTag]): declare an entry
+       for "FBURL".
+
 2006-08-03  Helge Hess  <helge.hess@opengroupware.org>
 
        * NGVCardSaxHandler.m: fixed a bug with returning parsing results.

diff --git a/SOPE/NGCards/NGVCard.m b/SOPE/NGCards/NGVCard.m
index 21add8fbb70487e9c465c933f03d74ec06d20466..6e9ec01c90d31603ee6e39f4232befb15c4f9404 100644 (file)
--- a/SOPE/NGCards/NGVCard.m
+++ b/SOPE/NGCards/NGVCard.m
@@ -79,6 +79,7 @@
       || [classTag isEqualToString: @"TEL"]
       || [classTag isEqualToString: @"TZ"]
       || [classTag isEqualToString: @"URL"]
+      || [classTag isEqualToString: @"FBURL"]
       || [classTag isEqualToString: @"LABEL"]
       || [classTag isEqualToString: @"EMAIL"]
       || [classTag isEqualToString: @"NICKNAME"]

diff --git a/SoObjects/Contacts/SOGoContactLDAPEntry.m b/SoObjects/Contacts/SOGoContactLDAPEntry.m
index 92f38c436a36d56587568762b87c799977288d15..7e047e4c596bf7d100a2903d6e34c19f87a6a26f 100644 (file)
--- a/SoObjects/Contacts/SOGoContactLDAPEntry.m
+++ b/SoObjects/Contacts/SOGoContactLDAPEntry.m
@@ -182,6 +182,11 @@
         [element setValue: 3 to: location];
       if (streetAddress || location)
         [vcard addChild: element];
+      info = [ldapEntry singleAttributeWithName: @"calFBURL"];
+      if (info)
+        [vcard addChildWithTag: @"FBURL"
+               types: nil
+               singleValue: info];
     }
 
   return vcard;

diff --git a/SoObjects/Contacts/SOGoContactLDAPFolder.m b/SoObjects/Contacts/SOGoContactLDAPFolder.m
index bc4ae3a07ef9579457d0749dd8bb3eda1290f3cb..073055678b9a563f295df389cc78499caba7c140 100644 (file)
--- a/SoObjects/Contacts/SOGoContactLDAPFolder.m
+++ b/SoObjects/Contacts/SOGoContactLDAPFolder.m
@@ -233,6 +233,7 @@
                   @"locality",
                   @"birthyear",
                   @"serialNumber",
+                  @"calFBURL",
                   nil];
 }
 

diff --git a/UI/Contacts/English.lproj/Localizable.strings b/UI/Contacts/English.lproj/Localizable.strings
index ec1cc675acc81ea65e26169f1f40d26f75dfb9f7..739f2a1db4d8977713633cb7f197479fb86f5f6c 100644 (file)
--- a/UI/Contacts/English.lproj/Localizable.strings
+++ b/UI/Contacts/English.lproj/Localizable.strings
@@ -76,6 +76,7 @@
 "Note: " = "Note: ";
 "Timezone: " = "Timezone: ";
 "Birthday: " = "Birthday: ";
+"Freebusy URL: " = "Freebusy URL: ";
 
 "Add as..." = "Add as...";
 "Recipient" = "Recipient";

diff --git a/UI/Contacts/French.lproj/Localizable.strings b/UI/Contacts/French.lproj/Localizable.strings
index ae004fa63deaa3e141b42c2ba8c6bf441ad3848d..4892982f70384578549a688b7bd9c27758d8b88c 100644 (file)
--- a/UI/Contacts/French.lproj/Localizable.strings
+++ b/UI/Contacts/French.lproj/Localizable.strings
@@ -76,6 +76,7 @@
 "Note: " = "Commentaires : ";
 "Timezone: " = "Fuseau horaire : ";
 "Birthday: " = "D. de naissance : ";
+"Freebusy URL: " = "Adresse du FreeBusy : ";
 
 "Add as..." = "Ajouter...";
 "Recipient" = "Destinataire";

diff --git a/UI/Contacts/UIxContactEditor.m b/UI/Contacts/UIxContactEditor.m
index 275e68a253ced7564bbf7367019cfdb989a12d0d..ead9c8f3214b617f9f324ea43ecf52313804579e 100644 (file)
--- a/UI/Contacts/UIxContactEditor.m
+++ b/UI/Contacts/UIxContactEditor.m
@@ -36,7 +36,7 @@
 {
   if ((self = [super init]))
     {
-      snapshot = [[NSMutableDictionary alloc] initWithCapacity:16];
+      snapshot = [[NSMutableDictionary alloc] initWithCapacity: 16];
       preferredEmail = nil;
     }
 
@@ -330,6 +330,8 @@
         to: [self _simpleValueForType: @"work" inArray: elements]];
   [self _setSnapshotValue: @"homeURL"
         to: [self _simpleValueForType: @"home" inArray: elements]];
+  [self _setSnapshotValue: @"calFBURL"
+        to: [[card uniqueChildWithTag: @"FBURL"] value: 0]];
 
   [self _setSnapshotValue: @"title" to: [card title]];
   [self _setupOrgFields];
@@ -338,10 +340,10 @@
   [self _setSnapshotValue: @"tz" to: [card tz]];
   [self _setSnapshotValue: @"note" to: [card note]];
 
-  [self  _retrieveQueryParameter: @"contactEmail"
-         intoSnapshotValue: @"workMail"];
-  [self  _retrieveQueryParameter: @"contactFN"
-         intoSnapshotValue: @"fn"];
+  [self _retrieveQueryParameter: @"contactEmail"
+        intoSnapshotValue: @"workMail"];
+  [self _retrieveQueryParameter: @"contactFN"
+        intoSnapshotValue: @"fn"];
 }
 
 - (id <WOActionResults>) defaultAction
@@ -455,6 +457,10 @@
   [element setValue: 5 to: [snapshot objectForKey: @"workPostalCode"]];
   [element setValue: 6 to: [snapshot objectForKey: @"workCountry"]];
 
+  element = [CardElement simpleElementWithTag: @"fburl"
+                         value: [snapshot objectForKey: @"calFBURL"]];
+  [card setUniqueChild: element];
+
   [self _savePhoneValues];
   [self _saveEmails];
 }

diff --git a/UI/Templates/ContactsUI/UIxContactEditor.wox b/UI/Templates/ContactsUI/UIxContactEditor.wox
index 9309fa4a0a90e36d5673a2b720b9dae902c79a1c..6e3f0f94af694cfb543e05441b2f3d694356b78b 100644 (file)
--- a/UI/Templates/ContactsUI/UIxContactEditor.wox
+++ b/UI/Templates/ContactsUI/UIxContactEditor.wox
@@ -329,6 +329,14 @@
                 </label>
               </td>
             </tr>
+            <tr>
+              <td colspan="2">
+                <label><var:string label:value="Freebusy URL: " const:escapeHTML="NO" />
+                  <input type="text" class="textField" name="calFBURL" id="calFBURL"
+                    var:value="snapshot.calFBURL" />
+                </label>
+              </td>
+            </tr>
             <tr>
               <td colspan="2">
                 <label><var:string label:value="Note: " const:escapeHTML="NO" />