CVS: squirrelmail/src addrbook_popup.php,1.12,1.13 addrbook_search.php,1.21,1.22 addrbook_search_html.php,1.25,1.26 addressbook.php,1.22,1.23 compose.php,1.141,1.142 delete_message.php,1.23,1.24 download.php,1.60,1.61 empty_trash.php,1.29,1.30 folders.php,1.68,1.69 folders_create.php,1.43,1.44 folders_delete.php,1.40,1.41 folders_rename_do.php,1.29,1.30 folders_rename_getname.php,1.25,1.26 folders_subscribe.php,1.10,1.11 help.php,1.17,1.18 left_main.php,1.77,1.78 load_prefs.php,1.54,1.55 login.php,1.38,1.39 move_messages.php,1.39,1.40 options.php,1.60,1.61 options_display.php,1.22,1.23 options_folder.php,1.17,1.18 options_highlight.php,1.18,1.19 options_order.php,1.8,1.9 options_personal.php,1.12,1.13 read_body.php,1.91,1.92 redirect.php,1.14,1.15 right_main.php,1.49,1.50 search.php,1.20,1.21 signout.php,1.30,1.31 validate.php,1.2,1.3 webmail.php,1.50,1.51

[Tyler A. <fi...@us...>]

Update of /cvsroot/squirrelmail/squirrelmail/src
In directory usw-pr-cvs1:/tmp/cvs-serv23613/src

Modified Files:
	addrbook_popup.php addrbook_search.php 
	addrbook_search_html.php addressbook.php compose.php 
	delete_message.php download.php empty_trash.php folders.php 
	folders_create.php folders_delete.php folders_rename_do.php 
	folders_rename_getname.php folders_subscribe.php help.php 
	left_main.php load_prefs.php login.php move_messages.php 
	options.php options_display.php options_folder.php 
	options_highlight.php options_order.php options_personal.php 
	read_body.php redirect.php right_main.php search.php 
	signout.php validate.php webmail.php 
Log Message:
* To reduce on errors, I moved the includes for config.php and strings.php
  into validate.php.
    = They (config/strings) were used eveywhere validate was used
    = Validate already included auth.php (which included i18n.php)
    = Now including just one file does a lot of stuff including loading
      SM config, validating data, and loading internationalization
    = Since we only include config.php once and not dozens of times, we could
      have a slight speed increase


Index: addrbook_popup.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/addrbook_popup.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -r1.12 -r1.13
--- addrbook_popup.php	2001/04/19 18:16:34	1.12
+++ addrbook_popup.php	2001/04/26 14:28:02	1.13
@@ -11,9 +11,6 @@
     **/
 
    include('../src/validate.php');
-   include("../functions/strings.php");
-   include('../functions/i18n.php');
-   include('../config/config.php');
    include('../functions/page_header.php');
    include('../functions/addressbook.php');
    include('../src/load_prefs.php');

Index: addrbook_search.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/addrbook_search.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -w -r1.21 -r1.22
--- addrbook_search.php	2001/04/19 18:16:34	1.21
+++ addrbook_search.php	2001/04/26 14:28:02	1.22
@@ -128,9 +128,6 @@
 
    /* ================= End of functions ================= */
 
-   include("../functions/strings.php");
-   include('../functions/i18n.php');
-   include('../config/config.php');
    include('../functions/array.php');
    include('../functions/strings.php');
    include('../functions/page_header.php');

Index: addrbook_search_html.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/addrbook_search_html.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -w -r1.25 -r1.26
--- addrbook_search_html.php	2001/04/23 14:51:27	1.25
+++ addrbook_search_html.php	2001/04/26 14:28:02	1.26
@@ -17,8 +17,6 @@
     **/
 
    include('../src/validate.php');
-   include('../functions/strings.php');
-   include('../config/config.php');
    include('../functions/page_header.php');
    include('../functions/date.php');
    include('../functions/smtp.php');

Index: addressbook.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/addressbook.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -w -r1.22 -r1.23
--- addressbook.php	2001/04/19 18:16:34	1.22
+++ addressbook.php	2001/04/26 14:28:02	1.23
@@ -11,8 +11,6 @@
     **/
 
    include('../src/validate.php');
-   include('../functions/strings.php');
-   include('../config/config.php');
    include('../functions/array.php');
    include('../functions/page_header.php');
    include('../functions/display_messages.php');

Index: compose.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/compose.php,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -w -r1.141 -r1.142
--- compose.php	2001/04/23 14:51:27	1.141
+++ compose.php	2001/04/26 14:28:02	1.142
@@ -16,8 +16,6 @@
     **/
 
    include('../src/validate.php');
-   include("../functions/strings.php");
-   include("../config/config.php");
    include("../functions/page_header.php");
    include("../functions/imap.php");
    include("../functions/date.php");

Index: delete_message.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/delete_message.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -w -r1.23 -r1.24
--- delete_message.php	2001/04/19 18:16:34	1.23
+++ delete_message.php	2001/04/26 14:28:02	1.24
@@ -11,8 +11,6 @@
     **/
 
    include("../src/validate.php");
-   include("../functions/strings.php");
-   include("../config/config.php");
    include("../functions/page_header.php");
    include("../functions/display_messages.php");
    include("../functions/imap.php");

Index: download.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/download.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -w -r1.60 -r1.61
--- download.php	2001/04/23 21:47:53	1.60
+++ download.php	2001/04/26 14:28:02	1.61
@@ -14,12 +14,9 @@
    define('download_php', true);  // Used for preferences
 
    include('../src/validate.php');
-   include("../functions/strings.php");
-   include("../config/config.php");
    include("../functions/imap.php");
    include("../functions/mime.php");
    include("../functions/date.php");
-   include("../functions/i18n.php");
    include("../src/load_prefs.php");
 
    header("Pragma: ");

Index: empty_trash.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/empty_trash.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -w -r1.29 -r1.30
--- empty_trash.php	2001/04/19 18:16:34	1.29
+++ empty_trash.php	2001/04/26 14:28:02	1.30
@@ -12,8 +12,6 @@
     **/
 
    include('../src/validate.php');
-   include("../functions/strings.php");
-   include("../config/config.php");
    include("../functions/page_header.php");
    include("../functions/display_messages.php");
    include("../functions/imap.php");

Index: folders.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/folders.php,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -w -r1.68 -r1.69
--- folders.php	2001/04/19 18:16:34	1.68
+++ folders.php	2001/04/26 14:28:02	1.69
@@ -13,8 +13,6 @@
     **/
 
    include('../src/validate.php');
-   include("../functions/strings.php");
-   include("../config/config.php");
    include("../functions/page_header.php");
    include("../functions/imap.php");
    include("../functions/array.php");

Index: folders_create.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/folders_create.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -w -r1.43 -r1.44
--- folders_create.php	2001/04/19 18:16:34	1.43
+++ folders_create.php	2001/04/26 14:28:02	1.44
@@ -12,8 +12,6 @@
     **/
 
    include('../src/validate.php');
-   include("../functions/strings.php");
-   include("../config/config.php");
    include("../functions/page_header.php");
    include("../functions/imap.php");
    include("../functions/display_messages.php");

Index: folders_delete.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/folders_delete.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -w -r1.40 -r1.41
--- folders_delete.php	2001/04/19 18:16:34	1.40
+++ folders_delete.php	2001/04/26 14:28:02	1.41
@@ -12,8 +12,6 @@
     **/
 
    include('../src/validate.php');
-   include("../functions/strings.php");
-   include("../config/config.php");
    include("../functions/page_header.php");
    include("../functions/imap.php");
    include("../functions/array.php");

Index: folders_rename_do.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/folders_rename_do.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -w -r1.29 -r1.30
--- folders_rename_do.php	2001/04/19 18:16:34	1.29
+++ folders_rename_do.php	2001/04/26 14:28:02	1.30
@@ -12,8 +12,6 @@
     **/
 
    include("../src/validate.php");
-   include("../functions/strings.php");
-   include("../config/config.php");
    include("../functions/page_header.php");
    include("../functions/imap.php");
    include("../src/load_prefs.php");

Index: folders_rename_getname.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/folders_rename_getname.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -w -r1.25 -r1.26
--- folders_rename_getname.php	2001/04/19 18:16:34	1.25
+++ folders_rename_getname.php	2001/04/26 14:28:02	1.26
@@ -12,8 +12,6 @@
     **/
 
    include('../src/validate.php');
-   include("../functions/strings.php");
-   include("../config/config.php");
    include("../functions/page_header.php");
    include("../functions/imap.php");
    include("../src/load_prefs.php");

Index: folders_subscribe.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/folders_subscribe.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- folders_subscribe.php	2001/01/30 18:02:23	1.10
+++ folders_subscribe.php	2001/04/26 14:28:02	1.11
@@ -11,19 +11,10 @@
     **  $Id$
     **/
 
-   session_start();
-
-   if (!isset($strings_php))
-      include("../functions/strings.php");
-   if (!isset($config_php))
-      include("../config/config.php");
-   if (!isset($page_header_php))
+   include ('../src/validate.php');
       include("../functions/page_header.php");
-   if (!isset($imap_php))
       include("../functions/imap.php");
-   if (!isset($display_messages_php))
       include("../functions/display_messages.php");
-
    include("../src/load_prefs.php");
 
    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);

Index: help.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/help.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -w -r1.17 -r1.18
--- help.php	2001/04/19 18:16:34	1.17
+++ help.php	2001/04/26 14:28:02	1.18
@@ -11,13 +11,10 @@
     **/
 
    include('../src/validate.php');
-   include("../functions/strings.php");
-   include("../config/config.php");
    include("../functions/page_header.php");
    include("../functions/display_messages.php");
    include("../functions/imap.php");
    include("../functions/array.php");
-   include("../functions/i18n.php");
    include("../src/load_prefs.php");
 
 

Index: left_main.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/left_main.php,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -w -r1.77 -r1.78
--- left_main.php	2001/04/22 05:32:24	1.77
+++ left_main.php	2001/04/26 14:28:02	1.78
@@ -11,9 +11,6 @@
     **/
 
    include('../src/validate.php');
-   include ("../functions/i18n.php");
-   include("../functions/strings.php");
-   include("../config/config.php");
    include("../functions/array.php");
    include("../functions/imap.php");
    include("../functions/page_header.php");

Index: load_prefs.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/load_prefs.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -w -r1.54 -r1.55
--- load_prefs.php	2001/04/21 20:33:57	1.54
+++ load_prefs.php	2001/04/26 14:28:02	1.55
@@ -20,8 +20,6 @@
       $theme = array();
    if (! isset($color))
       $color = array();
-   include('../src/validate.php');
-   include("../config/config.php");
    include("../functions/prefs.php");
    include("../functions/plugin.php");
       

Index: login.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/login.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -w -r1.38 -r1.39
--- login.php	2001/04/19 18:16:34	1.38
+++ login.php	2001/04/26 14:28:02	1.39
@@ -13,7 +13,6 @@
 
    include("../functions/strings.php");
    include("../config/config.php");
-   include("../functions/i18n.php");
    include("../functions/plugin.php");
 
    // $squirrelmail_language is set by a cookie when the user selects

Index: move_messages.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/move_messages.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -w -r1.39 -r1.40
--- move_messages.php	2001/04/19 18:16:34	1.39
+++ move_messages.php	2001/04/26 14:28:02	1.40
@@ -11,8 +11,6 @@
     **/
 
    include('../src/validate.php');
-   include("../functions/strings.php");
-   include("../config/config.php");
    include("../functions/page_header.php");
    include("../functions/display_messages.php");
    include("../functions/imap.php");

Index: options.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/options.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -w -r1.60 -r1.61
--- options.php	2001/04/21 20:33:57	1.60
+++ options.php	2001/04/26 14:28:02	1.61
@@ -12,13 +12,10 @@
     **/
 
    include('../src/validate.php');
-   include('../functions/strings.php');
-   include('../config/config.php');
    include('../functions/page_header.php');
    include('../functions/display_messages.php');
    include('../functions/imap.php');
    include('../functions/array.php');
-   include('../functions/i18n.php');
 
    if (isset($language)) {
       setcookie('squirrelmail_language', $language, time()+2592000);

Index: options_display.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/options_display.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -w -r1.22 -r1.23
--- options_display.php	2001/04/21 20:33:57	1.22
+++ options_display.php	2001/04/26 14:28:02	1.23
@@ -11,13 +11,10 @@
     **/
 
    include('../src/validate.php');
-   include('../functions/strings.php');
-   include('../config/config.php');
    include('../functions/page_header.php');
    include('../functions/display_messages.php');
    include('../functions/imap.php');
    include('../functions/array.php');
-   include('../functions/i18n.php');
    include('../functions/plugin.php');
    include('../src/load_prefs.php');
    

Index: options_folder.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/options_folder.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -w -r1.17 -r1.18
--- options_folder.php	2001/04/19 18:16:34	1.17
+++ options_folder.php	2001/04/26 14:28:02	1.18
@@ -11,13 +11,10 @@
     **/
 
    include('../src/validate.php');
-   include('../functions/strings.php');
-   include('../config/config.php');
    include('../functions/page_header.php');
    include('../functions/display_messages.php');
    include('../functions/imap.php');
    include('../functions/array.php');
-   include('../functions/i18n.php');
    include('../functions/plugin.php');
    include('../src/load_prefs.php');
    

Index: options_highlight.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/options_highlight.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -w -r1.18 -r1.19
--- options_highlight.php	2001/04/19 18:16:34	1.18
+++ options_highlight.php	2001/04/26 14:28:02	1.19
@@ -11,13 +11,10 @@
     **/
 
    include('../src/validate.php');
-   include('../functions/strings.php');
-   include('../config/config.php');
    include('../functions/page_header.php');
    include('../functions/display_messages.php');
    include('../functions/imap.php');
    include('../functions/array.php');
-   include('../functions/i18n.php');
    include('../functions/plugin.php');
 
    if (! isset($action))

Index: options_order.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/options_order.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- options_order.php	2001/04/19 18:16:34	1.8
+++ options_order.php	2001/04/26 14:28:02	1.9
@@ -11,13 +11,10 @@
     **/
 
    include('../src/validate.php');
-   include('../functions/strings.php');
-   include('../config/config.php');
    include('../functions/page_header.php');
    include('../functions/display_messages.php');
    include('../functions/imap.php');
    include('../functions/array.php');
-   include('../functions/i18n.php');
    include('../functions/plugin.php');
 
 

Index: options_personal.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/options_personal.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -r1.12 -r1.13
--- options_personal.php	2001/04/19 18:16:34	1.12
+++ options_personal.php	2001/04/26 14:28:02	1.13
@@ -11,13 +11,10 @@
     **/
 
    include('../src/validate.php');
-   include('../functions/strings.php');
-   include('../config/config.php');
    include('../functions/page_header.php');
    include('../functions/display_messages.php');
    include('../functions/imap.php');
    include('../functions/array.php');
-   include('../functions/i18n.php');
    include('../functions/plugin.php');
    include('../src/load_prefs.php');
    

Index: read_body.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/read_body.php,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -w -r1.91 -r1.92
--- read_body.php	2001/04/22 04:39:25	1.91
+++ read_body.php	2001/04/26 14:28:02	1.92
@@ -12,8 +12,6 @@
    **/
 
    include("../src/validate.php");
-   include('../functions/strings.php');
-   include('../config/config.php');
    include('../functions/page_header.php');
    include('../functions/imap.php');
    include('../functions/mime.php');

Index: redirect.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/redirect.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -w -r1.14 -r1.15
--- redirect.php	2001/04/19 18:16:34	1.14
+++ redirect.php	2001/04/26 14:28:02	1.15
@@ -13,6 +13,7 @@
     **  $Id$
     **/
 
+   include('../functions/i18n.php');
    include ('../functions/strings.php');
    include('../config/config.php');
 

Index: right_main.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/right_main.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -w -r1.49 -r1.50
--- right_main.php	2001/04/19 18:16:34	1.49
+++ right_main.php	2001/04/26 14:28:02	1.50
@@ -12,9 +12,6 @@
     **/
 
    include('../src/validate.php');
-   include('../functions/i18n.php');
-   include('../functions/strings.php');
-   include('../config/config.php');
    include('../functions/imap.php');
    include('../functions/date.php');
    include('../functions/page_header.php');

Index: search.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/search.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -w -r1.20 -r1.21
--- search.php	2001/04/19 18:16:34	1.20
+++ search.php	2001/04/26 14:28:02	1.21
@@ -3,9 +3,6 @@
    /* $Id$ */
 
    include('../src/validate.php');
-   include('../functions/strings.php');
-   include('../functions/i18n.php');
-   include('../config/config.php');
    include('../functions/page_header.php');
    include('../functions/imap.php');
    include('../functions/imap_search.php');

Index: signout.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/signout.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -w -r1.30 -r1.31
--- signout.php	2001/04/22 05:16:45	1.30
+++ signout.php	2001/04/26 14:28:02	1.31
@@ -12,10 +12,7 @@
     **/
 
    include('../src/validate.php');
-   include('../functions/strings.php');
    include ('../src/load_prefs.php');
-   include('../config/config.php');
-   include('../functions/i18n.php');
    include ('../functions/prefs.php');
    include ('../functions/plugin.php');
 

Index: validate.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/validate.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- validate.php	2001/04/19 18:16:34	1.2
+++ validate.php	2001/04/26 14:28:02	1.3
@@ -15,7 +15,13 @@
    }
 
    session_start();
-   include ("../functions/auth.php");
+   include ('../functions/auth.php');
+   
+   // Everyone needs stuff from config, and config needs stuff from
+   // strings.php, so include them both here.
+   include ('../functions/strings.php');
+   include ('../config/config.php');
+   
    is_logged_in();
 
 

Index: webmail.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/webmail.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -w -r1.50 -r1.51
--- webmail.php	2001/04/22 04:39:25	1.50
+++ webmail.php	2001/04/26 14:28:02	1.51
@@ -13,7 +13,6 @@
     **  $Id$
     **/
 
-   include ('../functions/i18n.php');
    include ('../functions/strings.php');
    include ('../config/config.php');
    include ('../functions/prefs.php');