improved query string handling

[sope] / sope-appserver / NGObjWeb / DynamicElements / WOFileUpload.m

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOFileUpload.m b/sope-appserver/NGObjWeb/DynamicElements/WOFileUpload.m
index 7301afd04744da94f1b7bfc829b9bb0f158b86ae..9e763c9d35b3d62cb4985e3838af736a2ba190ce 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOFileUpload.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOFileUpload.m
@@ -1,20 +1,20 @@
 /*
-  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.
 */
@@ -35,7 +35,7 @@
 
 @end /* WOFileUpload */
 
-#include "common.h"
+#include "decommon.h"
 #include <NGMime/NGMime.h>
 #include <NGHttp/NGHttp.h>
 
@@ -85,28 +85,31 @@ static NGMimeType *multipartFormData = nil;
   
   if ([self->disabled boolValueInComponent:[_ctx component]])
     return;
-
+  
   currentId = OWFormElementName(self, _ctx);
-
+  
   if ((formValue = [_rq formValueForKey:currentId]) == nil)
     return;
 
   contentType = [[_rq httpRequest] contentType];
       
   if (![contentType hasSameType:multipartFormData]) {
-    NSLog(@"WARNING: tried to apply file-upload value of %@ from "
-         @"a non multipart-form request (value=%@) !",
-         [_ctx elementID], formValue);
+    [self warnWithFormat:
+           @"Tried to apply file-upload value of eid=%@ from "
+           @"a non multipart-form request (value=%@).",
+           [_ctx elementID], formValue];
     return;
   }
   
 #if 0
   NSLog(@"%@: value=%@ ..", [self elementID], formValue);
 #endif
-
+  
   if ([self->data isValueSettable])
     [self->data setValue:formValue inComponent:[_ctx component]];
-
+  
+  /* the remainder is for locating the file path */
+  
   if (![self->filePath isValueSettable])
     return;
   
@@ -139,7 +142,7 @@ static NGMimeType *multipartFormData = nil;
        [[DispClass alloc] initWithString:[disposition stringValue]];
       disposition = [disposition autorelease];
     }
-              
+    
     formName = [(NGMimeContentDispositionHeaderField *)disposition name];
       
     if ([formName isEqualToString:currentId]) {
@@ -176,7 +179,7 @@ static NGMimeType *multipartFormData = nil;
                         [self->otherTagString stringValueInComponent:
                                 [_ctx component]]);
   }
-  WOResponse_AddCString(_response, " />");
+  WOResponse_AddEmptyCloseParens(_response, _ctx);
 }
 
 /* description */