From: thomppj Date: Fri, 6 Sep 2002 00:19:37 +0000 (+0000) Subject: Part 1 of switch to use of SM_PATH with require_once. X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=commitdiff_plain;h=8672576304f4da444b9b1e0e4ca81505af0267ec;hp=31e4027a33c78b19f4aff48dd6999284a034c7c0 Part 1 of switch to use of SM_PATH with require_once. Feel free to convert things in functions/, class/, plugins/, etc too. I have everything in src/ done. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3577 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- diff --git a/src/addrbook_popup.php b/src/addrbook_popup.php index c38a379a..c4597627 100644 --- a/src/addrbook_popup.php +++ b/src/addrbook_popup.php @@ -11,8 +11,12 @@ * $Id$ */ -require_once('../src/validate.php'); -require_once('../functions/addressbook.php'); +/* Path for SquirrelMail required files. */ +define('SM_PATH','../'); + +/* SquirrelMail required files. */ +require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'functions/addressbook.php'); ?> diff --git a/src/addrbook_search.php b/src/addrbook_search.php index 7fd7ee8e..e6beddef 100644 --- a/src/addrbook_search.php +++ b/src/addrbook_search.php @@ -15,9 +15,13 @@ * $Id$ */ -require_once('../src/validate.php'); -require_once('../functions/strings.php'); -require_once('../functions/html.php'); +/* Path for SquirrelMail required files. */ +define('SM_PATH','../'); + +/* SquirrelMail required files. */ +require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'functions/strings.php'); +require_once(SM_PATH . 'functions/html.php'); /* Function to include JavaScript code */ function insert_javascript() { diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php index 54de9f8f..06145579 100644 --- a/src/addrbook_search_html.php +++ b/src/addrbook_search_html.php @@ -17,14 +17,18 @@ * $Id$ */ -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'); -require_once('../functions/strings.php'); -require_once('../functions/html.php'); +/* Path for SquirrelMail required files. */ +define('SM_PATH','../'); + +/* SquirrelMail required files. */ +require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'functions/date.php'); +require_once(SM_PATH . 'functions/smtp.php'); +require_once(SM_PATH . 'functions/display_messages.php'); +require_once(SM_PATH . 'functions/addressbook.php'); +require_once(SM_PATH . 'functions/plugin.php'); +require_once(SM_PATH . 'functions/strings.php'); +require_once(SM_PATH . 'functions/html.php'); /* Insert hidden data */ function addr_insert_hidden() { diff --git a/src/addressbook.php b/src/addressbook.php index 9f8e039e..5f2907bb 100644 --- a/src/addressbook.php +++ b/src/addressbook.php @@ -11,12 +11,16 @@ * $Id$ */ -require_once('../src/validate.php'); -require_once('../functions/array.php'); -require_once('../functions/display_messages.php'); -require_once('../functions/addressbook.php'); -require_once('../functions/strings.php'); -require_once('../functions/html.php'); +/* Path for SquirrelMail required files. */ +define('SM_PATH','../'); + +/* SquirrelMail required files. */ +require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'functions/array.php'); +require_once(SM_PATH . 'functions/display_messages.php'); +require_once(SM_PATH . 'functions/addressbook.php'); +require_once(SM_PATH . 'functions/strings.php'); +require_once(SM_PATH . 'functions/html.php'); /* Make an input field */ function adressbook_inp_field($label, $field, $name, $size, $values, $add) { diff --git a/src/compose.php b/src/compose.php index 73ff63fb..b0b8257b 100644 --- a/src/compose.php +++ b/src/compose.php @@ -17,14 +17,18 @@ * $Id$ */ -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/plugin.php'); -require_once('../functions/display_messages.php'); -require_once('../class/deliver/Deliver.class.php'); +/* Path for SquirrelMail required files. */ +define('SM_PATH','../'); + +/* SquirrelMail required files. */ +require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'functions/imap.php'); +require_once(SM_PATH . 'functions/date.php'); +require_once(SM_PATH . 'functions/mime.php'); +//require_once(SM_PATH . 'functions/smtp.php'); +require_once(SM_PATH . 'functions/plugin.php'); +require_once(SM_PATH . 'functions/display_messages.php'); +require_once(SM_PATH . 'class/deliver/Deliver.class.php'); /* --------------------- Specific Functions ------------------------------ */ @@ -1206,7 +1210,7 @@ function sendMessage($composeMessage, $draft=false) { $composeMessage->rfc822_header = $rfc822_header; if (!$useSendmail && !$draft) { - require_once('../class/deliver/Deliver_SMTP.class.php'); + require_once(SM_PATH . 'class/deliver/Deliver_SMTP.class.php'); $deliver = new Deliver_SMTP(); global $smtpServerAddress, $smtpPort, $use_authenticated_smtp, $pop_before_smtp; if ($use_authenticated_smtp) { @@ -1221,18 +1225,18 @@ function sendMessage($composeMessage, $draft=false) { $stream = $deliver->initStream($composeMessage,$domain,0, $smtpServerAddress, $smtpPort, $authPop); } elseif (!$draft) { - require_once('../class/deliver/Deliver_SendMail.class.php'); + require_once(SM_PATH . 'class/deliver/Deliver_SendMail.class.php'); global $sendmail_path; $deliver = new Deliver_SendMail(); $stream = $deliver->initStream($composeMessage,$sendmail_path); } elseif ($draft) { global $draft_folder; - require_once('../class/deliver/Deliver_IMAP.class.php'); + require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php'); $imap_deliver = new Deliver_IMAP(); $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); if (sqimap_mailbox_exists ($imap_stream, $draft_folder)) { - require_once('../class/deliver/Deliver_IMAP.class.php'); + require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php'); $imap_deliver = new Deliver_IMAP(); $length = $imap_deliver->mail($composeMessage); sqimap_append ($imap_stream, $draft_folder, $length); @@ -1258,7 +1262,7 @@ function sendMessage($composeMessage, $draft=false) { $imapPort, 0); if (sqimap_mailbox_exists ($imap_stream, $sent_folder)) { sqimap_append ($imap_stream, $sent_folder, $length); - require_once('../class/deliver/Deliver_IMAP.class.php'); + require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php'); $imap_deliver = new Deliver_IMAP(); $imap_deliver->mail($composeMessage, $imap_stream); sqimap_append_done ($imap_stream); diff --git a/src/delete_message.php b/src/delete_message.php index 7cc08b1c..711a665a 100644 --- a/src/delete_message.php +++ b/src/delete_message.php @@ -11,9 +11,13 @@ * $Id$ */ -require_once('../src/validate.php'); -require_once('../functions/display_messages.php'); -require_once('../functions/imap.php'); +/* Path for SquirrelMail required files. */ +define('SM_PATH','../'); + +/* SquirrelMail required files. */ +require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'functions/display_messages.php'); +require_once(SM_PATH . 'functions/imap.php'); $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); diff --git a/src/download.php b/src/download.php index 7778bb73..f3ec5775 100644 --- a/src/download.php +++ b/src/download.php @@ -12,9 +12,13 @@ * $Id$ */ -require_once('../src/validate.php'); -require_once('../functions/imap.php'); -require_once('../functions/mime.php'); +/* Path for SquirrelMail required files. */ +define('SM_PATH','../'); + +/* SquirrelMail required files. */ +require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'functions/imap.php'); +require_once(SM_PATH . 'functions/mime.php'); header('Pragma: '); header('Cache-Control: cache'); diff --git a/src/draft_actions.php b/src/draft_actions.php index 1bb549ad..b6c0afd4 100644 --- a/src/draft_actions.php +++ b/src/draft_actions.php @@ -9,7 +9,11 @@ * $Id$ */ -require_once ('../src/validate.php'); +/* Path for SquirrelMail required files. */ +define('SM_PATH','../'); + +/* SquirrelMail required files. */ +require_once(SM_PATH . 'src/validate.php'); /* Print all the needed RFC822 headers */ function write822HeaderForDraft ($fp, $t, $c, $b, $subject, $more_headers, $session) { diff --git a/src/empty_trash.php b/src/empty_trash.php index 18d89d94..c3d79a59 100644 --- a/src/empty_trash.php +++ b/src/empty_trash.php @@ -12,11 +12,15 @@ * $Id$ */ -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'); +/* Path for SquirrelMail required files. */ +define('SM_PATH','../'); + +/* SquirrelMail required files. */ +require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'functions/display_messages.php'); +require_once(SM_PATH . 'functions/imap.php'); +require_once(SM_PATH . 'functions/array.php'); +require_once(SM_PATH . 'functions/tree.php'); $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); diff --git a/src/folders.php b/src/folders.php index 69ee1a29..c0106361 100644 --- a/src/folders.php +++ b/src/folders.php @@ -13,12 +13,16 @@ * $Id$ */ -require_once('../src/validate.php'); -require_once('../functions/imap_utf7_decode_local.php'); -require_once('../functions/imap.php'); -require_once('../functions/array.php'); -require_once('../functions/plugin.php'); -require_once('../functions/html.php'); +/* Path for SquirrelMail required files. */ +define('SM_PATH','../'); + +/* SquirrelMail required files. */ +require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'functions/imap_utf7_decode_local.php'); +require_once(SM_PATH . 'functions/imap.php'); +require_once(SM_PATH . 'functions/array.php'); +require_once(SM_PATH . 'functions/plugin.php'); +require_once(SM_PATH . 'functions/html.php'); displayPageHeader($color, 'None'); diff --git a/src/folders_create.php b/src/folders_create.php index d3309f68..3a5da960 100644 --- a/src/folders_create.php +++ b/src/folders_create.php @@ -12,9 +12,13 @@ * $Id$ */ -require_once('../src/validate.php'); -require_once('../functions/imap.php'); -require_once('../functions/display_messages.php'); +/* Path for SquirrelMail required files. */ +define('SM_PATH','../'); + +/* SquirrelMail required files. */ +require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'functions/imap.php'); +require_once(SM_PATH . 'functions/display_messages.php'); $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); global $delimiter; diff --git a/src/folders_delete.php b/src/folders_delete.php index 6775f677..fd501b89 100644 --- a/src/folders_delete.php +++ b/src/folders_delete.php @@ -12,12 +12,15 @@ * $Id$ */ - -require_once('../src/validate.php'); -require_once('../functions/imap.php'); -require_once('../functions/array.php'); -require_once('../functions/tree.php'); -require_once('../functions/display_messages.php'); +/* Path for SquirrelMail required files. */ +define('SM_PATH','../'); + +/* SquirrelMail required files. */ +require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'functions/imap.php'); +require_once(SM_PATH . 'functions/array.php'); +require_once(SM_PATH . 'functions/tree.php'); +require_once(SM_PATH . 'functions/display_messages.php'); /* * Incoming values: diff --git a/src/folders_rename_do.php b/src/folders_rename_do.php index 79175d1b..2918ea58 100644 --- a/src/folders_rename_do.php +++ b/src/folders_rename_do.php @@ -14,8 +14,12 @@ global $delimiter, $base_uri; -require_once('../src/validate.php'); -require_once('../functions/imap.php'); +/* Path for SquirrelMail required files. */ +define('SM_PATH','../'); + +/* SquirrelMail required files. */ +require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'functions/imap.php'); $new_name = trim($new_name); diff --git a/src/folders_rename_getname.php b/src/folders_rename_getname.php index 633c3ea5..ab147e2b 100644 --- a/src/folders_rename_getname.php +++ b/src/folders_rename_getname.php @@ -14,9 +14,13 @@ global $delimiter; -require_once('../src/validate.php'); -require_once('../functions/imap.php'); -require_once('../functions/html.php'); +/* Path for SquirrelMail required files. */ +define('SM_PATH','../'); + +/* SquirrelMail required files. */ +require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'functions/imap.php'); +require_once(SM_PATH . 'functions/html.php'); if ($old == '') { displayPageHeader($color, 'None'); diff --git a/src/folders_subscribe.php b/src/folders_subscribe.php index ae7eb179..f49f5623 100644 --- a/src/folders_subscribe.php +++ b/src/folders_subscribe.php @@ -12,9 +12,13 @@ * $Id$ */ -require_once('../src/validate.php'); -require_once('../functions/imap.php'); -require_once('../functions/display_messages.php'); +/* Path for SquirrelMail required files. */ +define('SM_PATH','../'); + +/* SquirrelMail required files. */ +require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'functions/imap.php'); +require_once(SM_PATH . 'functions/display_messages.php'); $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); diff --git a/src/help.php b/src/help.php index 3c3d8387..e72d3bc4 100644 --- a/src/help.php +++ b/src/help.php @@ -11,10 +11,14 @@ * $Id$ */ -require_once('../src/validate.php'); -require_once('../functions/display_messages.php'); -require_once('../functions/imap.php'); -require_once('../functions/array.php'); +/* Path for SquirrelMail required files. */ +define('SM_PATH','../'); + +/* SquirrelMail required files. */ +require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'functions/display_messages.php'); +require_once(SM_PATH . 'functions/imap.php'); +require_once(SM_PATH . 'functions/array.php'); displayPageHeader($color, 'None' ); diff --git a/src/image.php b/src/image.php index 776549db..ca830b59 100644 --- a/src/image.php +++ b/src/image.php @@ -11,11 +11,15 @@ * $Id$ */ -require_once('../src/validate.php'); -require_once('../functions/date.php'); -require_once('../functions/page_header.php'); -require_once('../functions/html.php'); -require_once('../src/load_prefs.php'); +/* Path for SquirrelMail required files. */ +define('SM_PATH','../'); + +/* SquirrelMail required files. */ +require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'functions/date.php'); +require_once(SM_PATH . 'functions/page_header.php'); +require_once(SM_PATH . 'functions/html.php'); +require_once(SM_PATH . 'src/load_prefs.php'); displayPageHeader($color, 'None'); diff --git a/src/left_main.php b/src/left_main.php index 16f8bd4f..6b919058 100644 --- a/src/left_main.php +++ b/src/left_main.php @@ -12,12 +12,16 @@ * $Id$ */ -require_once('../src/validate.php'); -require_once('../functions/array.php'); -require_once('../functions/imap.php'); -require_once('../functions/plugin.php'); -require_once('../functions/page_header.php'); -require_once('../functions/html.php'); +/* Path for SquirrelMail required files. */ +define('SM_PATH','../'); + +/* SquirrelMail required files. */ +require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'functions/array.php'); +require_once(SM_PATH . 'functions/imap.php'); +require_once(SM_PATH . 'functions/plugin.php'); +require_once(SM_PATH . 'functions/page_header.php'); +require_once(SM_PATH . 'functions/html.php'); /* These constants are used for folder stuff. */ define('SM_BOX_UNCOLLAPSED', 0); diff --git a/src/load_prefs.php b/src/load_prefs.php index 0e8f7a9d..965c6c11 100644 --- a/src/load_prefs.php +++ b/src/load_prefs.php @@ -12,10 +12,14 @@ * $Id$ */ -require_once('../src/validate.php'); -require_once('../functions/prefs.php'); -require_once('../functions/plugin.php'); -require_once('../functions/constants.php'); +/* Path for SquirrelMail required files. */ +define('SM_PATH','../'); + +/* SquirrelMail required files. */ +require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'functions/prefs.php'); +require_once(SM_PATH . 'functions/plugin.php'); +require_once(SM_PATH . 'functions/constants.php'); $username = ( !isset($username) ? '' : $username ); diff --git a/src/login.php b/src/login.php index dd73704f..d87f7497 100644 --- a/src/login.php +++ b/src/login.php @@ -12,13 +12,17 @@ * $Id$ */ -require_once('../functions/strings.php'); -require_once('../config/config.php'); -require_once('../functions/i18n.php'); -require_once('../functions/plugin.php'); -require_once('../functions/constants.php'); -require_once('../functions/page_header.php'); -require_once('../functions/html.php'); +/* Path for SquirrelMail required files. */ +define('SM_PATH','../'); + +/* SquirrelMail required files. */ +require_once(SM_PATH . 'functions/strings.php'); +require_once(SM_PATH . 'config/config.php'); +require_once(SM_PATH . 'functions/i18n.php'); +require_once(SM_PATH . 'functions/plugin.php'); +require_once(SM_PATH . 'functions/constants.php'); +require_once(SM_PATH . 'functions/page_header.php'); +require_once(SM_PATH . 'functions/html.php'); /* * $squirrelmail_language is set by a cookie when the user selects @@ -30,7 +34,7 @@ set_up_language($squirrelmail_language, TRUE); * Find out the base URI to set cookies. */ if (!function_exists('sqm_baseuri')){ - require_once('../functions/display_messages.php'); + require_once(SM_PATH . 'functions/display_messages.php'); } $base_uri = sqm_baseuri(); @session_destroy(); diff --git a/src/move_messages.php b/src/move_messages.php index 121a18cc..2188ef88 100644 --- a/src/move_messages.php +++ b/src/move_messages.php @@ -11,10 +11,15 @@ * $Id$ */ -require_once('../src/validate.php'); -require_once('../functions/display_messages.php'); -require_once('../functions/imap.php'); -require_once('../functions/html.php'); +/* Path for SquirrelMail required files. */ +define('SM_PATH','../'); + +/* SquirrelMail required files. */ +require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'functions/display_messages.php'); +require_once(SM_PATH . 'functions/imap.php'); +require_once(SM_PATH . 'functions/html.php'); + global $compose_new_win; function putSelectedMessagesIntoString($msg) { diff --git a/src/options.php b/src/options.php index d913187f..65fd9cdb 100644 --- a/src/options.php +++ b/src/options.php @@ -12,13 +12,17 @@ * $Id$ */ -require_once('../src/validate.php'); -require_once('../functions/display_messages.php'); -require_once('../functions/imap.php'); -require_once('../functions/array.php'); -require_once('../functions/options.php'); -require_once('../functions/strings.php'); -require_once('../functions/html.php'); +/* Path for SquirrelMail required files. */ +define('SM_PATH','../'); + +/* SquirrelMail required files. */ +require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'functions/display_messages.php'); +require_once(SM_PATH . 'functions/imap.php'); +require_once(SM_PATH . 'functions/array.php'); +require_once(SM_PATH . 'functions/options.php'); +require_once(SM_PATH . 'functions/strings.php'); +require_once(SM_PATH . 'functions/html.php'); /*********************************/ /*** Build the resultant page. ***/ diff --git a/src/options_folder.php b/src/options_folder.php index 3ee49101..f103cbc9 100644 --- a/src/options_folder.php +++ b/src/options_folder.php @@ -11,7 +11,11 @@ * $Id$ */ -require_once('../functions/imap.php'); +/* Path for SquirrelMail required files. */ +define('SM_PATH','../'); + +/* SquirrelMail required files. */ +require_once(SM_PATH . 'functions/imap.php'); /* Define the group constants for the folder options page. */ define('SMOPT_GRP_SPCFOLDER', 0); diff --git a/src/options_highlight.php b/src/options_highlight.php index 0739a1be..b429ab05 100644 --- a/src/options_highlight.php +++ b/src/options_highlight.php @@ -11,13 +11,17 @@ * $Id$ */ -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'); -require_once('../functions/strings.php'); -require_once('../functions/html.php'); +/* Path for SquirrelMail required files. */ +define('SM_PATH','../'); + +/* SquirrelMail required files. */ +require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'functions/display_messages.php'); +require_once(SM_PATH . 'functions/imap.php'); +require_once(SM_PATH . 'functions/array.php'); +require_once(SM_PATH . 'functions/plugin.php'); +require_once(SM_PATH . 'functions/strings.php'); +require_once(SM_PATH . 'functions/html.php'); function oh_opt( $val, $sel, $tit ) { echo "