[Spambayes-checkins] spambayes/spambayes OptionConfig.py,1.5,1.6

[Tim Stone]

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

Modified Files:
	OptionConfig.py 
Log Message:
Added configuration for pop3proxy_include_prob option, and edits for
 pop3proxy_add_mailid_to and pop3proxy_strip_incoming_mailids options.

Index: OptionConfig.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/OptionConfig.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** OptionConfig.py	6 Mar 2003 14:13:22 -0000	1.5
--- OptionConfig.py	10 Mar 2003 04:53:15 -0000	1.6
***************
*** 51,54 ****
--- 51,55 ----
      'p3addid':      ('pop3proxy',       'pop3proxy_add_mailid_to'),
      'p3stripid':    ('pop3proxy',       'pop3proxy_strip_incoming_mailids'),
+     'p3prob':       ('pop3proxy',       'pop3proxy_include_prob'),
      'smtpservers':  ('smtpproxy',       'smtpproxy_servers'),
      'smtpports':    ('smtpproxy',       'smtpproxy_ports'),
***************
*** 136,139 ****
--- 137,147 ----
           the correct id to find a message.  This option strips all spambayes
           ids from incoming mail."""),
+ 
+         ("p3prob", "Add spam probability header",
+          """You can have spambayes insert a header with the calculated spam
+          probability into each mail.  If you can view headers with your
+          mailer, then you can see this information, which can be interesting
+          and even instructive if you're a serious spambayes junkie."""),
+ 
      )),
  
***************
*** 430,436 ****
              cachemsg = "False"
      
!     if not nsub == "True" and not nsub == "False":
          errmsg += """<li>Cache Messages: must be "True" or "False".</li>\n"""
      
      # edit for equal number of pop3servers and ports
      try:
--- 438,477 ----
              cachemsg = "False"
      
!     if not cachemsg == "True" and not cachemsg == "False":
          errmsg += """<li>Cache Messages: must be "True" or "False".</li>\n"""
      
+     try:
+         prob = parms['p3prob']
+     except KeyError:
+         if options.pop3proxy_include_prob:
+             prob = "True"
+         else:
+             prob = "False"
+             
+     if not prob == "True" and not prob == "False":
+         errmsg += """<li>Add Spam Probability Header: must be "True" or "False".</li>\n"""
+     
+     try:
+         aid = parms['p3addid']
+     except KeyError:
+         if options.pop3proxy_add_mailid_to:
+             aid = "True"
+         else:
+             aid = "False"
+             
+     if not aid == "True" and not aid == "False":
+         errmsg += """<li>Add Id Tag: must be "True" or "False".</li>\n"""
+ 
+     try:
+         sid = parms['p3stripid']
+     except KeyError:
+         if options.pop3proxy_strip_incoming_mailids:
+             sid = "True"
+         else:
+             sid = "False"
+             
+     if not sid == "True" and not sid == "False":
+         errmsg += """<li>Strip Incoming Ids: must be "True" or "False".</li>\n"""
+ 
      # edit for equal number of pop3servers and ports
      try: