diff options
| -rwxr-xr-x | bin/add_members | 2 | ||||
| -rw-r--r-- | bin/change_pw | 2 | ||||
| -rwxr-xr-x | bin/newlist | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/bin/add_members b/bin/add_members index da94c7bc4..d14cb526b 100755 --- a/bin/add_members +++ b/bin/add_members @@ -257,7 +257,7 @@ def main(): realname = mlist.real_name subject = _('%(realname)s subscription notification') msg = Message.UserNotification( - mlist.owner, mm_cfg.MAILMAN_OWNER, subject, s.getvalue()) + mlist.owner, Utils.get_site_email(), subject, s.getvalue()) msg.send(mlist) if send_changes_msg: diff --git a/bin/change_pw b/bin/change_pw index 0593d2f82..bd15395fb 100644 --- a/bin/change_pw +++ b/bin/change_pw @@ -175,7 +175,7 @@ def main(): hostname = mlist.host_name adminurl = mlist.GetScriptURL('admin', absolute=1) msg = Message.UserNotification( - mlist.owner[:], mm_cfg.MAILMAN_OWNER, + mlist.owner[:], Utils.get_site_email(), _('Your new %(listname)s list password'), _('''\ The site administrator at %(hostname)s has changed the password for your diff --git a/bin/newlist b/bin/newlist index 9de3fcd0a..844b2fbb2 100755 --- a/bin/newlist +++ b/bin/newlist @@ -22,8 +22,7 @@ Usage: %(PROGRAM)s [options] [listname [listadmin-addr [admin-password]]] Options: - -q - --quiet + -q/--quiet Normally the administrator is notified by email (after a prompt) that their list has been created. This option suppresses the prompt and notification. @@ -170,17 +169,18 @@ def main(): if not quiet: print _('Hit enter to notify %(listname)s owner...'), sys.stdin.readline() + siteadmin = Utils.get_site_email(mlist.host_name, '-admin') text = Utils.maketext( 'newlist.txt', {'listname' : listname, 'password' : listpasswd, 'admin_url' : mlist.GetScriptURL('admin', absolute=1), 'listinfo_url': mlist.GetScriptURL('listinfo', absolute=1), - 'requestaddr' : "%s-request@%s" % (listname, mlist.host_name), - 'owner' : mm_cfg.MAILMAN_OWNER, + 'requestaddr' : mlist.GetRequestEmail(), + 'siteowner' : siteadmin, }, mlist.preferred_language) msg = Message.UserNotification( - owner_mail, mm_cfg.MAILMAN_OWNER, + owner_mail, siteadmin, _('Your new mailing list: %(listname)s'), text) msg.send(mlist) |