When registering a new user during an inline login, preserve the room we started...

[citadel.git] / webcit / webcit.c

diff --git a/webcit/webcit.c b/webcit/webcit.c
index 943b185df238844eebae02fd98085b290f9873e4..4b317d9352b2f415d7843b4c73945a09ec25c356 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -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"));
@@ -511,11 +512,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 +704,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 +731,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;