projects / squirrelmail.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 8863d46)
Operation "foo_once".
authorphilippe_mingo <philippe_mingo@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Wed, 26 Sep 2001 10:07:21 +0000 (10:07 +0000)
committerphilippe_mingo <philippe_mingo@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Wed, 26 Sep 2001 10:07:21 +0000 (10:07 +0000)
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

33 files changed:
src/addrbook_popup.php patch | blob | blame | history
src/addrbook_search.php patch | blob | blame | history
src/addrbook_search_html.php patch | blob | blame | history
src/addressbook.php patch | blob | blame | history
src/compose.php patch | blob | blame | history
src/delete_message.php patch | blob | blame | history
src/download.php patch | blob | blame | history
src/empty_trash.php patch | blob | blame | history
src/folders.php patch | blob | blame | history
src/folders_create.php patch | blob | blame | history
src/folders_delete.php patch | blob | blame | history
src/folders_rename_do.php patch | blob | blame | history
src/folders_rename_getname.php patch | blob | blame | history
src/folders_subscribe.php patch | blob | blame | history
src/help.php patch | blob | blame | history
src/left_main.php patch | blob | blame | history
src/load_prefs.php patch | blob | blame | history
src/login.php patch | blob | blame | history
src/move_messages.php patch | blob | blame | history
src/options.php patch | blob | blame | history
src/options_display.php patch | blob | blame | history
src/options_folder.php patch | blob | blame | history
src/options_highlight.php patch | blob | blame | history
src/options_identities.php patch | blob | blame | history
src/options_order.php patch | blob | blame | history
src/options_personal.php patch | blob | blame | history
src/read_body.php patch | blob | blame | history
src/redirect.php patch | blob | blame | history
src/right_main.php patch | blob | blame | history
src/search.php patch | blob | blame | history
src/signout.php patch | blob | blame | history
src/validate.php patch | blob | blame | history
src/webmail.php patch | blob | blame | history

diff --git a/src/addrbook_popup.php b/src/addrbook_popup.php
index f12575e34a4cde89b6da6e2ac8fe1b4b12c43fc0..8b6e1adbe11965e5b58b6d712b097d87eb4d8171 100644 (file)
--- 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');
    
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN">
@@ -19,7 +19,7 @@
 <HTML>
 <HEAD>
 <TITLE><?php 
-   printf("%s: %s", $org_title, _("Address Book")); 
+   echo "$org_title: " . _("Address Book"); 
 ?></TITLE>
 </HEAD>
 
@@ -30,4 +30,4 @@
         BORDER=0>
 </FRAMESET>
 
-</HTML>
+</HTML>
\ No newline at end of file
diff --git a/src/addrbook_search.php b/src/addrbook_search.php
index 6c42aa1804c2b36fc74da7d8e893bad2384f5e99..c010b1548ae52eadc8e443674b898a17e16ebadb 100644 (file)
--- 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 9cdf82a9117fa2def492f898742fdac89fe5b84c..abe09e9f68ffcdcbf8cdb7fdd4d30e62ea469d12 100644 (file)
--- 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 f36496ba6a94976b3e276ed4592ef6879e1b8517..e769db09bada5a444dbb70959b2a598304e6f3d2 100644 (file)
--- 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 9ebb5ded071d4f4541fa343de5756e8121aefbe3..b0ed6e891c6599b5f2e763b4af308e0001daab22 100644 (file)
--- 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 dd78d2bdb114e9e511f3b8a7af2a94ca6d51eff9..69b46bce3e5327c4d4ae19ad8020c95d55cf10f4 100644 (file)
--- 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 b9976a8d9113bee5a803aa10175a1328ce8d2389..8103994eba74bd5e63373ea8c739df58be692c8f 100644 (file)
--- 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 16d54e04cdff95c27985bae43c01493f04ed96cb..279af75eaac657ce58fdcb86035153e5f5b4f3ac 100644 (file)
--- 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 275a4c3dbfebbd4b82d1de6abf98c845d2e99944..34dc7f45906da04a55419a0b582e3cba5a1d80ae 100644 (file)
--- 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);
 ?>
 
-</body></html>
+</body></html>
\ No newline at end of file
diff --git a/src/folders_create.php b/src/folders_create.php
index 607bbac71d2e006b93cef0e72f42f84e83a8813b..09536fab425bde43cfae7a74c03f4a5efa213cdd 100644 (file)
--- 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 7cda7013ae9fd11ed9989aa0421b6d8821af99ce..a301f70ba9578161d9be6aceda4033bc61493635 100644 (file)
--- 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 "</BODY></HTML>";
    */
-?>
+?>
\ No newline at end of file
diff --git a/src/folders_rename_do.php b/src/folders_rename_do.php
index 37fbf311bcdebba1127a1c4197174ec62b3fd48b..4c0dcfff3eb74b8ce6ce950848b7cb13250678fd 100644 (file)
--- 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 a7803a882a78c7967a2d4728796390b6e8c52032..0af0f529c1873eefa18ca0c4901c14081f2b6e96 100644 (file)
--- 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 5c0433669410da1016ce6b3d44cbf48b41f884c0..c2cb6300c1a0b0b32178ad9e573479828e2b5687 100644 (file)
--- 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 "</CENTER>";
    echo "</BODY></HTML>";
    */
-?>
-
+?>
\ No newline at end of file
diff --git a/src/help.php b/src/help.php
index e95e0b1326b1795136470e9ab1a9056c9444f6c2..67aa1c0d530ac7dfc0f3dc423f9b4eaecfdabdfe 100644 (file)
--- 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 @@
 ?>
 <tr><td bgcolor="<?php echo $color[0] ?>">&nbsp;</td></tr></table>
 <td></tr></table>
-</body></html>
+</body></html>
\ No newline at end of file
diff --git a/src/left_main.php b/src/left_main.php
index d88bc15f4a0ed05b85149f1a82e7567ee166737a..db8bb5ad23e199f84fe91f48f37d7bcf6857a150 100644 (file)
--- 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 @@
    }
    
 ?>
-</BODY></HTML>
+</BODY></HTML>
\ No newline at end of file
diff --git a/src/load_prefs.php b/src/load_prefs.php
index edec5a4f47be7099c2901d88ca16c70291b343af..91c8a083a67ecda52e089cba2bd6ff7e4fcbf0ce 100644 (file)
--- 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 e48c691f28b0170fac6caee4e5e5b3eb8f18d46a..82ea8f050e47db0158389d3d7777fc1dec6086a3 100644 (file)
--- 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 c5f4c837d9bc53913160a24f89604c368755d9df..bd87a9e0b7307d53eb9057ecfa82f60a798a0a1a 100644 (file)
--- 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);
 
 ?>
-</BODY></HTML>
+</BODY></HTML>
\ No newline at end of file
diff --git a/src/options.php b/src/options.php
index 97dfd2ad868e10dc509daa12591e4f54f332baa2..dd11a7a0857d58227198c58b6ac81cb49b8fc7e1 100644 (file)
--- 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 @@
 </td></tr>
 </table>
 
-</body></html>
+</body></html>
\ No newline at end of file
diff --git a/src/options_display.php b/src/options_display.php
index 9b18c47e559bf9d3bf9b02ed75fb16c850cbc17c..9c98ef14b111639328536604b4f1b1ca0b69b431 100644 (file)
--- 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\"");
 
 </td></tr>
 </table>
-</body></html>
+</body></html>
\ No newline at end of file
diff --git a/src/options_folder.php b/src/options_folder.php
index 1f05f8ba6533e2371a7e8693b3566a8c70ecc90e..2d72f349a0a889086d0d7b2f4d36d6d762c58038 100644 (file)
--- 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 @@
 
 </td></tr>
 </table>
-</body></html>
+</body></html>
\ No newline at end of file
diff --git a/src/options_highlight.php b/src/options_highlight.php
index 8494895ad6c9a5df0a7de10ce98e392866ad22ec..264980c540ccfa0922181c26850306e49bbf02fb 100644 (file)
--- 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');
 ?>
-</body></html>
+</body></html>
\ No newline at end of file
diff --git a/src/options_identities.php b/src/options_identities.php
index 82338553b695fd1f06d8b79e862b7ce6c5320397..051405f999ed0e6aa873ed75a94c0c25843b0ad4 100644 (file)
--- 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)
   </tr>
 <?PHP
 }
+?>
\ No newline at end of file
diff --git a/src/options_order.php b/src/options_order.php
index e889a8733f26b54fbe6e31b84d0e21dc51c0979f..9c37465dd76099617b8a71b5c289970cd86ff58c 100644 (file)
--- 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 @@
 
 </td></tr>
 </table>
-</body></html>
+</body></html>
\ No newline at end of file
diff --git a/src/options_personal.php b/src/options_personal.php
index 3a40f28365d55872830f79ecd9de1078f6e755af..a2403528c47dd224b40e42b7eb527f74230873e0 100644 (file)
--- 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 @@
 
 </td></tr>
 </table>
-</body></html>
+</body></html>
\ No newline at end of file
diff --git a/src/read_body.php b/src/read_body.php
index 95368c107000c8b5b5b1acea2ff97c20768e9887..50c18b1a72efafb41cf910c08b9f4fa4b3d62ec1 100644 (file)
--- 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 12adb1c3e885a78a8d3d2eef646bc1e8d1d095af..35a1d4366e48c48c697d31f0f1599278ef4a93a8 100644 (file)
--- 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 d0f380798e1f66a635ab08eb4ed5f856d1003011..5e10025c31edc3aea47389bd32a989cc2bb669c5 100644 (file)
--- 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="<?PHP echo $color[9] ?>">
 ?>
 </FONT>
 </BODY>
-</HTML>
+</HTML>
\ No newline at end of file
diff --git a/src/search.php b/src/search.php
index de5471bbd36a76433970d2d3accd0b1fe4f0e6c2..e090e887a925d5d2dd3248ee02908a72f89309b8 100644 (file)
--- 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);
 ?>
-</body></html>
+</body></html>
\ No newline at end of file
diff --git a/src/signout.php b/src/signout.php
index d7258a77c2c50c9fbaebf159bc9daabb9e1ff00e..6b54cc4ec8be3aaf08742134cac02e92a3262140 100644 (file)
--- 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">
   </TR>
 </TABLE>
 </BODY>
-</HTML>
+</HTML>
\ No newline at end of file
diff --git a/src/validate.php b/src/validate.php
index 83d22e32f58e9f4909cb04f0965b520b4d71d799..2ee592b9e76557f0753c88a7bc980119d198b075 100644 (file)
--- 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 dfca03d829cbc48c602f1633cc02eb5948423409..39a1c827229de4f9102ea6e80bac5fce01615742 100644 (file)
--- 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 @@
 
 ?>
 </FRAMESET>
-</HEAD></HTML>
+</HEAD></HTML>
\ No newline at end of file
Unnamed repository; edit this file 'description' to name the repository.