Optimised get_company_pref()

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

diff --git a/admin/db/company_db.inc b/admin/db/company_db.inc
index 3f1718ca20e661540bac445b130b322eda644efe..39108db831f22d408f41f2344c3a1c3b9371f96a 100644 (file)
--- a/admin/db/company_db.inc
+++ b/admin/db/company_db.inc
@@ -33,39 +33,19 @@ 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(!$result)
-                       return null;
-
-               while($pref = db_fetch_assoc($result)) {
-                       $_SESSION['SysPrefs']->prefs[$pref['name']] = $pref['value'];
-               }
 
-               $SysPrefs = &$_SESSION['SysPrefs'];
+       if (!isset($SysPrefs->prefs))    // just after first login or reset
+               $SysPrefs->refresh();
 
-               // 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;
-       elseif (is_string($prefs))
+       if ($prefs && is_string($prefs))
                return @$all[$prefs];
 
-       $ret = array();
-       foreach($prefs as $name)
-               $ret[$name] = $all[$name];
+       if (!is_array($all))
+               $all = array();
 
-               return $ret;
+       return $all;
 }
 
 function get_company_prefs()
@@ -80,13 +60,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');
@@ -199,18 +172,18 @@ function key_in_foreign_table($id, $tables, $stdkey)
 //
 function clean_user_themes($theme)
 {
-       global $db_connections, $db, $installed_extensions;
+       global $db_connections, $db;
 
        $comp = user_company();
 
-       foreach ($db_connections as $n => $conn) {
+       $connections = $db_connections; // do not use db_connections directly here, or script will hang due to db_connections usage inside the loop
+       foreach ($connections as $n => $conn) {
                $db = $_SESSION["wa_current_user"]->set_db_connection($n);
                $sql = "UPDATE {$conn['tbpref']}users SET theme='default' WHERE theme='$theme'";
                if (!db_query($sql, 'Cannot update user theme settings'))
                        return false;
        }
        $db = $_SESSION["wa_current_user"]->set_db_connection($comp);
-
        $_SESSION['wa_current_user']->prefs->theme = 'default';
        return true;
 }