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

deconnexion.py: on teste l'url de reconnexion

Browse source
This commit is contained in:
Daniel STAN 2014-08-11 19:19:39 +02:00
parent 45eb0bbd02
commit 7385111364
2 changed files with 38 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

53
surveillance/deconnexion.py
View file

@ -1,4 +1,4 @@
#! /usr/bin/env python
#!/bin/bash /usr/scripts/python.sh
# -*- coding: utf-8 -*-
"""
@ -19,22 +19,21 @@ Licence : GPL v2
import commands
import sys
import psycopg2
sys.path.append('/usr/scripts/gestion')
from config import upload, virus, NETs, plage_ens, prefix
import config.mails.upload
import ipt
import smtplib
from ldap_crans import crans_ldap
from ldap_crans import MachineWifi
from ldap_crans import MachineFixe
from time import *
sys.path.append('/usr/scripts/surveillance/fiche_deconnexion')
from generate import generate_ps
from affich_tools import tableau
import analyse2 as analyse
from gestion.config import upload, virus, NETs, plage_ens, prefix
import gestion.config.mails.upload as mails_upload
from gestion import ipt
from gestion.ldap_crans import crans_ldap
from gestion.ldap_crans import MachineWifi
from gestion.ldap_crans import MachineFixe
import mail as mail_module
from surveillance.fiche_deconnexion.generate import generate_ps
from gestion.affich_tools import tableau
import surveillance.analyse2 as analyse
import gestion.mail as mail_module
# ldap
ldap = crans_ldap()
@ -202,6 +201,20 @@ for elupload, eltype, elid in uploadeurs:
# On envoie un mail à l'adhérent
################################
if eltype == "club":
theid = "cid="
else:
theid = "aid="
theid += proprio.id()
# Test: validation_url('upload')
try:
data = {'dn': theid,
'blid': len(proprio.blacklist())-1}
reco_url = mail_module.validation_url('upload', data)
except Exception as e:
reco_url = "[[erreur de génération: %r]]" % e
mail = connectsmtp()
corps = mail_module.generate('upload_hard', {'from': upload.expediteur, 'to': proprio.email(), 'upload': "%.2f" % (elupload,), 'proprio': proprio.Nom(), 'lang_info':'English version below'}).as_string()
@ -210,11 +223,11 @@ for elupload, eltype, elid in uploadeurs:
# On envoie un mail à disconnect
################################
if upload.disconnect_mail_hard:
if eltype == "club":
theid = "cid="
else:
theid = "aid="
mail_disconnect_hard = config.mails.upload.Message_disconnect_hard(upload.expediteur, upload.expediteur, proprio=proprio.Nom(), id=theid + proprio.id(), upload="%.2f" % (elupload,), mdc=mdcf, chambre=proprio.chbre())
mail_disconnect_hard = mails_upload.Message_disconnect_hard(upload.expediteur,
upload.expediteur, proprio=proprio.Nom(), id=theid,
upload="%.2f" % (elupload,), mdc=mdcf, chambre=proprio.chbre(),
reco_url=reco_url,
)
mail_disconnect_hard.send()
# Vérification du nombre de déconnexions
@ -230,7 +243,7 @@ for elupload, eltype, elid in uploadeurs:
+ "/usr/scripts/surveillance/fiche_deconnexion/generate.py --upload aid=%d" % int(proprio.id()))
# Envoi du mail à disconnect
corps = config.mails.upload.message_disconnect_multi % {'from': upload.expediteur, 'to': upload.expediteur, 'nbdeco': nb_decos, 'proprio': proprio.Nom(), 'ps': fichier_ps}
corps = mails_upload.message_disconnect_multi % {'from': upload.expediteur, 'to': upload.expediteur, 'nbdeco': nb_decos, 'proprio': proprio.Nom(), 'ps': fichier_ps}
corps = corps.encode('utf-8')
mail.sendmail(upload.expediteur, upload.expediteur, corps)
@ -268,7 +281,7 @@ for elupload, eltype, elid in uploadeurs:
# On envoie un mail à disconnect
################################
if upload.disconnect_mail_soft:
corps = config.mails.upload.message_disconnect_soft % {'from': upload.expediteur, 'to': upload.expediteur, 'upload': "%.2f" % (elupload,), 'proprio': proprio.Nom()}
corps = mails_upload.message_disconnect_soft % {'from': upload.expediteur, 'to': upload.expediteur, 'upload': "%.2f" % (elupload,), 'proprio': proprio.Nom()}
corps = corps.encode('utf-8')
mail.sendmail(upload.expediteur, upload.expediteur, corps)