From 6ee631f7b92f6a205e0841ac40e6b0e763a5a734 Mon Sep 17 00:00:00 2001 From: fidian Date: Thu, 26 Apr 2001 14:28:02 +0000 Subject: [PATCH] * 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 --- functions/auth.php | 4 +++- functions/mime.php | 2 -- functions/page_header.php | 1 - functions/tree.php | 1 - src/addrbook_popup.php | 3 --- src/addrbook_search.php | 3 --- src/addrbook_search_html.php | 2 -- src/addressbook.php | 2 -- src/compose.php | 2 -- src/delete_message.php | 2 -- src/download.php | 3 --- src/empty_trash.php | 2 -- src/folders.php | 2 -- src/folders_create.php | 2 -- src/folders_delete.php | 2 -- src/folders_rename_do.php | 2 -- src/folders_rename_getname.php | 2 -- src/folders_subscribe.php | 17 ++++------------- src/help.php | 3 --- src/left_main.php | 3 --- src/load_prefs.php | 2 -- src/login.php | 1 - src/move_messages.php | 2 -- src/options.php | 3 --- src/options_display.php | 3 --- src/options_folder.php | 3 --- src/options_highlight.php | 3 --- src/options_order.php | 3 --- src/options_personal.php | 3 --- src/read_body.php | 2 -- src/redirect.php | 1 + src/right_main.php | 3 --- src/search.php | 3 --- src/signout.php | 3 --- src/validate.php | 8 +++++++- src/webmail.php | 1 - 36 files changed, 15 insertions(+), 89 deletions(-) diff --git a/functions/auth.php b/functions/auth.php index daacc762..ea692eeb 100644 --- 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 dff98e9f..52706792 100644 --- 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 b398c347..9dc2a5c2 100644 --- 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 01e318da..cda8c8e3 100644 --- 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 a387df21..a042eae5 100644 --- 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 a4a92bb5..a8dd816a 100644 --- 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 4ff7aca3..63b3e4da 100644 --- 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 404b06c5..b9fc59b1 100644 --- 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 edec6ed0..0fc6361b 100644 --- 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 072eaf6b..691c97af 100644 --- 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 b1e0b1a9..0e9e9eed 100644 --- 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 6605b52a..486b15e6 100644 --- 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 f727337b..95d938cb 100644 --- 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 30e60596..a16b43d9 100644 --- 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 65f57630..7cbea84f 100644 --- 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 e18a44ce..e2db9ccb 100644 --- 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 071c2d04..44c7a69e 100644 --- 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 add22eb3..286064ef 100644 --- 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 162f99eb..f689c6d9 100644 --- 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 a907a73f..96ef4500 100644 --- 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 9716a90b..8f4e3038 100644 --- 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 2ebf129d..feb2a5cd 100644 --- 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 ee676e20..953fcbd3 100644 --- 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 4a29dd90..db4a4725 100644 --- 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 4580e8df..a8ea0852 100644 --- 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 dd5f21f0..2b62364e 100644 --- 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 de804a11..c2aa0864 100644 --- 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 15c9fb77..21bc43fc 100644 --- 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 2937a5c6..784dd757 100644 --- 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 2ba8d077..287b2752 100644 --- 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 5e7f9d05..959ecd35 100644 --- 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 7c338929..630d585f 100644 --- 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 2c0874f0..8071a435 100644 --- 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 a30910d2..3dd17fd9 100644 --- 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 0594d870..7added47 100644 --- 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 6e266238..45242c7f 100644 --- 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'); -- 2.25.1