From 08185f2a7631c3a12cb1ac085fec3be471b56b00 Mon Sep 17 00:00:00 2001 From: thomppj Date: Fri, 6 Sep 2002 01:16:40 +0000 Subject: [PATCH] A terrible pile of things done to the code. Did a little bit of SM_PATH stuff in plugins. Then I moved some files: src/validate.php -> include/validate.php src/load_prefs.php -> include/load_prefs.php src/options_personal.php -> include/options/personal.php src/options_display.php -> include/options/display.php src/options_folder.php -> include/options/folder.php Basically, the concept here is that src/ should ONLY contain files that actually get called from the web browser as a php script directly. All of these files do not really contain functions or anything (so the functions/ directory did not really make sense), but were more strictly include files. Of course, the name functions for a directory is bad organization, IMHO, anyhow. I guess class would fall in the same category. Oh well, some of that might get fixed someday. So, new rule. Only put it in src/ if it gets called directly. That was really sort of an unwritten rule before. However, since it was never really enforced or officialized, things got sloppy. I think I have everything fixed in the CORE with this traumatic moves. I am sure all of the plugins will be broken. Oh well, the error messages should be pretty loud and easy enough to fix. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3580 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/imap_mailbox.php | 4 +- {src => include}/load_prefs.php | 5 +-- .../options/display.php | 0 .../options/folder.php | 0 .../options/personal.php | 0 {src => include}/validate.php | 5 +-- plugins/abook_take/setup.php | 5 ++- plugins/abook_take/take.php | 40 ++++++++++--------- plugins/filters/filters.php | 1 - plugins/filters/options.php | 13 +++--- plugins/filters/setup.php | 8 +++- plugins/filters/spamoptions.php | 15 ++++--- src/addrbook_popup.php | 2 +- src/addrbook_search.php | 2 +- src/addrbook_search_html.php | 2 +- src/addressbook.php | 2 +- src/compose.php | 2 +- src/delete_message.php | 2 +- src/download.php | 2 +- src/draft_actions.php | 2 +- src/empty_trash.php | 2 +- src/folders.php | 2 +- src/folders_create.php | 2 +- src/folders_delete.php | 2 +- src/folders_rename_do.php | 6 +-- src/folders_rename_getname.php | 2 +- src/folders_subscribe.php | 2 +- src/help.php | 2 +- src/image.php | 4 +- src/left_main.php | 2 +- src/move_messages.php | 2 +- src/options.php | 12 +++--- src/options_highlight.php | 2 +- src/options_identities.php | 2 +- src/options_order.php | 2 +- src/printer_friendly_bottom.php | 4 +- src/printer_friendly_main.php | 2 +- src/printer_friendly_top.php | 4 +- src/read_body.php | 2 +- src/retrievalerror.php | 4 +- src/right_main.php | 2 +- src/search.php | 2 +- src/signout.php | 2 +- src/vcard.php | 4 +- src/view_header.php | 2 +- src/view_text.php | 2 +- 46 files changed, 99 insertions(+), 89 deletions(-) rename {src => include}/load_prefs.php (98%) rename src/options_display.php => include/options/display.php (100%) rename src/options_folder.php => include/options/folder.php (100%) rename src/options_personal.php => include/options/personal.php (100%) rename {src => include}/validate.php (95%) diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php index 40b281a2..538c00c1 100755 --- a/functions/imap_mailbox.php +++ b/functions/imap_mailbox.php @@ -461,7 +461,7 @@ function sqimap_mailbox_list($imap_stream) { $inbox_in_list = false; $inbox_subscribed = false; - require_once(SM_PATH . 'src/load_prefs.php'); + require_once(SM_PATH . 'include/load_prefs.php'); require_once(SM_PATH . 'functions/array.php'); if ($noselect_fix_enable) { @@ -711,7 +711,7 @@ function sqimap_mailbox_tree($imap_stream) { $inbox_in_list = false; $inbox_subscribed = false; - require_once(SM_PATH . 'src/load_prefs.php'); + require_once(SM_PATH . 'include/load_prefs.php'); require_once(SM_PATH . 'functions/array.php'); /* LSUB array */ diff --git a/src/load_prefs.php b/include/load_prefs.php similarity index 98% rename from src/load_prefs.php rename to include/load_prefs.php index 965c6c11..afc711a5 100644 --- a/src/load_prefs.php +++ b/include/load_prefs.php @@ -12,11 +12,8 @@ * $Id$ */ -/* Path for SquirrelMail required files. */ -define('SM_PATH','../'); - /* SquirrelMail required files. */ -require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'include/validate.php'); require_once(SM_PATH . 'functions/prefs.php'); require_once(SM_PATH . 'functions/plugin.php'); require_once(SM_PATH . 'functions/constants.php'); diff --git a/src/options_display.php b/include/options/display.php similarity index 100% rename from src/options_display.php rename to include/options/display.php diff --git a/src/options_folder.php b/include/options/folder.php similarity index 100% rename from src/options_folder.php rename to include/options/folder.php diff --git a/src/options_personal.php b/include/options/personal.php similarity index 100% rename from src/options_personal.php rename to include/options/personal.php diff --git a/src/validate.php b/include/validate.php similarity index 95% rename from src/validate.php rename to include/validate.php index 69e0994d..bbcd9991 100644 --- a/src/validate.php +++ b/include/validate.php @@ -13,9 +13,6 @@ * messages with a session_register. */ -/* Path for SquirrelMail required files. */ -define('SM_PATH','../'); - /* SquirrelMail required files. */ require_once(SM_PATH . 'class/mime.class.php'); @@ -82,7 +79,7 @@ unset($theme); $theme=array(); require_once(SM_PATH . 'config/config.php'); -require_once(SM_PATH . 'src/load_prefs.php'); +require_once(SM_PATH . 'include/load_prefs.php'); require_once(SM_PATH . 'functions/page_header.php'); require_once(SM_PATH . 'functions/prefs.php'); diff --git a/plugins/abook_take/setup.php b/plugins/abook_take/setup.php index 2f45a704..1130d924 100755 --- a/plugins/abook_take/setup.php +++ b/plugins/abook_take/setup.php @@ -1,7 +1,10 @@ diff --git a/src/addrbook_search.php b/src/addrbook_search.php index e6beddef..f6d63748 100644 --- a/src/addrbook_search.php +++ b/src/addrbook_search.php @@ -19,7 +19,7 @@ define('SM_PATH','../'); /* SquirrelMail required files. */ -require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'include/validate.php'); require_once(SM_PATH . 'functions/strings.php'); require_once(SM_PATH . 'functions/html.php'); diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php index 06145579..e388debd 100644 --- a/src/addrbook_search_html.php +++ b/src/addrbook_search_html.php @@ -21,7 +21,7 @@ define('SM_PATH','../'); /* SquirrelMail required files. */ -require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'include/validate.php'); require_once(SM_PATH . 'functions/date.php'); require_once(SM_PATH . 'functions/smtp.php'); require_once(SM_PATH . 'functions/display_messages.php'); diff --git a/src/addressbook.php b/src/addressbook.php index 5f2907bb..ab148752 100644 --- a/src/addressbook.php +++ b/src/addressbook.php @@ -15,7 +15,7 @@ define('SM_PATH','../'); /* SquirrelMail required files. */ -require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'include/validate.php'); require_once(SM_PATH . 'functions/array.php'); require_once(SM_PATH . 'functions/display_messages.php'); require_once(SM_PATH . 'functions/addressbook.php'); diff --git a/src/compose.php b/src/compose.php index b0b8257b..40e4cf7b 100644 --- a/src/compose.php +++ b/src/compose.php @@ -21,7 +21,7 @@ define('SM_PATH','../'); /* SquirrelMail required files. */ -require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'include/validate.php'); require_once(SM_PATH . 'functions/imap.php'); require_once(SM_PATH . 'functions/date.php'); require_once(SM_PATH . 'functions/mime.php'); diff --git a/src/delete_message.php b/src/delete_message.php index 711a665a..c0db7e36 100644 --- a/src/delete_message.php +++ b/src/delete_message.php @@ -15,7 +15,7 @@ define('SM_PATH','../'); /* SquirrelMail required files. */ -require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'include/validate.php'); require_once(SM_PATH . 'functions/display_messages.php'); require_once(SM_PATH . 'functions/imap.php'); diff --git a/src/download.php b/src/download.php index f3ec5775..574420ec 100644 --- a/src/download.php +++ b/src/download.php @@ -16,7 +16,7 @@ define('SM_PATH','../'); /* SquirrelMail required files. */ -require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'include/validate.php'); require_once(SM_PATH . 'functions/imap.php'); require_once(SM_PATH . 'functions/mime.php'); diff --git a/src/draft_actions.php b/src/draft_actions.php index b6c0afd4..3709b732 100644 --- a/src/draft_actions.php +++ b/src/draft_actions.php @@ -13,7 +13,7 @@ define('SM_PATH','../'); /* SquirrelMail required files. */ -require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'include/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 c3d79a59..5fefb858 100644 --- a/src/empty_trash.php +++ b/src/empty_trash.php @@ -16,7 +16,7 @@ define('SM_PATH','../'); /* SquirrelMail required files. */ -require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'include/validate.php'); require_once(SM_PATH . 'functions/display_messages.php'); require_once(SM_PATH . 'functions/imap.php'); require_once(SM_PATH . 'functions/array.php'); diff --git a/src/folders.php b/src/folders.php index c0106361..efc3bae7 100644 --- a/src/folders.php +++ b/src/folders.php @@ -17,7 +17,7 @@ define('SM_PATH','../'); /* SquirrelMail required files. */ -require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'include/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'); diff --git a/src/folders_create.php b/src/folders_create.php index 3a5da960..94a40dee 100644 --- a/src/folders_create.php +++ b/src/folders_create.php @@ -16,7 +16,7 @@ define('SM_PATH','../'); /* SquirrelMail required files. */ -require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'include/validate.php'); require_once(SM_PATH . 'functions/imap.php'); require_once(SM_PATH . 'functions/display_messages.php'); diff --git a/src/folders_delete.php b/src/folders_delete.php index fd501b89..42ecc12c 100644 --- a/src/folders_delete.php +++ b/src/folders_delete.php @@ -16,7 +16,7 @@ define('SM_PATH','../'); /* SquirrelMail required files. */ -require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'include/validate.php'); require_once(SM_PATH . 'functions/imap.php'); require_once(SM_PATH . 'functions/array.php'); require_once(SM_PATH . 'functions/tree.php'); diff --git a/src/folders_rename_do.php b/src/folders_rename_do.php index 2918ea58..d3191419 100644 --- a/src/folders_rename_do.php +++ b/src/folders_rename_do.php @@ -12,15 +12,15 @@ * $Id$ */ -global $delimiter, $base_uri; - /* Path for SquirrelMail required files. */ define('SM_PATH','../'); /* SquirrelMail required files. */ -require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'include/validate.php'); require_once(SM_PATH . 'functions/imap.php'); +global $delimiter, $base_uri; + $new_name = trim($new_name); if ($old_name <> $new_name) { diff --git a/src/folders_rename_getname.php b/src/folders_rename_getname.php index ab147e2b..f20f52b9 100644 --- a/src/folders_rename_getname.php +++ b/src/folders_rename_getname.php @@ -18,7 +18,7 @@ global $delimiter; define('SM_PATH','../'); /* SquirrelMail required files. */ -require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'include/validate.php'); require_once(SM_PATH . 'functions/imap.php'); require_once(SM_PATH . 'functions/html.php'); diff --git a/src/folders_subscribe.php b/src/folders_subscribe.php index f49f5623..7448164a 100644 --- a/src/folders_subscribe.php +++ b/src/folders_subscribe.php @@ -16,7 +16,7 @@ define('SM_PATH','../'); /* SquirrelMail required files. */ -require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'include/validate.php'); require_once(SM_PATH . 'functions/imap.php'); require_once(SM_PATH . 'functions/display_messages.php'); diff --git a/src/help.php b/src/help.php index e72d3bc4..e9b3c316 100644 --- a/src/help.php +++ b/src/help.php @@ -15,7 +15,7 @@ define('SM_PATH','../'); /* SquirrelMail required files. */ -require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'include/validate.php'); require_once(SM_PATH . 'functions/display_messages.php'); require_once(SM_PATH . 'functions/imap.php'); require_once(SM_PATH . 'functions/array.php'); diff --git a/src/image.php b/src/image.php index ca830b59..1778343b 100644 --- a/src/image.php +++ b/src/image.php @@ -15,11 +15,11 @@ define('SM_PATH','../'); /* SquirrelMail required files. */ -require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'include/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'); +require_once(SM_PATH . 'include/load_prefs.php'); displayPageHeader($color, 'None'); diff --git a/src/left_main.php b/src/left_main.php index 6b919058..5f221795 100644 --- a/src/left_main.php +++ b/src/left_main.php @@ -16,7 +16,7 @@ define('SM_PATH','../'); /* SquirrelMail required files. */ -require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'include/validate.php'); require_once(SM_PATH . 'functions/array.php'); require_once(SM_PATH . 'functions/imap.php'); require_once(SM_PATH . 'functions/plugin.php'); diff --git a/src/move_messages.php b/src/move_messages.php index 2188ef88..9829f0c4 100644 --- a/src/move_messages.php +++ b/src/move_messages.php @@ -15,7 +15,7 @@ define('SM_PATH','../'); /* SquirrelMail required files. */ -require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'include/validate.php'); require_once(SM_PATH . 'functions/display_messages.php'); require_once(SM_PATH . 'functions/imap.php'); require_once(SM_PATH . 'functions/html.php'); diff --git a/src/options.php b/src/options.php index 65fd9cdb..ef02ed88 100644 --- a/src/options.php +++ b/src/options.php @@ -16,7 +16,7 @@ define('SM_PATH','../'); /* SquirrelMail required files. */ -require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'include/validate.php'); require_once(SM_PATH . 'functions/display_messages.php'); require_once(SM_PATH . 'functions/imap.php'); require_once(SM_PATH . 'functions/array.php'); @@ -139,31 +139,31 @@ switch ($optpage) { case SMOPT_PAGE_MAIN: break; case SMOPT_PAGE_PERSONAL: $optpage_name = _("Personal Information"); - $optpage_file = '../src/options_personal.php'; + $optpage_file = SM_PATH . 'include/options/personal.php'; $optpage_loader = 'load_optpage_data_personal'; $optpage_loadhook = 'optpage_loadhook_personal'; break; case SMOPT_PAGE_DISPLAY: $optpage_name = _("Display Preferences"); - $optpage_file = '../src/options_display.php'; + $optpage_file = SM_PATH . 'include/options/display.php'; $optpage_loader = 'load_optpage_data_display'; $optpage_loadhook = 'optpage_loadhook_display'; break; case SMOPT_PAGE_HIGHLIGHT: $optpage_name = _("Message Highlighting"); - $optpage_file = '../src/options_highlight.php'; + $optpage_file = SM_PATH . 'include/options/highlight.php'; $optpage_loader = 'load_optpage_data_highlight'; $optpage_loadhook = 'optpage_loadhook_highlight'; break; case SMOPT_PAGE_FOLDER: $optpage_name = _("Folder Preferences"); - $optpage_file = '../src/options_folder.php'; + $optpage_file = SM_PATH . 'include/options/folder.php'; $optpage_loader = 'load_optpage_data_folder'; $optpage_loadhook = 'optpage_loadhook_folder'; break; case SMOPT_PAGE_ORDER: $optpage_name = _("Index Order"); - $optpage_file = '../src/options_order.php'; + $optpage_file = SM_PATH . 'include/options/order.php'; $optpage_loader = 'load_optpage_data_order'; $optpage_loadhook = 'optpage_loadhook_order'; break; diff --git a/src/options_highlight.php b/src/options_highlight.php index b429ab05..c6512c65 100644 --- a/src/options_highlight.php +++ b/src/options_highlight.php @@ -15,7 +15,7 @@ define('SM_PATH','../'); /* SquirrelMail required files. */ -require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'include/validate.php'); require_once(SM_PATH . 'functions/display_messages.php'); require_once(SM_PATH . 'functions/imap.php'); require_once(SM_PATH . 'functions/array.php'); diff --git a/src/options_identities.php b/src/options_identities.php index 91560c79..2bbc14da 100644 --- a/src/options_identities.php +++ b/src/options_identities.php @@ -15,7 +15,7 @@ define('SM_PATH','../'); /* SquirrelMail required files. */ -require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'include/validate.php'); require_once(SM_PATH . 'functions/display_messages.php'); require_once(SM_PATH . 'functions/html.php'); diff --git a/src/options_order.php b/src/options_order.php index cb26a745..296bbc7d 100644 --- a/src/options_order.php +++ b/src/options_order.php @@ -15,7 +15,7 @@ define('SM_PATH','../'); /* SquirrelMail required files. */ -require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'include/validate.php'); require_once(SM_PATH . 'functions/display_messages.php'); require_once(SM_PATH . 'functions/imap.php'); require_once(SM_PATH . 'functions/array.php'); diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php index bbab3b79..41c23ce2 100644 --- a/src/printer_friendly_bottom.php +++ b/src/printer_friendly_bottom.php @@ -18,10 +18,10 @@ define('SM_PATH','../'); /* SquirrelMail required files. */ -require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'include/validate.php'); require_once(SM_PATH . 'functions/strings.php'); require_once(SM_PATH . 'config/config.php'); -require_once(SM_PATH . 'src/load_prefs.php'); +require_once(SM_PATH . 'include/load_prefs.php'); require_once(SM_PATH . 'functions/imap.php'); require_once(SM_PATH . 'functions/page_header.php'); require_once(SM_PATH . 'functions/html.php'); diff --git a/src/printer_friendly_main.php b/src/printer_friendly_main.php index 29e5eb8f..58cb93ee 100644 --- a/src/printer_friendly_main.php +++ b/src/printer_friendly_main.php @@ -13,7 +13,7 @@ define('SM_PATH','../'); /* SquirrelMail required files. */ -require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'include/validate.php'); require_once(SM_PATH . 'functions/page_header.php'); displayHtmlHeader( _("Printer Friendly"), '', FALSE ); diff --git a/src/printer_friendly_top.php b/src/printer_friendly_top.php index 6fe4da1b..6b8224c0 100644 --- a/src/printer_friendly_top.php +++ b/src/printer_friendly_top.php @@ -16,10 +16,10 @@ define('SM_PATH','../'); /* SquirrelMail required files. */ -require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'include/validate.php'); require_once(SM_PATH . 'functions/strings.php'); require_once(SM_PATH . 'config/config.php'); -require_once(SM_PATH . 'src/load_prefs.php'); +require_once(SM_PATH . 'include/load_prefs.php'); require_once(SM_PATH . 'functions/page_header.php'); require_once(SM_PATH . 'functions/html.php'); diff --git a/src/read_body.php b/src/read_body.php index 102b6835..04ef5220 100644 --- a/src/read_body.php +++ b/src/read_body.php @@ -16,7 +16,7 @@ define('SM_PATH','../'); /* SquirrelMail required files. */ -require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'include/validate.php'); require_once(SM_PATH . 'functions/imap.php'); require_once(SM_PATH . 'functions/mime.php'); require_once(SM_PATH . 'functions/date.php'); diff --git a/src/retrievalerror.php b/src/retrievalerror.php index 2bfc9c86..48324cd8 100644 --- a/src/retrievalerror.php +++ b/src/retrievalerror.php @@ -18,11 +18,11 @@ define('SM_PATH','../'); /* SquirrelMail required files. */ -require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'include/validate.php'); require_once(SM_PATH . 'functions/imap.php'); require_once(SM_PATH . 'functions/smtp.php'); require_once(SM_PATH . 'functions/page_header.php'); -require_once(SM_PATH . 'src/load_prefs.php'); +require_once(SM_PATH . 'include/load_prefs.php'); $destination = 'retrievalerror@squirrelmail.org'; $attachments = array(); diff --git a/src/right_main.php b/src/right_main.php index aadcc70e..c65a4c20 100644 --- a/src/right_main.php +++ b/src/right_main.php @@ -16,7 +16,7 @@ define('SM_PATH','../'); /* SquirrelMail required files. */ -require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'include/validate.php'); require_once(SM_PATH . 'functions/imap.php'); require_once(SM_PATH . 'functions/date.php'); require_once(SM_PATH . 'functions/array.php'); diff --git a/src/search.php b/src/search.php index 01be5ff1..4b50c28c 100644 --- a/src/search.php +++ b/src/search.php @@ -13,7 +13,7 @@ define('SM_PATH','../'); /* SquirrelMail required files. */ -require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'include/validate.php'); require_once(SM_PATH . 'functions/imap.php'); require_once(SM_PATH . 'functions/imap_search.php'); require_once(SM_PATH . 'functions/imap_mailbox.php'); diff --git a/src/signout.php b/src/signout.php index 151a5d7f..ef307e9e 100644 --- a/src/signout.php +++ b/src/signout.php @@ -15,7 +15,7 @@ define('SM_PATH','../'); /* SquirrelMail required files. */ -require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'include/validate.php'); require_once(SM_PATH . 'functions/prefs.php'); require_once(SM_PATH . 'functions/plugin.php'); require_once(SM_PATH . 'functions/strings.php'); diff --git a/src/vcard.php b/src/vcard.php index 213711aa..ef0ff40e 100644 --- a/src/vcard.php +++ b/src/vcard.php @@ -15,11 +15,11 @@ define('SM_PATH','../'); /* SquirrelMail required files. */ -require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'include/validate.php'); require_once(SM_PATH . 'functions/date.php'); require_once(SM_PATH . 'functions/page_header.php'); require_once(SM_PATH . 'functions/mime.php'); -require_once(SM_PATH . 'src/load_prefs.php'); +require_once(SM_PATH . 'include/load_prefs.php'); $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); sqimap_mailbox_select($imapConnection, $mailbox); diff --git a/src/view_header.php b/src/view_header.php index 96f2e99e..8a2c111f 100644 --- a/src/view_header.php +++ b/src/view_header.php @@ -15,7 +15,7 @@ define('SM_PATH','../'); /* SquirrelMail required files. */ -require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'include/validate.php'); require_once(SM_PATH . 'functions/imap.php'); require_once(SM_PATH . 'functions/html.php'); require_once(SM_PATH . 'functions/url_parser.php'); diff --git a/src/view_text.php b/src/view_text.php index e152b438..7e856659 100644 --- a/src/view_text.php +++ b/src/view_text.php @@ -17,7 +17,7 @@ define('SM_PATH','../'); /* SquirrelMail required files. */ -require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'include/validate.php'); require_once(SM_PATH . 'functions/imap.php'); require_once(SM_PATH . 'functions/mime.php'); require_once(SM_PATH . 'functions/html.php'); -- 2.25.1