The 'static redirects' file may now contain a special token called 'home' which can...

[citadel.git] / webcit / webcit.c

diff --git a/webcit/webcit.c b/webcit/webcit.c
index 943b185df238844eebae02fd98085b290f9873e4..117f8fdf9e0c2147ae00704398395ef77f3e7b01 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -123,7 +123,7 @@ void wDumpContent(int print_standard_html_footer)
 {
        if (print_standard_html_footer) {
                wc_printf("</div> <!-- end of 'content' div -->\n");
-               do_template("trailing", NULL);
+               do_template("trailing");
        }
 
        /* If we've been saving it all up for one big output burst,
@@ -195,7 +195,7 @@ void output_headers(        int do_httpheaders,     /* 1 = output HTTP headers                        */
 
        if (do_htmlhead) {
                begin_burst();
-               do_template("head", NULL);
+               do_template("head");
 
                /* check for ImportantMessages (these display in a div overlaying the main screen) */
                if (!IsEmptyStr(WCC->ImportantMessage)) {
@@ -406,6 +406,7 @@ void ajax_servcmd(void)
        char *junk;
        size_t len;
 
+       syslog(LOG_DEBUG, "ajax_servcmd() g_cmd=\"%s\"\n", bstr("g_cmd") );
        begin_ajax_response();
        Buf = NewStrBuf();
        serv_puts(bstr("g_cmd"));
@@ -423,7 +424,8 @@ void ajax_servcmd(void)
                }
        case 1:
                while (!Done) {
-                       StrBuf_ServGetln(Buf);
+                       if (StrBuf_ServGetln(Buf) < 0)
+                               break;
                        if ( (StrLength(Buf)==3) && 
                             !strcmp(ChrPtr(Buf), "000")) {
                                Done = 1;
@@ -511,11 +513,33 @@ void push_destination(void) {
 void pop_destination(void) {
        wcsession *WCC = WC;
 
+       /*
+        * If we are in the middle of a new user signup, the server may request that
+        * we first pass through a registration screen.
+        */
+       if ((WCC) && (WCC->need_regi)) {
+               if ((WCC->PushedDestination != NULL) && (StrLength(WCC->PushedDestination) > 0)) {
+                       /* Registering will take us to the My Citadel Config room, so save our place */
+                       StrBufAppendBufPlain(WCC->PushedDestination, HKEY("?go="), 0);
+                       StrBufUrlescAppend(WCC->PushedDestination, WCC->CurRoom.name, NULL);
+               }
+               WCC->need_regi = 0;
+               display_reg(1);
+               return;
+       }
+
+       /*
+        * Do something reasonable if we somehow ended up requesting a pop without
+        * having first done a push.
+        */
        if ( (!WCC) || (WCC->PushedDestination == NULL) || (StrLength(WCC->PushedDestination) == 0) ) {
                do_welcome();
                return;
        }
 
+       /*
+        * All righty then!  We have a destination saved, so go there now.
+        */
        syslog(9, "Pop: %s\n", ChrPtr(WCC->PushedDestination));
        http_redirect(ChrPtr(WCC->PushedDestination));
 }
@@ -681,8 +705,9 @@ void session_loop(void)
 
        /* If the client sent a nonce that is incorrect, kill the request. */
        if (havebstr("nonce")) {
-               syslog(9, "Comparing supplied nonce %s to session nonce %ld\n", 
-                       bstr("nonce"), WCC->nonce);
+               syslog(9, "Comparing supplied nonce %s to session nonce %d\n", 
+                       bstr("nonce"), WCC->nonce
+               );
                if (ibstr("nonce") != WCC->nonce) {
                        syslog(9, "Ignoring request with mismatched nonce.\n");
                        hprintf("HTTP/1.1 404 Security check failed\r\n");
@@ -707,6 +732,11 @@ void session_loop(void)
                                "connected to the Citadel server.  Please report "
                                "this problem to your system administrator.")
                        );
+                       wc_printf("<br>");
+                       wc_printf("<a href=\"http://www.citadel.org/doku.php/"
+                               "faq:generalquestions:webcit_unable_to_connect\">%s</a>",
+                               _("Read More...")
+                       );
                        wc_printf("</body></html>\n");
                        end_burst();
                        goto SKIP_ALL_THIS_CRAP;
@@ -843,11 +873,19 @@ 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);
+       wcsession *WCC = WC;
+
+       if (WCC && WCC->serv_info && WCC->serv_info->serv_supports_guest) {
+               /* default action */
+
+               if (default_landing_page) {
+                       http_redirect(default_landing_page);
+               }
+               else {
+                       StrBuf *teh_lobby = NewStrBufPlain(HKEY("_BASEROOM_"));
+                       smart_goto(teh_lobby);
+                       FreeStrBuf(&teh_lobby);
+               }
        }
        else {
                display_login();