cleanup webcit.h; utils.c, remove unneeded stuff

[citadel.git] / webcit / downloads.c

diff --git a/webcit/downloads.c b/webcit/downloads.c
index 137a6389dafb0e3951dc607c295d017ed9d3006c..fc06c379bbf047a25bfaa93e0262f34cc86ccefd 100644 (file)
--- a/webcit/downloads.c
+++ b/webcit/downloads.c
@@ -1,9 +1,26 @@
 /*
- * $Id$
+ * Copyright (c) 1996-2010 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 as
+ * published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
+
 #include "webcit.h"
 #include "webserver.h"
 
+extern void output_static(const char* What);
+
 extern char* static_dirs[];
 
 typedef struct _FileListStruct {
@@ -217,7 +234,6 @@ HashList* LoadFileList(StrBuf *Target, WCTemplputParams *TP)
        else 
                SortByPayload(Files, CompareFilelistBySequence);
        FreeStrBuf(&Buf);
-       svputlong("FILE:HAVEPICS", HavePic);
        return Files;
 }
 
@@ -232,7 +248,7 @@ void display_mime_icon(void)
        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);
@@ -306,10 +322,18 @@ void upload_file(void)
        char buf[1024];
        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"));
+
+               Desc = sbstr("description");
+
+       serv_printf("UOPN %s|%s|%s", 
+                   ChrPtr(WCC->upload_filename), 
+                   MimeType, 
+                   ChrPtr(Desc));
+
        serv_getln(buf, sizeof buf);
        if (buf[0] != '2')
        {
@@ -388,7 +412,7 @@ void output_image(void)
         * Instead of an ugly 404, send a 1x1 transparent GIF
         * when there's no such image on the server.
         */
-       StrBufPrintf (Buf, "%s%s", static_dirs[0], "/blank.gif");
+       StrBufPrintf (Buf, "%s%s", static_dirs[0], "/webcit_icons/blank.gif");
        output_static(ChrPtr(Buf));
        FreeStrBuf(&Buf);
 }