AgelxNash / DocLister

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/snippets/DocLister/core/filterDocLister.abstract.php

Spacing +11 added lines, -11 removed lines

@@ -127,7 +127,7 @@ 
      */
     protected function build_sql_where($table_alias, $field, $operator, $value)
     {
-        $this->DocLister->debug->debug('Build SQL query for filters: ' . $this->DocLister->debug->dumpData(func_get_args()),
+        $this->DocLister->debug->debug('Build SQL query for filters: '.$this->DocLister->debug->dumpData(func_get_args()),
             'buildQuery', 2);
         $output = sqlHelper::tildeField($field, $table_alias);
 
@@ -135,28 +135,28 @@ 
             case '=':
             case 'eq':
             case 'is':
-                $output .= " = '" . $this->modx->db->escape($value) . "'";
+                $output .= " = '".$this->modx->db->escape($value)."'";
                 break;
             case '!=':
             case 'no':
             case 'isnot':
-                $output .= " != '" . $this->modx->db->escape($value) . "'";
+                $output .= " != '".$this->modx->db->escape($value)."'";
                 break;
             case '>':
             case 'gt':
-                $output .= ' > ' . str_replace(',', '.', floatval($value));
+                $output .= ' > '.str_replace(',', '.', floatval($value));
                 break;
             case '<':
             case 'lt':
-                $output .= ' < ' . str_replace(',', '.', floatval($value));
+                $output .= ' < '.str_replace(',', '.', floatval($value));
                 break;
             case '<=':
             case 'elt':
-                $output .= ' <= ' . str_replace(',', '.', floatval($value));
+                $output .= ' <= '.str_replace(',', '.', floatval($value));
                 break;
             case '>=':
             case 'egt':
-                $output .= ' >= ' . str_replace(',', '.', floatval($value));
+                $output .= ' >= '.str_replace(',', '.', floatval($value));
                 break;
             case '%':
             case 'like':
@@ -169,7 +169,7 @@ 
                 $output = $this->DocLister->LikeEscape($output, $value, '=', '%[+value+]');
                 break;
             case 'regexp':
-                $output .= " REGEXP '" . $this->modx->db->escape($value) . "'";
+                $output .= " REGEXP '".$this->modx->db->escape($value)."'";
                 break;
             case 'against':
                 /** content:pagetitle,description,content,introtext:against:искомая строка */
@@ -192,16 +192,16 @@ 
                     $word_arr[] = $this->DocLister->LikeEscape($output, $word);
                 }
                 if (!empty($word_arr)) {
-                    $output = '(' . implode(' OR ', $word_arr) . ')';
+                    $output = '('.implode(' OR ', $word_arr).')';
                 } else {
                     $output = '';
                 }
                 break;
             case 'in':
-                $output .= ' IN(' . $this->DocLister->sanitarIn($value, ',', true) . ')';
+                $output .= ' IN('.$this->DocLister->sanitarIn($value, ',', true).')';
                 break;
             case 'notin':
-                $output .= ' NOT IN(' . $this->DocLister->sanitarIn($value, ',', true) . ')';
+                $output .= ' NOT IN('.$this->DocLister->sanitarIn($value, ',', true).')';
                 break;
             default:
                 $output = '';

assets/snippets/DocLister/core/filter/tv.filter.php

Spacing +7 added lines, -7 removed lines

@@ -49,17 +49,17 @@ 
                 $this->tv_id = $tmp[0];
             }
             if (!$this->tv_id) {
-                $tvid = $this->modx->db->query("SELECT id FROM " . $this->DocLister->getTable('site_tmplvars') . " WHERE `name` = '" . $this->modx->db->escape($this->field) . "'");
+                $tvid = $this->modx->db->query("SELECT id FROM ".$this->DocLister->getTable('site_tmplvars')." WHERE `name` = '".$this->modx->db->escape($this->field)."'");
                 $this->tv_id = intval($this->modx->db->getValue($tvid));
             }
 
             if (!$this->tv_id) {
-                $this->DocLister->debug->warning('DocLister filtering by template variable "' . $this->DocLister->debug->dumpData($this->field) . '" failed. TV not found!');
+                $this->DocLister->debug->warning('DocLister filtering by template variable "'.$this->DocLister->debug->dumpData($this->field).'" failed. TV not found!');
             } else {
                 // create the alias for the join
-                $alias = 'dltv_' . $this->field;
+                $alias = 'dltv_'.$this->field;
                 if ($this->totalFilters > 0) {
-                    $alias .= '_' . $this->totalFilters;
+                    $alias .= '_'.$this->totalFilters;
                 }
                 $this->setTableAlias($alias);
                 $this->tvName = $this->field;
@@ -79,10 +79,10 @@ 
         $join = '';
         $exists = $this->DocLister->checkTableAlias($this->tvName, $this->extTV->tvValuesTable());
         $alias = $this->DocLister->TableAlias($this->tvName, $this->extTV->tvValuesTable(), $this->getTableAlias());
-        $this->field = $alias . ".value";
+        $this->field = $alias.".value";
         if (!$exists) {
-            $join = 'LEFT JOIN ' . $this->DocLister->getTable($this->extTV->tvValuesTable(),
-                    $alias) . ' ON `' . $alias . '`.`contentid`=`' . content_DL_filter::TableAlias . '`.`id` AND `' . $alias . '`.`tmplvarid`=' . $this->tv_id;
+            $join = 'LEFT JOIN '.$this->DocLister->getTable($this->extTV->tvValuesTable(),
+                    $alias).' ON `'.$alias.'`.`contentid`=`'.content_DL_filter::TableAlias.'`.`id` AND `'.$alias.'`.`tmplvarid`='.$this->tv_id;
         } else {
             $this->setTableAlias($alias);
         }

assets/snippets/DocLister/snippet.DLReflect.php

Indentation +4 added lines, -4 removed lines

@@ -44,10 +44,10 @@
 $reflectTPL = APIHelpers::getkey($params, 'reflectTPL',
     '@CODE: <li><a href="[+url+]" title="[+title+]">[+title+]</a></li>');
 /**
- * activeReflectTPL
- *        Шаблон активной даты.
- *    Поддерживается такие же плейсхолдеры, как и в шаблоне reflectTPL
- */
+     * activeReflectTPL
+     *        Шаблон активной даты.
+     *    Поддерживается такие же плейсхолдеры, как и в шаблоне reflectTPL
+     */
 $activeReflectTPL = APIHelpers::getkey($params, 'activeReflectTPL', '@CODE: <li><span>[+title+]</span></li>');
 
 list($dateFormat, $sqlDateFormat, $reflectValidator) = DLReflect::switchReflect($reflectType, function () {

Spacing +17 added lines, -17 removed lines

@@ -10,9 +10,9 @@ 
  *    &limitAfter=`3`
  * ]]
  */
-include_once(MODX_BASE_PATH . 'assets/snippets/DocLister/lib/DLCollection.class.php');
-include_once(MODX_BASE_PATH . 'assets/lib/APIHelpers.class.php');
-include_once(MODX_BASE_PATH . 'assets/snippets/DocLister/lib/DLReflect.class.php');
+include_once(MODX_BASE_PATH.'assets/snippets/DocLister/lib/DLCollection.class.php');
+include_once(MODX_BASE_PATH.'assets/lib/APIHelpers.class.php');
+include_once(MODX_BASE_PATH.'assets/snippets/DocLister/lib/DLReflect.class.php');
 
 $params = is_array($modx->event->params) ? $modx->event->params : array();
 
@@ -50,9 +50,9 @@ 
  */
 $activeReflectTPL = APIHelpers::getkey($params, 'activeReflectTPL', '@CODE: <li><span>[+title+]</span></li>');
 
-list($dateFormat, $sqlDateFormat, $reflectValidator) = DLReflect::switchReflect($reflectType, function () {
+list($dateFormat, $sqlDateFormat, $reflectValidator) = DLReflect::switchReflect($reflectType, function(){
     return array('m-Y', '%m-%Y', array('DLReflect', 'validateMonth'));
-}, function () {
+}, function(){
     return array('Y', '%Y', array('DLReflect', 'validateYear'));
 });
 $tmp = $originalDate = date($dateFormat);
@@ -142,14 +142,14 @@ 
  * Возможные значения: Любое число. 0 расценивается как все доступные месяцы
  * Значение по умолчанию: 0
  */
-$limitBefore = (int)APIHelpers::getkey($params, 'limitBefore', 0);
+$limitBefore = (int) APIHelpers::getkey($params, 'limitBefore', 0);
 /**
  * limitAfter
  *        Число элементов после месяца указанного в activeMonth параметре
  * Возможные значения: Любое число. 0 расценивается как все доступные месяцы
  * Значение по умолчанию: 0
  */
-$limitAfter = (int)APIHelpers::getkey($params, 'limitAfter', 0);
+$limitAfter = (int) APIHelpers::getkey($params, 'limitAfter', 0);
 $display = $limitBefore + 1 + $limitAfter;
 
 $out = '';
@@ -161,10 +161,10 @@ 
 $DLParams['saveDLObject'] = 'DLAPI';
 if ($reflectSource == 'tv') {
     $DLParams['tvSortType'] = 'TVDATETIME';
-    $DLParams['selectFields'] = "DATE_FORMAT(STR_TO_DATE(`dltv_" . $reflectField . "_1`.`value`,'%d-%m-%Y %H:%i:%s'), '" . $sqlDateFormat . "') as `id`";
+    $DLParams['selectFields'] = "DATE_FORMAT(STR_TO_DATE(`dltv_".$reflectField."_1`.`value`,'%d-%m-%Y %H:%i:%s'), '".$sqlDateFormat."') as `id`";
 } else {
     $DLParams['orderBy'] = $reflectField;
-    $DLParams['selectFields'] = "DATE_FORMAT(FROM_UNIXTIME(" . $reflectField . "), '" . $sqlDateFormat . "') as `id`";
+    $DLParams['selectFields'] = "DATE_FORMAT(FROM_UNIXTIME(".$reflectField."), '".$sqlDateFormat."') as `id`";
 }
 $totalReflects = $modx->runSnippet('DocLister', $DLParams);
 /** Получаем объект DocLister'a */
@@ -181,7 +181,7 @@ 
     $totalReflects = array();
 }
 $totalReflects = new DLCollection($modx, $totalReflects);
-$totalReflects = $totalReflects->filter(function ($el) {
+$totalReflects = $totalReflects->filter(function($el){
     return !empty($el['id']);
 });
 /** Добавляем активную дату в коллекцию */
@@ -195,7 +195,7 @@ 
     $totalReflects->add(array('id' => $originalCurrentReflect), $originalCurrentReflect);
 }
 /** Сортируем даты по возрастанию */
-$totalReflects->sort(function ($a, $b) use ($dateFormat) {
+$totalReflects->sort(function($a, $b) use ($dateFormat) {
     $aDate = DateTime::createFromFormat($dateFormat, $a['id']);
     $bDate = DateTime::createFromFormat($dateFormat, $b['id']);
 
@@ -203,7 +203,7 @@ 
 })->reindex();
 
 /** Разделяем коллекцию дат на 2 части (до текущей даты и после) */
-list($lReflect, $rReflect) = $totalReflects->partition(function ($key, $val) use (
+list($lReflect, $rReflect) = $totalReflects->partition(function($key, $val) use (
     $activeReflect,
     $originalDate,
     $dateFormat
@@ -267,7 +267,7 @@ 
 
 $sortDir = APIHelpers::getkey($params, 'sortDir', 'ASC');
 /** Сортируем результатирующий список  */
-$outReflects = $outReflects->sort(function ($a, $b) use ($sortDir, $dateFormat) {
+$outReflects = $outReflects->sort(function($a, $b) use ($sortDir, $dateFormat) {
     $aDate = DateTime::createFromFormat($dateFormat, $a);
     $bDate = DateTime::createFromFormat($dateFormat, $b);
     $out = false;
@@ -287,15 +287,15 @@ 
 foreach ($outReflects as $reflectItem) {
     $tpl = (!is_null($activeReflect) && $activeReflect == $reflectItem) ? $activeReflectTPL : $reflectTPL;
 
-    $data = DLReflect::switchReflect($reflectType, function () use ($reflectItem, $DLAPI) {
+    $data = DLReflect::switchReflect($reflectType, function() use ($reflectItem, $DLAPI) {
         list($vMonth, $vYear) = explode('-', $reflectItem, 2);
 
         return array(
             'monthNum'  => $vMonth,
-            'monthName' => $DLAPI->getMsg('months.' . (int)$vMonth),
+            'monthName' => $DLAPI->getMsg('months.'.(int) $vMonth),
             'year'      => $vYear,
         );
-    }, function () use ($reflectItem) {
+    }, function() use ($reflectItem) {
         return array(
             'year' => $reflectItem
         );
@@ -327,4 +327,4 @@ 
     $debug = '';
 }
 
-return $debug . $out;
+return $debug.$out;

Braces +8 added lines, -8 removed lines

@@ -50,9 +50,9 @@ 
  */
 $activeReflectTPL = APIHelpers::getkey($params, 'activeReflectTPL', '@CODE: <li><span>[+title+]</span></li>');
 
-list($dateFormat, $sqlDateFormat, $reflectValidator) = DLReflect::switchReflect($reflectType, function () {
+list($dateFormat, $sqlDateFormat, $reflectValidator) = DLReflect::switchReflect($reflectType, function (){
     return array('m-Y', '%m-%Y', array('DLReflect', 'validateMonth'));
-}, function () {
+}, function (){
     return array('Y', '%Y', array('DLReflect', 'validateYear'));
 });
 $tmp = $originalDate = date($dateFormat);
@@ -181,7 +181,7 @@ 
     $totalReflects = array();
 }
 $totalReflects = new DLCollection($modx, $totalReflects);
-$totalReflects = $totalReflects->filter(function ($el) {
+$totalReflects = $totalReflects->filter(function ($el){
     return !empty($el['id']);
 });
 /** Добавляем активную дату в коллекцию */
@@ -195,7 +195,7 @@ 
     $totalReflects->add(array('id' => $originalCurrentReflect), $originalCurrentReflect);
 }
 /** Сортируем даты по возрастанию */
-$totalReflects->sort(function ($a, $b) use ($dateFormat) {
+$totalReflects->sort(function ($a, $b) use ($dateFormat){
     $aDate = DateTime::createFromFormat($dateFormat, $a['id']);
     $bDate = DateTime::createFromFormat($dateFormat, $b['id']);
 
@@ -207,7 +207,7 @@ 
     $activeReflect,
     $originalDate,
     $dateFormat
-) {
+){
     $aDate = DateTime::createFromFormat($dateFormat, $val['id']);
     if (is_null($activeReflect)) {
         $activeReflect = $originalDate;
@@ -267,7 +267,7 @@ 
 
 $sortDir = APIHelpers::getkey($params, 'sortDir', 'ASC');
 /** Сортируем результатирующий список  */
-$outReflects = $outReflects->sort(function ($a, $b) use ($sortDir, $dateFormat) {
+$outReflects = $outReflects->sort(function ($a, $b) use ($sortDir, $dateFormat){
     $aDate = DateTime::createFromFormat($dateFormat, $a);
     $bDate = DateTime::createFromFormat($dateFormat, $b);
     $out = false;
@@ -287,7 +287,7 @@ 
 foreach ($outReflects as $reflectItem) {
     $tpl = (!is_null($activeReflect) && $activeReflect == $reflectItem) ? $activeReflectTPL : $reflectTPL;
 
-    $data = DLReflect::switchReflect($reflectType, function () use ($reflectItem, $DLAPI) {
+    $data = DLReflect::switchReflect($reflectType, function () use ($reflectItem, $DLAPI){
         list($vMonth, $vYear) = explode('-', $reflectItem, 2);
 
         return array(
@@ -295,7 +295,7 @@ 
             'monthName' => $DLAPI->getMsg('months.' . (int)$vMonth),
             'year'      => $vYear,
         );
-    }, function () use ($reflectItem) {
+    }, function () use ($reflectItem){
         return array(
             'year' => $reflectItem
         );

assets/snippets/DocLister/core/filter/private.filter.php

Spacing +3 added lines, -3 removed lines

@@ -38,7 +38,7 @@ 
             $docgrp = implode(",", $docgrp);
         }
         $alias = parent::TableAlias;
-        $where = ($this->modx->isFrontend() ? "`{$alias}`.`privateweb`=0" : "1='{$_SESSION['mgrRole']}' OR {$alias}.`privatemgr`=0") . (!$docgrp ? "" : " OR `{$this->tableAlias}`.`document_group` IN ({$docgrp})");
+        $where = ($this->modx->isFrontend() ? "`{$alias}`.`privateweb`=0" : "1='{$_SESSION['mgrRole']}' OR {$alias}.`privatemgr`=0").(!$docgrp ? "" : " OR `{$this->tableAlias}`.`document_group` IN ({$docgrp})");
 
         return "($where)";
     }
@@ -48,8 +48,8 @@ 
      */
     public function get_join()
     {
-        $join = 'LEFT JOIN ' . $this->DocLister->getTable('document_groups',
-                $this->tableAlias) . ' ON `' . $this->tableAlias . '`.`document`=`' . parent::TableAlias . '`.`id`';
+        $join = 'LEFT JOIN '.$this->DocLister->getTable('document_groups',
+                $this->tableAlias).' ON `'.$this->tableAlias.'`.`document`=`'.parent::TableAlias.'`.`id`';
 
         return $join;
     }

assets/snippets/DocLister/core/extender/tv.extender.inc

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

@@ -219,7 +219,7 @@
         $tbl_site_tmplvars = $this->DocLister->getTable('site_tmplvars');

         $fields = 'id,name,default_text as value,display,display_params,type';

         $implodeTvId = implode(',', $tvId);

-        $rs = $this->DocLister->dbQuery("SELECT {$fields} FROM {$tbl_site_tmplvars} WHERE id IN({$implodeTvId})");

+        $rs = $this->DocLister->dbQuery("select {$fields} FROM {$tbl_site_tmplvars} WHERE id IN({$implodeTvId})");

         $rows = $this->modx->db->makeArray($rs);

         $out = array();

         foreach ($rows as $item) {

Spacing +12 added lines, -12 removed lines

@@ -115,7 +115,7 @@ 
         $tvPrefix = $this->_TVprefix;

 

         foreach ($rows as $item) {

-            $out[$item['contentid']][$tvPrefix . $tv[$item['tmplvarid']]] = $item['value'];

+            $out[$item['contentid']][$tvPrefix.$tv[$item['tmplvarid']]] = $item['value'];

         }

         $tmp = explode(",", $this->DocLister->sanitarIn($IDs, ',', false));

         foreach ($tmp as $item) {

@@ -167,7 +167,7 @@ 
                 $out = array_unique($tmp);

                 $tmp = array();

                 foreach ($out as $item) {

-                    $tmp[] = $this->_TVprefix . $item;

+                    $tmp[] = $this->_TVprefix.$item;

                 }

             }

         } else {

@@ -186,8 +186,8 @@ 
      */

     public function renderTV($iddoc, $tvname, $tvval, $param)

     {

-        include_once MODX_MANAGER_PATH . "includes/tmplvars.format.inc.php";

-        include_once MODX_MANAGER_PATH . "includes/tmplvars.commands.inc.php";

+        include_once MODX_MANAGER_PATH."includes/tmplvars.format.inc.php";

+        include_once MODX_MANAGER_PATH."includes/tmplvars.commands.inc.php";

 

         return getTVDisplayFormat($tvname, $tvval, $param['display'], $param['display_params'], $param['type'], $iddoc,

             '');

@@ -226,7 +226,7 @@ 
         $rows = $this->modx->db->makeArray($rs);

         $out = array();

         foreach ($rows as $item) {

-            $out[$this->_TVprefix . $item['name']] = $item;

+            $out[$this->_TVprefix.$item['name']] = $item;

         }

 

         return $out;

@@ -265,20 +265,20 @@ 
                 $item = explode(" ", trim($item), 2);

                 if (isset($TVnames[$item[0]])) {

                     $exists = $this->DocLister->checkTableAlias($item[0], $this->tvValuesTable());

-                    $prefix = 'dltv_' . $item[0] . '_' . ($i + 1);

+                    $prefix = 'dltv_'.$item[0].'_'.($i + 1);

                     $prefix = $this->storeTable ? $this->DocLister->TableAlias($item[0], $this->tvValuesTable(),

                         $prefix) : $prefix;

                     if (!$exists) {

-                        $table .= " LEFT JOIN " . $this->DocLister->getTable($this->tvValuesTable(), $prefix) . "

-                        on `" . $prefix . "`.`contentid`=`c`.`id` AND `" . $prefix . "`.`tmplvarid`=" . $TVnames[$item[0]];

+                        $table .= " LEFT JOIN ".$this->DocLister->getTable($this->tvValuesTable(), $prefix)."

+                        on `" . $prefix."`.`contentid`=`c`.`id` AND `".$prefix."`.`tmplvarid`=".$TVnames[$item[0]];

                     }

                     if (in_array($item[0], $withDefault)) {

                         $exists = $this->DocLister->checkTableAlias($item[0], "site_tmplvars");

                         $dPrefix = $this->storeTable ? $this->DocLister->TableAlias($item[0], "site_tmplvars",

-                            'd_' . $prefix) : 'd_' . $prefix;

+                            'd_'.$prefix) : 'd_'.$prefix;

                         if (!$exists) {

-                            $table .= " LEFT JOIN " . $this->DocLister->getTable("site_tmplvars",

-                                    $dPrefix) . " on `" . $dPrefix . "`.`id` = " . $TVnames[$item[0]];

+                            $table .= " LEFT JOIN ".$this->DocLister->getTable("site_tmplvars",

+                                    $dPrefix)." on `".$dPrefix."`.`id` = ".$TVnames[$item[0]];

                         }

                         $field = "IFNULL(`{$prefix}`.`value`, `{$dPrefix}`.`default_text`)";

                     } else {

@@ -288,7 +288,7 @@ 
                 }

                 $item = implode(" ", $item);

             }

-            $sort = "ORDER BY " . implode(",", $matches);

+            $sort = "ORDER BY ".implode(",", $matches);

         }

 

         return array($table, $sort);

Braces +58 added lines, -58 removed lines

@@ -10,8 +10,8 @@ 
  * Обработка TV параметров перед выводом

  *

  */

-class tv_DL_Extender extends extDocLister

-{

+class tv_DL_Extender extends extDocLister
+{
     /**

      * @var mixed|string

      */

@@ -32,10 +32,10 @@ 
      * @param DocLister $DocLister

      * @param $name

      */

-    public function __construct($DocLister, $name)

-    {

+    public function __construct($DocLister, $name)
+    {
         parent::__construct($DocLister, $name);

-        if (!isset($this->modx->_TVnames)) {

+        if (!isset($this->modx->_TVnames)) {
             $this->modx->_TVnames = array();

         }

         $this->tvValuesTable = $this->DocLister->getCFGDef('tvValuesTable', $this->tvValuesTable());

@@ -45,26 +45,26 @@ 
     /**

      * @return bool

      */

-    protected function run()

-    {

+    protected function run()
+    {
         return true;

     }

 

     /**

      * @return mixed|string

      */

-    public function tvValuesTable()

-    {

+    public function tvValuesTable()
+    {
         return $this->tvValuesTable;

     }

 

     /**

      * @return mixed

      */

-    public function getTVnames()

-    {

+    public function getTVnames()
+    {
         $out = array();

-        foreach ($this->modx->_TVnames as $name => $tv) {

+        foreach ($this->modx->_TVnames as $name => $tv) {
             $out[$name] = $tv['id'];

         }

 

@@ -75,14 +75,14 @@ 
      * @param bool $reload

      * @return mixed

      */

-    public function getAllTV_Name($reload = false)

-    {

-        if (empty($this->modx->_TVnames) || $reload) {

+    public function getAllTV_Name($reload = false)
+    {
+        if (empty($this->modx->_TVnames) || $reload) {
             $from = $this->DocLister->getTable('site_tmplvars');

             $rs = $this->DocLister->dbQuery("SELECT `id`, `name`, `type` FROM {$from}");

             $rows = $this->modx->db->makeArray($rs);

 

-            foreach ($rows as $item) {

+            foreach ($rows as $item) {
                 $this->modx->_TVnames[$item['name']] = array(

                     "id"   => $item['id'],

                     "type" => $item['type']

@@ -98,11 +98,11 @@ 
      * @param $tvlist

      * @return array

      */

-    public function getTVList($IDs, $tvlist)

-    {

+    public function getTVList($IDs, $tvlist)
+    {
         $out = array();

         $tv = $this->getTVid($tvlist);

-        if (empty($tv)) {

+        if (empty($tv)) {
             return $out;

         }

         $tvId = array_keys($tv);

@@ -114,24 +114,24 @@ 
         $rows = $this->modx->db->makeArray($rs);

         $tvPrefix = $this->_TVprefix;

 

-        foreach ($rows as $item) {

+        foreach ($rows as $item) {
             $out[$item['contentid']][$tvPrefix . $tv[$item['tmplvarid']]] = $item['value'];

         }

         $tmp = explode(",", $this->DocLister->sanitarIn($IDs, ',', false));

-        foreach ($tmp as $item) {

-            if (!isset($out[$item])) {

+        foreach ($tmp as $item) {
+            if (!isset($out[$item])) {
                 $out[$item] = array();

             };

         }

         $renderTV = $this->getListRenderTV();

         $tvDef = $this->loadTVDefault($tvId);

         $TVkeys = array_keys($tvDef);

-        foreach ($out as $itemid => $item) {

-            foreach ($TVkeys as $name) {

-                if (!isset($out[$itemid][$name])) {

+        foreach ($out as $itemid => $item) {
+            foreach ($TVkeys as $name) {
+                if (!isset($out[$itemid][$name])) {
                     $out[$itemid][$name] = $tvDef[$name]['value'];

                 }

-                if (in_array($name, $renderTV) || $renderTV == array("*")) {

+                if (in_array($name, $renderTV) || $renderTV == array("*")) {
                     $out[$itemid][$name] = $this->renderTV($itemid, $name, $out[$itemid][$name], $tvDef[$name]);

                 }

             }

@@ -143,10 +143,10 @@ 
     /**

      * @return mixed|string

      */

-    public function getTVprefix()

-    {

+    public function getTVprefix()
+    {
         $tvPrefix = $this->DocLister->getCFGDef('tvPrefix', 'tv');

-        if (!empty($tvPrefix)) {

+        if (!empty($tvPrefix)) {
             $tvPrefix .= '.';

         }

 

@@ -156,21 +156,21 @@ 
     /**

      * @return array|mixed

      */

-    public function getListRenderTV()

-    {

+    public function getListRenderTV()
+    {
         $tmp = $this->DocLister->getCFGDef('renderTV', '');

-        if ($tmp != '' && $tmp != '*') {

+        if ($tmp != '' && $tmp != '*') {
             $tmp = explode(",", $tmp);

-            if (in_array("*", $tmp)) {

+            if (in_array("*", $tmp)) {
                 $tmp = array("*");

-            } else {

+            } else {
                 $out = array_unique($tmp);

                 $tmp = array();

-                foreach ($out as $item) {

+                foreach ($out as $item) {
                     $tmp[] = $this->_TVprefix . $item;

                 }

             }

-        } else {

+        } else {
             $tmp = array($tmp);

         }

 

@@ -184,8 +184,8 @@ 
      * @param $param

      * @return mixed

      */

-    public function renderTV($iddoc, $tvname, $tvval, $param)

-    {

+    public function renderTV($iddoc, $tvname, $tvval, $param)
+    {
         include_once MODX_MANAGER_PATH . "includes/tmplvars.format.inc.php";

         include_once MODX_MANAGER_PATH . "includes/tmplvars.commands.inc.php";

 

@@ -197,15 +197,15 @@ 
      * @param $tvlist

      * @return array

      */

-    public function getTVid($tvlist)

-    {

-        if (!empty($tvlist) && is_scalar($tvlist)) {

+    public function getTVid($tvlist)
+    {
+        if (!empty($tvlist) && is_scalar($tvlist)) {
             $tvlist = explode(",", $tvlist);

         }

         $out = array();

-        foreach ($tvlist as $tv) {

+        foreach ($tvlist as $tv) {
             $tv = trim($tv);

-            if (isset($this->modx->_TVnames[$tv])) {

+            if (isset($this->modx->_TVnames[$tv])) {
                 $out[$this->modx->_TVnames[$tv]['id']] = $tv;

             }

         }

@@ -217,15 +217,15 @@ 
      * @param $tvId

      * @return array

      */

-    public function loadTVDefault($tvId)

-    {

+    public function loadTVDefault($tvId)
+    {
         $tbl_site_tmplvars = $this->DocLister->getTable('site_tmplvars');

         $fields = 'id,name,default_text as value,display,display_params,type';

         $implodeTvId = implode(',', $tvId);

         $rs = $this->DocLister->dbQuery("SELECT {$fields} FROM {$tbl_site_tmplvars} WHERE id IN({$implodeTvId})");

         $rows = $this->modx->db->makeArray($rs);

         $out = array();

-        foreach ($rows as $item) {

+        foreach ($rows as $item) {
             $out[$this->_TVprefix . $item['name']] = $item;

         }

 

@@ -236,8 +236,8 @@ 
      * @param $name

      * @return string

      */

-    public function addTVSortWithDefault($name)

-    {

+    public function addTVSortWithDefault($name)
+    {
         $dTV = explode(',', $this->DocLister->getCFGDef('tvSortWithDefault', ''));

         $dTV[] = $name;

         $tvList = implode(",", array_unique($dTV));

@@ -251,37 +251,37 @@ 
      * @param $sort

      * @return array

      */

-    public function injectSortByTV($table, $sort)

-    {

-        if (preg_match("/^ORDER BY (.*)/", $sort, $match)) {

+    public function injectSortByTV($table, $sort)
+    {
+        if (preg_match("/^ORDER BY (.*)/", $sort, $match)) {
             $TVnames = $this->getTVnames();

-            if (!is_array($TVnames)) {

+            if (!is_array($TVnames)) {
                 $TVnames = array();

             }

             $matches = explode(",", $match[1]);

             $sortType = explode(",", $this->DocLister->getCFGDef('tvSortType'));

             $withDefault = explode(",", $this->DocLister->getCFGDef('tvSortWithDefault'));

-            foreach ($matches as $i => &$item) {

+            foreach ($matches as $i => &$item) {
                 $item = explode(" ", trim($item), 2);

-                if (isset($TVnames[$item[0]])) {

+                if (isset($TVnames[$item[0]])) {
                     $exists = $this->DocLister->checkTableAlias($item[0], $this->tvValuesTable());

                     $prefix = 'dltv_' . $item[0] . '_' . ($i + 1);

                     $prefix = $this->storeTable ? $this->DocLister->TableAlias($item[0], $this->tvValuesTable(),

                         $prefix) : $prefix;

-                    if (!$exists) {

+                    if (!$exists) {
                         $table .= " LEFT JOIN " . $this->DocLister->getTable($this->tvValuesTable(), $prefix) . "

                         on `" . $prefix . "`.`contentid`=`c`.`id` AND `" . $prefix . "`.`tmplvarid`=" . $TVnames[$item[0]];

                     }

-                    if (in_array($item[0], $withDefault)) {

+                    if (in_array($item[0], $withDefault)) {
                         $exists = $this->DocLister->checkTableAlias($item[0], "site_tmplvars");

                         $dPrefix = $this->storeTable ? $this->DocLister->TableAlias($item[0], "site_tmplvars",

                             'd_' . $prefix) : 'd_' . $prefix;

-                        if (!$exists) {

+                        if (!$exists) {
                             $table .= " LEFT JOIN " . $this->DocLister->getTable("site_tmplvars",

                                     $dPrefix) . " on `" . $dPrefix . "`.`id` = " . $TVnames[$item[0]];

                         }

                         $field = "IFNULL(`{$prefix}`.`value`, `{$dPrefix}`.`default_text`)";

-                    } else {

+                    } else {
                         $field = "`{$prefix}`.`value`";

                     }

                     $item[0] = $this->DocLister->changeSortType($field, isset($sortType[$i]) ? $sortType[$i] : null);

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/site_content.php

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

@@ -295,7 +295,7 @@ 
             }
             $where = sqlHelper::trimLogicalOp($where);
 
-            $where = "WHERE {$where}";
+            $where = "where {$where}";
             $whereArr = array();
             if (!$this->getCFGDef('showNoPublish', 0)) {
                 $whereArr[] = "c.deleted=0 AND c.published=1";
@@ -388,15 +388,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.deleted=0 AND c.published=1";
             }
@@ -410,7 +410,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;
@@ -436,9 +436,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}) AND c.isfolder=1";
+            $where = "where {$where} c.parent IN ({$sanitarInIDs}) AND c.isfolder=1";
         } else {
-            $where = "WHERE {$where} c.parent IN ({$sanitarInIDs}) AND c.deleted=0 AND c.published=1 AND c.isfolder=1";
+            $where = "where {$where} c.parent IN ({$sanitarInIDs}) AND c.deleted=0 AND c.published=1 AND c.isfolder=1";
         }
 
         $rs = $this->dbQuery("SELECT id FROM {$tbl_site_content} {$where}");
@@ -528,7 +528,7 @@ 
         $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 +23 added lines, -23 removed lines

@@ -141,7 +141,7 @@ 
                         if (!$item[$date] && $date == 'pub_date' && isset($item['createdon'])) {
                             $date = 'createdon';
                         }
-                        $_date = is_numeric($item[$date]) && $item[$date] == (int)$item[$date] ? $item[$date] : strtotime($item[$date]);
+                        $_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');
@@ -172,7 +172,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) {
@@ -226,7 +226,7 @@ 
                     if (!$row[$date] && $date == 'pub_date' && isset($row['createdon'])) {
                         $date = 'createdon';
                     }
-                    $_date = is_numeric($row[$date]) && $row[$date] == (int)$row[$date] ? $row[$date] : strtotime($row[$date]);
+                    $_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');
@@ -242,7 +242,7 @@ 
                     $row['title'] = empty($row['menutitle']) ? $row['pagetitle'] : $row['menutitle'];
                 }
             }
-            if ((bool)$this->getCFGDef('makeUrl', 1) && (array('1') == $fields || in_array('url',$fields))
+            if ((bool) $this->getCFGDef('makeUrl', 1) && (array('1') == $fields || in_array('url', $fields))
             ) {
                 if (isset($row['type']) && $row['type'] == 'reference' && isset($row['content'])) {
                     $row['url'] = is_numeric($row['content']) ? $this->modx->makeUrl($row['content'], '', '',
@@ -281,7 +281,7 @@ 
             $q_true = $q_true ? $q_true : $this->getCFGDef('idType', 'parents') == 'parents';
             $where = $this->getCFGDef('addWhereList', '');
             $where = sqlHelper::trimLogicalOp($where);
-            $where = ($where ? $where . ' AND ' : '') . $this->_filters['where'];
+            $where = ($where ? $where.' AND ' : '').$this->_filters['where'];
             if ($where != '' && $this->_filters['where'] != '') {
                 $where .= " AND ";
             }
@@ -292,7 +292,7 @@ 
             if (!$this->getCFGDef('showNoPublish', 0)) {
                 $whereArr[] = "c.deleted=0 AND c.published=1";
             }
-            else{
+            else {
                 $q_true = 1;
             }
 
@@ -303,7 +303,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})";
@@ -315,7 +315,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;
                         }
@@ -326,7 +326,7 @@ 
                         break;
                 }
             }
-            $from = $tbl_site_content . " " . $this->_filters['join'];
+            $from = $tbl_site_content." ".$this->_filters['join'];
             $where = sqlHelper::trimLogicalOp($where);
 
             $q_true = $q_true ? $q_true : trim($where) != 'WHERE';
@@ -344,7 +344,7 @@ 
             $group = $this->getGroupSQL($this->getCFGDef('groupBy', 'c.id'));
 
             $q_true = $q_true ? $q_true : $group != '';
-            if ( $q_true ){
+            if ($q_true) {
                 $maxDocs = $this->getCFGDef('maxDocs', 0);
                 $limit = $maxDocs > 0 ? $this->LimitSQL($this->getCFGDef('maxDocs', 0)) : '';
                 $rs = $this->dbQuery("SELECT count(*) FROM (SELECT count(*) FROM {$from} {$where} {$group} {$limit}) as `tmp`");
@@ -369,12 +369,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);
 
@@ -397,7 +397,7 @@ 
             $fields = $this->getCFGDef('selectFields', 'c.*');
             $group = $this->getGroupSQL($this->getCFGDef('groupBy', ''));
             $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'],
+            list($tbl_site_content, $sort) = $this->injectSortByTV($tbl_site_content.' '.$this->_filters['join'],
                 $sort);
 
             $limit = $this->LimitSQL($this->getCFGDef('queryLimit', 0));
@@ -479,21 +479,21 @@ 
         $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')) {
                 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;
             }
         }
@@ -502,7 +502,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)) {
@@ -512,7 +512,7 @@ 
             $where[] = "c.deleted=0 AND c.published=1";
         }
         if (!empty($where)) {
-            $where = "WHERE " . implode(" AND ", $where);
+            $where = "WHERE ".implode(" AND ", $where);
         } else {
             $where = '';
         }
@@ -520,9 +520,9 @@ 
         $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))
             );
 
@@ -544,7 +544,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 +3 added lines, -5 removed lines

@@ -291,8 +291,7 @@ 
             $whereArr = array();
             if (!$this->getCFGDef('showNoPublish', 0)) {
                 $whereArr[] = "c.deleted=0 AND c.published=1";
-            }
-            else{
+            } else {
                 $q_true = 1;
             }
 
@@ -344,13 +343,12 @@ 
             $group = $this->getGroupSQL($this->getCFGDef('groupBy', 'c.id'));
 
             $q_true = $q_true ? $q_true : $group != '';
-            if ( $q_true ){
+            if ( $q_true ) {
                 $maxDocs = $this->getCFGDef('maxDocs', 0);
                 $limit = $maxDocs > 0 ? $this->LimitSQL($this->getCFGDef('maxDocs', 0)) : '';
                 $rs = $this->dbQuery("SELECT count(*) FROM (SELECT count(*) FROM {$from} {$where} {$group} {$limit}) as `tmp`");
                 $out = $this->modx->db->getValue($rs);
-            }
-            else {
+            } else {
                 $out = count($this->IDs);
             }
         }

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