Changeset 528:f8a5f63eafc0 in documentViewer for documentViewer.py

Timestamp:

Apr 13, 2012, 2:55:16 PM (12 years ago)

Author:

casties

Branch:

default

Message:

new viewMode=thumbs.

File:

• documentViewer.py (modified) (3 diffs)

documentViewer.py

@@ -124 +124 @@
     viewer_images = PageTemplateFile('zpt/viewer_images', globals())
     viewer_index = PageTemplateFile('zpt/viewer_index', globals())
+    viewer_thumbs = PageTemplateFile('zpt/viewer_thumbs', globals())
     # available layer types
     builtinLayers = {'text': ['dict','search','gis','annotator'],
@@ -462 +463 @@
         return pt(docinfo=docinfo)
 
+    def getAuthenticatedUser(self, anon=None):
+        """returns the authenticated user object or None. (ignores Zopes anonymous user)"""
+        user = getSecurityManager().getUser()
+        if user is not None and user.getUserName() != "Anonymous User":
+            return user
+        else:
+            return anon
+
     def isAccessible(self, docinfo):
         """returns if access to the resource is granted"""
@@ -472 +481 @@
         elif access is None or access in self.authgroups:
             # only local access -- only logged in users
-            user = getSecurityManager().getUser()
+            user = self.getAuthenticatedUser()
             logging.debug("documentViewer (accessOK) user=%s ip=%s"%(user,self.REQUEST.getClientAddr()))
-            if user is not None:
-                #print "user: ", user
-                return (user.getUserName() != "Anonymous User")
-            else:
-                return False
+            return (user is not None)
         
         logging.error("documentViewer (accessOK) unknown access type %s"%access)
         return False
-