mirror of
https://github.com/gnustep/libs-gsweb.git
synced 2025-02-23 11:41:20 +00:00
Applied patch from Turbocat (www.turbocat.de): GSWPatch_04-JUL_2001.diff except GSWeb.framework/GSWInput.m/.h one (have to verify coherence of it) * GSWAdaptors/common/GSWApp.c/.h: Added GSWAppInfo * GSWAdaptors/common/GSWAppConnectNSSocket.c: Changes on includes * GSWAdaptors/common/GSWLoadBalancing.h: Added parameter to GSWLoadBalancing_Find* * GSWAdaptors/common/GSWLoadBalancing.c: added p_pURLComponents parameter, o management of AppInfo * GSWAdaptors/common/GSWAppRequest.c: managing refused connections * GSWExtensions.framework/GSWStatsPage.gswc/GSWStatsPage.gswd: misspelling correction * GSWExtensions.framework/GSWStatsPage.gswc/GSWStatsPage.html: Various Changes * GSWExtensions.framework/GSWStatsPage.m: changes in login/password validation o -awake added * GSWeb.framework/GSWApplication.m/.h: Manage refusing new sessions * GSWeb.framework/GSWBundle.m: debug traces commented * GSWeb.framework/GSWComponent.m: implementation of ensureAwakeInContext: * GSWeb.framework/GSWAssociation.m: special case for returned value of type GSMutableArray (Why ?) * GSWeb.framework/GSWComponentRequestHandler.m: comments added * GSWeb.framework/GSWDefaultAdaptorThread.m: added debug traces * GSWeb.framework/GSWDirectActionRequestHandler.m: replaced GSWDirectAction by DirectAction * GSWeb.framework/GSWDisplayGroup.m: initialize _baseIndex, o correct misspelled names, o added -description, o use delegate in _changedInEditingContext:, _invalidatedAllObjectsInStore:, o changes in -deleteObjectAtIndex:, * GSWeb.framework/GSWFileUpload.m: different handling of _fileDatasCount, handle bug in omniweb-browser * GSWeb.framework/GSWHyperlink.m: added ensureAwakeInContext: call * GSWeb.framework/GSWImageButton.m: added ensureAwakeInContext: call * GSWeb.framework/GSWPopUpButton.m: o use [response_ appendContentString:_noSelectionStringValue] instead of [response_ appendContentHTMLString:_noSelectionStringValue] o handle no displayString case o use [response_ appendContentString:_displayStringValue] instead of [response_ appendContentHTMLString:_displayStringValue] * GSWeb.framework/GSWConfig.h: set GSWOPTVALUE_AutoOpenInBrowser to NO * GSWeb.framework/GSWElementIDString.m: comment some debug traces * GSWeb.framework/GSWHTMLStaticGroup.m/.h: added support of documentType * GSWeb.framework/GSWHTMLURLValuedElement.m: addeded debug trace * GSWeb.framework/GSWKeyValueAssociation.m: use NSStringFromClass([retValue class]) instead of [retValue class] for log * GSWeb.framework/GSWRequest.m/.h: added -(NSDictionary*)headers; o added test on _contentType in _contentType o autorelease _dict in -uriElements * GSWeb.framework/GSWResponse.m/.h: added -setHeaders: and -headers o Added GSWResponse (GSWResponseRefused) o return self in -generateResponse * GSWeb.framework/GSWServerSessionStore.m/.h: added @interface GSWServerSessionStore (GSWServerSessionStoreInfo) o added refusing session management * GSWeb.framework/GSWSession.m: o in -terminate forces to call removeSessionWithID in GSWServerSessionStore to dealloc it * GSWeb.framework/GSWSessionTimeOutManager.m/.h: replace NSMutableOrderedArray* sessionOrderedTimeOuts; by NSMutableArray* sessionOrderedTimeOuts; o added traces o added GSWSessionTimeOutManager (GSWSessionRefused) * GSWeb.framework/GSWSubmitButton.m: raise exception if no element is returned * GSWeb.framework/GSWTemplateParser.m: added doctype management * GSWeb.framework/GSWUtils.h: added if defined for __NetBSD__ * GSWeb.framework/GSWWOCompatibility.m/.h: added WOGenericContainer, WOImageButton, WOHyperlink * GSWeb.framework/attach.m: added if defined for __NetBSD__ * GSWeb.framework/stacktrace.m: added if defined for __NetBSD__ * GSWeb.framework/GSWTemplateParserXML.m: traces commented o test XML node content before adding it * GSWeb.framework/NSObject+IVarAccess+PerformSel.m o changes in -getIVarNamed: and in setIVarNamed:withValue: (use of sel+imp, tests on parameters) * GSWAdaptors/common/GSWHTTPResponse.c: change in GSWHTTPResponse_GetResponse() o debug traces removed git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@11251 72102866-910b-0410-8b05-ffd578937521
205 lines
6.1 KiB
Objective-C
205 lines
6.1 KiB
Objective-C
/* GSWFileUpload.h - GSWeb: Class GSWFileUpload
|
|
Copyright (C) 1999 Free Software Foundation, Inc.
|
|
|
|
Written by: Manuel Guesdon <mguesdon@sbuilders.com>
|
|
Date: Sep 1999
|
|
|
|
This file is part of the GNUstep Web Library.
|
|
|
|
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.
|
|
*/
|
|
|
|
static char rcsId[] = "$Id$";
|
|
|
|
#include <GSWeb/GSWeb.h>
|
|
|
|
//====================================================================
|
|
@implementation GSWFileUpload
|
|
|
|
//--------------------------------------------------------------------
|
|
-(id)initWithName:(NSString*)name_
|
|
associations:(NSDictionary*)associations_
|
|
contentElements:(NSArray*)elements_
|
|
{
|
|
NSMutableDictionary* _associations=[NSMutableDictionary dictionaryWithDictionary:associations_];
|
|
LOGObjectFnStartC("GSWFileUpload");
|
|
NSDebugMLLog(@"gswdync",@"name_=%@ associations_:%@ elements_=%@",name_,associations_,elements_);
|
|
[_associations setObject:[GSWAssociation associationWithValue:@"file"]
|
|
forKey:@"type"];
|
|
[_associations removeObjectForKey:data__Key];
|
|
[_associations removeObjectForKey:filePath__Key];
|
|
if ((self=[super initWithName:name_
|
|
associations:_associations
|
|
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_
|
|
{
|
|
GSWAssertCorrectElementID(context_);// Debug Only
|
|
//Bypass GSWInput
|
|
return nil;
|
|
};
|
|
|
|
//--------------------------------------------------------------------
|
|
-(void)takeValuesFromRequest:(GSWRequest*)request_
|
|
inContext:(GSWContext*)context_
|
|
{
|
|
//OK
|
|
BOOL _disabled=NO;
|
|
LOGObjectFnStartC("GSWFileUpload");
|
|
GSWAssertCorrectElementID(context_);// Debug Only
|
|
_disabled=[self disabledInContext:context_];
|
|
if (!_disabled)
|
|
{
|
|
BOOL _wasFormSubmitted=[context_ _wasFormSubmitted];
|
|
if (_wasFormSubmitted)
|
|
{
|
|
GSWComponent* _component=nil;
|
|
NSString* _nameInContext=nil;
|
|
NSArray* _fileDatas=nil;
|
|
NSString* fileNameFormValueName=nil;
|
|
NSString* _fileName=nil;
|
|
NSData* _data=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) {
|
|
|
|
_data=[_fileDatas objectAtIndex:0];
|
|
if (_data)
|
|
{
|
|
if ([_data isKindOfClass:[NSData class]])
|
|
{
|
|
if ([_data length]==0)
|
|
{
|
|
LOGError(@"Empty Data: %@",_data);
|
|
};
|
|
}
|
|
else
|
|
{
|
|
if ([_data isKindOfClass:[NSString class]] && [_data length]==0)
|
|
{
|
|
LOGError(@"No Data: %@",_data);
|
|
_data=nil;
|
|
}
|
|
else
|
|
{
|
|
NSLog(@"content type request : %@",[request_ _contentType]);
|
|
NSLog(@"data class = %@",NSStringFromClass([_data class]));
|
|
/*if (![_data isMemberOfClass:[NSString class]]) {
|
|
ExceptionRaise(@"GSWFileUpload",
|
|
@"GSWFileUpload: bad data :%@",
|
|
_data);
|
|
_data=nil;
|
|
}*/
|
|
};
|
|
};
|
|
}
|
|
else
|
|
{
|
|
LOGError0(@"No Data:");
|
|
};
|
|
fileNameFormValueName=[NSString stringWithFormat:@"%@.filename",_nameInContext];
|
|
NSDebugMLLog(@"gswdync",@"fileNameFormValueName=%@",fileNameFormValueName);
|
|
_fileName=[request_ formValueForKey:fileNameFormValueName];
|
|
NSDebugMLLog(@"gswdync",@"_fileName=%@",_fileName);
|
|
if (!_fileName || [_fileName length]==0)
|
|
{
|
|
LOGError(@"No fileName: %@",_fileName);
|
|
};
|
|
[filepath setValue:_fileName
|
|
inComponent:_component];
|
|
[data setValue:_data
|
|
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
|
|
|