serverfilters-commit — CVS Commits

[Serverfilters-commit] script Makefile,1.6,1.7

[<jgs...@us...>]

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

Modified Files:
	Makefile 
Log Message:
Simplified options



Index: Makefile
===================================================================
RCS file: /cvsroot/serverfilters/script/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile	2 Mar 2004 03:20:30 -0000	1.6
--- Makefile	2 Mar 2004 03:24:19 -0000	1.7
***************
*** 14,21 ****
  #CFLAGS=-DDEBUG
  
  #LFLAGS=
  LFLAGS=-static 
- #STATICLIBS=
- STATICLIBS=-lkrb5 -lresolv -lcom_err -ldl -lz -lcrypto -lk5crypto
  
  # Edit the location of the squirrelmail config file here.
--- 14,21 ----
  #CFLAGS=-DDEBUG
  
+ # Use the following argument to tell the linker to make
+ # a statically linked binary
  #LFLAGS=
  LFLAGS=-static 
  
  # Edit the location of the squirrelmail config file here.
***************
*** 41,45 ****
  
  # You may need to adjust the following line.
! LIBS=/usr/lib/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt $(STATICLIBS)
  
  # This directory should contain a file named mail.h
--- 41,45 ----
  
  # You may need to adjust the following line.
! LIBS=/usr/lib/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt -lkrb5 -lresolv -lcom_err -ldl -lz -lcrypto -lk5crypto 
  
  # This directory should contain a file named mail.h

[Serverfilters-commit] script Makefile,1.5,1.6

[<jgs...@us...>]

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

Modified Files:
	Makefile 
Log Message:
Made changes to makefile to create a statically linked binary.


Index: Makefile
===================================================================
RCS file: /cvsroot/serverfilters/script/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile	29 Feb 2004 22:56:11 -0000	1.5
--- Makefile	2 Mar 2004 03:20:30 -0000	1.6
***************
*** 14,17 ****
--- 14,22 ----
  #CFLAGS=-DDEBUG
  
+ #LFLAGS=
+ LFLAGS=-static 
+ #STATICLIBS=
+ STATICLIBS=-lkrb5 -lresolv -lcom_err -ldl -lz -lcrypto -lk5crypto
+ 
  # Edit the location of the squirrelmail config file here.
  SQUIRRELMAILCONFIGFILE=/etc/squirrelmail/config.php
***************
*** 36,40 ****
  
  # You may need to adjust the following line.
! LIBS=/usr/lib/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt
  
  # This directory should contain a file named mail.h
--- 41,45 ----
  
  # You may need to adjust the following line.
! LIBS=/usr/lib/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt $(STATICLIBS)
  
  # This directory should contain a file named mail.h
***************
*** 64,68 ****
  
  filtercmd: filtercmd.o Makefile $(CHECKCREDS)
! 	gcc -o filtercmd filtercmd.o $(CHECKCREDS) $(LIBS) 
  	chmod 4750 filtercmd
  	chown root:$(HTTPD_GROUP) filtercmd
--- 69,73 ----
  
  filtercmd: filtercmd.o Makefile $(CHECKCREDS)
! 	gcc -o filtercmd filtercmd.o $(CHECKCREDS) $(LIBS) $(LFLAGS) 
  	chmod 4750 filtercmd
  	chown root:$(HTTPD_GROUP) filtercmd

[Serverfilters-commit] script test.sh,1.6,1.7

[<jgs...@us...>]

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

Modified Files:
	test.sh 
Log Message:
Improved script to make more user friendly.


Index: test.sh
===================================================================
RCS file: /cvsroot/serverfilters/script/test.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** test.sh	1 Mar 2004 16:17:07 -0000	1.6
--- test.sh	2 Mar 2004 02:56:02 -0000	1.7
***************
*** 18,35 ****
  cat $SCRIPTDIR/test_creds | $SCRIPTDIR/filtercmd getrc filter > $SCRIPTDIR/filter; 
  if [ $? == '0' ] ; then
!    echo "Pass"
  else
     echo "RESULT:" $?
  fi;
  echo '# filtercmd testing ' >> $SCRIPTDIR/filter
! cat $SCRIPTDIR/test_creds | $SCRIPTDIR/filtercmd putrc filter;
  if [ $? == '0' ] ; then
!    echo "Pass"
  else
     echo "RESULT:" $?
  fi;
! cat $SCRIPTDIR/test_creds | $SCRIPTDIR/filtercmd getrc filter;
  if [ $? == '0' ] ; then
!    echo "Pass"
  else
     echo "RESULT:" $?
--- 18,45 ----
  cat $SCRIPTDIR/test_creds | $SCRIPTDIR/filtercmd getrc filter > $SCRIPTDIR/filter; 
  if [ $? == '0' ] ; then
!    echo "Pass: Filter get"
  else
     echo "RESULT:" $?
  fi;
+ cp $SCRIPTDIR/filter $SCRIPTDIR/filter.orig
  echo '# filtercmd testing ' >> $SCRIPTDIR/filter
! cat $SCRIPTDIR/test_creds $SCRIPTDIR/filter | $SCRIPTDIR/filtercmd putrc filter;
! rm $SCRIPTDIR/filter
  if [ $? == '0' ] ; then
!    echo "Pass: Filter put"
  else
     echo "RESULT:" $?
  fi;
! cat $SCRIPTDIR/test_creds | $SCRIPTDIR/filtercmd getrc filter > $SCRIPTDIR/filter;
  if [ $? == '0' ] ; then
!    command=`grep "filtercmd testing" $SCRIPTDIR/filter`;
!    if [ -n "$command" ] ; then
!       echo "Pass: You are able to correctly retrieve and save your filter file."
!       echo "      Your filter file is saved in the current directory as 'filter'"
!       cat $SCRIPTDIR/test_creds $SCRIPTDIR/filter.orig | $SCRIPTDIR/filtercmd putrc filter 2> /dev/null;
!       mv $SCRIPTDIR/filter.orig $SCRIPTDIR/filter
!    else
!       echo "Fail: A problem occurred saving your filter file"
!    fi;
  else
     echo "RESULT:" $?

[Serverfilters-commit] README,1.11,1.12 backend.php,1.18,1.19 recipie_functions.php,1.11,1.12

[<jgs...@us...>]

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

Modified Files:
	README backend.php recipie_functions.php 
Log Message:
Added skeleton file stuff.
Fixed several bugs.


Index: backend.php
===================================================================
RCS file: /cvsroot/serverfilters/backend.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** backend.php	1 Mar 2004 07:06:59 -0000	1.18
--- backend.php	1 Mar 2004 17:24:00 -0000	1.19
***************
*** 25,29 ****
        $result = invoke_filtercmd("getrc filter", "", $localfile);
     } else {
!       touch($localfile);
     }
     return $localfile;
--- 25,30 ----
        $result = invoke_filtercmd("getrc filter", "", $localfile);
     } else {
!      create_filter();
!      local_filter_get();
     }
     return $localfile;
***************
*** 40,44 ****
  function local_filter_put($file) {
     $err_code = invoke_filtercmd("putrc filter", $file, "");
!    unlink($file);
  }
  
--- 41,45 ----
  function local_filter_put($file) {
     $err_code = invoke_filtercmd("putrc filter", $file, "");
!    //unlink($file);
  }
  
***************
*** 131,143 ****
           $location = "H";
           break;
!       case "Body" :
           $field = "";
           $location = "B";
           break;
!       case "Any Header" :
           $field = "";
           $location = "H";
           break;
!       case "Any part of Message" :
          $field = "";
          $location = "HB";
--- 132,144 ----
           $location = "H";
           break;
!       case _("Body") :
           $field = "";
           $location = "B";
           break;
!       case _("Any Header") :
           $field = "";
           $location = "H";
           break;
!       case _("Anywhere") :
          $field = "";
          $location = "HB";
***************
*** 151,175 ****
     $string = preg_quote($string);
     switch ($matching) {
!       case "Contains" :
           $prefix = ".*";
           $suffix = "";
           break;
!       case "Begins With" :
           $prefix = " ";
           $suffix = "";
           break;
!       case "Ends With" :
           $prefix = ".*";
           $suffix = "$";
           break;
!       case "Is Exactly" :
          $prefix = " ";
          $suffix = "$";
          break;
!       case "Custom" :
          $prefix = "";
          $suffix = "";
          $string = stripslashes($string);
          break;
     }
     fputs($fd, ":0${location}${procaction1}\n* ${field}${prefix}${string}${suffix}\n${copystring}\n");
--- 152,180 ----
     $string = preg_quote($string);
     switch ($matching) {
!       case _("Contains") :
           $prefix = ".*";
           $suffix = "";
           break;
!       case _("Begins With") :
           $prefix = " ";
           $suffix = "";
           break;
!       case _("Ends With") :
           $prefix = ".*";
           $suffix = "$";
           break;
!       case _("Is Exactly") :
          $prefix = " ";
          $suffix = "$";
          break;
!       case _("Matches Regex") :
          $prefix = "";
          $suffix = "";
          $string = stripslashes($string);
          break;
+       default :
+         $prefix = ".*";
+         $suffix = "";
+         break;
     }
     fputs($fd, ":0${location}${procaction1}\n* ${field}${prefix}${string}${suffix}\n${copystring}\n");
***************
*** 244,256 ****
           $location = "h";
           break;
!       case "Body" :
           $field = "";
           $location = "b";
           break;
!       case "Any Header" :
           $field = "";
           $location = "h";
           break;
!       case "Any part of Message" :
          $field = "";
          $location = "w";
--- 249,261 ----
           $location = "h";
           break;
!       case _("Body") :
           $field = "";
           $location = "b";
           break;
!       case _("Any Header") :
           $field = "";
           $location = "h";
           break;
!       case _("Anywhere") :
          $field = "";
          $location = "w";
***************
*** 264,288 ****
     $string = preg_quote($string);
     switch ($matching) {
!       case "Contains" :
           $prefix = ".*";
           $suffix = "";
           break;
!       case "Begins With" :
           $prefix = " ";
           $suffix = "";
           break;
!       case "Ends With" :
           $prefix = ".*";
           $suffix = "$";
           break;
!       case "Is Exactly" :
          $prefix = " ";
          $suffix = "$";
          break;
!       case "Custom" :
          $prefix = "";
          $suffix = "";
          $string = stripslashes($string);
          break;
     }
     fputs($fd, "if (/${field}${prefix}${string}${suffix}/:${location})\n{\n${copystring}\n}\n");
--- 269,297 ----
     $string = preg_quote($string);
     switch ($matching) {
!       case _("Contains") :
           $prefix = ".*";
           $suffix = "";
           break;
!       case _("Begins With") :
           $prefix = " ";
           $suffix = "";
           break;
!       case _("Ends With") :
           $prefix = ".*";
           $suffix = "$";
           break;
!       case _("Is Exactly") :
          $prefix = " ";
          $suffix = "$";
          break;
!       case _("Matches Regex") :
          $prefix = "";
          $suffix = "";
          $string = stripslashes($string);
          break;
+       default :
+         $prefix = ".*";
+         $suffix = "";
+         break;
     }
     fputs($fd, "if (/${field}${prefix}${string}${suffix}/:${location})\n{\n${copystring}\n}\n");

Index: recipie_functions.php
===================================================================
RCS file: /cvsroot/serverfilters/recipie_functions.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** recipie_functions.php	1 Mar 2004 14:56:05 -0000	1.11
--- recipie_functions.php	1 Mar 2004 17:24:00 -0000	1.12
***************
*** 203,206 ****
--- 203,220 ----
  		$nf = fopen($file, "w");
  
+                 $header = "";
+                 $footer = "";
+                 if (file_exists("../plugins/serversidefilter/skeleton/header")) {
+                     $header_ary = file("../plugins/serversidefilter/skeleton/header"); 
+                     foreach ($header_ary as $line)
+                         $header = $header . $line;
+                 }
+                 if (file_exists("../plugins/serversidefilter/skeleton/footer")) {
+                     $footer_ary = file("../plugins/serversidefilter/skeleton/footer");
+                     foreach ($footer_ary as $line)
+                         $footer = $footer . $line;
+                 }
+ 
+                 fputs($nf, $header);
  		fputs($nf, "##Begin Filter Configuration -- Please do not edit by hand, use SquirrelMail\n");
  		fputs($nf, "MAILDIR=$MAILDIR # Default mail directory\n");
***************
*** 211,217 ****
                  write_default_recipie($nf);
  		fputs($nf, "\n##End Filter Configuration\n");
  		fclose($nf);
  		filter_put($file);
-                 unlink($file);
                  if (isset($FORWARD_FILE_PATH))
                      write_forward();
--- 225,231 ----
                  write_default_recipie($nf);
  		fputs($nf, "\n##End Filter Configuration\n");
+                 fputs($nf, $footer);
  		fclose($nf);
  		filter_put($file);
                  if (isset($FORWARD_FILE_PATH))
                      write_forward();

[Serverfilters-commit] skeleton footer.sample,NONE,1.1 header.sample,NONE,1.1

[<jgs...@us...>]

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

Added Files:
	footer.sample header.sample 
Log Message:
Added skeleton file stuff.
Fixed several bugs.


--- NEW FILE: footer.sample ---
#Sample footer file for maildrop
log "Mail delivered!! Woohoo!"

--- NEW FILE: header.sample ---
#Sample header file for Maildrop
#turn logging on
logfile /var/log/filter

[Serverfilters-commit] skeleton - New directory

[<jgs...@us...>]

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

Log Message:
Directory /cvsroot/serverfilters/skeleton added to the repository

[Serverfilters-commit] README,1.10,1.11

[<jgs...@us...>]

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

Modified Files:
	README 
Log Message:
Updated installation procedure.
Added comment in debugging section on how to use script/test.sh

[Serverfilters-commit] script test.sh,1.5,1.6

[<jgs...@us...>]

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

Modified Files:
	test.sh 
Log Message:
Made test.sh more user friendly.


Index: test.sh
===================================================================
RCS file: /cvsroot/serverfilters/script/test.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** test.sh	29 Feb 2004 22:55:55 -0000	1.5
--- test.sh	1 Mar 2004 16:17:07 -0000	1.6
***************
*** 3,8 ****
  # need a valid username/password for testing
  if [ ! -s test_creds ]; then 
!   echo Enter a valid IMAP username and password on separate lines:
!   head -2 > test_creds
  fi
  
--- 3,10 ----
  # need a valid username/password for testing
  if [ ! -s test_creds ]; then 
!   read -p "IMAP username: " USER
!   read -p "IMAP password: " PASS
!   echo $USER > test_creds
!   echo $PASS >> test_creds
  fi
  
***************
*** 14,21 ****
  
  cd $RUNFROM
! cat $SCRIPTDIR/test_creds | $SCRIPTDIR/filtercmd getrc filter > $SCRIPTDIR/filter; echo "RESULT:" $?
  echo '# filtercmd testing ' >> $SCRIPTDIR/filter
! cat $SCRIPTDIR/test_creds | $SCRIPTDIR/filtercmd putrc filter; echo "RESULT:" $?
! cat $SCRIPTDIR/test_creds | $SCRIPTDIR/filtercmd getrc filter; echo "RESULT:" $?
  
  echo If you do not need to perform additional tests, remove the file 'test_creds'
--- 16,48 ----
  
  cd $RUNFROM
! cat $SCRIPTDIR/test_creds | $SCRIPTDIR/filtercmd getrc filter > $SCRIPTDIR/filter; 
! if [ $? == '0' ] ; then
!    echo "Pass"
! else
!    echo "RESULT:" $?
! fi;
  echo '# filtercmd testing ' >> $SCRIPTDIR/filter
! cat $SCRIPTDIR/test_creds | $SCRIPTDIR/filtercmd putrc filter;
! if [ $? == '0' ] ; then
!    echo "Pass"
! else
!    echo "RESULT:" $?
! fi;
! cat $SCRIPTDIR/test_creds | $SCRIPTDIR/filtercmd getrc filter;
! if [ $? == '0' ] ; then
!    echo "Pass"
! else
!    echo "RESULT:" $?
! fi;
! 
  
  echo If you do not need to perform additional tests, remove the file 'test_creds'
+ REMOVE=x
+ while [ $REMOVE != 'y' ] && [ $REMOVE != 'Y' ] && 
+       [ $REMOVE != 'n' ] && [ $REMOVE != 'N' ] ; do
+    read -p "Remove now? (Y/n): " REMOVE
+ done;
+ 
+ if [ $REMOVE == 'y' ] || [ $REMOVE == 'Y' ] ; then
+    rm $SCRIPTDIR/test_creds
+ fi;

[Serverfilters-commit] script filtercmd.c,1.13,1.14

[<jgs...@us...>]

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

Modified Files:
	filtercmd.c 
Log Message:
Made trusted file check always write error messages, not just when debug
is on.


Index: filtercmd.c
===================================================================
RCS file: /cvsroot/serverfilters/script/filtercmd.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** filtercmd.c	1 Mar 2004 14:02:03 -0000	1.13
--- filtercmd.c	1 Mar 2004 16:16:36 -0000	1.14
***************
*** 680,686 ****
  
  int trusted_error(char *err, char *path, char *file) {
! 	#ifdef DEBUG
  	fprintf(stderr, "trust error on %s while checking %s\n  %s\n", path, file, err);
! 	#endif
  	return ERR_CANT_TRUST_FILE;
  }
--- 680,686 ----
  
  int trusted_error(char *err, char *path, char *file) {
! 	//#ifdef DEBUG
  	fprintf(stderr, "trust error on %s while checking %s\n  %s\n", path, file, err);
! 	//#endif
  	return ERR_CANT_TRUST_FILE;
  }

[Serverfilters-commit] migrate_config.php,1.1,1.2

[<ton...@us...>]

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

Modified Files:
	migrate_config.php 
Log Message:
Takes a single command line argument, the old config.php file. Produces an output file, config.php.new, instead of writing to stdout. Comments are copied from distributed config.php.

[Serverfilters-commit] options.php,1.18,1.19 recipie_functions.php,1.10,1.11 serversidefilter.pot,1.1,1.2

[<jgs...@us...>]

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

Modified Files:
	options.php recipie_functions.php serversidefilter.pot 
Log Message:
More i18n changes.


Index: recipie_functions.php
===================================================================
RCS file: /cvsroot/serverfilters/recipie_functions.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** recipie_functions.php	1 Mar 2004 07:06:59 -0000	1.10
--- recipie_functions.php	1 Mar 2004 14:56:05 -0000	1.11
***************
*** 34,38 ****
  				print(" selected");
  			if ($fields[$i] == "TO_")
! 				print(">To or Cc</option>\n");
  			else
  				print(">$fields[$i]</option>\n");
--- 34,38 ----
  				print(" selected");
  			if ($fields[$i] == "TO_")
! 				print(">" . _("To or Cc") . "</option>\n");
  			else
  				print(">$fields[$i]</option>\n");

Index: serversidefilter.pot
===================================================================
RCS file: /cvsroot/serverfilters/serversidefilter.pot,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** serversidefilter.pot	1 Mar 2004 06:26:42 -0000	1.1
--- serversidefilter.pot	1 Mar 2004 14:56:05 -0000	1.2
***************
*** 8,12 ****
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
! "POT-Creation-Date: 2004-02-29 23:27-0600\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
--- 8,12 ----
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
! "POT-Creation-Date: 2004-03-01 09:01-0600\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
***************
*** 16,93 ****
  "Content-Transfer-Encoding: 8bit\n"
  
! #: options.php:188
  msgid "Options"
  msgstr ""
  
! #: options.php:188 setup.php:29
  msgid "Mail Filters"
  msgstr ""
  
! #: options.php:195
  msgid "Enter A New Filter:"
  msgstr ""
  
! #: options.php:200 recipie_functions.php:247
  msgid "If"
  msgstr ""
  
! #: options.php:203 options.php:237 options.php:259 recipie_functions.php:241
  #: recipie_functions.php:244 recipie_functions.php:250
  msgid "then"
  msgstr ""
  
! #: options.php:206 options.php:239 recipie_functions.php:255
! #: recipie_functions.php:257
  msgid "move"
  msgstr ""
  
! #: options.php:207 options.php:240 recipie_functions.php:255
! #: recipie_functions.php:257
  msgid "copy"
  msgstr ""
  
! #: options.php:212 options.php:243 options.php:265 recipie_functions.php:262
! msgid "Folder"
  msgstr ""
  
! #: options.php:216 options.php:246 options.php:268 recipie_functions.php:265
! msgid "Email"
  msgstr ""
  
! #: options.php:225
! msgid ""
! "Selecting \"Custom\" allows you to enter your own Regular Expression (ie: "
! "you use wildcard characters such as"
  msgstr ""
  
! #: options.php:237 options.php:259
  msgid "if message is marked as"
  msgstr ""
  
! #: options.php:237 recipie_functions.php:244
  msgid "SPAM"
  msgstr ""
  
! #: options.php:242 options.php:264 recipie_functions.php:259
  msgid "to"
  msgstr ""
  
! #: options.php:250
  msgid "save new"
  msgstr ""
  
! #: options.php:259 recipie_functions.php:241
  msgid "UNSURE"
  msgstr ""
  
! #: options.php:276
  msgid "Existing Filters:"
  msgstr ""
  
! #: options.php:283
  msgid "Notice:"
  msgstr ""
  
! #: options.php:283
  msgid ""
  "Use of these filters may prevent the reading of mail in non-IMAP mail "
--- 16,140 ----
  "Content-Transfer-Encoding: 8bit\n"
  
! #: options.php:62
! msgid "From"
! msgstr ""
! 
! #: options.php:62
! msgid "Subject"
! msgstr ""
! 
! #: options.php:62
! msgid "To"
! msgstr ""
! 
! #: options.php:62
! msgid "Cc"
! msgstr ""
! 
! #: options.php:62
! msgid "Body"
! msgstr ""
! 
! #: options.php:62
! msgid "Any Header"
! msgstr ""
! 
! #: options.php:62
! msgid "Anywhere"
! msgstr ""
! 
! #: options.php:63
! msgid "Contains"
! msgstr ""
! 
! #: options.php:63
! msgid "Begins With"
! msgstr ""
! 
! #: options.php:63
! msgid "Ends With"
! msgstr ""
! 
! #: options.php:63
! msgid "Is Exactly"
! msgstr ""
! 
! #: options.php:63
! msgid "Matches Regex"
! msgstr ""
! 
! #: options.php:201
  msgid "Options"
  msgstr ""
  
! #: options.php:201 setup.php:29
  msgid "Mail Filters"
  msgstr ""
  
! #: options.php:208
  msgid "Enter A New Filter:"
  msgstr ""
  
! #: options.php:213 recipie_functions.php:247
  msgid "If"
  msgstr ""
  
! #: options.php:216 options.php:248 options.php:271 recipie_functions.php:241
  #: recipie_functions.php:244 recipie_functions.php:250
  msgid "then"
  msgstr ""
  
! #: options.php:219 options.php:250 recipie_functions.php:255
! #: recipie_functions.php:257 recipie_functions.php:259
  msgid "move"
  msgstr ""
  
! #: options.php:220 options.php:251 recipie_functions.php:255
! #: recipie_functions.php:257 recipie_functions.php:259
  msgid "copy"
  msgstr ""
  
! #: options.php:221 options.php:252 recipie_functions.php:255
! #: recipie_functions.php:257 recipie_functions.php:259
! msgid "delete"
  msgstr ""
  
! #: options.php:226 options.php:255 options.php:277 recipie_functions.php:264
! msgid "Folder"
  msgstr ""
  
! #: options.php:230 options.php:258 options.php:280 recipie_functions.php:267
! msgid "Email"
  msgstr ""
  
! #: options.php:248 options.php:271
  msgid "if message is marked as"
  msgstr ""
  
! #: options.php:248 recipie_functions.php:244
  msgid "SPAM"
  msgstr ""
  
! #: options.php:254 options.php:276 recipie_functions.php:261
  msgid "to"
  msgstr ""
  
! #: options.php:262
  msgid "save new"
  msgstr ""
  
! #: options.php:271 recipie_functions.php:241
  msgid "UNSURE"
  msgstr ""
  
! #: options.php:288
  msgid "Existing Filters:"
  msgstr ""
  
! #: options.php:295
  msgid "Notice:"
  msgstr ""
  
! #: options.php:295
  msgid ""
  "Use of these filters may prevent the reading of mail in non-IMAP mail "
***************
*** 95,98 ****
--- 142,149 ----
  msgstr ""
  
+ #: recipie_functions.php:36
+ msgid "To or Cc"
+ msgstr ""
+ 
  #: recipie_functions.php:241 recipie_functions.php:244
  msgid "If message is marked as"

[Serverfilters-commit] script filtercmd.opts,1.2,NONE

[<ton...@us...>]

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

Removed Files:
	filtercmd.opts 
Log Message:
All settings now in Makefile directly.

--- filtercmd.opts DELETED ---

[Serverfilters-commit] script README,1.1,1.2

[<ton...@us...>]

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

Modified Files:
	README 
Log Message:
Added troubleshooting text for various error messages

Index: README
===================================================================
RCS file: /cvsroot/serverfilters/script/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** README	29 Feb 2004 22:56:36 -0000	1.1
--- README	1 Mar 2004 14:03:09 -0000	1.2
***************
*** 19,21 ****
  TROUBLESHOOTING
  
! To be written.
--- 19,79 ----
  TROUBLESHOOTING
  
! * When I visit the options page, I get a strange error at the top of the
! page and my filters are not saved.
! 
! Read the number at the end of that error message and find the explanation
! below.
! 
! * I am getting error 4, "filtercmd - setgid: Operation not permitted"
! 
! The binary is not setuid root. Run this command, "sudo chmod 4750 filtercmd".
! 
! * I am getting error 126
! 
! You didn't change the group in the makefile. Run this command, 
! "sudo chgrp apache filtercmd", replacing apache with your web server's group.
! 
! * I am getting error 10, "Can't read imap server from configfile"
! 
! filtercmd expects to find the squirrelmail configuration file in a certain place
! (specified in the Makefile). Did the squirrelmail/config.php file move?
! 
! * I am getting error 12, "Bad credentials"
! 
! This means the IMAP connection is not working. Compile the filtercmd with
! debugging on and run test.sh to find out why. This can sometimes be fixed by 
! adding options such as /notls to the MAILBOXNAME setting in the Makefile.
! 
! * I am getting error 13, "Can't verify credentials, IMAP not supported by library"
! 
! This error message means that the c-client library was mis-compiled -- you
! will have to either compile the c-client library by hand or find a working
! version.
! 
! * I am getting error 14, "Can't look up virtual user"
! 
! Check that the domain (everything after the @ in the username) was not found in the "virtualdomains"
! file. 
! 
! * I am getting error 15, "Can't trust config file -- make sure they are all owned by root"
! 
! filtercmd requires that the configuration files it consults are all
! root-owned. This ensures that the decisions filtercmd makes about which
! files to write are not based on tampered configuration files. All of the
! parent directories are checked as well. So, check the ownership of the
! configuration files, and the parent directories of those configuration
! files:
! 
!    /etc/squirrelmail/config.php
!    /usr/share/squirrelmail/plugins/serversidefilter/config.php
!    /usr/share/squirrelmail/plugins/serversidefilter/virtualdomains
! 
! * I don't have root access.
! 
! filtercmd can work in "single user" mode. Change the permissions of the file
! to 6755 and make sure it is owned by the user and group that owns the
! filter/forward files. Other users accessing the filtering page will get
! error 4. Note that the restrictions outlined while explaining error 15 still
! apply -- so without root access you still may not be able to run
! serversidefilter.
! 

[Serverfilters-commit] script filtercmd.c,1.12,1.13 filtercmd.h,1.3,1.4

[<ton...@us...>]

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

Modified Files:
	filtercmd.c filtercmd.h 
Log Message:
Cleanup some error codes

Index: filtercmd.c
===================================================================
RCS file: /cvsroot/serverfilters/script/filtercmd.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** filtercmd.c	1 Mar 2004 06:24:08 -0000	1.12
--- filtercmd.c	1 Mar 2004 14:02:03 -0000	1.13
***************
*** 168,173 ****
   	if (err) return inerror(err);
  
! 	if((setgid(GID)) < 0) eperror("setgid");
! 	if((setuid(UID)) < 0) eperror("setuid");
  
  	err = checkcredentials(imap_server, user, passwd);
--- 168,173 ----
   	if (err) return inerror(err);
  
! 	if((setgid(GID)) < 0) eperror("setgid", ERR_NOT_SUID);
! 	if((setuid(UID)) < 0) eperror("setuid", ERR_NOT_SUID);
  
  	err = checkcredentials(imap_server, user, passwd);
***************
*** 218,223 ****
  }
  
! void eperror(s)
  register char *s;
  {
          /*
--- 218,224 ----
  }
  
! void eperror(s, exitcode)
  register char *s;
+ int exitcode;
  {
          /*
***************
*** 231,235 ****
     snprintf(str,STR_MAX,"filtercmd - %s",s);
     perror(str);
!    exit(1);
  }
  
--- 232,236 ----
     snprintf(str,STR_MAX,"filtercmd - %s",s);
     perror(str);
!    exit(exitcode);
  }
  

Index: filtercmd.h
===================================================================
RCS file: /cvsroot/serverfilters/script/filtercmd.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** filtercmd.h	22 Feb 2004 21:18:01 -0000	1.3
--- filtercmd.h	1 Mar 2004 14:02:04 -0000	1.4
***************
*** 5,23 ****
  #define ERR_NO_CMD 2
  #define ERR_USAGE 3
! #define ERR_INVALID_COMMAND 4
! #define ERR_USER_IS_ROOT 5
! #define ERR_BAD_RC_PATH 6
! #define ERR_BAD_TEMP_PATH 7
! #define ERR_COPY_CANT_OPEN_SRC 8
! #define ERR_COPY_CANT_OPEN_DEST 9
! #define ERR_NEED_CREDENTIALS 10
! #define ERR_CANT_READ_IMAP_SERVER 11
! #define ERR_BAD_UID_GID 12
! #define ERR_BAD_CREDENTIALS 13
! #define ERR_BAD_LIBRARY 14
! #define ERR_CANT_FIND_VIRTUAL_DOMAIN 15
! #define ERR_CANT_TRUST_FILE 16
! #define ERR_BAD_RC_FILE_TYPE 17
! #define ERR_NO_RC_FILE_PATH 18
  
  static char *err_strings[] = {
--- 5,22 ----
  #define ERR_NO_CMD 2
  #define ERR_USAGE 3
! #define ERR_NOT_SUID 4
! #define ERR_INVALID_COMMAND 5
! #define ERR_USER_IS_ROOT 6
! #define ERR_COPY_CANT_OPEN_SRC 7
! #define ERR_COPY_CANT_OPEN_DEST 8
! #define ERR_NEED_CREDENTIALS 9
! #define ERR_CANT_READ_IMAP_SERVER 10
! #define ERR_BAD_UID_GID 11
! #define ERR_BAD_CREDENTIALS 12
! #define ERR_BAD_LIBRARY 13
! #define ERR_CANT_FIND_VIRTUAL_DOMAIN 14
! #define ERR_CANT_TRUST_FILE 15
! #define ERR_BAD_RC_FILE_TYPE 16
! #define ERR_NO_RC_FILE_PATH 17
  
  static char *err_strings[] = {
***************
*** 33,36 ****
--- 32,37 ----
  "Usage error - consult filtercmd.c\n",  
  
+ "Unable to setuid/setgid. Binary not setuid root?\n",
+ 
  "Invalid command specified.\n",
  
***************
*** 38,45 ****
  "The root user cannot be edited for security reasons\n",
  
- "rc file path fails checks\n",
- 
- "temp file path fails checks\n",
- 
  "Can't open source file\n",
  
--- 39,42 ----

[Serverfilters-commit] options.php,1.17,1.18

[<ton...@us...>]

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

Modified Files:
	options.php 
Log Message:
Update spamrule_set/unsurerule_set when adding or removing spam rules

[Serverfilters-commit] backend.php,1.17,1.18 options.php,1.16,1.17 recipie_functions.php,1.9,1.10

[<jgs...@us...>]

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

Modified Files:
	backend.php options.php recipie_functions.php 
Log Message:
Added direct delete option


Index: options.php
===================================================================
RCS file: /cvsroot/serverfilters/options.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** options.php	1 Mar 2004 06:26:42 -0000	1.16
--- options.php	1 Mar 2004 07:06:59 -0000	1.17
***************
*** 90,93 ****
--- 90,95 ----
  
  	$recipies = array();
+ 
+ 	set_filter_app();
          $file = filter_get();
  	read_recipies($file);
***************
*** 204,207 ****
--- 206,210 ----
  <option value=m><?php echo _("move") ?></option>
  <option value=c><?php echo _("copy") ?></option>
+ <option value=d><?php echo _("delete") ?></option>
  </select>
   to 
***************
*** 237,240 ****
--- 240,244 ----
                .'<option value=m>'._("move").'</option>'
                .'<option value=c>'._("copy").'</option>'
+               .'<option value=d>'._("delete").'</option>'
                .'</select>'
                .' '._("to").'</td><td><table border=0 cellpadding=0 cellspacing=0>'

Index: recipie_functions.php
===================================================================
RCS file: /cvsroot/serverfilters/recipie_functions.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** recipie_functions.php	24 Feb 2004 15:19:56 -0000	1.9
--- recipie_functions.php	1 Mar 2004 07:06:59 -0000	1.10
***************
*** 253,259 ****
  
  			if ($recipies[$i]['action'] == "m")
! 				print("<option value=m selected>" . _("move") . "</option>\n<option value=c>" . _("copy") . "</option>\n");
! 			else
! 				print("<option value=m>" . _("move") . "</option>\n<option value=c selected>" . _("copy"). "</option>\n");
  
  			print("</select>\n " . _("to") . "</td>");
--- 253,261 ----
  
  			if ($recipies[$i]['action'] == "m")
! 				print("<option value=m selected>" . _("move") . "</option>\n<option value=c>" . _("copy") . "</option>\n<option value=d>" . _("delete") . "</option>\n");
! 			else if ($recipies[$i]['action'] == "c")
! 				print("<option value=m>" . _("move") . "</option>\n<option value=c selected>" . _("copy"). "</option>\n<option value=d>" . _("delete") . "</option>\n");
!                         else
!                                 print("<option value=d>" . _("delete") . "</option>\n<option value=m>" . _("move") . "</option>\n<option value=c selected>" . _("copy"). "</option>\n");
  
  			print("</select>\n " . _("to") . "</td>");

[Serverfilters-commit] README,1.9,1.10

[<jgs...@us...>]

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

Modified Files:
	README 
Log Message:
Added debugging comment.

[Serverfilters-commit] getpot,NONE,1.1 serversidefilter.pot,NONE,1.1 options.php,1.15,1.16 setup.php,1.2,1.3

[<jgs...@us...>]

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

Modified Files:
	options.php setup.php 
Added Files:
	getpot serversidefilter.pot 
Log Message:
Added in i18n patches.


--- NEW FILE: serversidefilter.pot ---
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2004-02-29 23:27-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"

#: options.php:188
msgid "Options"
msgstr ""

#: options.php:188 setup.php:29
msgid "Mail Filters"
msgstr ""

#: options.php:195
msgid "Enter A New Filter:"
msgstr ""

#: options.php:200 recipie_functions.php:247
msgid "If"
msgstr ""

#: options.php:203 options.php:237 options.php:259 recipie_functions.php:241
#: recipie_functions.php:244 recipie_functions.php:250
msgid "then"
msgstr ""

#: options.php:206 options.php:239 recipie_functions.php:255
#: recipie_functions.php:257
msgid "move"
msgstr ""

#: options.php:207 options.php:240 recipie_functions.php:255
#: recipie_functions.php:257
msgid "copy"
msgstr ""

#: options.php:212 options.php:243 options.php:265 recipie_functions.php:262
msgid "Folder"
msgstr ""

#: options.php:216 options.php:246 options.php:268 recipie_functions.php:265
msgid "Email"
msgstr ""

#: options.php:225
msgid ""
"Selecting \"Custom\" allows you to enter your own Regular Expression (ie: "
"you use wildcard characters such as"
msgstr ""

#: options.php:237 options.php:259
msgid "if message is marked as"
msgstr ""

#: options.php:237 recipie_functions.php:244
msgid "SPAM"
msgstr ""

#: options.php:242 options.php:264 recipie_functions.php:259
msgid "to"
msgstr ""

#: options.php:250
msgid "save new"
msgstr ""

#: options.php:259 recipie_functions.php:241
msgid "UNSURE"
msgstr ""

#: options.php:276
msgid "Existing Filters:"
msgstr ""

#: options.php:283
msgid "Notice:"
msgstr ""

#: options.php:283
msgid ""
"Use of these filters may prevent the reading of mail in non-IMAP mail "
"clients."
msgstr ""

#: recipie_functions.php:241 recipie_functions.php:244
msgid "If message is marked as"
msgstr ""

#: setup.php:31
msgid "Here you may set up server-side filters on all of your incoming mail."
msgstr ""

Index: options.php
===================================================================
RCS file: /cvsroot/serverfilters/options.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** options.php	1 Mar 2004 04:24:06 -0000	1.15
--- options.php	1 Mar 2004 06:26:42 -0000	1.16
***************
*** 90,95 ****
  
  	$recipies = array();
- 
- 	set_filter_app();
          $file = filter_get();
  	read_recipies($file);
--- 90,93 ----
***************
*** 179,182 ****
--- 177,183 ----
  	$value = count($recipies);
  	displayPageHeader($color, 'None');
+         bindtextdomain('serversidefilter', SM_PATH . 'locale');
+         textdomain('serversidefilter');
+ 
  ?>
  <br>
***************
*** 201,206 ****
   ?>
  <select name=action>
! <option value=m>move</option>
! <option value=c>copy</option>
  </select>
   to 
--- 202,207 ----
   ?>
  <select name=action>
! <option value=m><?php echo _("move") ?></option>
! <option value=c><?php echo _("copy") ?></option>
  </select>
   to 
***************
*** 216,223 ****
  </table>
  </td>
! <td align=center valign=top><input type=image src="images/saveas.gif" border=0 name=create alt="save new"></td>
  </tr>
  <tr>
! <td colspan=8>* Selecting "Custom" allows you to enter your own Regular Expression (ie: you use wildcard characters such as *)</td>
  </tr>
  </form>
--- 217,225 ----
  </table>
  </td>
! <td align=center valign=top>
! <input type=image src="images/saveas.gif" border=0 name=create alt="<?php echo _("save new") ?>"></td>
  </tr>
  <tr>
! <td colspan=8>* <?php echo _("Selecting \"Custom\" allows you to enter your own Regular Expression (ie: you use wildcard characters such as") ?> *)</td>
  </tr>
  </form>
***************
*** 233,238 ****
                ._("if message is marked as").' <b>'._("SPAM").'</b> '._("then")
                .' <select name=action>'
!               .'<option value=m>move</option>'
!               .'<option value=c>copy</option>'
                .'</select>'
                .' '._("to").'</td><td><table border=0 cellpadding=0 cellspacing=0>'
--- 235,240 ----
                ._("if message is marked as").' <b>'._("SPAM").'</b> '._("then")
                .' <select name=action>'
!               .'<option value=m>'._("move").'</option>'
!               .'<option value=c>'._("copy").'</option>'
                .'</select>'
                .' '._("to").'</td><td><table border=0 cellpadding=0 cellspacing=0>'
***************
*** 243,247 ****
                 .'<td><input type=text name=add_string></td>'
                 .'</tr></table></td>'
!                .'<td colspan=4 align=center valign=top><input type=image src="images/saveas.gif" border=0 name=create alt="save new"></td></tr>'
                 .'</form>';
         }
--- 245,250 ----
                 .'<td><input type=text name=add_string></td>'
                 .'</tr></table></td>'
!                .'<td colspan=4 align=center valign=top>'
!                .'<input type=image src="images/saveas.gif" border=0 name=create alt="'._("save new").'"></td></tr>'
                 .'</form>';
         }
***************
*** 274,278 ****
  ?>
  </table>
! <p><b><?php echo _("Notice:") . "</b> " . _("Use of these filters may prevent the reading of mail in non-IMAP mail clients.") ?>
  </td></tr>
  </table>
--- 277,287 ----
  ?>
  </table>
! <p><b>
! <?php
!     echo _("Notice:") . "</b> " . _("Use of these filters may prevent the reading of mail in non-IMAP mail clients.");
! 
!     bindtextdomain('squirrelmail', SM_PATH . 'locale');
!     textdomain('squirrelmail');
! ?>
  </td></tr>
  </table>

Index: setup.php
===================================================================
RCS file: /cvsroot/serverfilters/setup.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** setup.php	22 Feb 2004 21:20:17 -0000	1.2
--- setup.php	1 Mar 2004 06:26:42 -0000	1.3
***************
*** 18,21 ****
--- 18,28 ----
  	global $optpage_blocks;
  
+         if (defined("SM_PATH")) {
+ 	    bindtextdomain ('serversidefilter', SM_PATH . 'locale');
+ 	} else {
+ 	    bindtextdomain ('serversidefilter', '../locale');
+ 	}
+ 	textdomain ('serversidefilter');
+ 
          $optpage_blocks[] = 
  		array(
***************
*** 24,32 ****
  			'desc' => _("Here you may set up server-side filters on all of your incoming mail."),
  			'js'   => FALSE);
  }
  
  function serversidefilter_version() {
  
!          return '1.40beta1';
  
  }
--- 31,46 ----
  			'desc' => _("Here you may set up server-side filters on all of your incoming mail."),
  			'js'   => FALSE);
+ 
+ 	if (defined("SM_PATH")) {
+ 	    bindtextdomain('squirrelmail', SM_PATH . 'locale');
+ 	} else {
+ 	    bindtextdomain ('squirrelmail', '../locale');
+ 	}
+ 	textdomain('squirrelmail');
  }
  
  function serversidefilter_version() {
  
!          return '1.40';
  
  }

[Serverfilters-commit] README,1.8,1.9

[<jgs...@us...>]

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

Modified Files:
	README 
Log Message:
Added comment about file permissions

[Serverfilters-commit] script filtercmd.c,1.11,1.12

[<jgs...@us...>]

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

Modified Files:
	filtercmd.c 
Log Message:
Fixed bug in domain calculation code.


Index: filtercmd.c
===================================================================
RCS file: /cvsroot/serverfilters/script/filtercmd.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** filtercmd.c	1 Mar 2004 02:18:30 -0000	1.11
--- filtercmd.c	1 Mar 2004 06:24:08 -0000	1.12
***************
*** 594,598 ****
  		
  		*dom = '\0';
! 		(*dom)++;
  		*domain = dom;
  		return 1;
--- 594,598 ----
  		
  		*dom = '\0';
! 		dom++;
  		*domain = dom;
  		return 1;

[Serverfilters-commit] README,1.7,1.8

[<jgs...@us...>]

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

Modified Files:
	README 
Log Message:
Added more details on the installation process.

[Serverfilters-commit] backend.php,1.16,1.17 options.php,1.14,1.15

[<jgs...@us...>]

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

Modified Files:
	backend.php options.php 
Log Message:
Fixed some temp file cleanup probs.


Index: options.php
===================================================================
RCS file: /cvsroot/serverfilters/options.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** options.php	24 Feb 2004 15:19:56 -0000	1.14
--- options.php	1 Mar 2004 04:24:06 -0000	1.15
***************
*** 7,11 ****
  
  	chdir('..');
! 	define('SM_PATH','../');
  
  
--- 7,11 ----
  
  	chdir('..');
! 	if (!defined('SM_PATH')) define('SM_PATH','../');
  
  
***************
*** 177,181 ****
  
          unlink($file);
-         unlink("/tmp/filterfile.$username.tmp");
  	$value = count($recipies);
  	displayPageHeader($color, 'None');
--- 177,180 ----

[Serverfilters-commit] script filtercmd.c,1.10,1.11

[<ton...@us...>]

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

Modified Files:
	filtercmd.c 
Log Message:
Add some missing ifdef statements

Index: filtercmd.c
===================================================================
RCS file: /cvsroot/serverfilters/script/filtercmd.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** filtercmd.c	1 Mar 2004 01:22:10 -0000	1.10
--- filtercmd.c	1 Mar 2004 02:18:30 -0000	1.11
***************
*** 508,512 ****
  	}
  
! 	fprintf(stderr, "phpvar: %s\n", phpvar);	
  	return readconfigvar(SERVERSIDEFILTERHOME "/config.php", phpvar, filter_file, buflen) 
  	   ? ERR_OK :  ERR_NO_RC_FILE_PATH;
--- 508,514 ----
  	}
  
! 	#ifdef DEBUG
! 	fprintf(stderr, "phpvar: %s\n", phpvar);
! 	#endif
  	return readconfigvar(SERVERSIDEFILTERHOME "/config.php", phpvar, filter_file, buflen) 
  	   ? ERR_OK :  ERR_NO_RC_FILE_PATH;

[Serverfilters-commit] script filtercmd.c,1.9,1.10

[<ton...@us...>]

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

Modified Files:
	filtercmd.c 
Log Message:
Improved reporting of certain errors

Index: filtercmd.c
===================================================================
RCS file: /cvsroot/serverfilters/script/filtercmd.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** filtercmd.c	29 Feb 2004 22:57:04 -0000	1.9
--- filtercmd.c	1 Mar 2004 01:22:10 -0000	1.10
***************
*** 185,191 ****
  				}
  
! 				if (!findfilterfile(argv[2], filter_file, STR_MAX)) {
! 					return inerror(ERR_BAD_RC_PATH);
! 				}        
  
  				return getrc(filter_file);
--- 185,190 ----
  				}
  
! 				err = findfilterfile(argv[2], filter_file, STR_MAX);
! 				if (err) return inerror(err);
  
  				return getrc(filter_file);
***************
*** 195,201 ****
                                          return ERR_USAGE;
                                  }
! 				if (!findfilterfile(argv[2], filter_file, STR_MAX)) {
! 					return inerror(ERR_BAD_RC_PATH);
! 				}        
  
  				return putrc(filter_file, UID, GID);
--- 194,200 ----
                                          return ERR_USAGE;
                                  }
! 
! 				err = findfilterfile(argv[2], filter_file, STR_MAX);
! 				if (err) return inerror(err);
  
  				return putrc(filter_file, UID, GID);
***************
*** 205,211 ****
                                          return ERR_USAGE;
                                  }
! 				if (!findfilterfile(argv[2], filter_file, STR_MAX)) {
! 					return inerror(ERR_BAD_RC_PATH);
! 				}        
  
  				return rcexists(filter_file);
--- 204,209 ----
                                          return ERR_USAGE;
                                  }
! 				err = findfilterfile(argv[2], filter_file, STR_MAX);
! 				if (err) return inerror(err);
  
  				return rcexists(filter_file);
***************
*** 495,498 ****
--- 493,498 ----
  	fprintf(stderr, "filter_file: %s\n", filter_file);
  	#endif
+ 	
+ 	return ERR_OK;
  }
  

[Serverfilters-commit] script checkcreds_cclient.c,1.2,1.3

[<ton...@us...>]

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

Modified Files:
	checkcreds_cclient.c 
Log Message:
Send debug output to stderr.

Index: checkcreds_cclient.c
===================================================================
RCS file: /cvsroot/serverfilters/script/checkcreds_cclient.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** checkcreds_cclient.c	29 Feb 2004 22:57:04 -0000	1.2
--- checkcreds_cclient.c	1 Mar 2004 01:20:24 -0000	1.3
***************
*** 64,69 ****
  void mm_login (NETMBX *mb,char *user,char *pwd,long trial) {
  	#ifdef DEBUG
! 	printf("mm_login: {%s/%s/user=\"%s\"}\n",mb->host,mb->service,mb->user);
! 	printf("mm_login -> %s %s\n", callback_user, callback_passwd);
  	#endif
  
--- 64,69 ----
  void mm_login (NETMBX *mb,char *user,char *pwd,long trial) {
  	#ifdef DEBUG
! 	fprintf(stderr, "mm_login: {%s/%s/user=\"%s\"}\n",mb->host,mb->service,mb->user);
! 	fprintf(stderr, "mm_login -> %s %s\n", callback_user, callback_passwd);
  	#endif
  
***************
*** 81,85 ****
      default: 	errflgname = "?"; break;    
    };
!   printf("mm_log: %s: %s\n", errflgname, string);
    #endif
  }
--- 81,85 ----
      default: 	errflgname = "?"; break;    
    };
!   fprintf(stderr, "mm_log: %s: %s\n", errflgname, string);
    #endif
  }