1
0
mirror of https://github.com/Mailu/Mailu.git synced 2025-07-05 00:49:29 +02:00

Rename the generic 'address' to 'email'

This commit is contained in:
Pierre Jaury
2016-05-01 20:04:40 +02:00
parent 5343a397ff
commit 3eca6864c3
19 changed files with 70 additions and 68 deletions

View File

@ -10,7 +10,7 @@ RC_LINE = """
poll {host} proto {protocol} port {port}
user "{username}" password "{password}"
smtphost "smtp"
smtpname {user_address}
smtpname {user_email}
{options}
"""
@ -25,15 +25,15 @@ def fetchmail(fetchmailrc):
def run(cursor):
cursor.execute("""
SELECT user_address, protocol, host, port, tls, username, password
SELECT user_email, protocol, host, port, tls, username, password
FROM fetch
""")
fetchmailrc = ""
for line in cursor.fetchall():
user_address, protocol, host, port, tls, username, password = line
user_email, protocol, host, port, tls, username, password = line
options = "options ssl" if tls else ""
fetchmailrc += RC_LINE.format(
user_address=user_address,
user_email=user_email,
protocol=protocol,
host=host,
port=port,