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 a722a50e5a743b25601366d2887efbe863a96a50..3ac6989843817f300ca34a3af7f0d9ca77294327 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,20 +1,20 @@
  Developers:
  -----------
    Paul Joseph Thompson <captbunzo@squirrelmail.org>
-   Peter Hutnick <peter@hutnick.com>
-   Luke Ehresman <luke@squirrelmail.org>     http://www.css.tayloru.edu/~lehresma
-   Nathan Ehresman <nathan@squirrelmail.org> http://www.css.tayloru.edu/~nehresma
-   Gustav Foseid <gustavf@squirrelmail.org>  http://www.initio.no
-   Pål Løberg <pallo@squirrelmail.org>       http://www.initio.no
-   Shane Wilson
-   Steve Gare                                http://www.xantara.co.uk
-   Gerrit Padgham <gpadgham@commnav.com>
-   Matt Phillips <mphillip@commnav.com>
-   Lewis Bergman
-   Bryan Stalcup <bryan@stalcup.net>
+   Luke Ehresman    <luke@squirrelmail.org> http://www.css.tayloru.edu/~lehresma
    Tyler Akins
-   Philippe Mingo <philippe@squirrelmail.org>
-   Stefan Sels <sm@sels.com> http://stefan.sels.com
+   Lewis Bergman
+   Nathan Ehresman  <nathan@squirrelmail.org> http://www.css.tayloru.edu/~nehresma
+   Gustav Foseid    <gustavf@squirrelmail.org> : http://www.initio.no
+   Steve Gare       http://www.xantara.co.uk
+   Peter Hutnick    <peter@hutnick.com>
+   Pål Løberg       <pallo@squirrelmail.org> : http://www.initio.no
+   Philippe Mingo   <philippe@squirrelmail.org>
+   Gerrit Padgham   <gpadgham@commnav.com>
+   Matt Phillips    <mphillip@commnav.com>
+   Stefan Sels      <sm@sels.com> http://stefan.sels.com
+   Bryan Stalcup    <bryan@stalcup.net>
+   Shane Wilson
 
  Translations:
  -------------
@@ -61,18 +61,20 @@
  --------------------------
    i18n support:        Sergiusz Pawlowicz 
    SquirrelMail logo:   Libor Kopecky <libor@globe.cz>
-   Web Site Admin/PR:   Paul Joseph Thompson <thomppj@okstate.edu>
+   Web Site Admin/PR:   Rick Castello <rick@squirrelmail.org>
 
-   Code contributions:  Konstantin Riabitsev <graf@relhum.org>
-                        Alex Bleeker <beheer@hackers.nl>
-                        Jan-Pieter Cornet <johnpc@xs4all.nl>
-                        John Williams <jw@netpimp.com> 
-                        Ondrej Sury <ondrej@globe.cz>
-                        Damien Sandras <dsandras@acm.org>
-                        Martin Jespersen <mbj@mbj.dk>
-                        David Whittington <dwhittin@css.tayloru.edu>
-                        Many, many others...
+   Paginator Help: Charles Scheidecker
+   Other Code contributions:
+       Konstantin Riabitsev <graf@relhum.org>
+       Alex Bleeker <beheer@hackers.nl>
+       Jan-Pieter Cornet <johnpc@xs4all.nl>
+       John Williams <jw@netpimp.com> 
+       Ondrej Sury <ondrej@globe.cz>
+       Damien Sandras <dsandras@acm.org>
+       Martin Jespersen <mbj@mbj.dk>
+       David Whittington <dwhittin@css.tayloru.edu>
+       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
-<captbunzo@squirrelmail.org>)
+( 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 <captbunzo@squirrelmail.org> )

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index cea2a8845967a1c9c013830130cdcb63824d88ef..fbf271c6e8924c61a06c90c0040774f035321055 100644 (file)
--- 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 3d3033b8105337153d978aa680bf94fa7084aa51..ad32bf9149bb105c31dffbf5d97ec979f16a938c 100644 (file)
--- 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 ceb739088d462c0952d228a79de18297b329407b..7e59501e9b84a0a6dc90d3cbe0a9db9bb284c5a6 100644 (file)
--- 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 d6e8855810c5cbd17844e5d8ce1f33268c1be6b3..a3f2dfade924189c20c843c37b508ea327c94a65 100644 (file)
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -359,4 +359,4 @@ do_hook('left_main_after');
 
 echo "</BODY></HTML>\n";
 
-?>
\ No newline at end of file
+?>

diff --git a/src/load_prefs.php b/src/load_prefs.php
index 0e411c2bffc8edbe5d4416572957ce8cc47d611e..c97503eeaafb4e7b05f9de96918f21d42acb694e 100644 (file)
--- 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 516b0427272ffae02b54e4a28c5c8a68c5c1c1dd..bf488efd2b85d5b15824f53a38e8dfb240caccb3 100644 (file)
--- 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 bb4f3d1e1cc698b98875eca48aaf876562ef1b69..9a6fff73c720c61ca4854862e7855ce44577ffb4 100644 (file)
--- 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