trying to figure out the problem with graphics upload in webcit classic

[citadel.git] / webcit / graphics.c

diff --git a/webcit/graphics.c b/webcit/graphics.c
index 9b396f44824a6c8fce0b923391182266504abd7f..009fbf89f597e61d5af4d26c2e1b0fd21c30265f 100644 (file)
--- a/webcit/graphics.c
+++ b/webcit/graphics.c
@@ -1,7 +1,7 @@
 /*
  * Handles HTTP upload of graphics files into the system.
  *
- * Copyright (c) 1996-2012 by the citadel.org team
+ * Copyright (c) 1996-2016 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.
@@ -17,7 +17,7 @@
 extern void output_static(const char* What);
 
 
-
+// display the picture (icon, photo, whatever) associated with the current room
 void display_roompic(void) {
        off_t bytes;
        StrBuf *Buf = NewStrBuf();
@@ -40,8 +40,8 @@ void display_roompic(void) {
 }
 
 
-// upload your photo
-void editpic(void)
+// upload the picture (icon, photo, whatever) associated with the current room
+void common_code_for_editroompic_and_editpic(char *servcmd)
 {
        if (havebstr("cancel_button")) {
                AppendImportantMessage(_("Graphics upload has been cancelled."), -1);
@@ -55,7 +55,7 @@ void editpic(void)
                return;
        }
        
-       serv_printf("ULUI %ld|%s", (long)WC->upload_length, GuessMimeType(ChrPtr(WC->upload), WC->upload_length));
+       serv_printf("%s %ld|%s", servcmd, (long)WC->upload_length, GuessMimeType(ChrPtr(WC->upload), WC->upload_length));
        StrBuf *Line = NewStrBuf();
        StrBuf_ServGetln(Line);
        if (GetServerStatusMsg(Line, NULL, 0, 0) == 7) {
@@ -70,10 +70,27 @@ void editpic(void)
 }
 
 
+// upload the picture (icon, photo, whatever) associated with the current room
+void editroompic(void)
+{
+       common_code_for_editroompic_and_editpic("ULRI");
+}
+
+       
+// upload the picture (icon, photo, whatever) associated with the current user
+void editpic(void)
+{
+       common_code_for_editroompic_and_editpic("ULUI");
+}
+
+
+// display the screen for uploading graphics to the server
 void display_graphics_upload(char *filename)
 {
        StrBuf *Line;
 
+       syslog(LOG_DEBUG, "display_graphics_upload(%s)", filename);
+
        Line = NewStrBuf();
        serv_printf("UIMG 0||%s", filename);
        StrBuf_ServGetln(Line);
@@ -90,6 +107,7 @@ void display_graphics_upload(char *filename)
        FreeStrBuf(&Line);
 }
 
+
 void do_graphics_upload(char *filename)
 {
        StrBuf *Line;
@@ -151,18 +169,16 @@ void do_graphics_upload(char *filename)
 
 
 void edithellopic(void)    { do_graphics_upload("hello"); }
-void editgoodbuyepic(void) { do_graphics_upload("UIMG 1|%s|goodbuye"); }
+void editgoodbyepic(void) { do_graphics_upload("UIMG 1|%s|goodbye"); }
 
 /* The users photo display / upload facility */
 void display_editpic(void) {
-       putbstr("__WHICHPIC", NewStrBufPlain(HKEY("_userpic_")));
        putbstr("__PICDESC", NewStrBufPlain(_("your photo"), -1));
        putbstr("__UPLURL", NewStrBufPlain(HKEY("editpic")));
        display_graphics_upload("editpic");
 }
 /* room picture dispay / upload facility */
 void display_editroompic(void) {
-       putbstr("__WHICHPIC", NewStrBufPlain(HKEY("_roompic_")));
        putbstr("__PICDESC", NewStrBufPlain(_("the icon for this room"), -1));
        putbstr("__UPLURL", NewStrBufPlain(HKEY("editroompic")));
        display_graphics_upload("editroompic");
@@ -171,25 +187,19 @@ void display_editroompic(void) {
 /* the greetingpage hello pic */
 void display_edithello(void) {
        putbstr("__WHICHPIC", NewStrBufPlain(HKEY("hello")));
-       putbstr("__PICDESC", NewStrBufPlain(_("the Greetingpicture for the login prompt"), -1));
+       putbstr("__PICDESC", NewStrBufPlain(_("graphics to be displayed on the login screen"), -1));
        putbstr("__UPLURL", NewStrBufPlain(HKEY("edithellopic")));
        display_graphics_upload("edithellopic");
 }
 
 /* the logoff banner */
 void display_editgoodbyepic(void) {
-       putbstr("__WHICHPIC", NewStrBufPlain(HKEY("UIMG 0|%s|goodbuye")));
+       putbstr("__WHICHPIC", NewStrBufPlain(HKEY("UIMG 0|%s|goodbye")));
        putbstr("__PICDESC", NewStrBufPlain(_("the Logoff banner picture"), -1));
-       putbstr("__UPLURL", NewStrBufPlain(HKEY("editgoodbuyepic")));
-       display_graphics_upload("editgoodbuyepic");
+       putbstr("__UPLURL", NewStrBufPlain(HKEY("editgoodbyepic")));
+       display_graphics_upload("editgoodbyepic");
 }
 
-void editroompic(void) {
-       char buf[SIZ];
-       snprintf(buf, SIZ, "_roompic_|%s",
-                bstr("which_room"));
-       do_graphics_upload(buf);
-}
 
 void 
 InitModule_GRAPHICS
@@ -201,7 +211,7 @@ InitModule_GRAPHICS
        WebcitAddUrlHandler(HKEY("editroompic"), "", 0, editroompic, 0);
        WebcitAddUrlHandler(HKEY("display_edithello"), "", 0, display_edithello, 0);
        WebcitAddUrlHandler(HKEY("edithellopic"), "", 0, edithellopic, 0);
-       WebcitAddUrlHandler(HKEY("display_editgoodbuye"), "", 0, display_editgoodbyepic, 0);
-       WebcitAddUrlHandler(HKEY("editgoodbuyepic"), "", 0, editgoodbuyepic, 0);
+       WebcitAddUrlHandler(HKEY("display_editgoodbye"), "", 0, display_editgoodbyepic, 0);
+       WebcitAddUrlHandler(HKEY("editgoodbyepic"), "", 0, editgoodbyepic, 0);
        WebcitAddUrlHandler(HKEY("roompic"), "", 0, display_roompic, 0);
 }