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/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 +16 added lines, -16 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);
@@ -129,8 +129,8 @@ 
         if ($cache) {
             return;
         }
-        $thumbsCache = \APIhelpers::getkey($this->params,'thumbsCache',$this->thumbsCache);
-        $thumb = $thumbsCache . $url;
+        $thumbsCache = \APIhelpers::getkey($this->params, 'thumbsCache', $this->thumbsCache);
+        $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 */
@@ -246,8 +246,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)) {

Braces +3 added lines, -1 removed lines

@@ -272,6 +272,8 @@
      */
     public function setParams($params = array())
     {
-        if (is_array($params)) $this->params = $params;
+        if (is_array($params)) {
+            $this->params = $params;
+        }
     }
 }

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/lib/MODxAPI/modResource.php

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

@@ -590,7 +590,7 @@ 
             if ($this->newDoc) {
                 $SQL = "INSERT into {$this->makeTable('site_content')} SET " . implode(', ', $this->set);
             } else {
-                $SQL = "UPDATE {$this->makeTable('site_content')} SET " . implode(', ',
+                $SQL = "update {$this->makeTable('site_content')} SET " . implode(', ',
                         $this->set) . " WHERE `id` = " . $this->id;
             }
             $this->query($SQL);
@@ -600,7 +600,7 @@ 
             }
 
             if ($parent > 0) {
-                $this->query("UPDATE {$this->makeTable('site_content')} SET `isfolder`='1' WHERE `id`='{$parent}'");
+                $this->query("update {$this->makeTable('site_content')} SET `isfolder`='1' WHERE `id`='{$parent}'");
             }
         }
 
@@ -674,7 +674,7 @@ 
             $id = $this->sanitarIn($_ids);
             $uid = (int)$this->modx->getLoginUserId();
             $deletedon = time() + $this->modxConfig('server_offset_time');
-            $this->query("UPDATE {$this->makeTable('site_content')} SET `deleted`=1, `deletedby`={$uid}, `deletedon`={$deletedon} WHERE `id` IN ({$id})");
+            $this->query("update {$this->makeTable('site_content')} SET `deleted`=1, `deletedby`={$uid}, `deletedon`={$deletedon} WHERE `id` IN ({$id})");
         } else {
             throw new Exception('Invalid IDs list for mark trash: <pre>' . print_r($ids,
                     1) . '</pre> please, check ignore list: <pre>' . print_r($ignore, 1) . '</pre>');
@@ -867,7 +867,7 @@ 
             $tbl_site_tmplvars = $this->makeTable('site_tmplvars');
             $fields = 'id,name,default_text as value,display,display_params,type';
             $implodeTvId = implode(',', $tvId);
-            $rs = $this->query("SELECT {$fields} FROM {$tbl_site_tmplvars} WHERE id IN({$implodeTvId})");
+            $rs = $this->query("select {$fields} FROM {$tbl_site_tmplvars} WHERE id IN({$implodeTvId})");
             $rows = $this->modx->db->makeArray($rs);
             $this->tvd = array();
             foreach ($rows as $item) {
@@ -890,7 +890,7 @@ 
                 $sql = "SELECT `id` FROM {$this->makeTable('site_templates')} WHERE `templatename` = '" . $this->escape($tpl) . "'";
                 $rs = $this->query($sql);
                 if (!$rs || $this->modx->db->getRecordCount($rs) <= 0) {
-                    throw new Exception("Template {$tpl} is not exists");
+                    throw new Exception("template {$tpl} is not exists");
                 }
                 $tpl = $this->modx->db->getValue($rs);
             } else {
@@ -933,7 +933,7 @@ 
         $dir = strtolower($dir) == 'desc' ? 'desc' : 'asc';
         if (is_integer($parent) && $criteria !== '') {
             $this->query("SET @index := 0");
-            $this->query("UPDATE {$this->makeTable('site_content')} SET `menuindex` = (@index := @index + 1) WHERE `parent`={$parent} ORDER BY {$criteria} {$dir}");
+            $this->query("update {$this->makeTable('site_content')} SET `menuindex` = (@index := @index + 1) WHERE `parent`={$parent} ORDER BY {$criteria} {$dir}");
         }
 
         return $this;

Spacing +39 added lines, -39 removed lines

@@ -163,7 +163,7 @@ 
         $this->get_TV();
         $uTable = $this->makeTable("manager_users");
         $aTable = $this->makeTable("user_attributes");
-        $query = "SELECT `u`.`id`, `a`.`email`, `u`.`username`  FROM " . $aTable . " as `a` LEFT JOIN " . $uTable . " as `u` ON `u`.`id`=`a`.`internalKey`";
+        $query = "SELECT `u`.`id`, `a`.`email`, `u`.`username`  FROM ".$aTable." as `a` LEFT JOIN ".$uTable." as `u` ON `u`.`id`=`a`.`internalKey`";
         $query = $this->query($query);
         $this->managerUsers = new DLCollection($modx, empty($query) ? array() : $query);
     }
@@ -225,7 +225,7 @@ 
     public function getUrl()
     {
         $out = null;
-        $id = (int)$this->getID();
+        $id = (int) $this->getID();
         if (!empty($id)) {
             $out = $this->modx->makeUrl($id);
         }
@@ -278,8 +278,8 @@ 
     {
         $out = null;
         if ($this->getID() > 0) {
-            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";
             $tvval = $this->get($tvname);
             if ($this->isTVarrayField($tvname) && is_array($tvval)) {
                 $tvval = implode('||', $tvval);
@@ -323,14 +323,14 @@ 
         if ((is_scalar($value) || $this->isTVarrayField($key) || $this->isJsonField($key)) && is_scalar($key) && !empty($key)) {
             switch ($key) {
                 case 'parent':
-                    $value = (int)$value;
+                    $value = (int) $value;
                     break;
                 case 'template':
                     $value = trim($value);
                     $value = $this->setTemplate($value);
                     break;
                 case 'published':
-                    $value = (int)((bool)$value);
+                    $value = (int) ((bool) $value);
                     if ($value) {
                         $this->field['publishedon'] = time() + $this->modxConfig('server_offset_time');
                     }
@@ -350,7 +350,7 @@ 
                     }
                     break;
                 case 'deleted':
-                    $value = (int)((bool)$value);
+                    $value = (int) ((bool) $value);
                     if ($value) {
                         $this->field['deletedon'] = time() + $this->modxConfig('server_offset_time');
                     } else {
@@ -392,11 +392,11 @@ 
     protected function getUser($value, $default = 0)
     {
         $currentAdmin = APIHelpers::getkey($_SESSION, 'mgrInternalKey', 0);
-        $value = (int)$value;
+        $value = (int) $value;
         if (!empty($value)) {
             $by = $this->findUserBy($value);
-            $exists = $this->managerUsers->exists(function ($key, Helpers\Collection $val) use ($by, $value) {
-                return ($val->containsKey($by) && $val->get($by) === (string)$value);
+            $exists = $this->managerUsers->exists(function($key, Helpers\Collection $val) use ($by, $value) {
+                return ($val->containsKey($by) && $val->get($by) === (string) $value);
             });
             if (!$exists) {
                 $value = 0;
@@ -416,7 +416,7 @@ 
     protected function findUserBy($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 = 'id';
                 break;
             case filter_var($data, FILTER_VALIDATE_EMAIL):
@@ -466,9 +466,9 @@ 
             $this->markAllEncode();
             $this->newDoc = false;
 
-            $result = $this->query("SELECT * from {$this->makeTable('site_content')} where `id`=" . (int)$id);
+            $result = $this->query("SELECT * from {$this->makeTable('site_content')} where `id`=".(int) $id);
             $this->fromArray($this->modx->db->getRow($result));
-            $result = $this->query("SELECT * from {$this->makeTable('site_tmplvar_contentvalues')} where `contentid`=" . (int)$id);
+            $result = $this->query("SELECT * from {$this->makeTable('site_tmplvar_contentvalues')} where `contentid`=".(int) $id);
             while ($row = $this->modx->db->getRow($result)) {
                 $this->field[$this->tvid[$row['tmplvarid']]] = $row['value'];
             }
@@ -495,7 +495,7 @@ 
     {
         $parent = null;
         if ($this->field['pagetitle'] == '') {
-            $this->log['emptyPagetitle'] = 'Pagetitle is empty in <pre>' . print_r($this->field, true) . '</pre>';
+            $this->log['emptyPagetitle'] = 'Pagetitle is empty in <pre>'.print_r($this->field, true).'</pre>';
 
             return false;
         }
@@ -548,7 +548,7 @@ 
             }
             switch (true) {
                 case $key == 'parent':
-                    $parent = (int)$this->get($key);
+                    $parent = (int) $this->get($key);
                     $q = $this->query("SELECT count(`id`) FROM {$this->makeTable('site_content')} WHERE `id`='{$parent}'");
                     if ($this->modx->db->getValue($q) != 1) {
                         $parent = 0;
@@ -567,10 +567,10 @@ 
 
         if (!empty($this->set)) {
             if ($this->newDoc) {
-                $SQL = "INSERT into {$this->makeTable('site_content')} SET " . implode(', ', $this->set);
+                $SQL = "INSERT into {$this->makeTable('site_content')} SET ".implode(', ', $this->set);
             } else {
-                $SQL = "UPDATE {$this->makeTable('site_content')} SET " . implode(', ',
-                        $this->set) . " WHERE `id` = " . $this->id;
+                $SQL = "UPDATE {$this->makeTable('site_content')} SET ".implode(', ',
+                        $this->set)." WHERE `id` = ".$this->id;
             }
             $this->query($SQL);
 
@@ -634,7 +634,7 @@ 
      * @param $tvId
      * @return bool
      */
-    protected function belongsToTemplate($tvId) {
+    protected function belongsToTemplate($tvId){
         $template = $this->get('template');
 
         return isset($this->tvTpl[$template]) && in_array($tvId, $this->tvTpl[$template]);
@@ -651,12 +651,12 @@ 
         $_ids = $this->cleanIDs($ids, ',', $ignore);
         if (is_array($_ids) && $_ids != array()) {
             $id = $this->sanitarIn($_ids);
-            $uid = (int)$this->modx->getLoginUserId();
+            $uid = (int) $this->modx->getLoginUserId();
             $deletedon = time() + $this->modxConfig('server_offset_time');
             $this->query("UPDATE {$this->makeTable('site_content')} SET `deleted`=1, `deletedby`={$uid}, `deletedon`={$deletedon} WHERE `id` IN ({$id})");
         } else {
-            throw new Exception('Invalid IDs list for mark trash: <pre>' . print_r($ids,
-                    1) . '</pre> please, check ignore list: <pre>' . print_r($ignore, 1) . '</pre>');
+            throw new Exception('Invalid IDs list for mark trash: <pre>'.print_r($ids,
+                    1).'</pre> please, check ignore list: <pre>'.print_r($ignore, 1).'</pre>');
         }
 
         return $this;
@@ -738,15 +738,15 @@ 
     {
         $ignore = array(
             0, //empty document
-            (int)$this->modxConfig('site_start'),
-            (int)$this->modxConfig('error_page'),
-            (int)$this->modxConfig('unauthorized_page'),
-            (int)$this->modxConfig('site_unavailable_page')
+            (int) $this->modxConfig('site_start'),
+            (int) $this->modxConfig('error_page'),
+            (int) $this->modxConfig('unauthorized_page'),
+            (int) $this->modxConfig('site_unavailable_page')
         );
         $data = $this->query("SELECT DISTINCT setting_value FROM {$this->makeTable('web_user_settings')} WHERE `setting_name`='login_home' AND `setting_value`!=''");
         $data = $this->modx->db->makeArray($data);
         foreach ($data as $item) {
-            $ignore[] = (int)$item['setting_value'];
+            $ignore[] = (int) $item['setting_value'];
         }
 
         return array_unique($ignore);
@@ -769,9 +769,9 @@ 
             }
             if (($flag && $this->newDoc) || (!$this->newDoc && $flag && $this->id != $flag)) {
                 $suffix = substr($alias, -2);
-                if (preg_match('/-(\d+)/', $suffix, $tmp) && isset($tmp[1]) && (int)$tmp[1] > 1) {
-                    $suffix = (int)$tmp[1] + 1;
-                    $alias = substr($alias, 0, -2) . '-' . $suffix;
+                if (preg_match('/-(\d+)/', $suffix, $tmp) && isset($tmp[1]) && (int) $tmp[1] > 1) {
+                    $suffix = (int) $tmp[1] + 1;
+                    $alias = substr($alias, 0, -2).'-'.$suffix;
                 } else {
                     $alias .= '-2';
                 }
@@ -799,7 +799,7 @@ 
     {
         $this->modx->_TVnames = array();
         if (empty($this->modx->_TVnames) || $reload) {
-            $result = $this->query('SELECT `id`,`name`,`type` FROM ' . $this->makeTable('site_tmplvars'));
+            $result = $this->query('SELECT `id`,`name`,`type` FROM '.$this->makeTable('site_tmplvars'));
             while ($row = $this->modx->db->GetRow($result)) {
                 $this->modx->_TVnames[$row['name']] = array(
                     "id"   => $row['id'],
@@ -827,7 +827,7 @@ 
      */
     protected function loadTVTemplate()
     {
-        $q = $this->query("SELECT `tmplvarid`, `templateid` FROM " . $this->makeTable('site_tmplvar_templates'));
+        $q = $this->query("SELECT `tmplvarid`, `templateid` FROM ".$this->makeTable('site_tmplvar_templates'));
         $q = $this->modx->db->makeArray($q);
         $this->tvTpl = array();
         foreach ($q as $item) {
@@ -865,20 +865,20 @@ 
      */
     public function setTemplate($tpl)
     {
-        if (!is_numeric($tpl) || $tpl != (int)$tpl) {
+        if (!is_numeric($tpl) || $tpl != (int) $tpl) {
             if (is_scalar($tpl)) {
-                $sql = "SELECT `id` FROM {$this->makeTable('site_templates')} WHERE `templatename` = '" . $this->escape($tpl) . "'";
+                $sql = "SELECT `id` FROM {$this->makeTable('site_templates')} WHERE `templatename` = '".$this->escape($tpl)."'";
                 $rs = $this->query($sql);
                 if (!$rs || $this->modx->db->getRecordCount($rs) <= 0) {
                     throw new Exception("Template {$tpl} is not exists");
                 }
                 $tpl = $this->modx->db->getValue($rs);
             } else {
-                throw new Exception("Invalid template name: " . print_r($tpl, 1));
+                throw new Exception("Invalid template name: ".print_r($tpl, 1));
             }
         }
 
-        return (int)$tpl;
+        return (int) $tpl;
     }
 
     /**
@@ -1002,7 +1002,7 @@ 
         if ($this->isEncodableField($field)) {
             $data = $this->get($field);
             if ($this->isTVarrayField($field)) {
-                $out = is_array($data) ? implode('||', $data) : (string)$data;
+                $out = is_array($data) ? implode('||', $data) : (string) $data;
             } else {
                 $out = json_encode($data);
             }
@@ -1056,7 +1056,7 @@ 
     /**
      * @param int $docId
      */
-    public function getDocumentGroups($docId = 0) {
+    public function getDocumentGroups($docId = 0){
         $out = array();
         $doc = $this->switchObject($docId);
         if (null !== $doc->getID()) {
@@ -1064,7 +1064,7 @@ 
             $docgroup_names = $this->makeTable('documentgroup_names');
 
             $rs = $this->query("SELECT `dg`.`document_group`, `dgn`.`name` FROM {$doc_groups} as `dg` INNER JOIN {$docgroup_names} as `dgn` ON `dgn`.`id`=`dg`.`document_group`
-                WHERE `dg`.`document` = " . $doc->getID());
+                WHERE `dg`.`document` = ".$doc->getID());
             while ($row = $this->modx->db->getRow($rs)) {
                 $out[$row['document_group']] = $row['name'];
             }

Braces +14 added lines, -6 removed lines

@@ -395,7 +395,7 @@ 
         $value = (int)$value;
         if (!empty($value)) {
             $by = $this->findUserBy($value);
-            $exists = $this->managerUsers->exists(function ($key, Helpers\Collection $val) use ($by, $value) {
+            $exists = $this->managerUsers->exists(function ($key, Helpers\Collection $val) use ($by, $value){
                 return ($val->containsKey($by) && $val->get($by) === (string)$value);
             });
             if (!$exists) {
@@ -614,7 +614,9 @@ 
             $this->newDoc = false;
         }
 
-        if (!empty($this->groupIds)) $this->setDocumentGroups($this->id, $this->groupIds);
+        if (!empty($this->groupIds)) {
+            $this->setDocumentGroups($this->id, $this->groupIds);
+        }
         $this->invokeEvent('OnDocFormSave', array(
             'mode'   => $this->mode,
             'id'     => isset($this->id) ? $this->id : '',
@@ -634,7 +636,8 @@ 
      * @param $tvId
      * @return bool
      */
-    protected function belongsToTemplate($tvId) {
+    protected function belongsToTemplate($tvId)
+    {
         $template = $this->get('template');
 
         return isset($this->tvTpl[$template]) && in_array($tvId, $this->tvTpl[$template]);
@@ -816,7 +819,9 @@ 
                 $arrayTVs[] = $name;
             }
         }
-        if (empty($this->tvaFields)) $this->tvaFields = $arrayTVs;
+        if (empty($this->tvaFields)) {
+            $this->tvaFields = $arrayTVs;
+        }
         $this->loadTVTemplate()->loadTVDefault(array_values($this->tv));
 
         return $this;
@@ -1056,7 +1061,8 @@ 
     /**
      * @param int $docId
      */
-    public function getDocumentGroups($docId = 0) {
+    public function getDocumentGroups($docId = 0)
+    {
         $out = array();
         $doc = $this->switchObject($docId);
         if (null !== $doc->getID()) {
@@ -1082,7 +1088,9 @@ 
      */
     public function setDocumentGroups($docId = 0, $groupIds = array())
     {
-        if (!is_array($groupIds)) return $this;
+        if (!is_array($groupIds)) {
+            return $this;
+        }
         if ($this->newDoc && $docId == 0) {
             $this->groupIds = $groupIds;
         } else {