projects / citadel.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Performed a bunch of markup fixes suggested by validator.w3.org
[citadel.git] / webcit / webcit.c
diff --git a/webcit/webcit.c b/webcit/webcit.c
index a234824210c9cba351648a4b078ecaf3d03dcf89..da57d4723a717f8e00315d11a1e3ce1860279bd0 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -186,7 +186,7 @@ void output_headers(        int do_httpheaders,     /* 1 = output HTTP headers                        */
                        wc_printf("<div id=\"important_message\">\n"
                                "<span class=\"imsg\">");
                        StrEscAppend(WCC->WBuf, NULL, WCC->ImportantMessage, 0, 0);
-                       wc_printf("</span><br />\n"
+                       wc_printf("</span><br>\n"
                                "</div>\n"
                        );
                        StrBufAppendBufPlain(WCC->trailing_javascript,
@@ -199,7 +199,7 @@ void output_headers(        int do_httpheaders,     /* 1 = output HTTP headers                        */
                        wc_printf("<div id=\"important_message\">\n"
                                "<span class=\"imsg\">");
                        StrEscAppend(WCC->WBuf, WCC->ImportantMsg, NULL, 0, 0);
-                       wc_printf("</span><br />\n"
+                       wc_printf("</span><br>\n"
                                "</div>\n"
                        );
                        StrBufAppendBufPlain(WCC->trailing_javascript,
@@ -250,15 +250,10 @@ void http_redirect(const char *whichpage) {
 /*
  * Output a piece of content to the web browser using conformant HTTP and MIME semantics
  */
-void http_transmit_thing(const char *content_type,
-                        int is_static) {
+void http_transmit_thing(const char *content_type, int is_static)
+{
 
-#ifndef TECH_PREVIEW
-       lprintf(9, "http_transmit_thing(%s)%s\n",
-               content_type,
-               ((is_static > 0) ? " (static)" : "")
-       );
-#endif
+       lprintf(9, "http_transmit_thing(%s)%s\n", content_type, ((is_static > 0) ? " (static)" : ""));
        output_headers(0, 0, 0, 0, 0, is_static);
 
        hprintf("Content-type: %s\r\n"
@@ -326,8 +321,7 @@ void display_success(char *successmessage)
 
 
 /*
- * Authorization required page 
- * This is probably temporary and should be revisited 
+ * Authorization required page (sends a 401, causing the browser to request login credentials)
  */
 void authorization_required(void)
 {
@@ -657,7 +651,17 @@ void session_loop(void)
         * connection now.
         */
        if (!WCC->connected) {
-               if (GetConnected ())
+               if (GetConnected()) {
+                       hprintf("HTTP/1.1 503 Service Unavailable\r\n");
+                       hprintf("Content-Type: text/html\r\n");
+                       begin_burst();
+                       wc_printf("<html><head><title>503 Service Unavailable</title></head><body>\n");
+                       wc_printf(_("This program was unable to connect or stay "
+                               "connected to the Citadel server.  Please report "
+                               "this problem to your system administrator.")
+                       );
+                       wc_printf("</body></html>\n");
+                       end_burst();
                        goto SKIP_ALL_THIS_CRAP;
        }
 
@@ -730,7 +734,10 @@ void session_loop(void)
        }
 
        if (WCC->Hdr->HR.Handler != NULL) {
-               if (!WCC->logged_in && ((WCC->Hdr->HR.Handler->Flags & ANONYMOUS) == 0)) {
+               if (    (!WCC->logged_in)
+                       && ((WCC->Hdr->HR.Handler->Flags & ANONYMOUS) == 0)
+                       && (WCC->serv_info->serv_supports_guest == 0)
+               ) {
                        display_login();
                }
                else {
@@ -745,17 +752,19 @@ void session_loop(void)
                                end_ajax_response();
                }
        }
-       /* When all else fais, display the main menu. */
+       /* When all else fails, display the default landing page or a main menu. */
        else {
                /* 
                 * ordinary browser users get a nice login screen, DAV etc. requsets
                 * are given a 401 so they can handle it appropriate.
                 */
                if (!WCC->logged_in)  {
-                       if (xhttp)
+                       if (xhttp) {
                                authorization_required();
-                       else 
-                               display_login();
+                       }
+                       else {
+                               display_default_landing_page();
+                       }
                }
                /*
                 * Toplevel dav requests? or just a flat browser request? 
@@ -774,6 +783,23 @@ SKIP_ALL_THIS_CRAP:
 }
 
 
+
+/*
+ * Display the appropriate landing page for this site.
+ */
+void display_default_landing_page(void) {
+       if (WC->serv_info->serv_supports_guest) {
+               /* default action.  probably revisit this. */
+               StrBuf *teh_lobby = NewStrBufPlain(HKEY("_BASEROOM_"));
+               smart_goto(teh_lobby);
+               FreeStrBuf(&teh_lobby);
+       }
+       else {
+               display_login();
+       }
+}
+
+
 /*
  * Replacement for sleep() that uses select() in order to avoid SIGALRM
  */
Citadel server, clients, utilities