X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebcit.c;h=d6aa8a0d2d26b8f9b7d152b2de6201a14ab8f50e;hb=749c2a7e25006217b60af84c3854760454f1f013;hp=1bd1e1ee582eaeb17f58b3614d9d4f847961cb62;hpb=0e27e9ae1d4e7f91a4207de6e1d3fa43d2148fd9;p=citadel.git diff --git a/webcit/webcit.c b/webcit/webcit.c index 1bd1e1ee5..d6aa8a0d2 100644 --- a/webcit/webcit.c +++ b/webcit/webcit.c @@ -927,7 +927,7 @@ void display_vcard_photo_img(void) const char *contentType; struct wcsession *WCC = WC; - msgnum = StrTol(WCC->UrlFragment1); + msgnum = StrTol(WCC->UrlFragment2); vcard = load_mimepart(msgnum,"1"); v = vcard_load(vcard); @@ -1811,8 +1811,11 @@ void session_loop(HashList *HTTPHeaders, StrBuf *ReqLine, StrBuf *request_method WCC->UrlFragment1 = NewStrBuf(); if (WCC->UrlFragment2 == NULL) WCC->UrlFragment2 = NewStrBuf(); + if (WCC->UrlFragment3 == NULL) + WCC->UrlFragment3 = NewStrBuf(); StrBufPrintf(WCC->UrlFragment1, "%s", index[0]); StrBufPrintf(WCC->UrlFragment2, "%s", index[1]); + StrBufPrintf(WCC->UrlFragment3, "%s", index[2]); } if ((Handler->Flags & AJAX) != 0) begin_ajax_response(); @@ -1864,6 +1867,8 @@ void diagnostics(void) StrEscPuts(WC->UrlFragment1); wprintf("
\n"); StrEscPuts(WC->UrlFragment2); + wprintf("
\n"); + StrEscPuts(WC->UrlFragment3); wprintf("
\n"); wprintf("Variables:
\n");
 	dump_vars();
@@ -1872,26 +1877,26 @@ void diagnostics(void)
 }
 
 void view_mimepart(void) {
-	mimepart(ChrPtr(WC->UrlFragment1),
-		 ChrPtr(WC->UrlFragment2),
+	mimepart(ChrPtr(WC->UrlFragment2),
+		 ChrPtr(WC->UrlFragment3),
 		 0);
 }
 
 void download_mimepart(void) {
-	mimepart(ChrPtr(WC->UrlFragment1),
-		 ChrPtr(WC->UrlFragment2),
+	mimepart(ChrPtr(WC->UrlFragment2),
+		 ChrPtr(WC->UrlFragment3),
 		 1);
 }
 
 void view_postpart(void) {
-	postpart(WC->UrlFragment1,
-		 WC->UrlFragment2,
+	postpart(WC->UrlFragment2,
+		 WC->UrlFragment3,
 		 0);
 }
 
 void download_postpart(void) {
-	postpart(WC->UrlFragment1,
-		 WC->UrlFragment2,
+	postpart(WC->UrlFragment2,
+		 WC->UrlFragment3,
 		 1);
 }
 
@@ -1956,8 +1961,10 @@ void tmplput_url_part(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *
 	if (WCC != NULL) {
 		if (Tokens->Params[0]->lvalue == 0)
 			UrlBuf = WCC->UrlFragment1;
-		else
+		else if (Tokens->Params[0]->lvalue == 1)
 			UrlBuf = WCC->UrlFragment2;
+		else
+			UrlBuf = WCC->UrlFragment3;
 
 		StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType,
 				     UrlBuf, 1);