SMPATH BORKED everything

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

diff --git a/plugins/newmail/newmail.php b/plugins/newmail/newmail.php
index 5640779090ca8baed433472c3b4d8c49ec1e011a..7e919cb978110be1828dd853a02e967a10496ba4 100644 (file)
--- a/plugins/newmail/newmail.php
+++ b/plugins/newmail/newmail.php
@@ -11,11 +11,13 @@
     **  $Id$
     **    
     **/
-    
-   chdir ('../');
-   require_once('../src/validate.php');
-   require_once('../src/load_prefs.php');
-   require_once('../functions/page_header.php');
+   chdir('..');
+   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 . 'functions/page_header.php');
 
    displayHtmlHeader( _("New Mail"), '', FALSE );
 

diff --git a/plugins/newmail/newmail_opt.php b/plugins/newmail/newmail_opt.php
index 0f3c701be621b34a7b016d23419a7d8d0ebe4239..87426a49a328e7d65355c51f7f66ab8ae9d12e78 100644 (file)
--- a/plugins/newmail/newmail_opt.php
+++ b/plugins/newmail/newmail_opt.php
@@ -12,13 +12,16 @@
     **
     **/
 
-    chdir("..");
-    require_once('../src/validate.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('../src/load_prefs.php');
+    chdir('..');
+    define('SM_PATH','../');
+
+    /* SquirrelMail required files. */
+    require_once(SM_PATH . 'include/validate.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 . 'src/load_prefs.php');
 
     displayPageHeader($color, 'None');
 

diff --git a/plugins/newmail/testsound.php b/plugins/newmail/testsound.php
index 0bcb4a7264e913d1c25c736dad85f3f96bf7729e..f8ddde9d432fe4ef40a9d08b00e93601992a3197 100644 (file)
--- a/plugins/newmail/testsound.php
+++ b/plugins/newmail/testsound.php
@@ -12,9 +12,14 @@
  */
 
    chdir ("../");
-   require_once('../src/validate.php');
-   require_once('../functions/html.php');
-   require_once("../src/load_prefs.php");
+   chdir('..');
+   define('SM_PATH','../');
+
+   /* 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";
    }