* 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

functions/auth.php

@@ -10,7 +10,9 @@
 
    if (defined ('auth_php'))
       return; 
-   define ('auth_php', true); 
+   define ('auth_php', true);
+   
+   include '../functions/i18n.php';
 
    function is_logged_in () {
       if (session_is_registered('user_is_logged_in'))

functions/mime.php

@@ -14,9 +14,7 @@
    global $debug_mime;
    $debug_mime = false;
    
-   include "../functions/i18n.php";
    include "../functions/imap.php";
-   include "../config/config.php";
 
    /** Setting up the objects that have the structure for the message **/
 

functions/page_header.php

@@ -13,7 +13,6 @@
 
    include('../src/validate.php');
    include("../functions/prefs.php");
-   include("../functions/i18n.php");
    include("../functions/plugin.php");
 
    // Check to see if gettext is installed

functions/tree.php

@@ -7,7 +7,6 @@
    define('tree_php', true);
 
    include('../functions/imap.php');
-   include('../config/config.php');
 
    // Recursive function to find the correct parent for a new node
    function findParentForChild($value, $treeIndexToStart, $tree) {

src/addrbook_popup.php

@@ -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');

src/addrbook_search.php

@@ -128,9 +128,6 @@ function bcc_address($addr) {
 
    /* ================= 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');

src/addrbook_search_html.php

@@ -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');

src/addressbook.php

@@ -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');

src/compose.php

@@ -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");

src/delete_message.php

@@ -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");

src/download.php

@@ -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: ");

src/empty_trash.php

@@ -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");

src/folders.php

@@ -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");

src/folders_create.php

@@ -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");

src/folders_delete.php

@@ -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");

src/folders_rename_do.php

@@ -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");

src/folders_rename_getname.php

@@ -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");

src/folders_subscribe.php

@@ -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("../functions/page_header.php");
-   if (!isset($imap_php))
-      include("../functions/imap.php");
-   if (!isset($display_messages_php))
-      include("../functions/display_messages.php");
-
+   include ('../src/validate.php');
+   include("../functions/page_header.php");
+   include("../functions/imap.php");
+   include("../functions/display_messages.php");
    include("../src/load_prefs.php");
 
    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);

src/help.php

@@ -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");
 
 

src/left_main.php

@@ -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");

src/load_prefs.php

@@ -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");
       

src/login.php

@@ -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

src/move_messages.php

@@ -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");

src/options.php

@@ -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);

src/options_display.php

@@ -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');
    

src/options_folder.php

@@ -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');
    

src/options_highlight.php

@@ -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))

src/options_order.php

@@ -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');
 
 

src/options_personal.php

@@ -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');
    

src/read_body.php

@@ -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');

src/redirect.php

@@ -13,6 +13,7 @@
     **  $Id$
     **/
 
+   include('../functions/i18n.php');
    include ('../functions/strings.php');
    include('../config/config.php');
 

src/right_main.php

@@ -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');

src/search.php

@@ -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');

src/signout.php

@@ -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');
 

src/validate.php

@@ -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();
 
 

src/webmail.php

@@ -13,7 +13,6 @@
     **  $Id$
     **/
 
-   include ('../functions/i18n.php');
    include ('../functions/strings.php');
    include ('../config/config.php');
    include ('../functions/prefs.php');