crans/scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Passage à get_mail et |name pour le templating.

Browse source
This commit is contained in:
Pierre-Elliott Bécue 2015-03-30 20:36:15 +02:00
parent fdfdd23022
commit baa9855327
6 changed files with 16 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gestion/mail/template/upload_hard/body/en
View file

@ -1,4 +1,4 @@
Greetings {{proprio}}, Greetings {{ proprio|name }},
Your upload bandwith has been temporarily limited due to a massive upload from your computers to outer networks. ({{upload}} on the last 24 hours) Your upload bandwith has been temporarily limited due to a massive upload from your computers to outer networks. ({{upload}} on the last 24 hours)

2
gestion/mail/template/upload_hard/body/fr
View file

@ -1,4 +1,4 @@
Bonjour {{proprio}}, Bonjour {{ proprio|name }},
Le débit de votre connexion internet a été temporairement limité car vos machines envoient trop de données vers des machines hors du réseau du Crans ({{upload}} Mo en 24h). Le débit de votre connexion internet a été temporairement limité car vos machines envoient trop de données vers des machines hors du réseau du Crans ({{upload}} Mo en 24h).

2
gestion/mail/template/upload_notif/body/fr
View file

@ -1,4 +1,4 @@
{{proprio}} ({{id}}) a été limité en débit montant du fait d'un {{ proprio|name }} ({{id}}) a été limité en débit montant du fait d'un
upload excessif ({{upload}} Mio). upload excessif ({{upload}} Mio).
Ses machines ont été aperçues pour la dernière fois à ces endroits : Ses machines ont été aperçues pour la dernière fois à ces endroits :

2
gestion/mail/template/upload_soft/body/en
View file

@ -1,4 +1,4 @@
Hi {{proprio}}, Hi {{ proprio|name }},
This email notifies you that your computer(s) send(s) a big amount of data out This email notifies you that your computer(s) send(s) a big amount of data out
of the Crans network ({{upload}} MB within the last 24h). of the Crans network ({{upload}} MB within the last 24h).

2
gestion/mail/template/upload_soft/body/fr
View file

@ -1,4 +1,4 @@
Bonjour {{proprio}}, Bonjour {{ proprio|name }},
Nous t'informons que ta (tes) machine(s) envoie(nt) une quantité importante de Nous t'informons que ta (tes) machine(s) envoie(nt) une quantité importante de
données vers l'extérieur ({{upload}} Mo en 24 heures). données vers l'extérieur ({{upload}} Mo en 24 heures).

28
surveillance/deconnexion2.py
View file

@ -229,12 +229,9 @@ def upload_hard(proprio, elupload, elid, eltype, curseur, ldap):
mail_data = { mail_data = {
'from': upload.expediteur, 'from': upload.expediteur,
'to': unicode(proprio['mail'][0]), 'to': unicode(proprio.get_mail()),
'upload': "%.2f" % (elupload,), 'upload': "%.2f" % (elupload,),
'proprio': u" ".join([ 'proprio': proprio,
unicode(proprio.get('prenom', [u''])[0]),
unicode(proprio.get('nom', [u''])[0]),
]),
'lang_info': 'English version below', 'lang_info': 'English version below',
'mdc': mdcf, 'mdc': mdcf,
'chambre': unicode(proprio.get('chbre', [u'????'])[0]), 'chambre': unicode(proprio.get('chbre', [u'????'])[0]),
@ -291,7 +288,7 @@ def upload_hard(proprio, elupload, elid, eltype, curseur, ldap):
with mail_module.ServerConnection() as smtp_conn: with mail_module.ServerConnection() as smtp_conn:
corps = mail_module.generate('upload_hard', mail_data).as_string() corps = mail_module.generate('upload_hard', mail_data).as_string()
if not DEBUG: if not DEBUG:
smtp_conn.sendmail(upload.expediteur, unicode(proprio['mail'][0]), corps) smtp_conn.sendmail(upload.expediteur, unicode(proprio.get_mail()), corps)
else: else:
print corps print corps
@ -327,10 +324,10 @@ def upload_hard(proprio, elupload, elid, eltype, curseur, ldap):
'from': upload.expediteur, 'from': upload.expediteur,
'to': upload.expediteur, 'to': upload.expediteur,
'nbdeco': nb_decos, 'nbdeco': nb_decos,
'proprio': u" ".join([ 'proprio': u" ".join(
unicode(proprio.get('prenom', [u''])[0]), unicode(proprio.get('prenom', [u''])[0]),
unicode(proprio.get('nom', [u''])[0]) unicode(proprio.get('nom', [u''])[0]),
]), ),
'ps': fichier_ps, 'ps': fichier_ps,
} }
corps = corps.encode('utf-8') corps = corps.encode('utf-8')
@ -348,18 +345,15 @@ def upload_soft(proprio, elupload, elid, eltype, curseur):
with mail_module.ServerConnection() as smtp_connect: with mail_module.ServerConnection() as smtp_connect:
corps = mail_module.generate('upload_soft', { corps = mail_module.generate('upload_soft', {
'from': upload.expediteur, 'from': upload.expediteur,
'to': unicode(proprio['mail'][0]), 'to': unicode(proprio.get_mail()),
'upload': "%.2f" % (elupload,), 'upload': "%.2f" % (elupload,),
'proprio': u" ".join([ 'proprio': proprio,
unicode(proprio.get('prenom', [u''])[0]),
unicode(proprio.get('nom', [u''])[0]),
]),
'lang_info':'English version below', 'lang_info':'English version below',
'limite_soft': upload.soft, 'limite_soft': upload.soft,
'limite_hard': upload.hard, 'limite_hard': upload.hard,
}).as_string() }).as_string()
if not DEBUG: if not DEBUG:
smtp_connect.sendmail(upload.expediteur, proprio.get_mail(), corps) smtp_connect.sendmail(upload.expediteur, unicode(proprio.get_mail()), corps)
else: else:
print corps print corps
@ -370,10 +364,10 @@ def upload_soft(proprio, elupload, elid, eltype, curseur):
'from': upload.expediteur, 'from': upload.expediteur,
'to': upload.expediteur, 'to': upload.expediteur,
'upload': "%.2f" % (elupload,), 'upload': "%.2f" % (elupload,),
'proprio': u" ".join([ 'proprio': u" ".join(
unicode(proprio.get('prenom', [u''])[0]), unicode(proprio.get('prenom', [u''])[0]),
unicode(proprio.get('nom', [u''])[0]), unicode(proprio.get('nom', [u''])[0]),
]), ),
} }
corps = corps.encode('utf-8') corps = corps.encode('utf-8')
smtp_connect.sendmail(upload.expediteur, upload.expediteur, corps) smtp_connect.sendmail(upload.expediteur, upload.expediteur, corps)