Fixes in the config parser and various cleanups

3 files changed, 28 insertions, 17 deletions

diff --git a/server/config.py b/server/config.py
index ab9be52..1fe47f1 100644
--- a/server/config.py
+++ b/server/config.py
@@ -1,16 +1,28 @@
 import ConfigParser
 
-class AliasConfigParser(ConfigParser.RawConfigParser):
+class AliasConfig(object):
+    def __init__(self):
+        self.name = None
+        self.root = None
+        self.host = None
+        self.secret = None
+        self.port = None
+        self.background = None
+        self.logfile = None
+        self.pidfile = None
 
     def read(self, filename):
-        ConfigParser.RawConfigParser.read(self, filename)
-        self.name = self.get("component", "name")
-        self.root = self.get("component", "root")
-        self.host = self.get("component", "host")
-        self.secret = self.get("component", "secret")
-        self.port = self.getint("component", "port")
-        self.background = self.getboolean("component", "background")
-        self.logfile = self.get("component", "logfile")
-        self.pidfile = self.get("component", "pidfile")
+        config = ConfigParser.SafeConfigParser()
+        config.read(filename)
+        self.name = config.get("component", "name")
+        self.root = config.get("component", "root")
+        self.host = config.get("component", "host")
+        self.secret = config.get("component", "secret")
+        self.port = config.getint("component", "port")
+        self.background = config.getboolean("component", "background")
+        if config.has_option("component", "logfile"):
+            self.logfile = config.get("component", "logfile")
+        if config.has_option("component", "pidfile"):
+            self.pidfile = config.get("component", "pidfile")
 
-config = AliasConfigParser()
+config = AliasConfig()
\ No newline at end of file
diff --git a/server/user.py b/server/user.py
index d63e659..383085d 100644
--- a/server/user.py
+++ b/server/user.py
@@ -21,7 +21,7 @@ class User:
         registration, key = ObjectReader(self.hash).get_content(self.jid)
         return registration
 
-    def registered(self):
+    def is_registered(self):
         return Object(self.hash).exists()
 
     def unregister(self, jid):
diff --git a/server/xep_0077.py b/server/xep_0077.py
index 51122eb..47d6a7f 100644
--- a/server/xep_0077.py
+++ b/server/xep_0077.py
@@ -54,10 +54,10 @@ class Registration(ElementBase):
         aliasform.addField(var="salt",ftype="text-single", label="Salt", required=True)
 
     def get_form(self):
-        return Form(self.xml.find('{jabber:x:data}x'))
+        return Form(self.xml.find('{jabber:x:data}x')).getValues()
 
     def set_form(self, values):
-        self.get_form().setValues(values)
+        Form(self.xml.find('{jabber:x:data}x')).setValues(values)
 
 class xep_0077(base_plugin):
     """
@@ -94,8 +94,7 @@ class xep_0077(base_plugin):
                 iq.reply().send()
                 return
 
-            registration_form = iq['register']['form']
-            registration_info = registration_form.getValues()
+            registration_info = iq['register']['form']
             for field in self.form_fields:
                 if not registration_info[field]:
                     # Incomplete Registration
@@ -128,7 +127,7 @@ class xep_0077(base_plugin):
         if self.form_instructions:
             reg['instructions'] = self.form_instructions
 
-        if registrant.registered():
+        if registrant.is_registered():
             reg['registered'] = True
             reg['form'] = registrant.get_registration()
         else: