X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebcit.c;h=df08bd8e026ef9ecc20f3ef079b65e6a69dd4766;hb=2362c3d4de86f20822ab81015222a196137fd20e;hp=580772a803970833ffd070db807567fedc9d171a;hpb=172af31bec540db82b61d6c0d9c7372bb7142607;p=citadel.git

diff --git a/webcit/webcit.c b/webcit/webcit.c
index 580772a80..df08bd8e0 100644
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -1,13 +1,11 @@
 /*
  * $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"
@@ -15,22 +13,39 @@
 #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
+HashList *HandlerHash = NULL;
+
+
+void WebcitAddUrlHandler(const char * UrlString, long UrlSLen, WebcitHandlerFunc F, int IsAjax)
+{
+	WebcitHandler *NewHandler;
+
+	if (HandlerHash == NULL)
+		HandlerHash = NewHash(1, NULL);
+	
+	NewHandler = (WebcitHandler*) malloc(sizeof(WebcitHandler));
+	NewHandler->F = F;
+	NewHandler->IsAjax = IsAjax;
+
+	Put(HandlerHash, UrlString, UrlSLen, NewHandler, NULL);
+}
+
+/*   
+ * remove escaped strings from i.e. the url string (like %20 for blanks)
  */
-void unescape_input(char *buf)
+long unescape_input(char *buf)
 {
 	int a, b;
 	char hex[3];
 	long buflen;
+	long len;
 
 	buflen = strlen(buf);
 
@@ -44,125 +59,268 @@ void unescape_input(char *buf)
 		if (buf[a] == '+')
 			buf[a] = ' ';
 		if (buf[a] == '%') {
-			hex[0] = buf[a + 1];
-			hex[1] = buf[a + 2];
-			hex[2] = 0;
-			b = 0;
-			sscanf(hex, "%02x", &b);
-			buf[a] = (char) b;
-			memmove(&buf[a + 1], &buf[a + 3], buflen - a - 2);
+			/* don't let % chars through, rather truncate the input. */
+			if (a + 2 > buflen) {
+				buf[a] = '\0';
+				buflen = a;
+			}
+			else {			
+				hex[0] = buf[a + 1];
+				hex[1] = buf[a + 2];
+				hex[2] = 0;
+				b = 0;
+				sscanf(hex, "%02x", &b);
+				buf[a] = (char) b;
+				len = buflen - a - 2;
+				if (len > 0)
+					memmove(&buf[a + 1], &buf[a + 3], len);
 			
-			buflen -=2;
+				buflen -=2;
+			}
 		}
 		a++;
 	}
+	return a;
+}
 
+void free_url(void *U)
+{
+	urlcontent *u = (urlcontent*) U;
+	free(u->url_data);
+	free(u);
 }
 
-/**
- * \brief Extract variables from the URL.
- * \param url URL supplied by the HTTP parser
+/*
+ * Extract variables from the URL.
  */
-void addurls(char *url)
+void addurls(char *url, long ulen)
 {
-	char *up, *ptr;
-	char buf[SIZ];
-	int a, b, len;
-	struct urlcontent *u;
-
-	up = url;
+	char *aptr, *bptr, *eptr;
+	char *up;
+	char *buf;
+	int len, keylen;
+	urlcontent *u;
+	struct wcsession *WCC = WC;
+
+	if (WCC->urlstrings == NULL)
+		WCC->urlstrings = NewHash(1, NULL);
+	buf = (char*) malloc (ulen + 1);
+	memcpy(buf, url, ulen);
+	buf[ulen] = '\0';
+	eptr = buf + ulen;
+	up = buf;
 	while (!IsEmptyStr(up)) {
-
-		/** locate the = sign */
-		safestrncpy(buf, up, sizeof buf);
-		b = (-1);
-		for (a = 255; a >= 0; --a)
-			if (buf[a] == '=')
-				b = a;
-		if (b < 0)
+		aptr = up;
+		while ((aptr < eptr) && (*aptr != '\0') && (*aptr != '='))
+			aptr++;
+		if (*aptr != '=')
 			return;
-		buf[b] = 0;
-
-		u = (struct urlcontent *) malloc(sizeof(struct urlcontent));
-		u->next = WC->urlstrings;
-		WC->urlstrings = u;
-		safestrncpy(u->url_key, buf, sizeof u->url_key);
-
-		/** now chop that part off */
-		for (a = 0; a <= b; ++a)
-			++up;
-
-		/** locate "&" and "?" delimiters */
-		ptr = up;
-		len = b = strlen(up);
-		for (a = 0; a < len; ++a) {
-			if ( (ptr[0] == '&') || (ptr[0] == '?') ) {
-				b = a;
-				break;
-			}
-			++ptr;
+		*aptr = '\0';
+		aptr++;
+		bptr = aptr;
+		while ((bptr < eptr) && (*bptr != '\0')
+		      && (*bptr != '&') && (*bptr != '?') && (*bptr != ' ')) {
+			bptr++;
+		}
+		*bptr = '\0';
+		u = (urlcontent *) malloc(sizeof(urlcontent));
+
+		keylen = safestrncpy(u->url_key, up, sizeof u->url_key);
+		if (keylen < 0){
+			lprintf(1, "URLkey to long! [%s]", up);
+			continue;
 		}
-		ptr = up + b;
-		*ptr = '\0';
 
-		len = b;
+		Put(WCC->urlstrings, u->url_key, keylen, u, free_url);
+		len = bptr - aptr;
 		u->url_data = malloc(len + 2);
-		safestrncpy(u->url_data, up, b + 1);
-		u->url_data[b] = 0;
-		unescape_input(u->url_data);
-		up = ptr;
+		safestrncpy(u->url_data, aptr, len + 2);
+		u->url_data_size = unescape_input(u->url_data);
+		u->url_data[u->url_data_size] = '\0';
+		up = bptr;
 		++up;
-
-		/* lprintf(9, "%s = %s\n", u->url_key, u->url_data); */
+#ifdef DEBUG_URLSTRINGS
+		lprintf(9, "%s = [%ld]  %s\n", u->url_key, u->url_data_size, u->url_data); 
+#endif
 	}
 }
 
-/**
- * \brief free urlstring memory
+/*
+ * free urlstring memory
  */
 void free_urls(void)
 {
-	struct urlcontent *u;
-
-	while (WC->urlstrings != NULL) {
-		free(WC->urlstrings->url_data);
-		u = WC->urlstrings->next;
-		free(WC->urlstrings);
-		WC->urlstrings = u;
-	}
+	DeleteHash(&WC->urlstrings);
 }
 
-/**
- * \brief Diagnostic function to display the contents of all variables
+/*
+ * Diagnostic function to display the contents of all variables
  */
+
 void dump_vars(void)
 {
-	struct urlcontent *u;
-
-	for (u = WC->urlstrings; u != NULL; u = u->next) {
+	struct wcsession *WCC = WC;
+	urlcontent *u;
+	void *U;
+	long HKLen;
+	char *HKey;
+	HashPos *Cursor;
+	
+	Cursor = GetNewHashPos ();
+	while (GetNextHashPos(WCC->urlstrings, Cursor, &HKLen, &HKey, &U)) {
+		u = (urlcontent*) U;
 		wprintf("%38s = %s\n", u->url_key, u->url_data);
 	}
 }
 
-/**
- * \brief Return the value of a variable supplied to the current web page (from the url or a form)
- * \param key The name of the variable we want
+/*
+ * Return the value of a variable supplied to the current web page (from the url or a form)
  */
-char *bstr(char *key)
+
+const char *XBstr(char *key, size_t keylen, size_t *len)
 {
-	struct urlcontent *u;
+	void *U;
 
-	for (u = WC->urlstrings; u != NULL; u = u->next) {
-		if (!strcasecmp(u->url_key, key))
-			return (u->url_data);
+	if ((WC->urlstrings != NULL) && 
+	    GetHash(WC->urlstrings, key, keylen, &U)) {
+		*len = ((urlcontent *)U)->url_data_size;
+		return ((urlcontent *)U)->url_data;
+	}
+	else {
+		*len = 0;
+		return ("");
 	}
-	return ("");
 }
 
-/**
- * \brief web-printing funcion. uses our vsnprintf wrapper
- * \param format printf format string 
- * \param ... the varargs to put into formatstring
+const char *XBSTR(char *key, size_t *len)
+{
+	void *U;
+
+	if ((WC->urlstrings != NULL) &&
+	    GetHash(WC->urlstrings, key, strlen (key), &U)){
+		*len = ((urlcontent *)U)->url_data_size;
+		return ((urlcontent *)U)->url_data;
+	}
+	else {
+		*len = 0;
+		return ("");
+	}
+}
+
+
+const char *BSTR(char *key)
+{
+	void *U;
+
+	if ((WC->urlstrings != NULL) &&
+	    GetHash(WC->urlstrings, key, strlen (key), &U))
+		return ((urlcontent *)U)->url_data;
+	else	
+		return ("");
+}
+
+const char *Bstr(char *key, size_t keylen)
+{
+	void *U;
+
+	if ((WC->urlstrings != NULL) && 
+	    GetHash(WC->urlstrings, key, keylen, &U))
+		return ((urlcontent *)U)->url_data;
+	else	
+		return ("");
+}
+
+long LBstr(char *key, size_t keylen)
+{
+	void *U;
+
+	if ((WC->urlstrings != NULL) && 
+	    GetHash(WC->urlstrings, key, keylen, &U))
+		return atol(((urlcontent *)U)->url_data);
+	else	
+		return (0);
+}
+
+long LBSTR(char *key)
+{
+	void *U;
+
+	if ((WC->urlstrings != NULL) && 
+	    GetHash(WC->urlstrings, key, strlen(key), &U))
+		return atol(((urlcontent *)U)->url_data);
+	else	
+		return (0);
+}
+
+int IBstr(char *key, size_t keylen)
+{
+	void *U;
+
+	if ((WC->urlstrings != NULL) && 
+	    GetHash(WC->urlstrings, key, keylen, &U))
+		return atoi(((urlcontent *)U)->url_data);
+	else	
+		return (0);
+}
+
+int IBSTR(char *key)
+{
+	void *U;
+
+	if ((WC->urlstrings != NULL) && 
+	    GetHash(WC->urlstrings, key, strlen(key), &U))
+		return atoi(((urlcontent *)U)->url_data);
+	else	
+		return (0);
+}
+
+int HaveBstr(char *key, size_t keylen)
+{
+	void *U;
+
+	if ((WC->urlstrings != NULL) && 
+	    GetHash(WC->urlstrings, key, keylen, &U))
+		return ((urlcontent *)U)->url_data_size != 0;
+	else	
+		return (0);
+}
+
+int HAVEBSTR(char *key)
+{
+	void *U;
+
+	if ((WC->urlstrings != NULL) && 
+	    GetHash(WC->urlstrings, key, strlen(key), &U))
+		return ((urlcontent *)U)->url_data_size != 0;
+	else	
+		return (0);
+}
+
+
+int YesBstr(char *key, size_t keylen)
+{
+	void *U;
+
+	if ((WC->urlstrings != NULL) && 
+	    GetHash(WC->urlstrings, key, keylen, &U))
+		return strcmp( ((urlcontent *)U)->url_data, "yes") == 0;
+	else	
+		return (0);
+}
+
+int YESBSTR(char *key)
+{
+	void *U;
+
+	if ((WC->urlstrings != NULL) && 
+	    GetHash(WC->urlstrings, key, strlen(key), &U))
+		return strcmp( ((urlcontent *)U)->url_data, "yes") == 0;
+	else	
+		return (0);
+}
+
+/*
+ * web-printing funcion. uses our vsnprintf wrapper
  */
 void wprintf(const char *format,...)
 {
@@ -177,12 +335,13 @@ void wprintf(const char *format,...)
 }
 
 
-/**
- * \brief wrap up an HTTP session, closes tags, etc.
- * \todo multiline params?
- * \param print_standard_html_footer should be set to 0 to transmit only, 1 to
- * append the main menu and closing tags, or 2 to
- * append the closing tags only.
+/*
+ * wrap up an HTTP session, closes tags, etc.
+ *
+ * print_standard_html_footer should be set to:
+ * 0 to transmit only,
+ * 1 to append the main menu and closing tags,
+ * 2 to append the closing tags only.
  */
 void wDumpContent(int print_standard_html_footer)
 {
@@ -198,12 +357,13 @@ void wDumpContent(int print_standard_html_footer)
 }
 
 
-/**
- * \brief Copy a string, escaping characters which have meaning in HTML.  
- * \param target target buffer
- * \param strbuf source buffer
- * \param nbsp If nonzero, spaces are converted to non-breaking spaces.
- * \param nolinebreaks if set, linebreaks are removed from the string.
+/*
+ * Copy a string, escaping characters which have meaning in HTML.  
+ *
+ * target		target buffer
+ * strbuf		source buffer
+ * nbsp			If nonzero, spaces are converted to non-breaking spaces.
+ * nolinebreaks		if set, linebreaks are removed from the string.
  */
 long stresc(char *target, long tSize, char *strbuf, int nbsp, int nolinebreaks)
 {
@@ -269,12 +429,6 @@ long stresc(char *target, long tSize, char *strbuf, int nbsp, int nolinebreaks)
 	return (bptr - target);
 }
 
-/**
- * \brief WHAT???
- * \param strbuf what???
- * \param nbsp If nonzero, spaces are converted to non-breaking spaces.
- * \param nolinebreaks if set, linebreaks are removed from the string.
- */ 
 void escputs1(char *strbuf, int nbsp, int nolinebreaks)
 {
 	char *buf;
@@ -288,9 +442,8 @@ void escputs1(char *strbuf, int nbsp, int nolinebreaks)
 	free(buf);
 }
 
-/** 
- * \brief static wrapper for ecsputs1
- * \param strbuf buffer to print escaped to client
+/* 
+ * static wrapper for ecsputs1
  */
 void escputs(char *strbuf)
 {
@@ -298,9 +451,8 @@ void escputs(char *strbuf)
 }
 
 
-/**
- * \brief urlescape buffer and print it to the client
- * \param strbuf buffer to urlescape
+/*
+ * urlescape buffer and print it to the client
  */
 void urlescputs(char *strbuf)
 {
@@ -311,10 +463,8 @@ void urlescputs(char *strbuf)
 }
 
 
-/**
- * \brief Copy a string, escaping characters for JavaScript strings.
- * \param target output string
- * \param strbuf input string
+/*
+ * Copy a string, escaping characters for JavaScript strings.
  */
 void jsesc(char *target, size_t tlen, char *strbuf)
 {
@@ -371,9 +521,8 @@ void jsesc(char *target, size_t tlen, char *strbuf)
 	*tptr = '\0';
 }
 
-/**
- * \brief escape and print java script
- * \param strbuf the js code
+/*
+ * escape and print javascript
  */
 void jsescputs(char *strbuf)
 {
@@ -383,10 +532,8 @@ void jsescputs(char *strbuf)
 	wprintf("%s", outbuf);
 }
 
-/**
- * \brief Copy a string, escaping characters for message text hold
- * \param target target buffer
- * \param strbuf source buffer
+/*
+ * Copy a string, escaping characters for message text hold
  */
 void msgesc(char *target, size_t tlen, char *strbuf)
 {
@@ -427,9 +574,8 @@ void msgesc(char *target, size_t tlen, char *strbuf)
 	*tptr = '\0';
 }
 
-/**
- * \brief print a string to the client after cleaning it with msgesc() and stresc()
- * \param strbuf string to be printed
+/*
+ * print a string to the client after cleaning it with msgesc() and stresc()
  */
 void msgescputs1( char *strbuf)
 {
@@ -448,9 +594,8 @@ void msgescputs1( char *strbuf)
 	free(outbuf2);
 }
 
-/**
- * \brief print a string to the client after cleaning it with msgesc()
- * \param strbuf string to be printed
+/*
+ * print a string to the client after cleaning it with msgesc()
  */
 void msgescputs(char *strbuf) {
 	char *outbuf;
@@ -467,20 +612,20 @@ void msgescputs(char *strbuf) {
 
 
 
-/**
- * \brief Output all that important stuff that the browser will want to see
+/*
+ * Output HTTP headers and leading HTML for a page
  */
-void output_headers(	int do_httpheaders,	/**< 1 = output HTTP headers                          */
-			int do_htmlhead,	/**< 1 = output HTML <head> section and <body> opener */
+void output_headers(	int do_httpheaders,	/* 1 = output HTTP headers                          */
+			int do_htmlhead,	/* 1 = output HTML <head> section and <body> opener */
 
-			int do_room_banner,	/**< 0=no, 1=yes,                                     
-								 * 2 = I'm going to embed my own, so don't open the 
-								 *     <div id="content"> either.                   
-								 */
+			int do_room_banner,	/* 0=no, 1=yes,                                     
+						 * 2 = I'm going to embed my own, so don't open the 
+						 *     <div id="content"> either.                   
+						 */
 
-			int unset_cookies,	/**< 1 = session is terminating, so unset the cookies */
-			int suppress_check,	/**< 1 = suppress check for instant messages          */
-			int cache		/**< 1 = allow browser to cache this page             */
+			int unset_cookies,	/* 1 = session is terminating, so unset the cookies */
+			int suppress_check,	/* 1 = suppress check for instant messages          */
+			int cache		/* 1 = allow browser to cache this page             */
 ) {
 	char cookie[1024];
 	char httpnow[128];
@@ -497,10 +642,17 @@ void output_headers(	int do_httpheaders,	/**< 1 = output HTTP headers
 	}
 
 	if (cache) {
+		char httpTomorow[128];
+
+		http_datestring(httpTomorow, sizeof httpTomorow, 
+				time(NULL) + 60 * 60 * 24 * 2);
+
 		wprintf("Pragma: public\r\n"
 			"Cache-Control: max-age=3600, must-revalidate\r\n"
-			"Last-modified: %s\r\n",
-			httpnow
+			"Last-modified: %s\r\n"
+			"Expires: %s\r\n",
+			httpnow,
+			httpTomorow
 		);
 	}
 	else {
@@ -525,27 +677,28 @@ void output_headers(	int do_httpheaders,	/**< 1 = output HTTP headers
 	if (do_htmlhead) {
 		begin_burst();
 		if (!access("static.local/webcit.css", R_OK)) {
-			svprintf("CSSLOCAL", WCS_STRING,
+			svprintf(HKEY("CSSLOCAL"), WCS_STRING,
 			   "<link href=\"static.local/webcit.css\" rel=\"stylesheet\" type=\"text/css\">"
 			);
 		}
 		do_template("head");
 	}
 
-	/** ICONBAR */
+	/* ICONBAR */
 	if (do_htmlhead) {
 
 
-		/** check for ImportantMessages (these display in a div overlaying the main screen) */
+		/* 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) ) {
@@ -569,11 +722,10 @@ void output_headers(	int do_httpheaders,	/**< 1 = output HTTP headers
 }
 
 
-/**
- * \brief Generic function to do an HTTP redirect.  Easy and fun.
- * \param whichpage target url to 302 to
+/*
+ * Generic function to do an HTTP redirect.  Easy and fun.
  */
-void http_redirect(char *whichpage) {
+void http_redirect(const char *whichpage) {
 	wprintf("HTTP/1.1 302 Moved Temporarily\n");
 	wprintf("Location: %s\r\n", whichpage);
 	wprintf("URI: %s\r\n", whichpage);
@@ -585,10 +737,10 @@ void http_redirect(char *whichpage) {
 
 
 
-/**
- * \brief Output a piece of content to the web browser
+/*
+ * Output a piece of content to the web browser using conformant HTTP and MIME semantics
  */
-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);
@@ -600,7 +752,7 @@ void http_transmit_thing(char *thing, size_t length, char *content_type,
 		PACKAGE_STRING);
 
 #ifdef HAVE_ZLIB
-	/** If we can send the data out compressed, please do so. */
+	/* If we can send the data out compressed, please do so. */
 	if (WC->gzip_ok) {
 		char *compressed_data = NULL;
 		size_t compressed_len;
@@ -624,7 +776,7 @@ void http_transmit_thing(char *thing, size_t length, char *content_type,
 	}
 #endif
 
-	/** No compression ... just send it out as-is */
+	/* No compression ... just send it out as-is */
 	wprintf("Content-length: %ld\r\n"
 		"\r\n",
 		(long) length
@@ -632,20 +784,20 @@ void http_transmit_thing(char *thing, size_t length, char *content_type,
 	client_write(thing, (size_t)length);
 }
 
-/**
- * \brief print menu box like used in the floor view or admin interface.
+/*
+ * print menu box like used in the floor view or admin interface.
  * This function takes pair of strings as va_args, 
- * \param Title Title string of the box
- * \param Class CSS Class for the box
- * \param nLines How many string pairs should we print? (URL, UrlText)
- * \param ... Pairs of URL Strings and their Names
+ * Title	Title string of the box
+ * Class	CSS Class for the box
+ * nLines	How many string pairs should we print? (URL, UrlText)
+ * ...		Pairs of URL Strings and their Names
  */
 void print_menu_box(char* Title, char *Class, int nLines, ...)
 {
 	va_list arg_list;
 	long i;
 	
-	svprintf("BOXTITLE", WCS_STRING, Title);
+	svput("BOXTITLE", WCS_STRING, Title);
 	do_template("beginbox");
 	
 	wprintf("<ul class=\"%s\">", Class);
@@ -667,9 +819,8 @@ void print_menu_box(char* Title, char *Class, int nLines, ...)
 }
 
 
-/**
- * \brief dump out static pages from disk
- * \param what the file urs to print
+/*
+ * dump out static pages from disk
  */
 void output_static(char *what)
 {
@@ -679,7 +830,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");
@@ -691,36 +842,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);
@@ -757,14 +879,13 @@ void output_static(char *what)
 		http_transmit_thing(bigbuffer, (size_t)bytes, content_type, 1);
 		free(bigbuffer);
 	}
-	if (!strcasecmp(bstr("force_close_session"), "yes")) {
+	if (yesbstr("force_close_session")) {
 		end_webcit_session();
 	}
 }
 
-
-/**
- * \brief When the browser requests an image file from the Citadel server,
+/*
+ * When the browser requests an image file from the Citadel server,
  * this function is called to transmit it.
  */
 void output_image()
@@ -772,6 +893,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);
@@ -784,32 +906,74 @@ 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);
+}
 
+/*
+ * Extract an embedded photo from a vCard for display on the client
+ */
+void display_vcard_photo_img(char *msgnum_as_string)
+{
+	long msgnum = 0L;
+	char *vcard;
+	struct vCard *v;
+	char *xferbuf;
+    char *photosrc;
+	int decoded;
+	const char *contentType;
+
+	msgnum = atol(msgnum_as_string);
+	
+	vcard = load_mimepart(msgnum,"1");
+	v = vcard_load(vcard);
+	
+	photosrc = vcard_get_prop(v, "PHOTO", 1,0,0);
+	xferbuf = malloc(strlen(photosrc));
+	if (xferbuf == NULL) {
+		lprintf(5, "xferbuf malloc failed\n");
+		return;
+	}
+	memset(xferbuf, 1, SIZ);
+	decoded = CtdlDecodeBase64(
+		xferbuf,
+		photosrc,
+		strlen(photosrc));
+	contentType = GuessMimeType(xferbuf, decoded);
+	http_transmit_thing(xferbuf, decoded, contentType, 0);
+	free(v);
+	free(photosrc);
+	free(xferbuf);
 }
 
-/**
- * \brief Generic function to output an arbitrary MIME part from an arbitrary
- *        message number on the server.
+/*
+ * Generic function to output an arbitrary MIME part from an arbitrary
+ * message number on the server.
  *
- * \param msgnum		Number of the item on the citadel server
- * \param partnum		The MIME part to be output
- * \param force_download	Nonzero to force set the Content-Type: header
- *                              to "application/octet-stream"
+ * msgnum		Number of the item on the citadel server
+ * partnum		The MIME part to be output
+ * force_download	Nonzero to force set the Content-Type: header to "application/octet-stream"
  */
 void mimepart(char *msgnum, char *partnum, int force_download)
 {
@@ -846,10 +1010,8 @@ void mimepart(char *msgnum, char *partnum, int force_download)
 }
 
 
-/**
- * \brief Read any MIME part of a message, from the server, into memory.
- * \param msgnum number of the message on the citadel server
- * \param partnum the MIME part to be loaded
+/*
+ * Read any MIME part of a message, from the server, into memory.
  */
 char *load_mimepart(long msgnum, char *partnum)
 {
@@ -877,11 +1039,12 @@ char *load_mimepart(long msgnum, char *partnum)
 }
 
 
-/**
- * \brief Convenience functions to display a page containing only a string
- * \param titlebarcolor color of the titlebar of the frame
- * \param titlebarmsg text to display in the title bar
- * \param messagetext body of the box
+/*
+ * Convenience functions to display a page containing only a string
+ *
+ * titlebarcolor	color of the titlebar of the frame
+ * titlebarmsg		text to display in the title bar
+ * messagetext		body of the box
  */
 void convenience_page(char *titlebarcolor, char *titlebarmsg, char *messagetext)
 {
@@ -899,8 +1062,8 @@ void convenience_page(char *titlebarcolor, char *titlebarmsg, char *messagetext)
 }
 
 
-/**
- * \brief Display a blank page.
+/*
+ * Display a blank page.
  */
 void blank_page(void) {
 	output_headers(1, 1, 0, 0, 0, 0);
@@ -908,8 +1071,8 @@ void blank_page(void) {
 }
 
 
-/**
- * \brief A template has been requested
+/*
+ * A template has been requested
  */
 void url_do_template(void) {
 	do_template(bstr("template"));
@@ -917,8 +1080,8 @@ void url_do_template(void) {
 
 
 
-/**
- * \brief Offer to make any page the user's "start page."
+/*
+ * Offer to make any page the user's "start page."
  */
 void offer_start_page(void) {
 	wprintf("<a href=\"change_start_page?startpage=");
@@ -936,8 +1099,8 @@ void offer_start_page(void) {
 }
 
 
-/**
- * \brief Change the user's start page
+/*
+ * Change the user's start page
  */
 void change_start_page(void) {
 
@@ -949,7 +1112,7 @@ void change_start_page(void) {
 		return;
 	}
 
-	set_preference("startpage", bstr("startpage"), 1);
+	set_preference("startpage", NewStrBufPlain(bstr("startpage"), -1), 1);
 
 	output_headers(1, 1, 0, 0, 0, 0);
 	do_template("newstartpage");
@@ -958,9 +1121,8 @@ void change_start_page(void) {
 
 
 
-/**
- * \brief convenience function to indicate success
- * \param successmessage the mesage itself
+/*
+ * convenience function to indicate success
  */
 void display_success(char *successmessage)
 {
@@ -968,15 +1130,14 @@ void display_success(char *successmessage)
 }
 
 
-/**
- * \brief Authorization required page 
+/*
+ * Authorization required page 
  * This is probably temporary and should be revisited 
- * \param message message to put in header
-*/
+ */
 void authorization_required(const char *message)
 {
 	wprintf("HTTP/1.1 401 Authorization Required\r\n");
-	wprintf("WWW-Authenticate: Basic realm=\"\"\r\n", serv_info.serv_humannode);
+	wprintf("WWW-Authenticate: Basic realm=\"%s\"\r\n", serv_info.serv_humannode);
 	wprintf("Content-Type: text/html\r\n\r\n");
 	wprintf("<h1>");
 	wprintf(_("Authorization Required"));
@@ -986,40 +1147,46 @@ void authorization_required(const char *message)
 	wDumpContent(0);
 }
 
-/**
- * \brief This function is called by the MIME parser to handle data uploaded by
- *        the browser.  Form data, uploaded files, and the data from HTTP PUT
- *        operations (such as those found in GroupDAV) all arrive this way.
+/*
+ * This function is called by the MIME parser to handle data uploaded by
+ * the browser.  Form data, uploaded files, and the data from HTTP PUT
+ * operations (such as those found in GroupDAV) all arrive this way.
  *
- * \param name Name of the item being uploaded
- * \param filename Filename of the item being uploaded
- * \param partnum MIME part identifier (not needed)
- * \param disp MIME content disposition (not needed)
- * \param content The actual data
- * \param cbtype MIME content-type
- * \param cbcharset Character set
- * \param length Content length
- * \param encoding MIME encoding type (not needed)
- * \param userdata Not used here
+ * name		Name of the item being uploaded
+ * filename	Filename of the item being uploaded
+ * partnum	MIME part identifier (not needed)
+ * disp		MIME content disposition (not needed)
+ * content	The actual data
+ * cbtype	MIME content-type
+ * cbcharset	Character set
+ * length	Content length
+ * encoding	MIME encoding type (not needed)
+ * userdata	Not used here
  */
 void upload_handler(char *name, char *filename, char *partnum, char *disp,
 			void *content, char *cbtype, char *cbcharset,
 			size_t length, char *encoding, void *userdata)
 {
-	struct urlcontent *u;
-
+	urlcontent *u;
+#ifdef DEBUG_URLSTRINGS
 	lprintf(9, "upload_handler() name=%s, type=%s, len=%d\n", name, cbtype, length);
+#endif
+	if (WC->urlstrings == NULL)
+		WC->urlstrings = NewHash(1, NULL);
 
 	/* Form fields */
 	if ( (length > 0) && (IsEmptyStr(cbtype)) ) {
-		u = (struct urlcontent *) malloc(sizeof(struct urlcontent));
-		u->next = WC->urlstrings;
-		WC->urlstrings = u;
+		u = (urlcontent *) malloc(sizeof(urlcontent));
+		
 		safestrncpy(u->url_key, name, sizeof(u->url_key));
 		u->url_data = malloc(length + 1);
+		u->url_data_size = length;
 		memcpy(u->url_data, content, length);
 		u->url_data[length] = 0;
-		/* lprintf(9, "Key: <%s>  Data: <%s>\n", u->url_key, u->url_data); */
+		Put(WC->urlstrings, u->url_key, strlen(u->url_key), u, free_url);
+#ifdef DEBUG_URLSTRINGS
+		lprintf(9, "Key: <%s> len: [%ld] Data: <%s>\n", u->url_key, u->url_data_size, u->url_data);
+#endif
 	}
 
 	/** Uploaded files */
@@ -1040,8 +1207,8 @@ void upload_handler(char *name, char *filename, char *partnum, char *disp,
 
 }
 
-/**
- * \brief Convenience functions to wrap around asynchronous ajax responses
+/*
+ * Convenience functions to wrap around asynchronous ajax responses
  */
 void begin_ajax_response(void) {
         output_headers(0, 0, 0, 0, 0, 0);
@@ -1057,16 +1224,16 @@ void begin_ajax_response(void) {
         begin_burst();
 }
 
-/**
- * \brief print ajax response footer 
+/*
+ * print ajax response footer 
  */
 void end_ajax_response(void) {
         wprintf("\r\n");
         wDumpContent(0);
 }
 
-/**
- * \brief Wraps a Citadel server command in an AJAX transaction.
+/*
+ * Wraps a Citadel server command in an AJAX transaction.
  */
 void ajax_servcmd(void)
 {
@@ -1110,7 +1277,7 @@ void ajax_servcmd(void)
 
 	end_ajax_response();
 	
-	/**
+	/*
 	 * This is kind of an ugly hack, but this is the only place it can go.
 	 * If the command was GEXP, then the instant messenger window must be
 	 * running, so reset the "last_pager_check" watchdog timer so
@@ -1122,8 +1289,8 @@ void ajax_servcmd(void)
 }
 
 
-/**
- * \brief Helper function for the asynchronous check to see if we need
+/*
+ * Helper function for the asynchronous check to see if we need
  * to open the instant messenger window.
  */
 void seconds_since_last_gexp(void)
@@ -1147,11 +1314,23 @@ void seconds_since_last_gexp(void)
 	end_ajax_response();
 }
 
+/**
+ * \brief Detects a 'mobile' user agent 
+ */
+int is_mobile_ua(char *user_agent) {
+	if (strstr(user_agent,"iPhone OS") != NULL) {
+		return 1;
+	} else if (strstr(user_agent,"Windows CE") != NULL) {
+		return 1;
+	} else if (strstr(user_agent,"SymbianOS") != NULL) {
+		return 1;
+	}
+	return 0;
+}
 
 
-
-/**
- * \brief Entry point for WebCit transaction
+/*
+ * Entry point for WebCit transaction
  */
 void session_loop(struct httprequest *req)
 {
@@ -1165,7 +1344,6 @@ void session_loop(struct httprequest *req)
 	char pathname[1024];
 	int a, b, nBackDots, nEmpty;
 	int ContentLength = 0;
-	int BytesRead = 0;
 	char ContentType[512];
 	char *content = NULL;
 	char *content_end = NULL;
@@ -1176,7 +1354,7 @@ void session_loop(struct httprequest *req)
 	int is_static = 0;
 	int n_static = 0;
 	int len = 0;
-	/**
+	/*
 	 * We stuff these with the values coming from the client cookies,
 	 * so we can use them to reconnect a timed out session if we have to.
 	 */
@@ -1198,8 +1376,7 @@ void session_loop(struct httprequest *req)
 
 	WC->upload_length = 0;
 	WC->upload = NULL;
-	WC->vars = NULL;
-	WC->is_wap = 0;
+	WC->is_mobile = 0;
 
 	hptr = req;
 	if (hptr == NULL) return;
@@ -1257,6 +1434,9 @@ void session_loop(struct httprequest *req)
 		}
 		else if (!strncasecmp(buf, "User-agent: ", 12)) {
 			safestrncpy(user_agent, &buf[12], sizeof user_agent);
+			if (is_mobile_ua(&buf[12])) {
+				WC->is_mobile = 1;
+			}
 		}
 		else if (!strncasecmp(buf, "X-Forwarded-Host: ", 18)) {
 			if (follow_xff) {
@@ -1275,25 +1455,24 @@ void session_loop(struct httprequest *req)
 			}
 			striplt(browser_host);
 		}
-		/** Only WAP gateways explicitly name this content-type */
-		else if (strstr(buf, "text/vnd.wap.wml")) {
-			WC->is_wap = 1;
-		}
 	}
 
 	if (ContentLength > 0) {
-		content = malloc(ContentLength + SIZ);
-		memset(content, 0, ContentLength + SIZ);
-		snprintf(content,  ContentLength + SIZ, "Content-type: %s\n"
+		int BuffSize;
+
+		BuffSize = ContentLength + SIZ;
+		content = malloc(BuffSize);
+		memset(content, 0, BuffSize);
+		snprintf(content,  BuffSize, "Content-type: %s\n"
 				"Content-length: %d\n\n",
 				ContentType, ContentLength);
 		body_start = strlen(content);
 
 		/** Read the entire input data at once. */
-		client_read(WC->http_sock, &content[BytesRead+body_start], ContentLength);
+		client_read(WC->http_sock, &content[body_start], ContentLength);
 
 		if (!strncasecmp(ContentType, "application/x-www-form-urlencoded", 33)) {
-			addurls(&content[body_start]);
+			addurls(&content[body_start], ContentLength);
 		} else if (!strncasecmp(ContentType, "multipart", 9)) {
 			content_end = content + ContentLength + body_start;
 			mime_parser(content, content_end, *upload_handler, NULL, NULL, NULL, 0);
@@ -1302,12 +1481,12 @@ void session_loop(struct httprequest *req)
 		content = NULL;
 	}
 
-	/** make a note of where we are in case the user wants to save it */
+	/* make a note of where we are in case the user wants to save it */
 	safestrncpy(WC->this_page, cmd, sizeof(WC->this_page));
 	remove_token(WC->this_page, 2, ' ');
 	remove_token(WC->this_page, 0, ' ');
 
-	/** If there are variables in the URL, we must grab them now */
+	/* If there are variables in the URL, we must grab them now */
 	len = strlen(cmd);
 	for (a = 0; a < len; ++a) {
 		if ((cmd[a] == '?') || (cmd[a] == '&')) {
@@ -1317,13 +1496,13 @@ void session_loop(struct httprequest *req)
 					len = b - 1;
 				}
 			}
-			addurls(&cmd[a + 1]);
+			addurls(&cmd[a + 1], len - a);
 			cmd[a] = 0;
 			len = a - 1;
 		}
 	}
 
-	/** If it's a "force 404" situation then display the error and bail. */
+	/* If it's a "force 404" situation then display the error and bail. */
 	if (!strcmp(action, "404")) {
 		wprintf("HTTP/1.1 404 Not found\r\n");
 		wprintf("Content-Type: text/plain\r\n");
@@ -1332,7 +1511,7 @@ void session_loop(struct httprequest *req)
 		goto SKIP_ALL_THIS_CRAP;
 	}
 
-	/** Static content can be sent without connecting to Citadel. */
+	/* Static content can be sent without connecting to Citadel. */
 	is_static = 0;
 	for (a=0; a<ndirs; ++a) {
 		if (!strcasecmp(action, (char*)static_content_dirs[a])) { /* map web to disk location */
@@ -1373,7 +1552,7 @@ void session_loop(struct httprequest *req)
 	if (strlen(bstr("nonce")) > 0) {
 		lprintf(9, "Comparing supplied nonce %s to session nonce %ld\n", 
 			bstr("nonce"), WC->nonce);
-		if (atoi(bstr("nonce")) != WC->nonce) {
+		if (ibstr("nonce") != WC->nonce) {
 			lprintf(9, "Ignoring request with mismatched nonce.\n");
 			wprintf("HTTP/1.1 404 Security check failed\r\n");
 			wprintf("Content-Type: text/plain\r\n");
@@ -1383,7 +1562,7 @@ void session_loop(struct httprequest *req)
 		}
 	}
 
-	/**
+	/*
 	 * If we're not connected to a Citadel server, try to hook up the
 	 * connection now.
 	 */
@@ -1434,21 +1613,19 @@ void session_loop(struct httprequest *req)
 		}
 	}
 
-	/**
+	/*
 	 * Functions which can be performed without logging in
 	 */
 	if (!strcasecmp(action, "listsub")) {
 		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,
 	 * try logging in to Citadel using that.
 	 */
@@ -1466,14 +1643,14 @@ void session_loop(struct httprequest *req)
 				safestrncpy(WC->httpauth_user, c_httpauth_user, sizeof WC->httpauth_user);
 				safestrncpy(WC->httpauth_pass, c_httpauth_pass, sizeof WC->httpauth_pass);
 			} else {
-				/** Should only display when password is wrong */
+				/* Should only display when password is wrong */
 				authorization_required(&buf[4]);
 				goto SKIP_ALL_THIS_CRAP;
 			}
 		}
 	}
 
-	/** This needs to run early */
+	/* This needs to run early */
 #ifdef TECH_PREVIEW
 	if (!strcasecmp(action, "rss")) {
 		display_rss(bstr("room"), request_method);
@@ -1481,7 +1658,7 @@ void session_loop(struct httprequest *req)
 	}
 #endif
 
-	/** 
+	/* 
 	 * The GroupDAV stuff relies on HTTP authentication instead of
 	 * our session's authentication.
 	 */
@@ -1495,7 +1672,7 @@ void session_loop(struct httprequest *req)
 	}
 
 
-	/**
+	/*
 	 * Automatically send requests with any method other than GET or
 	 * POST to the GroupDAV code as well.
 	 */
@@ -1508,7 +1685,7 @@ void session_loop(struct httprequest *req)
 		goto SKIP_ALL_THIS_CRAP;
 	}
 
-	/**
+	/*
 	 * If we're not logged in, but we have username and password cookies
 	 * supplied by the browser, try using them to log in.
 	 */
@@ -1525,7 +1702,7 @@ void session_loop(struct httprequest *req)
 			}
 		}
 	}
-	/**
+	/*
 	 * If we don't have a current room, but a cookie specifying the
 	 * current room is supplied, make an effort to go there.
 	 */
@@ -1539,21 +1716,46 @@ 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
-		 * before doing anything else!
-		 */
+	/*
+	 * All functions handled below this point ... make sure we log in
+	 * before doing anything else!
+	 */
 	} else if ((!WC->logged_in) && (!strcasecmp(action, "login"))) {
 		do_login();
+	} else if ((!WC->logged_in) && (!strcasecmp(action, "display_openid_login"))) {
+		display_openid_login(NULL);
+	} else if ((!WC->logged_in) && (!strcasecmp(action, "openid_login"))) {
+		do_openid_login();
+	} else if (!strcasecmp(action, "finalize_openid_login")) {
+		finalize_openid_login();
+	} else if (!strcasecmp(action, "openid_manual_create")) {
+		openid_manual_create();
 	} else if (!WC->logged_in) {
 		display_login(NULL);
 	}
 
-	/**
+	/*
 	 * Various commands...
 	 */
 
+	else {
+		void *vHandler;
+		WebcitHandler *Handler;
+
+		GetHash(HandlerHash, action, strlen(action) /* TODO*/, &vHandler),
+			Handler = (WebcitHandler*) vHandler;
+		if (Handler != NULL) {
+			if (Handler->IsAjax)
+				begin_ajax_response();
+			Handler->F();
+			if (Handler->IsAjax)
+				end_ajax_response();
+		}
+		
+
 	else if (!strcasecmp(action, "do_welcome")) {
 		do_welcome();
 	} else if (!strcasecmp(action, "blank")) {
@@ -1636,6 +1838,8 @@ void session_loop(struct httprequest *req)
 		print_message(index[1]);
 	} else if (!strcasecmp(action, "msgheaders")) {
 		display_headers(index[1]);
+	} else if (!strcasecmp(action, "vcardphoto")) {
+		display_vcard_photo_img(index[1]);	
 	} else if (!strcasecmp(action, "wiki")) {
 		display_wiki_page();
 	} else if (!strcasecmp(action, "display_enter")) {
@@ -1695,18 +1899,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")) {
@@ -1786,7 +2007,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")) {
@@ -1799,7 +2019,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")) {
@@ -1862,21 +2081,31 @@ void session_loop(struct httprequest *req)
 		dump_vars();
 		wprintf("</PRE><hr />\n");
 		wDumpContent(1);
-	} else if (!strcasecmp(action, "updatenote")) {
-		updatenote();
+	} else if (!strcasecmp(action, "add_new_note")) {
+		add_new_note();
+	} else if (!strcasecmp(action, "ajax_update_note")) {
+		ajax_update_note();
 	} 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")) {
 		upload_file();
+	} else if (!strcasecmp(action, "display_openids")) {
+		display_openids();
+	} else if (!strcasecmp(action, "openid_attach")) {
+		openid_attach();
+	} else if (!strcasecmp(action, "openid_detach")) {
+		openid_detach();
 	}
 
-	/** When all else fais, display the main menu. */
+	/* When all else fais, display the main menu. */
 	else {
 		display_main_menu();
 	}
-
+}
 SKIP_ALL_THIS_CRAP:
 	fflush(stdout);
 	if (content != NULL) {
@@ -1890,9 +2119,9 @@ SKIP_ALL_THIS_CRAP:
 	}
 }
 
-/**
- * \brief Replacement for sleep() that uses select() in order to avoid SIGALRM
- * \param seconds how many seconds should we sleep?
+
+/*
+ * Replacement for sleep() that uses select() in order to avoid SIGALRM
  */
 void sleeeeeeeeeep(int seconds)
 {
@@ -1904,4 +2133,3 @@ void sleeeeeeeeeep(int seconds)
 }
 
 
-/*@}*/