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

suppression de trailing whitespaces

Browse source 
darcs-hash:20081002165739-bd074-d426f3830f4c7d2203eb80c94c5ccc7c38e9ba86.gz
This commit is contained in:
Antoine Durand-Gasselin 2008-10-02 18:57:39 +02:00
parent c57212cb58
commit 7b7b88acb0
4 changed files with 34 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gestion/gen_confs/firewall.py
View file

@ -600,6 +600,7 @@ class firewall_komaz(firewall_crans) :
"-j CLASSIFY --set-class 1:%(class_id)s" % locals()) "-j CLASSIFY --set-class 1:%(class_id)s" % locals())
iptables("-t mangle -A SUBNET-%(subnet)s -o ens -s %(ip)s " iptables("-t mangle -A SUBNET-%(subnet)s -o ens -s %(ip)s "
"-j CLASSIFY --set-class 1:%(class_id)s" % locals()) "-j CLASSIFY --set-class 1:%(class_id)s" % locals())
self.anim.reinit() self.anim.reinit()
print OK print OK
@ -1164,6 +1165,7 @@ class firewall_sable(firewall_rouge):
"-j MARK --set-mark %s" % conf_fw.mark['proxy']) "-j MARK --set-mark %s" % conf_fw.mark['proxy'])
iptables("-t mangle -A PREROUTING -m mark --mark %s -j ACCEPT" % conf_fw.mark['proxy']) iptables("-t mangle -A PREROUTING -m mark --mark %s -j ACCEPT" % conf_fw.mark['proxy'])
if_defaut = "eth0"
if_radin = "eth0.%d" % vlans["radin"] if_radin = "eth0.%d" % vlans["radin"]
if_accueil = "eth0.%d" % vlans["accueil"] if_accueil = "eth0.%d" % vlans["accueil"]

5
intranet/modules/impression/main.py
View file

@ -192,7 +192,10 @@ class main(ModuleBase):
crans.cp.log("lancerImpression : %s" % str(e), 'IMPRESSION', 1) crans.cp.log("lancerImpression : %s" % str(e), 'IMPRESSION', 1)
return {"erreur":str(e)} return {"erreur":str(e)}
crans.cp.log("impression", 'IMPRESSION') crans.cp.log("impression", 'IMPRESSION')
return {'code':str(crans.impression.digicode.gen_code(cherrypy.session['uid'])) + "#"} return {
'code':str(crans.impression.digicode.gen_code(cherrypy.session['uid'])) + "#",
'code_bat_j': cherrypy.config.get('crans.impression.codes.batJ', u"Non disponible")
}
lancerImpression.exposed = True lancerImpression.exposed = True
# #

1
intranet/modules/impression/static/impression.js
View file

@ -357,7 +357,6 @@ Impression.AJAX.finImpression = function(AJAXResp)
Impression.popup.popupImpression(AJAXResp.code); Impression.popup.popupImpression(AJAXResp.code);
} }
Impression.AJAX.updateSolde(); Impression.AJAX.updateSolde();
} }
Impression.AJAX.getPrinterState = function() Impression.AJAX.getPrinterState = function()

1
intranet/modules/quota/main.py
View file

@ -21,7 +21,6 @@ class main(ModuleBase):
return crans.utils.quota.getUserQuota(cherrypy.session['uid']) return crans.utils.quota.getUserQuota(cherrypy.session['uid'])
#return [{'%': 33.9, 'quota': 390.62, 'label': u'Dossier personnel', 'limite': 585.94, 'filesystem': '/home', 'usage': 420.32}, {'%': 0.1, 'quota': 100.00, 'label': u'Boite de r\xe9ception', 'limite': 150.00, 'filesystem': '/var/mail', 'usage': 0.06}] #return [{'%': 33.9, 'quota': 390.62, 'label': u'Dossier personnel', 'limite': 585.94, 'filesystem': '/home', 'usage': 420.32}, {'%': 0.1, 'quota': 100.00, 'label': u'Boite de r\xe9ception', 'limite': 150.00, 'filesystem': '/var/mail', 'usage': 0.06}]
########################## ##########################
# affichage # affichage
########################## ##########################