[SM-CVS] SF.net SVN: squirrelmail: [13193] trunk/squirrelmail/functions/db_prefs.php

[<pdo...@us...>]

Revision: 13193
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=13193&view=rev
Author:   pdontthink
Date:     2008-06-23 12:57:55 -0700 (Mon, 23 Jun 2008)

Log Message:
-----------
Someone added some prefs hooks to the file-based prefs backend but never added them to the db-based one - fix that

Modified Paths:
--------------
    trunk/squirrelmail/functions/db_prefs.php

Modified: trunk/squirrelmail/functions/db_prefs.php
===================================================================
--- trunk/squirrelmail/functions/db_prefs.php	2008-06-23 19:54:09 UTC (rev 13192)
+++ trunk/squirrelmail/functions/db_prefs.php	2008-06-23 19:57:55 UTC (rev 13193)
@@ -278,17 +278,27 @@
     function getKey($user, $key, $default = '') {
         global $prefs_cache;
 
-        cachePrefValues($user);
+        $temp = array(&$user, &$key);
+        $result = do_hook('get_pref_override', $temp);
+        if (is_null($result)) {
+            cachePrefValues($user);
 
-        if (isset($prefs_cache[$key])) {
-            return $prefs_cache[$key];
-        } else {
-            if (isset($this->default[$key])) {
-                return $this->default[$key];
+            if (isset($prefs_cache[$key])) {
+                $result = $prefs_cache[$key];
             } else {
-                return $default;
+//FIXME: is there a justification for having two prefs hooks so close?  who uses them?
+                $temp = array(&$user, &$key);
+                $result = do_hook('get_pref', $temp);
+                if (is_null($result)) {
+                    if (isset($this->default[$key])) {
+                        $result = $this->default[$key];
+                    } else {
+                        $result = $default;
+                    }
+                }
             }
         }
+        return $result;
     }
 
     /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.