X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fcurrent_user.inc;h=b97db9f374bdf747390201ef5f29da3765c0d444;hb=66a62190f99d83f958bb98195b5756b8b307e378;hp=7763ae672e76bb473313d939da0150e2e7fa211e;hpb=98a64632fdc5636cf2a59457e703b73b00254595;p=fa-stable.git

diff --git a/includes/current_user.inc b/includes/current_user.inc
index 7763ae67..b97db9f3 100644
--- a/includes/current_user.inc
+++ b/includes/current_user.inc
@@ -9,8 +9,11 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-include_once($path_to_root . "/includes/prefs/userprefs.inc");
 
+include_once($path_to_root . "/includes/prefs/userprefs.inc");
+if (!defined('TB_PREF')) {
+	define('TB_PREF', '&TB_PREF&');
+}
 //--------------------------------------------------------------------------
 
 class current_user
@@ -19,17 +22,18 @@ class current_user
 	var $loginname;
 	var $username;
 	var $name;
-	var $company;
+	var $company; // user's company
 	var $pos;
 	var $access;
 	var $timeout;
 	var $last_act;
 	var $role_set = false;
-	var $old_db;	
+	var $old_db;
 	var $logged;
 	var $ui_mode = 0;
 	
 	var $prefs;
+	var $cur_con; // current db connection (can be different from $company for superuser)
 
 	function current_user()
 	{
@@ -149,22 +153,9 @@ class current_user
 		return $this->can_access($page_level);
 	}
 
-	function get_db_connection($id=-1)
+	function set_db_connection($id = -1)
 	{
-    	global $db_connections;
-
-    	$connection = $db_connections[$id == -1 ? $this->company : $id];
-
-    	//print_r($connection);
-
-    	$db = mysql_connect($connection["host"] ,
-    		$connection["dbuser"], $connection["dbpassword"]);
-    	mysql_select_db($connection["dbname"],$db);
-
-		if (!defined('TB_PREF'))
-			define('TB_PREF', $connection["tbpref"]);
-
-    	return $db;
+		return set_global_connection($id);
 	}
 
 	function update_prefs($prefs)
@@ -198,7 +189,7 @@ function number_format2($number, $decimals=0)
 	$tsep = $thoseps[$_SESSION["wa_current_user"]->prefs->tho_sep()];
 	$dsep = $decseps[$_SESSION["wa_current_user"]->prefs->dec_sep()];
 	//return number_format($number, $decimals, $dsep,	$tsep);
-	if($decimals=='max')
+	if($decimals==='max')
 		$dec = 15 - floor(log10(abs($number)));
 	else {
 		$delta = ($number < 0 ? -.0000000001 : .0000000001);