mirror of
https://github.com/gnustep/libs-gsweb.git
synced 2025-02-21 02:41:04 +00:00
* GSWeb.framework/GSWGNUmakefile: o removed NSObject+IVarAccess+PerformSel.* * GSWeb.framework/GSWConstants.m: o fix GSWHTTPHeader_Response_HeaderLineEnd: remove space at the begining o use RCS_ID * GSWeb.framework/Adaptors/common/GSWHTTPResponse.c: o fix status in GSWHTTPResponse_New() * GSWAdaptors/Apache/mod_gsweb.c: o fixes bad returned status o traces * GSWeb.framework/GSWTemplateParserANTLR.m: o removed logs o fixes for warnings o use RCS_ID * GSWeb.framework/GSWApplication.m: o use RCS_ID o added logs o new method to begin rewrite exception handling * GSWeb.framework/GSWRequest.m: o logs o fix in -_getFormValuesFromMultipartFormData to handle more than one value per name o use RCS_ID o -fix bad types in uriElementForKey: * GSWeb.framework/GSWConditional.m: o added asserts o use RCS_ID * GSWeb.framework/GSWHTMLStaticElement.m: o added asserts o clean warnings o use RCS_ID * GSWeb.framework/GSWComponentReference.m: o added asserts o use RCS_ID * GSWeb.framework/GSWActiveImage.m: o added asserts * GSWeb.framework/GSWComponentContent.m: o added asserts o use RCS_ID * GSWeb.framework/GSWForm.m: o added asserts o use RCS_ID * GSWeb.framework/GSWHTMLDynamicElement.m: o added asserts o use RCS_ID * GSWeb.framework/GSWHTMLURLValuedElement.m: o use RCS_ID o added asserts * GSWeb.framework/GSWRepetition.m: o added asserts o use RCS_ID * GSWeb.framework/GSWExtensions.framework/GNUmakefile: o added GSWPageRestorationErrorPage.gswc * GSWeb.framework/GSWFileUploadComponent.m: o use RCS_ID * GSWeb.framework/GSWImage.m: o Don't output nil height/width o fix: get component before using ! o use RCS_ID * GSWeb.framework/GSWElementIDString.m: o in -initWithCoder: retain _string o use RCS_ID * GSWeb.framework/GSWElementIDString.h: o cleaned * config.h.in: o define RCS_ID like in GDL2 * GSWeb.framework/GSWDirectActionRequestHandler.[hm]: o added +additionalRequestPathArrayFromRequest: o enable directAction with additional path components o use RCS_ID * GSWeb.framework/GSWDirectAction.[hm]: o added -additionalRequestPathArray o use RCS_ID * GSWeb.framework/GSWeb.h: o include GSCategories.h * GSWeb.framework/GSWDebug.m: o use RCS_ID * GSWeb.framework/GSWPageDefParserExt.m: o use RCS_ID * GSWeb.framework/GSWPageDefElement.m: o use RCS_ID * GSWeb.framework/GSWDeployedBundle.m: o use RCS_ID * GSWeb.framework/GSWProjectBundle.m: o use RCS_ID * GSWeb.framework/GSWStats.m: o use RCS_ID * GSWeb.framework/GSWBundle.m: o clean warnings o use RCS_ID * GSWeb.framework/GSWTemplateParser.m:: o clean warnings o use RCS_ID * GSWeb.framework/GSWTemplateParserXML.m: o clean warnings o use RCS_ID * GSWeb.framework/GSWComponent.m: o clean warnings o use RCS_ID * GSWeb.framework/GSWDisplayGroup.m: o clean warnings o fix -validateValue:forKey: call o use RCS_ID * GSWeb.framework/GSWHTMLParserExt.m: o use RCS_ID * GSWeb.framework/GSWAssociation.m: o clean warnings o use RCS_ID * GSWeb.framework/GSWResourceManager.m: o clean warnings o use RCS_ID * GSWeb.framework/GSWSession.m: o clean warnings o use RCS_ID * GSWeb.framework/GSWMultiKeyDictionary.m: o use RCS_ID * GSWeb.framework/GSWResponse.m: o clean warnings o use RCS_ID * GSWeb.framework/GSWStatisticsStore.m: o clean warnings * GSWeb.framework/GSWAdaptor.m: o use RCS_ID * GSWeb.framework/GSWGeometricRegion.[hm]: o types change o use RCS_ID * GSWeb.framework/GSWActiveImage.m: o clean warnings o use RCS_ID * GSWeb.framework/GSWBody.m: o use RCS_ID * GSWeb.framework/GSWTextField.m: o use RCS_ID * GSWeb.framework/GSWSubmitButton.m: o clean warnings o use RCS_ID * GSWeb.framework/GSWHTMLBareString.m: o use RCS_ID * GSWeb.framework/GSWHTMLComment.m: o use RCS_ID * GSWeb.framework/GSWApplet.m: o use RCS_ID * GSWeb.framework/GSWBrowser.m: o use RCS_ID * GSWeb.framework/GSWCheckBoxList.m: o use RCS_ID * GSWeb.framework/GSWEmbeddedObject.m: o use RCS_ID * GSWeb.framework/GSWFrame.m: o use RCS_ID * GSWeb.framework/GSWGenericContainer.m: o use RCS_ID * GSWeb.framework/GSWGenericElement.m: o use RCS_ID * GSWeb.framework/GSWHyperlink.m: o use RCS_ID o clean warnings * GSWeb.framework/GSWImageButton.m: o use RCS_ID o clean warnings * GSWeb.framework/GSWJavaScript.m: o use RCS_ID * GSWeb.framework/GSWNestedList.m: o use RCS_ID * GSWeb.framework/GSWParam.m: o use RCS_ID * GSWeb.framework/GSWPasswordField.m: o use RCS_ID * GSWeb.framework/GSWPopUpButton.m: o use RCS_ID * GSWeb.framework/GSWRadioButtonList.m: o use RCS_ID * GSWeb.framework/GSWResetButton.m: o use RCS_ID * GSWeb.framework/GSWSwitchComponent.m: o use RCS_ID * GSWeb.framework/GSWVBScript.m: o use RCS_ID * GSWeb.framework/GSWString.m: o use RCS_ID * GSWeb.framework/GSWText.m: o use RCS_ID * GSWeb.framework/GSWCookie.m: o use RCS_ID * GSWeb.framework/GSWRequestHandler.m: o use RCS_ID * GSWeb.framework/GSWMailDelivery.m: o use RCS_ID * GSWeb.framework/GSWComponentRequestHandler.m: o use RCS_ID o clean warnings * GSWeb.framework/GSWKeyValueAssociation.m: o use RCS_ID * GSWeb.framework/GSWHTMLStaticGroup.m: o use RCS_ID * GSWeb.framework/GSWConstantValueAssociation.m: o use RCS_ID * GSWeb.framework/GSWDynamicURLString.m: o use RCS_ID * GSWeb.framework/GSWBindingNameAssociation.m: o use RCS_ID * GSWeb.framework/GSWBindingNameAssociation.[hm] o clean warnings o use RCS_ID * GSWeb.framework/GSWURLValuedElementData.m: o clean warnings o use RCS_ID * GSWeb.framework/GSWToggle.m: o use RCS_ID * GSWeb.framework/GSWFileUpload.m: o use RCS_ID * GSWeb.framework/GSWResourceURL.m: o use RCS_ID * GSWeb.framework/GSWProcFS.m: o use RCS_ID * GSWeb.framework/GSWActionURL.m: o use RCS_ID * GSWeb.framework/GSWContext.m: o use RCS_ID * GSWeb.framework/GSWDefaultAdaptorThread.m: o use RCS_ID * GSWeb.framework/GSWDynamicElement.m: o use RCS_ID * GSWeb.framework/GSWeb.m: o use RCS_ID * GSWeb.framework/GSWElement.m: o use RCS_ID * GSWeb.framework/GSWResourceRequestHandler.m: o use RCS_ID * GSWeb.framework/GSWServerSessionStore.m: o use RCS_ID * GSWeb.framework/GSWSessionStore.m: o use RCS_ID * GSWeb.framework/GSWSessionTimeOut.m: o use RCS_ID * GSWeb.framework/GSWSessionTimeOutManager.m: o use RCS_ID * GSWeb.framework/GSWTransactionRecord.m: o use RCS_ID * GSWeb.framework/GSWUtils.m: o use RCS_ID * GSWeb.framework/GSWWOCompatibility.m: o use RCS_ID * GSWeb.framework/NSString+HTML.m: o use RCS_ID * GSWeb.framework/NSString+Trimming.m: o use RCS_ID git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@16216 72102866-910b-0410-8b05-ffd578937521
225 lines
8.3 KiB
Objective-C
225 lines
8.3 KiB
Objective-C
/** GSWFileUpload.m - <title>GSWeb: Class GSWFileUpload</title>
|
|
|
|
Copyright (C) 1999-2003 Free Software Foundation, Inc.
|
|
|
|
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
|
|
Date: Sep 1999
|
|
|
|
$Revision$
|
|
$Date$
|
|
|
|
This file is part of the GNUstep Web Library.
|
|
|
|
<license>
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2 of the License, or (at your option) any later version.
|
|
|
|
This library 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with this library; if not, write to the Free
|
|
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
</license>
|
|
**/
|
|
|
|
#include "config.h"
|
|
|
|
RCS_ID("$Id$")
|
|
|
|
#include "GSWeb.h"
|
|
|
|
//====================================================================
|
|
@implementation GSWFileUpload
|
|
|
|
//--------------------------------------------------------------------
|
|
-(id)initWithName:(NSString*)aName
|
|
associations:(NSDictionary*)associations
|
|
contentElements:(NSArray*)elements
|
|
{
|
|
NSMutableDictionary* tmpAssociations=[NSMutableDictionary dictionaryWithDictionary:associations];
|
|
LOGObjectFnStartC("GSWFileUpload");
|
|
NSDebugMLLog(@"gswdync",@"aName=%@ associations:%@ elements_=%@",
|
|
aName,associations,elements);
|
|
[tmpAssociations setObject:[GSWAssociation associationWithValue:@"file"]
|
|
forKey:@"type"];
|
|
[tmpAssociations removeObjectForKey:data__Key];
|
|
[tmpAssociations removeObjectForKey:filePath__Key];
|
|
if ((self=[super initWithName:aName
|
|
associations:tmpAssociations
|
|
contentElements:nil])) //No Childs!
|
|
{
|
|
_data = [[associations objectForKey:data__Key
|
|
withDefaultObject:[_data autorelease]] retain];
|
|
NSDebugMLLog(@"gswdync",@"GSWFileUpload: data=%@",_data);
|
|
|
|
if (!_data || ![_data isValueSettable])
|
|
{
|
|
//TODO
|
|
};
|
|
|
|
_filepath = [[associations objectForKey:filePath__Key
|
|
withDefaultObject:[_filepath autorelease]] retain];
|
|
NSDebugMLLog(@"gswdync",@"GSWFileUpload: filepath=%@",_filepath);
|
|
|
|
if (!_filepath || ![_filepath isValueSettable])
|
|
{
|
|
//TODO
|
|
};
|
|
};
|
|
LOGObjectFnStopC("GSWFileUpload");
|
|
return self;
|
|
};
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
-(void)dealloc
|
|
{
|
|
DESTROY(_data);
|
|
DESTROY(_filepath);
|
|
[super dealloc];
|
|
};
|
|
|
|
@end
|
|
//====================================================================
|
|
@implementation GSWFileUpload (GSWFileUploadA)
|
|
|
|
//--------------------------------------------------------------------
|
|
-(void)appendToResponse:(GSWResponse*)response
|
|
inContext:(GSWContext*)context
|
|
{
|
|
[super appendToResponse:response
|
|
inContext:context];
|
|
};
|
|
|
|
//--------------------------------------------------------------------
|
|
-(GSWElement*)invokeActionForRequest:(GSWRequest*)request
|
|
inContext:(GSWContext*)context
|
|
{
|
|
GSWStartElement(context);
|
|
GSWAssertCorrectElementID(context);
|
|
//Bypass GSWInput
|
|
return nil;
|
|
};
|
|
|
|
//--------------------------------------------------------------------
|
|
-(void)takeValuesFromRequest:(GSWRequest*)request
|
|
inContext:(GSWContext*)context
|
|
{
|
|
//OK
|
|
BOOL disabledValue=NO;
|
|
LOGObjectFnStartC("GSWFileUpload");
|
|
GSWStartElement(context);
|
|
GSWAssertCorrectElementID(context);
|
|
disabledValue=[self disabledInContext:context];
|
|
if (!disabledValue)
|
|
{
|
|
BOOL wasFormSubmitted=[context _wasFormSubmitted];
|
|
if (wasFormSubmitted)
|
|
{
|
|
GSWComponent* component=nil;
|
|
NSString* nameInContext=nil;
|
|
NSArray* fileDatas=nil;
|
|
NSString* fileNameFormValueName=nil;
|
|
NSString* fileNameValue=nil;
|
|
NSData* dataValue=nil;
|
|
int fileDatasCount=0;
|
|
NS_DURING
|
|
{
|
|
component=[context component];
|
|
nameInContext=[self nameInContext:context];
|
|
NSDebugMLLog(@"gswdync",@"nameInContext=%@",nameInContext);
|
|
fileDatas=[request formValuesForKey:nameInContext];
|
|
NSDebugMLLog(@"gswdync",@"value=%@",fileDatas);
|
|
fileDatasCount=[fileDatas count];
|
|
/*
|
|
if (_fileDatasCount!=1)
|
|
{
|
|
ExceptionRaise(@"GSWFileUpload",
|
|
@"GSWFileUpload: File Data Nb != 1 :%d",
|
|
_fileDatasCount);
|
|
};
|
|
*/
|
|
if (fileDatasCount==1)
|
|
{
|
|
dataValue=[fileDatas objectAtIndex:0];
|
|
NSDebugMLLog(@"gswdync",@"dataValue %p (class=%@)=%@",
|
|
dataValue,[dataValue class],dataValue);
|
|
if (dataValue)
|
|
{
|
|
if ([dataValue isKindOfClass:[NSData class]])
|
|
{
|
|
if ([dataValue length]==0)
|
|
{
|
|
LOGError(@"Empty Data: %@",dataValue);
|
|
};
|
|
}
|
|
else
|
|
{
|
|
if ([dataValue isKindOfClass:[NSString class]] && [dataValue length]==0)
|
|
{
|
|
LOGError(@"No Data: %@",dataValue);
|
|
NSDebugMLLog(@"gswdync",@"No Data: %p (class=%@)=%@",
|
|
dataValue,[dataValue class],dataValue);
|
|
dataValue=nil;
|
|
}
|
|
else
|
|
{
|
|
NSLog(@"content type request : %@",[request _contentType]);
|
|
NSLog(@"data class = %@",NSStringFromClass([dataValue class]));
|
|
NSDebugMLLog(@"gswdync",@"??Data: %p (class=%@)=%@",
|
|
dataValue,[dataValue class],dataValue);
|
|
/*if (![dataValue isMemberOfClass:[NSString class]]) {
|
|
ExceptionRaise(@"GSWFileUpload",
|
|
@"GSWFileUpload: bad data :%@",
|
|
dataValue);
|
|
dataValue=nil;
|
|
}*/
|
|
};
|
|
};
|
|
}
|
|
else
|
|
{
|
|
LOGError0(@"No Data:");
|
|
};
|
|
fileNameFormValueName=[NSString stringWithFormat:@"%@.filename",nameInContext];
|
|
NSDebugMLLog(@"gswdync",@"fileNameFormValueName=%@",fileNameFormValueName);
|
|
fileNameValue=[request formValueForKey:fileNameFormValueName];
|
|
NSDebugMLLog(@"gswdync",@"fileNameValue=%@",fileNameValue);
|
|
if (!fileNameValue || [fileNameValue length]==0)
|
|
{
|
|
LOGError(@"No fileName: %@",fileNameValue);
|
|
};
|
|
[_filepath setValue:fileNameValue
|
|
inComponent:component];
|
|
[_data setValue:dataValue
|
|
inComponent:component];
|
|
}
|
|
else
|
|
{
|
|
// bug in omniweb-browser if you click cancel in FileOpenPanel, it transmits incorrect datas
|
|
|
|
[_filepath setValue:nil
|
|
inComponent:component];
|
|
[_data setValue:nil
|
|
inComponent:component];
|
|
}
|
|
}
|
|
NS_HANDLER
|
|
{
|
|
localException=ExceptionByAddingUserInfoObjectFrameInfo0(localException,
|
|
@"GSWFileUpload in takeValuesFromRequest");
|
|
LOGException(@"%@ (%@)",localException,[localException reason]);
|
|
[localException raise];
|
|
};
|
|
NS_ENDHANDLER;
|
|
};
|
|
};
|
|
LOGObjectFnStopC("GSWFileUpload");
|
|
};
|
|
@end
|
|
|