removed a bunch of blank comment lines

[citadel.git] / webcit / graphics.c

diff --git a/webcit/graphics.c b/webcit/graphics.c
index f798cc3e5bf1cb99e0eb70b7a499ebaa8cd2b78b..10e0dd4af9b1d3893768e4be6abe48773a80bee5 100644 (file)
--- a/webcit/graphics.c
+++ b/webcit/graphics.c
@@ -1,99 +1,98 @@
 /*
  * Handles HTTP upload of graphics files into the system.
  *
- * Copyright (c) 1996-2011 by the citadel.org team
+ * 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 as
- * published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
+ * 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.
- *
- * 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"
 
+extern void output_static(const char* What);
+
 void display_graphics_upload(char *filename)
 {
-       char buf[SIZ];
+       StrBuf *Line;
 
-       snprintf(buf, SIZ, "UIMG 0||%s", filename);
-       serv_puts(buf);
-       serv_getln(buf, sizeof buf);
-       if (buf[0] != '2') {
-               strcpy(WC->ImportantMessage, &buf[4]);
+       Line = NewStrBuf();
+       serv_printf("UIMG 0||%s", filename);
+       StrBuf_ServGetln(Line);
+       if (GetServerStatusMsg(Line, NULL, 1, 2) != 2) {
                display_main_menu();
                return;
        }
-       output_headers(1, 0, 0, 0, 1, 0);
-       do_template("files_graphicsupload");
-       end_burst();
+       else
+       {
+               output_headers(1, 0, 0, 0, 1, 0);
+               do_template("files_graphicsupload");
+               end_burst();
+       }
+       FreeStrBuf(&Line);
 }
 
 void do_graphics_upload(char *filename)
 {
+       StrBuf *Line;
        const char *MimeType;
        wcsession *WCC = WC;
-       char buf[SIZ];
        int bytes_remaining;
        int pos = 0;
        int thisblock;
        bytes_remaining = WCC->upload_length;
 
        if (havebstr("cancel_button")) {
-               strcpy(WC->ImportantMessage,
-                       _("Graphics upload has been cancelled."));
+               AppendImportantMessage(_("Graphics upload has been cancelled."), -1);
                display_main_menu();
                return;
        }
 
        if (WCC->upload_length == 0) {
-               strcpy(WC->ImportantMessage,
-                       _("You didn't upload a file."));
+               AppendImportantMessage(_("You didn't upload a file."), -1);
                display_main_menu();
                return;
        }
        
        MimeType = GuessMimeType(ChrPtr(WCC->upload), bytes_remaining);
-       snprintf(buf, SIZ, "UIMG 1|%s|%s", MimeType, filename);
-       serv_puts(buf);
+       serv_printf("UIMG 1|%s|%s", MimeType, filename);
 
-       serv_getln(buf, sizeof buf);
-       if (buf[0] != '2') {
-               strcpy(WCC->ImportantMessage, &buf[4]);
+       Line = NewStrBuf();
+       StrBuf_ServGetln(Line);
+       if (GetServerStatusMsg(Line, NULL, 1, 2) != 2) {
                display_main_menu();
+               FreeStrBuf(&Line);
                return;
        }
        while (bytes_remaining) {
                thisblock = ((bytes_remaining > 4096) ? 4096 : bytes_remaining);
                serv_printf("WRIT %d", thisblock);
-               serv_getln(buf, sizeof buf);
-               if (buf[0] != '7') {
-                       strcpy(WCC->ImportantMessage, &buf[4]);
+               StrBuf_ServGetln(Line);
+               if (GetServerStatusMsg(Line, NULL, 1, 7) != 7) {
                        serv_puts("UCLS 0");
-                       serv_getln(buf, sizeof buf);
+                       StrBuf_ServGetln(Line);
                        display_main_menu();
+                       FreeStrBuf(&Line);
                        return;
                }
-               thisblock = extract_int(&buf[4], 0);
+               thisblock = extract_int(ChrPtr(Line) +4, 0);
                serv_write(&ChrPtr(WCC->upload)[pos], thisblock);
-               pos = pos + thisblock;
-               bytes_remaining = bytes_remaining - thisblock;
+               pos += thisblock;
+               bytes_remaining -= thisblock;
        }
 
        serv_puts("UCLS 1");
-       serv_getln(buf, sizeof buf);
-       if (buf[0] != 'x') {
-               display_success(&buf[4]);
-               return;
+       StrBuf_ServGetln(Line);
+       if (*ChrPtr(Line) != 'x') {
+               display_success(ChrPtr(Line) + 4);
+       
        }
+       FreeStrBuf(&Line);
+
 }