X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fsession.inc;h=a306acf063010cabf703a03599cc8dea2b684763;hb=2b2cbcfe6a448536113966cbb11b79eda73db5ab;hp=7bd85974f6b3b01dda46a7db59bc7b5eb1e90fcf;hpb=a8964ea2a500992fb004f9ee127ecc100cb0c2be;p=fa-stable.git
diff --git a/includes/session.inc b/includes/session.inc
index 7bd85974..a306acf0 100644
--- a/includes/session.inc
+++ b/includes/session.inc
@@ -51,17 +51,26 @@ 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!");
+
+ page(_("Access denied"), false);
+ display_error($msg);
+ end_page();
kill_login();
exit;
}
if (!$_SESSION["wa_current_user"]->can_access_page($page_security))
{
- page(_("Access denied"));
+ // 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 "";
@@ -88,6 +97,22 @@ function strip_quotes($data)
return $data;
}
+//============================================================================
+//
+//
+function login_timeout()
+{
+ // skip timeout on logout page
+ if ($_SESSION["wa_current_user"]->logged
+ && !strpos($_SERVER['PHP_SELF'], 'logout.php')) {
+ $tout = $_SESSION["wa_current_user"]->timeout;
+ if ($tout && (time() > $_SESSION["wa_current_user"]->last_act + $tout))
+ {
+ $_SESSION["wa_current_user"]->logged = false;
+ }
+ $_SESSION["wa_current_user"]->last_act = time();
+ }
+}
//============================================================================
if (!isset($path_to_root))
{
@@ -99,6 +124,7 @@ 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 . "/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");
@@ -106,36 +132,55 @@ include_once($path_to_root . "/includes/ajax.inc");
include_once($path_to_root . "/includes/ui/ui_msgs.inc");
/*
+ Uncomment the setting below when using FA on shared hosting
+ to avoid unexpeced session timeouts.
Make sure this directory exists and is writable!
-// $session_save_path = dirname(__FILE__).'/../tmp/';
*/
+//ini_set('session.save_path', dirname(__FILE__).'/../tmp/');
+
+ini_set('session.gc_maxlifetime', 36000); // 10hrs
session_name('FrontAccounting');
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"))
+{
+ $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");
+// Ajax communication object
$Ajax =& new Ajax();
-//include_once($path_to_root . "/includes/main.inc");
+// js/php validation rules container
+$Validate = array();
+// bindings for editors
+$Editors = array();
+// page help. Currently help for function keys.
+$Pagehelp = array();
-//include_once($path_to_root . "/includes/ui/ui_msgs.inc");
+$SysPrefs = new sys_prefs();
+
+$Refs = new references();
// intercept all output to destroy it in case of ajax call
-register_shutdown_function('ob_end_flush');
+register_shutdown_function('end_flush');
ob_start('output_html',0);
// colect all error msgs
@@ -143,15 +188,27 @@ set_error_handler('error_handler' /*, errtypes */);
if (!isset($_SESSION["wa_current_user"]))
$_SESSION["wa_current_user"] = new current_user();
+
set_global_connection();
+login_timeout();
+
if (!$_SESSION["wa_current_user"]->logged_in())
{
// Show login screen
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");
+ if (strstr($_SERVER['PHP_SELF'], 'timeout.php') == false)
+ $_SESSION['timeout'] = array( 'uri'=> $_SERVER['REQUEST_URI'],
+ 'post' => $_POST);
+
+ 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 {
$succeed = $_SESSION["wa_current_user"]->login($_POST["company_login_name"],
@@ -164,8 +221,8 @@ if (!$_SESSION["wa_current_user"]->logged_in())
// Incorrect password
login_fail();
}
- $lang = $_SESSION['language'];
- language::set_language($_SESSION['language']->code);
+ $lang = &$_SESSION['language'];
+ $lang->set_language($_SESSION['language']->code);
}
}
@@ -174,13 +231,6 @@ if (!isset($_SESSION["App"])) {
$_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);