projects / citadel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 59579fe)
Made the elimination of nocookies permanent.
authorArt Cancro <ajc@citadel.org>
Fri, 7 Jan 2011 20:51:04 +0000 (15:51 -0500)
committerWilfried Goesgens <dothebart@citadel.org>
Sun, 4 Sep 2011 13:42:00 +0000 (13:42 +0000)
webcit/context_loop.c patch | blob | history
webcit/static/nocookies.html [deleted file] patch | blob | history
webcit/static/t/head.html patch | blob | history

diff --git a/webcit/context_loop.c b/webcit/context_loop.c
index 26f6505f3f41f5c94e3721350390d3e2b72e8acc..d492ce09b5db076c79e72ad2fd1a101c134425a7 100644 (file)
--- a/webcit/context_loop.c
+++ b/webcit/context_loop.c
@@ -572,23 +572,13 @@ void context_loop(ParsedHttpHdrs *Hdr)
        if (TheSession == NULL) {
                TheSession = CreateSession(1, 0, &SessionList, Hdr, &SessionListMutex);
 
-               if ((StrLength(Hdr->c_username) == 0) && (!Hdr->HR.DontNeedAuth)) {
-
-                       if ((Hdr->HR.Handler != NULL) && 
-                           (XHTTP_COMMANDS & Hdr->HR.Handler->Flags) == XHTTP_COMMANDS) {
-                               OverrideRequest(Hdr, HKEY("GET /401 HTTP/1.0"));
-                               Hdr->HR.prohibit_caching = 1;                           
-                       }
-
-                       /*
-                        * I don't think we need this anymore now that guest mode is working
-                        * ajc 2011jan07
-                        *
-                       else {
-                               OverrideRequest(Hdr, HKEY("GET /static/nocookies.html?force_close_session=yes HTTP/1.0"));
-                               Hdr->HR.prohibit_caching = 1;
-                       }
-                        */
+               if (    (StrLength(Hdr->c_username) == 0)
+                       && (!Hdr->HR.DontNeedAuth)
+                       && (Hdr->HR.Handler != NULL)
+                       && ((XHTTP_COMMANDS & Hdr->HR.Handler->Flags) == XHTTP_COMMANDS)
+               ) {
+                       OverrideRequest(Hdr, HKEY("GET /401 HTTP/1.0"));
+                       Hdr->HR.prohibit_caching = 1;                           
                }
                
                if (StrLength(Hdr->c_language) > 0) {
diff --git a/webcit/static/nocookies.html b/webcit/static/nocookies.html
deleted file mode 100644 (file)
index d3ba135..0000000
--- a/webcit/static/nocookies.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<html>
-<head>
-       <title>Error</title>
-</head>
-<body>
-
-<div align="center">
-<h2>Sorry!</h2>
-<br>
-This site requires both Cookies and JavaScript to be enabled in your browser.<br>
-Please enable these features and log in again.  We are sorry for the inconvenience.
-</div>
-
-<div align="center">
-<a href=".">Back to login...</a>
-</div>
-
-<div align="center">
-Your browser may cache this site. In doubt, press CTRL+SHIFT+R (Firefox) or SHIFT F5 (Internet explorer) to get the actual content, or press the above link to login again.
-</div>
-
-</body>
-</html>
diff --git a/webcit/static/t/head.html b/webcit/static/t/head.html
index 0efa162d8a8dcd07e00865934a933e6644faa8b2..897276054b7b11d5f9ba97ca5b4a5e88139a099d 100644 (file)
--- a/webcit/static/t/head.html
+++ b/webcit/static/t/head.html
@@ -28,29 +28,25 @@
 <body>
 <div id="is_logged_in" style="display:none"><?%("COND:LOGGEDIN", 1, 1, 1, "no", "yes")></div>
 <?ICONBAR>
-<!--("begin modal container")-->
+<!-- begin modal box -->
 <div id="modal">
-       <div class="md-overlay-decorator"></div>
+       <div class="md-overlay-decorator">
+       </div>
        <div class="md-overlay-wrap">
                <div class="md-overlay">
-                       <div class="md-dialog-decorator"></div>
+                       <div class="md-dialog-decorator">
+                       </div>
                        <div class="md-dialog-wrap">
                                <div class="md-dialog" id="dialog">
                                        <div class="md-content" id="md-content">
-
-This is the modal dialog box.  If you are seeing this message, the
-modal dialog was invoked without first populating its contents, which
-is a mistake.
-<br>
-<h2><a href="javascript:toggleModal(0);">Dismiss</a></h2>
-
+                                               <!-- contents of modal box go here -->
                                        </div>
                                </div>
                        </div>
                </div>
        </div>
 </div>
-<!--("end modal container")-->
+<!-- end modal box -->
 <noscript><div id="noscript_warning">
 <?_("WARNING: You have JavaScript disabled in your web browser.  Many functions of this system will not work properly.")>
 </div></noscript>
Citadel server, clients, utilities