Merge commit 'a4cb4d96face514924387d34746b3148848ac092' into zope-2.13

[Plinn.git] / __init__.py

diff --git a/__init__.py b/__init__.py
index 292dca6..16c9e72 100755 (executable)
--- a/__init__.py
+++ b/__init__.py
@@ -28,6 +28,8 @@ import exceptions
 from Products.CMFCore import utils as core_cmf_utils
 from Products.CMFDefault import utils as default_cmf_utils
 from Products.CMFCore.permissions import AddPortalContent
+from Products.CMFCore.FSFile import FSFile
+from Products.CMFCore.DirectoryView import registerFileExtension
 import File, Folder, HugePlinnFolder, Topic
 import MembershipTool
 import MemberDataTool
@@ -36,11 +38,9 @@ import GroupDataTool
 import RegistrationTool
 import CalendarTool
 import AttachmentTool
-#from shutdown_dispatcher import ZopeShutdownDispatcher
+import catalog
 
 from PloneMisc import IndexIterator, Batch
-from utils import  getCPInfo, popCP
-
 import patch
 
 from AccessControl import allow_module, allow_class
@@ -57,14 +57,13 @@ tools = ( MembershipTool.MembershipTool
                , RegistrationTool.RegistrationTool
                , CalendarTool.CalendarTool
                , AttachmentTool.AttachmentTool
+               , catalog.CatalogTool
                )
 
-methods = {
-'getCPInfo': getCPInfo,
-'getCPInfo__roles__': None,
-'popCP' : popCP,
-'popCP__roles__' : None
-}
+# register files extensions
+registerFileExtension('ttf', FSFile)
+registerFileExtension('eot', FSFile)
+registerFileExtension('cur', FSFile)
 
 def initialize(registrar) :
        
@@ -72,8 +71,6 @@ def initialize(registrar) :
        allow_module('Products.Plinn.PloneMisc')
        allow_class(IndexIterator)
        allow_class(Batch)
-       app = registrar._ProductContext__app
-       #ZopeShutdownDispatcher(registrar._ProductContext__app)
        
        core_cmf_utils.ContentInit(
        'Plinn',
@@ -96,7 +93,7 @@ validTags = default_cmf_utils.NASTY_TAGS.copy()
 for tag in validTags.keys() :
        validTags[tag] = 1
 
-VALID_TAGS = {'font': 1, 'param' : 1}
+VALID_TAGS = {'font': 1, 'param' : 1, 'iframe' : 1}
 
 validTags.update(VALID_TAGS)