[Serverfilters-commit] backend.php,1.5,1.6 config.php,1.6,1.7 functions.php,1.5,1.6 options.php,1.6,1.7

[<jgs...@us...>]

Update of /cvsroot/serverfilters
In directory sc8-pr-cvs1:/tmp/cvs-serv27402

Modified Files:
	backend.php config.php functions.php options.php 
Log Message:
Removed FILTERFILE variable from config file.  The plugin now assumes:
.mailfilter for maildrop and
.procmailrc for procmail


Index: config.php
===================================================================
RCS file: /cvsroot/serverfilters/config.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** config.php	11 Dec 2003 15:33:25 -0000	1.6
--- config.php	11 Dec 2003 15:51:40 -0000	1.7
***************
*** 7,15 ****
  
  
!         global $ALWAYS_CREATE, $FILTERDIR, $FILTERFILE, $FILTER_APP_PATH, 
!                $DEFAULT_DELIVERY, $ALLOW_UNSUBSCRIBED, $SPAMFILTER, $SPAMHEADER, 
!                $SPAMFILTERMAXKB, $SPAMVALUE, $UNSUREVALUE, $VIRTUAL_DOMAINS,
!                $LOCAL_MAILDIR, $USE_MAILDIRS, $SEPERATOR, $CREATE_DOT_QMAIL,
!                $DOT_QMAIL_DIR;
  
          /**
--- 7,14 ----
  
  
!         global $ALWAYS_CREATE, $FILTERDIR, $FILTER_APP_PATH, $DEFAULT_DELIVERY,
!                $ALLOW_UNSUBSCRIBED, $SPAMFILTER, $SPAMHEADER, $SPAMFILTERMAXKB, 
!                $SPAMVALUE, $UNSUREVALUE, $VIRTUAL_DOMAINS, $LOCAL_MAILDIR, 
!                $USE_MAILDIRS, $SEPERATOR, $CREATE_DOT_QMAIL, $DOT_QMAIL_DIR;
  
          /**
***************
*** 32,42 ****
  	//$FILTERDIR = '/var/lib/squirrelmail/home/[DOMAIN]/[USERNAME]';
          $FILTERDIR = '/home/email/[DOMUSER]/users/[USERNAME]'; 
- 
-         /* 
-          * FILTERFILE
-          *    Name of the filter file
-          */
-         //$FILTERFILE = '.procmailrc';
-         $FILTERFILE = '.mailfilter';
  
          /*
--- 31,34 ----

Index: functions.php
===================================================================
RCS file: /cvsroot/serverfilters/functions.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** functions.php	9 Dec 2003 20:05:52 -0000	1.5
--- functions.php	11 Dec 2003 15:51:40 -0000	1.6
***************
*** 107,110 ****
--- 107,112 ----
     $FILTER_ARRY = explode("/", $FILTER_APP_PATH);
     $FILTER_APP = $FILTER_ARRY[count($FILTER_ARRY)-1];
+    $set_filterfile = $FILTER_APP.'_set_filterfile';
+    $set_filterfile();
  }
  

Index: options.php
===================================================================
RCS file: /cvsroot/serverfilters/options.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** options.php	11 Dec 2003 15:33:25 -0000	1.6
--- options.php	11 Dec 2003 15:51:40 -0000	1.7
***************
*** 90,95 ****
  	$recipies = array();
  
- 	$file = filter_get();
  	set_filter_app();
  	read_recipies($file);
  
--- 90,95 ----
  	$recipies = array();
  
  	set_filter_app();
+         $file = filter_get();
  	read_recipies($file);