Additional fixes to last merge.

[fa-stable.git] / admin / db / company_db.inc

diff --git a/admin/db/company_db.inc b/admin/db/company_db.inc
index 0a01a7c493c7048fae374606ea6d520b11ee9b4b..bd9c4ea5d635587e2c74001281717d4d6231a465 100644 (file)
--- 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,7 +30,7 @@ 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;
        
@@ -38,10 +38,7 @@ function get_company_pref($prefs = null, $tbpref = null)
 
                $_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)
@@ -71,14 +68,14 @@ 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 `0_sys_prefs` SET `name`=".db_escape($pref).", `category`=".db_escape($category)
+       $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");
 }
@@ -187,7 +184,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";