const char *HKey;
HashPos *Cursor;
- Cursor = GetNewHashPos ();
+ Cursor = GetNewHashPos (WCC->urlstrings, 0);
while (GetNextHashPos(WCC->urlstrings, Cursor, &HKLen, &HKey, &U)) {
u = (urlcontent*) U;
wprintf("%38s = %s\n", u->url_key, ChrPtr(u->url_data));
}
-void put_trailing_javascript(void) {
- wprintf("%s", ChrPtr(WC->trailing_javascript));
+void tmplput_trailing_javascript(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *vContext, int ContextType)
+{
+ struct wcsession *WCC = WC;
+
+ if (WCC != NULL)
+ StrBufAppendTemplate(Target, nArgs, Tokens, vContext, ContextType,
+ WCC->trailing_javascript, 0);
}
/*
{
if (print_standard_html_footer) {
wprintf("</div> <!-- end of 'content' div -->\n");
- svcallback("TRAILING_JAVASCRIPT", put_trailing_javascript);
do_template("trailing", NULL);
}
if (do_htmlhead) {
begin_burst();
- if (!access("static.local/webcit.css", R_OK)) {
- svprintf(HKEY("CSSLOCAL"), WCS_STRING,
- "<link href=\"static.local/webcit.css\" rel=\"stylesheet\" type=\"text/css\">"
- );
- }
do_template("head", NULL);
}
void http_transmit_thing(const char *content_type,
int is_static) {
+#ifndef TECH_PREVIEW
lprintf(9, "http_transmit_thing(%s)%s\n",
content_type,
(is_static ? " (static)" : "")
);
+#endif
output_headers(0, 0, 0, 0, 0, is_static);
hprintf("Content-type: %s\r\n"
long i;
svput("BOXTITLE", WCS_STRING, Title);
- do_template("beginbox", NULL);
+ do_template("beginboxx", NULL);
wprintf("<ul class=\"%s\">", Class);
close(fd);
+#ifndef TECH_PREVIEW
lprintf(9, "output_static('%s') %s\n", what, content_type);
+#endif
http_transmit_thing(content_type, 1);
}
if (yesbstr("force_close_session")) {
const char *contentType;
struct wcsession *WCC = WC;
- msgnum = StrTol(WCC->UrlFragment1);
+ msgnum = StrTol(WCC->UrlFragment2);
vcard = load_mimepart(msgnum,"1");
v = vcard_load(vcard);
* filename Fake filename to give
* force_download Nonzero to force set the Content-Type: header to "application/octet-stream"
*/
-void postpart(const char *partnum, const char *filename, int force_download)
+void postpart(StrBuf *partnum, StrBuf *filename, int force_download)
{
+ void *vPart;
char content_type[256];
- int num = atoi(partnum);
- struct wc_attachment *part = WC->first_attachment;
-
- while(num && part) {
- num--;
- part=part->next;
- }
+ wc_attachment *part;
- if (part) {
+ if (GetHash(WC->attachments, SKEY(partnum), &vPart) &&
+ (vPart != NULL)) {
+ part = (wc_attachment*) vPart;
if (force_download) {
strcpy(content_type, "application/octet-stream");
}
else {
- strncpy(content_type, part->content_type, sizeof content_type);
+ strncpy(content_type, ChrPtr(part->content_type), sizeof content_type);
}
output_headers(0, 0, 0, 0, 0, 0);
StrBufAppendBufPlain(WC->WBuf, part->data, part->length, 0);
http_transmit_thing(content_type, 0);
} else {
- hprintf("HTTP/1.1 404 %s\n",partnum);
+ hprintf("HTTP/1.1 404 %s\n", ChrPtr(partnum));
output_headers(0, 0, 0, 0, 0, 0);
hprintf("Content-Type: text/plain\r\n");
- wprintf(_("An error occurred while retrieving this part: %s/%s\n"), partnum, filename);
+ wprintf(_("An error occurred while retrieving this part: %s/%s\n"),
+ ChrPtr(partnum), ChrPtr(filename));
end_burst();
}
}
WCC->UrlFragment1 = NewStrBuf();
if (WCC->UrlFragment2 == NULL)
WCC->UrlFragment2 = NewStrBuf();
- StrBufPrintf(WCC->UrlFragment1, "%s", index[1]);
- StrBufPrintf(WCC->UrlFragment2, "%s", index[2]);
+ 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();
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();
}
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(ChrPtr(WC->UrlFragment1),
- ChrPtr(WC->UrlFragment2),
+ postpart(WC->UrlFragment2,
+ WC->UrlFragment3,
0);
}
void download_postpart(void) {
- postpart(ChrPtr(WC->UrlFragment1),
- ChrPtr(WC->UrlFragment2),
+ postpart(WC->UrlFragment2,
+ WC->UrlFragment3,
1);
}
struct wcsession *WCC = WC;
if (WCC != NULL) {
+/*
+ StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType,
+ WCC->ImportantMessage, 0);
+*/
StrEscAppend(Target, NULL, WCC->ImportantMessage, 0, 0);
- WCC->ImportantMessage[0] = '\0';
+ WCC->ImportantMessage[0] = '\0';
}
}
int ConditionalBstr(WCTemplateToken *Tokens, void *Context, int ContextType)
{
- if(Tokens->nParameters == 1)
- return HaveBstr(Tokens->Params[0]->Start,
- Tokens->Params[0]->len);
+ if(Tokens->nParameters == 3)
+ return HaveBstr(Tokens->Params[2]->Start,
+ Tokens->Params[2]->len);
else
- return strcmp(Bstr(Tokens->Params[0]->Start,
- Tokens->Params[0]->len),
- Tokens->Params[1]->Start) == 0;
+ return strcmp(Bstr(Tokens->Params[2]->Start,
+ Tokens->Params[2]->len),
+ Tokens->Params[3]->Start) == 0;
}
void tmplput_bstr(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
{
+ const StrBuf *Buf = SBstr(Tokens->Params[0]->Start,
+ Tokens->Params[0]->len);
+ if (Buf != NULL)
+ StrBufAppendTemplate(Target, nArgs, Tokens,
+ Context, ContextType,
+ Buf, 1);
+}
+
+
+void tmplput_csslocal(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+ extern StrBuf *csslocal;
StrBufAppendBuf(Target,
- SBstr(Tokens->Params[0]->Start,
- Tokens->Params[0]->len), 0);
+ csslocal, 0);
+}
+
+void tmplput_url_part(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+ StrBuf *UrlBuf;
+ struct wcsession *WCC = WC;
+
+ if (WCC != NULL) {
+ if (Tokens->Params[0]->lvalue == 0)
+ UrlBuf = WCC->UrlFragment1;
+ else if (Tokens->Params[0]->lvalue == 1)
+ UrlBuf = WCC->UrlFragment2;
+ else
+ UrlBuf = WCC->UrlFragment3;
+
+ StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType,
+ UrlBuf, 1);
+ }
}
+
+
+
void
InitModule_WEBCIT
(void)
RegisterConditional(HKEY("COND:IMPMSG"), 0, ConditionalImportantMesage, CTX_NONE);
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("CSSLOCAL", 0, 0, tmplput_csslocal, CTX_NONE);
RegisterNamespace("IMPORTANTMESSAGE", 0, 0, tmplput_importantmessage, CTX_NONE);
RegisterNamespace("OFFERSTARTPAGE", 0, 0, offer_start_page, CTX_NONE);
+ RegisterNamespace("TRAILING_JAVASCRIPT", 0, 0, tmplput_trailing_javascript, CTX_NONE);
}
projects / citadel.git / blobdiff