AgelxNash / DocLister

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

Spacing +11 added lines, -11 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('MODX_BASE_PATH')) {
+if ( ! defined('MODX_BASE_PATH')) {
     die('HACK???');
 }
 
@@ -58,7 +58,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) {
@@ -280,10 +280,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;
             }
 
@@ -338,7 +338,7 @@ 
 
             $q_true = $q_true ? $q_true : $group != 'GROUP BY c.id';
 
-            if ( $q_true ){
+            if ($q_true) {
                 $rs = $this->dbQuery("SELECT count(*) FROM (SELECT count(*) FROM {$from} {$where} {$group}) as `tmp`");
                 $out = $this->modx->db->getValue($rs);
             }
@@ -445,7 +445,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);
         }
 
@@ -462,12 +462,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;
         }
 
@@ -500,13 +500,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 +107 added lines, -109 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,35 +41,35 @@ 
     /**
      * @absctract
      */
-    public function getDocs($tvlist = '')
-    {
-        if ($tvlist == '') {
+    public function getDocs($tvlist = '')

+    {

+        if ($tvlist == '') {

             $tvlist = $this->getCFGDef('tvList', '');
         }
         
         $this->extTV->getAllTV_Name();
 
-        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');
         }
 
@@ -80,24 +80,24 @@ 
      * @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 != '') {

             $date = $this->getCFGDef('dateSource', 'pub_date');
 
             $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", "")));
                 }
 
@@ -116,20 +116,20 @@ 
                  */
                 $extJotCount = $this->getCFGdef('jotcount', 0) ? $this->getExtender('jotcount', true) : null;
 
-                if ($extJotCount) {
+                if ($extJotCount) {

                     $comments = $extJotCount->countComments(array_keys($this->_docs));
                 }
 
                 $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+]....
                     }
 
                     $item['summary'] = $extSummary ? $this->getSummary($item, $extSummary, 'introtext', 'content') : '';
 
-                    if ($extJotCount) {
+                    if ($extJotCount) {

                         $item['jotcount'] = APIHelpers::getkey($comments, $item['id'], 0);
                     }
 
@@ -139,20 +139,20 @@ 
 
                     $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', ''));
                         }
                     }
 
-                    if (isset($item[$date])) {
+                    if (isset($item[$date])) {

                         $_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'];
-                            if ($this->getCFGDef('dateFormat', '%d.%b.%y %H:%M') != '') {
+                            if ($this->getCFGDef('dateFormat', '%d.%b.%y %H:%M') != '') {

                                 $item['date'] = strftime($this->getCFGDef('dateFormat', '%d.%b.%y %H:%M'), $_date);
                             }
                         }
@@ -161,35 +161,35 @@ 
                     $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) : '';
             }
             $out = $this->renderWrap($out);
-        } else {
+        } else {

             $out = 'no template';
         }
 
@@ -202,8 +202,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');
@@ -223,44 +223,44 @@ 
          */
         $extE = $this->getExtender('e', true, true);
 
-        foreach ($data as $num => $item) {
+        foreach ($data as $num => $item) {

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

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

+                if (isset($this->_docs[$num][$date])) {

                     $_date = is_numeric($this->_docs[$num][$date]) && $this->_docs[$num][$date] == (int)$this->_docs[$num][$date] ? $this->_docs[$num][$date] : strtotime($this->_docs[$num][$date]);
-                    if ($_date !== false) {
+                    if ($_date !== false) {

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

                             $row['date'] = strftime($this->getCFGDef('dateFormat', '%d.%b.%y %H:%M'), $_date);
                         }
                     }
                 }
             }
-            if (array('1') == $fields || in_array(array('menutitle', 'pagetitle'), $fields)) {
+            if (array('1') == $fields || in_array(array('menutitle', 'pagetitle'), $fields)) {

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

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

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

                     $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;
                 }
             }
@@ -273,36 +273,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;
@@ -314,10 +313,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;
                         }
 
@@ -332,14 +331,14 @@ 
 
             $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'));
@@ -348,11 +347,10 @@ 
 
             $q_true = $q_true ? $q_true : $group != 'GROUP BY c.id';
 
-            if ( $q_true ){
+            if ( $q_true ) {

                 $rs = $this->dbQuery("SELECT count(*) FROM (SELECT count(*) FROM {$from} {$where} {$group}) 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";
@@ -408,7 +406,7 @@ 
 
             $rows = $this->modx->db->makeArray($rs);
 
-            foreach ($rows as $item) {
+            foreach ($rows as $item) {

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

+    {

         $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";
         }
 
@@ -440,7 +438,7 @@ 
 
         $rows = $this->modx->db->makeArray($rs);
         $out = array();
-        foreach ($rows as $item) {
+        foreach ($rows as $item) {

             $out[] = $item['id'];
         }
 
@@ -452,10 +450,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);
         }
 
@@ -465,19 +463,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;
         }
 
@@ -488,8 +486,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;
@@ -502,29 +500,29 @@ 
                     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', 'c.id'));
 
-        if ($sanitarInIDs != "''" || $this->getCFGDef('ignoreEmpty', '0')) {
+        if ($sanitarInIDs != "''" || $this->getCFGDef('ignoreEmpty', '0')) {

             $sql = $this->dbQuery("SELECT {$fields} FROM " . $from . " " . $where . " " .
                 $group . " " .
                 $sort . " " .
@@ -533,7 +531,7 @@ 
 
             $rows = $this->modx->db->makeArray($sql);
 
-            foreach ($rows as $item) {
+            foreach ($rows as $item) {

                 $out[$item['id']] = $item;
             }
         }
@@ -546,10 +544,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;