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 5d213a5f0389bd036b7ebc3e92d175a240a10110..4b317d9352b2f415d7843b4c73945a09ec25c356 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -269,7 +269,7 @@ void http_redirect(const char *whichpage) {
 void http_transmit_thing(const char *content_type, int is_static)
 {
 
-       lprintf(9, "http_transmit_thing(%s)%s\n", content_type, ((is_static > 0) ? " (static)" : ""));
+       syslog(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"
@@ -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"));
@@ -501,7 +502,7 @@ void push_destination(void) {
 
        FreeStrBuf(&WCC->PushedDestination);
        WCC->PushedDestination = NewStrBufDup(SBSTR("url"));
-       lprintf(9, "Push: %s\n", ChrPtr(WCC->PushedDestination));
+       syslog(9, "Push: %s\n", ChrPtr(WCC->PushedDestination));
        wc_printf("OK");
 }
 
@@ -511,12 +512,34 @@ 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;
        }
 
-       lprintf(9, "Pop: %s\n", ChrPtr(WCC->PushedDestination));
+       /*
+        * 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));
 }
 
@@ -582,7 +605,7 @@ void ParseREST_URL(void)
        HashList *Floors;
        void *vFloor;
 
-       lprintf(1, "parsing rest URL: %s\n", ChrPtr(WCC->Hdr->HR.ReqLine));
+       syslog(1, "parsing rest URL: %s\n", ChrPtr(WCC->Hdr->HR.ReqLine));
 
        WCC->Directory = NewHash(1, Flathash);
        WCC->CurrentFloor = NULL;
@@ -654,7 +677,6 @@ void session_loop(void)
        WCC= WC;
        WCC->upload_length = 0;
        WCC->upload = NULL;
-       WCC->is_mobile = 0;
        WCC->Hdr->nWildfireHeaders = 0;
        if (WCC->Hdr->HR.Handler != NULL)
                Flags = WCC->Hdr->HR.Handler->Flags; /* so we can temporarily add our own... */
@@ -682,10 +704,11 @@ void session_loop(void)
 
        /* If the client sent a nonce that is incorrect, kill the request. */
        if (havebstr("nonce")) {
-               lprintf(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) {
-                       lprintf(9, "Ignoring request with mismatched nonce.\n");
+                       syslog(9, "Ignoring request with mismatched nonce.\n");
                        hprintf("HTTP/1.1 404 Security check failed\r\n");
                        hprintf("Content-Type: text/plain\r\n");
                        begin_burst();
@@ -708,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;
@@ -751,16 +779,23 @@ void session_loop(void)
                (WCC->Hdr->HR.eReqType != eHEAD);
 
        /*
-        * If a 'go' parameter has been specified, attempt to goto that room
+        * If a 'go' (or 'gotofirst') parameter has been specified, attempt to goto that room
         * prior to doing anything else.
         */
        if (havebstr("go")) {
                int ret;
-               lprintf(9, "Explicit room selection: %s\n", bstr("go"));
+               syslog(9, "Explicit room selection: %s\n", bstr("go"));
                ret = gotoroom(sbstr("go"));    /* do quietly to avoid session output! */
                if ((ret/100) != 2) {
-                       lprintf(1, "GOTOFIRST: Unable to change to [%s]; Reason: %d\n",
-                               bstr("go"), ret);
+                       syslog(1, "Unable to change to [%s]; Reason: %d\n", bstr("go"), ret);
+               }
+       }
+       else if (havebstr("gotofirst")) {
+               int ret;
+               syslog(9, "Explicit room selection: %s\n", bstr("gotofirst"));
+               ret = gotoroom(sbstr("gotofirst"));     /* do quietly to avoid session output! */
+               if ((ret/100) != 2) {
+                       syslog(1, "Unable to change to [%s]; Reason: %d\n", bstr("gotofirst"), ret);
                }
        }
 
@@ -771,13 +806,13 @@ void session_loop(void)
        else if ( (StrLength(WCC->CurRoom.name) == 0) && ( (StrLength(WCC->Hdr->c_roomname) > 0) )) {
                int ret;
 
-               lprintf(9, "We are in '%s' but cookie indicates '%s', going there...\n",
+               syslog(9, "We are in '%s' but cookie indicates '%s', going there...\n",
                        ChrPtr(WCC->CurRoom.name),
                        ChrPtr(WCC->Hdr->c_roomname)
                );
                ret = gotoroom(WCC->Hdr->c_roomname);   /* do quietly to avoid session output! */
                if ((ret/100) != 2) {
-                       lprintf(1, "COOKIEGOTO: Unable to change to [%s]; Reason: %d\n",
+                       syslog(1, "COOKIEGOTO: Unable to change to [%s]; Reason: %d\n",
                                ChrPtr(WCC->Hdr->c_roomname), ret);
                }
        }
@@ -946,11 +981,11 @@ InitModule_WEBCIT
        
        snprintf(dir, SIZ, "%s/webcit.css", static_local_dir);
        if (!access(dir, R_OK)) {
-               lprintf(9, "Using local Stylesheet [%s]\n", dir);
+               syslog(9, "Using local Stylesheet [%s]\n", dir);
                csslocal = NewStrBufPlain(HKEY("<link href=\"static.local/webcit.css\" rel=\"stylesheet\" type=\"text/css\" />"));
        }
        else
-               lprintf(9, "No Site-local Stylesheet [%s] installed. \n", dir);
+               syslog(9, "No Site-local Stylesheet [%s] installed. \n", dir);
 
 }