X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fprefs.php;h=aaa12f0378b4ead34dcb38d4b72033c8c3d3c96f;hp=b9db9f85252cb6cfb25618a4b9d89e2b11865227;hb=eb548244cf42565bbad450f308b760d3b6c2fc94;hpb=55994cd645683d254ee6de4557a78af8f511a269
diff --git a/functions/prefs.php b/functions/prefs.php
index b9db9f85..aaa12f03 100644
--- a/functions/prefs.php
+++ b/functions/prefs.php
@@ -3,12 +3,12 @@
/**
* prefs.php
*
- * Copyright (c) 1999-2003 The SquirrelMail Project Team
+ * Copyright (c) 1999-2004 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* This contains functions for manipulating user preferences
*
- * $Id$
+ * @version $Id$
* @package squirrelmail
*/
@@ -18,14 +18,9 @@ require_once(SM_PATH . 'functions/global.php');
sqgetGlobalVar('prefs_cache', $prefs_cache, SQ_SESSION );
sqgetGlobalVar('prefs_are_cached', $prefs_are_cached, SQ_SESSION );
-$rg = ini_get('register_globals');
-
-/* 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) ||
- check_php_version(4,1) ||
- empty($rg)
+ !is_array( $prefs_cache)
) {
$prefs_are_cached = false;
$prefs_cache = array();
@@ -58,7 +53,7 @@ function getHashedFile($username, $dir, $datafile, $hash_search = true) {
if (substr($dir, -1) == '/') {
$dir = substr($dir, 0, strlen($dir) - 1);
}
-
+
/* Compute the hash for this user and extract the hash directories. */
$hash_dirs = computeHashDirs($username);
@@ -87,7 +82,7 @@ function getHashedFile($username, $dir, $datafile, $hash_search = true) {
}
}
}
-
+
/* Return the full hashed datafile path. */
return ($result);
}
@@ -108,7 +103,7 @@ function getHashedDir($username, $dir, $hash_dirs = '') {
if (substr($dir, -1) == '/') {
$dir = substr($dir, 0, strlen($dir) - 1);
}
-
+
/* If necessary, populate the hash dir variable. */
if ($hash_dirs == '') {
$hash_dirs = computeHashDirs($username);
@@ -120,9 +115,9 @@ function getHashedDir($username, $dir, $hash_dirs = '') {
$real_hash_dir .= '/' . $hash_dirs[$h];
if (!@is_dir($real_hash_dir)) {
if (!@mkdir($real_hash_dir, 0770)) {
- echo sprintf(_("Error creating directory %s."), $real_hash_dir) . '
' .
- _("Could not create hashed directory structure!") . "
\n" .
- _("Please contact your system administrator and report this error.") . "
\n";
+ echo sprintf(_("Error creating directory %s."), $real_hash_dir) . '
' .
+ _("Could not create hashed directory structure!") . "
\n" .
+ _("Please contact your system administrator and report this error.") . "
\n";
exit;
}
}
@@ -150,4 +145,30 @@ function computeHashDirs($username) {
return ($hash_dirs);
}
-?>
+/**
+ * FIXME: Undocumented function
+ */
+function checkForJavascript($reset = FALSE)
+{
+ global $data_dir, $username, $javascript_on, $javascript_setting;
+
+ if ( !$reset && sqGetGlobalVar('javascript_on', $javascript_on, SQ_SESSION) )
+ return $javascript_on;
+
+ if ( $reset || !isset($javascript_setting) )
+ $javascript_setting = getPref($data_dir, $username, 'javascript_setting', SMPREF_JS_AUTODETECT);
+
+ if ( !sqGetGlobalVar('new_js_autodetect_results', $js_autodetect_results) &&
+ !sqGetGlobalVar('js_autodetect_results', $js_autodetect_results) )
+ $js_autodetect_results = SMPREF_JS_OFF;
+
+ if ( $javascript_setting == SMPREF_JS_AUTODETECT )
+ $javascript_on = $js_autodetect_results;
+ else
+ $javascript_on = $javascript_setting;
+
+ sqsession_register($javascript_on, 'javascript_on');
+ return $javascript_on;
+}
+
+?>
\ No newline at end of file