buxfix traduction de la byline

[Plinn.git] / utils.py

diff --git a/utils.py b/utils.py
index 8f6bd3d..de68f22 100755 (executable)
--- a/utils.py
+++ b/utils.py
@@ -94,12 +94,12 @@ def formatFullName(memberName, memberGivenName, memberId, nameBefore=1) :
     memberFullName = u''
     if memberName and memberGivenName :
         if nameBefore :
     memberFullName = u''
     if memberName and memberGivenName :
         if nameBefore :

-            memberFullName = memberName.upper() + ' ' + capitalizeCompoundGivenName(memberGivenName)
+            memberFullName = memberName.capitalize() + ' ' + capitalizeCompoundGivenName(memberGivenName)

         else :
         else :

-            memberFullName = capitalizeCompoundGivenName(memberGivenName) + ' ' + memberName.upper() 
+            memberFullName = capitalizeCompoundGivenName(memberGivenName) + ' ' + memberName.capitalize() 

         
     elif memberName and not memberGivenName :
         
     elif memberName and not memberGivenName :

-        memberFullName = memberName.upper()
+        memberFullName = memberName.capitalize()

         
     elif not memberName and memberGivenName :
         memberFullName = capitalizeCompoundGivenName(memberGivenName)
         
     elif not memberName and memberGivenName :
         memberFullName = capitalizeCompoundGivenName(memberGivenName)


@@ -165,7 +165,11 @@ def _checkMemberPermission(userid, permission, obj, StringType = type('')):
     return 0
     
 def getCPInfo(self) :
     return 0
     
 def getCPInfo(self) :

-    try: cp = _cb_decode(self.REQUEST['__cp'])
+    if self.REQUEST.RESPONSE.cookies.has_key('__cp') :
+        cp = self.REQUEST.RESPONSE.cookies['__cp']['value']
+    else :
+        cp = self.REQUEST.get('__cp')
+    try: cp = _cb_decode(cp)

     except: return None
     return cp
 
     except: return None
     return cp
 


@@ -226,7 +230,7 @@ def getPreferredLanguages(context):
 security.declarePublic('getBestTranslationLanguage')
 def getBestTranslationLanguage(langs, context):
     """ returns best translation language according
 security.declarePublic('getBestTranslationLanguage')
 def getBestTranslationLanguage(langs, context):
     """ returns best translation language according

-        availables languages (param langs)
+        to available languages (param langs)

         and user preferences (retrieves by context)
     """
     request = getattr(context, 'REQUEST', None)
         and user preferences (retrieves by context)
     """
     request = getattr(context, 'REQUEST', None)


@@ -257,10 +261,12 @@ def getAdapterByInterface(ob, dotted_name, default=_marker) :
     else :
         return default
 
     else :
         return default
 

+security.declarePublic('encodeQuopriEmail')

 def encodeQuopriEmail(name, email) :
     qpName = encodestring(name).replace('=\n', '')
     return '''"=?utf-8?q?%s?=" <%s>''' % (qpName, email)
 
 def encodeQuopriEmail(name, email) :
     qpName = encodestring(name).replace('=\n', '')
     return '''"=?utf-8?q?%s?=" <%s>''' % (qpName, email)
 

+security.declarePublic('encodeMailHeader')

 def encodeMailHeader(content) :
     s = encodestring(content).replace('=\n', '')
     s = s.replace('_', '=5F')
 def encodeMailHeader(content) :
     s = encodestring(content).replace('=\n', '')
     s = s.replace('_', '=5F')


@@ -313,4 +319,20 @@ def _sudo(func, userid=None) :
         raise e
 
     return ret
         raise e
 
     return ret

-    
\ No newline at end of file
+
+security.declarePublic('searchContentsWithLocalRolesForAuthenticatedUser')
+def searchContentsWithLocalRolesForAuthenticatedUser(**kw):
+    mtool = getUtilityByInterfaceName('Products.CMFCore.interfaces.IMembershipTool')
+    ctool = getUtilityByInterfaceName('Products.CMFCore.interfaces.ICatalogTool')
+    member = mtool.getAuthenticatedMember()
+    userid = member.getId()
+    userAndGroups = ['user:%s' % userid]
+    
+    getGroups = getattr(member, 'getGroups', None)
+    if getGroups is not None :
+        for group in getGroups():
+            userAndGroups.append('user:'+group)
+    
+    kw[ 'allowedRolesAndUsers' ] = userAndGroups
+    
+    return ctool.unrestrictedSearchResults(**kw)