* Added Jens Ellerbrocks suggestion for "postUserFuncInt" in stdWrap.
authorKasper Skårhøj <kasper@typo3.org>
Thu, 1 Apr 2004 09:09:52 +0000 (09:09 +0000)
committerKasper Skårhøj <kasper@typo3.org>
Thu, 1 Apr 2004 09:09:52 +0000 (09:09 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@179 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/cms/tslib/class.tslib_content.php
typo3/sysext/cms/tslib/class.tslib_fe.php

index 145eccc..2f63d76 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-04-01  Kasper Skårhøj,,,  <kasper@typo3.com>
 
+       * Added Jens Ellerbrocks suggestion for "postUserFuncInt" in stdWrap.
+
+2004-04-01  Kasper Skårhøj,,,  <kasper@typo3.com>
+
        * Added some file icons from Ben and Emile
 
 2004-04-01  Kasper Skårhøj,,,  <kasper@typo3.com>
index 01a47fd..6d27701 100755 (executable)
@@ -648,10 +648,10 @@ class tslib_cObj {
                                $substKey = $ext.'_SCRIPT.'.$GLOBALS['TSFE']->uniqueHash();
                                $content.='<!--'.$substKey.'-->';
                                $GLOBALS['TSFE']->config[$ext.'incScript'][$substKey] = array(
-                                       'file'=>$incFile, 
-                                       'conf'=>$conf,
-                                       'cObj'=>serialize($this),
-                                       'type'=>'FUNC'
+                                       'file' => $incFile,
+                                       'conf' => $conf,
+                                       'cObj' => serialize($this),
+                                       'type' => 'FUNC'
                                );
                        break;
                        default:
@@ -2944,7 +2944,17 @@ class tslib_cObj {
                                        if ($conf['offsetWrap.']['stdWrap.'])   {       $content=$this->stdWrap($content,$conf['offsetWrap.']['stdWrap.']);     }
                                }
                                if ($conf['postUserFunc'])      {$content = $this->callUserFunction($conf['postUserFunc'], $conf['postUserFunc.'], $content);}
-                               
+                               if ($conf['postUserFuncInt'])   {
+                                       $substKey = 'INT_SCRIPT.'.$GLOBALS['TSFE']->uniqueHash();
+                                       $GLOBALS['TSFE']->config['INTincScript'][$substKey] = array(
+                                               'content' => $content,
+                                               'postUserFunc' => $conf['postUserFuncInt'],
+                                               'conf' => $conf['postUserFuncInt.'],
+                                               'type' => 'POSTUSERFUNC',
+                                               'cObj' => serialize($this),
+                                       );
+                                       $content ='<!--'.$substKey.'-->';
+                               }
                                        // Various:
                                if ($conf['prefixComment'] && !$GLOBALS['TSFE']->config['config']['disablePrefixComment'])      {$content = $this->prefixComment($conf['prefixComment'], $conf['prefixComment.'], $content);}
 
index 96a1dc7..22651ce 100755 (executable)
                                        $INTiS_cObj->INT_include=1;
                                        switch($INTiS_config[$INTiS_key]['type'])       {
                                                case 'SCRIPT':
-                                                       $incContent=$INTiS_cObj->PHP_SCRIPT($INTiS_config[$INTiS_key]['conf']);
+                                                       $incContent = $INTiS_cObj->PHP_SCRIPT($INTiS_config[$INTiS_key]['conf']);
                                                break;
                                                case 'COA':
-                                                       $incContent=$INTiS_cObj->COBJ_ARRAY($INTiS_config[$INTiS_key]['conf']);
+                                                       $incContent = $INTiS_cObj->COBJ_ARRAY($INTiS_config[$INTiS_key]['conf']);
                                                break;
                                                case 'FUNC':
-                                                       $incContent=$INTiS_cObj->USER($INTiS_config[$INTiS_key]['conf']);
+                                                       $incContent = $INTiS_cObj->USER($INTiS_config[$INTiS_key]['conf']);
+                                               break;
+                                               case 'POSTUSERFUNC':
+                                                       $incContent = $INTiS_cObj->callUserFunction($INTiS_config[$INTiS_key]['postUserFunc'], $INTiS_config[$INTiS_key]['conf'], $INTiS_config[$INTiS_key]['content']);
                                                break;
                                        }
                                }