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

Jump to bottom

Add pdotools options to parse chunk in fenom #381

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add pdotools options to parse chunk in fenom #381

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 25 additions & 8 deletions core/components/migx/model/migx/migx.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@ class Migx {
* @var modX A reference to the modX object.
*/
public $modx = null;

/**
* @access public
* @var modX A reference to the modX object.
*/
public $pdoTools = null;

/**
* @access public
* @var array A collection of properties to adjust MIGX behaviour.
Expand Down Expand Up @@ -46,6 +53,8 @@ class Migx {
*/
function __construct(modX & $modx, array $config = array()) {
$this->modx = &$modx;



$packageName = 'migx';
$packagepath = $this->modx->getOption('core_path') . 'components/' . $packageName . '/';
Expand All @@ -60,7 +69,12 @@ function __construct(modX & $modx, array $config = array()) {
$corePath = $this->modx->getOption('migx.core_path', null, $modx->getOption('core_path') . 'components/migx/');
$assetsPath = $this->modx->getOption('migx.assets_path', null, $modx->getOption('assets_path') . 'components/migx/');
$assetsUrl = $this->modx->getOption('migx.assets_url', null, $modx->getOption('assets_url') . 'components/migx/');


/*pdoTools parser check*/
$this->pdoTools = $this->modx->getService('pdoTools');
$pdoToolsUse = $this->modx->getOption('migx.pdotools_use', null, false);
$defaultconfig['pdoToolsUse'] = !empty($pdoToolsUse) && !empty($this->pdoTools);

$defaultconfig['debugUser'] = '';
$defaultconfig['corePath'] = $corePath;
$defaultconfig['modelPath'] = $corePath . 'model/';
Expand Down Expand Up @@ -1618,7 +1632,7 @@ function getColumnRenderOptions($col = '*', $indexfield = 'idx', $format = 'json
}

function renderChunk($tpl, $properties = array(), $getChunk = true, $printIfemty = true) {

$value = $this->parseChunk($tpl, $properties, $getChunk, $printIfemty);

$this->modx->getParser();
Expand Down Expand Up @@ -2136,13 +2150,16 @@ function parseChunk($tpl, $fields = array(), $getChunk = true, $printIfemty = tr
$tpl = false;
}
}

if ($tpl) {
$chunk = $this->modx->newObject('modChunk');
$chunk->setCacheable(false);
$chunk->setContent($tpl);

$output = $chunk->process($fields);
if(!empty($this->config['pdoToolsUse'])){
$output = $this->pdoTools->getChunk('@INLINE '.$tpl,$fields);
}else{
$chunk = $this->modx->newObject('modChunk');
$chunk->setCacheable(false);
$chunk->setContent($tpl);

$output = $chunk->process($fields);
}

} elseif ($printIfemty) {
$output = '<pre>' . print_r($fields, 1) . '</pre>';
Expand Down