X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fsession.inc;h=734c17036f9d2160bf55d535380c7f01f284323f;hb=e4601ecbe842aafa7f0424abc67ec7ba55139dff;hp=dad1c1c94f1cca20259e8f77ac2f937a8e7a18da;hpb=8f7ac519b7aaf8ec219862597e878d3a28316ac6;p=fa-stable.git
diff --git a/includes/session.inc b/includes/session.inc
index dad1c1c9..734c1703 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();
@@ -51,30 +53,51 @@ function check_page_security($page_security)
{
if (!$_SESSION["wa_current_user"]->check_user_access())
{
- echo "
";
- echo "" . _("Security settings have not been defined for your user account.");
- echo "
" . _("Please contact your system administrator.") . "";
+ // notification after upgrade from pre-2.2 version
+ $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!");
+ display_error($msg);
+ end_page();
kill_login();
exit;
}
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 "
";
echo _("The security settings on your account do not permit you to access this function");
echo "";
echo "
";
end_page();
- //kill_login();
exit;
}
}
+/*
+ Helper function for setting page security level depeding on
+ GET start variable and/or some value stored in session variable.
+ Before the call $page_security should be set to default page_security value.
+*/
+function set_page_security($value=null, $trans = array(), $gtrans = array())
+{
+ global $page_security;
+
+ // first check is this is not start page call
+ foreach($gtrans as $key => $area)
+ if (isset($_GET[$key])) {
+ $page_security = $area;
+ return;
+ }
+
+ // then check session value
+ if (isset($trans[$value])) {
+ $page_security = $trans[$value];
+ return;
+ }
+}
//-----------------------------------------------------------------------------
// Removing magic quotes from nested arrays/variables
@@ -97,6 +120,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))
@@ -116,8 +140,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 . "/frontaccounting.php");
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/lang/language.php");
include_once($path_to_root . "/config_db.php");
include_once($path_to_root . "/includes/ajax.inc");
@@ -137,15 +162,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']))
+if (!isset($_SESSION['language']))
{
- 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"))
@@ -153,6 +178,7 @@ if(@include_once($path_to_root . "/lang/".$_SESSION['language']->code."/locale.i
$Hooks = new Hooks();
}
+include_once($path_to_root . "/includes/access_levels.inc");
include_once($path_to_root . "/config.php");
include_once($path_to_root . "/includes/main.inc");
@@ -166,6 +192,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);
@@ -178,57 +208,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'];
- language::set_language($_SESSION['language']->code);
}
-}
-if (!isset($_SESSION["App"])) {
- $_SESSION["App"] = new front_accounting();
- $_SESSION["App"]->init();
-}
-
-// Run with debugging messages for the system administrator(s) but not anyone else
-/*if (in_array(15, $security_groups[$_SESSION["AccessLevel"]])) {
- $debug = 1;
-} else {
- $debug = 0;
-}*/
-
-//----------------------------------------------------------------------------------------
-
-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);