AgelxNash / DocLister

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

Indentation +30 added lines, -30 removed lines

@@ -136,7 +136,7 @@ 
                     $comments = $extJotCount->countComments(array_keys($this->_docs));

                 }

 

-				$this->skippedDocs = 0;

+                $this->skippedDocs = 0;

                 foreach ($this->_docs as $item) {

                     $this->renderTPL = $tpl;

                     if ($extUser) {

@@ -170,7 +170,7 @@ 
 

                     $findTpl = $this->renderTPL;

                     $tmp = $this->uniformPrepare($item, $i);

-					extract($tmp, EXTR_SKIP);

+                    extract($tmp, EXTR_SKIP);

                     if ($this->renderTPL == '') {

                         $this->renderTPL = $findTpl;

                     }

@@ -181,7 +181,7 @@ 
                             'nameParam' => 'prepare'

                         ));

                         if (is_bool($item) && $item === false) {

-							$this->skippedDocs++;

+                            $this->skippedDocs++;

                             continue;

                         }

                     }

@@ -217,13 +217,13 @@ 
         $extSummary = $this->getExtender('summary');

 

         /**

-        * @var $extPrepare prepare_DL_Extender

-        */

+         * @var $extPrepare prepare_DL_Extender

+         */

         $extPrepare = $this->getExtender('prepare');

 

         /**

-        * @var $extE e_DL_Extender

-        */

+         * @var $extE e_DL_Extender

+         */

         $extE = $this->getExtender('e', true, true);

 

         foreach ($data as $num => $item) {

@@ -291,18 +291,18 @@ 
             if ($sanitarInIDs != "''") {

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

                     case 'parents':

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

-							case '-1':

-								$tmpWhere = "c.parent IN (" . $sanitarInIDs . ")";

-								break;

-							case 0:

-								$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}))";

-								break;

-						}

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

+                            case '-1':

+                                $tmpWhere = "c.parent IN (" . $sanitarInIDs . ")";

+                                break;

+                            case 0:

+                                $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}))";

+                                break;

+                        }

                         if (($addDocs = $this->getCFGDef('documents', '')) != '') {

                             $addDocs = $this->sanitarIn($this->cleanIDs($addDocs));

                             $whereArr[] = "((" . $tmpWhere . ") OR c.id IN({$addDocs}))";

@@ -458,17 +458,17 @@ 
         $tmpWhere = null;

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

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

-				case '-1':

-					$tmpWhere = "c.parent IN (" . $sanitarInIDs . ")";

-					break;

-				case 0:

-					$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}))";

-					break;

-			}

+                case '-1':

+                    $tmpWhere = "c.parent IN (" . $sanitarInIDs . ")";

+                    break;

+                case 0:

+                    $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}))";

+                    break;

+            }

         }

         if (($addDocs = $this->getCFGDef('documents', '')) != '') {

             $addDocs = $this->sanitarIn($this->cleanIDs($addDocs));

Spacing +35 added lines, -35 removed lines

@@ -45,9 +45,9 @@ 
         $id = ((int)$id > 0) ? (int)$id : $this->getCurrentMODXPageID();

 		

         $link = $this->checkExtender('request') ? $this->extender['request']->getLink() : $this->getRequest();

-        if($id == $this->modx->config['site_start']){

+        if ($id == $this->modx->config['site_start']) {

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

-        }else{

+        } else {

             $url = $this->modx->makeUrl($id, '', $link, $this->getCFGDef('urlScheme', ''));

         }

         return $url;

@@ -154,10 +154,10 @@ 
 

                     $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', ''));

                         }

                     }

@@ -188,7 +188,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

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

                     }

                     $out .= $tmp;

                     $i++;

@@ -228,25 +228,25 @@ 
 

         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 (array('1') == $fields || in_array('date', $fields)) {

                 $tmp = (isset($this->_docs[$num][$date]) && $date != 'createdon' && $this->_docs[$num][$date] != 0 && $this->_docs[$num][$date] == (int)$this->_docs[$num][$date]) ? $this->_docs[$num][$date] : $this->_docs[$num]['createdon'];

                 $row['date'] = strftime($this->getCFGDef('dateFormat', '%d.%b.%y %H:%M'), $tmp + $this->modx->config['server_offset_time']);

             }

-            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 ((bool)$this->getCFGDef('makeUrl', 1) && (array('1') == $fields || in_array(array('content', 'type'), $fields))) {

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

                 }

             }

@@ -274,7 +274,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 ";

             }

@@ -291,9 +291,9 @@ 
             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 . ")";

+								$tmpWhere = "c.parent IN (".$sanitarInIDs.")";

 								break;

 							case 0:

 								$tmpWhere = "c.parent IN ({$sanitarInIDs}) AND c.id NOT IN({$sanitarInIDs})";

@@ -305,7 +305,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;

                         }

@@ -316,7 +316,7 @@ 
                         break;

                 }

             }

-            $from = $tbl_site_content . " " . $this->_filters['join'];

+            $from = $tbl_site_content." ".$this->_filters['join'];

             $where = sqlHelper::trimLogicalOp($where);

 

             if (trim($where) != 'WHERE') {

@@ -347,12 +347,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('site_content', 'c');

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

-                $where .= ($where ? " AND " : "") . "c.id IN ({$sanitarInIDs}) AND";

+                $where .= ($where ? " AND " : "")."c.id IN ({$sanitarInIDs}) AND";

             }

             $where = sqlHelper::trimLogicalOp($where);

 

@@ -375,7 +375,7 @@ 
             $fields = $this->getCFGDef('selectFields', 'c.*');

             $group = $this->getGroupSQL($this->getCFGDef('groupBy', 'c.id'));

             $sort = $this->SortOrderSQL("if(c.pub_date=0,c.createdon,c.pub_date)");

-            list($tbl_site_content, $sort) = $this->injectSortByTV($tbl_site_content . ' ' . $this->_filters['join'], $sort);

+            list($tbl_site_content, $sort) = $this->injectSortByTV($tbl_site_content.' '.$this->_filters['join'], $sort);

 

             $limit = $this->LimitSQL($this->getCFGDef('queryLimit', 0));

 

@@ -452,30 +452,30 @@ 
         $tbl_site_content = $this->getTable('site_content', 'c');

 

         $sort = $this->SortOrderSQL("if(c.pub_date=0,c.createdon,c.pub_date)");

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

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

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

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

 			}

         }

         if (($addDocs = $this->getCFGDef('documents', '')) != '') {

             $addDocs = $this->sanitarIn($this->cleanIDs($addDocs));

-            if(empty($tmpWhere)){

+            if (empty($tmpWhere)) {

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

-            }else{

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

+            } else {

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

             }

         }

         if (!empty($tmpWhere)) {

@@ -485,7 +485,7 @@ 
             $where[] = "c.deleted=0 AND c.published=1";

         }

         if (!empty($where)) {

-            $where = "WHERE " . implode(" AND ", $where);

+            $where = "WHERE ".implode(" AND ", $where);

         } else {

             $where = '';

         }

@@ -493,9 +493,9 @@ 
         $group = $this->getGroupSQL($this->getCFGDef('groupBy', 'c.id'));

 

         if ($sanitarInIDs != "''" || $this->getCFGDef('ignoreEmpty', '0')) {

-            $sql = $this->dbQuery("SELECT {$fields} FROM " . $from . " " . $where . " " .

-                $group . " ".

-                $sort . " " .

+            $sql = $this->dbQuery("SELECT {$fields} FROM ".$from." ".$where." ".

+                $group." ".

+                $sort." ".

                 $this->LimitSQL($this->getCFGDef('queryLimit', 0))

             );

 

@@ -513,7 +513,7 @@ 
         $type = trim($type);

         switch (strtoupper($type)) {

             case 'TVDATETIME':

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

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

                 break;

             default:

                 $field = parent::changeSortType($field, $type);

Braces +4 added lines, -4 removed lines

@@ -47,7 +47,7 @@ 
         $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}" : "");

-        }else{

+        } else{

             $url = $this->modx->makeUrl($id, '', $link, $this->getCFGDef('urlScheme', ''));

         }

         return $url;

@@ -157,7 +157,7 @@ 
                     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', ''));

                         }

                     }

@@ -241,7 +241,7 @@ 
             if((bool)$this->getCFGDef('makeUrl', 1) && (array('1') == $fields || in_array(array('content', 'type'), $fields))){

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

                 }

             }

@@ -474,7 +474,7 @@ 
             $addDocs = $this->sanitarIn($this->cleanIDs($addDocs));

             if(empty($tmpWhere)){

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

-            }else{

+            } else{

                 $tmpWhere = "((" . $tmpWhere . ") OR c.id IN({$addDocs}))";

             }

         }