Eliminated all eveil chdir statements.

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');

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');

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');

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');

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');

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');

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');

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');

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');

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',

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' );
 

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');

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";
-?>
+?>

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";
-?>
+?>

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 );
 

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');
 

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 );
 

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>

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);
 

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");
+
 ?>

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");
+
 ?>

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)) {