Commit 4c46c250 authored by Mac Newbold's avatar Mac Newbold

Aha! Finally... Rob's commit made me realize we already had a way to do

this...

Now when you load a page and aren't logged in (timed out, no https, or
just not logged in), the message it prints will also give you a link to
the login page that will bring you right back where you were when you
finish logging in.

I tried to make it look kina fancy, but Chad or Leigh may have to fix it
up... I couldn't tell from the Sherwood Forest skin how it would look
with our Standard skin.
parent 07fd07ca
...@@ -249,22 +249,31 @@ function CHECKLOGIN($uid) { ...@@ -249,22 +249,31 @@ function CHECKLOGIN($uid) {
# conditions. # conditions.
# #
function LOGGEDINORDIE($uid, $modifier = 0) { function LOGGEDINORDIE($uid, $modifier = 0) {
global $TBBASE, $BASEPATH;
$link = "\n<blockquote><blockquote>\n".
"<table class=\"menu\" cellpadding=10 cellspacing=0 align=center>\n".
"<tr>\n<td class=\"menufooter\" align=center valign=center>\n".
"<a href=\"$TBBASE/login.php3?refer=1\">".
"<img alt=\"logon\" border=0 src=\"$BASEPATH/logon.gif\"></a>\n".
"</td></tr></table>\n</blockquote></blockquote>\n";
if ($uid == FALSE) if ($uid == FALSE)
USERERROR("You do not appear to be logged in!", 1); USERERROR("You do not appear to be logged in! $link", 1);
$status = CHECKLOGIN($uid); $status = CHECKLOGIN($uid);
switch ($status & CHECKLOGIN_STATUSMASK) { switch ($status & CHECKLOGIN_STATUSMASK) {
case CHECKLOGIN_NOTLOGGEDIN: case CHECKLOGIN_NOTLOGGEDIN:
USERERROR("You do not appear to be logged in!", 1); USERERROR("You do not appear to be logged in! $link", 1);
break; break;
case CHECKLOGIN_TIMEDOUT: case CHECKLOGIN_TIMEDOUT:
USERERROR("Your login has timed out! Please log in again.", 1); USERERROR("Your login has timed out! Please log in again. $link", 1);
break; break;
case CHECKLOGIN_MAYBEVALID: case CHECKLOGIN_MAYBEVALID:
USERERROR("Your login cannot be verified. Are cookies turned on? ". USERERROR("Your login cannot be verified. Are cookies turned on? ".
"Are you using https? Are you logged in using another ". "Are you using https? Are you logged in using another ".
"browser or another machine?", 1); "browser or another machine? $link", 1);
break; break;
case CHECKLOGIN_LOGGEDIN: case CHECKLOGIN_LOGGEDIN:
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment