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

diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index 40b281a2f10ac11e0aaa1eb7063a5f0c4d853ad9..538c00c1839de0f78a2ef0d9565ed7f12a4cf1e1 100755 (executable)
--- 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 965c6c11fcfadc1c298511660bb9eca1d530ec76..afc711a5e5d907303dfbec017cc36043fc25cf38 100644 (file)
--- 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 69e0994df376ba7c71462876861c0efe2188669f..bbcd99919f8d84ef33cae9a7cfe386cd68a096a4 100644 (file)
--- 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 2f45a70470b0225001cc47897b65eaa0a0043a37..1130d9241e39649c81bca9203783eb5a4fa043c0 100755 (executable)
--- a/plugins/abook_take/setup.php
+++ b/plugins/abook_take/setup.php
@@ -1,7 +1,10 @@
 <?php
 
-   require_once('../functions/url_parser.php');
+/* Path for SquirrelMail required files. */
+define('SM_PATH','../../');
 
+/* SquirrelMail required files. */
+require_once(SM_PATH . 'functions/url_parser.php');
 
 /* Address Take -- steals addresses from incoming email messages.  Searches
    the To, Cc, From and Reply-To headers, also searches the body of the

diff --git a/plugins/abook_take/take.php b/plugins/abook_take/take.php
index 8415731260761e559fcd518626ec60046216828d..da149203d2e340797a96630a3e266df59bb3738c 100644 (file)
--- a/plugins/abook_take/take.php
+++ b/plugins/abook_take/take.php
@@ -1,25 +1,29 @@
 <?php
+
   /**
-   **  take.php
-   **  
-   **  Adds a "taken" address to the address book.  Takes addresses from
-   **   incoming mail -- the body, To, From, Cc, or Reply-To.
-   **/
-   
-   chdir('..');
-   require_once('../src/validate.php');
-   require_once("../functions/strings.php");
-   require_once("../config/config.php");
-   require_once("../functions/i18n.php");
-   require_once("../functions/page_header.php");
-   require_once("../functions/addressbook.php");
-   require_once("../src/load_prefs.php");
-   require_once('../functions/html.php');
+   * take.php
+   *
+   * Adds a "taken" address to the address book.  Takes addresses from
+   * incoming mail -- the body, To, From, Cc, or Reply-To.
+   */
    
-   displayPageHeader($color, "None");
-   
-   $abook_take_verify = getPref($data_dir, $username, 'abook_take_verify');
+/* Path for SquirrelMail required files. */
+define('SM_PATH','../../');
 
+/* SquirrelMail required files. */
+require_once(SM_PATH . 'config/config.php');
+require_once(SM_PATH . 'src/validate.php');
+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/page_header.php');
+require_once(SM_PATH . 'functions/addressbook.php');
+require_once(SM_PATH . 'src/load_prefs.php');
+require_once(SM_PATH . 'functions/html.php');
+   
+displayPageHeader($color, 'None');
+  
+$abook_take_verify = getPref($data_dir, $username, 'abook_take_verify');
 
 $abook = addressbook_init(false, true);
 $name = 'addaddr';

diff --git a/plugins/filters/filters.php b/plugins/filters/filters.php
index 381c7b97301794c59ccbeb78c883d46d932c2314..4d88d6f7510d979be53537ca79b785daa57f06f6 100644 (file)
--- a/plugins/filters/filters.php
+++ b/plugins/filters/filters.php
@@ -25,7 +25,6 @@
  * $Id$
  */
 
-
 function filters_SaveCache () {
     global $data_dir, $SpamFilters_DNScache;
 

diff --git a/plugins/filters/options.php b/plugins/filters/options.php
index 6e8531668904b582e83e7ba98e322c2439546bbe..5785f7086d259678d9bb25f99ca81cec06aa4175 100644 (file)
--- a/plugins/filters/options.php
+++ b/plugins/filters/options.php
@@ -25,11 +25,14 @@
  * $Id$
  */
 
-   chdir ('..');
-   require_once('../src/validate.php');
-   require_once('../functions/page_header.php');
-   require_once('../functions/imap.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/page_header.php');
+require_once(SM_PATH . 'functions/imap.php');
+require_once(SM_PATH . 'src/load_prefs.php');
 
    global $AllowSpamFilters;
 

diff --git a/plugins/filters/setup.php b/plugins/filters/setup.php
index 320c947f18203d7705cccd6c65dc999e781096e2..1522a1a7f2a7a14b806713b5ff446ef98eef8a1a 100644 (file)
--- a/plugins/filters/setup.php
+++ b/plugins/filters/setup.php
@@ -24,6 +24,12 @@
  * $Id$
  */
 
+/* Path for SquirrelMail required files. */
+define('SM_PATH','../../');
+
+/* SquirrelMail required files. */
+require_once(SM_PATH . 'plugins/filters/filters.php');
+
 /*
  * Set this to true if you have problems -- check the README file
  * Note:  This doesn't work all of the time (No idea why)
@@ -97,8 +103,6 @@ $SpamFilters_SharedCache = true;
 global $SpamFilters_CacheTTL;
 $SpamFilters_CacheTTL = 7200;
 
-require_once ('../plugins/filters/filters.php');
-
 function squirrelmail_plugin_init_filters() {
     global $squirrelmail_plugin_hooks;
     global $mailbox, $imap_stream, $imapConnection;

diff --git a/plugins/filters/spamoptions.php b/plugins/filters/spamoptions.php
index 40e8326fda4df48df9abac9f84c90c25ab5626eb..4e0832defc5e74ae1689a4c43f49cc2c697ad347 100644 (file)
--- a/plugins/filters/spamoptions.php
+++ b/plugins/filters/spamoptions.php
@@ -24,12 +24,15 @@
  * $Id$
  */
 
-chdir ('..');
-require_once('../src/validate.php');
-require_once('../functions/page_header.php');
-require_once('../functions/imap.php');
-require_once('../src/load_prefs.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/page_header.php');
+require_once(SM_PATH . 'functions/imap.php');
+require_once(SM_PATH . 'src/load_prefs.php');
+require_once(SM_PATH . 'functions/html.php');
 
 global $AllowSpamFilters;
 

diff --git a/src/addrbook_popup.php b/src/addrbook_popup.php
index c45976272589b13a675b5052af320fd8a5484fff..99abf0255236c6667c50b66868673f9eabdece17 100644 (file)
--- a/src/addrbook_popup.php
+++ b/src/addrbook_popup.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/addressbook.php');
    
 ?>

diff --git a/src/addrbook_search.php b/src/addrbook_search.php
index e6beddef3e6369fa9f13a71f77946816a8296696..f6d637486f76bcf4299bc2378aaae4629149fcde 100644 (file)
--- 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 0614557903b4652feebd32af7cd67fcd626852ef..e388debd4972c42813bfe39720b81f088005d365 100644 (file)
--- 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 5f2907bbcd8a678c9c8adaa9ab90282c6d4bd66a..ab148752457edb1dc1877e9c2c16444be75b8e83 100644 (file)
--- 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 b0b8257b7795ab6ad1c0dc5c0d5c90ee08e165c2..40e4cf7b9cc9fbdab871bba87bad1ae99c7a2371 100644 (file)
--- 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 711a665a3256427b627c15ea7b7eaf6d0d027ee2..c0db7e3619ee9325f88d2e8d4b0cfc25295192c1 100644 (file)
--- 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 f3ec5775088afd33780acad9f0eb5a01256abfbe..574420ec16baa09bd44c3fe5b1f18bc51ca8341e 100644 (file)
--- 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 b6c0afd4b24e8df89db4eb390159bda0502dc72e..3709b7327c0efbe2f140ea99533dbd21c0751360 100644 (file)
--- 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 c3d79a59da529631cee1ce2d324c490e7fdeba70..5fefb858a3a5d07b39b28e28793bc9c0578b3239 100644 (file)
--- 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 c01063617d000f655c541f1783684037d0b81794..efc3bae7f07b607d3d6cc38013a822fa71613639 100644 (file)
--- 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 3a5da96008baa2117b71f097e977870a3c21499b..94a40dee2620a6719ba92c1d54e1bf2ecba9ef41 100644 (file)
--- 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 fd501b89e6a899cfd325bc9bceda5e096a54ef17..42ecc12cdccd51aae36b541fbaabd1803d338e5f 100644 (file)
--- 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 2918ea58f4017f8df8d03346aac727696dc5c319..d3191419f82e4cfd1241e12eac820d4389b731f1 100644 (file)
--- 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 ab147e2b4832c9cf9bac51bc46f0c847a8df95a0..f20f52b9e0c08a8c66901d390feb88f838a59f0f 100644 (file)
--- 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 f49f56234cac1648b8c55fc51669aac13f3bf63f..7448164a29aa7d0d6b78fbd4217d1ec1e0c2423c 100644 (file)
--- 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 e72d3bc42e571f9e509a2dbbbb15273e9282499f..e9b3c3167ba6cf5034eb859f8e479c12f5b2be59 100644 (file)
--- 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 ca830b59422dae480e4488d6494b219264a2bdc3..1778343bf2dbcaf3292e14668cadaf17ece466ef 100644 (file)
--- 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 6b9190589d984dc7851e956cb53f0c6eb571f816..5f2217959bb55645dd3bf933ba67621d72dd9900 100644 (file)
--- 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 2188ef88447ec9d3aba3a79027b4f1db619df39a..9829f0c4e8ededc4648c8b51ce672e132f88a94c 100644 (file)
--- 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 65fd9cdb65b71107dd31e7a1e0262995910e86a4..ef02ed880d83d3ca6ec4e830511630671e76bb7e 100644 (file)
--- 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 b429ab0573c93d51486ae2ec614484c82bd5f0b5..c6512c65a6fd3aa16f1db1bf8ecaf82a2457df8c 100644 (file)
--- 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 91560c79e45e2f01e2898caf1292b1acac6452a8..2bbc14da0414f0a8bf7d0cc477d88f70bfe3896e 100644 (file)
--- 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 cb26a7452a8b2dd3d65bca9806879032d554a1d6..296bbc7d5610f1ba2becf958606a673927982fde 100644 (file)
--- 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 bbab3b79e31c6d5c0881bb0c9085a5aaf16afc48..41c23ce250a1a33a906ec7c27e0c19538c6d3107 100644 (file)
--- 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 29e5eb8fb8bc8d6245dacdb0501caf03da95ee74..58cb93ee00e607a19b43a5d9f291e5423a2c88d1 100644 (file)
--- 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 6fe4da1be5dfb5429d76a9a7ca6d6a2315c465e3..6b8224c04bb21450760d5f171112c59b108ef128 100644 (file)
--- 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 102b683532ab00996124c5652e6a46070ed5399c..04ef522087b3ab77b7c34ab11ab18814a397792b 100644 (file)
--- 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 2bfc9c865fa03390cc017799e9f4d9107d91e1eb..48324cd83151718b9713ca5e60a06dd94c587f1a 100644 (file)
--- 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 aadcc70e8f12f7eae553240e0baf6122c22de7e7..c65a4c206e55fe6957b64bdb29acf7567014e40c 100644 (file)
--- 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 01be5ff14f02b923fbb5c3f9e03be66adfb7d239..4b50c28cb8aaee73fbfb14bb6cd365931a879c3b 100644 (file)
--- 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 151a5d7f0aeab5781defb59fa331abfe159abc5e..ef307e9e9139f551240bc0bbf23148721f89ac08 100644 (file)
--- 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 213711aa7bfca7ff8edbe63e23dc4135bd07abcd..ef0ff40e1e4d0d0dd31cc32f1c7682365adf590f 100644 (file)
--- 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 96f2e99efb992d2b12fc95eb2a6d829b099abe28..8a2c111f1584288a1bc81b105df8e98df2598108 100644 (file)
--- 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 e152b438c8ddd8323f0956ee543e40adaac69fa7..7e856659dd3b0338e1d754cf14de29db40534338 100644 (file)
--- 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');