Monotone-Parent: 1a8298d1520d86d2ba9068bd72abcf7073aa20a8
Monotone-Revision: e9bc6cb46a4431aee9c0112701adef16e8fde065 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-05-09T18:25:51 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
parent
6313ca4cd4
commit
04afaf5430
|
@ -30,7 +30,7 @@
|
||||||
|
|
||||||
// #import <NGObjWeb/SoClassSecurityInfo.h>
|
// #import <NGObjWeb/SoClassSecurityInfo.h>
|
||||||
#import <SOGo/SOGoCustomGroupFolder.h>
|
#import <SOGo/SOGoCustomGroupFolder.h>
|
||||||
#import <SOGo/AgenorUserManager.h>
|
#import <SOGo/LDAPUserManager.h>
|
||||||
#import <SOGo/SOGoPermissions.h>
|
#import <SOGo/SOGoPermissions.h>
|
||||||
#import <SOGo/NSString+Utilities.h>
|
#import <SOGo/NSString+Utilities.h>
|
||||||
#import <SOGo/SOGoUser.h>
|
#import <SOGo/SOGoUser.h>
|
||||||
|
@ -741,7 +741,7 @@ static NSNumber *sharedYes = nil;
|
||||||
privacySqlString = @"and (isopaque = 1)";
|
privacySqlString = @"and (isopaque = 1)";
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
email = [activeUser email];
|
email = [activeUser primaryEmail];
|
||||||
|
|
||||||
privacySqlString
|
privacySqlString
|
||||||
= [NSString stringWithFormat:
|
= [NSString stringWithFormat:
|
||||||
|
@ -1092,7 +1092,7 @@ static NSNumber *sharedYes = nil;
|
||||||
{
|
{
|
||||||
/* Note: can return NSNull objects in the array! */
|
/* Note: can return NSNull objects in the array! */
|
||||||
NSMutableArray *uids;
|
NSMutableArray *uids;
|
||||||
AgenorUserManager *um;
|
LDAPUserManager *um;
|
||||||
unsigned i, count;
|
unsigned i, count;
|
||||||
|
|
||||||
if (_persons == nil)
|
if (_persons == nil)
|
||||||
|
@ -1100,7 +1100,7 @@ static NSNumber *sharedYes = nil;
|
||||||
|
|
||||||
count = [_persons count];
|
count = [_persons count];
|
||||||
uids = [NSMutableArray arrayWithCapacity:count + 1];
|
uids = [NSMutableArray arrayWithCapacity:count + 1];
|
||||||
um = [AgenorUserManager sharedUserManager];
|
um = [LDAPUserManager sharedUserManager];
|
||||||
|
|
||||||
for (i = 0; i < count; i++) {
|
for (i = 0; i < count; i++) {
|
||||||
iCalPerson *person;
|
iCalPerson *person;
|
||||||
|
|
|
@ -26,11 +26,9 @@
|
||||||
#import <NGCards/iCalEventChanges.h>
|
#import <NGCards/iCalEventChanges.h>
|
||||||
#import <NGCards/iCalPerson.h>
|
#import <NGCards/iCalPerson.h>
|
||||||
|
|
||||||
#import <SOGo/AgenorUserManager.h>
|
#import <SoObjects/SOGo/LDAPUserManager.h>
|
||||||
#import <SOGo/SOGoObject.h>
|
#import <SoObjects/SOGo/SOGoObject.h>
|
||||||
#import <SOGo/SOGoPermissions.h>
|
#import <SoObjects/SOGo/SOGoPermissions.h>
|
||||||
|
|
||||||
#import "iCalEntityObject+Agenor.h"
|
|
||||||
|
|
||||||
#import "common.h"
|
#import "common.h"
|
||||||
|
|
||||||
|
@ -46,7 +44,7 @@
|
||||||
/* iCal handling */
|
/* iCal handling */
|
||||||
- (NSArray *) attendeeUIDsFromAppointment: (iCalEvent *) _apt
|
- (NSArray *) attendeeUIDsFromAppointment: (iCalEvent *) _apt
|
||||||
{
|
{
|
||||||
AgenorUserManager *um;
|
LDAPUserManager *um;
|
||||||
NSMutableArray *uids;
|
NSMutableArray *uids;
|
||||||
NSArray *attendees;
|
NSArray *attendees;
|
||||||
unsigned i, count;
|
unsigned i, count;
|
||||||
|
@ -60,7 +58,7 @@
|
||||||
count = [attendees count];
|
count = [attendees count];
|
||||||
uids = [NSMutableArray arrayWithCapacity:count + 1];
|
uids = [NSMutableArray arrayWithCapacity:count + 1];
|
||||||
|
|
||||||
um = [AgenorUserManager sharedUserManager];
|
um = [LDAPUserManager sharedUserManager];
|
||||||
|
|
||||||
/* add organizer */
|
/* add organizer */
|
||||||
|
|
||||||
|
@ -201,7 +199,7 @@
|
||||||
- delete in removed folders
|
- delete in removed folders
|
||||||
- send iMIP mail for all folders not found
|
- send iMIP mail for all folders not found
|
||||||
*/
|
*/
|
||||||
AgenorUserManager *um;
|
LDAPUserManager *um;
|
||||||
iCalEvent *oldApt, *newApt;
|
iCalEvent *oldApt, *newApt;
|
||||||
iCalEventChanges *changes;
|
iCalEventChanges *changes;
|
||||||
iCalPerson *organizer;
|
iCalPerson *organizer;
|
||||||
|
@ -217,7 +215,7 @@
|
||||||
return [NSException exceptionWithHTTPStatus: 400 /* Bad Request */
|
return [NSException exceptionWithHTTPStatus: 400 /* Bad Request */
|
||||||
reason: @"got no iCalendar content to store!"];
|
reason: @"got no iCalendar content to store!"];
|
||||||
|
|
||||||
um = [AgenorUserManager sharedUserManager];
|
um = [LDAPUserManager sharedUserManager];
|
||||||
|
|
||||||
/* handle old content */
|
/* handle old content */
|
||||||
|
|
||||||
|
@ -247,12 +245,10 @@
|
||||||
/* diff */
|
/* diff */
|
||||||
|
|
||||||
changes = [iCalEventChanges changesFromEvent: oldApt toEvent: newApt];
|
changes = [iCalEventChanges changesFromEvent: oldApt toEvent: newApt];
|
||||||
uids = [um getUIDsForICalPersons: [changes deletedAttendees]
|
uids = [self getUIDsForICalPersons: [changes deletedAttendees]];
|
||||||
applyStrictMapping: NO];
|
|
||||||
removedUIDs = [NSMutableArray arrayWithArray: uids];
|
removedUIDs = [NSMutableArray arrayWithArray: uids];
|
||||||
|
|
||||||
uids = [um getUIDsForICalPersons: [newApt attendees]
|
uids = [self getUIDsForICalPersons: [newApt attendees]];
|
||||||
applyStrictMapping: NO];
|
|
||||||
storeUIDs = [NSMutableArray arrayWithArray: uids];
|
storeUIDs = [NSMutableArray arrayWithArray: uids];
|
||||||
props = [changes updatedProperties];
|
props = [changes updatedProperties];
|
||||||
|
|
||||||
|
@ -263,7 +259,7 @@
|
||||||
/* preserve organizer */
|
/* preserve organizer */
|
||||||
|
|
||||||
organizer = [newApt organizer];
|
organizer = [newApt organizer];
|
||||||
uid = [um getUIDForICalPerson: organizer];
|
uid = [self getUIDForICalPerson: organizer];
|
||||||
if (!uid)
|
if (!uid)
|
||||||
uid = [self ownerInContext: nil];
|
uid = [self ownerInContext: nil];
|
||||||
if (uid) {
|
if (uid) {
|
||||||
|
@ -275,7 +271,7 @@
|
||||||
/* organizer might have changed completely */
|
/* organizer might have changed completely */
|
||||||
|
|
||||||
if (oldApt && ([props containsObject: @"organizer"])) {
|
if (oldApt && ([props containsObject: @"organizer"])) {
|
||||||
uid = [um getUIDForICalPerson:[oldApt organizer]];
|
uid = [self getUIDForICalPerson:[oldApt organizer]];
|
||||||
if (uid) {
|
if (uid) {
|
||||||
if (![storeUIDs containsObject:uid]) {
|
if (![storeUIDs containsObject:uid]) {
|
||||||
if (![removedUIDs containsObject:uid]) {
|
if (![removedUIDs containsObject:uid]) {
|
||||||
|
@ -435,6 +431,7 @@
|
||||||
NSString *newContentString, *oldContentString;
|
NSString *newContentString, *oldContentString;
|
||||||
iCalCalendar *eventCalendar;
|
iCalCalendar *eventCalendar;
|
||||||
iCalEvent *event;
|
iCalEvent *event;
|
||||||
|
iCalPerson *organizer;
|
||||||
NSArray *organizers;
|
NSArray *organizers;
|
||||||
|
|
||||||
oldContentString = [self contentAsString];
|
oldContentString = [self contentAsString];
|
||||||
|
@ -449,7 +446,8 @@
|
||||||
newContentString = contentString;
|
newContentString = contentString;
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
[event setOrganizerWithUid: [[self container] ownerInContext: nil]];
|
organizer = [self iCalPersonWithUID: [self ownerInContext: context]];
|
||||||
|
[event setOrganizer: organizer];
|
||||||
newContentString = [eventCalendar versitString];
|
newContentString = [eventCalendar versitString];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
|
|
||||||
#import "common.h"
|
#import "common.h"
|
||||||
|
|
||||||
#import <SOGo/AgenorUserManager.h>
|
#import <SOGo/LDAPUserManager.h>
|
||||||
#import <SOGo/SOGoPermissions.h>
|
#import <SOGo/SOGoPermissions.h>
|
||||||
|
|
||||||
#import "SOGoFreeBusyObject.h"
|
#import "SOGoFreeBusyObject.h"
|
||||||
|
@ -110,11 +110,28 @@
|
||||||
return fbType;
|
return fbType;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (iCalPerson *) iCalPersonWithUID: (NSString *) uid
|
||||||
|
{
|
||||||
|
iCalPerson *person;
|
||||||
|
LDAPUserManager *um;
|
||||||
|
NSDictionary *contactInfos;
|
||||||
|
|
||||||
|
um = [LDAPUserManager sharedUserManager];
|
||||||
|
contactInfos = [um contactInfosForUserWithUIDorEmail: uid];
|
||||||
|
|
||||||
|
person = [iCalPerson new];
|
||||||
|
[person autorelease];
|
||||||
|
[person setCn: [contactInfos objectForKey: @"cn"]];
|
||||||
|
[person setEmail: [contactInfos objectForKey: @"c_email"]];
|
||||||
|
|
||||||
|
return person;
|
||||||
|
}
|
||||||
|
|
||||||
- (NSString *) iCalStringForFreeBusyInfos: (NSArray *) _infos
|
- (NSString *) iCalStringForFreeBusyInfos: (NSArray *) _infos
|
||||||
from: (NSCalendarDate *) _startDate
|
from: (NSCalendarDate *) _startDate
|
||||||
to: (NSCalendarDate *) _endDate
|
to: (NSCalendarDate *) _endDate
|
||||||
{
|
{
|
||||||
AgenorUserManager *um;
|
LDAPUserManager *um;
|
||||||
NSString *uid;
|
NSString *uid;
|
||||||
NSEnumerator *events;
|
NSEnumerator *events;
|
||||||
iCalCalendar *calendar;
|
iCalCalendar *calendar;
|
||||||
|
@ -122,7 +139,6 @@
|
||||||
NSDictionary *info;
|
NSDictionary *info;
|
||||||
iCalFreeBusyType type;
|
iCalFreeBusyType type;
|
||||||
|
|
||||||
um = [AgenorUserManager sharedUserManager];
|
|
||||||
uid = [[self container] login];
|
uid = [[self container] login];
|
||||||
|
|
||||||
calendar = [iCalCalendar groupWithTag: @"vcalendar"];
|
calendar = [iCalCalendar groupWithTag: @"vcalendar"];
|
||||||
|
@ -130,7 +146,7 @@
|
||||||
[calendar setVersion: @"2.0"];
|
[calendar setVersion: @"2.0"];
|
||||||
|
|
||||||
freebusy = [iCalFreeBusy groupWithTag: @"vfreebusy"];
|
freebusy = [iCalFreeBusy groupWithTag: @"vfreebusy"];
|
||||||
[freebusy addToAttendees: [um iCalPersonWithUid: uid]];
|
[freebusy addToAttendees: [self iCalPersonWithUid: uid]];
|
||||||
[freebusy setTimeStampAsDate: [NSCalendarDate calendarDate]];
|
[freebusy setTimeStampAsDate: [NSCalendarDate calendarDate]];
|
||||||
[freebusy setStartDate: _startDate];
|
[freebusy setStartDate: _startDate];
|
||||||
[freebusy setEndDate: _endDate];
|
[freebusy setEndDate: _endDate];
|
||||||
|
@ -138,7 +154,7 @@
|
||||||
/* ORGANIZER - strictly required but missing for now */
|
/* ORGANIZER - strictly required but missing for now */
|
||||||
|
|
||||||
/* ATTENDEE */
|
/* ATTENDEE */
|
||||||
// person = [um iCalPersonWithUid: uid];
|
// person = [self iCalPersonWithUid: uid];
|
||||||
// [person setTag: @"ATTENDEE"];
|
// [person setTag: @"ATTENDEE"];
|
||||||
// [ms appendString: [person versitString]];
|
// [ms appendString: [person versitString]];
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
#import <NGCards/iCalToDo.h>
|
#import <NGCards/iCalToDo.h>
|
||||||
#import <NGCards/iCalEventChanges.h>
|
#import <NGCards/iCalEventChanges.h>
|
||||||
#import <NGCards/iCalPerson.h>
|
#import <NGCards/iCalPerson.h>
|
||||||
#import <SOGo/AgenorUserManager.h>
|
#import <SOGo/LDAPUserManager.h>
|
||||||
#import <NGMime/NGMime.h>
|
#import <NGMime/NGMime.h>
|
||||||
#import <NGMail/NGMail.h>
|
#import <NGMail/NGMail.h>
|
||||||
#import <NGMail/NGSendMail.h>
|
#import <NGMail/NGSendMail.h>
|
||||||
|
@ -66,7 +66,7 @@ static NSString *mailTemplateDefaultLanguage = nil;
|
||||||
/* iCal handling */
|
/* iCal handling */
|
||||||
|
|
||||||
- (NSArray *)attendeeUIDsFromTask:(iCalToDo *)_task {
|
- (NSArray *)attendeeUIDsFromTask:(iCalToDo *)_task {
|
||||||
AgenorUserManager *um;
|
LDAPUserManager *um;
|
||||||
NSMutableArray *uids;
|
NSMutableArray *uids;
|
||||||
NSArray *attendees;
|
NSArray *attendees;
|
||||||
unsigned i, count;
|
unsigned i, count;
|
||||||
|
@ -80,7 +80,7 @@ static NSString *mailTemplateDefaultLanguage = nil;
|
||||||
count = [attendees count];
|
count = [attendees count];
|
||||||
uids = [NSMutableArray arrayWithCapacity:count + 1];
|
uids = [NSMutableArray arrayWithCapacity:count + 1];
|
||||||
|
|
||||||
um = [AgenorUserManager sharedUserManager];
|
um = [LDAPUserManager sharedUserManager];
|
||||||
|
|
||||||
/* add organizer */
|
/* add organizer */
|
||||||
|
|
||||||
|
@ -221,7 +221,7 @@ static NSString *mailTemplateDefaultLanguage = nil;
|
||||||
- delete in removed folders
|
- delete in removed folders
|
||||||
- send iMIP mail for all folders not found
|
- send iMIP mail for all folders not found
|
||||||
*/
|
*/
|
||||||
// AgenorUserManager *um;
|
// LDAPUserManager *um;
|
||||||
// iCalCalendar *calendar;
|
// iCalCalendar *calendar;
|
||||||
// iCalToDo *oldApt, *newApt;
|
// iCalToDo *oldApt, *newApt;
|
||||||
// // iCalToDoChanges *changes;
|
// // iCalToDoChanges *changes;
|
||||||
|
@ -239,7 +239,7 @@ static NSString *mailTemplateDefaultLanguage = nil;
|
||||||
// reason:@"got no iCalendar content to store!"];
|
// reason:@"got no iCalendar content to store!"];
|
||||||
// }
|
// }
|
||||||
|
|
||||||
// um = [AgenorUserManager sharedUserManager];
|
// um = [LDAPUserManager sharedUserManager];
|
||||||
|
|
||||||
// /* handle old content */
|
// /* handle old content */
|
||||||
|
|
||||||
|
|
|
@ -61,7 +61,7 @@
|
||||||
|
|
||||||
identity = [[[SOGoMailIdentity alloc] init] autorelease];
|
identity = [[[SOGoMailIdentity alloc] init] autorelease];
|
||||||
[identity setName: [self cn]];
|
[identity setName: [self cn]];
|
||||||
[identity setEmail:[self email]];
|
[identity setEmail: [self primaryEmail]];
|
||||||
[identity setSentFolderName:[self agenorSentFolderForAccount:account]];
|
[identity setSentFolderName:[self agenorSentFolderForAccount:account]];
|
||||||
return identity;
|
return identity;
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
#import <NGObjWeb/SoUser.h>
|
#import <NGObjWeb/SoUser.h>
|
||||||
#import <NGObjWeb/WORequest.h>
|
#import <NGObjWeb/WORequest.h>
|
||||||
#import <NGCards/iCalPerson.h>
|
#import <NGCards/iCalPerson.h>
|
||||||
#import <SoObjects/SOGo/AgenorUserManager.h>
|
#import <SoObjects/SOGo/LDAPUserManager.h>
|
||||||
#import <SoObjects/SOGo/SOGoContentObject.h>
|
#import <SoObjects/SOGo/SOGoContentObject.h>
|
||||||
#import <SoObjects/SOGo/SOGoPermissions.h>
|
#import <SoObjects/SOGo/SOGoPermissions.h>
|
||||||
|
|
||||||
|
@ -67,13 +67,12 @@
|
||||||
|
|
||||||
- (NSString *) _displayNameForUID: (NSString *) uid
|
- (NSString *) _displayNameForUID: (NSString *) uid
|
||||||
{
|
{
|
||||||
AgenorUserManager *um;
|
LDAPUserManager *um;
|
||||||
|
|
||||||
um = [AgenorUserManager sharedUserManager];
|
um = [LDAPUserManager sharedUserManager];
|
||||||
|
|
||||||
return [NSString stringWithFormat: @"%@ <%@>",
|
return [NSString stringWithFormat: @"%@ <%@>",
|
||||||
[um getCNForUID: uid],
|
[um getCNForUID: uid], [um getEmailForUID: uid]];
|
||||||
[um getEmailForUID: uid]];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
- (NSString *) ownerName
|
- (NSString *) ownerName
|
||||||
|
|
|
@ -25,16 +25,18 @@
|
||||||
|
|
||||||
#import <NGObjWeb/WODirectAction.h>
|
#import <NGObjWeb/WODirectAction.h>
|
||||||
|
|
||||||
@class SOGoFolder;
|
|
||||||
@class NSString;
|
@class NSString;
|
||||||
@class NSUserDefaults;
|
@class NSUserDefaults;
|
||||||
@class NSMutableString;
|
@class NSMutableString;
|
||||||
@class NSMutableDictionary;
|
@class NSMutableDictionary;
|
||||||
|
|
||||||
|
@class LDAPUserManager;
|
||||||
|
@class SOGoFolder;
|
||||||
|
|
||||||
@interface UIxFolderActions : WODirectAction
|
@interface UIxFolderActions : WODirectAction
|
||||||
{
|
{
|
||||||
SOGoFolder *clientObject;
|
SOGoFolder *clientObject;
|
||||||
AgenorUserManager *um;
|
LDAPUserManager *um;
|
||||||
NSUserDefaults *ud;
|
NSUserDefaults *ud;
|
||||||
NSString *owner;
|
NSString *owner;
|
||||||
NSString *login;
|
NSString *login;
|
||||||
|
|
|
@ -31,10 +31,10 @@
|
||||||
#import <NGObjWeb/WOResponse.h>
|
#import <NGObjWeb/WOResponse.h>
|
||||||
#import <NGObjWeb/SoSecurityManager.h>
|
#import <NGObjWeb/SoSecurityManager.h>
|
||||||
|
|
||||||
#import <SOGo/AgenorUserManager.h>
|
#import <SoObjects/SOGo/LDAPUserManager.h>
|
||||||
#import <SOGo/SOGoUser.h>
|
#import <SoObjects/SOGo/SOGoUser.h>
|
||||||
#import <SOGo/SOGoObject.h>
|
#import <SoObjects/SOGo/SOGoObject.h>
|
||||||
#import <SOGo/SOGoPermissions.h>
|
#import <SoObjects/SOGo/SOGoPermissions.h>
|
||||||
|
|
||||||
#import "UIxFolderActions.h"
|
#import "UIxFolderActions.h"
|
||||||
|
|
||||||
|
@ -46,8 +46,10 @@
|
||||||
- (void) _setupContext
|
- (void) _setupContext
|
||||||
{
|
{
|
||||||
NSString *clientClass;
|
NSString *clientClass;
|
||||||
|
SOGoUser *activeUser;
|
||||||
|
|
||||||
login = [[context activeUser] login];
|
activeUser = [context activeUser];
|
||||||
|
login = [activeUser login];
|
||||||
clientObject = [self clientObject];
|
clientObject = [self clientObject];
|
||||||
owner = [clientObject ownerInContext: nil];
|
owner = [clientObject ownerInContext: nil];
|
||||||
|
|
||||||
|
@ -59,8 +61,8 @@
|
||||||
else
|
else
|
||||||
baseFolder = nil;
|
baseFolder = nil;
|
||||||
|
|
||||||
um = [AgenorUserManager sharedUserManager];
|
um = [LDAPUserManager sharedUserManager];
|
||||||
ud = [um getUserSettingsForUID: login];
|
ud = [activeUser userSettings];
|
||||||
moduleSettings = [ud objectForKey: baseFolder];
|
moduleSettings = [ud objectForKey: baseFolder];
|
||||||
if (!moduleSettings)
|
if (!moduleSettings)
|
||||||
{
|
{
|
||||||
|
@ -119,7 +121,8 @@
|
||||||
|
|
||||||
[self _setupContext];
|
[self _setupContext];
|
||||||
email = [NSString stringWithFormat: @"%@ <%@>",
|
email = [NSString stringWithFormat: @"%@ <%@>",
|
||||||
[um getCNForUID: owner], [um getEmailForUID: owner]];
|
[um getCNForUID: owner],
|
||||||
|
[um getEmailForUID: owner]];
|
||||||
if ([baseFolder isEqualToString: @"Contacts"])
|
if ([baseFolder isEqualToString: @"Contacts"])
|
||||||
folderName = [NSString stringWithFormat: @"%@ (%@)",
|
folderName = [NSString stringWithFormat: @"%@ (%@)",
|
||||||
[clientObject nameInContainer], email];
|
[clientObject nameInContainer], email];
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
#import <NGObjWeb/WOContext+SoObjects.h>
|
#import <NGObjWeb/WOContext+SoObjects.h>
|
||||||
#import <NGObjWeb/WORequest.h>
|
#import <NGObjWeb/WORequest.h>
|
||||||
#import <NGObjWeb/WOResponse.h>
|
#import <NGObjWeb/WOResponse.h>
|
||||||
#import <SoObjects/SOGo/AgenorUserManager.h>
|
#import <SoObjects/SOGo/LDAPUserManager.h>
|
||||||
#import <SoObjects/SOGo/SOGoObject.h>
|
#import <SoObjects/SOGo/SOGoObject.h>
|
||||||
|
|
||||||
#import "UIxObjectActions.h"
|
#import "UIxObjectActions.h"
|
||||||
|
@ -38,7 +38,7 @@
|
||||||
WORequest *request;
|
WORequest *request;
|
||||||
NSString *uid, *email;
|
NSString *uid, *email;
|
||||||
unsigned int code;
|
unsigned int code;
|
||||||
AgenorUserManager *um;
|
LDAPUserManager *um;
|
||||||
SOGoObject *clientObject;
|
SOGoObject *clientObject;
|
||||||
|
|
||||||
code = 403;
|
code = 403;
|
||||||
|
@ -46,7 +46,7 @@
|
||||||
uid = [request formValueForKey: @"uid"];
|
uid = [request formValueForKey: @"uid"];
|
||||||
if ([uid length] > 0)
|
if ([uid length] > 0)
|
||||||
{
|
{
|
||||||
um = [AgenorUserManager sharedUserManager];
|
um = [LDAPUserManager sharedUserManager];
|
||||||
email = [um getEmailForUID: uid];
|
email = [um getEmailForUID: uid];
|
||||||
if ([email length] > 0)
|
if ([email length] > 0)
|
||||||
{
|
{
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
#import <NGObjWeb/NSException+HTTP.h>
|
#import <NGObjWeb/NSException+HTTP.h>
|
||||||
#import <NGObjWeb/WOResponse.h>
|
#import <NGObjWeb/WOResponse.h>
|
||||||
#import <NGObjWeb/WORequest.h>
|
#import <NGObjWeb/WORequest.h>
|
||||||
#import <SoObjects/SOGo/AgenorUserManager.h>
|
#import <SoObjects/SOGo/LDAPUserManager.h>
|
||||||
|
|
||||||
#import "UIxUserRightsEditor.h"
|
#import "UIxUserRightsEditor.h"
|
||||||
|
|
||||||
|
@ -54,9 +54,9 @@
|
||||||
|
|
||||||
- (NSString *) userDisplayName
|
- (NSString *) userDisplayName
|
||||||
{
|
{
|
||||||
AgenorUserManager *um;
|
LDAPUserManager *um;
|
||||||
|
|
||||||
um = [AgenorUserManager sharedUserManager];
|
um = [LDAPUserManager sharedUserManager];
|
||||||
|
|
||||||
return [NSString stringWithFormat: @"%@ <%@>",
|
return [NSString stringWithFormat: @"%@ <%@>",
|
||||||
[um getCNForUID: uid],
|
[um getCNForUID: uid],
|
||||||
|
@ -67,7 +67,7 @@
|
||||||
{
|
{
|
||||||
BOOL response;
|
BOOL response;
|
||||||
NSString *newUID, *email;
|
NSString *newUID, *email;
|
||||||
AgenorUserManager *um;
|
LDAPUserManager *um;
|
||||||
SOGoObject *clientObject;
|
SOGoObject *clientObject;
|
||||||
|
|
||||||
response = NO;
|
response = NO;
|
||||||
|
@ -75,7 +75,7 @@
|
||||||
newUID = [[context request] formValueForKey: @"uid"];
|
newUID = [[context request] formValueForKey: @"uid"];
|
||||||
if ([newUID length] > 0)
|
if ([newUID length] > 0)
|
||||||
{
|
{
|
||||||
um = [AgenorUserManager sharedUserManager];
|
um = [LDAPUserManager sharedUserManager];
|
||||||
email = [um getEmailForUID: newUID];
|
email = [um getEmailForUID: newUID];
|
||||||
if ([email length] > 0)
|
if ([email length] > 0)
|
||||||
{
|
{
|
||||||
|
|
|
@ -28,7 +28,6 @@
|
||||||
#import <NGCards/iCalEvent.h>
|
#import <NGCards/iCalEvent.h>
|
||||||
#import <NGCards/iCalPerson.h>
|
#import <NGCards/iCalPerson.h>
|
||||||
|
|
||||||
#import <SoObjects/SOGo/AgenorUserManager.h>
|
|
||||||
#import <SoObjects/SOGo/SOGoUser.h>
|
#import <SoObjects/SOGo/SOGoUser.h>
|
||||||
#import <SoObjects/SOGo/SOGoContentObject.h>
|
#import <SoObjects/SOGo/SOGoContentObject.h>
|
||||||
#import <SoObjects/Appointments/SOGoAppointmentFolder.h>
|
#import <SoObjects/Appointments/SOGoAppointmentFolder.h>
|
||||||
|
|
|
@ -22,9 +22,10 @@
|
||||||
#import "UIxAppointmentView.h"
|
#import "UIxAppointmentView.h"
|
||||||
#import <NGCards/NGCards.h>
|
#import <NGCards/NGCards.h>
|
||||||
#import <SOGo/WOContext+Agenor.h>
|
#import <SOGo/WOContext+Agenor.h>
|
||||||
|
#import <SOGo/SOGoUser.h>
|
||||||
#import <Appointments/SOGoAppointmentObject.h>
|
#import <Appointments/SOGoAppointmentObject.h>
|
||||||
#import <SOGoUI/SOGoDateFormatter.h>
|
#import <SOGoUI/SOGoDateFormatter.h>
|
||||||
#import "UIxComponent+Agenor.h"
|
#import "UIxComponent+Scheduler.h"
|
||||||
#import "common.h"
|
#import "common.h"
|
||||||
|
|
||||||
@interface UIxAppointmentView (PrivateAPI)
|
@interface UIxAppointmentView (PrivateAPI)
|
||||||
|
@ -62,7 +63,7 @@
|
||||||
- (BOOL)isAttendeeActiveUser {
|
- (BOOL)isAttendeeActiveUser {
|
||||||
NSString *email, *attEmail;
|
NSString *email, *attEmail;
|
||||||
|
|
||||||
email = [[[self context] activeUser] email];
|
email = [[[self context] activeUser] primaryEmail];
|
||||||
attendee = [self attendee];
|
attendee = [self attendee];
|
||||||
attEmail = [attendee rfc822Email];
|
attEmail = [attendee rfc822Email];
|
||||||
|
|
||||||
|
@ -219,7 +220,7 @@
|
||||||
NSString *email;
|
NSString *email;
|
||||||
iCalPerson *organizer;
|
iCalPerson *organizer;
|
||||||
|
|
||||||
email = [[[self context] activeUser] email];
|
email = [[[self context] activeUser] primaryEmail];
|
||||||
organizer = [[self appointment] organizer];
|
organizer = [[self appointment] organizer];
|
||||||
if (!organizer) return YES; // assume this is correct to do, right?
|
if (!organizer) return YES; // assume this is correct to do, right?
|
||||||
return [[organizer rfc822Email] isEqualToString:email];
|
return [[organizer rfc822Email] isEqualToString:email];
|
||||||
|
@ -237,7 +238,7 @@
|
||||||
return YES;
|
return YES;
|
||||||
|
|
||||||
/* can access it if I'm invited :-) */
|
/* can access it if I'm invited :-) */
|
||||||
email = [[[self context] activeUser] email];
|
email = [[[self context] activeUser] primaryEmail];
|
||||||
partMails = [[[self appointment] participants] valueForKey:@"rfc822Email"];
|
partMails = [[[self appointment] participants] valueForKey:@"rfc822Email"];
|
||||||
return [partMails containsObject:email];
|
return [partMails containsObject:email];
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
#import <NGCards/NGCards.h>
|
#import <NGCards/NGCards.h>
|
||||||
|
|
||||||
#import <SOGoUI/SOGoAptFormatter.h>
|
#import <SOGoUI/SOGoAptFormatter.h>
|
||||||
#import "UIxComponent+Agenor.h"
|
#import "UIxComponent+Scheduler.h"
|
||||||
|
|
||||||
#import "SoObjects/Appointments/SOGoAppointmentFolder.h"
|
#import "SoObjects/Appointments/SOGoAppointmentFolder.h"
|
||||||
#import <SOGo/NSArray+Utilities.h>
|
#import <SOGo/NSArray+Utilities.h>
|
||||||
|
@ -113,7 +113,7 @@ static BOOL shouldDisplayWeekend = NO;
|
||||||
{
|
{
|
||||||
count = [_apts count];
|
count = [_apts count];
|
||||||
filtered = [[[NSMutableArray alloc] initWithCapacity: count] autorelease];
|
filtered = [[[NSMutableArray alloc] initWithCapacity: count] autorelease];
|
||||||
email = [self emailForUser];
|
email = [[context activeUser] primaryEmail];
|
||||||
|
|
||||||
for (i = 0; i < count; i++)
|
for (i = 0; i < count; i++)
|
||||||
{
|
{
|
||||||
|
|
|
@ -28,7 +28,6 @@
|
||||||
#import <NGExtensions/NGExtensions.h>
|
#import <NGExtensions/NGExtensions.h>
|
||||||
#import <NGCards/iCalPerson.h>
|
#import <NGCards/iCalPerson.h>
|
||||||
|
|
||||||
#import <SOGo/AgenorUserManager.h>
|
|
||||||
#import <SOGo/SOGoUser.h>
|
#import <SOGo/SOGoUser.h>
|
||||||
#import <SOGoUI/UIxComponent.h>
|
#import <SOGoUI/UIxComponent.h>
|
||||||
#import <Appointments/SOGoAppointmentFolder.h>
|
#import <Appointments/SOGoAppointmentFolder.h>
|
||||||
|
|
|
@ -28,7 +28,6 @@
|
||||||
#import <NGCards/iCalToDo.h>
|
#import <NGCards/iCalToDo.h>
|
||||||
#import <NGCards/iCalPerson.h>
|
#import <NGCards/iCalPerson.h>
|
||||||
|
|
||||||
#import <SoObjects/SOGo/AgenorUserManager.h>
|
|
||||||
#import <SoObjects/SOGo/SOGoUser.h>
|
#import <SoObjects/SOGo/SOGoUser.h>
|
||||||
#import <SoObjects/SOGo/SOGoContentObject.h>
|
#import <SoObjects/SOGo/SOGoContentObject.h>
|
||||||
#import <SoObjects/Appointments/SOGoAppointmentFolder.h>
|
#import <SoObjects/Appointments/SOGoAppointmentFolder.h>
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
#import <SOGo/WOContext+Agenor.h>
|
#import <SOGo/WOContext+Agenor.h>
|
||||||
#import <Appointments/SOGoTaskObject.h>
|
#import <Appointments/SOGoTaskObject.h>
|
||||||
#import <SOGoUI/SOGoDateFormatter.h>
|
#import <SOGoUI/SOGoDateFormatter.h>
|
||||||
#import "UIxComponent+Agenor.h"
|
#import "UIxComponent+Scheduler.h"
|
||||||
#import "common.h"
|
#import "common.h"
|
||||||
|
|
||||||
@interface UIxTaskView (PrivateAPI)
|
@interface UIxTaskView (PrivateAPI)
|
||||||
|
@ -62,7 +62,7 @@
|
||||||
- (BOOL)isAttendeeActiveUser {
|
- (BOOL)isAttendeeActiveUser {
|
||||||
NSString *email, *attEmail;
|
NSString *email, *attEmail;
|
||||||
|
|
||||||
email = [[[self context] activeUser] email];
|
email = [[[self context] activeUser] primaryEmail];
|
||||||
attendee = [self attendee];
|
attendee = [self attendee];
|
||||||
attEmail = [attendee rfc822Email];
|
attEmail = [attendee rfc822Email];
|
||||||
|
|
||||||
|
@ -221,7 +221,7 @@
|
||||||
NSString *email;
|
NSString *email;
|
||||||
iCalPerson *organizer;
|
iCalPerson *organizer;
|
||||||
|
|
||||||
email = [[[self context] activeUser] email];
|
email = [[[self context] activeUser] primaryEmail];
|
||||||
organizer = [[self task] organizer];
|
organizer = [[self task] organizer];
|
||||||
if (!organizer) return YES; // assume this is correct to do, right?
|
if (!organizer) return YES; // assume this is correct to do, right?
|
||||||
return [[organizer rfc822Email] isEqualToString:email];
|
return [[organizer rfc822Email] isEqualToString:email];
|
||||||
|
@ -239,7 +239,7 @@
|
||||||
return YES;
|
return YES;
|
||||||
|
|
||||||
/* can access it if I'm invited :-) */
|
/* can access it if I'm invited :-) */
|
||||||
email = [[[self context] activeUser] email];
|
email = [[[self context] activeUser] primaryEmail];
|
||||||
partMails = [[[self task] participants] valueForKey:@"rfc822Email"];
|
partMails = [[[self task] participants] valueForKey:@"rfc822Email"];
|
||||||
return [partMails containsObject: email];
|
return [partMails containsObject: email];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue