AgelxNash / DocLister

assets/snippets/DocLister/core/DocLister.abstract.php

Spacing +72 added lines, -72 removed lines

@@ -8,13 +8,13 @@ 
  * @license GNU General Public License (GPL), http://www.gnu.org/copyleft/gpl.html
  * @author Agel_Nash <Agel_Nash@xaker.ru>
  */
-include_once(MODX_BASE_PATH . 'assets/lib/APIHelpers.class.php');
-include_once(MODX_BASE_PATH . 'assets/lib/Helpers/FS.php');
-require_once(dirname(dirname(__FILE__)) . "/lib/jsonHelper.class.php");
-require_once(dirname(dirname(__FILE__)) . "/lib/sqlHelper.class.php");
-require_once(dirname(dirname(__FILE__)) . "/lib/DLTemplate.class.php");
-require_once(dirname(dirname(__FILE__)) . "/lib/DLCollection.class.php");
-require_once(dirname(dirname(__FILE__)) . "/lib/xnop.class.php");
+include_once(MODX_BASE_PATH.'assets/lib/APIHelpers.class.php');
+include_once(MODX_BASE_PATH.'assets/lib/Helpers/FS.php');
+require_once(dirname(dirname(__FILE__))."/lib/jsonHelper.class.php");
+require_once(dirname(dirname(__FILE__))."/lib/sqlHelper.class.php");
+require_once(dirname(dirname(__FILE__))."/lib/DLTemplate.class.php");
+require_once(dirname(dirname(__FILE__))."/lib/DLCollection.class.php");
+require_once(dirname(dirname(__FILE__))."/lib/xnop.class.php");
 
 /**
  * Class DocLister
@@ -274,7 +274,7 @@ 
                 case ')':
                     $open--;
                     if ($open == 0) {
-                        $res[] = $cur . ')';
+                        $res[] = $cur.')';
                         $cur = '';
                     } else {
                         $cur .= $e;
@@ -348,8 +348,8 @@ 
                     ini_set('display_errors', 1);
                 }
                 $dir = dirname(dirname(__FILE__));
-                if (file_exists($dir . "/lib/DLdebug.class.php")) {
-                    include_once($dir . "/lib/DLdebug.class.php");
+                if (file_exists($dir."/lib/DLdebug.class.php")) {
+                    include_once($dir."/lib/DLdebug.class.php");
                     if (class_exists("DLdebug", false)) {
                         $this->debug = new DLdebug($this);
                     }
@@ -387,7 +387,7 @@ 
         }
         $table = $this->_table[$name];
         if (!empty($alias) && is_scalar($alias)) {
-            $table .= " as `" . $alias . "`";
+            $table .= " as `".$alias."`";
         }
 
         return $table;
@@ -427,7 +427,7 @@ 
      */
     public function loadConfig($name)
     {
-        $this->debug->debug('Load json config: ' . $this->debug->dumpData($name), 'loadconfig', 2);
+        $this->debug->debug('Load json config: '.$this->debug->dumpData($name), 'loadconfig', 2);
         if (!is_scalar($name)) {
             $name = '';
         }
@@ -442,10 +442,10 @@ 
             switch ($cfgName[1]) {
                 case 'custom':
                 case 'core':
-                    $configFile = dirname(dirname(__FILE__)) . "/config/{$cfgName[1]}/{$cfgName[0]}.json";
+                    $configFile = dirname(dirname(__FILE__))."/config/{$cfgName[1]}/{$cfgName[0]}.json";
                     break;
                 default:
-                    $configFile = $this->FS->relativePath($cfgName[1] . '/' . $cfgName[0] . ".json");
+                    $configFile = $this->FS->relativePath($cfgName[1].'/'.$cfgName[0].".json");
                     break;
             }
 
@@ -471,7 +471,7 @@ 
      */
     public function jsonDecode($json, $config = array(), $nop = false)
     {
-        $this->debug->debug('Decode JSON: ' . $this->debug->dumpData($json) . "\r\nwith config: " . $this->debug->dumpData($config),
+        $this->debug->debug('Decode JSON: '.$this->debug->dumpData($json)."\r\nwith config: ".$this->debug->dumpData($config),
             'jsonDecode', 2);
         $config = jsonHelper::jsonDecode($json, $config, $nop);
         $this->isErrorJSON($json);
@@ -490,7 +490,7 @@ 
     {
         $error = jsonHelper::json_last_error_msg();
         if (!in_array($error, array('error_none', 'other'))) {
-            $this->debug->error($this->getMsg('json.' . $error) . ": " . $this->debug->dumpData($json, 'code'), 'JSON');
+            $this->debug->error($this->getMsg('json.'.$error).": ".$this->debug->dumpData($json, 'code'), 'JSON');
             $error = true;
         }
 
@@ -574,12 +574,12 @@ 
      * @param int $id уникальный идентификатор страницы
      * @return string URL страницы
      */
-    public function getUrl($id = 0){
+    public function getUrl($id = 0) {
         $id = ((int)$id > 0) ? (int)$id : $this->getCurrentMODXPageID();
 
         $link = $this->checkExtender('request') ? $this->extender['request']->getLink() : $this->getRequest();
         if ($id == $this->modx->config['site_start']) {
-            $url = $this->modx->config['site_url'] . ($link != '' ? "?{$link}" : "");
+            $url = $this->modx->config['site_url'].($link != '' ? "?{$link}" : "");
         } else {
             $url = $this->modx->makeUrl($id, '', $link, $this->getCFGDef('urlScheme', ''));
         }
@@ -656,13 +656,13 @@ 
     public function ErrorLogger($message, $code, $file, $line, $trace)
     {
         if (abs($this->getCFGDef('debug', '0')) == '1') {
-            $out = "CODE #" . $code . "<br />";
-            $out .= "on file: " . $file . ":" . $line . "<br />";
+            $out = "CODE #".$code."<br />";
+            $out .= "on file: ".$file.":".$line."<br />";
             $out .= "<pre>";
             $out .= print_r($trace, 1);
             $out .= "</pre>";
 
-            $message = $out . $message;
+            $message = $out.$message;
         }
         die($message);
     }
@@ -690,7 +690,7 @@ 
             $ext = explode(",", $ext);
             foreach ($ext as $item) {
                 if ($item != '' && !$this->_loadExtender($item)) {
-                    throw new Exception('Error load ' . APIHelpers::e($item) . ' extender');
+                    throw new Exception('Error load '.APIHelpers::e($item).' extender');
                 }
             }
         }
@@ -773,7 +773,7 @@ 
         $out = DLTemplate::getInstance($this->getMODX())->toPlaceholders($data, $set, $key, $id);
 
         $this->debug->debugEnd(
-            "toPlaceholders", array($key . " placeholder" => $data), array('html')
+            "toPlaceholders", array($key." placeholder" => $data), array('html')
         );
 
         return $out;
@@ -801,7 +801,7 @@ 
             }
         }
         $q = $quote ? "'" : "";
-        $out = $q . implode($q . "," . $q, $out) . $q;
+        $out = $q.implode($q.",".$q, $out).$q;
 
         return $out;
     }
@@ -822,8 +822,8 @@ 
         if (empty($lang)) {
             $lang = $this->getCFGDef('lang', $this->modx->config['manager_language']);
         }
-        if (file_exists(dirname(dirname(__FILE__)) . "/lang/" . $lang . ".php")) {
-            $tmp = include(dirname(__FILE__) . "/lang/" . $lang . ".php");
+        if (file_exists(dirname(dirname(__FILE__))."/lang/".$lang.".php")) {
+            $tmp = include(dirname(__FILE__)."/lang/".$lang.".php");
             $this->_customLang = is_array($tmp) ? $tmp : array();
         }
 
@@ -844,14 +844,14 @@ 
             $lang = $this->getCFGDef('lang', $this->modx->config['manager_language']);
         }
 
-        $this->debug->debug('Load language ' . $this->debug->dumpData($name) . "." . $this->debug->dumpData($lang),
+        $this->debug->debug('Load language '.$this->debug->dumpData($name).".".$this->debug->dumpData($lang),
             'loadlang', 2);
         if (is_scalar($name)) {
             $name = array($name);
         }
         foreach ($name as $n) {
-            if (file_exists(dirname(__FILE__) . "/lang/" . $lang . "/" . $n . ".inc.php")) {
-                $tmp = include(dirname(__FILE__) . "/lang/" . $lang . "/" . $n . ".inc.php");
+            if (file_exists(dirname(__FILE__)."/lang/".$lang."/".$n.".inc.php")) {
+                $tmp = include(dirname(__FILE__)."/lang/".$lang."/".$n.".inc.php");
                 if (is_array($tmp)) {
                     /**
                      * Переименовыываем элементы массива из array('test'=>'data') в array('name.test'=>'data')
@@ -934,7 +934,7 @@ 
             }
         }
 
-        $data[$this->getCFGDef("sysKey", "dl") . ".wrap"] = $this->renderWrap($out);
+        $data[$this->getCFGDef("sysKey", "dl").".wrap"] = $this->renderWrap($out);
         $out = $this->parseChunk($this->getCFGDef('tpl', ''), $data);
 
         return $out;
@@ -1000,7 +1000,7 @@ 
         );
         $out = DLTemplate::getInstance($this->getMODX())->parseChunk($name, $data, $parseDocumentSource);
         if (empty($out)) {
-            $this->debug->debug("Empty chunk: " . $this->debug->dumpData($name), '', 2);
+            $this->debug->debug("Empty chunk: ".$this->debug->dumpData($name), '', 2);
         }
         $this->debug->debugEnd("parseChunk");
 
@@ -1036,7 +1036,7 @@ 
         if ((($this->getCFGDef("noneWrapOuter", "1") && $docs == 0) || $docs > 0) && !empty($this->ownerTPL)) {
             $this->debug->debug("", "renderWrapTPL", 2);
             $parse = true;
-            $plh = array($this->getCFGDef("sysKey", "dl") . ".wrap" => $data);
+            $plh = array($this->getCFGDef("sysKey", "dl").".wrap" => $data);
             /**
              * @var $extPrepare prepare_DL_Extender
              */
@@ -1086,13 +1086,13 @@ 
 
         $iterationName = ($i % 2 == 0) ? 'Odd' : 'Even';
         $tmp = strtolower($iterationName);
-        $class[] = $this->getCFGDef($tmp . 'Class', $tmp);
+        $class[] = $this->getCFGDef($tmp.'Class', $tmp);
 
-        $this->renderTPL = $this->getCFGDef('tplId' . $i, $this->renderTPL);
-        $this->renderTPL = $this->getCFGDef('tpl' . $iterationName, $this->renderTPL);
+        $this->renderTPL = $this->getCFGDef('tplId'.$i, $this->renderTPL);
+        $this->renderTPL = $this->getCFGDef('tpl'.$iterationName, $this->renderTPL);
 
         $data[$this->getCFGDef("sysKey",
-            "dl") . '.full_iteration'] = ($this->extPaginate) ? ($i + $this->getCFGDef('display',
+            "dl").'.full_iteration'] = ($this->extPaginate) ? ($i + $this->getCFGDef('display',
                 0) * ($this->extPaginate->currentPage() - 1)) : $i;
 
         if ($i == 1) {
@@ -1106,14 +1106,14 @@ 
         if ($this->modx->documentIdentifier == $data['id']) {
             $this->renderTPL = $this->getCFGDef('tplCurrent', $this->renderTPL);
             $data[$this->getCFGDef("sysKey",
-                "dl") . '.active'] = 1; //[+active+] - 1 if $modx->documentIdentifer equal ID this element
+                "dl").'.active'] = 1; //[+active+] - 1 if $modx->documentIdentifer equal ID this element
             $class[] = $this->getCFGDef('currentClass', 'current');
         } else {
-            $data[$this->getCFGDef("sysKey", "dl") . '.active'] = 0;
+            $data[$this->getCFGDef("sysKey", "dl").'.active'] = 0;
         }
 
         $class = implode(" ", $class);
-        $data[$this->getCFGDef("sysKey", "dl") . '.class'] = $class;
+        $data[$this->getCFGDef("sysKey", "dl").'.class'] = $class;
 
         /**
          * @var $extE e_DL_Extender
@@ -1218,7 +1218,7 @@ 
      */
     public function checkExtender($name)
     {
-        return (isset($this->extender[$name]) && $this->extender[$name] instanceof $name . "_DL_Extender");
+        return (isset($this->extender[$name]) && $this->extender[$name] instanceof $name."_DL_Extender");
     }
 
     /**
@@ -1259,17 +1259,17 @@ 
      */
     protected function _loadExtender($name)
     {
-        $this->debug->debug('Load Extender ' . $this->debug->dumpData($name), 'LoadExtender', 2);
+        $this->debug->debug('Load Extender '.$this->debug->dumpData($name), 'LoadExtender', 2);
         $flag = false;
 
-        $classname = ($name != '') ? $name . "_DL_Extender" : "";
+        $classname = ($name != '') ? $name."_DL_Extender" : "";
         if ($classname != '' && isset($this->extender[$name]) && $this->extender[$name] instanceof $classname) {
             $flag = true;
 
         } else {
             if (!class_exists($classname, false) && $classname != '') {
-                if (file_exists(dirname(__FILE__) . "/extender/" . $name . ".extender.inc")) {
-                    include_once(dirname(__FILE__) . "/extender/" . $name . ".extender.inc");
+                if (file_exists(dirname(__FILE__)."/extender/".$name.".extender.inc")) {
+                    include_once(dirname(__FILE__)."/extender/".$name.".extender.inc");
                 }
             }
             if (class_exists($classname, false) && $classname != '') {
@@ -1278,7 +1278,7 @@ 
             }
         }
         if (!$flag) {
-            $this->debug->debug("Error load Extender " . $this->debug->dumpData($name));
+            $this->debug->debug("Error load Extender ".$this->debug->dumpData($name));
         }
         $this->debug->debugEnd('LoadExtender');
 
@@ -1297,7 +1297,7 @@ 
      */
     public function setIDs($IDs)
     {
-        $this->debug->debug('set ID list ' . $this->debug->dumpData($IDs), 'setIDs', 2);
+        $this->debug->debug('set ID list '.$this->debug->dumpData($IDs), 'setIDs', 2);
         $IDs = $this->cleanIDs($IDs);
         $type = $this->getCFGDef('idType', 'parents');
         $depth = $this->getCFGDef('depth', '');
@@ -1332,7 +1332,7 @@ 
      */
     public function cleanIDs($IDs, $sep = ',')
     {
-        $this->debug->debug('clean IDs ' . $this->debug->dumpData($IDs) . ' with separator ' . $this->debug->dumpData($sep),
+        $this->debug->debug('clean IDs '.$this->debug->dumpData($IDs).' with separator '.$this->debug->dumpData($sep),
             'cleanIDs', 2);
         $out = array();
         if (!is_array($IDs)) {
@@ -1415,7 +1415,7 @@ 
     {
         $out = '';
         if ($group != '') {
-            $out = 'GROUP BY ' . $group;
+            $out = 'GROUP BY '.$group;
         }
 
         return $out;
@@ -1445,7 +1445,7 @@ 
                 $idList = $this->sanitarIn($this->IDs, ',', false);
                 $out = array('orderBy' => "FIND_IN_SET({$this->getCFGDef('sortBy', $this->getPK())}, '{$idList}')");
                 $this->setConfig($out); //reload config;
-                $sort = "ORDER BY " . $out['orderBy'];
+                $sort = "ORDER BY ".$out['orderBy'];
                 break;
             default:
                 $out = array('orderBy' => '', 'order' => '', 'sortBy' => '');
@@ -1465,13 +1465,13 @@ 
                     }
 
                     $out['sortBy'] = (($tmp = $this->getCFGDef('sortBy', '')) != '') ? $tmp : $sortName;
-                    $out['orderBy'] = $out['sortBy'] . " " . $out['order'];
+                    $out['orderBy'] = $out['sortBy']." ".$out['order'];
                 }
                 $this->setConfig($out); //reload config;
-                $sort = "ORDER BY " . $out['orderBy'];
+                $sort = "ORDER BY ".$out['orderBy'];
                 break;
         }
-        $this->debug->debugEnd("sortORDER", 'Get sort order for SQL: ' . $this->debug->dumpData($sort));
+        $this->debug->debugEnd("sortORDER", 'Get sort order for SQL: '.$this->debug->dumpData($sort));
 
         return $sort;
     }
@@ -1499,17 +1499,17 @@ 
         }
 
         if ($limit != 0) {
-            $ret = "LIMIT " . (int)$offset . "," . (int)$limit;
+            $ret = "LIMIT ".(int)$offset.",".(int)$limit;
         } else {
             if ($offset != 0) {
                 /**
                  * To retrieve all rows from a certain offset up to the end of the result set, you can use some large number for the second parameter
                  * @see http://dev.mysql.com/doc/refman/5.0/en/select.html
                  */
-                $ret = "LIMIT " . (int)$offset . ",18446744073709551615";
+                $ret = "LIMIT ".(int)$offset.",18446744073709551615";
             }
         }
-        $this->debug->debugEnd("limitSQL", "Get limit for SQL: " . $this->debug->dumpData($ret));
+        $this->debug->debugEnd("limitSQL", "Get limit for SQL: ".$this->debug->dumpData($ret));
 
         return $ret;
     }
@@ -1552,20 +1552,20 @@ 
         $children = array(); // children of each ID
         $ids = array();
         foreach ($data as $i => $r) {
-            $row =& $data[$i];
+            $row = & $data[$i];
             $id = $row[$idName];
             $pid = $row[$pidName];
-            $children[$pid][$id] =& $row;
+            $children[$pid][$id] = & $row;
             if (!isset($children[$id])) {
                 $children[$id] = array();
             }
-            $row['#childNodes'] =& $children[$id];
+            $row['#childNodes'] = & $children[$id];
             $ids[$row[$idName]] = true;
         }
         // Root elements are elements with non-found PIDs.
         $this->_tree = array();
         foreach ($data as $i => $r) {
-            $row =& $data[$i];
+            $row = & $data[$i];
             if (!isset($ids[$row[$pidName]])) {
                 $this->_tree[$row[$idName]] = $row;
             }
@@ -1604,7 +1604,7 @@ 
      */
     protected function getFilters($filter_string)
     {
-        $this->debug->debug("getFilters: " . $this->debug->dumpData($filter_string), 'getFilter', 1);
+        $this->debug->debug("getFilters: ".$this->debug->dumpData($filter_string), 'getFilter', 1);
         // the filter parameter tells us, which filters can be used in this query
         $filter_string = trim($filter_string, ' ;');
         if (!$filter_string) {
@@ -1631,14 +1631,14 @@ 
                     }
                 }
                 $output['join'] = !empty($joins) ? implode(' ', $joins) : '';
-                $output['where'] = !empty($wheres) ? '(' . implode($sql, $wheres) . ')' : '';
+                $output['where'] = !empty($wheres) ? '('.implode($sql, $wheres).')' : '';
             }
         }
 
         if (!$logic_op_found) {
             $filter = $this->loadFilter($filter_string);
             if (!$filter) {
-                $this->debug->warning('Error while loading DocLister filter "' . $this->debug->dumpData($filter_string) . '": check syntax!');
+                $this->debug->warning('Error while loading DocLister filter "'.$this->debug->dumpData($filter_string).'": check syntax!');
                 $output = false;
             } else {
                 $output['join'] = $filter->get_join();
@@ -1678,19 +1678,19 @@ 
         $type = trim($type);
         switch (strtoupper($type)) {
             case 'DECIMAL':
-                $field = 'CAST(' . $field . ' as DECIMAL(10,2))';
+                $field = 'CAST('.$field.' as DECIMAL(10,2))';
                 break;
             case 'UNSIGNED':
-                $field = 'CAST(' . $field . ' as UNSIGNED)';
+                $field = 'CAST('.$field.' as UNSIGNED)';
                 break;
             case 'BINARY':
-                $field = 'CAST(' . $field . ' as BINARY)';
+                $field = 'CAST('.$field.' as BINARY)';
                 break;
             case 'DATETIME':
-                $field = 'CAST(' . $field . ' as DATETIME)';
+                $field = 'CAST('.$field.' as DATETIME)';
                 break;
             case 'SIGNED':
-                $field = 'CAST(' . $field . ' as SIGNED)';
+                $field = 'CAST('.$field.' as SIGNED)';
                 break;
         }
 
@@ -1704,17 +1704,17 @@ 
      */
     protected function loadFilter($filter)
     {
-        $this->debug->debug('Load filter ' . $this->debug->dumpData($filter), 'loadFilter', 2);
+        $this->debug->debug('Load filter '.$this->debug->dumpData($filter), 'loadFilter', 2);
         $out = false;
         $fltr_params = explode(':', $filter, 2);
         $fltr = APIHelpers::getkey($fltr_params, 0, null);
         // check if the filter is implemented
-        if (!is_null($fltr) && file_exists(dirname(__FILE__) . '/filter/' . $fltr . '.filter.php')) {
-            require_once dirname(__FILE__) . '/filter/' . $fltr . '.filter.php';
+        if (!is_null($fltr) && file_exists(dirname(__FILE__).'/filter/'.$fltr.'.filter.php')) {
+            require_once dirname(__FILE__).'/filter/'.$fltr.'.filter.php';
             /**
              * @var tv_DL_filter|content_DL_filter $fltr_class
              */
-            $fltr_class = $fltr . '_DL_filter';
+            $fltr_class = $fltr.'_DL_filter';
             $this->totalFilters++;
             $fltr_obj = new $fltr_class();
             if ($fltr_obj->init($this, $filter)) {
@@ -1774,7 +1774,7 @@ 
     public function getRequest()
     {
         $URL = null;
-        parse_str(parse_url(MODX_SITE_URL . $_SERVER['REQUEST_URI'], PHP_URL_QUERY), $URL);
+        parse_str(parse_url(MODX_SITE_URL.$_SERVER['REQUEST_URI'], PHP_URL_QUERY), $URL);
 
         return http_build_query(array_merge($URL, array(DocLister::AliasRequest => null)));
     }

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

Spacing +16 added lines, -16 removed lines

@@ -78,18 +78,18 @@ 
                         $item = $extUser->setUserData($item); //[+user.id.createdby+], [+user.fullname.publishedby+], [+dl.user.publishedby+]....
                     }
 
-                    $item[$this->getCFGDef("sysKey", "dl") . '.summary'] = $extSummary ? $this->getSummary($item,
+                    $item[$this->getCFGDef("sysKey", "dl").'.summary'] = $extSummary ? $this->getSummary($item,
                         $extSummary) : '';
 
                     $item = array_merge($item,
                         $sysPlh); //inside the chunks available all placeholders set via $modx->toPlaceholders with prefix id, and with prefix sysKey
                     $item[$this->getCFGDef("sysKey",
-                        "dl") . '.iteration'] = $i; //[+iteration+] - Number element. Starting from zero
+                        "dl").'.iteration'] = $i; //[+iteration+] - Number element. Starting from zero
 
                     $date = $this->getCFGDef('dateSource', 'pub_date');
                     $date = isset($item[$date]) ? $item[$date] + $this->modx->config['server_offset_time'] : '';
                     if ($date != '' && $this->getCFGDef('dateFormat', '%d.%b.%y %H:%M') != '') {
-                        $item[$this->getCFGDef("sysKey", "dl") . '.date'] = strftime($this->getCFGDef('dateFormat',
+                        $item[$this->getCFGDef("sysKey", "dl").'.date'] = strftime($this->getCFGDef('dateFormat',
                             '%d.%b.%y %H:%M'), $date);
                     }
 
@@ -113,7 +113,7 @@ 
                     $tmp = $this->parseChunk($this->renderTPL, $item);
                     if ($this->getCFGDef('contentPlaceholder', 0) !== 0) {
                         $this->toPlaceholders($tmp, 1,
-                            "item[" . $i . "]"); // [+item[x]+] – individual placeholder for each iteration documents on this page
+                            "item[".$i."]"); // [+item[x]+] – individual placeholder for each iteration documents on this page
                     }
                     $out .= $tmp;
                     $i++;
@@ -203,7 +203,7 @@ 
             }
 
             if (!empty($where)) {
-                $where = "WHERE " . implode(" AND ", $where);
+                $where = "WHERE ".implode(" AND ", $where);
             }
             $limit = $this->LimitSQL($this->getCFGDef('queryLimit', 0));
             $fields = $this->getCFGDef('selectFields', '*');
@@ -237,13 +237,13 @@ 
 
         $tmpWhere = null;
         if ($sanitarInIDs != "''") {
-            $tmpWhere = "(`{$this->getParentField()}` IN (" . $sanitarInIDs . ")";
+            $tmpWhere = "(`{$this->getParentField()}` IN (".$sanitarInIDs.")";
             switch ($this->getCFGDef('showParent', '0')) {
                 case -1:
                     $tmpWhere .= ")";
                     break;
                 case 0:
-                    $tmpWhere .= " AND `{$this->getPK()}` NOT IN(" . $sanitarInIDs . "))";
+                    $tmpWhere .= " AND `{$this->getPK()}` NOT IN(".$sanitarInIDs."))";
                     break;
                 case 1:
                 default:
@@ -254,25 +254,25 @@ 
         if (($addDocs = $this->getCFGDef('documents', '')) != '') {
             $addDocs = $this->sanitarIn($this->cleanIDs($addDocs));
             if (empty($tmpWhere)) {
-                $tmpWhere = $this->getPK() . " IN({$addDocs})";
+                $tmpWhere = $this->getPK()." IN({$addDocs})";
             } else {
-                $tmpWhere = "((" . $tmpWhere . ") OR {$this->getPK()} IN({$addDocs}))";
+                $tmpWhere = "((".$tmpWhere.") OR {$this->getPK()} IN({$addDocs}))";
             }
         }
         if (!empty($tmpWhere)) {
             $where[] = $tmpWhere;
         }
         if (!empty($where)) {
-            $where = "WHERE " . implode(" AND ", $where);
+            $where = "WHERE ".implode(" AND ", $where);
         } else {
             $where = '';
         }
         $fields = $this->getCFGDef('selectFields', '*');
         $group = $this->getGroupSQL($this->getCFGDef('groupBy', "`{$this->getPK()}`"));
         if ($sanitarInIDs != "''" || $this->getCFGDef('ignoreEmpty', '0')) {
-            $sql = $this->dbQuery("SELECT {$fields} FROM " . $this->table . " " . $where . " " .
-                $group . " " .
-                $this->SortOrderSQL($this->getPK()) . " " .
+            $sql = $this->dbQuery("SELECT {$fields} FROM ".$this->table." ".$where." ".
+                $group." ".
+                $this->SortOrderSQL($this->getPK())." ".
                 $this->LimitSQL($this->getCFGDef('queryLimit', 0))
             );
             $rows = $this->modx->db->makeArray($sql);
@@ -317,7 +317,7 @@ 
                             }
                             if (($addDocs = $this->getCFGDef('documents', '')) != '') {
                                 $addDocs = $this->sanitarIn($this->cleanIDs($addDocs));
-                                $where[] = "((" . $tmpWhere . ") OR `{$this->getPK()}` IN({$addDocs}))";
+                                $where[] = "((".$tmpWhere.") OR `{$this->getPK()}` IN({$addDocs}))";
                             } else {
                                 $where[] = $tmpWhere;
                             }
@@ -329,7 +329,7 @@ 
                 }
             }
             if (!empty($where)) {
-                $where = "WHERE " . implode(" AND ", $where);
+                $where = "WHERE ".implode(" AND ", $where);
             } else {
                 $where = '';
             }
@@ -354,7 +354,7 @@ 
         $tmp = $this->getCFGDef('addWhereFolder', '');
         $where = "`{$this->getParentField()}` IN ({$sanitarInIDs})";
         if (!empty($tmp)) {
-            $where .= " AND " . $tmp;
+            $where .= " AND ".$tmp;
         }
 
         $rs = $this->dbQuery("SELECT `{$this->getPK()}` FROM {$this->table} WHERE {$where}");

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

Spacing +18 added lines, -18 removed lines

@@ -177,7 +177,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;
                     $i++;
@@ -274,7 +274,7 @@ 
         if ($sanitarInIDs != "''" || $this->getCFGDef('ignoreEmpty', '0')) {
             $where = $this->getCFGDef('addWhereList', '');
             $where = sqlHelper::trimLogicalOp($where);
-            $where = ($where ? $where . ' AND ' : '') . $this->_filters['where'];
+            $where = ($where ? $where.' AND ' : '').$this->_filters['where'];
             if ($where != '' && $this->_filters['where'] != '') {
                 $where .= " AND ";
             }
@@ -293,7 +293,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})";
@@ -305,7 +305,7 @@ 
                         }
                         if (($addDocs = $this->getCFGDef('documents', '')) != '') {
                             $addDocs = $this->sanitarIn($this->cleanIDs($addDocs));
-                            $whereArr[] = "((" . $tmpWhere . ") OR c.id IN({$addDocs}))";
+                            $whereArr[] = "((".$tmpWhere.") OR c.id IN({$addDocs}))";
                         } else {
                             $whereArr[] = $tmpWhere;
                         }
@@ -316,7 +316,7 @@ 
                         break;
                 }
             }
-            $from = $tbl_site_content . " " . $this->_filters['join'];
+            $from = $tbl_site_content." ".$this->_filters['join'];
             $where = sqlHelper::trimLogicalOp($where);
 
             if (trim($where) != 'WHERE') {
@@ -351,12 +351,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);
 
@@ -379,7 +379,7 @@ 
             $fields = $this->getCFGDef('selectFields', 'c.*');
             $group = $this->getGroupSQL($this->getCFGDef('groupBy', 'c.id'));
             $sort = $this->SortOrderSQL("if(c.pub_date=0,c.createdon,c.pub_date)");
-            list($tbl_site_content, $sort) = $this->injectSortByTV($tbl_site_content . ' ' . $this->_filters['join'],
+            list($tbl_site_content, $sort) = $this->injectSortByTV($tbl_site_content.' '.$this->_filters['join'],
                 $sort);
 
             $limit = $this->LimitSQL($this->getCFGDef('queryLimit', 0));
@@ -464,21 +464,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;
             }
         }
@@ -487,7 +487,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)) {
@@ -497,7 +497,7 @@ 
             $where[] = "c.deleted=0 AND c.published=1";
         }
         if (!empty($where)) {
-            $where = "WHERE " . implode(" AND ", $where);
+            $where = "WHERE ".implode(" AND ", $where);
         } else {
             $where = '';
         }
@@ -505,9 +505,9 @@ 
         $group = $this->getGroupSQL($this->getCFGDef('groupBy', 'c.id'));
 
         if ($sanitarInIDs != "''" || $this->getCFGDef('ignoreEmpty', '0')) {
-            $sql = $this->dbQuery("SELECT {$fields} FROM " . $from . " " . $where . " " .
-                $group . " " .
-                $sort . " " .
+            $sql = $this->dbQuery("SELECT {$fields} FROM ".$from." ".$where." ".
+                $group." ".
+                $sort." ".
                 $this->LimitSQL($this->getCFGDef('queryLimit', 0))
             );
 
@@ -531,7 +531,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);

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

Spacing +20 added lines, -20 removed lines

@@ -11,7 +11,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
@@ -124,7 +124,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;
                     $i++;
@@ -153,7 +153,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 ";
             }
@@ -172,7 +172,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})";
@@ -184,7 +184,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;
                         }
@@ -194,7 +194,7 @@ 
                         break;
                 }
             }
-            $from = $tbl_site_content . " " . $this->_filters['join'];
+            $from = $tbl_site_content." ".$this->_filters['join'];
             $where = sqlHelper::trimLogicalOp($where);
 
             if (trim($where) != 'WHERE') {
@@ -229,12 +229,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);
 
@@ -257,7 +257,7 @@ 
             $fields = $this->getCFGDef('selectFields', 'c.*');
             $group = $this->getGroupSQL($this->getCFGDef('groupBy', 'c.id'));
             $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));
@@ -294,8 +294,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').")");
 
         $rows = $this->modx->db->makeArray($rs);
         $out = array();
@@ -328,7 +328,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;
@@ -336,14 +336,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;
             }
         }
@@ -352,7 +352,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)) {
@@ -362,16 +362,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', 'c.id'));
         if ($sanitarInIDs != "''" || $this->getCFGDef('ignoreEmpty', '0')) {
-            $sql = $this->dbQuery("SELECT {$fields} FROM " . $from . " " . $where . " " .
-                $group . " " .
-                $sort . " " .
+            $sql = $this->dbQuery("SELECT {$fields} FROM ".$from." ".$where." ".
+                $group." ".
+                $sort." ".
                 $this->LimitSQL($this->getCFGDef('queryLimit', 0))
             );