X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=inline;f=includes%2Fsession.inc;h=261f8914684262a22c3d842646dcd032c369770e;hb=4e4ce8577f8582967995919860c66aa94d633afd;hp=c9e0becb80fc8103d2b5ed389fd7990ddf985144;hpb=50c10c8d64132ff5c269b23e62693db985dfe3f8;p=fa-stable.git diff --git a/includes/session.inc b/includes/session.inc index c9e0becb..261f8914 100644 --- a/includes/session.inc +++ b/includes/session.inc @@ -40,7 +40,7 @@ function login_fail() 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 "
" . _("Try again") . ""; + echo "
" . _("Try again") . ""; echo ""; kill_login(); @@ -51,6 +51,10 @@ function login_fail() function check_page_security($page_security) { + global $SysPrefs; + + $msg = ''; + if (!$_SESSION["wa_current_user"]->check_user_access()) { // notification after upgrade from pre-2.2 version @@ -58,9 +62,12 @@ function check_page_security($page_security) _("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); + } elseif (!$_SESSION['SysPrefs']->db_ok && !$_SESSION["wa_current_user"]->can_access('SA_SOFTWAREUPGRADE')) { + $msg = _('Access to application has been blocked until database upgrade is completed by system administrator.'); + } + + if ($msg){ + display_error($msg); end_page(); kill_login(); exit; @@ -68,19 +75,44 @@ 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 "



"; echo _("The security settings on your account do not permit you to access this function"); echo ""; echo "



"; end_page(); - //kill_login(); exit; } + if (!$_SESSION['SysPrefs']->db_ok + && !in_array($page_security, array('SA_SOFTWAREUPGRADE', 'SA_OPEN', 'SA_BACKUP'))) + { + display_error(_('System is blocked after source upgrade until database is updated on System/Software Upgrade page')); + end_page(); + 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; + } } //----------------------------------------------------------------------------- @@ -99,6 +131,18 @@ function strip_quotes($data) return $data; } +function html_cleanup(&$parms) +{ + foreach($parms as $name => $value) { +// $value = @html_entity_decode($value, ENT_QUOTES, $_SESSION['language']->encoding); + if (is_array($value)) + html_cleanup($parms[$name]); + else + $parms[$name] = @htmlspecialchars($value, ENT_QUOTES, $_SESSION['language']->encoding); + } + reset($parms); // needed for direct key() usage later throughout the sources +} + //============================================================================ // // @@ -124,13 +168,29 @@ 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/errors.inc"); +// colect all error msgs +set_error_handler('error_handler' /*, errtypes */); + +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"); include_once($path_to_root . "/includes/ui/ui_msgs.inc"); +include_once($path_to_root . "/includes/prefs/sysprefs.inc"); + +include_once($path_to_root . "/includes/hooks.inc"); +// +// include all extensions hook files. +// +foreach ($installed_extensions as $ext) +{ + if (file_exists($path_to_root.'/'.$ext['path'].'/hooks.php')) + include_once($path_to_root.'/'.$ext['path'].'/hooks.php'); +} + /* Uncomment the setting below when using FA on shared hosting @@ -141,33 +201,36 @@ include_once($path_to_root . "/includes/ui/ui_msgs.inc"); ini_set('session.gc_maxlifetime', 36000); // 10hrs -session_name('FrontAccounting'); +hook_session_start(@$_POST["company_login_name"]); + +session_name('FA'.md5(dirname(__FILE__))); + session_start(); +session_regenerate_id(); + // this is to fix the "back-do-you-want-to-refresh" issue - thanx PHPFreaks header("Cache-control: private"); +include_once($path_to_root . "/config.php"); get_text_init(); // Page Initialisation -if (!isset($_SESSION['languages'])) +if (!isset($_SESSION['language']) || !method_exists($_SESSION['language'], 'set_language')) { - load_languages(); // sets also default $_SESSION['language'] + $l = array_search_value($dflt_lang, $installed_languages, 'code'); + $_SESSION['language'] = new language($l['name'], $l['code'], $l['encoding'], + (isset($l['rtl']) && $l['rtl'] === true) ? 'rtl' : 'ltr'); } $_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 . "/version.php"); include_once($path_to_root . "/includes/main.inc"); // Ajax communication object -$Ajax =& new Ajax(); +$Ajax = new Ajax(); // js/php validation rules container $Validate = array(); @@ -176,21 +239,19 @@ $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); -// colect all error msgs -set_error_handler('error_handler' /*, errtypes */); - if (!isset($_SESSION["wa_current_user"])) $_SESSION["wa_current_user"] = new current_user(); -set_global_connection(); +html_cleanup($_GET); +html_cleanup($_POST); +html_cleanup($_REQUEST); +html_cleanup($_SERVER); // logout.php is the only page we should have always // accessable regardless of access level and current login status. @@ -203,19 +264,19 @@ if (strstr($_SERVER['PHP_SELF'], 'logout.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'], + // strip ajax marker from uri, to force synchronous page reload + $_SESSION['timeout'] = array( 'uri'=>preg_replace('/JsHttpRequest=(?:(\d+)-)?([^&]+)/s', + '', @htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES, $_SESSION['language']->encoding)), '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"); - } + include($path_to_root . "/access/login.php"); + if (in_ajax()) + $Ajax->activate('_page_body'); exit; } else { - $succeed = $_SESSION["wa_current_user"]->login($_POST["company_login_name"], + + $succeed = isset($db_connections[$_POST["company_login_name"]]) && + $_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']; @@ -227,19 +288,24 @@ if (strstr($_SERVER['PHP_SELF'], 'logout.php') == false){ $lang = &$_SESSION['language']; $lang->set_language($_SESSION['language']->code); } - } + } else + set_global_connection(); + + if (!$_SESSION["wa_current_user"]->old_db) + include_once($path_to_root . '/company/'.user_company().'/installed_extensions.php'); + + install_hooks(); if (!isset($_SESSION["App"])) { $_SESSION["App"] = new front_accounting(); $_SESSION["App"]->init(); } +} -//---------------------------------------------------------------------------------------- +$SysPrefs = &$_SESSION['SysPrefs']; - 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); +$_POST = strip_quotes($_POST); ?> \ No newline at end of file