X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fdb%2Fcompany_db.inc;h=39108db831f22d408f41f2344c3a1c3b9371f96a;hb=e221114b610740861dae6b7b4af5d0af28abbe21;hp=1a01ec63e7200108ccbd8f37879837a81b0b6f09;hpb=78fe8cb8f56510ba3f6a1720b207a33b5828e071;p=fa-stable.git

diff --git a/admin/db/company_db.inc b/admin/db/company_db.inc
index 1a01ec63..39108db8 100644
--- a/admin/db/company_db.inc
+++ b/admin/db/company_db.inc
@@ -33,42 +33,22 @@ 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'];
 
-		// update current db status for info in log file
-		$SysPrefs->db_ok = $SysPrefs->prefs['version_id'] == $db_version;
-	}
+	if (!isset($SysPrefs->prefs))	 // just after first login or reset
+		$SysPrefs->refresh();
 
-	$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 set_company_pref($pref, $category, $type, $length, $value)
+function get_company_prefs()
 {
 	return get_company_pref(null);
 }
@@ -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(company_path().'/js_cache'); // clear cache
-	unset($_SESSION['SysPrefs']);
-	get_company_prefs();
-}
-
 function get_base_sales_type()
 {
 	return get_company_pref('base_sales');
@@ -170,10 +143,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);
@@ -195,4 +166,24 @@ function key_in_foreign_table($id, $tables, $stdkey, $escaped=false)
 	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;
+}