X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fdb_prefs.php;h=91805d21611dfc16c572d13e6e81040157d41eb2;hb=3b84e1b10d0800d858a68283bce298d15677ce58;hp=2742d90cc395a8c0571b978c86e4454b39d4a64f;hpb=2ea6df85247d7e47498b77bd8223bf47a4dc8d29;p=squirrelmail.git
diff --git a/functions/db_prefs.php b/functions/db_prefs.php
index 2742d90c..91805d21 100644
--- a/functions/db_prefs.php
+++ b/functions/db_prefs.php
@@ -1,9 +1,9 @@
\n";
+ $error .= sprintf(_("Is PEAR installed, and is the include path set correctly to find %s?"),
+ 'DB.php') . "
\n";
+ $error .= _("Please contact your system administrator and report this error.");
+ error_box($error, $color);
+ exit;
+}
global $prefs_are_cached, $prefs_cache;
+/**
+ * @ignore
+ */
function cachePrefValues($username) {
global $prefs_are_cached, $prefs_cache;
+ sqgetGlobalVar('prefs_are_cached', $prefs_are_cached, SQ_SESSION );
if ($prefs_are_cached) {
+ sqgetGlobalVar('prefs_cache', $prefs_cache, SQ_SESSION );
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,10 +81,14 @@ 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');
}
+/**
+ * Completely undocumented class - someone document it!
+ * @package squirrelmail
+ */
class dbPrefs {
var $table = 'userprefs';
var $user_field = 'user';
@@ -108,7 +130,7 @@ class dbPrefs {
}
$dbh = DB::connect($prefs_dsn, true);
- if(DB::isError($dbh) || DB::isWarning($dbh)) {
+ if(DB::isError($dbh)) {
$this->error = DB::errorMessage($dbh);
return false;
}
@@ -165,10 +187,6 @@ class dbPrefs {
unset($prefs_cache[$key]);
- if(substr($key, 0, 9) == 'highlight') {
- $this->renumberHighlightList($user);
- }
-
return true;
}
@@ -271,69 +289,13 @@ 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) {
- if (!$this->open()) {
- return;
- }
- $query = sprintf("SELECT %s, %s as prefkey, %s as prefval FROM %s WHERE %s='%s' ".
- "AND %s LIKE 'highlight%%' ORDER BY %s",
- $this->user_field,
- $this->key_field,
- $this->val_field,
- $this->table,
- $this->user_field,
- $this->dbh->quoteString($user),
- $this->key_field,
- $this->key_field);
-
- $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 %s='%s' ".
- "WHERE %s ='%s' AND %s='%s'",
- $this->table,
- $this->key_field,
- $this->dbh->quoteString($newkey),
- $this->user_field,
- $this->dbh->quoteString($user),
- $this->key_field,
- $this->dbh->quoteString($oldkey));
-
- $res = $this->dbh->simpleQuery($query);
- if(DB::isError($res)) {
- $this->failQuery($res);
- }
- }
- }
-
- return;
- }
-
} /* end class dbPrefs */
-/* returns the value for the pref $string */
+/**
+ * returns the value for the pref $string
+ * @ignore
+ */
function getPref($data_dir, $username, $string, $default = '') {
$db = new dbPrefs;
if(isset($db->error)) {
@@ -345,18 +307,31 @@ function getPref($data_dir, $username, $string, $default = '') {
return $db->getKey($username, $string, $default);
}
-/* Remove the pref $string */
+/**
+ * Remove the pref $string
+ * @ignore
+ */
function removePref($data_dir, $username, $string) {
+ global $prefs_cache;
$db = new dbPrefs;
if(isset($db->error)) {
$db->failQuery();
}
$db->deleteKey($username, $string);
+
+ if (isset($prefs_cache[$string])) {
+ unset($prefs_cache[$string]);
+ }
+
+ sqsession_register($prefs_cache , 'prefs_cache');
return;
}
-/* sets the pref, $string, to $set_to */
+/**
+ * sets the pref, $string, to $set_to
+ * @ignore
+ */
function setPref($data_dir, $username, $string, $set_to) {
global $prefs_cache;
@@ -364,7 +339,7 @@ function setPref($data_dir, $username, $string, $set_to) {
return;
}
- if ($set_to == '') {
+ if ($set_to === '') {
removePref($data_dir, $username, $string);
return;
}
@@ -379,11 +354,14 @@ 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;
}
-/* This checks if the prefs are available */
+/**
+ * This checks if the prefs are available
+ * @ignore
+ */
function checkForPrefs($data_dir, $username) {
$db = new dbPrefs;
if(isset($db->error)) {
@@ -391,7 +369,10 @@ function checkForPrefs($data_dir, $username) {
}
}
-/* Writes the Signature */
+/**
+ * Writes the Signature
+ * @ignore
+ */
function setSig($data_dir, $username, $number, $string) {
if ($number == "g") {
$key = '___signature___';
@@ -402,7 +383,10 @@ function setSig($data_dir, $username, $number, $string) {
return;
}
-/* Gets the signature */
+/**
+ * Gets the signature
+ * @ignore
+ */
function getSig($data_dir, $username, $number) {
if ($number == "g") {
$key = '___signature___';
@@ -412,4 +396,5 @@ function getSig($data_dir, $username, $number) {
return getPref($data_dir, $username, $key);
}
-?>
+// vim: et ts=4
+?>
\ No newline at end of file