X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fsession.inc;h=9ba28f4964619c4b9ddad36d3e507c7c0046453a;hb=bc426821d8ae6319bd9394ac275bb700e6394fc3;hp=b7efb1899c524d1e4f15562dd4ca851c5efb891e;hpb=2dc462a7fa1972d04b569fb7156747c59bf6d069;p=fa-stable.git

diff --git a/includes/session.inc b/includes/session.inc
index b7efb189..9ba28f49 100644
--- a/includes/session.inc
+++ b/includes/session.inc
@@ -9,13 +9,13 @@
     | by Joe Hunt Consulting         |
 	\--------------------------------------------------*/
 
-	function output_html($text) 
+	function output_html($text)
 	{
   	  global $before_box;
   	  return  in_ajax() ? fmt_errors() : ($before_box.fmt_errors().$text);
 	}
 
-	if (!isset($path_to_root)) 
+	if (!isset($path_to_root))
 	{
 		$path_to_root = ".";
 	}
@@ -41,13 +41,14 @@
 	include_once($path_to_root . "/includes/lang/language.php");
 	include_once($path_to_root . "/config_db.php");
 	include_once($path_to_root . "/config.php");
+	include_once($path_to_root . "/includes/ajax.inc");
+	$Ajax =& new Ajax();
 
-
-    include_once($path_to_root . "/includes/main.inc");
+	include_once($path_to_root . "/includes/main.inc");
 
     //----------------------------------------------------------------------------------------
 
-	function kill_login() 
+	function kill_login()
 	{
         session_unset();
 		session_destroy();
@@ -55,7 +56,7 @@
 
 	//----------------------------------------------------------------------------------------
 
-	function login_fail() 
+	function login_fail()
 	{
         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>";
@@ -70,9 +71,9 @@
 
 	//----------------------------------------------------------------------------------------
 
-	function check_page_security($page_security) 
+	function check_page_security($page_security)
 	{
-		if (!$_SESSION["wa_current_user"]->check_user_access()) 
+		if (!$_SESSION["wa_current_user"]->check_user_access())
 		{
 			echo "<br><br><br><center>";
 			echo "<b>" . _("Security settings have not been defined for your user account.");
@@ -82,14 +83,14 @@
 			exit;
 		}
 
-		if (!$_SESSION["wa_current_user"]->can_access_page($page_security)) 
+		if (!$_SESSION["wa_current_user"]->can_access_page($page_security))
 		{
 			page(_("Access denied"));
 			echo "<center><br><br><br><b>";
 			echo _("The security settings on your account do not permit you to access this function");
 			echo "</b>";
 			echo "<br><br><a href='javascript:history.go(-1)'>" . _("Back") . "</a>";
-			echo "<br><br><br><br>";
+			echo "<br><br><br><br></center>";
 			//echo '<script type="text/javascript">';
 			//echo 'alert("' . _("The security settings on your account do not permit you to access this function") . '");';
 			//echo 'history.go(-1)';
@@ -102,33 +103,33 @@
 
 	//----------------------------------------------------------------------------------------
 	if (!isset($_SESSION["wa_current_user"]) ||
-		(isset($_SESSION["wa_current_user"]) && !$_SESSION["wa_current_user"]->logged_in())) 
+		(isset($_SESSION["wa_current_user"]) && !$_SESSION["wa_current_user"]->logged_in()))
 	{
 
 		$_SESSION["wa_current_user"] = new current_user();
 
         // Show login screen
-        if (!isset($_POST["user_name_entry_field"]) or $_POST["user_name_entry_field"] == "") 
+        if (!isset($_POST["user_name_entry_field"]) or $_POST["user_name_entry_field"] == "")
         {
 	        include($path_to_root . "/access/login.php");
+		$Ajax->redirect($path_to_root . "/access/login.php");
             exit;
         }
    	}
-	include_once("ajax.inc");
-	$Ajax =& new Ajax();
+	include_once($path_to_root . "/includes/ui/ui_msgs.inc");
 	// intercept all output to destroy it in case of ajax call
 	register_shutdown_function('ob_end_flush');
 	ob_start('output_html',0);
 	// colect all error msgs
 	set_error_handler('error_handler' /*, errtypes */);
 
-   	if (isset($_POST["user_name_entry_field"])) 
+   	if (isset($_POST["user_name_entry_field"]))
    	{
 		$succeed = $_SESSION["wa_current_user"]->login($_POST["company_login_name"],
 			$_POST["user_name_entry_field"],
 			md5($_POST["password"]));
 
-		if (!$succeed) 
+		if (!$succeed)
 		{
 			// Incorrect password
 			login_fail();
@@ -143,7 +144,7 @@
     }*/
 
 	//----------------------------------------------------------------------------------------
-    
+
    	check_page_security($page_security);