mirror
/
fenom
mirror of https://github.com/fenom-template/fenom.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge 7f6683e130 into 065ccaec23

This commit is contained in:
touol 2022-10-20 23:15:50 +03:00 committed by GitHub
parent 065ccaec23 7f6683e130
commit d6827a0b30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Fenom.php
View File

@ -40,6 +40,7 @@ class Fenom
const AUTO_TRIM = 0x1000; // reserved
const DENY_PHP_CALLS = 0x2000;
const AUTO_STRIP = 0x4000;
const MODX_SOFT_MODE = 0x8000; //This option for MODX, when compiling a Fenom tag error, enables the output of this tag as is. To inverse JS / JSON.
/**
* Use DENY_PHP_CALLS
* @deprecated
@ -87,6 +88,7 @@ class Fenom
"disable_php_calls" => self::DENY_PHP_CALLS,
"disable_statics" => self::DENY_STATICS,
"strip" => self::AUTO_STRIP,
"modx_soft_mode" => self::MODX_SOFT_MODE,
);
/**

44
src/Fenom/Template.php
View File

@ -123,7 +123,9 @@ class Template extends Render
* @var int crc32 of the template name
*/
private $_crc = 0;
private $_log = ""; //for MODX log in MODX_SOFT_MODE
/**
* @param Fenom $fenom Template storage
* @param int $options
@ -137,7 +139,24 @@ class Template extends Render
$this->_filters = $this->_fenom->getFilters();
$this->_tag_filters = $this->_fenom->getTagFilters();
}
/**
* Add log for MODX log in MODX_SOFT_MODE
* @param string $message
*/
private function log($message)
{
$this->_log .= $message."\r\n";
}
/**
* Get log for MODX log in MODX_SOFT_MODE
*/
public function getError()
{
return $this->_log;
}
/**
* Get tag stack size
* @return int
@ -271,9 +290,24 @@ class Template extends Render
if ($tokens->isIncomplete()) { // all strings finished?
$need_more = true;
} else {
$this->_appendCode($this->parseTag($tokens), '{' . $tag . '}'); // start the tag lexer
if ($tokens->key()) { // if tokenizer have tokens - throws exceptions
throw new CompileException("Unexpected token '" . $tokens->current() . "' in {$this} line {$this->_line}, near '{" . $tokens->getSnippetAsString(0, 0) . "' <- there", 0, E_ERROR, $this->_name, $this->_line);
$soft_mode = $this->_options & Fenom::MODX_SOFT_MODE;
if($soft_mode){
try{
$code = $this->parseTag($tokens);
if ($tokens->key()) { // if tokenizer have tokens - throws exceptions
throw new CompileException("Unexpected token '" . $tokens->current() . "' in {$this} line {$this->_line}, near '{" . $tokens->getSnippetAsString(0, 0) . "' <- there", 0, E_ERROR, $this->_name, $this->_line);
}
$this->_appendCode($code, '{' . $tag . '}'); // start the tag lexer
}catch (\Exception $e){
$this->_appendText('{' . $tag . '}');
$this->log($e->getMessage());
}
}else{
$code = $this->parseTag($tokens);
$this->_appendCode($code, '{' . $tag . '}'); // start the tag lexer
if ($tokens->key()) { // if tokenizer have tokens - throws exceptions
throw new CompileException("Unexpected token '" . $tokens->current() . "' in {$this} line {$this->_line}, near '{" . $tokens->getSnippetAsString(0, 0) . "' <- there", 0, E_ERROR, $this->_name, $this->_line);
}
}
}
} while ($need_more);