amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-21 11:25:24 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: b53acc7dcc075094066fd5f4ce6648443c3b3097

Browse Source 
Monotone-Revision: 0f82937150b1062cdd543c629309b912157fb9ee

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-05-09T19:18:06
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-05-09 19:18:06 +00:00
parent acf7adcad1
commit 6df3f8bb66
2 changed files with 41 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+4
View File
@@ -1,5 +1,9 @@
2007-05-09 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Contacts/SOGoContactFolders.m ([SOGoContactFolders
-appendSystemSources]): pass LDAPSource objects to
SOGoContactLDAPFolder instances.
* SoObjects/Mailer/SOGoDraftObject.m: extract the raw email
address of the "from" field before sending the message. Otherwise,
sending the mail won't work.
SoObjects/Contacts/SOGoContactFolders.m
+37 -45
View File
@@ -31,9 +31,11 @@
#import <Foundation/NSDictionary.h>
#import <Foundation/NSString.h>
#import <NGObjWeb/NSException+HTTP.h>
#import <NGObjWeb/WOApplication.h>
#import <NGObjWeb/WOContext.h>
#import <NGObjWeb/WOContext+SoObjects.h>
#import <NGObjWeb/WOResponse.h>
#import <NGObjWeb/SoUser.h>
#import <GDLContentStore/GCSFolderManager.h>
@@ -41,10 +43,9 @@
#import <GDLAccess/EOAdaptorChannel.h>
#import <GDLContentStore/NSURL+GCS.h>
#import <SoObjects/SOGo/LDAPUserManager.h>
#import <SoObjects/SOGo/SOGoPermissions.h>
#import "common.h"
#import "SOGoContactGCSFolder.h"
#import "SOGoContactLDAPFolder.h"
#import "SOGoContactFolders.h"
@@ -71,7 +72,7 @@
[super dealloc];
}
- (void) appendPersonalSourcesInContext: (WOContext *) context;
- (void) appendPersonalSources
{
SOGoContactGCSFolder *ab;
GCSChannelManager *cm;
@@ -87,11 +88,11 @@
fc = [cm acquireOpenChannelForURL: folderLocation];
if (fc)
{
sql
= [NSString stringWithFormat: @"SELECT c_path4, c_foldername FROM %@"
@" WHERE c_path2 = '%@' AND c_folder_type = 'Contact'",
[folderLocation gcsTableName],
[self ownerInContext: nil]];
sql = [NSString
stringWithFormat: (@"SELECT c_path4, c_foldername FROM %@"
@" WHERE c_path2 = '%@'"
@" AND c_folder_type = 'Contact'"),
[folderLocation gcsTableName], [self ownerInContext: context]];
[fc evaluateExpressionX: sql];
attrs = [fc describeResults: NO];
row = [fc fetchAttributes: attrs withZone: NULL];
@@ -112,6 +113,28 @@
}
}
- (void) appendSystemSources
{
LDAPUserManager *um;
NSEnumerator *sourceIDs;
NSString *currentSourceID, *displayName;
SOGoContactLDAPFolder *currentFolder;
um = [LDAPUserManager sharedUserManager];
sourceIDs = [[um addressBookSourceIDs] objectEnumerator];
currentSourceID = [sourceIDs nextObject];
while (currentSourceID)
{
displayName = [um displayNameForSourceWithID: currentSourceID];
currentFolder = [SOGoContactLDAPFolder contactFolderWithName: currentSourceID
andDisplayName: displayName
inContainer: self];
[currentFolder setLDAPSource: [um sourceWithID: currentSourceID]];
[contactFolders setObject: currentFolder forKey: currentSourceID];
currentSourceID = [sourceIDs nextObject];
}
}
- (WOResponse *) newFolderWithName: (NSString *) name
{
SOGoContactGCSFolder *newFolder;
@@ -119,7 +142,7 @@
newFolder = [SOGoContactGCSFolder contactFolderWithName: name
andDisplayName: name
inContainer: [self clientObject]];
inContainer: self];
if ([newFolder isKindOfClass: [NSException class]])
response = (WOResponse *) newFolder;
else
@@ -140,42 +163,13 @@
return response;
}
- (void) appendSystemSourcesInContext: (WOContext *) context;
{
NSUserDefaults *ud;
NSEnumerator *ldapABs;
NSDictionary *udAB;
SOGoContactLDAPFolder *ab;
ud = [NSUserDefaults standardUserDefaults];
ldapABs = [[ud objectForKey: @"SOGoLDAPAddressBooks"] objectEnumerator];
udAB = [ldapABs nextObject];
while (udAB)
{
ab = [SOGoContactLDAPFolder contactFolderWithName:
[udAB objectForKey: @"id"]
andDisplayName:
[udAB objectForKey: @"displayName"]
inContainer: self];
[ab LDAPSetHostname: [udAB objectForKey: @"hostname"]
setPort: [[udAB objectForKey: @"port"] intValue]
setBindDN: [udAB objectForKey: @"bindDN"]
setBindPW: [udAB objectForKey: @"bindPW"]
setContactIdentifier: [udAB objectForKey: @"idField"]
setUserIdentifier: [udAB objectForKey: @"userIdField"]
setRootDN: [udAB objectForKey: @"rootDN"]];
[contactFolders setObject: ab forKey: [udAB objectForKey: @"id"]];
udAB = [ldapABs nextObject];
}
}
- (void) initContactSources
{
if (!contactFolders)
{
contactFolders = [NSMutableDictionary new];
[self appendPersonalSourcesInContext: context];
[self appendSystemSourcesInContext: context];
[self appendPersonalSources];
[self appendSystemSources];
}
}
@@ -184,7 +178,6 @@
acquire: (BOOL) acquire
{
id obj;
id folder;
/* first check attributes directly bound to the application */
obj = [super lookupName: name inContext: lookupContext acquire: NO];
@@ -193,10 +186,9 @@
if (!contactFolders)
[self initContactSources];
folder = [contactFolders objectForKey: name];
obj = ((folder)
? folder
: [NSException exceptionWithHTTPStatus: 404]);
obj = [contactFolders objectForKey: name];
if (!obj)
obj = [NSException exceptionWithHTTPStatus: 404];
}
return obj;