Éléments déplacés vers le produit photoprint.

[Plinn.git] / utils.py

diff --git a/utils.py b/utils.py
index 252af4e..6b3b697 100755 (executable)
--- a/utils.py
+++ b/utils.py
@@ -28,6 +28,7 @@ from types import StringType
 from random import randrange
 from Acquisition import aq_base
 from quopri import encodestring
 from random import randrange
 from Acquisition import aq_base
 from quopri import encodestring

+from zope.globalrequest import getRequest

 from AccessControl.PermissionRole import rolesForPermissionOn
 from AccessControl import ModuleSecurityInfo
 from AccessControl import getSecurityManager
 from AccessControl.PermissionRole import rolesForPermissionOn
 from AccessControl import ModuleSecurityInfo
 from AccessControl import getSecurityManager


@@ -93,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)


@@ -164,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
 


@@ -195,7 +200,7 @@ security.declarePublic('Message')
 Message = MessageFactory('plinn')
 
 security.declarePublic('translate')
 Message = MessageFactory('plinn')
 
 security.declarePublic('translate')

-def translate(message, context):
+def translate(message, context=None):

     """ Translate i18n message.
     """
     if isinstance(message, Exception):
     """ Translate i18n message.
     """
     if isinstance(message, Exception):


@@ -203,7 +208,11 @@ def translate(message, context):
             message = message[0]
         except (TypeError, IndexError):
             pass
             message = message[0]
         except (TypeError, IndexError):
             pass

-    return i18ntranslate(message, domain='plinn', context=context.REQUEST)
+    if not context :
+        request = getRequest()
+    else :
+        request = context.REQUEST
+    return i18ntranslate(message, domain='plinn', context=request)

 
 security.declarePublic('desacc')
 desacc = Utf8Utils.desacc
 
 security.declarePublic('desacc')
 desacc = Utf8Utils.desacc


@@ -221,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)


@@ -252,10 +261,35 @@ 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')
+    s = s.replace(' ', '_')
+
+    lines = []
+    STEP = 50
+    start = 0
+    stop = STEP
+    part = s[start:stop]
+    lines.append(part)
+
+    while len(part) == STEP:
+        start = start + STEP
+        stop = stop + STEP
+        part = s[start:stop]
+        lines.append(part)
+    
+    lines = [' =?utf-8?Q?%s?=' % part for part in lines]
+    s = '\n'.join(lines)
+    s = s.strip()
+    return s
+

 
 def _sudo(func, userid=None) :
     """
 
 def _sudo(func, userid=None) :
     """