Merged changes from main trunk up to 2.2.3

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

diff --git a/includes/session.inc b/includes/session.inc
index 734c17036f9d2160bf55d535380c7f01f284323f..8929ff2e4341e83a777b7e75ebd4fb7d76e8789c 100644 (file)
--- a/includes/session.inc
+++ b/includes/session.inc
@@ -162,19 +162,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 +187,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();
@@ -206,8 +210,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,15 +245,19 @@ if (strstr($_SERVER['PHP_SELF'], 'logout.php') == false){
                        $lang = &$_SESSION['language'];
                        $lang->set_language($_SESSION['language']->code);
                }
-       }
+       } else
+               set_global_connection();
 
-       include_once($path_to_root . '/company/'.user_company().'/installed_extensions.php');
+       if (!$_SESSION["wa_current_user"]->old_db)
+               include_once($path_to_root . '/company/'.user_company().'/installed_extensions.php');
 
        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);