Merge new summary view branches changes into trunk

[citadel.git] / webcit / webcit.c

diff --git a/webcit/webcit.c b/webcit/webcit.c
index 56371be92483eb26d0f212ab1f7da52ff590b7a9..2be182799aeef85f603c2eca3510db0ef82c7ca7 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -175,11 +175,7 @@ void output_headers(       int do_httpheaders,     /* 1 = output HTTP headers
                }
 
                if ( (WC->logged_in) && (!unset_cookies) ) {
-                       wprintf("<div id=\"iconbar\">");
-                       do_selected_iconbar();
-                       /** check for instant messages (these display in a new window) */
-                       page_popup();
-                       wprintf("</div>");
+                 DoTemplate(HKEY("iconbar"), NULL, &NoCtx);
                }
 
                if (do_room_banner == 1) {
@@ -194,6 +190,13 @@ void output_headers(       int do_httpheaders,     /* 1 = output HTTP headers
        }
 }
 
+void output_custom_content_header(const char *ctype) {
+  hprintf("HTTP/1.1 200 OK\r\n");
+  hprintf("Content-type: %s; charset=utf-8\r\n",ctype);
+  hprintf("Server: %s / %s\r\n", PACKAGE_STRING, ChrPtr(serv_info.serv_software));
+  hprintf("Connection: close\r\n");
+}
+
 
 /*
  * Generic function to do an HTTP redirect.  Easy and fun.
@@ -1005,6 +1008,10 @@ void session_loop(HashList *HTTPHeaders, StrBuf *ReqLine, StrBuf *request_method
        }
 
 SKIP_ALL_THIS_CRAP:
+       if (WCC->SavePrefsToServer) {
+               save_preferences();
+               WCC->SavePrefsToServer = 0;
+       }
        FreeStrBuf(&Buf);
        FreeStrBuf(&c_username);
        FreeStrBuf(&c_password);