X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fsession.inc;h=22644aec2fe2955352ab212c4e7c6f2a4b4aebb3;hb=1571869d54be48452fdbe08f25130972ff0a7b5a;hp=0089095be1fd341a3b9dc02f19e4b0cc3944ed0e;hpb=327bdb5d6f9a11274f0bedd20e6c9d39276a5f8f;p=fa-stable.git

diff --git a/includes/session.inc b/includes/session.inc
index 0089095b..22644aec 100644
--- a/includes/session.inc
+++ b/includes/session.inc
@@ -359,6 +359,8 @@ foreach ($installed_extensions as $ext)
 
 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__)));
 
@@ -372,7 +374,8 @@ if ($login_delay > 0)
 	@include_once($path_to_root . "/tmp/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'],
@@ -385,6 +388,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();
@@ -467,7 +471,10 @@ if (strstr($_SERVER['PHP_SELF'], 'logout.php') == false){
 			$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();
@@ -480,5 +487,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