X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fdb%2Fcompany_db.inc;h=f73cd04cc636036d1b68bd41738d6a64b0fb1288;hb=ec58402529d7c61843274582de9174cbb2e56679;hp=e13690926a47b2b2a554f7cb88094dd6f0d7d710;hpb=e72ab8e70a65eec9e98b0411456f389422faf4b4;p=fa-stable.git

diff --git a/admin/db/company_db.inc b/admin/db/company_db.inc
index e1369092..f73cd04c 100644
--- 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,34 +30,14 @@ 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, $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";
-		$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;
@@ -68,12 +48,19 @@ function get_company_pref($prefs = null, $tbpref = null)
 	foreach($prefs as $name)
 		$ret[$name] = $all[$name];
 
-		return $ret;
+	return $ret;
 }
 
-function get_company_prefs($tbpref = TB_PREF)
+function get_company_prefs()
 {
-	return get_company_pref(null, $tbpref);
+	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 get_base_sales_type()
@@ -159,10 +146,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 +158,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";
@@ -184,4 +169,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;
+}