Changeset 1560 in products

Timestamp:

Jan 15, 2010 7:48:36 AM (14 years ago)

Author:

mylan

Message:

Update commentor's photo logic - 1st - get member's photo if no - from gravatar service, if no - return default plone member photo

File:

• quintagroup.plonecomments/trunk/quintagroup/plonecomments/browser/comments.py (modified) (2 diffs)

quintagroup.plonecomments/trunk/quintagroup/plonecomments/browser/comments.py

@@ -36 +36 @@
     def getGravatar(self, reply):
         purl = getToolByName(self.context, 'portal_url')
-        default = purl() + '/defaultUser.gif' 
+        mtool = getToolByName(self.context, 'portal_membership')            
+        portrait_url = purl() + '/defaultUser.gif' 
         email = ''
 
@@ -44 +45 @@
             member = mtool.getMemberById(creator)
             email = member and member.getProperty('email','') or ''
+            mem_id = getattr(member,'getId',lambda:'Anonymous User')()
+            portrait = mtool.getPersonalPortrait(mem_id)
+            portrait_url =  portrait.absolute_url()
         else:
             email = reply.getProperty('email',d='')
-        if not email:
-            return default
+
+        if not email or not 'defaultUser.gif' in portrait_url:
+            return portrait_url
 
         size = 40
         gravatar_url = "http://www.gravatar.com/avatar.php?"
         # construct the url
-        gravatar_url += urllib.urlencode({'gravatar_id':md5.md5(email).hexdigest(), 
-            'default':default, 'size':str(size)})
-
+        gravatar_url += urllib.urlencode({'gravatar_id':md5.md5(email).hexdigest(),
+            'default':portrait_url, 'size':str(size)})
         return gravatar_url
+        
 
     def authenticated_report_abuse_enabled(self):