X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fsession.inc;h=d8a82f8bd0699087dae83f27ff70d1fc1bf3a6fb;hb=cfaa5cec1f5137bcc1599a4306879e3265d1dacd;hp=d9fd8c305724cbabd3d34efa96a9f711ac164b58;hpb=918e4561ac1adc980f79c9c3cdbcf8d250a7fdc0;p=fa-stable.git diff --git a/includes/session.inc b/includes/session.inc index d9fd8c30..d8a82f8b 100644 --- a/includes/session.inc +++ b/includes/session.inc @@ -240,7 +240,7 @@ 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')) + } elseif (!$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.'); } @@ -262,7 +262,7 @@ function check_page_security($page_security) end_page(@$_REQUEST['popup']); exit; } - if (!$_SESSION['SysPrefs']->db_ok + if (!$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')); @@ -380,6 +380,8 @@ foreach ($installed_extensions as $ext) if (file_exists($path_to_root.'/'.$ext['path'].'/hooks.php')) include_once($path_to_root.'/'.$ext['path'].'/hooks.php'); } +$Session_manager = new SessionManager(); +$Session_manager->sessionStart('FA'.md5(dirname(__FILE__))); $_SESSION['SysPrefs'] = new sys_prefs(); @@ -418,9 +420,6 @@ ini_set('session.gc_maxlifetime', 36000); // 10hrs hook_session_start(@$_POST["company_login_name"]); -$Session_manager = new SessionManager(); -$Session_manager->sessionStart('FA'.md5(dirname(__FILE__))); - // this is to fix the "back-do-you-want-to-refresh" issue - thanx PHPFreaks header("Cache-control: private"); @@ -554,18 +553,20 @@ if (!defined('FA_LOGOUT_PHP_FILE')){ $lang->set_language($_SESSION['language']->code); } } else - { set_global_connection(); - if (db_fixed()) - db_set_encoding($_SESSION['language']->encoding); - } + { + set_global_connection(); + + if (db_fixed()) + db_set_encoding($_SESSION['language']->encoding); + $SysPrefs->refresh(); + } 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);