[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/browser/authentication.py - look up configurable names in cookie_authentication

[Yvo Schubbe]

Log message for revision 111175:
  - look up configurable names in cookie_authentication

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/authentication.py

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/authentication.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/authentication.py	2010-04-20 14:57:52 UTC (rev 111174)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/authentication.py	2010-04-20 15:06:31 UTC (rev 111175)
@@ -104,7 +104,8 @@
             failure='handle_failure'))
 
     def setUpWidgets(self, ignore_request=False):
-        ac_name = self.request.get('__ac_name')
+        cctool = self._getTool('cookie_authentication')
+        ac_name = self.request.get(cctool.name_cookie)
         if ac_name and not self.request.has_key('%s.name' % self.prefix):
             self.request.form['%s.name' % self.prefix] = ac_name
         super(LoginFormView,
@@ -119,12 +120,12 @@
                 if candidate['email'].lower() == data['name'].lower():
                     data['name'] = candidate['username']
                     break
+        cctool = self._getTool('cookie_authentication')
         # logged_in uses default charset for decoding
         charset = self._getDefaultCharset()
-        self.request.form['__ac_name'] = data['name'].encode(charset)
-        self.request.form['__ac_password'] = data['password'].encode(charset)
-        self.request.form['__ac_persistent'] = data['persistent']
-        cctool = self._getTool('cookie_authentication')
+        self.request.form[cctool.name_cookie] = data['name'].encode(charset)
+        self.request.form[cctool.pw_cookie] = data['password'].encode(charset)
+        self.request.form[cctool.persist_cookie] = data['persistent']
         cctool(self.context, self.request)
         return self._setRedirect('portal_actions', 'user/logged_in',
                                  '%s.came_from' % self.prefix)
@@ -153,7 +154,8 @@
             failure='handle_failure'))
 
     def setUpWidgets(self, ignore_request=False):
-        ac_name = self.request.get('__ac_name')
+        cctool = self._getTool('cookie_authentication')
+        ac_name = self.request.get(cctool.name_cookie)
         if ac_name and not self.request.has_key('%s.name' % self.prefix):
             self.request.form['%s.name' % self.prefix] = ac_name
         super(MailPasswordFormView,