Fix a bunch of plugins to cope with moved load_prefs/validate files.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3616 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/plugins/abook_take/take.php b/plugins/abook_take/take.php
index da149203d2e340797a96630a3e266df59bb3738c..62bf7dfe75cc3d6e4f0d4bd8ac867f6d1104c871 100644 (file)
--- a/plugins/abook_take/take.php
+++ b/plugins/abook_take/take.php
@@ -12,13 +12,13 @@ define('SM_PATH','../../');
 
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'config/config.php');
 
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'config/config.php');

-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 . 'functions/i18n.php');
 require_once(SM_PATH . 'functions/page_header.php');
 require_once(SM_PATH . 'functions/addressbook.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 . 'include/load_prefs.php');

 require_once(SM_PATH . 'functions/html.php');
    
 displayPageHeader($color, 'None');
 require_once(SM_PATH . 'functions/html.php');
    
 displayPageHeader($color, 'None');

diff --git a/plugins/administrator/options.php b/plugins/administrator/options.php
index ed695e0f7876679841b2435b2ff7b0a8d92bd63e..9842e2459fc43f42513121ac8edd76da4572e7cd 100644 (file)
--- a/plugins/administrator/options.php
+++ b/plugins/administrator/options.php
@@ -140,7 +140,7 @@ define('SM_PATH','../');
 require_once(SM_PATH . 'include/validate.php');
 require_once(SM_PATH . 'functions/page_header.php');
 require_once(SM_PATH . 'functions/imap.php');
 require_once(SM_PATH . 'include/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 . 'include/load_prefs.php');

 require_once(SM_PATH . 'plugins/administrator/defines.php');
 require_once(SM_PATH . 'plugins/administrator/auth.php');
 
 require_once(SM_PATH . 'plugins/administrator/defines.php');
 require_once(SM_PATH . 'plugins/administrator/auth.php');
 

diff --git a/plugins/bug_report/bug_report.php b/plugins/bug_report/bug_report.php
index c90a46771c45cce0ac9220a8a5abbd951fb4b391..36cdc7d5b595988aafbdf86fdca222a817ecfebe 100644 (file)
--- a/plugins/bug_report/bug_report.php
+++ b/plugins/bug_report/bug_report.php
@@ -16,18 +16,18 @@
  * $Id$
  */
 
  * $Id$
  */
 

-chdir('..');
-

 session_start();
 session_start();

-
-require_once('../config/config.php');
-require_once('../functions/strings.php');
-require_once('../functions/page_header.php');
-require_once('../functions/display_messages.php');
-require_once('../functions/imap.php');
-require_once('../functions/array.php');
-require_once('../functions/i18n.php');
-require_once('../src/load_prefs.php');
+chdir('..');
+define('SM_PATH','../');
+
+require_once(SM_PATH . 'config/config.php');
+require_once(SM_PATH . 'functions/strings.php');
+require_once(SM_PATH . 'functions/page_header.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/i18n.php');
+require_once(SM_PATH . 'include/load_prefs.php');

 displayPageHeader($color, 'None');
 
 
 displayPageHeader($color, 'None');
 
 

diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index 31e7ee4745278eaf62f9b283af1fb3924c180f0c..a0db34881c66c02088266e5a614d8665c9bd5102 100644 (file)
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -25,7 +25,7 @@ require_once(SM_PATH . 'functions/strings.php');
 require_once(SM_PATH . 'functions/date.php');
 require_once(SM_PATH . 'config/config.php');
 require_once(SM_PATH . 'functions/page_header.php');
 require_once(SM_PATH . 'functions/date.php');
 require_once(SM_PATH . 'config/config.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');

 require_once(SM_PATH . 'functions/html.php');
 
 //display upper part of month calendar view
 require_once(SM_PATH . 'functions/html.php');
 
 //display upper part of month calendar view

diff --git a/plugins/calendar/day.php b/plugins/calendar/day.php
index feb6489b759cbe7cf6cdda80f9a74f2228a90f8f..fc21bf3e9ed4f619f513b5f0bb757f11ea9a1d33 100644 (file)
--- a/plugins/calendar/day.php
+++ b/plugins/calendar/day.php
@@ -25,7 +25,7 @@ require_once(SM_PATH . 'functions/strings.php');
 require_once(SM_PATH . 'functions/date.php');
 require_once(SM_PATH . 'config/config.php');
 require_once(SM_PATH . 'functions/page_header.php');
 require_once(SM_PATH . 'functions/date.php');
 require_once(SM_PATH . 'config/config.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');

 require_once(SM_PATH . 'functions/html.php');
 
 //displays head of day calendar view
 require_once(SM_PATH . 'functions/html.php');
 
 //displays head of day calendar view

diff --git a/plugins/calendar/event_create.php b/plugins/calendar/event_create.php
index 968768536db21fca7a9c8a80d9b773d29e376fa0..92610e0631296cd69fdb84a0c146769650f15694 100644 (file)
--- a/plugins/calendar/event_create.php
+++ b/plugins/calendar/event_create.php
@@ -24,7 +24,7 @@ require_once(SM_PATH . 'functions/strings.php');
 require_once(SM_PATH . 'functions/date.php');
 require_once(SM_PATH . 'config/config.php');
 require_once(SM_PATH . 'functions/page_header.php');
 require_once(SM_PATH . 'functions/date.php');
 require_once(SM_PATH . 'config/config.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');

 require_once(SM_PATH . 'functions/html.php');
 
 //main form to gather event info
 require_once(SM_PATH . 'functions/html.php');
 
 //main form to gather event info

diff --git a/plugins/calendar/event_delete.php b/plugins/calendar/event_delete.php
index a9ecc725cd052c5b81f7e276bb7aadb2bee9cf74..cd23d8d72cac3b16339f1d97c007f6937001a921 100644 (file)
--- a/plugins/calendar/event_delete.php
+++ b/plugins/calendar/event_delete.php
@@ -24,7 +24,7 @@ require_once(SM_PATH . 'functions/strings.php');
 require_once(SM_PATH . 'functions/date.php');
 require_once(SM_PATH . 'config/config.php');
 require_once(SM_PATH . 'functions/page_header.php');
 require_once(SM_PATH . 'functions/date.php');
 require_once(SM_PATH . 'config/config.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');

 require_once(SM_PATH . 'functions/html.php');
 
 function confirm_deletion()
 require_once(SM_PATH . 'functions/html.php');
 
 function confirm_deletion()

diff --git a/plugins/calendar/event_edit.php b/plugins/calendar/event_edit.php
index f1ce4ce46f6a4f23a3378dc903ac4569a78e885a..c40f175f7a6648e12aa99af49ec13cbd78ef3fde 100644 (file)
--- a/plugins/calendar/event_edit.php
+++ b/plugins/calendar/event_edit.php
@@ -24,7 +24,7 @@ require_once(SM_PATH . 'functions/strings.php');
 require_once(SM_PATH . 'functions/date.php');
 require_once(SM_PATH . 'config/config.php');
 require_once(SM_PATH . 'functions/page_header.php');
 require_once(SM_PATH . 'functions/date.php');
 require_once(SM_PATH . 'config/config.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');

 require_once(SM_PATH . 'functions/html.php');
 
 // update event info
 require_once(SM_PATH . 'functions/html.php');
 
 // update event info

diff --git a/plugins/listcommands/mailout.php b/plugins/listcommands/mailout.php
index 6a2ef1377ae7bba3299f108eb00125802b195ab2..21be97388cb6b83bbd5757f0cc22a32fca1c490a 100644 (file)
--- a/plugins/listcommands/mailout.php
+++ b/plugins/listcommands/mailout.php
@@ -14,7 +14,7 @@ define('SM_PATH','../');
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');
 include_once(SM_PATH . 'functions/page_header.php');
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');
 include_once(SM_PATH . 'functions/page_header.php');

-include_once(SM_PATH . 'src/load_prefs.php');
+include_once(SM_PATH . 'include/load_prefs.php');

 include_once(SM_PATH . 'functions/html.php');
 
 displayPageHeader($color, $mailbox);
 include_once(SM_PATH . 'functions/html.php');
 
 displayPageHeader($color, $mailbox);

diff --git a/plugins/mail_fetch/fetch.php b/plugins/mail_fetch/fetch.php
index 8e0ffd89d1188ab0e1535ac662f08bae318c0dbd..85753e690e0b1b35bf3e94bb7dbd0f2fd7ef67ce 100644 (file)
--- a/plugins/mail_fetch/fetch.php
+++ b/plugins/mail_fetch/fetch.php
@@ -12,14 +12,16 @@
     **/
 
     chdir('..');
     **/
 
     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('../plugins/mail_fetch/class.POP3.php');
-    require_once('../functions/i18n.php');
-    require_once( '../plugins/mail_fetch/functions.php' );
-    require_once( '../functions/html.php' );
+    define('SM_PATH','../');
+
+    require_once(SM_PATH . 'include/validate.php');
+    require_once(SM_PATH . 'functions/page_header.php');
+    require_once(SM_PATH . 'functions/imap.php');
+    require_once(SM_PATH . 'include/load_prefs.php');
+    require_once(SM_PATH . 'plugins/mail_fetch/class.POP3.php');
+    require_once(SM_PATH . 'functions/i18n.php');
+    require_once(SM_PATH . 'plugins/mail_fetch/functions.php' );
+    require_once(SM_PATH . 'functions/html.php' );

 
 
     function Mail_Fetch_Status($msg) {
 
 
     function Mail_Fetch_Status($msg) {

diff --git a/plugins/mail_fetch/options.php b/plugins/mail_fetch/options.php
index bcf103ec5d32d57835f9a00c6053df8f9537f8bb..10c9dd3e013e702e87747fb468897faf04ca6cbf 100644 (file)
--- a/plugins/mail_fetch/options.php
+++ b/plugins/mail_fetch/options.php
@@ -12,9 +12,11 @@
     **/
 
     chdir('..');
     **/
 
     chdir('..');

-    require_once('../src/validate.php');
-    require_once('../functions/imap.php');
-    require_once('../src/load_prefs.php');
+    define('SM_PATH','../');
+
+    require_once(SM_PATH . 'include/validate.php');
+    require_once(SM_PATH . 'functions/imap.php');
+    require_once(SM_PATH . 'include/load_prefs.php');

 
     displayPageHeader( $color, 'None' );
 
 
     displayPageHeader( $color, 'None' );
 

diff --git a/plugins/mail_fetch/setup.php b/plugins/mail_fetch/setup.php
index 27c4b53b733c02f5c34c615a85bb37a04f749b81..4741605c5400fdc820af8754e79a3a00ef11d13d 100644 (file)
--- a/plugins/mail_fetch/setup.php
+++ b/plugins/mail_fetch/setup.php
@@ -11,7 +11,8 @@
     **  $Id$
     **/
 
     **  $Id$
     **/
 

-    require_once( '../plugins/mail_fetch/functions.php' );
+    define('SM_PATH','../');
+    require_once(SM_PATH . 'plugins/mail_fetch/functions.php' );

 
     function squirrelmail_plugin_init_mail_fetch() {
         global $squirrelmail_plugin_hooks;
 
     function squirrelmail_plugin_init_mail_fetch() {
         global $squirrelmail_plugin_hooks;


@@ -205,9 +206,7 @@
     function mail_fetch_setnew()    {
 
         global $data_dir,$username;
     function mail_fetch_setnew()    {
 
         global $data_dir,$username;

-        // require_once ('../src/load_prefs.php');
-        // require_once ('../src/validate.php');
-        require_once('../functions/prefs.php');
+        require_once(SM_PATH . 'functions/prefs.php');

 
         if( $username <> '' ) {
             // Creates the pref file if it does not exist.
 
         if( $username <> '' ) {
             // Creates the pref file if it does not exist.

diff --git a/plugins/newmail/newmail.php b/plugins/newmail/newmail.php
index 7e919cb978110be1828dd853a02e967a10496ba4..da04ec4fa1e8a46ac703e05d1c6a9db531518c04 100644 (file)
--- a/plugins/newmail/newmail.php
+++ b/plugins/newmail/newmail.php
@@ -16,7 +16,7 @@
 
     /* SquirrelMail required files. */
    require_once(SM_PATH . 'include/validate.php');
 
     /* SquirrelMail required files. */
    require_once(SM_PATH . 'include/validate.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');
 
    displayHtmlHeader( _("New Mail"), '', FALSE );
    require_once(SM_PATH . 'functions/page_header.php');
 
    displayHtmlHeader( _("New Mail"), '', FALSE );

diff --git a/plugins/newmail/newmail_opt.php b/plugins/newmail/newmail_opt.php
index 87426a49a328e7d65355c51f7f66ab8ae9d12e78..b3492b31988fb0a335b12cd7861e82b4e995b084 100644 (file)
--- a/plugins/newmail/newmail_opt.php
+++ b/plugins/newmail/newmail_opt.php
@@ -21,7 +21,7 @@
     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/display_messages.php');
     require_once(SM_PATH . 'functions/imap.php');
     require_once(SM_PATH . 'functions/array.php');

-    require_once(SM_PATH . 'src/load_prefs.php');
+    require_once(SM_PATH . 'include/load_prefs.php');

 
     displayPageHeader($color, 'None');
 
 
     displayPageHeader($color, 'None');
 

diff --git a/plugins/newmail/testsound.php b/plugins/newmail/testsound.php
index 0d3f4f7ba27845247e45ca815e76dffc8a5513b1..36f3241b950c32e58e40ce0adeacdc683d88afaa 100644 (file)
--- a/plugins/newmail/testsound.php
+++ b/plugins/newmail/testsound.php
@@ -17,7 +17,6 @@
    /* SquirrelMail required files. */
    require_once(SM_PATH . 'include/validate.php');
    require_once(SM_PATH . 'functions/html.php');
    /* SquirrelMail required files. */
    require_once(SM_PATH . 'include/validate.php');
    require_once(SM_PATH . 'functions/html.php');

-   require_once(SM_PATH . 'src/load_prefs.php');

 
    if (!isset($sound)) {
     $sound = "Click.wav";
 
    if (!isset($sound)) {
     $sound = "Click.wav";

diff --git a/plugins/spamcop/options.php b/plugins/spamcop/options.php
index 13140bf637f4cf143de31e7194444cb412967f3e..2ff09a61790e55d35dd3e18f70212f24560ae916 100755 (executable)
--- a/plugins/spamcop/options.php
+++ b/plugins/spamcop/options.php
@@ -1,6 +1,7 @@
 <?php
 <?php

-   chdir ("..");
-   require_once('../src/validate.php');
+   chdir ('..');
+   define('SM_PATH','../');
+   require_once(SM_PATH . 'include/validate.php');

 
    displayPageHeader($color, "None");   
 
 
    displayPageHeader($color, "None");   
 

diff --git a/plugins/squirrelspell/sqspell_interface.php b/plugins/squirrelspell/sqspell_interface.php
index 797a06d2c374872bcfdd42a8e9268bdd3dd63a82..b8f4273050e91ef116a00bd9c700e2aa885e62ee 100644 (file)
--- a/plugins/squirrelspell/sqspell_interface.php
+++ b/plugins/squirrelspell/sqspell_interface.php
@@ -34,7 +34,7 @@ define('SM_PATH','../');
 
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');
 
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');

-require_once(SM_PATH . 'src/load_prefs.php');
+require_once(SM_PATH . 'include/load_prefs.php');

 require_once("$SQSPELL_DIR/sqspell_config.php");
 require_once("$SQSPELL_DIR/sqspell_functions.php");
     
 require_once("$SQSPELL_DIR/sqspell_config.php");
 require_once("$SQSPELL_DIR/sqspell_functions.php");
     

diff --git a/plugins/squirrelspell/sqspell_options.php b/plugins/squirrelspell/sqspell_options.php
index cc1013c31056962374e2ba823dfecb81a6906ed4..ce6b230ea994b1703f8e51b4ee194e8006ccaeec 100644 (file)
--- a/plugins/squirrelspell/sqspell_options.php
+++ b/plugins/squirrelspell/sqspell_options.php
@@ -28,8 +28,8 @@ define('SM_PATH','../');
 
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');
 
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');

-require_once(SM_PATH . 'src/validate.php');
-require_once(SM_PATH . 'src/load_prefs.php');
+require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'include/load_prefs.php');

 require_once(SM_PATH . 'functions/strings.php');
 require_once(SM_PATH . 'functions/page_header.php');
 require_once("$SQSPELL_DIR/sqspell_config.php");
 require_once(SM_PATH . 'functions/strings.php');
 require_once(SM_PATH . 'functions/page_header.php');
 require_once("$SQSPELL_DIR/sqspell_config.php");

diff --git a/plugins/translate/options.php b/plugins/translate/options.php
index c839f99aaae8ae4000c1cad42c20cd0eb504e477..74db0b338e5d42bacc6de0ea988c98283aca623d 100644 (file)
--- a/plugins/translate/options.php
+++ b/plugins/translate/options.php
@@ -10,15 +10,19 @@
     * $Id$
     */
 
     * $Id$
     */
 

+   /* Path for SquirrelMail required files. */

    chdir('..');
    chdir('..');

-   require_once('../src/validate.php');
-   require_once('../functions/strings.php');
-   require_once('../functions/page_header.php');
-   require_once('../functions/display_messages.php');
-   require_once('../functions/imap.php');
-   require_once('../functions/array.php');
-   require_once('../functions/i18n.php');
-   require_once('../src/load_prefs.php');
+   define('SM_PATH','../');
+
+   /* SquirrelMail required files. */
+   require_once(SM_PATH . 'include/validate.php');
+   require_once(SM_PATH . 'functions/strings.php');
+   require_once(SM_PATH . 'functions/page_header.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/i18n.php');
+   require_once(SM_PATH . 'include/load_prefs.php');

    displayPageHeader($color, 'None');
 
     if (isset($submit_translate) && $submit_translate ) {
    displayPageHeader($color, 'None');
 
     if (isset($submit_translate) && $submit_translate ) {