Commit 86c0ffa5 authored by Leigh B. Stoller's avatar Leigh B. Stoller

A couple of small changes to prevent the "No Data" errors that

netscape gives when logged in using another browser. Most of the
problems stems from the desire to allow users to refer to the main
page in http mode even when logged in. I want to draw the menu as if
logged in, but have the actual pages demand https mode. I'm also
trying to catch the case where users have turned off cookies. I think
Mac's idea is the way to go, but I don't want to mess with it right
now. These changes will avoid the worst problem.
parent c681eefa
......@@ -68,7 +68,7 @@ function WRITESIDEBAR() {
<b><span class=sidebarbutton>
Web Interface Options\n";
if ($login_status & (CHECKLOGIN_LOGGEDIN|CHECKLOGIN_MAYBEVALID)) {
if ($login_status & CHECKLOGIN_LOGGEDIN) {
$freepcs = TBFreePCs();
echo " <br>($freepcs Free PCs)\n";
......
......@@ -25,12 +25,12 @@ if (($uid = GETUID())) {
if ($check_status == CHECKLOGIN_LOGGEDIN) {
$LOC = "$TBBASE/showuser.php3?target_uid=$uid";
}
elseif ($check_status == CHECKLOGIN_MAYBEVALID) {
$LOC = "$TBBASE/start.php3";
}
elseif (isset($SSL_PROTOCOL)) {
$LOC = "$TBBASE/index.php3";
}
elseif ($check_status == CHECKLOGIN_MAYBEVALID) {
$LOC = "$TBBASE/start.php3";
}
else
$LOC = "$TBDOCBASE/index.php3";
}
......
......@@ -241,7 +241,8 @@ function LOGGEDINORDIE($uid, $modifier = 0) {
break;
case CHECKLOGIN_MAYBEVALID:
USERERROR("Your login cannot be verified. Are cookies turned on? ".
"Are you using https?", 1);
"Are you using https? Are you logged in using another ".
"browser or another machine?", 1);
break;
case CHECKLOGIN_LOGGEDIN:
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