From 1df0f48b2147c3cbc71dc2085de76f5a4432fb6d Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.spb.su>
Date: Fri, 2 Mar 2007 12:05:17 +0100
Subject: login system fixes...

---
 functions.php | 39 +++------------------------------------
 1 file changed, 3 insertions(+), 36 deletions(-)

(limited to 'functions.php')

diff --git a/functions.php b/functions.php
index 98bfc2e64..49955b63f 100644
--- a/functions.php
+++ b/functions.php
@@ -1192,49 +1192,17 @@
 				}
 			}
 
-/*			if ($_COOKIE[get_session_cookie_name()]) {
-				require_once "sessions.php";
-} */
-
 			$login_action = $_POST["login_action"];
 
-/*			if (!validate_session($link) && $login_action != "do_login") {
-				logout_user();
-				render_login_form($link);
-				exit;
-} */
-
-			$session_started = false;
-
 			# try to authenticate user if called from login form			
 			if ($login_action == "do_login") {
 				$login = $_POST["login"];
 				$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";
-
-				$session_started = true;
-
 				if (authenticate_user($link, $login, $password)) {
 					$_POST["password"] = "";
 
-					if ($remember_me) {
-						$_SESSION["cookie_lifetime"] = time() + 
-							SESSION_COOKIE_LIFETIME_REMEMBER;
-					} else if (SESSION_COOKIE_LIFETIME) {
-						$_SESSION["cookie_lifetime"] = time() + SESSION_COOKIE_LIFETIME;
-					}
-
-					setcookie("ttrss_cltime", $_SESSION["cookie_lifetime"], 
-						$_SESSION["cookie_lifetime"]);
-
 					header("Location: " . $_SERVER["REQUEST_URI"]);
 					exit;
 
@@ -1244,17 +1212,16 @@
 				}
 			}
 
-			if (!$session_started) {
-				require_once "sessions.php";
-			}
+//			print session_id();
+//			print_r($_SESSION);
 
 			if (!$_SESSION["uid"] || !validate_session($link)) {
 				render_login_form($link);
 				exit;
 			}
 
+
 		} else {
-			require_once "sessions.php";
 			return authenticate_user($link, "admin", null);
 		}
 	}
-- 
cgit v1.2.3