valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

login system fixes (2)

This commit is contained in:
Andrew Dolgov 2007-03-01 13:29:25 +01:00
parent d620cfe70a
commit 8e849206dd
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
functions.js
View File

@ -56,6 +56,8 @@ function logout_callback() {
var container = document.getElementById('notify'); var container = document.getElementById('notify');
if (xmlhttp.readyState == 4) { if (xmlhttp.readyState == 4) {
try { try {
var date = new Date();
var timestamp = Math.round(date.getTime() / 1000);
window.location.href = "tt-rss.php"; window.location.href = "tt-rss.php";
} catch (e) { } catch (e) {
exception_error("logout_callback", e); exception_error("logout_callback", e);
@ -1538,7 +1540,7 @@ function fatalError(code, message) {
try { try {
if (code == 6) { if (code == 6) {
//window.location.href = "login.php?rt=none"; window.location.href = "tt-rss.php";
} else if (code == 5) { } else if (code == 5) {
window.location.href = "update.php"; window.location.href = "update.php";
} else { } else {

4
functions.php
View File

@ -1170,7 +1170,7 @@
if ($_SESSION["cookie_lifetime"] && $_SESSION["uid"]) { if ($_SESSION["cookie_lifetime"] && $_SESSION["uid"]) {
# print time() . " vs " . $_SESSION["cookie_lifetime"]; //print_r($_SESSION);
if (time() > $_SESSION["cookie_lifetime"]) { if (time() > $_SESSION["cookie_lifetime"]) {
return false; return false;
@ -1210,7 +1210,7 @@
if ($remember_me) { if ($remember_me) {
$_SESSION["cookie_lifetime"] = time() + $_SESSION["cookie_lifetime"] = time() +
SESSION_COOKIE_LIFETIME_REMEMBER; SESSION_COOKIE_LIFETIME_REMEMBER;
} else { } else if (SESSION_COOKIE_LIFETIME > 0) {
$_SESSION["cookie_lifetime"] = time() + SESSION_COOKIE_LIFETIME; $_SESSION["cookie_lifetime"] = time() + SESSION_COOKIE_LIFETIME;
} }