X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fparamhandling.c;h=c3c8490af75b8381db8a01823a5937b7688cd9c9;hb=6984213c936384e82cca051f017f0cacda0cd066;hp=948265f3a48b12e74c7f1615d239941f04092533;hpb=f5c1330914acc193f96892efc191a32ee537dfb5;p=citadel.git

diff --git a/webcit/paramhandling.c b/webcit/paramhandling.c
index 948265f3a..c3c8490af 100644
--- a/webcit/paramhandling.c
+++ b/webcit/paramhandling.c
@@ -41,7 +41,7 @@ void ParseURLParams(StrBuf *url)
 		}
 		keylen = aptr - up - 1; /* -1 -> '=' */
 		if(keylen > sizeof(u->url_key)) {
-			lprintf(1, "URLkey to long! [%s]", up);
+			syslog(1, "URLkey to long! [%s]", up);
 			continue;
 		}
 
@@ -49,19 +49,19 @@ void ParseURLParams(StrBuf *url)
 		memcpy(u->url_key, up, keylen);
 		u->url_key[keylen] = '\0';
 		if (keylen < 0) {
-			lprintf(1, "URLkey to long! [%s]", up);
+			syslog(1, "URLkey to long! [%s]", up);
 			free(u);
 			continue;
 		}
 		
-		if (strncmp(u->url_key, HKEY("__")) != 0)
+		if (strncmp(u->url_key, "__", 2) != 0)
 		{
 			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);
 #ifdef DEBUG_URLSTRINGS
-			lprintf(9, "%s = [%ld]  %s\n", 
+			syslog(9, "%s = [%d]  %s\n", 
 				u->url_key, 
 				StrLength(u->url_data), 
 				ChrPtr(u->url_data)); 
@@ -71,7 +71,7 @@ void ParseURLParams(StrBuf *url)
 			len = bptr - aptr;
 			u->url_data = NewStrBufPlain(aptr, len);
 			StrBufUnescape(u->url_data, 1);
-			lprintf(1, "REJECTED because of __ is internal only: %s = [%ld]  %s\n", 
+			syslog(1, "REJECTED because of __ is internal only: %s = [%d]  %s\n", 
 				u->url_key, 
 				StrLength(u->url_data), 
 				ChrPtr(u->url_data)); 
@@ -308,7 +308,7 @@ void upload_handler(char *name, char *filename, char *partnum, char *disp,
 	long keylen;
 
 #ifdef DEBUG_URLSTRINGS
-	lprintf(9, "upload_handler() name=%s, type=%s, len=%d\n", name, cbtype, length);
+	syslog(9, "\033[31mupload_handler() name=%s, type=%s, len=%d\033[0m\n", name, cbtype, length);
 #endif
 	if (WCC->Hdr->urlstrings == NULL)
 		WCC->Hdr->urlstrings = NewHash(1, NULL);
@@ -320,12 +320,12 @@ void upload_handler(char *name, char *filename, char *partnum, char *disp,
 		keylen = safestrncpy(u->url_key, name, sizeof(u->url_key));
 		u->url_data = NewStrBufPlain(content, length);
 		
-		if (strncmp(u->url_key, HKEY("__")) != 0)
+		if (strncmp(u->url_key, "__", 2) != 0)
 		{
 			Put(WCC->Hdr->urlstrings, u->url_key, keylen, u, free_url);
 		}
 		else {
-			lprintf(1, "REJECTED because of __ is internal only: %s = [%ld]  %s\n", 
+			syslog(1, "REJECTED because of __ is internal only: %s = [%d]  %s\n", 
 				u->url_key, 
 				StrLength(u->url_data), 
 				ChrPtr(u->url_data)); 
@@ -333,20 +333,22 @@ void upload_handler(char *name, char *filename, char *partnum, char *disp,
 			free_url(u);
 		}
 #ifdef DEBUG_URLSTRINGS
-		lprintf(9, "Key: <%s> len: [%ld] Data: <%s>\n", 
+		syslog(9, "Key: <%s> len: [%d] Data: <%s>\n", 
 			u->url_key, 
 			StrLength(u->url_data), 
 			ChrPtr(u->url_data));
 #endif
 	}
 
-	/** Uploaded files */
+	/* Uploaded files */
 	if ( (length > 0) && (!IsEmptyStr(cbtype)) ) {
 		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));
+		safestrncpy(WCC->upload_content_type, cbtype, sizeof(WC->upload_content_type));
+#ifdef DEBUG_URLSTRINGS
+		syslog(9, "File: <%s> len: [%ld]\n", filename, length);
+#endif
 		
 	}
 
@@ -359,7 +361,7 @@ void PutBstr(const char *key, long keylen, StrBuf *Value)
 	urlcontent *u;
 
 	if(keylen > sizeof(u->url_key)) {
-		lprintf(1, "URLkey to long! [%s]", key);
+		syslog(1, "URLkey to long! [%s]", key);
 		FreeStrBuf(&Value);
 		return;
 	}
@@ -417,16 +419,16 @@ void diagnostics(void)
 {
 	output_headers(1, 1, 1, 0, 0, 0);
 	wc_printf("Session: %d<hr />\n", WC->wc_session);
-	wc_printf("Command: <br /><PRE>\n");
+	wc_printf("Command: <br><PRE>\n");
 /*	
 StrEscPuts(WC->UrlFragment1);
-	wc_printf("<br />\n");
+	wc_printf("<br>\n");
 	StrEscPuts(WC->UrlFragment2);
-	wc_printf("<br />\n");
+	wc_printf("<br>\n");
 	StrEscPuts(WC->UrlFragment3);
 */
 	wc_printf("</PRE><hr />\n");
-	wc_printf("Variables: <br /><PRE>\n");
+	wc_printf("Variables: <br><PRE>\n");
 	dump_vars();
 	wc_printf("</PRE><hr />\n");
 	wDumpContent(1);