--- ECHO_content/ECHO_helpers.py	2012/01/16 18:57:50	1.103.2.2
+++ ECHO_content/ECHO_helpers.py	2012/01/17 18:39:07	1.103.2.3
@@ -131,6 +131,9 @@ class ECHO_basis:
         """return utf-8 encoded string object for string or unicode object s"""
         return utf8ify(s)
 
+    def getBrowserType(self):
+        """returns browserType object"""
+        return browserType(self)
     
     def manage_addECHO_locale(self,lang,title,label,text=None,content_type=None,RESPONSE=None):
             return ECHO_collection.manage_addECHO_locale(self,lang,title,label)
@@ -439,10 +442,10 @@ class ECHO_basis:
 
     def createMapImg(self):
         """generate img-tag for map"""
-        bt = BrowserCheck(self)
+        bt = browserType(self)
         tag = ""
         src = self.getOverview().absolute_url()
-        if bt.isN4:
+        if bt['isN4']:
             # N4 needs ilayer to create an id
             tag += '<ilayer id="overview" visibility="show"><img src="%s"></ilayer>'%src
         else:
@@ -456,7 +459,7 @@ class ECHO_basis:
 
     def createMapLink(self, ob, text=None, target="_blank"):
         """generate map link"""
-        bt = BrowserCheck(self)
+        bt = browserType(self)
         id = ob.getFullId()
         url = ob.getTargetUrl()
         if url == "":
@@ -478,7 +481,7 @@ class ECHO_basis:
             
         tiptext = ob.getTip()
         tag = ""
-        if bt.isN4:
+        if bt['isN4']:
             # N4 needs layer for highlighting
             tag += '<ilayer id="a.%s"><a class="maplink" onmouseover="highlightPair(\'%s\', true)" onmouseout="highlightPair(\'%s\', false)" %s %s'%(id,id,id,href,targetattr)
             tag += ">" + text + "</a></ilayer>"
@@ -492,7 +495,7 @@ class ECHO_basis:
 
     def createMapAux(self, ob, arrowsrc="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?dw=15&fn=icons/pfeil", circlesrc="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?dw=15&fn=icons/kreis", target="_blank",backLink=None,alternativArrowsrc="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?dw=15&fn=icons/pfeil_blau"):
         """generate map link image, text and other stuff"""
-        bt = BrowserCheck(self)
+        bt = browserType(self)
         id = ob.getFullId()
         link = ob.getLinkId()
         url = ob.getTargetUrl()
@@ -509,7 +512,7 @@ class ECHO_basis:
         tiptext = ob.getTip()
         tag = ""
 
-        if bt.isN4:
+        if bt['isN4']:
             #
             # N4 needs layer and img elements
             #
@@ -572,7 +575,7 @@ class ECHO_basis:
 
                 if float(rot) < 0:
                     marksrc = circlesrc
-                if bt.isIEWin and bt.versIE > 5:
+                if bt['isIEWin'] and bt['versIE'] > 5:
                     # IE/Win 5.5 has "feature" for PNG transparency
                     tag += '<span id="i.%s" style="position:absolute; top:-100px; left:-100px; border-style:none; border-width=1px; filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src=\'%s&rot=%s\');"><img style="visibility:hidden" src="%s&rot=%s" /></span>'%(id,marksrc,rot,marksrc,rot)
                 else:
@@ -587,7 +590,7 @@ class ECHO_basis:
                 tag += '</div></div>'
             else:
                 # DOM - Area
-                if bt.isIE:
+                if bt['isIE']:
                     # IE needs transparent img for area
                     tag += '<img id="i.%s" border="0" style="position:absolute; top:-100px; left:-100px;" src="trans_img"'%(id)
                     if tiptext:
@@ -994,28 +997,30 @@ def sendFile(self, filename, type):
     return
 
 
-class BrowserCheck:
+def browserType(zope):
     """check the browsers request to find out the browser type"""
-    
-    def __init__(self, zope):
-        """initialisiere"""
-        self.ua = zope.REQUEST.get_header("HTTP_USER_AGENT")
-        self.isN4 = False
-        self.isIE = False
-        if string.find(self.ua, 'MSIE') > -1:
-            self.isIE = True
-        else:
-            self.isN4 = string.find(self.ua, 'Mozilla/4.') > -1
-        try:
-            self.nav = self.ua[string.find(self.ua, '('):]
-            ie = string.split(self.nav, "; ")[1]
-            if string.find(ie, "MSIE") > -1:
-                self.versIE = string.split(ie, " ")[1]
-        except: pass
-        self.isMac = string.find(self.ua, 'Macintosh') > -1
-        self.isWin = string.find(self.ua, 'Windows') > -1
-        self.isIEWin = self.isIE and self.isWin
-        self.isIEMac = self.isIE and self.isMac
+    bt = {}
+    ua = zope.REQUEST.get_header("HTTP_USER_AGENT")
+    bt['ua'] = ua
+    bt['isN4'] = False
+    bt['isIE'] = False
+    if string.find(ua, 'MSIE') > -1:
+        bt['isIE'] = True
+    else:
+        bt['isN4'] = string.find(ua, 'Mozilla/4.') > -1
+    try:
+        nav = ua[string.find(ua, '('):]
+        bt['nav'] = nav
+        ie = string.split(nav, "; ")[1]
+        if string.find(ie, "MSIE") > -1:
+            bt['versIE'] = string.split(ie, " ")[1]
+    except: pass
+    
+    bt['isMac'] = string.find(ua, 'Macintosh') > -1
+    bt['isWin'] = string.find(ua, 'Windows') > -1
+    bt['isIEWin'] = bt['isIE'] and bt['isWin']
+    bt['isIEMac'] = bt['isIE'] and bt['isMac']
+    return bt
 
                 
 def writeMetadata(url,metadict,project=None,startpage=None,xslt=None,thumbtemplate=None,topbar=None,digiLibTemplate=None,xmlfrag=None,digiliburlprefix=None):