System preferences moved form company to new sys_prefs table

[fa-stable.git] / includes / session.inc

diff --git a/includes/session.inc b/includes/session.inc
index f449407d9af302f698a555bb4d4810c8c86dec6d..f6ac6b26ce8bbcba0e29b98c605b6fc8f819476a 100644 (file)
--- 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.")
                                . "<br>" . _("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,14 @@ 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 
@@ -147,6 +163,7 @@ 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");
 
 /*
        Uncomment the setting below when using FA on shared hosting
@@ -162,19 +179,23 @@ session_start();
 // this is to fix the "back-do-you-want-to-refresh" issue - thanx PHPFreaks
 header("Cache-control: private");
 
+
 get_text_init();
 
 // Page Initialisation
 if (!isset($_SESSION['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']) ? '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")) 
+if (file_exists($path_to_root . "/lang/".$_SESSION['language']->code."/locale.inc"))
 {
+       include_once($path_to_root . "/lang/".$_SESSION['language']->code."/locale.inc");
        $Hooks = new Hooks();
 }
 
@@ -183,7 +204,7 @@ include_once($path_to_root . "/config.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();
@@ -192,8 +213,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
@@ -206,8 +225,6 @@ set_error_handler('error_handler' /*, errtypes */);
 if (!isset($_SESSION["wa_current_user"]))
        $_SESSION["wa_current_user"] = new current_user();
 
-set_global_connection();
-
 // 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){
@@ -243,7 +260,8 @@ 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');
@@ -253,6 +271,9 @@ if (strstr($_SERVER['PHP_SELF'], 'logout.php') == false){
                $_SESSION["App"]->init();
        }
 }
+
+$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);