/*
- * $Id$
+ * Copyright (c) 1996-2012 by the citadel.org team
+ *
+ * This program is open source software. You can redistribute it and/or
+ * modify it under the terms of the GNU General Public License, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*/
+
#include "webcit.h"
-#include "webserver.h"
+
+
+CtxType CTX_FILELIST = CTX_NONE;
+
+extern void output_static(const char* What);
extern char* static_dirs[];
/* -------------------------------------------------------------------------------- */
void tmplput_FILE_NAME(StrBuf *Target, WCTemplputParams *TP)
{
- FileListStruct *F = (FileListStruct*) CTX;
+ FileListStruct *F = (FileListStruct*) CTX(CTX_FILELIST);
StrBufAppendTemplate(Target, TP, F->Filename, 0);
}
void tmplput_FILE_SIZE(StrBuf *Target, WCTemplputParams *TP)
{
- FileListStruct *F = (FileListStruct*) CTX;
+ FileListStruct *F = (FileListStruct*) CTX(CTX_FILELIST);
StrBufAppendPrintf(Target, "%ld", F->FileSize);
}
void tmplput_FILEMIMETYPE(StrBuf *Target, WCTemplputParams *TP)
{
- FileListStruct *F = (FileListStruct*) CTX;
+ FileListStruct *F = (FileListStruct*) CTX(CTX_FILELIST);
StrBufAppendTemplate(Target, TP, F->MimeType, 0);
}
void tmplput_FILE_COMMENT(StrBuf *Target, WCTemplputParams *TP)
{
- FileListStruct *F = (FileListStruct*) CTX;
+ FileListStruct *F = (FileListStruct*) CTX(CTX_FILELIST);
StrBufAppendTemplate(Target, TP, F->Comment, 0);
}
int Conditional_FILE_ISPIC(StrBuf *Target, WCTemplputParams *TP)
{
- FileListStruct *F = (FileListStruct*) CTX;
+ FileListStruct *F = (FileListStruct*) CTX(CTX_FILELIST);
return F->IsPic;
}
int sequence = 0;
char buf[1024];
CompareFunc SortIt;
- int HavePic;
+ int HavePic = 0;
WCTemplputParams SubTP;
- memset(&TP, 0, sizeof(WCTemplputParams));
+ memset(&SubTP, 0, sizeof(WCTemplputParams));
serv_puts("RDIR");
serv_getln(buf, sizeof buf);
if (buf[0] != '1') return NULL;
}
Put(Files, SKEY(Entry->Filename), Entry, FreeFiles);
}
+ if (HavePic)
+ putbstr("__HAVE_PIC", NewStrBufPlain(HKEY("1")));
SubTP.Filter.ContextType = CTX_FILELIST;
SortIt = RetrieveSort(&SubTP, NULL, 0, HKEY("fileunsorted"), 0);
if (SortIt != NULL)
else
SortByPayload(Files, CompareFilelistBySequence);
FreeStrBuf(&Buf);
- svputlong("FILE:HAVEPICS", HavePic);
return Files;
}
FileName = GetIconFilename(MimeType, tlen);
if (FileName == NULL)
- snprintf (FileBuf, SIZ, "%s%s", static_dirs[0], "/diskette_24x.gif");
+ snprintf (FileBuf, SIZ, "%s%s", static_dirs[0], "/webcit_icons/essen/16x16/file.png");
else
snprintf (FileBuf, SIZ, "%s%s", static_dirs[3], FileName);
output_static(FileBuf);
if (GetServerStatus(Buf, NULL) == 2) {
StrBufCutLeft(Buf, 4);
bytes = StrBufExtract_long(Buf, 0, '|');
- if (!force_download) {
- StrBufExtract_token(ContentType, Buf, 3, '|');
- }
- read_server_binary(WCC->WBuf, bytes, Buf);
+ StrBufExtract_token(ContentType, Buf, 3, '|');
+
+ CheckGZipCompressionAllowed (SKEY(ContentType));
+ if (force_download)
+ FlushStrBuf(ContentType);
+
+ serv_read_binary_to_http(ContentType, bytes, 0, 0);
serv_puts("CLOS");
StrBuf_ServGetln(Buf);
- http_transmit_thing(ChrPtr(ContentType), 0);
} else {
StrBufCutLeft(Buf, 4);
hprintf("HTTP/1.1 404 %s\n", ChrPtr(Buf));
output_headers(0, 0, 0, 0, 0, 0);
hprintf("Content-Type: text/plain\r\n");
- wprintf(_("An error occurred while retrieving this file: %s\n"),
+ wc_printf(_("An error occurred while retrieving this file: %s\n"),
ChrPtr(Buf));
end_burst();
}
void delete_file(void)
{
const StrBuf *MimeType;
- StrBuf *Buf;
+ StrBuf *Line;
char buf[256];
safestrncpy(buf, bstr("file"), sizeof buf);
unescape_input(buf);
serv_printf("DELF %s", buf);
- Buf = NewStrBuf();
- StrBuf_ServGetln(Buf);
- GetServerStatus(Buf, NULL);
- StrBufCutLeft(Buf, 4);
- strcpy(WC->ImportantMessage, ChrPtr(Buf));
+
+ StrBuf_ServGetln(Line);
+ GetServerStatusMsg(Line, NULL, 1, 0);
+
MimeType = DoTemplate(HKEY("files"), NULL, &NoCtx);
http_transmit_thing(ChrPtr(MimeType), 0);
- FreeStrBuf(&Buf);
+ FreeStrBuf(&Line);
}
{
const StrBuf *RetMimeType;
const char *MimeType;
- char buf[1024];
+ StrBuf *Line;
long bytes_transmitted = 0;
long blocksize;
+ const StrBuf *Desc;
wcsession *WCC = WC; /* stack this for faster access (WC is a function) */
MimeType = GuessMimeType(ChrPtr(WCC->upload), WCC->upload_length);
- serv_printf("UOPN %s|%s|%s", WCC->upload_filename, MimeType, bstr("description"));
- serv_getln(buf, sizeof buf);
- if (buf[0] != '2')
- {
- strcpy(WCC->ImportantMessage, &buf[4]);
+
+ Desc = sbstr("description");
+
+ serv_printf("UOPN %s|%s|%s",
+ ChrPtr(WCC->upload_filename),
+ MimeType,
+ ChrPtr(Desc));
+ Line = NewStrBuf();
+ StrBuf_ServGetln(Line);
+ if (GetServerStatusMsg(Line, NULL, 1, 2) != 2) {
RetMimeType = DoTemplate(HKEY("files"), NULL, &NoCtx);
http_transmit_thing(ChrPtr(RetMimeType), 0);
+ FreeStrBuf(&Line);
return;
}
blocksize = (WCC->upload_length - bytes_transmitted);
}
serv_printf("WRIT %ld", blocksize);
- serv_getln(buf, sizeof buf);
- if (buf[0] == '7')
- {
- blocksize = atoi(&buf[4]);
+ StrBuf_ServGetln(Line);
+ if (GetServerStatusMsg(Line, NULL, 0, 0) == 7) {
+ blocksize = atoi(ChrPtr(Line) + 4);
serv_write(&ChrPtr(WCC->upload)[bytes_transmitted], blocksize);
bytes_transmitted += blocksize;
}
+ else
+ break;
}
serv_puts("UCLS 1");
- serv_getln(buf, sizeof buf);
- strcpy(WCC->ImportantMessage, &buf[4]);
+ StrBuf_ServGetln(Line);
+ GetServerStatusMsg(Line, NULL, 1, 0);
RetMimeType = DoTemplate(HKEY("files"), NULL, &NoCtx);
http_transmit_thing(ChrPtr(RetMimeType), 0);
+ FreeStrBuf(&Line);
}
serv_printf("OIMG %s|%s", bstr("name"), bstr("parm"));
StrBuf_ServGetln(Buf);
if (GetServerStatus(Buf, NULL) == 2) {
+ int rc;
StrBufCutLeft(Buf, 4);
bytes = StrBufExtract_long(Buf, 0, '|');
/** Read it from the server */
- if (read_server_binary(WCC->WBuf, bytes, Buf) > 0) {
- serv_puts("CLOS");
- StrBuf_ServGetln(Buf);
+ rc = serv_read_binary(WCC->WBuf, bytes, Buf);
+ serv_puts("CLOS");
+ StrBuf_ServGetln(Buf);
+ if (rc > 0) {
MimeType = GuessMimeType (ChrPtr(WCC->WBuf), StrLength(WCC->WBuf));
/** Write it to the browser */
if (!IsEmptyStr(MimeType))
{
+ CheckGZipCompressionAllowed (MimeType, strlen(MimeType));
http_transmit_thing(MimeType, 0);
FreeStrBuf(&Buf);
return;
}
}
/* hm... unknown mimetype? fallback to blank gif */
- }
+ }
+ else {
+ syslog(LOG_DEBUG, "OIMG failed: %s", ChrPtr(Buf));
+ }
/*
* Instead of an ugly 404, send a 1x1 transparent GIF
- * when there's no such image on the server.
+ * when there's no such image on the server display blank
*/
- StrBufPrintf (Buf, "%s%s", static_dirs[0], "/blank.gif");
- output_static(ChrPtr(Buf));
+ output_static(NULL);
FreeStrBuf(&Buf);
}
InitModule_DOWNLOAD
(void)
{
+ RegisterCTX(CTX_FILELIST);
RegisterIterator("ROOM:FILES", 0, NULL, LoadFileList,
NULL, DeleteHash, CTX_FILELIST, CTX_NONE,
RegisterNamespace("FILE:MIMETYPE", 0, 2, tmplput_FILEMIMETYPE, NULL, CTX_FILELIST);
RegisterNamespace("FILE:COMMENT", 0, 2, tmplput_FILE_COMMENT, NULL, CTX_FILELIST);
- RegisterConditional(HKEY("COND:FILE:ISPIC"), 0, Conditional_FILE_ISPIC, CTX_FILELIST);
+ RegisterConditional("COND:FILE:ISPIC", 0, Conditional_FILE_ISPIC, CTX_FILELIST);
WebcitAddUrlHandler(HKEY("image"), "", 0, output_image, ANONYMOUS);
WebcitAddUrlHandler(HKEY("display_mime_icon"), "", 0, display_mime_icon , ANONYMOUS);
projects / citadel.git / blobdiff