* 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

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1306 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/auth.php b/functions/auth.php
index daacc762332834791c17be2ec0d23f0b59d1ea8d..ea692eeb653e1c954c6d59963aea9140f915fa63 100644 (file)
--- a/functions/auth.php
+++ b/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'))

diff --git a/functions/mime.php b/functions/mime.php
index dff98e9ff27ff3fd4b63997e551b74aff1e3fb04..527067929abd7e2b29af8209d2f3dab27d55fce3 100644 (file)
--- a/functions/mime.php
+++ b/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 **/
 

diff --git a/functions/page_header.php b/functions/page_header.php
index b398c3474902dbfca5afa01d82059810179b95b4..9dc2a5c2c277c6c1f783088841d4bd91477251f6 100644 (file)
--- a/functions/page_header.php
+++ b/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

diff --git a/functions/tree.php b/functions/tree.php
index 01e318daf4566c547eccc2be3d9d0717bae86d00..cda8c8e361d6b5f570ed362f697d797265b3d3e7 100644 (file)
--- a/functions/tree.php
+++ b/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) {

diff --git a/src/addrbook_popup.php b/src/addrbook_popup.php
index a387df21dceb07a4ff138f1d08d0bea3925b9f40..a042eae5e77539f1900f2a3ff9344b489bf46212 100644 (file)
--- a/src/addrbook_popup.php
+++ b/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');

diff --git a/src/addrbook_search.php b/src/addrbook_search.php
index a4a92bb501c2f4b0bc412193a41332a540aafb16..a8dd816ae8cfb43bd36bc5628b6e8030c2d525b4 100644 (file)
--- a/src/addrbook_search.php
+++ b/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');

diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index 4ff7aca37b8c926608b22954adb539a9bf028398..63b3e4daa960e4bc27bbcb38474236c3d3f36163 100644 (file)
--- a/src/addrbook_search_html.php
+++ b/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');

diff --git a/src/addressbook.php b/src/addressbook.php
index 404b06c5bdb4ad6a3329f68c5cdf8b50bded358c..b9fc59b1c1cb70de5aaed15e0ff75ced8ac207a1 100644 (file)
--- a/src/addressbook.php
+++ b/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');

diff --git a/src/compose.php b/src/compose.php
index edec6ed08c445bc222ea7a3ea0f4575346bff7a1..0fc6361bf26f18cd5d6551712c9c997d473ebb2a 100644 (file)
--- a/src/compose.php
+++ b/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");

diff --git a/src/delete_message.php b/src/delete_message.php
index 072eaf6bf43d09e25c72ab0e6e0fab8ef66f5135..691c97af3bedfb762d5ecc92325c7c9262903603 100644 (file)
--- a/src/delete_message.php
+++ b/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");

diff --git a/src/download.php b/src/download.php
index b1e0b1a9129205beb38d1930c6de695eca69706b..0e9e9eedc2d71dafac35b02436d6a2abc6edf1cb 100644 (file)
--- a/src/download.php
+++ b/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: ");

diff --git a/src/empty_trash.php b/src/empty_trash.php
index 6605b52a391fd1f8c973c6d62b27af2162364a8b..486b15e6d96883a1e00fb09f364a47e411b32a69 100644 (file)
--- a/src/empty_trash.php
+++ b/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");

diff --git a/src/folders.php b/src/folders.php
index f727337be6ac07b42effff21ec0c53edafcaa00d..95d938cb4b51157d041293ceae19e246ed6d7164 100644 (file)
--- a/src/folders.php
+++ b/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");

diff --git a/src/folders_create.php b/src/folders_create.php
index 30e605969521e581ebb4ec9838783c2111ad5604..a16b43d933be6c14561b4bb27f0ba1a726f4e72e 100644 (file)
--- a/src/folders_create.php
+++ b/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");

diff --git a/src/folders_delete.php b/src/folders_delete.php
index 65f576302fead2860355c619950f808b3f1f4a62..7cbea84f3b12ba48c5bd1643fae16a958042b92d 100644 (file)
--- a/src/folders_delete.php
+++ b/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");

diff --git a/src/folders_rename_do.php b/src/folders_rename_do.php
index e18a44cefbf3eb4365a5470260293d7690c0cf10..e2db9ccbdf49afd2ed047ccc8f32aa49463cb159 100644 (file)
--- a/src/folders_rename_do.php
+++ b/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");

diff --git a/src/folders_rename_getname.php b/src/folders_rename_getname.php
index 071c2d046e99bf712bfe0d62746375cce8c07b63..44c7a69ef6fe377d41e093f4a1500f27f8d00288 100644 (file)
--- a/src/folders_rename_getname.php
+++ b/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");

diff --git a/src/folders_subscribe.php b/src/folders_subscribe.php
index add22eb395a013c611e8d7d872e7cee927438911..286064ef24d3b42e65ef1394caa0c62e5e188a3c 100644 (file)
--- a/src/folders_subscribe.php
+++ b/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);

diff --git a/src/help.php b/src/help.php
index 162f99eb99ae3fac3fbbf9d038e0d488febffcc6..f689c6d946df88eac5c77239eaf3ac93f4ee35ab 100644 (file)
--- a/src/help.php
+++ b/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");
 
 

diff --git a/src/left_main.php b/src/left_main.php
index a907a73fa1e3bc8f3440203137657ae7a562ddb4..96ef4500fa0e3acfd06a3c0df11d280f91ba64c0 100644 (file)
--- a/src/left_main.php
+++ b/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");

diff --git a/src/load_prefs.php b/src/load_prefs.php
index 9716a90b4bef4da68a391f0e0740f3dc14647ebd..8f4e3038939a51fce595725725a770b0c37fc133 100644 (file)
--- a/src/load_prefs.php
+++ b/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");
       

diff --git a/src/login.php b/src/login.php
index 2ebf129d40502abd3b765b5674f9d1c9f3f993a7..feb2a5cd0d3aebc7daaa5162d4d96d89323d34c3 100644 (file)
--- a/src/login.php
+++ b/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

diff --git a/src/move_messages.php b/src/move_messages.php
index ee676e20ac627a597ac60d155af7b560d7d7941d..953fcbd366784b428bb68bfdf5fa09f09e35181a 100644 (file)
--- a/src/move_messages.php
+++ b/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");

diff --git a/src/options.php b/src/options.php
index 4a29dd900fa25d6ca09dbaabe2bf0c38cd614ae0..db4a47258e1efa902d6c06c7cf22336928ec166f 100644 (file)
--- a/src/options.php
+++ b/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);

diff --git a/src/options_display.php b/src/options_display.php
index 4580e8dfdb00b0f818d841abdf069d58037f9773..a8ea08526f5bd61d3788c73ffded497d9819011a 100644 (file)
--- a/src/options_display.php
+++ b/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');
    

diff --git a/src/options_folder.php b/src/options_folder.php
index dd5f21f0579c4abb1f70a50eacbb9815dbf3c7aa..2b62364e9e696c87e354413e62b333642f650fbb 100644 (file)
--- a/src/options_folder.php
+++ b/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');
    

diff --git a/src/options_highlight.php b/src/options_highlight.php
index de804a115037acb9d9032c26aa7bf93a43210943..c2aa0864aece610918a8e2fca7690b8c7095171a 100644 (file)
--- a/src/options_highlight.php
+++ b/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))

diff --git a/src/options_order.php b/src/options_order.php
index 15c9fb7717011f95037bbb1e0a68ba2b7f74d376..21bc43fc662d4c4a05ef713719d43ef6506df5a7 100644 (file)
--- a/src/options_order.php
+++ b/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');
 
 

diff --git a/src/options_personal.php b/src/options_personal.php
index 2937a5c6657211714e72564c5a117866bc68761a..784dd757a780e7906d95fdf056ed56e822504730 100644 (file)
--- a/src/options_personal.php
+++ b/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');
    

diff --git a/src/read_body.php b/src/read_body.php
index 2ba8d077ddf1dd4554dba43ec2a637f5cf76f398..287b275209dd01f776c957607cbb0898cfbfcce6 100644 (file)
--- a/src/read_body.php
+++ b/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');

diff --git a/src/redirect.php b/src/redirect.php
index 5e7f9d052dafec8c7d7159530ab2d042675acd4a..959ecd35e1111d3458f4a4cfa93d0d5bee1e3e9d 100644 (file)
--- a/src/redirect.php
+++ b/src/redirect.php
@@ -13,6 +13,7 @@
     **  $Id$
     **/
 
+   include('../functions/i18n.php');
    include ('../functions/strings.php');
    include('../config/config.php');
 

diff --git a/src/right_main.php b/src/right_main.php
index 7c33892933e3d76d7134b94b801cde83b298c33f..630d585f85a6e76c4425f60cf3099ab1c8071923 100644 (file)
--- a/src/right_main.php
+++ b/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');

diff --git a/src/search.php b/src/search.php
index 2c0874f095369f004fffbcd0fe2bccea95b59f71..8071a435ebe56f36f4b69b7d6436f7fb9fbfc6da 100644 (file)
--- a/src/search.php
+++ b/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');

diff --git a/src/signout.php b/src/signout.php
index a30910d2fa06adb74eb6c0bfcf0c46a401b64572..3dd17fd977712fb8ed6bc8ac564bb32bc99e2216 100644 (file)
--- a/src/signout.php
+++ b/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');
 

diff --git a/src/validate.php b/src/validate.php
index 0594d8705ded3c83a1db3e995961728b6a9b6357..7added477318dfd7f4b3b0e4c6460615c3bb7b42 100644 (file)
--- a/src/validate.php
+++ b/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();
 
 

diff --git a/src/webmail.php b/src/webmail.php
index 6e266238f6c5cb40cb24d546bf78f1dd17a49bfc..45242c7f1eccdee58bb4b50a6b9d4b7f8ade4044 100644 (file)
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -13,7 +13,6 @@
     **  $Id$
     **/
 
-   include ('../functions/i18n.php');
    include ('../functions/strings.php');
    include ('../config/config.php');
    include ('../functions/prefs.php');