* add a leading '?'

[citadel.git] / webcit / paramhandling.c

diff --git a/webcit/paramhandling.c b/webcit/paramhandling.c
index bb7367fdbd3b6dd449bdf84548ee81c705c792b2..d1edfeb066270be3420b1f523e5479da8ebc17e4 100644 (file)
--- a/webcit/paramhandling.c
+++ b/webcit/paramhandling.c
@@ -1,5 +1,5 @@
 /*
- * $Id: paramhandling.c 6808 2008-12-11 00:00:36Z dothebart $
+ * $Id$
  *
  * parse urlparts and post data
  */
@@ -96,7 +96,7 @@ void dump_vars(void)
        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));
        }
 }
 
@@ -292,12 +292,13 @@ void upload_handler(char *name, char *filename, char *partnum, char *disp,
                        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->Hdr->urlstrings == NULL)
-               WC->Hdr->urlstrings = NewHash(1, NULL);
+       if (WCC->Hdr->urlstrings == NULL)
+               WCC->Hdr->urlstrings = NewHash(1, NULL);
 
        /* Form fields */
        if ( (length > 0) && (IsEmptyStr(cbtype)) ) {
@@ -306,7 +307,7 @@ void upload_handler(char *name, char *filename, char *partnum, char *disp,
                safestrncpy(u->url_key, name, sizeof(u->url_key));
                u->url_data = NewStrBufPlain(content, length);
                
-               Put(WC->Hdr->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, 
@@ -317,18 +318,12 @@ void upload_handler(char *name, char *filename, char *partnum, char *disp,
 
        /** 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);
-               }
-               else {
-                       lprintf(3, "malloc() failed: %s\n", strerror(errno));
-               }
+               WCC->upload = NewStrBufPlain(content, length);
+               WCC->upload_length = length;
+               WCC->upload_filename = NewStrBufPlain(filename, -1);
+               safestrncpy(WCC->upload_content_type, cbtype,
+                           sizeof(WC->upload_content_type));
+               
        }
 
 }
@@ -357,11 +352,21 @@ 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;
+               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;
+               }
        }
 }
 
@@ -372,22 +377,34 @@ void tmplput_bstr(StrBuf *Target, WCTemplputParams *TP)
                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);
 }
 
@@ -395,22 +412,24 @@ StrEscPuts(WC->UrlFragment1);
 void tmplput_url_part(StrBuf *Target, WCTemplputParams *TP)
 {
        StrBuf *Name = NULL;
-       StrBuf *UrlBuf;
+       StrBuf *UrlBuf = NULL;
        wcsession *WCC = WC;
        
        if (WCC != NULL) {
-               if (TP->Tokens->Params[0]->lvalue == 0) {
-                       UrlBuf = NewStrBuf();
-                       if (WCC->Hdr->Handler != NULL)
-                               UrlBuf = Name = WCC->Hdr->Handler->Name;
+               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->ReqLine, 0, '/');
+                       StrBufExtract_token(UrlBuf, WCC->Hdr->HR.ReqLine, 0, '/');
                }
                else {
                        UrlBuf = NewStrBuf();
-                       StrBufExtract_token(UrlBuf, WCC->Hdr->ReqLine, 1, '/');
+                       StrBufExtract_token(UrlBuf, WCC->Hdr->HR.ReqLine, 1, '/');
                }
 
                if (UrlBuf == NULL)  {
@@ -426,11 +445,12 @@ void
 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, CTX_NONE);
-       RegisterNamespace("URLPART", 1, 2, tmplput_url_part, 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);
 }
 
 
@@ -446,4 +466,5 @@ SessionDetachModule_PARAMHANDLING
 (wcsession *sess)
 {
        DeleteHash(&sess->Hdr->urlstrings);
+       FreeStrBuf(&sess->upload_filename);
 }