amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-27 07:49:29 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 5a23f90d09d0b1f04579ab1128bcbe5d07d7aa3d

Browse Source 
Monotone-Revision: c4326e19647bbfc97b2d64badbd1269165a03c7f

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-05-09T19:09:50
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-05-09 19:09:50 +00:00
parent 904d7a5e1a
commit 81e04f0c5b
3 changed files with 45 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,5 +1,11 @@
2007-05-09 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Contacts/SOGoContactLDIFEntry.[hm]: new class module
replacing the SOGoContactLDAPEntry module. It was renamed as such
because it now receives a dictionary instead of an NGLdapEntry.
It thus can now handle data from any source of LDIF data, not
only coming from LDAP.
* SoObjects/SOGo/LDAPUserManager.[hm]: new class module
implementing most of what used to be the AgenorUserManager class.
The difference is that users are cached in the forme of

21
SoObjects/Contacts/SOGoContactLDIFEntry.h
View File

@@ -1,4 +1,4 @@
/* SOGoContactLDAPEntry.h - this file is part of SOGo
/* SOGoContactLDIFEntry.h - this file is part of SOGo
* Copyright (C) 2006 Inverse groupe conseil
*
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
@@ -19,32 +19,31 @@
* Boston, MA 02111-1307, USA.
*/
#ifndef SOGOCONTACTLDAPENTRY_H
#define SOGOCONTACTLDAPENTRY_H
#ifndef SOGOCONTACTLDIFENTRY_H
#define SOGOCONTACTLDIFENTRY_H
#import <SOGo/SOGoObject.h>
#import "SOGoContactObject.h"
@class NSDictionary;
@class NSString;
@class SOGoContactLDAPFolder;
@class NGLdapEntry;
@interface SOGoContactLDAPEntry : NSObject <SOGoContactObject>
@interface SOGoContactLDIFEntry : SOGoObject <SOGoContactObject>
{
NSString *name;
NGLdapEntry *ldapEntry;
NSDictionary *ldifEntry;
NGVCard *vcard;
id container;
}
+ (SOGoContactLDAPEntry *) contactEntryWithName: (NSString *) newName
withLDAPEntry: (NGLdapEntry *) newEntry
+ (SOGoContactLDIFEntry *) contactEntryWithName: (NSString *) newName
withLDIFEntry: (NSDictionary *) newEntry
inContainer: (id) newContainer;
- (id) initWithName: (NSString *) newName
withLDAPEntry: (NGLdapEntry *) newEntry
withLDIFEntry: (NSDictionary *) newEntry
inContainer: (id) newContainer;
@end
#endif /* SOGOCONTACTLDAPENTRY_H */
#endif /* SOGOCONTACTLDIFENTRY_H */

75
SoObjects/Contacts/SOGoContactLDIFEntry.m
View File

@@ -1,4 +1,4 @@
/* SOGoContactLDAPEntry.m - this file is part of SOGo
/* SOGoContactLDIFEntry.m - this file is part of SOGo
*
* Copyright (C) 2006 Inverse groupe conseil
*
@@ -27,48 +27,32 @@
#import <NGCards/NGVCard.h>
#import <NGCards/CardVersitRenderer.h>
#import "SOGoContactLDAPEntry.h"
#import "SOGoContactLDIFEntry.h"
@implementation SOGoContactLDAPEntry
@implementation SOGoContactLDIFEntry
+ (SOGoContactLDAPEntry *) contactEntryWithName: (NSString *) newName
withLDAPEntry: (NGLdapEntry *) newEntry
+ (SOGoContactLDIFEntry *) contactEntryWithName: (NSString *) newName
withLDIFEntry: (NSDictionary *) newEntry
inContainer: (id) newContainer
{
SOGoContactLDAPEntry *entry;
SOGoContactLDIFEntry *entry;
entry = [[self alloc] initWithName: newName
withLDAPEntry: newEntry
withLDIFEntry: newEntry
inContainer: newContainer];
[entry autorelease];
return entry;
}
- (void) dumpEntry: (NGLdapEntry *) anEntry
{
NSArray *keys;
unsigned int count, max;
keys = [anEntry attributeNames];
max = [keys count];
NSLog (@"dumping entry...");
for (count = 0; count < max; count++)
NSLog (@"%d: %@ = '%@'", count,
[keys objectAtIndex: count],
[anEntry singleAttributeWithName: [keys objectAtIndex: count]]);
NSLog (@"dumping finished..");
}
- (id) initWithName: (NSString *) newName
withLDAPEntry: (NGLdapEntry *) newEntry
withLDIFEntry: (NSDictionary *) newEntry
inContainer: (id) newContainer
{
self = [self init];
ASSIGN (name, newName);
ASSIGN (container, newContainer);
ASSIGN (ldapEntry, newEntry);
ASSIGN (ldifEntry, newEntry);
vcard = nil;
// [self dumpEntry: anEntry];
@@ -84,7 +68,7 @@
- (void) dealloc
{
[vcard release];
[ldapEntry release];
[ldifEntry release];
[super dealloc];
}
@@ -97,23 +81,23 @@
{
NSString *info;
info = [ldapEntry singleAttributeWithName: @"telephoneNumber"];
info = [ldifEntry valueForKey: @"telephoneNumber"];
if (info)
[vCard addTel: info
types: [NSArray arrayWithObjects: @"work", @"voice", @"pref", nil]];
info = [ldapEntry singleAttributeWithName: @"homePhone"];
info = [ldifEntry valueForKey: @"homePhone"];
if (info)
[vCard addTel: info
types: [NSArray arrayWithObjects: @"home", @"voice", nil]];
info = [ldapEntry singleAttributeWithName: @"fax"];
info = [ldifEntry valueForKey: @"fax"];
if (info)
[vCard addTel: info
types: [NSArray arrayWithObjects: @"work", @"fax", nil]];
info = [ldapEntry singleAttributeWithName: @"pager"];
info = [ldifEntry valueForKey: @"pager"];
if (info)
[vCard addTel: info
types: [NSArray arrayWithObjects: @"pager", nil]];
info = [ldapEntry singleAttributeWithName: @"mobile"];
info = [ldifEntry valueForKey: @"mobile"];
if (info)
[vCard addTel: info
types: [NSArray arrayWithObjects: @"cell", @"voice", nil]];
@@ -137,37 +121,37 @@
[vcard setVClass: @"PUBLIC"];
[vcard setProdID: @"-//OpenGroupware.org//SOGo"];
[vcard setProfile: @"vCard"];
info = [ldapEntry singleAttributeWithName: @"displayName"];
info = [ldifEntry valueForKey: @"displayName"];
if (!(info && [info length] > 0))
info = [ldapEntry singleAttributeWithName: @"cn"];
info = [ldifEntry valueForKey: @"cn"];
[vcard setFn: info];
surname = [ldapEntry singleAttributeWithName: @"sn"];
surname = [ldifEntry valueForKey: @"sn"];
if (!surname)
surname = [ldapEntry singleAttributeWithName: @"surname"];
surname = [ldifEntry valueForKey: @"surname"];
[vcard setNWithFamily: surname
given: [ldapEntry singleAttributeWithName: @"givenName"]
given: [ldifEntry valueForKey: @"givenName"]
additional: nil
prefixes: nil
suffixes: nil];
info = [ldapEntry singleAttributeWithName: @"title"];
info = [ldifEntry valueForKey: @"title"];
if (info)
[vcard setTitle: info];
info = [ldapEntry singleAttributeWithName: @"mozillaNickname"];
info = [ldifEntry valueForKey: @"mozillaNickname"];
if (info)
[vcard setNickname: info];
info = [ldapEntry singleAttributeWithName: @"xmozillaNickname"];
info = [ldifEntry valueForKey: @"xmozillaNickname"];
if (info)
[vcard setNickname: info];
info = [ldapEntry singleAttributeWithName: @"notes"];
info = [ldifEntry valueForKey: @"notes"];
if (info)
[vcard setNote: info];
info = [ldapEntry singleAttributeWithName: @"mail"];
info = [ldifEntry valueForKey: @"mail"];
if (info)
[vcard addEmail: info
types: [NSArray arrayWithObjects: @"internet", @"pref", nil]];
[self _setPhonesOfVCard: vcard];
streetAddress = [ldapEntry singleAttributeWithName: @"streetAddress"];
location = [ldapEntry singleAttributeWithName: @"l"];
streetAddress = [ldifEntry valueForKey: @"streetAddress"];
location = [ldifEntry valueForKey: @"l"];
element = [CardElement elementWithTag: @"adr"
attributes: nil values: nil];
[element setValue: 0 ofAttribute: @"type" to: @"work"];
@@ -177,7 +161,7 @@
[element setValue: 3 to: location];
if (streetAddress || location)
[vcard addChild: element];
info = [ldapEntry singleAttributeWithName: @"calFBURL"];
info = [ldifEntry valueForKey: @"calFBURL"];
if (info)
[vcard addChildWithTag: @"FBURL"
types: nil
@@ -189,8 +173,7 @@
- (NSString *) davEntityTag
{
return [[ldapEntry attributeWithName: @"modifyTimeStamp"]
stringValueAtIndex: 0];
return [ldifEntry valueForKey: @"modifyTimeStamp"];
}
- (NSString *) davContentType