Partial support for IMAP LOgin Referrals: tell the user what's going on

[squirrelmail.git] / functions / db_prefs.php

diff --git a/functions/db_prefs.php b/functions/db_prefs.php
index 981177b8feec1796590a015421a7837bb25077de..ec2a099f7d1274c7f5932162cd05a8ae16c8a160 100644 (file)
--- a/functions/db_prefs.php
+++ b/functions/db_prefs.php
@@ -3,7 +3,7 @@
 /**
  * db_prefs.php
  *
- * Copyright (c) 1999-2004 The SquirrelMail Project Team
+ * Copyright (c) 1999-2005 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * This contains functions for manipulating user preferences
@@ -41,8 +41,11 @@ if (!include_once('DB.php')) {
     // same error also in abook_database.php
     require_once(SM_PATH . 'functions/display_messages.php');
     $error  = _("Could not include PEAR database functions required for the database backend.") . "<br />\n";
+    $error .= sprintf(_("Is PEAR installed, and is the include path set correctly to find %s?"),
+                        '<tt>DB.php</tt>') . "<br />\n";
     $error .= _("Please contact your system administrator and report this error.");
     error_box($error, $color);
+    exit;
 }
 
 global $prefs_are_cached, $prefs_cache;
@@ -53,7 +56,9 @@ global $prefs_are_cached, $prefs_cache;
 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;
     }
 
@@ -392,4 +397,4 @@ function getSig($data_dir, $username, $number) {
 }
 
 // vim: et ts=4
-?>
+?>
\ No newline at end of file