From 5e1d3178125345dbef8b9832576f0ac4d4645d70 Mon Sep 17 00:00:00 2001
From: root <root@adelauth>
Date: Thu, 23 Oct 2008 15:36:03 +0200
Subject: [PATCH] * extra/modules/root.ptl:  - modifiy attoma login template to
 use old name for federation with msp    checkbox  - change code reading
 checkbox (donot try to validate value of form variable,    just check its
 presence)

---
 extra/modules/root.ptl | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/extra/modules/root.ptl b/extra/modules/root.ptl
index 5522428..0fae7ff 100644
--- a/extra/modules/root.ptl
+++ b/extra/modules/root.ptl
@@ -418,12 +418,13 @@ class AlternateRootDirectory(OldRootDirectory):
 
     def login_success(self, identity):
         session = get_session()
+        print 'Formulaire', get_request().form
         if session.msp_login_dump:
             identity = identities.get_store().get_identity(get_session().user)
-            if get_request().form.get('tfConfirmFederationFromMSP') == 'true' or \
+            if get_request().form.get('tfConfirmFederationFromMSP') or \
                     get_response().filter.get('federated_with_msp'):
                 return self.liberty.proxyAssertionConsumer()
-        elif get_request().form.get('tfConfirmFederationFromMSP') == 'true':
+        elif get_request().form.get('tfConfirmFederationFromMSP'):
             if session.msp_init_federate:
                 session.msp_init_federate = False
                 return self.federate_msp()
@@ -566,8 +567,8 @@ class MspLoginForm(Form):
         <div class="cdc_plus"><a href="forgot_password">Mot de passe perdu ?</a></div>
     </fieldset>
     <fieldset class="cdc_coche">
-        <input type="checkbox" id="cdc_champ_liaison" name="cdc_champ_liaison" checked="checked"/>
-        <label for="cdc_champ_liaison">Cr&eacute;er une liaison avec <img src="/themes/adeline/images/logo_servicepublic_mini.gif" alt="mon servicepublic.fr" /></label>                             
+        <input type="checkbox" id="tfConfirmFederationFromMSP" name="tfConfirmFederationFromMSP" checked="checked"/>
+        <label for="tfConfirmFederationFromMSP">Cr&eacute;er une liaison avec <img src="/themes/adeline/images/logo_servicepublic_mini.gif" alt="mon servicepublic.fr" /></label>                             
     </fieldset>
     <fieldset class="cdc_valider">
         <input type="submit" value="Valider" />