[Serverfilters-commit] serversidefilter/script filtercmd.c,1.2,1.3

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

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

Modified Files:
	filtercmd.c 
Log Message:
Adding vacation file rc types

Index: filtercmd.c
===================================================================
RCS file: /cvsroot/serverfilters/serversidefilter/script/filtercmd.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** filtercmd.c	21 May 2005 19:46:19 -0000	1.2
--- filtercmd.c	17 Jun 2005 04:43:52 -0000	1.3
***************
*** 67,76 ****
   *	More than one type of RC file can be handled by this script. The RC file 
   *	types are:
!  *		forward	(.qmail file, or .forward file)
!  *		filter (.procmailrc, or .mailfilter)
   *
   *  The settings in the configuration file that control the locations are:
   *		$FORWARD_FILE_PATH (for "foward" rc type)
   *		$FILTER_FILE_PATH (for "filter" rc type)
   *
   *  RC FILE OWNERSHIP
--- 67,84 ----
   *	More than one type of RC file can be handled by this script. The RC file 
   *	types are:
!  *	    forward  (.qmail file, or .forward file)
!  *	    filter   (.procmailrc, or .mailfilter)
!  *	    vacmsg   (vacation message text file, such as vacation.txt)
!  *	    vacsubj  (vacation subject text file, such as vacation_subject.txt)
!  *	    vaccc    (vacation cc: addresses file, such as vacation_cc_addresses.txt)
!  *	    vackeep  (vacation keep messages file, such as vacation_keep_messages.txt)
   *
   *  The settings in the configuration file that control the locations are:
   *		$FORWARD_FILE_PATH (for "foward" rc type)
   *		$FILTER_FILE_PATH (for "filter" rc type)
+  *		$VAC_MSG_FILE_PATH (for "vacmsg" rc type)
+  *		$VAC_SUBJ_FILE_PATH (for "vacsubj" rc type)
+  *		$VAC_CC_FILE_PATH (for "vaccc" rc type)
+  *		$VAC_KEEP_FILE_PATH (for "vackeep" rc type)
   *
   *  RC FILE OWNERSHIP
***************
*** 588,592 ****
   * 
   * Parameters:
!  *   filter_type - IN. One of "filter", "forward".
   *   filter_file - OUT. The resulting calculated path.
   *   buflen - IN. Size of the filter_file buffer.
--- 596,601 ----
   * 
   * Parameters:
!  *   filter_type - IN. One of "filter", "forward", "vacmsg",
!  *                     "vacsubj", "vaccc", "vackeep".
   *   filter_file - OUT. The resulting calculated path.
   *   buflen - IN. Size of the filter_file buffer.
***************
*** 624,660 ****
  	char* phpvar;
  
! #ifdef USEMYSQL
! 	char filename[STR_MAX];
! 
!         // already have home path, just need to add file name on the end
! 	if (0 == strcmp(filter_type, "filter")) {
! 		phpvar = "$FILTER_FILE_NAME";
! 	} else if (0 == strcmp(filter_type, "forward")) {
! 		phpvar = "$FORWARD_FILE_NAME";
! 	} else {
! 		return ERR_BAD_RC_FILE_TYPE;
! 	}
! #else
! #ifdef USELDAP
  	char filename[STR_MAX];
  
          // already have home path, just need to add file name on the end
  	if (0 == strcmp(filter_type, "filter")) {
- 		phpvar = "$FILTER_FILE_NAME";
- 	} else if (0 == strcmp(filter_type, "forward")) {
- 		phpvar = "$FORWARD_FILE_NAME";
- 	} else {
- 		return ERR_BAD_RC_FILE_TYPE;
- 	}
- #else
- 	if (0 == strcmp(filter_type, "filter")) {
  		phpvar = "$FILTER_FILE_PATH";
  	} else if (0 == strcmp(filter_type, "forward")) {
  		phpvar = "$FORWARD_FILE_PATH";
  	} else {
  		return ERR_BAD_RC_FILE_TYPE;
  	}
- #endif
- #endif
  
  	#ifdef DEBUG
--- 633,655 ----
  	char* phpvar;
  
! /* filename variable only used for MySQL/LDAP backends */
  	char filename[STR_MAX];
  
          // already have home path, just need to add file name on the end
  	if (0 == strcmp(filter_type, "filter")) {
  		phpvar = "$FILTER_FILE_PATH";
  	} else if (0 == strcmp(filter_type, "forward")) {
  		phpvar = "$FORWARD_FILE_PATH";
+ 	} else if (0 == strcmp(filter_type, "vacmsg")) {
+ 		phpvar = "$VAC_MSG_FILE_PATH";
+ 	} else if (0 == strcmp(filter_type, "vacsubj")) {
+ 		phpvar = "$VAC_SUBJ_FILE_PATH";
+ 	} else if (0 == strcmp(filter_type, "vaccc")) {
+ 		phpvar = "$VAC_CC_FILE_PATH";
+ 	} else if (0 == strcmp(filter_type, "vackeep")) {
+ 		phpvar = "$VAC_KEEP_FILE_PATH";
  	} else {
  		return ERR_BAD_RC_FILE_TYPE;
  	}
  
  	#ifdef DEBUG