Menu
▾
▴
serverfilters-commit — CVS Commits
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(33) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(2) |
Feb
(21) |
Mar
(34) |
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(11) |
Jun
(12) |
Jul
(6) |
Aug
(1) |
Sep
|
Oct
|
Nov
(4) |
Dec
(11) |
| 2009 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(7) |
Nov
|
Dec
(1) |
| 2011 |
Jan
(18) |
Feb
|
Mar
|
Apr
(2) |
May
(8) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(2) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(5) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Paul L. <pdo...@us...> - 2005-12-01 08:37:23
|
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 ---- |
|
From: Paul L. <pdo...@us...> - 2005-12-01 06:12:46
|
Update of /cvsroot/serverfilters/serversidefilter/script In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19631/script Modified Files: Makefile Makefile.ldap Makefile.mysql Log Message: Minor makefile adjustmenst/tips Index: Makefile.ldap =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/script/Makefile.ldap,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.ldap 22 Nov 2005 20:55:25 -0000 1.4 --- Makefile.ldap 1 Dec 2005 06:12:37 -0000 1.5 *************** *** 64,72 **** # is for use when you have manually downloaded the UW-IMAP c-client library # and placed it in a subdirectory below serversidefilter/script (in this case ! # called "imap-2004a"). You should be able to successfully compile with # LIBS being completely empty when using CHECKCREDS=checkcreds_imap.o above. # LIBS=/usr/lib/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt -lkrb5 -lresolv -lcom_err -ldl -lz -lcrypto -lk5crypto ! #LIBS=../../../plugins/serversidefilter/script/imap-2004a/c-client/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt -lkrb5 -lresolv -lcom_err -ldl -lz -lcrypto -lk5crypto # # FreeBSD: --- 64,72 ---- # is for use when you have manually downloaded the UW-IMAP c-client library # and placed it in a subdirectory below serversidefilter/script (in this case ! # called "imap-2004g"). You should be able to successfully compile with # LIBS being completely empty when using CHECKCREDS=checkcreds_imap.o above. # LIBS=/usr/lib/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt -lkrb5 -lresolv -lcom_err -ldl -lz -lcrypto -lk5crypto ! #LIBS=../../../plugins/serversidefilter/script/imap-2004g/c-client/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt -lkrb5 -lresolv -lcom_err -ldl -lz -lcrypto -lk5crypto # # FreeBSD: *************** *** 85,89 **** # I=/usr/include/imap ! #I=../../../plugins/serversidefilter/script/imap-2004a/c-client # # FreeBSD: --- 85,89 ---- # I=/usr/include/imap ! #I=../../../plugins/serversidefilter/script/imap-2004g/c-client # # FreeBSD: *************** *** 158,162 **** --- 158,164 ---- # LDAP_FLAGS=-I/usr/local/include + #LDAP_FLAGS=-I/usr/include LDAP_LDFLAGS=-L/usr/local/lib -lldap -llber + #LDAP_LDFLAGS=-L/usr/lib -lldap # Point this to the LDAP configuration file *************** *** 180,185 **** chmod 4750 filtercmd ! filtercmd.o: filtercmd.c Makefile ! gcc -c filtercmd.c $(CFLAGS) $(FILTERCMD_CFLAGS) $(MYSQL_CFLAGS) $(LDAP_CFLAGS) checkcreds_cclient.o: checkcreds_cclient.c Makefile --- 182,189 ---- chmod 4750 filtercmd ! filtercmd.o: filtercmd.c Makefile $(CHECKCREDS) $(MYSQL) $(LDAP) ! gcc -c filtercmd.c $(CFLAGS) $(FILTERCMD_CFLAGS) $(MYSQL_CFLAGS) $(MYSQL_FLAGS) $(LDAP_CFLAGS) $(LDAP_FLAGS) ! #filtercmd.o: filtercmd.c Makefile ! # gcc -c filtercmd.c $(CFLAGS) $(FILTERCMD_CFLAGS) $(MYSQL_CFLAGS) $(LDAP_CFLAGS) checkcreds_cclient.o: checkcreds_cclient.c Makefile Index: Makefile.mysql =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/script/Makefile.mysql,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.mysql 22 Nov 2005 20:55:25 -0000 1.3 --- Makefile.mysql 1 Dec 2005 06:12:37 -0000 1.4 *************** *** 64,72 **** # is for use when you have manually downloaded the UW-IMAP c-client library # and placed it in a subdirectory below serversidefilter/script (in this case ! # called "imap-2004a"). You should be able to successfully compile with # LIBS being completely empty when using CHECKCREDS=checkcreds_imap.o above. # LIBS=/usr/lib/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt -lkrb5 -lresolv -lcom_err -ldl -lz -lcrypto -lk5crypto ! #LIBS=../../../plugins/serversidefilter/script/imap-2004a/c-client/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt -lkrb5 -lresolv -lcom_err -ldl -lz -lcrypto -lk5crypto # # FreeBSD: --- 64,72 ---- # is for use when you have manually downloaded the UW-IMAP c-client library # and placed it in a subdirectory below serversidefilter/script (in this case ! # called "imap-2004g"). You should be able to successfully compile with # LIBS being completely empty when using CHECKCREDS=checkcreds_imap.o above. # LIBS=/usr/lib/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt -lkrb5 -lresolv -lcom_err -ldl -lz -lcrypto -lk5crypto ! #LIBS=../../../plugins/serversidefilter/script/imap-2004g/c-client/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt -lkrb5 -lresolv -lcom_err -ldl -lz -lcrypto -lk5crypto # # FreeBSD: *************** *** 85,89 **** # I=/usr/include/imap ! #I=../../../plugins/serversidefilter/script/imap-2004a/c-client # # FreeBSD: --- 85,89 ---- # I=/usr/include/imap ! #I=../../../plugins/serversidefilter/script/imap-2004g/c-client # # FreeBSD: *************** *** 157,162 **** # Change these as needed if you are using LDAP functionality # #LDAP_FLAGS=-I/usr/include ! #LDAP_LDFLAGS=-L/usr/lib # Point this to the LDAP configuration file --- 157,164 ---- # Change these as needed if you are using LDAP functionality # + #LDAP_FLAGS=-I/usr/local/include #LDAP_FLAGS=-I/usr/include ! #LDAP_LDFLAGS=-L/usr/local/lib -lldap -llber ! #LDAP_LDFLAGS=-L/usr/lib -lldap # Point this to the LDAP configuration file *************** *** 180,185 **** chmod 4750 filtercmd ! filtercmd.o: filtercmd.c Makefile ! gcc -c filtercmd.c $(CFLAGS) $(FILTERCMD_CFLAGS) $(MYSQL_CFLAGS) $(LDAP_CFLAGS) checkcreds_cclient.o: checkcreds_cclient.c Makefile --- 182,189 ---- chmod 4750 filtercmd ! filtercmd.o: filtercmd.c Makefile $(CHECKCREDS) $(MYSQL) $(LDAP) ! gcc -c filtercmd.c $(CFLAGS) $(FILTERCMD_CFLAGS) $(MYSQL_CFLAGS) $(MYSQL_FLAGS) $(LDAP_CFLAGS) $(LDAP_FLAGS) ! #filtercmd.o: filtercmd.c Makefile ! # gcc -c filtercmd.c $(CFLAGS) $(FILTERCMD_CFLAGS) $(MYSQL_CFLAGS) $(LDAP_CFLAGS) checkcreds_cclient.o: checkcreds_cclient.c Makefile Index: Makefile =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/script/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 22 Nov 2005 20:55:25 -0000 1.3 --- Makefile 1 Dec 2005 06:12:37 -0000 1.4 *************** *** 64,72 **** # is for use when you have manually downloaded the UW-IMAP c-client library # and placed it in a subdirectory below serversidefilter/script (in this case ! # called "imap-2004a"). You should be able to successfully compile with # LIBS being completely empty when using CHECKCREDS=checkcreds_imap.o above. # LIBS=/usr/lib/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt -lkrb5 -lresolv -lcom_err -ldl -lz -lcrypto -lk5crypto ! #LIBS=../../../plugins/serversidefilter/script/imap-2004a/c-client/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt -lkrb5 -lresolv -lcom_err -ldl -lz -lcrypto -lk5crypto # # FreeBSD: --- 64,72 ---- # is for use when you have manually downloaded the UW-IMAP c-client library # and placed it in a subdirectory below serversidefilter/script (in this case ! # called "imap-2004g"). You should be able to successfully compile with # LIBS being completely empty when using CHECKCREDS=checkcreds_imap.o above. # LIBS=/usr/lib/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt -lkrb5 -lresolv -lcom_err -ldl -lz -lcrypto -lk5crypto ! #LIBS=../../../plugins/serversidefilter/script/imap-2004g/c-client/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt -lkrb5 -lresolv -lcom_err -ldl -lz -lcrypto -lk5crypto # # FreeBSD: *************** *** 85,89 **** # I=/usr/include/imap ! #I=../../../plugins/serversidefilter/script/imap-2004a/c-client # # FreeBSD: --- 85,89 ---- # I=/usr/include/imap ! #I=../../../plugins/serversidefilter/script/imap-2004g/c-client # # FreeBSD: *************** *** 157,162 **** # Change these as needed if you are using LDAP functionality # #LDAP_FLAGS=-I/usr/include ! #LDAP_LDFLAGS=-L/usr/lib # Point this to the LDAP configuration file --- 157,164 ---- # Change these as needed if you are using LDAP functionality # + #LDAP_FLAGS=-I/usr/local/include #LDAP_FLAGS=-I/usr/include ! #LDAP_LDFLAGS=-L/usr/local/lib -lldap -llber ! #LDAP_LDFLAGS=-L/usr/lib -lldap # Point this to the LDAP configuration file *************** *** 180,185 **** chmod 4750 filtercmd ! filtercmd.o: filtercmd.c Makefile ! gcc -c filtercmd.c $(CFLAGS) $(FILTERCMD_CFLAGS) $(MYSQL_CFLAGS) $(LDAP_CFLAGS) checkcreds_cclient.o: checkcreds_cclient.c Makefile --- 182,189 ---- chmod 4750 filtercmd ! filtercmd.o: filtercmd.c Makefile $(CHECKCREDS) $(MYSQL) $(LDAP) ! gcc -c filtercmd.c $(CFLAGS) $(FILTERCMD_CFLAGS) $(MYSQL_CFLAGS) $(MYSQL_FLAGS) $(LDAP_CFLAGS) $(LDAP_FLAGS) ! #filtercmd.o: filtercmd.c Makefile ! # gcc -c filtercmd.c $(CFLAGS) $(FILTERCMD_CFLAGS) $(MYSQL_CFLAGS) $(LDAP_CFLAGS) checkcreds_cclient.o: checkcreds_cclient.c Makefile |
|
From: Paul L. <pdo...@us...> - 2005-12-01 05:37:39
|
Update of /cvsroot/serverfilters/serversidefilter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14388 Modified Files: config.php.sample Log Message: Fixes for when maildir does not exist; as when it has been removed w/out updating filters Index: config.php.sample =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/config.php.sample,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** config.php.sample 21 Jul 2005 09:52:20 -0000 1.6 --- config.php.sample 1 Dec 2005 05:37:31 -0000 1.7 *************** *** 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; --- 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; *************** *** 52,55 **** --- 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 |
|
From: Paul L. <pdo...@us...> - 2005-12-01 05:37:24
|
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"); } |
|
From: Paul L. <pdo...@us...> - 2005-12-01 00:43:40
|
Update of /cvsroot/serverfilters/serversidefilter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24561 Modified Files: options.php Log Message: Don't save translated field names in filter Index: options.php =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/options.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** options.php 30 Nov 2005 23:53:59 -0000 1.6 --- options.php 1 Dec 2005 00:43:32 -0000 1.7 *************** *** 163,167 **** $recipies[$_POST['rule']]['field'] = $SPAMHEADER; else ! $recipies[$_POST['rule']]['field'] = $fields[$_POST['field']]; $recipies[$_POST['rule']]['string'] = $_POST['string']; if (get_magic_quotes_gpc() == 1) --- 163,167 ---- $recipies[$_POST['rule']]['field'] = $SPAMHEADER; else ! $recipies[$_POST['rule']]['field'] = $_POST['field']; $recipies[$_POST['rule']]['string'] = $_POST['string']; if (get_magic_quotes_gpc() == 1) |
|
From: Paul L. <pdo...@us...> - 2005-11-30 23:54:13
|
Update of /cvsroot/serverfilters/serversidefilter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8330 Modified Files: options.php Log Message: Missing switch of text domain Index: options.php =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/options.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** options.php 30 Nov 2005 23:39:42 -0000 1.5 --- options.php 30 Nov 2005 23:53:59 -0000 1.6 *************** *** 57,60 **** --- 57,62 ---- + bindtextdomain('serversidefilter', SM_PATH . 'locale'); + textdomain('serversidefilter'); $fields = array('From' => _("From"), 'Subject' => _("Subject"), *************** *** 70,73 **** --- 72,77 ---- 'Is Exactly' => _("Is Exactly"), 'Matches Regex' => _("Matches Regex")); + bindtextdomain('squirrelmail', SM_PATH . 'locale'); + textdomain('squirrelmail'); $spamrule_set = false; |
|
From: Paul L. <pdo...@us...> - 2005-11-30 23:39:50
|
Update of /cvsroot/serverfilters/serversidefilter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5415 Modified Files: options.php Log Message: Missed translation Index: options.php =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/options.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** options.php 21 Jul 2005 09:49:44 -0000 1.4 --- options.php 30 Nov 2005 23:39:42 -0000 1.5 *************** *** 250,254 **** <option value="d"><?php echo _("delete") ?></option> </select> ! to </td><td><table border="0" cellpadding="0" cellspacing="0"> <tr> --- 250,254 ---- <option value="d"><?php echo _("delete") ?></option> </select> ! <?php echo _("to"); ?> </td><td><table border="0" cellpadding="0" cellspacing="0"> <tr> |
|
From: Paul L. <pdo...@us...> - 2005-11-22 20:55:40
|
Update of /cvsroot/serverfilters/serversidefilter/script In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30529/script Modified Files: Makefile Makefile.ldap Makefile.mysql Log Message: Make dynamic linking default Index: Makefile.ldap =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/script/Makefile.ldap,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.ldap 21 Jul 2005 07:10:26 -0000 1.3 --- Makefile.ldap 22 Nov 2005 20:55:25 -0000 1.4 *************** *** 24,29 **** # a statically linked binary # ! #LFLAGS= ! LFLAGS=-static --- 24,29 ---- # a statically linked binary # ! LFLAGS= ! #LFLAGS=-static Index: Makefile.mysql =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/script/Makefile.mysql,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.mysql 21 May 2005 19:46:19 -0000 1.2 --- Makefile.mysql 22 Nov 2005 20:55:25 -0000 1.3 *************** *** 24,29 **** # a statically linked binary # ! #LFLAGS= ! LFLAGS=-static --- 24,29 ---- # a statically linked binary # ! LFLAGS= ! #LFLAGS=-static Index: Makefile =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/script/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile 21 May 2005 19:46:19 -0000 1.2 --- Makefile 22 Nov 2005 20:55:25 -0000 1.3 *************** *** 24,29 **** # a statically linked binary # ! #LFLAGS= ! LFLAGS=-static --- 24,29 ---- # a statically linked binary # ! LFLAGS= ! #LFLAGS=-static |
|
From: Paul L. <pdo...@us...> - 2005-11-22 20:55:15
|
Update of /cvsroot/serverfilters/serversidefilter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30463 Modified Files: TODO Log Message: Remember to create better debugging for missing LDAP or MySQL conf files Index: TODO =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/TODO,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TODO 21 Jul 2005 09:52:20 -0000 1.3 --- TODO 22 Nov 2005 20:55:04 -0000 1.4 *************** *** 1,3 **** --- 1,7 ---- + missing /etc/serversidefilter_mysql.conf file (or whatever) causes segfault. + need to put a check for the existence of that file in the code somewhere so + that is easier to debug instead of stracing the executable + integrate other people's fixes and stuff (solaris? freebsd?, etc) |
|
From: Paul L. <pdo...@us...> - 2005-08-02 08:44:08
|
Update of /cvsroot/serverfilters/serversidefilter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13243 Modified Files: getpot Log Message: Adding no-wrap to xgettext Index: getpot =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/getpot,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** getpot 21 May 2005 09:13:18 -0000 1.1.1.1 --- getpot 2 Aug 2005 08:43:57 -0000 1.2 *************** *** 1,4 **** #!/bin/sh ! XGETTEXT_OPTIONS="--keyword=_ -keyword=N_ --default-domain=serversidefilter --no-location" # Allows controlling language option --- 1,4 ---- #!/bin/sh ! XGETTEXT_OPTIONS="--no-wrap --keyword=_ -keyword=N_ --default-domain=serversidefilter --no-location" # Allows controlling language option |
Update of /cvsroot/serverfilters/serversidefilter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3555 Modified Files: CHANGELOG INSTALL README TODO backend.php config.php.sample functions.php make_release.sh setup.php version Log Message: Reimplemented FTP backend. Untested. Index: setup.php =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/setup.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** setup.php 17 Jun 2005 09:00:52 -0000 1.5 --- setup.php 21 Jul 2005 09:52:20 -0000 1.6 *************** *** 44,48 **** { ! return '1.5-1.2.7-RC1'; } --- 44,48 ---- { ! return '1.5-1.2.7-RC2'; } Index: make_release.sh =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/make_release.sh,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** make_release.sh 21 May 2005 09:13:18 -0000 1.1.1.1 --- make_release.sh 21 Jul 2005 09:52:20 -0000 1.2 *************** *** 33,37 **** # CONFIG_FILES=( config.php ) # ! CONFIG_FILES=( config.php script/imap-2004a script/imap.tar.Z script/serversidefilter_mysql.conf script/serversidefilter_ldap.conf script/filtercmd ) --- 33,37 ---- # CONFIG_FILES=( config.php ) # ! CONFIG_FILES=( config.php script/imap-2004a script/imap.tar.Z script/serversidefilter_mysql.conf script/serversidefilter_ldap.conf script/filtercmd script/Makefile.orig script/Makefile.paul ) Index: functions.php =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/functions.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** functions.php 2 Jun 2005 06:44:19 -0000 1.2 --- functions.php 21 Jul 2005 09:52:20 -0000 1.3 *************** *** 23,27 **** function serversidefilter_optpage_register_block_do() { ! global $optpage_blocks; --- 23,27 ---- function serversidefilter_optpage_register_block_do() { ! global $optpage_blocks; *************** *** 61,81 **** * Filter functions * These are the functions you call to get or write the filter files ! * These simply call the only available backend, "local" */ function filter_get() { ! return local_filter_get(); } function filter_exists() { ! return local_filter_exists(); } function filter_put($file) { ! return local_filter_put($file); } function write_forward() { ! global $username, $attachment_dir, $FILTER_FILE_PATH, $FORWARD_FILE_TYPE, $FILTER_APP_PATH; $tmpfile = $attachment_dir . "/forwardfile-$username"; --- 61,90 ---- * Filter functions * These are the functions you call to get or write the filter files ! * These call the backend configured by the user. */ function filter_get() { ! global $BACKEND; ! $fxn_name = strtolower($BACKEND) . '_filter_get'; ! ! return $fxn_name(); } function filter_exists() { ! global $BACKEND; ! $fxn_name = strtolower($BACKEND) . '_filter_exists'; ! ! return $fxn_name(); } function filter_put($file) { ! global $BACKEND; ! $fxn_name = strtolower($BACKEND) . '_filter_put'; ! ! return $fxn_name($file); } function write_forward() { ! global $BACKEND, $username, $attachment_dir, $FILTER_FILE_PATH, $FORWARD_FILE_TYPE, $FILTER_APP_PATH; $tmpfile = $attachment_dir . "/forwardfile-$username"; *************** *** 91,95 **** fclose($fd); ! $result = local_write_forward($tmpfile); } --- 100,106 ---- fclose($fd); ! $fxn_name = strtolower($BACKEND) . '_write_forward'; ! ! $result = $fxn_name($tmpfile); } Index: version =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/version,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** version 17 Jun 2005 09:00:52 -0000 1.4 --- version 21 Jul 2005 09:52:20 -0000 1.5 *************** *** 1,2 **** Server Side Filter ! 1.5-1.2.7-RC1 --- 1,2 ---- Server Side Filter ! 1.5-1.2.7-RC2 Index: INSTALL =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/INSTALL,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** INSTALL 21 May 2005 19:46:19 -0000 1.2 --- INSTALL 21 Jul 2005 09:52:20 -0000 1.3 *************** *** 9,12 **** --- 9,13 ---- $ tar -zxvf serversidefilter-1.5-1.2.7.tar.gz + 2) Change into the serversidefilter directory, copy config.php.sample to config.php and edit config.php, making adjustments as *************** *** 17,26 **** $ vi config.php - 3) For security purposes, you must restrict ownership of the - configuration file to the root user: ! $ sudo chown root:root config.php ! ! 4) If you would like to include any additional filter directives at the beggining and/or end of all filter files created, create and edit the following files, adding the desired text: --- 18,23 ---- $ vi config.php ! 3) If you would like to include any additional filter directives at the beggining and/or end of all filter files created, create and edit the following files, adding the desired text: *************** *** 32,37 **** $ vi footer $ cd ../ ! 5) If you host virutal domains and have virtual mail users, you need to complete some extra configuration depending upon your system's email server. --- 29,46 ---- $ vi footer $ cd ../ + ! 4) If you are not using the "local" backend (see $BACKEND in ! config.php), that is, if you ARE using the FTP backend, ! skip to step 10. ! ! ! 5) For security purposes, you must restrict ownership of the ! configuration file to the root user: ! ! $ sudo chown root:root config.php ! ! ! 6) If you host virutal domains and have virtual mail users, you need to complete some extra configuration depending upon your system's email server. *************** *** 81,85 **** above for other backends as needed. ! 6) Compile the filtercmd executable in the script directory. For information on how to compile the binary yourself, refer to script/README. --- 90,95 ---- above for other backends as needed. ! ! 7) Compile the filtercmd executable in the script directory. For information on how to compile the binary yourself, refer to script/README. *************** *** 87,91 **** $ less script/README ! 7) Determine what user group your web server runs under (common ones are "apache", "nobody", "www", etc.) and make sure that the filtercmd executable has that same group ownership (substitute the user group --- 97,102 ---- $ less script/README ! ! 8) Determine what user group your web server runs under (common ones are "apache", "nobody", "www", etc.) and make sure that the filtercmd executable has that same group ownership (substitute the user group *************** *** 94,111 **** # sudo chown root:apache script/filtercmd ! 8) Ensure that the filtercmd executable is SUID: $ sudo chmod 4750 script/filtercmd ! 9) Then go to your config directory and run conf.pl. Choose ! option 8 and move the plugin from the "Available Plugins" ! category to the "Installed Plugins" category. Save and exit. $ cd ../../config/ $ ./conf.pl - 10) Also, please verify that you have the "compatibility" plugin - installed. - --- 105,121 ---- # sudo chown root:apache script/filtercmd ! ! 9) Ensure that the filtercmd executable is SUID: $ sudo chmod 4750 script/filtercmd ! ! 10) Then go to your config directory and run conf.pl. Choose ! option 8 and move the plugin from the "Available Plugins" ! category to the "Installed Plugins" category. Save and exit. $ cd ../../config/ $ ./conf.pl *************** *** 124,127 **** --- 134,138 ---- $ tar -zxvf serversidefilter-1.5-1.2.7.tar.gz + 2) Change into the serversidefilter directory, check your config.php file against the new version, to see if there are any new *************** *** 147,151 **** structure. ! 3) For security purposes, you must restrict ownership of the configuration file to the root user: --- 158,169 ---- structure. ! ! 3) If you are not using the "local" backend (see $BACKEND in ! config.php), that is, if you ARE using the FTP backend, ! skip to step 5. What? There is no step 5? Well then, you ! must be finished with the upgrade. ! ! ! 4) For security purposes, you must restrict ownership of the configuration file to the root user: Index: backend.php =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/backend.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** backend.php 21 May 2005 09:13:18 -0000 1.1.1.1 --- backend.php 21 Jul 2005 09:52:20 -0000 1.2 *************** *** 20,23 **** --- 20,375 ---- */ + + + // ----------------------------------------------------------------------------- + // FTP backend + // ----------------------------------------------------------------------------- + + global $FTP; + $FTP = FALSE; + + + + function ftp_filter_exists() { + + global $FILTER_FILE_NAME; + return do_ftp_action('list', $FILTER_FILE_NAME); + + } + + + + function ftp_filter_get() { + + global $attachment_dir, $username, $color, $FILTER_FILE_NAME; + + $localfile = $attachment_dir . '/serversidefilter/'; + if (!is_dir($localfile)) { + mkdir($localfile, 0777); + } + chmod($localfile, 0777); + + $localfile .= "filterfile.$username"; + touch($localfile); + if (ftp_filter_exists()) { + $result = do_ftp_action('get', $FILTER_FILE_NAME, $localfile); + } else { + $err_code = create_filter(); + if (!$err_code) ftp_filter_get(); + } + return $localfile; + + } + + + + function ftp_filter_put($file) { + + global $FILTER_FILE_NAME; + + $put = do_ftp_action('put', $FILTER_FILE_NAME, $file); + + // delete localFile + // + //unlink($tempFile); + + return $put; + + } + + + + function ftp_write_forward($tmpfile) { + + global $FORWARD_FILE_NAME; + + return do_ftp_action('put', $FORWARD_FILE_NAME, $tmpfile); + + } + + + + /** + * Do FTP Action + * + * Serves as a proxy between PHP code and the FTP server. + * + * @param string $action This should be one of four values + * that indicate what action is to be + * taken: + * 'list' determines if a file exists + * 'put' uploads the given file + * 'get' downloads the given file + * 'delete' removes the indicated file + * @param string $remoteFile The name of the file to be manipulated + * on the server. + * @param string $localFile The name of the file to be uploaded or + * downloaded (basically, this is usually + * just a temporary file). + * + * @return boolean FALSE if the action failed, TRUE otherwise + * + */ + function do_ftp_action($action, $remoteFile='', $localFile='') + { + + global $color, $username, $key, $onetimepad, $FTP_SERVER, $LDAP_ATTRIBUTE, + $ftp_debug, $connect_method, + $FTP_PASSIVE, $LDAP_LOOKUP_FTP_SERVER, $LDAP_BASE, $LDAP_SERVER, + $USE_SSL_FTP, $FTP; + + $connect_method = 'ftp'; + + // debugging + // $ftp_debug = 1; + + $connect_method = strtolower($connect_method); + + + // decrypt password + // + sqgetGlobalVar('key', $key, SQ_COOKIE); + sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION); + $password = OneTimePadDecrypt($key, $onetimepad); + + + // look up ftp server in LDAP if necessary + // + if ($LDAP_LOOKUP_FTP_SERVER) + { + + // try to get ftp server name from user's session if possible + // + sqgetGlobalVar('ssf_ftp_server', $ssf_ftp_server, SQ_SESSION); + + + // do the LDAP lookup + // + if (empty($ssf_ftp_server)) + { + + $LDAP = ldap_connect($LDAP_SERVER); + if ($LDAP) + { + + $r = ldap_bind($LDAP); // this is an "anonymous" bind, ty + + + if ($r) + { + $sr = ldap_search($LDAP, $LDAP_BASE, "uid=$username"); + // Maybe check for search error... + } + else + { + plain_error_message(_("Error: Could not bind to LDAP server."), $color); + return FALSE; + } + + + $entry = ldap_first_entry($LDAP, $sr); + $values = ldap_get_values($LDAP, $entry, $LDAP_ATTRIBUTE); + $ssf_ftp_server = $values[0]; + + + // check for null return from ldap + // + if (!isset($ssf_ftp_server)) + { + plain_error_message(sprintf(_("Error: Could not find FTP server for %s in LDAP server."), $username), $color); + ldap_close($LDAP); + return FALSE; + } + else + sqsession_register($ssf_ftp_server, 'ssf_ftp_server'); + + + ldap_close($LDAP); + + } + else + { + plain_error_message(_("Error: Could not connect to LDAP server."), $color); + return FALSE; + } + + } + + $FTP_SERVER = $ssf_ftp_server; + + } + + + $result = FALSE; + + if ($ftp_debug) + { + echo "ACTION: $action === REMOTE: $remoteFile === LOCAL: $localFile === USER: $username === PASSWORD: $password<br />"; + } + + if ($connect_method == 'ftp') + { + + // use FTP over SSL? + // + if ($USE_SSL_FTP) $ftp_conn_func = 'ftp_ssl_connect'; + else $ftp_conn_func = 'ftp_connect'; + + + // only connect to FTP server once per page request + // + if (!$FTP) + { + + $FTP = $ftp_conn_func($FTP_SERVER); + + + if (!$FTP) + { + plain_error_message(_("Error: Unable to connect to FTP server. Please try again later."), $color); + return FALSE; + } + if (!($FTPConn = ftp_login($FTP, $username, $password))) + { + plain_error_message(_("Error: Unable to log in to FTP server. Please contact your system administrator."), $color); + ftp_quit($FTP); + return FALSE; + } + if ($FTP_PASSIVE && !ftp_pasv($FTP, TRUE)) + { + plain_error_message(_("Error: Unable to switch to passive FTP mode. Please contact your system administrator."), $color); + ftp_quit($FTP); + return FALSE; + } + + // TODO: this flushes browser output too, and might create problems...? + flush(); + + } + + } + + switch ($action) + { + + // check whether file exists + // + case 'list': + + if ($connect_method == 'ftp') + { + $ftpList = ftp_size($FTP, $remoteFile); + + if ($ftpList > 0) + $result = TRUE; + else + $result = FALSE; + } + else + { + // nothing for now + } + + break; + + + + // upload $remoteFile to $localFile + // + case 'put': + + if ($connect_method == 'ftp') + { + if (ftp_put($FTP, $remoteFile, $localFile, FTP_ASCII)) + $result = TRUE; + else + { + plain_error_message(_("Error: Unable to upload file. Please contact your system administrator."), $color); + $result = FALSE; + } + } + else + { + // nothing for now + } + + break; + + + + // download $remoteFile to $localFile + // + case 'get': + + if ($connect_method == 'ftp') + { + if (ftp_get($FTP, $localFile, $remoteFile, FTP_ASCII)) + $result = TRUE; + else + { + plain_error_message(_("Error: unable to download file. Please contact your system administrator."), $color); + $result = FALSE; + } + } + else + { + // nothing for now + } + + break; + + + + // delete files listed in $remoteFile if they exist + // + case 'delete': + + $remoteFiles = explode(',', $remoteFile); + $result = TRUE; + foreach ($remoteFiles as $file) + { + + if ($connect_method == 'ftp') + { + $ftpList = ftp_size($FTP, $file); + if ($ftpList > 0 && !ftp_delete($FTP, $file)) + { + plain_error_message(_("Error: unable to delete file. Please contact your system administrator."), $color); + $result = FALSE; + } + } + else + { + // nothing for now + } + + } + + break; + + + + // unknown action + // + default: + + echo _("Unknown action:") . " $action<br />\n"; + $result = FALSE; + + } + + // keep FTP connection open for duration of whole page request + //if ($connection_method == 'ftp') ftp_quit($FTP); + + return $result; + + } + + + + // ----------------------------------------------------------------------------- + // "local" backend + // ----------------------------------------------------------------------------- + function local_filter_get() { global $username, $attachment_dir; *************** *** 49,58 **** function local_filter_put($file) { ! return invoke_filtercmd("putrc filter", $file, ""); //unlink($file); } function local_write_forward($tmpfile) { ! return invoke_filtercmd("putrc forward", $tmpfile, ""); } --- 401,410 ---- function local_filter_put($file) { ! return invoke_filtercmd('putrc filter', $file, ''); //unlink($file); } function local_write_forward($tmpfile) { ! return invoke_filtercmd('putrc forward', $tmpfile, ''); } *************** *** 123,126 **** --- 475,484 ---- } + + + // ----------------------------------------------------------------------------- + // Procmail backend + // ----------------------------------------------------------------------------- + /** * Procmail backend *************** *** 251,254 **** --- 609,618 ---- } + + + // ----------------------------------------------------------------------------- + // Maildrop backend + // ----------------------------------------------------------------------------- + /** * Maildrop backend Index: README =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/README,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** README 21 May 2005 19:46:19 -0000 1.2 --- README 21 Jul 2005 09:52:20 -0000 1.3 *************** *** 22,26 **** dot-qmail files for delivery. ! Dot-forward files can also be generated to invoke the filter app. NOTE: Since version 1.4, ServerSide Filter uses a setuid application for --- 22,26 ---- dot-qmail files for delivery. ! Dot-forward and vacation files can also be generated to invoke the filter app. NOTE: Since version 1.4, ServerSide Filter uses a setuid application for *************** *** 40,44 **** - SquirrelMail 1.4.x (may also work with earlier versions of 1.2.x) - - Compatibility plugin - Maildrop or procmail --- 40,43 ---- Index: config.php.sample =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/config.php.sample,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** config.php.sample 21 Jul 2005 07:24:07 -0000 1.5 --- config.php.sample 21 Jul 2005 09:52:20 -0000 1.6 *************** *** 24,31 **** // variables it will be parsing out of this file *must* NOT // be in the global statement here: ! global $ALWAYS_CREATE, $FILTER_APP_PATH, $DEFAULT_DELIVERY, $ALLOW_UNSUBSCRIBED, $SPAMFILTER, $SPAMHEADER, $SPAMFILTERMAXKB, $SPAMVALUE, $UNSUREVALUE, $VIRTUAL_DOMAINS, $LOCAL_MAILDIR, $USE_LDAP, ! $USE_MAILDIRS, $SEPERATOR, $USE_MYSQL, $USE_SPECIAL_SPAM_FILTER_RULE; --- 24,33 ---- // variables it will be parsing out of this file *must* NOT // be in the global statement here: ! global $ALWAYS_CREATE, $FILTER_APP_PATH, $DEFAULT_DELIVERY, $BACKEND, $ALLOW_UNSUBSCRIBED, $SPAMFILTER, $SPAMHEADER, $SPAMFILTERMAXKB, $SPAMVALUE, $UNSUREVALUE, $VIRTUAL_DOMAINS, $LOCAL_MAILDIR, $USE_LDAP, ! $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; *************** *** 40,61 **** - // This is the full path to the filter files. Note that this - // must be set to the same value as $FILTER_FILE_NAME when - // using database lookups (see below). - // - //$FILTER_FILE_PATH = '/home/email/[DOMUSER]/users/[USERNAME]/.procmailrc'; - //$FILTER_FILE_PATH = '.mailfilter'; - $FILTER_FILE_PATH = '/home/email/[DOMUSER]/users/[USERNAME]/.mailfilter'; - - - - // This is the expected name of filter files stored in the user's - // home directory (the path to which is stored in a database backend). - // - //$FILTER_FILE_NAME = '.procmailrc'; - $FILTER_FILE_NAME = '.mailfilter'; - - - // This is the full path of the filter application you use. // Supported filter apps are: --- 42,45 ---- *************** *** 78,83 **** ! // Uncomment the following line to allow filtering to unsubscribed ! // mailboxes. Comment line out to disable to only allow filtering // to subscribed mailboxes. // --- 62,67 ---- ! // Uncomment the following line to allow filtering to unsubscribed ! // mailboxes. Comment line out to disable to only allow filtering // to subscribed mailboxes. // *************** *** 99,103 **** ! // Limits messages sent through the spam filter to be below this // size (in kilobytes). Set to 0 if you do not want any limit. --- 83,87 ---- ! // Limits messages sent through the spam filter to be below this // size (in kilobytes). Set to 0 if you do not want any limit. *************** *** 109,116 **** // If you run a Spam tagging tool such as SpamAssassin from another // location (such as amavis, etc.), but would still like the special ! // spam filter included with this plugin, make sure $SPAMFILTER above // is commented out but that $SPAMHEADER and $SPAMVALUE (and optionally ! // $UNSUREVALUE) are correctly configured and set this to 1. If you ! // are using the $SPAMFILTER setting above, you should leave this // turned off. // --- 93,100 ---- // If you run a Spam tagging tool such as SpamAssassin from another // location (such as amavis, etc.), but would still like the special ! // spam filter included with this plugin, make sure $SPAMFILTER above // is commented out but that $SPAMHEADER and $SPAMVALUE (and optionally ! // $UNSUREVALUE) are correctly configured and set this to 1. If you ! // are using the $SPAMFILTER setting above, you should leave this // turned off. // *************** *** 120,129 **** // Set the path to the Maildir here. This is used in the filter ! // file itself. // ! //$LOCAL_MAILDIR = '$HOME/Maildir/'; // This would be a good example for a // standard email setup ! $LOCAL_MAILDIR = '$HOME/users/[USERNAME]/'; // This example is compatible with ! // vmailmgr virtual domains //$LOCAL_MAILDIR = '$DEFAULT/'; // In many cases, Maildrop's $DEFAULT // environment variable already points --- 104,113 ---- // Set the path to the Maildir here. This is used in the filter ! // file itself. // ! //$LOCAL_MAILDIR = '$HOME/Maildir/'; // This would be a good example for a // standard email setup ! $LOCAL_MAILDIR = '$HOME/users/[USERNAME]/'; // This example is compatible with ! // vmailmgr virtual domains //$LOCAL_MAILDIR = '$DEFAULT/'; // In many cases, Maildrop's $DEFAULT // environment variable already points *************** *** 133,142 **** // Set this to 1 if your mailbox uses maildirs, set to 0 for mbox style mailboxs ! // $USE_MAILDIRS = 1; ! /////////////////////////////////////////////////////////////////////////// // // VIRTUAL DOMAIN SETTINGS --- 117,224 ---- // Set this to 1 if your mailbox uses maildirs, set to 0 for mbox style mailboxs ! // $USE_MAILDIRS = 1; ! // -------------------------------------------------------------- ! // ! // Choose how the plugin should get and set filter information ! // Currently suppored backends are: ! // ! // local Filter files are located on the local (or NFS) ! // filesystem and are accessed with normal filesystem ! // commands ! // ! // ftp Filter files are located on a FTP server ! // and are accessed by using PHP's FTP functionality ! // (you must have enabled FTP functionality in your ! // PHP build with --enable-ftp) ! // ! //$BACKEND = 'ftp'; ! $BACKEND = 'local'; ! ! ! ! // -------------------------------------------------------------- ! // ! // FTP backend configuration settings ! // ! ! ! ! // This is the expected name of filter files stored in the user's ! // home directory (the path to which is stored in a database backend). ! // ! //$FILTER_FILE_NAME = '.procmailrc'; ! $FILTER_FILE_NAME = '.mailfilter'; ! ! ! ! // Also, please see $FORWARD_FILE_NAME below; it should be set ! // correctly to use .forward files with the FTP backend ! // ! ! ! ! // The FTP server's hostname (or IP address)... ! // ! $FTP_SERVER = 'localhost'; ! ! ! ! // Turn on passive mode if necessary by setting this to 1 ! // ! $FTP_PASSIVE = 0; ! //$FTP_PASSIVE = 1; ! ! ! ! // You may specify that the FTP connection be made ! // via SSL FTP by setting this to 1 (please note that ! // this requires that OpenSSL support be enabled in ! // your PHP build) ! // ! $USE_SSL_FTP = 0; ! ! ! ! // If you store users' FTP servers (server name/location) ! // in LDAP, you can look up what $FTP_SERVER (above) should ! // be in LDAP by turning this on ! // ! $LDAP_LOOKUP_FTP_SERVER = 0; ! //$LDAP_LOOKUP_FTP_SERVER = 1; ! ! ! ! // When using $LDAP_LOOKUP_FTP_SERVER, set the LDAP base ! // server, and attribute here ($LDAP_SERVER may be a host ! // name or LDAP URI) ! // ! $LDAP_BASE = 'ou=People,dc=DOMAIN,dc=com'; ! $LDAP_SERVER = 'your.ldap.server.com'; ! $LDAP_ATTRIBUTE = 'mailhost'; ! ! ! ! // -------------------------------------------------------------- ! // ! // Local backend configuration settings ! // ! ! ! ! // This is the full path to the filter files. Note that this ! // must be set to the same value as $FILTER_FILE_NAME when ! // using database lookups (see below). ! // ! //$FILTER_FILE_PATH = '/home/email/[DOMUSER]/users/[USERNAME]/.procmailrc'; ! //$FILTER_FILE_PATH = '.mailfilter'; ! $FILTER_FILE_PATH = '/home/email/[DOMUSER]/users/[USERNAME]/.mailfilter'; ! ! ! ! // -------------------------------------------------------------- // // VIRTUAL DOMAIN SETTINGS *************** *** 199,203 **** ! /////////////////////////////////////////////////////////////////////////// // // VACATION FILE SETTINGS --- 281,285 ---- ! // -------------------------------------------------------------- // // VACATION FILE SETTINGS *************** *** 211,215 **** // top of this file. // ! // Note that no path should be given here (just the // file name) when using database lookups (see above) // --- 293,297 ---- // top of this file. // ! // Note that no path should be given here (just the // file name) when using database lookups (see above) // Index: CHANGELOG =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/CHANGELOG,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CHANGELOG 17 Jun 2005 07:29:46 -0000 1.3 --- CHANGELOG 21 Jul 2005 09:52:20 -0000 1.4 *************** *** 30,33 **** --- 30,35 ---- - Added vacation rctypes to filtercmd script as well as delrc command to remove files. + - Removed requirement for Compatibility plugin + - Reimplemented FTP backend functionality Version 1.41 Index: TODO =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/TODO,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TODO 21 May 2005 19:46:19 -0000 1.2 --- TODO 21 Jul 2005 09:52:20 -0000 1.3 *************** *** 3,9 **** - bring back FTP functionality - - hook into folders options so when folder is renamed/deleted, we can update filters accordingly --- 3,6 ---- |
|
From: Paul L. <pdo...@us...> - 2005-07-21 09:51:17
|
Update of /cvsroot/serverfilters/serversidefilter/script In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3203/script Modified Files: filtercmd.c Log Message: typo Index: filtercmd.c =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/script/filtercmd.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** filtercmd.c 21 Jul 2005 07:23:40 -0000 1.6 --- filtercmd.c 21 Jul 2005 09:50:39 -0000 1.7 *************** *** 78,82 **** * * 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) --- 78,82 ---- * * The settings in the configuration file that control the locations are: ! * $FORWARD_FILE_PATH (for "forward" rc type) * $FILTER_FILE_PATH (for "filter" rc type) * $VAC_MSG_FILE_PATH (for "vacmsg" rc type) |
|
From: Paul L. <pdo...@us...> - 2005-07-21 09:51:05
|
Update of /cvsroot/serverfilters/serversidefilter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2921 Modified Files: options.php Log Message: Removing Compatibility requirement Index: options.php =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/options.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** options.php 17 Jun 2005 06:17:28 -0000 1.3 --- options.php 21 Jul 2005 09:49:44 -0000 1.4 *************** *** 19,39 **** - // include compatibility plugin - // - include_once(SM_PATH . 'plugins/compatibility/functions.php'); - - - - if (compatibility_check_sm_version(1, 3)) - { - include_once (SM_PATH . 'include/validate.php'); - include_once (SM_PATH . 'include/load_prefs.php'); - } - else - { - include_once (SM_PATH . 'src/validate.php'); - include_once (SM_PATH . 'src/load_prefs.php'); - } --- 19,33 ---- + if (file_exists(SM_PATH . 'include/validate.php')) + { + include_once(SM_PATH . 'include/validate.php'); + include_once(SM_PATH . 'include/load_prefs.php'); + } + else + { + include_once(SM_PATH . 'src/validate.php'); + include_once(SM_PATH . 'src/load_prefs.php'); + } |
|
From: Paul L. <pdo...@us...> - 2005-07-21 07:24:16
|
Update of /cvsroot/serverfilters/serversidefilter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6583 Modified Files: config.php.sample Log Message: Developer reminder Index: config.php.sample =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/config.php.sample,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** config.php.sample 22 Jun 2005 04:36:25 -0000 1.4 --- config.php.sample 21 Jul 2005 07:24:07 -0000 1.5 *************** *** 21,24 **** --- 21,27 ---- + // Developer note: due to the way filtercmd works, any config + // variables it will be parsing out of this file *must* NOT + // be in the global statement here: global $ALWAYS_CREATE, $FILTER_APP_PATH, $DEFAULT_DELIVERY, $ALLOW_UNSUBSCRIBED, $SPAMFILTER, $SPAMHEADER, $SPAMFILTERMAXKB, |
|
From: Paul L. <pdo...@us...> - 2005-07-21 07:23:48
|
Update of /cvsroot/serverfilters/serversidefilter/script In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6500 Modified Files: filtercmd.c Log Message: Parsing of PHP files now supports comment lines that start with # sign too Index: filtercmd.c =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/script/filtercmd.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** filtercmd.c 21 Jul 2005 07:10:26 -0000 1.5 --- filtercmd.c 21 Jul 2005 07:23:40 -0000 1.6 *************** *** 521,524 **** --- 521,529 ---- if (commentpos && commentpos < s) return 0; + /* look for # comment marker, making sure the # can't be + treated as a comment by the compiler */ + commentpos = strstr(line, "#"); + if (commentpos && commentpos < s) return 0; + /* skip ahead to either ' or " or a number */ s += strcspn(s, "\"'0123456789\0\n"); |
|
From: Paul L. <pdo...@us...> - 2005-07-21 07:11:01
|
Update of /cvsroot/serverfilters/serversidefilter/script In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4327 Modified Files: Makefile.ldap filtercmd.c Log Message: Fixes to get LDAP working Index: Makefile.ldap =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/script/Makefile.ldap,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.ldap 21 May 2005 19:46:19 -0000 1.2 --- Makefile.ldap 21 Jul 2005 07:10:26 -0000 1.3 *************** *** 157,162 **** # Change these as needed if you are using LDAP functionality # ! LDAP_FLAGS=-I/usr/include ! LDAP_LDFLAGS=-L/usr/lib # Point this to the LDAP configuration file --- 157,162 ---- # Change these as needed if you are using LDAP functionality # ! LDAP_FLAGS=-I/usr/local/include ! LDAP_LDFLAGS=-L/usr/local/lib -lldap -llber # Point this to the LDAP configuration file *************** *** 199,203 **** mdldapconfig.o: ldap/mdldapconfig.c Makefile ! gcc -c mysql/mdldapconfig.c $(CFLAGS) test: test.sh filtercmd --- 199,203 ---- mdldapconfig.o: ldap/mdldapconfig.c Makefile ! gcc -c ldap/mdldapconfig.c $(CFLAGS) test: test.sh filtercmd Index: filtercmd.c =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/script/filtercmd.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** filtercmd.c 17 Jun 2005 07:29:46 -0000 1.4 --- filtercmd.c 21 Jul 2005 07:10:26 -0000 1.5 *************** *** 805,817 **** mdldapconfig *ldapcfg = NULL; // Read the config ldapcfg = (mdldapconfig*)get_ldap_config(LDAPCONFIG); if ( ldapcfg ) ! if ( !(ldapcfg->hostname && ldapcfg->database && ldapcfg->dbtable) ) return ERR_LDAP_CONFIG_FILE_INCOMPLETE; // Find the user - mdldaprec *mrec = NULL; mrec = get_user_ldap(ldapcfg,(char*)user); if ( mrec ) { --- 805,817 ---- mdldapconfig *ldapcfg = NULL; + mdldaprec *mrec = NULL; // Read the config ldapcfg = (mdldapconfig*)get_ldap_config(LDAPCONFIG); if ( ldapcfg ) ! if ( !(ldapcfg->hostname) ) return ERR_LDAP_CONFIG_FILE_INCOMPLETE; // Find the user mrec = get_user_ldap(ldapcfg,(char*)user); if ( mrec ) { *************** *** 823,827 **** *uid = mrec->uidnumber; *gid = mrec->gidnumber; ! strncpy(home, mrec->homedir, buflen); free_ldap_rec(&mrec); --- 823,827 ---- *uid = mrec->uidnumber; *gid = mrec->gidnumber; ! strncpy(home, mrec->homedirectory, buflen); free_ldap_rec(&mrec); |
|
From: Paul L. <pdo...@us...> - 2005-06-22 04:36:33
|
Update of /cvsroot/serverfilters/serversidefilter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3346 Modified Files: config.php.sample Log Message: Just s reminder in the docs for ppl who only use the vacation stuff Index: config.php.sample =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/config.php.sample,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** config.php.sample 17 Jun 2005 07:29:46 -0000 1.3 --- config.php.sample 22 Jun 2005 04:36:25 -0000 1.4 *************** *** 204,207 **** --- 204,211 ---- // These are used to manage vacation type RC Files // + // Remember that you may use the [USERNAME], [DOMAIN], + // and [DOMUSER] substitutions as explained at the + // top of this file. + // // Note that no path should be given here (just the // file name) when using database lookups (see above) |
|
From: Paul L. <pdo...@us...> - 2005-06-17 09:01:01
|
Update of /cvsroot/serverfilters/serversidefilter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25874 Modified Files: version setup.php Log Message: RC1, not alpha any more Index: setup.php =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/setup.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** setup.php 17 Jun 2005 04:44:56 -0000 1.4 --- setup.php 17 Jun 2005 09:00:52 -0000 1.5 *************** *** 44,48 **** { ! return '1.5-1.2.7-alpha-2'; } --- 44,48 ---- { ! return '1.5-1.2.7-RC1'; } Index: version =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/version,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** version 17 Jun 2005 04:44:56 -0000 1.3 --- version 17 Jun 2005 09:00:52 -0000 1.4 *************** *** 1,2 **** Server Side Filter ! 1.5-1.2.7-alpha-2 --- 1,2 ---- Server Side Filter ! 1.5-1.2.7-RC1 |
|
From: Paul L. <pdo...@us...> - 2005-06-17 07:29:55
|
Update of /cvsroot/serverfilters/serversidefilter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12559 Modified Files: CHANGELOG config.php.sample Log Message: Adding delrc command to filtercmd script Index: config.php.sample =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/config.php.sample,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** config.php.sample 17 Jun 2005 04:43:52 -0000 1.2 --- config.php.sample 17 Jun 2005 07:29:46 -0000 1.3 *************** *** 21,25 **** ! global $ALWAYS_CREATE, $FILTER_FILE_PATH, $FILTER_APP_PATH, $DEFAULT_DELIVERY, $ALLOW_UNSUBSCRIBED, $SPAMFILTER, $SPAMHEADER, $SPAMFILTERMAXKB, $SPAMVALUE, $UNSUREVALUE, $VIRTUAL_DOMAINS, $LOCAL_MAILDIR, $USE_LDAP, --- 21,25 ---- ! global $ALWAYS_CREATE, $FILTER_APP_PATH, $DEFAULT_DELIVERY, $ALLOW_UNSUBSCRIBED, $SPAMFILTER, $SPAMHEADER, $SPAMFILTERMAXKB, $SPAMVALUE, $UNSUREVALUE, $VIRTUAL_DOMAINS, $LOCAL_MAILDIR, $USE_LDAP, *************** *** 37,44 **** ! // This is the full path to the filter files. Note that this ! // is ignored when using database lookups (see below). // //$FILTER_FILE_PATH = '/home/email/[DOMUSER]/users/[USERNAME]/.procmailrc'; $FILTER_FILE_PATH = '/home/email/[DOMUSER]/users/[USERNAME]/.mailfilter'; --- 37,46 ---- ! // This is the full path to the filter files. Note that this ! // must be set to the same value as $FILTER_FILE_NAME when ! // using database lookups (see below). // //$FILTER_FILE_PATH = '/home/email/[DOMUSER]/users/[USERNAME]/.procmailrc'; + //$FILTER_FILE_PATH = '.mailfilter'; $FILTER_FILE_PATH = '/home/email/[DOMUSER]/users/[USERNAME]/.mailfilter'; *************** *** 156,159 **** --- 158,163 ---- // Comment these lines out if you do not wish to have forward // files created + // Note that the path name should be identical to the file name + // when using database lookups (see below) // $FORWARD_FILE_TYPE = "qmail"; *************** *** 196,205 **** // VACATION FILE SETTINGS // // These are used to manage vacation type RC Files // ! $VAC_MSG_FILE_PATH = "xxx_vacation.txt"; ! $VAC_SUBJ_FILE_PATH = "xxx_vacation_subject.txt"; ! $VAC_CC_FILE_PATH = "xxx_vacation_cc_addresses.txt"; ! $VAC_KEEP_FILE_PATH = "xxx_vacation_keep_messages.txt"; --- 200,214 ---- // VACATION FILE SETTINGS // + + // These are used to manage vacation type RC Files // ! // Note that no path should be given here (just the ! // file name) when using database lookups (see above) ! // ! $VAC_MSG_FILE_PATH = "vacation.txt"; ! $VAC_SUBJ_FILE_PATH = "vacation_subject.txt"; ! $VAC_CC_FILE_PATH = "vacation_cc_addresses.txt"; ! $VAC_KEEP_FILE_PATH = "vacation_keep_messages.txt"; Index: CHANGELOG =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/CHANGELOG,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CHANGELOG 21 May 2005 19:46:19 -0000 1.2 --- CHANGELOG 17 Jun 2005 07:29:46 -0000 1.3 *************** *** 28,31 **** --- 28,33 ---- - Added new checkcreds_imap alternative to the UW c-client library (thanks to David Phillips <david at geektech.com>). + - Added vacation rctypes to filtercmd script as well + as delrc command to remove files. Version 1.41 |
|
From: Paul L. <pdo...@us...> - 2005-06-17 07:29:55
|
Update of /cvsroot/serverfilters/serversidefilter/script In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12559/script Modified Files: filtercmd.c Log Message: Adding delrc command to filtercmd script Index: filtercmd.c =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/script/filtercmd.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** filtercmd.c 17 Jun 2005 04:43:52 -0000 1.3 --- filtercmd.c 17 Jun 2005 07:29:46 -0000 1.4 *************** *** 7,10 **** --- 7,11 ---- * filtercmd getrc rctype > temprcfile < credentials * filtercmd putrc rctype < credentials < temprcfile + * filtercmd delrc rctype < credentials * filtercmd rcexists rctype < credentials * *************** *** 12,16 **** * * The filtercmd program allows an unpriviledged program ! * (squirrelmail) to work with users' mail filtering configuration * files. The format of the mail filtering configuration files is not * parsed in any way. This program only handles reading and writing --- 13,17 ---- * * The filtercmd program allows an unpriviledged program ! * (SquirrelMail) to work with users' mail filtering configuration * files. The format of the mail filtering configuration files is not * parsed in any way. This program only handles reading and writing *************** *** 26,29 **** --- 27,32 ---- * reading the credentials, and replace the existing rcfile. * + * The delrc command will remove the rc file if it exists. + * * The rcexists command will return a zero exit status if the rc file exists, * non-zero otherwise. *************** *** 109,113 **** #define STR_MAX 1024 #define MAXLEN 1024 ! #define VERSION "filtercmd 1.41, part of serversidefilter for squirrelmail" /* define this in filtercmd.opts */ --- 112,116 ---- #define STR_MAX 1024 #define MAXLEN 1024 ! #define VERSION "filtercmd 1.5, part of serversidefilter for squirrelmail" /* define this in filtercmd.opts */ *************** *** 273,276 **** --- 276,288 ---- return putrc(filter_file, UID, GID); + } else if (!strcmp("delrc", cmd)) { + if (argc < 3) { + printf("Usage: filtercmd delrc filter_file\n"); + return ERR_USAGE; + } + err = findfilterfile(argv[2], filter_file, STR_MAX); + if (err) return inerror(err); + + return delrc(filter_file); } else if (!strcmp("rcexists", cmd)) { if (argc < 3) { *************** *** 285,289 **** return inerror(ERR_INVALID_COMMAND); } else { ! printf("Usage: filtercmd [getrc|putrc|rcexists]\n"); return ERR_USAGE; } --- 297,301 ---- return inerror(ERR_INVALID_COMMAND); } else { ! printf("Usage: filtercmd [getrc|putrc|delrc|rcexists]\n"); return ERR_USAGE; } *************** *** 546,549 **** --- 558,569 ---- + int delrc(char* filter_file) + { + int result; + + result = unlink(filter_file); + return result; + } + int getrc(char* filter_file) { |
|
From: Paul L. <pdo...@us...> - 2005-06-17 06:17:37
|
Update of /cvsroot/serverfilters/serversidefilter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8981 Modified Files: options.php Log Message: missed one - removing most reliance on compatibility plugin Index: options.php =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/options.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** options.php 17 Jun 2005 02:53:44 -0000 1.2 --- options.php 17 Jun 2005 06:17:28 -0000 1.3 *************** *** 54,58 **** // get global variables for versions of PHP < 4.1 // ! if (!compatibility_check_php_version(4, 1)) { global $HTTP_COOKIE_VARS, $HTTP_POST_VARS; $_COOKIE = $HTTP_COOKIE_VARS; --- 54,58 ---- // get global variables for versions of PHP < 4.1 // ! if (!check_php_version(4, 1)) { global $HTTP_COOKIE_VARS, $HTTP_POST_VARS; $_COOKIE = $HTTP_COOKIE_VARS; |
|
From: Paul L. <pdo...@us...> - 2005-06-17 04:45:05
|
Update of /cvsroot/serverfilters/serversidefilter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2264 Modified Files: setup.php version Log Message: upping version Index: setup.php =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/setup.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** setup.php 16 Jun 2005 18:38:52 -0000 1.3 --- setup.php 17 Jun 2005 04:44:56 -0000 1.4 *************** *** 44,48 **** { ! return '1.5-1.2.7-alpha-1'; } --- 44,48 ---- { ! return '1.5-1.2.7-alpha-2'; } Index: version =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/version,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** version 21 May 2005 19:46:19 -0000 1.2 --- version 17 Jun 2005 04:44:56 -0000 1.3 *************** *** 1,2 **** Server Side Filter ! 1.5-1.2.7-alpha-1 --- 1,2 ---- Server Side Filter ! 1.5-1.2.7-alpha-2 |
|
From: Paul L. <pdo...@us...> - 2005-06-17 04:44:01
|
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 |
|
From: Paul L. <pdo...@us...> - 2005-06-17 04:44:00
|
Update of /cvsroot/serverfilters/serversidefilter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2004 Modified Files: config.php.sample Log Message: Adding vacation file rc types Index: config.php.sample =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/config.php.sample,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** config.php.sample 21 May 2005 09:13:18 -0000 1.1.1.1 --- config.php.sample 17 Jun 2005 04:43:52 -0000 1.2 *************** *** 192,194 **** --- 192,207 ---- + /////////////////////////////////////////////////////////////////////////// + // + // VACATION FILE SETTINGS + // + // These are used to manage vacation type RC Files + // + $VAC_MSG_FILE_PATH = "xxx_vacation.txt"; + $VAC_SUBJ_FILE_PATH = "xxx_vacation_subject.txt"; + $VAC_CC_FILE_PATH = "xxx_vacation_cc_addresses.txt"; + $VAC_KEEP_FILE_PATH = "xxx_vacation_keep_messages.txt"; + + + ?> |
|
From: Paul L. <pdo...@us...> - 2005-06-17 02:53:53
|
Update of /cvsroot/serverfilters/serversidefilter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13246 Modified Files: options.php Log Message: Don't need compatibility's global var fxn any more... see new version of that plugin Index: options.php =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/options.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** options.php 21 May 2005 09:13:18 -0000 1.1.1.1 --- options.php 17 Jun 2005 02:53:44 -0000 1.2 *************** *** 22,31 **** // include compatibility plugin // ! if (defined('SM_PATH')) ! include_once(SM_PATH . 'plugins/compatibility/functions.php'); ! else if (file_exists('../plugins/compatibility/functions.php')) ! include_once('../plugins/compatibility/functions.php'); ! else if (file_exists('./plugins/compatibility/functions.php')) ! include_once('./plugins/compatibility/functions.php'); --- 22,26 ---- // include compatibility plugin // ! include_once(SM_PATH . 'plugins/compatibility/functions.php'); *************** *** 54,59 **** global $spamrule_set, $unsurerule_set; ! compatibility_sqextractGlobalVar('onetimepad'); ! compatibility_sqextractGlobalVar('delimiter'); // get global variables for versions of PHP < 4.1 --- 49,54 ---- global $spamrule_set, $unsurerule_set; ! sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION); ! sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION); // get global variables for versions of PHP < 4.1 |
