minor cleanup

[citadel.git] / webcit / webcit.c

diff --git a/webcit/webcit.c b/webcit/webcit.c
index b0236838823e0f618e7056a75baa77d1ddebd7a1..3c094cd1e0c1fd1490640f4314a9e48419b1d5c4 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -2,7 +2,24 @@
  * This is the main transaction loop of the web service.  It maintains a
  * persistent session to the Citadel server, handling HTTP WebCit requests as
  * they arrive and presenting a user interface.
+ *
+ * Copyright (c) 1996-2011 by the citadel.org team
+ *
+ * This program is open source software.  You can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
+
 #define SHOW_ME_VAPPEND_PRINTF
 #include <stdio.h>
 #include <stdarg.h>
@@ -10,7 +27,6 @@
 #include "groupdav.h"
 #include "webserver.h"
 
-
 StrBuf *csslocal = NULL;
 HashList *HandlerHash = NULL;
 
@@ -186,7 +202,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 +215,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,
@@ -472,6 +488,39 @@ void seconds_since_last_gexp(void)
 }
 
 
+/*
+ * Save a URL destination so we can go to it later
+ */
+void push_destination(void) {
+       wcsession *WCC = WC;
+
+       if (!WCC) {
+               wc_printf("no session");
+               return;
+       }
+
+       FreeStrBuf(&WCC->PushedDestination);
+       WCC->PushedDestination = NewStrBufDup(SBSTR("url"));
+       lprintf(9, "Push: %s\n", ChrPtr(WCC->PushedDestination));
+       wc_printf("OK");
+}
+
+/*
+ * Go to the URL saved by push_destination()
+ */
+void pop_destination(void) {
+       wcsession *WCC = WC;
+
+       if (!WCC) {
+               do_welcome();
+               return;
+       }
+
+       lprintf(9, "Pop: %s\n", ChrPtr(WCC->PushedDestination));
+       http_redirect(ChrPtr(WCC->PushedDestination));
+}
+
+
 
 int ReadPostData(void)
 {
@@ -647,8 +696,7 @@ void session_loop(void)
        }
 
        /*
-        * If we're not connected to a Citadel server, try to hook up the
-        * connection now.
+        * If we're not connected to a Citadel server, try to hook up the connection now.
         */
        if (!WCC->connected) {
                if (GetConnected()) {
@@ -663,9 +711,9 @@ void session_loop(void)
                        wc_printf("</body></html>\n");
                        end_burst();
                        goto SKIP_ALL_THIS_CRAP;
+               }
        }
 
-
        /*
         * If we're not logged in, but we have authentication data (either from
         * a cookie or from http-auth), try logging in to Citadel using that.
@@ -703,21 +751,22 @@ void session_loop(void)
                (WCC->Hdr->HR.eReqType != eHEAD);
 
        /*
-        * If a 'gotofirst' parameter has been specified, attempt to goto that room
+        * If a 'go' parameter has been specified, attempt to goto that room
         * prior to doing anything else.
         */
-       if (havebstr("gotofirst")) {
+       if (havebstr("go")) {
                int ret;
-               ret = gotoroom(sbstr("gotofirst"));     /* do quietly to avoid session output! */
+               lprintf(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("gotofirst"), ret);
+                               bstr("go"), ret);
                }
        }
 
        /*
         * If we aren't in any room yet, but we have cookie data telling us where we're
-        * supposed to be, and 'gotofirst' was not specified, then go there.
+        * supposed to be, and 'go' was not specified, then go there.
         */
        else if ( (StrLength(WCC->CurRoom.name) == 0) && ( (StrLength(WCC->Hdr->c_roomname) > 0) )) {
                int ret;
@@ -881,6 +930,8 @@ InitModule_WEBCIT
        WebcitAddUrlHandler(HKEY("sslg"), "", 0, seconds_since_last_gexp, AJAX|LOGCHATTY);
        WebcitAddUrlHandler(HKEY("ajax_servcmd"), "", 0, ajax_servcmd, 0);
        WebcitAddUrlHandler(HKEY("webcit"), "", 0, blank_page, URLNAMESPACE);
+       WebcitAddUrlHandler(HKEY("push"), "", 0, push_destination, AJAX);
+       WebcitAddUrlHandler(HKEY("pop"), "", 0, pop_destination, 0);
 
        WebcitAddUrlHandler(HKEY("401"), "", 0, authorization_required, ANONYMOUS|COOKIEUNNEEDED);
        RegisterConditional(HKEY("COND:IMPMSG"), 0, ConditionalImportantMesage, CTX_NONE);
@@ -958,5 +1009,6 @@ SessionDestroyModule_WEBCIT
        FreeStrBuf(&sess->WBuf);
        FreeStrBuf(&sess->HBuf);
        FreeStrBuf(&sess->ImportantMsg);
+       FreeStrBuf(&sess->PushedDestination);
 }