refactored login routines

cps/admin.py

@@ -102,10 +102,12 @@ def admin_required(f):
 @admi.before_app_request
 def before_request():
     # make remember me function work
-    if current_user.is_authenticated:
-        confirm_login()
-    if not ub.check_user_session(current_user.id, flask_session.get('_id')) and 'opds' not in request.path:
-        logout_user()
+    #if current_user.is_authenticated:
+    #    print("before request confirm request {}".format(request.path))
+    #    confirm_login()
+    #if not ub.check_user_session(current_user.id, flask_session.get('_id')) and 'opds' not in request.path:
+    #    log.info("before logout {}".format(request.path))
+    #    logout_user()
     g.constants = constants
     g.user = current_user
     g.google_site_verification = os.getenv('GOOGLE_SITE_VERIFICATION','')
@@ -114,8 +116,6 @@ def before_request():
     g.allow_upload = config.config_uploading
     g.current_theme = config.config_theme
     g.config_authors_max = config.config_authors_max
-    g.shelves_access = ub.session.query(ub.Shelf).filter(
-        or_(ub.Shelf.is_public == 1, ub.Shelf.user_id == current_user.id)).order_by(ub.Shelf.name).all()
     if '/static/' not in request.path and not config.db_configured and \
         request.endpoint not in ('admin.ajax_db_config',
                                  'admin.simulatedbchange',