X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fdb_prefs.php;h=960a8bbe2776ea81345ed3bd83fb8c79d8d11449;hp=029c9354b158d4201e392694de400c6a239e7a0f;hb=88a99543763d8a85d201267d387493c07997d7c5;hpb=3499f99feb029991182c20537d7e8f8fc83c3a5d diff --git a/functions/db_prefs.php b/functions/db_prefs.php index 029c9354..960a8bbe 100644 --- a/functions/db_prefs.php +++ b/functions/db_prefs.php @@ -3,21 +3,17 @@ /* * db_prefs.php * - * Copyright (c) 1999-2002 The SquirrelMail Project Team + * Copyright (c) 1999-2003 The SquirrelMail Project Team * Licensed under the GNU GPL. For full terms see the file COPYING. * * This contains functions for manipulating user preferences * stored in a database, accessed though the Pear DB layer. * - * To use this instead of the regular prefs.php, create a - * database as described below, and replace prefs.php - * with this file. - * * Database: * --------- * - * The preferences table should have tree columns: - * username char \ primary + * The preferences table should have three columns: + * user char \ primary * prefkey char / key * prefval blob * @@ -32,8 +28,12 @@ * $Id$ */ +define('SMDB_UNKNOWN', 0); +define('SMDB_MYSQL', 1); +define('SMDB_PGSQL', 2); + require_once('DB.php'); -require_once('../config/config.php'); +require_once(SM_PATH . 'config/config.php'); global $prefs_are_cached, $prefs_cache; @@ -44,8 +44,8 @@ function cachePrefValues($username) { return; } - session_unregister('prefs_cache'); - session_unregister('prefs_are_cached'); + sqsession_unregister('prefs_cache'); + sqsession_unregister('prefs_are_cached'); $db = new dbPrefs; if(isset($db->error)) { @@ -63,32 +63,52 @@ function cachePrefValues($username) { $prefs_are_cached = true; - session_register('prefs_cache'); - session_register('prefs_are_cached'); + sqsession_register($prefs_cache, 'prefs_cache'); + sqsession_register($prefs_are_cached, 'prefs_are_cached'); } class dbPrefs { var $table = 'userprefs'; + var $user_field = 'user'; + var $key_field = 'prefkey'; + var $val_field = 'prefval'; var $dbh = NULL; var $error = NULL; + var $db_type = SMDB_UNKNOWN; - var $default = Array('chosen_theme' => '../themes/default_theme.php', + var $default = Array('theme_default' => 0, 'show_html_default' => '0'); function open() { global $prefs_dsn, $prefs_table; + global $prefs_user_field, $prefs_key_field, $prefs_val_field; if(isset($this->dbh)) { return true; } + if (preg_match('/^mysql/', $prefs_dsn)) { + $this->db_type = SMDB_MYSQL; + } elseif (preg_match('/^pgsql/', $prefs_dsn)) { + $this->db_type = SMDB_PGSQL; + } + if (!empty($prefs_table)) { $this->table = $prefs_table; } - $dbh = DB::connect($prefs_dsn); + if (!empty($prefs_user_field)) { + $this->user_field = $prefs_user_field; + } + if (!empty($prefs_key_field)) { + $this->key_field = $prefs_key_field; + } + if (!empty($prefs_val_field)) { + $this->val_field = $prefs_val_field; + } + $dbh = DB::connect($prefs_dsn, true); - if(DB::isError($dbh) || DB::isWarning($dbh)) { + if(DB::isError($dbh)) { $this->error = DB::errorMessage($dbh); return false; } @@ -128,10 +148,14 @@ class dbPrefs { function deleteKey($user, $key) { global $prefs_cache; - $this->open(); - $query = sprintf("DELETE FROM %s WHERE user='%s' AND prefkey='%s'", + if (!$this->open()) { + return false; + } + $query = sprintf("DELETE FROM %s WHERE %s='%s' AND %s='%s'", $this->table, + $this->user_field, $this->dbh->quoteString($user), + $this->key_field, $this->dbh->quoteString($key)); $res = $this->dbh->simpleQuery($query); @@ -141,25 +165,78 @@ class dbPrefs { unset($prefs_cache[$key]); - if(substr($key, 0, 9) == 'highlight') { - $this->renumberHighlightList($user); - } - return true; } function setKey($user, $key, $value) { - $this->open(); - $query = sprintf("REPLACE INTO %s (user,prefkey,prefval) ". - "VALUES('%s','%s','%s')", - $this->table, - $this->dbh->quoteString($user), - $this->dbh->quoteString($key), - $this->dbh->quoteString($value)); - - $res = $this->dbh->simpleQuery($query); - if(DB::isError($res)) { - $this->failQuery($res); + if (!$this->open()) { + return false; + } + if ($this->db_type == SMDB_MYSQL) { + $query = sprintf("REPLACE INTO %s (%s, %s, %s) ". + "VALUES('%s','%s','%s')", + $this->table, + $this->user_field, + $this->key_field, + $this->val_field, + $this->dbh->quoteString($user), + $this->dbh->quoteString($key), + $this->dbh->quoteString($value)); + + $res = $this->dbh->simpleQuery($query); + if(DB::isError($res)) { + $this->failQuery($res); + } + } elseif ($this->db_type == SMDB_PGSQL) { + $this->dbh->simpleQuery("BEGIN TRANSACTION"); + $query = sprintf("DELETE FROM %s WHERE %s='%s' AND %s='%s'", + $this->table, + $this->user_field, + $this->dbh->quoteString($user), + $this->key_field, + $this->dbh->quoteString($key)); + $res = $this->dbh->simpleQuery($query); + if (DB::isError($res)) { + $this->dbh->simpleQuery("ROLLBACK TRANSACTION"); + $this->failQuery($res); + } + $query = sprintf("INSERT INTO %s (%s, %s, %s) VALUES ('%s', '%s', '%s')", + $this->table, + $this->user_field, + $this->key_field, + $this->val_field, + $this->dbh->quoteString($user), + $this->dbh->quoteString($key), + $this->dbh->quoteString($value)); + $res = $this->dbh->simpleQuery($query); + if (DB::isError($res)) { + $this->dbh->simpleQuery("ROLLBACK TRANSACTION"); + $this->failQuery($res); + } + $this->dbh->simpleQuery("COMMIT TRANSACTION"); + } else { + $query = sprintf("DELETE FROM %s WHERE %s='%s' AND %s='%s'", + $this->table, + $this->user_field, + $this->dbh->quoteString($user), + $this->key_field, + $this->dbh->quoteString($key)); + $res = $this->dbh->simpleQuery($query); + if (DB::isError($res)) { + $this->failQuery($res); + } + $query = sprintf("INSERT INTO %s (%s, %s, %s) VALUES ('%s', '%s', '%s')", + $this->table, + $this->user_field, + $this->key_field, + $this->val_field, + $this->dbh->quoteString($user), + $this->dbh->quoteString($key), + $this->dbh->quoteString($value)); + $res = $this->dbh->simpleQuery($query); + if (DB::isError($res)) { + $this->failQuery($res); + } } return true; @@ -168,12 +245,17 @@ class dbPrefs { function fillPrefsCache($user) { global $prefs_cache; - $this->open(); + if (!$this->open()) { + return; + } $prefs_cache = array(); - $query = sprintf("SELECT prefkey, prefval FROM %s ". - "WHERE user = '%s'", + $query = sprintf("SELECT %s as prefkey, %s as prefval FROM %s ". + "WHERE %s = '%s'", + $this->key_field, + $this->val_field, $this->table, + $this->user_field, $this->dbh->quoteString($user)); $res = $this->dbh->query($query); if (DB::isError($res)) { @@ -185,54 +267,6 @@ class dbPrefs { } } - /* - * When a highlight option is deleted the preferences module - * must renumber the list. This should be done somewhere else, - * but it is not, so.... - */ - function renumberHighlightList($user) { - $this->open(); - $query = sprintf("SELECT * FROM %s WHERE user='%s' ". - "AND prefkey LIKE 'highlight%%' ORDER BY prefkey", - $this->table, - $this->dbh->quoteString($user)); - - $res = $this->dbh->query($query); - if(DB::isError($res)) { - $this->failQuery($res); - } - - /* Store old data in array */ - $rows = Array(); - while($row = $res->fetchRow(DB_FETCHMODE_ASSOC)) { - $rows[] = $row; - } - - /* Renumber keys of old data */ - $hilinum = 0; - for($i = 0; $i < count($rows) ; $i++) { - $oldkey = $rows[$i]['prefkey']; - $newkey = substr($oldkey, 0, 9) . $hilinum; - $hilinum++; - - if($oldkey != $newkey) { - $query = sprintf("UPDATE %s SET prefkey='%s' ". - "WHERE user ='%s' AND prefkey='%s'", - $this->table, - $this->dbh->quoteString($newkey), - $this->dbh->quoteString($user), - $this->dbh->quoteString($oldkey)); - - $res = $this->dbh->simpleQuery($query); - if(DB::isError($res)) { - $this->failQuery($res); - } - } - } - - return; - } - } /* end class dbPrefs */ @@ -256,6 +290,12 @@ function removePref($data_dir, $username, $string) { } $db->deleteKey($username, $string); + + if (isset($prefs_cache[$string])) { + unset($prefs_cache[$string]); + } + + sqsession_register($prefs_cache , 'prefs_cache'); return; } @@ -264,10 +304,10 @@ function setPref($data_dir, $username, $string, $set_to) { global $prefs_cache; if (isset($prefs_cache[$string]) && ($prefs_cache[$string] == $set_to)) { - return; + return; } - if ($set_to == '') { + if ($set_to === '') { removePref($data_dir, $username, $string); return; } @@ -282,7 +322,7 @@ function setPref($data_dir, $username, $string, $set_to) { assert_options(ASSERT_ACTIVE, 1); assert_options(ASSERT_BAIL, 1); assert ('$set_to == $prefs_cache[$string]'); - + sqsession_register($prefs_cache , 'prefs_cache'); return; } @@ -295,24 +335,24 @@ function checkForPrefs($data_dir, $username) { } /* Writes the Signature */ -function setSig($data_dir, $username, $string) { - $db = new dbPrefs; - if(isset($db->error)) { - $db->failQuery(); +function setSig($data_dir, $username, $number, $string) { + if ($number == "g") { + $key = '___signature___'; + } else { + $key = sprintf('___sig%s___', $number); } - - $db->setKey($username, '___signature___', $string); + setPref($data_dir, $username, $key, $string); return; } /* Gets the signature */ -function getSig($data_dir, $username) { - $db = new dbPrefs; - if(isset($db->error)) { - $db->failQuery(); +function getSig($data_dir, $username, $number) { + if ($number == "g") { + $key = '___signature___'; + } else { + $key = sprintf('___sig%d___', $number); } - - return $db->getKey($username, '___signature___'); + return getPref($data_dir, $username, $key); } ?>