Changed 'the Greetingpicture for the login prompt' to 'graphics to be displayed on...

[citadel.git] / webcit / graphics.c

diff --git a/webcit/graphics.c b/webcit/graphics.c
index 9b396f44824a6c8fce0b923391182266504abd7f..3e10a4df2ae5aa2d11d1ebede3cbf15917874a96 100644 (file)
--- a/webcit/graphics.c
+++ b/webcit/graphics.c
@@ -1,7 +1,8 @@
+
 /*
  * 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.
@@ -14,10 +15,10 @@
 
 #include "webcit.h"
 
-extern void output_static(const char* What);
-
+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,9 +41,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);
                display_main_menu();
@@ -54,8 +54,8 @@ void editpic(void)
                display_main_menu();
                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,8 +70,20 @@ void editpic(void)
 }
 
 
-void display_graphics_upload(char *filename)
-{
+// 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;
 
        Line = NewStrBuf();
@@ -81,8 +93,7 @@ void display_graphics_upload(char *filename)
                display_main_menu();
                return;
        }
-       else
-       {
+       else {
                output_headers(1, 0, 0, 0, 1, 0);
                do_template("files_graphicsupload");
                end_burst();
@@ -90,8 +101,8 @@ void display_graphics_upload(char *filename)
        FreeStrBuf(&Line);
 }
 
-void do_graphics_upload(char *filename)
-{
+
+void do_graphics_upload(char *filename) {
        StrBuf *Line;
        const char *MimeType;
        wcsession *WCC = WC;
@@ -111,7 +122,7 @@ void do_graphics_upload(char *filename)
                display_main_menu();
                return;
        }
-       
+
        MimeType = GuessMimeType(ChrPtr(WCC->upload), bytes_remaining);
        serv_printf("UIMG 1|%s|%s", MimeType, filename);
 
@@ -133,7 +144,7 @@ void do_graphics_upload(char *filename)
                        FreeStrBuf(&Line);
                        return;
                }
-               thisblock = extract_int(ChrPtr(Line) +4, 0);
+               thisblock = extract_int(ChrPtr(Line) + 4, 0);
                serv_write(&ChrPtr(WCC->upload)[pos], thisblock);
                pos += thisblock;
                bytes_remaining -= thisblock;
@@ -143,26 +154,29 @@ void do_graphics_upload(char *filename)
        StrBuf_ServGetln(Line);
        if (*ChrPtr(Line) != 'x') {
                display_success(ChrPtr(Line) + 4);
-       
+
        }
        FreeStrBuf(&Line);
 
 }
 
 
-void edithellopic(void)    { do_graphics_upload("hello"); }
-void editgoodbuyepic(void) { do_graphics_upload("UIMG 1|%s|goodbuye"); }
+void edithellopic(void) {
+       do_graphics_upload("hello");
+}
+void editgoodbuyepic(void) {
+       do_graphics_upload("UIMG 1|%s|goodbuye");
+}
 
 /* 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,7 +185,7 @@ 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");
 }
@@ -184,17 +198,8 @@ void display_editgoodbyepic(void) {
        display_graphics_upload("editgoodbuyepic");
 }
 
-void editroompic(void) {
-       char buf[SIZ];
-       snprintf(buf, SIZ, "_roompic_|%s",
-                bstr("which_room"));
-       do_graphics_upload(buf);
-}
 
-void 
-InitModule_GRAPHICS
-(void)
-{
+void InitModule_GRAPHICS(void) {
        WebcitAddUrlHandler(HKEY("display_editpic"), "", 0, display_editpic, 0);
        WebcitAddUrlHandler(HKEY("editpic"), "", 0, editpic, 0);
        WebcitAddUrlHandler(HKEY("display_editroompic"), "", 0, display_editroompic, 0);