Eliminated all eveil chdir statements.

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

diff --git a/plugins/administrator/options.php b/plugins/administrator/options.php
index 9842e2459fc43f42513121ac8edd76da4572e7cd..32c7cb77849c128dbe5596ddf3fdae969343752e 100644 (file)
--- a/plugins/administrator/options.php
+++ b/plugins/administrator/options.php
@@ -132,9 +132,7 @@ function parseConfig( $cfg_file ) {
 
 /* ---------------------- main -------------------------- */
 
-chdir('..');
-chdir('..');
-define('SM_PATH','../');
+define('SM_PATH','../../');
 
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');

diff --git a/plugins/bug_report/bug_report.php b/plugins/bug_report/bug_report.php
index 36cdc7d5b595988aafbdf86fdca222a817ecfebe..2cbfe4e1bd297269654b328c16153fabf2888029 100644 (file)
--- a/plugins/bug_report/bug_report.php
+++ b/plugins/bug_report/bug_report.php
@@ -17,8 +17,7 @@
  */
 
 session_start();
-chdir('..');
-define('SM_PATH','../');
+define('SM_PATH','../../');
 
 require_once(SM_PATH . 'config/config.php');
 require_once(SM_PATH . 'functions/strings.php');

diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index a0db34881c66c02088266e5a614d8665c9bd5102..524b9dd289cea2368c25d862a97e16b7a9232f26 100644 (file)
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -12,12 +12,11 @@
  *
  * $Id$
  */
+define('SM_PATH','../../');
 
-require_once('calendar_data.php');
-require_once('functions.php');
-
-chdir('..');
-define('SM_PATH','../');
+/* Calender plugin required files. */
+require_once(SM_PATH . 'plugins/calendar/calendar_data.php');
+require_once(SM_PATH . 'plugins/calendar/functions.php');
 
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');

diff --git a/plugins/calendar/day.php b/plugins/calendar/day.php
index fc21bf3e9ed4f619f513b5f0bb757f11ea9a1d33..90bd9e3fc1eff80e424dd44a0f4380f041bb9690 100644 (file)
--- a/plugins/calendar/day.php
+++ b/plugins/calendar/day.php
@@ -11,13 +11,12 @@
  * Displays the day page (day view).
  *
  * $Id$
- */
 
-require_once('calendar_data.php');
-require_once('functions.php');
+define('SM_PATH','../../');
 
-chdir('..');
-define('SM_PATH','../');
+/* Calender plugin required files. */
+require_once(SM_PATH . 'plugins/calendar/calendar_data.php');
+require_once(SM_PATH . 'plugins/calendar/functions.php');
 
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');

diff --git a/plugins/calendar/event_create.php b/plugins/calendar/event_create.php
index 92610e0631296cd69fdb84a0c146769650f15694..f021220f69a090752d93817adcc9989cddf5e2fd 100644 (file)
--- a/plugins/calendar/event_create.php
+++ b/plugins/calendar/event_create.php
@@ -12,12 +12,12 @@
  *
  * $Id$
  */
-
-require_once('calendar_data.php');
-require_once('functions.php');
-chdir('..');
 define('SM_PATH','../');
 
+/* Calender plugin required files. */
+require_once(SM_PATH . 'plugins/calendar/calendar_data.php');
+require_once(SM_PATH . 'plugins/calendar/functions.php');
+
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');
 require_once(SM_PATH . 'functions/strings.php');

diff --git a/plugins/calendar/event_delete.php b/plugins/calendar/event_delete.php
index cd23d8d72cac3b16339f1d97c007f6937001a921..e598081da1bbae6aac7443a619aeaf3b443314d0 100644 (file)
--- a/plugins/calendar/event_delete.php
+++ b/plugins/calendar/event_delete.php
@@ -12,12 +12,12 @@
  *
  * $Id$
  */
-
-require_once('calendar_data.php');
-require_once('functions.php');
-chdir('..');
 define('SM_PATH','../');
 
+/* Calender plugin required files. */
+require_once(SM_PATH . 'plugins/calendar/calendar_data.php');
+require_once(SM_PATH . 'plugins/calendar/functions.php');
+
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');
 require_once(SM_PATH . 'functions/strings.php');

diff --git a/plugins/calendar/event_edit.php b/plugins/calendar/event_edit.php
index c40f175f7a6648e12aa99af49ec13cbd78ef3fde..286fc1c097cde2d917f111c25d27ad4c09d76197 100644 (file)
--- a/plugins/calendar/event_edit.php
+++ b/plugins/calendar/event_edit.php
@@ -12,12 +12,12 @@
  *
  * $Id$
  */
-
-require_once('calendar_data.php');
-require_once('functions.php');
-chdir('..');
 define('SM_PATH','../');
 
+/* Calender plugin required files. */
+require_once(SM_PATH . 'plugins/calendar/calendar_data.php');
+require_once(SM_PATH . 'plugins/calendar/functions.php');
+
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');
 require_once(SM_PATH . 'functions/strings.php');

diff --git a/plugins/info/options.php b/plugins/info/options.php
index 0e8ca49dcec6c270814531592cd117f8b139a16a..46b8bedb7ebdefca958e1906ed1f14776c69c105 100644 (file)
--- a/plugins/info/options.php
+++ b/plugins/info/options.php
@@ -9,8 +9,8 @@
  * Written by: Jason Munro 
  * jason@stdbev.com
  */
-chdir('..');
-define('SM_PATH','../');
+
+define('SM_PATH','../../');
 
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');

diff --git a/plugins/listcommands/mailout.php b/plugins/listcommands/mailout.php
index 21be97388cb6b83bbd5757f0cc22a32fca1c490a..bf2b51b175f5b2256d3851ca2b293d9880401f79 100644 (file)
--- a/plugins/listcommands/mailout.php
+++ b/plugins/listcommands/mailout.php
@@ -8,8 +8,7 @@
  * $Id$
  */
 
-chdir('..');
-define('SM_PATH','../');
+define('SM_PATH','../../');
 
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');

diff --git a/plugins/mail_fetch/fetch.php b/plugins/mail_fetch/fetch.php
index 85753e690e0b1b35bf3e94bb7dbd0f2fd7ef67ce..8e23b67461d7c2efe7d9cc881a1ae5bfb7f924d3 100644 (file)
--- a/plugins/mail_fetch/fetch.php
+++ b/plugins/mail_fetch/fetch.php
@@ -1,28 +1,26 @@
 <?php
 
-   /**
-    **  mail_fetch/fetch.php
-    **
-    **  Copyright (c) 1999-2002 The SquirrelMail Project Team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  Fetch code.
-    **
-    **  $Id$
-    **/
+/**
+ * mail_fetch/fetch.php
+ *
+ * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * Fetch code.
+ *
+ * $Id$
+ */
 
-    chdir('..');
-    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' );
+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) {
         echo html_tag( 'table',

diff --git a/plugins/mail_fetch/options.php b/plugins/mail_fetch/options.php
index 10c9dd3e013e702e87747fb468897faf04ca6cbf..7dd615d1eb1644909a2a3913409e12a2f7a366ea 100644 (file)
--- a/plugins/mail_fetch/options.php
+++ b/plugins/mail_fetch/options.php
@@ -1,22 +1,21 @@
 <?php
 
-   /**
-    **  mail_fetch/options.php
-    **
-    **  Copyright (c) 1999-2002 The SquirrelMail Project Team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  Setup of the mailfetch plugin.
-    **
-    **  $Id$
-    **/
+/**
+ * mail_fetch/options.php
+ *
+ * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * Setup of the mailfetch plugin.
+ *
+ * $Id$
+ */
 
-    chdir('..');
-    define('SM_PATH','../');
+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');
+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' );
 

diff --git a/plugins/message_details/message_details_bottom.php b/plugins/message_details/message_details_bottom.php
index e028ee2121ae6d9c18a18b8180c5be7bbdc982f3..6520a0963997ebee1c203ec33afe5129138ca39f 100644 (file)
--- a/plugins/message_details/message_details_bottom.php
+++ b/plugins/message_details/message_details_bottom.php
@@ -1,17 +1,16 @@
 <?php
 
 /** Message Source  
-*
-* Plugin to view the RFC822 raw message output and the bodystructure of a message
-*
-* Copyright (c) 2002 Marc Groot Koerkamp, The Netherlands
-* Licensed under the GNU GPL. For full terms see the file COPYING.
-* 
-* $Id$
-**/
+ *
+ * Plugin to view the RFC822 raw message output and the bodystructure of a message
+ *
+ * Copyright (c) 2002 Marc Groot Koerkamp, The Netherlands
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ * 
+ * $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 9e8b07e47fa0609c766caf3c51da0dd6931d29e8..1310ef70deadbe71be9afb4e00588c095b1ae35b 100644 (file)
--- a/plugins/message_details/message_details_main.php
+++ b/plugins/message_details/message_details_main.php
@@ -1,17 +1,16 @@
 <?php
 /** Message Source  
-*
-* Plugin to view the RFC822 raw message output and the bodystructure of a message
-*
-* Copyright (c) 2002 Marc Groot Koerkamp, The Netherlands
-* Licensed under the GNU GPL. For full terms see the file COPYING.
-* 
-* $Id$
-**/
-/* Path for SquirrelMail required files. */
+ *
+ * Plugin to view the RFC822 raw message output and the bodystructure of a message
+ *
+ * Copyright (c) 2002 Marc Groot Koerkamp, The Netherlands
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ * 
+ * $Id$
+ */
 
-chdir('..');
-define('SM_PATH','../');
+/* Path for SquirrelMail required files. */
+define('SM_PATH','../../');
 
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');
@@ -24,4 +23,4 @@ echo "<frameset rows=\"60, *\" noresize border=\"0\">\n";
 echo '<frame src="message_details_top.php?mailbox=' . urlencode($mailbox) .'&passed_id=' . "$passed_id". '" name="top_frame" scrolling="off">';
 echo '<frame src="message_details_bottom.php?mailbox=' . urlencode($mailbox) .'&passed_id=' . "$passed_id" . '" name="bottom_frame">';
 echo  '</frameset>'."\n"."</html>\n";
-?>
\ No newline at end of file
+?>

diff --git a/plugins/message_details/message_details_top.php b/plugins/message_details/message_details_top.php
index 0054746930355989d401351a35ad4f6489808015..2f5aba78e2e346b73a91b7964df06a24d6db9a85 100644 (file)
--- a/plugins/message_details/message_details_top.php
+++ b/plugins/message_details/message_details_top.php
@@ -1,23 +1,22 @@
 <?php
+
 /** Message Source  
-*
-* Plugin to view the RFC822 raw message output and the bodystructure of a message
-*
-* Copyright (c) 2002 Marc Groot Koerkamp, The Netherlands
-* Licensed under the GNU GPL. For full terms see the file COPYING.
-* 
-* $Id$
-**/
+ *
+ * Plugin to view the RFC822 raw message output and the bodystructure of a message
+ *
+ * Copyright (c) 2002 Marc Groot Koerkamp, The Netherlands
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ * 
+ * $Id$
+ */
 
-chdir('..');
-define('SM_PATH','../');
+define('SM_PATH','../../');
 
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');
 require_once(SM_PATH . 'functions/strings.php');
 require_once(SM_PATH . 'config/config.php');
 
-
 displayHtmlHeader( _("Message details"),
              "<script language=\"javascript\">\n".
              "<!--\n".
@@ -40,4 +39,4 @@ echo "<body text=\"$color[8]\" bgcolor=\"$color[3]\" link=\"$color[7]\" vlink=\"
      '</b>'.
      '</body>'.
      "</html>\n";
-?>
\ No newline at end of file
+?>

diff --git a/plugins/newmail/newmail.php b/plugins/newmail/newmail.php
index da04ec4fa1e8a46ac703e05d1c6a9db531518c04..59bfb2c697cd2bc89da8de0c3a621c3584adfb98 100644 (file)
--- a/plugins/newmail/newmail.php
+++ b/plugins/newmail/newmail.php
@@ -1,23 +1,22 @@
 <?php
 
-   /**
-    **  newmail.php
-    **
-    **  Copyright (c) 1999-2002 The SquirrelMail Project Team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.        
-    **
-    **  Displays all options relating to new mail sounds
-    **
-    **  $Id$
-    **    
-    **/
-   chdir('..');
-   define('SM_PATH','../');
+/**
+ * newmail.php
+ *
+ * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.        
+ *
+ * Displays all options relating to new mail sounds
+ *
+ * $Id$    
+ */
 
-    /* SquirrelMail required files. */
-   require_once(SM_PATH . 'include/validate.php');
-   require_once(SM_PATH . 'include/load_prefs.php');
-   require_once(SM_PATH . 'functions/page_header.php');
+define('SM_PATH','../../');
+
+/* SquirrelMail required files. */
+require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'include/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 b3492b31988fb0a335b12cd7861e82b4e995b084..262427626b9f478c2fe24fbbf8ec0c50fc5d602d 100644 (file)
--- a/plugins/newmail/newmail_opt.php
+++ b/plugins/newmail/newmail_opt.php
@@ -1,27 +1,25 @@
 <?php
 
-   /**
-    **  newmails_opt.php
-    **
-    **  Copyright (c) 1999-2002 The SquirrelMail Project Team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  Displays all options relating to new mail sounds
-    **
-    **  $Id$
-    **
-    **/
+/**
+ * newmails_opt.php
+ *
+ * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * Displays all options relating to new mail sounds
+ *
+ * $Id$
+ */
 
-    chdir('..');
-    define('SM_PATH','../');
+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 . 'include/load_prefs.php');
+/* 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 . 'include/load_prefs.php');
 
     displayPageHeader($color, 'None');
 

diff --git a/plugins/newmail/testsound.php b/plugins/newmail/testsound.php
index 36f3241b950c32e58e40ce0adeacdc683d88afaa..4f2331bdbcb0ddeb83e823aec62b9a9f3e6aa5a2 100644 (file)
--- a/plugins/newmail/testsound.php
+++ b/plugins/newmail/testsound.php
@@ -11,19 +11,16 @@
  * $Id$
  */
 
-   chdir('../');
-   define('SM_PATH','../');
+define('SM_PATH','../../');
 
-   /* SquirrelMail required files. */
-   require_once(SM_PATH . 'include/validate.php');
-   require_once(SM_PATH . 'functions/html.php');
+/* SquirrelMail required files. */
+require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/html.php');
 
-   if (!isset($sound)) {
-    $sound = "Click.wav";
-   }
-   $sound = str_replace('../plugins/newmail/', '', $sound);
-   $sound = str_replace('../', '', $sound);
-   $sound = str_replace("..\\", '', $sound);
+$sound = (!isset($sound) ? 'Click.wav' : $sound);
+$sound = str_replace('../plugins/newmail/', '', $sound);
+$sound = str_replace('../', '', $sound);
+$sound = str_replace("..\\", '', $sound);
 
    displayHtmlHeader( _("Test Sound"), '', FALSE );
 

diff --git a/plugins/spamcop/options.php b/plugins/spamcop/options.php
index 2ff09a61790e55d35dd3e18f70212f24560ae916..097cadd2f980f9b2cdc1d5f4829ad8d8af79e812 100755 (executable)
--- a/plugins/spamcop/options.php
+++ b/plugins/spamcop/options.php
@@ -1,29 +1,41 @@
 <?php
-   chdir ('..');
-   define('SM_PATH','../');
-   require_once(SM_PATH . 'include/validate.php');
-
-   displayPageHeader($color, "None");   
-
-   if (! isset($action))
-      $action = '';
-   if ($action == 'enable')
-      setPref($data_dir, $username, 'spamcop_enabled', 1);
-   elseif ($action == 'disable')
-      setPref($data_dir, $username, 'spamcop_enabled', '');
-   elseif ($action == 'save')
-      setPref($data_dir, $username, 'spamcop_delete', '');
-   elseif ($action == 'delete')
-      setPref($data_dir, $username, 'spamcop_delete', 1);
-   elseif ($action == 'meth' && isset($meth))
-      setPref($data_dir, $username, 'spamcop_method', $meth);
-   elseif ($action == 'save_id' && isset($ID))
-      setPref($data_dir, $username, 'spamcop_id', $ID);
-
-   global $spamcop_enabled, $spamcop_delete;
-   spamcop_load();
-
-   ?>
+
+define('SM_PATH','../../');
+require_once(SM_PATH . 'include/validate.php');
+
+displayPageHeader($color, "None");   
+
+$action = (!isset($action) ? '' : $action);
+
+switch ($action) {
+    case 'enable':
+        setPref($data_dir, $username, 'spamcop_enabled', 1);
+        break;
+    case 'disable':
+        setPref($data_dir, $username, 'spamcop_enabled', '');
+        break;
+    case 'save':
+        setPref($data_dir, $username, 'spamcop_delete', '');
+        break;
+    case 'delete':
+        setPref($data_dir, $username, 'spamcop_delete', 1);
+        break;
+    case 'meth':
+        if (isset($meth)) {
+            setPref($data_dir, $username, 'spamcop_method', $meth);
+        }
+        break;
+    case 'save_id':
+        if (isset($ID)) {
+            setPref($data_dir, $username, 'spamcop_id', $ID);
+        }
+        break;
+}
+
+global $spamcop_enabled, $spamcop_delete;
+spamcop_load();
+
+?>
       <br>
       <table width=95% align=center border=0 cellpadding=2 cellspacing=0><tr><td bgcolor="<?php echo $color[0] ?>">
          <center><b><?php echo _("Options") ?> - Message Filtering</b></center>

diff --git a/plugins/spamcop/spamcop.php b/plugins/spamcop/spamcop.php
index a48d6e32923026e490a2c9add0a00e119fee57a0..ddba3220218f955325f1c6c6f0e7d9ad9a5666c4 100644 (file)
--- a/plugins/spamcop/spamcop.php
+++ b/plugins/spamcop/spamcop.php
@@ -1,13 +1,10 @@
 <?php
 
-    chdir('..');
-    chdir('..');
-    define('SM_PATH','../');
+define('SM_PATH','../../');
 
-     /* SquirrelMail required files. */
-    require_once(SM_PATH . 'include/validate.php');
-
-    include_once(SM_PATH . 'functions/imap.php');
+ /* SquirrelMail required files. */
+require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/imap.php');
     
     displayPageHeader($color, $mailbox);
 

diff --git a/plugins/squirrelspell/sqspell_interface.php b/plugins/squirrelspell/sqspell_interface.php
index b8f4273050e91ef116a00bd9c700e2aa885e62ee..837cbf8e1e81f5d8ec82ef1d667224266b225a1f 100644 (file)
--- a/plugins/squirrelspell/sqspell_interface.php
+++ b/plugins/squirrelspell/sqspell_interface.php
@@ -2,7 +2,7 @@
 
 /**
  * sqspell_interface.php
- * ----------------------
+ *
  * Main wrapper for the pop-up.
  *
  * Copyright (c) 1999-2002 The SquirrelMail development team
@@ -22,21 +22,20 @@
  * defaults. Don't change these, * the setuppable stuff is in
  * sqspell_config.php
  */
-$SQSPELL_DIR='squirrelspell';
+$SQSPELL_DIR='plugins/squirrelspell/';
 $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');
 require_once(SM_PATH . 'include/load_prefs.php');
-require_once("$SQSPELL_DIR/sqspell_config.php");
-require_once("$SQSPELL_DIR/sqspell_functions.php");
+require_once($SQSPELL_DIR . 'sqspell_config.php');
+require_once($SQSPELL_DIR . 'sqspell_functions.php');
     
 /**
  * $MOD is the name of the module to invoke.
@@ -44,13 +43,12 @@ require_once("$SQSPELL_DIR/sqspell_functions.php");
  * breaches.
  */
 if (!isset($MOD) || !$MOD){
-  $MOD='init';
+    $MOD='init';
 } else {
-  sqspell_ckMOD($MOD);
+    sqspell_ckMOD($MOD);
 }
 
-/**
- * Include the module.
- */
-require_once("$SQSPELL_DIR/modules/$MOD.mod");
+/* Include the module. */
+require_once($SQSPELL_DIR . "modules/$MOD.mod");
+
 ?>

diff --git a/plugins/squirrelspell/sqspell_options.php b/plugins/squirrelspell/sqspell_options.php
index ce6b230ea994b1703f8e51b4ee194e8006ccaeec..dbff907361074cfee0cda72a7b2248efaa454251 100644 (file)
--- a/plugins/squirrelspell/sqspell_options.php
+++ b/plugins/squirrelspell/sqspell_options.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * sqspell_options.php 
- * --------------------
+ *
  * Main wrapper for the options interface.
  *
  * Copyright (c) 1999-2002 The SquirrelMail development team
@@ -17,23 +17,21 @@
  * Set a couple of constants and defaults. Don't change these, 
  * the configurable stuff is in sqspell_config.php
  */
-$SQSPELL_DIR='squirrelspell';
+$SQSPELL_DIR='plugins/squirrelspell/';
 $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');
-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");
-require_once("$SQSPELL_DIR/sqspell_functions.php");
+require_once($SQSPELL_DIR . 'sqspell_config.php');
+require_once($SQSPELL_DIR . 'sqspell_functions.php');
 
 /**
  * $MOD is the name of the module to invoke.
@@ -46,8 +44,7 @@ if (!isset($MOD) || !$MOD){
   sqspell_ckMOD($MOD);
 }
 
-/**
- * Load the stuff already. 
- */
-require_once("$SQSPELL_DIR/modules/$MOD.mod");
+/* Load the stuff already. */
+require_once($SQSPELL_DIR . "modules/$MOD.mod");
+
 ?>

diff --git a/plugins/translate/options.php b/plugins/translate/options.php
index 74db0b338e5d42bacc6de0ea988c98283aca623d..ae55cb997c7d572b605cae7d338b0b622e35bf70 100644 (file)
--- a/plugins/translate/options.php
+++ b/plugins/translate/options.php
@@ -1,29 +1,30 @@
 <?php
-   /**
-    * options.php
-    *
-    * Copyright (c) 1999-2002 The SquirrelMail Project Team
-    * Licensed under the GNU GPL. For full terms see the file COPYING.
-    *
-    * Pick your translator to translate the body of incoming mail messages
-    *
-    * $Id$
-    */
-
-   /* Path for SquirrelMail required files. */
-   chdir('..');
-   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');
+
+/**
+ * options.php
+ *
+ * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * Pick your translator to translate the body of incoming mail messages
+ *
+ * $Id$
+ */
+
+/* Path for SquirrelMail required files. */
+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 ) {
         if (isset($translate_translate_server)) {