Update from beta to RC1

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

diff --git a/admin/db/company_db.inc b/admin/db/company_db.inc
index bca6a1cc2671be4fba124b57b260c1921ca9d1f9..521851386c458b319ba848dea8ecfd06e8486f6b 100644 (file)
--- a/admin/db/company_db.inc
+++ b/admin/db/company_db.inc
@@ -12,13 +12,15 @@
 /*
        Update main or gl company setup.
 */
-function update_company_prefs( $params )
+function update_company_prefs( $params, $pref = TB_PREF )
 {
-       $sql = "UPDATE ".TB_PREF."sys_prefs SET value = ";
+       $sql = "UPDATE {$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 "))
                        return false;
+               // update cached value
+               $_SESSION['SysPrefs']->prefs[$name] = $value;
        }
        return true;
 }
@@ -28,7 +30,7 @@ function update_company_prefs( $params )
        $prefs can be preference name, array of names, or null for all preferences.
        
 */
-function get_company_pref($prefs = null, $tbpref = TB_PREF)
+function get_company_pref($prefs = null, $tbpref = null)
 {
        global $SysPrefs, $core_version;
        
@@ -36,7 +38,10 @@ function get_company_pref($prefs = null, $tbpref = TB_PREF)
 
                $_SESSION['SysPrefs'] = new sys_prefs();
 
-               $sql = "SELECT name, value FROM ".$tbpref."sys_prefs";
+               if (!isset($tbpref))
+                       $tbpref = TB_PREF;
+
+               $sql = "SELECT name, value FROM {$tbpref}sys_prefs";
                $result = @db_query($sql); // supress errors before 2.3 db structure upgrade
 
                if(!$result)
@@ -57,7 +62,7 @@ function get_company_pref($prefs = null, $tbpref = TB_PREF)
        if (!$prefs)
                return $all;
        elseif (is_string($prefs))
-               return $all[$prefs];
+               return @$all[$prefs];
 
        $ret = array();
        foreach($prefs as $name)
@@ -147,15 +152,36 @@ function get_payment_terms_all($show_inactive)
        if (!$show_inactive) $sql .= " WHERE !inactive";
        return db_query($sql,"could not get payment terms");
 }
-
-function key_in_foreign_table($id, $table, $key, $escaped=false)
+/*
+       Return number of records in tables, where some foreign key $id is used.
+       $id - searched key value
+       $tables - array of table names (without prefix); when table name is used as a key, then
+               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)
 {
        if (!$escaped)
                $id = db_escape($id);
-       $sql= "SELECT COUNT(*) FROM ".TB_PREF."$table WHERE $key = $id";
-       $result = db_query($sql,"check $table relations failed");
-       $myrow = db_fetch_row($result);
-       return ($myrow[0] > 0); 
+
+       if (!is_array($tables))
+               $tables = array($tables);
+
+       $sqls = array();
+       foreach ($tables as $tbl => $key) {
+               if (is_numeric($tbl)) {
+                       $tbl = $key;
+                       $key = $stdkey;
+               }
+               $sqls[] = "(SELECT COUNT(*) as cnt FROM ".TB_PREF."$tbl WHERE $key=$id)\n";
+       }
+
+       $sql = "SELECT sum(cnt) FROM (". implode(' UNION ', $sqls).") as counts";
+
+       $result = db_query($sql, "check relations for ".implode(',',$tables)." failed");
+       $count =  db_fetch($result);
+
+       return $count[0];
 }
 
 ?>
\ No newline at end of file