AgelxNash / DocLister

assets/snippets/DocLister/lib/DLCollection.class.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-include_once(MODX_BASE_PATH . "assets/lib/Helpers/Collection.php");
+include_once(MODX_BASE_PATH."assets/lib/Helpers/Collection.php");
 
 /**
  * Class DLCollection

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

Spacing +11 added lines, -11 removed lines

@@ -127,7 +127,7 @@ 
      */
     protected function build_sql_where($table_alias, $field, $operator, $value)
     {
-        $this->DocLister->debug->debug('Build SQL query for filters: ' . $this->DocLister->debug->dumpData(func_get_args()),
+        $this->DocLister->debug->debug('Build SQL query for filters: '.$this->DocLister->debug->dumpData(func_get_args()),
             'buildQuery', 2);
         $output = sqlHelper::tildeField($field, $table_alias);
 
@@ -135,28 +135,28 @@ 
             case '=':
             case 'eq':
             case 'is':
-                $output .= " = '" . $this->modx->db->escape($value) . "'";
+                $output .= " = '".$this->modx->db->escape($value)."'";
                 break;
             case '!=':
             case 'no':
             case 'isnot':
-                $output .= " != '" . $this->modx->db->escape($value) . "'";
+                $output .= " != '".$this->modx->db->escape($value)."'";
                 break;
             case '>':
             case 'gt':
-                $output .= ' > ' . str_replace(',', '.', floatval($value));
+                $output .= ' > '.str_replace(',', '.', floatval($value));
                 break;
             case '<':
             case 'lt':
-                $output .= ' < ' . str_replace(',', '.', floatval($value));
+                $output .= ' < '.str_replace(',', '.', floatval($value));
                 break;
             case '<=':
             case 'elt':
-                $output .= ' <= ' . str_replace(',', '.', floatval($value));
+                $output .= ' <= '.str_replace(',', '.', floatval($value));
                 break;
             case '>=':
             case 'egt':
-                $output .= ' >= ' . str_replace(',', '.', floatval($value));
+                $output .= ' >= '.str_replace(',', '.', floatval($value));
                 break;
             case '%':
             case 'like':
@@ -169,7 +169,7 @@ 
                 $output = $this->DocLister->LikeEscape($output, $value, '=', '%[+value+]');
                 break;
             case 'regexp':
-                $output .= " REGEXP '" . $this->modx->db->escape($value) . "'";
+                $output .= " REGEXP '".$this->modx->db->escape($value)."'";
                 break;
             case 'against':
                 /** content:pagetitle,description,content,introtext:against:искомая строка */
@@ -192,16 +192,16 @@ 
                     $word_arr[] = $this->DocLister->LikeEscape($output, $word);
                 }
                 if (!empty($word_arr)) {
-                    $output = '(' . implode(' OR ', $word_arr) . ')';
+                    $output = '('.implode(' OR ', $word_arr).')';
                 } else {
                     $output = '';
                 }
                 break;
             case 'in':
-                $output .= ' IN(' . $this->DocLister->sanitarIn($value, ',', true) . ')';
+                $output .= ' IN('.$this->DocLister->sanitarIn($value, ',', true).')';
                 break;
             case 'notin':
-                $output .= ' NOT IN(' . $this->DocLister->sanitarIn($value, ',', true) . ')';
+                $output .= ' NOT IN('.$this->DocLister->sanitarIn($value, ',', true).')';
                 break;
             default:
                 $output = '';

assets/snippets/DocLister/core/filter/tv.filter.php

Spacing +7 added lines, -7 removed lines

@@ -49,17 +49,17 @@ 
                 $this->tv_id = $tmp[0];
             }
             if (!$this->tv_id) {
-                $tvid = $this->modx->db->query("SELECT id FROM " . $this->DocLister->getTable('site_tmplvars') . " WHERE `name` = '" . $this->modx->db->escape($this->field) . "'");
+                $tvid = $this->modx->db->query("SELECT id FROM ".$this->DocLister->getTable('site_tmplvars')." WHERE `name` = '".$this->modx->db->escape($this->field)."'");
                 $this->tv_id = intval($this->modx->db->getValue($tvid));
             }
 
             if (!$this->tv_id) {
-                $this->DocLister->debug->warning('DocLister filtering by template variable "' . $this->DocLister->debug->dumpData($this->field) . '" failed. TV not found!');
+                $this->DocLister->debug->warning('DocLister filtering by template variable "'.$this->DocLister->debug->dumpData($this->field).'" failed. TV not found!');
             } else {
                 // create the alias for the join
-                $alias = 'dltv_' . $this->field;
+                $alias = 'dltv_'.$this->field;
                 if ($this->totalFilters > 0) {
-                    $alias .= '_' . $this->totalFilters;
+                    $alias .= '_'.$this->totalFilters;
                 }
                 $this->setTableAlias($alias);
                 $this->tvName = $this->field;
@@ -79,10 +79,10 @@ 
         $join = '';
         $exists = $this->DocLister->checkTableAlias($this->tvName, $this->extTV->tvValuesTable());
         $alias = $this->DocLister->TableAlias($this->tvName, $this->extTV->tvValuesTable(), $this->getTableAlias());
-        $this->field = $alias . ".value";
+        $this->field = $alias.".value";
         if (!$exists) {
-            $join = 'LEFT JOIN ' . $this->DocLister->getTable($this->extTV->tvValuesTable(),
-                    $alias) . ' ON `' . $alias . '`.`contentid`=`' . content_DL_filter::TableAlias . '`.`id` AND `' . $alias . '`.`tmplvarid`=' . $this->tv_id;
+            $join = 'LEFT JOIN '.$this->DocLister->getTable($this->extTV->tvValuesTable(),
+                    $alias).' ON `'.$alias.'`.`contentid`=`'.content_DL_filter::TableAlias.'`.`id` AND `'.$alias.'`.`tmplvarid`='.$this->tv_id;
         } else {
             $this->setTableAlias($alias);
         }

assets/snippets/DocLister/snippet.DLReflect.php

Indentation +4 added lines, -4 removed lines

@@ -44,10 +44,10 @@
 $reflectTPL = APIHelpers::getkey($params, 'reflectTPL',
     '@CODE: <li><a href="[+url+]" title="[+title+]">[+title+]</a></li>');
 /**
- * activeReflectTPL
- *        Шаблон активной даты.
- *    Поддерживается такие же плейсхолдеры, как и в шаблоне reflectTPL
- */
+     * activeReflectTPL
+     *        Шаблон активной даты.
+     *    Поддерживается такие же плейсхолдеры, как и в шаблоне reflectTPL
+     */
 $activeReflectTPL = APIHelpers::getkey($params, 'activeReflectTPL', '@CODE: <li><span>[+title+]</span></li>');
 
 list($dateFormat, $sqlDateFormat, $reflectValidator) = DLReflect::switchReflect($reflectType, function () {

Spacing +17 added lines, -17 removed lines

@@ -10,9 +10,9 @@ 
  *    &limitAfter=`3`
  * ]]
  */
-include_once(MODX_BASE_PATH . 'assets/snippets/DocLister/lib/DLCollection.class.php');
-include_once(MODX_BASE_PATH . 'assets/lib/APIHelpers.class.php');
-include_once(MODX_BASE_PATH . 'assets/snippets/DocLister/lib/DLReflect.class.php');
+include_once(MODX_BASE_PATH.'assets/snippets/DocLister/lib/DLCollection.class.php');
+include_once(MODX_BASE_PATH.'assets/lib/APIHelpers.class.php');
+include_once(MODX_BASE_PATH.'assets/snippets/DocLister/lib/DLReflect.class.php');
 
 $params = is_array($modx->event->params) ? $modx->event->params : array();
 
@@ -50,9 +50,9 @@ 
  */
 $activeReflectTPL = APIHelpers::getkey($params, 'activeReflectTPL', '@CODE: <li><span>[+title+]</span></li>');
 
-list($dateFormat, $sqlDateFormat, $reflectValidator) = DLReflect::switchReflect($reflectType, function () {
+list($dateFormat, $sqlDateFormat, $reflectValidator) = DLReflect::switchReflect($reflectType, function(){
     return array('m-Y', '%m-%Y', array('DLReflect', 'validateMonth'));
-}, function () {
+}, function(){
     return array('Y', '%Y', array('DLReflect', 'validateYear'));
 });
 $tmp = $originalDate = date($dateFormat);
@@ -142,14 +142,14 @@ 
  * Возможные значения: Любое число. 0 расценивается как все доступные месяцы
  * Значение по умолчанию: 0
  */
-$limitBefore = (int)APIHelpers::getkey($params, 'limitBefore', 0);
+$limitBefore = (int) APIHelpers::getkey($params, 'limitBefore', 0);
 /**
  * limitAfter
  *        Число элементов после месяца указанного в activeMonth параметре
  * Возможные значения: Любое число. 0 расценивается как все доступные месяцы
  * Значение по умолчанию: 0
  */
-$limitAfter = (int)APIHelpers::getkey($params, 'limitAfter', 0);
+$limitAfter = (int) APIHelpers::getkey($params, 'limitAfter', 0);
 $display = $limitBefore + 1 + $limitAfter;
 
 $out = '';
@@ -161,10 +161,10 @@ 
 $DLParams['saveDLObject'] = 'DLAPI';
 if ($reflectSource == 'tv') {
     $DLParams['tvSortType'] = 'TVDATETIME';
-    $DLParams['selectFields'] = "DATE_FORMAT(STR_TO_DATE(`dltv_" . $reflectField . "_1`.`value`,'%d-%m-%Y %H:%i:%s'), '" . $sqlDateFormat . "') as `id`";
+    $DLParams['selectFields'] = "DATE_FORMAT(STR_TO_DATE(`dltv_".$reflectField."_1`.`value`,'%d-%m-%Y %H:%i:%s'), '".$sqlDateFormat."') as `id`";
 } else {
     $DLParams['orderBy'] = $reflectField;
-    $DLParams['selectFields'] = "DATE_FORMAT(FROM_UNIXTIME(" . $reflectField . "), '" . $sqlDateFormat . "') as `id`";
+    $DLParams['selectFields'] = "DATE_FORMAT(FROM_UNIXTIME(".$reflectField."), '".$sqlDateFormat."') as `id`";
 }
 $totalReflects = $modx->runSnippet('DocLister', $DLParams);
 /** Получаем объект DocLister'a */
@@ -181,7 +181,7 @@ 
     $totalReflects = array();
 }
 $totalReflects = new DLCollection($modx, $totalReflects);
-$totalReflects = $totalReflects->filter(function ($el) {
+$totalReflects = $totalReflects->filter(function($el){
     return !empty($el['id']);
 });
 /** Добавляем активную дату в коллекцию */
@@ -195,7 +195,7 @@ 
     $totalReflects->add(array('id' => $originalCurrentReflect), $originalCurrentReflect);
 }
 /** Сортируем даты по возрастанию */
-$totalReflects->sort(function ($a, $b) use ($dateFormat) {
+$totalReflects->sort(function($a, $b) use ($dateFormat) {
     $aDate = DateTime::createFromFormat($dateFormat, $a['id']);
     $bDate = DateTime::createFromFormat($dateFormat, $b['id']);
 
@@ -203,7 +203,7 @@ 
 })->reindex();
 
 /** Разделяем коллекцию дат на 2 части (до текущей даты и после) */
-list($lReflect, $rReflect) = $totalReflects->partition(function ($key, $val) use (
+list($lReflect, $rReflect) = $totalReflects->partition(function($key, $val) use (
     $activeReflect,
     $originalDate,
     $dateFormat
@@ -267,7 +267,7 @@ 
 
 $sortDir = APIHelpers::getkey($params, 'sortDir', 'ASC');
 /** Сортируем результатирующий список  */
-$outReflects = $outReflects->sort(function ($a, $b) use ($sortDir, $dateFormat) {
+$outReflects = $outReflects->sort(function($a, $b) use ($sortDir, $dateFormat) {
     $aDate = DateTime::createFromFormat($dateFormat, $a);
     $bDate = DateTime::createFromFormat($dateFormat, $b);
     $out = false;
@@ -287,15 +287,15 @@ 
 foreach ($outReflects as $reflectItem) {
     $tpl = (!is_null($activeReflect) && $activeReflect == $reflectItem) ? $activeReflectTPL : $reflectTPL;
 
-    $data = DLReflect::switchReflect($reflectType, function () use ($reflectItem, $DLAPI) {
+    $data = DLReflect::switchReflect($reflectType, function() use ($reflectItem, $DLAPI) {
         list($vMonth, $vYear) = explode('-', $reflectItem, 2);
 
         return array(
             'monthNum'  => $vMonth,
-            'monthName' => $DLAPI->getMsg('months.' . (int)$vMonth),
+            'monthName' => $DLAPI->getMsg('months.'.(int) $vMonth),
             'year'      => $vYear,
         );
-    }, function () use ($reflectItem) {
+    }, function() use ($reflectItem) {
         return array(
             'year' => $reflectItem
         );
@@ -327,4 +327,4 @@ 
     $debug = '';
 }
 
-return $debug . $out;
+return $debug.$out;

Braces +8 added lines, -8 removed lines

@@ -50,9 +50,9 @@ 
  */
 $activeReflectTPL = APIHelpers::getkey($params, 'activeReflectTPL', '@CODE: <li><span>[+title+]</span></li>');
 
-list($dateFormat, $sqlDateFormat, $reflectValidator) = DLReflect::switchReflect($reflectType, function () {
+list($dateFormat, $sqlDateFormat, $reflectValidator) = DLReflect::switchReflect($reflectType, function (){
     return array('m-Y', '%m-%Y', array('DLReflect', 'validateMonth'));
-}, function () {
+}, function (){
     return array('Y', '%Y', array('DLReflect', 'validateYear'));
 });
 $tmp = $originalDate = date($dateFormat);
@@ -181,7 +181,7 @@ 
     $totalReflects = array();
 }
 $totalReflects = new DLCollection($modx, $totalReflects);
-$totalReflects = $totalReflects->filter(function ($el) {
+$totalReflects = $totalReflects->filter(function ($el){
     return !empty($el['id']);
 });
 /** Добавляем активную дату в коллекцию */
@@ -195,7 +195,7 @@ 
     $totalReflects->add(array('id' => $originalCurrentReflect), $originalCurrentReflect);
 }
 /** Сортируем даты по возрастанию */
-$totalReflects->sort(function ($a, $b) use ($dateFormat) {
+$totalReflects->sort(function ($a, $b) use ($dateFormat){
     $aDate = DateTime::createFromFormat($dateFormat, $a['id']);
     $bDate = DateTime::createFromFormat($dateFormat, $b['id']);
 
@@ -207,7 +207,7 @@ 
     $activeReflect,
     $originalDate,
     $dateFormat
-) {
+){
     $aDate = DateTime::createFromFormat($dateFormat, $val['id']);
     if (is_null($activeReflect)) {
         $activeReflect = $originalDate;
@@ -267,7 +267,7 @@ 
 
 $sortDir = APIHelpers::getkey($params, 'sortDir', 'ASC');
 /** Сортируем результатирующий список  */
-$outReflects = $outReflects->sort(function ($a, $b) use ($sortDir, $dateFormat) {
+$outReflects = $outReflects->sort(function ($a, $b) use ($sortDir, $dateFormat){
     $aDate = DateTime::createFromFormat($dateFormat, $a);
     $bDate = DateTime::createFromFormat($dateFormat, $b);
     $out = false;
@@ -287,7 +287,7 @@ 
 foreach ($outReflects as $reflectItem) {
     $tpl = (!is_null($activeReflect) && $activeReflect == $reflectItem) ? $activeReflectTPL : $reflectTPL;
 
-    $data = DLReflect::switchReflect($reflectType, function () use ($reflectItem, $DLAPI) {
+    $data = DLReflect::switchReflect($reflectType, function () use ($reflectItem, $DLAPI){
         list($vMonth, $vYear) = explode('-', $reflectItem, 2);
 
         return array(
@@ -295,7 +295,7 @@ 
             'monthName' => $DLAPI->getMsg('months.' . (int)$vMonth),
             'year'      => $vYear,
         );
-    }, function () use ($reflectItem) {
+    }, function () use ($reflectItem){
         return array(
             'year' => $reflectItem
         );

assets/snippets/DocLister/core/filter/private.filter.php

Spacing +3 added lines, -3 removed lines

@@ -38,7 +38,7 @@ 
             $docgrp = implode(",", $docgrp);
         }
         $alias = parent::TableAlias;
-        $where = ($this->modx->isFrontend() ? "`{$alias}`.`privateweb`=0" : "1='{$_SESSION['mgrRole']}' OR {$alias}.`privatemgr`=0") . (!$docgrp ? "" : " OR `{$this->tableAlias}`.`document_group` IN ({$docgrp})");
+        $where = ($this->modx->isFrontend() ? "`{$alias}`.`privateweb`=0" : "1='{$_SESSION['mgrRole']}' OR {$alias}.`privatemgr`=0").(!$docgrp ? "" : " OR `{$this->tableAlias}`.`document_group` IN ({$docgrp})");
 
         return "($where)";
     }
@@ -48,8 +48,8 @@ 
      */
     public function get_join()
     {
-        $join = 'LEFT JOIN ' . $this->DocLister->getTable('document_groups',
-                $this->tableAlias) . ' ON `' . $this->tableAlias . '`.`document`=`' . parent::TableAlias . '`.`id`';
+        $join = 'LEFT JOIN '.$this->DocLister->getTable('document_groups',
+                $this->tableAlias).' ON `'.$this->tableAlias.'`.`document`=`'.parent::TableAlias.'`.`id`';
 
         return $join;
     }

assets/lib/MODxAPI/autoTable.abstract.php

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -89,10 +89,10 @@
         }
         if (!empty($this->set)) {
             if ($this->newDoc) {
-                $SQL = "INSERT {$this->ignoreError} INTO {$this->makeTable($this->table)} SET " . implode(', ',
+                $SQL = "insert {$this->ignoreError} INTO {$this->makeTable($this->table)} SET " . implode(', ',
                         $this->set);
             } else {
-                $SQL = ($this->getID() === null) ? null : "UPDATE {$this->ignoreError} {$this->makeTable($this->table)} SET " . implode(', ',
+                $SQL = ($this->getID() === null) ? null : "update {$this->ignoreError} {$this->makeTable($this->table)} SET " . implode(', ',
                         $this->set) . " WHERE `" . $this->pkName . "` = " . $this->getID();
             }
             $this->query($SQL);

Spacing +6 added lines, -6 removed lines

@@ -56,7 +56,7 @@ 
             $this->close();
             $this->markAllEncode();
             $this->newDoc = false;
-            $result = $this->query("SELECT * from {$this->makeTable($this->table)} where `" . $this->pkName . "`='" . $this->escape($id) . "'");
+            $result = $this->query("SELECT * from {$this->makeTable($this->table)} where `".$this->pkName."`='".$this->escape($id)."'");
             $this->fromArray($this->modx->db->getRow($result));
             $this->store($this->toArray());
             $this->id = $this->eraseField($this->pkName);
@@ -97,11 +97,11 @@ 
         }
         if (!empty($this->set)) {
             if ($this->newDoc) {
-                $SQL = "INSERT {$this->ignoreError} INTO {$this->makeTable($this->table)} SET " . implode(', ',
+                $SQL = "INSERT {$this->ignoreError} INTO {$this->makeTable($this->table)} SET ".implode(', ',
                         $this->set);
             } else {
-                $SQL = ($this->getID() === null) ? null : "UPDATE {$this->ignoreError} {$this->makeTable($this->table)} SET " . implode(', ',
-                        $this->set) . " WHERE `" . $this->pkName . "` = " . $this->getID();
+                $SQL = ($this->getID() === null) ? null : "UPDATE {$this->ignoreError} {$this->makeTable($this->table)} SET ".implode(', ',
+                        $this->set)." WHERE `".$this->pkName."` = ".$this->getID();
             }
             $this->query($SQL);
             if ($this->newDoc) {
@@ -128,11 +128,11 @@ 
         if (is_array($_ids) && $_ids != array()) {
             $id = $this->sanitarIn($_ids);
             if (!empty($id)) {
-                $this->query("DELETE from {$this->makeTable($this->table)} where `" . $this->pkName . "` IN ({$id})");
+                $this->query("DELETE from {$this->makeTable($this->table)} where `".$this->pkName."` IN ({$id})");
             }
             $this->clearCache($fire_events);
         } else {
-            throw new Exception('Invalid IDs list for delete: <pre>' . print_r($ids, 1) . '</pre>');
+            throw new Exception('Invalid IDs list for delete: <pre>'.print_r($ids, 1).'</pre>');
         }
 
         return $this;

Braces +1 added lines, -2 removed lines

@@ -80,8 +80,7 @@
         foreach ($this->jsonFields as $field) {
             if ($this->get($field) === null
                 && isset($this->default_field[$field])
-                && is_array($this->default_field[$field]))
-            {
+                && is_array($this->default_field[$field])) {
                 $this->set($field, $this->default_field[$field]);
             }
         }

assets/snippets/DocLister/core/controller/shopkeeper.php

Upper-Lower-Casing +8 added lines, -8 removed lines

@@ -155,7 +155,7 @@ 
             }
             $where = sqlHelper::trimLogicalOp($where);
 
-            $where = "WHERE {$where}";
+            $where = "where {$where}";
             $whereArr = array();
             if (!$this->getCFGDef('showNoPublish', 0)) {
                 $whereArr[] = "c.published=1";
@@ -236,15 +236,15 @@ 
 
             if ($this->getCFGDef('showNoPublish', 0)) {
                 if ($where != '') {
-                    $where = "WHERE {$where}";
+                    $where = "where {$where}";
                 } else {
                     $where = '';
                 }
             } else {
                 if ($where != '') {
-                    $where = "WHERE {$where} AND ";
+                    $where = "where {$where} AND ";
                 } else {
-                    $where = "WHERE {$where} ";
+                    $where = "where {$where} ";
                 }
                 $where .= "c.published=1";
             }
@@ -258,7 +258,7 @@ 
 
             $limit = $this->LimitSQL($this->getCFGDef('queryLimit', 0));
 
-            $rs = $this->dbQuery("SELECT {$fields} FROM {$tbl_site_content} {$where} {$group} {$sort} {$limit}");
+            $rs = $this->dbQuery("select {$fields} FROM {$tbl_site_content} {$where} {$group} {$sort} {$limit}");
 
             while ($item = $this->modx->db->getRow($rs)) {
                 $out[$item['id']] = $item;
@@ -284,9 +284,9 @@ 
         $tbl_site_content = $this->getTable('site_content', 'c');
         $sanitarInIDs = $this->sanitarIn($id);
         if ($this->getCFGDef('showNoPublish', 0)) {
-            $where = "WHERE {$where} c.parent IN ({$sanitarInIDs}";
+            $where = "where {$where} c.parent IN ({$sanitarInIDs}";
         } else {
-            $where = "WHERE {$where} c.parent IN ({$sanitarInIDs}) AND c.deleted=0 AND c.published=1";
+            $where = "where {$where} c.parent IN ({$sanitarInIDs}) AND c.deleted=0 AND c.published=1";
         }
 
         $rs = $this->dbQuery("SELECT id FROM {$tbl_site_content} {$where} AND c.id IN(SELECT DISTINCT s.parent FROM " . $this->getTable('catalog',
@@ -362,7 +362,7 @@ 
         $fields = $this->getCFGDef('selectFields', 'c.*');
         $group = $this->getGroupSQL($this->getCFGDef('groupBy', ''));
         if ($sanitarInIDs != "''" || $this->getCFGDef('ignoreEmpty', '0')) {
-            $rs = $this->dbQuery("SELECT {$fields} FROM " . $from . " " . $where . " " .
+            $rs = $this->dbQuery("select {$fields} FROM " . $from . " " . $where . " " .
                 $group . " " .
                 $sort . " " .
                 $this->LimitSQL($this->getCFGDef('queryLimit', 0))

Spacing +20 added lines, -20 removed lines

@@ -7,7 +7,7 @@ 
  * @license GNU General Public License (GPL), http://www.gnu.org/copyleft/gpl.html
  * @author Agel_Nash <Agel_Nash@xaker.ru>, kabachello <kabachnik@hotmail.com>
  */
-include_once(dirname(__FILE__) . "/site_content.php");
+include_once(dirname(__FILE__)."/site_content.php");
 
 /**
  * Class shopkeeperDocLister
@@ -117,7 +117,7 @@ 
 
                     if ($this->getCFGDef('contentPlaceholder', 0) !== 0) {
                         $this->toPlaceholders($tmp, 1,
-                            "item[" . $i . "]"); // [+item[x]+] – individual placeholder for each iteration documents on this page
+                            "item[".$i."]"); // [+item[x]+] – individual placeholder for each iteration documents on this page
                     }
                     $out .= $tmp;
                     if (next($this->_docs) !== false) {
@@ -145,7 +145,7 @@ 
         if ($sanitarInIDs != "''" || $this->getCFGDef('ignoreEmpty', '0')) {
             $where = $this->getCFGDef('addWhereList', '');
             $where = sqlHelper::trimLogicalOp($where);
-            $where = ($where ? $where . ' AND ' : '') . $this->_filters['where'];
+            $where = ($where ? $where.' AND ' : '').$this->_filters['where'];
             if ($where != '' && $this->_filters['where'] != '') {
                 $where .= " AND ";
             }
@@ -164,7 +164,7 @@ 
                     case 'parents':
                         switch ($this->getCFGDef('showParent', '0')) {
                             case '-1':
-                                $tmpWhere = "c.parent IN (" . $sanitarInIDs . ")";
+                                $tmpWhere = "c.parent IN (".$sanitarInIDs.")";
                                 break;
                             case 0:
                                 $tmpWhere = "c.parent IN ({$sanitarInIDs}) AND c.id NOT IN({$sanitarInIDs})";
@@ -176,7 +176,7 @@ 
                         }
                         if (($addDocs = $this->getCFGDef('documents', '')) != '') {
                             $addDocs = $this->sanitarIn($this->cleanIDs($addDocs));
-                            $whereArr[] = "((" . $tmpWhere . ") OR c.id IN({$addDocs}))";
+                            $whereArr[] = "((".$tmpWhere.") OR c.id IN({$addDocs}))";
                         } else {
                             $whereArr[] = $tmpWhere;
                         }
@@ -186,7 +186,7 @@ 
                         break;
                 }
             }
-            $from = $tbl_site_content . " " . $this->_filters['join'];
+            $from = $tbl_site_content." ".$this->_filters['join'];
             $where = sqlHelper::trimLogicalOp($where);
 
             if (trim($where) != 'WHERE') {
@@ -221,12 +221,12 @@ 
             $where = $this->getCFGDef('addWhereList', '');
             $where = sqlHelper::trimLogicalOp($where);
 
-            $where = ($where ? $where . ' AND ' : '') . $this->_filters['where'];
+            $where = ($where ? $where.' AND ' : '').$this->_filters['where'];
             $where = sqlHelper::trimLogicalOp($where);
 
             $tbl_site_content = $this->getTable('catalog', 'c');
             if ($sanitarInIDs != "''") {
-                $where .= ($where ? " AND " : "") . "c.id IN ({$sanitarInIDs}) AND";
+                $where .= ($where ? " AND " : "")."c.id IN ({$sanitarInIDs}) AND";
             }
             $where = sqlHelper::trimLogicalOp($where);
 
@@ -249,7 +249,7 @@ 
             $fields = $this->getCFGDef('selectFields', 'c.*');
             $group = $this->getGroupSQL($this->getCFGDef('groupBy', ''));
             $sort = $this->SortOrderSQL("c.createdon");
-            list($tbl_site_content, $sort) = $this->injectSortByTV($tbl_site_content . ' ' . $this->_filters['join'],
+            list($tbl_site_content, $sort) = $this->injectSortByTV($tbl_site_content.' '.$this->_filters['join'],
                 $sort);
 
             $limit = $this->LimitSQL($this->getCFGDef('queryLimit', 0));
@@ -285,8 +285,8 @@ 
             $where = "WHERE {$where} c.parent IN ({$sanitarInIDs}) AND c.deleted=0 AND c.published=1";
         }
 
-        $rs = $this->dbQuery("SELECT id FROM {$tbl_site_content} {$where} AND c.id IN(SELECT DISTINCT s.parent FROM " . $this->getTable('catalog',
-                's') . ")");
+        $rs = $this->dbQuery("SELECT id FROM {$tbl_site_content} {$where} AND c.id IN(SELECT DISTINCT s.parent FROM ".$this->getTable('catalog',
+                's').")");
 
         while ($item = $this->modx->db->getRow($rs)) {
             $out[] = $item['id'];
@@ -317,7 +317,7 @@ 
         $tbl_site_content = $this->getTable('catalog', 'c');
 
         $sort = $this->SortOrderSQL("c.createdon");
-        list($from, $sort) = $this->injectSortByTV($tbl_site_content . ' ' . $this->_filters['join'], $sort);
+        list($from, $sort) = $this->injectSortByTV($tbl_site_content.' '.$this->_filters['join'], $sort);
         $sanitarInIDs = $this->sanitarIn($this->IDs);
 
         $tmpWhere = null;
@@ -325,14 +325,14 @@ 
         if ($sanitarInIDs != "''") {
             switch ($this->getCFGDef('showParent', '0')) {
                 case '-1':
-                    $tmpWhere = "c.parent IN (" . $sanitarInIDs . ")";
+                    $tmpWhere = "c.parent IN (".$sanitarInIDs.")";
                     break;
                 case 0:
-                    $tmpWhere = "c.parent IN (" . $sanitarInIDs . ") AND c.id NOT IN(" . $sanitarInIDs . ")";
+                    $tmpWhere = "c.parent IN (".$sanitarInIDs.") AND c.id NOT IN(".$sanitarInIDs.")";
                     break;
                 case 1:
                 default:
-                    $tmpWhere = "(c.parent IN (" . $sanitarInIDs . ") OR c.id IN({$sanitarInIDs}))";
+                    $tmpWhere = "(c.parent IN (".$sanitarInIDs.") OR c.id IN({$sanitarInIDs}))";
                     break;
             }
         }
@@ -341,7 +341,7 @@ 
             if (empty($tmpWhere)) {
                 $tmpWhere = "c.id IN({$addDocs})";
             } else {
-                $tmpWhere = "((" . $tmpWhere . ") OR c.id IN({$addDocs}))";
+                $tmpWhere = "((".$tmpWhere.") OR c.id IN({$addDocs}))";
             }
         }
         if (!empty($tmpWhere)) {
@@ -351,16 +351,16 @@ 
             $where[] = "c.published=1";
         }
         if (!empty($where)) {
-            $where = "WHERE " . implode(" AND ", $where);
+            $where = "WHERE ".implode(" AND ", $where);
         } else {
             $where = '';
         }
         $fields = $this->getCFGDef('selectFields', 'c.*');
         $group = $this->getGroupSQL($this->getCFGDef('groupBy', ''));
         if ($sanitarInIDs != "''" || $this->getCFGDef('ignoreEmpty', '0')) {
-            $rs = $this->dbQuery("SELECT {$fields} FROM " . $from . " " . $where . " " .
-                $group . " " .
-                $sort . " " .
+            $rs = $this->dbQuery("SELECT {$fields} FROM ".$from." ".$where." ".
+                $group." ".
+                $sort." ".
                 $this->LimitSQL($this->getCFGDef('queryLimit', 0))
             );
 

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

Indentation +2 added lines, -2 removed lines

@@ -1700,8 +1700,8 @@
         $fltr_params = explode(':', $filter, 2);
         $fltr = APIHelpers::getkey($fltr_params, 0, null);
         /**
-        * @var tv_DL_filter|content_DL_filter $fltr_class
-        */
+         * @var tv_DL_filter|content_DL_filter $fltr_class
+         */
         $fltr_class = $fltr . '_DL_filter';
         // check if the filter is implemented
         if (!is_null($fltr)) {

Spacing +86 added lines, -86 removed lines

@@ -5,14 +5,14 @@ 
  * @license GNU General Public License (GPL), http://www.gnu.org/copyleft/gpl.html
  * @author Agel_Nash <Agel_Nash@xaker.ru>
  */
-include_once(MODX_BASE_PATH . 'assets/lib/APIHelpers.class.php');
-include_once(MODX_BASE_PATH . 'assets/lib/Helpers/FS.php');
-include_once(MODX_BASE_PATH . 'assets/lib/Helpers/Config.php');
-require_once(dirname(dirname(__FILE__)) . "/lib/jsonHelper.class.php");
-require_once(dirname(dirname(__FILE__)) . "/lib/sqlHelper.class.php");
-require_once(dirname(dirname(__FILE__)) . "/lib/DLTemplate.class.php");
-require_once(dirname(dirname(__FILE__)) . "/lib/DLCollection.class.php");
-require_once(dirname(dirname(__FILE__)) . "/lib/xnop.class.php");
+include_once(MODX_BASE_PATH.'assets/lib/APIHelpers.class.php');
+include_once(MODX_BASE_PATH.'assets/lib/Helpers/FS.php');
+include_once(MODX_BASE_PATH.'assets/lib/Helpers/Config.php');
+require_once(dirname(dirname(__FILE__))."/lib/jsonHelper.class.php");
+require_once(dirname(dirname(__FILE__))."/lib/sqlHelper.class.php");
+require_once(dirname(dirname(__FILE__))."/lib/DLTemplate.class.php");
+require_once(dirname(dirname(__FILE__))."/lib/DLCollection.class.php");
+require_once(dirname(dirname(__FILE__))."/lib/xnop.class.php");
 
 /**
  * Class DocLister
@@ -298,7 +298,7 @@ 
                 case ')':
                     $open--;
                     if ($open == 0) {
-                        $res[] = $cur . ')';
+                        $res[] = $cur.')';
                         $cur = '';
                     } else {
                         $cur .= $e;
@@ -362,7 +362,7 @@ 
      */
     public function setDebug($flag = 0)
     {
-        $flag = abs((int)$flag);
+        $flag = abs((int) $flag);
         if ($this->_debugMode != $flag) {
             $this->_debugMode = $flag;
             $this->debug = null;
@@ -372,8 +372,8 @@ 
                     ini_set('display_errors', 1);
                 }
                 $dir = dirname(dirname(__FILE__));
-                if (file_exists($dir . "/lib/DLdebug.class.php")) {
-                    include_once($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)) {
                         $this->debug = new DLdebug($this);
                     }
@@ -411,7 +411,7 @@ 
         }
         $table = $this->_table[$name];
         if (!empty($alias) && is_scalar($alias)) {
-            $table .= " as `" . $alias . "`";
+            $table .= " as `".$alias."`";
         }
 
         return $table;
@@ -452,7 +452,7 @@ 
      */
     public function jsonDecode($json, $config = array(), $nop = false)
     {
-        $this->debug->debug('Decode JSON: ' . $this->debug->dumpData($json) . "\r\nwith config: " . $this->debug->dumpData($config),
+        $this->debug->debug('Decode JSON: '.$this->debug->dumpData($json)."\r\nwith config: ".$this->debug->dumpData($config),
             'jsonDecode', 2);
         $config = jsonHelper::jsonDecode($json, $config, $nop);
         $this->isErrorJSON($json);
@@ -471,7 +471,7 @@ 
     {
         $error = jsonHelper::json_last_error_msg();
         if (!in_array($error, array('error_none', 'other'))) {
-            $this->debug->error($this->getMsg('json.' . $error) . ": " . $this->debug->dumpData($json, 'code'), 'JSON');
+            $this->debug->error($this->getMsg('json.'.$error).": ".$this->debug->dumpData($json, 'code'), 'JSON');
             $error = true;
         }
 
@@ -501,7 +501,7 @@ 
         }
 
         if (
-            (int)$this->getCFGDef('display', 0) > 0 && ( //OR paginate in extender's parameter
+            (int) $this->getCFGDef('display', 0) > 0 && ( //OR paginate in extender's parameter
                 in_array('paginate', $extenders) || $this->getCFGDef('paginate', '') != '' ||
                 $this->getCFGDef('TplPrevP', '') != '' || $this->getCFGDef('TplPage', '') != '' ||
                 $this->getCFGDef('TplCurrentPage', '') != '' || $this->getCFGDef('TplWrapPaginate', '') != '' ||
@@ -511,7 +511,7 @@ 
         ) {
             throw new Exception('Error load paginate extender');
         } else {
-            if ((int)$this->getCFGDef('display', 0) == 0) {
+            if ((int) $this->getCFGDef('display', 0) == 0) {
                 $extenders = $this->unsetArrayVal($extenders, 'paginate');
             }
         }
@@ -557,11 +557,11 @@ 
      */
     public function getUrl($id = 0)
     {
-        $id = ((int)$id > 0) ? (int)$id : $this->getCurrentMODXPageID();
+        $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']) {
-            $url = $this->modx->config['site_url'] . ($link != '' ? "?{$link}" : "");
+            $url = $this->modx->config['site_url'].($link != '' ? "?{$link}" : "");
         } else {
             $url = $this->modx->makeUrl($id, '', $link, $this->getCFGDef('urlScheme', ''));
         }
@@ -622,7 +622,7 @@ 
      */
     public function getCurrentMODXPageID()
     {
-        $id = isset($this->modx->documentIdentifier) ? (int)$this->modx->documentIdentifier : 0;
+        $id = isset($this->modx->documentIdentifier) ? (int) $this->modx->documentIdentifier : 0;
         $docData = isset($this->modx->documentObject) ? $this->modx->documentObject : array();
 
         return empty($id) ? \APIHelpers::getkey($docData, 'id', 0) : $id;
@@ -640,13 +640,13 @@ 
     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 = "CODE #".$code."<br />";
+            $out .= "on file: ".$file.":".$line."<br />";
             $out .= "<pre>";
             $out .= print_r($trace, 1);
             $out .= "</pre>";
 
-            $message = $out . $message;
+            $message = $out.$message;
         }
         die($message);
     }
@@ -675,7 +675,7 @@ 
             $ext = explode(",", $ext);
             foreach ($ext as $item) {
                 if ($item != '' && !$this->_loadExtender($item)) {
-                    throw new Exception('Error load ' . APIHelpers::e($item) . ' extender');
+                    throw new Exception('Error load '.APIHelpers::e($item).' extender');
                 }
             }
         }
@@ -717,7 +717,7 @@ 
         $out = DLTemplate::getInstance($this->getMODX())->toPlaceholders($data, $set, $key, $id);
 
         $this->debug->debugEnd(
-            "toPlaceholders", array($key . " placeholder" => $data), array('html')
+            "toPlaceholders", array($key." placeholder" => $data), array('html')
         );
 
         return $out;
@@ -735,8 +735,8 @@ 
      */
     public function sanitarIn($data, $sep = ',', $quote = true)
     {
-        if(is_scalar($data)) $data = explode($sep, $data);
-        if(!is_array($data)) $data = array(); //@TODO: throw
+        if (is_scalar($data)) $data = explode($sep, $data);
+        if (!is_array($data)) $data = array(); //@TODO: throw
 
         $out = array();
         foreach ($data as $item) {
@@ -745,7 +745,7 @@ 
             }
         }
         $q = $quote ? "'" : "";
-        $out = $q . implode($q . "," . $q, $out) . $q;
+        $out = $q.implode($q.",".$q, $out).$q;
 
         return $out;
     }
@@ -766,8 +766,8 @@ 
         if (empty($lang)) {
             $lang = $this->getCFGDef('lang', $this->modx->config['manager_language']);
         }
-        if (file_exists(dirname(dirname(__FILE__)) . "/lang/" . $lang . ".php")) {
-            $tmp = include(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();
         }
 
@@ -788,14 +788,14 @@ 
             $lang = $this->getCFGDef('lang', $this->modx->config['manager_language']);
         }
 
-        $this->debug->debug('Load language ' . $this->debug->dumpData($name) . "." . $this->debug->dumpData($lang),
+        $this->debug->debug('Load language '.$this->debug->dumpData($name).".".$this->debug->dumpData($lang),
             'loadlang', 2);
         if (is_scalar($name)) {
             $name = array($name);
         }
         foreach ($name as $n) {
-            if (file_exists(dirname(__FILE__) . "/lang/" . $lang . "/" . $n . ".inc.php")) {
-                $tmp = include(dirname(__FILE__) . "/lang/" . $lang . "/" . $n . ".inc.php");
+            if (file_exists(dirname(__FILE__)."/lang/".$lang."/".$n.".inc.php")) {
+                $tmp = include(dirname(__FILE__)."/lang/".$lang."/".$n.".inc.php");
                 if (is_array($tmp)) {
                     /**
                      * Переименовыываем элементы массива из array('test'=>'data') в array('name.test'=>'data')
@@ -878,7 +878,7 @@ 
             }
         }
 
-        $data[$this->getCFGDef("sysKey", "dl") . ".wrap"] = $this->renderWrap($out);
+        $data[$this->getCFGDef("sysKey", "dl").".wrap"] = $this->renderWrap($out);
         $out = $this->parseChunk($this->getCFGDef('tpl', ''), $data);
 
         return $out;
@@ -946,7 +946,7 @@ 
         $out = $this->DLTemplate->parseChunk($name, $data, $parseDocumentSource);
         $out = $this->parseLang($out);
         if (empty($out)) {
-            $this->debug->debug("Empty chunk: " . $this->debug->dumpData($name), '', 2);
+            $this->debug->debug("Empty chunk: ".$this->debug->dumpData($name), '', 2);
         }
         $this->debug->debugEnd("parseChunk");
 
@@ -982,7 +982,7 @@ 
         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);
+            $plh = array($this->getCFGDef("sysKey", "dl").".wrap" => $data);
             /**
              * @var $extPrepare prepare_DL_Extender
              */
@@ -1032,10 +1032,10 @@ 
 
         $iterationName = ($i % 2 == 1) ? 'Odd' : 'Even';
         $tmp = strtolower($iterationName);
-        $class[] = $this->getCFGDef($tmp . 'Class', $tmp);
+        $class[] = $this->getCFGDef($tmp.'Class', $tmp);
 
-        $this->renderTPL = $this->getCFGDef('tplId' . $i, $this->renderTPL);
-        $this->renderTPL = $this->getCFGDef('tpl' . $iterationName, $this->renderTPL);
+        $this->renderTPL = $this->getCFGDef('tplId'.$i, $this->renderTPL);
+        $this->renderTPL = $this->getCFGDef('tpl'.$iterationName, $this->renderTPL);
         $iteration = $i;
 
         if ($this->extPaginate) {
@@ -1052,7 +1052,7 @@ 
         }
 
         $data[$this->getCFGDef("sysKey",
-            "dl") . '.full_iteration'] = $iteration;
+            "dl").'.full_iteration'] = $iteration;
 
         if ($i == 1) {
             $this->renderTPL = $this->getCFGDef('tplFirst', $this->renderTPL);
@@ -1065,14 +1065,14 @@ 
         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
+                "dl").'.active'] = 1; //[+active+] - 1 if $modx->documentIdentifer equal ID this element
             $class[] = $this->getCFGDef('currentClass', 'current');
         } else {
-            $data[$this->getCFGDef("sysKey", "dl") . '.active'] = 0;
+            $data[$this->getCFGDef("sysKey", "dl").'.active'] = 0;
         }
 
         $class = implode(" ", $class);
-        $data[$this->getCFGDef("sysKey", "dl") . '.class'] = $class;
+        $data[$this->getCFGDef("sysKey", "dl").'.class'] = $class;
 
         /**
          * @var $extE e_DL_Extender
@@ -1182,7 +1182,7 @@ 
      */
     public function checkExtender($name)
     {
-        return (isset($this->extender[$name]) && $this->extender[$name] instanceof $name . "_DL_Extender");
+        return (isset($this->extender[$name]) && $this->extender[$name] instanceof $name."_DL_Extender");
     }
 
     /**
@@ -1223,17 +1223,17 @@ 
      */
     protected function _loadExtender($name)
     {
-        $this->debug->debug('Load Extender ' . $this->debug->dumpData($name), 'LoadExtender', 2);
+        $this->debug->debug('Load Extender '.$this->debug->dumpData($name), 'LoadExtender', 2);
         $flag = false;
 
-        $classname = ($name != '') ? $name . "_DL_Extender" : "";
+        $classname = ($name != '') ? $name."_DL_Extender" : "";
         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")) {
-                    include_once(dirname(__FILE__) . "/extender/" . $name . ".extender.inc");
+                if (file_exists(dirname(__FILE__)."/extender/".$name.".extender.inc")) {
+                    include_once(dirname(__FILE__)."/extender/".$name.".extender.inc");
                 }
             }
             if (class_exists($classname, false) && $classname != '') {
@@ -1242,7 +1242,7 @@ 
             }
         }
         if (!$flag) {
-            $this->debug->debug("Error load Extender " . $this->debug->dumpData($name));
+            $this->debug->debug("Error load Extender ".$this->debug->dumpData($name));
         }
         $this->debug->debugEnd('LoadExtender');
 
@@ -1261,7 +1261,7 @@ 
      */
     public function setIDs($IDs)
     {
-        $this->debug->debug('set ID list ' . $this->debug->dumpData($IDs), 'setIDs', 2);
+        $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', '');
@@ -1296,7 +1296,7 @@ 
      */
     public function cleanIDs($IDs, $sep = ',')
     {
-        $this->debug->debug('clean IDs ' . $this->debug->dumpData($IDs) . ' with separator ' . $this->debug->dumpData($sep),
+        $this->debug->debug('clean IDs '.$this->debug->dumpData($IDs).' with separator '.$this->debug->dumpData($sep),
             'cleanIDs', 2);
         $out = array();
         if (!is_array($IDs)) {
@@ -1304,8 +1304,8 @@ 
         }
         foreach ($IDs as $item) {
             $item = trim($item);
-            if (is_numeric($item) && (int)$item >= 0) { //Fix 0xfffffffff
-                $out[] = (int)$item;
+            if (is_numeric($item) && (int) $item >= 0) { //Fix 0xfffffffff
+                $out[] = (int) $item;
             }
         }
         $out = array_unique($out);
@@ -1379,7 +1379,7 @@ 
     {
         $out = '';
         if ($group != '') {
-            $out = 'GROUP BY ' . $group;
+            $out = 'GROUP BY '.$group;
         }
 
         return $out;
@@ -1409,7 +1409,7 @@ 
                 $idList = $this->sanitarIn($this->IDs, ',', false);
                 $out = array('orderBy' => "FIND_IN_SET({$this->getCFGDef('sortBy', $this->getPK())}, '{$idList}')");
                 $this->config->setConfig($out); //reload config;
-                $sort = "ORDER BY " . $out['orderBy'];
+                $sort = "ORDER BY ".$out['orderBy'];
                 break;
             default:
                 $out = array('orderBy' => '', 'order' => '', 'sortBy' => '');
@@ -1429,13 +1429,13 @@ 
                     }
 
                     $out['sortBy'] = (($tmp = $this->getCFGDef('sortBy', '')) != '') ? $tmp : $sortName;
-                    $out['orderBy'] = $out['sortBy'] . " " . $out['order'];
+                    $out['orderBy'] = $out['sortBy']." ".$out['order'];
                 }
                 $this->config->setConfig($out); //reload config;
-                $sort = "ORDER BY " . $out['orderBy'];
+                $sort = "ORDER BY ".$out['orderBy'];
                 break;
         }
-        $this->debug->debugEnd("sortORDER", 'Get sort order for SQL: ' . $this->debug->dumpData($sort));
+        $this->debug->debugEnd("sortORDER", 'Get sort order for SQL: '.$this->debug->dumpData($sort));
 
         return $sort;
     }
@@ -1466,17 +1466,17 @@ 
         }
 
         if ($limit != 0) {
-            $ret = "LIMIT " . (int)$offset . "," . (int)$limit;
+            $ret = "LIMIT ".(int) $offset.",".(int) $limit;
         } 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
                  */
-                $ret = "LIMIT " . (int)$offset . ",18446744073709551615";
+                $ret = "LIMIT ".(int) $offset.",18446744073709551615";
             }
         }
-        $this->debug->debugEnd("limitSQL", "Get limit for SQL: " . $this->debug->dumpData($ret));
+        $this->debug->debugEnd("limitSQL", "Get limit for SQL: ".$this->debug->dumpData($ret));
 
         return $ret;
     }
@@ -1519,20 +1519,20 @@ 
         $children = array(); // children of each ID
         $ids = array();
         foreach ($data as $i => $r) {
-            $row =& $data[$i];
+            $row = & $data[$i];
             $id = $row[$idName];
             $pid = $row[$pidName];
-            $children[$pid][$id] =& $row;
+            $children[$pid][$id] = & $row;
             if (!isset($children[$id])) {
                 $children[$id] = array();
             }
-            $row['#childNodes'] =& $children[$id];
+            $row['#childNodes'] = & $children[$id];
             $ids[$row[$idName]] = true;
         }
         // Root elements are elements with non-found PIDs.
         $this->_tree = array();
         foreach ($data as $i => $r) {
-            $row =& $data[$i];
+            $row = & $data[$i];
             if (!isset($ids[$row[$pidName]])) {
                 $this->_tree[$row[$idName]] = $row;
             }
@@ -1549,11 +1549,11 @@ 
      */
     public function getPK($full = true)
     {
-        $idField = isset($this->idField) ? $this->idField: 'id';
+        $idField = isset($this->idField) ? $this->idField : 'id';
         if ($full) {
-            $idField = '`' . $idField . '`';
+            $idField = '`'.$idField.'`';
             if (!empty($this->alias)) {
-                $idField = '`' . $this->alias . '`.' . $idField;
+                $idField = '`'.$this->alias.'`.'.$idField;
             }
         }
 
@@ -1570,9 +1570,9 @@ 
     {
         $parentField = isset($this->parentField) ? $this->parentField : '';
         if ($full && !empty($parentField)) {
-            $parentField = '`' . $parentField . '`';
+            $parentField = '`'.$parentField.'`';
             if (!empty($this->alias)) {
-                $parentField = '`' . $this->alias . '`.' . $parentField;
+                $parentField = '`'.$this->alias.'`.'.$parentField;
             }
         }
 
@@ -1588,7 +1588,7 @@ 
      */
     protected function getFilters($filter_string)
     {
-        $this->debug->debug("getFilters: " . $this->debug->dumpData($filter_string), 'getFilter', 1);
+        $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) {
@@ -1615,14 +1615,14 @@ 
                     }
                 }
                 $output['join'] = !empty($joins) ? implode(' ', $joins) : '';
-                $output['where'] = !empty($wheres) ? '(' . implode($sql, $wheres) . ')' : '';
+                $output['where'] = !empty($wheres) ? '('.implode($sql, $wheres).')' : '';
             }
         }
 
         if (!$logic_op_found) {
             $filter = $this->loadFilter($filter_string);
             if (!$filter) {
-                $this->debug->warning('Error while loading DocLister filter "' . $this->debug->dumpData($filter_string) . '": check syntax!');
+                $this->debug->warning('Error while loading DocLister filter "'.$this->debug->dumpData($filter_string).'": check syntax!');
                 $output = false;
             } else {
                 $output['join'] = $filter->get_join();
@@ -1654,10 +1654,10 @@ 
      * @param string $join
      * @return $this
      */
-    public function setFiltersJoin($join = '') {
+    public function setFiltersJoin($join = ''){
         if (!empty($join)) {
             if (!empty($this->_filters['join'])) {
-                $this->_filters['join'] .= ' ' . $join;
+                $this->_filters['join'] .= ' '.$join;
             } else {
                 $this->_filters['join'] = $join;
             }
@@ -1678,19 +1678,19 @@ 
         $type = trim($type);
         switch (strtoupper($type)) {
             case 'DECIMAL':
-                $field = 'CAST(' . $field . ' as DECIMAL(10,2))';
+                $field = 'CAST('.$field.' as DECIMAL(10,2))';
                 break;
             case 'UNSIGNED':
-                $field = 'CAST(' . $field . ' as UNSIGNED)';
+                $field = 'CAST('.$field.' as UNSIGNED)';
                 break;
             case 'BINARY':
-                $field = 'CAST(' . $field . ' as BINARY)';
+                $field = 'CAST('.$field.' as BINARY)';
                 break;
             case 'DATETIME':
-                $field = 'CAST(' . $field . ' as DATETIME)';
+                $field = 'CAST('.$field.' as DATETIME)';
                 break;
             case 'SIGNED':
-                $field = 'CAST(' . $field . ' as SIGNED)';
+                $field = 'CAST('.$field.' as SIGNED)';
                 break;
         }
 
@@ -1704,18 +1704,18 @@ 
      */
     protected function loadFilter($filter)
     {
-        $this->debug->debug('Load filter ' . $this->debug->dumpData($filter), 'loadFilter', 2);
+        $this->debug->debug('Load filter '.$this->debug->dumpData($filter), 'loadFilter', 2);
         $out = false;
         $fltr_params = explode(':', $filter, 2);
         $fltr = APIHelpers::getkey($fltr_params, 0, null);
         /**
         * @var tv_DL_filter|content_DL_filter $fltr_class
         */
-        $fltr_class = $fltr . '_DL_filter';
+        $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')) {
-                require_once dirname(__FILE__) . '/filter/' . $fltr . '.filter.php';
+            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)) {
                 $this->totalFilters++;
@@ -1742,7 +1742,7 @@ 
      */
     public function getCountFilters()
     {
-        return (int)$this->totalFilters;
+        return (int) $this->totalFilters;
     }
 
     /**
@@ -1780,7 +1780,7 @@ 
     public function getRequest()
     {
         $URL = null;
-        parse_str(parse_url(MODX_SITE_URL . $_SERVER['REQUEST_URI'], PHP_URL_QUERY), $URL);
+        parse_str(parse_url(MODX_SITE_URL.$_SERVER['REQUEST_URI'], PHP_URL_QUERY), $URL);
 
         return http_build_query(array_merge($URL, array(DocLister::AliasRequest => null)));
     }

Braces +13 added lines, -5 removed lines

@@ -735,8 +735,13 @@ 
      */
     public function sanitarIn($data, $sep = ',', $quote = true)
     {
-        if(is_scalar($data)) $data = explode($sep, $data);
-        if(!is_array($data)) $data = array(); //@TODO: throw
+        if(is_scalar($data)) {
+            $data = explode($sep, $data);
+        }
+        if(!is_array($data)) {
+            $data = array();
+        }
+        //@TODO: throw
 
         $out = array();
         foreach ($data as $item) {
@@ -1101,7 +1106,8 @@ 
         $fields = is_array($fields) ? $fields : explode(",", $fields);
         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;
@@ -1304,7 +1310,8 @@ 
         }
         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;
             }
         }
@@ -1654,7 +1661,8 @@ 
      * @param string $join
      * @return $this
      */
-    public function setFiltersJoin($join = '') {
+    public function setFiltersJoin($join = '')
+    {
         if (!empty($join)) {
             if (!empty($this->_filters['join'])) {
                 $this->_filters['join'] .= ' ' . $join;

assets/snippets/DocLister/core/controller/onetable.php

Indentation +6 added lines, -6 removed lines

@@ -215,10 +215,10 @@ 
             $from = $this->table . " " . $this->_filters['join'];
             $where = $this->getCFGDef('addWhereList', '');
             
-           	//====== block added by Dreamer to enable filters ======
+                //====== block added by Dreamer to enable filters ======
             $where = ($where ? $where . ' AND ' : '') . $this->_filters['where'];
             $where = sqlHelper::trimLogicalOp($where);
-        	//------- end of block -------
+            //------- end of block -------
 
             
             if ($where != '') {
@@ -257,10 +257,10 @@ 
         $tmpWhere = $this->getCFGDef('addWhereList', '');
         $tmpWhere = sqlHelper::trimLogicalOp($tmpWhere);
         
-    	//====== block added by Dreamer to enable filters ======
+        //====== block added by Dreamer to enable filters ======
         $tmpWhere = ($tmpWhere ? $tmpWhere . ' AND ' : '') . $this->_filters['where'];
         $tmpWhere = sqlHelper::trimLogicalOp($tmpWhere);
-	    //------- end of block -------
+        //------- end of block -------
         
         
         if (!empty($tmpWhere)) {
@@ -329,10 +329,10 @@ 
             $from = $this->table . " " . $this->_filters['join'];
             $where = $this->getCFGDef('addWhereList', '');
             
-        	//====== block added by Dreamer ======
+            //====== block added by Dreamer ======
             $where = ($where ? $where . ' AND ' : '') . $this->_filters['where'];
             $where = sqlHelper::trimLogicalOp($where);
-	        //------- end of block -------
+            //------- end of block -------
             
             if ($where != '') {
                 $where = array($where);

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -235,7 +235,7 @@ 
             $fields = $this->getCFGDef('selectFields', '*');
             $group = $this->getGroupSQL($this->getCFGDef('groupBy', ''));
             $sort = $this->SortOrderSQL($this->getPK());
-            $rs = $this->dbQuery("SELECT {$fields} FROM {$from} {$where} {$group} {$sort} {$limit}");
+            $rs = $this->dbQuery("select {$fields} FROM {$from} {$where} {$group} {$sort} {$limit}");
 
             $pk = $this->getPK(false);
             while ($item = $this->modx->db->getRow($rs)) {
@@ -305,7 +305,7 @@ 
         $sort = $this->SortOrderSQL($this->getPK());
         $limit = $this->LimitSQL($this->getCFGDef('queryLimit', 0));
         if ($sanitarInIDs != "''" || $this->getCFGDef('ignoreEmpty', '0')) {
-            $rs = $this->dbQuery("SELECT {$fields} FROM {$from} {$where} {$group} {$sort} {$limit}");
+            $rs = $this->dbQuery("select {$fields} FROM {$from} {$where} {$group} {$sort} {$limit}");
 
             $pk = $this->getPK(false);
 
@@ -399,7 +399,7 @@ 
             $where .= " AND " . $tmp;
         }
 
-        $rs = $this->dbQuery("SELECT {$this->getPK()} FROM {$this->table} WHERE {$where}");
+        $rs = $this->dbQuery("select {$this->getPK()} FROM {$this->table} WHERE {$where}");
         $pk = $this->getPK(false);
         while ($item = $this->modx->db->getRow($rs)) {
             $out[] = $item[$pk];

Spacing +20 added lines, -20 removed lines

@@ -83,17 +83,17 @@ 
                         $item = $extUser->setUserData($item); //[+user.id.createdby+], [+user.fullname.publishedby+], [+dl.user.publishedby+]....
                     }
 
-                    $item[$this->getCFGDef("sysKey", "dl") . '.summary'] = $extSummary ? $this->getSummary($item,
+                    $item[$this->getCFGDef("sysKey", "dl").'.summary'] = $extSummary ? $this->getSummary($item,
                         $extSummary) : '';
 
                     $item = array_merge($item,
                         $sysPlh); //inside the chunks available all placeholders set via $modx->toPlaceholders with prefix id, and with prefix sysKey
                     $item[$this->getCFGDef("sysKey",
-                        "dl") . '.iteration'] = $i; //[+iteration+] - Number element. Starting from zero
+                        "dl").'.iteration'] = $i; //[+iteration+] - Number element. Starting from zero
 
                     $date = $this->getCFGDef('dateSource', 'pub_date');
                     if (isset($item[$date])) {
-                        $_date = is_numeric($item[$date]) && $item[$date] == (int)$item[$date] ? $item[$date] : strtotime($item[$date]);
+                        $_date = is_numeric($item[$date]) && $item[$date] == (int) $item[$date] ? $item[$date] : strtotime($item[$date]);
                         if ($_date !== false) {
                             $_date = $_date + $this->modx->config['server_offset_time'];
                             $dateFormat = $this->getCFGDef('dateFormat', '%d.%b.%y %H:%M');
@@ -123,7 +123,7 @@ 
                     $tmp = $this->parseChunk($this->renderTPL, $item);
                     if ($this->getCFGDef('contentPlaceholder', 0) !== 0) {
                         $this->toPlaceholders($tmp, 1,
-                            "item[" . $i . "]"); // [+item[x]+] – individual placeholder for each iteration documents on this page
+                            "item[".$i."]"); // [+item[x]+] – individual placeholder for each iteration documents on this page
                     }
                     $out .= $tmp;
                     if (next($this->_docs) !== false) {
@@ -172,7 +172,7 @@ 
                 //without break
                 case ((array('1') == $fields || in_array('date', $fields)) && $date != 'date'):
                     if (isset($row[$date])) {
-                        $_date = is_numeric($row[$date]) && $row[$date] == (int)$row[$date] ? $row[$date] : strtotime($row[$date]);
+                        $_date = is_numeric($row[$date]) && $row[$date] == (int) $row[$date] ? $row[$date] : strtotime($row[$date]);
                         if ($_date !== false) {
                             $_date = $_date + $this->modx->config['server_offset_time'];
                             $dateFormat = $this->getCFGDef('dateFormat', '%d.%b.%y %H:%M');
@@ -210,11 +210,11 @@ 
         $out = array();
         $sanitarInIDs = $this->sanitarIn($this->IDs);
         if ($sanitarInIDs != "''" || $this->getCFGDef('ignoreEmpty', '0')) {
-            $from = $this->table . " " . $this->_filters['join'];
+            $from = $this->table." ".$this->_filters['join'];
             $where = $this->getCFGDef('addWhereList', '');
 
            	//====== block added by Dreamer to enable filters ======
-            $where = ($where ? $where . ' AND ' : '') . $this->_filters['where'];
+            $where = ($where ? $where.' AND ' : '').$this->_filters['where'];
             $where = sqlHelper::trimLogicalOp($where);
         	//------- end of block -------
 
@@ -229,7 +229,7 @@ 
             }
 
             if (!empty($where)) {
-                $where = "WHERE " . implode(" AND ", $where);
+                $where = "WHERE ".implode(" AND ", $where);
             } else {
                 $where = '';
             }
@@ -256,12 +256,12 @@ 
     {
         $where = array();
         $out = array();
-        $from = $this->table . " " . $this->_filters['join'];
+        $from = $this->table." ".$this->_filters['join'];
         $tmpWhere = $this->getCFGDef('addWhereList', '');
         $tmpWhere = sqlHelper::trimLogicalOp($tmpWhere);
 
     	//====== block added by Dreamer to enable filters ======
-        $tmpWhere = ($tmpWhere ? $tmpWhere . ' AND ' : '') . $this->_filters['where'];
+        $tmpWhere = ($tmpWhere ? $tmpWhere.' AND ' : '').$this->_filters['where'];
         $tmpWhere = sqlHelper::trimLogicalOp($tmpWhere);
 	    //------- end of block -------
 
@@ -273,13 +273,13 @@ 
 
         $tmpWhere = null;
         if ($sanitarInIDs != "''") {
-            $tmpWhere = "({$this->getParentField()} IN (" . $sanitarInIDs . ")";
+            $tmpWhere = "({$this->getParentField()} IN (".$sanitarInIDs.")";
             switch ($this->getCFGDef('showParent', '0')) {
                 case -1:
                     $tmpWhere .= ")";
                     break;
                 case 0:
-                    $tmpWhere .= " AND {$this->getPK()} NOT IN(" . $sanitarInIDs . "))";
+                    $tmpWhere .= " AND {$this->getPK()} NOT IN(".$sanitarInIDs."))";
                     break;
                 case 1:
                 default:
@@ -290,16 +290,16 @@ 
         if (($addDocs = $this->getCFGDef('documents', '')) != '') {
             $addDocs = $this->sanitarIn($this->cleanIDs($addDocs));
             if (empty($tmpWhere)) {
-                $tmpWhere = $this->getPK() . " IN({$addDocs})";
+                $tmpWhere = $this->getPK()." IN({$addDocs})";
             } else {
-                $tmpWhere = "((" . $tmpWhere . ") OR {$this->getPK()} IN({$addDocs}))";
+                $tmpWhere = "((".$tmpWhere.") OR {$this->getPK()} IN({$addDocs}))";
             }
         }
         if (!empty($tmpWhere)) {
             $where[] = $tmpWhere;
         }
         if (!empty($where)) {
-            $where = "WHERE " . implode(" AND ", $where);
+            $where = "WHERE ".implode(" AND ", $where);
         } else {
             $where = '';
         }
@@ -329,11 +329,11 @@ 
         $out = 0;
         $sanitarInIDs = $this->sanitarIn($this->IDs);
         if ($sanitarInIDs != "''" || $this->getCFGDef('ignoreEmpty', '0')) {
-            $from = $this->table . " " . $this->_filters['join'];
+            $from = $this->table." ".$this->_filters['join'];
             $where = $this->getCFGDef('addWhereList', '');
 
         	//====== block added by Dreamer ======
-            $where = ($where ? $where . ' AND ' : '') . $this->_filters['where'];
+            $where = ($where ? $where.' AND ' : '').$this->_filters['where'];
             $where = sqlHelper::trimLogicalOp($where);
 	        //------- end of block -------
 
@@ -360,7 +360,7 @@ 
                             }
                             if (($addDocs = $this->getCFGDef('documents', '')) != '') {
                                 $addDocs = $this->sanitarIn($this->cleanIDs($addDocs));
-                                $where[] = "((" . $tmpWhere . ") OR {$this->getPK()} IN({$addDocs}))";
+                                $where[] = "((".$tmpWhere.") OR {$this->getPK()} IN({$addDocs}))";
                             } else {
                                 $where[] = $tmpWhere;
                             }
@@ -372,7 +372,7 @@ 
                 }
             }
             if (!empty($where)) {
-                $where = "WHERE " . implode(" AND ", $where);
+                $where = "WHERE ".implode(" AND ", $where);
             } else {
                 $where = '';
             }
@@ -399,7 +399,7 @@ 
         $tmp = $this->getCFGDef('addWhereFolder', '');
         $where = "{$this->getParentField()} IN ({$sanitarInIDs})";
         if (!empty($tmp)) {
-            $where .= " AND " . $tmp;
+            $where .= " AND ".$tmp;
         }
 
         $rs = $this->dbQuery("SELECT {$this->getPK()} FROM {$this->table} WHERE {$where}");