X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fsession.inc;h=b7880a91fbf6bba4572c8175907b04efa0a15645;hb=ec09689a87c0b0bac3c24e782ae4e5dfe7a6248e;hp=c37b7c15d6399d953e9bc0ebae7a8fef60a28c7c;hpb=902f1015d874c33bd7946b17de2ad80b4f2144b6;p=fa-stable.git
diff --git a/includes/session.inc b/includes/session.inc
index c37b7c15..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 "
" . _("Incorrect Password") . "
";
echo "" . _("The user and password combination is not valid for the system.") . "
";
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 "
" . _("Back") . "";
+ echo "
" . _("Try again") . "";
echo "";
kill_login();
@@ -52,10 +54,10 @@ function check_page_security($page_security)
if (!$_SESSION["wa_current_user"]->check_user_access())
{
// notification after upgrade from pre-2.2 version
- $msg = is_array($_SESSION["wa_current_user"]->role_set) ?
- _("Please remove \$security_groups and \$security_headings arrays from config.php file!")
- : _("Security settings have not been defined for your user account.")
- . "
" . _("Please contact your system administrator.");
+ $msg = $_SESSION["wa_current_user"]->old_db ?
+ _("Security settings have not been defined for your user account.")
+ . "
" . _("Please contact your system administrator.")
+ : _("Please remove \$security_groups and \$security_headings arrays from config.php file!");
page(_("Access denied"), false);
display_error($msg);
@@ -102,6 +104,7 @@ function strip_quotes($data)
//
function login_timeout()
{
+ // skip timeout on logout page
if ($_SESSION["wa_current_user"]->logged) {
$tout = $_SESSION["wa_current_user"]->timeout;
if ($tout && (time() > $_SESSION["wa_current_user"]->last_act + $tout))
@@ -143,15 +146,15 @@ session_start();
// this is to fix the "back-do-you-want-to-refresh" issue - thanx PHPFreaks
header("Cache-control: private");
-get_text::init();
+get_text_init();
// Page Initialisation
if (!isset($_SESSION['languages']))
{
- language::load_languages(); // sets also default $_SESSION['language']
+ load_languages(); // sets also default $_SESSION['language']
}
-language::set_language($_SESSION['language']->code);
+$_SESSION['language']->set_language($_SESSION['language']->code);
// include $Hooks object if locale file exists
if(@include_once($path_to_root . "/lang/".$_SESSION['language']->code."/locale.inc"))
@@ -173,6 +176,10 @@ $Editors = array();
// page help. Currently help for function keys.
$Pagehelp = array();
+$SysPrefs = new sys_prefs();
+
+$Refs = new references();
+
// intercept all output to destroy it in case of ajax call
register_shutdown_function('end_flush');
ob_start('output_html',0);
@@ -185,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'];
- language::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);