better MULTI_USER_MODE

VERSION

@@ -1 +1 @@
-Version 1.99.7 (2012-03-26 16:07:16) dev
+Version 1.99.7 (2012-03-26 16:15:22) dev

applications/admin/controllers/default.py

@@ -1360,14 +1360,16 @@ def reload_routes():
 
 def manage_students():
     if not (MULTI_USER_MODE and is_manager()):
-        raise HTTP(401)
+        session.flash = 'Not Authorized'
+        redirect(URL('site'))
     db.auth_user.registration_key.writable = True
     grid = SQLFORM.grid(db.auth_user)
     return locals()
 
 def bulk_register():
     if not (MULTI_USER_MODE and is_manager()):
-        raise HTTP(401)
+        session.flash = 'Not Authorized'
+        redirect(URL('site'))
     form = SQLFORM.factory(Field('emails','text'))
     if form.process().accepted:
         emails = [x.strip() for x in form.vars.emails.split('\n') if x.strip()]

applications/admin/controllers/gae.py

@@ -12,6 +12,10 @@ except:
     session.flash='sorry, only on Unix systems'
     redirect(URL(request.application,'default','site'))
 
+if MULTI_USER_MODE and not is_manager():
+    session.flash = 'Not Authorized'
+    redirect(URL('default','site'))
+
 forever=10**8
 
 def kill():

applications/admin/models/menu.py

@@ -22,7 +22,7 @@ if request.args:
                           URL(_a,'mercurial','commit',args=_t)))
 
 if not session.authorized:
-    response.menu = [(T('Login'), True, '')]
+    response.menu = [(T('Login'), True, URL('site'))]
 else:
     response.menu.append((T('Logout'), False,
                           URL(_a,'default',f='logout')))