X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fprefs.php;h=5b618d5623d6d57fb933e4b3376b7a03756ddeda;hp=d92c76f0a7c5f8c55f3a5f3395cea9a0690cf429;hb=73ee0267d9c4cf950e5cf5a204c4baffbb9c624e;hpb=ace4c62c1999df7206731e637594f2da98bd52a8
diff --git a/functions/prefs.php b/functions/prefs.php
index d92c76f0..5b618d56 100644
--- a/functions/prefs.php
+++ b/functions/prefs.php
@@ -3,42 +3,16 @@
/**
* prefs.php
*
- * Copyright (c) 1999-2005 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
- * This contains functions for manipulating user preferences
+ * This contains functions for filebased user prefs locations
*
+ * @copyright © 1999-2007 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)
- ) {
- $prefs_are_cached = false;
- $prefs_cache = array();
-}
-$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');
-} else {
- require_once(SM_PATH . 'functions/file_prefs.php');
-}
/* Hashing functions */
@@ -121,10 +95,11 @@ function getHashedDir($username, $dir, $hash_dirs = '') {
for ($h = 0; $h < $dir_hash_level; ++$h) {
$real_hash_dir .= '/' . $hash_dirs[$h];
if (!@is_dir($real_hash_dir)) {
+//FIXME: When safe_mode is turned on, the error suppression below makes debugging safe_mode UID/GID restrictions tricky... for now, I will add a check in configtest
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";
+ error_box ( sprintf(_("Error creating directory %s."), $real_hash_dir) . "\n" .
+ _("Could not create hashed directory structure!") . "\n" .
+ _("Please contact your system administrator and report this error.") );
exit;
}
}
@@ -152,33 +127,3 @@ function computeHashDirs($username) {
/* Return our array of hash directories. */
return ($hash_dirs);
}
-
-/**
- * Javascript support detection function
- * @param boolean $reset recheck javascript support if set to true.
- * @return integer SMPREF_JS_* constants
- * @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