libical, expat, and libsieve are now *required*.
[citadel.git] / webcit / webcit.c
index 25efc69e123bb6a578fbcf2f6f79b878eb3a7070..b25347a4001b022839cc6bc7fb50aa43565fb011 100644 (file)
@@ -1,29 +1,26 @@
 /*
  * $Id$
- */
-/**
- * \defgroup MainServer This is the main transaction loop of the web service.  It maintains a
+ *
+ * This is the main transaction loop of the web service.  It maintains a
  * persistent session to the Citadel server, handling HTTP WebCit requests as
  * they arrive and presenting a user interface.
- * \ingroup WebcitHttpServer
  */
-/*@{*/
+
 #include "webcit.h"
 #include "groupdav.h"
 #include "webserver.h"
-#include "mime_parser.h"
 
 #include <stdio.h>
 #include <stdarg.h>
 
-/**
+/*
  * String to unset the cookie.
  * Any date "in the past" will work, so I chose my birthday, right down to
  * the exact minute.  :)
  */
 static char *unset = "; expires=28-May-1971 18:10:00 GMT";
 
-/**
+/**   
  * \brief remove escaped strings from i.e. the url string (like %20 for blanks)
  * \param buf the buffer to examine
  */
@@ -40,7 +37,8 @@ void unescape_input(char *buf)
                buflen --;
        }
 
-       for (a = 0; a < buflen; ++a) {
+       a = 0; 
+       while (a < buflen) {
                if (buf[a] == '+')
                        buf[a] = ' ';
                if (buf[a] == '%') {
@@ -54,6 +52,7 @@ void unescape_input(char *buf)
                        
                        buflen -=2;
                }
+               a++;
        }
 
 }
@@ -66,16 +65,18 @@ void addurls(char *url)
 {
        char *up, *ptr;
        char buf[SIZ];
-       int a, b, len;
+       int a, b, len, n;
        struct urlcontent *u;
 
        up = url;
        while (!IsEmptyStr(up)) {
 
                /** locate the = sign */
-               safestrncpy(buf, up, sizeof buf);
+               n = safestrncpy(buf, up, sizeof buf);
+               if (n < 0) /** hm, we exceeded the buffer... hmmm what todo now? */
+                       n = -n;
                b = (-1);
-               for (a = 255; a >= 0; --a)
+               for (a = n; a >= 0; --a)
                        if (buf[a] == '=')
                                b = a;
                if (b < 0)
@@ -204,15 +205,16 @@ void wDumpContent(int print_standard_html_footer)
  * \param nbsp If nonzero, spaces are converted to non-breaking spaces.
  * \param nolinebreaks if set, linebreaks are removed from the string.
  */
-void stresc(char *target, char *strbuf, int nbsp, int nolinebreaks)
+long stresc(char *target, long tSize, char *strbuf, int nbsp, int nolinebreaks)
 {
-       char *aptr, *bptr;
+       char *aptr, *bptr, *eptr;
 
        *target = '\0';
        aptr = strbuf;
        bptr = target;
+       eptr = target + tSize - 6; // our biggest unit to put in... 
 
-       while (!IsEmptyStr(aptr) ){
+       while ((bptr < eptr) && !IsEmptyStr(aptr) ){
                if (*aptr == '<') {
                        memcpy(bptr, "&lt;", 4);
                        bptr += 4;
@@ -250,10 +252,10 @@ void stresc(char *target, char *strbuf, int nbsp, int nolinebreaks)
                        bptr += 6;
                }
                else if ((*aptr == '\n') && (nolinebreaks)) {
-                       strcat(bptr, "");       /* nothing */
+                       *bptr='\0';     /* nothing */
                }
                else if ((*aptr == '\r') && (nolinebreaks)) {
-                       strcat(bptr, "");       /* nothing */
+                       *bptr='\0';     /* nothing */
                }
                else{
                        *bptr = *aptr;
@@ -262,6 +264,9 @@ void stresc(char *target, char *strbuf, int nbsp, int nolinebreaks)
                aptr ++;
        }
        *bptr = '\0';
+       if ((bptr = eptr - 1 ) && !IsEmptyStr(aptr) )
+               return -1;
+       return (bptr - target);
 }
 
 /**
@@ -273,10 +278,12 @@ void stresc(char *target, char *strbuf, int nbsp, int nolinebreaks)
 void escputs1(char *strbuf, int nbsp, int nolinebreaks)
 {
        char *buf;
+       long Siz;
 
        if (strbuf == NULL) return;
-       buf = malloc( (3 * strlen(strbuf)) + SIZ );
-       stresc(buf, strbuf, nbsp, nolinebreaks);
+       Siz = (3 * strlen(strbuf)) + SIZ ;
+       buf = malloc(Siz);
+       stresc(buf, Siz, strbuf, nbsp, nolinebreaks);
        wprintf("%s", buf);
        free(buf);
 }
@@ -290,35 +297,6 @@ void escputs(char *strbuf)
        escputs1(strbuf, 0, 0);
 }
 
-/** 
- * \brief Escape a string for feeding out as a URL.
- * \param outbuf the output buffer
- * \param strbuf the input buffer
- */
-void urlesc(char *outbuf, char *strbuf)
-{
-       int a, b, c, len, eclen, olen;
-       char *ec = " #&;`'|*?-~<>^()[]{}/$\"\\";
-
-       strcpy(outbuf, "");
-       len = strlen(strbuf);
-       eclen = strlen(ec);
-       olen = 0;
-       for (a = 0; a < len; ++a) {
-               c = 0;
-               for (b = 0; b < eclen; ++b) {
-                       if (strbuf[a] == ec[b])
-                               c = 1;
-               }
-               if (c == 1) {
-                       sprintf(&outbuf[olen], "%%%02x", strbuf[a]);
-                       olen += 3;
-               }
-               else 
-                       outbuf[olen ++] = strbuf[a];
-       }
-       outbuf[olen] = '\0';
-}
 
 /**
  * \brief urlescape buffer and print it to the client
@@ -328,7 +306,7 @@ void urlescputs(char *strbuf)
 {
        char outbuf[SIZ];
        
-       urlesc(outbuf, strbuf);
+       urlesc(outbuf, SIZ, strbuf);
        wprintf("%s", outbuf);
 }
 
@@ -338,27 +316,59 @@ void urlescputs(char *strbuf)
  * \param target output string
  * \param strbuf input string
  */
-void jsesc(char *target, char *strbuf)
+void jsesc(char *target, size_t tlen, char *strbuf)
 {
-       int a, len;
+       int len;
+       char *tend;
+       char *send;
+       char *tptr;
+       char *sptr;
 
        target[0]='\0';
        len = strlen (strbuf);
-       for (a = 0; a < len; ++a) {
-               if (strbuf[a] == '<')
-                       strcat(target, "[");
-               else if (strbuf[a] == '>')
-                       strcat(target, "]");
-               else if (strbuf[a] == '\"')
-                       strcat(target, "&quot;");
-               else if (strbuf[a] == '&')
-                       strcat(target, "&amp;;");
-               else if (strbuf[a] == '\'') 
-                       strcat(target, "\\'");
-               else {
-                       strncat(target, &strbuf[a], 1);
+       send = strbuf + len;
+       tend = target + tlen;
+       sptr = strbuf;
+       tptr = target;
+       
+       while (!IsEmptyStr(sptr) && 
+              (sptr < send) &&
+              (tptr < tend)) {
+              
+               if (*sptr == '<')
+                       *tptr = '[';
+               else if (*sptr == '>')
+                       *tptr = ']';
+               else if (*sptr == '\'') {
+                       if (tend - tptr < 3)
+                               return;
+                       *(tptr++) = '\\';
+                       *tptr = '\'';
+               }
+               else if (*sptr == '"') {
+                       if (tend - tptr < 8)
+                               return;
+                       *(tptr++) = '&';
+                       *(tptr++) = 'q';
+                       *(tptr++) = 'u';
+                       *(tptr++) = 'o';
+                       *(tptr++) = 't';
+                       *tptr = ';';
                }
+               else if (*sptr == '&') {
+                       if (tend - tptr < 7)
+                               return;
+                       *(tptr++) = '&';
+                       *(tptr++) = 'a';
+                       *(tptr++) = 'm';
+                       *(tptr++) = 'p';
+                       *tptr = ';';
+               } else {
+                       *tptr = *sptr;
+               }
+               tptr++; sptr++;
        }
+       *tptr = '\0';
 }
 
 /**
@@ -369,7 +379,7 @@ void jsescputs(char *strbuf)
 {
        char outbuf[SIZ];
        
-       jsesc(outbuf, strbuf);
+       jsesc(outbuf, SIZ, strbuf);
        wprintf("%s", outbuf);
 }
 
@@ -378,23 +388,43 @@ void jsescputs(char *strbuf)
  * \param target target buffer
  * \param strbuf source buffer
  */
-void msgesc(char *target, char *strbuf)
+void msgesc(char *target, size_t tlen, char *strbuf)
 {
-       int a, len;
+       int len;
+       char *tend;
+       char *send;
+       char *tptr;
+       char *sptr;
 
-       *target='\0';
-       len = strlen(strbuf);
-       for (a = 0; a < len; ++a) {
-               if (strbuf[a] == '\n')
-                       strcat(target, " ");
-               else if (strbuf[a] == '\r')
-                       strcat(target, " ");
-               else if (strbuf[a] == '\'')
-                       strcat(target, "&#39;");
-               else {
-                       strncat(target, &strbuf[a], 1);
+       target[0]='\0';
+       len = strlen (strbuf);
+       send = strbuf + len;
+       tend = target + tlen;
+       sptr = strbuf;
+       tptr = target;
+
+       while (!IsEmptyStr(sptr) && 
+              (sptr < send) &&
+              (tptr < tend)) {
+              
+               if (*sptr == '\n')
+                       *tptr = ' ';
+               else if (*sptr == '\r')
+                       *tptr = ' ';
+               else if (*sptr == '\'') {
+                       if (tend - tptr < 8)
+                               return;
+                       *(tptr++) = '&';
+                       *(tptr++) = '#';
+                       *(tptr++) = '3';
+                       *(tptr++) = '9';
+                       *tptr = ';';
+               } else {
+                       *tptr = *sptr;
                }
+               tptr++; sptr++;
        }
+       *tptr = '\0';
 }
 
 /**
@@ -411,8 +441,8 @@ void msgescputs1( char *strbuf)
        buflen = 3 * strlen(strbuf) + SIZ;
        outbuf = malloc( buflen);
        outbuf2 = malloc( buflen);
-       msgesc(outbuf, strbuf);
-       stresc(outbuf2, outbuf, 0, 0);
+       msgesc(outbuf, buflen, strbuf);
+       stresc(outbuf2, buflen, outbuf, 0, 0);
        wprintf("%s", outbuf2);
        free(outbuf);
        free(outbuf2);
@@ -424,10 +454,12 @@ void msgescputs1( char *strbuf)
  */
 void msgescputs(char *strbuf) {
        char *outbuf;
+       size_t len;
 
        if (strbuf == NULL) return;
-       outbuf = malloc( (3 * strlen(strbuf)) + SIZ);
-       msgesc(outbuf, strbuf);
+       len =  (3 * strlen(strbuf)) + SIZ;
+       outbuf = malloc(len);
+       msgesc(outbuf, len, strbuf);
        wprintf("%s", outbuf);
        free(outbuf);
 }
@@ -460,7 +492,7 @@ void output_headers(        int do_httpheaders,     /**< 1 = output HTTP headers
                wprintf("Content-type: text/html; charset=utf-8\r\n"
                        "Server: %s / %s\n"
                        "Connection: close\r\n",
-                       SERVER, serv_info.serv_software
+                       PACKAGE_STRING, serv_info.serv_software
                );
        }
 
@@ -478,7 +510,7 @@ void output_headers(        int do_httpheaders,     /**< 1 = output HTTP headers
                );
        }
 
-       stuff_to_cookie(cookie, WC->wc_session, WC->wc_username,
+       stuff_to_cookie(cookie, 1024, WC->wc_session, WC->wc_username,
                        WC->wc_password, WC->wc_roomname);
 
        if (unset_cookies) {
@@ -506,14 +538,15 @@ void output_headers(      int do_httpheaders,     /**< 1 = output HTTP headers
 
                /** check for ImportantMessages (these display in a div overlaying the main screen) */
                if (!IsEmptyStr(WC->ImportantMessage)) {
-                       wprintf("<div id=\"important_message\">\n");
-                       wprintf("<span class=\"imsg\">"
-                               "%s</span><br />\n", WC->ImportantMessage);
-                       wprintf("</div>\n");
-                       wprintf("<script type=\"text/javascript\">\n"
-                               "        setTimeout('hide_imsg_popup()', 3000); \n"
+                       wprintf("<div id=\"important_message\">\n"
+                               "<span class=\"imsg\">");
+                       escputs(WC->ImportantMessage);
+                       wprintf("</span><br />\n"
+                               "</div>\n"
+                               "<script type=\"text/javascript\">\n"
+                               "        setTimeout('hide_imsg_popup()', 5000); \n"
                                "</script>\n");
-                       safestrncpy(WC->ImportantMessage, "", sizeof WC->ImportantMessage);
+                       WC->ImportantMessage[0] = 0;
                }
 
                if ( (WC->logged_in) && (!unset_cookies) ) {
@@ -556,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);
@@ -565,15 +598,15 @@ void http_transmit_thing(char *thing, size_t length, char *content_type,
                "Server: %s\r\n"
                "Connection: close\r\n",
                content_type,
-               SERVER);
+               PACKAGE_STRING);
 
 #ifdef HAVE_ZLIB
        /** If we can send the data out compressed, please do so. */
        if (WC->gzip_ok) {
                char *compressed_data = NULL;
-               uLongf compressed_len;
+               size_t compressed_len;
 
-               compressed_len = (uLongf) ((length * 101) / 100) + 100;
+               compressed_len =  ((length * 101) / 100) + 100;
                compressed_data = malloc(compressed_len);
 
                if (compress_gzip((Bytef *) compressed_data,
@@ -644,54 +677,52 @@ void output_static(char *what)
        FILE *fp;
        struct stat statbuf;
        off_t bytes;
+       off_t count = 0;
+       size_t res;
        char *bigbuffer;
-       char content_type[128];
+       const char *content_type;
        int len;
 
        fp = fopen(what, "rb");
        if (fp == NULL) {
                lprintf(9, "output_static('%s')  -- NOT FOUND --\n", what);
-               wprintf("HTTP/1.1 404 %s\n", strerror(errno));
+               wprintf("HTTP/1.1 404 %s\r\n", strerror(errno));
                wprintf("Content-Type: text/plain\r\n");
                wprintf("\r\n");
-               wprintf("Cannot open %s: %s\n", what, strerror(errno));
+               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);
-
-               fstat(fileno(fp), &statbuf);
+               content_type = GuessMimeByFilename(what, len);
+
+               if (fstat(fileno(fp), &statbuf) == -1) {
+                       lprintf(9, "output_static('%s')  -- FSTAT FAILED --\n", what);
+                       wprintf("HTTP/1.1 404 %s\r\n", strerror(errno));
+                       wprintf("Content-Type: text/plain\r\n");
+                       wprintf("\r\n");
+                       wprintf("Cannot fstat %s: %s\n", what, strerror(errno));
+                       return;
+               }
+
+               count = 0;
                bytes = statbuf.st_size;
-               bigbuffer = malloc(bytes + 2);
-               fread(bigbuffer, bytes, 1, fp);
+               if ((bigbuffer = malloc(bytes + 2)) == NULL) {
+                       lprintf(9, "output_static('%s')  -- MALLOC FAILED (%s) --\n", what, strerror(errno));
+                       wprintf("HTTP/1.1 500 internal server error\r\n");
+                       wprintf("Content-Type: text/plain\r\n");
+                       wprintf("\r\n");
+                       return;
+               }
+               while (count < bytes) {
+                       if ((res = fread(bigbuffer + count, 1, bytes - count, fp)) == 0) {
+                               lprintf(9, "output_static('%s')  -- FREAD FAILED (%s) %zu bytes of %zu --\n", what, strerror(errno), bytes - count, bytes);
+                               wprintf("HTTP/1.1 500 internal server error \r\n");
+                               wprintf("Content-Type: text/plain\r\n");
+                               wprintf("\r\n");
+                               return;
+                       }
+                       count += res;
+               }
+
                fclose(fp);
 
                lprintf(9, "output_static('%s')  %s\n", what, content_type);
@@ -703,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.
@@ -713,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);
@@ -725,20 +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.
-                */
-               output_static("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);
 }
 
 /**
@@ -865,13 +905,13 @@ void offer_start_page(void) {
        wprintf("\">");
        wprintf(_("Make this my start page"));
        wprintf("</a>");
-/*
+#ifdef TECH_PREVIEW
        wprintf("<br/><a href=\"rss?room=");
        urlescputs(WC->wc_roomname);
        wprintf("\" title=\"RSS 2.0 feed for ");
        escputs(WC->wc_roomname);
        wprintf("\"><img alt=\"RSS\" border=\"0\" src=\"static/xml_button.gif\"/></a>\n");
-*/
+#endif
 }
 
 
@@ -992,7 +1032,7 @@ void begin_ajax_response(void) {
                 "Cache-Control: no-cache\r\n"
                "Expires: -1\r\n"
                ,
-                SERVER);
+                PACKAGE_STRING);
         begin_burst();
 }
 
@@ -1223,7 +1263,7 @@ void session_loop(struct httprequest *req)
        if (ContentLength > 0) {
                content = malloc(ContentLength + SIZ);
                memset(content, 0, ContentLength + SIZ);
-               sprintf(content, "Content-type: %s\n"
+               snprintf(content,  ContentLength + SIZ, "Content-type: %s\n"
                                "Content-length: %d\n\n",
                                ContentType, ContentLength);
                body_start = strlen(content);
@@ -1303,7 +1343,7 @@ void session_loop(struct httprequest *req)
                        wprintf("HTTP/1.1 404 Security check failed\r\n");
                        wprintf("Content-Type: text/plain\r\n");
                        wprintf("\r\n");
-                       wprintf("Security check failed.\r\n");
+                       wprintf("You have sent a malformed or invalid request.\r\n");
                }
                goto SKIP_ALL_THIS_CRAP;        /* Don't try to connect */
        }
@@ -1329,7 +1369,7 @@ void session_loop(struct httprequest *req)
        if (!WC->connected) {
                if (!strcasecmp(ctdlhost, "uds")) {
                        /* unix domain socket */
-                       sprintf(buf, "%s/citadel.socket", ctdlport);
+                       snprintf(buf, SIZ, "%s/citadel.socket", ctdlport);
                        WC->serv_sock = uds_connectsock(buf);
                }
                else {
@@ -1380,12 +1420,10 @@ void session_loop(struct httprequest *req)
                do_listsub();
                goto SKIP_ALL_THIS_CRAP;
        }
-#ifdef WEBCIT_WITH_CALENDAR_SERVICE
        if (!strcasecmp(action, "freebusy")) {
                do_freebusy(cmd);
                goto SKIP_ALL_THIS_CRAP;
        }
-#endif
 
        /**
         * If we're not logged in, but we have HTTP Authentication data,
@@ -1413,10 +1451,12 @@ void session_loop(struct httprequest *req)
        }
 
        /** This needs to run early */
+#ifdef TECH_PREVIEW
        if (!strcasecmp(action, "rss")) {
                display_rss(bstr("room"), request_method);
                goto SKIP_ALL_THIS_CRAP;
        }
+#endif
 
        /** 
         * The GroupDAV stuff relies on HTTP authentication instead of
@@ -1476,6 +1516,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
@@ -1499,6 +1541,8 @@ void session_loop(struct httprequest *req)
                url_do_template();
        } else if (!strcasecmp(action, "display_aide_menu")) {
                display_aide_menu();
+       } else if (!strcasecmp(action, "server_shutdown")) {
+               display_shutdown();
        } else if (!strcasecmp(action, "display_main_menu")) {
                display_main_menu();
        } else if (!strcasecmp(action, "who")) {
@@ -1525,6 +1569,10 @@ void session_loop(struct httprequest *req)
                begin_ajax_response();
                calendar_section();
                end_ajax_response();
+       } else if (!strcasecmp(action, "mini_calendar")) {
+               begin_ajax_response();
+               ajax_mini_calendar();
+               end_ajax_response();
        } else if (!strcasecmp(action, "iconbar_ajax_menu")) {
                begin_ajax_response();
                do_iconbar();
@@ -1616,7 +1664,7 @@ void session_loop(struct httprequest *req)
        } else if (!strcasecmp(action, "editinfo")) {
                save_edit(_("Room info"), "EINF 1", 1);
        } else if (!strcasecmp(action, "display_editbio")) {
-               sprintf(buf, "RBIO %s", WC->wc_fullname);
+               snprintf(buf, SIZ, "RBIO %s", WC->wc_fullname);
                display_edit(_("Your bio"), "NOOP", buf, "editbio", 3);
        } else if (!strcasecmp(action, "editbio")) {
                save_edit(_("Your bio"), "EBIO", 0);
@@ -1626,18 +1674,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")) {
@@ -1645,13 +1710,13 @@ void session_loop(struct httprequest *req)
        } else if (!strcasecmp(action, "create_floor")) {
                create_floor();
        } else if (!strcasecmp(action, "display_editfloorpic")) {
-               sprintf(buf, "UIMG 0|_floorpic_|%s",
+               snprintf(buf, SIZ, "UIMG 0|_floorpic_|%s",
                        bstr("which_floor"));
                display_graphics_upload(_("the icon for this floor"),
                                        buf,
                                        "editfloorpic");
        } else if (!strcasecmp(action, "editfloorpic")) {
-               sprintf(buf, "UIMG 1|_floorpic_|%s",
+               snprintf(buf, SIZ, "UIMG 1|_floorpic_|%s",
                        bstr("which_floor"));
                do_graphics_upload(buf);
        } else if (!strcasecmp(action, "display_reg")) {
@@ -1717,7 +1782,6 @@ void session_loop(struct httprequest *req)
                display_floorconfig(NULL);
        } else if (!strcasecmp(action, "toggle_self_service")) {
                toggle_self_service();
-#ifdef WEBCIT_WITH_CALENDAR_SERVICE
        } else if (!strcasecmp(action, "display_edit_task")) {
                display_edit_task();
        } else if (!strcasecmp(action, "save_task")) {
@@ -1730,7 +1794,6 @@ void session_loop(struct httprequest *req)
                respond_to_request();
        } else if (!strcasecmp(action, "handle_rsvp")) {
                handle_rsvp();
-#endif
        } else if (!strcasecmp(action, "summary")) {
                summary();
        } else if (!strcasecmp(action, "summary_inner_div")) {
@@ -1755,6 +1818,10 @@ void session_loop(struct httprequest *req)
                display_sieve();
        } else if (!strcasecmp(action, "save_sieve")) {
                save_sieve();
+       } else if (!strcasecmp(action, "display_pushemail")) {
+               display_pushemail();
+       } else if (!strcasecmp(action, "save_pushemail")) {
+               save_pushemail();
        } else if (!strcasecmp(action, "display_add_remove_scripts")) {
                display_add_remove_scripts(NULL);
        } else if (!strcasecmp(action, "create_script")) {
@@ -1793,6 +1860,8 @@ void session_loop(struct httprequest *req)
                updatenote();
        } else if (!strcasecmp(action, "display_room_directory")) {
                display_room_directory();
+       } else if (!strcasecmp(action, "display_pictureview")) {
+               display_pictureview();
        } else if (!strcasecmp(action, "download_file")) {
                download_file(index[1]);
        } else if (!strcasecmp(action, "upload_file")) {
@@ -1817,5 +1886,18 @@ SKIP_ALL_THIS_CRAP:
        }
 }
 
+/**
+ * \brief Replacement for sleep() that uses select() in order to avoid SIGALRM
+ * \param seconds how many seconds should we sleep?
+ */
+void sleeeeeeeeeep(int seconds)
+{
+       struct timeval tv;
+
+       tv.tv_sec = seconds;
+       tv.tv_usec = 0;
+       select(0, NULL, NULL, NULL, &tv);
+}
+
 
 /*@}*/