Some code cleanups to read_body.php

[squirrelmail.git] / plugins / mail_fetch / setup.php

diff --git a/plugins/mail_fetch/setup.php b/plugins/mail_fetch/setup.php
index ceb739088d462c0952d228a79de18297b329407b..4741605c5400fdc820af8754e79a3a00ef11d13d 100644 (file)
--- a/plugins/mail_fetch/setup.php
+++ b/plugins/mail_fetch/setup.php
@@ -3,7 +3,7 @@
    /**
     **  mail_fetch/setup.php
     **
-    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
+    **  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.
@@ -11,7 +11,8 @@
     **  $Id$
     **/
 
-    require_once( '../plugins/mail_fetch/functions.php' );
+    define('SM_PATH','../');
+    require_once(SM_PATH . 'plugins/mail_fetch/functions.php' );
 
     function squirrelmail_plugin_init_mail_fetch() {
         global $squirrelmail_plugin_hooks;
@@ -61,11 +62,11 @@
 
     function mail_fetch_login() {
 
-        require_once ('../src/validate.php');
+        require_once ('../include/validate.php');
         require_once ('../functions/imap.php');
         require_once ('../plugins/mail_fetch/class.POP3.php');
         require_once ('../plugins/mail_fetch/functions.php');
-        require_once('../functions/i18n.php');
+        require_once ('../functions/i18n.php');
 
         global $username, $data_dir, $key,$imapServerAddress,$imapPort;
 
@@ -205,13 +206,10 @@
     function mail_fetch_setnew()    {
 
         global $data_dir,$username;
-        // require_once ('../src/load_prefs.php');
-        // require_once ('../src/validate.php');
-        require_once('../functions/prefs.php');
+        require_once(SM_PATH . 'functions/prefs.php');
 
         if( $username <> '' ) {
             // Creates the pref file if it does not exist.
-        checkForPrefs( $data_dir, $username );
             setPref( $data_dir, $username, 'mailfetch_newlog', 'on' );
         }
 
@@ -228,4 +226,4 @@
       );
    }
 
-?>
\ No newline at end of file
+?>