Bug 287832 Clean up nsDirPrefs.cpp. Part 5 - Remove the old ldap attribute pref handling code. r/sr=bienvenu

mailnews/addrbook/src/nsDirPrefs.h

@@ -78,43 +78,6 @@ typedef enum
   FixedQueryLDAPDirectory = 777
 } DirectoryType;
 
-typedef enum
-{
-	cn,
-	givenname,
-	sn,
-	mail,
-	telephonenumber,   /* work */
-	o,
-	ou,
-	l,
-	street,
-	auth,
-	/* mscott: I've added these extra DIR_AttributeIDs because the new address book can handle these */
-	carlicense,
-	businesscategory,
-	departmentnumber,
-	description,
-	employeetype,
-	facsimiletelephonenumber,
-	/* jpegPhoto */
-	manager,
-	objectclass,
-	postaladdress,
-	postalcode,
-	secretary,
-	title,
-	custom1,
-	custom2,
-	custom3,
-	custom4,
-	custom5, 
-	nickname, /* only valid on address book directories as LDAP does not have a nick name field */
-	mobiletelephonenumber,  /* cell phone */
-	pager,
-	homephone
-} DIR_AttributeId;
-
 typedef enum
 {
 	idNone = 0,					/* Special value                          */ 
@@ -128,7 +91,6 @@ typedef enum
 	idPort,
 	idMaxHits,
 	idUri,
-	idLastSearchString,
 	idType,	
 	idCSID,
 	idLocale,
@@ -139,18 +101,8 @@ typedef enum
 	idVLVDisabled,
 	idEnableAuth,
 	idSavePassword,
-	idCustomAttributes,
 	idAutoCompleteNever,
 	idAutoCompleteEnabled,
-	idTokenSeps,
-	idDnAttributes,
-    idDnAttributesCount,
-	idSuppressedAttributes,
-	idSuppressedAttributesCount,
-	idUriAttributes,
-	idUriAttributesCount,
-	idBasicSearchAttributes,
-	idBasicSearchAttributesCount,
 	idAuthDn,
 	idPassword,
 	idReplNever,
@@ -161,8 +113,6 @@ typedef enum
 	idReplLastChangeNumber,
 	idReplDataVersion,
 	idReplSyncURL,
-	idReplExcludedAttributes,
-	idReplExcludedAttributesCount,
 	idPalmCategory,
         idPalmSyncTimeStamp,
   idProtocolVersion,
@@ -180,8 +130,6 @@ typedef struct _DIR_ReplicationInfo
 	char *syncURL;               /* Points to the server to use for replication          */
 	char *dataVersion;           /* LDAP server's scoping of the lastChangeNumber        */
 	                             /* Changes when the server's DB gets reloaded from LDIF */
-	char **excludedAttributes;   /* List of attributes we shouldn't replicate            */
-	PRInt32 excludedAttributesCount; /* Number of attributes we shouldn't replicat           */
 } DIR_ReplicationInfo;
 
 #define DIR_Server_typedef 1     /* this quiets a redeclare warning in libaddr */
@@ -200,7 +148,6 @@ typedef struct DIR_Server
 	char   *fileName;			/* XP path name of local DB               */
 	PRInt32 port;				/* network port number                    */
 	PRInt32 maxHits;			/* maximum number of hits to return       */
-	char   *lastSearchString;	/* required if saving results             */
 	DirectoryType dirType;	
 	PRInt16   csid;				/* LDAP entries' codeset (normally UTF-8) */
 	char    *locale;			/* the locale associated with the address book or directory */
@@ -214,26 +161,6 @@ typedef struct DIR_Server
 	PRPackedBool enableAuth;			/* AUTH: Use DN/password when binding?    */
 	PRPackedBool savePassword;		/* AUTH: Remember DN and password?        */
 
-	/* site-configurable attributes */
-	nsVoidArray *customAttributes;
-	char *tokenSeps;
-
-	/* site-configurable list of attributes whose values are DNs */
-	char **dnAttributes;
-    PRInt32 dnAttributesCount;
-
-	/* site-configurable list of attributes we shouldn't display in HTML */
-	char **suppressedAttributes;
-	PRInt32 suppressedAttributesCount;
-
-	/* site-configurable list of attributes that contain URLs */
-	char **uriAttributes;
-	PRInt32 uriAttributesCount;
-
-	/* site-configurable list of attributes for the Basic Search dialog */
-	DIR_AttributeId *basicSearchAttributes;
-	PRInt32 basicSearchAttributesCount;
-
 	/* authentication fields */
 	char *authDn;				/* DN to give to authenticate as			*/
 	char *password;				/* Password for the DN						*/
@@ -288,17 +215,6 @@ void    DIR_SavePrefsForOneServer(DIR_Server *server);
 char   *DIR_CreateServerPrefName (DIR_Server *server, char *name);
 void	DIR_SetServerFileName(DIR_Server* pServer, const char* leafName);
 
-/* APIs for site-configurability of LDAP attribute names and 
- * search filter behavior.
- *
- * Strings are NOT allocated, and arrays are NULL-terminated
- */
-const char  *DIR_GetAttributeName (DIR_Server *server, DIR_AttributeId id);
-const char **DIR_GetAttributeStrings (DIR_Server *server, DIR_AttributeId id);
-const char  *DIR_GetFirstAttributeString (DIR_Server *server, DIR_AttributeId id);
-
-nsresult DIR_AttributeNameToId (DIR_Server *server, const char *attrName, DIR_AttributeId *id);
-
 DIR_PrefId  DIR_AtomizePrefName(const char *prefname);
 
 /* Flags manipulation