Changed structure of tag_association table

[fa-stable.git] / includes / session.inc

diff --git a/includes/session.inc b/includes/session.inc
index a306acf063010cabf703a03599cc8dea2b684763..2178a8d51e84b5a339fad042b69d176dd64cf3b1 100644 (file)
--- 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();
@@ -57,8 +59,7 @@ function check_page_security($page_security)
                                . "<br>" . _("Please contact your system administrator.")       
                        : _("Please remove \$security_groups and \$security_headings arrays from config.php file!");
 
-               page(_("Access denied"), false);
-                       display_error($msg);
+               display_error($msg);
                end_page();
                kill_login();
                exit;
@@ -66,17 +67,12 @@ function check_page_security($page_security)
 
        if (!$_SESSION["wa_current_user"]->can_access_page($page_security))
        {
-               // no_menu parameter guess here is ugly hack, but works for now.
-               // Better solution is to use global switch for menu, set before 
-               // session.inc inclusion.
-               page(_("Access denied"), strpos($_SERVER['PHP_SELF'], '/view/'));
 
                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><br><br></center>";
                end_page();
-               //kill_login();
                exit;
        }
 }
@@ -103,8 +99,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))
                {
@@ -123,9 +118,9 @@ if (!isset($path_to_root))
 if (isset($_GET['path_to_root']) || isset($_POST['path_to_root']))
        die("Restricted access");
 
+include_once($path_to_root . "/includes/current_user.inc");
 include_once($path_to_root . "/frontaccounting.php");
 include_once($path_to_root . "/admin/db/security_db.inc");
-include_once($path_to_root . "/includes/current_user.inc");
 include_once($path_to_root . "/includes/lang/language.php");
 include_once($path_to_root . "/config_db.php");
 include_once($path_to_root . "/includes/ajax.inc");
@@ -191,50 +186,50 @@ 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();
-}
 
-//----------------------------------------------------------------------------------------
-
-check_page_security($page_security);
+       include_once($path_to_root . '/company/'.user_company().'/installed_extensions.php');
 
+       if (!isset($_SESSION["App"])) {
+               $_SESSION["App"] = new front_accounting();
+               $_SESSION["App"]->init();
+       }
+}
 // POST vars cleanup needed for direct reuse.
 // We quote all values later with db_escape() before db update.
        $_POST = strip_quotes($_POST);