correction envoi mail

asmodee.ini

@@ -1,8 +1,8 @@
 [AUTH]
-username = ""
+username = username
-password = ""
+password = password
-server = ""
+server = https://instance.tld
-admin = ""
+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"
+msender = user@domain.tld
-mpass = "password"
+mpass = password
-msmtp = "smtp"
+msmtp = smtp
-mport = "port"
+mport = port

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):
+			if (malt == "1"):
-				os.system('echo "' + event['content']['body'] + '" | mailx -s "' + event['sender'] + '" -r ' + msender + ' ' + mail)
+				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']