diff options
-rw-r--r-- | functions.php | 20 | ||||
-rw-r--r-- | opml.php | 2 | ||||
-rw-r--r-- | prefs.php | 2 | ||||
-rw-r--r-- | sessions.php | 2 | ||||
-rw-r--r-- | tt-rss.php | 2 | ||||
-rw-r--r-- | update.php | 2 |
6 files changed, 22 insertions, 8 deletions
diff --git a/functions.php b/functions.php index 70cc16cc9..ada1b7162 100644 --- a/functions.php +++ b/functions.php @@ -1168,14 +1168,15 @@ } } - if ($_SESSION["cookie_lifetime"] && $_SESSION["uid"]) { +/* if ($_SESSION["cookie_lifetime"] && $_SESSION["uid"]) { //print_r($_SESSION); if (time() > $_SESSION["cookie_lifetime"]) { return false; } - } + } */ + return true; } @@ -1190,6 +1191,10 @@ } } + if ($_COOKIE["ttrss_sid"]) { + require_once "sessions.php"; + } + if (!validate_session($link)) { logout_user(); render_login_form($link); @@ -1204,13 +1209,21 @@ $password = $_POST["password"]; $remember_me = $_POST["remember_me"]; + if ($remember_me) { + session_set_cookie_params(SESSION_COOKIE_LIFETIME_REMEMBER); + } else { + session_set_cookie_params(SESSION_COOKIE_LIFETIME); + } + + require_once "sessions.php"; + if (authenticate_user($link, $login, $password)) { $_POST["password"] = ""; if ($remember_me) { $_SESSION["cookie_lifetime"] = time() + SESSION_COOKIE_LIFETIME_REMEMBER; - } else if (SESSION_COOKIE_LIFETIME > 0) { + } else if (SESSION_COOKIE_LIFETIME) { $_SESSION["cookie_lifetime"] = time() + SESSION_COOKIE_LIFETIME; } @@ -1230,6 +1243,7 @@ } } else { + require_once "sessions.php"; return authenticate_user($link, "admin", null); } } @@ -1,5 +1,5 @@ <?php - require_once "sessions.php"; +// require_once "sessions.php"; require_once "sanity_check.php"; require_once "functions.php"; require_once "config.php"; @@ -1,6 +1,6 @@ <?php require_once "functions.php"; - require_once "sessions.php"; +// require_once "sessions.php"; require_once "sanity_check.php"; require_once "version.php"; require_once "config.php"; diff --git a/sessions.php b/sessions.php index c2854e04a..e13562628 100644 --- a/sessions.php +++ b/sessions.php @@ -95,7 +95,7 @@ session_set_save_handler("open", "close", "read", "write", "destroy", "gc"); } - session_set_cookie_params(SESSION_COOKIE_LIFETIME_REMEMBER); +// session_set_cookie_params(SESSION_COOKIE_LIFETIME_REMEMBER); session_start(); ?> diff --git a/tt-rss.php b/tt-rss.php index ef9f2437c..f39396eca 100644 --- a/tt-rss.php +++ b/tt-rss.php @@ -1,6 +1,6 @@ <?php require_once "functions.php"; - require_once "sessions.php"; +// require_once "sessions.php"; require_once "sanity_check.php"; require_once "version.php"; require_once "config.php"; diff --git a/update.php b/update.php index 34357f2f2..eb5cf94f5 100644 --- a/update.php +++ b/update.php @@ -1,5 +1,5 @@ <?php - require_once "sessions.php"; +// require_once "sessions.php"; require_once "sanity_check.php"; require_once "functions.php"; |