projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
align cases so they're easier to find..
[squirrelmail.git]
/
functions
/
prefs.php
diff --git
a/functions/prefs.php
b/functions/prefs.php
index 4445f53bbc7f90e0cde9799a4254edc0887b2acc..10ea919a3d78f2e76454382eb9e66ca8f959dff4 100644
(file)
--- a/
functions/prefs.php
+++ b/
functions/prefs.php
@@
-3,7
+3,7
@@
/**
* prefs.php
*
/**
* prefs.php
*
- * Copyright (c) 1999-200
2
The SquirrelMail Project Team
+ * Copyright (c) 1999-200
3
The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* This contains functions for manipulating user preferences
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* This contains functions for manipulating user preferences
@@
-13,21
+13,18
@@
require_once(SM_PATH . 'functions/global.php');
require_once(SM_PATH . 'functions/global.php');
-if (isset($_SESSION['prefs_cache'])) {
- $prefs_cache = $_SESSION['prefs_cache'];
-}
-if (isset($_SESSION['prefs_are_cached'])) {
- $prefs_are_cached = $_SESSION['prefs_are_cached'];
-}
+sqgetGlobalVar('prefs_cache', $prefs_cache, SQ_SESSION );
+sqgetGlobalVar('prefs_are_cached', $prefs_are_cached, SQ_SESSION );
$rg = ini_get('register_globals');
$rg = ini_get('register_globals');
-if ( !session_is_registered('prefs_are_cached') ||
+/* if php version >= 4.1 OR (4.0 AND $rg = off) */
+if ( !sqsession_is_registered('prefs_are_cached') ||
!isset( $prefs_cache) ||
!is_array( $prefs_cache) ||
!isset( $prefs_cache) ||
!is_array( $prefs_cache) ||
-
substr( phpversion(), 0, 3 ) == '4.1'
||
- substr( phpversion(), 0, 3 ) == '4.2' ||
-
(substr( phpversion(), 0, 3 ) == '4.0' && empty($rg))
) {
+
check_php_version(4,1)
||
+ empty($rg)
+ ) {
$prefs_are_cached = false;
$prefs_cache = array();
}
$prefs_are_cached = false;
$prefs_cache = array();
}
@@
-54,7
+51,8
@@
function getHashedFile($username, $dir, $datafile, $hash_search = true) {
/* First, get and make sure the full hash directory exists. */
$real_hash_dir = getHashedDir($username, $dir, $hash_dirs);
/* First, get and make sure the full hash directory exists. */
$real_hash_dir = getHashedDir($username, $dir, $hash_dirs);
- /* Set the value of our real data file. */
+ /* Set the value of our real data file, after we've removed unwanted characters. */
+ $datafile = str_replace('/', '_', $datafile);
$result = "$real_hash_dir/$datafile";
/* Check for this file in the real hash directory. */
$result = "$real_hash_dir/$datafile";
/* Check for this file in the real hash directory. */