Merged changes form stable branch up to 2.3.13

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

diff --git a/includes/session.inc b/includes/session.inc
index ed5f5c0312e1da7773c34f1676a4407c233898bd..9a3efc267fd696e5206ede57d78a6c29dc56d7fc 100644 (file)
--- a/includes/session.inc
+++ b/includes/session.inc
@@ -76,8 +76,7 @@ class SessionManager
                $_SESSION['EXPIRES'] = time() + 10;
 
                // Create new session without destroying the old one
-               session_regenerate_id(version_compare(PHP_VERSION, '5.1.0') >= 0 && (substr(strtoupper(PHP_OS),0,3) == "WIN"));
- 
+               session_regenerate_id();
                // Grab current session ID and close both sessions to allow other scripts to use them
                $newSession = session_id();
                session_write_close();
@@ -357,6 +356,8 @@ foreach ($installed_extensions as $ext)
 ini_set('session.gc_maxlifetime', 36000); // 10hrs
 ini_set('session.cache_limiter', 'private'); // prevent 'page expired' errors
 
+hook_session_start(@$_POST["company_login_name"]);
+
 $Session_manager = new SessionManager();
 $Session_manager->sessionStart('FA'.md5(dirname(__FILE__)));
 
@@ -370,7 +371,8 @@ if ($login_delay > 0)
        @include_once($path_to_root . "/faillog.php");
 
 // Page Initialisation
-if (!isset($_SESSION['language']) || !method_exists($_SESSION['language'], 'set_language')) 
+if (!isset($_SESSION['wa_current_user']) || !$_SESSION['wa_current_user']->logged_in()
+       || !isset($_SESSION['language']) || !method_exists($_SESSION['language'], 'set_language'))
 {
        $l = array_search_value($dflt_lang, $installed_languages,  'code');
        $_SESSION['language'] = new language($l['name'], $l['code'], $l['encoding'],
@@ -383,6 +385,7 @@ $_SESSION['language']->set_language($_SESSION['language']->code);
 include_once($path_to_root . "/includes/access_levels.inc");
 include_once($path_to_root . "/version.php");
 include_once($path_to_root . "/includes/main.inc");
+include_once($path_to_root . "/includes/app_entries.inc");
 
 // Ajax communication object
 $Ajax = new Ajax();
@@ -453,11 +456,12 @@ if (strstr($_SERVER['PHP_SELF'], 'logout.php') == false){
                        // Incorrect password
                                login_fail();
                        }
-                       $lang = &$_SESSION['language'];
-                       $lang->set_language($_SESSION['language']->code);
                }
        } else
-               set_global_connection();
+       {       set_global_connection();
+                       if (db_fixed())
+                               db_set_encoding($_SESSION['language']->encoding);
+       }
 
        if (!isset($_SESSION["App"])) {
                $_SESSION["App"] = new front_accounting();
@@ -470,5 +474,3 @@ $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);
-
-?>
\ No newline at end of file