From 5c325683cbdd9f91a91ed24078b2ffd1a0bc90ce Mon Sep 17 00:00:00 2001
From: indiri69 <indiri69@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Thu, 12 Sep 2002 18:47:06 +0000
Subject: [PATCH] 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
---
 plugins/message_details/message_details_bottom.php | 10 +++++-----
 plugins/message_details/message_details_main.php   |  4 ++--
 plugins/message_details/message_details_top.php    |  4 ++--
 plugins/spamcop/options.php                        |  3 ++-
 plugins/squirrelspell/modules/check_me.mod         |  2 +-
 plugins/squirrelspell/sqspell_interface.php        |  3 ++-
 plugins/squirrelspell/sqspell_options.php          |  3 ++-
 plugins/translate/options.php                      |  3 ++-
 8 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/plugins/message_details/message_details_bottom.php b/plugins/message_details/message_details_bottom.php
index 2c2eab8b..11d00eca 100644
--- 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 5d4ae410..1300d23e 100644
--- 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 d82e5539..c02560eb 100644
--- 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 097cadd2..bc6dd1e0 100755
--- 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 313c0b52..370241f1 100644
--- 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 8f428040..d5b15f9e 100644
--- 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 54a898f5..3470d152 100644
--- 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 ae55cb99..2288a444 100644
--- 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');
-- 
2.25.1