mirror of
https://github.com/gnustep/libs-gsweb.git
synced 2025-05-30 08:41:24 +00:00
2003-01-19 Manuel Guesdon <mguesdon@orange-concept.com>
* GSWeb/GSWApplication.m o removed unused +initialize * GSWeb/GSWDefaultAdaptorThread.m: o more information on "bad request first line" exception * GSWeb/GSWHTMLDynamicElement.m o in -initWithName:attributeAssociations:contentElements: add "" to association values because XML parser romove them. o added -computeActionStringWithActionClassAssociation: directActionNameAssociation:inContext: o added -computeQueryDictionaryWithActionClassAssociation: directActionNameAssociation:queryDictionaryAssociation: otherQueryAssociations:inContext: * GSWeb/GSWResponse.m: o don't append debugcomment if !GSDebugSet(@"debugComments") o fixed bug in appendContentString: in NSAssert3 params o adedd -_appendTagAttribute:value:escapingHTMLAttributeValue: o added GSWResponse (GSWResponseRedirected) * GSWeb/GSWResponse.h: o added -forceFinalizeInContext o added GSWResponse (GSWResponseRedirected) * GSWeb/GSWTemplateParserXML.m: o only include comments if [GSWApplication includeCommentsInResponses] * GSWExtensions.framework/GSWLongResponsePage.m: o in -cancel call cancelPageForStatus: instead of cancelPage o declare private interface * GSWeb/GSWComponent.m: o don't output end of component commend if !DEBUG && !GSDebugSet(@"gswcomponents") o fixes in _generateResponseInContext: * GSWeb/GSWContext.[hm]: o added _userInfo to enable developper context specific temporary information storage o added -userInfo o added -_generateRelativeURLs o make -_generateCompleteURLs returning previous state. o added -directActionURLForActionNamed:queryDictionary:isSecure: o added -_directActionURLForActionNamed:queryDictionary:isSecure:url: o added -componentActionURLIsSecure: o modified -session o modified -_takeAwakeComponent: to not add already added component o implemented _takeAwakeComponentsFromArray; o fixed -_incrementContextID o added _session o fixes in -copyWithZone to keep mutable objects mutables. o added _requestContextID o added -_setRequestContextID: and -_requestContextID; * GSWeb/GSWHyperlink.[hm]: o added _secure o added binding validation tests o fixes in -appendToResponse:inContext: o handle correctly otherQueryAssociations (bindings starting with '?') * GSWeb/GSWConstants.[hm]: o added cidStore__Key for GSWHTMLURLValuedElement o added cidKey__Key for GSWHTMLURLValuedElement * GSWeb/GSWImage.[hm]: o added _width, _height * GSWeb/GSWHTMLURLValuedElement.[hm] o implemented -_appendCGIActionURLToResponse:inContext: o implemented -computeActionStringInContext: o implemented -computeQueryDictionaryInContext: o handle otherQueryAssociations (bindings starting with '?') o handle cidStore and cidKey * GSWeb/GSWRequest.[hm]: o added _context o changes for compilation warnings o added -sessionIDFromValuesOrCookieByLookingForCookieFirst: o added +_lookForIDsInCookiesFirst o rewrite form/uri/cookie values retrieving (for sessionID,...) o new use GSMimeParser for formData parsing * Doc/antlr.txt added * GSWeb/GSWPageDefParser.[hm] regenerated to handle (bindings starting with '?') * GSWeb/GSWPageDefParserTokenTypes.txt regenerated to handle (bindings starting with '?') * GSWeb/GSWPageDefParserTokenTypes.h regenerated to handle (bindings starting with '?') * GSWeb/GSWPageDefLexer.[hm] regenerated to handle (bindings starting with '?') * GSWeb/GSWUtils.[hm]: o added -extractObjectsForKeysWithPrefix:removePrefix: o fixed bug in HexStringToData o fixed bug in NSDictionary +dictionaryWithArray:onSelector:withObject: * GSWeb/GSWForm.[hm] o handle otherQueryAssociations (bindings starting with '?') o implemented -computeQueryDictionaryInContext: o implemented/fixed -_appendHiddenFieldsToResponse:inContext: o implemented -_appendCGIActionToResponse:inContext: o fix -appendGSWebObjectsAssociationsToResponse:inContext: for directAction o added -computeActionStringInContext: o fixed -invokeActionForRequest:inContext: to invoke action when to element is invoked * GSWeb/GSWDirectAction.m: o fixed -_initializeRequestSessionIDInContext: o added -sessionIDForRequest: * GSWeb/NSString+HTML.[hm]: o added -dictionaryWithSep1:withSep2:withOptionUnescape:forceArray: * GSWeb/NSString+Trimming.m: o fix in +stringUniqueIdWithLength: initialize random generator * GSWeb/GSWSession.[hm]: o added createSessionID which create better sessionID (uniq in time and larger to give better security) o fixes in _saveCurrentPage * GSWeb/GSWBundle.m: o fix compiler warning git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@15630 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
mguesdon
parent
378e9aaf92
commit
0746bae903
53 changed files with 2776 additions and 973 deletions
|
|
@ -1,12 +1,13 @@
|
|||
/** GSWHTMLDynamicElement.m - <title>GSWeb: Class GSWHTMLDynamicElement</title>
|
||||
|
||||
Copyright (C) 1999-2002 Free Software Foundation, Inc.
|
||||
Copyright (C) 1999-2003 Free Software Foundation, Inc.
|
||||
|
||||
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
|
||||
Date: Feb 1999
|
||||
|
||||
$Revision$
|
||||
$Date$
|
||||
$Id$
|
||||
|
||||
<abstract></abstract>
|
||||
|
||||
|
|
@ -29,7 +30,7 @@
|
|||
</license>
|
||||
**/
|
||||
|
||||
static char rcsId[] = "$Id$";
|
||||
static const char rcsId[]="$Id$";
|
||||
|
||||
#include <GSWeb/GSWeb.h>
|
||||
|
||||
|
|
@ -111,7 +112,11 @@ attributeAssociations:(NSDictionary*)attributeAssociations
|
|||
[htmlBareStrings addObject:[NSString stringWithString:@"="]];
|
||||
[elementsMap appendBytes:&ElementsMap_htmlBareString
|
||||
length:1];
|
||||
[htmlBareStrings addObject:[NSString stringWithFormat:@"%@",associationValue]];
|
||||
associationValue=[NSString stringWithFormat:@"%@",associationValue];
|
||||
// Parser remove "";
|
||||
if ([associationValue hasPrefix:@"\""])
|
||||
associationValue=[NSString stringWithFormat:@"\"%@\"",associationValue];
|
||||
[htmlBareStrings addObject:associationValue];
|
||||
[elementsMap appendBytes:&ElementsMap_htmlBareString
|
||||
length:1];
|
||||
}
|
||||
|
|
@ -738,3 +743,128 @@ attributeAssociations:(NSDictionary*)attributeAssociations
|
|||
@end
|
||||
|
||||
|
||||
//====================================================================
|
||||
//@implementation GSWHTMLDynamicElement (GSWHTMLDynamicElementD)
|
||||
// move it to GSWHTMLDynamicElement later !!!!
|
||||
|
||||
@implementation GSWDynamicElement (GSWHTMLDynamicElementD)
|
||||
//--------------------------------------------------------------------
|
||||
-(NSString*)computeActionStringWithActionClassAssociation:(GSWAssociation*)actionClass
|
||||
directActionNameAssociation:(GSWAssociation*)directActionName
|
||||
inContext:(GSWContext*)context
|
||||
{
|
||||
//OK
|
||||
GSWComponent* component=nil;
|
||||
id tmpDirectActionString=nil;
|
||||
id directActionNameValue=nil;
|
||||
id actionClassValue=nil;
|
||||
LOGObjectFnStart();
|
||||
component=[context component];
|
||||
if (directActionName)
|
||||
directActionNameValue=[directActionName valueInComponent:component];
|
||||
if (actionClass)
|
||||
actionClassValue=[actionClass valueInComponent:component];
|
||||
|
||||
if (actionClassValue)
|
||||
{
|
||||
if (directActionNameValue)
|
||||
tmpDirectActionString=[NSString stringWithFormat:@"%@/%@",
|
||||
actionClassValue,
|
||||
directActionNameValue];
|
||||
else
|
||||
tmpDirectActionString=actionClassValue;
|
||||
}
|
||||
else if (directActionNameValue)
|
||||
tmpDirectActionString=directActionNameValue;
|
||||
else
|
||||
{
|
||||
LOGSeriousError(@"No actionClass (for %@) and no directActionName (for %@)",
|
||||
actionClass,
|
||||
directActionName);
|
||||
};
|
||||
|
||||
NSDebugMLLog(@"gswdync",@"tmpDirectActionString=%@",tmpDirectActionString);
|
||||
LOGObjectFnStop();
|
||||
return tmpDirectActionString;
|
||||
};
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
-(NSDictionary*)computeQueryDictionaryWithActionClassAssociation:(GSWAssociation*)actionClass
|
||||
directActionNameAssociation:(GSWAssociation*)directActionName
|
||||
queryDictionaryAssociation:(GSWAssociation*)queryDictionary
|
||||
otherQueryAssociations:(NSDictionary*)otherQueryAssociations
|
||||
inContext:(GSWContext*)context
|
||||
{
|
||||
//OK
|
||||
NSMutableDictionary* finalQueryDictionary=nil;
|
||||
GSWComponent* component=nil;
|
||||
GSWSession* session=nil;
|
||||
NSString* sessionID=nil;
|
||||
LOGObjectFnStart();
|
||||
|
||||
NSDebugMLLog(@"gswdync",@"actionClass=%@",actionClass);
|
||||
NSDebugMLLog(@"gswdync",@"directActionName=%@",directActionName);
|
||||
NSDebugMLLog(@"gswdync",@"queryDictionary=%@",queryDictionary);
|
||||
NSDebugMLLog(@"gswdync",@"otherQueryAssociations=%@",otherQueryAssociations);
|
||||
|
||||
component=[context component];
|
||||
session=[context existingSession];
|
||||
NSDebugMLog(@"session=%@",session);
|
||||
|
||||
if (queryDictionary)
|
||||
{
|
||||
NSDictionary* queryDictionaryValue=[queryDictionary valueInComponent:component];
|
||||
if (queryDictionaryValue)
|
||||
{
|
||||
if ([queryDictionaryValue isKindOfClass:[NSMutableDictionary class]])
|
||||
finalQueryDictionary=(NSMutableDictionary*)queryDictionaryValue;
|
||||
else
|
||||
{
|
||||
NSAssert3([queryDictionaryValue isKindOfClass:[NSDictionary class]],
|
||||
@"queryDictionary value is not a dictionary but a %@. association was: %@. queryDictionaryValue is:",
|
||||
[queryDictionaryValue class],
|
||||
queryDictionary,
|
||||
queryDictionaryValue);
|
||||
finalQueryDictionary=[[queryDictionaryValue mutableCopy] autorelease];
|
||||
};
|
||||
};
|
||||
};
|
||||
if (!finalQueryDictionary)
|
||||
finalQueryDictionary=(NSMutableDictionary*)[NSMutableDictionary dictionary];
|
||||
|
||||
if (session)
|
||||
sessionID=[session sessionID];
|
||||
NSDebugMLog(@"sessionID=%@",sessionID);
|
||||
/*
|
||||
in GSWHyperlink, it was
|
||||
if (!_action && !_pageName
|
||||
&& (WOStrictFlag || (!WOStrictFlag && !_redirectURL))) //??
|
||||
*/
|
||||
if(sessionID
|
||||
&& (directActionName || actionClass)
|
||||
&& (!session || ![session storesIDsInCookies] || [session storesIDsInURLs]))
|
||||
[finalQueryDictionary setObject:sessionID
|
||||
forKey:GSWKey_SessionID[GSWebNamingConv]];
|
||||
|
||||
if (otherQueryAssociations)
|
||||
{
|
||||
NSEnumerator *enumerator = [otherQueryAssociations keyEnumerator];
|
||||
id associationKey=nil;
|
||||
while ((associationKey = [enumerator nextObject]))
|
||||
{
|
||||
id association = [otherQueryAssociations valueForKey:associationKey];
|
||||
id associationValue=[association valueInComponent:component];
|
||||
NSDebugMLLog(@"gswdync",@"associationKey=%@",associationKey);
|
||||
NSDebugMLLog(@"gswdync",@"association=%@",association);
|
||||
NSDebugMLLog(@"gswdync",@"associationValue=%@",associationValue);
|
||||
if (!associationValue)
|
||||
associationValue=[NSString string];
|
||||
[finalQueryDictionary setObject:associationValue
|
||||
forKey:associationKey];
|
||||
};
|
||||
};
|
||||
|
||||
LOGObjectFnStop();
|
||||
return finalQueryDictionary;
|
||||
};
|
||||
@end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue