X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fdb%2Fcompany_db.inc;h=9fd2e68c27adf2931ce65aeb9bb01586bd801526;hb=7840540918bfd37c886877a5d52e3ba0b3373289;hp=64f44bc3f3992873966cbf4f9235127cc5e1f340;hpb=d3d448011070f36166a37c2b7ab146a4e160b66b;p=fa-stable.git

diff --git a/admin/db/company_db.inc b/admin/db/company_db.inc
index 64f44bc3..9fd2e68c 100644
--- a/admin/db/company_db.inc
+++ b/admin/db/company_db.inc
@@ -12,9 +12,9 @@
 /*
 	Update main or gl company setup.
 */
-function update_company_prefs( $params, $pref = TB_PREF )
+function update_company_prefs($params)
 {
-	$sql = "UPDATE {$pref}sys_prefs SET value = ";
+	$sql = "UPDATE ".TB_PREF."sys_prefs SET value = ";
 	foreach($params as $name => $value) {
 		if (!db_query($sql. db_escape($value). " WHERE name=".db_escape($name),
 			 "The company prefferences could not be updated "))
@@ -30,21 +30,15 @@ function update_company_prefs( $params, $pref = TB_PREF )
 	$prefs can be preference name, array of names, or null for all preferences.
 	
 */
-function get_company_pref($prefs = null, $tbpref = null)
+function get_company_pref($prefs = null)
 {
 	global $SysPrefs, $db_version;
 	
-	static $cached; // retrieve values from db once a request. Some values can't be cached between requests
-					// to ensure prefs integrity for all usrs (e.g. gl_close_date).
-	
-	if (!$cached) { // cached preferences
+	if (!isset($_SESSION['SysPrefs']->prefs)) { // cached preferences
 
 		$_SESSION['SysPrefs'] = new sys_prefs();
 
-		if (!isset($tbpref))
-			$tbpref = TB_PREF;
-
-		$sql = "SELECT name, value FROM {$tbpref}sys_prefs";
+		$sql = "SELECT name, value FROM ".TB_PREF."sys_prefs";
 		$result = @db_query($sql); // supress errors before 2.3 db structure upgrade
 
 		if(!$result)
@@ -58,7 +52,6 @@ function get_company_pref($prefs = null, $tbpref = null)
 
 		// update current db status for info in log file
 		$SysPrefs->db_ok = $SysPrefs->prefs['version_id'] == $db_version;
-		$cached = true;
 	}
 
 	$all = $_SESSION['SysPrefs']->prefs;
@@ -75,15 +68,15 @@ function get_company_pref($prefs = null, $tbpref = null)
 		return $ret;
 }
 
-function get_company_prefs($tbpref = TB_PREF)
+function get_company_prefs()
 {
-	return get_company_pref(null, $tbpref);
+	return get_company_pref(null);
 }
 
 function set_company_pref($pref, $category, $type, $length, $value)
 {
-	$sql = "REPLACE ".TB_PREF."sys_prefs SET name=".db_escape($pref).", category=".db_escape($category)
-		.", type=".db_escape($type).", length=".db_escape($length).", value=".db_escape($value);
+	$sql = "REPLACE `".TB_PREF."sys_prefs` SET `name`=".db_escape($pref).", `category`=".db_escape($category)
+		.", `type`=".db_escape($type).", `length`=".db_escape($length).", `value`=".db_escape($value);
 	return db_query($sql, "cannot set company pref");
 }
 
@@ -177,10 +170,8 @@ function get_payment_terms_all($show_inactive)
 		value is name of foreign key field. For numeric keys $stdkey field name is used.
 	$stdkey - standard name of foreign key.
 */
-function key_in_foreign_table($id, $tables, $stdkey, $escaped=false)
+function key_in_foreign_table($id, $tables, $stdkey)
 {
-	if (!$escaped)
-		$id = db_escape($id);
 
 	if (!is_array($tables))
 		$tables = array($tables);
@@ -191,7 +182,7 @@ function key_in_foreign_table($id, $tables, $stdkey, $escaped=false)
 			$tbl = $key;
 			$key = $stdkey;
 		}
-		$sqls[] = "(SELECT COUNT(*) as cnt FROM ".TB_PREF."$tbl WHERE $key=$id)\n";
+		$sqls[] = "(SELECT COUNT(*) as cnt FROM `".TB_PREF."$tbl` WHERE `$key`=".db_escape($id).")\n";
 	}
 
 	$sql = "SELECT sum(cnt) FROM (". implode(' UNION ', $sqls).") as counts";