[PyWebMail-Checkins] webmail/webmail/server/pop3 plain.py, 1.12, 1.13

[Michael D. <du...@us...>]

Update of /cvsroot/pywebmail/webmail/webmail/server/pop3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22370

Modified Files:
	plain.py 
Log Message:
check password

Index: plain.py
===================================================================
RCS file: /cvsroot/pywebmail/webmail/webmail/server/pop3/plain.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** plain.py	6 Oct 2006 20:53:30 -0000	1.12
--- plain.py	2 Mar 2008 17:06:57 -0000	1.13
***************
*** 256,260 ****
  
    def login(self, username, password, folder_name=None):
!     if not self.mailboxes.has_key(username):
        mailbox = self.setup.get_mailbox(username, password)
        mailbox.open()
--- 256,264 ----
  
    def login(self, username, password, folder_name=None):
!     if self.mailboxes.has_key(username):
!       info = self.mailboxes[username].account.initial_info
!       check_password = info.get('access_password', info.get('password', None))
!       assert password==check_password, 'Invalid username or password.'
!     else:
        mailbox = self.setup.get_mailbox(username, password)
        mailbox.open()