From 6f39e7e3e5fbdd93ea1658c4b561ea22330f56be Mon Sep 17 00:00:00 2001 From: helge Date: Tue, 11 Mar 2008 19:27:05 +0000 Subject: [PATCH] added Z1 connector as a known user agent git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1617 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/NGObjWeb/ChangeLog | 5 +++++ sope-appserver/NGObjWeb/Version | 2 +- sope-appserver/NGObjWeb/WEClientCapabilities.m | 17 +++++++++++++++-- sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.m | 5 ++++- 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog index 2618e33e..aa3ab315 100644 --- a/sope-appserver/NGObjWeb/ChangeLog +++ b/sope-appserver/NGObjWeb/ChangeLog @@ -1,5 +1,10 @@ 2008-03-11 Helge Hess + * WEClientCapabilities.m: added ZideOne connector as a known user + agent (v4.7.24) + +2008-03-11 Helge Hess + * DAVPropMap.plist: added more GroupDAV2 properties (v4.7.23) 2008-03-11 Helge Hess diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version index 1715d6c2..6fa3391a 100644 --- 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 3bd44a9c..bc51a87d 100644 --- 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 0334a9f6..18d0b816 100644 --- 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; } -- 2.39.5