Remove $Id$ tags from most of webcit

[citadel.git] / webcit / downloads.c

diff --git a/webcit/downloads.c b/webcit/downloads.c
index 8544aabb9db93a88d75e50fd00595fadb94e9799..5701caeb834041af93c5a8182dfa936eece15752 100644 (file)
--- a/webcit/downloads.c
+++ b/webcit/downloads.c
@@ -1,5 +1,19 @@
 /*
- * $Id$
+ * Copyright (c) 1996-2010 by the citadel.org team
+ *
+ * This program is free 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"
@@ -217,7 +231,6 @@ HashList* LoadFileList(StrBuf *Target, WCTemplputParams *TP)
        else 
                SortByPayload(Files, CompareFilelistBySequence);
        FreeStrBuf(&Buf);
-       svputlong("FILE:HAVEPICS", HavePic);
        return Files;
 }
 
@@ -259,7 +272,7 @@ void download_file(void)
                if (!force_download) {
                        StrBufExtract_token(ContentType, Buf, 3, '|');
                }
-               read_server_binary(WCC->WBuf, bytes, Buf);
+               serv_read_binary(WCC->WBuf, bytes, Buf);
                serv_puts("CLOS");
                StrBuf_ServGetln(Buf);
                http_transmit_thing(ChrPtr(ContentType), 0);
@@ -306,10 +319,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')
        {
@@ -360,15 +381,17 @@ void output_image(void)
        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))