AgelxNash / DocLister

assets/lib/class.summary.php

Doc Comments +5 added lines, -5 removed lines

@@ -69,7 +69,7 @@ 
     }
 
     /**
-     * @return mixed
+     * @return string
      */
     public function getCut()
     {
@@ -149,8 +149,8 @@ 
     /**
      * @param $resource
      * @param $truncLen
-     * @param $truncOffset
-     * @param $truncChars
+     * @param integer $truncOffset
+     * @param boolean $truncChars
      * @param string $splitter
      * @return array|mixed|string
      */
@@ -242,7 +242,7 @@ 
      */
     /**
      * @param $string
-     * @param $limit
+     * @param integer $limit
      * @param string $break
      * @return string
      */
@@ -265,7 +265,7 @@ 
     }
 
     /**
-     * @param $str
+     * @param string $str
      * @return mixed
      */
     protected function rTriming($str)

Spacing +7 added lines, -7 removed lines

@@ -83,10 +83,10 @@ 
      */
     protected function dotted($scheme = 0)
     {
-        if (($scheme == 1 && ($this->_useCut || $this->_useSubstr)) || ($scheme == 2 && $this->_useSubstr && !$this->_useCut)) {
+        if (($scheme == 1 && ($this->_useCut || $this->_useSubstr)) || ($scheme == 2 && $this->_useSubstr && ! $this->_useCut)) {
             $this->_cfg['content'] .= '…'; //...
         } else {
-            if ($scheme && (!$this->_useCut || $scheme != 2)) {
+            if ($scheme && ( ! $this->_useCut || $scheme != 2)) {
                 $this->_cfg['content'] .= '.';
             }
         }
@@ -115,13 +115,13 @@ 
                         $this->_cfg['content'] = APIhelpers::sanitarTag($this->_cfg['content']);
                         break;
                     case 'chars':
-                        if (!(isset($process[1]) && $process[1] > 0)) {
+                        if ( ! (isset($process[1]) && $process[1] > 0)) {
                             $process[1] = 200;
                         }
                         $this->_cfg['content'] = APIhelpers::mb_trim_word($this->_cfg['content'], $process[1]);
                         break;
                     case 'len':
-                        if (!(isset($process[1]) && $process[1] > 0)) {
+                        if ( ! (isset($process[1]) && $process[1] > 0)) {
                             $process[1] = 200;
                         }
                         $this->_cfg['content'] = $this->summary($this->_cfg['content'], $process[1], 50, true,
@@ -208,7 +208,7 @@ 
                 } else {
                     $next_char = "";
                 }
-                if (!$quotes_on) {
+                if ( ! $quotes_on) {
                     // Check if it's a tag
                     // On a "<" add 3 if it's an opening tag (like <a href...)
                     // or add only 1 if it's an ending tag (like </a>)
@@ -295,7 +295,7 @@ 
     protected function rTriming($str)
     {
         $str = preg_replace('/[\r\n]++/', ' ', $str);
-        if (!$this->_useCut || $this->_dotted != 2) {
+        if ( ! $this->_useCut || $this->_dotted != 2) {
             $str = preg_replace("/(([\.,\-:!?;\s])|(&\w+;))+$/ui", "", $str);
         }
 
@@ -348,7 +348,7 @@ 
                 if (mb_strstr($tag, ' ', 'UTF-8')) {
                     $tag = mb_substr($tag, 0, strpos($tag, ' '), 'UTF-8');
                 }
-                if (!mb_stristr($tag, 'br', 'UTF-8') && !mb_stristr($tag, 'img', 'UTF-8') && !empty ($tag)) {
+                if ( ! mb_stristr($tag, 'br', 'UTF-8') && ! mb_stristr($tag, 'img', 'UTF-8') && ! empty ($tag)) {
                     $endTags .= '</' . $tag . '>';
                 }
             }

Braces +69 added lines, -69 removed lines

@@ -17,8 +17,8 @@ 
 /**
  * Class SummaryText
  */
-class SummaryText
-{
+class SummaryText

+{

     /**
      * @var array
      */
@@ -45,8 +45,8 @@ 
      * @param $action
      * @param null $break
      */
-    public function __construct($text, $action, $break = null)
-    {
+    public function __construct($text, $action, $break = null)

+    {

         $this->_cfg['content'] = is_scalar($text) ? $text : '';
         $this->_cfg['original'] = $this->_cfg['content'];
         $this->_cfg['summary'] = is_scalar($action) ? $action : '';
@@ -57,12 +57,12 @@ 
      * @param $cut
      * @return bool
      */
-    public function setCut($cut)
-    {
-        if (is_scalar($cut) && $cut != '') {
+    public function setCut($cut)

+    {

+        if (is_scalar($cut) && $cut != '') {

             $this->_cfg['cut'] = $cut;
             $flag = true;
-        } else {
+        } else {

             $flag = false;
         }
 
@@ -72,8 +72,8 @@ 
     /**
      * @return mixed
      */
-    public function getCut()
-    {
+    public function getCut()

+    {

         return \APIHelpers::getkey($this->_cfg, 'cut', '<cut/>');
     }
 
@@ -81,12 +81,12 @@ 
      * @param int $scheme
      * @return mixed
      */
-    protected function dotted($scheme = 0)
-    {
-        if (($scheme == 1 && ($this->_useCut || $this->_useSubstr)) || ($scheme == 2 && $this->_useSubstr && !$this->_useCut)) {
+    protected function dotted($scheme = 0)

+    {

+        if (($scheme == 1 && ($this->_useCut || $this->_useSubstr)) || ($scheme == 2 && $this->_useSubstr && !$this->_useCut)) {

             $this->_cfg['content'] .= '&hellip;'; //...
-        } else {
-            if ($scheme && (!$this->_useCut || $scheme != 2)) {
+        } else {

+            if ($scheme && (!$this->_useCut || $scheme != 2)) {

                 $this->_cfg['content'] .= '.';
             }
         }
@@ -98,16 +98,16 @@ 
      * @param int $dotted
      * @return mixed
      */
-    public function run($dotted = 0)
-    {
+    public function run($dotted = 0)

+    {

         $this->_dotted = $dotted;
-        if (isset($this->_cfg['content'], $this->_cfg['summary']) && $this->_cfg['summary'] != '' && $this->_cfg['content'] != '') {
+        if (isset($this->_cfg['content'], $this->_cfg['summary']) && $this->_cfg['summary'] != '' && $this->_cfg['content'] != '') {

             $param = explode(",", $this->_cfg['summary']);
             $this->_cfg['content'] = $this->beforeCut($this->_cfg['content'], $this->getCut());
-            foreach ($param as $doing) {
+            foreach ($param as $doing) {

 
                 $process = explode(":", $doing);
-                switch ($process[0]) {
+                switch ($process[0]) {

                     case 'notags':
                         $this->_cfg['content'] = strip_tags($this->_cfg['content']);
                         break;
@@ -115,13 +115,13 @@ 
                         $this->_cfg['content'] = APIhelpers::sanitarTag($this->_cfg['content']);
                         break;
                     case 'chars':
-                        if (!(isset($process[1]) && $process[1] > 0)) {
+                        if (!(isset($process[1]) && $process[1] > 0)) {

                             $process[1] = 200;
                         }
                         $this->_cfg['content'] = APIhelpers::mb_trim_word($this->_cfg['content'], $process[1]);
                         break;
                     case 'len':
-                        if (!(isset($process[1]) && $process[1] > 0)) {
+                        if (!(isset($process[1]) && $process[1] > 0)) {

                             $process[1] = 200;
                         }
                         $this->_cfg['content'] = $this->summary($this->_cfg['content'], $process[1], 50, true,
@@ -139,15 +139,15 @@ 
      * @param string $splitter
      * @return array|mixed
      */
-    protected function beforeCut($resource, $splitter = '')
-    {
-        if ($splitter !== '') {
+    protected function beforeCut($resource, $splitter = '')

+    {

+        if ($splitter !== '') {

             $summary = str_replace('<p>' . $splitter . '</p>', $splitter,
                 $resource); // For TinyMCE or if it isn't wrapped inside paragraph tags
             $summary = explode($splitter, $summary, 2);
             $this->_useCut = isset($summary[1]);
             $summary = $summary['0'];
-        } else {
+        } else {

             $summary = $resource;
         }
 
@@ -162,18 +162,18 @@ 
      * @param string $splitter
      * @return array|mixed|string
      */
-    protected function summary($resource, $truncLen, $truncOffset, $truncChars, $splitter = '')
-    {
-        if (isset($this->_useCut) && $splitter != '' && mb_strstr($resource, $splitter, 'UTF-8')) {
+    protected function summary($resource, $truncLen, $truncOffset, $truncChars, $splitter = '')

+    {

+        if (isset($this->_useCut) && $splitter != '' && mb_strstr($resource, $splitter, 'UTF-8')) {

             $summary = $this->beforeCut($resource, $splitter);
-        } else {
-            if ($this->_useCut !== true && (mb_strlen($resource, 'UTF-8') > $truncLen)) {
+        } else {

+            if ($this->_useCut !== true && (mb_strlen($resource, 'UTF-8') > $truncLen)) {

 
                 $summary = $this->html_substr($resource, $truncLen, $truncOffset, $truncChars);
-                if ($resource != $summary) {
+                if ($resource != $summary) {

                     $this->_useSubstr = true;
                 }
-            } else {
+            } else {

                 $summary = $resource;
             }
         }
@@ -194,60 +194,60 @@ 
      * @param bool $truncChars
      * @return string
      */
-    protected function html_substr($posttext, $minimum_length = 200, $length_offset = 100, $truncChars = false)
-    {
+    protected function html_substr($posttext, $minimum_length = 200, $length_offset = 100, $truncChars = false)

+    {

         $tag_counter = 0;
         $quotes_on = false;
-        if (mb_strlen($posttext) > $minimum_length && $truncChars !== true) {
+        if (mb_strlen($posttext) > $minimum_length && $truncChars !== true) {

             $c = 0;
             $len = mb_strlen($posttext, 'UTF-8');
-            for ($i = 0; $i < $len; $i++) {
+            for ($i = 0; $i < $len; $i++) {

                 $current_char = mb_substr($posttext, $i, 1, 'UTF-8');
-                if ($i < mb_strlen($posttext, 'UTF-8') - 1) {
+                if ($i < mb_strlen($posttext, 'UTF-8') - 1) {

                     $next_char = mb_substr($posttext, $i + 1, 1, 'UTF-8');
-                } else {
+                } else {

                     $next_char = "";
                 }
-                if (!$quotes_on) {
+                if (!$quotes_on) {

                     // Check if it's a tag
                     // On a "<" add 3 if it's an opening tag (like <a href...)
                     // or add only 1 if it's an ending tag (like </a>)
-                    if ($current_char == '<') {
-                        if ($next_char == '/') {
+                    if ($current_char == '<') {

+                        if ($next_char == '/') {

                             $tag_counter += 1;
-                        } else {
+                        } else {

                             $tag_counter += 3;
                         }
                     }
                     // Slash signifies an ending (like </a> or ... />)
                     // substract 2
-                    if ($current_char == '/' && $tag_counter <> 0) {
+                    if ($current_char == '/' && $tag_counter <> 0) {

                         $tag_counter -= 2;
                     }
                     // On a ">" substract 1
-                    if ($current_char == '>') {
+                    if ($current_char == '>') {

                         $tag_counter -= 1;
                     }
                     // If quotes are encountered, start ignoring the tags
                     // (for directory slashes)
-                    if ($current_char == '"') {
+                    if ($current_char == '"') {

                         $quotes_on = true;
                     }
-                } else {
+                } else {

                     // IF quotes are encountered again, turn it back off
-                    if ($current_char == '"') {
+                    if ($current_char == '"') {

                         $quotes_on = false;
                     }
                 }
 
                 // Count only the chars outside html tags
-                if ($tag_counter == 2 || $tag_counter == 0) {
+                if ($tag_counter == 2 || $tag_counter == 0) {

                     $c++;
                 }
 
                 // Check if the counter has reached the minimum length yet,
                 // then wait for the tag_counter to become 0, and chop the string there
-                if ($c > $minimum_length - $length_offset && $tag_counter == 0) {
+                if ($c > $minimum_length - $length_offset && $tag_counter == 0) {

                     $posttext = mb_substr($posttext, 0, $i + 1, 'UTF-8');
 
                     return $posttext;
@@ -267,20 +267,20 @@ 
      * @param string $break
      * @return string
      */
-    protected function textTrunc($string, $limit, $break = ". ")
-    {
+    protected function textTrunc($string, $limit, $break = ". ")

+    {

         // Original PHP code from The Art of Web: www.the-art-of-web.com
 
         // return with no change if string is shorter than $limit
-        if (mb_strlen($string, 'UTF-8') < $limit) {
+        if (mb_strlen($string, 'UTF-8') < $limit) {

             return $string;
         }
 
         $string = mb_substr($string, 0, $limit, 'UTF-8');
-        if (false !== ($breakpoint = mb_strrpos($string, $break, 'UTF-8'))) {
+        if (false !== ($breakpoint = mb_strrpos($string, $break, 'UTF-8'))) {

             $string = mb_substr($string, 0, $breakpoint + 1, 'UTF-8');
-        } else {
-            if ($break != ' ') {
+        } else {

+            if ($break != ' ') {

                 $string = $this->textTrunc($string, $limit, " ");
             }
         }
@@ -292,10 +292,10 @@ 
      * @param $str
      * @return mixed
      */
-    protected function rTriming($str)
-    {
+    protected function rTriming($str)

+    {

         $str = preg_replace('/[\r\n]++/', ' ', $str);
-        if (!$this->_useCut || $this->_dotted != 2) {
+        if (!$this->_useCut || $this->_dotted != 2) {

             $str = preg_replace("/(([\.,\-:!?;\s])|(&\w+;))+$/ui", "", $str);
         }
 
@@ -308,8 +308,8 @@ 
      * @param $text
      * @return string
      */
-    private function closeTags($text)
-    {
+    private function closeTags($text)

+    {

         $openPattern = "/<([^\/].*?)>/";
         $closePattern = "/<\/(.*?)>/";
         $endTags = '';
@@ -319,15 +319,15 @@ 
 
         $c = 0;
         $loopCounter = count($closeTags[1]); //used to prevent an infinite loop if the html is malformed
-        while ($c < count($closeTags[1]) && $loopCounter) {
+        while ($c < count($closeTags[1]) && $loopCounter) {

             $i = 0;
-            while ($i < count($openTags[1])) {
+            while ($i < count($openTags[1])) {

                 $tag = trim($openTags[1][$i]);
 
-                if (mb_strstr($tag, ' ', 'UTF-8')) {
+                if (mb_strstr($tag, ' ', 'UTF-8')) {

                     $tag = mb_substr($tag, 0, strpos($tag, ' '), 'UTF-8');
                 }
-                if ($tag == $closeTags[1][$c]) {
+                if ($tag == $closeTags[1][$c]) {

                     $openTags[1][$i] = '';
                     $c++;
                     break;
@@ -339,16 +339,16 @@ 
 
         $results = $openTags[1];
 
-        if (is_array($results)) {
+        if (is_array($results)) {

             $results = array_reverse($results);
 
-            foreach ($results as $tag) {
+            foreach ($results as $tag) {

                 $tag = trim($tag);
 
-                if (mb_strstr($tag, ' ', 'UTF-8')) {
+                if (mb_strstr($tag, ' ', 'UTF-8')) {

                     $tag = mb_substr($tag, 0, strpos($tag, ' '), 'UTF-8');
                 }
-                if (!mb_stristr($tag, 'br', 'UTF-8') && !mb_stristr($tag, 'img', 'UTF-8') && !empty ($tag)) {
+                if (!mb_stristr($tag, 'br', 'UTF-8') && !mb_stristr($tag, 'img', 'UTF-8') && !empty ($tag)) {

                     $endTags .= '</' . $tag . '>';
                 }
             }

assets/lib/MODxAPI/MODx.php

Doc Comments +1 added lines, -1 removed lines

@@ -618,7 +618,7 @@
     }
 
     /**
-     * @param $table
+     * @param null|string $table
      * @return mixed|string
      */
     final public function makeTable($table)

Spacing +13 added lines, -13 removed lines

@@ -197,7 +197,7 @@ 
      */
     public function addQuery($q)
     {
-        if (is_scalar($q) && !empty($q)) {
+        if (is_scalar($q) && ! empty($q)) {
             $this->_query[] = $q;
         }
 
@@ -231,7 +231,7 @@ 
      */
     final public function escape($value)
     {
-        if (!is_scalar($value)) {
+        if ( ! is_scalar($value)) {
             $value = '';
         } else {
             $value = $this->modx->db->escape($value);
@@ -372,7 +372,7 @@ 
             //Если уже загружен объект, с которым мы хотим временно поработать
             case ($this->getID() == $id && $id):
                 //Если $id не указан, но уже загружен какой-то объект
-            case (!$id && $this->getID()):
+            case ( ! $id && $this->getID()):
             default:
                 $obj = $this;
                 break;
@@ -407,7 +407,7 @@ 
      */
     public function set($key, $value)
     {
-        if ((is_scalar($value) || $this->isJsonField($key)) && is_scalar($key) && !empty($key)) {
+        if ((is_scalar($value) || $this->isJsonField($key)) && is_scalar($key) && ! empty($key)) {
             $this->field[$key] = $value;
         }
 
@@ -454,7 +454,7 @@ 
      */
     final protected function Uset($key, $id = '')
     {
-        if (!isset($this->field[$key])) {
+        if ( ! isset($this->field[$key])) {
             $tmp = "`{$key}`=''";
             $this->log[] = "{$key} is empty";
         } else {
@@ -464,7 +464,7 @@ 
                 throw new Exception("{$key} is invalid <pre>" . print_r($this->field[$key], true) . "</pre>");
             }
         }
-        if (!empty($tmp)) {
+        if ( ! empty($tmp)) {
             if ($id == '') {
                 $this->set[] = $tmp;
             } else {
@@ -485,7 +485,7 @@ 
     final public function cleanIDs($IDs, $sep = ',', $ignore = array())
     {
         $out = array();
-        if (!is_array($IDs)) {
+        if ( ! is_array($IDs)) {
             if (is_scalar($IDs)) {
                 $IDs = explode($sep, $IDs);
             } else {
@@ -496,7 +496,7 @@ 
         foreach ($IDs as $item) {
             $item = trim($item);
             if (is_scalar($item) && (int)$item >= 0) { //Fix 0xfffffffff
-                if (!empty($ignore) && in_array((int)$item, $ignore, true)) {
+                if ( ! empty($ignore) && in_array((int)$item, $ignore, true)) {
                     $this->log[] = 'Ignore id ' . (int)$item;
                 } else {
                     $out[] = (int)$item;
@@ -516,7 +516,7 @@ 
      */
     final public function fromJson($data, $callback = null)
     {
-        if (is_scalar($data) && !empty($data)) {
+        if (is_scalar($data) && ! empty($data)) {
             $json = json_decode($data);
         } else {
             throw new Exception("json is not string with json data");
@@ -634,7 +634,7 @@ 
      */
     final public function sanitarIn($data, $sep = ',')
     {
-        if (!is_array($data)) {
+        if ( ! is_array($data)) {
             $data = explode($sep, $data);
         }
         $out = array();
@@ -676,7 +676,7 @@ 
         if ($where != '') {
             $sql = $this->query("SELECT `" . $this->escape($PK) . "` FROM " . $this->makeTable($table) . " WHERE " . $where);
             $id = $this->modx->db->getValue($sql);
-            if (is_null($id) || (!$this->newDoc && $id == $this->getID())) {
+            if (is_null($id) || ( ! $this->newDoc && $id == $this->getID())) {
                 $flag = true;
             } else {
                 $flag = false;
@@ -872,7 +872,7 @@ 
      */
     public function getNoEncodeFields()
     {
-        return $this->_decodedFields->filter(function ($value) {
+        return $this->_decodedFields->filter(function($value) {
             return ($value === false);
         });
     }
@@ -883,7 +883,7 @@ 
      */
     public function getNoDecodeFields()
     {
-        return $this->_decodedFields->filter(function ($value) {
+        return $this->_decodedFields->filter(function($value) {
             return ($value === true);
         });
     }

Braces +201 added lines, -200 removed lines

@@ -7,15 +7,15 @@ 
 /**
  * Class MODxAPIhelpers
  */
-class MODxAPIhelpers
-{
+class MODxAPIhelpers

+{

     /**
      * @param $email
      * @param bool $dns
      * @return false|string
      */
-    public function emailValidate($email, $dns = true)
-    {
+    public function emailValidate($email, $dns = true)

+    {

         return \APIhelpers::emailValidate($email, $dns);
     }
 
@@ -24,8 +24,8 @@ 
      * @param string $data
      * @return string
      */
-    public function genPass($len, $data = '')
-    {
+    public function genPass($len, $data = '')

+    {

         return \APIhelpers::genPass($len, $data);
     }
 
@@ -33,8 +33,8 @@ 
      * @param string $out
      * @return string
      */
-    public function getUserIP($out = '127.0.0.1')
-    {
+    public function getUserIP($out = '127.0.0.1')

+    {

         return \APIhelpers::getUserIP($out);
     }
 
@@ -42,8 +42,8 @@ 
      * @param $data
      * @return array|mixed|string
      */
-    public function sanitarTag($data)
-    {
+    public function sanitarTag($data)

+    {

         return \APIhelpers::sanitarTag($data);
     }
 
@@ -54,8 +54,8 @@ 
      * @param array $mixArray
      * @return bool
      */
-    public function checkString($value, $minLen = 1, $alph = array(), $mixArray = array())
-    {
+    public function checkString($value, $minLen = 1, $alph = array(), $mixArray = array())

+    {

         return \APIhelpers::checkString($value, $minLen, $alph, $mixArray);
     }
 }
@@ -63,8 +63,8 @@ 
 /**
  * Class MODxAPI
  */
-abstract class MODxAPI extends MODxAPIhelpers
-{
+abstract class MODxAPI extends MODxAPIhelpers

+{

     /**
      * Объект DocumentParser - основной класс MODX
      * @var \DocumentParser
@@ -143,10 +143,10 @@ 
      * @param bool $debug
      * @throws Exception
      */
-    public function __construct(DocumentParser $modx, $debug = false)
-    {
+    public function __construct(DocumentParser $modx, $debug = false)

+    {

         $this->modx = $modx;
-        if (function_exists("get_magic_quotes_gpc") && get_magic_quotes_gpc()) {
+        if (function_exists("get_magic_quotes_gpc") && get_magic_quotes_gpc()) {

             throw new Exception('Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config.');
         }
 
@@ -158,8 +158,8 @@ 
      * @param boolean $flag
      * @return $this
      */
-    public function setDebug($flag)
-    {
+    public function setDebug($flag)

+    {

         $this->_debug = (bool)$flag;
 
         return $this;
@@ -168,16 +168,16 @@ 
     /**
      * @return bool
      */
-    public function getDebug()
-    {
+    public function getDebug()

+    {

         return $this->_debug;
     }
 
     /**
      * @return array
      */
-    public function getDefaultFields()
-    {
+    public function getDefaultFields()

+    {

         return $this->default_field;
     }
 
@@ -186,8 +186,8 @@ 
      * @param null $default
      * @return mixed
      */
-    final public function modxConfig($name, $default = null)
-    {
+    final public function modxConfig($name, $default = null)

+    {

         return APIHelpers::getkey($this->modx->config, $name, $default);
     }
 
@@ -195,9 +195,9 @@ 
      * @param $q
      * @return $this
      */
-    public function addQuery($q)
-    {
-        if (is_scalar($q) && !empty($q)) {
+    public function addQuery($q)

+    {

+        if (is_scalar($q) && !empty($q)) {

             $this->_query[] = $q;
         }
 
@@ -207,8 +207,8 @@ 
     /**
      * @return array
      */
-    public function getQueryList()
-    {
+    public function getQueryList()

+    {

         return $this->_query;
     }
 
@@ -216,9 +216,9 @@ 
      * @param $SQL
      * @return mixed
      */
-    final public function query($SQL)
-    {
-        if ($this->getDebug()) {
+    final public function query($SQL)

+    {

+        if ($this->getDebug()) {

             $this->addQuery($SQL);
         }
 
@@ -229,11 +229,11 @@ 
      * @param $value
      * @return string|void
      */
-    final public function escape($value)
-    {
-        if (!is_scalar($value)) {
+    final public function escape($value)

+    {

+        if (!is_scalar($value)) {

             $value = '';
-        } else {
+        } else {

             $value = $this->modx->db->escape($value);
         }
 
@@ -246,10 +246,10 @@ 
      * @param bool $flag
      * @return $this
      */
-    final public function invokeEvent($name, $data = array(), $flag = false)
-    {
+    final public function invokeEvent($name, $data = array(), $flag = false)

+    {

         $flag = (isset($flag) && $flag != '') ? (bool)$flag : false;
-        if ($flag) {
+        if ($flag) {

             $this->modx->invokeEvent($name, $data);
         }
 
@@ -262,8 +262,8 @@ 
      * @param boolean $flag
      * @return array|bool
      */
-    final public function getInvokeEventResult($name, $data = array(), $flag = null)
-    {
+    final public function getInvokeEventResult($name, $data = array(), $flag = null)

+    {

         $flag = (isset($flag) && $flag != '') ? (bool)$flag : false;
 
         return $flag ? $this->modx->invokeEvent($name, $data) : false;
@@ -272,8 +272,8 @@ 
     /**
      * @return $this
      */
-    final public function clearLog()
-    {
+    final public function clearLog()

+    {

         $this->log = array();
 
         return $this;
@@ -282,8 +282,8 @@ 
     /**
      * @return array
      */
-    final public function getLog()
-    {
+    final public function getLog()

+    {

         return $this->log;
     }
 
@@ -291,10 +291,10 @@ 
      * @param bool $flush
      * @return $this
      */
-    final public function list_log($flush = false)
-    {
+    final public function list_log($flush = false)

+    {

         echo '<pre>' . print_r(APIHelpers::sanitarTag($this->log), true) . '</pre>';
-        if ($flush) {
+        if ($flush) {

             $this->clearLog();
         }
 
@@ -305,10 +305,10 @@ 
      * @param bool $full
      * @return string
      */
-    final public function getCachePath($full = true)
-    {
+    final public function getCachePath($full = true)

+    {

         $path = $this->modx->getCachePath();
-        if ($full) {
+        if ($full) {

             $path = MODX_BASE_PATH . substr($path, strlen(MODX_BASE_URL));
         }
 
@@ -319,10 +319,10 @@ 
      * @param null|boolean $fire_events
      * @param bool $custom
      */
-    final public function clearCache($fire_events = false, $custom = false)
-    {
+    final public function clearCache($fire_events = false, $custom = false)

+    {

         $IDs = array();
-        if ($custom === false) {
+        if ($custom === false) {

             $this->modx->clearCache();
             include_once(MODX_MANAGER_PATH . 'processors/cache_sync.class.processor.php');
             $sync = new synccache();
@@ -330,22 +330,22 @@ 
             $sync->setCachepath($path);
             $sync->setReport(false);
             $sync->emptyCache();
-        } else {
-            if (is_scalar($custom)) {
+        } else {

+            if (is_scalar($custom)) {

                 $custom = array($custom);
             }
-            switch ($this->modx->config['cache_type']) {
+            switch ($this->modx->config['cache_type']) {

                 case 2:
                     $cacheFile = "_*.pageCache.php";
                     break;
                 default:
                     $cacheFile = ".pageCache.php";
             }
-            if (is_array($custom)) {
-                foreach ($custom as $id) {
+            if (is_array($custom)) {

+                foreach ($custom as $id) {

                     $tmp = glob(MODX_BASE_PATH . "assets/cache/docid_" . $id . $cacheFile);
-                    foreach ($tmp as $file) {
-                        if (is_readable($file)) {
+                    foreach ($tmp as $file) {

+                        if (is_readable($file)) {

                             unlink($file);
                         }
                         $IDs[] = $id;
@@ -361,9 +361,9 @@ 
      * @param integer $id
      * @return MODxAPI
      */
-    public function switchObject($id)
-    {
-        switch (true) {
+    public function switchObject($id)

+    {

+        switch (true) {

             //Если загружен другой объект - не тот, с которым мы хотим временно поработать
             case ($this->getID() != $id && $id):
                 $obj = clone $this;
@@ -385,8 +385,8 @@ 
      * @param bool $flag
      * @return $this
      */
-    public function useIgnore($flag = true)
-    {
+    public function useIgnore($flag = true)

+    {

         $this->ignoreError = $flag ? 'IGNORE' : '';
 
         return $this;
@@ -395,8 +395,8 @@ 
     /**
      * @return bool
      */
-    public function hasIgnore()
-    {
+    public function hasIgnore()

+    {

         return (bool)$this->ignoreError;
     }
 
@@ -405,9 +405,9 @@ 
      * @param $value
      * @return $this
      */
-    public function set($key, $value)
-    {
-        if ((is_scalar($value) || $this->isJsonField($key)) && is_scalar($key) && !empty($key)) {
+    public function set($key, $value)

+    {

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

             $this->field[$key] = $value;
         }
 
@@ -417,8 +417,8 @@ 
     /**
      * @return null|int
      */
-    final public function getID()
-    {
+    final public function getID()

+    {

         return $this->id;
     }
 
@@ -426,8 +426,8 @@ 
      * @param $key
      * @return mixed
      */
-    public function get($key)
-    {
+    public function get($key)

+    {

         return APIHelpers::getkey($this->field, $key, null);
     }
 
@@ -435,10 +435,10 @@ 
      * @param $data
      * @return $this
      */
-    public function fromArray($data)
-    {
-        if (is_array($data)) {
-            foreach ($data as $key => $value) {
+    public function fromArray($data)

+    {

+        if (is_array($data)) {

+            foreach ($data as $key => $value) {

                 $this->set($key, $value);
             }
         }
@@ -452,22 +452,22 @@ 
      * @return $this
      * @throws Exception
      */
-    final protected function Uset($key, $id = '')
-    {
-        if (!isset($this->field[$key])) {
+    final protected function Uset($key, $id = '')

+    {

+        if (!isset($this->field[$key])) {

             $tmp = "`{$key}`=''";
             $this->log[] = "{$key} is empty";
-        } else {
-            if ($this->issetField($key) && is_scalar($this->field[$key])) {
+        } else {

+            if ($this->issetField($key) && is_scalar($this->field[$key])) {

                 $tmp = "`{$key}`='{$this->escape($this->field[$key])}'";
-            } else {
+            } else {

                 throw new Exception("{$key} is invalid <pre>" . print_r($this->field[$key], true) . "</pre>");
             }
         }
-        if (!empty($tmp)) {
-            if ($id == '') {
+        if (!empty($tmp)) {

+            if ($id == '') {

                 $this->set[] = $tmp;
-            } else {
+            } else {

                 $this->set[$id][] = $tmp;
             }
         }
@@ -482,23 +482,24 @@ 
      * @return array
      * @throws Exception
      */
-    final public function cleanIDs($IDs, $sep = ',', $ignore = array())
-    {
+    final public function cleanIDs($IDs, $sep = ',', $ignore = array())

+    {

         $out = array();
-        if (!is_array($IDs)) {
-            if (is_scalar($IDs)) {
+        if (!is_array($IDs)) {

+            if (is_scalar($IDs)) {

                 $IDs = explode($sep, $IDs);
-            } else {
+            } else {

                 $IDs = array();
                 throw new Exception('Invalid IDs list <pre>' . print_r($IDs, 1) . '</pre>');
             }
         }
-        foreach ($IDs as $item) {
+        foreach ($IDs as $item) {

             $item = trim($item);
-            if (is_scalar($item) && (int)$item >= 0) { //Fix 0xfffffffff
-                if (!empty($ignore) && in_array((int)$item, $ignore, true)) {
+            if (is_scalar($item) && (int)$item >= 0) {

+//Fix 0xfffffffff
+                if (!empty($ignore) && in_array((int)$item, $ignore, true)) {

                     $this->log[] = 'Ignore id ' . (int)$item;
-                } else {
+                } else {

                     $out[] = (int)$item;
                 }
             }
@@ -514,26 +515,26 @@ 
      * @return $this
      * @throws Exception
      */
-    final public function fromJson($data, $callback = null)
-    {
-        if (is_scalar($data) && !empty($data)) {
+    final public function fromJson($data, $callback = null)

+    {

+        if (is_scalar($data) && !empty($data)) {

             $json = json_decode($data);
-        } else {
+        } else {

             throw new Exception("json is not string with json data");
         }
 
-        if ($this->jsonError($json)) {
-            if (isset($callback) && is_callable($callback)) {
+        if ($this->jsonError($json)) {

+            if (isset($callback) && is_callable($callback)) {

                 call_user_func_array($callback, array($json));
-            } else {
-                if (isset($callback)) {
+            } else {

+                if (isset($callback)) {

                     throw new Exception("Can't call callback JSON unpack <pre>" . print_r($callback, 1) . "</pre>");
                 }
-                foreach ($json as $key => $val) {
+                foreach ($json as $key => $val) {

                     $this->set($key, $val);
                 }
             }
-        } else {
+        } else {

             throw new Exception('Error from JSON decode: <pre>' . print_r($data, 1) . '</pre>');
         }
 
@@ -545,19 +546,19 @@ 
      * @return string
      * @throws Exception
      */
-    final public function toJson($callback = null)
-    {
+    final public function toJson($callback = null)

+    {

         $data = $this->toArray();
-        if (isset($callback) && is_callable($callback)) {
+        if (isset($callback) && is_callable($callback)) {

             $data = call_user_func_array($callback, array($data));
-        } else {
-            if (isset($callback)) {
+        } else {

+            if (isset($callback)) {

                 throw new Exception("Can't call callback JSON pre pack <pre>" . print_r($callback, 1) . "</pre>");
             }
         }
         $json = json_encode($data);
 
-        if ($this->jsonError($data)) {
+        if ($this->jsonError($data)) {

             throw new Exception('Error from JSON decode: <pre>' . print_r($data, 1) . '</pre>');
         }
 
@@ -568,10 +569,10 @@ 
      * @param $data
      * @return bool
      */
-    final protected function jsonError($data)
-    {
+    final protected function jsonError($data)

+    {

         $flag = false;
-        if (json_last_error() === JSON_ERROR_NONE && is_object($data) && $data instanceof stdClass) {
+        if (json_last_error() === JSON_ERROR_NONE && is_object($data) && $data instanceof stdClass) {

             $flag = true;
         }
 
@@ -584,25 +585,25 @@ 
      * @param string $sep
      * @return array
      */
-    public function toArray($prefix = '', $suffix = '', $sep = '_')
-    {
+    public function toArray($prefix = '', $suffix = '', $sep = '_')

+    {

         $tpl = '';
         $plh = '[+key+]';
-        if ($prefix !== '') {
+        if ($prefix !== '') {

             $tpl = $prefix . $sep;
         }
         $tpl .= $plh;
-        if ($suffix !== '') {
+        if ($suffix !== '') {

             $tpl .= $sep . $suffix;
         }
         $out = array();
         $fields = $this->field;
         $fields[$this->fieldPKName()] = $this->getID();
-        if ($tpl != $plh) {
-            foreach ($fields as $key => $value) {
+        if ($tpl != $plh) {

+            foreach ($fields as $key => $value) {

                 $out[str_replace($plh, $key, $tpl)] = $value;
             }
-        } else {
+        } else {

             $out = $fields;
         }
 
@@ -612,8 +613,8 @@ 
     /**
      * @return string
      */
-    final public function fieldPKName()
-    {
+    final public function fieldPKName()

+    {

         return $this->pkName;
     }
 
@@ -621,8 +622,8 @@ 
      * @param $table
      * @return mixed|string
      */
-    final public function makeTable($table)
-    {
+    final public function makeTable($table)

+    {

         //Без использования APIHelpers::getkey(). Иначе getFullTableName будет всегда выполняться
         return (isset($this->_table[$table])) ? $this->_table[$table] : $this->modx->getFullTableName($table);
     }
@@ -632,14 +633,14 @@ 
      * @param string $sep
      * @return array|string
      */
-    final public function sanitarIn($data, $sep = ',')
-    {
-        if (!is_array($data)) {
+    final public function sanitarIn($data, $sep = ',')

+    {

+        if (!is_array($data)) {

             $data = explode($sep, $data);
         }
         $out = array();
-        foreach ($data as $item) {
-            if ($item !== '') {
+        foreach ($data as $item) {

+            if ($item !== '') {

                 $out[] = $this->escape($item);
             }
         }
@@ -654,34 +655,34 @@ 
      * @param string $PK
      * @return bool
      */
-    public function checkUnique($table, $field, $PK = 'id')
-    {
-        if (is_array($field)) {
+    public function checkUnique($table, $field, $PK = 'id')

+    {

+        if (is_array($field)) {

             $where = array();
-            foreach ($field as $_field) {
+            foreach ($field as $_field) {

                 $val = $this->get($_field);
-                if ($val != '') {
+                if ($val != '') {

                     $where[] = "`" . $this->escape($_field) . "` = '" . $this->escape($val) . "'";
                 }
             }
             $where = implode(' AND ', $where);
-        } else {
+        } else {

             $where = '';
             $val = $this->get($field);
-            if ($val != '') {
+            if ($val != '') {

                 $where = "`" . $this->escape($field) . "` = '" . $this->escape($val) . "'";
             }
         }
 
-        if ($where != '') {
+        if ($where != '') {

             $sql = $this->query("SELECT `" . $this->escape($PK) . "` FROM " . $this->makeTable($table) . " WHERE " . $where);
             $id = $this->modx->db->getValue($sql);
-            if (is_null($id) || (!$this->newDoc && $id == $this->getID())) {
+            if (is_null($id) || (!$this->newDoc && $id == $this->getID())) {

                 $flag = true;
-            } else {
+            } else {

                 $flag = false;
             }
-        } else {
+        } else {

             $flag = false;
         }
 
@@ -692,8 +693,8 @@ 
      * @param array $data
      * @return $this
      */
-    public function create($data = array())
-    {
+    public function create($data = array())

+    {

         $this->close();
         $this->fromArray($data);
 
@@ -704,8 +705,8 @@ 
      * @param $id
      * @return $this
      */
-    public function copy($id)
-    {
+    public function copy($id)

+    {

         $this->edit($id)->id = 0;
         $this->newDoc = true;
 
@@ -715,8 +716,8 @@ 
     /**
      *
      */
-    public function close()
-    {
+    public function close()

+    {

         $this->newDoc = true;
         $this->id = null;
         $this->field = array();
@@ -728,8 +729,8 @@ 
      * @param $key
      * @return bool
      */
-    public function issetField($key)
-    {
+    public function issetField($key)

+    {

         return (is_scalar($key) && array_key_exists($key, $this->default_field));
     }
 
@@ -757,8 +758,8 @@ 
      * @param $data
      * @return array|mixed|string
      */
-    final public function sanitarTag($data)
-    {
+    final public function sanitarTag($data)

+    {

         return parent::sanitarTag($this->modx->stripTags($data));
     }
 
@@ -767,17 +768,17 @@ 
      * @param bool $dmi3yy
      * @return bool
      */
-    final protected function checkVersion($version, $dmi3yy = true)
-    {
+    final protected function checkVersion($version, $dmi3yy = true)

+    {

         $flag = false;
         $currentVer = $this->modx->getVersionData('version');
-        if (is_array($currentVer)) {
+        if (is_array($currentVer)) {

             $currentVer = APIHelpers::getkey($currentVer, 'version', '');
         }
         $tmp = substr($currentVer, 0, strlen($version));
-        if (version_compare($tmp, $version, '>=')) {
+        if (version_compare($tmp, $version, '>=')) {

             $flag = true;
-            if ($dmi3yy) {
+            if ($dmi3yy) {

                 $flag = (boolean)preg_match('/^' . $tmp . '(.*)\-d/', $currentVer);
             }
         }
@@ -789,10 +790,10 @@ 
      * @param string $name
      * @return bool|mixed
      */
-    protected function eraseField($name)
-    {
+    protected function eraseField($name)

+    {

         $flag = false;
-        if (array_key_exists($name, $this->field)) {
+        if (array_key_exists($name, $this->field)) {

             $flag = $this->field[$name];
             unset($this->field[$name]);
         }
@@ -805,8 +806,8 @@ 
      * @param  string $field имя поля
      * @return boolean
      */
-    public function isJsonField($field)
-    {
+    public function isJsonField($field)

+    {

         return (is_scalar($field) && in_array($field, $this->jsonFields));
     }
 
@@ -815,9 +816,9 @@ 
      * @param  string $field имя поля
      * @return $this
      */
-    public function markAsDecode($field)
-    {
-        if (is_scalar($field)) {
+    public function markAsDecode($field)

+    {

+        if (is_scalar($field)) {

             $this->_decodedFields->set($field, false);
         }
 
@@ -829,9 +830,9 @@ 
      * @param  string $field имя поля
      * @return $this
      */
-    public function markAsEncode($field)
-    {
-        if (is_scalar($field)) {
+    public function markAsEncode($field)

+    {

+        if (is_scalar($field)) {

             $this->_decodedFields->set($field, true);
         }
 
@@ -842,10 +843,10 @@ 
      * Пометить все поля как запакованные
      * @return $this
      */
-    public function markAllEncode()
-    {
+    public function markAllEncode()

+    {

         $this->_decodedFields->clear();
-        foreach ($this->jsonFields as $field) {
+        foreach ($this->jsonFields as $field) {

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

+    {

         $this->_decodedFields->clear();
-        foreach ($this->jsonFields as $field) {
+        foreach ($this->jsonFields as $field) {

             $this->markAsDecode($field);
         }
 
@@ -870,9 +871,9 @@ 
      * Получить список не запакованных полей
      * @return DLCollection
      */
-    public function getNoEncodeFields()
-    {
-        return $this->_decodedFields->filter(function ($value) {
+    public function getNoEncodeFields()

+    {

+        return $this->_decodedFields->filter(function ($value) {

             return ($value === false);
         });
     }
@@ -881,9 +882,9 @@ 
      * Получить список не распакованных полей
      * @return DLCollection
      */
-    public function getNoDecodeFields()
-    {
-        return $this->_decodedFields->filter(function ($value) {
+    public function getNoDecodeFields()

+    {

+        return $this->_decodedFields->filter(function ($value) {

             return ($value === true);
         });
     }
@@ -893,8 +894,8 @@ 
      * @param  string $field имя поля
      * @return boolean
      */
-    public function isDecodableField($field)
-    {
+    public function isDecodableField($field)

+    {

         $data = $this->get($field);
 
         /**
@@ -909,8 +910,8 @@ 
      * @param  string $field имя поля
      * @return boolean
      */
-    public function isEncodableField($field)
-    {
+    public function isEncodableField($field)

+    {

         /**
          * Если поле было распаковано ранее и еще не упаковано
          */
@@ -923,14 +924,14 @@ 
      * @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);
             $out = jsonHelper::jsonDecode($data, array('assoc' => true), true);
         }
-        if ($store) {
+        if ($store) {

             $this->field[$field] = $out;
             $this->markAsDecode($field);
         }
@@ -942,9 +943,9 @@ 
      * Декодирование всех json полей
      * @return $this
      */
-    protected function decodeFields()
-    {
-        foreach ($this->getNoDecodeFields() as $field => $flag) {
+    protected function decodeFields()

+    {

+        foreach ($this->getNoDecodeFields() as $field => $flag) {

             $this->decodeField($field, true);
         }
 
@@ -957,14 +958,14 @@ 
      * @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);
             $out = json_encode($data);
         }
-        if ($store) {
+        if ($store) {

             $this->field[$field] = $out;
             $this->markAsEncode($field);
         }
@@ -976,9 +977,9 @@ 
      * Запаковка всех json полей
      * @return $this
      */
-    protected function encodeFields()
-    {
-        foreach ($this->getNoEncodeFields() as $field => $flag) {
+    protected function encodeFields()

+    {

+        foreach ($this->getNoEncodeFields() as $field => $flag) {

             $this->encodeField($field, true);
         }
 

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

Spacing +7 added lines, -7 removed lines

@@ -88,7 +88,7 @@ 
                 'format' => $format,
                 'start'  => microtime(true) - $this->DocLister->getTimeStart()
             );
-            if (is_scalar($key) && !empty($key)) {
+            if (is_scalar($key) && ! empty($key)) {
                 $data['time'] = microtime(true);
                 $this->_calcLog[$key] = $data;
             } else {
@@ -104,9 +104,9 @@ 
      */
     public function updateMessage($message, $key, $format = null)
     {
-        if (is_scalar($key) && !empty($key) && isset($this->_calcLog[$key])) {
+        if (is_scalar($key) && ! empty($key) && isset($this->_calcLog[$key])) {
             $this->_calcLog[$key]['msg'] = $message;
-            if (!is_null($format)) {
+            if ( ! is_null($format)) {
                 $this->_calcLog[$key]['format'] = $format;
             }
         }
@@ -165,7 +165,7 @@ 
      */
     private function _sendLogEvent($type, $message, $title = '')
     {
-        $title = "DocLister" . (!empty($title) ? ' - ' . $title : '');
+        $title = "DocLister" . ( ! empty($title) ? ' - ' . $title : '');
         $this->modx->logEvent(0, $type, $message, $title);
     }
 
@@ -203,7 +203,7 @@ 
                                 $msg = $this->dumpData($msg);
                                 break;
                         }
-                        if (!empty($title) && !is_numeric($title)) {
+                        if ( ! empty($title) && ! is_numeric($title)) {
                             $message .= $this->DocLister->parseChunk('@CODE:<strong>[+title+]</strong>: [+msg+]<br />',
                                 compact('msg', 'title'));
                         } else {
@@ -222,7 +222,7 @@ 
                     </li>';
                 $out .= $this->DocLister->parseChunk("@CODE: " . $tpl, $item);
             }
-            if (!empty($out)) {
+            if ( ! empty($out)) {
                 $out = $this->DocLister->parseChunk("@CODE:
                 <style>.dlDebug{
                     background: #eee !important;
@@ -279,7 +279,7 @@ 
     public function dumpData($data, $wrap = '', $charset = 'UTF-8')
     {
         $out = $this->DocLister->sanitarData(print_r($data, 1), $charset);
-        if (!empty($wrap) && is_string($wrap)) {
+        if ( ! empty($wrap) && is_string($wrap)) {
             $out = "<{$wrap}>{$out}</{$wrap}>";
         }
 

Braces +47 added lines, -47 removed lines

@@ -5,8 +5,8 @@ 
 /**
  * Class DLdebug
  */
-class DLdebug
-{
+class DLdebug

+{

     /**
      * @var array
      */
@@ -35,9 +35,9 @@ 
      * DLdebug constructor.
      * @param $DocLister
      */
-    public function __construct($DocLister)
-    {
-        if ($DocLister instanceof DocLister) {
+    public function __construct($DocLister)

+    {

+        if ($DocLister instanceof DocLister) {

             $this->DocLister = $DocLister;
             $this->modx = $this->DocLister->getMODX();
         }
@@ -47,16 +47,16 @@ 
     /**
      * @return array
      */
-    public function getLog()
-    {
+    public function getLog()

+    {

         return $this->_log;
     }
 
     /**
      * @return $this
      */
-    public function clearLog()
-    {
+    public function clearLog()

+    {

         $this->_log = array();
 
         return $this;
@@ -65,8 +65,8 @@ 
     /**
      * @return int
      */
-    public function countLog()
-    {
+    public function countLog()

+    {

         return count($this->_log);
     }
 
@@ -79,19 +79,19 @@ 
      * @param int $mode
      * @param bool $format
      */
-    public function debug($message, $key = null, $mode = 0, $format = false)
-    {
+    public function debug($message, $key = null, $mode = 0, $format = false)

+    {

         $mode = (int)$mode;
-        if ($mode > 0 && $this->DocLister->getDebug() >= $mode) {
+        if ($mode > 0 && $this->DocLister->getDebug() >= $mode) {

             $data = array(
                 'msg'    => $message,
                 'format' => $format,
                 'start'  => microtime(true) - $this->DocLister->getTimeStart()
             );
-            if (is_scalar($key) && !empty($key)) {
+            if (is_scalar($key) && !empty($key)) {

                 $data['time'] = microtime(true);
                 $this->_calcLog[$key] = $data;
-            } else {
+            } else {

                 $this->_log[$this->countLog()] = $data;
             }
         }
@@ -102,11 +102,11 @@ 
      * @param $key
      * @param null $format
      */
-    public function updateMessage($message, $key, $format = null)
-    {
-        if (is_scalar($key) && !empty($key) && isset($this->_calcLog[$key])) {
+    public function updateMessage($message, $key, $format = null)

+    {

+        if (is_scalar($key) && !empty($key) && isset($this->_calcLog[$key])) {

             $this->_calcLog[$key]['msg'] = $message;
-            if (!is_null($format)) {
+            if (!is_null($format)) {

                 $this->_calcLog[$key]['format'] = $format;
             }
         }
@@ -117,9 +117,9 @@ 
      * @param null $msg
      * @param null $format
      */
-    public function debugEnd($key, $msg = null, $format = null)
-    {
-        if (is_scalar($key) && isset($this->_calcLog[$key], $this->_calcLog[$key]['time']) && $this->DocLister->getDebug() > 0) {
+    public function debugEnd($key, $msg = null, $format = null)

+    {

+        if (is_scalar($key) && isset($this->_calcLog[$key], $this->_calcLog[$key]['time']) && $this->DocLister->getDebug() > 0) {

             $this->_log[$this->countLog()] = array(
                 'msg'    => isset($msg) ? $msg : $this->_calcLog[$key]['msg'],
                 'start'  => $this->_calcLog[$key]['start'],
@@ -135,8 +135,8 @@ 
      * @param $message
      * @param string $title
      */
-    public function info($message, $title = '')
-    {
+    public function info($message, $title = '')

+    {

         $this->_sendLogEvent(1, $message, $title);
     }
 
@@ -144,8 +144,8 @@ 
      * @param $message
      * @param string $title
      */
-    public function warning($message, $title = '')
-    {
+    public function warning($message, $title = '')

+    {

         $this->_sendLogEvent(2, $message, $title);
     }
 
@@ -153,8 +153,8 @@ 
      * @param $message
      * @param string $title
      */
-    public function error($message, $title = '')
-    {
+    public function error($message, $title = '')

+    {

         $this->_sendLogEvent(3, $message, $title);
     }
 
@@ -163,8 +163,8 @@ 
      * @param $message
      * @param string $title
      */
-    private function _sendLogEvent($type, $message, $title = '')
-    {
+    private function _sendLogEvent($type, $message, $title = '')

+    {

         $title = "DocLister" . (!empty($title) ? ' - ' . $title : '');
         $this->modx->logEvent(0, $type, $message, $title);
     }
@@ -172,26 +172,26 @@ 
     /**
      * @return string
      */
-    public function showLog()
-    {
+    public function showLog()

+    {

         $out = "";
-        if ($this->DocLister->getDebug() > 0 && is_array($this->_log)) {
-            foreach ($this->_log as $item) {
+        if ($this->DocLister->getDebug() > 0 && is_array($this->_log)) {

+            foreach ($this->_log as $item) {

                 $item['time'] = isset($item['time']) ? round(floatval($item['time']), 5) : 0;
                 $item['start'] = isset($item['start']) ? round(floatval($item['start']), 5) : 0;
 
-                if (isset($item['msg'])) {
-                    if (is_scalar($item['msg'])) {
+                if (isset($item['msg'])) {

+                    if (is_scalar($item['msg'])) {

                         $item['msg'] = array($item['msg']);
                     }
-                    if (is_scalar($item['format'])) {
+                    if (is_scalar($item['format'])) {

                         $item['format'] = array($item['format']);
                     }
                     $message = '';
                     $i = 0;
-                    foreach ($item['msg'] as $title => $msg) {
+                    foreach ($item['msg'] as $title => $msg) {

                         $format = isset($item['format'][$i]) ? $item['format'][$i] : null;
-                        switch ($format) {
+                        switch ($format) {

                             case 'sql':
                                 $msg = $this->dumpData(Formatter\SqlFormatter::format($msg), '', null);
                                 break;
@@ -203,16 +203,16 @@ 
                                 $msg = $this->dumpData($msg);
                                 break;
                         }
-                        if (!empty($title) && !is_numeric($title)) {
+                        if (!empty($title) && !is_numeric($title)) {

                             $message .= $this->DocLister->parseChunk('@CODE:<strong>[+title+]</strong>: [+msg+]<br />',
                                 compact('msg', 'title'));
-                        } else {
+                        } else {

                             $message .= $msg;
                         }
                         $i++;
                     }
                     $item['msg'] = $message;
-                } else {
+                } else {

                     $item['msg'] = '';
                 }
 
@@ -222,7 +222,7 @@ 
                     </li>';
                 $out .= $this->DocLister->parseChunk("@CODE: " . $tpl, $item);
             }
-            if (!empty($out)) {
+            if (!empty($out)) {

                 $out = $this->DocLister->parseChunk("@CODE:
                 <style>.dlDebug{
                     background: #eee !important;
@@ -276,10 +276,10 @@ 
      * @param string $charset
      * @return string
      */
-    public function dumpData($data, $wrap = '', $charset = 'UTF-8')
-    {
+    public function dumpData($data, $wrap = '', $charset = 'UTF-8')

+    {

         $out = $this->DocLister->sanitarData(print_r($data, 1), $charset);
-        if (!empty($wrap) && is_string($wrap)) {
+        if (!empty($wrap) && is_string($wrap)) {

             $out = "<{$wrap}>{$out}</{$wrap}>";
         }
 

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

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php

-if (!defined('MODX_BASE_PATH')) {

+if ( ! defined('MODX_BASE_PATH')) {

     die('HACK???');

 }

 

Braces +2 added lines, -1 removed lines

@@ -111,7 +111,8 @@
     {

         $out = false;

         if (preg_match("/^\((.*)\)$/iu", $data, $data) && isset($data[1]) && $data[1] != '') {

-            if ($data[1] == "*") { //Юзать если нужны массивы в суппер-глабальных массивах

+            if ($data[1] == "*") {

+//Юзать если нужны массивы в суппер-глабальных массивах

                 /**

                  * Но в таком случае в $this->param попадут все!!! элементы массива, которые были переданы

                  *

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

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('MODX_BASE_PATH')) {
+if ( ! defined('MODX_BASE_PATH')) {
     die('HACK???');
 }
 
@@ -213,7 +213,7 @@ 
                 $where[] = "`{$this->getPK()}` IN ({$sanitarInIDs})";
             }
 
-            if (!empty($where)) {
+            if ( ! empty($where)) {
                 $where = "WHERE " . implode(" AND ", $where);
             }
             $limit = $this->LimitSQL($this->getCFGDef('queryLimit', 0));
@@ -241,7 +241,7 @@ 
 
         $tmpWhere = $this->getCFGDef('addWhereList', '');
         $tmpWhere = sqlHelper::trimLogicalOp($tmpWhere);
-        if (!empty($tmpWhere)) {
+        if ( ! empty($tmpWhere)) {
             $where[] = $tmpWhere;
         }
         $sanitarInIDs = $this->sanitarIn($this->IDs);
@@ -270,10 +270,10 @@ 
                 $tmpWhere = "((" . $tmpWhere . ") OR {$this->getPK()} IN({$addDocs}))";
             }
         }
-        if (!empty($tmpWhere)) {
+        if ( ! empty($tmpWhere)) {
             $where[] = $tmpWhere;
         }
-        if (!empty($where)) {
+        if ( ! empty($where)) {
             $where = "WHERE " . implode(" AND ", $where);
         } else {
             $where = '';
@@ -338,7 +338,7 @@ 
                     }
                 }
             }
-            if (!empty($where)) {
+            if ( ! empty($where)) {
                 $where = "WHERE " . implode(" AND ", $where);
             } else {
                 $where = '';
@@ -363,7 +363,7 @@ 
 
         $tmp = $this->getCFGDef('addWhereFolder', '');
         $where = "`{$this->getParentField()}` IN ({$sanitarInIDs})";
-        if (!empty($tmp)) {
+        if ( ! empty($tmp)) {
             $where .= " AND " . $tmp;
         }
 

Braces +67 added lines, -67 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('MODX_BASE_PATH')) {
+if (!defined('MODX_BASE_PATH')) {

     die('HACK???');
 }
 
@@ -14,8 +14,8 @@ 
  * @param contentField =`description` //content
  * @param table =`` //table name
  */
-class onetableDocLister extends DocLister
-{
+class onetableDocLister extends DocLister

+{

     /**
      * @var string
      */
@@ -34,11 +34,11 @@ 
     /**
      * @absctract
      */
-    public function getDocs($tvlist = '')
-    {
-        if ($this->checkExtender('paginate')) {
+    public function getDocs($tvlist = '')

+    {

+        if ($this->checkExtender('paginate')) {

             $this->extender['paginate']->init($this);
-        } else {
+        } else {

             $this->setConfig(array('start' => 0));
         }
         $type = $this->getCFGDef('idType', 'parents');
@@ -51,25 +51,25 @@ 
      * @param string $tpl
      * @return string
      */
-    public function _render($tpl = '')
-    {
+    public function _render($tpl = '')

+    {

         $out = '';
-        if ($tpl == '') {
+        if ($tpl == '') {

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

             $this->toPlaceholders(count($this->_docs), 1, "display"); // [+display+] - сколько показано на странице.
 
             $i = 1;
             $sysPlh = $this->renameKeyArr($this->_plh, $this->getCFGDef("sysKey", "dl"));
             $noneTPL = $this->getCFGDef("noneTPL", "");
-            if (count($this->_docs) == 0 && $noneTPL != '') {
+            if (count($this->_docs) == 0 && $noneTPL != '') {

                 $out = $this->parseChunk($noneTPL, $sysPlh);
-            } else {
+            } else {

                 /**
                  * @var $extUser user_DL_Extender
                  */
-                if ($extUser = $this->getExtender('user')) {
+                if ($extUser = $this->getExtender('user')) {

                     $extUser->init($this, array('fields' => $this->getCFGDef("userFields", "")));
                 }
 
@@ -83,9 +83,9 @@ 
                  */
                 $extPrepare = $this->getExtender('prepare');
                 $this->skippedDocs = 0;
-                foreach ($this->_docs as $item) {
+                foreach ($this->_docs as $item) {

                     $this->renderTPL = $tpl;
-                    if ($extUser) {
+                    if ($extUser) {

                         $item = $extUser->setUserData($item); //[+user.id.createdby+], [+user.fullname.publishedby+], [+dl.user.publishedby+]....
                     }
 
@@ -99,7 +99,7 @@ 
 
                     $date = $this->getCFGDef('dateSource', 'pub_date');
                     $date = isset($item[$date]) ? $item[$date] + $this->modx->config['server_offset_time'] : '';
-                    if ($date != '' && $this->getCFGDef('dateFormat', '%d.%b.%y %H:%M') != '') {
+                    if ($date != '' && $this->getCFGDef('dateFormat', '%d.%b.%y %H:%M') != '') {

                         $item[$this->getCFGDef("sysKey", "dl") . '.date'] = strftime($this->getCFGDef('dateFormat',
                             '%d.%b.%y %H:%M'), $date);
                     }
@@ -107,22 +107,22 @@ 
                     $findTpl = $this->renderTPL;
                     $tmp = $this->uniformPrepare($item, $i);
                     extract($tmp, EXTR_SKIP);
-                    if ($this->renderTPL == '') {
+                    if ($this->renderTPL == '') {

                         $this->renderTPL = $findTpl;
                     }
 
-                    if ($extPrepare) {
+                    if ($extPrepare) {

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

                             $this->skippedDocs++;
                             continue;
                         }
                     }
                     $tmp = $this->parseChunk($this->renderTPL, $item);
-                    if ($this->getCFGDef('contentPlaceholder', 0) !== 0) {
+                    if ($this->getCFGDef('contentPlaceholder', 0) !== 0) {

                         $this->toPlaceholders($tmp, 1,
                             "item[" . $i . "]"); // [+item[x]+] – individual placeholder for each iteration documents on this page
                     }
@@ -131,7 +131,7 @@ 
                 }
             }
             $out = $this->renderWrap($out);
-        } else {
+        } else {

             $out = 'none TPL';
         }
 
@@ -144,8 +144,8 @@ 
      * @param array $array
      * @return string
      */
-    public function getJSON($data, $fields, $array = array())
-    {
+    public function getJSON($data, $fields, $array = array())

+    {

         $out = array();
         $fields = is_array($fields) ? $fields : explode(",", $fields);
         $date = $this->getCFGDef('dateSource', 'pub_date');
@@ -165,10 +165,10 @@ 
          */
         $extE = $this->getExtender('e', true, true);
 
-        foreach ($data as $num => $item) {
+        foreach ($data as $num => $item) {

             $row = $item;
 
-            switch (true) {
+            switch (true) {

                 case ((array('1') == $fields || in_array('summary', $fields)) && $extSummary):
                     $row['summary'] = $this->getSummary($this->_docs[$num], $extSummary, 'introtext');
                 //without break
@@ -179,15 +179,15 @@ 
                 // no break
             }
 
-            if ($extE && $tmp = $extE->init($this, array('data' => $row))) {
-                if (is_array($tmp)) {
+            if ($extE && $tmp = $extE->init($this, array('data' => $row))) {

+                if (is_array($tmp)) {

                     $row = $tmp;
                 }
             }
 
-            if ($extPrepare) {
+            if ($extPrepare) {

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

                     continue;
                 }
             }
@@ -200,20 +200,20 @@ 
     /**
      * @return array
      */
-    protected function getDocList()
-    {
+    protected function getDocList()

+    {

         $out = array();
         $sanitarInIDs = $this->sanitarIn($this->IDs);
-        if ($sanitarInIDs != "''" || $this->getCFGDef('ignoreEmpty', '0')) {
+        if ($sanitarInIDs != "''" || $this->getCFGDef('ignoreEmpty', '0')) {

             $where = $this->getCFGDef('addWhereList', '');
-            if ($where != '') {
+            if ($where != '') {

                 $where = array($where);
             }
-            if ($sanitarInIDs != "''") {
+            if ($sanitarInIDs != "''") {

                 $where[] = "`{$this->getPK()}` IN ({$sanitarInIDs})";
             }
 
-            if (!empty($where)) {
+            if (!empty($where)) {

                 $where = "WHERE " . implode(" AND ", $where);
             }
             $limit = $this->LimitSQL($this->getCFGDef('queryLimit', 0));
@@ -223,7 +223,7 @@ 
 
             $rows = $this->modx->db->makeArray($rs);
             $out = array();
-            foreach ($rows as $item) {
+            foreach ($rows as $item) {

                 $out[$item[$this->getPK()]] = $item;
             }
         }
@@ -234,22 +234,22 @@ 
     /**
      * @return array
      */
-    protected function getChildrenList()
-    {
+    protected function getChildrenList()

+    {

         $where = array();
         $out = array();
 
         $tmpWhere = $this->getCFGDef('addWhereList', '');
         $tmpWhere = sqlHelper::trimLogicalOp($tmpWhere);
-        if (!empty($tmpWhere)) {
+        if (!empty($tmpWhere)) {

             $where[] = $tmpWhere;
         }
         $sanitarInIDs = $this->sanitarIn($this->IDs);
 
         $tmpWhere = null;
-        if ($sanitarInIDs != "''") {
+        if ($sanitarInIDs != "''") {

             $tmpWhere = "(`{$this->getParentField()}` IN (" . $sanitarInIDs . ")";
-            switch ($this->getCFGDef('showParent', '0')) {
+            switch ($this->getCFGDef('showParent', '0')) {

                 case -1:
                     $tmpWhere .= ")";
                     break;
@@ -262,32 +262,32 @@ 
                     break;
             }
         }
-        if (($addDocs = $this->getCFGDef('documents', '')) != '') {
+        if (($addDocs = $this->getCFGDef('documents', '')) != '') {

             $addDocs = $this->sanitarIn($this->cleanIDs($addDocs));
-            if (empty($tmpWhere)) {
+            if (empty($tmpWhere)) {

                 $tmpWhere = $this->getPK() . " IN({$addDocs})";
-            } else {
+            } else {

                 $tmpWhere = "((" . $tmpWhere . ") OR {$this->getPK()} IN({$addDocs}))";
             }
         }
-        if (!empty($tmpWhere)) {
+        if (!empty($tmpWhere)) {

             $where[] = $tmpWhere;
         }
-        if (!empty($where)) {
+        if (!empty($where)) {

             $where = "WHERE " . implode(" AND ", $where);
-        } else {
+        } else {

             $where = '';
         }
         $fields = $this->getCFGDef('selectFields', '*');
         $group = $this->getGroupSQL($this->getCFGDef('groupBy', "`{$this->getPK()}`"));
-        if ($sanitarInIDs != "''" || $this->getCFGDef('ignoreEmpty', '0')) {
+        if ($sanitarInIDs != "''" || $this->getCFGDef('ignoreEmpty', '0')) {

             $sql = $this->dbQuery("SELECT {$fields} FROM " . $this->table . " " . $where . " " .
                 $group . " " .
                 $this->SortOrderSQL($this->getPK()) . " " .
                 $this->LimitSQL($this->getCFGDef('queryLimit', 0))
             );
             $rows = $this->modx->db->makeArray($sql);
-            foreach ($rows as $item) {
+            foreach ($rows as $item) {

                 $out[$item[$this->getPK()]] = $item;
             }
         }
@@ -298,22 +298,22 @@ 
     /**
      * @absctract
      */
-    public function getChildrenCount()
-    {
+    public function getChildrenCount()

+    {

         $out = 0;
         $sanitarInIDs = $this->sanitarIn($this->IDs);
-        if ($sanitarInIDs != "''" || $this->getCFGDef('ignoreEmpty', '0')) {
+        if ($sanitarInIDs != "''" || $this->getCFGDef('ignoreEmpty', '0')) {

             $where = $this->getCFGDef('addWhereList', '');
-            if ($where != '') {
+            if ($where != '') {

                 $where = array($where);
-            } else {
+            } else {

                 $where = array();
             }
-            if ($sanitarInIDs != "''") {
-                if ($sanitarInIDs != "''") {
-                    switch ($this->getCFGDef('idType', 'parents')) {
+            if ($sanitarInIDs != "''") {

+                if ($sanitarInIDs != "''") {

+                    switch ($this->getCFGDef('idType', 'parents')) {

                         case 'parents':
-                            switch ($this->getCFGDef('showParent', '0')) {
+                            switch ($this->getCFGDef('showParent', '0')) {

                                 case '-1':
                                     $tmpWhere = "`{$this->getParentField()}` IN ({$sanitarInIDs})";
                                     break;
@@ -325,10 +325,10 @@ 
                                     $tmpWhere = "(`{$this->getParentField()}` IN ({$sanitarInIDs}) OR `{$this->getPK()}` IN({$sanitarInIDs}))";
                                     break;
                             }
-                            if (($addDocs = $this->getCFGDef('documents', '')) != '') {
+                            if (($addDocs = $this->getCFGDef('documents', '')) != '') {

                                 $addDocs = $this->sanitarIn($this->cleanIDs($addDocs));
                                 $where[] = "((" . $tmpWhere . ") OR `{$this->getPK()}` IN({$addDocs}))";
-                            } else {
+                            } else {

                                 $where[] = $tmpWhere;
                             }
                             break;
@@ -338,9 +338,9 @@ 
                     }
                 }
             }
-            if (!empty($where)) {
+            if (!empty($where)) {

                 $where = "WHERE " . implode(" AND ", $where);
-            } else {
+            } else {

                 $where = '';
             }
 
@@ -357,13 +357,13 @@ 
      * @param string $id
      * @return array
      */
-    public function getChildrenFolder($id)
-    {
+    public function getChildrenFolder($id)

+    {

         $sanitarInIDs = $this->sanitarIn($id);
 
         $tmp = $this->getCFGDef('addWhereFolder', '');
         $where = "`{$this->getParentField()}` IN ({$sanitarInIDs})";
-        if (!empty($tmp)) {
+        if (!empty($tmp)) {

             $where .= " AND " . $tmp;
         }
 
@@ -371,7 +371,7 @@ 
 
         $rows = $this->modx->db->makeArray($rs);
         $out = array();
-        foreach ($rows as $item) {
+        foreach ($rows as $item) {

             $out[] = $item[$this->getPK()];
         }
 

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

@@ -219,7 +219,7 @@ 
             $limit = $this->LimitSQL($this->getCFGDef('queryLimit', 0));
             $fields = $this->getCFGDef('selectFields', '*');
             $group = $this->getGroupSQL($this->getCFGDef('groupBy', ''));
-            $rs = $this->dbQuery("SELECT {$fields} FROM {$this->table} {$where} {$group} {$this->SortOrderSQL($this->getPK())} {$limit}");
+            $rs = $this->dbQuery("select {$fields} FROM {$this->table} {$where} {$group} {$this->SortOrderSQL($this->getPK())} {$limit}");
 
             $rows = $this->modx->db->makeArray($rs);
             $out = array();
@@ -281,7 +281,7 @@ 
         $fields = $this->getCFGDef('selectFields', '*');
         $group = $this->getGroupSQL($this->getCFGDef('groupBy', "`{$this->getPK()}`"));
         if ($sanitarInIDs != "''" || $this->getCFGDef('ignoreEmpty', '0')) {
-            $sql = $this->dbQuery("SELECT {$fields} FROM " . $this->table . " " . $where . " " .
+            $sql = $this->dbQuery("select {$fields} FROM " . $this->table . " " . $where . " " .
                 $group . " " .
                 $this->SortOrderSQL($this->getPK()) . " " .
                 $this->LimitSQL($this->getCFGDef('queryLimit', 0))

assets/lib/Module/Action.php

Spacing +4 added lines, -4 removed lines

@@ -74,7 +74,7 @@ 
      */
     public static function listValue()
     {
-        $out = self::_workValue(function ($data, $modObj) {
+        $out = self::_workValue(function($data, $modObj) {
             $listFunction = $data['key'] . 'Lists';
             $out = method_exists($modObj, $listFunction) ? $modObj->$listFunction() : array();
             $out['selected'] = $modObj->get($data['key']);
@@ -95,7 +95,7 @@ 
         self::$TPL = 'ajax/getValue';
         $data = Helper::jeditable('data');
         $out = array();
-        if (!empty($data)) {
+        if ( ! empty($data)) {
             $modObj = self::$classTable;
             $modObj->edit($data['id']);
             if ($modObj->getID() && ((is_object($callback) && ($callback instanceof \Closure)) || is_callable($callback))) {
@@ -111,7 +111,7 @@ 
      */
     public static function saveValue()
     {
-        return self::_workValue(function ($data, $modObj) {
+        return self::_workValue(function($data, $modObj) {
             $out = array();
             if (isset($_POST['value']) && is_scalar($_POST['value'])) {
                 if ($modObj->set($data['key'], $_POST['value'])->save()) {
@@ -133,7 +133,7 @@ 
      */
     public static function getValue()
     {
-        return self::_workValue(function ($data, $modObj) {
+        return self::_workValue(function($data, $modObj) {
             return array(
                 'value' => $modObj->get($data['key'])
             );

Braces +39 added lines, -39 removed lines

@@ -4,8 +4,8 @@ 
  * Class Action
  * @package Module
  */
-abstract class Action
-{
+abstract class Action

+{

     /**
      * Объект DocumentParser - основной класс MODX
      * @var \DocumentParser
@@ -20,8 +20,8 @@ 
     /**
      * @param \DocumentParser $modx
      */
-    public static function setMODX(\DocumentParser $modx)
-    {
+    public static function setMODX(\DocumentParser $modx)

+    {

         self::$modx = $modx;
     }
 
@@ -30,8 +30,8 @@ 
      * @param Template $tpl
      * @param \MODxAPI $classTable
      */
-    public static function init(\DocumentParser $modx, Template $tpl, \MODxAPI $classTable)
-    {
+    public static function init(\DocumentParser $modx, Template $tpl, \MODxAPI $classTable)

+    {

         self::setMODX($modx);
         self::$TPL = Template::showLog();
         self::$_tplObj = $tpl;
@@ -41,8 +41,8 @@ 
     /**
      * @return string
      */
-    public static function TABLE()
-    {
+    public static function TABLE()

+    {

         return static::$TABLE;
     }
 
@@ -50,8 +50,8 @@ 
      * @param $id
      * @return bool
      */
-    protected static function _checkObj($id)
-    {
+    protected static function _checkObj($id)

+    {

         $q = self::$modx->db->select('id', self::$modx->getFullTableName(self::TABLE()), "id = " . $id);
 
         return (self::$modx->db->getRecordCount($q) == 1);
@@ -62,8 +62,8 @@ 
      * @param $id
      * @return mixed
      */
-    protected static function _getValue($field, $id)
-    {
+    protected static function _getValue($field, $id)

+    {

         $q = self::$modx->db->select($field, self::$modx->getFullTableName(self::TABLE()), "id = " . $id);
 
         return self::$modx->db->getValue($q);
@@ -72,9 +72,9 @@ 
     /**
      * @return array|mixed
      */
-    public static function listValue()
-    {
-        $out = self::_workValue(function ($data, $modObj) {
+    public static function listValue()

+    {

+        $out = self::_workValue(function ($data, $modObj) {

             $listFunction = $data['key'] . 'Lists';
             $out = method_exists($modObj, $listFunction) ? $modObj->$listFunction() : array();
             $out['selected'] = $modObj->get($data['key']);
@@ -90,15 +90,15 @@ 
      * @param $callback
      * @return array|mixed
      */
-    protected static function _workValue($callback)
-    {
+    protected static function _workValue($callback)

+    {

         self::$TPL = 'ajax/getValue';
         $data = Helper::jeditable('data');
         $out = array();
-        if (!empty($data)) {
+        if (!empty($data)) {

             $modObj = self::$classTable;
             $modObj->edit($data['id']);
-            if ($modObj->getID() && ((is_object($callback) && ($callback instanceof \Closure)) || is_callable($callback))) {
+            if ($modObj->getID() && ((is_object($callback) && ($callback instanceof \Closure)) || is_callable($callback))) {

                 $out = call_user_func($callback, $data, $modObj);
             }
         }
@@ -109,16 +109,16 @@ 
     /**
      * @return array|mixed
      */
-    public static function saveValue()
-    {
-        return self::_workValue(function ($data, $modObj) {
+    public static function saveValue()

+    {

+        return self::_workValue(function ($data, $modObj) {

             $out = array();
-            if (isset($_POST['value']) && is_scalar($_POST['value'])) {
-                if ($modObj->set($data['key'], $_POST['value'])->save()) {
+            if (isset($_POST['value']) && is_scalar($_POST['value'])) {

+                if ($modObj->set($data['key'], $_POST['value'])->save()) {

                     $textMethod = $data['key'] . 'Text';
-                    if (method_exists($modObj, $textMethod)) {
+                    if (method_exists($modObj, $textMethod)) {

                         $out['value'] = $modObj->$textMethod();
-                    } else {
+                    } else {

                         $out['value'] = $modObj->get($data['key']);
                     }
                 }
@@ -131,9 +131,9 @@ 
     /**
      * @return array|mixed
      */
-    public static function getValue()
-    {
-        return self::_workValue(function ($data, $modObj) {
+    public static function getValue()

+    {

+        return self::_workValue(function ($data, $modObj) {

             return array(
                 'value' => $modObj->get($data['key'])
             );
@@ -143,21 +143,21 @@ 
     /**
      * @return array
      */
-    public static function deleted()
-    {
+    public static function deleted()

+    {

         $data = array();
         $dataID = (int)Template::getParam('docId', $_GET);
-        if ($dataID > 0 && self::_checkObj($dataID)) {
+        if ($dataID > 0 && self::_checkObj($dataID)) {

             $oldValue = self::_getValue('deleted_at', $dataID);
             $q = self::$modx->db->update(array(
                 'deleted_at' => empty($oldValue) ? date('Y-m-d H:i:s') : null
             ), self::$modx->getFullTableName(self::TABLE()), "id = " . $dataID);
-            if ($q) {
+            if ($q) {

                 $data['log'] = $oldValue ? 'Запись с ID ' . $dataID . ' восстановлена' : 'Запись с ID ' . $dataID . ' удалена';
-            } else {
+            } else {

                 $data['log'] = $oldValue ? 'Не удалось восстановить запись с ID ' . $dataID : 'Не удалось удалить запись с ID ' . $dataID;
             }
-        } else {
+        } else {

             $data['log'] = '<span class="error">Ошибка</span>. Не удалось определить обновляему запись';
         }
 
@@ -167,16 +167,16 @@ 
     /**
      * 
      */
-    public static function lists()
-    {
+    public static function lists()

+    {

         self::$TPL = 'ajax/lists';
     }
 
     /**
      * @return null
      */
-    public static function getClassTable()
-    {
+    public static function getClassTable()

+    {

         return self::$classTable;
     }
 }

assets/lib/Module/Helper.php

Spacing +4 added lines, -4 removed lines

@@ -68,7 +68,7 @@ 
         $request = $post ? $_POST : $_GET;
         $match = (isset($request[$key]) && is_scalar($request[$key]) && preg_match("/^(.*)_(\d+)$/i", $request[$key],
                 $match)) ? $match : array();
-        if (!empty($match)) {
+        if ( ! empty($match)) {
             $data = array(
                 'key' => $match[1],
                 'id'  => $match[2]
@@ -94,7 +94,7 @@ 
         if ($post) {
             curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
         }
-        if (!empty($header)) {
+        if ( ! empty($header)) {
             curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
         }
         curl_setopt($ch, CURLOPT_TIMEOUT, 10);
@@ -113,7 +113,7 @@ 
     {
         require_once(MODX_BASE_PATH . "assets/snippets/DocLister/lib/jsonHelper.class.php");
         $error = \jsonHelper::json_last_error_msg();
-        if (!in_array($error, array('error_none', 'other'))) {
+        if ( ! in_array($error, array('error_none', 'other'))) {
             $error = true;
         }
 
@@ -132,7 +132,7 @@ 
     {
         $handle = fopen($path, "r");
         $i = $total = 0;
-        while (!feof($handle)) {
+        while ( ! feof($handle)) {
             $i++;
             $buffer = fgets($handle, $size);
             if (is_callable($callback)) {

Braces +26 added lines, -26 removed lines

@@ -6,8 +6,8 @@ 
  * Class Helper
  * @package Module
  */
-class Helper extends \APIhelpers
-{
+class Helper extends \APIhelpers

+{

     /**
      * Объект DocumentParser - основной класс MODX
      * @var \DocumentParser
@@ -23,8 +23,8 @@ 
      * @param \DocumentParser $modx
      * @param string $mode
      */
-    public static function init(\DocumentParser $modx, $mode = 'list')
-    {
+    public static function init(\DocumentParser $modx, $mode = 'list')

+    {

         self::$modx = $modx;
         self::setMode($mode);
     }
@@ -32,16 +32,16 @@ 
     /**
      * @return string
      */
-    public static function getMode()
-    {
+    public static function getMode()

+    {

         return self::$mode;
     }
 
     /**
      * @param $text
      */
-    public static function setMode($text)
-    {
+    public static function setMode($text)

+    {

         self::$mode = $text;
     }
 
@@ -50,8 +50,8 @@ 
      * @param string $where
      * @return mixed
      */
-    protected static function _counter($from, $where = '')
-    {
+    protected static function _counter($from, $where = '')

+    {

         $q = self::$modx->db->select('count(id)', self::$modx->getFullTableName($from), $where);
 
         return self::$modx->db->getValue($q);
@@ -62,13 +62,13 @@ 
      * @param bool $post
      * @return array
      */
-    public static function jeditable($key = 'id', $post = true)
-    {
+    public static function jeditable($key = 'id', $post = true)

+    {

         $data = array();
         $request = $post ? $_POST : $_GET;
         $match = (isset($request[$key]) && is_scalar($request[$key]) && preg_match("/^(.*)_(\d+)$/i", $request[$key],
                 $match)) ? $match : array();
-        if (!empty($match)) {
+        if (!empty($match)) {

             $data = array(
                 'key' => $match[1],
                 'id'  => $match[2]
@@ -85,16 +85,16 @@ 
      * @param array $header
      * @return mixed
      */
-    public static function curl($url, $data = '', $post = false, array $header = array())
-    {
+    public static function curl($url, $data = '', $post = false, array $header = array())

+    {

         $ch = curl_init();
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
         $post = (bool)$post;
         curl_setopt($ch, CURLOPT_POST, $post);
-        if ($post) {
+        if ($post) {

             curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
         }
-        if (!empty($header)) {
+        if (!empty($header)) {

             curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
         }
         curl_setopt($ch, CURLOPT_TIMEOUT, 10);
@@ -109,11 +109,11 @@ 
      * @param $json string строка с JSON для записи в лог при отладке
      * @return bool|string
      */
-    public function isErrorJSON($json)
-    {
+    public function isErrorJSON($json)

+    {

         require_once(MODX_BASE_PATH . "assets/snippets/DocLister/lib/jsonHelper.class.php");
         $error = \jsonHelper::json_last_error_msg();
-        if (!in_array($error, array('error_none', 'other'))) {
+        if (!in_array($error, array('error_none', 'other'))) {

             $error = true;
         }
 
@@ -128,21 +128,21 @@ 
      * @param int $size
      * @return array
      */
-    public static function readFileLine($path, $callback, array $callbackParams = array(), $lines = 0, $size = 4096)
-    {
+    public static function readFileLine($path, $callback, array $callbackParams = array(), $lines = 0, $size = 4096)

+    {

         $handle = fopen($path, "r");
         $i = $total = 0;
-        while (!feof($handle)) {
+        while (!feof($handle)) {

             $i++;
             $buffer = fgets($handle, $size);
-            if (is_callable($callback)) {
+            if (is_callable($callback)) {

                 $callbackParams['line'] = $buffer;
                 $callbackParams['numLine'] = $i;
-                if (call_user_func($callback, $callbackParams)) {
+                if (call_user_func($callback, $callbackParams)) {

                     $total++;
                 }
             }
-            if ($lines > 0 && $i >= $lines) {
+            if ($lines > 0 && $i >= $lines) {

                 break;
             }
         }

assets/lib/Module/Template.php

Spacing +2 added lines, -2 removed lines

@@ -63,7 +63,7 @@ 
         $this->_publicFolder = "/" . $tplFolder . "/public/";
         $this->_tplFolder = MODX_BASE_PATH . $tplFolder . "/template/";
 
-        if (!defined('MODX_MAIN_URL')) {
+        if ( ! defined('MODX_MAIN_URL')) {
             define('MODX_MAIN_URL', MODX_SITE_URL);
         }
     }
@@ -108,7 +108,7 @@ 
     protected function _getMainTpl($name)
     {
         $content = '';
-        if (!self::isAjax()) {
+        if ( ! self::isAjax()) {
 
             ob_start();
             extract($this->vars);

Braces +33 added lines, -33 removed lines

@@ -4,8 +4,8 @@ 
  * Class Template
  * @package Module
  */
-abstract class Template
-{
+abstract class Template

+{

     /**
      * @var \DocumentParser|null
      */
@@ -49,12 +49,12 @@ 
      * @param bool $ajax
      * @param null $tplFolder
      */
-    public function __construct(\DocumentParser $modx, $ajax = false, $tplFolder = null)
-    {
+    public function __construct(\DocumentParser $modx, $ajax = false, $tplFolder = null)

+    {

         $this->_modx = $modx;
         self::$_ajax = (boolean)$ajax;
         $this->loadVars();
-        if (is_null($tplFolder)) {
+        if (is_null($tplFolder)) {

             $tplFolder = dirname(dirname(__FILE__));
         }
         $FS = \Helpers\FS::getInstance();
@@ -63,7 +63,7 @@ 
         $this->_publicFolder = "/" . $tplFolder . "/public/";
         $this->_tplFolder = MODX_BASE_PATH . $tplFolder . "/template/";
 
-        if (!defined('MODX_MAIN_URL')) {
+        if (!defined('MODX_MAIN_URL')) {

             define('MODX_MAIN_URL', MODX_SITE_URL);
         }
     }
@@ -71,16 +71,16 @@ 
     /**
      * @return bool
      */
-    public static function isAjax()
-    {
+    public static function isAjax()

+    {

         return self::$_ajax;
     }
 
     /**
      * @return string
      */
-    public function publicFolder()
-    {
+    public function publicFolder()

+    {

         return $this->_publicFolder;
     }
 
@@ -88,16 +88,16 @@ 
      * @param $path
      * @return string
      */
-    public function src($path)
-    {
+    public function src($path)

+    {

         return rtrim(MODX_MAIN_URL, '/') . $this->publicFolder() . ltrim($path, '/');
     }
 
     /**
      * @return string
      */
-    public function showHeader()
-    {
+    public function showHeader()

+    {

         return $this->_getMainTpl('header.inc.php');
     }
 
@@ -105,14 +105,14 @@ 
      * @param $name
      * @return string
      */
-    protected function _getMainTpl($name)
-    {
+    protected function _getMainTpl($name)

+    {

         $content = '';
-        if (!self::isAjax()) {
+        if (!self::isAjax()) {

 
             ob_start();
             extract($this->vars);
-            if (file_exists($incPath . $name)) {
+            if (file_exists($incPath . $name)) {

                 include($incPath . $name);
                 $content = ob_get_contents();
             }
@@ -125,10 +125,10 @@ 
     /**
      *
      */
-    public function loadVars()
-    {
+    public function loadVars()

+    {

         $vars = array();
-        foreach ($this->vars as $item) {
+        foreach ($this->vars as $item) {

             global $$item;
             $vars[$item] = $$item;
         }
@@ -140,8 +140,8 @@ 
     /**
      * @return string
      */
-    public function showFooter()
-    {
+    public function showFooter()

+    {

         return $this->_getMainTpl('footer.inc.php');
     }
 
@@ -150,10 +150,10 @@ 
      * @param array $tplParams
      * @return string
      */
-    public function showBody($TplName, array $tplParams = array())
-    {
+    public function showBody($TplName, array $tplParams = array())

+    {

         ob_start();
-        if (file_exists($this->_tplFolder . $TplName . "." . self::TPL_EXT)) {
+        if (file_exists($this->_tplFolder . $TplName . "." . self::TPL_EXT)) {

             extract($this->vars);
             include($this->_tplFolder . $TplName . "." . self::TPL_EXT);
         }
@@ -169,8 +169,8 @@ 
      * @param null $default
      * @return mixed|null
      */
-    public static function getParam($key, array $param = array(), $default = null)
-    {
+    public static function getParam($key, array $param = array(), $default = null)

+    {

         return isset($param[$key]) ? $param[$key] : $default;
     }
 
@@ -181,8 +181,8 @@ 
      * @param bool $full
      * @return string
      */
-    public function makeUrl($action, array $data = array(), $module = null, $full = false)
-    {
+    public function makeUrl($action, array $data = array(), $module = null, $full = false)

+    {

         $action = is_scalar($action) ? $action : '';
         $content = self::getParam('content', $this->vars, array());
         $data = array_merge(
@@ -197,7 +197,7 @@ 
             )
         );
         $out = implode("?", array($this->_modx->getManagerPath(), http_build_query($data)));
-        if ($full) {
+        if ($full) {

             $out = $this->_modx->getConfig('site_url') . ltrim($out, '/');
         }
 
@@ -207,8 +207,8 @@ 
     /**
      * @return string
      */
-    public static function showLog()
-    {
+    public static function showLog()

+    {

         return self::isAjax() ? 'log' : 'main';
     }
 

assets/lib/MODxAPI/modChunk.php

Braces +2 added lines, -2 removed lines

@@ -4,8 +4,8 @@
 /**
  * Class modChunk
  */
-class modChunk extends autoTable
-{
+class modChunk extends autoTable

+{

     /**
      * @var string
      */