Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add MODX_SOFT_MODE #309

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add MODX_SOFT_MODE #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1b79e6
MODX_SOFT_MODE
touol Nov 14, 2019
7f6683e
MODX_SOFT_MODE
touol Nov 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/Fenom.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
);

/**
Expand Down
44 changes: 39 additions & 5 deletions src/Fenom/Template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -137,7 +139,24 @@ public function __construct(Fenom $fenom, $options, Template $parent = null)
$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
Expand Down Expand Up @@ -271,9 +290,24 @@ public function compile()
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);
Expand Down