[Spambayes-checkins] spambayes/spambayes ImapUI.py, 1.4, 1.5 Options.py, 1.35, 1.36

[Tony Meyer]

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

Modified Files:
	ImapUI.py Options.py 
Log Message:
Change imap filter to specify servers in the pop3proxy style,
i.e. server[:port] rather than have two options.  If you were
previously specifying a port, you will need to change your
configuration file, otherwise no change is necessary.

Index: ImapUI.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/ImapUI.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ImapUI.py	19 Apr 2003 08:22:01 -0000	1.4
--- ImapUI.py	20 Apr 2003 06:58:52 -0000	1.5
***************
*** 73,76 ****
--- 73,77 ----
      'imapusername': ('imap',            'username'),
      'imappassword': ('imap',            'password'),
+     'imapssl':      ('imap',            'use_ssl'),
      'p3notateto':   ('pop3proxy',       'notate_to'),
      'p3notatesub':  ('pop3proxy',       'notate_subject'),
***************
*** 88,92 ****
             # localhost, it's available for the world to see)
             # on the other hand, we have to be able to enter it somehow...
!            'imappassword',
             'Header Options', 'p3notateto', 'p3notatesub', 
             'p3prob', 'p3thermostat', 'p3evidence', 
--- 89,93 ----
             # localhost, it's available for the world to see)
             # on the other hand, we have to be able to enter it somehow...
!            'imappassword', 'imapssl',
             'Header Options', 'p3notateto', 'p3notatesub', 
             'p3prob', 'p3thermostat', 'p3evidence', 

Index: Options.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/Options.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** Options.py	20 Apr 2003 06:26:14 -0000	1.35
--- Options.py	20 Apr 2003 06:58:52 -0000	1.36
***************
*** 881,887 ****
    "imap" : (
      ("server", "Server", "",
!      """This is the name of the imap server that stores your mail, and
!      which the imap filter will connect to - for example: mail.example.com
!      or imap.example.com.  If you use more than one server, then things are
       a bit more complicated for you at the moment, sorry.  You will need to
       have multiple instances of the imap filter running, each with a
--- 881,889 ----
    "imap" : (
      ("server", "Server", "",
!      """This is the name and port of the imap server that stores your mail,
!      and which the imap filter will connect to - for example:
!      mail.example.com or imap.example.com:143.  The default IMAP port is
!      143, or 993 if using SSL; if you connect via one of those ports, you
!      can leave this blank. If you use more than one server, then things are
       a bit more complicated for you at the moment, sorry.  You will need to
       have multiple instances of the imap filter running, each with a
***************
*** 891,903 ****
       mailing list know if you are in this situation so that we can consider
       coming up with a better solution.""",
!      SERVER, SINGLE_VALUE, DO_NOT_RESTORE),
! 
!     ("port", "Port", 143,
!      """This is the port of the imap server that stores your mail, and
!      which the imap filter will connect to.  The default IMAP port is 143,
!      or 993 if using SSL; you will probably have one of those values here.
!      If you are using multiple imap servers, please see the comments
!      regarding the server value.""",
!      PORT, SINGLE_VALUE, DO_NOT_RESTORE),
  
      ("username", "Username", "",
--- 893,897 ----
       mailing list know if you are in this situation so that we can consider
       coming up with a better solution.""",
!      SERVER, MULTIPLE_ALLOWED, DO_NOT_RESTORE),
  
      ("username", "Username", "",
***************
*** 907,911 ****
       on the same server, please see the comments regarding the server
       value.""",
!      PORT, SINGLE_VALUE, DO_NOT_RESTORE),
  
      ("password", "Password", "",
--- 901,905 ----
       on the same server, please see the comments regarding the server
       value.""",
!      r"[\w]+", MULTIPLE_ALLOWED, DO_NOT_RESTORE),
  
      ("password", "Password", "",
***************
*** 917,921 ****
       blank and use the -p command line option to imapfilter.py and you will
       be prompted for your password.""",
!      r"[\w]+", SINGLE_VALUE, DO_NOT_RESTORE),
  
      ("expunge", "Purge//Expunge", False,
--- 911,915 ----
       blank and use the -p command line option to imapfilter.py and you will
       be prompted for your password.""",
!      r"[\w]+", MULTIPLE_ALLOWED, DO_NOT_RESTORE),
  
      ("expunge", "Purge//Expunge", False,
***************
*** 925,928 ****
--- 919,926 ----
       BOOLEAN, SINGLE_VALUE, RESTORE),
  
+     ("use_ssl", "Connect via a secure socket layer", False,
+      """NOT YET IMPLEMENTED""",
+      BOOLEAN, SINGLE_VALUE, DO_NOT_RESTORE),
+ 
      ("filter_folders", "Folders to filter", "INBOX",
       """Comma delimited list of folders to be filtered""",
***************
*** 1051,1055 ****
                    },
      'imap': {'server' : string_cracker,
-              'port' : int_cracker,
               'username' : string_cracker,
               'password' : string_cracker,
--- 1049,1052 ----
***************
*** 1059,1063 ****
               'ham_train_folders' : string_cracker,
               'spam_train_folders' : string_cracker,
!              'expunge' : boolean_cracker, 
              },
      'html_ui': {'port': int_cracker,
--- 1056,1061 ----
               'ham_train_folders' : string_cracker,
               'spam_train_folders' : string_cracker,
!              'expunge' : boolean_cracker,
!              'use_ssl' : boolean_cracker,
              },
      'html_ui': {'port': int_cracker,