X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fsession.inc;h=b7880a91fbf6bba4572c8175907b04efa0a15645;hb=ec09689a87c0b0bac3c24e782ae4e5dfe7a6248e;hp=a306acf063010cabf703a03599cc8dea2b684763;hpb=286e6233d6d7d63fbaafea42475ecbd5f4cf0dd0;p=fa-stable.git

diff --git a/includes/session.inc b/includes/session.inc
index a306acf0..b7880a91 100644
--- a/includes/session.inc
+++ b/includes/session.inc
@@ -33,12 +33,14 @@ function kill_login()
 
 function login_fail()
 {
+	global $path_to_root;
+	
 	header("HTTP/1.1 401 Authorization Required");
 	echo "<center><br><br><font size='5' color='red'><b>" . _("Incorrect Password") . "<b></font><br><br>";
 	echo "<b>" . _("The user and password combination is not valid for the system.") . "<b><br><br>";
 
 	echo _("If you are not an authorized user, please contact your system administrator to obtain an account to enable you to use the system.");
-	echo "<br><a href='javascript:history.go(-1)'>" . _("Back") . "</a>";
+	echo "<br><a href='$path_to_root/index.php'>" . _("Try again") . "</a>";
 	echo "</center>";
 
 	kill_login();
@@ -103,8 +105,7 @@ function strip_quotes($data)
 function login_timeout()
 {
 	// skip timeout on logout page
-	if ($_SESSION["wa_current_user"]->logged 
-			&& !strpos($_SERVER['PHP_SELF'], 'logout.php')) {
+	if ($_SESSION["wa_current_user"]->logged) {
 		$tout = $_SESSION["wa_current_user"]->timeout;
 		if ($tout && (time() > $_SESSION["wa_current_user"]->last_act + $tout))
 		{
@@ -191,50 +192,52 @@ if (!isset($_SESSION["wa_current_user"]))
 
 set_global_connection();
 
-login_timeout();
+// logout.php is the only page we should have always 
+// accessable regardless of access level and current login status.
+if (strstr($_SERVER['PHP_SELF'], 'logout.php') == false){
 
-if (!$_SESSION["wa_current_user"]->logged_in())
-{
-	// Show login screen
-	if (!isset($_POST["user_name_entry_field"]) or $_POST["user_name_entry_field"] == "")
+	login_timeout();
+
+	if (!$_SESSION["wa_current_user"]->logged_in())
 	{
-		if (strstr($_SERVER['PHP_SELF'], 'timeout.php') == false) 
+		// Show login screen
+		if (!isset($_POST["user_name_entry_field"]) or $_POST["user_name_entry_field"] == "")
+		{
 			$_SESSION['timeout'] = array( 'uri'=> $_SERVER['REQUEST_URI'],
 				'post' => $_POST);
 
-		if (!in_ajax()) {
-			include($path_to_root . "/access/login.php");
+			if (!in_ajax()) {
+				include($path_to_root . "/access/login.php");
+			} else {
+				// ajax update of current page elements - open login window in popup
+				// to not interfere with ajaxified page.
+				$Ajax->popup($path_to_root . "/access/timeout.php");
+			}
+			exit;
 		} else {
-			// ajax update of current page elements - open login window in popup
-			// to not interfere with ajaxified page.
-			$Ajax->popup($path_to_root . "/access/timeout.php");
-		}
-		exit;
-	} else {
-		$succeed = $_SESSION["wa_current_user"]->login($_POST["company_login_name"],
-			$_POST["user_name_entry_field"],
-			md5($_POST["password"]));
-		// select full vs fallback ui mode on login
-		$_SESSION["wa_current_user"]->ui_mode = $_POST['ui_mode'];
-		if (!$succeed)
-		{
+			$succeed = $_SESSION["wa_current_user"]->login($_POST["company_login_name"],
+				$_POST["user_name_entry_field"], md5($_POST["password"]));
+			// select full vs fallback ui mode on login
+			$_SESSION["wa_current_user"]->ui_mode = $_POST['ui_mode'];
+			if (!$succeed)
+			{
 			// Incorrect password
-			login_fail();
+				login_fail();
+			}
+			$lang = &$_SESSION['language'];
+			$lang->set_language($_SESSION['language']->code);
 		}
-		$lang = &$_SESSION['language'];
-		$lang->set_language($_SESSION['language']->code);
 	}
-}
 
-if (!isset($_SESSION["App"])) {
-	$_SESSION["App"] = new front_accounting();
-	$_SESSION["App"]->init();
-}
+	if (!isset($_SESSION["App"])) {
+		$_SESSION["App"] = new front_accounting();
+		$_SESSION["App"]->init();
+	}
 
 //----------------------------------------------------------------------------------------
 
-check_page_security($page_security);
-
+	check_page_security($page_security);
+}
 // POST vars cleanup needed for direct reuse.
 // We quote all values later with db_escape() before db update.
 	$_POST = strip_quotes($_POST);