lochmueller / ink

Classes/Hooks/TypoScriptFrontend.php

Indentation +18 added lines, -18 removed lines

@@ -16,24 +16,24 @@
  */
 class TypoScriptFrontend {
 
-	/**
-	 * Call the end of rendering hook
-	 *
-	 * @hook TYPO3_CONF_VARS|SC_OPTIONS|tslib/class.tslib_fe.php|hook_eofe
-	 *
-	 * @param array                        $params
-	 * @param TypoScriptFrontendController $obj
-	 */
-	public function endOfRendering(array $params, TypoScriptFrontendController $obj) {
-		if (!isset($obj->config['config']['newsletterPostprocessing.']) || !is_array($obj->config['config']['newsletterPostprocessing.'])) {
-			return;
-		}
+    /**
+     * Call the end of rendering hook
+     *
+     * @hook TYPO3_CONF_VARS|SC_OPTIONS|tslib/class.tslib_fe.php|hook_eofe
+     *
+     * @param array                        $params
+     * @param TypoScriptFrontendController $obj
+     */
+    public function endOfRendering(array $params, TypoScriptFrontendController $obj) {
+        if (!isset($obj->config['config']['newsletterPostprocessing.']) || !is_array($obj->config['config']['newsletterPostprocessing.'])) {
+            return;
+        }
 
-		foreach ($obj->config['config']['newsletterPostprocessing.'] as $postprocessorClass) {
-			/** @var PostprocessingInterface $processor */
-			$processor = GeneralUtility::makeInstance($postprocessorClass);
-			$obj->content = $processor->process($obj->content);
-		}
-	}
+        foreach ($obj->config['config']['newsletterPostprocessing.'] as $postprocessorClass) {
+            /** @var PostprocessingInterface $processor */
+            $processor = GeneralUtility::makeInstance($postprocessorClass);
+            $obj->content = $processor->process($obj->content);
+        }
+    }
 
 }

Classes/PlainRenderer.php

Indentation +77 added lines, -77 removed lines

@@ -17,88 +17,88 @@
  */
 class PlainRenderer {
 
-	/**
-	 * The content object
-	 *
-	 * @var \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer
-	 */
-	public $cObj;
+    /**
+     * The content object
+     *
+     * @var \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer
+     */
+    public $cObj;
 
-	/**
-	 * Configuration
-	 *
-	 * @var
-	 */
-	protected $conf;
+    /**
+     * Configuration
+     *
+     * @var
+     */
+    protected $conf;
 
-	/**
-	 * Render the different elements and collect the single lines.
-	 * After the rendering the lines will be imploded. Notice:
-	 * All methods after this are CType rendering helper
-	 *
-	 * @param string $content
-	 * @param array  $conf
-	 *
-	 * @return array
-	 */
-	public function render($content, $conf) {
-		$lines = array();
-		$this->conf = $conf;
-		$CType = (string)$this->cObj->data['CType'];
-		if (isset($this->conf['forceCType']) && trim($this->conf['forceCType']) !== '') {
-			$CType = trim($this->conf['forceCType']);
-		}
+    /**
+     * Render the different elements and collect the single lines.
+     * After the rendering the lines will be imploded. Notice:
+     * All methods after this are CType rendering helper
+     *
+     * @param string $content
+     * @param array  $conf
+     *
+     * @return array
+     */
+    public function render($content, $conf) {
+        $lines = array();
+        $this->conf = $conf;
+        $CType = (string)$this->cObj->data['CType'];
+        if (isset($this->conf['forceCType']) && trim($this->conf['forceCType']) !== '') {
+            $CType = trim($this->conf['forceCType']);
+        }
 
-		$renderer = array(
-			'html'            => 'FRUIT\\Ink\\Rendering\\Html',
-			'header'          => 'FRUIT\\Ink\\Rendering\\Header',
-			'table'           => 'FRUIT\\Ink\\Rendering\\Table',
-			'menu'            => 'FRUIT\\Ink\\Rendering\\Menu',
-			'text'            => 'FRUIT\\Ink\\Rendering\\Text',
-			'image'           => 'FRUIT\\Ink\\Rendering\\Image',
-			'textpic'         => 'FRUIT\\Ink\\Rendering\\TextPicture',
-			'templavoila_pi1' => 'FRUIT\\Ink\\Rendering\\Templavoila',
-			'list'            => 'FRUIT\\Ink\\Rendering\\Plugin',
-		);
+        $renderer = array(
+            'html'            => 'FRUIT\\Ink\\Rendering\\Html',
+            'header'          => 'FRUIT\\Ink\\Rendering\\Header',
+            'table'           => 'FRUIT\\Ink\\Rendering\\Table',
+            'menu'            => 'FRUIT\\Ink\\Rendering\\Menu',
+            'text'            => 'FRUIT\\Ink\\Rendering\\Text',
+            'image'           => 'FRUIT\\Ink\\Rendering\\Image',
+            'textpic'         => 'FRUIT\\Ink\\Rendering\\TextPicture',
+            'templavoila_pi1' => 'FRUIT\\Ink\\Rendering\\Templavoila',
+            'list'            => 'FRUIT\\Ink\\Rendering\\Plugin',
+        );
 
-		GeneralUtility::requireOnce(ExtensionManagementUtility::extPath('ink', 'Classes/Rendering/Plugin.php'));
-		GeneralUtility::requireOnce(ExtensionManagementUtility::extPath('ink', 'Classes/Rendering/Image.php'));
-		GeneralUtility::requireOnce(ExtensionManagementUtility::extPath('ink', 'Classes/Rendering/Menu.php'));
+        GeneralUtility::requireOnce(ExtensionManagementUtility::extPath('ink', 'Classes/Rendering/Plugin.php'));
+        GeneralUtility::requireOnce(ExtensionManagementUtility::extPath('ink', 'Classes/Rendering/Image.php'));
+        GeneralUtility::requireOnce(ExtensionManagementUtility::extPath('ink', 'Classes/Rendering/Menu.php'));
 
-		$objectManager = new ObjectManager();
-		/** @var Dispatcher $signalSlot */
-		$signalSlot = $objectManager->get('TYPO3\\CMS\\Extbase\\SignalSlot\\Dispatcher');
-		$returnData = $signalSlot->dispatch(__CLASS__, 'renderer', array('renderer' => $renderer));
-		$renderer = $returnData['renderer'];
+        $objectManager = new ObjectManager();
+        /** @var Dispatcher $signalSlot */
+        $signalSlot = $objectManager->get('TYPO3\\CMS\\Extbase\\SignalSlot\\Dispatcher');
+        $returnData = $signalSlot->dispatch(__CLASS__, 'renderer', array('renderer' => $renderer));
+        $renderer = $returnData['renderer'];
 
-		if (isset($renderer[$CType])) {
-			$className = $renderer[$CType];
-			/** @var RenderingInterface $renderObject */
-			$renderObject = $objectManager->get($className);
-			$lines = $renderObject->render($this->cObj, $this->conf);
-		} else {
-			$lines[] = 'CType: ' . $CType . ' have no rendering definitions';
-		}
-		$content = implode(LF, $lines);
-		return trim($content, CRLF . TAB);
-	}
+        if (isset($renderer[$CType])) {
+            $className = $renderer[$CType];
+            /** @var RenderingInterface $renderObject */
+            $renderObject = $objectManager->get($className);
+            $lines = $renderObject->render($this->cObj, $this->conf);
+        } else {
+            $lines[] = 'CType: ' . $CType . ' have no rendering definitions';
+        }
+        $content = implode(LF, $lines);
+        return trim($content, CRLF . TAB);
+    }
 
-	/**
-	 * Function used by TypoScript "parseFunc" to process links in the bodytext.
-	 * Extracts the link and shows it in plain text in a parathesis next to the link text. If link was relative the site URL was prepended.
-	 *
-	 * @param    string $content : Empty, ignore.
-	 * @param    array  $conf    : TypoScript parameters
-	 *
-	 * @return    string        Processed output.
-	 * @see parseBody()
-	 */
-	function atag_to_http($content, $conf) {
-		$this->conf = $conf;
-		$theLink = trim($this->cObj->parameters['href']);
-		if (strtolower(substr($theLink, 0, 7)) == 'mailto:') {
-			$theLink = substr($theLink, 7);
-		}
-		return $this->cObj->getCurrentVal() . ' ( ' . $theLink . ' )';
-	}
+    /**
+     * Function used by TypoScript "parseFunc" to process links in the bodytext.
+     * Extracts the link and shows it in plain text in a parathesis next to the link text. If link was relative the site URL was prepended.
+     *
+     * @param    string $content : Empty, ignore.
+     * @param    array  $conf    : TypoScript parameters
+     *
+     * @return    string        Processed output.
+     * @see parseBody()
+     */
+    function atag_to_http($content, $conf) {
+        $this->conf = $conf;
+        $theLink = trim($this->cObj->parameters['href']);
+        if (strtolower(substr($theLink, 0, 7)) == 'mailto:') {
+            $theLink = substr($theLink, 7);
+        }
+        return $this->cObj->getCurrentVal() . ' ( ' . $theLink . ' )';
+    }
 }

Classes/Rendering/AbstractRendering.php

Indentation +93 added lines, -93 removed lines

@@ -16,106 +16,106 @@
  */
 abstract class AbstractRendering implements RenderingInterface {
 
-	/**
-	 * Content object
-	 *
-	 * @var ContentObjectRenderer
-	 */
-	protected $contentObject;
+    /**
+     * Content object
+     *
+     * @var ContentObjectRenderer
+     */
+    protected $contentObject;
 
-	/**
-	 * Configuration
-	 *
-	 * @var array
-	 */
-	protected $configuration;
+    /**
+     * Configuration
+     *
+     * @var array
+     */
+    protected $configuration;
 
-	/**
-	 * Set the content object and configuration
-	 * Call the renderInternal after preparation
-	 *
-	 * @param ContentObjectRenderer $contentObject
-	 * @param array                 $configuration
-	 *
-	 * @return array
-	 */
-	public function render($contentObject, $configuration) {
-		$this->contentObject = $contentObject;
-		$this->configuration = $configuration;
-		return $this->renderInternal();
-	}
+    /**
+     * Set the content object and configuration
+     * Call the renderInternal after preparation
+     *
+     * @param ContentObjectRenderer $contentObject
+     * @param array                 $configuration
+     *
+     * @return array
+     */
+    public function render($contentObject, $configuration) {
+        $this->contentObject = $contentObject;
+        $this->configuration = $configuration;
+        return $this->renderInternal();
+    }
 
-	/**
-	 * Parsing the bodytext field content, removing typical entities and <br /> tags.
-	 *
-	 * @param    string $str     : Field content from "bodytext" or other text field
-	 * @param    string $altConf : Altername conf name (especially when bodyext field in other table then tt_content)
-	 *
-	 * @return    string        Processed content
-	 */
-	function parseBody($str, $altConf = 'bodytext') {
-		if ($this->configuration[$altConf . '.']['doubleLF']) {
-			$str = preg_replace("/\n/", "\n\n", $str);
-		}
-		// Regular parsing:
-		$str = preg_replace('/<br\s*\/?>/i', chr(10), $str);
-		$str = $this->contentObject->stdWrap($str, $this->configuration[$altConf . '.']['stdWrap.']);
+    /**
+     * Parsing the bodytext field content, removing typical entities and <br /> tags.
+     *
+     * @param    string $str     : Field content from "bodytext" or other text field
+     * @param    string $altConf : Altername conf name (especially when bodyext field in other table then tt_content)
+     *
+     * @return    string        Processed content
+     */
+    function parseBody($str, $altConf = 'bodytext') {
+        if ($this->configuration[$altConf . '.']['doubleLF']) {
+            $str = preg_replace("/\n/", "\n\n", $str);
+        }
+        // Regular parsing:
+        $str = preg_replace('/<br\s*\/?>/i', chr(10), $str);
+        $str = $this->contentObject->stdWrap($str, $this->configuration[$altConf . '.']['stdWrap.']);
 
-		// Then all a-tags:
-		$aConf = array();
-		$aConf['parseFunc.']['tags.']['a'] = 'USER';
-		// check direct mail usage @todo
-		$aConf['parseFunc.']['tags.']['a.']['userFunc'] = 'FRUIT\\Ink\\PlainRenderer->atag_to_http';
-		$aConf['parseFunc.']['tags.']['a.']['siteUrl'] = 'http://www.google.de';
-		$str = $this->contentObject->stdWrap($str, $aConf);
-		$str = str_replace('&nbsp;', ' ', htmlspecialchars_decode($str));
+        // Then all a-tags:
+        $aConf = array();
+        $aConf['parseFunc.']['tags.']['a'] = 'USER';
+        // check direct mail usage @todo
+        $aConf['parseFunc.']['tags.']['a.']['userFunc'] = 'FRUIT\\Ink\\PlainRenderer->atag_to_http';
+        $aConf['parseFunc.']['tags.']['a.']['siteUrl'] = 'http://www.google.de';
+        $str = $this->contentObject->stdWrap($str, $aConf);
+        $str = str_replace('&nbsp;', ' ', htmlspecialchars_decode($str));
 
-		if ($this->configuration[$altConf . '.']['header']) {
-			$str = $this->configuration[$altConf . '.']['header'] . LF . $str;
-		}
+        if ($this->configuration[$altConf . '.']['header']) {
+            $str = $this->configuration[$altConf . '.']['header'] . LF . $str;
+        }
 
-		return chr(10) . $str;
-	}
+        return chr(10) . $str;
+    }
 
-	/**
-	 * Function used to wrap the bodytext field content (or image caption) into lines of a max length of
-	 *
-	 * @param        string $str : The content to break
-	 *
-	 * @return        string                Processed value.
-	 * @see main_plaintext(), breakLines()
-	 */
-	function breakContent($str) {
-		$cParts = explode(chr(10), $str);
-		$lines = array();
-		foreach ($cParts as $substrs) {
-			$lines[] = $this->breakLines($substrs, LF);
-		}
-		return implode(chr(10), $lines);
-	}
+    /**
+     * Function used to wrap the bodytext field content (or image caption) into lines of a max length of
+     *
+     * @param        string $str : The content to break
+     *
+     * @return        string                Processed value.
+     * @see main_plaintext(), breakLines()
+     */
+    function breakContent($str) {
+        $cParts = explode(chr(10), $str);
+        $lines = array();
+        foreach ($cParts as $substrs) {
+            $lines[] = $this->breakLines($substrs, LF);
+        }
+        return implode(chr(10), $lines);
+    }
 
-	/**
-	 * Returns a typolink URL based on input.
-	 *
-	 * @param    string $ll : Parameter to typolink
-	 *
-	 * @return    string        The URL returned from $this->cObj->getTypoLink_URL(); - possibly it prefixed with the URL of the site if not present already
-	 */
-	function getLink($ll) {
-		return $this->contentObject->getTypoLink_URL($ll);
-	}
+    /**
+     * Returns a typolink URL based on input.
+     *
+     * @param    string $ll : Parameter to typolink
+     *
+     * @return    string        The URL returned from $this->cObj->getTypoLink_URL(); - possibly it prefixed with the URL of the site if not present already
+     */
+    function getLink($ll) {
+        return $this->contentObject->getTypoLink_URL($ll);
+    }
 
-	/**
-	 * Breaking lines into fixed length lines, using GeneralUtility::breakLinesForEmail()
-	 *
-	 * @param        string  $str       : The string to break
-	 * @param        string  $implChar  : Line break character
-	 * @param        integer $charWidth : Length of lines, default is $this->charWidth
-	 *
-	 * @return        string                Processed string
-	 */
-	function breakLines($str, $implChar = LF, $charWidth = FALSE) {
-		$charWidth = $charWidth === FALSE ? Configuration::getPlainTextWith() : (int)$charWidth;
-		return MailUtility::breakLinesForEmail($str, $implChar, $charWidth);
-	}
+    /**
+     * Breaking lines into fixed length lines, using GeneralUtility::breakLinesForEmail()
+     *
+     * @param        string  $str       : The string to break
+     * @param        string  $implChar  : Line break character
+     * @param        integer $charWidth : Length of lines, default is $this->charWidth
+     *
+     * @return        string                Processed string
+     */
+    function breakLines($str, $implChar = LF, $charWidth = FALSE) {
+        $charWidth = $charWidth === FALSE ? Configuration::getPlainTextWith() : (int)$charWidth;
+        return MailUtility::breakLinesForEmail($str, $implChar, $charWidth);
+    }
 }
\ No newline at end of file

Classes/Rendering/Templavoila.php

Indentation +19 added lines, -19 removed lines

@@ -15,24 +15,24 @@
  */
 class Templavoila extends AbstractRendering {
 
-	/**
-	 * Render the given element
-	 *
-	 * @return array
-	 */
-	public function renderInternal() {
+    /**
+     * Render the given element
+     *
+     * @return array
+     */
+    public function renderInternal() {
 
-		// TV nicht geladen
-		if (!ExtensionManagementUtility::isLoaded('templavoila')) {
-			$defaultOutput = $this->configuration['defaultOutput'];
-			if ($defaultOutput) {
-				$defaultOutput = str_replace('###CType###', $this->contentObject->data['CType'], $defaultOutput);
-			}
-			return $defaultOutput;
-		}
-		$pi1 = GeneralUtility::makeInstance('tx_templavoila_pi1');
-		$pi1->cObj = $this->contentObject;
-		$lines[] = $pi1->renderElement($this->contentObject->data, 'tt_content');
-		return $lines;
-	}
+        // TV nicht geladen
+        if (!ExtensionManagementUtility::isLoaded('templavoila')) {
+            $defaultOutput = $this->configuration['defaultOutput'];
+            if ($defaultOutput) {
+                $defaultOutput = str_replace('###CType###', $this->contentObject->data['CType'], $defaultOutput);
+            }
+            return $defaultOutput;
+        }
+        $pi1 = GeneralUtility::makeInstance('tx_templavoila_pi1');
+        $pi1->cObj = $this->contentObject;
+        $lines[] = $pi1->renderElement($this->contentObject->data, 'tt_content');
+        return $lines;
+    }
 }
\ No newline at end of file

Classes/Rendering/Html.php

Indentation +8 added lines, -8 removed lines

@@ -12,12 +12,12 @@
  */
 class Html extends AbstractRendering {
 
-	/**
-	 * Get the liens for the current HTML element
-	 *
-	 * @return array
-	 */
-	public function renderInternal() {
-		return array($this->breakContent(strip_tags($this->contentObject->data['bodytext'])));
-	}
+    /**
+     * Get the liens for the current HTML element
+     *
+     * @return array
+     */
+    public function renderInternal() {
+        return array($this->breakContent(strip_tags($this->contentObject->data['bodytext'])));
+    }
 }
\ No newline at end of file

Classes/Rendering/TextPicture.php

Indentation +18 added lines, -18 removed lines

@@ -12,22 +12,22 @@
  */
 class TextPicture extends AbstractRendering {
 
-	/**
-	 * Render the given element
-	 *
-	 * @return array
-	 */
-	public function renderInternal() {
-		$image = new Image();
-		if (!($this->contentObject->data['imageorient'] & 24)) {
-			$lines = $image->render($this->contentObject, $this->configuration);
-			$lines[] = '';
-		}
-		$lines[] = $this->breakContent(strip_tags($this->parseBody($this->contentObject->data['bodytext'])));
-		if ($this->contentObject->data['imageorient'] & 24) {
-			$lines[] = '';
-			$lines = array_merge($lines, $image->render($this->contentObject, $this->configuration));
-		}
-		return $lines;
-	}
+    /**
+     * Render the given element
+     *
+     * @return array
+     */
+    public function renderInternal() {
+        $image = new Image();
+        if (!($this->contentObject->data['imageorient'] & 24)) {
+            $lines = $image->render($this->contentObject, $this->configuration);
+            $lines[] = '';
+        }
+        $lines[] = $this->breakContent(strip_tags($this->parseBody($this->contentObject->data['bodytext'])));
+        if ($this->contentObject->data['imageorient'] & 24) {
+            $lines[] = '';
+            $lines = array_merge($lines, $image->render($this->contentObject, $this->configuration));
+        }
+        return $lines;
+    }
 }
\ No newline at end of file

Classes/Rendering/Header.php

Indentation +25 added lines, -25 removed lines

@@ -16,30 +16,30 @@
  */
 class Header extends AbstractRendering {
 
-	/**
-	 * Render the given element
-	 *
-	 * @return array
-	 */
-	public function renderInternal() {
-		$headerWrap = MailUtility::breakLinesForEmail(trim($this->contentObject->data['header']), LF, Configuration::getPlainTextWith());
-		$subHeaderWrap = MailUtility::breakLinesForEmail(trim($this->contentObject->data['subheader']), LF, Configuration::getPlainTextWith());
+    /**
+     * Render the given element
+     *
+     * @return array
+     */
+    public function renderInternal() {
+        $headerWrap = MailUtility::breakLinesForEmail(trim($this->contentObject->data['header']), LF, Configuration::getPlainTextWith());
+        $subHeaderWrap = MailUtility::breakLinesForEmail(trim($this->contentObject->data['subheader']), LF, Configuration::getPlainTextWith());
 
-		// align
-		$header = array_merge(GeneralUtility::trimExplode(LF, $headerWrap, TRUE), GeneralUtility::trimExplode(LF, $subHeaderWrap, TRUE));
-		if ($this->contentObject->data['header_position'] == 'right') {
-			foreach ($header as $key => $l) {
-				$l = trim($l);
-				$header[$key] = str_pad(' ', (Configuration::getPlainTextWith() - strlen($l)), ' ', STR_PAD_LEFT) . $l;
-			}
-		} elseif ($this->contentObject->data['header_position'] == 'center') {
-			foreach ($header as $key => $l) {
-				$l = trim($l);
-				$header[$key] = str_pad(' ', floor((Configuration::getPlainTextWith() - strlen($l)) / 2), ' ', STR_PAD_LEFT) . $l;
-			}
-		}
-		$header = implode(LF, $header);
-		$lines[] = $header;
-		return $lines;
-	}
+        // align
+        $header = array_merge(GeneralUtility::trimExplode(LF, $headerWrap, TRUE), GeneralUtility::trimExplode(LF, $subHeaderWrap, TRUE));
+        if ($this->contentObject->data['header_position'] == 'right') {
+            foreach ($header as $key => $l) {
+                $l = trim($l);
+                $header[$key] = str_pad(' ', (Configuration::getPlainTextWith() - strlen($l)), ' ', STR_PAD_LEFT) . $l;
+            }
+        } elseif ($this->contentObject->data['header_position'] == 'center') {
+            foreach ($header as $key => $l) {
+                $l = trim($l);
+                $header[$key] = str_pad(' ', floor((Configuration::getPlainTextWith() - strlen($l)) / 2), ' ', STR_PAD_LEFT) . $l;
+            }
+        }
+        $header = implode(LF, $header);
+        $lines[] = $header;
+        return $lines;
+    }
 }
\ No newline at end of file

Classes/Rendering/Text.php

Indentation +9 added lines, -9 removed lines

@@ -12,15 +12,15 @@
  */
 class Text extends AbstractRendering {
 
-	/**
-	 * Render the current content
-	 *
-	 * @return array
-	 */
-	public function renderInternal() {
+    /**
+     * Render the current content
+     *
+     * @return array
+     */
+    public function renderInternal() {
 
-		$lines[] = trim($this->breakContent(strip_tags($this->parseBody($this->contentObject->data['bodytext']))), CRLF . TAB);
-		return $lines;
+        $lines[] = trim($this->breakContent(strip_tags($this->parseBody($this->contentObject->data['bodytext']))), CRLF . TAB);
+        return $lines;
 
-	}
+    }
 }
\ No newline at end of file

Classes/Rendering/Plugin.php

Indentation +40 added lines, -40 removed lines

@@ -12,48 +12,48 @@
  */
 class Plugin extends AbstractRendering {
 
-	/**
-	 * Render the given element
-	 *
-	 * @return array
-	 */
-	public function renderInternal() {
-		$lines = array();
-		$lines[] = 'Test';
-		$myName = FALSE;
-		$listType = $this->contentObject->data['list_type'];
-		$template = $GLOBALS['TSFE']->tmpl;
+    /**
+     * Render the given element
+     *
+     * @return array
+     */
+    public function renderInternal() {
+        $lines = array();
+        $lines[] = 'Test';
+        $myName = FALSE;
+        $listType = $this->contentObject->data['list_type'];
+        $template = $GLOBALS['TSFE']->tmpl;
 
-		if (isset($template->setup['tt_content.']['list.']['20.'][$listType])) {
-			$theValue = $template->setup['tt_content.']['list.']['20.'][$listType];
-			$theConf = $template->setup['tt_content.']['list.']['20.'][$listType . '.'];
-		} else {
-			$tmp = explode('_pi', $listType);
-			if (count($tmp) < 2) {
-				$myName = 'tx_' . str_replace('_', '', $tmp[0]);
-			} else {
-				$myName = 'tx_' . str_replace('_', '', $tmp[0]) . '_pi' . $tmp[1];
-			}
-			$theValue = $template->setup['plugin.'][$myName];
-			$theConf = $template->setup['plugin.'][$myName . '.'];
-		}
-		$content = $this->contentObject->cObjGetSingle($theValue, $theConf);
+        if (isset($template->setup['tt_content.']['list.']['20.'][$listType])) {
+            $theValue = $template->setup['tt_content.']['list.']['20.'][$listType];
+            $theConf = $template->setup['tt_content.']['list.']['20.'][$listType . '.'];
+        } else {
+            $tmp = explode('_pi', $listType);
+            if (count($tmp) < 2) {
+                $myName = 'tx_' . str_replace('_', '', $tmp[0]);
+            } else {
+                $myName = 'tx_' . str_replace('_', '', $tmp[0]) . '_pi' . $tmp[1];
+            }
+            $theValue = $template->setup['plugin.'][$myName];
+            $theConf = $template->setup['plugin.'][$myName . '.'];
+        }
+        $content = $this->contentObject->cObjGetSingle($theValue, $theConf);
 
-		$myContent = $this->breakContent(strip_tags($content));
-		if (strlen($myContent) > 1) {
-			if (substr($myContent, 0, 1) == '|' && substr($myContent, -1) == '|') {
-				$myContent = substr($myContent, 1, strlen($myContent) - 2);
-			}
-		}
+        $myContent = $this->breakContent(strip_tags($content));
+        if (strlen($myContent) > 1) {
+            if (substr($myContent, 0, 1) == '|' && substr($myContent, -1) == '|') {
+                $myContent = substr($myContent, 1, strlen($myContent) - 2);
+            }
+        }
 
-		if (!is_array($theConf) || strlen($theConf['plainType']) < 2) {
-			$defaultOutput = $this->configuration['defaultOutput'];
-			if ($defaultOutput && $myName) {
-				$lines[] = str_replace('###CType###', $this->contentObject->data['CType'] . ': "' . $this->contentObject->data['list_type'] . '"; plugin: "' . $myName . '"; plainType: "' . (is_array($theConf) ? $theConf['plainType'] : '') . '"', $defaultOutput);
-			}
-		}
+        if (!is_array($theConf) || strlen($theConf['plainType']) < 2) {
+            $defaultOutput = $this->configuration['defaultOutput'];
+            if ($defaultOutput && $myName) {
+                $lines[] = str_replace('###CType###', $this->contentObject->data['CType'] . ': "' . $this->contentObject->data['list_type'] . '"; plugin: "' . $myName . '"; plainType: "' . (is_array($theConf) ? $theConf['plainType'] : '') . '"', $defaultOutput);
+            }
+        }
 
-		$lines[] = $myContent;
-		return $lines;
-	}
+        $lines[] = $myContent;
+        return $lines;
+    }
 }
\ No newline at end of file