Add clickjacking protection (thanks to Asbjorn Thorsen and Geir Hansen for bringing...

[squirrelmail.git] / functions / file_prefs.php

diff --git a/functions/file_prefs.php b/functions/file_prefs.php
index 524ee32c4cc37d4ebdfe66d758991c59f6456728..677624e915fd177d5ca15f5b8108265628f4ac79 100644 (file)
--- a/functions/file_prefs.php
+++ b/functions/file_prefs.php
@@ -5,7 +5,7 @@
  *
  * This contains functions for manipulating user preferences in files
  *
- * @copyright © 1999-2007 The SquirrelMail Project Team
+ * @copyright 1999-2011 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
@@ -111,14 +111,15 @@ function getPref($data_dir, $username, $pref_name, $default = '') {
 
     $temp = array(&$username, &$pref_name);
     $result = do_hook('get_pref_override', $temp);
-    if (!$result) {
+    if (is_null($result)) {
         cachePrefValues($data_dir, $username);
         if (isset($prefs_cache[$pref_name])) {
             $result = $prefs_cache[$pref_name];
         } else {
+//FIXME: is there a justification for having two prefs hooks so close?  who uses them?
             $temp = array(&$username, &$pref_name);
             $result = do_hook('get_pref', $temp);
-            if (!$result) {
+            if (is_null($result)) {
                 $result = $default;
             }
         }
@@ -257,14 +258,14 @@ function checkForPrefs($data_dir, $username, $filename = '') {
             ( is_readable($default_pref) && !@copy($default_pref, $filename) ) ||
             !@touch($filename)
         ) {
-            $uid = 'httpd';
+            $uid = 'that the web server is running as';
             if (function_exists('posix_getuid')){
                 $user_data = posix_getpwuid(posix_getuid());
                 $uid = $user_data['name'];
             }
             $errTitle = _("Could not create initial preference file!");
             $errString = $errTitle . "\n" .
-                       sprintf( _("%s should be writable by user %s."), $data_dir, $uid ) . "\n" .
+                       sprintf( _("%s should be writable by the user %s."), $data_dir, $uid ) . "\n" .
                        _("Please contact your system administrator and report this error.") ;
             logout_error( $errString, $errTitle );
             exit;