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

plugins/abook_take/take.php

@@ -12,13 +12,13 @@ define('SM_PATH','../../');
 
 /* 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 . 'src/load_prefs.php');
+require_once(SM_PATH . 'include/load_prefs.php');
 require_once(SM_PATH . 'functions/html.php');
    
 displayPageHeader($color, 'None');

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 . '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');
 

plugins/bug_report/bug_report.php

@@ -16,18 +16,18 @@
  * $Id$
  */
 
-chdir('..');
-
 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');
 
 

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 . '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

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 . '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

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 . '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

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 . 'src/load_prefs.php');
+require_once(SM_PATH . 'include/load_prefs.php');
 require_once(SM_PATH . 'functions/html.php');
 
 function confirm_deletion()

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 . 'src/load_prefs.php');
+require_once(SM_PATH . 'include/load_prefs.php');
 require_once(SM_PATH . 'functions/html.php');
 
 // update event info

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');
-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);

plugins/mail_fetch/fetch.php

@@ -12,14 +12,16 @@
     **/
 
     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) {

plugins/mail_fetch/options.php

@@ -12,9 +12,11 @@
     **/
 
     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' );
 

plugins/mail_fetch/setup.php

@@ -11,7 +11,8 @@
     **  $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;
@@ -205,9 +206,7 @@
     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.

plugins/newmail/newmail.php

@@ -16,7 +16,7 @@
 
     /* 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 );

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 . 'src/load_prefs.php');
+    require_once(SM_PATH . 'include/load_prefs.php');
 
     displayPageHeader($color, 'None');
 

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');
-   require_once(SM_PATH . 'src/load_prefs.php');
 
    if (!isset($sound)) {
     $sound = "Click.wav";

plugins/spamcop/options.php

@@ -1,6 +1,7 @@
 <?php
-   chdir ("..");
-   require_once('../src/validate.php');
+   chdir ('..');
+   define('SM_PATH','../');
+   require_once(SM_PATH . 'include/validate.php');
 
    displayPageHeader($color, "None");   
 

plugins/squirrelspell/sqspell_interface.php

@@ -34,7 +34,7 @@ define('SM_PATH','../');
 
 /* 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");
     

plugins/squirrelspell/sqspell_options.php

@@ -28,8 +28,8 @@ define('SM_PATH','../');
 
 /* 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");

plugins/translate/options.php

@@ -10,15 +10,19 @@
     * $Id$
     */
 
+   /* Path for SquirrelMail required files. */
    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 ) {