In configure we do not need to set_config()

[cascardo/ipsilon.git] / ipsilon / login / authform.py

diff --git a/ipsilon/login/authform.py b/ipsilon/login/authform.py
index 4c812db..418a5e5 100755 (executable)
--- a/ipsilon/login/authform.py
+++ b/ipsilon/login/authform.py
@@ -33,14 +33,14 @@ class Form(LoginFormBase):
         us.remote_login()
         user = us.get_user()
         if not user.is_anonymous:
-            return self.lm.auth_successful(user.name, 'password')
+            return self.lm.auth_successful(self.trans, user.name, 'password')
         else:
             try:
                 error = cherrypy.request.headers['EXTERNAL_AUTH_ERROR']
             except KeyError:
                 error = "Unknown error using external authentication"
                 cherrypy.log.error("Error: %s" % error)
-            return self.lm.auth_failed()
+            return self.lm.auth_failed(self.trans)
 
 
 class LoginManager(LoginManagerBase):
@@ -71,6 +71,7 @@ Form based login Manager. Relies on mod_intercept_form_submit plugin for
                 'Password'
             ],
         }
+        self.conf_opt_order = ['username text', 'password text', 'help text']
 
     @property
     def help_text(self):
@@ -143,8 +144,7 @@ class Installer(object):
             order = []
         order.append('form')
         globalconf['order'] = ','.join(order)
-        po.set_config(globalconf)
-        po.save_plugin_config(FACILITY)
+        po.save_plugin_config(FACILITY, globalconf)
 
         # for selinux enabled platforms, ignore if it fails just report
         try: