From 4c2a93e26cd8075e0a91164032e88409a0e94222 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 12 Jan 2007 23:22:04 +0000 Subject: [PATCH] Monotone-Parent: 8d1d44754257c773dc6882bb69d2da203650f3cf Monotone-Revision: 5a720314ac446bf86e127d6d6e938b844aab7441 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-01-12T23:22:04 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ SoObjects/SOGo/SOGoAuthenticator.m | 19 +++++-------------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4cf81ee3e..10d2f7a77 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2007-01-12 Wolfgang Sourdeau + * SoObjects/SOGo/SOGoAuthenticator.m ([SOGoAuthenticator + -checkLogin:_loginpassword:_pwd]): authorize special "freebusy" + user with password "freebusy". + * SoObjects/Appointments/SOGoFreeBusyObject.m ([SOGoFreeBusyObject -contentAsString]): the default timerange is now 14 days before currentday and 1 month after. diff --git a/SoObjects/SOGo/SOGoAuthenticator.m b/SoObjects/SOGo/SOGoAuthenticator.m index 00205e6fd..0aa6552e5 100644 --- a/SoObjects/SOGo/SOGoAuthenticator.m +++ b/SoObjects/SOGo/SOGoAuthenticator.m @@ -72,20 +72,11 @@ static SOGoAuthenticator *auth = nil; - (BOOL) checkLogin: (NSString *) _login password: (NSString *) _pwd { - BOOL result; - -// return YES; - if ([authMethod isEqualToString: @"LDAP"]) - result = [self LDAPCheckLogin: _login password: _pwd]; - else - { - if ([_login length] == 0) - result = NO; - else - result = YES; - } - - return result; + return (([_login isEqualToString: @"freebusy"] + && [_pwd isEqualToString: @"freebusy"]) + || ([authMethod isEqualToString: @"LDAP"] + && [self LDAPCheckLogin: _login password: _pwd]) + || [_login length] > 0); } - (BOOL) LDAPCheckLogin: (NSString *) _login