Added FAL support, resolves #48490
authorfrancois <francois@735d13b6-9817-0410-8766-e36946ffe9aa>
Fri, 24 May 2013 15:56:41 +0000 (15:56 +0000)
committerfrancois <francois@735d13b6-9817-0410-8766-e36946ffe9aa>
Fri, 24 May 2013 15:56:41 +0000 (15:56 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Extensions/phpdisplay/trunk@75513 735d13b6-9817-0410-8766-e36946ffe9aa

ChangeLog
Configuration/TCA/tx_phpdisplay_displays.php
class.tx_phpdisplay.php
ext_emconf.php

index f34d796..1842458 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2012-05-24 Francois Suter (Cobweb)  <typo3@cobweb.ch>
 
        * Verified compatibility with TYPO3 6.0 and 6.1, resolves #48489
+       * Added FAL support, resolves #48490
 
 2012-06-29 Francois Suter (Cobweb)  <typo3@cobweb.ch>
 
index 4e72889..de6b3e5 100644 (file)
@@ -49,7 +49,10 @@ $TCA['tx_phpdisplay_displays'] = array(
                                                'title' => 'Link',
                                                'icon' => 'link_popup.gif',
                                                'script' => 'browse_links.php?mode=wizard',
-                                               'JSopenParams' => 'height=600,width=700,status=0,menubar=0,scrollbars=1'
+                                               'JSopenParams' => 'height=600,width=700,status=0,menubar=0,scrollbars=1',
+                                               'params' => array(
+                                                       'blindLinkOptions' => 'page,url,mail,spec,folder',
+                                               ),
                                        )
                                )
                        )
index b301804..c38ba8c 100644 (file)
@@ -166,24 +166,25 @@ class tx_phpdisplay extends tx_tesseract_feconsumerbase {
                $this->localCObj = t3lib_div::makeInstance('tslib_cObj');
                $this->configuration = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf'][$this->extKey]);
 
-               // Loads the template file
-               $templateFile = $this->consumerData['template'];
 
-               if (preg_match('/^FILE:/isU', $templateFile)) {
-                       $templateFile = str_replace('FILE:', '' , $templateFile);
-               }
-               $templateFile = t3lib_div::getFileAbsFileName($templateFile);
+                       // Get the full path to the template file
+               try {
+                       $filePath = tx_tesseract_utilities::getTemplateFilePath($this->consumerData['template']);
 
-               if (is_file($templateFile)) {
                                /** @var $template tx_phpdisplay_template */
                        $template = t3lib_div::makeInstance('tx_phpdisplay_template');
                        $template->set('controller', $this->getController());
                        $template->set('filter', $this->getFilter());
                        $template->set('datastructure', $this->getDataStructure());
-                       $this->result = $template->fetch($templateFile);
+                       $this->result = $template->fetch($filePath);
                }
-               else {
-                       $this->result .= '<div style="color :red; font-weight: bold">Template not found at ' . $templateFile . '.</div>';
+               catch (Exception $e) {
+                       $this->controller->addMessage(
+                               $this->extKey,
+                               $e->getMessage() . ' (' . $e->getCode() . ')',
+                               'Error processing the view',
+                               t3lib_FlashMessage::ERROR
+                       );
                }
        }
 
index 42f0cfa..0fd36d2 100644 (file)
@@ -33,7 +33,7 @@ $EM_CONF[$_EXTKEY] = array(
        'constraints' => array(
                'depends' => array(
                        'typo3' => '4.5.0-6.1.99',
-                       'tesseract' => '1.0.0-0.0.0',
+                       'tesseract' => '1.7.0-0.0.0',
                ),
                'conflicts' => array(
                ),