AgelxNash / DocLister

assets/snippets/DocLister/core/DocLister.abstract.php

Braces +300 added lines, -292 removed lines

@@ -17,8 +17,8 @@ 
 /**
  * Class DocLister
  */
-abstract class DocLister
-{
+abstract class DocLister

+{

     /**
      * Ключ в массиве $_REQUEST в котором находится алиас запрашиваемого документа
      */
@@ -188,48 +188,48 @@ 
      * @param int $startTime время запуска сниппета
      * @throws Exception
      */
-    public function __construct($modx, $cfg = array(), $startTime = null)
-    {
+    public function __construct($modx, $cfg = array(), $startTime = null)

+    {

         $this->setTimeStart($startTime);
 
-        if (extension_loaded('mbstring')) {
+        if (extension_loaded('mbstring')) {

             mb_internal_encoding("UTF-8");
-        } else {
+        } else {

             throw new Exception('Not found php extension mbstring');
         }
 
-        if ($modx instanceof DocumentParser) {
+        if ($modx instanceof DocumentParser) {

             $this->modx = $modx;
             $this->setDebug(1);
 
-            if (!is_array($cfg) || empty($cfg)) {
+            if (!is_array($cfg) || empty($cfg)) {

                 $cfg = $this->modx->Event->params;
             }
-        } else {
+        } else {

             throw new Exception('MODX var is not instaceof DocumentParser');
         }
 
         $this->FS = \Helpers\FS::getInstance();
         $this->config = new \Helpers\Config($cfg);
 
-        if (isset($cfg['config'])) {
+        if (isset($cfg['config'])) {

             $this->config->setPath(dirname(__DIR__))->loadConfig($cfg['config']);
         }
 
-        if ($this->config->setConfig($cfg) === false) {
+        if ($this->config->setConfig($cfg) === false) {

             throw new Exception('no parameters to run DocLister');
         }
 
         $this->loadLang(array('core', 'json'));
         $this->setDebug($this->getCFGDef('debug', 0));
 
-        if ($this->checkDL()) {
+        if ($this->checkDL()) {

             $cfg = array();
             $idType = $this->getCFGDef('idType', '');
-            if (empty($idType) && $this->getCFGDef('documents', '') != '') {
+            if (empty($idType) && $this->getCFGDef('documents', '') != '') {

                 $idType = 'documents';
             }
-            switch ($idType) {
+            switch ($idType) {

                 case 'documents':
                     $IDs = $this->getCFGDef('documents');
                     $cfg['idType'] = "documents";
@@ -237,7 +237,7 @@ 
                 case 'parents':
                 default:
                     $cfg['idType'] = "parents";
-                    if (($IDs = $this->getCFGDef('parents', '')) === '') {
+                    if (($IDs = $this->getCFGDef('parents', '')) === '') {

                         $IDs = $this->getCurrentMODXPageID();
                     }
                     break;
@@ -256,21 +256,21 @@ 
 
         $this->setLocate();
 
-        if ($this->getCFGDef("customLang")) {
+        if ($this->getCFGDef("customLang")) {

             $this->getCustomLang();
         }
         $this->loadExtender($this->getCFGDef("extender", ""));
 
-        if ($this->checkExtender('request')) {
+        if ($this->checkExtender('request')) {

             $this->extender['request']->init($this, $this->getCFGDef("requestActive", ""));
         }
         $this->_filters = $this->getFilters($this->getCFGDef('filters', ''));
         $this->ownerTPL = $this->getCFGDef("ownerTPL", "");
         $DLTemplate = DLTemplate::getInstance($modx);
-        if ($path = $this->getCFGDef('templatePath')) {
+        if ($path = $this->getCFGDef('templatePath')) {

             $DLTemplate->setTemplatePath($path);
         }
-        if ($ext = $this->getCFGDef('templateExtension')) {
+        if ($ext = $this->getCFGDef('templateExtension')) {

             $DLTemplate->setTemplateExtension($ext);
         }
         $DLTemplate->setTwigTemplateVars(array('DocLister' => $this));
@@ -282,25 +282,25 @@ 
      * @param string $str строка с фильтром
      * @return array массив субфильтров
      */
-    public function smartSplit($str)
-    {
+    public function smartSplit($str)

+    {

         $res = array();
         $cur = '';
         $open = 0;
         $strlen = mb_strlen($str, 'UTF-8');
-        for ($i = 0; $i <= $strlen; $i++) {
+        for ($i = 0; $i <= $strlen; $i++) {

             $e = mb_substr($str, $i, 1, 'UTF-8');
-            switch ($e) {
+            switch ($e) {

                 case '\\':
                     $cur .= $e;
                     $cur .= mb_substr($str, ++$i, 1, 'UTF-8');
                     break;
                 case ')':
                     $open--;
-                    if ($open == 0) {
+                    if ($open == 0) {

                         $res[] = $cur . ')';
                         $cur = '';
-                    } else {
+                    } else {

                         $cur .= $e;
                     }
                     break;
@@ -309,10 +309,10 @@ 
                     $cur .= $e;
                     break;
                 case ';':
-                    if ($open == 0) {
+                    if ($open == 0) {

                         $res[] = $cur;
                         $cur = '';
-                    } else {
+                    } else {

                         $cur .= $e;
                     }
                     break;
@@ -321,7 +321,7 @@ 
             }
         }
         $cur = preg_replace("/(\))$/u", '', $cur);
-        if ($cur != '') {
+        if ($cur != '') {

             $res[] = $cur;
         }
 
@@ -332,8 +332,8 @@ 
      * Трансформация объекта в строку
      * @return string последний ответ от DocLister'а
      */
-    public function __toString()
-    {
+    public function __toString()

+    {

         return $this->outData;
     }
 
@@ -341,8 +341,8 @@ 
      * Установить время запуска сниппета
      * @param float|null $time
      */
-    public function setTimeStart($time = null)
-    {
+    public function setTimeStart($time = null)

+    {

         $this->_timeStart = is_null($time) ? microtime(true) : $time;
     }
 
@@ -351,8 +351,8 @@ 
      *
      * @return int
      */
-    public function getTimeStart()
-    {
+    public function getTimeStart()

+    {

         return $this->_timeStart;
     }
 
@@ -360,27 +360,27 @@ 
      * Установка режима отладки
      * @param int $flag режим отладки
      */
-    public function setDebug($flag = 0)
-    {
+    public function setDebug($flag = 0)

+    {

         $flag = abs((int)$flag);
-        if ($this->_debugMode != $flag) {
+        if ($this->_debugMode != $flag) {

             $this->_debugMode = $flag;
             $this->debug = null;
-            if ($this->_debugMode > 0) {
-                if (isset($_SESSION['usertype']) && $_SESSION['usertype'] == 'manager') {
+            if ($this->_debugMode > 0) {

+                if (isset($_SESSION['usertype']) && $_SESSION['usertype'] == 'manager') {

                     error_reporting(E_ALL ^ E_NOTICE);
                     ini_set('display_errors', 1);
                 }
                 $dir = dirname(dirname(__FILE__));
-                if (file_exists($dir . "/lib/DLdebug.class.php")) {
+                if (file_exists($dir . "/lib/DLdebug.class.php")) {

                     include_once($dir . "/lib/DLdebug.class.php");
-                    if (class_exists("DLdebug", false)) {
+                    if (class_exists("DLdebug", false)) {

                         $this->debug = new DLdebug($this);
                     }
                 }
             }
 
-            if (is_null($this->debug)) {
+            if (is_null($this->debug)) {

                 $this->debug = new xNop();
                 $this->_debugMode = 0;
                 error_reporting(0);
@@ -392,8 +392,8 @@ 
     /**
      * Информация о режиме отладки
      */
-    public function getDebug()
-    {
+    public function getDebug()

+    {

         return $this->_debugMode;
     }
 
@@ -404,13 +404,13 @@ 
      * @param string $alias желаемый алиас таблицы
      * @return string имя таблицы с префиксом и алиасом
      */
-    public function getTable($name, $alias = '')
-    {
-        if (!isset($this->_table[$name])) {
+    public function getTable($name, $alias = '')

+    {

+        if (!isset($this->_table[$name])) {

             $this->_table[$name] = $this->modx->getFullTableName($name);
         }
         $table = $this->_table[$name];
-        if (!empty($alias) && is_scalar($alias)) {
+        if (!empty($alias) && is_scalar($alias)) {

             $table .= " as `" . $alias . "`";
         }
 
@@ -423,9 +423,9 @@ 
      * @param $alias
      * @return mixed
      */
-    public function TableAlias($name, $table, $alias)
-    {
-        if (!$this->checkTableAlias($name, $table)) {
+    public function TableAlias($name, $table, $alias)

+    {

+        if (!$this->checkTableAlias($name, $table)) {

             $this->AddTable[$table][$name] = $alias;
         }
 
@@ -437,8 +437,8 @@ 
      * @param $table
      * @return bool
      */
-    public function checkTableAlias($name, $table)
-    {
+    public function checkTableAlias($name, $table)

+    {

         return isset($this->AddTable[$table][$name]);
     }
 
@@ -450,8 +450,8 @@ 
      * @param bool $nop создавать ли пустой объект запрашиваемого типа
      * @return array|mixed|xNop
      */
-    public function jsonDecode($json, $config = array(), $nop = false)
-    {
+    public function jsonDecode($json, $config = array(), $nop = false)

+    {

         $this->debug->debug('Decode JSON: ' . $this->debug->dumpData($json) . "\r\nwith config: " . $this->debug->dumpData($config),
             'jsonDecode', 2);
         $config = jsonHelper::jsonDecode($json, $config, $nop);
@@ -467,10 +467,10 @@ 
      * @param $json string строка с JSON для записи в лог при отладке
      * @return bool|string
      */
-    public function isErrorJSON($json)
-    {
+    public function isErrorJSON($json)

+    {

         $error = jsonHelper::json_last_error_msg();
-        if (!in_array($error, array('error_none', 'other'))) {
+        if (!in_array($error, array('error_none', 'other'))) {

             $this->debug->error($this->getMsg('json.' . $error) . ": " . $this->debug->dumpData($json, 'code'), 'JSON');
             $error = true;
         }
@@ -482,20 +482,20 @@ 
      * Проверка параметров и загрузка необходимых экстендеров
      * return boolean статус загрузки
      */
-    public function checkDL()
-    {
+    public function checkDL()

+    {

         $this->debug->debug('Check DocLister parameters', 'checkDL', 2);
         $flag = true;
         $extenders = $this->getCFGDef('extender', '');
         $extenders = explode(",", $extenders);
         $tmp = $this->getCFGDef('requestActive', '') != '' || in_array('request', $extenders);
-        if ($tmp && !$this->_loadExtender('request')) {
+        if ($tmp && !$this->_loadExtender('request')) {

             //OR request in extender's parameter
             throw new Exception('Error load request extender');
         }
 
         $tmp = $this->getCFGDef('summary', '') != '' || in_array('summary', $extenders);
-        if ($tmp && !$this->_loadExtender('summary')) {
+        if ($tmp && !$this->_loadExtender('summary')) {

             //OR summary in extender's parameter
             throw new Exception('Error load summary extender');
         }
@@ -508,15 +508,15 @@ 
                 $this->getCFGDef('pageLimit', '') != '' || $this->getCFGDef('pageAdjacents', '') != '' ||
                 $this->getCFGDef('PaginateClass', '') != '' || $this->getCFGDef('TplNextP', '') != ''
             ) && !$this->_loadExtender('paginate')
-        ) {
+        ) {

             throw new Exception('Error load paginate extender');
-        } else {
-            if ((int)$this->getCFGDef('display', 0) == 0) {
+        } else {

+            if ((int)$this->getCFGDef('display', 0) == 0) {

                 $extenders = $this->unsetArrayVal($extenders, 'paginate');
             }
         }
 
-        if ($this->getCFGDef('prepare', '') != '' || $this->getCFGDef('prepareWrap') != '') {
+        if ($this->getCFGDef('prepare', '') != '' || $this->getCFGDef('prepareWrap') != '') {

             $this->_loadExtender('prepare');
         }
 
@@ -533,14 +533,14 @@ 
      * @param mixed $val значение которые необходимо удалить из массива
      * @return array отчищеный массив с данными
      */
-    private function unsetArrayVal($data, $val)
-    {
+    private function unsetArrayVal($data, $val)

+    {

         $out = array();
-        if (is_array($data)) {
-            foreach ($data as $item) {
-                if ($item != $val) {
+        if (is_array($data)) {

+            foreach ($data as $item) {

+                if ($item != $val) {

                     $out[] = $item;
-                } else {
+                } else {

                     continue;
                 }
             }
@@ -555,14 +555,14 @@ 
      * @param int $id уникальный идентификатор страницы
      * @return string URL страницы
      */
-    public function getUrl($id = 0)
-    {
+    public function getUrl($id = 0)

+    {

         $id = ((int)$id > 0) ? (int)$id : $this->getCurrentMODXPageID();
 
         $link = $this->checkExtender('request') ? $this->extender['request']->getLink() : $this->getRequest();
-        if ($id == $this->modx->config['site_start']) {
+        if ($id == $this->modx->config['site_start']) {

             $url = $this->modx->config['site_url'] . ($link != '' ? "?{$link}" : "");
-        } else {
+        } else {

             $url = $this->modx->makeUrl($id, '', $link, $this->getCFGDef('urlScheme', ''));
         }
 
@@ -590,20 +590,20 @@ 
      * @param string $tpl шаблон
      * @return string
      */
-    public function render($tpl = '')
-    {
+    public function render($tpl = '')

+    {

         $this->debug->debug(array('Render data with template ' => $tpl), 'render', 2, array('html'));
         $out = '';
-        if (1 == $this->getCFGDef('tree', '0')) {
-            foreach ($this->_tree as $item) {
+        if (1 == $this->getCFGDef('tree', '0')) {

+            foreach ($this->_tree as $item) {

                 $out .= $this->renderTree($item);
             }
             $out = $this->renderWrap($out);
-        } else {
+        } else {

             $out = $this->_render($tpl);
         }
 
-        if ($out) {
+        if ($out) {

             $this->outData = DLTemplate::getInstance($this->modx)->parseDocumentSource($out);
         }
         $this->debug->debugEnd('render');
@@ -620,8 +620,8 @@ 
      *
      * @return int
      */
-    public function getCurrentMODXPageID()
-    {
+    public function getCurrentMODXPageID()

+    {

         $id = isset($this->modx->documentIdentifier) ? (int)$this->modx->documentIdentifier : 0;
         $docData = isset($this->modx->documentObject) ? $this->modx->documentObject : array();
 
@@ -637,9 +637,9 @@ 
      * @param integer $line error on line
      * @param array $trace stack trace
      */
-    public function ErrorLogger($message, $code, $file, $line, $trace)
-    {
-        if (abs($this->getCFGDef('debug', '0')) == '1') {
+    public function ErrorLogger($message, $code, $file, $line, $trace)

+    {

+        if (abs($this->getCFGDef('debug', '0')) == '1') {

             $out = "CODE #" . $code . "<br />";
             $out .= "on file: " . $file . ":" . $line . "<br />";
             $out .= "<pre>";
@@ -656,8 +656,8 @@ 
      *
      * @return DocumentParser
      */
-    public function getMODX()
-    {
+    public function getMODX()

+    {

         return $this->modx;
     }
 
@@ -668,13 +668,13 @@ 
      * @return boolean status load extenders
      * @throws Exception
      */
-    public function loadExtender($ext = '')
-    {
+    public function loadExtender($ext = '')

+    {

         $out = true;
-        if ($ext != '') {
+        if ($ext != '') {

             $ext = explode(",", $ext);
-            foreach ($ext as $item) {
-                if ($item != '' && !$this->_loadExtender($item)) {
+            foreach ($ext as $item) {

+                if ($item != '' && !$this->_loadExtender($item)) {

                     throw new Exception('Error load ' . APIHelpers::e($item) . ' extender');
                 }
             }
@@ -690,8 +690,8 @@ 
      * @param mixed $def значение по умолчанию, если в конфиге нет искомого параметра
      * @return mixed значение из конфига
      */
-    public function getCFGDef($name, $def = null)
-    {
+    public function getCFGDef($name, $def = null)

+    {

         return $this->config->getCFGDef($name, $def);
     }
 
@@ -703,15 +703,15 @@ 
      * @param string $key ключ локального плейсхолдера
      * @return string
      */
-    public function toPlaceholders($data, $set = 0, $key = 'contentPlaceholder')
-    {
+    public function toPlaceholders($data, $set = 0, $key = 'contentPlaceholder')

+    {

         $this->debug->debug(null, 'toPlaceholders', 2);
-        if ($set == 0) {
+        if ($set == 0) {

             $set = $this->getCFGDef('contentPlaceholder', 0);
         }
         $this->_plh[$key] = $data;
         $id = $this->getCFGDef('id', '');
-        if ($id != '') {
+        if ($id != '') {

             $id .= ".";
         }
         $out = DLTemplate::getInstance($this->getMODX())->toPlaceholders($data, $set, $key, $id);
@@ -733,14 +733,19 @@ 
      * @param boolean $quote заключать ли данные на выходе в кавычки
      * @return string обработанная строка
      */
-    public function sanitarIn($data, $sep = ',', $quote = true)
-    {
-        if(is_scalar($data)) $data = explode($sep, $data);
-        if(!is_array($data)) $data = array(); //@TODO: throw
+    public function sanitarIn($data, $sep = ',', $quote = true)

+    {

+        if(is_scalar($data)) {

+            $data = explode($sep, $data);

+        }

+        if(!is_array($data)) {

+            $data = array();

+        }

+        //@TODO: throw
 
         $out = array();
-        foreach ($data as $item) {
-            if ($item !== '') {
+        foreach ($data as $item) {

+            if ($item !== '') {

                 $out[] = $this->modx->db->escape($item);
             }
         }
@@ -761,12 +766,12 @@ 
      * @param string $lang имя языкового пакета
      * @return array
      */
-    public function getCustomLang($lang = '')
-    {
-        if (empty($lang)) {
+    public function getCustomLang($lang = '')

+    {

+        if (empty($lang)) {

             $lang = $this->getCFGDef('lang', $this->modx->config['manager_language']);
         }
-        if (file_exists(dirname(dirname(__FILE__)) . "/lang/" . $lang . ".php")) {
+        if (file_exists(dirname(dirname(__FILE__)) . "/lang/" . $lang . ".php")) {

             $tmp = include(dirname(__FILE__) . "/lang/" . $lang . ".php");
             $this->_customLang = is_array($tmp) ? $tmp : array();
         }
@@ -782,25 +787,25 @@ 
      * @param boolean $rename Переименовывать ли элементы массива
      * @return array массив с лексиконом
      */
-    public function loadLang($name = 'core', $lang = '', $rename = true)
-    {
-        if (empty($lang)) {
+    public function loadLang($name = 'core', $lang = '', $rename = true)

+    {

+        if (empty($lang)) {

             $lang = $this->getCFGDef('lang', $this->modx->config['manager_language']);
         }
 
         $this->debug->debug('Load language ' . $this->debug->dumpData($name) . "." . $this->debug->dumpData($lang),
             'loadlang', 2);
-        if (is_scalar($name)) {
+        if (is_scalar($name)) {

             $name = array($name);
         }
-        foreach ($name as $n) {
-            if (file_exists(dirname(__FILE__) . "/lang/" . $lang . "/" . $n . ".inc.php")) {
+        foreach ($name as $n) {

+            if (file_exists(dirname(__FILE__) . "/lang/" . $lang . "/" . $n . ".inc.php")) {

                 $tmp = include(dirname(__FILE__) . "/lang/" . $lang . "/" . $n . ".inc.php");
-                if (is_array($tmp)) {
+                if (is_array($tmp)) {

                     /**
                      * Переименовыываем элементы массива из array('test'=>'data') в array('name.test'=>'data')
                      */
-                    if ($rename) {
+                    if ($rename) {

                         $tmp = $this->renameKeyArr($tmp, $n, '', '.');
                     }
                     $this->_lang = array_merge($this->_lang, $tmp);
@@ -819,11 +824,11 @@ 
      * @param string $def Строка по умолчанию, если запись в языковом пакете не будет обнаружена
      * @return string строка в соответствии с текущими языковыми настройками
      */
-    public function getMsg($name, $def = '')
-    {
-        if (isset($this->_customLang[$name])) {
+    public function getMsg($name, $def = '')

+    {

+        if (isset($this->_customLang[$name])) {

             $say = $this->_customLang[$name];
-        } else {
+        } else {

             $say = \APIHelpers::getkey($this->_lang, $name, $def);
         }
 
@@ -839,8 +844,8 @@ 
      * @param string $sep разделитель суффиксов, префиксов и ключей массива
      * @return array массив с переименованными ключами
      */
-    public function renameKeyArr($data, $prefix = '', $suffix = '', $sep = '.')
-    {
+    public function renameKeyArr($data, $prefix = '', $suffix = '', $sep = '.')

+    {

         return \APIHelpers::renameKeyArr($data, $prefix, $suffix, $sep);
     }
 
@@ -850,12 +855,12 @@ 
      * @param string $locale локаль
      * @return string имя установленной локали
      */
-    public function setLocate($locale = '')
-    {
-        if ('' == $locale) {
+    public function setLocate($locale = '')

+    {

+        if ('' == $locale) {

             $locale = $this->getCFGDef('locale', '');
         }
-        if ('' != $locale) {
+        if ('' != $locale) {

             setlocale(LC_ALL, $locale);
         }
 
@@ -869,11 +874,11 @@ 
      * @param array $data массив сформированный как дерево
      * @return string строка для отображения пользователю
      */
-    protected function renderTree($data)
-    {
+    protected function renderTree($data)

+    {

         $out = '';
-        if (!empty($data['#childNodes'])) {
-            foreach ($data['#childNodes'] as $item) {
+        if (!empty($data['#childNodes'])) {

+            foreach ($data['#childNodes'] as $item) {

                 $out .= $this->renderTree($item);
             }
         }
@@ -890,8 +895,8 @@ 
      * @param string $name Template: chunk name || @CODE: template || @FILE: file with template
      * @return string html template with placeholders without data
      */
-    private function _getChunk($name)
-    {
+    private function _getChunk($name)

+    {

         $this->debug->debug(array('Get chunk by name' => $name), "getChunk", 2, array('html'));
         //without trim
         $tpl = DLTemplate::getInstance($this->getMODX())->getChunk($name);
@@ -908,18 +913,18 @@ 
      * @param string $tpl HTML шаблон
      * @return string
      */
-    public function parseLang($tpl)
-    {
+    public function parseLang($tpl)

+    {

         $this->debug->debug(array("parseLang" => $tpl), "parseLang", 2, array('html'));
-        if (is_scalar($tpl) && !empty($tpl)) {
-            if (preg_match_all("/\[\%([a-zA-Z0-9\.\_\-]+)\%\]/", $tpl, $match)) {
+        if (is_scalar($tpl) && !empty($tpl)) {

+            if (preg_match_all("/\[\%([a-zA-Z0-9\.\_\-]+)\%\]/", $tpl, $match)) {

                 $langVal = array();
-                foreach ($match[1] as $item) {
+                foreach ($match[1] as $item) {

                     $langVal[] = $this->getMsg($item);
                 }
                 $tpl = str_replace($match[0], $langVal, $tpl);
             }
-        } else {
+        } else {

             $tpl = '';
         }
         $this->debug->debugEnd("parseLang");
@@ -935,8 +940,8 @@ 
      * @param bool $parseDocumentSource render html template via DocumentParser::parseDocumentSource()
      * @return string html template with data without placeholders
      */
-    public function parseChunk($name, $data = array(), $parseDocumentSource = false)
-    {
+    public function parseChunk($name, $data = array(), $parseDocumentSource = false)

+    {

         $this->debug->debug(
             array("parseChunk" => $name, "With data" => print_r($data, 1)),
             "parseChunk",
@@ -945,7 +950,7 @@ 
 
         $out = $this->DLTemplate->parseChunk($name, $data, $parseDocumentSource);
         $out = $this->parseLang($out);
-        if (empty($out)) {
+        if (empty($out)) {

             $this->debug->debug("Empty chunk: " . $this->debug->dumpData($name), '', 2);
         }
         $this->debug->debugEnd("parseChunk");
@@ -961,8 +966,8 @@ 
      *
      * @return string html template from parameter
      */
-    public function getChunkByParam($name, $val = '')
-    {
+    public function getChunkByParam($name, $val = '')

+    {

         $data = $this->getCFGDef($name, $val);
         $data = $this->_getChunk($data);
 
@@ -975,11 +980,11 @@ 
      * @param string $data html код который нужно обернуть в ownerTPL
      * @return string результатирующий html код
      */
-    public function renderWrap($data)
-    {
+    public function renderWrap($data)

+    {

         $out = $data;
         $docs = count($this->_docs) - $this->skippedDocs;
-        if ((($this->getCFGDef("noneWrapOuter", "1") && $docs == 0) || $docs > 0) && !empty($this->ownerTPL)) {
+        if ((($this->getCFGDef("noneWrapOuter", "1") && $docs == 0) || $docs > 0) && !empty($this->ownerTPL)) {

             $this->debug->debug("", "renderWrapTPL", 2);
             $parse = true;
             $plh = array($this->getCFGDef("sysKey", "dl") . ".wrap" => $data);
@@ -987,7 +992,7 @@ 
              * @var $extPrepare prepare_DL_Extender
              */
             $extPrepare = $this->getExtender('prepare');
-            if ($extPrepare) {
+            if ($extPrepare) {

                 $params = $extPrepare->init($this, array(
                     'data'      => array(
                         'docs'         => $this->_docs,
@@ -996,13 +1001,13 @@ 
                     'nameParam' => 'prepareWrap',
                     'return'    => 'placeholders'
                 ));
-                if (is_bool($params) && $params === false) {
+                if (is_bool($params) && $params === false) {

                     $out = $data;
                     $parse = false;
                 }
                 $plh = $params;
             }
-            if ($parse && !empty($this->ownerTPL)) {
+            if ($parse && !empty($this->ownerTPL)) {

                 $this->debug->updateMessage(
                     array("render ownerTPL" => $this->ownerTPL, "With data" => print_r($plh, 1)),
                     "renderWrapTPL",
@@ -1010,7 +1015,7 @@ 
                 );
                 $out = $this->parseChunk($this->ownerTPL, $plh);
             }
-            if (empty($this->ownerTPL)) {
+            if (empty($this->ownerTPL)) {

                 $this->debug->updateMessage("empty ownerTPL", "renderWrapTPL");
             }
             $this->debug->debugEnd("renderWrapTPL");
@@ -1026,8 +1031,8 @@ 
      * @param int $i номер итерации в цикле
      * @return array массив с данными которые можно использовать в цикле render метода
      */
-    protected function uniformPrepare(&$data, $i = 0)
-    {
+    protected function uniformPrepare(&$data, $i = 0)

+    {

         $class = array();
 
         $iterationName = ($i % 2 == 1) ? 'Odd' : 'Even';
@@ -1038,13 +1043,13 @@ 
         $this->renderTPL = $this->getCFGDef('tpl' . $iterationName, $this->renderTPL);
         $iteration = $i;
 
-        if ($this->extPaginate) {
+        if ($this->extPaginate) {

             $offset = $this->getCFGDef('reversePagination',
                 0) && $this->extPaginate->currentPage() > 1 ? $this->extPaginate->totalPage() * $this->getCFGDef('display',
                     0) - $this->extPaginate->totalDocs() : 0;
             if ($this->getCFGDef('maxDocs', 0) && !$this->getCFGDef('reversePagination',
                     0) && $this->extPaginate->currentPage() == $this->extPaginate->totalPage()
-            ) {
+            ) {

                 $iteration += $this->getCFGDef('display', 0);
             }
             $iteration += $this->getCFGDef('display',
@@ -1054,20 +1059,20 @@ 
         $data[$this->getCFGDef("sysKey",
             "dl") . '.full_iteration'] = $iteration;
 
-        if ($i == 1) {
+        if ($i == 1) {

             $this->renderTPL = $this->getCFGDef('tplFirst', $this->renderTPL);
             $class[] = $this->getCFGDef('firstClass', 'first');
         }
-        if ($i == (count($this->_docs) - $this->skippedDocs)) {
+        if ($i == (count($this->_docs) - $this->skippedDocs)) {

             $this->renderTPL = $this->getCFGDef('tplLast', $this->renderTPL);
             $class[] = $this->getCFGDef('lastClass', 'last');
         }
-        if ($this->modx->documentIdentifier == $data['id']) {
+        if ($this->modx->documentIdentifier == $data['id']) {

             $this->renderTPL = $this->getCFGDef('tplCurrent', $this->renderTPL);
             $data[$this->getCFGDef("sysKey",
                 "dl") . '.active'] = 1; //[+active+] - 1 if $modx->documentIdentifer equal ID this element
             $class[] = $this->getCFGDef('currentClass', 'current');
-        } else {
+        } else {

             $data[$this->getCFGDef("sysKey", "dl") . '.active'] = 0;
         }
 
@@ -1078,8 +1083,8 @@ 
          * @var $extE e_DL_Extender
          */
         $extE = $this->getExtender('e', true, true);
-        if ($out = $extE->init($this, compact('data'))) {
-            if (is_array($out)) {
+        if ($out = $extE->init($this, compact('data'))) {

+            if (is_array($out)) {

                 $data = $out;
             }
         }
@@ -1095,42 +1100,43 @@ 
      * @param array $array данные которые необходимо примешать к ответу на каждой записи $data
      * @return string JSON строка
      */
-    public function getJSON($data, $fields, $array = array())
-    {
+    public function getJSON($data, $fields, $array = array())

+    {

         $out = array();
         $fields = is_array($fields) ? $fields : explode(",", $fields);
-        if (is_array($array) && count($array) > 0) {
+        if (is_array($array) && count($array) > 0) {

             $tmp = array();
-            foreach ($data as $i => $v) { //array_merge not valid work with integer index key
+            foreach ($data as $i => $v) {

+//array_merge not valid work with integer index key
                 $tmp[$i] = (isset($array[$i]) ? array_merge($v, $array[$i]) : $v);
             }
             $data = $tmp;
         }
 
-        foreach ($data as $num => $doc) {
+        foreach ($data as $num => $doc) {

             $tmp = array();
-            foreach ($doc as $name => $value) {
-                if (in_array($name, $fields) || (isset($fields[0]) && $fields[0] == '1')) {
+            foreach ($doc as $name => $value) {

+                if (in_array($name, $fields) || (isset($fields[0]) && $fields[0] == '1')) {

                     $tmp[str_replace(".", "_", $name)] = $value; //JSON element name without dot
                 }
             }
             $out[$num] = $tmp;
         }
 
-        if ('new' == $this->getCFGDef('JSONformat', 'old')) {
+        if ('new' == $this->getCFGDef('JSONformat', 'old')) {

             $return = array();
 
             $return['rows'] = array();
-            foreach ($out as $key => $item) {
+            foreach ($out as $key => $item) {

                 $return['rows'][] = $item;
             }
             $return['total'] = $this->getChildrenCount();
-        } elseif ('simple' == $this->getCFGDef('JSONformat', 'old')) {
+        } elseif ('simple' == $this->getCFGDef('JSONformat', 'old')) {

             $return = array();
-            foreach ($out as $key => $item) {
+            foreach ($out as $key => $item) {

                 $return[] = $item;
             }
-        } else {
+        } else {

             $return = $out;
         }
         $this->outData = json_encode($return);
@@ -1146,11 +1152,11 @@ 
      * @param string $contentField
      * @return mixed|string
      */
-    protected function getSummary(array $item = array(), $extSummary = null, $introField = '', $contentField = '')
-    {
+    protected function getSummary(array $item = array(), $extSummary = null, $introField = '', $contentField = '')

+    {

         $out = '';
 
-        if (is_null($extSummary)) {
+        if (is_null($extSummary)) {

             /**
              * @var $extSummary summary_DL_Extender
              */
@@ -1159,10 +1165,10 @@ 
         $introField = $this->getCFGDef("introField", $introField);
         $contentField = $this->getCFGDef("contentField", $contentField);
 
-        if (!empty($introField) && !empty($item[$introField]) && mb_strlen($item[$introField], 'UTF-8') > 0) {
+        if (!empty($introField) && !empty($item[$introField]) && mb_strlen($item[$introField], 'UTF-8') > 0) {

             $out = $item[$introField];
-        } else {
-            if (!empty($contentField) && !empty($item[$contentField]) && mb_strlen($item[$contentField], 'UTF-8') > 0) {
+        } else {

+            if (!empty($contentField) && !empty($item[$contentField]) && mb_strlen($item[$contentField], 'UTF-8') > 0) {

                 $out = $extSummary->init($this, array(
                     "content"      => $item[$contentField],
                     "action"       => $this->getCFGDef("summary", ""),
@@ -1180,8 +1186,8 @@ 
      * @param string $name extender name
      * @return boolean status extender load
      */
-    public function checkExtender($name)
-    {
+    public function checkExtender($name)

+    {

         return (isset($this->extender[$name]) && $this->extender[$name] instanceof $name . "_DL_Extender");
     }
 
@@ -1189,8 +1195,8 @@ 
      * @param $name
      * @param $obj
      */
-    public function setExtender($name, $obj)
-    {
+    public function setExtender($name, $obj)

+    {

         $this->extender[$name] = $obj;
     }
 
@@ -1202,13 +1208,13 @@ 
      * @param bool $nop если экстендер не загружен, то загружать ли xNop
      * @return null|xNop
      */
-    public function getExtender($name, $autoload = false, $nop = false)
-    {
+    public function getExtender($name, $autoload = false, $nop = false)

+    {

         $out = null;
-        if ((is_scalar($name) && $this->checkExtender($name)) || ($autoload && $this->_loadExtender($name))) {
+        if ((is_scalar($name) && $this->checkExtender($name)) || ($autoload && $this->_loadExtender($name))) {

             $out = $this->extender[$name];
         }
-        if ($nop && is_null($out)) {
+        if ($nop && is_null($out)) {

             $out = new xNop();
         }
 
@@ -1221,27 +1227,27 @@ 
      * @param string $name name extender
      * @return boolean $flag status load extender
      */
-    protected function _loadExtender($name)
-    {
+    protected function _loadExtender($name)

+    {

         $this->debug->debug('Load Extender ' . $this->debug->dumpData($name), 'LoadExtender', 2);
         $flag = false;
 
         $classname = ($name != '') ? $name . "_DL_Extender" : "";
-        if ($classname != '' && isset($this->extender[$name]) && $this->extender[$name] instanceof $classname) {
+        if ($classname != '' && isset($this->extender[$name]) && $this->extender[$name] instanceof $classname) {

             $flag = true;
 
-        } else {
-            if (!class_exists($classname, false) && $classname != '') {
-                if (file_exists(dirname(__FILE__) . "/extender/" . $name . ".extender.inc")) {
+        } else {

+            if (!class_exists($classname, false) && $classname != '') {

+                if (file_exists(dirname(__FILE__) . "/extender/" . $name . ".extender.inc")) {

                     include_once(dirname(__FILE__) . "/extender/" . $name . ".extender.inc");
                 }
             }
-            if (class_exists($classname, false) && $classname != '') {
+            if (class_exists($classname, false) && $classname != '') {

                 $this->extender[$name] = new $classname($this, $name);
                 $flag = true;
             }
         }
-        if (!$flag) {
+        if (!$flag) {

             $this->debug->debug("Error load Extender " . $this->debug->dumpData($name));
         }
         $this->debug->debugEnd('LoadExtender');
@@ -1259,16 +1265,16 @@ 
      * @param mixed $IDs список id документов по которым необходима выборка
      * @return array очищенный массив
      */
-    public function setIDs($IDs)
-    {
+    public function setIDs($IDs)

+    {

         $this->debug->debug('set ID list ' . $this->debug->dumpData($IDs), 'setIDs', 2);
         $IDs = $this->cleanIDs($IDs);
         $type = $this->getCFGDef('idType', 'parents');
         $depth = $this->getCFGDef('depth', '');
-        if ($type == 'parents' && $depth > 0) {
+        if ($type == 'parents' && $depth > 0) {

             $tmp = $IDs;
-            do {
-                if (count($tmp) > 0) {
+            do {

+                if (count($tmp) > 0) {

                     $tmp = $this->getChildrenFolder($tmp);
                     $IDs = array_merge($IDs, $tmp);
                 }
@@ -1282,8 +1288,8 @@ 
     /**
      * @return int
      */
-    public function getIDs()
-    {
+    public function getIDs()

+    {

         return $this->IDs;
     }
 
@@ -1294,17 +1300,18 @@ 
      * @param string $sep разделитель
      * @return array очищенный массив с данными
      */
-    public function cleanIDs($IDs, $sep = ',')
-    {
+    public function cleanIDs($IDs, $sep = ',')

+    {

         $this->debug->debug('clean IDs ' . $this->debug->dumpData($IDs) . ' with separator ' . $this->debug->dumpData($sep),
             'cleanIDs', 2);
         $out = array();
-        if (!is_array($IDs)) {
+        if (!is_array($IDs)) {

             $IDs = explode($sep, $IDs);
         }
-        foreach ($IDs as $item) {
+        foreach ($IDs as $item) {

             $item = trim($item);
-            if (is_numeric($item) && (int)$item >= 0) { //Fix 0xfffffffff
+            if (is_numeric($item) && (int)$item >= 0) {

+//Fix 0xfffffffff
                 $out[] = (int)$item;
             }
         }
@@ -1318,8 +1325,8 @@ 
      * Проверка массива с id-шниками документов для выборки
      * @return boolean пригодны ли данные для дальнейшего использования
      */
-    protected function checkIDs()
-    {
+    protected function checkIDs()

+    {

         return (is_array($this->IDs) && count($this->IDs) > 0) ? true : false;
     }
 
@@ -1331,11 +1338,11 @@ 
      * @global array $_docs all documents
      * @return array all field values
      */
-    public function getOneField($userField, $uniq = false)
-    {
+    public function getOneField($userField, $uniq = false)

+    {

         $out = array();
-        foreach ($this->_docs as $doc => $val) {
-            if (isset($val[$userField]) && (($uniq && !in_array($val[$userField], $out)) || !$uniq)) {
+        foreach ($this->_docs as $doc => $val) {

+            if (isset($val[$userField]) && (($uniq && !in_array($val[$userField], $out)) || !$uniq)) {

                 $out[$doc] = $val[$userField];
             }
         }
@@ -1346,8 +1353,8 @@ 
     /**
      * @return DLCollection
      */
-    public function docsCollection()
-    {
+    public function docsCollection()

+    {

         return new DLCollection($this->modx, $this->_docs);
     }
 
@@ -1375,10 +1382,10 @@ 
      * @param string $group
      * @return string
      */
-    protected function getGroupSQL($group = '')
-    {
+    protected function getGroupSQL($group = '')

+    {

         $out = '';
-        if ($group != '') {
+        if ($group != '') {

             $out = 'GROUP BY ' . $group;
         }
 
@@ -1397,12 +1404,12 @@ 
      *
      * @return string Order by for SQL
      */
-    protected function SortOrderSQL($sortName, $orderDef = 'DESC')
-    {
+    protected function SortOrderSQL($sortName, $orderDef = 'DESC')

+    {

         $this->debug->debug('', 'sortORDER', 2);
 
         $sort = '';
-        switch ($this->getCFGDef('sortType', '')) {
+        switch ($this->getCFGDef('sortType', '')) {

             case 'none':
                 break;
             case 'doclist':
@@ -1413,10 +1420,10 @@ 
                 break;
             default:
                 $out = array('orderBy' => '', 'order' => '', 'sortBy' => '');
-                if (($tmp = $this->getCFGDef('orderBy', '')) != '') {
+                if (($tmp = $this->getCFGDef('orderBy', '')) != '') {

                     $out['orderBy'] = $tmp;
-                } else {
-                    switch (true) {
+                } else {

+                    switch (true) {

                         case ('' != ($tmp = $this->getCFGDef('sortDir', ''))): //higher priority than order
                             $out['order'] = $tmp;
                         // no break
@@ -1424,7 +1431,7 @@ 
                             $out['order'] = $tmp;
                         // no break
                     }
-                    if ('' == $out['order'] || !in_array(strtoupper($out['order']), array('ASC', 'DESC'))) {
+                    if ('' == $out['order'] || !in_array(strtoupper($out['order']), array('ASC', 'DESC'))) {

                         $out['order'] = $orderDef; //Default
                     }
 
@@ -1445,30 +1452,30 @@ 
      *
      * @return string LIMIT вставка в SQL запрос
      */
-    protected function LimitSQL($limit = 0, $offset = 0)
-    {
+    protected function LimitSQL($limit = 0, $offset = 0)

+    {

         $this->debug->debug('', 'limitSQL', 2);
         $ret = '';
-        if ($limit == 0) {
+        if ($limit == 0) {

             $limit = $this->getCFGDef('display', 0);
         }
         $maxDocs = $this->getCFGDef('maxDocs', 0);
-        if ($maxDocs > 0 && $limit > $maxDocs) {
+        if ($maxDocs > 0 && $limit > $maxDocs) {

             $limit = $maxDocs;
         }
-        if ($offset == 0) {
+        if ($offset == 0) {

             $offset = $this->getCFGDef('offset', 0);
         }
         $offset += $this->getCFGDef('start', 0);
         $total = $this->getCFGDef('total', 0);
-        if ($limit < ($total - $limit)) {
+        if ($limit < ($total - $limit)) {

             $limit = $total - $offset;
         }
 
-        if ($limit != 0) {
+        if ($limit != 0) {

             $ret = "LIMIT " . (int)$offset . "," . (int)$limit;
-        } else {
-            if ($offset != 0) {
+        } else {

+            if ($offset != 0) {

                 /**
                  * To retrieve all rows from a certain offset up to the end of the result set, you can use some large number for the second parameter
                  * @see http://dev.mysql.com/doc/refman/5.0/en/select.html
@@ -1488,8 +1495,8 @@ 
      * @param string $charset
      * @return string Clear string
      */
-    public function sanitarData($data, $charset = 'UTF-8')
-    {
+    public function sanitarData($data, $charset = 'UTF-8')

+    {

         return APIHelpers::sanitarTag($data, $charset);
     }
 
@@ -1500,8 +1507,8 @@ 
      * @param string $parentField default name parent field
      * @return array
      */
-    public function treeBuild($idField = 'id', $parentField = 'parent')
-    {
+    public function treeBuild($idField = 'id', $parentField = 'parent')

+    {

         return $this->_treeBuild($this->_docs, $this->getCFGDef('idField', $idField),
             $this->getCFGDef('parentField', $parentField));
     }
@@ -1514,16 +1521,16 @@ 
      * @param string $pidName name parent field in associative data array
      * @return array
      */
-    private function _treeBuild($data, $idName, $pidName)
-    {
+    private function _treeBuild($data, $idName, $pidName)

+    {

         $children = array(); // children of each ID
         $ids = array();
-        foreach ($data as $i => $r) {
+        foreach ($data as $i => $r) {

             $row =& $data[$i];
             $id = $row[$idName];
             $pid = $row[$pidName];
             $children[$pid][$id] =& $row;
-            if (!isset($children[$id])) {
+            if (!isset($children[$id])) {

                 $children[$id] = array();
             }
             $row['#childNodes'] =& $children[$id];
@@ -1531,9 +1538,9 @@ 
         }
         // Root elements are elements with non-found PIDs.
         $this->_tree = array();
-        foreach ($data as $i => $r) {
+        foreach ($data as $i => $r) {

             $row =& $data[$i];
-            if (!isset($ids[$row[$pidName]])) {
+            if (!isset($ids[$row[$pidName]])) {

                 $this->_tree[$row[$idName]] = $row;
             }
         }
@@ -1547,12 +1554,12 @@ 
      * @param bool $full если true то возвращается значение для подстановки в запрос
      * @return string PrimaryKey основной таблицы
      */
-    public function getPK($full = true)
-    {
+    public function getPK($full = true)

+    {

         $idField = isset($this->idField) ? $this->idField: 'id';
-        if ($full) {
+        if ($full) {

             $idField = '`' . $idField . '`';
-            if (!empty($this->alias)) {
+            if (!empty($this->alias)) {

                 $idField = '`' . $this->alias . '`.' . $idField;
             }
         }
@@ -1566,12 +1573,12 @@ 
      * @param bool $full если true то возвращается значение для подстановки в запрос
      * @return string Parent Key основной таблицы
      */
-    public function getParentField($full = true)
-    {
+    public function getParentField($full = true)

+    {

         $parentField = isset($this->parentField) ? $this->parentField : '';
-        if ($full && !empty($parentField)) {
+        if ($full && !empty($parentField)) {

             $parentField = '`' . $parentField . '`';
-            if (!empty($this->alias)) {
+            if (!empty($this->alias)) {

                 $parentField = '`' . $this->alias . '`.' . $parentField;
             }
         }
@@ -1586,31 +1593,31 @@ 
      * @param string $filter_string строка со всеми фильтрами
      * @return mixed результат разбора фильтров
      */
-    protected function getFilters($filter_string)
-    {
+    protected function getFilters($filter_string)

+    {

         $this->debug->debug("getFilters: " . $this->debug->dumpData($filter_string), 'getFilter', 1);
         // the filter parameter tells us, which filters can be used in this query
         $filter_string = trim($filter_string, ' ;');
-        if (!$filter_string) {
+        if (!$filter_string) {

             return;
         }
         $output = array('join' => '', 'where' => '');
         $logic_op_found = false;
         $joins = $wheres = array();
-        foreach ($this->_logic_ops as $op => $sql) {
-            if (strpos($filter_string, $op) === 0) {
+        foreach ($this->_logic_ops as $op => $sql) {

+            if (strpos($filter_string, $op) === 0) {

                 $logic_op_found = true;
                 $subfilters = mb_substr($filter_string, strlen($op) + 1, mb_strlen($filter_string, "UTF-8"), "UTF-8");
                 $subfilters = $this->smartSplit($subfilters);
-                foreach ($subfilters as $subfilter) {
+                foreach ($subfilters as $subfilter) {

                     $subfilter = $this->getFilters(trim($subfilter));
-                    if (!$subfilter) {
+                    if (!$subfilter) {

                         continue;
                     }
-                    if ($subfilter['join']) {
+                    if ($subfilter['join']) {

                         $joins[] = $subfilter['join'];
                     }
-                    if ($subfilter['where']) {
+                    if ($subfilter['where']) {

                         $wheres[] = $subfilter['where'];
                     }
                 }
@@ -1619,12 +1626,12 @@ 
             }
         }
 
-        if (!$logic_op_found) {
+        if (!$logic_op_found) {

             $filter = $this->loadFilter($filter_string);
-            if (!$filter) {
+            if (!$filter) {

                 $this->debug->warning('Error while loading DocLister filter "' . $this->debug->dumpData($filter_string) . '": check syntax!');
                 $output = false;
-            } else {
+            } else {

                 $output['join'] = $filter->get_join();
                 $output['where'] = stripslashes($filter->get_where());
             }
@@ -1637,16 +1644,16 @@ 
     /**
      * @return mixed
      */
-    public function filtersWhere()
-    {
+    public function filtersWhere()

+    {

         return APIHelpers::getkey($this->_filters, 'where', '');
     }
 
     /**
      * @return mixed
      */
-    public function filtersJoin()
-    {
+    public function filtersJoin()

+    {

         return APIHelpers::getkey($this->_filters, 'join', '');
     }
 
@@ -1654,11 +1661,12 @@ 
      * @param string $join
      * @return $this
      */
-    public function setFiltersJoin($join = '') {
-        if (!empty($join)) {
-            if (!empty($this->_filters['join'])) {
+    public function setFiltersJoin($join = '')

+    {

+        if (!empty($join)) {

+            if (!empty($this->_filters['join'])) {

                 $this->_filters['join'] .= ' ' . $join;
-            } else {
+            } else {

                 $this->_filters['join'] = $join;
             }
         }
@@ -1673,10 +1681,10 @@ 
      * @param $type string тип фильтрации
      * @return string имя поля с учетом приведения типа
      */
-    public function changeSortType($field, $type)
-    {
+    public function changeSortType($field, $type)

+    {

         $type = trim($type);
-        switch (strtoupper($type)) {
+        switch (strtoupper($type)) {

             case 'DECIMAL':
                 $field = 'CAST(' . $field . ' as DECIMAL(10,2))';
                 break;
@@ -1702,8 +1710,8 @@ 
      * @param string $filter срока с параметрами фильтрации
      * @return bool
      */
-    protected function loadFilter($filter)
-    {
+    protected function loadFilter($filter)

+    {

         $this->debug->debug('Load filter ' . $this->debug->dumpData($filter), 'loadFilter', 2);
         $out = false;
         $fltr_params = explode(':', $filter, 2);
@@ -1713,21 +1721,21 @@ 
         */
         $fltr_class = $fltr . '_DL_filter';
         // check if the filter is implemented
-        if (!is_null($fltr)) {
-            if (!class_exists($fltr_class) && file_exists(__DIR__ . '/filter/' . $fltr . '.filter.php')) {
+        if (!is_null($fltr)) {

+            if (!class_exists($fltr_class) && file_exists(__DIR__ . '/filter/' . $fltr . '.filter.php')) {

                 require_once dirname(__FILE__) . '/filter/' . $fltr . '.filter.php';
             }
-            if (class_exists($fltr_class)) {
+            if (class_exists($fltr_class)) {

                 $this->totalFilters++;
                 $fltr_obj = new $fltr_class();
-                if ($fltr_obj->init($this, $filter)) {
+                if ($fltr_obj->init($this, $filter)) {

                     $out = $fltr_obj;
-                } else {
+                } else {

                     $this->debug->error("Wrong filter parameter: '{$this->debug->dumpData($filter)}'", 'Filter');
                 }
             }
         }
-        if (!$out) {
+        if (!$out) {

             $this->debug->error("Error load Filter: '{$this->debug->dumpData($filter)}'", 'Filter');
         }
 
@@ -1740,8 +1748,8 @@ 
      * Общее число фильтров
      * @return int
      */
-    public function getCountFilters()
-    {
+    public function getCountFilters()

+    {

         return (int)$this->totalFilters;
     }
 
@@ -1749,8 +1757,8 @@ 
      * Выполнить SQL запрос
      * @param string $q SQL запрос
      */
-    public function dbQuery($q)
-    {
+    public function dbQuery($q)

+    {

         $this->debug->debug($q, "query", 1, 'sql');
         $out = $this->modx->db->query($q);
         $this->debug->debugEnd("query");
@@ -1768,8 +1776,8 @@ 
      * @param string $tpl шаблон подстановки значения в SQL запрос
      * @return string строка для подстановки в SQL запрос
      */
-    public function LikeEscape($field, $value, $escape = '=', $tpl = '%[+value+]%')
-    {
+    public function LikeEscape($field, $value, $escape = '=', $tpl = '%[+value+]%')

+    {

         return sqlHelper::LikeEscape($this->modx, $field, $value, $escape, $tpl);
     }
 
@@ -1777,8 +1785,8 @@ 
      * Получение REQUEST_URI без GET-ключа с
      * @return string
      */
-    public function getRequest()
-    {
+    public function getRequest()

+    {

         $URL = null;
         parse_str(parse_url(MODX_SITE_URL . $_SERVER['REQUEST_URI'], PHP_URL_QUERY), $URL);