projects / citadel.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
off-by-one fix in siteconfig
[citadel.git] / webcit / webcit.c
diff --git a/webcit/webcit.c b/webcit/webcit.c
index d988ea8b9987b802d6136a58cc7434581af5eaf7..5642ee168a3d8bfa2d1860e7b5aeb6abbefaa230 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -6,18 +6,12 @@
  * 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.
+ * modify it under the terms of the GNU General Public License, version 3.
  *
  * 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
@@ -31,7 +25,7 @@ StrBuf *csslocal = NULL;
 HashList *HandlerHash = NULL;
 
 void stuff_to_cookie(int unset_cookie);
-int GetConnected(void);
+extern int GetConnected(void);
 
 
 void PutRequestLocalMem(void *Data, DeleteHashDataFunc DeleteIt)
@@ -245,6 +239,7 @@ void http_redirect(const char *whichpage) {
        hprintf("Location: %s\r\n", whichpage);
        hprintf("URI: %s\r\n", whichpage);
        hprintf("Content-type: text/html; charset=utf-8\r\n");
+       stuff_to_cookie(0);
        begin_burst();
        wc_printf("<html><body>");
        wc_printf("Go <a href=\"%s\">here</A>.", whichpage);
@@ -347,17 +342,20 @@ void authorization_required(void)
        wc_printf("<h1>");
        wc_printf(_("Authorization Required"));
        wc_printf("</h1>\r\n");
-       
 
-       if (WCC->ImportantMsg != NULL)
+       if (WCC->ImportantMsg != NULL) {
                message = ChrPtr(WCC->ImportantMsg);
+       }
 
-       wc_printf(_("The resource you requested requires a valid username and password. "
-               "You could not be logged in: %s\n"), message);
+       wc_printf(
+               _("The resource you requested requires a valid username and password. "
+               "You could not be logged in: %s\n"),
+               message
+       );
        wDumpContent(0);
-       end_webcit_session();
 }
 
+
 /*
  * Convenience functions to wrap around asynchronous ajax responses
  */
@@ -375,6 +373,7 @@ void begin_ajax_response(void) {
        begin_burst();
 }
 
+
 /*
  * print ajax response footer 
  */
@@ -383,7 +382,6 @@ void end_ajax_response(void) {
 }
 
 
-
 /*
  * Wraps a Citadel server command in an AJAX transaction.
  */
@@ -496,6 +494,7 @@ void push_destination(void) {
        wc_printf("OK");
 }
 
+
 /*
  * Go to the URL saved by push_destination()
  */
@@ -584,49 +583,6 @@ int ReadPostData(void)
        return 1;
 }
 
-#if 0
-void ParseREST_URL(void)
-{
-       StrBuf *Buf;
-       StrBuf *pFloor = NULL;
-       wcsession *WCC = WC;
-       long i = 0;
-       const char *pCh = NULL;
-       HashList *Floors;
-       void *vFloor;
-
-       syslog(1, "parsing rest URL: %s", ChrPtr(WCC->Hdr->HR.ReqLine));
-
-       WCC->Directory = NewHash(1, Flathash);
-       WCC->CurrentFloor = NULL;
-
-       Buf = NewStrBuf();
-       while (StrBufExtract_NextToken(Buf, WCC->Hdr->HR.ReqLine, &pCh,  '/') >= 0)
-       {
-               if (StrLength(Buf) != 0) {
-                       /* ignore empty path segments */
-                       StrBufUnescape(Buf, 1);
-                       Put(WCC->Directory, IKEY(i), Buf, HFreeStrBuf);
-                       if (i==0)
-                               pFloor = Buf;
-                       Buf = NewStrBuf();
-               }
-               i++;
-       }
-
-       FreeStrBuf(&Buf);
-       if (pFloor != NULL)
-       {
-               Floors = GetFloorListHash(NULL, NULL);
-               
-               if (Floors != NULL)
-               {
-                       if (GetHash(WCC->FloorsByName, SKEY(pFloor), &vFloor))
-                               WCC->CurrentFloor = (Floor*) vFloor;
-               }
-       }
-}
-#endif
 
 int Conditional_REST_DEPTH(StrBuf *Target, WCTemplputParams *TP)
 {
@@ -734,10 +690,10 @@ void session_loop(void)
         * 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.
         */
-       if ((!WCC->logged_in)
-           && (StrLength(WCC->Hdr->c_username) > 0)
-           && (StrLength(WCC->Hdr->c_password) > 0))
-       {
+       if (    (!WCC->logged_in)
+               && (StrLength(WCC->Hdr->c_username) > 0)
+               && (StrLength(WCC->Hdr->c_password) > 0)
+       ) {
                long Status;
 
                FlushStrBuf(Buf);
@@ -813,15 +769,13 @@ void session_loop(void)
                        display_login();
                }
                else {
-#if 0
-                       if ((WCC->Hdr->HR.Handler->Flags & PARSE_REST_URL) != 0)
-                               ParseREST_URL();
-#endif
-                       if ((WCC->Hdr->HR.Handler->Flags & AJAX) != 0)
+                       if ((WCC->Hdr->HR.Handler->Flags & AJAX) != 0) {
                                begin_ajax_response();
+                       }
                        WCC->Hdr->HR.Handler->F();
-                       if ((WCC->Hdr->HR.Handler->Flags & AJAX) != 0)
+                       if ((WCC->Hdr->HR.Handler->Flags & AJAX) != 0) {
                                end_ajax_response();
+                       }
                }
        }
        /* When all else fails, display the default landing page or a main menu. */
@@ -842,10 +796,12 @@ void session_loop(void)
                 * Toplevel dav requests? or just a flat browser request? 
                 */
                else {
-                       if (xhttp)
+                       if (xhttp) {
                                dav_main();
-                       else
+                       }
+                       else {
                                display_main_menu();
+                       }
                }
        }
 
Citadel server, clients, utilities