Further XSS improvements plus a bugfix.

[squirrelmail.git] / functions / db_prefs.php

diff --git a/functions/db_prefs.php b/functions/db_prefs.php
index a8790b9057829fc03281d08c654c83b0dddca442..fb81c3d31d3a6305832ca73809f04b408c6228e5 100644 (file)
--- a/functions/db_prefs.php
+++ b/functions/db_prefs.php
@@ -36,7 +36,7 @@ define('SMDB_UNKNOWN', 0);
 define('SMDB_MYSQL', 1);
 define('SMDB_PGSQL', 2);
 
-include_once('DB.php');
+require_once('DB.php');
 require_once('../config/config.php');
 
 global $prefs_are_cached, $prefs_cache;
@@ -397,33 +397,23 @@ function checkForPrefs($data_dir, $username) {
 
 /* Writes the Signature */
 function setSig($data_dir, $username, $number, $string) {
-    $db = new dbPrefs;
-    if(isset($db->error)) {
-        $db->failQuery();
-    }
-
     if ($number == "g") {
         $key = '___signature___';
     } else {
         $key = sprintf('___sig%s___', $number);
     }
-    $db->setKey($username, $key, $string);
+    setPref($data_dir, $username, $key, $string);
     return;
 }
 
 /* Gets the signature */
 function getSig($data_dir, $username, $number) {
-    $db = new dbPrefs;
-    if(isset($db->error)) {
-        $db->failQuery();
-    }
-
     if ($number == "g") {
         $key = '___signature___';
     } else {
         $key = sprintf('___sig%d___', $number);
     }
-    return $db->getKey($username, $key);
+    return getPref($data_dir, $username, $key);
 }
 
 ?>