AgelxNash / DocLister

assets/lib/Helpers/PHPThumb.php

Spacing +7 added lines, -7 removed lines

@@ -1,7 +1,7 @@ 
 <?php namespace Helpers;
 
-include_once(MODX_BASE_PATH . 'assets/snippets/phpthumb/phpthumb.class.php');
-require_once(MODX_BASE_PATH . 'assets/lib/Helpers/FS.php');
+include_once(MODX_BASE_PATH.'assets/snippets/phpthumb/phpthumb.class.php');
+require_once(MODX_BASE_PATH.'assets/lib/Helpers/FS.php');
 
 /**
  * Class PHPThumb
@@ -44,7 +44,7 @@ 
         $this->thumb->sourceFilename = $inputFile;
         $ext = explode('.', $inputFile);
         $ext = str_replace('jpeg', 'jpg', strtolower(array_pop($ext)));
-        $options = 'f=' . $ext . '&' . $options;
+        $options = 'f='.$ext.'&'.$options;
         $this->setOptions($options);
         if ($this->thumb->GenerateThumbnail() && $this->thumb->RenderToFile($outputFile)) {
             return true;
@@ -64,12 +64,12 @@ 
             case 'jpg':
                 $ext = $this->fs->takeFileExt($file);
                 if ($ext == 'jpeg' || $ext == 'jpg') {
-                    $cmd = '/usr/bin/jpegtran -optimize -progressive -copy none -outfile ' . escapeshellarg($file . '_') . ' ' . escapeshellarg($file);
+                    $cmd = '/usr/bin/jpegtran -optimize -progressive -copy none -outfile '.escapeshellarg($file.'_').' '.escapeshellarg($file);
                     exec($cmd, $result, $return_var);
-                    if ($this->fs->fileSize($file) > $this->fs->fileSize($file . '_')) {
-                        $this->fs->moveFile($file . '_', $file);
+                    if ($this->fs->fileSize($file) > $this->fs->fileSize($file.'_')) {
+                        $this->fs->moveFile($file.'_', $file);
                     } else {
-                        $this->fs->unlink($file . '_');
+                        $this->fs->unlink($file.'_');
                     }
                 }
                 break;

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/lib/SimpleTab/table.abstract.php

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

@@ -61,7 +61,7 @@ 
         $index = $this->modx->db->getValue($rows);
         $index = $index - 1;
         $this->query("SET @index := " . $index);
-        $this->query("UPDATE {$table} SET `{$this->indexName}` = (@index := @index + 1) WHERE (`{$this->indexName}`>{$index} AND `{$this->rfName}`={$rid} AND `{$this->pkName}` NOT IN ({$ids})) ORDER BY `{$this->indexName}` ASC");
+        $this->query("update {$table} SET `{$this->indexName}` = (@index := @index + 1) WHERE (`{$this->indexName}`>{$index} AND `{$this->rfName}`={$rid} AND `{$this->pkName}` NOT IN ({$ids})) ORDER BY `{$this->indexName}` ASC");
         $out = $this->modx->db->getAffectedRows();
 
         return $out;
@@ -96,14 +96,14 @@ 
         $ids = implode(',', $ids);
         if ($dir == 'top') {
             $this->query("SET @index := " . ($index - $cnt - 1));
-            $this->query("UPDATE {$table} SET `{$this->indexName}` = (@index := @index + 1) WHERE (`{$this->pkName}` IN ({$ids})) ORDER BY `{$this->indexName}` ASC");
+            $this->query("update {$table} SET `{$this->indexName}` = (@index := @index + 1) WHERE (`{$this->pkName}` IN ({$ids})) ORDER BY `{$this->indexName}` ASC");
             $this->query("SET @index := -1");
         } else {
             $this->query("SET @index := -1");
-            $this->query("UPDATE {$table} SET `{$this->indexName}` = (@index := @index + 1) WHERE (`{$this->pkName}` IN ({$ids})) ORDER BY `{$this->indexName}` ASC");
+            $this->query("update {$table} SET `{$this->indexName}` = (@index := @index + 1) WHERE (`{$this->pkName}` IN ({$ids})) ORDER BY `{$this->indexName}` ASC");
             $this->query("SET @index := " . ($cnt - 1));
         }
-        $this->query("UPDATE {$table} SET `{$this->indexName}` = (@index := @index + 1) WHERE (`{$this->pkName}` NOT IN ({$ids})) AND `{$this->rfName}` = {$rid} ORDER BY `{$this->indexName}` ASC");
+        $this->query("update {$table} SET `{$this->indexName}` = (@index := @index + 1) WHERE (`{$this->pkName}` NOT IN ({$ids})) AND `{$this->rfName}` = {$rid} ORDER BY `{$this->indexName}` ASC");
         $out = $this->modx->db->getAffectedRows();
 
         return $out;

Spacing +15 added lines, -15 removed lines

@@ -1,8 +1,8 @@ 
 <?php namespace SimpleTab;
 
-require_once(MODX_BASE_PATH . 'assets/lib/MODxAPI/autoTable.abstract.php');
-require_once(MODX_BASE_PATH . 'assets/lib/Helpers/FS.php');
-require_once(MODX_BASE_PATH . 'assets/lib/Helpers/PHPThumb.php');
+require_once(MODX_BASE_PATH.'assets/lib/MODxAPI/autoTable.abstract.php');
+require_once(MODX_BASE_PATH.'assets/lib/Helpers/FS.php');
+require_once(MODX_BASE_PATH.'assets/lib/Helpers/PHPThumb.php');
 
 /**
  * Class dataTable
@@ -59,7 +59,7 @@ 
         $rows = $this->query("SELECT MIN(`{$this->indexName}`) FROM {$table} WHERE `{$this->pkName}` IN ({$ids})");
         $index = $this->modx->db->getValue($rows);
         $index = $index - 1;
-        $this->query("SET @index := " . $index);
+        $this->query("SET @index := ".$index);
         $this->query("UPDATE {$table} SET `{$this->indexName}` = (@index := @index + 1) WHERE (`{$this->indexName}`>{$index} AND `{$this->rfName}`={$rid} AND `{$this->pkName}` NOT IN ({$ids})) ORDER BY `{$this->indexName}` ASC");
         $out = $this->modx->db->getAffectedRows();
 
@@ -94,13 +94,13 @@ 
         $cnt = count($ids);
         $ids = implode(',', $ids);
         if ($dir == 'top') {
-            $this->query("SET @index := " . ($index - $cnt - 1));
+            $this->query("SET @index := ".($index - $cnt - 1));
             $this->query("UPDATE {$table} SET `{$this->indexName}` = (@index := @index + 1) WHERE (`{$this->pkName}` IN ({$ids})) ORDER BY `{$this->indexName}` ASC");
             $this->query("SET @index := -1");
         } else {
             $this->query("SET @index := -1");
             $this->query("UPDATE {$table} SET `{$this->indexName}` = (@index := @index + 1) WHERE (`{$this->pkName}` IN ({$ids})) ORDER BY `{$this->indexName}` ASC");
-            $this->query("SET @index := " . ($cnt - 1));
+            $this->query("SET @index := ".($cnt - 1));
         }
         $this->query("UPDATE {$table} SET `{$this->indexName}` = (@index := @index + 1) WHERE (`{$this->pkName}` NOT IN ({$ids})) AND `{$this->rfName}` = {$rid} ORDER BY `{$this->indexName}` ASC");
         $out = $this->modx->db->getAffectedRows();
@@ -119,7 +119,7 @@ 
             return;
         }
         if ($this->fs->checkFile($url)) {
-            unlink(MODX_BASE_PATH . $url);
+            unlink(MODX_BASE_PATH.$url);
         }
         $dir = $this->fs->takeFileDir($url);
         $iterator = new \FilesystemIterator($dir);
@@ -130,7 +130,7 @@ 
             return;
         }
         $thumbsCache = \APIhelpers::getkey($this->params, 'thumbsCache', $this->thumbsCache);
-        $thumb = $thumbsCache . $url;
+        $thumb = $thumbsCache.$url;
         if ($this->fs->checkFile($thumb)) {
             $this->deleteThumb($thumb, true);
         }
@@ -183,7 +183,7 @@ 
         $filename = $this->fs->takeFileName($name);
         $ext = $this->fs->takeFileExt($name);
 
-        return $this->modx->stripAlias($filename) . '.' . $ext;
+        return $this->modx->stripAlias($filename).'.'.$ext;
     }
 
     /**
@@ -196,12 +196,12 @@ 
      */
     public function reorder($source, $target, $point, $rid, $orderDir)
     {
-        $rid = (int)$rid;
+        $rid = (int) $rid;
         $point = strtolower($point);
         $orderDir = strtolower($orderDir);
-        $sourceIndex = (int)$source[$this->indexName];
-        $targetIndex = (int)$target[$this->indexName];
-        $sourceId = (int)$source[$this->pkName];
+        $sourceIndex = (int) $source[$this->indexName];
+        $targetIndex = (int) $target[$this->indexName];
+        $sourceId = (int) $source[$this->pkName];
         $table = $this->makeTable($this->table);
         $rows = 0;
         /* more refactoring  needed */
@@ -270,8 +270,8 @@ 
             return false;
         }
         $thumb = new \Helpers\PHPThumb();
-        $inputFile = MODX_BASE_PATH . $this->fs->relativePath($url);
-        $outputFile = MODX_BASE_PATH . $this->fs->relativePath($folder) . '/' . $this->fs->relativePath($url);
+        $inputFile = MODX_BASE_PATH.$this->fs->relativePath($url);
+        $outputFile = MODX_BASE_PATH.$this->fs->relativePath($folder).'/'.$this->fs->relativePath($url);
         $dir = $this->fs->takeFileDir($outputFile);
         $this->fs->makeDir($dir, $this->modx->config['new_folder_permissions']);
         if ($thumb->create($inputFile, $outputFile, $options)) {

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 +83 added lines, -83 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
@@ -307,7 +307,7 @@ 
                 case ')':
                     $open--;
                     if ($open == 0) {
-                        $res[] = $cur . ')';
+                        $res[] = $cur.')';
                         $cur = '';
                     } else {
                         $cur .= $e;
@@ -371,7 +371,7 @@ 
      */
     public function setDebug($flag = 0)
     {
-        $flag = abs((int)$flag);
+        $flag = abs((int) $flag);
         if ($this->_debugMode != $flag) {
             $this->_debugMode = $flag;
             $this->debug = null;
@@ -381,8 +381,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);
                     }
@@ -420,7 +420,7 @@ 
         }
         $table = $this->_table[$name];
         if (!empty($alias) && is_scalar($alias)) {
-            $table .= " as `" . $alias . "`";
+            $table .= " as `".$alias."`";
         }
 
         return $table;
@@ -462,7 +462,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),
+            'Decode JSON: '.$this->debug->dumpData($json)."\r\nwith config: ".$this->debug->dumpData($config),
             'jsonDecode',
             2
         );
@@ -483,7 +483,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;
         }
 
@@ -512,7 +512,7 @@ 
             throw new Exception('Error load summary extender');
         }
 
-        if ((int)$this->getCFGDef('display', 0) > 0 && ( //OR paginate in extender's parameter
+        if ((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', '') != '' ||
@@ -522,7 +522,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');
             }
         }
@@ -568,11 +568,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', ''));
         }
@@ -633,7 +633,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;
@@ -651,13 +651,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);
     }
@@ -686,7 +686,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');
                 }
             }
         }
@@ -729,7 +729,7 @@ 
 
         $this->debug->debugEnd(
             "toPlaceholders",
-            array($key . " placeholder" => $data),
+            array($key." placeholder" => $data),
             array('html')
         );
 
@@ -762,7 +762,7 @@ 
             }
         }
         $q = $quote ? "'" : "";
-        $out = $q . implode($q . "," . $q, $out) . $q;
+        $out = $q.implode($q.",".$q, $out).$q;
 
         return $out;
     }
@@ -783,8 +783,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();
         }
 
@@ -806,7 +806,7 @@ 
         }
 
         $this->debug->debug(
-            'Load language ' . $this->debug->dumpData($name) . "." . $this->debug->dumpData($lang),
+            'Load language '.$this->debug->dumpData($name).".".$this->debug->dumpData($lang),
             'loadlang',
             2
         );
@@ -814,8 +814,8 @@ 
             $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')
@@ -898,7 +898,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;
@@ -967,7 +967,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");
 
@@ -1003,7 +1003,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
              */
@@ -1053,10 +1053,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) {
@@ -1083,7 +1083,7 @@ 
         $data[$this->getCFGDef(
             "sysKey",
             "dl"
-        ) . '.full_iteration'] = $iteration;
+        ).'.full_iteration'] = $iteration;
 
         if ($i == 1) {
             $this->renderTPL = $this->getCFGDef('tplFirst', $this->renderTPL);
@@ -1098,14 +1098,14 @@ 
             $data[$this->getCFGDef(
                 "sysKey",
                 "dl"
-            ) . '.active'] = 1; //[+active+] - 1 if $modx->documentIdentifer equal ID this element
+            ).'.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
@@ -1215,7 +1215,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");
     }
 
     /**
@@ -1256,16 +1256,16 @@ 
      */
     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 != '') {
@@ -1274,7 +1274,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');
 
@@ -1293,7 +1293,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', '');
@@ -1329,7 +1329,7 @@ 
     public function cleanIDs($IDs, $sep = ',')
     {
         $this->debug->debug(
-            'clean IDs ' . $this->debug->dumpData($IDs) . ' with separator ' . $this->debug->dumpData($sep),
+            'clean IDs '.$this->debug->dumpData($IDs).' with separator '.$this->debug->dumpData($sep),
             'cleanIDs',
             2
         );
@@ -1339,8 +1339,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);
@@ -1414,7 +1414,7 @@ 
     {
         $out = '';
         if ($group != '') {
-            $out = 'GROUP BY ' . $group;
+            $out = 'GROUP BY '.$group;
         }
 
         return $out;
@@ -1444,7 +1444,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' => '');
@@ -1464,13 +1464,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;
     }
@@ -1501,17 +1501,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;
     }
@@ -1557,20 +1557,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;
             }
@@ -1587,11 +1587,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;
             }
         }
 
@@ -1608,9 +1608,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;
             }
         }
 
@@ -1626,7 +1626,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) {
@@ -1653,14 +1653,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();
@@ -1696,7 +1696,7 @@ 
     {
         if (!empty($join)) {
             if (!empty($this->_filters['join'])) {
-                $this->_filters['join'] .= ' ' . $join;
+                $this->_filters['join'] .= ' '.$join;
             } else {
                 $this->_filters['join'] = $join;
             }
@@ -1717,19 +1717,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;
         }
 
@@ -1743,18 +1743,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++;
@@ -1781,7 +1781,7 @@ 
      */
     public function getCountFilters()
     {
-        return (int)$this->totalFilters;
+        return (int) $this->totalFilters;
     }
 
     /**
@@ -1819,7 +1819,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 +4 added lines, -2 removed lines

@@ -1134,7 +1134,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;
@@ -1339,7 +1340,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;
             }
         }

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

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,7 +83,7 @@ 
                         $item = $extUser->setUserData($item); //[+user.id.createdby+], [+user.fullname.publishedby+], [+dl.user.publishedby+]....
                     }
 
-                    $item[$this->getCFGDef("sysKey", "dl") . '.summary'] = $extSummary ? $this->getSummary(
+                    $item[$this->getCFGDef("sysKey", "dl").'.summary'] = $extSummary ? $this->getSummary(
                         $item,
                         $extSummary
                     ) : '';
@@ -95,11 +95,11 @@ 
                     $item[$this->getCFGDef(
                         "sysKey",
                         "dl"
-                    ) . '.iteration'] = $i; //[+iteration+] - Number element. Starting from zero
+                    ).'.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');
@@ -131,7 +131,7 @@ 
                         $this->toPlaceholders(
                             $tmp,
                             1,
-                            "item[" . $i . "]"
+                            "item[".$i."]"
                         ); // [+item[x]+] – individual placeholder for each iteration documents on this page
                     }
                     $out .= $tmp;
@@ -180,7 +180,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');
@@ -218,11 +218,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 -------
 
@@ -237,7 +237,7 @@ 
             }
 
             if (!empty($where)) {
-                $where = "WHERE " . implode(" AND ", $where);
+                $where = "WHERE ".implode(" AND ", $where);
             } else {
                 $where = '';
             }
@@ -264,12 +264,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 -------
 
@@ -281,13 +281,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:
@@ -298,16 +298,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 = '';
         }
@@ -336,11 +336,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 -------
 
@@ -367,7 +367,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;
                             }
@@ -379,7 +379,7 @@ 
                 }
             }
             if (!empty($where)) {
-                $where = "WHERE " . implode(" AND ", $where);
+                $where = "WHERE ".implode(" AND ", $where);
             } else {
                 $where = '';
             }
@@ -406,7 +406,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}");

assets/lib/MODxAPI/modManagers.php

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

@@ -164,9 +164,9 @@ 
                     session_regenerate_id(false);
                     $value = session_id();
                     if ($mid = $this->modx->getLoginUserID('mgr')) {
-                        $this->modx->db->query("UPDATE {$this->makeTable('active_user_locks')} SET `sid`='{$value}' WHERE `internalKey`={$mid}");
-                        $this->modx->db->query("UPDATE {$this->makeTable('active_user_sessions')} SET `sid`='{$value}' WHERE `internalKey`={$mid}");
-                        $this->modx->db->query("UPDATE {$this->makeTable('active_users')} SET `sid`='{$value}' WHERE `internalKey`={$mid}");
+                        $this->modx->db->query("update {$this->makeTable('active_user_locks')} SET `sid`='{$value}' WHERE `internalKey`={$mid}");
+                        $this->modx->db->query("update {$this->makeTable('active_user_sessions')} SET `sid`='{$value}' WHERE `internalKey`={$mid}");
+                        $this->modx->db->query("update {$this->makeTable('active_users')} SET `sid`='{$value}' WHERE `internalKey`={$mid}");
                     }
                     break;
                 case 'editedon':
@@ -243,7 +243,7 @@ 
             if ($this->newDoc) {
                 $SQL = "INSERT into {$this->makeTable('manager_users')} SET " . implode(', ', $this->set['user']);
             } else {
-                $SQL = "UPDATE {$this->makeTable('manager_users')} SET " . implode(', ',
+                $SQL = "update {$this->makeTable('manager_users')} SET " . implode(', ',
                         $this->set['user']) . " WHERE id = " . $this->id;
             }
             $this->query($SQL);
@@ -267,7 +267,7 @@ 
                 $SQL = "INSERT into {$this->makeTable('user_attributes')} SET " . implode(', ',
                         $this->set['attribute']);
             } else {
-                $SQL = "UPDATE {$this->makeTable('user_attributes')} SET " . implode(', ',
+                $SQL = "update {$this->makeTable('user_attributes')} SET " . implode(', ',
                         $this->set['attribute']) . " WHERE  internalKey = " . $this->getID();
             }
             $this->query($SQL);
@@ -279,7 +279,7 @@ 
             }
             $result = $this->query("SELECT `setting_value` FROM {$this->makeTable('user_settings')} WHERE `user` = '{$this->id}' AND `setting_name` = '{$key}'");
             if ($this->modx->db->getRecordCount($result) > 0) {
-                $this->query("UPDATE {$this->makeTable('user_settings')} SET `setting_value` = '{$value}' WHERE `user` = '{$this->id}' AND `setting_name` = '{$key}';");
+                $this->query("update {$this->makeTable('user_settings')} SET `setting_value` = '{$value}' WHERE `user` = '{$this->id}' AND `setting_name` = '{$key}';");
             } else {
                 $this->query("INSERT into {$this->makeTable('user_settings')} SET `user` = {$this->id},`setting_name` = '{$key}',`setting_value` = '{$value}';");
             }

Spacing +28 added lines, -28 removed lines

@@ -76,7 +76,7 @@ 
      * @return $this
      */
     protected function setRememberTime($val){
-        $this->rememberTime = (int)$val;
+        $this->rememberTime = (int) $val;
         return $this;
     }
 
@@ -104,7 +104,7 @@ 
     protected function findUser($data)
     {
         switch (true) {
-            case (is_int($data) || ((int)$data > 0 && (string)intval($data) === $data)):
+            case (is_int($data) || ((int) $data > 0 && (string) intval($data) === $data)):
                 $find = 'attribute.internalKey';
                 break;
             case filter_var($data, FILTER_VALIDATE_EMAIL):
@@ -227,27 +227,27 @@ 
     public function save($fire_events = false, $clearCache = false)
     {
         if ($this->get('email') == '' || $this->get('username') == '' || $this->get('password') == '') {
-            $this->log['EmptyPKField'] = 'Email, username or password is empty <pre>' . print_r($this->toArray(),
-                    true) . '</pre>';
+            $this->log['EmptyPKField'] = 'Email, username or password is empty <pre>'.print_r($this->toArray(),
+                    true).'</pre>';
 
             return false;
         }
 
         if (!$this->checkUnique('manager_users', 'username')) {
-            $this->log['UniqueUsername'] = 'username not unique <pre>' . print_r($this->get('username'),
-                    true) . '</pre>';
+            $this->log['UniqueUsername'] = 'username not unique <pre>'.print_r($this->get('username'),
+                    true).'</pre>';
 
             return false;
         }
 
         if (!$this->checkUnique('user_attributes', 'email', 'internalKey')) {
-            $this->log['UniqueEmail'] = 'Email not unique <pre>' . print_r($this->get('email'), true) . '</pre>';
+            $this->log['UniqueEmail'] = 'Email not unique <pre>'.print_r($this->get('email'), true).'</pre>';
 
             return false;
         }
 
-        if(!$this->get('role')) {
-            $this->log['UniqueEmail'] = 'Wrong manager role <pre>' . print_r($this->get('role'), true) . '</pre>';
+        if (!$this->get('role')) {
+            $this->log['UniqueEmail'] = 'Wrong manager role <pre>'.print_r($this->get('role'), true).'</pre>';
         }
 
         $this->set('sessionid', '');
@@ -262,10 +262,10 @@ 
         }
         if (!empty($this->set['user'])) {
             if ($this->newDoc) {
-                $SQL = "INSERT into {$this->makeTable('manager_users')} SET " . implode(', ', $this->set['user']);
+                $SQL = "INSERT into {$this->makeTable('manager_users')} SET ".implode(', ', $this->set['user']);
             } else {
-                $SQL = "UPDATE {$this->makeTable('manager_users')} SET " . implode(', ',
-                        $this->set['user']) . " WHERE id = " . $this->id;
+                $SQL = "UPDATE {$this->makeTable('manager_users')} SET ".implode(', ',
+                        $this->set['user'])." WHERE id = ".$this->id;
             }
             $this->query($SQL);
         }
@@ -285,11 +285,11 @@ 
         if (!empty($this->set['attribute'])) {
             if ($this->newDoc) {
                 $this->set('internalKey', $this->id)->Uset('internalKey', 'attribute');
-                $SQL = "INSERT into {$this->makeTable('user_attributes')} SET " . implode(', ',
+                $SQL = "INSERT into {$this->makeTable('user_attributes')} SET ".implode(', ',
                         $this->set['attribute']);
             } else {
-                $SQL = "UPDATE {$this->makeTable('user_attributes')} SET " . implode(', ',
-                        $this->set['attribute']) . " WHERE  internalKey = " . $this->getID();
+                $SQL = "UPDATE {$this->makeTable('user_attributes')} SET ".implode(', ',
+                        $this->set['attribute'])." WHERE  internalKey = ".$this->getID();
             }
             $this->query($SQL);
         }
@@ -446,10 +446,10 @@ 
             ), $fire_events);
             if (is_array($eventResult)) {
                 foreach ($eventResult as $result) {
-                    $pluginFlag = (bool)$result;
+                    $pluginFlag = (bool) $result;
                 }
             } else {
-                $pluginFlag = (bool)$eventResult;
+                $pluginFlag = (bool) $eventResult;
             }
             if (!$pluginFlag) {
                 $hashType = $this->getPasswordHashType($_password);
@@ -586,7 +586,7 @@ 
     {
         if (!empty($cookieName) && $this->getID() !== null) {
             $secure = $this->isSecure();
-            $remember = is_bool($remember) ? $this->getRememberTime() : (int)$remember;
+            $remember = is_bool($remember) ? $this->getRememberTime() : (int) $remember;
             $cookieValue = $this->get('username');
             $cookieExpires = time() + $remember;
             setcookie($cookieName, $cookieValue, $cookieExpires, MODX_BASE_URL, '', $secure, true);
@@ -608,7 +608,7 @@ 
             $membergroup_access = $this->modx->getFullTableName('membergroup_access');
 
             $sql = "SELECT `uga`.`documentgroup` FROM {$member_groups} as `ug`
-                INNER JOIN {$membergroup_access} as `uga` ON `uga`.`membergroup`=`ug`.`user_group` WHERE `ug`.`member` = " . $user->getID();
+                INNER JOIN {$membergroup_access} as `uga` ON `uga`.`membergroup`=`ug`.`user_group` WHERE `ug`.`member` = ".$user->getID();
             $out = $this->modx->db->getColumn('documentgroup', $this->query($sql));
 
         }
@@ -631,7 +631,7 @@ 
 
             $rs = $this->query("SELECT `ug`.`user_group`, `ugn`.`name` FROM {$member_groups} as `ug`
                 INNER JOIN {$membergroup_names} as `ugn` ON `ugn`.`id`=`ug`.`user_group`
-                WHERE `ug`.`member` = " . $user->getID());
+                WHERE `ug`.`member` = ".$user->getID());
             while ($row = $this->modx->db->getRow($rs)) {
                 $out[$row['user_group']] = $row['name'];
             }
@@ -709,31 +709,31 @@ 
      */
     public function makeHash($pass, $seed, $algorithm)
     {
-        $salt = md5($pass . $seed);
+        $salt = md5($pass.$seed);
 
         switch ($algorithm) {
             case 'BLOWFISH_Y':
-                $salt = '$2y$07$' . substr($salt, 0, 22);
+                $salt = '$2y$07$'.substr($salt, 0, 22);
                 break;
             case 'BLOWFISH_A':
-                $salt = '$2a$07$' . substr($salt, 0, 22);
+                $salt = '$2a$07$'.substr($salt, 0, 22);
                 break;
             case 'SHA512':
-                $salt = '$6$' . substr($salt, 0, 16);
+                $salt = '$6$'.substr($salt, 0, 16);
                 break;
             case 'SHA256':
-                $salt = '$5$' . substr($salt, 0, 16);
+                $salt = '$5$'.substr($salt, 0, 16);
                 break;
             case 'MD5':
-                $salt = '$1$' . substr($salt, 0, 8);
+                $salt = '$1$'.substr($salt, 0, 8);
                 break;
             default:
                 $algorithm = 'UNCRYPT';
                 break;
         }
 
-        $pass = $algorithm !== 'UNCRYPT' ? sha1($pass) . crypt($pass, $salt) : sha1($salt . $pass);
-        $out = strtolower($algorithm) . '>' . md5($salt . $pass) . substr(md5($salt), 0, 8);
+        $pass = $algorithm !== 'UNCRYPT' ? sha1($pass).crypt($pass, $salt) : sha1($salt.$pass);
+        $out = strtolower($algorithm).'>'.md5($salt.$pass).substr(md5($salt), 0, 8);
 
         return $out;
     }

Braces +4 added lines, -2 removed lines

@@ -75,7 +75,8 @@ 
      * @param $val
      * @return $this
      */
-    protected function setRememberTime($val){
+    protected function setRememberTime($val)
+    {
         $this->rememberTime = (int)$val;
         return $this;
     }
@@ -83,7 +84,8 @@ 
     /**
      * @return integer
      */
-    public function getRememberTime(){
+    public function getRememberTime()
+    {
         return $this->rememberTime;
     }
 

assets/snippets/DocLister/core/lang/japanese-utf8/paginate.inc.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-if ( ! defined('MODX_BASE_PATH')) {
+if (!defined('MODX_BASE_PATH')) {
     die('What are you doing? Get out of here!');
 }