We use cookies to ensure you get the best experience on our website
Sākums Izpētīt Palīdzība
Reģistrēties Pierakstīties
0ct0pu5
/
squirrelmail
1
0
Atdalīts 0
Faili Problēmas 0 Izmaiņu pieprasījumi 0 Vikivietne
Pārlūkot izejas kodu

Operation "foo_once".
src Folder
Step 1: Check file including and change it to the _once system.

philippe_mingo 24 gadi atpakaļ
vecāks
ae9acf00a1
revīzija
5aae18c113
33 mainītis faili ar 175 papildinājumiem un 176 dzēšanām
Apvienotais skats Rādīt salīdzināšanas statistiku
  1. 4 4
      src/addrbook_popup.php
  2. 4 4
      src/addrbook_search.php
  3. 6 6
      src/addrbook_search_html.php
  4. 4 4
      src/addressbook.php
  5. 8 8
      src/compose.php
  6. 4 4
      src/delete_message.php
  7. 5 5
      src/download.php
  8. 6 6
      src/empty_trash.php
  9. 5 5
      src/folders.php
  10. 4 5
      src/folders_create.php
  11. 5 5
      src/folders_delete.php
  12. 3 4
      src/folders_rename_do.php
  13. 3 5
      src/folders_rename_getname.php
  14. 4 5
      src/folders_subscribe.php
  15. 5 5
      src/help.php
  16. 5 5
      src/left_main.php
  17. 9 6
      src/load_prefs.php
  18. 4 4
      src/login.php
  19. 4 4
      src/move_messages.php
  20. 5 5
      src/options.php
  21. 6 6
      src/options_display.php
  22. 6 6
      src/options_folder.php
  23. 6 6
      src/options_highlight.php
  24. 3 2
      src/options_identities.php
  25. 7 7
      src/options_order.php
  26. 6 6
      src/options_personal.php
  27. 5 5
      src/read_body.php
  28. 7 7
      src/redirect.php
  29. 8 8
      src/right_main.php
  30. 5 5
      src/search.php
  31. 4 4
      src/signout.php
  32. 7 7
      src/validate.php
  33. 8 8
      src/webmail.php

+ 4 - 4
src/addrbook_popup.php
Parādīt failu 

@@ -10,8 +10,8 @@
 
     **  $Id$
 
     **  $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">
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN">
 
@@ -19,7 +19,7 @@
 
 <HTML>
 
 <HTML>
 
 <HEAD>
 
 <HEAD>
 
 <TITLE><?php 
 <TITLE><?php 
-   printf("%s: %s", $org_title, _("Address Book")); 
+   echo "$org_title: " . _("Address Book"); 
 ?></TITLE>
 
 ?></TITLE>
 
 </HEAD>
 
 </HEAD>
 
 
 
@@ -30,4 +30,4 @@
 
         BORDER=0>
 
         BORDER=0>
 
 </FRAMESET>
 
 </FRAMESET>
 
 
 
-</HTML>
 
+</HTML>

+ 4 - 4
src/addrbook_search.php
Parādīt failu 

@@ -14,7 +14,7 @@
 
     **  $Id$
 
     **  $Id$
 
     **/
 
     **/
 
 
 
-   include("../src/validate.php");
 
+   require_once('../src/validate.php');
 
 
 
    // Function to include JavaScript code
 
    // Function to include JavaScript code
 
    function insert_javascript() {
 
    function insert_javascript() {
 
@@ -128,9 +128,9 @@ function bcc_address($addr) {
 
 
 
    /* ================= End of functions ================= */
 
    /* ================= 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();
 
    displayHtmlHeader();

+ 6 - 6
src/addrbook_search_html.php
Parādīt failu 

@@ -16,12 +16,12 @@
 
     **  $Id$
 
     **  $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
 
    // Insert hidden data
 
    function addr_insert_hidden() {
 
    function addr_insert_hidden() {

+ 4 - 4
src/addressbook.php
Parādīt failu 

@@ -10,10 +10,10 @@
 
     **  $Id$
 
     **  $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"
 
    // Sort array by the key "name"
 
    function alistcmp($a,$b) {   
    function alistcmp($a,$b) {

+ 8 - 8
src/compose.php
Parādīt failu 

@@ -15,13 +15,13 @@
 
     ** $Id$
 
     ** $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))
 
    if (!isset($attachments))
 
    {
 
    {
 
@@ -508,7 +508,7 @@
 
       }
 
       }
 
       // I am using an include so as to elminiate an extra unnecessary click.  If you
 
       // I am using an include so as to elminiate an extra unnecessary click.  If you
 
       // can think of a better way, please implement it.
 
       // can think of a better way, please implement it.
 
-      include ("./addrbook_search_html.php");
 
+      include_once('./addrbook_search_html.php');
 
    } else if (isset($attach)) {
 
    } else if (isset($attach)) {
 
       if (saveAttachedFiles())
 
       if (saveAttachedFiles())
 
             plain_error_message(_("Could not move/copy file. File not attached"), $color);
 
             plain_error_message(_("Could not move/copy file. File not attached"), $color);

+ 4 - 4
src/delete_message.php
Parādīt failu 

@@ -10,9 +10,9 @@
 
     **  $Id$
 
     **  $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);
 
    $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));
 
       header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=".urlencode($mailbox));
 
 
 
    sqimap_logout($imapConnection);
 
    sqimap_logout($imapConnection);
 
-?>
 
+?>

+ 5 - 5
src/download.php
Parādīt failu 

@@ -13,10 +13,10 @@
 
 
 
    define('download_php', true);  // Used for preferences
 
    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("Pragma: ");
 
    header("Cache-Control: cache");
 
    header("Cache-Control: cache");
 
@@ -219,4 +219,4 @@
 
 	  }
 
 	  }
 
       }
 
       }
 
    }
 
    }
 
-?>
 
+?>

+ 6 - 6
src/empty_trash.php
Parādīt failu 

@@ -11,11 +11,11 @@
 
     **  $Id$
 
     **  $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);
 
    $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 
 
 
@@ -54,4 +54,4 @@
 
    header ("Location: $location/left_main.php");
 
    header ("Location: $location/left_main.php");
 
 
 
    sqimap_logout($imap_stream);
 
    sqimap_logout($imap_stream);
 
-?>
 
+?>

+ 5 - 5
src/folders.php
Parādīt failu 

@@ -12,10 +12,10 @@
 
     **  $Id$
 
     **  $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"));
 
    displayPageHeader($color, _("None"));
 
 
 
@@ -269,4 +269,4 @@
 
    sqimap_logout($imapConnection);
 
    sqimap_logout($imapConnection);
 
 ?>
 
 ?>
 
 
 
-</body></html>
 
+</body></html>

+ 4 - 5
src/folders_create.php
Parādīt failu 

@@ -11,9 +11,9 @@
 
     **  $Id$
 
     **  $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);
 
    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 
    $dm = sqimap_get_delimiter($imapConnection);
 
    $dm = sqimap_get_delimiter($imapConnection);
 
@@ -48,5 +48,4 @@
 
    $location = get_location();
 
    $location = get_location();
 
    header ("Location: $location/folders.php?success=create");
 
    header ("Location: $location/folders.php?success=create");
 
    sqimap_logout($imapConnection);
 
    sqimap_logout($imapConnection);
 
-?>
 
-
 
+?>

+ 5 - 5
src/folders_delete.php
Parādīt failu 

@@ -11,10 +11,10 @@
 
     **  $Id$
 
     **  $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:
 
    *  Incoming values:
 
@@ -99,4 +99,4 @@
 
    
    
    echo "</BODY></HTML>";
 
    echo "</BODY></HTML>";
 
    */
 
    */
 
-?>
 
+?>

+ 3 - 4
src/folders_rename_do.php
Parādīt failu 

@@ -11,9 +11,8 @@
 
     **  $Id$
 
     **  $Id$
 
     **/
 
     **/
 
 
 
-   include("../src/validate.php");
 
-   include("../functions/imap.php");
 
-
 
+   require_once('../src/validate.php');
 
+   require_once('../functions/imap.php');
 
 
 
    if($old_name == $new_name) {
 
    if($old_name == $new_name) {
 
       $location = get_location();
 
       $location = get_location();
 
@@ -68,4 +67,4 @@
 
    sqimap_logout($imapConnection);
 
    sqimap_logout($imapConnection);
 
    $location = get_location();
 
    $location = get_location();
 
    header ("Location: $location/folders.php?success=rename");
 
    header ("Location: $location/folders.php?success=rename");
 
-?>
 
+?>

+ 3 - 5
src/folders_rename_getname.php
Parādīt failu 

@@ -11,8 +11,8 @@
 
     **  $Id$
 
     **  $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);
 
    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 
 
 
@@ -49,6 +49,4 @@
 
 
 
    /** Log out this session **/
 
    /** Log out this session **/
 
    sqimap_logout($imapConnection);
 
    sqimap_logout($imapConnection);
 
-?>
 
-
 
-
 
+?>

+ 4 - 5
src/folders_subscribe.php
Parādīt failu 

@@ -11,9 +11,9 @@
 
     **  $Id$
 
     **  $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);
 
    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 
    $dm = sqimap_get_delimiter($imapConnection);
 
    $dm = sqimap_get_delimiter($imapConnection);
 
@@ -53,5 +53,4 @@
 
    echo "</CENTER>";
 
    echo "</CENTER>";
 
    echo "</BODY></HTML>";
 
    echo "</BODY></HTML>";
 
    */
 
    */
 
-?>
 
-
 
+?>

+ 5 - 5
src/help.php
Parādīt failu 

@@ -10,10 +10,10 @@
 
     **  $Id$
 
     **  $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");
 
    displayPageHeader($color, "None");
 
@@ -191,4 +191,4 @@
 
 ?>
 
 ?>
 
 <tr><td bgcolor="<?php echo $color[0] ?>">&nbsp;</td></tr></table>
 
 <tr><td bgcolor="<?php echo $color[0] ?>">&nbsp;</td></tr></table>
 
 <td></tr></table>
 
 <td></tr></table>
 
-</body></html>
 
+</body></html>

+ 5 - 5
src/left_main.php
Parādīt failu 

@@ -10,10 +10,10 @@
 
     **  $Id$
 
     **  $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)
 
    // open a connection on the imap port (143)
 
    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 10); // the 10 is to hide the output
 
    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 10); // the 10 is to hide the output
 
@@ -200,4 +200,4 @@
 
    }
 
    }
 
    
    
 ?>
 
 ?>
 
-</BODY></HTML>
 
+</BODY></HTML>

+ 9 - 6
src/load_prefs.php
Parādīt failu 

@@ -11,19 +11,22 @@
 
     **  $Id$
 
     **  $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'))
 
    if (defined('load_prefs_php'))
 
        return;
 
        return;
 
    define('load_prefs_php', true);
 
    define('load_prefs_php', true);
 
+   // ----------------------------------------------------------
 
 
 
    global $theme, $chosen_theme, $color;
 
    global $theme, $chosen_theme, $color;
 
    if (! isset($theme))
 
    if (! isset($theme))
 
       $theme = array();
 
       $theme = array();
 
    if (! isset($color))
 
    if (! isset($color))
 
       $color = array();
 
       $color = array();
 
-   include("../functions/prefs.php");
 
-   include("../functions/plugin.php");
 
+   require_once('../functions/prefs.php');
 
+   require_once('../functions/plugin.php');
 
       
       
    if (!isset($username))
 
    if (!isset($username))
 
        $username = '';
 
        $username = '';
 
@@ -42,10 +45,10 @@
 
        $chosen_theme = "";
 
        $chosen_theme = "";
 
 
 
    if (isset($chosen_theme) && $in_ary && (file_exists($chosen_theme))) {
 
    if (isset($chosen_theme) && $in_ary && (file_exists($chosen_theme))) {
 
-      @include($chosen_theme);
 
+      @include_once($chosen_theme);
 
    } else {
 
    } else {
 
       if (isset($theme) && isset($theme[0]) && file_exists($theme[0]["PATH"])) {
 
       if (isset($theme) && isset($theme[0]) && file_exists($theme[0]["PATH"])) {
 
-         @include($theme[0]["PATH"]);
 
+         @include_once($theme[0]["PATH"]);
 
       } else {
 
       } else {
 
           #
 
           #
 
           #  I hard coded the theme as a failsafe if no themes were
 
           #  I hard coded the theme as a failsafe if no themes were
 
@@ -245,4 +248,4 @@
 
 
 
    do_hook("loading_prefs");
 
    do_hook("loading_prefs");
 
 
 
-?>
 
+?>

+ 4 - 4
src/login.php
Parādīt failu 

@@ -52,10 +52,10 @@
 
       $rcptaddress = urlencode($rcptaddress);
 
       $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
 
    // $squirrelmail_language is set by a cookie when the user selects
 
    // language and logs out
 
    // language and logs out

+ 4 - 4
src/move_messages.php
Parādīt failu 

@@ -10,9 +10,9 @@
 
     **  $Id$
 
     **  $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) {
 
    function putSelectedMessagesIntoString($msg) {
 
       $j = 0;
 
       $j = 0;
 
@@ -139,4 +139,4 @@
 
    sqimap_logout($imapConnection);
 
    sqimap_logout($imapConnection);
 
 
 
 ?>
 
 ?>
 
-</BODY></HTML>
 
+</BODY></HTML>

+ 5 - 5
src/options.php
Parādīt failu 

@@ -11,10 +11,10 @@
 
     **  $Id$
 
     **  $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)) {
 
    if (isset($language)) {
 
       setcookie('squirrelmail_language', $language, time()+2592000);
 
       setcookie('squirrelmail_language', $language, time()+2592000);
 
@@ -225,4 +225,4 @@
 
 </td></tr>
 
 </td></tr>
 
 </table>
 
 </table>
 
 
 
-</body></html>
 
+</body></html>

+ 6 - 6
src/options_display.php
Parādīt failu 

@@ -10,11 +10,11 @@
 
     **  $Id$
 
     **  $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');
 
    displayPageHeader($color, 'None');
 
    $chosen_language = getPref($data_dir, $username, 'language');  
    $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>
 
 </td></tr>
 
 </table>
 
 </table>
 
-</body></html>
 
+</body></html>

+ 6 - 6
src/options_folder.php
Parādīt failu 

@@ -10,11 +10,11 @@
 
     **  $Id$
 
     **  $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');
 
    displayPageHeader($color, 'None');
 
 
 
@@ -148,4 +148,4 @@
 
 
 
 </td></tr>
 
 </td></tr>
 
 </table>
 
 </table>
 
-</body></html>
 
+</body></html>

+ 6 - 6
src/options_highlight.php
Parādīt failu 

@@ -10,11 +10,11 @@
 
     **  $Id$
 
     **  $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))
 
    if (! isset($action))
 
        $action = '';
 
        $action = '';
 
@@ -332,4 +332,4 @@
 
    } 
    } 
    do_hook('options_highlight_bottom');
 
    do_hook('options_highlight_bottom');
 
 ?>
 
 ?>
 
-</body></html>
 
+</body></html>

+ 3 - 2
src/options_identities.php
Parādīt failu 

@@ -5,8 +5,8 @@
 
     **  $Id$
 
     **  $Id$
 
     **/
 
     **/
 
 
 
-   include('../src/validate.php');
 
-   include('../functions/display_messages.php');
 
+   require_once('../src/validate.php');
 
+   require_once('../functions/display_messages.php');
 
 
 
    if (isset($return)) {
 
    if (isset($return)) {
 
       SaveUpdateFunction();
 
       SaveUpdateFunction();
 
@@ -335,3 +335,4 @@ function ShowTableInfo($full_name, $email_address, $reply_to, $post)
 
   </tr>
 
   </tr>
 
 <?PHP
 
 <?PHP
 
 }
 
 }
 
+?>

+ 7 - 7
src/options_order.php
Parādīt failu 

@@ -10,11 +10,11 @@
 
     **  $Id$
 
     **  $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 = ''; }
 
    if (! isset($action)) { $action = ''; }
 
@@ -68,7 +68,7 @@
 
       $index_order = array();
 
       $index_order = array();
 
       $index_order = $new_ary;
 
       $index_order = $new_ary;
 
       if (count($index_order) < 1) {
 
       if (count($index_order) < 1) {
 
-         include ('../src/load_prefs.php');
 
+         include_once('../src/load_prefs.php');
 
       }
 
       }
 
    } else if ($method == 'add' && $add) {
 
    } else if ($method == 'add' && $add) {
 
       // User should not be able to insert PHP-code here
 
       // User should not be able to insert PHP-code here
 
@@ -140,4 +140,4 @@
 
 
 
 </td></tr>
 
 </td></tr>
 
 </table>
 
 </table>
 
-</body></html>
 
+</body></html>

+ 6 - 6
src/options_personal.php
Parādīt failu 

@@ -10,11 +10,11 @@
 
     **  $Id$
 
     **  $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');
 
    displayPageHeader($color, 'None');
 
 
 
@@ -125,4 +125,4 @@
 
 
 
 </td></tr>
 
 </td></tr>
 
 </table>
 
 </table>
 
-</body></html>
 
+</body></html>

+ 5 - 5
src/read_body.php
Parādīt failu 

@@ -11,11 +11,11 @@
 
    **  $Id$
 
    **  $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);
 
    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 
    sqimap_mailbox_select($imapConnection, $mailbox);
 
    sqimap_mailbox_select($imapConnection, $mailbox);

+ 7 - 7
src/redirect.php
Parādīt failu 

@@ -13,9 +13,9 @@
 
     **  $Id$
 
     **  $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.
 
    // Before starting the session, the base URI must be known.
 
    // Assuming that this file is in the src/ subdirectory (or
 
    // 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')) {
 
    if (!session_is_registered('user_is_logged_in')) {
 
       do_hook ('login_before');
 
       do_hook ('login_before');
 
@@ -96,4 +96,4 @@
 
          urlencode($rcptemail));
 
          urlencode($rcptemail));
 
    else
 
    else
 
       header("Location: webmail.php");
 
       header("Location: webmail.php");
 
-?>
 
+?>

+ 8 - 8
src/right_main.php
Parādīt failu 

@@ -11,13 +11,13 @@
 
     **  $Id$
 
     **  $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>
 
 </FONT>
 
 </BODY>
 
 </BODY>
 
-</HTML>
 
+</HTML>

+ 5 - 5
src/search.php
Parādīt failu 

@@ -2,10 +2,10 @@
 
 
 
    /* $Id$ */
 
    /* $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);
 
    displayPageHeader($color, $mailbox);
 
    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 
    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 
@@ -84,4 +84,4 @@
 
    do_hook("search_bottom");
 
    do_hook("search_bottom");
 
    sqimap_logout ($imapConnection);
 
    sqimap_logout ($imapConnection);
 
 ?>
 
 ?>
 
-</body></html>
 
+</body></html>

+ 4 - 4
src/signout.php
Parādīt failu 

@@ -11,9 +11,9 @@
 
     **  $Id$
 
     **  $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
 
    // Erase any lingering attachments
 
    if (! isset($attachments)) {
 
    if (! isset($attachments)) {
 
@@ -81,4 +81,4 @@ CELLPADDING="2" ALIGN="CENTER">
 
   </TR>
 
   </TR>
 
 </TABLE>
 
 </TABLE>
 
 </BODY>
 
 </BODY>
 
-</HTML>
 
+</HTML>

+ 7 - 7
src/validate.php
Parādīt failu 

@@ -13,8 +13,8 @@
 
    define ('validate_php', true); 
    define ('validate_php', true); 
 
 
    session_start();
 
    session_start();
 
-   include ('../functions/i18n.php');
 
-   include ('../functions/auth.php');
 
+   require_once('../functions/i18n.php');
 
+   require_once('../functions/auth.php');
 
    
    
    is_logged_in();
 
    is_logged_in();
 
 
 
@@ -103,13 +103,13 @@
 
    // strings.php, so include them both here.
 
    // strings.php, so include them both here.
 
    // Include them down here instead of at the top so that all config
 
    // Include them down here instead of at the top so that all config
 
    // variables overwrite any passed in variables (for security)
 
    // 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
 
    // Set up the language
 
    // i18n.php was included by auth.php
 
    // i18n.php was included by auth.php
 
    global $username, $data_dir;
 
    global $username, $data_dir;
 
    set_up_language(getPref($data_dir, $username, 'language'));
 
    set_up_language(getPref($data_dir, $username, 'language'));
 
-?>
 
+?>

+ 8 - 8
src/webmail.php
Parādīt failu 

@@ -13,13 +13,13 @@
 
     **  $Id$
 
     **  $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();
 
    session_start();
 
    is_logged_in();
 
    is_logged_in();
 
@@ -99,4 +99,4 @@
 
 
 
 ?>
 
 ?>
 
 </FRAMESET>
 
 </FRAMESET>
 
-</HEAD></HTML>
 
+</HEAD></HTML>

Contact | Legal | Takedown | Status
Self-hosted public services - About
NibbleSpot by 0ct0pu5