From e69d7b412512a97b03e3312bb073a6f87da5f239 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Mon, 29 Sep 2008 14:36:18 +0000
Subject: [PATCH] Monotone-Parent: b3afbde30d88c6ea366307b2bb45202fe90bd36f
 Monotone-Revision: f3553f7157471c92e062fbcc05707ec8f12c2df5

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2008-09-29T14:36:18
Monotone-Branch: ca.inverse.sogo
---
 SoObjects/Contacts/SOGoContactLDAPFolder.m | 12 +-----------
 SoObjects/SOGo/LDAPSource.m                | 11 -----------
 UI/WebServerResources/UIxMailEditor.js     |  6 ------
 3 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/SoObjects/Contacts/SOGoContactLDAPFolder.m b/SoObjects/Contacts/SOGoContactLDAPFolder.m
index b7d9cdfb9..3e28d9230 100644
--- a/SoObjects/Contacts/SOGoContactLDAPFolder.m
+++ b/SoObjects/Contacts/SOGoContactLDAPFolder.m
@@ -24,7 +24,6 @@
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSEnumerator.h>
 #import <Foundation/NSString.h>
-#import <Foundation/NSUserDefaults.h>
 
 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGObjWeb/WOApplication.h>
@@ -188,10 +187,8 @@
   NSEnumerator *oldRecords;
   NSDictionary *oldRecord;
   NSMutableDictionary *newRecord;
-  NSString *data, *contactInfo;
-  NSUserDefaults *ud;
+  NSString *data;
   
-  ud = [NSUserDefaults standardUserDefaults];
   newRecords = [[NSMutableArray alloc] initWithCapacity: [records count]];
   [newRecords autorelease];
 
@@ -240,13 +237,6 @@
 	data = @"";
       [newRecord setObject: data forKey: @"phone"];
 
-      contactInfo = [ud stringForKey: @"SOGoLDAPContactInfoAttribute"];
-      if ([contactInfo length] > 0) {
-	data = [oldRecord objectForKey: contactInfo];
-	if ([data length] > 0)
-	  [newRecord setObject: data forKey: @"contactInfo"];
-      }
-
       [newRecords addObject: newRecord];
       oldRecord = [oldRecords nextObject];
     }
diff --git a/SoObjects/SOGo/LDAPSource.m b/SoObjects/SOGo/LDAPSource.m
index 4f7ed3b6a..dfc37d341 100644
--- a/SoObjects/SOGo/LDAPSource.m
+++ b/SoObjects/SOGo/LDAPSource.m
@@ -23,7 +23,6 @@
 #import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSString.h>
-#import <Foundation/NSUserDefaults.h>
 
 #import <EOControl/EOControl.h>
 #import <NGLdap/NGLdapConnection.h>
@@ -395,12 +394,8 @@ static int sizeLimit;
 
 - (NSArray *) _searchAttributes
 {
-  NSUserDefaults *ud;
-  NSString *contactInfo;
-
   if (!searchAttributes)
     {
-      ud = [NSUserDefaults standardUserDefaults];
       searchAttributes = [NSMutableArray new];
       if (CNField)
 	[searchAttributes addObject: CNField];
@@ -409,12 +404,6 @@ static int sizeLimit;
       [searchAttributes addObjectsFromArray: mailFields];
       [searchAttributes addObjectsFromArray: [self _contraintsFields]];
       [searchAttributes addObjectsFromArray: commonSearchFields];
-
-      // Add SOGoLDAPContactInfoAttribute from user defaults
-      contactInfo = [ud stringForKey: @"SOGoLDAPContactInfoAttribute"];
-      if ([contactInfo length] > 0 &&
-	  ![searchAttributes containsObject: contactInfo])
-	[searchAttributes addObject: contactInfo];
     }
 
   return searchAttributes;
diff --git a/UI/WebServerResources/UIxMailEditor.js b/UI/WebServerResources/UIxMailEditor.js
index ba924ea1f..64b970e37 100644
--- a/UI/WebServerResources/UIxMailEditor.js
+++ b/UI/WebServerResources/UIxMailEditor.js
@@ -437,12 +437,6 @@ function performSearchCallback(http) {
 					list.appendChild(node);
 					node.uid = contact["c_uid"];
 					node.appendChild(document.createTextNode(completeEmail));
-					log($H(contact).inspect() + "");
-					if (contact["contactInfo"]) {
-						var info = new Element('span').update(contact['contactInfo']);
-						node.appendChild(info);
-						log ("info = " + contact['contactInfo']);
-					}
 					$(node).observe("mousedown", onAddressResultClick);
 				}