Menu
▾
▴
[Serverfilters-commit] README,1.5,1.6 backend.php,1.9,1.10 config.php,1.9,1.10 options.php,1.7,1.8 package,1.6,1.7 recipie_functions.php,1.4,1.5 setup.php,1.1.1.1,1.2 version,1.1.1.1,1.2
Update of /cvsroot/serverfilters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29133 Modified Files: README backend.php config.php options.php package recipie_functions.php setup.php version Log Message: Several bugfixes and feature changes Index: backend.php =================================================================== RCS file: /cvsroot/serverfilters/backend.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** backend.php 12 Jan 2004 15:45:33 -0000 1.9 --- backend.php 22 Feb 2004 21:20:16 -0000 1.10 *************** *** 63,67 **** //DEBUG: uncomment to help debug problems ! //if ($result) echo("$command -> $result<br>\n"); return $result; --- 63,67 ---- //DEBUG: uncomment to help debug problems ! if ($result) echo("$command -> $result<br>\n"); return $result; *************** *** 119,123 **** function procmail_write_filter_recipie($fd, $action, $field, $string, $folder, $toFolder, $toAddress, $add_string) { ! global $default_folder_prefix, $optional_delimiter, $USE_MAILDIRS; if ($action == "m") --- 119,123 ---- function procmail_write_filter_recipie($fd, $action, $field, $string, $folder, $toFolder, $toAddress, $add_string) { ! global $default_folder_prefix, $USE_MAILDIRS; if ($action == "m") Index: config.php =================================================================== RCS file: /cvsroot/serverfilters/config.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** config.php 25 Dec 2003 02:17:53 -0000 1.9 --- config.php 22 Feb 2004 21:20:16 -0000 1.10 *************** *** 71,75 **** $SPAMHEADER = 'X-Spam-Flag'; $SPAMVALUE = 'Yes'; ! //$SPAMFILTER= '/usr/bin/sb_filter.py -f'; //$SPAMHEADER = 'X-SpamBayes-Classification'; //$SPAMVALUE = 'spam'; --- 71,75 ---- $SPAMHEADER = 'X-Spam-Flag'; $SPAMVALUE = 'Yes'; ! //$SPAMFILTER= '/usr/bin/sb_filter.py'; //$SPAMHEADER = 'X-SpamBayes-Classification'; //$SPAMVALUE = 'spam'; *************** *** 121,125 **** $CREATE_DOT_FORWARD = false; ! $DOT_FORWARD_DIR = "/home/[USERNAME]/"; ?> --- 121,125 ---- $CREATE_DOT_FORWARD = false; ! $DOT_FORWARD_DIR = "/home/email/[DOMUSER]/"; ?> Index: options.php =================================================================== RCS file: /cvsroot/serverfilters/options.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** options.php 11 Dec 2003 15:51:40 -0000 1.7 --- options.php 22 Feb 2004 21:20:16 -0000 1.8 *************** *** 43,47 **** global $username, $key, $imapServerAddress, $imapPort; ! global $fields, $folders, $imapConnection, $imap_stream; global $recipies, $SPAMHEADER, $SPAMVALUE, $UNSUREVALUE; --- 43,47 ---- global $username, $key, $imapServerAddress, $imapPort; ! global $fields, $matching, $folders, $imapConnection, $imap_stream; global $recipies, $SPAMHEADER, $SPAMVALUE, $UNSUREVALUE; *************** *** 60,63 **** --- 60,64 ---- $fields = array("From", "Subject", "To", "Cc", "TO_"); + $matching = array("Conatains", "Begins with", "Ends With", "Is Exactly"); $spamrule_set = false; $unsurerule_set = false; *************** *** 190,194 **** <input type=hidden name="create.x" value="<?php print($value++)?>"> <tr><td align=right valign=top> ! <?php echo _("If") . " "; echo fieldDropdown('') . " " . _("contains") . " <input type=text name=string size=10> " . _("then") . " " ?> <select name=action> <option value=m>move</option> --- 191,195 ---- <input type=hidden name="create.x" value="<?php print($value++)?>"> <tr><td align=right valign=top> ! <?php echo _("If") . " "; echo fieldDropdown('') . " " . echo matchingDropdown('') . " <input type=text name=string size=10> " . _("then") . " " ?> <select name=action> <option value=m>move</option> Index: package =================================================================== RCS file: /cvsroot/serverfilters/package,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** package 9 Dec 2003 20:05:53 -0000 1.6 --- package 22 Feb 2004 21:20:16 -0000 1.7 *************** *** 1,3 **** --- 1,7 ---- #!/bin/sh + if [ -e serversidefilter ] ; then + rm -rf serversidefilter + fi + mkdir serversidefilter mkdir serversidefilter/script *************** *** 19,31 **** cp config.php serversidefilter/config.php.sample ! cp setup.php options.php functions.php backend.php ChangeLog index.php README virtualdomains.sample recipie_functions.php version serversidefilter/ cp images/*.gif serversidefilter/images ! cp script/filtercmd.c serversidefilter/script/ chown -R apache.apache serversidefilter/ ! gcc -o serversidefilter/script/filtercmd script/filtercmd.c ! chown root.apache serversidefilter/script/filtercmd ! chmod 4750 serversidefilter/script/filtercmd tar czvf ../serversidefilter-$VERSION.tar.gz serversidefilter/ --- 23,35 ---- cp config.php serversidefilter/config.php.sample ! cp setup.php options.php functions.php backend.php ChangeLog FAQ index.php README virtualdomains.sample recipie_functions.php version serversidefilter/ cp images/*.gif serversidefilter/images ! cp script/* serversidefilter/script/ chown -R apache.apache serversidefilter/ ! cd serversidefilter/script/ ! make ! cd ../../ tar czvf ../serversidefilter-$VERSION.tar.gz serversidefilter/ Index: recipie_functions.php =================================================================== RCS file: /cvsroot/serverfilters/recipie_functions.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** recipie_functions.php 11 Dec 2003 16:28:51 -0000 1.4 --- recipie_functions.php 22 Feb 2004 21:20:16 -0000 1.5 *************** *** 59,62 **** --- 59,78 ---- } + + function matchingDropdown($str) { + global $matching; + + print("<select name=matching>\n"); + + for ($i = 0; $i < count($matching); $i++) { + print("<option value=\"$i\""); + if ($matching[$i] == $str) + print(" selected"); + print(">$matching[$i]</option>\n"); + } + + print("</select>\n"); + } + function read_recipies($file) { global $recipies, $spamrule_set, $unsurerule_set, $SPAMHEADER, $SPAMVALUE, $UNSUREVALUE; Index: setup.php =================================================================== RCS file: /cvsroot/serverfilters/setup.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** setup.php 4 Dec 2003 23:15:04 -0000 1.1.1.1 --- setup.php 22 Feb 2004 21:20:17 -0000 1.2 *************** *** 28,32 **** function serversidefilter_version() { ! return '1.33'; } --- 28,32 ---- function serversidefilter_version() { ! return '1.40beta1'; } Index: version =================================================================== RCS file: /cvsroot/serverfilters/version,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** version 4 Dec 2003 23:15:05 -0000 1.1.1.1 --- version 22 Feb 2004 21:20:17 -0000 1.2 *************** *** 1,2 **** Serverside Filter Configuration ! 1.33 --- 1,2 ---- Serverside Filter Configuration ! 1.40beta1 |
