* don't nail upload hellos to .gif as we don't need that anymore

[citadel.git] / webcit / webcit.c

diff --git a/webcit/webcit.c b/webcit/webcit.c
index 3c78875e868ae5bd63755328af040c5deed4b978..29463d6c972808a73f2092b0572c113a39efd009 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -589,7 +589,7 @@ void http_redirect(char *whichpage) {
 /**
  * \brief Output a piece of content to the web browser
  */
-void http_transmit_thing(char *thing, size_t length, char *content_type,
+void http_transmit_thing(char *thing, size_t length, const char *content_type,
                         int is_static) {
 
        output_headers(0, 0, 0, 0, 0, is_static);
@@ -680,7 +680,7 @@ void output_static(char *what)
        off_t count = 0;
        size_t res;
        char *bigbuffer;
-       char content_type[128];
+       const char *content_type;
        int len;
 
        fp = fopen(what, "rb");
@@ -692,36 +692,7 @@ void output_static(char *what)
                wprintf("Cannot open %s: %s\r\n", what, strerror(errno));
        } else {
                len = strlen (what);
-               if (!strncasecmp(&what[len - 4], ".gif", 4))
-                       safestrncpy(content_type, "image/gif", sizeof content_type);
-               else if (!strncasecmp(&what[len - 4], ".txt", 4))
-                       safestrncpy(content_type, "text/plain", sizeof content_type);
-               else if (!strncasecmp(&what[len - 4], ".css", 4))
-                       safestrncpy(content_type, "text/css", sizeof content_type);
-               else if (!strncasecmp(&what[len - 4], ".jpg", 4))
-                       safestrncpy(content_type, "image/jpeg", sizeof content_type);
-               else if (!strncasecmp(&what[len - 4], ".png", 4))
-                       safestrncpy(content_type, "image/png", sizeof content_type);
-               else if (!strncasecmp(&what[len - 4], ".ico", 4))
-                       safestrncpy(content_type, "image/x-icon", sizeof content_type);
-               else if (!strncasecmp(&what[len - 5], ".html", 5))
-                       safestrncpy(content_type, "text/html", sizeof content_type);
-               else if (!strncasecmp(&what[len - 4], ".htm", 4))
-                       safestrncpy(content_type, "text/html", sizeof content_type);
-               else if (!strncasecmp(&what[len - 4], ".wml", 4))
-                       safestrncpy(content_type, "text/vnd.wap.wml", sizeof content_type);
-               else if (!strncasecmp(&what[len - 5], ".wmls", 5))
-                       safestrncpy(content_type, "text/vnd.wap.wmlscript", sizeof content_type);
-               else if (!strncasecmp(&what[len - 5], ".wmlc", 5))
-                       safestrncpy(content_type, "application/vnd.wap.wmlc", sizeof content_type);
-               else if (!strncasecmp(&what[len - 6], ".wmlsc", 6))
-                       safestrncpy(content_type, "application/vnd.wap.wmlscriptc", sizeof content_type);
-               else if (!strncasecmp(&what[len - 5], ".wbmp", 5))
-                       safestrncpy(content_type, "image/vnd.wap.wbmp", sizeof content_type);
-               else if (!strncasecmp(&what[len - 3], ".js", 3))
-                       safestrncpy(content_type, "text/javascript", sizeof content_type);
-               else
-                       safestrncpy(content_type, "application/octet-stream", sizeof content_type);
+               content_type = GuessMimeByFilename(what, len);
 
                if (fstat(fileno(fp), &statbuf) == -1) {
                        lprintf(9, "output_static('%s')  -- FSTAT FAILED --\n", what);
@@ -763,7 +734,6 @@ void output_static(char *what)
        }
 }
 
-
 /**
  * \brief When the browser requests an image file from the Citadel server,
  * this function is called to transmit it.
@@ -773,6 +743,7 @@ void output_image()
        char buf[SIZ];
        char *xferbuf = NULL;
        off_t bytes;
+       const char *MimeType;
 
        serv_printf("OIMG %s|%s", bstr("name"), bstr("parm"));
        serv_getln(buf, sizeof buf);
@@ -785,22 +756,29 @@ void output_image()
                serv_puts("CLOS");
                serv_getln(buf, sizeof buf);
 
+               MimeType = GuessMimeType (xferbuf, bytes);
                /** Write it to the browser */
-               http_transmit_thing(xferbuf, (size_t)bytes, "image/gif", 0);
+               if (!IsEmptyStr(MimeType))
+               {
+                       http_transmit_thing(xferbuf, 
+                                           (size_t)bytes, 
+                                           MimeType, 
+                                           0);
+                       free(xferbuf);
+                       return;
+               }
+               /* hm... unknown mimetype? fallback to blank gif */
                free(xferbuf);
+       } 
 
-       } else {
-               /**
-                * Instead of an ugly 404, send a 1x1 transparent GIF
-                * when there's no such image on the server.
-                */
-               char blank_gif[SIZ];
-               snprintf (blank_gif, SIZ, "%s%s", static_dirs[0], "/blank.gif");
-               output_static(blank_gif);
-       }
-
-
-
+       
+       /**
+        * Instead of an ugly 404, send a 1x1 transparent GIF
+        * when there's no such image on the server.
+        */
+       char blank_gif[SIZ];
+       snprintf (blank_gif, SIZ, "%s%s", static_dirs[0], "/blank.gif");
+       output_static(blank_gif);
 }
 
 /**
@@ -1540,6 +1518,8 @@ void session_loop(struct httprequest *req)
 
        if (!strcasecmp(action, "image")) {
                output_image();
+       } else if (!strcasecmp(action, "display_mime_icon")) {
+               display_mime_icon();
 
                /**
                 * All functions handled below this point ... make sure we log in
@@ -1696,18 +1676,35 @@ void session_loop(struct httprequest *req)
                delete_room();
        } else if (!strcasecmp(action, "validate")) {
                validate();
+               /* The users photo display / upload facility */
        } else if (!strcasecmp(action, "display_editpic")) {
                display_graphics_upload(_("your photo"),
-                                       "UIMG 0|_userpic_",
+                                       "_userpic_",
                                        "editpic");
        } else if (!strcasecmp(action, "editpic")) {
-               do_graphics_upload("UIMG 1|_userpic_");
+               do_graphics_upload("_userpic_");
+                /* room picture dispay / upload facility */
        } else if (!strcasecmp(action, "display_editroompic")) {
                display_graphics_upload(_("the icon for this room"),
-                                       "UIMG 0|_roompic_",
+                                       "_roompic_",
                                        "editroompic");
        } else if (!strcasecmp(action, "editroompic")) {
-               do_graphics_upload("UIMG 1|_roompic_");
+               do_graphics_upload("_roompic_");
+               /* the greetingpage hello pic */
+       } else if (!strcasecmp(action, "display_edithello")) {
+               display_graphics_upload(_("the Greetingpicture for the login prompt"),
+                                       "hello",
+                                       "edithellopic");
+       } else if (!strcasecmp(action, "edithellopic")) {
+               do_graphics_upload("hello");
+               /* the logoff banner */
+       } else if (!strcasecmp(action, "display_editgoodbyepic")) {
+               display_graphics_upload(_("the Logoff banner picture"),
+                                       "UIMG 0|%s|goodbuye",
+                                       "editgoodbuyepic");
+       } else if (!strcasecmp(action, "editgoodbuyepic")) {
+               do_graphics_upload("UIMG 1|%s|goodbuye");
+
        } else if (!strcasecmp(action, "delete_floor")) {
                delete_floor();
        } else if (!strcasecmp(action, "rename_floor")) {