* add a Display name to our handlers; this will be used by DAV handlers.

[citadel.git] / webcit / graphics.c

diff --git a/webcit/graphics.c b/webcit/graphics.c
index 9cc0d4145babb464433ba2eabcec8e8ef3c48b66..8ccd6b0e14ff28f398f59075155d5dd134477450 100644 (file)
--- a/webcit/graphics.c
+++ b/webcit/graphics.c
@@ -9,6 +9,8 @@
 
 void display_graphics_upload(char *description, char *filename, char *uplurl)
 {
+       WCTemplputParams SubTP;
+       StrBuf *Buf;
        char buf[SIZ];
 
 
@@ -20,12 +22,17 @@ void display_graphics_upload(char *description, char *filename, char *uplurl)
                display_main_menu();
                return;
        }
-       output_headers(1, 1, 0, 0, 0, 0);
+       /*output_headers(1, 1, 0, 0, 0, 0); */
 
        output_headers(1, 1, 1, 0, 0, 0);
 
-       svput("BOXTITLE", WCS_STRING, _("Image upload"));
-       do_template("beginbox");
+       Buf = NewStrBufPlain(_("Image upload"), -1);
+       memset(&SubTP, 0, sizeof(WCTemplputParams));
+       SubTP.Filter.ContextType = CTX_STRBUF;
+       SubTP.Context = Buf;
+       DoTemplate(HKEY("beginbox"), NULL, &SubTP);
+
+       FreeStrBuf(&Buf);
 
        wprintf("<form enctype=\"multipart/form-data\" action=\"%s\" "
                "method=\"post\" name=\"graphicsupload\">\n", uplurl);
@@ -41,7 +48,7 @@ void display_graphics_upload(char *description, char *filename, char *uplurl)
        wprintf(_("Please select a file to upload:"));
        wprintf("<input type=\"file\" name=\"filename\" size=\"35\">\n");
 
-       wprintf("<div class=\"uploadpic\"><img src=\"image&name=%s\"></div>\n", filename);
+       wprintf("<div class=\"uploadpic\"><img src=\"image?name=%s\"></div>\n", filename);
 
        wprintf("<div class=\"buttons\">");
        wprintf("<input type=\"submit\" name=\"upload_button\" value=\"%s\">\n", _("Upload"));
@@ -52,7 +59,7 @@ void display_graphics_upload(char *description, char *filename, char *uplurl)
        wprintf("</div>\n");
        wprintf("</form>\n");
 
-       do_template("endbox");
+       do_template("endbox", NULL);
 
        wDumpContent(1);
 }
@@ -60,11 +67,12 @@ void display_graphics_upload(char *description, char *filename, char *uplurl)
 void do_graphics_upload(char *filename)
 {
        const char *MimeType;
+       wcsession *WCC = WC;
        char buf[SIZ];
        int bytes_remaining;
        int pos = 0;
        int thisblock;
-       bytes_remaining = WC->upload_length;
+       bytes_remaining = WCC->upload_length;
 
        if (havebstr("cancel_button")) {
                strcpy(WC->ImportantMessage,
@@ -73,20 +81,20 @@ void do_graphics_upload(char *filename)
                return;
        }
 
-       if (WC->upload_length == 0) {
+       if (WCC->upload_length == 0) {
                strcpy(WC->ImportantMessage,
                        _("You didn't upload a file."));
                display_main_menu();
                return;
        }
        
-       MimeType = GuessMimeType(&WC->upload[0], bytes_remaining);
+       MimeType = GuessMimeType(ChrPtr(WCC->upload), bytes_remaining);
        snprintf(buf, SIZ, "UIMG 1|%s|%s", MimeType, filename);
        serv_puts(buf);
 
        serv_getln(buf, sizeof buf);
        if (buf[0] != '2') {
-               strcpy(WC->ImportantMessage, &buf[4]);
+               strcpy(WCC->ImportantMessage, &buf[4]);
                display_main_menu();
                return;
        }
@@ -95,14 +103,14 @@ void do_graphics_upload(char *filename)
                serv_printf("WRIT %d", thisblock);
                serv_getln(buf, sizeof buf);
                if (buf[0] != '7') {
-                       strcpy(WC->ImportantMessage, &buf[4]);
+                       strcpy(WCC->ImportantMessage, &buf[4]);
                        serv_puts("UCLS 0");
                        serv_getln(buf, sizeof buf);
                        display_main_menu();
                        return;
                }
                thisblock = extract_int(&buf[4], 0);
-               serv_write(&WC->upload[pos], thisblock);
+               serv_write(&ChrPtr(WCC->upload)[pos], thisblock);
                pos = pos + thisblock;
                bytes_remaining = bytes_remaining - thisblock;
        }
@@ -149,16 +157,23 @@ void display_editgoodbyepic(void) {
 
 void display_editfloorpic(void) {
        char buf[SIZ];
-       snprintf(buf, SIZ, "UIMG 0|_floorpic_|%s",
+       snprintf(buf, SIZ, "_floorpic_|%s",
                 bstr("which_floor"));
        display_graphics_upload(_("the icon for this floor"),
                                buf,
                                "editfloorpic");
 }
 
+void editroompic(void) {
+       char buf[SIZ];
+       snprintf(buf, SIZ, "_roompic_|%s",
+                bstr("which_room"));
+       do_graphics_upload(buf);
+}
+
 void editfloorpic(void){
        char buf[SIZ];
-       snprintf(buf, SIZ, "UIMG 1|_floorpic_|%s",
+       snprintf(buf, SIZ, "_floorpic_|%s",
                 bstr("which_floor"));
        do_graphics_upload(buf);
 }
@@ -167,13 +182,14 @@ void
 InitModule_GRAPHICS
 (void)
 {
-       WebcitAddUrlHandler(HKEY("display_editpic"), display_editpic, 0);
-       WebcitAddUrlHandler(HKEY("editpic"), editpic, 0);
-       WebcitAddUrlHandler(HKEY("display_editroompic"), display_editroompic, 0);
-       WebcitAddUrlHandler(HKEY("display_edithello"), display_edithello, 0);
-       WebcitAddUrlHandler(HKEY("edithellopic"), edithellopic, 0);
-       WebcitAddUrlHandler(HKEY("display_editgoodbyepic"), display_editgoodbyepic, 0);
-       WebcitAddUrlHandler(HKEY("editgoodbuyepic"), editgoodbuyepic, 0);
-       WebcitAddUrlHandler(HKEY("display_editfloorpic"), display_editfloorpic, 0);
-       WebcitAddUrlHandler(HKEY("editfloorpic"), editfloorpic, 0);
+       WebcitAddUrlHandler(HKEY("display_editpic"), "", 0, display_editpic, 0);
+       WebcitAddUrlHandler(HKEY("editpic"), "", 0, editpic, 0);
+       WebcitAddUrlHandler(HKEY("display_editroompic"), "", 0, display_editroompic, 0);
+       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_editfloorpic"), "", 0, display_editfloorpic, 0);
+       WebcitAddUrlHandler(HKEY("editfloorpic"), "", 0, editfloorpic, 0);
 }