AgelxNash / DocLister

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

Doc Comments +1 added lines, -1 removed lines

@@ -107,7 +107,7 @@
 
     /**
      * Список активных документов
-     * @param $id
+     * @param integer $id
      * @param int $maxDepth
      */
     public function setActiveBranch($id, $maxDepth = 10)

Spacing +19 added lines, -19 removed lines

@@ -67,9 +67,9 @@ 
             foreach ($this->levels as $level => $docs) {
                 $ids = array_merge($ids, array_keys($docs));
             }
-            if (!empty($ids)) {
+            if ( ! empty($ids)) {
                 $tv = $this->extTV->getTVList($ids, $tvlist);
-                if (!is_array($tv)) {
+                if ( ! is_array($tv)) {
                     $tv = array();
                 }
                 $this->docTvs = $tv;
@@ -111,7 +111,7 @@ 
         if ($this->getCFGDef('showParent', 0) && in_array(0, $this->IDs)) {
             $this->config->setConfig(array('showParent' => 0));
         }
-        $joinMenus = $this->getCFGDef('joinMenus', 0) && !$this->getCFGDef('showParent', 0);
+        $joinMenus = $this->getCFGDef('joinMenus', 0) && ! $this->getCFGDef('showParent', 0);
         while ($currentLevel <= $maxDepth) {
             $orderBy = $this->getCFGDef('orderBy');
             if ($this->getCFGDef('showParent', 0) && $currentLevel == 1) {
@@ -138,7 +138,7 @@ 
             } else {
                 foreach ($docs as $id => &$item) {
                     $parent = $item['parent'];
-                    if (!isset($this->display[$parent])) {
+                    if ( ! isset($this->display[$parent])) {
                         $this->display[$parent] = 1;
                     }
                     $item['iteration'] = $this->display[$parent]++;
@@ -193,7 +193,7 @@ 
                 $_ids[] = $row['parent'];
                 $out[$row['parent']] = $row['count'];
             }
-            if (!empty($_ids)) {
+            if ( ! empty($_ids)) {
                 $ids = $this->diff($ids, $_ids);
             } else {
                 break;
@@ -213,7 +213,7 @@ 
         $at = array_flip($a);
         $d = array();
         foreach ($b as $i) {
-            if (!isset($at[$i])) {
+            if ( ! isset($at[$i])) {
                 $d[] = $i;
             }
         }
@@ -264,7 +264,7 @@ 
                         $data = $out;
                     }
                 };
-                if (!isset($data['maxLevel'])) {
+                if ( ! isset($data['maxLevel'])) {
                     $data['maxLevel'] = 1;
                     $docs[$currentLevel - 1][$data['parent']]['maxLevel'] = 0;
                 }
@@ -280,11 +280,11 @@ 
                 }
 
                 if (isset($data['wrap'])) {
-                    if(is_array($data['wrap'])) $data['wrap'] = $this->parseRow($data['wrap']);
+                    if (is_array($data['wrap'])) $data['wrap'] = $this->parseRow($data['wrap']);
                     $data['wrap'] = $this->parseOuter($data);
                 }
                 $hideSubMenus = $this->getCFGDef('hideSubMenus', 0);
-                $hideSubMenus = !$hideSubMenus || ($hideSubMenus && in_array((int)$data['parent'],
+                $hideSubMenus = ! $hideSubMenus || ($hideSubMenus && in_array((int)$data['parent'],
                             $this->activeBranch));
                 if ($hideSubMenus) {
                     $docs[$currentLevel - 1][$data['parent']]['wrap'][] = $data;
@@ -295,7 +295,7 @@ 
         }
         unset($data);
         $out = '';
-        $joinMenus = $this->getCFGDef('joinMenus', 0) && !$this->getCFGDef('showParent', 0);
+        $joinMenus = $this->getCFGDef('joinMenus', 0) && ! $this->getCFGDef('showParent', 0);
         foreach ($docs[0] as $id => $data) {
             if (isset($data['wrap'])) {
                 if ($joinMenus) {
@@ -329,14 +329,14 @@ 
         if ($id == $this->getHereId()) {
             $data['here'] = 1;
         }
-        if (!isset($data['here']) && in_array($id, $this->activeBranch)) {
+        if ( ! isset($data['here']) && in_array($id, $this->activeBranch)) {
             $data['active'] = 1;
         }
         if ($this->getCFGDef('hideSubMenus') && isset($data['isfolder']) && $data['isfolder']) {
             $data['state'] = in_array($data['id'], $this->activeBranch) ? 'open' : 'closed';
         }
 
-        if (!isset($data['_display'])) {
+        if ( ! isset($data['_display'])) {
             $data['_display'] = $this->display[$data['parent']] - 1;
         }
         if ($data['iteration'] == 1) {
@@ -347,7 +347,7 @@ 
         }
 
         $titleField = $this->getCFGDef('titleField', 'title');
-        $data[$titleField] = isset($data['menutitle']) && !empty($data['menutitle']) ? $data['menutitle'] : $data['pagetitle'];
+        $data[$titleField] = isset($data['menutitle']) && ! empty($data['menutitle']) ? $data['menutitle'] : $data['pagetitle'];
         $data['level'] = $this->currentLevel;
         $data['url'] = $this->makeUrl($data);
         if ($this->getCFGDef('countChildren', 0)) {
@@ -433,7 +433,7 @@ 
      */
     public function getHereId()
     {
-        if (!$hereId = (int)$this->getCFGDef('hereId')) {
+        if ( ! $hereId = (int)$this->getCFGDef('hereId')) {
             $hereId = isset($this->modx->documentIdentifier) ? (int)$this->modx->documentIdentifier : 0;
         }
 
@@ -486,7 +486,7 @@ 
         if (isset($data['type']) && $data['type'] == 'reference') {
             $classes['webLinkClass'] = $this->getCFGDef('webLinkClass');
         }
-        if (!empty($data['wrap'])) {
+        if ( ! empty($data['wrap'])) {
             $classes['parentClass'] = $this->getCFGDef('parentClass');
         }
         $classNames = implode(' ', array_filter(array_values($classes)));
@@ -504,10 +504,10 @@ 
     protected function getRowTemplate($data = array())
     {
         $tpl = $this->getCFGDef('rowTpl', '@CODE:<li[+classes+]><a href="[+url+]">[+title+]</a></li>');
-        if (!empty($data['wrap'])) {
+        if ( ! empty($data['wrap'])) {
             $tpl = $this->getCFGDef('parentRowTpl',
                 '@CODE:<li[+classes+]><a href="[+url+]">[+title+]</a>[+wrap+]</li>');
-            if ((isset($data['template']) && !$data['template']) || (isset($data['link_attributes']) && strpos($data['link_attributes'],
+            if ((isset($data['template']) && ! $data['template']) || (isset($data['link_attributes']) && strpos($data['link_attributes'],
                         'category') !== false)
             ) {
                 $tpl = $this->getCFGDef('categoryFolderTpl', $tpl);
@@ -570,7 +570,7 @@ 
                 }
 
                 $hideSubMenus = $this->getCFGDef('hideSubMenus', 0);
-                $hideSubMenus = !$hideSubMenus || ($hideSubMenus && in_array((int)$data['parent'],
+                $hideSubMenus = ! $hideSubMenus || ($hideSubMenus && in_array((int)$data['parent'],
                             $this->activeBranch));
                 if ($hideSubMenus) {
                     $docs[$currentLevel - 1][$data['parent']]['children'][] = $data;
@@ -581,7 +581,7 @@ 
         }
         unset($data);
         $out = array();
-        $joinMenus = $this->getCFGDef('joinMenus', 0) && !$this->getCFGDef('showParent', 0);
+        $joinMenus = $this->getCFGDef('joinMenus', 0) && ! $this->getCFGDef('showParent', 0);
         foreach ($docs[0] as $id => $data) {
             if (isset($data['children'])) {
                 if ($joinMenus) {

Braces +143 added lines, -137 removed lines

@@ -9,8 +9,8 @@ 
  * @license GNU General Public License (GPL), http://www.gnu.org/copyleft/gpl.html
  * @author Agel_Nash <Agel_Nash@xaker.ru>, kabachello <kabachnik@hotmail.com>
  */
-class site_content_menuDocLister extends site_contentDocLister
-{
+class site_content_menuDocLister extends site_contentDocLister

+{

     public $levels = array();
     protected $currentLevel = 1;
     protected $docTvs = array();
@@ -25,8 +25,8 @@ 
      * @param mixed $IDs список id документов по которым необходима выборка
      * @return array очищенный массив
      */
-    public function setIDs($IDs)
-    {
+    public function setIDs($IDs)

+    {

         $this->debug->debug('set ID list ' . $this->debug->dumpData($IDs), 'setIDs', 2);
         $IDs = $this->cleanIDs($IDs);
         $this->debug->debugEnd("setIDs");
@@ -38,15 +38,15 @@ 
      * @param string $tvlist
      * @return array
      */
-    public function getDocs($tvlist = '')
-    {
+    public function getDocs($tvlist = '')

+    {

         $this->extTV->getAllTV_Name();
-        if ($ids = $this->getCFGDef('documents')) {
+        if ($ids = $this->getCFGDef('documents')) {

             $this->setIDs($ids);
             $docs = $this->getDocList();
             $display = count($docs);
             $iteration = 1;
-            foreach ($docs as $id => &$item) {
+            foreach ($docs as $id => &$item) {

                 $item['iteration'] = $iteration++;
                 $item['_display'] = $display;
                 $item['_parent'] = $item['parent'];
@@ -54,53 +54,53 @@ 
             }
             $this->levels[1] = $docs;
             $this->setActiveBranch($this->getHereId(), 1);
-        } else {
+        } else {

             $this->_getChildren();
         }
 
-        if ($tvlist == '') {
+        if ($tvlist == '') {

             $tvlist = $this->getCFGDef('tvList', '');
         }
 
-        if ($tvlist != '') {
+        if ($tvlist != '') {

             $ids = array();
-            foreach ($this->levels as $level => $docs) {
+            foreach ($this->levels as $level => $docs) {

                 $ids = array_merge($ids, array_keys($docs));
             }
-            if (!empty($ids)) {
+            if (!empty($ids)) {

                 $tv = $this->extTV->getTVList($ids, $tvlist);
-                if (!is_array($tv)) {
+                if (!is_array($tv)) {

                     $tv = array();
                 }
                 $this->docTvs = $tv;
             }
 
         }
-        if ($this->getCFGDef('countChildren', 0)) {
+        if ($this->getCFGDef('countChildren', 0)) {

             $this->countChildren();
         }
         //TODO кэширование
         return $this->levels;
     }
 
-    public function _getChildren()
-    {
+    public function _getChildren()

+    {

         $maxDepth = $this->getCFGDef('maxDepth', 10);
-        if ($this->getCFGDef('hideSubMenus', 0) && empty($this->getCFGDef('openIds'))) {
+        if ($this->getCFGDef('hideSubMenus', 0) && empty($this->getCFGDef('openIds'))) {

             $maxDepth = min($maxDepth, $this->setActiveBranch($this->getHereId()));
-            if (empty(array_intersect($this->IDs, $this->activeBranch))) {
+            if (empty(array_intersect($this->IDs, $this->activeBranch))) {

                 $maxDepth = 1;
                 $this->config->setConfig(array('hideSubMenus' => 0));
             };
-        } else {
+        } else {

             $this->setActiveBranch($this->getHereId());
         }
-        if ($oIds = $this->getCFGDef('openIds')) {
+        if ($oIds = $this->getCFGDef('openIds')) {

             $maxDepth = 1;
             $oIds = $this->cleanIDs($oIds);
             $oIds[] = $this->getHereId();
-            foreach ($oIds as $id) {
-                if (($c = $this->setActiveBranch($id)) > $maxDepth) {
+            foreach ($oIds as $id) {

+                if (($c = $this->setActiveBranch($id)) > $maxDepth) {

                     $maxDepth = $c;
                 }
             }
@@ -108,44 +108,44 @@ 
         }
         $currentLevel = &$this->currentLevel;
         $currentLevel = 1;
-        if ($this->getCFGDef('showParent', 0) && in_array(0, $this->IDs)) {
+        if ($this->getCFGDef('showParent', 0) && in_array(0, $this->IDs)) {

             $this->config->setConfig(array('showParent' => 0));
         }
         $joinMenus = $this->getCFGDef('joinMenus', 0) && !$this->getCFGDef('showParent', 0);
-        while ($currentLevel <= $maxDepth) {
+        while ($currentLevel <= $maxDepth) {

             $orderBy = $this->getCFGDef('orderBy');
-            if ($this->getCFGDef('showParent', 0) && $currentLevel == 1) {
+            if ($this->getCFGDef('showParent', 0) && $currentLevel == 1) {

                 $docs = $this->getDocList();
                 $this->config->setConfig(array('showParent' => 0));
-            } else {
+            } else {

                 $docs = $this->getChildrenList();
             }
-            if ($currentLevel == 1 && $joinMenus) {
+            if ($currentLevel == 1 && $joinMenus) {

                 $tmp = array();
                 $display = 0;
                 $iteration = 1;
-                foreach ($docs as $id => $item) {
+                foreach ($docs as $id => $item) {

                     $tmp[$item['parent']][] = $item['id'];
                     $display++;
                 }
-                foreach ($tmp as $id => $item) {
-                    foreach ($item as $_id) {
+                foreach ($tmp as $id => $item) {

+                    foreach ($item as $_id) {

                         $docs[$_id]['_display'] = $display;
                         $docs[$_id]['iteration'] = $iteration++;
                     }
                 }
                 unset($tmp);
-            } else {
-                foreach ($docs as $id => &$item) {
+            } else {

+                foreach ($docs as $id => &$item) {

                     $parent = $item['parent'];
-                    if (!isset($this->display[$parent])) {
+                    if (!isset($this->display[$parent])) {

                         $this->display[$parent] = 1;
                     }
                     $item['iteration'] = $this->display[$parent]++;
                 }
             }
             $this->config->setConfig(array('orderBy' => $orderBy));
-            if (empty($docs)) {
+            if (empty($docs)) {

                 break;
             }
             $this->levels[$currentLevel++] = $docs;
@@ -159,8 +159,8 @@ 
      * @param $id
      * @param int $maxDepth
      */
-    public function setActiveBranch($id, $maxDepth = 10)
-    {
+    public function setActiveBranch($id, $maxDepth = 10)

+    {

         $ids = array_values($this->modx->getParentIds($id, $maxDepth));
         $ids[] = $id;
         $ids[] = 0;
@@ -173,29 +173,29 @@ 
     /**
      * Подсчет количества непосредственных дочерних документов
      */
-    public function countChildren()
-    {
+    public function countChildren()

+    {

         $ids = array();
         $out = &$this->countChildren;
-        foreach ($this->levels as $level => $docs) {
+        foreach ($this->levels as $level => $docs) {

             $ids = array_merge($ids, array_keys($docs));
         }
         $maxDepth = count($this->levels);
         $currentDepth = 1;
-        while ($currentDepth <= $maxDepth) {
+        while ($currentDepth <= $maxDepth) {

             $_ids = implode(',', $ids);
-            if (empty($_ids)) {
+            if (empty($_ids)) {

                 break;
             }
             $q = $this->dbQuery("SELECT `parent`,COUNT(*) as `count` FROM {$this->getTable('site_content')} WHERE `parent` IN ({$_ids}) AND `published`=1 AND `deleted`=0 GROUP BY `parent`");
             $_ids = array();
-            while ($row = $this->modx->db->getRow($q)) {
+            while ($row = $this->modx->db->getRow($q)) {

                 $_ids[] = $row['parent'];
                 $out[$row['parent']] = $row['count'];
             }
-            if (!empty($_ids)) {
+            if (!empty($_ids)) {

                 $ids = $this->diff($ids, $_ids);
-            } else {
+            } else {

                 break;
             }
             $currentDepth++;
@@ -208,12 +208,12 @@ 
      * @param $a
      * @return array
      */
-    private function diff($b, $a)
-    {
+    private function diff($b, $a)

+    {

         $at = array_flip($a);
         $d = array();
-        foreach ($b as $i) {
-            if (!isset($at[$i])) {
+        foreach ($b as $i) {

+            if (!isset($at[$i])) {

                 $d[] = $i;
             }
         }
@@ -228,17 +228,17 @@ 
      * @param string $tpl шаблон
      * @return string
      */
-    public function render($tpl = '')
-    {
+    public function render($tpl = '')

+    {

         $this->debug->debug(array('Render data with template ' => $tpl), 'render', 2, array('html'));
-        if (empty($this->levels)) {
+        if (empty($this->levels)) {

             $noneTpl = $this->getCFGDef('noneTpl');
             $out = $noneTpl ? $this->parseChunk($noneTpl, array()) : '';
-        } else {
+        } else {

             $out = $this->_render($tpl);
         }
 
-        if ($out) {
+        if ($out) {

             $this->outData = DLTemplate::getInstance($this->modx)->parseDocumentSource($out);
         }
         $this->debug->debugEnd('render');
@@ -250,43 +250,45 @@ 
      * @param string $tpl
      * @return string
      */
-    public function _render($tpl = '')
-    {
+    public function _render($tpl = '')

+    {

         $currentLevel = &$this->currentLevel;
         $currentLevel = count($this->levels);
         $docs = $this->levels;
         /** @var prepare_DL_Extender_ $extPrepare */
         $extPrepare = $this->getExtender('prepare');
-        while ($currentLevel > 0) {
-            foreach ($docs[$currentLevel] as $id => &$data) {
-                if ($out = $this->prepareData($data)) {
-                    if (is_array($out)) {
+        while ($currentLevel > 0) {

+            foreach ($docs[$currentLevel] as $id => &$data) {

+                if ($out = $this->prepareData($data)) {

+                    if (is_array($out)) {

                         $data = $out;
                     }
                 };
-                if (!isset($data['maxLevel'])) {
+                if (!isset($data['maxLevel'])) {

                     $data['maxLevel'] = 1;
                     $docs[$currentLevel - 1][$data['parent']]['maxLevel'] = 0;
                 }
 
-                if ($extPrepare) {
+                if ($extPrepare) {

                     $data = $extPrepare->init($this, array(
                         'data'      => $data,
                         'nameParam' => 'prepare'
                     ));
-                    if (is_bool($data) && $data === false) {
+                    if (is_bool($data) && $data === false) {

                         continue;
                     }
                 }
 
-                if (isset($data['wrap'])) {
-                    if(is_array($data['wrap'])) $data['wrap'] = $this->parseRow($data['wrap']);
+                if (isset($data['wrap'])) {

+                    if(is_array($data['wrap'])) {

+                        $data['wrap'] = $this->parseRow($data['wrap']);

+                    }

                     $data['wrap'] = $this->parseOuter($data);
                 }
                 $hideSubMenus = $this->getCFGDef('hideSubMenus', 0);
                 $hideSubMenus = !$hideSubMenus || ($hideSubMenus && in_array((int)$data['parent'],
                             $this->activeBranch));
-                if ($hideSubMenus) {
+                if ($hideSubMenus) {

                     $docs[$currentLevel - 1][$data['parent']]['wrap'][] = $data;
                 }
             }
@@ -296,17 +298,19 @@ 
         unset($data);
         $out = '';
         $joinMenus = $this->getCFGDef('joinMenus', 0) && !$this->getCFGDef('showParent', 0);
-        foreach ($docs[0] as $id => $data) {
-            if (isset($data['wrap'])) {
-                if ($joinMenus) {
+        foreach ($docs[0] as $id => $data) {

+            if (isset($data['wrap'])) {

+                if ($joinMenus) {

                     $out .= $this->parseRow($data['wrap']);
-                } else {
+                } else {

                     $data['wrap'] = $this->parseRow($data['wrap']);
                     $out .= $this->parseOuter($data);
                 }
             }
         }
-        if ($joinMenus) $out = $this->parseOuter(array('wrap' => $out));
+        if ($joinMenus) {

+            $out = $this->parseOuter(array('wrap' => $out));

+        }

 
         return $out;
     }
@@ -316,33 +320,33 @@ 
      * @param $data
      * @return array
      */
-    public function prepareData($data)
-    {
+    public function prepareData($data)

+    {

         /**
          * @var e_DL_Extender $extE
          */
         $extE = $this->getExtender('e', true, true);
         $id = $data['id'];
-        if (isset($this->docTvs[$id])) {
+        if (isset($this->docTvs[$id])) {

             $data = array_merge($data, $this->docTvs[$id]);
         }
-        if ($id == $this->getHereId()) {
+        if ($id == $this->getHereId()) {

             $data['here'] = 1;
         }
-        if (!isset($data['here']) && in_array($id, $this->activeBranch)) {
+        if (!isset($data['here']) && in_array($id, $this->activeBranch)) {

             $data['active'] = 1;
         }
-        if ($this->getCFGDef('hideSubMenus') && isset($data['isfolder']) && $data['isfolder']) {
+        if ($this->getCFGDef('hideSubMenus') && isset($data['isfolder']) && $data['isfolder']) {

             $data['state'] = in_array($data['id'], $this->activeBranch) ? 'open' : 'closed';
         }
 
-        if (!isset($data['_display'])) {
+        if (!isset($data['_display'])) {

             $data['_display'] = $this->display[$data['parent']] - 1;
         }
-        if ($data['iteration'] == 1) {
+        if ($data['iteration'] == 1) {

             $data['first'] = 1;
         }
-        if ($data['iteration'] == $data['_display']) {
+        if ($data['iteration'] == $data['_display']) {

             $data['last'] = 1;
         }
 
@@ -350,12 +354,12 @@ 
         $data[$titleField] = isset($data['menutitle']) && !empty($data['menutitle']) ? $data['menutitle'] : $data['pagetitle'];
         $data['level'] = $this->currentLevel;
         $data['url'] = $this->makeUrl($data);
-        if ($this->getCFGDef('countChildren', 0)) {
+        if ($this->getCFGDef('countChildren', 0)) {

             $data['count'] = isset($this->countChildren[$data['id']]) ? $this->countChildren[$data['id']] : 0;
         }
 
-        if ($out = $extE->init($this, compact('data'))) {
-            if (is_array($out)) {
+        if ($out = $extE->init($this, compact('data'))) {

+            if (is_array($out)) {

                 $data = $out;
             }
         }
@@ -368,16 +372,16 @@ 
      * @param array $data
      * @return string
      */
-    public function parseOuter($data = array())
-    {
+    public function parseOuter($data = array())

+    {

         $tpl = $this->getCFGDef('outerTpl', '@CODE:<ul[+classes+]>[+wrap+]</ul>');
         $classes = '';
         $classNames = $this->getCFGDef('outerClass');
-        if ($this->currentLevel >= 1) {
+        if ($this->currentLevel >= 1) {

             $tpl = $this->getCFGDef('innerTpl', $tpl);
             $classNames = $this->getCFGDef('innerClass');
         }
-        if ($classNames) {
+        if ($classNames) {

             $classes = " class=\"{$classNames}\"";
         }
         $tpl = isset($data['_renderOuterTpl']) ? $data['_renderOuterTpl'] : $tpl;
@@ -394,10 +398,10 @@ 
      * @param array $data
      * @return string
      */
-    public function parseRow($data = array())
-    {
+    public function parseRow($data = array())

+    {

         $out = '';
-        foreach ($data as $iteration => $item) {
+        foreach ($data as $iteration => $item) {

             $tpl = isset($item['_renderRowTpl']) ? $item['_renderRowTpl'] : $this->getRowTemplate($item);
             $item = array_merge($item, $this->getClasses($item));
             $out .= $this->parseChunk($tpl, $item);
@@ -411,14 +415,14 @@ 
      * @param array $data
      * @return string
      */
-    protected function makeUrl($data = array())
-    {
+    protected function makeUrl($data = array())

+    {

         $out = '';
-        if ($this->getCFGDef('makeUrl', 1)) {
-            if (isset($data['type']) && $data['type'] == 'reference' && isset($data['content'])) {
+        if ($this->getCFGDef('makeUrl', 1)) {

+            if (isset($data['type']) && $data['type'] == 'reference' && isset($data['content'])) {

                 $out = is_numeric($data['content']) ? $this->modx->makeUrl($data['content'], '', '',
                     $this->getCFGDef('urlScheme', '')) : $data['content'];
-            } else {
+            } else {

                 $out = isset($data['id']) && is_numeric($data['id']) ? $this->modx->makeUrl($data['id'], '', '',
                     $this->getCFGDef('urlScheme', '')) : '';
             }
@@ -431,9 +435,9 @@ 
      * Вовзращает id текущего документа
      * @return int
      */
-    public function getHereId()
-    {
-        if (!$hereId = (int)$this->getCFGDef('hereId')) {
+    public function getHereId()

+    {

+        if (!$hereId = (int)$this->getCFGDef('hereId')) {

             $hereId = isset($this->modx->documentIdentifier) ? (int)$this->modx->documentIdentifier : 0;
         }
 
@@ -445,8 +449,8 @@ 
      * @param array $data
      * @return array
      */
-    protected function getClasses($data = array())
-    {
+    protected function getClasses($data = array())

+    {

         $classes = isset($data['classes']) ? $data['classes'] : array(
             'rowClass'     => '',
             'firstClass'   => '',
@@ -459,34 +463,34 @@ 
             'oddClass'     => '',
             'evenClass'    => ''
         );
-        if (isset($data['state'])) {
+        if (isset($data['state'])) {

             $classes['stateClass'] = $this->getCFGDef($data['state'] . 'Class', $data['state']);
         }
-        if (isset($data['here'])) {
+        if (isset($data['here'])) {

             $classes['hereClass'] = $this->getCFGDef('hereClass', 'current');
         }
-        if (isset($data['active'])) {
+        if (isset($data['active'])) {

             $classes['activeClass'] = $this->getCFGDef('activeClass', 'active');
         }
         $classes['rowClass'] = $this->getCFGDef('rowClass');
-        if ($data['iteration'] % 2 == 1) {
+        if ($data['iteration'] % 2 == 1) {

             $classes['oddClass'] = $this->getCFGDef('oddClass', 'odd');
-        } else {
+        } else {

             $classes['evenClass'] = $this->getCFGDef('evenClass', 'even');
         }
-        if (isset($data['first'])) {
+        if (isset($data['first'])) {

             $classes['firstClass'] = $this->getCFGDef('firstClass', 'first');
         }
-        if (isset($data['last'])) {
+        if (isset($data['last'])) {

             $classes['lastClass'] = $this->getCFGDef('lastClass', 'last');
         }
-        if ($levelClass = $this->getCFGDef('levelClass', 'level')) {
+        if ($levelClass = $this->getCFGDef('levelClass', 'level')) {

             $classes['levelClass'] = $levelClass . $data['level'];
         }
-        if (isset($data['type']) && $data['type'] == 'reference') {
+        if (isset($data['type']) && $data['type'] == 'reference') {

             $classes['webLinkClass'] = $this->getCFGDef('webLinkClass');
         }
-        if (!empty($data['wrap'])) {
+        if (!empty($data['wrap'])) {

             $classes['parentClass'] = $this->getCFGDef('parentClass');
         }
         $classNames = implode(' ', array_filter(array_values($classes)));
@@ -501,28 +505,28 @@ 
      * @param array $data
      * @return string
      */
-    protected function getRowTemplate($data = array())
-    {
+    protected function getRowTemplate($data = array())

+    {

         $tpl = $this->getCFGDef('rowTpl', '@CODE:<li[+classes+]><a href="[+url+]">[+title+]</a></li>');
-        if (!empty($data['wrap'])) {
+        if (!empty($data['wrap'])) {

             $tpl = $this->getCFGDef('parentRowTpl',
                 '@CODE:<li[+classes+]><a href="[+url+]">[+title+]</a>[+wrap+]</li>');
             if ((isset($data['template']) && !$data['template']) || (isset($data['link_attributes']) && strpos($data['link_attributes'],
                         'category') !== false)
-            ) {
+            ) {

                 $tpl = $this->getCFGDef('categoryFolderTpl', $tpl);
-            } elseif (isset($data['here'])) {
+            } elseif (isset($data['here'])) {

                 $tpl = $this->getCFGDef('parentRowHereTpl', $tpl);
-            } elseif (isset($data['active'])) {
+            } elseif (isset($data['active'])) {

                 $tpl = $this->getCFGDef('parentRowActiveTpl', $tpl);
             }
-        } elseif ($data['level'] > 1) {
+        } elseif ($data['level'] > 1) {

             $tpl = $this->getCFGDef('innerRowTpl', $tpl);
-            if (isset($data['here'])) {
+            if (isset($data['here'])) {

                 $tpl = $this->getCFGDef('innerRowHereTpl', $tpl);
             }
-        } else {
-            if (isset($data['here'])) {
+        } else {

+            if (isset($data['here'])) {

                 $tpl = $this->getCFGDef('rowHereTpl', $tpl);
             }
         }
@@ -536,35 +540,37 @@ 
      * @param array $array
      * @return string
      */
-    public function getJSON($data, $fields, $array = array())
-    {
+    public function getJSON($data, $fields, $array = array())

+    {

         $currentLevel = &$this->currentLevel;
         $currentLevel = count($this->levels);
         $docs = $this->levels;
 
-        if (empty($docs)) return '[]';
+        if (empty($docs)) {

+            return '[]';

+        }

 
         /** @var prepare_DL_Extender_ $extPrepare */
         $extPrepare = $this->getExtender('prepare');
 
-        while ($currentLevel > 0) {
-            foreach ($docs[$currentLevel] as $id => &$data) {
-                if ($out = $this->prepareData($data)) {
-                    if (is_array($out)) {
+        while ($currentLevel > 0) {

+            foreach ($docs[$currentLevel] as $id => &$data) {

+                if ($out = $this->prepareData($data)) {

+                    if (is_array($out)) {

                         $data = $out;
                     }
                 };
 
-                if (isset($data['here']) || isset($data['active'])) {
+                if (isset($data['here']) || isset($data['active'])) {

                     $docs[$currentLevel - 1][$data['parent']]['active'] = 1;
                 }
 
-                if ($extPrepare) {
+                if ($extPrepare) {

                     $data = $extPrepare->init($this, array(
                         'data'      => $data,
                         'nameParam' => 'prepare'
                     ));
-                    if (is_bool($data) && $data === false) {
+                    if (is_bool($data) && $data === false) {

                         continue;
                     }
                 }
@@ -572,7 +578,7 @@ 
                 $hideSubMenus = $this->getCFGDef('hideSubMenus', 0);
                 $hideSubMenus = !$hideSubMenus || ($hideSubMenus && in_array((int)$data['parent'],
                             $this->activeBranch));
-                if ($hideSubMenus) {
+                if ($hideSubMenus) {

                     $docs[$currentLevel - 1][$data['parent']]['children'][] = $data;
                 }
             }
@@ -582,11 +588,11 @@ 
         unset($data);
         $out = array();
         $joinMenus = $this->getCFGDef('joinMenus', 0) && !$this->getCFGDef('showParent', 0);
-        foreach ($docs[0] as $id => $data) {
-            if (isset($data['children'])) {
-                if ($joinMenus) {
+        foreach ($docs[0] as $id => $data) {

+            if (isset($data['children'])) {

+                if ($joinMenus) {

                     $out = array_merge($out, $data['children']);
-                } else {
+                } else {

                     $out[] = $data['children'];
                 }
             }
@@ -603,8 +609,8 @@ 
      * @param mixed $def значение по умолчанию, если в конфиге нет искомого параметра
      * @return mixed значение из конфига
      */
-    public function getCFGDef($name, $def = null)
-    {
+    public function getCFGDef($name, $def = null)

+    {

         return parent::getCFGDef($name . $this->currentLevel, parent::getCFGDef($name, $def));
     }
 }

assets/lib/MODxAPI/modResource.php

Braces +193 added lines, -185 removed lines

@@ -4,8 +4,8 @@ 
 /**
  * Class modResource
  */
-class modResource extends MODxAPI
-{
+class modResource extends MODxAPI

+{

     /**
      * @var string
      */
@@ -157,8 +157,8 @@ 
      * @param DocumentParser $modx
      * @param bool $debug
      */
-    public function __construct($modx, $debug = false)
-    {
+    public function __construct($modx, $debug = false)

+    {

         parent::__construct($modx, $debug);
         $this->get_TV();
         $uTable = $this->makeTable("manager_users");
@@ -171,8 +171,8 @@ 
     /**
      * @return array
      */
-    public function toArrayMain()
-    {
+    public function toArrayMain()

+    {

         $out = array_intersect_key(parent::toArray(), $this->default_field);
 
         return $out;
@@ -182,18 +182,18 @@ 
      * @param bool $render
      * @return array
      */
-    public function toArrayTV($render = false)
-    {
+    public function toArrayTV($render = false)

+    {

         $out = array_diff_key(parent::toArray(), $this->default_field);
         $tpl = $this->get('template');
         $tvTPL = APIHelpers::getkey($this->tvTpl, $tpl, array());
-        foreach ($tvTPL as $item) {
-            if (isset($this->tvid[$item]) && !array_key_exists($this->tvid[$item], $out)) {
+        foreach ($tvTPL as $item) {

+            if (isset($this->tvid[$item]) && !array_key_exists($this->tvid[$item], $out)) {

                 $out[$this->tvid[$item]] = $this->get($this->tvid[$item]);
             }
         }
-        if ($render) {
-            foreach ($out as $key => $val) {
+        if ($render) {

+            foreach ($out as $key => $val) {

                 $out[$key] = $this->renderTV($key);
             }
         }
@@ -208,8 +208,8 @@ 
      * @param bool $render
      * @return array
      */
-    public function toArray($prefix = '', $suffix = '', $sep = '_', $render = true)
-    {
+    public function toArray($prefix = '', $suffix = '', $sep = '_', $render = true)

+    {

         $out = array_merge(
             $this->toArrayMain(),
             $this->toArrayTV($render),
@@ -222,11 +222,11 @@ 
     /**
      * @return null|string
      */
-    public function getUrl()
-    {
+    public function getUrl()

+    {

         $out = null;
         $id = (int)$this->getID();
-        if (!empty($id)) {
+        if (!empty($id)) {

             $out = $this->modx->makeUrl($id);
         }
 
@@ -238,10 +238,10 @@ 
      * @param string $second
      * @return mixed
      */
-    public function getTitle($main = 'menutitle', $second = 'pagetitle')
-    {
+    public function getTitle($main = 'menutitle', $second = 'pagetitle')

+    {

         $title = $this->get($main);
-        if (empty($title) && $title !== '0') {
+        if (empty($title) && $title !== '0') {

             $title = $this->get($second);
         }
 
@@ -251,8 +251,8 @@ 
     /**
      * @return bool
      */
-    public function isWebShow()
-    {
+    public function isWebShow()

+    {

         $pub = ($this->get('publishedon') < time() && $this->get('published'));
         $unpub = ($this->get('unpub_date') == 0 || $this->get('unpub_date') > time());
         $del = ($this->get('deleted') == 0 && ($this->get('deletedon') == 0 || $this->get('deletedon') > time()));
@@ -263,8 +263,8 @@ 
     /**
      * @return $this
      */
-    public function touch()
-    {
+    public function touch()

+    {

         $this->set('editedon', time());
 
         return $this;
@@ -274,14 +274,14 @@ 
      * @param $tvname
      * @return null|string
      */
-    public function renderTV($tvname)
-    {
+    public function renderTV($tvname)

+    {

         $out = null;
-        if ($this->getID() > 0) {
+        if ($this->getID() > 0) {

             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)) {
+            if ($this->isTVarrayField($tvname) && is_array($tvval)) {

                 $tvval = implode('||', $tvval);
             }
             $param = APIHelpers::getkey($this->tvd, $tvname, array());
@@ -298,14 +298,14 @@ 
      * @param $key
      * @return mixed
      */
-    public function get($key)
-    {
+    public function get($key)

+    {

         $out = parent::get($key);
-        if (isset($this->tv[$key])) {
+        if (isset($this->tv[$key])) {

             $tpl = $this->get('template');
             $tvTPL = APIHelpers::getkey($this->tvTpl, $tpl, array());
             $tvID = APIHelpers::getkey($this->tv, $key, 0);
-            if (in_array($tvID, $tvTPL) && is_null($out)) {
+            if (in_array($tvID, $tvTPL) && is_null($out)) {

                 $out = APIHelpers::getkey($this->tvd[$key], 'value', null);
             }
         }
@@ -318,10 +318,10 @@ 
      * @param $value
      * @return $this
      */
-    public function set($key, $value)
-    {
-        if ((is_scalar($value) || $this->isTVarrayField($key) || $this->isJsonField($key)) && is_scalar($key) && !empty($key)) {
-            switch ($key) {
+    public function set($key, $value)

+    {

+        if ((is_scalar($value) || $this->isTVarrayField($key) || $this->isJsonField($key)) && is_scalar($key) && !empty($key)) {

+            switch ($key) {

                 case 'parent':
                     $value = (int)$value;
                     break;
@@ -331,38 +331,38 @@ 
                     break;
                 case 'published':
                     $value = (int)((bool)$value);
-                    if ($value) {
+                    if ($value) {

                         $this->field['publishedon'] = time() + $this->modxConfig('server_offset_time');
                     }
                     break;
                 case 'pub_date':
                     $value = $this->getTime($value);
-                    if ($value > 0 && time() + $this->modxConfig('server_offset_time') > $value) {
+                    if ($value > 0 && time() + $this->modxConfig('server_offset_time') > $value) {

                         $this->field['published'] = 1;
                         $this->field['publishedon'] = $value;
                     }
                     break;
                 case 'unpub_date':
                     $value = $this->getTime($value);
-                    if ($value > 0 && time() + $this->modxConfig('server_offset_time') > $value) {
+                    if ($value > 0 && time() + $this->modxConfig('server_offset_time') > $value) {

                         $this->field['published'] = 0;
                         $this->field['publishedon'] = 0;
                     }
                     break;
                 case 'deleted':
                     $value = (int)((bool)$value);
-                    if ($value) {
+                    if ($value) {

                         $this->field['deletedon'] = time() + $this->modxConfig('server_offset_time');
-                    } else {
+                    } else {

                         $this->field['deletedon'] = 0;
                     }
                     break;
                 case 'deletedon':
                     $value = $this->getTime($value);
-                    if ($value > 0 && time() + $this->modxConfig('server_offset_time') < $value) {
+                    if ($value > 0 && time() + $this->modxConfig('server_offset_time') < $value) {

                         $value = 0;
                     }
-                    if ($value) {
+                    if ($value) {

                         $this->field['deleted'] = 1;
                     }
                     break;
@@ -389,20 +389,20 @@ 
      * @param int $default
      * @return int|mixed
      */
-    protected function getUser($value, $default = 0)
-    {
+    protected function getUser($value, $default = 0)

+    {

         $currentAdmin = APIHelpers::getkey($_SESSION, 'mgrInternalKey', 0);
         $value = (int)$value;
-        if (!empty($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) {
+            if (!$exists) {

                 $value = 0;
             }
         }
-        if (empty($value)) {
+        if (empty($value)) {

             $value = empty($currentAdmin) ? $default : $currentAdmin;
         }
 
@@ -413,9 +413,9 @@ 
      * @param $data
      * @return bool|string
      */
-    protected function findUserBy($data)
-    {
-        switch (true) {
+    protected function findUserBy($data)

+    {

+        switch (true) {

             case (is_int($data) || ((int)$data > 0 && (string)intval($data) === $data)):
                 $find = 'id';
                 break;
@@ -436,11 +436,11 @@ 
      * @param array $data
      * @return $this
      */
-    public function create($data = array())
-    {
+    public function create($data = array())

+    {

         $this->close();
         $fld = array();
-        foreach ($this->tvd as $name => $tv) {
+        foreach ($this->tvd as $name => $tv) {

             $fld[$name] = $tv['value'];
         };
         $this->store($fld);
@@ -458,10 +458,10 @@ 
      * @param $id
      * @return $this
      */
-    public function edit($id)
-    {
+    public function edit($id)

+    {

         $id = is_scalar($id) ? trim($id) : '';
-        if ($this->getID() != $id) {
+        if ($this->getID() != $id) {

             $this->close();
             $this->markAllEncode();
             $this->newDoc = false;
@@ -469,12 +469,12 @@ 
             $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);
-            while ($row = $this->modx->db->getRow($result)) {
+            while ($row = $this->modx->db->getRow($result)) {

                 $this->field[$this->tvid[$row['tmplvarid']]] = $row['value'];
             }
-            if (empty($this->field['id'])) {
+            if (empty($this->field['id'])) {

                 $this->id = null;
-            } else {
+            } else {

                 $this->id = $this->field['id'];
                 $this->set('editedby', null)->touch();
                 $this->decodeFields();
@@ -491,10 +491,10 @@ 
      * @param bool $clearCache
      * @return bool|null
      */
-    public function save($fire_events = false, $clearCache = false)
-    {
+    public function save($fire_events = false, $clearCache = false)

+    {

         $parent = null;
-        if ($this->field['pagetitle'] == '') {
+        if ($this->field['pagetitle'] == '') {

             $this->log['emptyPagetitle'] = 'Pagetitle is empty in <pre>' . print_r($this->field, true) . '</pre>';
 
             return false;
@@ -506,7 +506,7 @@ 
             $this->field['parent'] == 0 &&
             !$this->modxConfig('udperms_allowroot') &&
             !($uid && isset($_SESSION['mgrRole']) && $_SESSION['mgrRole'] == 1)
-        ) {
+        ) {

             $this->log['rootForbidden'] = 'Only Administrators can create documents in the root folder because udperms_allowroot setting is off';
 
             return false;
@@ -522,11 +522,11 @@ 
         ), $fire_events);
 
         $fld = $this->encodeFields()->toArray(null, null, null, false);
-        foreach ($this->default_field as $key => $value) {
+        foreach ($this->default_field as $key => $value) {

             $tmp = $this->get($key);
-            if ($this->newDoc && (!is_int($tmp) && $tmp == '')) {
-                if ($tmp == $value) {
-                    switch ($key) {
+            if ($this->newDoc && (!is_int($tmp) && $tmp == '')) {

+                if ($tmp == $value) {

+                    switch ($key) {

                         case 'cacheable':
                             $value = $this->modxConfig('cache_default');
                             break;
@@ -546,11 +546,11 @@ 
                 }
                 $this->field[$key] = $value;
             }
-            switch (true) {
+            switch (true) {

                 case $key == 'parent':
                     $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) {
+                    if ($this->modx->db->getValue($q) != 1) {

                         $parent = 0;
                     }
                     $this->field[$key] = $parent;
@@ -565,38 +565,38 @@ 
             unset($fld[$key]);
         }
 
-        if (!empty($this->set)) {
-            if ($this->newDoc) {
+        if (!empty($this->set)) {

+            if ($this->newDoc) {

                 $SQL = "INSERT into {$this->makeTable('site_content')} SET " . implode(', ', $this->set);
-            } else {
+            } else {

                 $SQL = "UPDATE {$this->makeTable('site_content')} SET " . implode(', ',
                         $this->set) . " WHERE `id` = " . $this->id;
             }
             $this->query($SQL);
 
-            if ($this->newDoc) {
+            if ($this->newDoc) {

                 $this->id = $this->modx->db->getInsertId();
             }
 
-            if ($parent > 0) {
+            if ($parent > 0) {

                 $this->query("UPDATE {$this->makeTable('site_content')} SET `isfolder`='1' WHERE `id`='{$parent}'");
             }
         }
 
         $_deleteTVs = $_insertTVs = array();
-        foreach ($fld as $key => $value) {
-            if (empty($this->tv[$key]) || !$this->isChanged($key) || !$this->belongsToTemplate($this->tv[$key])) {
+        foreach ($fld as $key => $value) {

+            if (empty($this->tv[$key]) || !$this->isChanged($key) || !$this->belongsToTemplate($this->tv[$key])) {

                 continue;
-            } elseif ($value === '') {
+            } elseif ($value === '') {

                 $_deleteTVs[] = $this->tv[$key];
-            } else {
+            } else {

                 $_insertTVs[$this->tv[$key]] = $this->escape($value);
             }
         }
 
-        if (!empty($_insertTVs)) {
+        if (!empty($_insertTVs)) {

             $values = array();
-            foreach ($_insertTVs as $id => $value) {
+            foreach ($_insertTVs as $id => $value) {

                 $values[] = "({$this->id}, {$id}, '{$value}')";
             }
             $values = implode(',', $values);
@@ -604,17 +604,19 @@ 
     `value` = VALUES(`value`)");
         }
 
-        if (!empty($_deleteTVs)) {
+        if (!empty($_deleteTVs)) {

             $ids = implode(',', $_deleteTVs);
             $this->query("DELETE FROM {$this->makeTable('site_tmplvar_contentvalues')} WHERE `contentid` = '{$this->id}' AND `tmplvarid` IN ({$ids})");
         }
 
-        if (!isset($this->mode)) {
+        if (!isset($this->mode)) {

             $this->mode = $this->newDoc ? "new" : "upd";
             $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 : '',
@@ -622,7 +624,7 @@ 
             'docObj' => $this
         ), $fire_events);
 
-        if ($clearCache) {
+        if ($clearCache) {

             $this->clearCache($fire_events);
         }
         $this->decodeFields();
@@ -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]);
@@ -645,16 +648,16 @@ 
      * @return $this
      * @throws Exception
      */
-    public function toTrash($ids)
-    {
+    public function toTrash($ids)

+    {

         $ignore = $this->systemID();
         $_ids = $this->cleanIDs($ids, ',', $ignore);
-        if (is_array($_ids) && $_ids != array()) {
+        if (is_array($_ids) && $_ids != array()) {

             $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})");
-        } else {
+        } 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>');
         }
@@ -666,11 +669,11 @@ 
      * @param bool $fire_events
      * @return $this
      */
-    public function clearTrash($fire_events = false)
-    {
+    public function clearTrash($fire_events = false)

+    {

         $q = $this->query("SELECT `id` FROM {$this->makeTable('site_content')} WHERE `deleted`='1'");
         $_ids = $this->modx->db->getColumn('id', $q);
-        if (is_array($_ids) && $_ids != array()) {
+        if (is_array($_ids) && $_ids != array()) {

             $this->invokeEvent('OnBeforeEmptyTrash', array(
                 "ids" => $_ids
             ), $fire_events);
@@ -692,15 +695,15 @@ 
      * @param int|bool $depth
      * @return array
      */
-    public function children($ids, $depth)
-    {
+    public function children($ids, $depth)

+    {

         $_ids = $this->cleanIDs($ids, ',');
-        if (is_array($_ids) && $_ids != array()) {
+        if (is_array($_ids) && $_ids != array()) {

             $id = $this->sanitarIn($_ids);
-            if (!empty($id)) {
+            if (!empty($id)) {

                 $q = $this->query("SELECT `id` FROM {$this->makeTable('site_content')} where `parent` IN ({$id})");
                 $id = $this->modx->db->getColumn('id', $q);
-                if ($depth > 0 || $depth === true) {
+                if ($depth > 0 || $depth === true) {

                     $id = $this->children($id, is_bool($depth) ? $depth : ($depth - 1));
                 }
                 $_ids = array_merge($_ids, $id);
@@ -716,8 +719,8 @@ 
      * @return $this
      * @throws Exception
      */
-    public function delete($ids, $fire_events = false)
-    {
+    public function delete($ids, $fire_events = false)

+    {

         $ids = $this->children($ids, true);
         $_ids = $this->cleanIDs($ids, ',', $this->systemID());
         $this->invokeEvent('OnBeforeDocFormDelete', array(
@@ -734,8 +737,8 @@ 
     /**
      * @return array
      */
-    private function systemID()
-    {
+    private function systemID()

+    {

         $ignore = array(
             0, //empty document
             (int)$this->modxConfig('site_start'),
@@ -745,7 +748,7 @@ 
         );
         $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) {
+        foreach ($data as $item) {

             $ignore[] = (int)$item['setting_value'];
         }
 
@@ -757,22 +760,22 @@ 
      * @param $alias
      * @return string
      */
-    protected function checkAlias($alias)
-    {
+    protected function checkAlias($alias)

+    {

         $alias = strtolower($alias);
-        if ($this->modxConfig('friendly_urls')) {
+        if ($this->modxConfig('friendly_urls')) {

             $_alias = $this->escape($alias);
-            if ((!$this->modxConfig('allow_duplicate_alias') && !$this->modxConfig('use_alias_path')) || ($this->modxConfig('allow_duplicate_alias') && $this->modxConfig('use_alias_path'))) {
+            if ((!$this->modxConfig('allow_duplicate_alias') && !$this->modxConfig('use_alias_path')) || ($this->modxConfig('allow_duplicate_alias') && $this->modxConfig('use_alias_path'))) {

                 $flag = $this->modx->db->getValue($this->query("SELECT `id` FROM {$this->makeTable('site_content')} WHERE `alias`='{$_alias}' AND `parent`={$this->get('parent')} LIMIT 1"));
-            } else {
+            } else {

                 $flag = $this->modx->db->getValue($this->query("SELECT `id` FROM {$this->makeTable('site_content')} WHERE `alias`='{$_alias}' LIMIT 1"));
             }
-            if (($flag && $this->newDoc) || (!$this->newDoc && $flag && $this->id != $flag)) {
+            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) {
+                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 {
+                } else {

                     $alias .= '-2';
                 }
                 $alias = $this->checkAlias($alias);
@@ -786,8 +789,8 @@ 
      * @param $key
      * @return bool
      */
-    public function issetField($key)
-    {
+    public function issetField($key)

+    {

         return (array_key_exists($key, $this->default_field) || array_key_exists($key, $this->tv));
     }
 
@@ -795,12 +798,12 @@ 
      * @param bool $reload
      * @return $this
      */
-    protected function get_TV($reload = false)
-    {
+    protected function get_TV($reload = false)

+    {

         $this->modx->_TVnames = array();
-        if (empty($this->modx->_TVnames) || $reload) {
+        if (empty($this->modx->_TVnames) || $reload) {

             $result = $this->query('SELECT `id`,`name`,`type` FROM ' . $this->makeTable('site_tmplvars'));
-            while ($row = $this->modx->db->GetRow($result)) {
+            while ($row = $this->modx->db->GetRow($result)) {

                 $this->modx->_TVnames[$row['name']] = array(
                     "id"   => $row['id'],
                     "type" => $row['type']
@@ -809,14 +812,16 @@ 
         }
         $arrayTypes = array('checkbox', 'listbox-multiple');
         $arrayTVs = array();
-        foreach ($this->modx->_TVnames as $name => $data) {
+        foreach ($this->modx->_TVnames as $name => $data) {

             $this->tvid[$data['id']] = $name;
             $this->tv[$name] = $data['id'];
-            if (in_array($data['type'], $arrayTypes)) {
+            if (in_array($data['type'], $arrayTypes)) {

                 $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;
@@ -825,12 +830,12 @@ 
     /**
      * @return $this
      */
-    protected function loadTVTemplate()
-    {
+    protected function loadTVTemplate()

+    {

         $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) {
+        foreach ($q as $item) {

             $this->tvTpl[$item['templateid']][] = $item['tmplvarid'];
         }
 
@@ -841,16 +846,16 @@ 
      * @param array $tvId
      * @return $this
      */
-    protected function loadTVDefault(array $tvId = array())
-    {
-        if (is_array($tvId) && !empty($tvId)) {
+    protected function loadTVDefault(array $tvId = array())

+    {

+        if (is_array($tvId) && !empty($tvId)) {

             $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})");
             $rows = $this->modx->db->makeArray($rs);
             $this->tvd = array();
-            foreach ($rows as $item) {
+            foreach ($rows as $item) {

                 $this->tvd[$item['name']] = $item;
             }
         }
@@ -863,17 +868,17 @@ 
      * @return int
      * @throws Exception
      */
-    public function setTemplate($tpl)
-    {
-        if (!is_numeric($tpl) || $tpl != (int)$tpl) {
-            if (is_scalar($tpl)) {
+    public function setTemplate($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) . "'";
                 $rs = $this->query($sql);
-                if (!$rs || $this->modx->db->getRecordCount($rs) <= 0) {
+                if (!$rs || $this->modx->db->getRecordCount($rs) <= 0) {

                     throw new Exception("Template {$tpl} is not exists");
                 }
                 $tpl = $this->modx->db->getValue($rs);
-            } else {
+            } else {

                 throw new Exception("Invalid template name: " . print_r($tpl, 1));
             }
         }
@@ -884,14 +889,14 @@ 
     /**
      * @return string
      */
-    protected function getAlias()
-    {
-        if ($this->modxConfig('friendly_urls') && $this->modxConfig('automatic_alias') && $this->get('alias') == '') {
+    protected function getAlias()

+    {

+        if ($this->modxConfig('friendly_urls') && $this->modxConfig('automatic_alias') && $this->get('alias') == '') {

             $alias = strtr($this->get('pagetitle'), $this->table);
-        } else {
-            if ($this->get('alias') != '') {
+        } else {

+            if ($this->get('alias') != '') {

                 $alias = $this->get('alias');
-            } else {
+            } else {

                 $alias = '';
             }
         }
@@ -908,10 +913,10 @@ 
      *
      * Пересчет menuindex по полю таблицы site_content
      */
-    public function updateMenuindex($parent, $criteria = 'id', $dir = 'asc')
-    {
+    public function updateMenuindex($parent, $criteria = 'id', $dir = 'asc')

+    {

         $dir = strtolower($dir) == 'desc' ? 'desc' : 'asc';
-        if (is_integer($parent) && $criteria !== '') {
+        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}");
         }
@@ -924,37 +929,37 @@ 
      *
      * @return $this
      */
-    public function setDefaultTemplate()
-    {
+    public function setDefaultTemplate()

+    {

         $parent = $this->get('parent');
         $template = $this->modxConfig('default_template');
-        switch ($this->modxConfig('auto_template_logic')) {
+        switch ($this->modxConfig('auto_template_logic')) {

             case 'sibling':
-                if (!$parent) {
+                if (!$parent) {

                     $site_start = $this->modxConfig('site_start');
                     $where = "sc.isfolder=0 AND sc.id!={$site_start}";
                     $sibl = $this->modx->getDocumentChildren($parent, 1, 0, 'template', $where, 'menuindex', 'ASC', 1);
-                    if (isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
+                    if (isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {

                         $template = $sibl[0]['template'];
                     }
-                } else {
+                } else {

                     $sibl = $this->modx->getDocumentChildren($parent, 1, 0, 'template', 'isfolder=0', 'menuindex',
                         'ASC', 1);
-                    if (isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
+                    if (isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {

                         $template = $sibl[0]['template'];
-                    } else {
+                    } else {

                         $sibl = $this->modx->getDocumentChildren($parent, 0, 0, 'template', 'isfolder=0', 'menuindex',
                             'ASC', 1);
-                        if (isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
+                        if (isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {

                             $template = $sibl[0]['template'];
                         }
                     }
                 }
                 break;
             case 'parent':
-                if ($parent) {
+                if ($parent) {

                     $_parent = $this->modx->getPageInfo($parent, 0, 'template');
-                    if (isset($_parent['template'])) {
+                    if (isset($_parent['template'])) {

                         $template = $_parent['template'];
                     }
                 }
@@ -971,18 +976,18 @@ 
      * @param  bool $store обновить распакованное поле
      * @return array ассоциативный массив с данными из json строки
      */
-    public function decodeField($field, $store = false)
-    {
+    public function decodeField($field, $store = false)

+    {

         $out = array();
-        if ($this->isDecodableField($field)) {
+        if ($this->isDecodableField($field)) {

             $data = $this->get($field);
-            if ($this->isTVarrayField($field)) {
+            if ($this->isTVarrayField($field)) {

                 $out = explode('||', $data);
-            } else {
+            } else {

                 $out = jsonHelper::jsonDecode($data, array('assoc' => true), true);
             }
         }
-        if ($store) {
+        if ($store) {

             $this->field[$field] = $out;
             $this->markAsDecode($field);
         }
@@ -996,18 +1001,18 @@ 
      * @param  bool $store обновить запакованное поле
      * @return string|null json строка
      */
-    public function encodeField($field, $store = false)
-    {
+    public function encodeField($field, $store = false)

+    {

         $out = null;
-        if ($this->isEncodableField($field)) {
+        if ($this->isEncodableField($field)) {

             $data = $this->get($field);
-            if ($this->isTVarrayField($field)) {
+            if ($this->isTVarrayField($field)) {

                 $out = is_array($data) ? implode('||', $data) : (string)$data;
-            } else {
+            } else {

                 $out = json_encode($data);
             }
         }
-        if ($store) {
+        if ($store) {

             $this->field[$field] = $out;
             $this->markAsEncode($field);
         }
@@ -1020,8 +1025,8 @@ 
      * @param  string $field имя поля
      * @return boolean
      */
-    public function isTVarrayField($field)
-    {
+    public function isTVarrayField($field)

+    {

         return (is_scalar($field) && in_array($field, $this->tvaFields));
     }
 
@@ -1029,10 +1034,10 @@ 
      * Пометить все поля как запакованные
      * @return $this
      */
-    public function markAllEncode()
-    {
+    public function markAllEncode()

+    {

         parent::markAllEncode();
-        foreach ($this->tvaFields as $field) {
+        foreach ($this->tvaFields as $field) {

             $this->markAsEncode($field);
         }
 
@@ -1043,10 +1048,10 @@ 
      * Пометить все поля как распакованные
      * @return $this
      */
-    public function markAllDecode()
-    {
+    public function markAllDecode()

+    {

         parent::markAllDecode();
-        foreach ($this->tvaFields as $field) {
+        foreach ($this->tvaFields as $field) {

             $this->markAsDecode($field);
         }
 
@@ -1056,16 +1061,17 @@ 
     /**
      * @param int $docId
      */
-    public function getDocumentGroups($docId = 0) {
+    public function getDocumentGroups($docId = 0)

+    {

         $out = array();
         $doc = $this->switchObject($docId);
-        if (null !== $doc->getID()) {
+        if (null !== $doc->getID()) {

             $doc_groups = $this->makeTable('document_groups');
             $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());
-            while ($row = $this->modx->db->getRow($rs)) {
+            while ($row = $this->modx->db->getRow($rs)) {

                 $out[$row['document_group']] = $row['name'];
             }
 
@@ -1080,18 +1086,20 @@ 
      * @param array $groupIds
      * @return $this
      */
-    public function setDocumentGroups($docId = 0, $groupIds = array())
-    {
-        if (!is_array($groupIds)) return $this;
-        if ($this->newDoc && $docId == 0) {
+    public function setDocumentGroups($docId = 0, $groupIds = array())

+    {

+        if (!is_array($groupIds)) {

+            return $this;

+        }

+        if ($this->newDoc && $docId == 0) {

             $this->groupIds = $groupIds;
-        } else {
+        } else {

             $doc = $this->switchObject($docId);
-            if ($id = $doc->getID()) {
-                foreach ($groupIds as $gid) {
+            if ($id = $doc->getID()) {

+                foreach ($groupIds as $gid) {

                     $this->query("REPLACE INTO {$this->makeTable('document_groups')} (`document_group`, `document`) VALUES ('{$gid}', '{$id}')");
                 }
-                if (!$this->newDoc) {
+                if (!$this->newDoc) {

                     $groupIds = empty($groupIds) ? '0' : implode(',', $groupIds);
                     $this->query("DELETE FROM {$this->makeTable('document_groups')} WHERE `document`={$id} AND `document_group` NOT IN ({$groupIds})");
                 }

assets/lib/SimpleTab/table.abstract.php

Braces +48 added lines, -46 removed lines

@@ -8,8 +8,8 @@ 
  * Class dataTable
  * @package SimpleTab
  */
-class dataTable extends \autoTable
-{
+class dataTable extends \autoTable

+{

     /**
      * @var array
      */
@@ -40,8 +40,8 @@ 
      * @param \DocumentParser $modx
      * @param bool $debug
      */
-    public function __construct($modx, $debug = false)
-    {
+    public function __construct($modx, $debug = false)

+    {

         parent::__construct($modx, $debug);
         $this->modx = $modx;
         $this->fs = \Helpers\FS::getInstance();
@@ -51,8 +51,8 @@ 
      * @param $ids
      * @param $rid
      */
-    protected function clearIndexes($ids, $rid)
-    {
+    protected function clearIndexes($ids, $rid)

+    {

         $ids = $this->cleanIDs($ids, ',', array(0));
         $ids = $this->sanitarIn($ids);
         $table = $this->makeTable($this->table);
@@ -70,8 +70,8 @@ 
      * @param $field
      * @return $this
      */
-    public function touch($field)
-    {
+    public function touch($field)

+    {

         $this->set($field, date('Y-m-d H:i:s', time() + $this->modx->config['server_offset_time']));
 
         return $this;
@@ -82,22 +82,22 @@ 
      * @param $dir
      * @param $rid
      */
-    public function place($ids, $dir, $rid)
-    {
+    public function place($ids, $dir, $rid)

+    {

         $table = $this->makeTable($this->table);
         $ids = $this->cleanIDs($ids, ',', array(0));
-        if (empty($ids) || is_scalar($ids)) {
+        if (empty($ids) || is_scalar($ids)) {

             return false;
         }
         $rows = $this->query("SELECT count(`{$this->pkName}`) FROM {$table} WHERE `{$this->rfName}`={$rid}");
         $index = $this->modx->db->getValue($rows);
         $cnt = count($ids);
         $ids = implode(',', $ids);
-        if ($dir == 'top') {
+        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("SET @index := -1");
-        } else {
+        } 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));
@@ -112,26 +112,26 @@ 
      * @param $url
      * @param bool $cache
      */
-    public function deleteThumb($url, $cache = false)
-    {
+    public function deleteThumb($url, $cache = false)

+    {

         $url = $this->fs->relativePath($url);
-        if (empty($url)) {
+        if (empty($url)) {

             return;
         }
-        if ($this->fs->checkFile($url)) {
+        if ($this->fs->checkFile($url)) {

             unlink(MODX_BASE_PATH . $url);
         }
         $dir = $this->fs->takeFileDir($url);
         $iterator = new \FilesystemIterator($dir);
-        if (!$iterator->valid()) {
+        if (!$iterator->valid()) {

             rmdir($dir);
         }
-        if ($cache) {
+        if ($cache) {

             return;
         }
         $thumbsCache = \APIhelpers::getkey($this->params,'thumbsCache',$this->thumbsCache);
         $thumb = $thumbsCache . $url;
-        if ($this->fs->checkFile($thumb)) {
+        if ($this->fs->checkFile($thumb)) {

             $this->deleteThumb($thumb, true);
         }
     }
@@ -141,8 +141,8 @@ 
      * @param bool $fire_events
      * @return $this
      */
-    public function delete($ids, $fire_events = false)
-    {
+    public function delete($ids, $fire_events = false)

+    {

         $out = parent::delete($ids, $fire_events);
         $this->query("ALTER TABLE {$this->makeTable($this->table)} AUTO_INCREMENT = 1");
 
@@ -155,8 +155,8 @@ 
      * @param bool $fire_events
      * @return $this
      */
-    public function deleteAll($ids, $rid, $fire_events = false)
-    {
+    public function deleteAll($ids, $rid, $fire_events = false)

+    {

         $this->clearIndexes($ids, $rid);
 
         return $this->delete($ids, $fire_events);
@@ -165,8 +165,8 @@ 
     /**
      * @return array
      */
-    public function fieldNames()
-    {
+    public function fieldNames()

+    {

         $fields = array_keys($this->getDefaultFields());
         $fields[] = $this->fieldPKName();
 
@@ -177,8 +177,8 @@ 
      * @param  string $name
      * @return string
      */
-    public function stripName($name)
-    {
+    public function stripName($name)

+    {

 
         $filename = $this->fs->takeFileName($name);
         $ext = $this->fs->takeFileExt($name);
@@ -194,8 +194,8 @@ 
      * @param $orderDir
      * @return int|void
      */
-    public function reorder($source, $target, $point, $rid, $orderDir)
-    {
+    public function reorder($source, $target, $point, $rid, $orderDir)

+    {

         $rid = (int)$rid;
         $point = strtolower($point);
         $orderDir = strtolower($orderDir);
@@ -205,25 +205,25 @@ 
         $table = $this->makeTable($this->table);
         $rows = 0;
         /* more refactoring  needed */
-        if ($targetIndex < $sourceIndex) {
-            if (($point == 'top' && $orderDir == 'asc') || ($point == 'bottom' && $orderDir == 'desc')) {
+        if ($targetIndex < $sourceIndex) {

+            if (($point == 'top' && $orderDir == 'asc') || ($point == 'bottom' && $orderDir == 'desc')) {

                 $this->modx->db->update("`{$this->indexName}`=`{$this->indexName}`+1", $table,
                     "`{$this->indexName}`>={$targetIndex} AND `{$this->indexName}`<{$sourceIndex} AND `{$this->rfName}`={$rid}");
                 $rows = $this->modx->db->update("`{$this->indexName}`={$targetIndex}", $table,
                     "`{$this->pkName}`={$sourceId}");
-            } elseif (($point == 'bottom' && $orderDir == 'asc') || ($point == 'top' && $orderDir == 'desc')) {
+            } elseif (($point == 'bottom' && $orderDir == 'asc') || ($point == 'top' && $orderDir == 'desc')) {

                 $this->modx->db->update("`{$this->indexName}`=`{$this->indexName}`+1", $table,
                     "`{$this->indexName}`>{$targetIndex} AND `{$this->indexName}`<{$sourceIndex} AND `{$this->rfName}`={$rid}");
                 $rows = $this->modx->db->update("`{$this->indexName}`=1+{$targetIndex}", $table,
                     "`{$this->pkName}`={$sourceId}");
             }
-        } else {
-            if (($point == 'bottom' && $orderDir == 'asc') || ($point == 'top' && $orderDir == 'desc')) {
+        } else {

+            if (($point == 'bottom' && $orderDir == 'asc') || ($point == 'top' && $orderDir == 'desc')) {

                 $this->modx->db->update("`{$this->indexName}`=`{$this->indexName}`-1", $table,
                     "`{$this->indexName}`<={$targetIndex} AND `{$this->indexName}`>={$sourceIndex} AND `{$this->rfName}`={$rid}");
                 $rows = $this->modx->db->update("`{$this->indexName}`={$targetIndex}", $table,
                     "`{$this->pkName}`={$sourceId}");
-            } elseif (($point == 'top' && $orderDir == 'asc') || ($point == 'bottom' && $orderDir == 'desc')) {
+            } elseif (($point == 'top' && $orderDir == 'asc') || ($point == 'bottom' && $orderDir == 'desc')) {

                 $this->modx->db->update("`{$this->indexName}`=`{$this->indexName}`-1", $table,
                     "`{$this->indexName}`<{$targetIndex} AND `{$this->indexName}`>={$sourceIndex} AND `{$this->rfName}`={$rid}");
                 $rows = $this->modx->db->update("`{$this->indexName}`=-1+{$targetIndex}", $table,
@@ -240,9 +240,9 @@ 
      * @param $options
      * @return bool
      */
-    public function makeThumb($folder, $url, $options)
-    {
-        if (empty($url)) {
+    public function makeThumb($folder, $url, $options)

+    {

+        if (empty($url)) {

             return false;
         }
         $thumb = new \Helpers\PHPThumb();
@@ -250,9 +250,9 @@ 
         $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)) {
+        if ($thumb->create($inputFile, $outputFile, $options)) {

             return true;
-        } else {
+        } else {

             $this->modx->logEvent(0, 3, $thumb->debugMessages, __NAMESPACE__);
 
             return false;
@@ -262,16 +262,18 @@ 
     /**
      * @return array
      */
-    public function getParams()
-    {
+    public function getParams()

+    {

         return $this->params;
     }
 
     /**
      * @param array $params
      */
-    public function setParams($params = array())
-    {
-        if (is_array($params)) $this->params = $params;
+    public function setParams($params = array())

+    {

+        if (is_array($params)) {

+            $this->params = $params;

+        }

     }
 }

assets/lib/Helpers/PHPThumb.php

Spacing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
     {
         $options = strtr($options, Array("," => "&", "_" => "=", '{' => '[', '}' => ']'));
         parse_str($options, $params);
-        if(!is_array($params)) $params = array();
+        if ( ! is_array($params)) $params = array();
 
         foreach ($params as $key => $value) {
             $this->thumb->setParameter($key, $value);

Braces +20 added lines, -18 removed lines

@@ -7,8 +7,8 @@ 
  * Class PHPThumb
  * @package Helpers
  */
-class PHPThumb
-{
+class PHPThumb

+{

 
     private $thumb = null;
     protected $fs = null;
@@ -17,8 +17,8 @@ 
     /**
      * PHPThumb constructor.
      */
-    public function __construct()
-    {
+    public function __construct()

+    {

         $this->thumb = new \phpthumb();
         $this->fs = FS::getInstance();
     }
@@ -29,16 +29,16 @@ 
      * @param $options
      * @return bool
      */
-    public function create($inputFile, $outputFile, $options)
-    {
+    public function create($inputFile, $outputFile, $options)

+    {

         $this->thumb->sourceFilename = $inputFile;
         $ext = explode('.', $inputFile);
         $ext = str_replace('jpeg', 'jpg', strtolower(array_pop($ext)));
         $options = 'f=' . $ext . '&' . $options;
         $this->setOptions($options);
-        if ($this->thumb->GenerateThumbnail() && $this->thumb->RenderToFile($outputFile)) {
+        if ($this->thumb->GenerateThumbnail() && $this->thumb->RenderToFile($outputFile)) {

             return true;
-        } else {
+        } else {

             $this->debugMessages = implode('<br/>', $this->thumb->debugmessages);
 
             return false;
@@ -49,17 +49,17 @@ 
      * @param $file
      * @param string $type
      */
-    public function optimize($file, $type = 'jpg')
-    {
-        switch ($type) {
+    public function optimize($file, $type = 'jpg')

+    {

+        switch ($type) {

             case 'jpg':
                 $ext = $this->fs->takeFileExt($file);
-                if ($ext == 'jpeg' || $ext == 'jpg') {
+                if ($ext == 'jpeg' || $ext == 'jpg') {

                     $cmd = '/usr/bin/jpegtran -optimize -progressive -copy none -outfile ' . escapeshellarg($file . '_') . ' ' . escapeshellarg($file);
                     exec($cmd, $result, $return_var);
-                    if ($this->fs->fileSize($file) > $this->fs->fileSize($file . '_')) {
+                    if ($this->fs->fileSize($file) > $this->fs->fileSize($file . '_')) {

                         $this->fs->moveFile($file . '_', $file);
-                    } else {
+                    } else {

                         $this->fs->unlink($file . '_');
                     }
                 }
@@ -72,13 +72,15 @@ 
     /**
      * @param $options
      */
-    private function setOptions($options)
-    {
+    private function setOptions($options)

+    {

         $options = strtr($options, Array("," => "&", "_" => "=", '{' => '[', '}' => ']'));
         parse_str($options, $params);
-        if(!is_array($params)) $params = array();
+        if(!is_array($params)) {

+            $params = array();

+        }

 
-        foreach ($params as $key => $value) {
+        foreach ($params as $key => $value) {

             $this->thumb->setParameter($key, $value);
         }
     }

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

@@ -74,7 +74,7 @@
      */
     private function setOptions($options)
     {
-        $options = strtr($options, Array("," => "&", "_" => "=", '{' => '[', '}' => ']'));
+        $options = strtr($options, array("," => "&", "_" => "=", '{' => '[', '}' => ']'));
         parse_str($options, $params);
         if(!is_array($params)) $params = array();
 

assets/lib/Formatter/SqlFormatter.php

Spacing +12 added lines, -12 removed lines

@@ -833,7 +833,7 @@ 
             } // Non-quoted variable name
             else {
                 preg_match('/^(' . $string[0] . '[a-zA-Z0-9\._\$]+)/', $string, $matches);
-                if (!empty($matches)) {
+                if ( ! empty($matches)) {
                     $ret[self::TOKEN_VALUE] = $matches[1];
                 }
             }
@@ -862,7 +862,7 @@ 
 
         // A reserved word cannot be preceded by a '.'
         // this makes it so in "mytable.from", "from" is not considered a reserved word
-        if (!$previous || !isset($previous[self::TOKEN_VALUE]) || $previous[self::TOKEN_VALUE] !== '.') {
+        if ( ! $previous || ! isset($previous[self::TOKEN_VALUE]) || $previous[self::TOKEN_VALUE] !== '.') {
             $upper = strtoupper($string);
             // Top Level Reserved Word
             if (preg_match('/^(' . self::$regex_reserved_toplevel . ')($|\s|' . self::$regex_boundaries . ')/', $upper,
@@ -1118,7 +1118,7 @@ 
                 $length = 0;
                 for ($j = 1; $j <= 250; $j++) {
                     // Reached end of string
-                    if (!isset($tokens[$i + $j])) {
+                    if ( ! isset($tokens[$i + $j])) {
                         break;
                     }
 
@@ -1156,7 +1156,7 @@ 
                     $return = rtrim($return, ' ');
                 }
 
-                if (!$inline_parentheses) {
+                if ( ! $inline_parentheses) {
                     $increase_block_indent = true;
                     // Add a newline after the parentheses
                     $newline = true;
@@ -1189,7 +1189,7 @@ 
                 }
 
                 // Add a newline before the closing parentheses (if not already added)
-                if (!$added_newline) {
+                if ( ! $added_newline) {
                     $return .= "\n" . str_repeat($tab, $indent_level);
                 }
             } // Top level reserved words start a new line and increase the special indent level
@@ -1206,7 +1206,7 @@ 
                 // Add a newline after the top level reserved word
                 $newline = true;
                 // Add a newline before the top level reserved word (if not already added)
-                if (!$added_newline) {
+                if ( ! $added_newline) {
                     $return .= "\n" . str_repeat($tab, $indent_level);
                 } // If we already added a newline, redo the indentation since it may be different now
                 else {
@@ -1220,14 +1220,14 @@ 
                     $highlighted = preg_replace('/\s+/', ' ', $highlighted);
                 }
                 //if SQL 'LIMIT' clause, start variable to reset newline
-                if ($token[self::TOKEN_VALUE] === 'LIMIT' && !$inline_parentheses) {
+                if ($token[self::TOKEN_VALUE] === 'LIMIT' && ! $inline_parentheses) {
                     $clause_limit = true;
                 }
             } // Checks if we are out of the limit clause
             elseif ($clause_limit && $token[self::TOKEN_VALUE] !== "," && $token[self::TOKEN_TYPE] !== self::TOKEN_TYPE_NUMBER && $token[self::TOKEN_TYPE] !== self::TOKEN_TYPE_WHITESPACE) {
                 $clause_limit = false;
             } // Commas start a new line (unless within inline parentheses or SQL 'LIMIT' clause)
-            elseif ($token[self::TOKEN_VALUE] === ',' && !$inline_parentheses) {
+            elseif ($token[self::TOKEN_VALUE] === ',' && ! $inline_parentheses) {
                 //If the previous TOKEN_VALUE is 'LIMIT', resets new line
                 if ($clause_limit === true) {
                     $newline = false;
@@ -1239,7 +1239,7 @@ 
             } // Newline reserved words start a new line
             elseif ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_RESERVED_NEWLINE) {
                 // Add a newline before the reserved word (if not already added)
-                if (!$added_newline) {
+                if ( ! $added_newline) {
                     $return .= "\n" . str_repeat($tab, $indent_level);
                 }
 
@@ -1333,7 +1333,7 @@ 
         foreach ($tokens as $token) {
             // If this is a query separator
             if ($token[self::TOKEN_VALUE] === ';') {
-                if (!$empty) {
+                if ( ! $empty) {
                     $queries[] = $current_query . ';';
                 }
                 $current_query = '';
@@ -1349,7 +1349,7 @@ 
             $current_query .= $token[self::TOKEN_VALUE];
         }
 
-        if (!$empty) {
+        if ( ! $empty) {
             $queries[] = trim($current_query);
         }
 
@@ -1643,7 +1643,7 @@ 
             return $string . "\n";
         } else {
             $string = trim($string);
-            if (!self::$use_pre) {
+            if ( ! self::$use_pre) {
                 return $string;
             }
 

Braces +184 added lines, -182 removed lines

@@ -12,8 +12,8 @@ 
  * @link       http://github.com/jdorn/sql-formatter
  * @version    1.2.18
  */
-class SqlFormatter
-{
+class SqlFormatter

+{

     // Constants for token types
     const TOKEN_TYPE_WHITESPACE = 0;
     const TOKEN_TYPE_WORD = 1;
@@ -732,8 +732,8 @@ 
      * Get stats about the token cache
      * @return Array An array containing the keys 'hits', 'misses', 'entries', and 'size' in bytes
      */
-    public static function getCacheStats()
-    {
+    public static function getCacheStats()

+    {

         return array(
             'hits'    => self::$cache_hits,
             'misses'  => self::$cache_misses,
@@ -745,9 +745,9 @@ 
     /**
      * Stuff that only needs to be done once.  Builds regular expressions and sorts the reserved words.
      */
-    protected static function init()
-    {
-        if (self::$init) {
+    protected static function init()

+    {

+        if (self::$init) {

             return;
         }
 
@@ -779,10 +779,10 @@ 
      *
      * @return Array An associative array containing the type and value of the token.
      */
-    protected static function getNextToken($string, $previous = null)
-    {
+    protected static function getNextToken($string, $previous = null)

+    {

         // Whitespace
-        if (preg_match('/^\s+/', $string, $matches)) {
+        if (preg_match('/^\s+/', $string, $matches)) {

             return array(
                 self::TOKEN_VALUE => $matches[0],
                 self::TOKEN_TYPE  => self::TOKEN_TYPE_WHITESPACE
@@ -790,17 +790,18 @@ 
         }
 
         // Comment
-        if ($string[0] === '#' || (isset($string[1]) && ($string[0] === '-' && $string[1] === '-') || ($string[0] === '/' && $string[1] === '*'))) {
+        if ($string[0] === '#' || (isset($string[1]) && ($string[0] === '-' && $string[1] === '-') || ($string[0] === '/' && $string[1] === '*'))) {

             // Comment until end of line
-            if ($string[0] === '-' || $string[0] === '#') {
+            if ($string[0] === '-' || $string[0] === '#') {

                 $last = strpos($string, "\n");
                 $type = self::TOKEN_TYPE_COMMENT;
-            } else { // Comment until closing comment tag
+            } else {

+// Comment until closing comment tag
                 $last = strpos($string, "*/", 2) + 2;
                 $type = self::TOKEN_TYPE_BLOCK_COMMENT;
             }
 
-            if ($last === false) {
+            if ($last === false) {

                 $last = strlen($string);
             }
 
@@ -811,7 +812,7 @@ 
         }
 
         // Quoted String
-        if ($string[0] === '"' || $string[0] === '\'' || $string[0] === '`' || $string[0] === '[') {
+        if ($string[0] === '"' || $string[0] === '\'' || $string[0] === '`' || $string[0] === '[') {

             $return = array(
                 self::TOKEN_TYPE  => (($string[0] === '`' || $string[0] === '[') ? self::TOKEN_TYPE_BACKTICK_QUOTE : self::TOKEN_TYPE_QUOTE),
                 self::TOKEN_VALUE => self::getQuotedString($string)
@@ -821,31 +822,31 @@ 
         }
 
         // User-defined Variable
-        if (($string[0] === '@' || $string[0] === ':') && isset($string[1])) {
+        if (($string[0] === '@' || $string[0] === ':') && isset($string[1])) {

             $ret = array(
                 self::TOKEN_VALUE => null,
                 self::TOKEN_TYPE  => self::TOKEN_TYPE_VARIABLE
             );
 
             // If the variable name is quoted
-            if ($string[1] === '"' || $string[1] === '\'' || $string[1] === '`') {
+            if ($string[1] === '"' || $string[1] === '\'' || $string[1] === '`') {

                 $ret[self::TOKEN_VALUE] = $string[0] . self::getQuotedString(substr($string, 1));
             } // Non-quoted variable name
-            else {
+            else {

                 preg_match('/^(' . $string[0] . '[a-zA-Z0-9\._\$]+)/', $string, $matches);
-                if (!empty($matches)) {
+                if (!empty($matches)) {

                     $ret[self::TOKEN_VALUE] = $matches[1];
                 }
             }
 
-            if ($ret[self::TOKEN_VALUE] !== null) {
+            if ($ret[self::TOKEN_VALUE] !== null) {

                 return $ret;
             }
         }
 
         // Number (decimal, binary, or hex)
         if (preg_match('/^([0-9]+(\.[0-9]+)?|0x[0-9a-fA-F]+|0b[01]+)($|\s|"\'`|' . self::$regex_boundaries . ')/',
-            $string, $matches)) {
+            $string, $matches)) {

             return array(
                 self::TOKEN_VALUE => $matches[1],
                 self::TOKEN_TYPE  => self::TOKEN_TYPE_NUMBER
@@ -853,7 +854,7 @@ 
         }
 
         // Boundary Character (punctuation and symbols)
-        if (preg_match('/^(' . self::$regex_boundaries . ')/', $string, $matches)) {
+        if (preg_match('/^(' . self::$regex_boundaries . ')/', $string, $matches)) {

             return array(
                 self::TOKEN_VALUE => $matches[1],
                 self::TOKEN_TYPE  => self::TOKEN_TYPE_BOUNDARY
@@ -862,11 +863,11 @@ 
 
         // A reserved word cannot be preceded by a '.'
         // this makes it so in "mytable.from", "from" is not considered a reserved word
-        if (!$previous || !isset($previous[self::TOKEN_VALUE]) || $previous[self::TOKEN_VALUE] !== '.') {
+        if (!$previous || !isset($previous[self::TOKEN_VALUE]) || $previous[self::TOKEN_VALUE] !== '.') {

             $upper = strtoupper($string);
             // Top Level Reserved Word
             if (preg_match('/^(' . self::$regex_reserved_toplevel . ')($|\s|' . self::$regex_boundaries . ')/', $upper,
-                $matches)) {
+                $matches)) {

                 return array(
                     self::TOKEN_TYPE  => self::TOKEN_TYPE_RESERVED_TOPLEVEL,
                     self::TOKEN_VALUE => substr($string, 0, strlen($matches[1]))
@@ -874,7 +875,7 @@ 
             }
             // Newline Reserved Word
             if (preg_match('/^(' . self::$regex_reserved_newline . ')($|\s|' . self::$regex_boundaries . ')/', $upper,
-                $matches)) {
+                $matches)) {

                 return array(
                     self::TOKEN_TYPE  => self::TOKEN_TYPE_RESERVED_NEWLINE,
                     self::TOKEN_VALUE => substr($string, 0, strlen($matches[1]))
@@ -882,7 +883,7 @@ 
             }
             // Other Reserved Word
             if (preg_match('/^(' . self::$regex_reserved . ')($|\s|' . self::$regex_boundaries . ')/', $upper,
-                $matches)) {
+                $matches)) {

                 return array(
                     self::TOKEN_TYPE  => self::TOKEN_TYPE_RESERVED,
                     self::TOKEN_VALUE => substr($string, 0, strlen($matches[1]))
@@ -894,7 +895,7 @@ 
         // this makes it so "count(" is considered a function, but "count" alone is not
         $upper = strtoupper($string);
         // function
-        if (preg_match('/^(' . self::$regex_function . '[(]|\s|[)])/', $upper, $matches)) {
+        if (preg_match('/^(' . self::$regex_function . '[(]|\s|[)])/', $upper, $matches)) {

             return array(
                 self::TOKEN_TYPE  => self::TOKEN_TYPE_RESERVED,
                 self::TOKEN_VALUE => substr($string, 0, strlen($matches[1]) - 1)
@@ -914,8 +915,8 @@ 
      * @param $string
      * @return null
      */
-    protected static function getQuotedString($string)
-    {
+    protected static function getQuotedString($string)

+    {

         $ret = null;
 
         // This checks for the following patterns:
@@ -924,7 +925,7 @@ 
         // 3. double quoted string using "" or \" to escape
         // 4. single quoted string using '' or \' to escape
         if (preg_match('/^(((`[^`]*($|`))+)|((\[[^\]]*($|\]))(\][^\]]*($|\]))*)|(("[^"\\\\]*(?:\\\\.[^"\\\\]*)*("|$))+)|((\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*(\'|$))+))/s',
-            $string, $matches)) {
+            $string, $matches)) {

             $ret = $matches[1];
         }
 
@@ -939,8 +940,8 @@ 
      *
      * @return Array An array of tokens.
      */
-    protected static function tokenize($string)
-    {
+    protected static function tokenize($string)

+    {

         self::init();
 
         $tokens = array();
@@ -953,9 +954,9 @@ 
         $current_length = strlen($string);
 
         // Keep processing the string until it is empty
-        while ($current_length) {
+        while ($current_length) {

             // If the string stopped shrinking, there was a problem
-            if ($old_string_len <= $current_length) {
+            if ($old_string_len <= $current_length) {

                 $tokens[] = array(
                     self::TOKEN_VALUE => $string,
                     self::TOKEN_TYPE  => self::TOKEN_TYPE_ERROR
@@ -966,26 +967,26 @@ 
             $old_string_len = $current_length;
 
             // Determine if we can use caching
-            if ($current_length >= self::$max_cachekey_size) {
+            if ($current_length >= self::$max_cachekey_size) {

                 $cacheKey = substr($string, 0, self::$max_cachekey_size);
-            } else {
+            } else {

                 $cacheKey = false;
             }
 
             // See if the token is already cached
-            if ($cacheKey !== false && isset(self::$token_cache[$cacheKey])) {
+            if ($cacheKey !== false && isset(self::$token_cache[$cacheKey])) {

                 // Retrieve from cache
                 $token = self::$token_cache[$cacheKey];
                 $token_length = strlen($token[self::TOKEN_VALUE]);
                 self::$cache_hits++;
-            } else {
+            } else {

                 // Get the next token and the token type
                 $token = self::getNextToken($string, $token);
                 $token_length = strlen($token[self::TOKEN_VALUE]);
                 self::$cache_misses++;
 
                 // If the token is shorter than the max length, store it in cache
-                if ($cacheKey !== false && $token_length < self::$max_cachekey_size) {
+                if ($cacheKey !== false && $token_length < self::$max_cachekey_size) {

                     self::$token_cache[$cacheKey] = $token;
                 }
             }
@@ -1009,8 +1010,8 @@ 
      *
      * @return String The SQL string with HTML styles and formatting wrapped in a <pre> tag
      */
-    public static function format($string, $highlight = true)
-    {
+    public static function format($string, $highlight = true)

+    {

         // This variable will be populated with formatted html
         $return = '';
 
@@ -1032,47 +1033,48 @@ 
 
         // Remove existing whitespace
         $tokens = array();
-        foreach ($original_tokens as $i => $token) {
-            if ($token[self::TOKEN_TYPE] !== self::TOKEN_TYPE_WHITESPACE) {
+        foreach ($original_tokens as $i => $token) {

+            if ($token[self::TOKEN_TYPE] !== self::TOKEN_TYPE_WHITESPACE) {

                 $token['i'] = $i;
                 $tokens[] = $token;
             }
         }
 
         // Format token by token
-        foreach ($tokens as $i => $token) {
+        foreach ($tokens as $i => $token) {

             // Get highlighted token if doing syntax highlighting
-            if ($highlight) {
+            if ($highlight) {

                 $highlighted = self::highlightToken($token);
-            } else { // If returning raw text
+            } else {

+// If returning raw text
                 $highlighted = $token[self::TOKEN_VALUE];
             }
 
             // If we are increasing the special indent level now
-            if ($increase_special_indent) {
+            if ($increase_special_indent) {

                 $indent_level++;
                 $increase_special_indent = false;
                 array_unshift($indent_types, 'special');
             }
             // If we are increasing the block indent level now
-            if ($increase_block_indent) {
+            if ($increase_block_indent) {

                 $indent_level++;
                 $increase_block_indent = false;
                 array_unshift($indent_types, 'block');
             }
 
             // If we need a new line before the token
-            if ($newline) {
+            if ($newline) {

                 $return .= "\n" . str_repeat($tab, $indent_level);
                 $newline = false;
                 $added_newline = true;
-            } else {
+            } else {

                 $added_newline = false;
             }
 
             // Display comments directly where they appear in the source
-            if ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_COMMENT || $token[self::TOKEN_TYPE] === self::TOKEN_TYPE_BLOCK_COMMENT) {
-                if ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_BLOCK_COMMENT) {
+            if ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_COMMENT || $token[self::TOKEN_TYPE] === self::TOKEN_TYPE_BLOCK_COMMENT) {

+                if ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_BLOCK_COMMENT) {

                     $indent = str_repeat($tab, $indent_level);
                     $return .= "\n" . $indent;
                     $highlighted = str_replace("\n", "\n" . $indent, $highlighted);
@@ -1083,12 +1085,12 @@ 
                 continue;
             }
 
-            if ($inline_parentheses) {
+            if ($inline_parentheses) {

                 // End of inline parentheses
-                if ($token[self::TOKEN_VALUE] === ')') {
+                if ($token[self::TOKEN_VALUE] === ')') {

                     $return = rtrim($return, ' ');
 
-                    if ($inline_indented) {
+                    if ($inline_indented) {

                         array_shift($indent_types);
                         $indent_level--;
                         $return .= "\n" . str_repeat($tab, $indent_level);
@@ -1100,8 +1102,8 @@ 
                     continue;
                 }
 
-                if ($token[self::TOKEN_VALUE] === ',') {
-                    if ($inline_count >= 30) {
+                if ($token[self::TOKEN_VALUE] === ',') {

+                    if ($inline_count >= 30) {

                         $inline_count = 0;
                         $newline = true;
                     }
@@ -1111,21 +1113,21 @@ 
             }
 
             // Opening parentheses increase the block indent level and start a new line
-            if ($token[self::TOKEN_VALUE] === '(') {
+            if ($token[self::TOKEN_VALUE] === '(') {

                 // First check if this should be an inline parentheses block
                 // Examples are "NOW()", "COUNT(*)", "int(10)", key(`somecolumn`), DECIMAL(7,2)
                 // Allow up to 3 non-whitespace tokens inside inline parentheses
                 $length = 0;
-                for ($j = 1; $j <= 250; $j++) {
+                for ($j = 1; $j <= 250; $j++) {

                     // Reached end of string
-                    if (!isset($tokens[$i + $j])) {
+                    if (!isset($tokens[$i + $j])) {

                         break;
                     }
 
                     $next = $tokens[$i + $j];
 
                     // Reached closing parentheses, able to inline it
-                    if ($next[self::TOKEN_VALUE] === ')') {
+                    if ($next[self::TOKEN_VALUE] === ')') {

                         $inline_parentheses = true;
                         $inline_count = 0;
                         $inline_indented = false;
@@ -1133,72 +1135,72 @@ 
                     }
 
                     // Reached an invalid token for inline parentheses
-                    if ($next[self::TOKEN_VALUE] === ';' || $next[self::TOKEN_VALUE] === '(') {
+                    if ($next[self::TOKEN_VALUE] === ';' || $next[self::TOKEN_VALUE] === '(') {

                         break;
                     }
 
                     // Reached an invalid token type for inline parentheses
-                    if ($next[self::TOKEN_TYPE] === self::TOKEN_TYPE_RESERVED_TOPLEVEL || $next[self::TOKEN_TYPE] === self::TOKEN_TYPE_RESERVED_NEWLINE || $next[self::TOKEN_TYPE] === self::TOKEN_TYPE_COMMENT || $next[self::TOKEN_TYPE] === self::TOKEN_TYPE_BLOCK_COMMENT) {
+                    if ($next[self::TOKEN_TYPE] === self::TOKEN_TYPE_RESERVED_TOPLEVEL || $next[self::TOKEN_TYPE] === self::TOKEN_TYPE_RESERVED_NEWLINE || $next[self::TOKEN_TYPE] === self::TOKEN_TYPE_COMMENT || $next[self::TOKEN_TYPE] === self::TOKEN_TYPE_BLOCK_COMMENT) {

                         break;
                     }
 
                     $length += strlen($next[self::TOKEN_VALUE]);
                 }
 
-                if ($inline_parentheses && $length > 30) {
+                if ($inline_parentheses && $length > 30) {

                     $increase_block_indent = true;
                     $inline_indented = true;
                     $newline = true;
                 }
 
                 // Take out the preceding space unless there was whitespace there in the original query
-                if (isset($original_tokens[$token['i'] - 1]) && $original_tokens[$token['i'] - 1][self::TOKEN_TYPE] !== self::TOKEN_TYPE_WHITESPACE) {
+                if (isset($original_tokens[$token['i'] - 1]) && $original_tokens[$token['i'] - 1][self::TOKEN_TYPE] !== self::TOKEN_TYPE_WHITESPACE) {

                     $return = rtrim($return, ' ');
                 }
 
-                if (!$inline_parentheses) {
+                if (!$inline_parentheses) {

                     $increase_block_indent = true;
                     // Add a newline after the parentheses
                     $newline = true;
                 }
 
             } // Closing parentheses decrease the block indent level
-            elseif ($token[self::TOKEN_VALUE] === ')') {
+            elseif ($token[self::TOKEN_VALUE] === ')') {

                 // Remove whitespace before the closing parentheses
                 $return = rtrim($return, ' ');
 
                 $indent_level--;
 
                 // Reset indent level
-                while ($j = array_shift($indent_types)) {
-                    if ($j === 'special') {
+                while ($j = array_shift($indent_types)) {

+                    if ($j === 'special') {

                         $indent_level--;
-                    } else {
+                    } else {

                         break;
                     }
                 }
 
-                if ($indent_level < 0) {
+                if ($indent_level < 0) {

                     // This is an error
                     $indent_level = 0;
 
-                    if ($highlight) {
+                    if ($highlight) {

                         $return .= "\n" . self::highlightError($token[self::TOKEN_VALUE]);
                         continue;
                     }
                 }
 
                 // Add a newline before the closing parentheses (if not already added)
-                if (!$added_newline) {
+                if (!$added_newline) {

                     $return .= "\n" . str_repeat($tab, $indent_level);
                 }
             } // Top level reserved words start a new line and increase the special indent level
-            elseif ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_RESERVED_TOPLEVEL) {
+            elseif ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_RESERVED_TOPLEVEL) {

                 $increase_special_indent = true;
 
                 // If the last indent type was 'special', decrease the special indent for this round
                 reset($indent_types);
-                if (current($indent_types) === 'special') {
+                if (current($indent_types) === 'special') {

                     $indent_level--;
                     array_shift($indent_types);
                 }
@@ -1206,88 +1208,88 @@ 
                 // Add a newline after the top level reserved word
                 $newline = true;
                 // Add a newline before the top level reserved word (if not already added)
-                if (!$added_newline) {
+                if (!$added_newline) {

                     $return .= "\n" . str_repeat($tab, $indent_level);
                 } // If we already added a newline, redo the indentation since it may be different now
-                else {
+                else {

                     $return = rtrim($return, $tab) . str_repeat($tab, $indent_level);
                 }
 
                 // If the token may have extra whitespace
                 if (strpos($token[self::TOKEN_VALUE], ' ') !== false || strpos($token[self::TOKEN_VALUE],
                         "\n") !== false || strpos($token[self::TOKEN_VALUE], "\t") !== false
-                ) {
+                ) {

                     $highlighted = preg_replace('/\s+/', ' ', $highlighted);
                 }
                 //if SQL 'LIMIT' clause, start variable to reset newline
-                if ($token[self::TOKEN_VALUE] === 'LIMIT' && !$inline_parentheses) {
+                if ($token[self::TOKEN_VALUE] === 'LIMIT' && !$inline_parentheses) {

                     $clause_limit = true;
                 }
             } // Checks if we are out of the limit clause
-            elseif ($clause_limit && $token[self::TOKEN_VALUE] !== "," && $token[self::TOKEN_TYPE] !== self::TOKEN_TYPE_NUMBER && $token[self::TOKEN_TYPE] !== self::TOKEN_TYPE_WHITESPACE) {
+            elseif ($clause_limit && $token[self::TOKEN_VALUE] !== "," && $token[self::TOKEN_TYPE] !== self::TOKEN_TYPE_NUMBER && $token[self::TOKEN_TYPE] !== self::TOKEN_TYPE_WHITESPACE) {

                 $clause_limit = false;
             } // Commas start a new line (unless within inline parentheses or SQL 'LIMIT' clause)
-            elseif ($token[self::TOKEN_VALUE] === ',' && !$inline_parentheses) {
+            elseif ($token[self::TOKEN_VALUE] === ',' && !$inline_parentheses) {

                 //If the previous TOKEN_VALUE is 'LIMIT', resets new line
-                if ($clause_limit === true) {
+                if ($clause_limit === true) {

                     $newline = false;
                     $clause_limit = false;
                 } // All other cases of commas
-                else {
+                else {

                     $newline = true;
                 }
             } // Newline reserved words start a new line
-            elseif ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_RESERVED_NEWLINE) {
+            elseif ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_RESERVED_NEWLINE) {

                 // Add a newline before the reserved word (if not already added)
-                if (!$added_newline) {
+                if (!$added_newline) {

                     $return .= "\n" . str_repeat($tab, $indent_level);
                 }
 
                 // If the token may have extra whitespace
                 if (strpos($token[self::TOKEN_VALUE], ' ') !== false || strpos($token[self::TOKEN_VALUE],
                         "\n") !== false || strpos($token[self::TOKEN_VALUE], "\t") !== false
-                ) {
+                ) {

                     $highlighted = preg_replace('/\s+/', ' ', $highlighted);
                 }
             } // Multiple boundary characters in a row should not have spaces between them (not including parentheses)
-            elseif ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_BOUNDARY) {
-                if (isset($tokens[$i - 1]) && $tokens[$i - 1][self::TOKEN_TYPE] === self::TOKEN_TYPE_BOUNDARY) {
-                    if (isset($original_tokens[$token['i'] - 1]) && $original_tokens[$token['i'] - 1][self::TOKEN_TYPE] !== self::TOKEN_TYPE_WHITESPACE) {
+            elseif ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_BOUNDARY) {

+                if (isset($tokens[$i - 1]) && $tokens[$i - 1][self::TOKEN_TYPE] === self::TOKEN_TYPE_BOUNDARY) {

+                    if (isset($original_tokens[$token['i'] - 1]) && $original_tokens[$token['i'] - 1][self::TOKEN_TYPE] !== self::TOKEN_TYPE_WHITESPACE) {

                         $return = rtrim($return, ' ');
                     }
                 }
             }
 
             // If the token shouldn't have a space before it
-            if ($token[self::TOKEN_VALUE] === '.' || $token[self::TOKEN_VALUE] === ',' || $token[self::TOKEN_VALUE] === ';') {
+            if ($token[self::TOKEN_VALUE] === '.' || $token[self::TOKEN_VALUE] === ',' || $token[self::TOKEN_VALUE] === ';') {

                 $return = rtrim($return, ' ');
             }
 
             $return .= $highlighted . ' ';
 
             // If the token shouldn't have a space after it
-            if ($token[self::TOKEN_VALUE] === '(' || $token[self::TOKEN_VALUE] === '.') {
+            if ($token[self::TOKEN_VALUE] === '(' || $token[self::TOKEN_VALUE] === '.') {

                 $return = rtrim($return, ' ');
             }
 
             // If this is the "-" of a negative number, it shouldn't have a space after it
-            if ($token[self::TOKEN_VALUE] === '-' && isset($tokens[$i + 1]) && $tokens[$i + 1][self::TOKEN_TYPE] === self::TOKEN_TYPE_NUMBER && isset($tokens[$i - 1])) {
+            if ($token[self::TOKEN_VALUE] === '-' && isset($tokens[$i + 1]) && $tokens[$i + 1][self::TOKEN_TYPE] === self::TOKEN_TYPE_NUMBER && isset($tokens[$i - 1])) {

                 $prev = $tokens[$i - 1][self::TOKEN_TYPE];
-                if ($prev !== self::TOKEN_TYPE_QUOTE && $prev !== self::TOKEN_TYPE_BACKTICK_QUOTE && $prev !== self::TOKEN_TYPE_WORD && $prev !== self::TOKEN_TYPE_NUMBER) {
+                if ($prev !== self::TOKEN_TYPE_QUOTE && $prev !== self::TOKEN_TYPE_BACKTICK_QUOTE && $prev !== self::TOKEN_TYPE_WORD && $prev !== self::TOKEN_TYPE_NUMBER) {

                     $return = rtrim($return, ' ');
                 }
             }
         }
 
         // If there are unmatched parentheses
-        if ($highlight && array_search('block', $indent_types) !== false) {
+        if ($highlight && array_search('block', $indent_types) !== false) {

             $return .= "\n" . self::highlightError("WARNING: unclosed parentheses or section");
         }
 
         // Replace tab characters with the configuration tab character
         $return = trim(str_replace("\t", self::$tab, $return));
 
-        if ($highlight) {
+        if ($highlight) {

             $return = self::output($return);
         }
 
@@ -1301,13 +1303,13 @@ 
      *
      * @return String The SQL string with HTML styles applied
      */
-    public static function highlight($string)
-    {
+    public static function highlight($string)

+    {

         $tokens = self::tokenize($string);
 
         $return = '';
 
-        foreach ($tokens as $token) {
+        foreach ($tokens as $token) {

             $return .= self::highlightToken($token);
         }
 
@@ -1322,18 +1324,18 @@ 
      *
      * @return Array An array of individual query strings without trailing semicolons
      */
-    public static function splitQuery($string)
-    {
+    public static function splitQuery($string)

+    {

         $queries = array();
         $current_query = '';
         $empty = true;
 
         $tokens = self::tokenize($string);
 
-        foreach ($tokens as $token) {
+        foreach ($tokens as $token) {

             // If this is a query separator
-            if ($token[self::TOKEN_VALUE] === ';') {
-                if (!$empty) {
+            if ($token[self::TOKEN_VALUE] === ';') {

+                if (!$empty) {

                     $queries[] = $current_query . ';';
                 }
                 $current_query = '';
@@ -1342,14 +1344,14 @@ 
             }
 
             // If this is a non-empty character
-            if ($token[self::TOKEN_TYPE] !== self::TOKEN_TYPE_WHITESPACE && $token[self::TOKEN_TYPE] !== self::TOKEN_TYPE_COMMENT && $token[self::TOKEN_TYPE] !== self::TOKEN_TYPE_BLOCK_COMMENT) {
+            if ($token[self::TOKEN_TYPE] !== self::TOKEN_TYPE_WHITESPACE && $token[self::TOKEN_TYPE] !== self::TOKEN_TYPE_COMMENT && $token[self::TOKEN_TYPE] !== self::TOKEN_TYPE_BLOCK_COMMENT) {

                 $empty = false;
             }
 
             $current_query .= $token[self::TOKEN_VALUE];
         }
 
-        if (!$empty) {
+        if (!$empty) {

             $queries[] = trim($current_query);
         }
 
@@ -1363,15 +1365,15 @@ 
      *
      * @return String The SQL string without comments
      */
-    public static function removeComments($string)
-    {
+    public static function removeComments($string)

+    {

         $result = '';
 
         $tokens = self::tokenize($string);
 
-        foreach ($tokens as $token) {
+        foreach ($tokens as $token) {

             // Skip comment tokens
-            if ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_COMMENT || $token[self::TOKEN_TYPE] === self::TOKEN_TYPE_BLOCK_COMMENT) {
+            if ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_COMMENT || $token[self::TOKEN_TYPE] === self::TOKEN_TYPE_BLOCK_COMMENT) {

                 continue;
             }
 
@@ -1389,32 +1391,32 @@ 
      *
      * @return String The SQL string without comments
      */
-    public static function compress($string)
-    {
+    public static function compress($string)

+    {

         $result = '';
 
         $tokens = self::tokenize($string);
 
         $whitespace = true;
-        foreach ($tokens as $token) {
+        foreach ($tokens as $token) {

             // Skip comment tokens
-            if ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_COMMENT || $token[self::TOKEN_TYPE] === self::TOKEN_TYPE_BLOCK_COMMENT) {
+            if ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_COMMENT || $token[self::TOKEN_TYPE] === self::TOKEN_TYPE_BLOCK_COMMENT) {

                 continue;
             } // Remove extra whitespace in reserved words (e.g "OUTER     JOIN" becomes "OUTER JOIN")
-            elseif ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_RESERVED || $token[self::TOKEN_TYPE] === self::TOKEN_TYPE_RESERVED_NEWLINE || $token[self::TOKEN_TYPE] === self::TOKEN_TYPE_RESERVED_TOPLEVEL) {
+            elseif ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_RESERVED || $token[self::TOKEN_TYPE] === self::TOKEN_TYPE_RESERVED_NEWLINE || $token[self::TOKEN_TYPE] === self::TOKEN_TYPE_RESERVED_TOPLEVEL) {

                 $token[self::TOKEN_VALUE] = preg_replace('/\s+/', ' ', $token[self::TOKEN_VALUE]);
             }
 
-            if ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_WHITESPACE) {
+            if ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_WHITESPACE) {

                 // If the last token was whitespace, don't add another one
-                if ($whitespace) {
+                if ($whitespace) {

                     continue;
-                } else {
+                } else {

                     $whitespace = true;
                     // Convert all whitespace to a single space
                     $token[self::TOKEN_VALUE] = ' ';
                 }
-            } else {
+            } else {

                 $whitespace = false;
             }
 
@@ -1431,39 +1433,39 @@ 
      *
      * @return String HTML code of the highlighted token.
      */
-    protected static function highlightToken($token)
-    {
+    protected static function highlightToken($token)

+    {

         $type = $token[self::TOKEN_TYPE];
 
-        if (self::is_cli()) {
+        if (self::is_cli()) {

             $token = $token[self::TOKEN_VALUE];
-        } else {
-            if (defined('ENT_IGNORE')) {
+        } else {

+            if (defined('ENT_IGNORE')) {

                 $token = htmlentities($token[self::TOKEN_VALUE], ENT_COMPAT | ENT_IGNORE, 'UTF-8');
-            } else {
+            } else {

                 $token = htmlentities($token[self::TOKEN_VALUE], ENT_COMPAT, 'UTF-8');
             }
         }
 
-        if ($type === self::TOKEN_TYPE_BOUNDARY) {
+        if ($type === self::TOKEN_TYPE_BOUNDARY) {

             return self::highlightBoundary($token);
-        } elseif ($type === self::TOKEN_TYPE_WORD) {
+        } elseif ($type === self::TOKEN_TYPE_WORD) {

             return self::highlightWord($token);
-        } elseif ($type === self::TOKEN_TYPE_BACKTICK_QUOTE) {
+        } elseif ($type === self::TOKEN_TYPE_BACKTICK_QUOTE) {

             return self::highlightBacktickQuote($token);
-        } elseif ($type === self::TOKEN_TYPE_QUOTE) {
+        } elseif ($type === self::TOKEN_TYPE_QUOTE) {

             return self::highlightQuote($token);
-        } elseif ($type === self::TOKEN_TYPE_RESERVED) {
+        } elseif ($type === self::TOKEN_TYPE_RESERVED) {

             return self::highlightReservedWord($token);
-        } elseif ($type === self::TOKEN_TYPE_RESERVED_TOPLEVEL) {
+        } elseif ($type === self::TOKEN_TYPE_RESERVED_TOPLEVEL) {

             return self::highlightReservedWord($token);
-        } elseif ($type === self::TOKEN_TYPE_RESERVED_NEWLINE) {
+        } elseif ($type === self::TOKEN_TYPE_RESERVED_NEWLINE) {

             return self::highlightReservedWord($token);
-        } elseif ($type === self::TOKEN_TYPE_NUMBER) {
+        } elseif ($type === self::TOKEN_TYPE_NUMBER) {

             return self::highlightNumber($token);
-        } elseif ($type === self::TOKEN_TYPE_VARIABLE) {
+        } elseif ($type === self::TOKEN_TYPE_VARIABLE) {

             return self::highlightVariable($token);
-        } elseif ($type === self::TOKEN_TYPE_COMMENT || $type === self::TOKEN_TYPE_BLOCK_COMMENT) {
+        } elseif ($type === self::TOKEN_TYPE_COMMENT || $type === self::TOKEN_TYPE_BLOCK_COMMENT) {

             return self::highlightComment($token);
         }
 
@@ -1477,11 +1479,11 @@ 
      *
      * @return String HTML code of the highlighted token.
      */
-    protected static function highlightQuote($value)
-    {
-        if (self::is_cli()) {
+    protected static function highlightQuote($value)

+    {

+        if (self::is_cli()) {

             return self::$cli_quote . $value . "\x1b[0m";
-        } else {
+        } else {

             return '<span ' . self::$quote_attributes . '>' . $value . '</span>';
         }
     }
@@ -1493,11 +1495,11 @@ 
      *
      * @return String HTML code of the highlighted token.
      */
-    protected static function highlightBacktickQuote($value)
-    {
-        if (self::is_cli()) {
+    protected static function highlightBacktickQuote($value)

+    {

+        if (self::is_cli()) {

             return self::$cli_backtick_quote . $value . "\x1b[0m";
-        } else {
+        } else {

             return '<span ' . self::$backtick_quote_attributes . '>' . $value . '</span>';
         }
     }
@@ -1509,11 +1511,11 @@ 
      *
      * @return String HTML code of the highlighted token.
      */
-    protected static function highlightReservedWord($value)
-    {
-        if (self::is_cli()) {
+    protected static function highlightReservedWord($value)

+    {

+        if (self::is_cli()) {

             return self::$cli_reserved . $value . "\x1b[0m";
-        } else {
+        } else {

             return '<span ' . self::$reserved_attributes . '>' . $value . '</span>';
         }
     }
@@ -1525,15 +1527,15 @@ 
      *
      * @return String HTML code of the highlighted token.
      */
-    protected static function highlightBoundary($value)
-    {
-        if ($value === '(' || $value === ')') {
+    protected static function highlightBoundary($value)

+    {

+        if ($value === '(' || $value === ')') {

             return $value;
         }
 
-        if (self::is_cli()) {
+        if (self::is_cli()) {

             return self::$cli_boundary . $value . "\x1b[0m";
-        } else {
+        } else {

             return '<span ' . self::$boundary_attributes . '>' . $value . '</span>';
         }
     }
@@ -1545,11 +1547,11 @@ 
      *
      * @return String HTML code of the highlighted token.
      */
-    protected static function highlightNumber($value)
-    {
-        if (self::is_cli()) {
+    protected static function highlightNumber($value)

+    {

+        if (self::is_cli()) {

             return self::$cli_number . $value . "\x1b[0m";
-        } else {
+        } else {

             return '<span ' . self::$number_attributes . '>' . $value . '</span>';
         }
     }
@@ -1561,11 +1563,11 @@ 
      *
      * @return String HTML code of the highlighted token.
      */
-    protected static function highlightError($value)
-    {
-        if (self::is_cli()) {
+    protected static function highlightError($value)

+    {

+        if (self::is_cli()) {

             return self::$cli_error . $value . "\x1b[0m";
-        } else {
+        } else {

             return '<span ' . self::$error_attributes . '>' . $value . '</span>';
         }
     }
@@ -1577,11 +1579,11 @@ 
      *
      * @return String HTML code of the highlighted token.
      */
-    protected static function highlightComment($value)
-    {
-        if (self::is_cli()) {
+    protected static function highlightComment($value)

+    {

+        if (self::is_cli()) {

             return self::$cli_comment . $value . "\x1b[0m";
-        } else {
+        } else {

             return '<span ' . self::$comment_attributes . '>' . $value . '</span>';
         }
     }
@@ -1593,11 +1595,11 @@ 
      *
      * @return String HTML code of the highlighted token.
      */
-    protected static function highlightWord($value)
-    {
-        if (self::is_cli()) {
+    protected static function highlightWord($value)

+    {

+        if (self::is_cli()) {

             return self::$cli_word . $value . "\x1b[0m";
-        } else {
+        } else {

             return '<span ' . self::$word_attributes . '>' . $value . '</span>';
         }
     }
@@ -1609,11 +1611,11 @@ 
      *
      * @return String HTML code of the highlighted token.
      */
-    protected static function highlightVariable($value)
-    {
-        if (self::is_cli()) {
+    protected static function highlightVariable($value)

+    {

+        if (self::is_cli()) {

             return self::$cli_variable . $value . "\x1b[0m";
-        } else {
+        } else {

             return '<span ' . self::$variable_attributes . '>' . $value . '</span>';
         }
     }
@@ -1625,8 +1627,8 @@ 
      *
      * @return String The quoted string
      */
-    private static function quote_regex($a)
-    {
+    private static function quote_regex($a)

+    {

         return preg_quote($a, '/');
     }
 
@@ -1637,13 +1639,13 @@ 
      *
      * @return String The quoted string
      */
-    private static function output($string)
-    {
-        if (self::is_cli()) {
+    private static function output($string)

+    {

+        if (self::is_cli()) {

             return $string . "\n";
-        } else {
+        } else {

             $string = trim($string);
-            if (!self::$use_pre) {
+            if (!self::$use_pre) {

                 return $string;
             }
 
@@ -1654,11 +1656,11 @@ 
     /**
      * @return bool
      */
-    private static function is_cli()
-    {
-        if (isset(self::$cli)) {
+    private static function is_cli()

+    {

+        if (isset(self::$cli)) {

             return self::$cli;
-        } else {
+        } else {

             return php_sapi_name() === 'cli';
         }
     }

assets/snippets/DocLister/lib/DLphx.class.php

Spacing +11 added lines, -11 removed lines

@@ -201,7 +201,7 @@ 
                     default:
                         $this->Log("MODx / PHx placeholder variable: " . $input);
                         // Check if placeholder is set
-                        if (!array_key_exists($input, $this->placeholders) && !array_key_exists($input,
+                        if ( ! array_key_exists($input, $this->placeholders) && ! array_key_exists($input,
                                 $modx->placeholders)
                         ) {
                             // not set so try again later.
@@ -310,7 +310,7 @@ 
                     case "show":
                         $conditional = implode(' ', $condition);
                         $isvalid = intval($this->runCode($conditional));
-                        if (!$isvalid) {
+                        if ( ! $isvalid) {
                             $output = null;
                         }
                         break;
@@ -326,7 +326,7 @@ 
                     case "else":
                         $conditional = implode(' ', $condition);
                         $isvalid = intval($this->runCode($condition));
-                        if (!$isvalid) {
+                        if ( ! $isvalid) {
                             $output = $modifier_value[$i];
                         }
                         break;
@@ -392,7 +392,7 @@ 
                         break;
                     case "wordwrap": // default: 70
                         $wrapat = intval($modifier_value[$i]) ? intval($modifier_value[$i]) : 70;
-                        $output = preg_replace_callback("@(\b\w+\b)@",function($m) use($wrapat) {return wordwrap($m[1],$wrapat,' ',1);},$output);
+                        $output = preg_replace_callback("@(\b\w+\b)@", function($m) use($wrapat) {return wordwrap($m[1], $wrapat, ' ', 1); },$output);
                         break;
                     case "limit": // default: 100
                         $limit = intval($modifier_value[$i]) ? intval($modifier_value[$i]) : 100;
@@ -415,7 +415,7 @@ 
                         $output = eval("return " . $filter . ";");
                         break;
                     case "isnotempty":
-                        if (!empty($output)) {
+                        if ( ! empty($output)) {
                             $output = $modifier_value[$i];
                         }
                         break;
@@ -494,7 +494,7 @@ 
                         $cm = $snippet;
                         // end //
 
-                        if (!empty($cm)) {
+                        if ( ! empty($cm)) {
                             ob_start();
                             $options = $modifier_value[$i];
                             $custom = eval($cm);
@@ -516,7 +516,7 @@ 
         return $output;
     }
 
-    private function runCode($code){
+    private function runCode($code) {
         return eval("return (" . $code . ");");
     }
     // Event logging (debug)
@@ -525,7 +525,7 @@ 
      */
     public function createEventLog()
     {
-        if (!empty($this->console)) {
+        if ( ! empty($this->console)) {
             $console = implode("\n", $this->console);
             $this->console = array();
 
@@ -598,7 +598,7 @@ 
     public function ModUser($userid, $field)
     {
         global $modx;
-        if (!array_key_exists($userid, $this->cache["ui"])) {
+        if ( ! array_key_exists($userid, $this->cache["ui"])) {
             if (intval($userid) < 0) {
                 $user = $modx->getWebUserInfo(-($userid));
             } else {
@@ -623,7 +623,7 @@ 
         global $modx;
 
         // if $groupNames is not an array return false
-        if (!is_array($groupNames)) {
+        if ( ! is_array($groupNames)) {
             return false;
         }
 
@@ -633,7 +633,7 @@ 
         }
 
         // Creates an array with all webgroups the user id is in
-        if (!array_key_exists($userid, $this->cache["mo"])) {
+        if ( ! array_key_exists($userid, $this->cache["mo"])) {
             $tbl = $modx->getFullTableName("webgroup_names");
             $tbl2 = $modx->getFullTableName("web_groups");
             $sql = "SELECT wgn.name FROM $tbl wgn INNER JOIN $tbl2 wg ON wg.webgroup=wgn.id AND wg.webuser='" . $userid . "'";

Braces +121 added lines, -118 removed lines

@@ -15,8 +15,8 @@ 
 /**
  * Class DLphx
  */
-class DLphx
-{
+class DLphx

+{

     public $placeholders = array();
     public $name = 'PHx';
     public $version = '2.2.0';
@@ -43,8 +43,8 @@ 
      * @param int|bool|string $debug
      * @param int $maxpass
      */
-    public function __construct($debug = false, $maxpass = 50)
-    {
+    public function __construct($debug = false, $maxpass = 50)

+    {

         global $modx;
 
         $this->user["mgrid"] = isset($_SESSION['mgrInternalKey']) ? intval($_SESSION['mgrInternalKey']) : 0;
@@ -56,14 +56,14 @@ 
         $this->maxPasses = ($maxpass != '') ? $maxpass : 50;
 
         $modx->setPlaceholder("phx", "&_PHX_INTERNAL_&");
-        if (function_exists('mb_internal_encoding')) {
+        if (function_exists('mb_internal_encoding')) {

             mb_internal_encoding($modx->config['modx_charset']);
         }
     }
 
     // Plugin event hook for MODx
-    public function OnParseDocument()
-    {
+    public function OnParseDocument()

+    {

         global $modx;
         // Get document output from MODx
         $template = $modx->documentOutput;
@@ -78,11 +78,11 @@ 
      * @param string $template
      * @return mixed|string
      */
-    public function Parse($template = '')
-    {
+    public function Parse($template = '')

+    {

         global $modx;
         // If we already reached max passes don't get at it again.
-        if ($this->curPass == $this->maxPasses) {
+        if ($this->curPass == $this->maxPasses) {

             return $template;
         }
         // Set template pre-process hash
@@ -93,7 +93,7 @@ 
         $template = $this->ParseValues($template);
         // clean up unused placeholders that have modifiers attached (MODx can't clean them)
         preg_match_all('~(?:=`[^`@]*?)(\[\+([^:\+\[\]]+)([^\[\]]*?)\+\])~s', $template, $matches);
-        if ($matches[0]) {
+        if ($matches[0]) {

             $template = str_replace($matches[1], '', $template);
             $this->Log("Cleaning unsolved tags: \n" . implode("\n", $matches[2]));
         }
@@ -102,11 +102,11 @@ 
         // Set template post-process hash
         $et = md5($template);
         // If template has changed, parse it once more...
-        if ($st != $et) {
+        if ($st != $et) {

             $template = $this->Parse($template);
         }
         // Write an event log if debugging is enabled and there is something to log
-        if ($this->debug && $this->debugLog) {
+        if ($this->debug && $this->debugLog) {

             $modx->logEvent($this->curPass, 1, $this->createEventLog(), $this->name . ' ' . $this->version);
             $this->debugLog = false;
         }
@@ -120,8 +120,8 @@ 
      * @param string $template
      * @return mixed|string
      */
-    public function ParseValues($template = '')
-    {
+    public function ParseValues($template = '')

+    {

         global $modx;
 
         $this->curPass = $this->curPass + 1;
@@ -130,12 +130,12 @@ 
         $this->LogPass();
 
         // MODX Chunks
-        if (preg_match_all('~(?<!(?:then|else)=`){{([^:\+{}]+)([^{}]*?)}}~s', $template, $matches)) {
+        if (preg_match_all('~(?<!(?:then|else)=`){{([^:\+{}]+)([^{}]*?)}}~s', $template, $matches)) {

             $this->Log('MODX Chunks -> Merging all chunk tags');
             $count = count($matches[0]);
             $var_search = array();
             $var_replace = array();
-            for ($i = 0; $i < $count; $i++) {
+            for ($i = 0; $i < $count; $i++) {

                 $var_search[] = $matches[0][$i];
                 $input = $matches[1][$i];
                 $this->Log('MODX Chunk: ' . $input);
@@ -147,13 +147,13 @@ 
 
         // MODx Snippets
         //if ( preg_match_all('~\[(\[|!)([^\[]*?)(!|\])\]~s',$template, $matches)) {
-        if (preg_match_all('~(?<!(?:then|else)=`)\[(\[)([^\[]*?)(\])\]~s', $template, $matches)) {
+        if (preg_match_all('~(?<!(?:then|else)=`)\[(\[)([^\[]*?)(\])\]~s', $template, $matches)) {

             $count = count($matches[0]);
             $var_search = array();
             $var_replace = array();
 
             // for each detected snippet
-            for ($i = 0; $i < $count; $i++) {
+            for ($i = 0; $i < $count; $i++) {

                 $snippet = $matches[2][$i]; // snippet call
                 $this->Log("MODx Snippet -> " . $snippet);
 
@@ -169,7 +169,7 @@ 
         }
 
         // PHx / MODx Tags
-        if (preg_match_all('~\[(\+|\*|\()([^:\+\[\]]+)([^\[\]]*?)(\1|\))\]~s', $template, $matches)) {
+        if (preg_match_all('~\[(\+|\*|\()([^:\+\[\]]+)([^\[\]]*?)(\1|\))\]~s', $template, $matches)) {

 
             //$matches[0] // Complete string that's need to be replaced
             //$matches[1] // Type
@@ -180,11 +180,11 @@ 
             $count = count($matches[0]);
             $var_search = array();
             $var_replace = array();
-            for ($i = 0; $i < $count; $i++) {
+            for ($i = 0; $i < $count; $i++) {

                 $input = $matches[2][$i];
                 $modifiers = $matches[3][$i];
                 $var_search[] = $matches[0][$i];
-                switch ($matches[1][$i]) {
+                switch ($matches[1][$i]) {

                     // Document / Template Variable eXtended
                     case "*":
                         $this->Log("MODx TV/DV: " . $input);
@@ -203,10 +203,10 @@ 
                         // Check if placeholder is set
                         if (!array_key_exists($input, $this->placeholders) && !array_key_exists($input,
                                 $modx->placeholders)
-                        ) {
+                        ) {

                             // not set so try again later.
                             $input = '';
-                        } else {
+                        } else {

                             // is set, get value and run filter
                             $input = $this->getPHxVariable($input);
                         }
@@ -220,11 +220,11 @@ 
         $et = md5($template); // Post-process template hash
 
         // Log an event if this was the maximum pass
-        if ($this->curPass == $this->maxPasses) {
+        if ($this->curPass == $this->maxPasses) {

             $this->Log("Max passes reached. infinite loop protection so exiting.\n If you need the extra passes set the max passes to the highest count of nested tags in your template.");
         }
         // If this pass is not at maximum passes and the template hash is not the same, get at it again.
-        if (($this->curPass < $this->maxPasses) && ($st != $et)) {
+        if (($this->curPass < $this->maxPasses) && ($st != $et)) {

             $template = $this->ParseValues($template);
         }
 
@@ -237,23 +237,23 @@ 
      * @param $modifiers
      * @return mixed|null|string
      */
-    public function Filter($input, $modifiers)
-    {
+    public function Filter($input, $modifiers)

+    {

         global $modx;
         $output = $input;
         $this->Log("  |--- Input = '" . $output . "'");
-        if (preg_match_all('~:([^:=]+)(?:=`(.*?)`(?=:[^:=]+|$))?~s', $modifiers, $matches)) {
+        if (preg_match_all('~:([^:=]+)(?:=`(.*?)`(?=:[^:=]+|$))?~s', $modifiers, $matches)) {

             $modifier_cmd = $matches[1]; // modifier command
             $modifier_value = $matches[2]; // modifier value
             $count = count($modifier_cmd);
             $condition = array();
-            for ($i = 0; $i < $count; $i++) {
+            for ($i = 0; $i < $count; $i++) {

                 $output = trim($output);
                 $this->Log("  |--- Modifier = '" . $modifier_cmd[$i] . "'");
-                if ($modifier_value[$i] != '') {
+                if ($modifier_value[$i] != '') {

                     $this->Log("  |--- Options = '" . $modifier_value[$i] . "'");
                 }
-                switch ($modifier_cmd[$i]) {
+                switch ($modifier_cmd[$i]) {

                     #####  Conditional Modifiers
                     case "input":
                     case "if":
@@ -295,7 +295,7 @@ 
                     case "ir":
                     case "memberof":
                     case "mo": // Is Member Of  (same as inrole but this one can be stringed as a conditional)
-                        if ($output == "&_PHX_INTERNAL_&") {
+                        if ($output == "&_PHX_INTERNAL_&") {

                             $output = $this->user["id"];
                         }
                         $grps = ($this->strlen($modifier_value[$i]) > 0) ? explode(",", $modifier_value[$i]) : array();
@@ -310,23 +310,23 @@ 
                     case "show":
                         $conditional = implode(' ', $condition);
                         $isvalid = intval($this->runCode($conditional));
-                        if (!$isvalid) {
+                        if (!$isvalid) {

                             $output = null;
                         }
                         break;
                     case "then":
                         $conditional = implode(' ', $condition);
                         $isvalid = intval($this->runCode($conditional));
-                        if ($isvalid) {
+                        if ($isvalid) {

                             $output = $modifier_value[$i];
-                        } else {
+                        } else {

                             $output = null;
                         }
                         break;
                     case "else":
                         $conditional = implode(' ', $condition);
                         $isvalid = intval($this->runCode($condition));
-                        if (!$isvalid) {
+                        if (!$isvalid) {

                             $output = $modifier_value[$i];
                         }
                         break;
@@ -334,7 +334,7 @@ 
                         $raw = explode("&", $modifier_value[$i]);
                         $map = array();
                         $count = count($raw);
-                        for ($m = 0; $m < $count; $m++) {
+                        for ($m = 0; $m < $count; $m++) {

                             $mi = explode("=", $raw[$m]);
                             $map[$mi[0]] = $mi[1];
                         }
@@ -415,13 +415,13 @@ 
                         $output = eval("return " . $filter . ";");
                         break;
                     case "isnotempty":
-                        if (!empty($output)) {
+                        if (!empty($output)) {

                             $output = $modifier_value[$i];
                         }
                         break;
                     case "isempty":
                     case "ifempty":
-                        if (empty($output)) {
+                        if (empty($output)) {

                             $output = $modifier_value[$i];
                         }
                         break;
@@ -433,12 +433,12 @@ 
                         break;
                     case "set":
                         $c = $i + 1;
-                        if ($count > $c && $modifier_cmd[$c] == "value") {
+                        if ($count > $c && $modifier_cmd[$c] == "value") {

                             $output = preg_replace("~([^a-zA-Z0-9])~", "", $modifier_value[$i]);
                         }
                         break;
                     case "value":
-                        if ($i > 0 && $modifier_cmd[$i - 1] == "set") {
+                        if ($i > 0 && $modifier_cmd[$i - 1] == "set") {

                             $modx->SetPlaceholder("phx." . $output, $modifier_value[$i]);
                         }
                         $output = null;
@@ -447,13 +447,13 @@ 
                         $output = md5($output);
                         break;
                     case "userinfo":
-                        if ($output == "&_PHX_INTERNAL_&") {
+                        if ($output == "&_PHX_INTERNAL_&") {

                             $output = $this->user["id"];
                         }
                         $output = $this->ModUser($output, $modifier_value[$i]);
                         break;
                     case "inrole": // deprecated
-                        if ($output == "&_PHX_INTERNAL_&") {
+                        if ($output == "&_PHX_INTERNAL_&") {

                             $output = $this->user["id"];
                         }
                         $grps = ($this->strlen($modifier_value[$i]) > 0) ? explode(",", $modifier_value[$i]) : array();
@@ -465,19 +465,21 @@ 
                         $snippet = '';
                         // modified by Anton Kuzmin (23.06.2010) //
                         $snippetName = 'phx:' . $modifier_cmd[$i];
-                        if (isset($modx->snippetCache[$snippetName])) {
+                        if (isset($modx->snippetCache[$snippetName])) {

                             $snippet = $modx->snippetCache[$snippetName];
-                        } else { // not in cache so let's check the db
+                        } else {

+// not in cache so let's check the db
                             $sql = "SELECT snippet FROM " . $modx->getFullTableName("site_snippets") . " WHERE " . $modx->getFullTableName("site_snippets") . ".name='" . $modx->db->escape($snippetName) . "';";
                             $result = $modx->dbQuery($sql);
-                            if ($modx->recordCount($result) == 1) {
+                            if ($modx->recordCount($result) == 1) {

                                 $row = $modx->fetchRow($result);
                                 $snippet = $modx->snippetCache[$row['name']] = $row['snippet'];
                                 $this->Log("  |--- DB -> Custom Modifier");
-                            } else {
-                                if ($modx->recordCount($result) == 0) { // If snippet not found, look in the modifiers folder
+                            } else {

+                                if ($modx->recordCount($result) == 0) {

+// If snippet not found, look in the modifiers folder
                                     $filename = $modx->config['rb_base_dir'] . 'plugins/phx/modifiers/' . $modifier_cmd[$i] . '.phx.php';
-                                    if (@file_exists($filename)) {
+                                    if (@file_exists($filename)) {

                                         $file_contents = @file_get_contents($filename);
                                         $file_contents = str_replace('<' . '?php', '', $file_contents);
                                         $file_contents = str_replace('?' . '>', '', $file_contents);
@@ -485,7 +487,7 @@ 
                                         $snippet = $modx->snippetCache[$snippetName] = $file_contents;
                                         $modx->snippetCache[$snippetName . 'Props'] = '';
                                         $this->Log("  |--- File ($filename) -> Custom Modifier");
-                                    } else {
+                                    } else {

                                         $this->Log("  |--- PHX Error:  {$modifier_cmd[$i]} could not be found");
                                     }
                                 }
@@ -494,19 +496,19 @@ 
                         $cm = $snippet;
                         // end //
 
-                        if (!empty($cm)) {
+                        if (!empty($cm)) {

                             ob_start();
                             $options = $modifier_value[$i];
                             $custom = eval($cm);
                             $msg = ob_get_contents();
                             $output = $msg . $custom;
                             ob_end_clean();
-                        } else {
+                        } else {

                             $output = '';
                         }
                         break;
                 }
-                if (count($condition)) {
+                if (count($condition)) {

                     $this->Log("  |--- Condition = '" . $condition[count($condition) - 1] . "'");
                 }
                 $this->Log("  |--- Output = '" . $output . "'");
@@ -516,16 +518,17 @@ 
         return $output;
     }
 
-    private function runCode($code){
+    private function runCode($code)

+    {

         return eval("return (" . $code . ");");
     }
     // Event logging (debug)
     /**
      * @return string
      */
-    public function createEventLog()
-    {
-        if (!empty($this->console)) {
+    public function createEventLog()

+    {

+        if (!empty($this->console)) {

             $console = implode("\n", $this->console);
             $this->console = array();
 
@@ -538,8 +541,8 @@ 
      * @param $string
      * @return array|mixed|string
      */
-    public function LogClean($string)
-    {
+    public function LogClean($string)

+    {

         $string = preg_replace("/&amp;(#[0-9]+|[a-z]+);/i", "&$1;", $string);
         $string = APIHelpers::sanitarTag($string);
 
@@ -550,9 +553,9 @@ 
     /**
      * @param $string
      */
-    public function Log($string)
-    {
-        if ($this->debug) {
+    public function Log($string)

+    {

+        if ($this->debug) {

             $this->debugLog = true;
             $this->console[] = (count($this->console) + 1 - $this->curPass) . " [" . strftime("%H:%M:%S",
                     time()) . "] " . $this->LogClean($string);
@@ -563,9 +566,9 @@ 
     /**
      * @param $string
      */
-    public function LogSnippet($string)
-    {
-        if ($this->debug) {
+    public function LogSnippet($string)

+    {

+        if ($this->debug) {

             $this->debugLog = true;
             $this->console[] = (count($this->console) + 1 - $this->curPass) . " [" . strftime("%H:%M:%S",
                     time()) . "] " . "  |--- Returns: <div style='margin: 10px;'>" . $this->LogClean($string) . "</div>";
@@ -573,8 +576,8 @@ 
     }
 
     // Log pass
-    public function LogPass()
-    {
+    public function LogPass()

+    {

         $this->console[] = "<div style='margin: 2px;margin-top: 5px;border-bottom: 1px solid black;'>Pass " . $this->curPass . "</div>";
     }
 
@@ -582,8 +585,8 @@ 
     /**
      * @param $string
      */
-    public function LogSource($string)
-    {
+    public function LogSource($string)

+    {

         $this->console[] = "<div style='margin: 2px;margin-top: 5px;border-bottom: 1px solid black;'>Source:</div>" . $this->LogClean($string);
     }
 
@@ -595,17 +598,17 @@ 
      * @param $field
      * @return mixed
      */
-    public function ModUser($userid, $field)
-    {
+    public function ModUser($userid, $field)

+    {

         global $modx;
-        if (!array_key_exists($userid, $this->cache["ui"])) {
-            if (intval($userid) < 0) {
+        if (!array_key_exists($userid, $this->cache["ui"])) {

+            if (intval($userid) < 0) {

                 $user = $modx->getWebUserInfo(-($userid));
-            } else {
+            } else {

                 $user = $modx->getUserInfo($userid);
             }
             $this->cache["ui"][$userid] = $user;
-        } else {
+        } else {

             $user = $this->cache["ui"][$userid];
         }
 
@@ -618,32 +621,32 @@ 
      * @param array $groupNames
      * @return bool
      */
-    public function isMemberOfWebGroupByUserId($userid = 0, $groupNames = array())
-    {
+    public function isMemberOfWebGroupByUserId($userid = 0, $groupNames = array())

+    {

         global $modx;
 
         // if $groupNames is not an array return false
-        if (!is_array($groupNames)) {
+        if (!is_array($groupNames)) {

             return false;
         }
 
         // if the user id is a negative number make it positive
-        if (intval($userid) < 0) {
+        if (intval($userid) < 0) {

             $userid = -($userid);
         }
 
         // Creates an array with all webgroups the user id is in
-        if (!array_key_exists($userid, $this->cache["mo"])) {
+        if (!array_key_exists($userid, $this->cache["mo"])) {

             $tbl = $modx->getFullTableName("webgroup_names");
             $tbl2 = $modx->getFullTableName("web_groups");
             $sql = "SELECT wgn.name FROM $tbl wgn INNER JOIN $tbl2 wg ON wg.webgroup=wgn.id AND wg.webuser='" . $userid . "'";
             $this->cache["mo"][$userid] = $grpNames = $modx->db->getColumn("name", $sql);
-        } else {
+        } else {

             $grpNames = $this->cache["mo"][$userid];
         }
         // Check if a supplied group matches a webgroup from the array we just created
-        foreach ($groupNames as $k => $v) {
-            if (in_array(trim($v), $grpNames)) {
+        foreach ($groupNames as $k => $v) {

+            if (in_array(trim($v), $grpNames)) {

                 return true;
             }
         }
@@ -657,14 +660,14 @@ 
      * @param $name
      * @return mixed|string
      */
-    public function getPHxVariable($name)
-    {
+    public function getPHxVariable($name)

+    {

         global $modx;
         // Check if this variable is created by PHx
-        if (array_key_exists($name, $this->placeholders)) {
+        if (array_key_exists($name, $this->placeholders)) {

             // Return the value from PHx
             return $this->placeholders[$name];
-        } else {
+        } else {

             // Return the value from MODx
             return $modx->getPlaceholder($name);
         }
@@ -675,9 +678,9 @@ 
      * @param $name
      * @param $value
      */
-    public function setPHxVariable($name, $value)
-    {
-        if ($name != "phx") {
+    public function setPHxVariable($name, $value)

+    {

+        if ($name != "phx") {

             $this->placeholders[$name] = $value;
         }
     }
@@ -689,9 +692,9 @@ 
      * @param null $l
      * @return string
      */
-    public function substr($str, $s, $l = null)
-    {
-        if (function_exists('mb_substr')) {
+    public function substr($str, $s, $l = null)

+    {

+        if (function_exists('mb_substr')) {

             return mb_substr($str, $s, $l);
         }
 
@@ -702,9 +705,9 @@ 
      * @param $str
      * @return int
      */
-    public function strlen($str)
-    {
-        if (function_exists('mb_strlen')) {
+    public function strlen($str)

+    {

+        if (function_exists('mb_strlen')) {

             return mb_strlen($str);
         }
 
@@ -715,9 +718,9 @@ 
      * @param $str
      * @return string
      */
-    public function strtolower($str)
-    {
-        if (function_exists('mb_strtolower')) {
+    public function strtolower($str)

+    {

+        if (function_exists('mb_strtolower')) {

             return mb_strtolower($str);
         }
 
@@ -728,9 +731,9 @@ 
      * @param $str
      * @return string
      */
-    public function strtoupper($str)
-    {
-        if (function_exists('mb_strtoupper')) {
+    public function strtoupper($str)

+    {

+        if (function_exists('mb_strtoupper')) {

             return mb_strtoupper($str);
         }
 
@@ -741,9 +744,9 @@ 
      * @param $str
      * @return string
      */
-    public function ucfirst($str)
-    {
-        if (function_exists('mb_strtoupper') && function_exists('mb_substr') && function_exists('mb_strlen')) {
+    public function ucfirst($str)

+    {

+        if (function_exists('mb_strtoupper') && function_exists('mb_substr') && function_exists('mb_strlen')) {

             return mb_strtoupper(mb_substr($str, 0, 1)) . mb_substr($str, 1, mb_strlen($str));
         }
 
@@ -754,9 +757,9 @@ 
      * @param $str
      * @return string
      */
-    public function lcfirst($str)
-    {
-        if (function_exists('mb_strtolower') && function_exists('mb_substr') && function_exists('mb_strlen')) {
+    public function lcfirst($str)

+    {

+        if (function_exists('mb_strtolower') && function_exists('mb_substr') && function_exists('mb_strlen')) {

             return mb_strtolower(mb_substr($str, 0, 1)) . mb_substr($str, 1, mb_strlen($str));
         }
 
@@ -767,9 +770,9 @@ 
      * @param $str
      * @return string
      */
-    public function ucwords($str)
-    {
-        if (function_exists('mb_convert_case')) {
+    public function ucwords($str)

+    {

+        if (function_exists('mb_convert_case')) {

             return mb_convert_case($str, MB_CASE_TITLE);
         }
 
@@ -780,8 +783,8 @@ 
      * @param $str
      * @return string
      */
-    public function strrev($str)
-    {
+    public function strrev($str)

+    {

         preg_match_all('/./us', $str, $ar);
 
         return implode(array_reverse($ar[0]));
@@ -791,8 +794,8 @@ 
      * @param $str
      * @return string
      */
-    public function str_shuffle($str)
-    {
+    public function str_shuffle($str)

+    {

         preg_match_all('/./us', $str, $ar);
         shuffle($ar[0]);
 
@@ -803,8 +806,8 @@ 
      * @param $str
      * @return int
      */
-    public function str_word_count($str)
-    {
+    public function str_word_count($str)

+    {

         return count(preg_split('~[^\p{L}\p{N}\']+~u', $str));
     }
 }