1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-12 09:34:54 +02:00

BC Fallback for breadcrumb() generator. Magix shortcode fix for news-view. Magic shortcodes are defined by the first render with {SETSTYLE=default} or {SETSTYLE=main} encountered in the template.

This commit is contained in:
Cameron
2019-06-15 16:45:03 -07:00
parent 3ccc01fae3
commit 346d42bdfb
4 changed files with 94 additions and 27 deletions

View File

@@ -947,7 +947,7 @@ if (!class_exists('e107table', false))
private $uniqueId = null;
private $content = array();
private $contentTypes = array('header','footer','text','title','image', 'list');
public $renders = array(); // all render vars.
private $mainRenders = array(); // all renderered with style = 'default' or 'main'.
function __construct()
@@ -957,30 +957,39 @@ if (!class_exists('e107table', false))
}
/**
* Return content options for the main render that uses {SETSTYLE=default} or {SETSTYLE=main}
* @return array
*/
private function getMainRender()
{
if(isset($this->mainRenders[0]))
{
return $this->mainRenders[0];
}
return array();
}
function getMagicShortcodes()
{
$ret = array();
$val = $this->getMainRender();
$types = array('caption') + $this->contentTypes;
$c = 1;
foreach($this->renders as $k => $val)
foreach($types as $var)
{
foreach($types as $var)
{
$sc = '{---'.strtoupper($var).$c.'---}';
$ret[$sc] = varset($val[$var]);
}
$c++;
$sc = '{---'.strtoupper($var).'---}';
$ret[$sc] = isset($val[$var]) ? (string) $val[$var] : null;
}
return $ret;
}
@@ -1010,12 +1019,21 @@ if (!class_exists('e107table', false))
/**
* Set Advanced Page/Menu content (beyond just $caption and $text)
*
* @param string $type header|footer|text|title|image|list
* @param string|array $type header|footer|text|title|image|list
* @param string $val
* @return bool|e107table
*/
public function setContent($type, $val)
{
if(is_array($type))
{
foreach($this->contentTypes as $t)
{
$this->content[$t] = (string) $type[$t];
}
}
if(!in_array($type,$this->contentTypes))
{
return false;
@@ -1149,9 +1167,13 @@ if (!class_exists('e107table', false))
$options['menuCount'] = $this->eMenuCount;
$options['menuTotal'] = varset($this->eMenuTotal[$this->eMenuArea]);
$options['setStyle'] = $this->eSetStyle;
$options['caption'] = strip_tags($caption);
$this->renders[] = $options;
$options['caption'] = $caption; // TODO FIXME strip HTML but retain text that may be inside tags.
if($this->eSetStyle === 'default' || $this->eSetStyle === 'main')
{
$this->mainRenders[] = $options;
}
//XXX Optional feature may be added if needed - define magic shortcodes inside $thm class. eg. function msc_custom();