bm-multipop.diff
上传用户:gyjinxi
上传日期:2007-01-04
资源大小:159k
文件大小:3k
- diff -rbc2p bobomail-orig/bobomailrc.py bobomail/bobomailrc.py
- *** bobomail-orig/bobomailrc.py Wed May 3 23:31:50 2000
- --- bobomail/bobomailrc.py Thu May 4 00:35:09 2000
- *************** auth_host = "localhost"
- *** 28,32 ****
-
- # place here the domain for the from-header
- ! domain = "meine-domain.de"
-
-
- --- 28,32 ----
-
- # place here the domain for the from-header
- ! domain = {auth_host: "meine-domain.de"}
-
-
- diff -rbc2p bobomail-orig/dtml/login.html bobomail/dtml/login.html
- *** bobomail-orig/dtml/login.html Mon Apr 24 02:08:48 2000
- --- bobomail/dtml/login.html Thu May 4 00:19:35 2000
- ***************
- *** 9,12 ****
- --- 9,17 ----
- <table border="0" align="center">
- <tr>
- + <td align="right">POP3-host:</td>
- + <td><input type="text" name="host" size="30"></td>
- + </tr>
- +
- + <tr>
- <td align="right"><dtml-gt>Userid</dtml-gt>:</td>
- <td><input type="text" name="userid" size="30"></td>
- diff -rbc2p bobomail-orig/fetchmail.py bobomail/fetchmail.py
- *** bobomail-orig/fetchmail.py Mon Apr 24 02:04:56 2000
- --- bobomail/fetchmail.py Thu May 4 00:19:23 2000
- *************** class POP3Box:
- *** 102,106 ****
-
- def open(self, auth):
- ! self.con = POP3(pop3_host)
- self.con.user(auth.userid)
- self.con.pass_(auth.password)
- --- 102,106 ----
-
- def open(self, auth):
- ! self.con = POP3(auth.host)
- self.con.user(auth.userid)
- self.con.pass_(auth.password)
- diff -rbc2p bobomail-orig/main.py bobomail/main.py
- *** bobomail-orig/main.py Mon Apr 24 14:51:02 2000
- --- bobomail/main.py Thu May 4 00:37:32 2000
- *************** class BoboMail:
- *** 49,55 ****
- return HTMLTemplate(login_template, title=_("Login"))
-
- ! def Login(self, userid, password, REQUEST, RESPONSE):
- "Log into BoboMail"
- ! if self.auth.login(auth_host, userid, password):
- log("OK: %s logged in" % userid)
- RESPONSE.redirect(
- --- 49,55 ----
- return HTMLTemplate(login_template, title=_("Login"))
-
- ! def Login(self, userid, password, REQUEST, RESPONSE, host=auth_host):
- "Log into BoboMail"
- ! if self.auth.login(host, userid, password):
- log("OK: %s logged in" % userid)
- RESPONSE.redirect(
- *************** class BoboMail:
- *** 165,169 ****
- else: filename = ""
- errors = sendmail(
- ! "%s@%s" % (self.auth.userid, domain), to, cc, bcc, subject, body, attach, filename)
- return HTMLTemplate(sent_template, title=_("Sent mail"), sid=sid, failed=errors)
- else: return self.authError()
- --- 165,171 ----
- else: filename = ""
- errors = sendmail(
- ! "%s@%s" % (self.auth.userid,
- ! domain.get(self.auth.host, self.auth.host)),
- ! to, cc, bcc, subject, body, attach, filename)
- return HTMLTemplate(sent_template, title=_("Sent mail"), sid=sid, failed=errors)
- else: return self.authError()