Re-enabled login and registration access...

...after lopping them off via disabling access for anonymous users.

Major re-org of the htmltemplate code, cleaning it up significantly. Fixed
a couple of bugs while I was there. Probably introduced a couple, but
things seem to work OK at the moment.

Author: Richard Jones

roundup-admin

@@ -16,7 +16,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: roundup-admin,v 1.36 2001-10-21 00:45:15 richard Exp $
+# $Id: roundup-admin,v 1.37 2001-10-23 01:00:18 richard Exp $
 
 import sys
 if int(sys.version[0]) < 2:
@@ -35,13 +35,13 @@ class AdminTool:
 
     def __init__(self):
         self.commands = {}
-        for k, v in AdminTool.__dict__.items():
+        for k in AdminTool.__dict__.keys():
             if k[:3] == 'do_':
-                self.commands[k[3:]] = v
+                self.commands[k[3:]] = getattr(self, k)
         self.help = {}
-        for k, v in AdminTool.__dict__.items():
+        for k in AdminTool.__dict__.keys():
             if k[:5] == 'help_':
-                self.help[k[5:]] = v
+                self.help[k[5:]] = getattr(self, k)
 
     def usage(message=''):
         if message: message = 'Problem: '+message+'\n'
@@ -133,7 +133,7 @@ Command help:
         '''
         help = self.help.get(args[0], None)
         if help:
-            help(self)
+            help()
             return
         help = self.commands.get(args[0], None)
         if help:
@@ -212,7 +212,11 @@ Command help:
         designators = string.split(args[1], ',')
         l = []
         for designator in designators:
-            classname, nodeid = roundupdb.splitDesignator(designator)
+            try:
+                classname, nodeid = roundupdb.splitDesignator(designator)
+            except roundupdb.DesignatorError, message:
+                print 'Error: %s'%message
+                return 1
             if self.comma_sep:
                 l.append(self.db.getclass(classname).get(nodeid, propname))
             else:
@@ -236,7 +240,11 @@ Command help:
             key, value = prop.split('=')
             props[key] = value
         for designator in designators:
-            classname, nodeid = roundupdb.splitDesignator(designator)
+            try:
+                classname, nodeid = roundupdb.splitDesignator(designator)
+            except roundupdb.DesignatorError, message:
+                print 'Error: %s'%message
+                return 1
             cl = self.db.getclass(classname)
             properties = cl.getprops()
             for key, value in props.items():
@@ -427,7 +435,11 @@ Command help:
 
         Lists the journal entries for the node identified by the designator.
         '''
-        classname, nodeid = roundupdb.splitDesignator(args[0])
+        try:
+            classname, nodeid = roundupdb.splitDesignator(args[0])
+        except roundupdb.DesignatorError, message:
+            print 'Error: %s'%message
+            return 1
         # TODO: handle the -c option?
         print self.db.getclass(classname).history(nodeid)
         return 0
@@ -441,7 +453,11 @@ Command help:
         '''
         designators = string.split(args[0], ',')
         for designator in designators:
-            classname, nodeid = roundupdb.splitDesignator(designator)
+            try:
+                classname, nodeid = roundupdb.splitDesignator(designator)
+            except roundupdb.DesignatorError, message:
+                print 'Error: %s'%message
+                return 1
             self.db.getclass(classname).retire(nodeid)
         return 0
 
@@ -610,7 +626,7 @@ Command help:
 
         # do the command
         try:
-            return function(self, args[1:])
+            return function(args[1:])
         finally:
             self.db.close()
 
@@ -671,6 +687,9 @@ if __name__ == '__main__':
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.36  2001/10/21 00:45:15  richard
+# Added author identification to e-mail messages from roundup.
+#
 # Revision 1.35  2001/10/20 11:58:48  richard
 # Catch errors in login - no username or password supplied.
 # Fixed editing of password (Password property type) thanks Roch'e Compaan.

roundup/cgi_client.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: cgi_client.py,v 1.38 2001-10-22 03:25:01 richard Exp $
+# $Id: cgi_client.py,v 1.39 2001-10-23 01:00:18 richard Exp $
 
 import os, cgi, pprint, StringIO, urlparse, re, traceback, mimetypes
 import base64, Cookie, time
@@ -240,8 +240,8 @@ def list(self, sort=None, group=None, filter=None, columns=None,
         if show_customization is None:
             show_customization = self.customization_widget()
 
-        htmltemplate.index(self, self.TEMPLATES, self.db, cn, filterspec,
-            filter, columns, sort, group,
+        index = htmltemplate.IndexTemplate(self, self.TEMPLATES, cn)
+        index.render(filterspec, filter, columns, sort, group,
             show_customization=show_customization)
         self.pagefoot()
 
@@ -276,7 +276,9 @@ def shownode(self, message=None):
         nodeid = self.nodeid
 
         # use the template to display the item
-        htmltemplate.item(self, self.TEMPLATES, self.db, self.classname, nodeid)
+        item = htmltemplate.ItemTemplate(self, self.TEMPLATES, self.classname)
+        item.render(nodeid)
+
         self.pagefoot()
     showissue = shownode
     showmsg = shownode
@@ -433,8 +435,12 @@ def newnode(self, message=None):
                 traceback.print_exc(None, s)
                 message = '<pre>%s</pre>'%cgi.escape(s.getvalue())
         self.pagehead('New %s'%self.classname.capitalize(), message)
-        htmltemplate.newitem(self, self.TEMPLATES, self.db, self.classname,
-            self.form)
+
+        # call the template
+        newitem = htmltemplate.NewItemTemplate(self, self.TEMPLATES,
+            self.classname)
+        newitem.render(self.form)
+
         self.pagefoot()
     newissue = newnode
     newuser = newnode
@@ -466,8 +472,9 @@ def newfile(self, message=None):
                 message = '<pre>%s</pre>'%cgi.escape(s.getvalue())
 
         self.pagehead('New %s'%self.classname.capitalize(), message)
-        htmltemplate.newitem(self, self.TEMPLATES, self.db, self.classname,
-            self.form)
+        newitem = htmltemplate.NewItemTemplate(self, self.TEMPLATES,
+            self.classname)
+        newitem.render(self.form)
         self.pagefoot()
 
     def classes(self, message=None):
@@ -541,6 +548,7 @@ def login_action(self, message=None):
             password = self.form['__login_password'].value
         else:
             password = ''
+        print self.user, password
         # make sure the user exists
         try:
             uid = self.db.user.lookup(self.user)
@@ -585,6 +593,10 @@ def newuser_action(self, message=None):
         ''' create a new user based on the contents of the form and then
         set the cookie
         '''
+        # re-open the database as "admin"
+        self.db.close()
+        self.db = self.instance.open('admin')
+
         # TODO: pre-check the required fields and username key property
         cl = self.db.classes['user']
         props, dummy = parsePropsFromForm(self.db, cl, self.form)
@@ -626,10 +638,6 @@ def main(self, dre=re.compile(r'([^\d]+)(\d+)'),
             self.user = user
         self.db.close()
 
-        # make sure totally anonymous access is OK
-        if self.ANONYMOUS_ACCESS == 'deny' and self.user is None:
-            return self.login()
-
         # re-open the database for real, using the user
         self.db = self.instance.open(self.user)
 
@@ -647,18 +655,28 @@ def main(self, dre=re.compile(r'([^\d]+)(\d+)'),
         # appends the name of the file to the URL so the download file name
         # is correct, but doesn't actually use it.
         action = path[0]
-        if action == 'list_classes':
-            self.classes()
-            return
-        if action == 'login':
-            self.login()
-            return
         if action == 'login_action':
             self.login_action()
             return
+
+        # make sure anonymous are allowed to register
+        if self.ANONYMOUS_REGISTER == 'deny' and self.user is None:
+            return self.login()
+
         if action == 'newuser_action':
             self.newuser_action()
             return
+
+        # make sure totally anonymous access is OK
+        if self.ANONYMOUS_ACCESS == 'deny' and self.user is None:
+            return self.login()
+
+        if action == 'list_classes':
+            self.classes()
+            return
+        if action == 'login':
+            self.login()
+            return
         if action == 'logout':
             self.logout()
             return
@@ -834,6 +852,12 @@ def parsePropsFromForm(db, cl, form, nodeid=0):
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.38  2001/10/22 03:25:01  richard
+# Added configuration for:
+#  . anonymous user access and registration (deny/allow)
+#  . filter "widget" location on index page (top, bottom, both)
+# Updated some documentation.
+#
 # Revision 1.37  2001/10/21 07:26:35  richard
 # feature #473127: Filenames. I modified the file.index and htmltemplate
 #  source so that the filename is used in the link and the creation