- Fixed possible E_WARNING on line 319 and 249 of pdoTools class.

- Disabled system option "pdotools_fenom_modx" by default due to security issues.
Version 2.0.1-pl

Author: bezumkin

_build/build.config.php

@@ -4,7 +4,7 @@
 define('PKG_NAME','pdoTools');
 define('PKG_NAME_LOWER',strtolower(PKG_NAME));
 
-define('PKG_VERSION','2.0.0');
+define('PKG_VERSION','2.0.1');
 define('PKG_RELEASE','pl');
 define('PKG_AUTO_INSTALL', true);
 

_build/data/transport.settings.php

@@ -33,7 +33,7 @@
 	),
 	'fenom_modx' => array(
 		'xtype' => 'combo-boolean',
-		'value' => true,
+		'value' => false,
 	),
 	'fenom_options' => array(
 		'xtype' => 'textarea',

core/components/pdotools/docs/changelog.txt

@@ -1,5 +1,10 @@
 Changelog for pdoTools.
 
+2.0.1 pl
+==============
+- Fixed possible E_WARNING on line 319 and 349 of pdoTools class.
+- Disabled system option "pdotools_fenom_modx" by default due to security issues.
+
 2.0.0 pl
 ==============
 - New system settings to control the Fenom.

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

@@ -44,7 +44,7 @@ function __construct(xPDO &$modx) {
 	 */
 	public function processElementTags($parentTag, & $content, $processUncacheable = false, $removeUnprocessed = false, $prefix = "[[", $suffix = "]]", $tokens = array(), $depth = 0) {
 
-		if (is_string($content) && empty($parentTag) && $processUncacheable && $this->modx->getOption('pdotools_fenom_parser', null, true)) {
+		if (is_string($content) && empty($parentTag) && $processUncacheable && !empty($this->pdoTools->config['useFenomParser'])) {
 			$content = $this->pdoTools->fenom($content, $this->modx->placeholders);
 		}
 

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

@@ -76,7 +76,9 @@ public function setConfig(array $config = array(), $clean_timings = true) {
 			$this->config['scheme'] = $this->modx->getOption('link_tag_scheme');
 		}
 		$this->config['useFenom'] = $this->modx->getOption('pdotools_fenom_default', null, true);
+		$this->config['useFenomParser'] = $this->modx->getOption('pdotools_fenom_parser', null, false);
 		$this->config['useFenomCache'] = $this->modx->getOption('pdotools_fenom_cache', null, false);
+		$this->config['useFenomMODX'] = $this->modx->getOption('pdotools_fenom_modx', null, false);
 	}
 
 
@@ -313,8 +315,8 @@ public function getChunk($name = '', array $properties = array(), $fastMode = fa
 		}
 
 		$content = $this->config['useFenom']
-			? $this->fenom($chunk, $properties)
-			: $content = $chunk['content'];
+			? $this->fenom($chunk['content'], $properties)
+			: $chunk['content'];
 
 		if (strpos($content, '[[') !== false) {
 			// Processing quick placeholders
@@ -386,8 +388,8 @@ public function parseChunk($name = '', array $properties = array(), $prefix = '[
 		}
 
 		$content = $this->config['useFenom']
-			? $this->fenom($chunk, $properties)
-			: $content = $chunk['content'];
+			? $this->fenom($chunk['content'], $properties)
+			: $chunk['content'];
 
 		if (strpos($content, '[[') !== false) {
 			$pl = $this->makePlaceholders($properties, '', $prefix, $suffix);
@@ -464,7 +466,7 @@ public function fenom($chunk, array $properties = array()) {
 
 			if ($tpl instanceof Fenom\Render) {
 				$properties['_pls'] = $properties;
-				if ($this->modx->getOption('pdotools_fenom_modx', null, true)) {
+				if (!empty($this->config['useFenomMODX'])) {
 					$properties['modx'] = $this->modx;
 					$properties['pdoTools'] = $this;
 				}