X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fcurrent_user.inc;h=1c7d161183a560d493ee685b891bba6020d1bfc5;hb=175a48c5bd73abe16e77fa2cb48ba522f00d1501;hp=ef14c821402b12db3cfb428fb5af3069945d2719;hpb=d117e84dc5e15c3c8fff7781dc0936ad63c10b22;p=fa-stable.git

diff --git a/includes/current_user.inc b/includes/current_user.inc
index ef14c821..1c7d1611 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)
@@ -420,6 +411,11 @@ function user_startup_tab()
 	return $_SESSION["wa_current_user"]->prefs->start_up_tab();
 }
 
+function user_check_access($sec_area)
+{
+	return $_SESSION["wa_current_user"]->can_access($sec_area);
+}
+
 function set_user_prefs($prefs)
 {
 	$_SESSION["wa_current_user"]->update_prefs($prefs);