cleanup webcit.h; utils.c, remove unneeded stuff

[citadel.git] / webcit / webcit.c

diff --git a/webcit/webcit.c b/webcit/webcit.c
index 08d6a8ab066b9d892bdd1ab33edf8499b05547e4..6d9373edb6708071982e4536792b5757bdbf4838 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -30,6 +30,10 @@
 StrBuf *csslocal = NULL;
 HashList *HandlerHash = NULL;
 
+void stuff_to_cookie(int unset_cookie);
+int GetConnected(void);
+
+
 void PutRequestLocalMem(void *Data, DeleteHashDataFunc DeleteIt)
 {
         wcsession *WCC = WC;
@@ -123,7 +127,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 +199,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)) {
@@ -424,7 +428,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;
@@ -455,7 +460,7 @@ void ajax_servcmd(void)
         * This is kind of an ugly hack, but this is the only place it can go.
         * If the command was GEXP, then the instant messenger window must be
         * running, so reset the "last_pager_check" watchdog timer so
-        * that page_popup() doesn't try to open it a second time.
+        * that page_popup() doesn't try to open it a second time. TODO: page_popup isn't with us anymore.
         */
        if (!strncasecmp(bstr("g_cmd"), "GEXP", 4)) {
                WCC->last_pager_check = time(NULL);
@@ -512,11 +517,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));
 }
@@ -711,7 +738,7 @@ void session_loop(void)
                        );
                        wc_printf("<br>");
                        wc_printf("<a href=\"http://www.citadel.org/doku.php/"
-                               "faq:mastering_your_os:net#netstat\">%s</a>",
+                               "faq:generalquestions:webcit_unable_to_connect\">%s</a>",
                                _("Read More...")
                        );
                        wc_printf("</body></html>\n");
@@ -850,11 +877,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();
@@ -930,6 +965,12 @@ void tmplput_csslocal(StrBuf *Target, WCTemplputParams *TP)
                        csslocal, 0);
 }
 
+void tmplput_packagestring(StrBuf *Target, WCTemplputParams *TP)
+{
+       StrBufAppendBufPlain(Target, 
+                            HKEY(PACKAGE_STRING), 0);
+}
+
 extern char static_local_dir[PATH_MAX];
 
 
@@ -955,6 +996,7 @@ InitModule_WEBCIT
        RegisterNamespace("IMPORTANTMESSAGE", 0, 0, tmplput_importantmessage, NULL, CTX_NONE);
        RegisterNamespace("TRAILING_JAVASCRIPT", 0, 0, tmplput_trailing_javascript, NULL, CTX_NONE);
        RegisterNamespace("URL:DISPLAYNAME", 0, 1, tmplput_HANDLER_DISPLAYNAME, NULL, CTX_NONE);
+       RegisterNamespace("PACKAGESTRING", 0, 1, tmplput_packagestring, NULL, CTX_NONE);
 
        
        snprintf(dir, SIZ, "%s/webcit.css", static_local_dir);