added Z1 connector as a known user agent

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1617 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 2618e33e6c394b59516f477ceef85ad4f1c74fc5..aa3ab3159bed672fddb402e3c41be3af4593c8a7 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,5 +1,10 @@
 2008-03-11  Helge Hess  <helge.hess@opengroupware.org>
 
+       * WEClientCapabilities.m: added ZideOne connector as a known user
+         agent (v4.7.24)
+
+2008-03-11  Helge Hess  <helge.hess@opengroupware.org>
+       
        * DAVPropMap.plist: added more GroupDAV2 properties (v4.7.23)
 
 2008-03-11  Helge Hess  <helge.hess@opengroupware.org>

diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index 1715d6c2dad4d2ca36f1f7e4559909788bf0529d..6fa3391ae85f30f8d6d18849b4d6767a51b94404 100644 (file)
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=23
+SUBMINOR_VERSION:=24
 
 # v4.7.11  requires libNGExtensions v4.7.194
 # v4.5.234 requires libDOM          v4.5.21

diff --git a/sope-appserver/NGObjWeb/WEClientCapabilities.m b/sope-appserver/NGObjWeb/WEClientCapabilities.m
index 3bd44a9caff88ddac7c1b78f7324044cfeb87f5c..bc51a87ddf732d928bc35d6221c6182c3364a649 100644 (file)
--- a/sope-appserver/NGObjWeb/WEClientCapabilities.m
+++ b/sope-appserver/NGObjWeb/WEClientCapabilities.m
@@ -1,6 +1,6 @@
 /*
-  Copyright (C) 2000-2007 SKYRIX Software AG
-  Copyright (C) 2006-2007 Helge Hess
+  Copyright (C) 2000-2008 SKYRIX Software AG
+  Copyright (C) 2006-2008 Helge Hess
 
   This file is part of SOPE.
 
@@ -76,6 +76,7 @@
 #define WEUA_PEAR_XMLRPC       45
 #define WEUA_Cook_XMLRPCdotNET 46
 #define WEUA_WDFS              47
+#define WEUA_ZideOne_Outlook   48
 
 #define WEOS_UNKNOWN   0
 #define WEOS_WINDOWS   1
@@ -113,7 +114,11 @@
   /* process user-agent */
   
   self->userAgent = [[_request headerForKey:@"user-agent"] copy];
+#if LIB_FOUNDATION_LIBRARY
   ua = [self->userAgent cString];
+#else
+  ua = [self->userAgent UTF8String];
+#endif
   if (ua == NULL) {
     /* no user-agent, eg telnet */
     ua = "";
@@ -143,6 +148,11 @@
     self->browserMinorVersion = 0;
     self->browserMajorVersion = 0;
   }
+  else if (strstr(ua, "ZideOne/") != NULL) {
+    self->browser = WEUA_ZideOne_Outlook;
+    self->browserMinorVersion = 0;
+    self->browserMajorVersion = 0;
+  }
   else if ((tmp = strstr(ua, "Safari/"))) {
     /* Hm, Safari says it is a Mozilla/5.0 ? */
     int combinedVersion;
@@ -485,6 +495,7 @@
     case WEUA_PEAR_XMLRPC:       return @"PHP PEAR XMLRPC";
     case WEUA_Cook_XMLRPCdotNET: return @"PHP PEAR XMLRPC";
     case WEUA_WDFS:              return @"WDFS";
+    case WEUA_ZideOne_Outlook:   return @"ZideOne";
     default:                     return @"unknown";
   }
 }
@@ -646,6 +657,7 @@
   if (self->browser == WEUA_WebDrive)         return YES;
   if (self->browser == WEUA_Sunbird)          return YES;
   if (self->browser == WEUA_WDFS)             return YES;
+  if (self->browser == WEUA_ZideOne_Outlook)  return YES;
   return NO;
 }
 
@@ -706,6 +718,7 @@
   case WEUA_SOUP:
   case WEUA_Morgul:
   case WEUA_Sunbird:
+  case WEUA_ZideOne_Outlook:
     /* browser so new, that they always supported UTF-8 ... */
     return YES;
   case WEUA_IE:

diff --git a/sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.m b/sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.m
index 0334a9f6f92d91da31410b9d46600612172fac47..18d0b8166c6fbcd5a163d10acde6de6bc423828a 100644 (file)
--- a/sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.m
+++ b/sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.m
@@ -305,8 +305,11 @@
     NSString *path;
     
     path = [WOApplication findNGObjWebResource:@"DAVPropMap" ofType:@"plist"];
-    if (path != nil)
+    if (path != nil) {
       defMap = [[NSDictionary alloc] initWithContentsOfFile:path];
+      if (defMap == nil)
+       NSLog(@"could not parse plist file: %@", path);
+    }
   }
   return defMap;
 }