X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fsession.inc;h=5620c78d1af384e68f1e966683808ddc09e616c5;hb=8bc62affeb4931af38076490facde167cf7b84b1;hp=3617a91c8dc709e80b4ad74c9f89af9ae5f578a7;hpb=d497aeb2d93ed1c705007fa6ff84a4c470f7f538;p=fa-stable.git diff --git a/includes/session.inc b/includes/session.inc index 3617a91c..5620c78d 100644 --- a/includes/session.inc +++ b/includes/session.inc @@ -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,7 +62,11 @@ 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!"); - + } 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(); @@ -75,6 +83,36 @@ function check_page_security($page_security) end_page(); 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; + } } //----------------------------------------------------------------------------- @@ -93,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 +} + //============================================================================ // // @@ -125,6 +175,9 @@ 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"); /* Uncomment the setting below when using FA on shared hosting @@ -135,33 +188,33 @@ include_once($path_to_root . "/includes/ui/ui_msgs.inc"); ini_set('session.gc_maxlifetime', 36000); // 10hrs -session_name('FrontAccounting'); +session_name('FA'.md5(dirname(__FILE__))); +//include_once($path_to_root.'/modules/www_statistics/includes/db_sessions.inc'); session_start(); + // 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(); @@ -170,8 +223,6 @@ $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 @@ -184,7 +235,9 @@ 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); // logout.php is the only page we should have always // accessable regardless of access level and current login status. @@ -197,19 +250,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']; @@ -221,26 +274,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'); - 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(); } +} - /* - This call is necessary only at: - . on any page with non-standard security areas - . in security roles editor - To be optmized after. - */ - add_access_extensions(); +$SysPrefs = &$_SESSION['SysPrefs']; -} // 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