Need chdir in plugins when data_dir is relative

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

diff --git a/plugins/message_details/message_details_bottom.php b/plugins/message_details/message_details_bottom.php
index 2c2eab8b7e6fe0e0b471b2371949a92f85c0de8b..11d00eca84af8bd7d02d5d513f46948df7483a4c 100644 (file)
--- a/plugins/message_details/message_details_bottom.php
+++ b/plugins/message_details/message_details_bottom.php
@@ -10,8 +10,8 @@
  * $Id$
  */
 
-#chdir ('..');
-define('SM_PATH','../../');
+chdir ('..');
+define('SM_PATH','../');
 
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');
@@ -25,15 +25,15 @@ global $color, $uid_support;
 function CalcEntity($entString, $direction) {
     $result = $entString;
     if ($direction == -1) {
-         $pos = strrpos($entString,'.');
-         $result = substr($entString,0,$pos);
+        $pos = strrpos($entString,'.');
+        $result = substr($entString,0,$pos);
     }
 
     switch ($direction) {
        case 0:
           $pos = strrpos($entString,'.');
           if ($pos === false) {
-            $entString++;
+         $entString++;
             $result= $entString;
           } 
          else {

diff --git a/plugins/message_details/message_details_main.php b/plugins/message_details/message_details_main.php
index 5d4ae41007d942eb630af6bc6bf8e2a6627616ae..1300d23e60fd49fffddb6ad543885b03ecf0b4ba 100644 (file)
--- a/plugins/message_details/message_details_main.php
+++ b/plugins/message_details/message_details_main.php
@@ -10,8 +10,8 @@
  */
 
 /* Path for SquirrelMail required files. */
-#chdir('..');
-define('SM_PATH','../../');
+chdir('..');
+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 d82e553910920ca5b1dd0d584549eb115d4eb306..c02560eb296ed3df6f660e359cd80c029c85d2cd 100644 (file)
--- a/plugins/message_details/message_details_top.php
+++ b/plugins/message_details/message_details_top.php
@@ -10,8 +10,8 @@
  * $Id$
  */
 
-#chdir ('..');
-define('SM_PATH','../../');
+chdir ('..');
+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 097cadd2f980f9b2cdc1d5f4829ad8d8af79e812..bc6dd1e0af6140c91d462b90900489f249fef5d6 100755 (executable)
--- a/plugins/spamcop/options.php
+++ b/plugins/spamcop/options.php
@@ -1,6 +1,7 @@
 <?php
 
-define('SM_PATH','../../');
+chdir('..');
+define('SM_PATH','../');
 require_once(SM_PATH . 'include/validate.php');
 
 displayPageHeader($color, "None");   

diff --git a/plugins/squirrelspell/modules/check_me.mod b/plugins/squirrelspell/modules/check_me.mod
index 313c0b523ee887ddb63e17567e9fdbd93f1084d4..370241f1621628dd66fc9c772496bae6dfb1415e 100644 (file)
--- a/plugins/squirrelspell/modules/check_me.mod
+++ b/plugins/squirrelspell/modules/check_me.mod
@@ -90,7 +90,7 @@ $sqspell_command=$SQSPELL_APP[$sqspell_use_app];
  * QUITE remote.
  */
 do {
-  $floc = SM_PATH . "$attachment_dir/" . md5($sqspell_new_text . microtime());
+  $floc = "$attachment_dir/" . md5($sqspell_new_text . microtime());
 } while (file_exists($floc));
 /**
  * Write the contents to the file.

diff --git a/plugins/squirrelspell/sqspell_interface.php b/plugins/squirrelspell/sqspell_interface.php
index 8f42804083bddbff6e06186d15028601e3f580c6..d5b15f9e259ba6c0c0d7f47ffd5d5f33e86255a0 100644 (file)
--- a/plugins/squirrelspell/sqspell_interface.php
+++ b/plugins/squirrelspell/sqspell_interface.php
@@ -29,7 +29,8 @@ $SQSPELL_CRYPTO=FALSE;
  * Load the stuff needed from squirrelmail
  */
 
-define('SM_PATH','../../');
+chdir('..');
+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 54a898f5ae16a1fa27c29e61889852fcff0d5d6d..3470d1527bf0096f21220d2292c5ae5692f4b844 100644 (file)
--- a/plugins/squirrelspell/sqspell_options.php
+++ b/plugins/squirrelspell/sqspell_options.php
@@ -23,7 +23,8 @@ $SQSPELL_CRYPTO=FALSE;
 /**
  * Load some necessary stuff from squirrelmail. 
  */
-define('SM_PATH','../../');
+chdir('..');
+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 ae55cb997c7d572b605cae7d338b0b622e35bf70..2288a4441d38f0c75e67cfab5ac70ab10b60e46c 100644 (file)
--- a/plugins/translate/options.php
+++ b/plugins/translate/options.php
@@ -12,7 +12,8 @@
  */
 
 /* Path for SquirrelMail required files. */
-define('SM_PATH','../../');
+chdir('..');
+define('SM_PATH','../');
 
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');