serverfilters-commit

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

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

Modified Files:
	backend.php 
Log Message:
Fixes for when maildir does not exist; as when it has been removed w/out updating filters

Index: backend.php
===================================================================
RCS file: /cvsroot/serverfilters/serversidefilter/backend.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** backend.php	21 Jul 2005 09:52:20 -0000	1.2
--- backend.php	1 Dec 2005 05:37:15 -0000	1.3
***************
*** 621,625 ****
  function maildrop_write_filter_recipie($fd, $action, $field, $string, $folder,
                                         $toFolder, $toAddress, $add_string, $matching) {
!    global $default_folder_prefix;
  
     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, $IS_MAILDIR;
  
     if ($action == "m" or $action == "d")
***************
*** 630,634 ****
     $df = preg_replace("/\./",'',$default_folder_prefix);
     $folder = preg_replace("/$df/",'',$folder);
!    $folder = '$MAILDIR/'.$folder;
  
     if ($action == "d") 
--- 630,635 ----
     $df = preg_replace("/\./",'',$default_folder_prefix);
     $folder = preg_replace("/$df/",'',$folder);
!    $folder = '$MAILDIR/' . $folder 
!            . ($IS_MAILDIR ? '/' : '');
  
     if ($action == "d") 
***************
*** 694,698 ****
          break;
     }
!    fputs($fd, "if (/${field}${prefix}${string}${suffix}/:${location})\n{\n${copystring}\n}\n");
  }
  
--- 695,700 ----
          break;
     }
!    //fputs($fd, "if (/${field}${prefix}${string}${suffix}/:${location})\n{\n${copystring}\n}\n");
!    fputs($fd, "exception {\n   if (/${field}${prefix}${string}${suffix}/:${location})\n   {\n      ${copystring}\n   }\n}\n");
  }