amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-05 16:35:10 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 549cdd23ad59a0b412d59c2943fac5263a0f83af

Browse Source 
Monotone-Revision: fca9715aa0632958f50527cf33ba977fc0c06e85

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-09-29T18:08:34
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2006-09-29 18:08:34 +00:00
parent 899bed1fce
commit 41ebf96731
5 changed files with 29 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+6
View File
@@ -1,3 +1,9 @@
2006-09-29 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/AgenorUserManager.m ([AgenorUserManager
-iCalPersonWithUid:uid]): new method taken from removed module
'iCalPerson+UIx';
2006-09-28 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/Scheduler/UIxAppointmentView.m ([UIxAppointmentView
SoObjects/SOGo/AgenorUserManager.h
+3 -1
View File
@@ -53,7 +53,9 @@
- (NSString *)getUIDForEmail:(NSString *)_email;
- (NSString *)getEmailForUID:(NSString *)_uid;
- (NSString *)getUIDForICalPerson:(iCalPerson *)_person;
- (iCalPerson *) iCalPersonWithUid: (NSString *) uid;
- (NSString *) getUIDForICalPerson: (iCalPerson *) _person;
/* may insert NSNulls into returned array if _mapStrictly -> YES */
- (NSArray *)getUIDsForICalPersons:(NSArray *)_persons
applyStrictMapping:(BOOL)_mapStrictly;
SoObjects/SOGo/AgenorUserManager.m
+20 -7
View File
@@ -930,8 +930,8 @@ static unsigned PoolScanInterval = 5 * 60 /* every five minutes */;
attributes:[self mailServerDiscoveryAttributes]];
while ((entry = [resultEnum nextObject]) != nil) {
NSString *server, *shareLogin, *emitterAddress;
id shareUid;
NSString *server, *shareLogin;
id shareUid, emitterAddress;
/* calculate server connect string */
@@ -959,14 +959,15 @@ static unsigned PoolScanInterval = 5 * 60 /* every five minutes */;
/* calculate emitter address (check for proper access right) */
emitterAddress = ([self hasUser:_uid partageAccess:"GC" inEntry:entry]
? [self emissionEMailFromEntry:entry]
: nil);
if ([self hasUser:_uid partageAccess:"GC" inEntry:entry])
emitterAddress = [self emissionEMailFromEntry:entry];
else
emitterAddress = [NSNull null];
/* set value */
[shares setObject:(emitterAddress ? emitterAddress : (id)[NSNull null])
forKey:shareLogin];
[shares setObject: emitterAddress
forKey: shareLogin];
}
/* cache */
@@ -1150,6 +1151,18 @@ static unsigned PoolScanInterval = 5 * 60 /* every five minutes */;
return attr;
}
- (iCalPerson *) iCalPersonWithUid: (NSString *) uid
{
iCalPerson *person;
person = [iCalPerson new];
[person autorelease];
[person setCn: [self getCNForUID: uid]];
[person setEmail: [self getEmailForUID: uid]];
return person;
}
/* debugging */
- (BOOL)isDebuggingEnabled {
UI/Scheduler/iCalPerson+UIx.h
-37
View File
@@ -1,37 +0,0 @@
/*
Copyright (C) 2004 SKYRIX Software AG
This file is part of OpenGroupware.org.
OGo is free software; you can redistribute it and/or modify it under
the terms of the GNU Lesser General Public License as published by the
Free Software Foundation; either version 2, or (at your option) any
later version.
OGo is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
License for more details.
You should have received a copy of the GNU Lesser General Public
License along with OGo; see the file COPYING. If not, write to the
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
*/
// $Id: UIxAppointmentEditor.m 181 2004-08-11 15:13:25Z helge $
#ifndef __iCalPerson_UIx_H__
#define __iCalPerson_UIx_H__
#include <NGCards/NGCards.h>
@class NSString;
@interface iCalPerson(Convenience)
+ (iCalPerson *) personWithUid: (NSString *) uid;
- (NSString *)cnForDisplay;
@end
#endif /* __iCalPerson_UIx_H__ */
UI/Scheduler/iCalPerson+UIx.m
-52
View File
@@ -1,52 +0,0 @@
/*
Copyright (C) 2004 SKYRIX Software AG
This file is part of OpenGroupware.org.
OGo is free software; you can redistribute it and/or modify it under
the terms of the GNU Lesser General Public License as published by the
Free Software Foundation; either version 2, or (at your option) any
later version.
OGo is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
License for more details.
You should have received a copy of the GNU Lesser General Public
License along with OGo; see the file COPYING. If not, write to the
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
*/
// $Id: UIxAppointmentEditor.m 181 2004-08-11 15:13:25Z helge $
#import <SOGo/AgenorUserManager.h>
#import "iCalPerson+UIx.h"
#import "common.h"
@implementation iCalPerson (Convenience)
+ (iCalPerson *) personWithUid: (NSString *) uid
{
iCalPerson *person;
AgenorUserManager *um;
NSString *email, *cn;
person = [self new];
[person autorelease];
um = [AgenorUserManager sharedUserManager];
email = [um getEmailForUID: uid];
cn = [um getCNForUID: uid];
[person setCn: cn];
[person setEmail: email];
return person;
}
- (NSString *) cnForDisplay
{
return [self cnWithoutQuotes];
}
@end /* iCalPerson(Convenience) */