fixed bundle resource lookup on MacOSX, changed resource lookup in

[sope] / sope-appserver / NGObjWeb / WEClientCapabilities.m

diff --git a/sope-appserver/NGObjWeb/WEClientCapabilities.m b/sope-appserver/NGObjWeb/WEClientCapabilities.m
index 94061d07cae5915672c621238a93753889bce53a..ac3a820a293a8f9c2c05543dcd0f9c1c61044a63 100644 (file)
--- a/sope-appserver/NGObjWeb/WEClientCapabilities.m
+++ b/sope-appserver/NGObjWeb/WEClientCapabilities.m
@@ -1,24 +1,23 @@
 /*
-  Copyright (C) 2000-2004 SKYRIX Software AG
+  Copyright (C) 2000-2005 SKYRIX Software AG
 
-  This file is part of OpenGroupware.org.
+  This file is part of SOPE.
 
-  OGo is free software; you can redistribute it and/or modify it under
+  SOPE 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
+  SOPE 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
+  License along with SOPE; see the file COPYING.  If not, write to the
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #include <NGObjWeb/WEClientCapabilities.h>
 #include <NGObjWeb/WOAssociation.h>
@@ -67,6 +66,8 @@
 #define WEUA_KungLog          36
 #define WEUA_SOPE             37
 #define WEUA_Ecto             38
+#define WEUA_NewsFire         39
+#define WEUA_Goliath          40
 
 #define WEOS_UNKNOWN   0
 #define WEOS_WINDOWS   1
@@ -330,6 +331,12 @@
   else if (strstr(ua, "ecto")) {
     self->browser = WEUA_Ecto;
   }
+  else if (strstr(ua, "NewsFire")) {
+    self->browser = WEUA_NewsFire;
+  }
+  else if (strstr(ua, "Goliath")) {
+    self->browser = WEUA_Goliath;
+  }
   else if (strstr(ua, "SOPE/")) {
     self->browser = WEUA_SOPE;
   }
@@ -422,6 +429,8 @@
     case WEUA_Morgul:           return @"Morgul";
     case WEUA_KungLog:          return @"KungLog";
     case WEUA_Ecto:             return @"Ecto";
+    case WEUA_NewsFire:         return @"NewsFire";
+    case WEUA_Goliath:          return @"Goliath";
     default:                    return @"unknown";
   }
 }
@@ -576,6 +585,7 @@
   if (self->browser == WEUA_ZideLook)         return YES;
   if (self->browser == WEUA_Entourage)        return YES;
   if (self->browser == WEUA_Morgul)           return YES;
+  if (self->browser == WEUA_Goliath)          return YES;
   return NO;
 }
 
@@ -590,6 +600,11 @@
   if (self->browser == WEUA_Ecto)    return YES;
   return NO;
 }
+- (BOOL)isRSSClient {
+  if (self->browser == WEUA_NetNewsWire) return YES;
+  if (self->browser == WEUA_NewsFire)    return YES;
+  return NO;
+}
 
 - (BOOL)doesSupportCSSOverflow {
   if (![self isCSS1Browser])
@@ -826,7 +841,7 @@ static NSString *WEClientDetectorFormName = @"WEClientDetect";
 - (void)appendToResponse:(WOResponse *)_response inContext:(WOContext *)_ctx {
   if (![_ctx isInForm]) {
     [[_ctx component]
-           logWithFormat:@"WARNING: you must use %@ inside a form !",
+           warnWithFormat:@"you must use %@ inside a form !",
              NSStringFromClass([self class])];
     return;
   }
@@ -1017,4 +1032,10 @@ static NSString *WEClientDetectorFormName = @"WEClientDetect";
 
   Ecto (WebServicesCore)
     'ecto (Macintosh; U; PPC Mac OS X) WebServicesCore'
+
+  NewsFire
+    'NewsFire/0.23'
+  
+  Goliath
+    'Goliath/1.0.1 (Macintosh-Carbon; PPC)'
 */