AgelxNash / DocLister

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);

Braces +71 added lines, -71 removed lines

@@ -10,8 +10,8 @@ 
  * @param contentField =`description` //content
  * @param table =`` //table name
  */
-class onetableDocLister extends DocLister
-{
+class onetableDocLister extends DocLister

+{

     /**
      * @var string
      */
@@ -29,11 +29,11 @@ 
     /**
      * @absctract
      */
-    public function getDocs($tvlist = '')
-    {
-        if ($this->checkExtender('paginate')) {
+    public function getDocs($tvlist = '')

+    {

+        if ($this->checkExtender('paginate')) {

             $this->extender['paginate']->init($this);
-        } else {
+        } else {

             $this->config->setConfig(array('start' => 0));
         }
         $type = $this->getCFGDef('idType', 'parents');
@@ -46,26 +46,26 @@ 
      * @param string $tpl
      * @return string
      */
-    public function _render($tpl = '')
-    {
+    public function _render($tpl = '')

+    {

         $out = '';
         $separator = $this->getCFGDef('outputSeparator', '');
-        if ($tpl == '') {
+        if ($tpl == '') {

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

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

                 $out = $this->parseChunk($noneTPL, $sysPlh);
-            } else {
+            } else {

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

                     $extUser->init($this, array('fields' => $this->getCFGDef("userFields", "")));
                 }
 
@@ -79,9 +79,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+]....
                     }
 
@@ -94,12 +94,12 @@ 
                         "dl") . '.iteration'] = $i; //[+iteration+] - Number element. Starting from zero
 
                     $date = $this->getCFGDef('dateSource', 'pub_date');
-                    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'];
                             $dateFormat = $this->getCFGDef('dateFormat', '%d.%b.%y %H:%M');
-                            if ($dateFormat) {
+                            if ($dateFormat) {

                                 $item['date'] = strftime($dateFormat, $_date);
                             }
                         }
@@ -108,27 +108,27 @@ 
                     $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;
-                    if (next($this->_docs) !== false) {
+                    if (next($this->_docs) !== false) {

                         $out .= $separator;
                     }
                     $i++;
@@ -146,8 +146,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');
@@ -166,19 +166,19 @@ 
          * @var $extE e_DL_Extender
          */
         $extE = $this->getExtender('e', true, true);
-        foreach ($data as $num => $row) {
+        foreach ($data as $num => $row) {

 
-            switch (true) {
+            switch (true) {

                 case ((array('1') == $fields || in_array('summary', $fields)) && $extSummary):
                     $row['summary'] = $this->getSummary($row, $extSummary, 'introtext');
                 //without break
                 case ((array('1') == $fields || in_array('date', $fields)) && $date != 'date'):
-                    if (isset($row[$date])) {
+                    if (isset($row[$date])) {

                         $_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);
                             }
                         }
@@ -186,15 +186,15 @@ 
                 //nobreak    
             }
 
-            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;
                 }
             }
@@ -207,11 +207,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')) {

             $from = $this->table . " " . $this->_filters['join'];
             $where = $this->getCFGDef('addWhereList', '');
             
@@ -221,14 +221,14 @@ 
         	//------- end of block -------
 
             
-            if ($where != '') {
+            if ($where != '') {

                 $where = array($where);
             }
-            if ($sanitarInIDs != "''") {
+            if ($sanitarInIDs != "''") {

                 $where[] = "{$this->getPK()} IN ({$sanitarInIDs})";
             }
 
-            if (!empty($where)) {
+            if (!empty($where)) {

                 $where = "WHERE " . implode(" AND ", $where);
             }
             $limit = $this->LimitSQL($this->getCFGDef('queryLimit', 0));
@@ -238,7 +238,7 @@ 
             $rs = $this->dbQuery("SELECT {$fields} FROM {$from} {$where} {$group} {$sort} {$limit}");
 
             $pk = $this->getPK(false);
-            while ($item = $this->modx->db->getRow($rs)) {
+            while ($item = $this->modx->db->getRow($rs)) {

                 $out[$item[$pk]] = $item;
             }
         }
@@ -249,8 +249,8 @@ 
     /**
      * @return array
      */
-    protected function getChildrenList()
-    {
+    protected function getChildrenList()

+    {

         $where = array();
         $out = array();
         $from = $this->table . " " . $this->_filters['join'];
@@ -263,15 +263,15 @@ 
 	    //------- end of block -------
         
         
-        if (!empty($tmpWhere)) {
+        if (!empty($tmpWhere)) {

             $where[] = $tmpWhere;
         }
         $sanitarInIDs = $this->sanitarIn($this->IDs);
 
         $tmpWhere = null;
-        if ($sanitarInIDs != "''") {
+        if ($sanitarInIDs != "''") {

             $tmpWhere = "({$this->getParentField()} IN (" . $sanitarInIDs . ")";
-            switch ($this->getCFGDef('showParent', '0')) {
+            switch ($this->getCFGDef('showParent', '0')) {

                 case -1:
                     $tmpWhere .= ")";
                     break;
@@ -284,32 +284,32 @@ 
                     break;
             }
         }
-        if (($addDocs = $this->getCFGDef('documents', '')) != '') {
+        if (($addDocs = $this->getCFGDef('documents', '')) != '') {

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

                 $tmpWhere = $this->getPK() . " IN({$addDocs})";
-            } else {
+            } else {

                 $tmpWhere = "((" . $tmpWhere . ") OR {$this->getPK()} IN({$addDocs}))";
             }
         }
-        if (!empty($tmpWhere)) {
+        if (!empty($tmpWhere)) {

             $where[] = $tmpWhere;
         }
-        if (!empty($where)) {
+        if (!empty($where)) {

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

             $where = '';
         }
         $fields = $this->getCFGDef('selectFields', '*');
         $group = $this->getGroupSQL($this->getCFGDef('groupBy', ''));
         $sort = $this->SortOrderSQL($this->getPK());
         $limit = $this->LimitSQL($this->getCFGDef('queryLimit', 0))
-        if ($sanitarInIDs != "''" || $this->getCFGDef('ignoreEmpty', '0')) {
+        if ($sanitarInIDs != "''" || $this->getCFGDef('ignoreEmpty', '0')) {

             $rs = $this->dbQuery("SELECT {$fields} FROM {$from} {$where} {$group} {$sort} {$limit}");
 
             $pk = $this->getPK(false);
 
-            while ($item = $this->modx->db->getRow($rs)) {
+            while ($item = $this->modx->db->getRow($rs)) {

                 $out[$item[$pk]] = $item;
             }
 
@@ -321,11 +321,11 @@ 
     /**
      * @absctract
      */
-    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')) {

             $from = $this->table . " " . $this->_filters['join'];
             $where = $this->getCFGDef('addWhereList', '');
             
@@ -334,16 +334,16 @@ 
             $where = sqlHelper::trimLogicalOp($where);
 	        //------- end of block -------
             
-            if ($where != '') {
+            if ($where != '') {

                 $where = array($where);
-            } else {
+            } else {

                 $where = array();
             }
-            if ($sanitarInIDs != "''") {
-                if ($sanitarInIDs != "''") {
-                    switch ($this->getCFGDef('idType', 'parents')) {
+            if ($sanitarInIDs != "''") {

+                if ($sanitarInIDs != "''") {

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

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

                                 case '-1':
                                     $tmpWhere = "{$this->getParentField()} IN ({$sanitarInIDs})";
                                     break;
@@ -355,10 +355,10 @@ 
                                     $tmpWhere = "({$this->getParentField()} IN ({$sanitarInIDs}) OR {$this->getPK()} IN({$sanitarInIDs}))";
                                     break;
                             }
-                            if (($addDocs = $this->getCFGDef('documents', '')) != '') {
+                            if (($addDocs = $this->getCFGDef('documents', '')) != '') {

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

                                 $where[] = $tmpWhere;
                             }
                             break;
@@ -368,9 +368,9 @@ 
                     }
                 }
             }
-            if (!empty($where)) {
+            if (!empty($where)) {

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

                 $where = '';
             }
 
@@ -388,20 +388,20 @@ 
      * @param string $id
      * @return array
      */
-    public function getChildrenFolder($id)
-    {
+    public function getChildrenFolder($id)

+    {

         $out = array();
         $sanitarInIDs = $this->sanitarIn($id);
 
         $tmp = $this->getCFGDef('addWhereFolder', '');
         $where = "{$this->getParentField()} IN ({$sanitarInIDs})";
-        if (!empty($tmp)) {
+        if (!empty($tmp)) {

             $where .= " AND " . $tmp;
         }
 
         $rs = $this->dbQuery("SELECT {$this->getPK()} FROM {$this->table} WHERE {$where}");
         $pk = $this->getPK(false);
-        while ($item = $this->modx->db->getRow($rs)) {
+        while ($item = $this->modx->db->getRow($rs)) {

             $out[] = $item[$pk];
         }
 

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];