diff --git a/asmodee.ini b/asmodee.ini index 1de3f8a..2724648 100644 --- a/asmodee.ini +++ b/asmodee.ini @@ -1,8 +1,8 @@ [AUTH] -username = "" -password = "" -server = "" -admin = "" +username = username +password = password +server = https://instance.tld +admin = @mxid:intance.tld [MOD] # liste = roll,quote,biere,stats,liste,horloge,carte,card,cristal,welcome,salut,jdr,gens,va,salon,kick @@ -10,7 +10,7 @@ liste = roll,quote,biere,stats,liste,horloge,carte,card,cristal,welcome,salut,jd [MAIL] malt = 0 -msender = "user@domain.tld" -mpass = "password" -msmtp = "smtp" -mport = "port" +msender = user@domain.tld +mpass = password +msmtp = smtp +mport = port diff --git a/asmodee.py b/asmodee.py index 4aaebc7..b1b8a1a 100755 --- a/asmodee.py +++ b/asmodee.py @@ -1862,14 +1862,16 @@ def envoi_mail(room,event): # envoi des messages aux abonnés par mail lmails = mails[room.room_id] except: lmails = [] + sender = event['sender'] + body = event['content']['body'] for mail in lmails: - if (malt == 1): - os.system('echo "' + event['content']['body'] + '" | mailx -s "' + event['sender'] + '" -r ' + msender + ' ' + mail) + if (malt == "1"): + os.system('echo ' + body + ' | mailx -s ' + sender + ' -r ' + msender + ' ' + mail) else: serveur = smtplib.SMTP(msmtp, mport) serveur.starttls() serveur.login(msender, mpass) - message = event['sender'] + " : " + event['content']['body'] + message = sender + " : " + body serveur.sendmail(msender, mail, message) serveur.quit() @@ -2030,7 +2032,12 @@ def main(): liste_mod = mods else: liste_mod = mods - + + global malt + global msender + global mpass + global msmtp + global mport if ('MAIL' in config): try: malt = config['MAIL']['malt']