From fcf20c0cf90762bcfcb33d4aedcd2d099c7258ab Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 19 Jun 2007 17:54:48 +0000 Subject: [PATCH] Monotone-Parent: 7e4d175baa0bf4159a2a0fe43320b6c8cb5884e8 Monotone-Revision: e55b054800d7d89a5aad8e5477bfe9625f49efa5 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-06-19T17:54:48 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++ SoObjects/SOGo/WOContext+Agenor.h | 33 ------------- SoObjects/SOGo/WOContext+Agenor.m | 82 ------------------------------- 3 files changed, 4 insertions(+), 115 deletions(-) delete mode 100644 SoObjects/SOGo/WOContext+Agenor.h delete mode 100644 SoObjects/SOGo/WOContext+Agenor.m diff --git a/ChangeLog b/ChangeLog index b4ad8eccb..a5a669680 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-06-19 Wolfgang Sourdeau + + * SoObjects/SOGo/WOContext+Agenor.[hm]: removed unused module. + 2007-06-14 Wolfgang Sourdeau * SoObjects/SOGo/SOGoLRUCache.m: removed unused module. diff --git a/SoObjects/SOGo/WOContext+Agenor.h b/SoObjects/SOGo/WOContext+Agenor.h deleted file mode 100644 index 759e3fc9c..000000000 --- a/SoObjects/SOGo/WOContext+Agenor.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - Copyright (C) 2000-2005 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. -*/ - -#ifndef __SOGo_WOContext_Agenor_H_ -#define __SOGo_WOContext_Agenor_H_ - -#include - -@interface WOContext (Agenor) - -- (BOOL)isAccessFromIntranet; - -@end - -#endif /* __SOGo_WOContext_Agenor_H_ */ diff --git a/SoObjects/SOGo/WOContext+Agenor.m b/SoObjects/SOGo/WOContext+Agenor.m deleted file mode 100644 index f8d246fde..000000000 --- a/SoObjects/SOGo/WOContext+Agenor.m +++ /dev/null @@ -1,82 +0,0 @@ -/* - Copyright (C) 2000-2005 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. -*/ - -#include "WOContext+Agenor.h" -#include "common.h" - -@implementation WOContext(Agenor) - -static EOQualifier *internetDetectQualifier = nil; - -static EOQualifier *getInternetDetectQualifier(void) { - static BOOL didCheck = NO; - NSUserDefaults *ud; - NSString *s; - - if (didCheck) return internetDetectQualifier; - - ud = [NSUserDefaults standardUserDefaults]; - - if ((s = [ud stringForKey:@"SOGoInternetDetectQualifier"]) != nil) { - internetDetectQualifier = - [[EOQualifier qualifierWithQualifierFormat:s] retain]; - if (internetDetectQualifier == nil) - NSLog(@"ERROR: could not parse qualifier: '%@'", s); - } - if (internetDetectQualifier == nil) - NSLog(@"Note: no 'SOGoInternetDetectQualifier' configured."); - else { - NSLog(@"Note: detect Internet access using: %@", - internetDetectQualifier); - } - - didCheck = YES; - return internetDetectQualifier; -} - -- (BOOL)isAccessFromIntranet { - id q; - NSNumber *bv; - WORequest *rq; - BOOL ok; - - if ((bv = [self objectForKey:@"_agenorUnrestricedAccess"]) != nil) - return [bv boolValue]; - - if ((rq = [self request]) == nil) { - [self logWithFormat:@"ERROR: got no request for context!"]; - return NO; - } - - - if ((q = (id)getInternetDetectQualifier()) == nil) - /* if no qualifier is set, allow access */ - ok = YES; - else - /* is Internet request? */ - ok = [q evaluateWithObject:[rq headers]] ? NO : YES; - - bv = [NSNumber numberWithBool:ok]; - [self setObject:bv forKey:@"_agenorUnrestricedAccess"]; - return ok; -} - -@end /* WOContext(Agenor) */