Follow-up to #10853: New Multimedia CE
authorSteffen Kamper <info@sk-typo3.de>
Mon, 31 Aug 2009 11:27:45 +0000 (11:27 +0000)
committerSteffen Kamper <info@sk-typo3.de>
Mon, 31 Aug 2009 11:27:45 +0000 (11:27 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@5853 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
t3lib/core_autoload.php
typo3/sysext/cms/ext_tables.php
typo3/sysext/cms/tslib/class.tslib_content.php
typo3/sysext/cms/tslib/hooks/class.tx_cms_mediaitems.php

index fd02692..f275f38 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@
 
 2009-08-31  Steffen Kamper  <info@sk-typo3.de>
 
+       * Follow-up to #10853: New Multimedia CE
        * Added feature #10853: New Multimedia CE
        * Added feature #11374: Add Linebreak in Palette of TCEFORMS
 
index ed4f384..47b2e9f 100644 (file)
@@ -124,6 +124,7 @@ return array(
        'tslib_pibase' => PATH_tslib . 'class.tslib_pibase.php',
        'tslib_search' => PATH_tslib . 'class.tslib_search.php',
        'sc_tslib_showpic' => PATH_tslib . 'showpic.php',
+       'tx_cms_mediaitems' => PATH_tslib . 'hooks/class.tx_cms_mediaitems.php',
        'tx_cms_treelistcacheupdate' => PATH_tslib . 'hooks/class.tx_cms_treelistcacheupdate.php',
        'tslib_content_cobjgetsinglehook' => PATH_tslib . 'interfaces/interface.tslib_content_cobjgetsinglehook.php',
        'tslib_content_getdatahook' => PATH_tslib . 'interfaces/interface.tslib_content_getdatahook.php',
index f7f3dd1..03f4973 100755 (executable)
@@ -2,7 +2,6 @@
 # TYPO3 SVN ID: $Id$
 if (!defined ('TYPO3_MODE'))   die ('Access denied.');
 
-include_once(t3lib_extMgm::extPath($_EXTKEY) . 'tslib/hooks/class.tx_cms_mediaitems.php');
 
 if (TYPO3_MODE == 'BE') {
        t3lib_extMgm::addModule('web','layout','top',t3lib_extMgm::extPath($_EXTKEY).'layout/');
index b546795..05e4947 100644 (file)
@@ -2650,7 +2650,7 @@ class tslib_cObj {
         * @param       array           Array of TypoScript properties
         * @return      string          Output
         */
-       function MEDIA($conf) {
+       public function MEDIA($conf) {
                $content = '';  
                $flexParams = $this->stdWrap($conf['flexParams'], $conf['flexParams.']);
                if (substr($flexParams, 0, 1) === '<') {
@@ -2663,7 +2663,7 @@ class tslib_cObj {
                }
 
 
-               $mode = @file_exists(PATH_site . $url) ? 'file' : 'url';
+               $mode = is_file(PATH_site . $url) ? 'file' : 'url';
                if ($mode === 'file') {
                        $filename = $GLOBALS['TSFE']->tmpl->getFileName($url);
                        $fileinfo = t3lib_div::split_fileref($filename);
@@ -2696,7 +2696,7 @@ class tslib_cObj {
                        $conf['height'] = intval($conf['height']) ? $conf['height'] : $typeConf['defaultHeight'];
                }
 
-               if (is_array($conf['parameter.']['mmMediaOptions'])) { 
+               if (is_array($conf['parameter.']['mmMediaOptions'])) {
                        $params = array();
                        foreach ($conf['parameter.']['mmMediaOptions'] as $key => $value) {
                                if ($key == 'mmMediaCustomParameterContainer') {
@@ -2707,7 +2707,7 @@ class tslib_cObj {
                                                $tmp = t3lib_div::trimExplode(chr(10), $rawTS);
                                                if (count($tmp)) {
                                                        foreach ($tmp as $tsLine) {
-                                                               if (substr($tsLine, 0, 1) != '#' && $pos = strpos($tsLine, '.')) { 
+                                                               if (substr($tsLine, 0, 1) != '#' && $pos = strpos($tsLine, '.')) {
                                                                        $parts[0] = substr($tsLine, 0, $pos);
                                                                        $parts[1] = substr($tsLine, $pos + 1);
                                                                        $valueParts = t3lib_div::trimExplode('=', $parts[1], true);
@@ -2716,7 +2716,7 @@ class tslib_cObj {
                                                                                case 'flashvars':
                                                                                        $conf['flashvars.'][$valueParts[0]] = $valueParts[1];
                                                                                break;
-                                                                               case 'params':          
+                                                                               case 'params':
                                                                                        $conf['params.'][$valueParts[0]] = $valueParts[1];
                                                                                break;
                                                                                case 'attributes':
@@ -2803,7 +2803,7 @@ class tslib_cObj {
         * @param       array           Array of TypoScript properties
         * @return      string          Output
         */
-       function SWFOBJECT($conf) {
+       public function SWFOBJECT($conf) {
                $content = '';
                $flashvars = $params = $attributes = '';
 
@@ -2891,7 +2891,7 @@ class tslib_cObj {
         * @param       array           Array of TypoScript properties
         * @return      string          Output
         */
-       function QTOBJECT($conf) {
+       public function QTOBJECT($conf) {
                $content = '';  
                $params = '';
 
@@ -2965,10 +2965,10 @@ class tslib_cObj {
         * @access      public
         * 
         */
-       function readFlexformIntoConf($flexData, &$conf, $recursive=FALSE) {
+       public function readFlexformIntoConf($flexData, &$conf, $recursive=FALSE) {
                if ($recursive === FALSE) {
                        $flexData = t3lib_div::xml2array($flexData, 'T3');
-               } 
+               }
 
                if (is_array($flexData)) {
                        if (isset($flexData['data']['sDEF']['lDEF'])) {
@@ -2982,7 +2982,7 @@ class tslib_cObj {
                                                        $conf[$ekey] =  $element['vDEF'];
                                                } else {
                                                        if(is_array($element)) {
-                                                               $this->readFlexformIntoConf($element, $conf[$key][key($element)][$ekey], TRUE);                                                 
+                                                               $this->readFlexformIntoConf($element, $conf[$key][key($element)][$ekey], TRUE);
                                                        } else {
                                                                $this->readFlexformIntoConf($element, $conf[$key][$ekey], TRUE);
                                                        }
@@ -2998,7 +2998,7 @@ class tslib_cObj {
                }
        }
 
-       
+
        /**
         * Returns all parents of the given PID (Page UID) list
         *
index 913c351..31a2bad 100644 (file)
@@ -32,7 +32,7 @@
  * @subpackage cms \r
  */\r
  \r
-class tx_cms_mediaItems {\r
+class tx_cms_mediaItems implements t3lib_Singleton {\r
 \r
        /**\r
         * Load extra render types if they exist\r