From: thomppj Date: Fri, 21 Dec 2001 18:18:48 +0000 (+0000) Subject: Lots of little changes... X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=commitdiff_plain;h=165829a378d4e41c1a47b46be08fdbd20315077f Lots of little changes... git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1881 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- diff --git a/AUTHORS b/AUTHORS index a722a50e..3ac69898 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,20 +1,20 @@ Developers: ----------- Paul Joseph Thompson - Peter Hutnick - Luke Ehresman http://www.css.tayloru.edu/~lehresma - Nathan Ehresman http://www.css.tayloru.edu/~nehresma - Gustav Foseid http://www.initio.no - Pål Løberg http://www.initio.no - Shane Wilson - Steve Gare http://www.xantara.co.uk - Gerrit Padgham - Matt Phillips - Lewis Bergman - Bryan Stalcup + Luke Ehresman http://www.css.tayloru.edu/~lehresma Tyler Akins - Philippe Mingo - Stefan Sels http://stefan.sels.com + Lewis Bergman + Nathan Ehresman http://www.css.tayloru.edu/~nehresma + Gustav Foseid : http://www.initio.no + Steve Gare http://www.xantara.co.uk + Peter Hutnick + Pål Løberg : http://www.initio.no + Philippe Mingo + Gerrit Padgham + Matt Phillips + Stefan Sels http://stefan.sels.com + Bryan Stalcup + Shane Wilson Translations: ------------- @@ -61,18 +61,20 @@ -------------------------- i18n support: Sergiusz Pawlowicz SquirrelMail logo: Libor Kopecky - Web Site Admin/PR: Paul Joseph Thompson + Web Site Admin/PR: Rick Castello - Code contributions: Konstantin Riabitsev - Alex Bleeker - Jan-Pieter Cornet - John Williams - Ondrej Sury - Damien Sandras - Martin Jespersen - David Whittington - Many, many others... + Paginator Help: Charles Scheidecker + Other Code contributions: + Konstantin Riabitsev + Alex Bleeker + Jan-Pieter Cornet + John Williams + Ondrej Sury + Damien Sandras + Martin Jespersen + David Whittington + Many, many others... -(We have tried to keep this up to date to give credit where it is due. -If you feel that you have wrongfully been left off this list, contact -) +( We have tried to keep this up to date to give credit where it + is due. If you feel that you have wrongfully been left off this + list, contact ) diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index cea2a884..fbf271c6 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -673,7 +673,6 @@ function get_paginator_link /** * This function computes the paginator string. - * It was derived from code contributed by Charles Scheidecker. */ function get_paginator_str ($box, $start_msg, $end_msg, $num_msgs, $show_num, $sort) { diff --git a/functions/prefs.php b/functions/prefs.php index 3d3033b8..ad32bf91 100644 --- a/functions/prefs.php +++ b/functions/prefs.php @@ -3,7 +3,7 @@ /** * prefs.php * - * Copyright (c) 1999-2001 The SquirrelMail Development Team + * Copyright (c) 1999-2002 The SquirrelMail Development Team * Licensed under the GNU GPL. For full terms see the file COPYING. * * This contains functions for manipulating user preferences @@ -27,6 +27,11 @@ function cachePrefValues($data_dir, $username) { return; } + /* A call to checkForPrefs here should take eliminate the need for + /* this to be called throughout the rest of the SquirrelMail code. + checkForPrefs($data_dir, $username); + + /* Calculate the filename for the user's preference file */ $filename = getHashedFile($username, $data_dir, "$username.pref"); if (!file_exists($filename)) { diff --git a/plugins/mail_fetch/setup.php b/plugins/mail_fetch/setup.php index ceb73908..7e59501e 100644 --- a/plugins/mail_fetch/setup.php +++ b/plugins/mail_fetch/setup.php @@ -211,7 +211,6 @@ if( $username <> '' ) { // Creates the pref file if it does not exist. - checkForPrefs( $data_dir, $username ); setPref( $data_dir, $username, 'mailfetch_newlog', 'on' ); } @@ -228,4 +227,4 @@ ); } -?> \ No newline at end of file +?> diff --git a/src/left_main.php b/src/left_main.php index d6e88558..a3f2dfad 100644 --- a/src/left_main.php +++ b/src/left_main.php @@ -359,4 +359,4 @@ do_hook('left_main_after'); echo "\n"; -?> \ No newline at end of file +?> diff --git a/src/load_prefs.php b/src/load_prefs.php index 0e411c2b..c97503ee 100644 --- a/src/load_prefs.php +++ b/src/load_prefs.php @@ -38,7 +38,6 @@ require_once('../src/validate.php'); require_once('../functions/constants.php'); if (!isset($username)) { $username = ''; } - checkForPrefs($data_dir, $username); $chosen_theme = getPref($data_dir, $username, "chosen_theme"); $in_ary = false; diff --git a/src/redirect.php b/src/redirect.php index 516b0427..bf488efd 100644 --- a/src/redirect.php +++ b/src/redirect.php @@ -149,9 +149,10 @@ if (isset($HTTP_ACCEPT) && /* Complete autodetection of Javascript. */ -checkForPrefs($data_dir, $username); -$javascript_setting = getPref($data_dir, $username, 'javascript_setting', SMPREF_JS_AUTODETECT); -$js_autodetect_results = (isset($js_autodetect_results) ? $js_autodetect_results : SMPREF_JS_OFF); +$javascript_setting = getPref + ($data_dir, $username, 'javascript_setting', SMPREF_JS_AUTODETECT); +$js_autodetect_results = (isset($js_autodetect_results) ? + $js_autodetect_results : SMPREF_JS_OFF); if ($javascript_setting == SMPREF_JS_AUTODETECT) { if ($js_autodetect_results == SMPREF_JS_ON) { setPref($data_dir, $username, 'javascript_on', SMPREF_JS_ON); diff --git a/src/webmail.php b/src/webmail.php index bb4f3d1e..9a6fff73 100644 --- a/src/webmail.php +++ b/src/webmail.php @@ -26,7 +26,6 @@ $base_uri = $regs[1]; session_start(); is_logged_in(); -checkForPrefs($data_dir, $username); /* * We'll need this to later have a noframes version