complete the transition to sqlite

4 files changed, 11 insertions, 9 deletions

diff --git a/modules/installed/lib/auth.py b/modules/installed/lib/auth.py
index 4b0f229..988f8dd 100644
--- a/modules/installed/lib/auth.py
+++ b/modules/installed/lib/auth.py
@@ -18,7 +18,7 @@ def check_credentials(username, passphrase):
     """Verifies credentials for username and passphrase.
     Returns None on success or a string describing the error on failure"""
 
-    u = cfg.users.get(username)
+    u = cfg.users[username]
     if u is None:
         cfg.log("Unknown user: %s" % username)
         return u"Username %s is unknown to me." % username
diff --git a/modules/installed/lib/user_store.py b/modules/installed/lib/user_store.py
index 3466555..a4042c1 100644
--- a/modules/installed/lib/user_store.py
+++ b/modules/installed/lib/user_store.py
@@ -14,6 +14,8 @@ class UserStore(UserStoreModule, sqlite_db):
         self.__enter__()
     def close(self):
         self.__exit__()
+    def expert(self):
+        return False
 
 class UserStoreOld():
 #class UserStore(UserStoreModule):
diff --git a/modules/installed/router/router.py b/modules/installed/router/router.py
index 764d43c..0d12c87 100644
--- a/modules/installed/router/router.py
+++ b/modules/installed/router/router.py
@@ -60,7 +60,7 @@ router does.  With the addition of some extra modules, its abilities
 can rival those of high-end routers costing hundreds of dollars.</p>
 """ % cfg.box_name + parts['sidebar_right']
         if not cfg.users.expert():
-            main += """<p>In basic mode, you don't need to do any
+            parts['main'] += """<p>In basic mode, you don't need to do any
             router setup before you can go online.  Just plug your
             %(product)s in to your cable or DSL modem and the router
             will try to get you on the internet using DHCP.</p>
diff --git a/modules/installed/system/users.py b/modules/installed/system/users.py
index ce99f64..669183c 100644
--- a/modules/installed/system/users.py
+++ b/modules/installed/system/users.py
@@ -51,11 +51,11 @@ class add(FormPlugin, PagePlugin):
         if not username: msg = add_message(msg, _("Must specify a username!"))
         if not md5_password: msg = add_message(msg, _("Must specify a password!"))
         
-        if cfg.users.get(username):
+        if username in cfg.users:
             msg = add_message(msg, _("User already exists!"))
         else:
             try:
-                cfg.users.set(User(dict={'username':username, 'name':name, 'email':email, 'password':md5_password}))
+                cfg.users[username]= User(dict={'username':username, 'name':name, 'email':email, 'password':md5_password})
             except:
                 msg = add_message(msg, _("Error storing user!"))
 
@@ -77,7 +77,7 @@ class edit(FormPlugin, PagePlugin):
     system.</p><p>Deleting users is permanent!</p>""" % (cfg.product_name, cfg.box_name))
 
     def main(self, msg=''):
-        users = cfg.users.get_all()
+        users = cfg.users.keys()
         add_form = Form(title=_("Edit or Delete User"), action="/sys/users/edit", message=msg)
         add_form.html('<span class="indent"><b>Delete</b><br /></span>')
         for uname in sorted(users.keys()):
@@ -95,12 +95,12 @@ class edit(FormPlugin, PagePlugin):
             cfg.log.info("%s asked to delete %s" % (cherrypy.session.get(cfg.session_key), usernames))
             if usernames:
                 for username in usernames:
-                    if cfg.users.exists(username):
+                    if username in cfg.users:
                         try:
-                            cfg.users.remove(username)
+                            del cfg.users[username]
                             msg.add(_("Deleted user %s." % username))
                         except IOError, e:
-                            if cfg.users.get('username', reload=True):
+                            if 'username' in cfg.users:
                                 m = _("Error on deletion, user %s not fully deleted: %s" % (username, e))
                                 cfg.log.error(m)
                                 msg.add(m)
@@ -117,7 +117,7 @@ class edit(FormPlugin, PagePlugin):
             return self.fill_template(title="", main=main, sidebar_left=self.sidebar_left, sidebar_right=self.sidebar_right)
 
         sidebar_right = ''
-        u = cfg.users.get(kwargs['username'])
+        u = cfg.users[kwargs['username']]
         if not u:
             main = _("<p>Could not find a user with username of %s!</p>" % kwargs['username'])
             return self.fill_template(template="err", title=_("Unnown User"), main=main,