Stable merged into unstable again (due to failure on binary file during previous...

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

diff --git a/admin/db/company_db.inc b/admin/db/company_db.inc
index 521851386c458b319ba848dea8ecfd06e8486f6b..9fd2e68c27adf2931ce65aeb9bb01586bd801526 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,18 +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, $core_version;
+       global $SysPrefs, $db_version;
        
        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)
@@ -54,7 +51,7 @@ function get_company_pref($prefs = null, $tbpref = null)
                $SysPrefs = &$_SESSION['SysPrefs'];
 
                // update current db status for info in log file
-               $SysPrefs->db_ok = $SysPrefs->prefs['version_id'] == $core_version;
+               $SysPrefs->db_ok = $SysPrefs->prefs['version_id'] == $db_version;
        }
 
        $all = $_SESSION['SysPrefs']->prefs;
@@ -71,9 +68,23 @@ 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);
+}
+
+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);
+       return db_query($sql, "cannot set company pref");
+}
+
+function refresh_sys_prefs()
 {
-       return get_company_pref(null, $tbpref);
+       flush_dir(company_path().'/js_cache'); // clear cache
+       unset($_SESSION['SysPrefs']);
+       get_company_prefs();
 }
 
 function get_base_sales_type()
@@ -84,7 +95,7 @@ function get_base_sales_type()
 function get_company_extensions($id = -1) {
        global $path_to_root;
 
-       $file = $path_to_root.($id == -1 ? '' : '/company/'.$id).'/installed_extensions.php';
+       $file = $path_to_root.($id == -1 ? '' : '/company/'.(int)$id).'/installed_extensions.php';
        $installed_extensions = array();
        if (is_file($file)) {
                include($file);
@@ -159,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);
@@ -173,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";