X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fdb%2Fcompany_db.inc;h=f73cd04cc636036d1b68bd41738d6a64b0fb1288;hb=582e4a2443d9ed6ca67f47c05b7d92772b53b805;hp=9fd2e68c27adf2931ce65aeb9bb01586bd801526;hpb=264c09696d65efe4532c197f317162daf8c24f32;p=fa-stable.git

diff --git a/admin/db/company_db.inc b/admin/db/company_db.inc
index 9fd2e68c..f73cd04c 100644
--- 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(!$result)
-			return null;
-
-		while($pref = db_fetch_assoc($result)) {
-			$_SESSION['SysPrefs']->prefs[$pref['name']] = $pref['value'];
-		}
+	if (!isset($SysPrefs->prefs))	 // just after first login or reset
+		$SysPrefs->refresh();
 
-		$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(company_path().'/js_cache'); // clear cache
-	unset($_SESSION['SysPrefs']);
-	get_company_prefs();
-}
-
 function get_base_sales_type()
 {
 	return get_company_pref('base_sales');
@@ -193,4 +169,24 @@ function key_in_foreign_table($id, $tables, $stdkey)
 	return $count[0];
 }
 
-?>
\ No newline at end of file
+//---------------------------------------------------------------------------------------------
+//
+// Resets $theme references in users records to 'default'.
+//
+function clean_user_themes($theme)
+{
+	global $db_connections, $db;
+
+	$comp = user_company();
+
+	$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;
+}