Fixed upgrade procedures (obsolete columns dropped in post_install phase), restored...

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

diff --git a/admin/db/company_db.inc b/admin/db/company_db.inc
index 1346aa3ad457cc1970654f71dbb490c45cf0aaab..447307b8d98d8d3bdd2db991ed5e4c36566f19de 100644 (file)
--- a/admin/db/company_db.inc
+++ b/admin/db/company_db.inc
@@ -33,28 +33,11 @@ function update_company_prefs($params)
 function get_company_pref($prefs = null)
 {
        global $SysPrefs, $db_version;
-       
-       if (!isset($_SESSION['SysPrefs']->prefs)) { // cached preferences
-
-               $_SESSION['SysPrefs'] = new sys_prefs();
 
-               $sql = "SELECT name, value FROM ".TB_PREF."sys_prefs";
-               $result = @db_query($sql); // supress errors before 2.3 db structure upgrade
+       if (!isset($SysPrefs->prefs))    // just after first login or reset
+               $SysPrefs->refresh();
 
-               if(!$result)
-                       return null;
-
-               while($pref = db_fetch_assoc($result)) {
-                       $_SESSION['SysPrefs']->prefs[$pref['name']] = $pref['value'];
-               }
-
-               $SysPrefs = &$_SESSION['SysPrefs'];
-
-               // update current db status for info in log file
-               $SysPrefs->db_ok = $SysPrefs->prefs['version_id'] == $db_version;
-       }
-
-       $all = $_SESSION['SysPrefs']->prefs;
+       $all = $SysPrefs->prefs;
 
        if (!$prefs)
                return $all;
@@ -65,7 +48,7 @@ function get_company_pref($prefs = null)
        foreach($prefs as $name)
                $ret[$name] = $all[$name];
 
-               return $ret;
+       return $ret;
 }
 
 function get_company_prefs()
@@ -80,13 +63,6 @@ function set_company_pref($pref, $category, $type, $length, $value)
        return db_query($sql, "cannot set company pref");
 }
 
-function refresh_sys_prefs()
-{
-       flush_dir(user_js_cache()); // clear cache
-       unset($_SESSION['SysPrefs']);
-       get_company_prefs();
-}
-
 function get_base_sales_type()
 {
        return get_company_pref('base_sales');
@@ -214,5 +190,3 @@ function clean_user_themes($theme)
        $_SESSION['wa_current_user']->prefs->theme = 'default';
        return true;
 }
-
-