From ff8a98e7e1d368c57b088522586bddcf68d443a5 Mon Sep 17 00:00:00 2001 From: philippe_mingo Date: Wed, 26 Sep 2001 10:07:21 +0000 Subject: [PATCH] Operation "foo_once". src Folder Step 1: Check file including and change it to the _once system. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1525 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/addrbook_popup.php | 8 ++++---- src/addrbook_search.php | 8 ++++---- src/addrbook_search_html.php | 12 ++++++------ src/addressbook.php | 8 ++++---- src/compose.php | 16 ++++++++-------- src/delete_message.php | 8 ++++---- src/download.php | 10 +++++----- src/empty_trash.php | 12 ++++++------ src/folders.php | 10 +++++----- src/folders_create.php | 9 ++++----- src/folders_delete.php | 10 +++++----- src/folders_rename_do.php | 7 +++---- src/folders_rename_getname.php | 8 +++----- src/folders_subscribe.php | 9 ++++----- src/help.php | 10 +++++----- src/left_main.php | 10 +++++----- src/load_prefs.php | 15 +++++++++------ src/login.php | 8 ++++---- src/move_messages.php | 8 ++++---- src/options.php | 10 +++++----- src/options_display.php | 12 ++++++------ src/options_folder.php | 12 ++++++------ src/options_highlight.php | 12 ++++++------ src/options_identities.php | 5 +++-- src/options_order.php | 14 +++++++------- src/options_personal.php | 12 ++++++------ src/read_body.php | 10 +++++----- src/redirect.php | 14 +++++++------- src/right_main.php | 16 ++++++++-------- src/search.php | 10 +++++----- src/signout.php | 8 ++++---- src/validate.php | 14 +++++++------- src/webmail.php | 16 ++++++++-------- 33 files changed, 175 insertions(+), 176 deletions(-) diff --git a/src/addrbook_popup.php b/src/addrbook_popup.php index f12575e3..8b6e1adb 100644 --- a/src/addrbook_popup.php +++ b/src/addrbook_popup.php @@ -10,8 +10,8 @@ ** $Id$ **/ - include('../src/validate.php'); - include('../functions/addressbook.php'); + require_once('../src/validate.php'); + require_once('../functions/addressbook.php'); ?> @@ -19,7 +19,7 @@ <?php - printf("%s: %s", $org_title, _("Address Book")); + echo "$org_title: " . _("Address Book"); ?> @@ -30,4 +30,4 @@ BORDER=0> - + \ No newline at end of file diff --git a/src/addrbook_search.php b/src/addrbook_search.php index 6c42aa18..c010b154 100644 --- a/src/addrbook_search.php +++ b/src/addrbook_search.php @@ -14,7 +14,7 @@ ** $Id$ **/ - include("../src/validate.php"); + require_once('../src/validate.php'); // Function to include JavaScript code function insert_javascript() { @@ -128,9 +128,9 @@ function bcc_address($addr) { /* ================= End of functions ================= */ - include('../functions/array.php'); - include('../functions/strings.php'); - include('../functions/addressbook.php'); + require_once('../functions/array.php'); + require_once('../functions/strings.php'); + require_once('../functions/addressbook.php'); displayHtmlHeader(); diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php index 9cdf82a9..abe09e9f 100644 --- a/src/addrbook_search_html.php +++ b/src/addrbook_search_html.php @@ -16,12 +16,12 @@ ** $Id$ **/ - include('../src/validate.php'); - include('../functions/date.php'); - include('../functions/smtp.php'); - include('../functions/display_messages.php'); - include('../functions/addressbook.php'); - include('../functions/plugin.php'); + require_once('../src/validate.php'); + require_once('../functions/date.php'); + require_once('../functions/smtp.php'); + require_once('../functions/display_messages.php'); + require_once('../functions/addressbook.php'); + require_once('../functions/plugin.php'); // Insert hidden data function addr_insert_hidden() { diff --git a/src/addressbook.php b/src/addressbook.php index f36496ba..e769db09 100644 --- a/src/addressbook.php +++ b/src/addressbook.php @@ -10,10 +10,10 @@ ** $Id$ **/ - include('../src/validate.php'); - include('../functions/array.php'); - include('../functions/display_messages.php'); - include('../functions/addressbook.php'); + require_once('../src/validate.php'); + require_once('../functions/array.php'); + require_once('../functions/display_messages.php'); + require_once('../functions/addressbook.php'); // Sort array by the key "name" function alistcmp($a,$b) { diff --git a/src/compose.php b/src/compose.php index 9ebb5ded..b0ed6e89 100644 --- a/src/compose.php +++ b/src/compose.php @@ -15,13 +15,13 @@ ** $Id$ **/ - include('../src/validate.php'); - include("../functions/imap.php"); - include("../functions/date.php"); - include("../functions/mime.php"); - include("../functions/smtp.php"); - include("../functions/display_messages.php"); - include ("../functions/plugin.php"); + require_once('../src/validate.php'); + require_once('../functions/imap.php'); + require_once('../functions/date.php'); + require_once('../functions/mime.php'); + require_once('../functions/smtp.php'); + require_once('../functions/display_messages.php'); + require_once('../functions/plugin.php'); if (!isset($attachments)) { @@ -508,7 +508,7 @@ } // I am using an include so as to elminiate an extra unnecessary click. If you // can think of a better way, please implement it. - include ("./addrbook_search_html.php"); + include_once('./addrbook_search_html.php'); } else if (isset($attach)) { if (saveAttachedFiles()) plain_error_message(_("Could not move/copy file. File not attached"), $color); diff --git a/src/delete_message.php b/src/delete_message.php index dd78d2bd..69b46bce 100644 --- a/src/delete_message.php +++ b/src/delete_message.php @@ -10,9 +10,9 @@ ** $Id$ **/ - include("../src/validate.php"); - include("../functions/display_messages.php"); - include("../functions/imap.php"); + require_once('../src/validate.php'); + require_once('../functions/display_messages.php'); + require_once('../functions/imap.php'); $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); @@ -29,4 +29,4 @@ header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=".urlencode($mailbox)); sqimap_logout($imapConnection); -?> +?> \ No newline at end of file diff --git a/src/download.php b/src/download.php index b9976a8d..8103994e 100644 --- a/src/download.php +++ b/src/download.php @@ -13,10 +13,10 @@ define('download_php', true); // Used for preferences - include('../src/validate.php'); - include("../functions/imap.php"); - include("../functions/mime.php"); - include("../functions/date.php"); + require_once('../src/validate.php'); + require_once('../functions/imap.php'); + require_once('../functions/mime.php'); + require_once('../functions/date.php'); header("Pragma: "); header("Cache-Control: cache"); @@ -219,4 +219,4 @@ } } } -?> +?> \ No newline at end of file diff --git a/src/empty_trash.php b/src/empty_trash.php index 16d54e04..279af75e 100644 --- a/src/empty_trash.php +++ b/src/empty_trash.php @@ -11,11 +11,11 @@ ** $Id$ **/ - include('../src/validate.php'); - include("../functions/display_messages.php"); - include("../functions/imap.php"); - include("../functions/array.php"); - include("../functions/tree.php"); + require_once('../src/validate.php'); + require_once('../functions/display_messages.php'); + require_once('../functions/imap.php'); + require_once('../functions/array.php'); + require_once('../functions/tree.php'); $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); @@ -54,4 +54,4 @@ header ("Location: $location/left_main.php"); sqimap_logout($imap_stream); -?> +?> \ No newline at end of file diff --git a/src/folders.php b/src/folders.php index 275a4c3d..34dc7f45 100644 --- a/src/folders.php +++ b/src/folders.php @@ -12,10 +12,10 @@ ** $Id$ **/ - include('../src/validate.php'); - include("../functions/imap.php"); - include("../functions/array.php"); - include("../functions/plugin.php"); + require_once('../src/validate.php'); + require_once('../functions/imap.php'); + require_once('../functions/array.php'); + require_once('../functions/plugin.php'); displayPageHeader($color, _("None")); @@ -269,4 +269,4 @@ sqimap_logout($imapConnection); ?> - + \ No newline at end of file diff --git a/src/folders_create.php b/src/folders_create.php index 607bbac7..09536fab 100644 --- a/src/folders_create.php +++ b/src/folders_create.php @@ -11,9 +11,9 @@ ** $Id$ **/ - include('../src/validate.php'); - include("../functions/imap.php"); - include("../functions/display_messages.php"); + require_once('../src/validate.php'); + require_once('../functions/imap.php'); + require_once('../functions/display_messages.php'); $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); $dm = sqimap_get_delimiter($imapConnection); @@ -48,5 +48,4 @@ $location = get_location(); header ("Location: $location/folders.php?success=create"); sqimap_logout($imapConnection); -?> - +?> \ No newline at end of file diff --git a/src/folders_delete.php b/src/folders_delete.php index 7cda7013..a301f70b 100644 --- a/src/folders_delete.php +++ b/src/folders_delete.php @@ -11,10 +11,10 @@ ** $Id$ **/ - include('../src/validate.php'); - include("../functions/imap.php"); - include("../functions/array.php"); - include("../functions/tree.php"); + require_once('../src/validate.php'); + require_once('../functions/imap.php'); + require_once('../functions/array.php'); + require_once('../functions/tree.php'); /* * Incoming values: @@ -99,4 +99,4 @@ echo ""; */ -?> +?> \ No newline at end of file diff --git a/src/folders_rename_do.php b/src/folders_rename_do.php index 37fbf311..4c0dcfff 100644 --- a/src/folders_rename_do.php +++ b/src/folders_rename_do.php @@ -11,9 +11,8 @@ ** $Id$ **/ - include("../src/validate.php"); - include("../functions/imap.php"); - + require_once('../src/validate.php'); + require_once('../functions/imap.php'); if($old_name == $new_name) { $location = get_location(); @@ -68,4 +67,4 @@ sqimap_logout($imapConnection); $location = get_location(); header ("Location: $location/folders.php?success=rename"); -?> +?> \ No newline at end of file diff --git a/src/folders_rename_getname.php b/src/folders_rename_getname.php index a7803a88..0af0f529 100644 --- a/src/folders_rename_getname.php +++ b/src/folders_rename_getname.php @@ -11,8 +11,8 @@ ** $Id$ **/ - include('../src/validate.php'); - include("../functions/imap.php"); + require_once('../src/validate.php'); + require_once('../functions/imap.php'); $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); @@ -49,6 +49,4 @@ /** Log out this session **/ sqimap_logout($imapConnection); -?> - - +?> \ No newline at end of file diff --git a/src/folders_subscribe.php b/src/folders_subscribe.php index 5c043366..c2cb6300 100644 --- a/src/folders_subscribe.php +++ b/src/folders_subscribe.php @@ -11,9 +11,9 @@ ** $Id$ **/ - include ('../src/validate.php'); - include("../functions/imap.php"); - include("../functions/display_messages.php"); + require_once('../src/validate.php'); + require_once('../functions/imap.php'); + require_once('../functions/display_messages.php'); $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); $dm = sqimap_get_delimiter($imapConnection); @@ -53,5 +53,4 @@ echo ""; echo ""; */ -?> - +?> \ No newline at end of file diff --git a/src/help.php b/src/help.php index e95e0b13..67aa1c0d 100644 --- a/src/help.php +++ b/src/help.php @@ -10,10 +10,10 @@ ** $Id$ **/ - include('../src/validate.php'); - include("../functions/display_messages.php"); - include("../functions/imap.php"); - include("../functions/array.php"); + require_once('../src/validate.php'); + require_once('../functions/display_messages.php'); + require_once('../functions/imap.php'); + require_once('../functions/array.php'); displayPageHeader($color, "None"); @@ -191,4 +191,4 @@ ?>   - + \ No newline at end of file diff --git a/src/left_main.php b/src/left_main.php index d88bc15f..db8bb5ad 100644 --- a/src/left_main.php +++ b/src/left_main.php @@ -10,10 +10,10 @@ ** $Id$ **/ - include('../src/validate.php'); - include("../functions/array.php"); - include("../functions/imap.php"); - include("../functions/plugin.php"); + require_once('../src/validate.php'); + require_once('../functions/array.php'); + require_once('../functions/imap.php'); + require_once('../functions/plugin.php'); // open a connection on the imap port (143) $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 10); // the 10 is to hide the output @@ -200,4 +200,4 @@ } ?> - + \ No newline at end of file diff --git a/src/load_prefs.php b/src/load_prefs.php index edec5a4f..91c8a083 100644 --- a/src/load_prefs.php +++ b/src/load_prefs.php @@ -11,19 +11,22 @@ ** $Id$ **/ - include('../src/validate.php'); + require_once('../src/validate.php'); + // ---------------------------------------------------------- + // Following code should be removed in the next foo_once step if (defined('load_prefs_php')) return; define('load_prefs_php', true); + // ---------------------------------------------------------- global $theme, $chosen_theme, $color; if (! isset($theme)) $theme = array(); if (! isset($color)) $color = array(); - include("../functions/prefs.php"); - include("../functions/plugin.php"); + require_once('../functions/prefs.php'); + require_once('../functions/plugin.php'); if (!isset($username)) $username = ''; @@ -42,10 +45,10 @@ $chosen_theme = ""; if (isset($chosen_theme) && $in_ary && (file_exists($chosen_theme))) { - @include($chosen_theme); + @include_once($chosen_theme); } else { if (isset($theme) && isset($theme[0]) && file_exists($theme[0]["PATH"])) { - @include($theme[0]["PATH"]); + @include_once($theme[0]["PATH"]); } else { # # I hard coded the theme as a failsafe if no themes were @@ -245,4 +248,4 @@ do_hook("loading_prefs"); -?> +?> \ No newline at end of file diff --git a/src/login.php b/src/login.php index e48c691f..82ea8f05 100644 --- a/src/login.php +++ b/src/login.php @@ -52,10 +52,10 @@ $rcptaddress = urlencode($rcptaddress); } - include("../functions/strings.php"); - include("../config/config.php"); - include('../functions/i18n.php'); - include("../functions/plugin.php"); + require_once('../functions/strings.php'); + require_once('../config/config.php'); + require_once('../functions/i18n.php'); + require_once('../functions/plugin.php'); // $squirrelmail_language is set by a cookie when the user selects // language and logs out diff --git a/src/move_messages.php b/src/move_messages.php index c5f4c837..bd87a9e0 100644 --- a/src/move_messages.php +++ b/src/move_messages.php @@ -10,9 +10,9 @@ ** $Id$ **/ - include('../src/validate.php'); - include("../functions/display_messages.php"); - include("../functions/imap.php"); + require_once('../src/validate.php'); + require_once('../functions/display_messages.php'); + require_once('../functions/imap.php'); function putSelectedMessagesIntoString($msg) { $j = 0; @@ -139,4 +139,4 @@ sqimap_logout($imapConnection); ?> - + \ No newline at end of file diff --git a/src/options.php b/src/options.php index 97dfd2ad..dd11a7a0 100644 --- a/src/options.php +++ b/src/options.php @@ -11,10 +11,10 @@ ** $Id$ **/ - include('../src/validate.php'); - include('../functions/display_messages.php'); - include('../functions/imap.php'); - include('../functions/array.php'); + require_once('../src/validate.php'); + require_once('../functions/display_messages.php'); + require_once('../functions/imap.php'); + require_once('../functions/array.php'); if (isset($language)) { setcookie('squirrelmail_language', $language, time()+2592000); @@ -225,4 +225,4 @@ - + \ No newline at end of file diff --git a/src/options_display.php b/src/options_display.php index 9b18c47e..9c98ef14 100644 --- a/src/options_display.php +++ b/src/options_display.php @@ -10,11 +10,11 @@ ** $Id$ **/ - include('../src/validate.php'); - include('../functions/display_messages.php'); - include('../functions/imap.php'); - include('../functions/array.php'); - include('../functions/plugin.php'); + require_once('../src/validate.php'); + require_once('../functions/display_messages.php'); + require_once('../functions/imap.php'); + require_once('../functions/array.php'); + require_once('../functions/plugin.php'); displayPageHeader($color, 'None'); $chosen_language = getPref($data_dir, $username, 'language'); @@ -265,4 +265,4 @@ echo _("Don't remove me from the CC addresses when I use \"Reply All\""); - + \ No newline at end of file diff --git a/src/options_folder.php b/src/options_folder.php index 1f05f8ba..2d72f349 100644 --- a/src/options_folder.php +++ b/src/options_folder.php @@ -10,11 +10,11 @@ ** $Id$ **/ - include('../src/validate.php'); - include('../functions/display_messages.php'); - include('../functions/imap.php'); - include('../functions/array.php'); - include('../functions/plugin.php'); + require_once('../src/validate.php'); + require_once('../functions/display_messages.php'); + require_once('../functions/imap.php'); + require_once('../functions/array.php'); + require_once('../functions/plugin.php'); displayPageHeader($color, 'None'); @@ -148,4 +148,4 @@ - + \ No newline at end of file diff --git a/src/options_highlight.php b/src/options_highlight.php index 8494895a..264980c5 100644 --- a/src/options_highlight.php +++ b/src/options_highlight.php @@ -10,11 +10,11 @@ ** $Id$ **/ - include('../src/validate.php'); - include('../functions/display_messages.php'); - include('../functions/imap.php'); - include('../functions/array.php'); - include('../functions/plugin.php'); + require_once('../src/validate.php'); + require_once('../functions/display_messages.php'); + require_once('../functions/imap.php'); + require_once('../functions/array.php'); + require_once('../functions/plugin.php'); if (! isset($action)) $action = ''; @@ -332,4 +332,4 @@ } do_hook('options_highlight_bottom'); ?> - + \ No newline at end of file diff --git a/src/options_identities.php b/src/options_identities.php index 82338553..051405f9 100644 --- a/src/options_identities.php +++ b/src/options_identities.php @@ -5,8 +5,8 @@ ** $Id$ **/ - include('../src/validate.php'); - include('../functions/display_messages.php'); + require_once('../src/validate.php'); + require_once('../functions/display_messages.php'); if (isset($return)) { SaveUpdateFunction(); @@ -335,3 +335,4 @@ function ShowTableInfo($full_name, $email_address, $reply_to, $post) \ No newline at end of file diff --git a/src/options_order.php b/src/options_order.php index e889a873..9c37465d 100644 --- a/src/options_order.php +++ b/src/options_order.php @@ -10,11 +10,11 @@ ** $Id$ **/ - include('../src/validate.php'); - include('../functions/display_messages.php'); - include('../functions/imap.php'); - include('../functions/array.php'); - include('../functions/plugin.php'); + require_once('../src/validate.php'); + require_once('../functions/display_messages.php'); + require_once('../functions/imap.php'); + require_once('../functions/array.php'); + require_once('../functions/plugin.php'); if (! isset($action)) { $action = ''; } @@ -68,7 +68,7 @@ $index_order = array(); $index_order = $new_ary; if (count($index_order) < 1) { - include ('../src/load_prefs.php'); + include_once('../src/load_prefs.php'); } } else if ($method == 'add' && $add) { // User should not be able to insert PHP-code here @@ -140,4 +140,4 @@ - + \ No newline at end of file diff --git a/src/options_personal.php b/src/options_personal.php index 3a40f283..a2403528 100644 --- a/src/options_personal.php +++ b/src/options_personal.php @@ -10,11 +10,11 @@ ** $Id$ **/ - include('../src/validate.php'); - include('../functions/display_messages.php'); - include('../functions/imap.php'); - include('../functions/array.php'); - include('../functions/plugin.php'); + require_once('../src/validate.php'); + require_once('../functions/display_messages.php'); + require_once('../functions/imap.php'); + require_once('../functions/array.php'); + require_once('../functions/plugin.php'); displayPageHeader($color, 'None'); @@ -125,4 +125,4 @@ - + \ No newline at end of file diff --git a/src/read_body.php b/src/read_body.php index 95368c10..50c18b1a 100644 --- a/src/read_body.php +++ b/src/read_body.php @@ -11,11 +11,11 @@ ** $Id$ **/ - include("../src/validate.php"); - include('../functions/imap.php'); - include('../functions/mime.php'); - include('../functions/date.php'); - include('../functions/url_parser.php'); + require_once('../src/validate.php'); + require_once('../functions/imap.php'); + require_once('../functions/mime.php'); + require_once('../functions/date.php'); + require_once('../functions/url_parser.php'); $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); sqimap_mailbox_select($imapConnection, $mailbox); diff --git a/src/redirect.php b/src/redirect.php index 12adb1c3..35a1d436 100644 --- a/src/redirect.php +++ b/src/redirect.php @@ -13,9 +13,9 @@ ** $Id$ **/ - include('../functions/i18n.php'); - include('../functions/strings.php'); - include('../config/config.php'); + require_once('../functions/i18n.php'); + require_once('../functions/strings.php'); + require_once('../config/config.php'); // Before starting the session, the base URI must be known. // Assuming that this file is in the src/ subdirectory (or @@ -53,9 +53,9 @@ } - include ('../functions/prefs.php'); - include ('../functions/imap.php'); - include ('../functions/plugin.php'); + require_once('../functions/prefs.php'); + require_once('../functions/imap.php'); + require_once('../functions/plugin.php'); if (!session_is_registered('user_is_logged_in')) { do_hook ('login_before'); @@ -96,4 +96,4 @@ urlencode($rcptemail)); else header("Location: webmail.php"); -?> +?> \ No newline at end of file diff --git a/src/right_main.php b/src/right_main.php index d0f38079..5e10025c 100644 --- a/src/right_main.php +++ b/src/right_main.php @@ -11,13 +11,13 @@ ** $Id$ **/ - include('../src/validate.php'); - include('../functions/imap.php'); - include('../functions/date.php'); - include('../functions/array.php'); - include('../functions/mime.php'); - include('../functions/mailbox_display.php'); - include('../functions/display_messages.php'); + require_once('../src/validate.php'); + require_once('../functions/imap.php'); + require_once('../functions/date.php'); + require_once('../functions/array.php'); + require_once('../functions/mime.php'); + require_once('../functions/mailbox_display.php'); + require_once('../functions/display_messages.php'); ///////////////////////////////////////////////////////////////////////////////// // @@ -115,4 +115,4 @@ bgcolor=""> ?> - + \ No newline at end of file diff --git a/src/search.php b/src/search.php index de5471bb..e090e887 100644 --- a/src/search.php +++ b/src/search.php @@ -2,10 +2,10 @@ /* $Id$ */ - include('../src/validate.php'); - include('../functions/imap.php'); - include('../functions/imap_search.php'); - include('../functions/array.php'); + require_once('../src/validate.php'); + require_once('../functions/imap.php'); + require_once('../functions/imap_search.php'); + require_once('../functions/array.php'); displayPageHeader($color, $mailbox); $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); @@ -84,4 +84,4 @@ do_hook("search_bottom"); sqimap_logout ($imapConnection); ?> - + \ No newline at end of file diff --git a/src/signout.php b/src/signout.php index d7258a77..6b54cc4e 100644 --- a/src/signout.php +++ b/src/signout.php @@ -11,9 +11,9 @@ ** $Id$ **/ - include('../src/validate.php'); - include ('../functions/prefs.php'); - include ('../functions/plugin.php'); + require_once('../src/validate.php'); + require_once('../functions/prefs.php'); + require_once('../functions/plugin.php'); // Erase any lingering attachments if (! isset($attachments)) { @@ -81,4 +81,4 @@ CELLPADDING="2" ALIGN="CENTER"> - + \ No newline at end of file diff --git a/src/validate.php b/src/validate.php index 83d22e32..2ee592b9 100644 --- a/src/validate.php +++ b/src/validate.php @@ -13,8 +13,8 @@ define ('validate_php', true); session_start(); - include ('../functions/i18n.php'); - include ('../functions/auth.php'); + require_once('../functions/i18n.php'); + require_once('../functions/auth.php'); is_logged_in(); @@ -103,13 +103,13 @@ // strings.php, so include them both here. // Include them down here instead of at the top so that all config // variables overwrite any passed in variables (for security) - include ('../functions/strings.php'); - include ('../config/config.php'); - include ('../src/load_prefs.php'); - include ('../functions/page_header.php'); + require_once('../functions/strings.php'); + require_once('../config/config.php'); + require_once('../src/load_prefs.php'); + require_once('../functions/page_header.php'); // Set up the language // i18n.php was included by auth.php global $username, $data_dir; set_up_language(getPref($data_dir, $username, 'language')); -?> +?> \ No newline at end of file diff --git a/src/webmail.php b/src/webmail.php index dfca03d8..39a1c827 100644 --- a/src/webmail.php +++ b/src/webmail.php @@ -13,13 +13,13 @@ ** $Id$ **/ - include ('../functions/strings.php'); - include ('../config/config.php'); - include ('../functions/prefs.php'); - include ('../functions/imap.php'); - include ('../functions/plugin.php'); - include ('../functions/i18n.php'); - include ('../functions/auth.php'); + require_once('../functions/strings.php'); + require_once('../config/config.php'); + require_once('../functions/prefs.php'); + require_once('../functions/imap.php'); + require_once('../functions/plugin.php'); + require_once('../functions/i18n.php'); + require_once('../functions/auth.php'); session_start(); is_logged_in(); @@ -99,4 +99,4 @@ ?> - + \ No newline at end of file -- 2.25.1