X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fprefs.php;h=ec3bc71c9837d49340be45e32b3fccbe1ad5eeab;hb=4517d1c380440e290b53a1cc2b4289ab7d731de4;hp=112d7572abad1e0afe1e6a130b15a1e8f6a50a7a;hpb=abd74f7defe104b7d691be5670f59a46b0b7d025;p=squirrelmail.git
diff --git a/functions/prefs.php b/functions/prefs.php
index 112d7572..ec3bc71c 100644
--- a/functions/prefs.php
+++ b/functions/prefs.php
@@ -3,30 +3,35 @@
/**
* prefs.php
*
- * 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$
+ * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
* @package squirrelmail
+ * @subpackage prefs
*/
+/** @ignore */
+if (!defined('SM_PATH')) define('SM_PATH','../');
+
/** Include global.php */
require_once(SM_PATH . 'functions/global.php');
+require_once(SM_PATH . 'functions/plugin.php');
sqgetGlobalVar('prefs_cache', $prefs_cache, SQ_SESSION );
sqgetGlobalVar('prefs_are_cached', $prefs_are_cached, SQ_SESSION );
if ( !sqsession_is_registered('prefs_are_cached') ||
!isset( $prefs_cache) ||
- !is_array( $prefs_cache)
+ !is_array( $prefs_cache)
) {
$prefs_are_cached = false;
$prefs_cache = array();
}
-if (isset($prefs_backend) && file_exists(SM_PATH . $prefs_backend)) {
+$prefs_backend = do_hook_function('prefs_backend');
+if (isset($prefs_backend) && !empty($prefs_backend) && file_exists(SM_PATH . $prefs_backend)) {
require_once(SM_PATH . $prefs_backend);
} elseif (isset($prefs_dsn) && !empty($prefs_dsn)) {
require_once(SM_PATH . 'functions/db_prefs.php');
@@ -41,19 +46,19 @@ if (isset($prefs_backend) && file_exists(SM_PATH . $prefs_backend)) {
* hashed location of that datafile.
*
* @param string username the username of the current user
- * @param string dir the squirrelmail datadir
+ * @param string dir the SquirrelMail datadir
* @param string datafile the name of the file to open
* @param bool hash_seach default true
* @return string the hashed location of datafile
+ * @since 1.2.0
*/
function getHashedFile($username, $dir, $datafile, $hash_search = true) {
- global $dir_hash_level;
/* Remove trailing slash from $dir if found */
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);
@@ -82,7 +87,7 @@ function getHashedFile($username, $dir, $datafile, $hash_search = true) {
}
}
}
-
+
/* Return the full hashed datafile path. */
return ($result);
}
@@ -92,9 +97,10 @@ function getHashedFile($username, $dir, $datafile, $hash_search = true) {
* dir for that username.
*
* @param string username the username of the current user
- * @param string dir the squirrelmail datadir
+ * @param string dir the SquirrelMail datadir
* @param string hash_dirs default ''
* @return the path to the hash dir for username
+ * @since 1.2.0
*/
function getHashedDir($username, $dir, $hash_dirs = '') {
global $dir_hash_level;
@@ -103,7 +109,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);
@@ -115,9 +121,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;
}
}
@@ -132,6 +138,7 @@ function getHashedDir($username, $dir, $hash_dirs = '') {
*
* @param string username the username to calculate the hash dir for
* @return array a list of hash dirs for this username
+ * @since 1.2.0
*/
function computeHashDirs($username) {
/* Compute the hash for this user and extract the hash directories. */
@@ -145,4 +152,32 @@ function computeHashDirs($username) {
return ($hash_dirs);
}
-?>
+/**
+ * Javascript support detection function
+ * @param boolean $reset recheck javascript support if set to true.
+ * @return integer SMPREF_JS_ON or SMPREF_JS_OFF ({@see functions/constants.php})
+ * @since 1.5.1
+ */
+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