AgelxNash / DocLister

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

Spacing +14 added lines, -14 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('MODX_BASE_PATH')) {
+if ( ! defined('MODX_BASE_PATH')) {
     die('HACK???');
 }
 
@@ -67,7 +67,7 @@ 
         $this->_docs = ($type == 'parents') ? $this->getChildrenList() : $this->getDocList();
         if ($tvlist != '' && count($this->_docs) > 0) {
             $tv = $this->extTV->getTVList(array_keys($this->_docs), $tvlist);
-            if (!is_array($tv)) {
+            if ( ! is_array($tv)) {
                 $tv = array();
             }
             foreach ($tv as $docID => $TVitem) {
@@ -143,7 +143,7 @@ 
                     }
                     $date = $this->getCFGDef('dateSource', 'pub_date');
                     if (isset($item[$date])) {
-                        if (!$item[$date] && $date == 'pub_date' && isset($item['createdon'])) {
+                        if ( ! $item[$date] && $date == 'pub_date' && isset($item['createdon'])) {
                             $date = 'createdon';
                         }
                         $_date = is_numeric($item[$date]) && $item[$date] == (int)$item[$date] ? $item[$date] : strtotime($item[$date]);
@@ -225,7 +225,7 @@ 
 
             if (array('1') == $fields || in_array('date', $fields)) {
                 if (isset($row[$date])) {
-                    if (!$row[$date] && $date == 'pub_date' && isset($row['createdon'])) {
+                    if ( ! $row[$date] && $date == 'pub_date' && isset($row['createdon'])) {
                         $date = 'createdon';
                     }   
                     $_date = is_numeric($row[$date]) && $row[$date] == (int)$row[$date] ? $row[$date] : strtotime($row[$date]);
@@ -244,7 +244,7 @@ 
                     $row['title'] = empty($row['menutitle']) ? $row['pagetitle'] : $row['menutitle'];
                 }
             }
-            if ((bool)$this->getCFGDef('makeUrl', 1) && (array('1') == $fields || in_array('url',$fields))
+            if ((bool)$this->getCFGDef('makeUrl', 1) && (array('1') == $fields || in_array('url', $fields))
             ) {
                 if (isset($row['type']) && $row['type'] == 'reference' && isset($row['content'])) {
                     $row['url'] = is_numeric($row['content']) ? $this->modx->makeUrl($row['content'], '', '',
@@ -291,10 +291,10 @@ 
 
             $where = "WHERE {$where}";
             $whereArr = array();
-            if (!$this->getCFGDef('showNoPublish', 0)) {
+            if ( ! $this->getCFGDef('showNoPublish', 0)) {
                 $whereArr[] = "c.deleted=0 AND c.published=1";
             }
-            else{
+            else {
                 $q_true = 1;
             }
 
@@ -346,7 +346,7 @@ 
             $group = $this->getGroupSQL($this->getCFGDef('groupBy', 'c.id'));
 
             $q_true = $q_true ? $q_true : $group != '';
-            if ( $q_true ){
+            if ($q_true) {
                 $maxDocs = $this->getCFGDef('maxDocs', 0);
                 $limit = $maxDocs > 0 ? $this->LimitSQL($this->getCFGDef('maxDocs', 0)) : '';
                 $rs = $this->dbQuery("SELECT count(*) FROM (SELECT count(*) FROM {$from} {$where} {$group} {$limit}) as `tmp`");
@@ -452,7 +452,7 @@ 
     protected function injectSortByTV($table, $sort)
     {
         $out = $this->getExtender('tv', true, true)->injectSortByTV($table, $sort);
-        if (!is_array($out) || empty($out)) {
+        if ( ! is_array($out) || empty($out)) {
             $out = array($table, $sort);
         }
 
@@ -469,12 +469,12 @@ 
 
         $tmpWhere = $this->getCFGDef('addWhereList', '');
         $tmpWhere = sqlHelper::trimLogicalOp($tmpWhere);
-        if (!empty($tmpWhere)) {
+        if ( ! empty($tmpWhere)) {
             $where[] = $tmpWhere;
         }
 
         $tmpWhere = sqlHelper::trimLogicalOp($this->_filters['where']);
-        if (!empty($tmpWhere)) {
+        if ( ! empty($tmpWhere)) {
             $where[] = $tmpWhere;
         }
 
@@ -507,13 +507,13 @@ 
                 $tmpWhere = "((" . $tmpWhere . ") OR c.id IN({$addDocs}))";
             }
         }
-        if (!empty($tmpWhere)) {
+        if ( ! empty($tmpWhere)) {
             $where[] = $tmpWhere;
         }
-        if (!$this->getCFGDef('showNoPublish', 0)) {
+        if ( ! $this->getCFGDef('showNoPublish', 0)) {
             $where[] = "c.deleted=0 AND c.published=1";
         }
-        if (!empty($where)) {
+        if ( ! empty($where)) {
             $where = "WHERE " . implode(" AND ", $where);
         } else {
             $where = '';

Braces +108 added lines, -110 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('MODX_BASE_PATH')) {
+if (!defined('MODX_BASE_PATH')) {

     die('HACK???');
 }
 
@@ -11,8 +11,8 @@ 
  * @license GNU General Public License (GPL), http://www.gnu.org/copyleft/gpl.html
  * @author Agel_Nash <Agel_Nash@xaker.ru>, kabachello <kabachnik@hotmail.com>
  */
-class site_contentDocLister extends DocLister
-{
+class site_contentDocLister extends DocLister

+{

     /**
      * Экземпляр экстендера TV
      *
@@ -32,8 +32,8 @@ 
      * @param array $cfg
      * @param null $startTime
      */
-    public function __construct($modx, $cfg = array(), $startTime = null)
-    {
+    public function __construct($modx, $cfg = array(), $startTime = null)

+    {

         parent::__construct($modx, $cfg, $startTime);
         $this->extTV = $this->getExtender('tv', true, true);
     }
@@ -41,9 +41,9 @@ 
     /**
      * @absctract
      */
-    public function getDocs($tvlist = '')
-    {
-        if ($tvlist == '') {
+    public function getDocs($tvlist = '')

+    {

+        if ($tvlist == '') {

             $tvlist = $this->getCFGDef('tvList', '');
         }
         
@@ -54,31 +54,31 @@ 
          */
         $extJotCount = $this->getCFGdef('jotcount', 0) ? $this->getExtender('jotcount', true) : null;
 
-        if ($extJotCount) {
+        if ($extJotCount) {

             $extJotCount->init($this);
         }
 
-        if ($this->extPaginate = $this->getExtender('paginate')) {
+        if ($this->extPaginate = $this->getExtender('paginate')) {

             $this->extPaginate->init($this);
-        } else {
+        } else {

             $this->config->setConfig(array('start' => 0));
         }
         $type = $this->getCFGDef('idType', 'parents');
         $this->_docs = ($type == 'parents') ? $this->getChildrenList() : $this->getDocList();
-        if ($tvlist != '' && count($this->_docs) > 0) {
+        if ($tvlist != '' && count($this->_docs) > 0) {

             $tv = $this->extTV->getTVList(array_keys($this->_docs), $tvlist);
-            if (!is_array($tv)) {
+            if (!is_array($tv)) {

                 $tv = array();
             }
-            foreach ($tv as $docID => $TVitem) {
-                if (isset($this->_docs[$docID]) && is_array($this->_docs[$docID])) {
+            foreach ($tv as $docID => $TVitem) {

+                if (isset($this->_docs[$docID]) && is_array($this->_docs[$docID])) {

                     $this->_docs[$docID] = array_merge($this->_docs[$docID], $TVitem);
-                } else {
+                } else {

                     unset($this->_docs[$docID]);
                 }
             }
         }
-        if (1 == $this->getCFGDef('tree', '0')) {
+        if (1 == $this->getCFGDef('tree', '0')) {

             $this->treeBuild('id', 'parent');
         }
 
@@ -89,22 +89,22 @@ 
      * @param string $tpl
      * @return string
      */
-    public function _render($tpl = '')
-    {
+    public function _render($tpl = '')

+    {

         $out = '';
-        if ($tpl == '') {
+        if ($tpl == '') {

             $tpl = $this->getCFGDef('tpl', '@CODE:<a href="[+url+]">[+pagetitle+]</a><br />');
         }
-        if ($tpl != '') {
+        if ($tpl != '') {

             $this->toPlaceholders(count($this->_docs), 1, "display"); // [+display+] - сколько показано на странице.
 
             $i = 1;
             $sysPlh = $this->renameKeyArr($this->_plh, $this->getCFGDef("sysKey", "dl"));
-            if (count($this->_docs) > 0) {
+            if (count($this->_docs) > 0) {

                 /**
                  * @var $extUser user_DL_Extender
                  */
-                if ($extUser = $this->getExtender('user')) {
+                if ($extUser = $this->getExtender('user')) {

                     $extUser->init($this, array('fields' => $this->getCFGDef("userFields", "")));
                 }
 
@@ -119,9 +119,9 @@ 
                 $extPrepare = $this->getExtender('prepare');
 
                 $this->skippedDocs = 0;
-                foreach ($this->_docs as $item) {
+                foreach ($this->_docs as $item) {

                     $this->renderTPL = $tpl;
-                    if ($extUser) {
+                    if ($extUser) {

                         $item = $extUser->setUserData($item); //[+user.id.createdby+], [+user.fullname.publishedby+], [+dl.user.publishedby+]....
                     }
 
@@ -133,24 +133,24 @@ 
 
                     $item['title'] = ($item['menutitle'] == '' ? $item['pagetitle'] : $item['menutitle']);
 
-                    if ($this->getCFGDef('makeUrl', 1)) {
-                        if ($item['type'] == 'reference') {
+                    if ($this->getCFGDef('makeUrl', 1)) {

+                        if ($item['type'] == 'reference') {

                             $item['url'] = is_numeric($item['content']) ? $this->modx->makeUrl($item['content'], '', '',
                                 $this->getCFGDef('urlScheme', '')) : $item['content'];
-                        } else {
+                        } else {

                             $item['url'] = $this->modx->makeUrl($item['id'], '', '', $this->getCFGDef('urlScheme', ''));
                         }
                     }
                     $date = $this->getCFGDef('dateSource', 'pub_date');
-                    if (isset($item[$date])) {
-                        if (!$item[$date] && $date == 'pub_date' && isset($item['createdon'])) {
+                    if (isset($item[$date])) {

+                        if (!$item[$date] && $date == 'pub_date' && isset($item['createdon'])) {

                             $date = 'createdon';
                         }
                         $_date = is_numeric($item[$date]) && $item[$date] == (int)$item[$date] ? $item[$date] : strtotime($item[$date]);
-                        if ($_date !== false) {
+                        if ($_date !== false) {

                             $_date = $_date + $this->modx->config['server_offset_time'];
                             $dateFormat = $this->getCFGDef('dateFormat', '%d.%b.%y %H:%M');
-                            if ($dateFormat) {
+                            if ($dateFormat) {

                                 $item['date'] = strftime($dateFormat, $_date);
                             }
                         }
@@ -159,30 +159,30 @@ 
                     $findTpl = $this->renderTPL;
                     $tmp = $this->uniformPrepare($item, $i);
                     extract($tmp, EXTR_SKIP);
-                    if ($this->renderTPL == '') {
+                    if ($this->renderTPL == '') {

                         $this->renderTPL = $findTpl;
                     }
 
-                    if ($extPrepare) {
+                    if ($extPrepare) {

                         $item = $extPrepare->init($this, array(
                             'data'      => $item,
                             'nameParam' => 'prepare'
                         ));
-                        if (is_bool($item) && $item === false) {
+                        if (is_bool($item) && $item === false) {

                             $this->skippedDocs++;
                             continue;
                         }
                     }
                     $tmp = $this->parseChunk($this->renderTPL, $item);
 
-                    if ($this->getCFGDef('contentPlaceholder', 0) !== 0) {
+                    if ($this->getCFGDef('contentPlaceholder', 0) !== 0) {

                         $this->toPlaceholders($tmp, 1,
                             "item[" . $i . "]"); // [+item[x]+] – individual placeholder for each iteration documents on this page
                     }
                     $out .= $tmp;
                     $i++;
                 }
-            } else {
+            } else {

                 $noneTPL = $this->getCFGDef("noneTPL", "");
                 $out = ($noneTPL != '') ? $this->parseChunk($noneTPL, $sysPlh) : '';
             }
@@ -198,8 +198,8 @@ 
      * @param array $array
      * @return string
      */
-    public function getJSON($data, $fields, $array = array())
-    {
+    public function getJSON($data, $fields, $array = array())

+    {

         $out = array();
         $fields = is_array($fields) ? $fields : explode(",", $fields);
         $date = $this->getCFGDef('dateSource', 'pub_date');
@@ -218,50 +218,50 @@ 
          */
         $extE = $this->getExtender('e', true, true);
 
-        foreach ($data as $num => $row) {
-            if ((array('1') == $fields || in_array('summary', $fields)) && $extSummary) {
+        foreach ($data as $num => $row) {

+            if ((array('1') == $fields || in_array('summary', $fields)) && $extSummary) {

                 $row['summary'] = $this->getSummary($row, $extSummary, 'introtext', 'content');
             }
 
-            if (array('1') == $fields || in_array('date', $fields)) {
-                if (isset($row[$date])) {
-                    if (!$row[$date] && $date == 'pub_date' && isset($row['createdon'])) {
+            if (array('1') == $fields || in_array('date', $fields)) {

+                if (isset($row[$date])) {

+                    if (!$row[$date] && $date == 'pub_date' && isset($row['createdon'])) {

                         $date = 'createdon';
                     }   
                     $_date = is_numeric($row[$date]) && $row[$date] == (int)$row[$date] ? $row[$date] : strtotime($row[$date]);
-                    if ($_date !== false) {
+                    if ($_date !== false) {

                         $_date = $_date + $this->modx->config['server_offset_time'];
                         $dateFormat = $this->getCFGDef('dateFormat', '%d.%b.%y %H:%M');
-                        if ($dateFormat) {
+                        if ($dateFormat) {

                             $row['date'] = strftime($dateFormat, $_date);
                         }
                     }
                 }
             }
 
-            if (array('1') == $fields || in_array('title', $fields)) {
-                if (isset($row['pagetitle'])) {
+            if (array('1') == $fields || in_array('title', $fields)) {

+                if (isset($row['pagetitle'])) {

                     $row['title'] = empty($row['menutitle']) ? $row['pagetitle'] : $row['menutitle'];
                 }
             }
             if ((bool)$this->getCFGDef('makeUrl', 1) && (array('1') == $fields || in_array('url',$fields))
-            ) {
-                if (isset($row['type']) && $row['type'] == 'reference' && isset($row['content'])) {
+            ) {

+                if (isset($row['type']) && $row['type'] == 'reference' && isset($row['content'])) {

                     $row['url'] = is_numeric($row['content']) ? $this->modx->makeUrl($row['content'], '', '',
                         $this->getCFGDef('urlScheme', '')) : $row['content'];
-                } elseif (isset($row['id'])) {
+                } elseif (isset($row['id'])) {

                     $row['url'] = $this->modx->makeUrl($row['id'], '', '', $this->getCFGDef('urlScheme', ''));
                 }
             }
-            if ($extE && $tmp = $extE->init($this, array('data' => $row))) {
-                if (is_array($tmp)) {
+            if ($extE && $tmp = $extE->init($this, array('data' => $row))) {

+                if (is_array($tmp)) {

                     $row = $tmp;
                 }
             }
 
-            if ($extPrepare) {
+            if ($extPrepare) {

                 $row = $extPrepare->init($this, array('data' => $row));
-                if (is_bool($row) && $row === false) {
+                if (is_bool($row) && $row === false) {

                     continue;
                 }
             }
@@ -274,36 +274,35 @@ 
     /**
      * @abstract
      */
-    public function getChildrenCount()
-    {
+    public function getChildrenCount()

+    {

         $out = 0;
         $sanitarInIDs = $this->sanitarIn($this->IDs);
-        if ($sanitarInIDs != "''" || $this->getCFGDef('ignoreEmpty', '0')) {
+        if ($sanitarInIDs != "''" || $this->getCFGDef('ignoreEmpty', '0')) {

             $q_true = $this->getCFGDef('ignoreEmpty', '0');
             $q_true = $q_true ? $q_true : $this->getCFGDef('idType', 'parents') == 'parents';
             $where = $this->getCFGDef('addWhereList', '');
             $where = sqlHelper::trimLogicalOp($where);
             $where = ($where ? $where . ' AND ' : '') . $this->_filters['where'];
-            if ($where != '' && $this->_filters['where'] != '') {
+            if ($where != '' && $this->_filters['where'] != '') {

                 $where .= " AND ";
             }
             $where = sqlHelper::trimLogicalOp($where);
 
             $where = "WHERE {$where}";
             $whereArr = array();
-            if (!$this->getCFGDef('showNoPublish', 0)) {
+            if (!$this->getCFGDef('showNoPublish', 0)) {

                 $whereArr[] = "c.deleted=0 AND c.published=1";
-            }
-            else{
+            } else {

                 $q_true = 1;
             }
 
             $tbl_site_content = $this->getTable('site_content', 'c');
 
-            if ($sanitarInIDs != "''") {
-                switch ($this->getCFGDef('idType', 'parents')) {
+            if ($sanitarInIDs != "''") {

+                switch ($this->getCFGDef('idType', 'parents')) {

                     case 'parents':
-                        switch ($this->getCFGDef('showParent', '0')) {
+                        switch ($this->getCFGDef('showParent', '0')) {

                             case '-1':
                                 $tmpWhere = "c.parent IN (" . $sanitarInIDs . ")";
                                 break;
@@ -315,10 +314,10 @@ 
                                 $tmpWhere = "(c.parent IN ({$sanitarInIDs}) OR c.id IN({$sanitarInIDs}))";
                                 break;
                         }
-                        if (($addDocs = $this->getCFGDef('documents', '')) != '') {
+                        if (($addDocs = $this->getCFGDef('documents', '')) != '') {

                             $addDocs = $this->sanitarIn($this->cleanIDs($addDocs));
                             $whereArr[] = "((" . $tmpWhere . ") OR c.id IN({$addDocs}))";
-                        } else {
+                        } else {

                             $whereArr[] = $tmpWhere;
                         }
 
@@ -333,26 +332,25 @@ 
 
             $q_true = $q_true ? $q_true : trim($where) != 'WHERE';
 
-            if (trim($where) != 'WHERE') {
+            if (trim($where) != 'WHERE') {

                 $where .= " AND ";
             }
 
             $where .= implode(" AND ", $whereArr);
             $where = sqlHelper::trimLogicalOp($where);
 
-            if (trim($where) == 'WHERE') {
+            if (trim($where) == 'WHERE') {

                 $where = '';
             }
             $group = $this->getGroupSQL($this->getCFGDef('groupBy', 'c.id'));
 
             $q_true = $q_true ? $q_true : $group != '';
-            if ( $q_true ){
+            if ( $q_true ) {

                 $maxDocs = $this->getCFGDef('maxDocs', 0);
                 $limit = $maxDocs > 0 ? $this->LimitSQL($this->getCFGDef('maxDocs', 0)) : '';
                 $rs = $this->dbQuery("SELECT count(*) FROM (SELECT count(*) FROM {$from} {$where} {$group} {$limit}) as `tmp`");
                 $out = $this->modx->db->getValue($rs);
-            }
-            else {
+            } else {

                 $out = count($this->IDs);
             }
         }
@@ -363,11 +361,11 @@ 
     /**
      * @return array
      */
-    protected function getDocList()
-    {
+    protected function getDocList()

+    {

         $out = array();
         $sanitarInIDs = $this->sanitarIn($this->IDs);
-        if ($sanitarInIDs != "''" || $this->getCFGDef('ignoreEmpty', '0')) {
+        if ($sanitarInIDs != "''" || $this->getCFGDef('ignoreEmpty', '0')) {

             $where = $this->getCFGDef('addWhereList', '');
             $where = sqlHelper::trimLogicalOp($where);
 
@@ -375,21 +373,21 @@ 
             $where = sqlHelper::trimLogicalOp($where);
 
             $tbl_site_content = $this->getTable('site_content', 'c');
-            if ($sanitarInIDs != "''") {
+            if ($sanitarInIDs != "''") {

                 $where .= ($where ? " AND " : "") . "c.id IN ({$sanitarInIDs}) AND";
             }
             $where = sqlHelper::trimLogicalOp($where);
 
-            if ($this->getCFGDef('showNoPublish', 0)) {
-                if ($where != '') {
+            if ($this->getCFGDef('showNoPublish', 0)) {

+                if ($where != '') {

                     $where = "WHERE {$where}";
-                } else {
+                } else {

                     $where = '';
                 }
-            } else {
-                if ($where != '') {
+            } else {

+                if ($where != '') {

                     $where = "WHERE {$where} AND ";
-                } else {
+                } else {

                     $where = "WHERE {$where} ";
                 }
                 $where .= "c.deleted=0 AND c.published=1";
@@ -406,7 +404,7 @@ 
 
             $rs = $this->dbQuery("SELECT {$fields} FROM {$tbl_site_content} {$where} {$group} {$sort} {$limit}");
 
-            while ($item = $this->modx->db->getRow($rs)) {
+            while ($item = $this->modx->db->getRow($rs)) {

                 $out[$item['id']] = $item;
             };
         }
@@ -418,26 +416,26 @@ 
      * @param string $id
      * @return array
      */
-    public function getChildrenFolder($id)
-    {
+    public function getChildrenFolder($id)

+    {

         $out = array();
         $where = $this->getCFGDef('addWhereFolder', '');
         $where = sqlHelper::trimLogicalOp($where);
-        if ($where != '') {
+        if ($where != '') {

             $where .= " AND ";
         }
 
         $tbl_site_content = $this->getTable('site_content', 'c');
         $sanitarInIDs = $this->sanitarIn($id);
-        if ($this->getCFGDef('showNoPublish', 0)) {
+        if ($this->getCFGDef('showNoPublish', 0)) {

             $where = "WHERE {$where} c.parent IN ({$sanitarInIDs}) AND c.isfolder=1";
-        } else {
+        } else {

             $where = "WHERE {$where} c.parent IN ({$sanitarInIDs}) AND c.deleted=0 AND c.published=1 AND c.isfolder=1";
         }
 
         $rs = $this->dbQuery("SELECT id FROM {$tbl_site_content} {$where}");
 
-        while ($item = $this->modx->db->getRow($rs)) {
+        while ($item = $this->modx->db->getRow($rs)) {

             $out[] = $item['id'];
         }
 
@@ -449,10 +447,10 @@ 
      * @param $sort
      * @return array
      */
-    protected function injectSortByTV($table, $sort)
-    {
+    protected function injectSortByTV($table, $sort)

+    {

         $out = $this->getExtender('tv', true, true)->injectSortByTV($table, $sort);
-        if (!is_array($out) || empty($out)) {
+        if (!is_array($out) || empty($out)) {

             $out = array($table, $sort);
         }
 
@@ -462,19 +460,19 @@ 
     /**
      * @return array
      */
-    protected function getChildrenList()
-    {
+    protected function getChildrenList()

+    {

         $where = array();
         $out = array();
 
         $tmpWhere = $this->getCFGDef('addWhereList', '');
         $tmpWhere = sqlHelper::trimLogicalOp($tmpWhere);
-        if (!empty($tmpWhere)) {
+        if (!empty($tmpWhere)) {

             $where[] = $tmpWhere;
         }
 
         $tmpWhere = sqlHelper::trimLogicalOp($this->_filters['where']);
-        if (!empty($tmpWhere)) {
+        if (!empty($tmpWhere)) {

             $where[] = $tmpWhere;
         }
 
@@ -485,8 +483,8 @@ 
         $sanitarInIDs = $this->sanitarIn($this->IDs);
 
         $tmpWhere = null;
-        if ($sanitarInIDs != "''") {
-            switch ($this->getCFGDef('showParent', '0')) {
+        if ($sanitarInIDs != "''") {

+            switch ($this->getCFGDef('showParent', '0')) {

                 case '-1':
                     $tmpWhere = "c.parent IN (" . $sanitarInIDs . ")";
                     break;
@@ -499,36 +497,36 @@ 
                     break;
             }
         }
-        if (($addDocs = $this->getCFGDef('documents', '')) != '') {
+        if (($addDocs = $this->getCFGDef('documents', '')) != '') {

             $addDocs = $this->sanitarIn($this->cleanIDs($addDocs));
-            if (empty($tmpWhere)) {
+            if (empty($tmpWhere)) {

                 $tmpWhere = "c.id IN({$addDocs})";
-            } else {
+            } else {

                 $tmpWhere = "((" . $tmpWhere . ") OR c.id IN({$addDocs}))";
             }
         }
-        if (!empty($tmpWhere)) {
+        if (!empty($tmpWhere)) {

             $where[] = $tmpWhere;
         }
-        if (!$this->getCFGDef('showNoPublish', 0)) {
+        if (!$this->getCFGDef('showNoPublish', 0)) {

             $where[] = "c.deleted=0 AND c.published=1";
         }
-        if (!empty($where)) {
+        if (!empty($where)) {

             $where = "WHERE " . implode(" AND ", $where);
-        } else {
+        } else {

             $where = '';
         }
         $fields = $this->getCFGDef('selectFields', 'c.*');
         $group = $this->getGroupSQL($this->getCFGDef('groupBy', ''));
 
-        if ($sanitarInIDs != "''" || $this->getCFGDef('ignoreEmpty', '0')) {
+        if ($sanitarInIDs != "''" || $this->getCFGDef('ignoreEmpty', '0')) {

             $rs = $this->dbQuery("SELECT {$fields} FROM " . $from . " " . $where . " " .
                 $group . " " .
                 $sort . " " .
                 $this->LimitSQL($this->getCFGDef('queryLimit', 0))
             );
 
-            while ($item = $this->modx->db->getRow($rs)) {
+            while ($item = $this->modx->db->getRow($rs)) {

                 $out[$item['id']] = $item;
             }
         }
@@ -541,10 +539,10 @@ 
      * @param string $type
      * @return string
      */
-    public function changeSortType($field, $type)
-    {
+    public function changeSortType($field, $type)

+    {

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

             case 'TVDATETIME':
                 $field = "STR_TO_DATE(" . $field . ",'%d-%m-%Y %H:%i:%s')";
                 break;