Fixed syntax typo.

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

diff --git a/includes/session.inc b/includes/session.inc
index c37b7c15d6399d953e9bc0ebae7a8fef60a28c7c..a306acf063010cabf703a03599cc8dea2b684763 100644 (file)
--- a/includes/session.inc
+++ b/includes/session.inc
@@ -52,10 +52,10 @@ function check_page_security($page_security)
        if (!$_SESSION["wa_current_user"]->check_user_access())
        {
                // notification after upgrade from pre-2.2 version
-               $msg = is_array($_SESSION["wa_current_user"]->role_set) ?
-                       _("Please remove \$security_groups and \$security_headings arrays from config.php file!")
-                       : _("Security settings have not been defined for your user account.")
-                       . "<br>" . _("Please contact your system administrator.");
+               $msg = $_SESSION["wa_current_user"]->old_db ?
+                        _("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!");
 
                page(_("Access denied"), false);
                        display_error($msg);
@@ -102,7 +102,9 @@ function strip_quotes($data)
 //
 function login_timeout()
 {
-       if ($_SESSION["wa_current_user"]->logged) {
+       // 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))
                {
@@ -143,15 +145,15 @@ 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")) 
@@ -173,6 +175,10 @@ $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);
@@ -215,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);
        }
 }