const char *aptr, *bptr, *eptr, *up;
int len, keylen;
urlcontent *u;
- struct wcsession *WCC = WC;
+ wcsession *WCC = WC;
- if (WCC->urlstrings == NULL)
- WCC->urlstrings = NewHash(1, NULL);
+ if (WCC->Hdr->urlstrings == NULL)
+ WCC->Hdr->urlstrings = NewHash(1, NULL);
eptr = ChrPtr(url) + StrLength(url);
up = ChrPtr(url);
while ((up < eptr) && (!IsEmptyStr(up))) {
continue;
}
- Put(WCC->urlstrings, u->url_key, keylen, u, free_url);
+ Put(WCC->Hdr->urlstrings, u->url_key, keylen, u, free_url);
len = bptr - aptr;
u->url_data = NewStrBufPlain(aptr, len);
StrBufUnescape(u->url_data, 1);
*/
void free_urls(void)
{
- DeleteHash(&WC->urlstrings);
+ DeleteHash(&WC->Hdr->urlstrings);
}
/*
void dump_vars(void)
{
- struct wcsession *WCC = WC;
+ wcsession *WCC = WC;
urlcontent *u;
void *U;
long HKLen;
const char *HKey;
HashPos *Cursor;
- Cursor = GetNewHashPos (WCC->urlstrings, 0);
- while (GetNextHashPos(WCC->urlstrings, Cursor, &HKLen, &HKey, &U)) {
+ 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));
}
{
void *U;
- if ((WC->urlstrings != NULL) &&
- GetHash(WC->urlstrings, key, keylen, &U)) {
+ if ((WC->Hdr->urlstrings != NULL) &&
+ GetHash(WC->Hdr->urlstrings, key, keylen, &U)) {
*len = StrLength(((urlcontent *)U)->url_data);
return ChrPtr(((urlcontent *)U)->url_data);
}
{
void *U;
- if ((WC->urlstrings != NULL) &&
- GetHash(WC->urlstrings, key, strlen (key), &U)){
+ if ((WC->Hdr->urlstrings != NULL) &&
+ GetHash(WC->Hdr->urlstrings, key, strlen (key), &U)){
*len = StrLength(((urlcontent *)U)->url_data);
return ChrPtr(((urlcontent *)U)->url_data);
}
{
void *U;
- if ((WC->urlstrings != NULL) &&
- GetHash(WC->urlstrings, key, strlen (key), &U))
+ if ((WC->Hdr->urlstrings != NULL) &&
+ GetHash(WC->Hdr->urlstrings, key, strlen (key), &U))
return ChrPtr(((urlcontent *)U)->url_data);
else
return ("");
{
void *U;
- if ((WC->urlstrings != NULL) &&
- GetHash(WC->urlstrings, key, keylen, &U))
+ if ((WC->Hdr->urlstrings != NULL) &&
+ GetHash(WC->Hdr->urlstrings, key, keylen, &U))
return ChrPtr(((urlcontent *)U)->url_data);
else
return ("");
{
void *U;
- if ((WC->urlstrings != NULL) &&
- GetHash(WC->urlstrings, key, strlen (key), &U))
+ if ((WC->Hdr->urlstrings != NULL) &&
+ GetHash(WC->Hdr->urlstrings, key, strlen (key), &U))
return ((urlcontent *)U)->url_data;
else
return NULL;
{
void *U;
- if ((WC->urlstrings != NULL) &&
- GetHash(WC->urlstrings, key, keylen, &U))
+ if ((WC->Hdr->urlstrings != NULL) &&
+ GetHash(WC->Hdr->urlstrings, key, keylen, &U))
return ((urlcontent *)U)->url_data;
else
return NULL;
{
void *U;
- if ((WC->urlstrings != NULL) &&
- GetHash(WC->urlstrings, key, keylen, &U))
+ if ((WC->Hdr->urlstrings != NULL) &&
+ GetHash(WC->Hdr->urlstrings, key, keylen, &U))
return StrTol(((urlcontent *)U)->url_data);
else
return (0);
{
void *U;
- if ((WC->urlstrings != NULL) &&
- GetHash(WC->urlstrings, key, strlen(key), &U))
+ if ((WC->Hdr->urlstrings != NULL) &&
+ GetHash(WC->Hdr->urlstrings, key, strlen(key), &U))
return StrTol(((urlcontent *)U)->url_data);
else
return (0);
{
void *U;
- if ((WC->urlstrings != NULL) &&
- GetHash(WC->urlstrings, key, keylen, &U))
+ if ((WC->Hdr->urlstrings != NULL) &&
+ GetHash(WC->Hdr->urlstrings, key, keylen, &U))
return StrTol(((urlcontent *)U)->url_data);
else
return (0);
{
void *U;
- if ((WC->urlstrings != NULL) &&
- GetHash(WC->urlstrings, key, strlen(key), &U))
+ if ((WC->Hdr->urlstrings != NULL) &&
+ GetHash(WC->Hdr->urlstrings, key, strlen(key), &U))
return StrToi(((urlcontent *)U)->url_data);
else
return (0);
{
void *U;
- if ((WC->urlstrings != NULL) &&
- GetHash(WC->urlstrings, key, keylen, &U))
+ if ((WC->Hdr->urlstrings != NULL) &&
+ GetHash(WC->Hdr->urlstrings, key, keylen, &U))
return (StrLength(((urlcontent *)U)->url_data) != 0);
else
return (0);
{
void *U;
- if ((WC->urlstrings != NULL) &&
- GetHash(WC->urlstrings, key, strlen(key), &U))
+ if ((WC->Hdr->urlstrings != NULL) &&
+ GetHash(WC->Hdr->urlstrings, key, strlen(key), &U))
return (StrLength(((urlcontent *)U)->url_data) != 0);
else
return (0);
{
void *U;
- if ((WC->urlstrings != NULL) &&
- GetHash(WC->urlstrings, key, keylen, &U))
+ if ((WC->Hdr->urlstrings != NULL) &&
+ GetHash(WC->Hdr->urlstrings, key, keylen, &U))
return strcmp( ChrPtr(((urlcontent *)U)->url_data), "yes") == 0;
else
return (0);
{
void *U;
- if ((WC->urlstrings != NULL) &&
- GetHash(WC->urlstrings, key, strlen(key), &U))
+ if ((WC->Hdr->urlstrings != NULL) &&
+ GetHash(WC->Hdr->urlstrings, key, strlen(key), &U))
return strcmp( ChrPtr(((urlcontent *)U)->url_data), "yes") == 0;
else
return (0);
void *content, char *cbtype, char *cbcharset,
size_t length, char *encoding, char *cbid, void *userdata)
{
+ wcsession *WCC = WC;
urlcontent *u;
#ifdef DEBUG_URLSTRINGS
lprintf(9, "upload_handler() name=%s, type=%s, len=%d\n", name, cbtype, length);
#endif
- if (WC->urlstrings == NULL)
- WC->urlstrings = NewHash(1, NULL);
+ if (WCC->Hdr->urlstrings == NULL)
+ WCC->Hdr->urlstrings = NewHash(1, NULL);
/* Form fields */
if ( (length > 0) && (IsEmptyStr(cbtype)) ) {
safestrncpy(u->url_key, name, sizeof(u->url_key));
u->url_data = NewStrBufPlain(content, length);
- Put(WC->urlstrings, u->url_key, strlen(u->url_key), u, free_url);
+ Put(WCC->Hdr->urlstrings, u->url_key, strlen(u->url_key), u, free_url);
#ifdef DEBUG_URLSTRINGS
lprintf(9, "Key: <%s> len: [%ld] Data: <%s>\n",
u->url_key,
/** Uploaded files */
if ( (length > 0) && (!IsEmptyStr(cbtype)) ) {
- WC->upload = malloc(length);
- if (WC->upload != NULL) {
- WC->upload_length = length;
- safestrncpy(WC->upload_filename, filename,
- sizeof(WC->upload_filename));
- safestrncpy(WC->upload_content_type, cbtype,
- sizeof(WC->upload_content_type));
- memcpy(WC->upload, content, length);
+ WCC->upload = NewStrBufPlain(content, length);
+ WCC->upload_length = length;
+ safestrncpy(WCC->upload_filename, filename,
+ sizeof(WC->upload_filename));
+ safestrncpy(WCC->upload_content_type, cbtype,
+ sizeof(WC->upload_content_type));
+
+ }
+
+}
+
+
+
+void PutBstr(const char *key, long keylen, StrBuf *Value)
+{
+ urlcontent *u;
+
+ if(keylen > sizeof(u->url_key)) {
+ lprintf(1, "URLkey to long! [%s]", key);
+ FreeStrBuf(&Value);
+ return;
+ }
+ u = (urlcontent*)malloc(sizeof(urlcontent));
+ memcpy(u->url_key, key, keylen + 1);
+ u->url_data = Value;
+ Put(WC->Hdr->urlstrings, u->url_key, keylen, u, free_url);
+}
+
+
+
+int ConditionalBstr(StrBuf *Target, WCTemplputParams *TP)
+{
+ 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;
+ }
+}
+
+void tmplput_bstr(StrBuf *Target, WCTemplputParams *TP)
+{
+ const StrBuf *Buf = SBstr(TKEY(0));
+ if (Buf != NULL)
+ 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");
+/*
+StrEscPuts(WC->UrlFragment1);
+ wprintf("<br />\n");
+ StrEscPuts(WC->UrlFragment2);
+ wprintf("<br />\n");
+ StrEscPuts(WC->UrlFragment3);
+*/
+ wprintf("</PRE><hr />\n");
+ wprintf("Variables: <br /><PRE>\n");
+ dump_vars();
+ wprintf("</PRE><hr />\n");
+ wDumpContent(1);
+}
+
+
+void tmplput_url_part(StrBuf *Target, WCTemplputParams *TP)
+{
+ StrBuf *Name = NULL;
+ StrBuf *UrlBuf = NULL;
+ wcsession *WCC = WC;
+
+ if (WCC != NULL) {
+ if (TP->Tokens->Params[0]->lvalue == 0) {
+ if (WCC->Hdr->HR.Handler != NULL)
+ UrlBuf = Name = WCC->Hdr->HR.Handler->Name;
+ }
+ else if (TP->Tokens->Params[0]->lvalue == 1) {
+ UrlBuf = NewStrBuf();
+ StrBufExtract_token(UrlBuf, WCC->Hdr->HR.ReqLine, 0, '/');
}
else {
- lprintf(3, "malloc() failed: %s\n", strerror(errno));
+ UrlBuf = NewStrBuf();
+ StrBufExtract_token(UrlBuf, WCC->Hdr->HR.ReqLine, 1, '/');
}
+
+ if (UrlBuf == NULL) {
+ LogTemplateError(Target, "urlbuf", ERR_PARM1, TP, "not set.");
+ }
+ StrBufAppendTemplate(Target, TP, UrlBuf, 2);
+ if (Name == NULL) FreeStrBuf(&UrlBuf);
}
+}
+
+void
+InitModule_PARAMHANDLING
+(void)
+{
+ WebcitAddUrlHandler(HKEY("diagnostics"), diagnostics, NEED_URL);
+
+ RegisterConditional(HKEY("COND:BSTR"), 1, ConditionalBstr, CTX_NONE);
+ RegisterNamespace("BSTR", 1, 2, tmplput_bstr, CTX_NONE);
+ RegisterNamespace("URLPART", 1, 2, tmplput_url_part, CTX_NONE);
+}
+
+
+void
+SessionAttachModule_PARAMHANDLING
+(wcsession *sess)
+{
+ sess->Hdr->urlstrings = NewHash(1,NULL);
+}
+
+void
+SessionDetachModule_PARAMHANDLING
+(wcsession *sess)
+{
+ DeleteHash(&sess->Hdr->urlstrings);
}