[Serverfilters-commit] serversidefilter config.php.sample,1.7,1.8 backend.php,1.3,1.4

[Paul L. <pdo...@us...>]

Update of /cvsroot/serverfilters/serversidefilter
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17527

Modified Files:
	config.php.sample backend.php 
Log Message:
Oops, missed 

Index: backend.php
===================================================================
RCS file: /cvsroot/serverfilters/serversidefilter/backend.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** backend.php	1 Dec 2005 05:37:15 -0000	1.3
--- backend.php	1 Dec 2005 08:37:15 -0000	1.4
***************
*** 621,625 ****
  function maildrop_write_filter_recipie($fd, $action, $field, $string, $folder,
                                         $toFolder, $toAddress, $add_string, $matching) {
!    global $default_folder_prefix, $IS_MAILDIR;
  
     if ($action == "m" or $action == "d")
--- 621,625 ----
  function maildrop_write_filter_recipie($fd, $action, $field, $string, $folder,
                                         $toFolder, $toAddress, $add_string, $matching) {
!    global $default_folder_prefix, $USE_MAILDIRS;
  
     if ($action == "m" or $action == "d")
***************
*** 631,635 ****
     $folder = preg_replace("/$df/",'',$folder);
     $folder = '$MAILDIR/' . $folder 
!            . ($IS_MAILDIR ? '/' : '');
  
     if ($action == "d") 
--- 631,635 ----
     $folder = preg_replace("/$df/",'',$folder);
     $folder = '$MAILDIR/' . $folder 
!            . ($USE_MAILDIRS ? '/' : '');
  
     if ($action == "d") 

Index: config.php.sample
===================================================================
RCS file: /cvsroot/serverfilters/serversidefilter/config.php.sample,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** config.php.sample	1 Dec 2005 05:37:31 -0000	1.7
--- config.php.sample	1 Dec 2005 08:37:15 -0000	1.8
***************
*** 29,33 ****
         $USE_MAILDIRS, $SEPERATOR, $USE_MYSQL, $USE_SPECIAL_SPAM_FILTER_RULE,
         $FTP_SERVER, $FTP_PASSIVE, $USE_SSL_FTP, $LDAP_LOOKUP_FTP_SERVER,
!        $LDAP_BASE, $LDAP_SERVER, $LDAP_ATTRIBUTE, $IS_MAILDIR;
  
  
--- 29,33 ----
         $USE_MAILDIRS, $SEPERATOR, $USE_MYSQL, $USE_SPECIAL_SPAM_FILTER_RULE,
         $FTP_SERVER, $FTP_PASSIVE, $USE_SSL_FTP, $LDAP_LOOKUP_FTP_SERVER,
!        $LDAP_BASE, $LDAP_SERVER, $LDAP_ATTRIBUTE;
  
  
***************
*** 52,62 ****
  
  
- // If you are using maildir storage, set this to 1;
- // otherwise (mailbox storage), set this to zero.
- //
- $IS_MAILDIR = 1;
- 
- 
- 
  // If you would like to include a default delivery method in your
  // filter files, include that here.  If you do not want a default
--- 52,55 ----