Skip to content

Commit e63c868

Browse files
committed
pdotools_fenom_modx setting
1 parent 94f2a64 commit e63c868

File tree

5 files changed

+14
-2
lines changed

5 files changed

+14
-2
lines changed

_build/data/transport.settings.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@
3131
'xtype' => 'combo-boolean',
3232
'value' => false,
3333
),
34+
'fenom_modx' => array(
35+
'xtype' => 'combo-boolean',
36+
'value' => true,
37+
),
3438
'fenom_options' => array(
3539
'xtype' => 'textarea',
3640
'value' => '',

core/components/pdotools/lexicon/de/default.inc.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
$_lang['setting_pdotools_fenom_parser_desc'] = 'Experimentelle pdoParser verwenden Sie die Template-engine Fenom bei der Verarbeitung Seiten und Website-Vorlagen. Es muss natürlich aktiviert sein.';
3030
$_lang['setting_pdotools_fenom_php'] = 'PHP in Fenom';
3131
$_lang['setting_pdotools_fenom_php_desc'] = 'Wenn aktiviert, können Sie PHP-Funktionen, die in den Vorlagen und Stücke, zum Beispiel {$.php.phpinfo()}.';
32+
$_lang['setting_pdotools_fenom_modx'] = 'Erlaube MODX in Fenom';
33+
$_lang['setting_pdotools_fenom_modx_desc'] = 'Diese Option ermöglicht die Verwendung von MODX und pdoTools in Fenom über {$modx} und {$pdoTools} Variablen.';
3234
$_lang['setting_pdotools_fenom_options'] = 'Fenom Optionen';
3335
$_lang['setting_pdotools_fenom_options_desc'] = 'JSON-string-array mit der beschriebenen Einstellungen auf <a href="https://github.com/fenom-Vorlage/fenom/blob/master/docs/de/Konfiguration.md" target="_blank">offiziellen Dokumentation</a>. Beispiel: {"auto_escape":true,"force_include":true}';
3436
$_lang['setting_pdotools_fenom_cache'] = 'Caching zusammengestellt Brocken';

core/components/pdotools/lexicon/en/default.inc.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
$_lang['setting_pdotools_fenom_parser_desc'] = 'Experimental pdoParser will use the templating engine Fenom when processing pages and site templates. Of course, it must be activated.';
2828
$_lang['setting_pdotools_fenom_php'] = 'Allow PHP in Fenom';
2929
$_lang['setting_pdotools_fenom_php_desc'] = 'If enabled, you can use PHP functions in templates and chunks, for example {$.php.phpinfo()}.';
30+
$_lang['setting_pdotools_fenom_modx'] = 'Allow MODX in Fenom';
31+
$_lang['setting_pdotools_fenom_modx_desc'] = 'This options allows you to use MODX and pdoTools in Fenom via {$modx} and {$pdoTools} variables.';
3032
$_lang['setting_pdotools_fenom_options'] = 'Fenom options';
3133
$_lang['setting_pdotools_fenom_options_desc'] = 'JSON string with array of settings described on <a href="https://github.com/fenom-template/fenom/blob/master/docs/en/configuration.md" target="_blank">official documentation</a>. For example: {"auto_escape":true,"force_include":true}';
3234
$_lang['setting_pdotools_fenom_cache'] = 'Caching compiled chunks';

core/components/pdotools/lexicon/ru/default.inc.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
$_lang['setting_pdotools_fenom_parser_desc'] = 'Эксперементальный pdoParser будет использовать шаблонизатор Fenom для обработки страниц и шаблонов сайта. Конечно, он сам должен быть активирован.';
2828
$_lang['setting_pdotools_fenom_php'] = 'Разрешить PHP в Fenom';
2929
$_lang['setting_pdotools_fenom_php_desc'] = 'В чанках и на страницах сайта можно использовать функции PHP для оформления, например {$.php.phpinfo()}.';
30+
$_lang['setting_pdotools_fenom_modx'] = 'Разрешить MODX в Fenom';
31+
$_lang['setting_pdotools_fenom_modx_desc'] = 'Эта опция разрешает доступ к объектам MODX и pdoTools из Fenom через переменные {$modx} и {$pdoTools}.';
3032
$_lang['setting_pdotools_fenom_options'] = 'Настройки Fenom';
3133
$_lang['setting_pdotools_fenom_options_desc'] = 'JSON строка с массивом настроек согласно <a href="https://github.com/fenom-template/fenom/blob/master/docs/ru/configuration.md" target="_blank">официальной документации</a>. Например: {"auto_escape":true,"force_include":true}';
3234
$_lang['setting_pdotools_fenom_cache'] = 'Кэширование скомпилированных чанков';

core/components/pdotools/model/pdotools/pdotools.class.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -464,8 +464,10 @@ public function fenom($chunk, array $properties = array()) {
464464

465465
if ($tpl instanceof Fenom\Render) {
466466
$properties['_pls'] = $properties;
467-
$properties['modx'] = $this->modx;
468-
$properties['pdoTools'] = $this;
467+
if ($this->modx->getOption('pdotools_fenom_modx', null, true)) {
468+
$properties['modx'] = $this->modx;
469+
$properties['pdoTools'] = $this;
470+
}
469471
try {
470472
$content = $tpl->fetch($properties);
471473
}

0 commit comments

Comments
 (0)