Putting back SM_PATH the way it should be and eliminating chdir in the

plugins.

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

diff --git a/plugins/calendar/event_create.php b/plugins/calendar/event_create.php
index f021220f69a090752d93817adcc9989cddf5e2fd..978a03017cb92a38d198e1524ae7a7df36047bc9 100644 (file)
--- a/plugins/calendar/event_create.php
+++ b/plugins/calendar/event_create.php
@@ -12,7 +12,7 @@
  *
  * $Id$
  */
-define('SM_PATH','../');
+define('SM_PATH','../../');
 
 /* Calender plugin required files. */
 require_once(SM_PATH . 'plugins/calendar/calendar_data.php');

diff --git a/plugins/calendar/event_delete.php b/plugins/calendar/event_delete.php
index e598081da1bbae6aac7443a619aeaf3b443314d0..09fe78fba27848d66dbb70f2d3427029a73c4a8a 100644 (file)
--- a/plugins/calendar/event_delete.php
+++ b/plugins/calendar/event_delete.php
@@ -12,7 +12,7 @@
  *
  * $Id$
  */
-define('SM_PATH','../');
+define('SM_PATH','../../');
 
 /* Calender plugin required files. */
 require_once(SM_PATH . 'plugins/calendar/calendar_data.php');

diff --git a/plugins/calendar/event_edit.php b/plugins/calendar/event_edit.php
index 286fc1c097cde2d917f111c25d27ad4c09d76197..098aeb6cd85969e7f6b0bb4a38f845a91763577b 100644 (file)
--- a/plugins/calendar/event_edit.php
+++ b/plugins/calendar/event_edit.php
@@ -12,7 +12,7 @@
  *
  * $Id$
  */
-define('SM_PATH','../');
+define('SM_PATH','../../');
 
 /* Calender plugin required files. */
 require_once(SM_PATH . 'plugins/calendar/calendar_data.php');

diff --git a/plugins/mail_fetch/setup.php b/plugins/mail_fetch/setup.php
index 4741605c5400fdc820af8754e79a3a00ef11d13d..1c27171951184c7d28629ee7ee9a0c503bc927d4 100644 (file)
--- a/plugins/mail_fetch/setup.php
+++ b/plugins/mail_fetch/setup.php
@@ -11,7 +11,7 @@
     **  $Id$
     **/
 
-    define('SM_PATH','../');
+    define('SM_PATH','../../');
     require_once(SM_PATH . 'plugins/mail_fetch/functions.php' );
 
     function squirrelmail_plugin_init_mail_fetch() {

diff --git a/plugins/message_details/message_details_bottom.php b/plugins/message_details/message_details_bottom.php
index 11d00eca84af8bd7d02d5d513f46948df7483a4c..1593abb3a4ace3e31294d43700a28fe20458a7b9 100644 (file)
--- a/plugins/message_details/message_details_bottom.php
+++ b/plugins/message_details/message_details_bottom.php
@@ -10,8 +10,7 @@
  * $Id$
  */
 
-chdir ('..');
-define('SM_PATH','../');
+define('SM_PATH','../../');
 
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');

diff --git a/plugins/message_details/message_details_main.php b/plugins/message_details/message_details_main.php
index 1300d23e60fd49fffddb6ad543885b03ecf0b4ba..1310ef70deadbe71be9afb4e00588c095b1ae35b 100644 (file)
--- a/plugins/message_details/message_details_main.php
+++ b/plugins/message_details/message_details_main.php
@@ -10,8 +10,7 @@
  */
 
 /* Path for SquirrelMail required files. */
-chdir('..');
-define('SM_PATH','../');
+define('SM_PATH','../../');
 
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');

diff --git a/plugins/message_details/message_details_top.php b/plugins/message_details/message_details_top.php
index c02560eb296ed3df6f660e359cd80c029c85d2cd..2f5aba78e2e346b73a91b7964df06a24d6db9a85 100644 (file)
--- a/plugins/message_details/message_details_top.php
+++ b/plugins/message_details/message_details_top.php
@@ -10,8 +10,7 @@
  * $Id$
  */
 
-chdir ('..');
-define('SM_PATH','../');
+define('SM_PATH','../../');
 
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');

diff --git a/plugins/spamcop/options.php b/plugins/spamcop/options.php
index bc6dd1e0af6140c91d462b90900489f249fef5d6..097cadd2f980f9b2cdc1d5f4829ad8d8af79e812 100755 (executable)
--- a/plugins/spamcop/options.php
+++ b/plugins/spamcop/options.php
@@ -1,7 +1,6 @@
 <?php
 
-chdir('..');
-define('SM_PATH','../');
+define('SM_PATH','../../');
 require_once(SM_PATH . 'include/validate.php');
 
 displayPageHeader($color, "None");   

diff --git a/plugins/squirrelspell/sqspell_interface.php b/plugins/squirrelspell/sqspell_interface.php
index d5b15f9e259ba6c0c0d7f47ffd5d5f33e86255a0..8f42804083bddbff6e06186d15028601e3f580c6 100644 (file)
--- a/plugins/squirrelspell/sqspell_interface.php
+++ b/plugins/squirrelspell/sqspell_interface.php
@@ -29,8 +29,7 @@ $SQSPELL_CRYPTO=FALSE;
  * Load the stuff needed from squirrelmail
  */
 
-chdir('..');
-define('SM_PATH','../');
+define('SM_PATH','../../');
 
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');

diff --git a/plugins/squirrelspell/sqspell_options.php b/plugins/squirrelspell/sqspell_options.php
index 3470d1527bf0096f21220d2292c5ae5692f4b844..54a898f5ae16a1fa27c29e61889852fcff0d5d6d 100644 (file)
--- a/plugins/squirrelspell/sqspell_options.php
+++ b/plugins/squirrelspell/sqspell_options.php
@@ -23,8 +23,7 @@ $SQSPELL_CRYPTO=FALSE;
 /**
  * Load some necessary stuff from squirrelmail. 
  */
-chdir('..');
-define('SM_PATH','../');
+define('SM_PATH','../../');
 
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');

diff --git a/plugins/translate/options.php b/plugins/translate/options.php
index 2288a4441d38f0c75e67cfab5ac70ab10b60e46c..ae55cb997c7d572b605cae7d338b0b622e35bf70 100644 (file)
--- a/plugins/translate/options.php
+++ b/plugins/translate/options.php
@@ -12,8 +12,7 @@
  */
 
 /* Path for SquirrelMail required files. */
-chdir('..');
-define('SM_PATH','../');
+define('SM_PATH','../../');
 
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');