/*
- * $Id: paramhandling.c 6808 2008-12-11 00:00:36Z dothebart $
+ * $Id$
*
* parse urlparts and post data
*/
Cursor = GetNewHashPos (WCC->Hdr->urlstrings, 0);
while (GetNextHashPos(WCC->Hdr->urlstrings, Cursor, &HKLen, &HKey, &U)) {
u = (urlcontent*) U;
- wprintf("%38s = %s\n", u->url_key, ChrPtr(u->url_data));
+ wc_printf("%38s = %s\n", u->url_key, ChrPtr(u->url_data));
}
}
if ( (length > 0) && (!IsEmptyStr(cbtype)) ) {
WCC->upload = NewStrBufPlain(content, length);
WCC->upload_length = length;
- safestrncpy(WCC->upload_filename, filename,
- sizeof(WC->upload_filename));
+ WCC->upload_filename = NewStrBufPlain(filename, -1);
safestrncpy(WCC->upload_content_type, cbtype,
sizeof(WC->upload_content_type));
if(TP->Tokens->nParameters == 3)
return HaveBstr(TKEY(2));
else {
- if (TP->Tokens->Params[3]->Type == TYPE_LONG)
- return LBstr(TKEY(2)) == TP->Tokens->Params[3]->lvalue;
- else
- return strcmp(Bstr(TKEY(2)),
- TP->Tokens->Params[3]->Start) == 0;
+ if (IS_NUMBER(TP->Tokens->Params[3]->Type))
+ {
+ return LBstr(TKEY(2)) ==
+ GetTemplateTokenNumber(Target,
+ TP,
+ 3,
+ 0);
+ }
+ else {
+ const char *pch;
+ long len;
+
+ GetTemplateTokenString (Target, TP, 3, &pch, &len);
+ return strcmp(Bstr(TKEY(2)), pch) == 0;
+ }
}
}
StrBufAppendTemplate(Target, TP, Buf, 1);
}
+
+void tmplput_bstrforward(StrBuf *Target, WCTemplputParams *TP)
+{
+ const StrBuf *Buf = SBstr(TKEY(0));
+ if (Buf != NULL) {
+ StrBufAppendBufPlain(Target, HKEY("?"), 0);
+ StrBufAppendBufPlain(Target, TKEY(0), 0);
+ StrBufAppendBufPlain(Target, HKEY("="), 0);
+ StrBufAppendTemplate(Target, TP, Buf, 1);
+ }
+}
+
void diagnostics(void)
{
output_headers(1, 1, 1, 0, 0, 0);
- wprintf("Session: %d<hr />\n", WC->wc_session);
- wprintf("Command: <br /><PRE>\n");
+ wc_printf("Session: %d<hr />\n", WC->wc_session);
+ wc_printf("Command: <br /><PRE>\n");
/*
StrEscPuts(WC->UrlFragment1);
- wprintf("<br />\n");
+ wc_printf("<br />\n");
StrEscPuts(WC->UrlFragment2);
- wprintf("<br />\n");
+ wc_printf("<br />\n");
StrEscPuts(WC->UrlFragment3);
*/
- wprintf("</PRE><hr />\n");
- wprintf("Variables: <br /><PRE>\n");
+ wc_printf("</PRE><hr />\n");
+ wc_printf("Variables: <br /><PRE>\n");
dump_vars();
- wprintf("</PRE><hr />\n");
+ wc_printf("</PRE><hr />\n");
wDumpContent(1);
}
wcsession *WCC = WC;
if (WCC != NULL) {
- if (TP->Tokens->Params[0]->lvalue == 0) {
+ long n;
+
+ n = GetTemplateTokenNumber(Target, TP, 0, 0);
+ if (n == 0) {
if (WCC->Hdr->HR.Handler != NULL)
UrlBuf = Name = WCC->Hdr->HR.Handler->Name;
}
- else if (TP->Tokens->Params[0]->lvalue == 1) {
+ else if (n == 1) {
UrlBuf = NewStrBuf();
StrBufExtract_token(UrlBuf, WCC->Hdr->HR.ReqLine, 0, '/');
}
InitModule_PARAMHANDLING
(void)
{
- WebcitAddUrlHandler(HKEY("diagnostics"), diagnostics, NEED_URL);
+ WebcitAddUrlHandler(HKEY("diagnostics"), "", 0, diagnostics, NEED_URL);
RegisterConditional(HKEY("COND:BSTR"), 1, ConditionalBstr, CTX_NONE);
RegisterNamespace("BSTR", 1, 2, tmplput_bstr, NULL, CTX_NONE);
+ RegisterNamespace("BSTR:FORWARD", 1, 2, tmplput_bstrforward, NULL, CTX_NONE);
RegisterNamespace("URLPART", 1, 2, tmplput_url_part, NULL, CTX_NONE);
}
(wcsession *sess)
{
DeleteHash(&sess->Hdr->urlstrings);
+ FreeStrBuf(&sess->upload_filename);
}