LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Monotone-Parent: a3012f209b73b78a6c9e34d61aedf2907383b05b 

Monotone-Revision: 6bacc3304f196f108a7aa25e27eff1ab2474e5e0

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-07-10T13:22:21
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2009-07-10 13:22:21 +00:00
parent 1355f8077d
commit a4efa19e98
1 changed files with 66 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
SOPE/sope-patchset-r1660.diff
View File

@ -4066,6 +4066,72 @@ Index: sope-appserver/NGObjWeb/ChangeLog
2009-06-10 Helge Hess <helge.hess@opengroupware.org>
* DAVPropMap.plist: mapped {DAV:}current-user-principal (v4.9.37)
Index: sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m
===================================================================
--- sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m (revision 1660)
+++ sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m (working copy)
@@ -49,6 +49,8 @@
#define XMLNS_INTTASK \
@"{http://schemas.microsoft.com/mapi/id/{00062003-0000-0000-C000-000000000046}/}"
+static Class NSURLKlass = Nil;
+
@interface SoWebDAVRenderer(Privates)
- (BOOL)renderStatusResult:(id)_object withDefaultStatus:(int)_defStatus
inContext:(WOContext *)_ctx;
@@ -79,6 +81,8 @@
if ((debugOn = [ud boolForKey:@"SoRendererDebugEnabled"]))
NSLog(@"enabled debugging in SoWebDAVRenderer (SoRendererDebugEnabled)");
+
+ NSURLKlass = [NSURL class];
}
+ (id)sharedRenderer {
@@ -616,16 +620,19 @@
[r appendContentString:s];
}
else {
+ s = [self stringForValue:value ofProperty:_key prefixes:nsToPrefix];
[r appendContentCharacter:'<'];
[r appendContentString:extName];
- [r appendContentCharacter:'>'];
-
- s = [self stringForValue:value ofProperty:_key prefixes:nsToPrefix];
- [r appendContentString:s];
-
- [r appendContentString:@"</"];
- [r appendContentString:extName];
- [r appendContentString:@">"];
+ if ([s length] > 0) {
+ [r appendContentCharacter:'>'];
+ [r appendContentString:s];
+ [r appendContentString:@"</"];
+ [r appendContentString:extName];
+ [r appendContentString:@">"];
+ }
+ else {
+ [r appendContentString:@"/>"];
+ }
if (formatOutput) [r appendContentCharacter:'\n'];
}
}
@@ -694,8 +701,13 @@
}
/* tidy href */
- href = [self tidyHref:href baseURL:baseURL];
-
+ if (useRelativeURLs) {
+ if ([href isKindOfClass: NSURLKlass])
+ href = [href path];
+ }
+ else
+ href = [self tidyHref:href baseURL:baseURL];
+
/* tidy status */
stat = [self tidyStatus:stat];
}
Index: sope-appserver/NGObjWeb/WODirectAction.m
===================================================================
--- sope-appserver/NGObjWeb/WODirectAction.m (revision 1660)