[Spambayes-checkins] spambayes/spambayes Options.py,1.16,1.17

[Tony Meyer]

Update of /cvsroot/spambayes/spambayes/spambayes
In directory sc8-pr-cvs1:/tmp/cvs-serv30319/spambayes

Modified Files:
	Options.py 
Log Message:
Provides options to (a) add an id (as a header or in the body) to incoming mail, (b) strip such ids from incoming mail, (c) find (via the ui) a message based on id, (d) train messages by forwarding/bouncing them to a smtpproxy.

Index: Options.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/Options.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Options.py	26 Feb 2003 00:02:06 -0000	1.16
--- Options.py	27 Feb 2003 04:13:32 -0000	1.17
***************
*** 389,392 ****
--- 389,397 ----
  pop3proxy_persistent_storage_file: hammie.db
  pop3proxy_notate_to: False
+ pop3proxy_add_mailid_header: False
+ pop3proxy_mailid_header_name: X-Spambayes-MailId
+ pop3proxy_mailid_as_header: False
+ pop3proxy_mailid_in_msgbody: False
+ pop3proxy_strip_incoming_mailids: False
  pop3proxy_notate_subject: False
  
***************
*** 396,399 ****
--- 401,411 ----
  pop3proxy_port: 110
  
+ [smtpproxy]
+ smtpproxy_servers:
+ smtpproxy_ports:
+ smtpproxy_ham_address = spambayes_ham at localhost
+ smtpproxy_spam_address = spambayes_spam at localhost
+ smtpproxy_shutdown_address = spambayes_shutdown at localhost
+ 
  [html_ui]
  html_ui_port: 8880
***************
*** 496,501 ****
--- 508,524 ----
                    'pop3proxy_persistent_storage_file': string_cracker,
                    'pop3proxy_notate_to': boolean_cracker,
+                   'pop3proxy_add_mailid_header' : boolean_cracker,
+                   'pop3proxy_mailid_header_name' : string_cracker,
+                   'pop3proxy_mailid_as_header' : boolean_cracker,
+                   'pop3proxy_mailid_in_msgbody' : boolean_cracker,
+                   'pop3proxy_strip_incoming_mailids' : boolean_cracker,
                    'pop3proxy_notate_subject': boolean_cracker,
                    },
+     'smtpproxy': {'smtpproxy_ham_address' : string_cracker,
+                   'smtpproxy_spam_address' : string_cracker,
+                   'smtpproxy_shutdown_address' : string_cracker,
+                   'smtpproxy_servers' : string_cracker,
+                   'smtpproxy_ports' : string_cracker, 
+                   },
      'html_ui': {'html_ui_port': int_cracker,
                  'html_ui_launch_browser': boolean_cracker,
***************
*** 581,583 ****
  
  if not optionsPathname:
!     optionsPathname = os.path.abspath('bayescustomize.ini')
--- 604,606 ----
  
  if not optionsPathname:
!     optionsPathname = os.path.abspath('bayescustomize.ini')
\ No newline at end of file