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

on ne laisse que ce qui est utilisable (ce qui est fini)

Browse source 
darcs-hash:20060915171304-f46e9-daf88641e00e4e33543a2f1523e221ec519f1429.gz
This commit is contained in:
gdetrez 2006-09-15 19:13:04 +02:00
parent 159999c06d
commit 58c7254f7f
9 changed files with 38 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

20
intranet/monCompte.py
View file

@ -103,15 +103,15 @@ class monCompte:
############## info mail ##############
mailInfos = {}
#try:
mailConfig = MailConfig(cherrypy.session['uid'])
mailInfos['forwarding_address'] = mailConfig['forward']
mailInfos['spam'] = {}
mailInfos['spam']['no'] = mailConfig['spam'] == 'accepte'
mailInfos['spam']['mark'] = mailConfig['spam'] == 'marque'
mailInfos['spam']['drop'] = mailConfig['spam'] == 'supprime'
#except Exception, e:
# t['mailError'] = u"Erreur:fichiers de configuration mail incompréhensibles"
try:
mailConfig = MailConfig(cherrypy.session['uid'])
mailInfos['forwarding_address'] = mailConfig['forward']
mailInfos['spam'] = {}
mailInfos['spam']['no'] = mailConfig['spam'] == 'accepte'
mailInfos['spam']['mark'] = mailConfig['spam'] == 'marque'
mailInfos['spam']['drop'] = mailConfig['spam'] == 'supprime'
except Exception, e:
t['mailError'] = u"Erreur:fichiers de configuration mail incompréhensibles"
mailInfos['alias'] = adh.alias()
mailInfos['contourneGreylist'] = adh.contourneGreylist()
@ -380,6 +380,8 @@ class monCompte:
##########################
def creerMachine(self, nomNouvelleMachine, MACNouvelleMachine, estMachineWifi='0'):
adh = self.__ldap.search('uid=' + cherrypy.session['uid'])['adherent'][0]
if adh.droits() == [] and adh.machines_fixes() != []:
return {'error':'Vous avez deja une machine fixe. Vous ne pouvez ajouter que des machines WiFi.'}
try:
if estMachineWifi=='true':
m = MachineWifi(adh)