AgelxNash / DocLister

assets/lib/Formatter/SqlFormatter.php

Doc Comments +2 added lines, -2 removed lines

@@ -330,8 +330,8 @@
     }
 
     /**
-     * @param $string
-     * @return null
+     * @param string $string
+     * @return string|null
      */
     protected static function getQuotedString($string)
     {

Spacing +11 added lines, -11 removed lines

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

Braces +184 added lines, -182 removed lines

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

+{

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

+    {

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

+    {

+        if (self::$init) {

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

+    {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+    {

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

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

+    {

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

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

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

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

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

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

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

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

+    {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+                    if ($inline_count >= 30) {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+    {

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

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

+    {

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

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

+                if (!$empty) {

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

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

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

+    {

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

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

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

+    {

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

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

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

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

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

                     continue;
-                } else {
+                } else {

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

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

+    {

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

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

+            if (defined('ENT_IGNORE')) {

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

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

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

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

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

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

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

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

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

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

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

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

+    {

+        if (self::is_cli()) {

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

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

+    {

+        if (self::is_cli()) {

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

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

+    {

+        if (self::is_cli()) {

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

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

+    {

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

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

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

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

+    {

+        if (self::is_cli()) {

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

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

+    {

+        if (self::is_cli()) {

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

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

+    {

+        if (self::is_cli()) {

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

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

+    {

+        if (self::is_cli()) {

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

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

+    {

+        if (self::is_cli()) {

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

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

+    {

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

+    {

+        if (self::is_cli()) {

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

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

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

+    {

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

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

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

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

Doc Comments +2 added lines, -2 removed lines

@@ -440,8 +440,8 @@
     }
 
     /**
-     * @param $table
-     * @param $sort
+     * @param string $table
+     * @param string $sort
      * @return array
      */
     protected function injectSortByTV($table, $sort)

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

@@ -295,7 +295,7 @@ 
             }
             $where = sqlHelper::trimLogicalOp($where);
 
-            $where = "WHERE {$where}";
+            $where = "where {$where}";
             $whereArr = array();
             if (!$this->getCFGDef('showNoPublish', 0)) {
                 $whereArr[] = "c.deleted=0 AND c.published=1";
@@ -388,15 +388,15 @@ 
 
             if ($this->getCFGDef('showNoPublish', 0)) {
                 if ($where != '') {
-                    $where = "WHERE {$where}";
+                    $where = "where {$where}";
                 } else {
                     $where = '';
                 }
             } else {
                 if ($where != '') {
-                    $where = "WHERE {$where} AND ";
+                    $where = "where {$where} AND ";
                 } else {
-                    $where = "WHERE {$where} ";
+                    $where = "where {$where} ";
                 }
                 $where .= "c.deleted=0 AND c.published=1";
             }
@@ -410,7 +410,7 @@ 
 
             $limit = $this->LimitSQL($this->getCFGDef('queryLimit', 0));
 
-            $rs = $this->dbQuery("SELECT {$fields} FROM {$tbl_site_content} {$where} {$group} {$sort} {$limit}");
+            $rs = $this->dbQuery("select {$fields} FROM {$tbl_site_content} {$where} {$group} {$sort} {$limit}");
 
             while ($item = $this->modx->db->getRow($rs)) {
                 $out[$item['id']] = $item;
@@ -436,9 +436,9 @@ 
         $tbl_site_content = $this->getTable('site_content', 'c');
         $sanitarInIDs = $this->sanitarIn($id);
         if ($this->getCFGDef('showNoPublish', 0)) {
-            $where = "WHERE {$where} c.parent IN ({$sanitarInIDs}) AND c.isfolder=1";
+            $where = "where {$where} c.parent IN ({$sanitarInIDs}) AND c.isfolder=1";
         } else {
-            $where = "WHERE {$where} c.parent IN ({$sanitarInIDs}) AND c.deleted=0 AND c.published=1 AND c.isfolder=1";
+            $where = "where {$where} c.parent IN ({$sanitarInIDs}) AND c.deleted=0 AND c.published=1 AND c.isfolder=1";
         }
 
         $rs = $this->dbQuery("SELECT id FROM {$tbl_site_content} {$where}");
@@ -528,7 +528,7 @@ 
         $group = $this->getGroupSQL($this->getCFGDef('groupBy', ''));
 
         if ($sanitarInIDs != "''" || $this->getCFGDef('ignoreEmpty', '0')) {
-            $rs = $this->dbQuery("SELECT {$fields} FROM " . $from . " " . $where . " " .
+            $rs = $this->dbQuery("select {$fields} FROM " . $from . " " . $where . " " .
                 $group . " " .
                 $sort . " " .
                 $this->LimitSQL($this->getCFGDef('queryLimit', 0))

Spacing +13 added lines, -13 removed lines

@@ -61,7 +61,7 @@ 
         $this->_docs = ($type == 'parents') ? $this->getChildrenList() : $this->getDocList();
         if ($tvlist != '' && count($this->_docs) > 0) {
             $tv = $this->extTV->getTVList(array_keys($this->_docs), $tvlist);
-            if (!is_array($tv)) {
+            if ( ! is_array($tv)) {
                 $tv = array();
             }
             foreach ($tv as $docID => $TVitem) {
@@ -138,7 +138,7 @@ 
                     }
                     $date = $this->getCFGDef('dateSource', 'pub_date');
                     if (isset($item[$date])) {
-                        if (!$item[$date] && $date == 'pub_date' && isset($item['createdon'])) {
+                        if ( ! $item[$date] && $date == 'pub_date' && isset($item['createdon'])) {
                             $date = 'createdon';
                         }
                         $_date = is_numeric($item[$date]) && $item[$date] == (int)$item[$date] ? $item[$date] : strtotime($item[$date]);
@@ -223,7 +223,7 @@ 
 
             if (array('1') == $fields || in_array('date', $fields)) {
                 if (isset($row[$date])) {
-                    if (!$row[$date] && $date == 'pub_date' && isset($row['createdon'])) {
+                    if ( ! $row[$date] && $date == 'pub_date' && isset($row['createdon'])) {
                         $date = 'createdon';
                     }
                     $_date = is_numeric($row[$date]) && $row[$date] == (int)$row[$date] ? $row[$date] : strtotime($row[$date]);
@@ -242,7 +242,7 @@ 
                     $row['title'] = empty($row['menutitle']) ? $row['pagetitle'] : $row['menutitle'];
                 }
             }
-            if ((bool)$this->getCFGDef('makeUrl', 1) && (array('1') == $fields || in_array('url',$fields))
+            if ((bool)$this->getCFGDef('makeUrl', 1) && (array('1') == $fields || in_array('url', $fields))
             ) {
                 if (isset($row['type']) && $row['type'] == 'reference' && isset($row['content'])) {
                     $row['url'] = is_numeric($row['content']) ? $this->modx->makeUrl($row['content'], '', '',
@@ -289,10 +289,10 @@ 
 
             $where = "WHERE {$where}";
             $whereArr = array();
-            if (!$this->getCFGDef('showNoPublish', 0)) {
+            if ( ! $this->getCFGDef('showNoPublish', 0)) {
                 $whereArr[] = "c.deleted=0 AND c.published=1";
             }
-            else{
+            else {
                 $q_true = 1;
             }
 
@@ -344,7 +344,7 @@ 
             $group = $this->getGroupSQL($this->getCFGDef('groupBy', 'c.id'));
 
             $q_true = $q_true ? $q_true : $group != '';
-            if ( $q_true ){
+            if ($q_true) {
                 $maxDocs = $this->getCFGDef('maxDocs', 0);
                 $limit = $maxDocs > 0 ? $this->LimitSQL($this->getCFGDef('maxDocs', 0)) : '';
                 $rs = $this->dbQuery("SELECT count(*) FROM (SELECT count(*) FROM {$from} {$where} {$group} {$limit}) as `tmp`");
@@ -450,7 +450,7 @@ 
     protected function injectSortByTV($table, $sort)
     {
         $out = $this->getExtender('tv', true, true)->injectSortByTV($table, $sort);
-        if (!is_array($out) || empty($out)) {
+        if ( ! is_array($out) || empty($out)) {
             $out = array($table, $sort);
         }
 
@@ -467,12 +467,12 @@ 
 
         $tmpWhere = $this->getCFGDef('addWhereList', '');
         $tmpWhere = sqlHelper::trimLogicalOp($tmpWhere);
-        if (!empty($tmpWhere)) {
+        if ( ! empty($tmpWhere)) {
             $where[] = $tmpWhere;
         }
 
         $tmpWhere = sqlHelper::trimLogicalOp($this->_filters['where']);
-        if (!empty($tmpWhere)) {
+        if ( ! empty($tmpWhere)) {
             $where[] = $tmpWhere;
         }
 
@@ -505,13 +505,13 @@ 
                 $tmpWhere = "((" . $tmpWhere . ") OR c.id IN({$addDocs}))";
             }
         }
-        if (!empty($tmpWhere)) {
+        if ( ! empty($tmpWhere)) {
             $where[] = $tmpWhere;
         }
-        if (!$this->getCFGDef('showNoPublish', 0)) {
+        if ( ! $this->getCFGDef('showNoPublish', 0)) {
             $where[] = "c.deleted=0 AND c.published=1";
         }
-        if (!empty($where)) {
+        if ( ! empty($where)) {
             $where = "WHERE " . implode(" AND ", $where);
         } else {
             $where = '';

Braces +107 added lines, -109 removed lines

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

+{

     /**
      * Экземпляр экстендера TV
      *
@@ -28,8 +28,8 @@ 
      * @param array $cfg
      * @param null $startTime
      */
-    public function __construct($modx, $cfg = array(), $startTime = null)
-    {
+    public function __construct($modx, $cfg = array(), $startTime = null)

+    {

         parent::__construct($modx, $cfg, $startTime);
         $this->extTV = $this->getExtender('tv', true, true);
     }
@@ -37,9 +37,9 @@ 
     /**
      * @absctract
      */
-    public function getDocs($tvlist = '')
-    {
-        if ($tvlist == '') {
+    public function getDocs($tvlist = '')

+    {

+        if ($tvlist == '') {

             $tvlist = $this->getCFGDef('tvList', '');
         }
 
@@ -50,29 +50,29 @@ 
          */
         $extJotCount = $this->getCFGdef('jotcount', 0) ? $this->getExtender('jotcount', true) : null;
 
-        if ($extJotCount) {
+        if ($extJotCount) {

             $extJotCount->init($this);
         }
 
-        if ($this->extPaginate = $this->getExtender('paginate')) {
+        if ($this->extPaginate = $this->getExtender('paginate')) {

             $this->extPaginate->init($this);
         }
         $type = $this->getCFGDef('idType', 'parents');
         $this->_docs = ($type == 'parents') ? $this->getChildrenList() : $this->getDocList();
-        if ($tvlist != '' && count($this->_docs) > 0) {
+        if ($tvlist != '' && count($this->_docs) > 0) {

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

                 $tv = array();
             }
-            foreach ($tv as $docID => $TVitem) {
-                if (isset($this->_docs[$docID]) && is_array($this->_docs[$docID])) {
+            foreach ($tv as $docID => $TVitem) {

+                if (isset($this->_docs[$docID]) && is_array($this->_docs[$docID])) {

                     $this->_docs[$docID] = array_merge($this->_docs[$docID], $TVitem);
-                } else {
+                } else {

                     unset($this->_docs[$docID]);
                 }
             }
         }
-        if (1 == $this->getCFGDef('tree', '0')) {
+        if (1 == $this->getCFGDef('tree', '0')) {

             $this->treeBuild('id', 'parent');
         }
 
@@ -83,23 +83,23 @@ 
      * @param string $tpl
      * @return string
      */
-    public function _render($tpl = '')
-    {
+    public function _render($tpl = '')

+    {

         $out = '';
         $separator = $this->getCFGDef('outputSeparator', '');
-        if ($tpl == '') {
+        if ($tpl == '') {

             $tpl = $this->getCFGDef('tpl', '@CODE:<a href="[+url+]">[+pagetitle+]</a><br />');
         }
-        if ($tpl != '') {
+        if ($tpl != '') {

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

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

                     $extUser->init($this, array('fields' => $this->getCFGDef("userFields", "")));
                 }
 
@@ -114,9 +114,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+]....
                     }
 
@@ -128,24 +128,24 @@ 
 
                     $item['title'] = ($item['menutitle'] == '' ? $item['pagetitle'] : $item['menutitle']);
 
-                    if ($this->getCFGDef('makeUrl', 1)) {
-                        if ($item['type'] == 'reference') {
+                    if ($this->getCFGDef('makeUrl', 1)) {

+                        if ($item['type'] == 'reference') {

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

                             $item['url'] = $this->modx->makeUrl($item['id'], '', '', $this->getCFGDef('urlScheme', ''));
                         }
                     }
                     $date = $this->getCFGDef('dateSource', 'pub_date');
-                    if (isset($item[$date])) {
-                        if (!$item[$date] && $date == 'pub_date' && isset($item['createdon'])) {
+                    if (isset($item[$date])) {

+                        if (!$item[$date] && $date == 'pub_date' && isset($item['createdon'])) {

                             $date = 'createdon';
                         }
                         $_date = is_numeric($item[$date]) && $item[$date] == (int)$item[$date] ? $item[$date] : strtotime($item[$date]);
-                        if ($_date !== false) {
+                        if ($_date !== false) {

                             $_date = $_date + $this->modx->config['server_offset_time'];
                             $dateFormat = $this->getCFGDef('dateFormat', '%d.%b.%y %H:%M');
-                            if ($dateFormat) {
+                            if ($dateFormat) {

                                 $item['date'] = strftime($dateFormat, $_date);
                             }
                         }
@@ -154,33 +154,33 @@ 
                     $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
                     }
                     $out .= $tmp;
-                    if (next($this->_docs) !== false) {
+                    if (next($this->_docs) !== false) {

                         $out .= $separator;
                     }
                     $i++;
                 }
-            } else {
+            } else {

                 $noneTPL = $this->getCFGDef('noneTPL', '');
                 $out = ($noneTPL != '') ? $this->parseChunk($noneTPL, $sysPlh) : '';
             }
@@ -196,8 +196,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');
@@ -216,50 +216,50 @@ 
          */
         $extE = $this->getExtender('e', true, true);
 
-        foreach ($data as $num => $row) {
-            if ((array('1') == $fields || in_array('summary', $fields)) && $extSummary) {
+        foreach ($data as $num => $row) {

+            if ((array('1') == $fields || in_array('summary', $fields)) && $extSummary) {

                 $row['summary'] = $this->getSummary($row, $extSummary, 'introtext', 'content');
             }
 
-            if (array('1') == $fields || in_array('date', $fields)) {
-                if (isset($row[$date])) {
-                    if (!$row[$date] && $date == 'pub_date' && isset($row['createdon'])) {
+            if (array('1') == $fields || in_array('date', $fields)) {

+                if (isset($row[$date])) {

+                    if (!$row[$date] && $date == 'pub_date' && isset($row['createdon'])) {

                         $date = 'createdon';
                     }
                     $_date = is_numeric($row[$date]) && $row[$date] == (int)$row[$date] ? $row[$date] : strtotime($row[$date]);
-                    if ($_date !== false) {
+                    if ($_date !== false) {

                         $_date = $_date + $this->modx->config['server_offset_time'];
                         $dateFormat = $this->getCFGDef('dateFormat', '%d.%b.%y %H:%M');
-                        if ($dateFormat) {
+                        if ($dateFormat) {

                             $row['date'] = strftime($dateFormat, $_date);
                         }
                     }
                 }
             }
 
-            if (array('1') == $fields || in_array('title', $fields)) {
-                if (isset($row['pagetitle'])) {
+            if (array('1') == $fields || in_array('title', $fields)) {

+                if (isset($row['pagetitle'])) {

                     $row['title'] = empty($row['menutitle']) ? $row['pagetitle'] : $row['menutitle'];
                 }
             }
             if ((bool)$this->getCFGDef('makeUrl', 1) && (array('1') == $fields || in_array('url',$fields))
-            ) {
-                if (isset($row['type']) && $row['type'] == 'reference' && isset($row['content'])) {
+            ) {

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

                     $row['url'] = is_numeric($row['content']) ? $this->modx->makeUrl($row['content'], '', '',
                         $this->getCFGDef('urlScheme', '')) : $row['content'];
-                } elseif (isset($row['id'])) {
+                } elseif (isset($row['id'])) {

                     $row['url'] = $this->modx->makeUrl($row['id'], '', '', $this->getCFGDef('urlScheme', ''));
                 }
             }
-            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;
                 }
             }
@@ -272,36 +272,35 @@ 
     /**
      * @abstract
      */
-    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')) {

             $q_true = $this->getCFGDef('ignoreEmpty', '0');
             $q_true = $q_true ? $q_true : $this->getCFGDef('idType', 'parents') == 'parents';
             $where = $this->getCFGDef('addWhereList', '');
             $where = sqlHelper::trimLogicalOp($where);
             $where = ($where ? $where . ' AND ' : '') . $this->_filters['where'];
-            if ($where != '' && $this->_filters['where'] != '') {
+            if ($where != '' && $this->_filters['where'] != '') {

                 $where .= " AND ";
             }
             $where = sqlHelper::trimLogicalOp($where);
 
             $where = "WHERE {$where}";
             $whereArr = array();
-            if (!$this->getCFGDef('showNoPublish', 0)) {
+            if (!$this->getCFGDef('showNoPublish', 0)) {

                 $whereArr[] = "c.deleted=0 AND c.published=1";
-            }
-            else{
+            } else {

                 $q_true = 1;
             }
 
             $tbl_site_content = $this->getTable('site_content', 'c');
 
-            if ($sanitarInIDs != "''") {
-                switch ($this->getCFGDef('idType', 'parents')) {
+            if ($sanitarInIDs != "''") {

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

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

                             case '-1':
                                 $tmpWhere = "c.parent IN (" . $sanitarInIDs . ")";
                                 break;
@@ -313,10 +312,10 @@ 
                                 $tmpWhere = "(c.parent IN ({$sanitarInIDs}) OR c.id IN({$sanitarInIDs}))";
                                 break;
                         }
-                        if (($addDocs = $this->getCFGDef('documents', '')) != '') {
+                        if (($addDocs = $this->getCFGDef('documents', '')) != '') {

                             $addDocs = $this->sanitarIn($this->cleanIDs($addDocs));
                             $whereArr[] = "((" . $tmpWhere . ") OR c.id IN({$addDocs}))";
-                        } else {
+                        } else {

                             $whereArr[] = $tmpWhere;
                         }
 
@@ -331,26 +330,25 @@ 
 
             $q_true = $q_true ? $q_true : trim($where) != 'WHERE';
 
-            if (trim($where) != 'WHERE') {
+            if (trim($where) != 'WHERE') {

                 $where .= " AND ";
             }
 
             $where .= implode(" AND ", $whereArr);
             $where = sqlHelper::trimLogicalOp($where);
 
-            if (trim($where) == 'WHERE') {
+            if (trim($where) == 'WHERE') {

                 $where = '';
             }
             $group = $this->getGroupSQL($this->getCFGDef('groupBy', 'c.id'));
 
             $q_true = $q_true ? $q_true : $group != '';
-            if ( $q_true ){
+            if ( $q_true ) {

                 $maxDocs = $this->getCFGDef('maxDocs', 0);
                 $limit = $maxDocs > 0 ? $this->LimitSQL($this->getCFGDef('maxDocs', 0)) : '';
                 $rs = $this->dbQuery("SELECT count(*) FROM (SELECT count(*) FROM {$from} {$where} {$group} {$limit}) as `tmp`");
                 $out = $this->modx->db->getValue($rs);
-            }
-            else {
+            } else {

                 $out = count($this->IDs);
             }
         }
@@ -361,11 +359,11 @@ 
     /**
      * @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', '');
             $where = sqlHelper::trimLogicalOp($where);
 
@@ -373,21 +371,21 @@ 
             $where = sqlHelper::trimLogicalOp($where);
 
             $tbl_site_content = $this->getTable('site_content', 'c');
-            if ($sanitarInIDs != "''") {
+            if ($sanitarInIDs != "''") {

                 $where .= ($where ? " AND " : "") . "c.id IN ({$sanitarInIDs}) AND";
             }
             $where = sqlHelper::trimLogicalOp($where);
 
-            if ($this->getCFGDef('showNoPublish', 0)) {
-                if ($where != '') {
+            if ($this->getCFGDef('showNoPublish', 0)) {

+                if ($where != '') {

                     $where = "WHERE {$where}";
-                } else {
+                } else {

                     $where = '';
                 }
-            } else {
-                if ($where != '') {
+            } else {

+                if ($where != '') {

                     $where = "WHERE {$where} AND ";
-                } else {
+                } else {

                     $where = "WHERE {$where} ";
                 }
                 $where .= "c.deleted=0 AND c.published=1";
@@ -404,7 +402,7 @@ 
 
             $rs = $this->dbQuery("SELECT {$fields} FROM {$tbl_site_content} {$where} {$group} {$sort} {$limit}");
 
-            while ($item = $this->modx->db->getRow($rs)) {
+            while ($item = $this->modx->db->getRow($rs)) {

                 $out[$item['id']] = $item;
             };
         }
@@ -416,26 +414,26 @@ 
      * @param string|array $id
      * @return array
      */
-    public function getChildrenFolder($id)
-    {
+    public function getChildrenFolder($id)

+    {

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

             $where .= " AND ";
         }
 
         $tbl_site_content = $this->getTable('site_content', 'c');
         $sanitarInIDs = $this->sanitarIn($id);
-        if ($this->getCFGDef('showNoPublish', 0)) {
+        if ($this->getCFGDef('showNoPublish', 0)) {

             $where = "WHERE {$where} c.parent IN ({$sanitarInIDs}) AND c.isfolder=1";
-        } else {
+        } else {

             $where = "WHERE {$where} c.parent IN ({$sanitarInIDs}) AND c.deleted=0 AND c.published=1 AND c.isfolder=1";
         }
 
         $rs = $this->dbQuery("SELECT id FROM {$tbl_site_content} {$where}");
 
-        while ($item = $this->modx->db->getRow($rs)) {
+        while ($item = $this->modx->db->getRow($rs)) {

             $out[] = $item['id'];
         }
 
@@ -447,10 +445,10 @@ 
      * @param $sort
      * @return array
      */
-    protected function injectSortByTV($table, $sort)
-    {
+    protected function injectSortByTV($table, $sort)

+    {

         $out = $this->getExtender('tv', true, true)->injectSortByTV($table, $sort);
-        if (!is_array($out) || empty($out)) {
+        if (!is_array($out) || empty($out)) {

             $out = array($table, $sort);
         }
 
@@ -460,19 +458,19 @@ 
     /**
      * @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;
         }
 
         $tmpWhere = sqlHelper::trimLogicalOp($this->_filters['where']);
-        if (!empty($tmpWhere)) {
+        if (!empty($tmpWhere)) {

             $where[] = $tmpWhere;
         }
 
@@ -483,8 +481,8 @@ 
         $sanitarInIDs = $this->sanitarIn($this->IDs);
 
         $tmpWhere = null;
-        if ($sanitarInIDs != "''") {
-            switch ($this->getCFGDef('showParent', '0')) {
+        if ($sanitarInIDs != "''") {

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

                 case '-1':
                     $tmpWhere = "c.parent IN (" . $sanitarInIDs . ")";
                     break;
@@ -497,36 +495,36 @@ 
                     break;
             }
         }
-        if (($addDocs = $this->getCFGDef('documents', '')) != '') {
+        if (($addDocs = $this->getCFGDef('documents', '')) != '') {

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

                 $tmpWhere = "c.id IN({$addDocs})";
-            } else {
+            } else {

                 $tmpWhere = "((" . $tmpWhere . ") OR c.id IN({$addDocs}))";
             }
         }
-        if (!empty($tmpWhere)) {
+        if (!empty($tmpWhere)) {

             $where[] = $tmpWhere;
         }
-        if (!$this->getCFGDef('showNoPublish', 0)) {
+        if (!$this->getCFGDef('showNoPublish', 0)) {

             $where[] = "c.deleted=0 AND c.published=1";
         }
-        if (!empty($where)) {
+        if (!empty($where)) {

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

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

             $rs = $this->dbQuery("SELECT {$fields} FROM " . $from . " " . $where . " " .
                 $group . " " .
                 $sort . " " .
                 $this->LimitSQL($this->getCFGDef('queryLimit', 0))
             );
 
-            while ($item = $this->modx->db->getRow($rs)) {
+            while ($item = $this->modx->db->getRow($rs)) {

                 $out[$item['id']] = $item;
             }
         }
@@ -539,10 +537,10 @@ 
      * @param string $type
      * @return string
      */
-    public function changeSortType($field, $type)
-    {
+    public function changeSortType($field, $type)

+    {

         $type = trim($type);
-        switch (strtoupper($type)) {
+        switch (strtoupper($type)) {

             case 'TVDATETIME':
                 $field = "STR_TO_DATE(" . $field . ",'%d-%m-%Y %H:%i:%s')";
                 break;

assets/snippets/DocLister/snippet.DLReflect.php

Indentation +4 added lines, -4 removed lines

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

Braces +37 added lines, -37 removed lines

@@ -25,7 +25,7 @@ 
  *            year - по годам
  */
 $reflectType = APIHelpers::getkey($params, 'reflectType', 'month');
-if (!in_array($reflectType, array('year', 'month'))) {
+if (!in_array($reflectType, array('year', 'month'))) {

     return '';
 }
 
@@ -50,9 +50,9 @@ 
  */
 $activeReflectTPL = APIHelpers::getkey($params, 'activeReflectTPL', '@CODE: <li><span>[+title+]</span></li>');
 
-list($dateFormat, $sqlDateFormat, $reflectValidator) = DLReflect::switchReflect($reflectType, function () {
+list($dateFormat, $sqlDateFormat, $reflectValidator) = DLReflect::switchReflect($reflectType, function () {

     return array('m-Y', '%m-%Y', array('DLReflect', 'validateMonth'));
-}, function () {
+}, function () {

     return array('Y', '%Y', array('DLReflect', 'validateYear'));
 });
 $tmp = $originalDate = date($dateFormat);
@@ -65,13 +65,13 @@ 
  *        Если не указан в параметре, то генерируется автоматически текущая дата
  */
 $currentReflect = APIHelpers::getkey($params, 'currentReflect', $tmp);
-if (!call_user_func($reflectValidator, $currentYear)) {
+if (!call_user_func($reflectValidator, $currentYear)) {

     $currentReflect = $tmp;
 }
 $originalCurrentReflect = $currentReflect;
 
 $selectCurrentReflect = APIHelpers::getkey($params, 'selectCurrentReflect', 1);
-if (!$selectCurrentReflect && $currentReflect == $tmp) {
+if (!$selectCurrentReflect && $currentReflect == $tmp) {

     $currentReflect = null;
 }
 
@@ -99,12 +99,12 @@ 
  */
 $tmp = APIHelpers::getkey($params, 'activeReflect', $currentReflect);
 $tmpGet = APIHelpers::getkey($_GET, $reflectType, $tmp);
-if (!call_user_func($reflectValidator, $tmpGet)) {
+if (!call_user_func($reflectValidator, $tmpGet)) {

     $activeReflect = $tmp;
-    if (!call_user_func($reflectValidator, $activeReflect)) {
+    if (!call_user_func($reflectValidator, $activeReflect)) {

         $activeReflect = $currentReflect;
     }
-} else {
+} else {

     $activeReflect = $tmpGet;
 }
 
@@ -159,10 +159,10 @@ 
 $DLParams['api'] = 'id';
 $DLParams['orderBy'] = $reflectField;
 $DLParams['saveDLObject'] = 'DLAPI';
-if ($reflectSource == 'tv') {
+if ($reflectSource == 'tv') {

     $DLParams['tvSortType'] = 'TVDATETIME';
     $DLParams['selectFields'] = "DATE_FORMAT(STR_TO_DATE(`dltv_" . $reflectField . "_1`.`value`,'%d-%m-%Y %H:%i:%s'), '" . $sqlDateFormat . "') as `id`";
-} else {
+} else {

     $DLParams['orderBy'] = $reflectField;
     $DLParams['selectFields'] = "DATE_FORMAT(FROM_UNIXTIME(" . $reflectField . "), '" . $sqlDateFormat . "') as `id`";
 }
@@ -170,32 +170,32 @@ 
 /** Получаем объект DocLister'a */
 $DLAPI = $modx->getPlaceholder('DLAPI');
 
-if ($reflectType == 'month') {
+if ($reflectType == 'month') {

     //Загружаем лексикон с месяцами
     $DLAPI->loadLang('months');
 }
 
 /** Разбираем API ответ от DocLister'a */
 $totalReflects = json_decode($totalReflects, true);
-if (is_null($totalReflects)) {
+if (is_null($totalReflects)) {

     $totalReflects = array();
 }
 $totalReflects = new DLCollection($modx, $totalReflects);
-$totalReflects = $totalReflects->filter(function ($el) {
+$totalReflects = $totalReflects->filter(function ($el) {

     return !empty($el['id']);
 });
 /** Добавляем активную дату в коллекцию */
-if (!is_null($activeReflect)) {
+if (!is_null($activeReflect)) {

     $totalReflects->add(array('id' => $activeReflect), $activeReflect);
 }
 $hasCurrentReflect = ($totalReflects->indexOf(array('id' => $originalCurrentReflect)) !== false);
 
 /** Добавляем текущую дату в коллекцию */
-if ($appendCurrentReflect) {
+if ($appendCurrentReflect) {

     $totalReflects->add(array('id' => $originalCurrentReflect), $originalCurrentReflect);
 }
 /** Сортируем даты по возрастанию */
-$totalReflects->sort(function ($a, $b) use ($dateFormat) {
+$totalReflects->sort(function ($a, $b) use ($dateFormat) {

     $aDate = DateTime::createFromFormat($dateFormat, $a['id']);
     $bDate = DateTime::createFromFormat($dateFormat, $b['id']);
 
@@ -207,9 +207,9 @@ 
     $activeReflect,
     $originalDate,
     $dateFormat
-) {
+) {

     $aDate = DateTime::createFromFormat($dateFormat, $val['id']);
-    if (is_null($activeReflect)) {
+    if (is_null($activeReflect)) {

         $activeReflect = $originalDate;
     }
     $bDate = DateTime::createFromFormat($dateFormat, $activeReflect);
@@ -217,7 +217,7 @@ 
     return $aDate->getTimestamp() < $bDate->getTimestamp();
 });
 /** Удаляем текущую активную дату из списка дат идущих за текущим */
-if ($rReflect->indexOf(array('id' => $originalCurrentReflect)) !== false) {
+if ($rReflect->indexOf(array('id' => $originalCurrentReflect)) !== false) {

     $rReflect->reindex()->remove(0);
 }
 /** Разворачиваем в обратном порядке список дат до текущей даты */
@@ -225,13 +225,13 @@ 
 
 /** Расчитываем сколько дат из какого списка взять */
 $showBefore = ($lReflect->count() < $limitBefore || empty($limitBefore)) ? $lReflect->count() : $limitBefore;
-if (($rReflect->count() < $limitAfter) || empty($limitAfter)) {
+if (($rReflect->count() < $limitAfter) || empty($limitAfter)) {

     $showAfter = $rReflect->count();
     $showBefore += !empty($limitAfter) ? ($limitAfter - $rReflect->count()) : 0;
-} else {
-    if ($limitBefore > 0) {
+} else {

+    if ($limitBefore > 0) {

         $showAfter = $limitAfter + ($limitBefore - $showBefore);
-    } else {
+    } else {

         $showAfter = $limitAfter;
     }
 }
@@ -241,25 +241,25 @@ 
 $outReflects = new DLCollection($modx);
 /** Берем нужное число элементов с левой стороны */
 $i = 0;
-foreach ($lReflect as $item) {
-    if ((++$i) > $showBefore) {
+foreach ($lReflect as $item) {

+    if ((++$i) > $showBefore) {

         break;
     }
     $outReflects->add($item['id']);
 }
 /** Добавляем текущую дату */
-if (is_null($activeReflect)) {
-    if (($hasCurrentReflect && !$selectCurrentReflect) || $appendCurrentReflect) {
+if (is_null($activeReflect)) {

+    if (($hasCurrentReflect && !$selectCurrentReflect) || $appendCurrentReflect) {

         $outReflects->add($originalCurrentReflect);
     }
-} else {
+} else {

     $outReflects->add($activeReflect);
 }
 
 /** Берем оставшее число позиций с правой стороны */
 $i = 0;
-foreach ($rReflect as $item) {
-    if ((++$i) > $showAfter) {
+foreach ($rReflect as $item) {

+    if ((++$i) > $showAfter) {

         break;
     }
     $outReflects->add($item['id']);
@@ -267,11 +267,11 @@ 
 
 $sortDir = APIHelpers::getkey($params, 'sortDir', 'ASC');
 /** Сортируем результатирующий список  */
-$outReflects = $outReflects->sort(function ($a, $b) use ($sortDir, $dateFormat) {
+$outReflects = $outReflects->sort(function ($a, $b) use ($sortDir, $dateFormat) {

     $aDate = DateTime::createFromFormat($dateFormat, $a);
     $bDate = DateTime::createFromFormat($dateFormat, $b);
     $out = false;
-    switch ($sortDir) {
+    switch ($sortDir) {

         case 'ASC':
             $out = $aDate->getTimestamp() - $bDate->getTimestamp();
             break;
@@ -284,10 +284,10 @@ 
 })->reindex()->unique();
 
 /** Применяем шаблон к каждой отображаемой дате */
-foreach ($outReflects as $reflectItem) {
+foreach ($outReflects as $reflectItem) {

     $tpl = (!is_null($activeReflect) && $activeReflect == $reflectItem) ? $activeReflectTPL : $reflectTPL;
 
-    $data = DLReflect::switchReflect($reflectType, function () use ($reflectItem, $DLAPI) {
+    $data = DLReflect::switchReflect($reflectType, function () use ($reflectItem, $DLAPI) {

         list($vMonth, $vYear) = explode('-', $reflectItem, 2);
 
         return array(
@@ -295,7 +295,7 @@ 
             'monthName' => $DLAPI->getMsg('months.' . (int)$vMonth),
             'year'      => $vYear,
         );
-    }, function () use ($reflectItem) {
+    }, function () use ($reflectItem) {

         return array(
             'year' => $reflectItem
         );
@@ -321,9 +321,9 @@ 
 /**
  * Ну и выводим стек отладки если это нужно
  */
-if (isset($_SESSION['usertype']) && $_SESSION['usertype'] == 'manager') {
+if (isset($_SESSION['usertype']) && $_SESSION['usertype'] == 'manager') {

     $debug = $DLAPI->debug->showLog();
-} else {
+} else {

     $debug = '';
 }
 

Spacing +18 added lines, -18 removed lines

@@ -25,7 +25,7 @@ 
  *            year - по годам
  */
 $reflectType = APIHelpers::getkey($params, 'reflectType', 'month');
-if (!in_array($reflectType, array('year', 'month'))) {
+if ( ! in_array($reflectType, array('year', 'month'))) {
     return '';
 }
 
@@ -50,9 +50,9 @@ 
  */
 $activeReflectTPL = APIHelpers::getkey($params, 'activeReflectTPL', '@CODE: <li><span>[+title+]</span></li>');
 
-list($dateFormat, $sqlDateFormat, $reflectValidator) = DLReflect::switchReflect($reflectType, function () {
+list($dateFormat, $sqlDateFormat, $reflectValidator) = DLReflect::switchReflect($reflectType, function() {
     return array('m-Y', '%m-%Y', array('DLReflect', 'validateMonth'));
-}, function () {
+}, function() {
     return array('Y', '%Y', array('DLReflect', 'validateYear'));
 });
 $tmp = $originalDate = date($dateFormat);
@@ -65,13 +65,13 @@ 
  *        Если не указан в параметре, то генерируется автоматически текущая дата
  */
 $currentReflect = APIHelpers::getkey($params, 'currentReflect', $tmp);
-if (!call_user_func($reflectValidator, $currentYear)) {
+if ( ! call_user_func($reflectValidator, $currentYear)) {
     $currentReflect = $tmp;
 }
 $originalCurrentReflect = $currentReflect;
 
 $selectCurrentReflect = APIHelpers::getkey($params, 'selectCurrentReflect', 1);
-if (!$selectCurrentReflect && $currentReflect == $tmp) {
+if ( ! $selectCurrentReflect && $currentReflect == $tmp) {
     $currentReflect = null;
 }
 
@@ -99,9 +99,9 @@ 
  */
 $tmp = APIHelpers::getkey($params, 'activeReflect', $currentReflect);
 $tmpGet = APIHelpers::getkey($_GET, $reflectType, $tmp);
-if (!call_user_func($reflectValidator, $tmpGet)) {
+if ( ! call_user_func($reflectValidator, $tmpGet)) {
     $activeReflect = $tmp;
-    if (!call_user_func($reflectValidator, $activeReflect)) {
+    if ( ! call_user_func($reflectValidator, $activeReflect)) {
         $activeReflect = $currentReflect;
     }
 } else {
@@ -181,11 +181,11 @@ 
     $totalReflects = array();
 }
 $totalReflects = new DLCollection($modx, $totalReflects);
-$totalReflects = $totalReflects->filter(function ($el) {
-    return !empty($el['id']);
+$totalReflects = $totalReflects->filter(function($el) {
+    return ! empty($el['id']);
 });
 /** Добавляем активную дату в коллекцию */
-if (!is_null($activeReflect)) {
+if ( ! is_null($activeReflect)) {
     $totalReflects->add(array('id' => $activeReflect), $activeReflect);
 }
 $hasCurrentReflect = ($totalReflects->indexOf(array('id' => $originalCurrentReflect)) !== false);
@@ -195,7 +195,7 @@ 
     $totalReflects->add(array('id' => $originalCurrentReflect), $originalCurrentReflect);
 }
 /** Сортируем даты по возрастанию */
-$totalReflects->sort(function ($a, $b) use ($dateFormat) {
+$totalReflects->sort(function($a, $b) use ($dateFormat) {
     $aDate = DateTime::createFromFormat($dateFormat, $a['id']);
     $bDate = DateTime::createFromFormat($dateFormat, $b['id']);
 
@@ -203,7 +203,7 @@ 
 })->reindex();
 
 /** Разделяем коллекцию дат на 2 части (до текущей даты и после) */
-list($lReflect, $rReflect) = $totalReflects->partition(function ($key, $val) use (
+list($lReflect, $rReflect) = $totalReflects->partition(function($key, $val) use (
     $activeReflect,
     $originalDate,
     $dateFormat
@@ -227,7 +227,7 @@ 
 $showBefore = ($lReflect->count() < $limitBefore || empty($limitBefore)) ? $lReflect->count() : $limitBefore;
 if (($rReflect->count() < $limitAfter) || empty($limitAfter)) {
     $showAfter = $rReflect->count();
-    $showBefore += !empty($limitAfter) ? ($limitAfter - $rReflect->count()) : 0;
+    $showBefore += ! empty($limitAfter) ? ($limitAfter - $rReflect->count()) : 0;
 } else {
     if ($limitBefore > 0) {
         $showAfter = $limitAfter + ($limitBefore - $showBefore);
@@ -249,7 +249,7 @@ 
 }
 /** Добавляем текущую дату */
 if (is_null($activeReflect)) {
-    if (($hasCurrentReflect && !$selectCurrentReflect) || $appendCurrentReflect) {
+    if (($hasCurrentReflect && ! $selectCurrentReflect) || $appendCurrentReflect) {
         $outReflects->add($originalCurrentReflect);
     }
 } else {
@@ -267,7 +267,7 @@ 
 
 $sortDir = APIHelpers::getkey($params, 'sortDir', 'ASC');
 /** Сортируем результатирующий список  */
-$outReflects = $outReflects->sort(function ($a, $b) use ($sortDir, $dateFormat) {
+$outReflects = $outReflects->sort(function($a, $b) use ($sortDir, $dateFormat) {
     $aDate = DateTime::createFromFormat($dateFormat, $a);
     $bDate = DateTime::createFromFormat($dateFormat, $b);
     $out = false;
@@ -285,9 +285,9 @@ 
 
 /** Применяем шаблон к каждой отображаемой дате */
 foreach ($outReflects as $reflectItem) {
-    $tpl = (!is_null($activeReflect) && $activeReflect == $reflectItem) ? $activeReflectTPL : $reflectTPL;
+    $tpl = ( ! is_null($activeReflect) && $activeReflect == $reflectItem) ? $activeReflectTPL : $reflectTPL;
 
-    $data = DLReflect::switchReflect($reflectType, function () use ($reflectItem, $DLAPI) {
+    $data = DLReflect::switchReflect($reflectType, function() use ($reflectItem, $DLAPI) {
         list($vMonth, $vYear) = explode('-', $reflectItem, 2);
 
         return array(
@@ -295,7 +295,7 @@ 
             'monthName' => $DLAPI->getMsg('months.' . (int)$vMonth),
             'year'      => $vYear,
         );
-    }, function () use ($reflectItem) {
+    }, function() use ($reflectItem) {
         return array(
             'year' => $reflectItem
         );

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

Doc Comments +5 added lines, -5 removed lines

@@ -399,8 +399,8 @@ 
     /**
      * @param $name
      * @param $table
-     * @param $alias
-     * @return mixed
+     * @param string $alias
+     * @return string
      */
     public function TableAlias($name, $table, $alias)
     {
@@ -465,7 +465,7 @@ 
     /**
      * Разбор JSON строки при помощи json_decode
      *
-     * @param $json string строка c JSON
+     * @param string $json string строка c JSON
      * @param array $config ассоциативный массив с настройками для json_decode
      * @param bool $nop создавать ли пустой объект запрашиваемого типа
      * @return array|mixed|xNop
@@ -550,7 +550,7 @@ 
      * Удаление определенных данных из массива
      *
      * @param array $data массив с данными
-     * @param mixed $val значение которые необходимо удалить из массива
+     * @param string $val значение которые необходимо удалить из массива
      * @return array отчищеный массив с данными
      */
     private function unsetArrayVal($data, $val)
@@ -1180,7 +1180,7 @@ 
 
     /**
      * @param array $item
-     * @param null $extSummary
+     * @param summary_DL_Extender $extSummary
      * @param string $introField
      * @param string $contentField
      * @return mixed|string

Indentation +2 added lines, -2 removed lines

@@ -1700,8 +1700,8 @@
         $fltr_params = explode(':', $filter, 2);
         $fltr = APIHelpers::getkey($fltr_params, 0, null);
         /**
-        * @var tv_DL_filter|content_DL_filter $fltr_class
-        */
+         * @var tv_DL_filter|content_DL_filter $fltr_class
+         */
         $fltr_class = $fltr . '_DL_filter';
         // check if the filter is implemented
         if (!is_null($fltr)) {

Spacing +44 added lines, -44 removed lines

@@ -202,7 +202,7 @@ 
             $this->modx = $modx;
             $this->setDebug(1);
 
-            if (!is_array($cfg) || empty($cfg)) {
+            if ( ! is_array($cfg) || empty($cfg)) {
                 $cfg = $this->modx->Event->params;
             }
         } else {
@@ -406,11 +406,11 @@ 
      */
     public function getTable($name, $alias = '')
     {
-        if (!isset($this->_table[$name])) {
+        if ( ! isset($this->_table[$name])) {
             $this->_table[$name] = $this->modx->getFullTableName($name);
         }
         $table = $this->_table[$name];
-        if (!empty($alias) && is_scalar($alias)) {
+        if ( ! empty($alias) && is_scalar($alias)) {
             $table .= " as `" . $alias . "`";
         }
 
@@ -425,7 +425,7 @@ 
      */
     public function TableAlias($name, $table, $alias)
     {
-        if (!$this->checkTableAlias($name, $table)) {
+        if ( ! $this->checkTableAlias($name, $table)) {
             $this->AddTable[$table][$name] = $alias;
         }
 
@@ -470,7 +470,7 @@ 
     public function isErrorJSON($json)
     {
         $error = jsonHelper::json_last_error_msg();
-        if (!in_array($error, array('error_none', 'other'))) {
+        if ( ! in_array($error, array('error_none', 'other'))) {
             $this->debug->error($this->getMsg('json.' . $error) . ": " . $this->debug->dumpData($json, 'code'), 'JSON');
             $error = true;
         }
@@ -489,13 +489,13 @@ 
         $extenders = $this->getCFGDef('extender', '');
         $extenders = explode(",", $extenders);
         $tmp = $this->getCFGDef('requestActive', '') != '' || in_array('request', $extenders);
-        if ($tmp && !$this->_loadExtender('request')) {
+        if ($tmp && ! $this->_loadExtender('request')) {
             //OR request in extender's parameter
             throw new Exception('Error load request extender');
         }
 
         $tmp = $this->getCFGDef('summary', '') != '' || in_array('summary', $extenders);
-        if ($tmp && !$this->_loadExtender('summary')) {
+        if ($tmp && ! $this->_loadExtender('summary')) {
             //OR summary in extender's parameter
             throw new Exception('Error load summary extender');
         }
@@ -507,7 +507,7 @@ 
                 $this->getCFGDef('TplCurrentPage', '') != '' || $this->getCFGDef('TplWrapPaginate', '') != '' ||
                 $this->getCFGDef('pageLimit', '') != '' || $this->getCFGDef('pageAdjacents', '') != '' ||
                 $this->getCFGDef('PaginateClass', '') != '' || $this->getCFGDef('TplNextP', '') != ''
-            ) && !$this->_loadExtender('paginate')
+            ) && ! $this->_loadExtender('paginate')
         ) {
             throw new Exception('Error load paginate extender');
         } else {
@@ -674,7 +674,7 @@ 
         if ($ext != '') {
             $ext = explode(",", $ext);
             foreach ($ext as $item) {
-                if ($item != '' && !$this->_loadExtender($item)) {
+                if ($item != '' && ! $this->_loadExtender($item)) {
                     throw new Exception('Error load ' . APIHelpers::e($item) . ' extender');
                 }
             }
@@ -735,8 +735,8 @@ 
      */
     public function sanitarIn($data, $sep = ',', $quote = true)
     {
-        if(is_scalar($data)) $data = explode($sep, $data);
-        if(!is_array($data)) $data = array(); //@TODO: throw
+        if (is_scalar($data)) $data = explode($sep, $data);
+        if ( ! is_array($data)) $data = array(); //@TODO: throw
 
         $out = array();
         foreach ($data as $item) {
@@ -872,7 +872,7 @@ 
     protected function renderTree($data)
     {
         $out = '';
-        if (!empty($data['#childNodes'])) {
+        if ( ! empty($data['#childNodes'])) {
             foreach ($data['#childNodes'] as $item) {
                 $out .= $this->renderTree($item);
             }
@@ -911,7 +911,7 @@ 
     public function parseLang($tpl)
     {
         $this->debug->debug(array("parseLang" => $tpl), "parseLang", 2, array('html'));
-        if (is_scalar($tpl) && !empty($tpl)) {
+        if (is_scalar($tpl) && ! empty($tpl)) {
             if (preg_match_all("/\[\%([a-zA-Z0-9\.\_\-]+)\%\]/", $tpl, $match)) {
                 $langVal = array();
                 foreach ($match[1] as $item) {
@@ -979,7 +979,7 @@ 
     {
         $out = $data;
         $docs = count($this->_docs) - $this->skippedDocs;
-        if ((($this->getCFGDef("noneWrapOuter", "1") && $docs == 0) || $docs > 0) && !empty($this->ownerTPL)) {
+        if ((($this->getCFGDef("noneWrapOuter", "1") && $docs == 0) || $docs > 0) && ! empty($this->ownerTPL)) {
             $this->debug->debug("", "renderWrapTPL", 2);
             $parse = true;
             $plh = array($this->getCFGDef("sysKey", "dl") . ".wrap" => $data);
@@ -1002,7 +1002,7 @@ 
                 }
                 $plh = $params;
             }
-            if ($parse && !empty($this->ownerTPL)) {
+            if ($parse && ! empty($this->ownerTPL)) {
                 $this->debug->updateMessage(
                     array("render ownerTPL" => $this->ownerTPL, "With data" => print_r($plh, 1)),
                     "renderWrapTPL",
@@ -1042,7 +1042,7 @@ 
             $offset = $this->getCFGDef('reversePagination',
                 0) && $this->extPaginate->currentPage() > 1 ? $this->extPaginate->totalPage() * $this->getCFGDef('display',
                     0) - $this->extPaginate->totalDocs() : 0;
-            if ($this->getCFGDef('maxDocs', 0) && !$this->getCFGDef('reversePagination',
+            if ($this->getCFGDef('maxDocs', 0) && ! $this->getCFGDef('reversePagination',
                     0) && $this->extPaginate->currentPage() == $this->extPaginate->totalPage()
             ) {
                 $iteration += $this->getCFGDef('display', 0);
@@ -1159,10 +1159,10 @@ 
         $introField = $this->getCFGDef("introField", $introField);
         $contentField = $this->getCFGDef("contentField", $contentField);
 
-        if (!empty($introField) && !empty($item[$introField]) && mb_strlen($item[$introField], 'UTF-8') > 0) {
+        if ( ! empty($introField) && ! empty($item[$introField]) && mb_strlen($item[$introField], 'UTF-8') > 0) {
             $out = $item[$introField];
         } else {
-            if (!empty($contentField) && !empty($item[$contentField]) && mb_strlen($item[$contentField], 'UTF-8') > 0) {
+            if ( ! empty($contentField) && ! empty($item[$contentField]) && mb_strlen($item[$contentField], 'UTF-8') > 0) {
                 $out = $extSummary->init($this, array(
                     "content"      => $item[$contentField],
                     "action"       => $this->getCFGDef("summary", ""),
@@ -1231,7 +1231,7 @@ 
             $flag = true;
 
         } else {
-            if (!class_exists($classname, false) && $classname != '') {
+            if ( ! class_exists($classname, false) && $classname != '') {
                 if (file_exists(dirname(__FILE__) . "/extender/" . $name . ".extender.inc")) {
                     include_once(dirname(__FILE__) . "/extender/" . $name . ".extender.inc");
                 }
@@ -1241,7 +1241,7 @@ 
                 $flag = true;
             }
         }
-        if (!$flag) {
+        if ( ! $flag) {
             $this->debug->debug("Error load Extender " . $this->debug->dumpData($name));
         }
         $this->debug->debugEnd('LoadExtender');
@@ -1299,7 +1299,7 @@ 
         $this->debug->debug('clean IDs ' . $this->debug->dumpData($IDs) . ' with separator ' . $this->debug->dumpData($sep),
             'cleanIDs', 2);
         $out = array();
-        if (!is_array($IDs)) {
+        if ( ! is_array($IDs)) {
             $IDs = explode($sep, $IDs);
         }
         foreach ($IDs as $item) {
@@ -1335,7 +1335,7 @@ 
     {
         $out = array();
         foreach ($this->_docs as $doc => $val) {
-            if (isset($val[$userField]) && (($uniq && !in_array($val[$userField], $out)) || !$uniq)) {
+            if (isset($val[$userField]) && (($uniq && ! in_array($val[$userField], $out)) || ! $uniq)) {
                 $out[$doc] = $val[$userField];
             }
         }
@@ -1424,7 +1424,7 @@ 
                             $out['order'] = $tmp;
                         // no break
                     }
-                    if ('' == $out['order'] || !in_array(strtoupper($out['order']), array('ASC', 'DESC'))) {
+                    if ('' == $out['order'] || ! in_array(strtoupper($out['order']), array('ASC', 'DESC'))) {
                         $out['order'] = $orderDef; //Default
                     }
 
@@ -1519,21 +1519,21 @@ 
         $children = array(); // children of each ID
         $ids = array();
         foreach ($data as $i => $r) {
-            $row =& $data[$i];
+            $row = & $data[$i];
             $id = $row[$idName];
             $pid = $row[$pidName];
-            $children[$pid][$id] =& $row;
-            if (!isset($children[$id])) {
+            $children[$pid][$id] = & $row;
+            if ( ! isset($children[$id])) {
                 $children[$id] = array();
             }
-            $row['#childNodes'] =& $children[$id];
+            $row['#childNodes'] = & $children[$id];
             $ids[$row[$idName]] = true;
         }
         // Root elements are elements with non-found PIDs.
         $this->_tree = array();
         foreach ($data as $i => $r) {
-            $row =& $data[$i];
-            if (!isset($ids[$row[$pidName]])) {
+            $row = & $data[$i];
+            if ( ! isset($ids[$row[$pidName]])) {
                 $this->_tree[$row[$idName]] = $row;
             }
         }
@@ -1549,10 +1549,10 @@ 
      */
     public function getPK($full = true)
     {
-        $idField = isset($this->idField) ? $this->idField: 'id';
+        $idField = isset($this->idField) ? $this->idField : 'id';
         if ($full) {
             $idField = '`' . $idField . '`';
-            if (!empty($this->alias)) {
+            if ( ! empty($this->alias)) {
                 $idField = '`' . $this->alias . '`.' . $idField;
             }
         }
@@ -1569,9 +1569,9 @@ 
     public function getParentField($full = true)
     {
         $parentField = isset($this->parentField) ? $this->parentField : '';
-        if ($full && !empty($parentField)) {
+        if ($full && ! empty($parentField)) {
             $parentField = '`' . $parentField . '`';
-            if (!empty($this->alias)) {
+            if ( ! empty($this->alias)) {
                 $parentField = '`' . $this->alias . '`.' . $parentField;
             }
         }
@@ -1591,7 +1591,7 @@ 
         $this->debug->debug("getFilters: " . $this->debug->dumpData($filter_string), 'getFilter', 1);
         // the filter parameter tells us, which filters can be used in this query
         $filter_string = trim($filter_string, ' ;');
-        if (!$filter_string) {
+        if ( ! $filter_string) {
             return;
         }
         $output = array('join' => '', 'where' => '');
@@ -1604,7 +1604,7 @@ 
                 $subfilters = $this->smartSplit($subfilters);
                 foreach ($subfilters as $subfilter) {
                     $subfilter = $this->getFilters(trim($subfilter));
-                    if (!$subfilter) {
+                    if ( ! $subfilter) {
                         continue;
                     }
                     if ($subfilter['join']) {
@@ -1614,14 +1614,14 @@ 
                         $wheres[] = $subfilter['where'];
                     }
                 }
-                $output['join'] = !empty($joins) ? implode(' ', $joins) : '';
-                $output['where'] = !empty($wheres) ? '(' . implode($sql, $wheres) . ')' : '';
+                $output['join'] = ! empty($joins) ? implode(' ', $joins) : '';
+                $output['where'] = ! empty($wheres) ? '(' . implode($sql, $wheres) . ')' : '';
             }
         }
 
-        if (!$logic_op_found) {
+        if ( ! $logic_op_found) {
             $filter = $this->loadFilter($filter_string);
-            if (!$filter) {
+            if ( ! $filter) {
                 $this->debug->warning('Error while loading DocLister filter "' . $this->debug->dumpData($filter_string) . '": check syntax!');
                 $output = false;
             } else {
@@ -1655,8 +1655,8 @@ 
      * @return $this
      */
     public function setFiltersJoin($join = '') {
-        if (!empty($join)) {
-            if (!empty($this->_filters['join'])) {
+        if ( ! empty($join)) {
+            if ( ! empty($this->_filters['join'])) {
                 $this->_filters['join'] .= ' ' . $join;
             } else {
                 $this->_filters['join'] = $join;
@@ -1713,8 +1713,8 @@ 
         */
         $fltr_class = $fltr . '_DL_filter';
         // check if the filter is implemented
-        if (!is_null($fltr)) {
-            if (!class_exists($fltr_class) && file_exists(__DIR__ . '/filter/' . $fltr . '.filter.php')) {
+        if ( ! is_null($fltr)) {
+            if ( ! class_exists($fltr_class) && file_exists(__DIR__ . '/filter/' . $fltr . '.filter.php')) {
                 require_once dirname(__FILE__) . '/filter/' . $fltr . '.filter.php';
             }
             if (class_exists($fltr_class)) {
@@ -1727,7 +1727,7 @@ 
                 }
             }
         }
-        if (!$out) {
+        if ( ! $out) {
             $this->debug->error("Error load Filter: '{$this->debug->dumpData($filter)}'", 'Filter');
         }
 

Braces +300 added lines, -292 removed lines

@@ -17,8 +17,8 @@ 
 /**
  * Class DocLister
  */
-abstract class DocLister
-{
+abstract class DocLister

+{

     /**
      * Ключ в массиве $_REQUEST в котором находится алиас запрашиваемого документа
      */
@@ -188,48 +188,48 @@ 
      * @param int $startTime время запуска сниппета
      * @throws Exception
      */
-    public function __construct($modx, $cfg = array(), $startTime = null)
-    {
+    public function __construct($modx, $cfg = array(), $startTime = null)

+    {

         $this->setTimeStart($startTime);
 
-        if (extension_loaded('mbstring')) {
+        if (extension_loaded('mbstring')) {

             mb_internal_encoding("UTF-8");
-        } else {
+        } else {

             throw new Exception('Not found php extension mbstring');
         }
 
-        if ($modx instanceof DocumentParser) {
+        if ($modx instanceof DocumentParser) {

             $this->modx = $modx;
             $this->setDebug(1);
 
-            if (!is_array($cfg) || empty($cfg)) {
+            if (!is_array($cfg) || empty($cfg)) {

                 $cfg = $this->modx->Event->params;
             }
-        } else {
+        } else {

             throw new Exception('MODX var is not instaceof DocumentParser');
         }
 
         $this->FS = \Helpers\FS::getInstance();
         $this->config = new \Helpers\Config($cfg);
 
-        if (isset($cfg['config'])) {
+        if (isset($cfg['config'])) {

             $this->config->setPath(dirname(__DIR__))->loadConfig($cfg['config']);
         }
 
-        if ($this->config->setConfig($cfg) === false) {
+        if ($this->config->setConfig($cfg) === false) {

             throw new Exception('no parameters to run DocLister');
         }
 
         $this->loadLang(array('core', 'json'));
         $this->setDebug($this->getCFGDef('debug', 0));
 
-        if ($this->checkDL()) {
+        if ($this->checkDL()) {

             $cfg = array();
             $idType = $this->getCFGDef('idType', '');
-            if (empty($idType) && $this->getCFGDef('documents', '') != '') {
+            if (empty($idType) && $this->getCFGDef('documents', '') != '') {

                 $idType = 'documents';
             }
-            switch ($idType) {
+            switch ($idType) {

                 case 'documents':
                     $IDs = $this->getCFGDef('documents');
                     $cfg['idType'] = "documents";
@@ -237,7 +237,7 @@ 
                 case 'parents':
                 default:
                     $cfg['idType'] = "parents";
-                    if (($IDs = $this->getCFGDef('parents', '')) === '') {
+                    if (($IDs = $this->getCFGDef('parents', '')) === '') {

                         $IDs = $this->getCurrentMODXPageID();
                     }
                     break;
@@ -256,21 +256,21 @@ 
 
         $this->setLocate();
 
-        if ($this->getCFGDef("customLang")) {
+        if ($this->getCFGDef("customLang")) {

             $this->getCustomLang();
         }
         $this->loadExtender($this->getCFGDef("extender", ""));
 
-        if ($this->checkExtender('request')) {
+        if ($this->checkExtender('request')) {

             $this->extender['request']->init($this, $this->getCFGDef("requestActive", ""));
         }
         $this->_filters = $this->getFilters($this->getCFGDef('filters', ''));
         $this->ownerTPL = $this->getCFGDef("ownerTPL", "");
         $DLTemplate = DLTemplate::getInstance($modx);
-        if ($path = $this->getCFGDef('templatePath')) {
+        if ($path = $this->getCFGDef('templatePath')) {

             $DLTemplate->setTemplatePath($path);
         }
-        if ($ext = $this->getCFGDef('templateExtension')) {
+        if ($ext = $this->getCFGDef('templateExtension')) {

             $DLTemplate->setTemplateExtension($ext);
         }
         $DLTemplate->setTwigTemplateVars(array('DocLister' => $this));
@@ -282,25 +282,25 @@ 
      * @param string $str строка с фильтром
      * @return array массив субфильтров
      */
-    public function smartSplit($str)
-    {
+    public function smartSplit($str)

+    {

         $res = array();
         $cur = '';
         $open = 0;
         $strlen = mb_strlen($str, 'UTF-8');
-        for ($i = 0; $i <= $strlen; $i++) {
+        for ($i = 0; $i <= $strlen; $i++) {

             $e = mb_substr($str, $i, 1, 'UTF-8');
-            switch ($e) {
+            switch ($e) {

                 case '\\':
                     $cur .= $e;
                     $cur .= mb_substr($str, ++$i, 1, 'UTF-8');
                     break;
                 case ')':
                     $open--;
-                    if ($open == 0) {
+                    if ($open == 0) {

                         $res[] = $cur . ')';
                         $cur = '';
-                    } else {
+                    } else {

                         $cur .= $e;
                     }
                     break;
@@ -309,10 +309,10 @@ 
                     $cur .= $e;
                     break;
                 case ';':
-                    if ($open == 0) {
+                    if ($open == 0) {

                         $res[] = $cur;
                         $cur = '';
-                    } else {
+                    } else {

                         $cur .= $e;
                     }
                     break;
@@ -321,7 +321,7 @@ 
             }
         }
         $cur = preg_replace("/(\))$/u", '', $cur);
-        if ($cur != '') {
+        if ($cur != '') {

             $res[] = $cur;
         }
 
@@ -332,8 +332,8 @@ 
      * Трансформация объекта в строку
      * @return string последний ответ от DocLister'а
      */
-    public function __toString()
-    {
+    public function __toString()

+    {

         return $this->outData;
     }
 
@@ -341,8 +341,8 @@ 
      * Установить время запуска сниппета
      * @param float|null $time
      */
-    public function setTimeStart($time = null)
-    {
+    public function setTimeStart($time = null)

+    {

         $this->_timeStart = is_null($time) ? microtime(true) : $time;
     }
 
@@ -351,8 +351,8 @@ 
      *
      * @return int
      */
-    public function getTimeStart()
-    {
+    public function getTimeStart()

+    {

         return $this->_timeStart;
     }
 
@@ -360,27 +360,27 @@ 
      * Установка режима отладки
      * @param int $flag режим отладки
      */
-    public function setDebug($flag = 0)
-    {
+    public function setDebug($flag = 0)

+    {

         $flag = abs((int)$flag);
-        if ($this->_debugMode != $flag) {
+        if ($this->_debugMode != $flag) {

             $this->_debugMode = $flag;
             $this->debug = null;
-            if ($this->_debugMode > 0) {
-                if (isset($_SESSION['usertype']) && $_SESSION['usertype'] == 'manager') {
+            if ($this->_debugMode > 0) {

+                if (isset($_SESSION['usertype']) && $_SESSION['usertype'] == 'manager') {

                     error_reporting(E_ALL ^ E_NOTICE);
                     ini_set('display_errors', 1);
                 }
                 $dir = dirname(dirname(__FILE__));
-                if (file_exists($dir . "/lib/DLdebug.class.php")) {
+                if (file_exists($dir . "/lib/DLdebug.class.php")) {

                     include_once($dir . "/lib/DLdebug.class.php");
-                    if (class_exists("DLdebug", false)) {
+                    if (class_exists("DLdebug", false)) {

                         $this->debug = new DLdebug($this);
                     }
                 }
             }
 
-            if (is_null($this->debug)) {
+            if (is_null($this->debug)) {

                 $this->debug = new xNop();
                 $this->_debugMode = 0;
                 error_reporting(0);
@@ -392,8 +392,8 @@ 
     /**
      * Информация о режиме отладки
      */
-    public function getDebug()
-    {
+    public function getDebug()

+    {

         return $this->_debugMode;
     }
 
@@ -404,13 +404,13 @@ 
      * @param string $alias желаемый алиас таблицы
      * @return string имя таблицы с префиксом и алиасом
      */
-    public function getTable($name, $alias = '')
-    {
-        if (!isset($this->_table[$name])) {
+    public function getTable($name, $alias = '')

+    {

+        if (!isset($this->_table[$name])) {

             $this->_table[$name] = $this->modx->getFullTableName($name);
         }
         $table = $this->_table[$name];
-        if (!empty($alias) && is_scalar($alias)) {
+        if (!empty($alias) && is_scalar($alias)) {

             $table .= " as `" . $alias . "`";
         }
 
@@ -423,9 +423,9 @@ 
      * @param $alias
      * @return mixed
      */
-    public function TableAlias($name, $table, $alias)
-    {
-        if (!$this->checkTableAlias($name, $table)) {
+    public function TableAlias($name, $table, $alias)

+    {

+        if (!$this->checkTableAlias($name, $table)) {

             $this->AddTable[$table][$name] = $alias;
         }
 
@@ -437,8 +437,8 @@ 
      * @param $table
      * @return bool
      */
-    public function checkTableAlias($name, $table)
-    {
+    public function checkTableAlias($name, $table)

+    {

         return isset($this->AddTable[$table][$name]);
     }
 
@@ -450,8 +450,8 @@ 
      * @param bool $nop создавать ли пустой объект запрашиваемого типа
      * @return array|mixed|xNop
      */
-    public function jsonDecode($json, $config = array(), $nop = false)
-    {
+    public function jsonDecode($json, $config = array(), $nop = false)

+    {

         $this->debug->debug('Decode JSON: ' . $this->debug->dumpData($json) . "\r\nwith config: " . $this->debug->dumpData($config),
             'jsonDecode', 2);
         $config = jsonHelper::jsonDecode($json, $config, $nop);
@@ -467,10 +467,10 @@ 
      * @param $json string строка с JSON для записи в лог при отладке
      * @return bool|string
      */
-    public function isErrorJSON($json)
-    {
+    public function isErrorJSON($json)

+    {

         $error = jsonHelper::json_last_error_msg();
-        if (!in_array($error, array('error_none', 'other'))) {
+        if (!in_array($error, array('error_none', 'other'))) {

             $this->debug->error($this->getMsg('json.' . $error) . ": " . $this->debug->dumpData($json, 'code'), 'JSON');
             $error = true;
         }
@@ -482,20 +482,20 @@ 
      * Проверка параметров и загрузка необходимых экстендеров
      * return boolean статус загрузки
      */
-    public function checkDL()
-    {
+    public function checkDL()

+    {

         $this->debug->debug('Check DocLister parameters', 'checkDL', 2);
         $flag = true;
         $extenders = $this->getCFGDef('extender', '');
         $extenders = explode(",", $extenders);
         $tmp = $this->getCFGDef('requestActive', '') != '' || in_array('request', $extenders);
-        if ($tmp && !$this->_loadExtender('request')) {
+        if ($tmp && !$this->_loadExtender('request')) {

             //OR request in extender's parameter
             throw new Exception('Error load request extender');
         }
 
         $tmp = $this->getCFGDef('summary', '') != '' || in_array('summary', $extenders);
-        if ($tmp && !$this->_loadExtender('summary')) {
+        if ($tmp && !$this->_loadExtender('summary')) {

             //OR summary in extender's parameter
             throw new Exception('Error load summary extender');
         }
@@ -508,15 +508,15 @@ 
                 $this->getCFGDef('pageLimit', '') != '' || $this->getCFGDef('pageAdjacents', '') != '' ||
                 $this->getCFGDef('PaginateClass', '') != '' || $this->getCFGDef('TplNextP', '') != ''
             ) && !$this->_loadExtender('paginate')
-        ) {
+        ) {

             throw new Exception('Error load paginate extender');
-        } else {
-            if ((int)$this->getCFGDef('display', 0) == 0) {
+        } else {

+            if ((int)$this->getCFGDef('display', 0) == 0) {

                 $extenders = $this->unsetArrayVal($extenders, 'paginate');
             }
         }
 
-        if ($this->getCFGDef('prepare', '') != '' || $this->getCFGDef('prepareWrap') != '') {
+        if ($this->getCFGDef('prepare', '') != '' || $this->getCFGDef('prepareWrap') != '') {

             $this->_loadExtender('prepare');
         }
 
@@ -533,14 +533,14 @@ 
      * @param mixed $val значение которые необходимо удалить из массива
      * @return array отчищеный массив с данными
      */
-    private function unsetArrayVal($data, $val)
-    {
+    private function unsetArrayVal($data, $val)

+    {

         $out = array();
-        if (is_array($data)) {
-            foreach ($data as $item) {
-                if ($item != $val) {
+        if (is_array($data)) {

+            foreach ($data as $item) {

+                if ($item != $val) {

                     $out[] = $item;
-                } else {
+                } else {

                     continue;
                 }
             }
@@ -555,14 +555,14 @@ 
      * @param int $id уникальный идентификатор страницы
      * @return string URL страницы
      */
-    public function getUrl($id = 0)
-    {
+    public function getUrl($id = 0)

+    {

         $id = ((int)$id > 0) ? (int)$id : $this->getCurrentMODXPageID();
 
         $link = $this->checkExtender('request') ? $this->extender['request']->getLink() : $this->getRequest();
-        if ($id == $this->modx->config['site_start']) {
+        if ($id == $this->modx->config['site_start']) {

             $url = $this->modx->config['site_url'] . ($link != '' ? "?{$link}" : "");
-        } else {
+        } else {

             $url = $this->modx->makeUrl($id, '', $link, $this->getCFGDef('urlScheme', ''));
         }
 
@@ -590,20 +590,20 @@ 
      * @param string $tpl шаблон
      * @return string
      */
-    public function render($tpl = '')
-    {
+    public function render($tpl = '')

+    {

         $this->debug->debug(array('Render data with template ' => $tpl), 'render', 2, array('html'));
         $out = '';
-        if (1 == $this->getCFGDef('tree', '0')) {
-            foreach ($this->_tree as $item) {
+        if (1 == $this->getCFGDef('tree', '0')) {

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

                 $out .= $this->renderTree($item);
             }
             $out = $this->renderWrap($out);
-        } else {
+        } else {

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

             $this->outData = DLTemplate::getInstance($this->modx)->parseDocumentSource($out);
         }
         $this->debug->debugEnd('render');
@@ -620,8 +620,8 @@ 
      *
      * @return int
      */
-    public function getCurrentMODXPageID()
-    {
+    public function getCurrentMODXPageID()

+    {

         $id = isset($this->modx->documentIdentifier) ? (int)$this->modx->documentIdentifier : 0;
         $docData = isset($this->modx->documentObject) ? $this->modx->documentObject : array();
 
@@ -637,9 +637,9 @@ 
      * @param integer $line error on line
      * @param array $trace stack trace
      */
-    public function ErrorLogger($message, $code, $file, $line, $trace)
-    {
-        if (abs($this->getCFGDef('debug', '0')) == '1') {
+    public function ErrorLogger($message, $code, $file, $line, $trace)

+    {

+        if (abs($this->getCFGDef('debug', '0')) == '1') {

             $out = "CODE #" . $code . "<br />";
             $out .= "on file: " . $file . ":" . $line . "<br />";
             $out .= "<pre>";
@@ -656,8 +656,8 @@ 
      *
      * @return DocumentParser
      */
-    public function getMODX()
-    {
+    public function getMODX()

+    {

         return $this->modx;
     }
 
@@ -668,13 +668,13 @@ 
      * @return boolean status load extenders
      * @throws Exception
      */
-    public function loadExtender($ext = '')
-    {
+    public function loadExtender($ext = '')

+    {

         $out = true;
-        if ($ext != '') {
+        if ($ext != '') {

             $ext = explode(",", $ext);
-            foreach ($ext as $item) {
-                if ($item != '' && !$this->_loadExtender($item)) {
+            foreach ($ext as $item) {

+                if ($item != '' && !$this->_loadExtender($item)) {

                     throw new Exception('Error load ' . APIHelpers::e($item) . ' extender');
                 }
             }
@@ -690,8 +690,8 @@ 
      * @param mixed $def значение по умолчанию, если в конфиге нет искомого параметра
      * @return mixed значение из конфига
      */
-    public function getCFGDef($name, $def = null)
-    {
+    public function getCFGDef($name, $def = null)

+    {

         return $this->config->getCFGDef($name, $def);
     }
 
@@ -703,15 +703,15 @@ 
      * @param string $key ключ локального плейсхолдера
      * @return string
      */
-    public function toPlaceholders($data, $set = 0, $key = 'contentPlaceholder')
-    {
+    public function toPlaceholders($data, $set = 0, $key = 'contentPlaceholder')

+    {

         $this->debug->debug(null, 'toPlaceholders', 2);
-        if ($set == 0) {
+        if ($set == 0) {

             $set = $this->getCFGDef('contentPlaceholder', 0);
         }
         $this->_plh[$key] = $data;
         $id = $this->getCFGDef('id', '');
-        if ($id != '') {
+        if ($id != '') {

             $id .= ".";
         }
         $out = DLTemplate::getInstance($this->getMODX())->toPlaceholders($data, $set, $key, $id);
@@ -733,14 +733,19 @@ 
      * @param boolean $quote заключать ли данные на выходе в кавычки
      * @return string обработанная строка
      */
-    public function sanitarIn($data, $sep = ',', $quote = true)
-    {
-        if(is_scalar($data)) $data = explode($sep, $data);
-        if(!is_array($data)) $data = array(); //@TODO: throw
+    public function sanitarIn($data, $sep = ',', $quote = true)

+    {

+        if(is_scalar($data)) {

+            $data = explode($sep, $data);

+        }

+        if(!is_array($data)) {

+            $data = array();

+        }

+        //@TODO: throw
 
         $out = array();
-        foreach ($data as $item) {
-            if ($item !== '') {
+        foreach ($data as $item) {

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

                 $out[] = $this->modx->db->escape($item);
             }
         }
@@ -761,12 +766,12 @@ 
      * @param string $lang имя языкового пакета
      * @return array
      */
-    public function getCustomLang($lang = '')
-    {
-        if (empty($lang)) {
+    public function getCustomLang($lang = '')

+    {

+        if (empty($lang)) {

             $lang = $this->getCFGDef('lang', $this->modx->config['manager_language']);
         }
-        if (file_exists(dirname(dirname(__FILE__)) . "/lang/" . $lang . ".php")) {
+        if (file_exists(dirname(dirname(__FILE__)) . "/lang/" . $lang . ".php")) {

             $tmp = include(dirname(__FILE__) . "/lang/" . $lang . ".php");
             $this->_customLang = is_array($tmp) ? $tmp : array();
         }
@@ -782,25 +787,25 @@ 
      * @param boolean $rename Переименовывать ли элементы массива
      * @return array массив с лексиконом
      */
-    public function loadLang($name = 'core', $lang = '', $rename = true)
-    {
-        if (empty($lang)) {
+    public function loadLang($name = 'core', $lang = '', $rename = true)

+    {

+        if (empty($lang)) {

             $lang = $this->getCFGDef('lang', $this->modx->config['manager_language']);
         }
 
         $this->debug->debug('Load language ' . $this->debug->dumpData($name) . "." . $this->debug->dumpData($lang),
             'loadlang', 2);
-        if (is_scalar($name)) {
+        if (is_scalar($name)) {

             $name = array($name);
         }
-        foreach ($name as $n) {
-            if (file_exists(dirname(__FILE__) . "/lang/" . $lang . "/" . $n . ".inc.php")) {
+        foreach ($name as $n) {

+            if (file_exists(dirname(__FILE__) . "/lang/" . $lang . "/" . $n . ".inc.php")) {

                 $tmp = include(dirname(__FILE__) . "/lang/" . $lang . "/" . $n . ".inc.php");
-                if (is_array($tmp)) {
+                if (is_array($tmp)) {

                     /**
                      * Переименовыываем элементы массива из array('test'=>'data') в array('name.test'=>'data')
                      */
-                    if ($rename) {
+                    if ($rename) {

                         $tmp = $this->renameKeyArr($tmp, $n, '', '.');
                     }
                     $this->_lang = array_merge($this->_lang, $tmp);
@@ -819,11 +824,11 @@ 
      * @param string $def Строка по умолчанию, если запись в языковом пакете не будет обнаружена
      * @return string строка в соответствии с текущими языковыми настройками
      */
-    public function getMsg($name, $def = '')
-    {
-        if (isset($this->_customLang[$name])) {
+    public function getMsg($name, $def = '')

+    {

+        if (isset($this->_customLang[$name])) {

             $say = $this->_customLang[$name];
-        } else {
+        } else {

             $say = \APIHelpers::getkey($this->_lang, $name, $def);
         }
 
@@ -839,8 +844,8 @@ 
      * @param string $sep разделитель суффиксов, префиксов и ключей массива
      * @return array массив с переименованными ключами
      */
-    public function renameKeyArr($data, $prefix = '', $suffix = '', $sep = '.')
-    {
+    public function renameKeyArr($data, $prefix = '', $suffix = '', $sep = '.')

+    {

         return \APIHelpers::renameKeyArr($data, $prefix, $suffix, $sep);
     }
 
@@ -850,12 +855,12 @@ 
      * @param string $locale локаль
      * @return string имя установленной локали
      */
-    public function setLocate($locale = '')
-    {
-        if ('' == $locale) {
+    public function setLocate($locale = '')

+    {

+        if ('' == $locale) {

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

             setlocale(LC_ALL, $locale);
         }
 
@@ -869,11 +874,11 @@ 
      * @param array $data массив сформированный как дерево
      * @return string строка для отображения пользователю
      */
-    protected function renderTree($data)
-    {
+    protected function renderTree($data)

+    {

         $out = '';
-        if (!empty($data['#childNodes'])) {
-            foreach ($data['#childNodes'] as $item) {
+        if (!empty($data['#childNodes'])) {

+            foreach ($data['#childNodes'] as $item) {

                 $out .= $this->renderTree($item);
             }
         }
@@ -890,8 +895,8 @@ 
      * @param string $name Template: chunk name || @CODE: template || @FILE: file with template
      * @return string html template with placeholders without data
      */
-    private function _getChunk($name)
-    {
+    private function _getChunk($name)

+    {

         $this->debug->debug(array('Get chunk by name' => $name), "getChunk", 2, array('html'));
         //without trim
         $tpl = DLTemplate::getInstance($this->getMODX())->getChunk($name);
@@ -908,18 +913,18 @@ 
      * @param string $tpl HTML шаблон
      * @return string
      */
-    public function parseLang($tpl)
-    {
+    public function parseLang($tpl)

+    {

         $this->debug->debug(array("parseLang" => $tpl), "parseLang", 2, array('html'));
-        if (is_scalar($tpl) && !empty($tpl)) {
-            if (preg_match_all("/\[\%([a-zA-Z0-9\.\_\-]+)\%\]/", $tpl, $match)) {
+        if (is_scalar($tpl) && !empty($tpl)) {

+            if (preg_match_all("/\[\%([a-zA-Z0-9\.\_\-]+)\%\]/", $tpl, $match)) {

                 $langVal = array();
-                foreach ($match[1] as $item) {
+                foreach ($match[1] as $item) {

                     $langVal[] = $this->getMsg($item);
                 }
                 $tpl = str_replace($match[0], $langVal, $tpl);
             }
-        } else {
+        } else {

             $tpl = '';
         }
         $this->debug->debugEnd("parseLang");
@@ -935,8 +940,8 @@ 
      * @param bool $parseDocumentSource render html template via DocumentParser::parseDocumentSource()
      * @return string html template with data without placeholders
      */
-    public function parseChunk($name, $data, $parseDocumentSource = false)
-    {
+    public function parseChunk($name, $data, $parseDocumentSource = false)

+    {

         $this->debug->debug(
             array("parseChunk" => $name, "With data" => print_r($data, 1)),
             "parseChunk",
@@ -945,7 +950,7 @@ 
 
         $out = $this->DLTemplate->parseChunk($name, $data, $parseDocumentSource);
         $out = $this->parseLang($out);
-        if (empty($out)) {
+        if (empty($out)) {

             $this->debug->debug("Empty chunk: " . $this->debug->dumpData($name), '', 2);
         }
         $this->debug->debugEnd("parseChunk");
@@ -961,8 +966,8 @@ 
      *
      * @return string html template from parameter
      */
-    public function getChunkByParam($name, $val = '')
-    {
+    public function getChunkByParam($name, $val = '')

+    {

         $data = $this->getCFGDef($name, $val);
         $data = $this->_getChunk($data);
 
@@ -975,11 +980,11 @@ 
      * @param string $data html код который нужно обернуть в ownerTPL
      * @return string результатирующий html код
      */
-    public function renderWrap($data)
-    {
+    public function renderWrap($data)

+    {

         $out = $data;
         $docs = count($this->_docs) - $this->skippedDocs;
-        if ((($this->getCFGDef("noneWrapOuter", "1") && $docs == 0) || $docs > 0) && !empty($this->ownerTPL)) {
+        if ((($this->getCFGDef("noneWrapOuter", "1") && $docs == 0) || $docs > 0) && !empty($this->ownerTPL)) {

             $this->debug->debug("", "renderWrapTPL", 2);
             $parse = true;
             $plh = array($this->getCFGDef("sysKey", "dl") . ".wrap" => $data);
@@ -987,7 +992,7 @@ 
              * @var $extPrepare prepare_DL_Extender
              */
             $extPrepare = $this->getExtender('prepare');
-            if ($extPrepare) {
+            if ($extPrepare) {

                 $params = $extPrepare->init($this, array(
                     'data'      => array(
                         'docs'         => $this->_docs,
@@ -996,13 +1001,13 @@ 
                     'nameParam' => 'prepareWrap',
                     'return'    => 'placeholders'
                 ));
-                if (is_bool($params) && $params === false) {
+                if (is_bool($params) && $params === false) {

                     $out = $data;
                     $parse = false;
                 }
                 $plh = $params;
             }
-            if ($parse && !empty($this->ownerTPL)) {
+            if ($parse && !empty($this->ownerTPL)) {

                 $this->debug->updateMessage(
                     array("render ownerTPL" => $this->ownerTPL, "With data" => print_r($plh, 1)),
                     "renderWrapTPL",
@@ -1010,7 +1015,7 @@ 
                 );
                 $out = $this->parseChunk($this->ownerTPL, $plh);
             }
-            if (empty($this->ownerTPL)) {
+            if (empty($this->ownerTPL)) {

                 $this->debug->updateMessage("empty ownerTPL", "renderWrapTPL");
             }
             $this->debug->debugEnd("renderWrapTPL");
@@ -1026,8 +1031,8 @@ 
      * @param int $i номер итерации в цикле
      * @return array массив с данными которые можно использовать в цикле render метода
      */
-    protected function uniformPrepare(&$data, $i = 0)
-    {
+    protected function uniformPrepare(&$data, $i = 0)

+    {

         $class = array();
 
         $iterationName = ($i % 2 == 1) ? 'Odd' : 'Even';
@@ -1038,13 +1043,13 @@ 
         $this->renderTPL = $this->getCFGDef('tpl' . $iterationName, $this->renderTPL);
         $iteration = $i;
 
-        if ($this->extPaginate) {
+        if ($this->extPaginate) {

             $offset = $this->getCFGDef('reversePagination',
                 0) && $this->extPaginate->currentPage() > 1 ? $this->extPaginate->totalPage() * $this->getCFGDef('display',
                     0) - $this->extPaginate->totalDocs() : 0;
             if ($this->getCFGDef('maxDocs', 0) && !$this->getCFGDef('reversePagination',
                     0) && $this->extPaginate->currentPage() == $this->extPaginate->totalPage()
-            ) {
+            ) {

                 $iteration += $this->getCFGDef('display', 0);
             }
             $iteration += $this->getCFGDef('display',
@@ -1054,20 +1059,20 @@ 
         $data[$this->getCFGDef("sysKey",
             "dl") . '.full_iteration'] = $iteration;
 
-        if ($i == 1) {
+        if ($i == 1) {

             $this->renderTPL = $this->getCFGDef('tplFirst', $this->renderTPL);
             $class[] = $this->getCFGDef('firstClass', 'first');
         }
-        if ($i == (count($this->_docs) - $this->skippedDocs)) {
+        if ($i == (count($this->_docs) - $this->skippedDocs)) {

             $this->renderTPL = $this->getCFGDef('tplLast', $this->renderTPL);
             $class[] = $this->getCFGDef('lastClass', 'last');
         }
-        if ($this->modx->documentIdentifier == $data['id']) {
+        if ($this->modx->documentIdentifier == $data['id']) {

             $this->renderTPL = $this->getCFGDef('tplCurrent', $this->renderTPL);
             $data[$this->getCFGDef("sysKey",
                 "dl") . '.active'] = 1; //[+active+] - 1 if $modx->documentIdentifer equal ID this element
             $class[] = $this->getCFGDef('currentClass', 'current');
-        } else {
+        } else {

             $data[$this->getCFGDef("sysKey", "dl") . '.active'] = 0;
         }
 
@@ -1078,8 +1083,8 @@ 
          * @var $extE e_DL_Extender
          */
         $extE = $this->getExtender('e', true, true);
-        if ($out = $extE->init($this, compact('data'))) {
-            if (is_array($out)) {
+        if ($out = $extE->init($this, compact('data'))) {

+            if (is_array($out)) {

                 $data = $out;
             }
         }
@@ -1095,42 +1100,43 @@ 
      * @param array $array данные которые необходимо примешать к ответу на каждой записи $data
      * @return string JSON строка
      */
-    public function getJSON($data, $fields, $array = array())
-    {
+    public function getJSON($data, $fields, $array = array())

+    {

         $out = array();
         $fields = is_array($fields) ? $fields : explode(",", $fields);
-        if (is_array($array) && count($array) > 0) {
+        if (is_array($array) && count($array) > 0) {

             $tmp = array();
-            foreach ($data as $i => $v) { //array_merge not valid work with integer index key
+            foreach ($data as $i => $v) {

+//array_merge not valid work with integer index key
                 $tmp[$i] = (isset($array[$i]) ? array_merge($v, $array[$i]) : $v);
             }
             $data = $tmp;
         }
 
-        foreach ($data as $num => $doc) {
+        foreach ($data as $num => $doc) {

             $tmp = array();
-            foreach ($doc as $name => $value) {
-                if (in_array($name, $fields) || (isset($fields[0]) && $fields[0] == '1')) {
+            foreach ($doc as $name => $value) {

+                if (in_array($name, $fields) || (isset($fields[0]) && $fields[0] == '1')) {

                     $tmp[str_replace(".", "_", $name)] = $value; //JSON element name without dot
                 }
             }
             $out[$num] = $tmp;
         }
 
-        if ('new' == $this->getCFGDef('JSONformat', 'old')) {
+        if ('new' == $this->getCFGDef('JSONformat', 'old')) {

             $return = array();
 
             $return['rows'] = array();
-            foreach ($out as $key => $item) {
+            foreach ($out as $key => $item) {

                 $return['rows'][] = $item;
             }
             $return['total'] = $this->getChildrenCount();
-        } elseif ('simple' == $this->getCFGDef('JSONformat', 'old')) {
+        } elseif ('simple' == $this->getCFGDef('JSONformat', 'old')) {

             $return = array();
-            foreach ($out as $key => $item) {
+            foreach ($out as $key => $item) {

                 $return[] = $item;
             }
-        } else {
+        } else {

             $return = $out;
         }
         $this->outData = json_encode($return);
@@ -1146,11 +1152,11 @@ 
      * @param string $contentField
      * @return mixed|string
      */
-    protected function getSummary(array $item = array(), $extSummary = null, $introField = '', $contentField = '')
-    {
+    protected function getSummary(array $item = array(), $extSummary = null, $introField = '', $contentField = '')

+    {

         $out = '';
 
-        if (is_null($extSummary)) {
+        if (is_null($extSummary)) {

             /**
              * @var $extSummary summary_DL_Extender
              */
@@ -1159,10 +1165,10 @@ 
         $introField = $this->getCFGDef("introField", $introField);
         $contentField = $this->getCFGDef("contentField", $contentField);
 
-        if (!empty($introField) && !empty($item[$introField]) && mb_strlen($item[$introField], 'UTF-8') > 0) {
+        if (!empty($introField) && !empty($item[$introField]) && mb_strlen($item[$introField], 'UTF-8') > 0) {

             $out = $item[$introField];
-        } else {
-            if (!empty($contentField) && !empty($item[$contentField]) && mb_strlen($item[$contentField], 'UTF-8') > 0) {
+        } else {

+            if (!empty($contentField) && !empty($item[$contentField]) && mb_strlen($item[$contentField], 'UTF-8') > 0) {

                 $out = $extSummary->init($this, array(
                     "content"      => $item[$contentField],
                     "action"       => $this->getCFGDef("summary", ""),
@@ -1180,8 +1186,8 @@ 
      * @param string $name extender name
      * @return boolean status extender load
      */
-    public function checkExtender($name)
-    {
+    public function checkExtender($name)

+    {

         return (isset($this->extender[$name]) && $this->extender[$name] instanceof $name . "_DL_Extender");
     }
 
@@ -1189,8 +1195,8 @@ 
      * @param $name
      * @param $obj
      */
-    public function setExtender($name, $obj)
-    {
+    public function setExtender($name, $obj)

+    {

         $this->extender[$name] = $obj;
     }
 
@@ -1202,13 +1208,13 @@ 
      * @param bool $nop если экстендер не загружен, то загружать ли xNop
      * @return null|xNop
      */
-    public function getExtender($name, $autoload = false, $nop = false)
-    {
+    public function getExtender($name, $autoload = false, $nop = false)

+    {

         $out = null;
-        if ((is_scalar($name) && $this->checkExtender($name)) || ($autoload && $this->_loadExtender($name))) {
+        if ((is_scalar($name) && $this->checkExtender($name)) || ($autoload && $this->_loadExtender($name))) {

             $out = $this->extender[$name];
         }
-        if ($nop && is_null($out)) {
+        if ($nop && is_null($out)) {

             $out = new xNop();
         }
 
@@ -1221,27 +1227,27 @@ 
      * @param string $name name extender
      * @return boolean $flag status load extender
      */
-    protected function _loadExtender($name)
-    {
+    protected function _loadExtender($name)

+    {

         $this->debug->debug('Load Extender ' . $this->debug->dumpData($name), 'LoadExtender', 2);
         $flag = false;
 
         $classname = ($name != '') ? $name . "_DL_Extender" : "";
-        if ($classname != '' && isset($this->extender[$name]) && $this->extender[$name] instanceof $classname) {
+        if ($classname != '' && isset($this->extender[$name]) && $this->extender[$name] instanceof $classname) {

             $flag = true;
 
-        } else {
-            if (!class_exists($classname, false) && $classname != '') {
-                if (file_exists(dirname(__FILE__) . "/extender/" . $name . ".extender.inc")) {
+        } else {

+            if (!class_exists($classname, false) && $classname != '') {

+                if (file_exists(dirname(__FILE__) . "/extender/" . $name . ".extender.inc")) {

                     include_once(dirname(__FILE__) . "/extender/" . $name . ".extender.inc");
                 }
             }
-            if (class_exists($classname, false) && $classname != '') {
+            if (class_exists($classname, false) && $classname != '') {

                 $this->extender[$name] = new $classname($this, $name);
                 $flag = true;
             }
         }
-        if (!$flag) {
+        if (!$flag) {

             $this->debug->debug("Error load Extender " . $this->debug->dumpData($name));
         }
         $this->debug->debugEnd('LoadExtender');
@@ -1259,16 +1265,16 @@ 
      * @param mixed $IDs список id документов по которым необходима выборка
      * @return array очищенный массив
      */
-    public function setIDs($IDs)
-    {
+    public function setIDs($IDs)

+    {

         $this->debug->debug('set ID list ' . $this->debug->dumpData($IDs), 'setIDs', 2);
         $IDs = $this->cleanIDs($IDs);
         $type = $this->getCFGDef('idType', 'parents');
         $depth = $this->getCFGDef('depth', '');
-        if ($type == 'parents' && $depth > 0) {
+        if ($type == 'parents' && $depth > 0) {

             $tmp = $IDs;
-            do {
-                if (count($tmp) > 0) {
+            do {

+                if (count($tmp) > 0) {

                     $tmp = $this->getChildrenFolder($tmp);
                     $IDs = array_merge($IDs, $tmp);
                 }
@@ -1282,8 +1288,8 @@ 
     /**
      * @return int
      */
-    public function getIDs()
-    {
+    public function getIDs()

+    {

         return $this->IDs;
     }
 
@@ -1294,17 +1300,18 @@ 
      * @param string $sep разделитель
      * @return array очищенный массив с данными
      */
-    public function cleanIDs($IDs, $sep = ',')
-    {
+    public function cleanIDs($IDs, $sep = ',')

+    {

         $this->debug->debug('clean IDs ' . $this->debug->dumpData($IDs) . ' with separator ' . $this->debug->dumpData($sep),
             'cleanIDs', 2);
         $out = array();
-        if (!is_array($IDs)) {
+        if (!is_array($IDs)) {

             $IDs = explode($sep, $IDs);
         }
-        foreach ($IDs as $item) {
+        foreach ($IDs as $item) {

             $item = trim($item);
-            if (is_numeric($item) && (int)$item >= 0) { //Fix 0xfffffffff
+            if (is_numeric($item) && (int)$item >= 0) {

+//Fix 0xfffffffff
                 $out[] = (int)$item;
             }
         }
@@ -1318,8 +1325,8 @@ 
      * Проверка массива с id-шниками документов для выборки
      * @return boolean пригодны ли данные для дальнейшего использования
      */
-    protected function checkIDs()
-    {
+    protected function checkIDs()

+    {

         return (is_array($this->IDs) && count($this->IDs) > 0) ? true : false;
     }
 
@@ -1331,11 +1338,11 @@ 
      * @global array $_docs all documents
      * @return array all field values
      */
-    public function getOneField($userField, $uniq = false)
-    {
+    public function getOneField($userField, $uniq = false)

+    {

         $out = array();
-        foreach ($this->_docs as $doc => $val) {
-            if (isset($val[$userField]) && (($uniq && !in_array($val[$userField], $out)) || !$uniq)) {
+        foreach ($this->_docs as $doc => $val) {

+            if (isset($val[$userField]) && (($uniq && !in_array($val[$userField], $out)) || !$uniq)) {

                 $out[$doc] = $val[$userField];
             }
         }
@@ -1346,8 +1353,8 @@ 
     /**
      * @return DLCollection
      */
-    public function docsCollection()
-    {
+    public function docsCollection()

+    {

         return new DLCollection($this->modx, $this->_docs);
     }
 
@@ -1375,10 +1382,10 @@ 
      * @param string $group
      * @return string
      */
-    protected function getGroupSQL($group = '')
-    {
+    protected function getGroupSQL($group = '')

+    {

         $out = '';
-        if ($group != '') {
+        if ($group != '') {

             $out = 'GROUP BY ' . $group;
         }
 
@@ -1397,12 +1404,12 @@ 
      *
      * @return string Order by for SQL
      */
-    protected function SortOrderSQL($sortName, $orderDef = 'DESC')
-    {
+    protected function SortOrderSQL($sortName, $orderDef = 'DESC')

+    {

         $this->debug->debug('', 'sortORDER', 2);
 
         $sort = '';
-        switch ($this->getCFGDef('sortType', '')) {
+        switch ($this->getCFGDef('sortType', '')) {

             case 'none':
                 break;
             case 'doclist':
@@ -1413,10 +1420,10 @@ 
                 break;
             default:
                 $out = array('orderBy' => '', 'order' => '', 'sortBy' => '');
-                if (($tmp = $this->getCFGDef('orderBy', '')) != '') {
+                if (($tmp = $this->getCFGDef('orderBy', '')) != '') {

                     $out['orderBy'] = $tmp;
-                } else {
-                    switch (true) {
+                } else {

+                    switch (true) {

                         case ('' != ($tmp = $this->getCFGDef('sortDir', ''))): //higher priority than order
                             $out['order'] = $tmp;
                         // no break
@@ -1424,7 +1431,7 @@ 
                             $out['order'] = $tmp;
                         // no break
                     }
-                    if ('' == $out['order'] || !in_array(strtoupper($out['order']), array('ASC', 'DESC'))) {
+                    if ('' == $out['order'] || !in_array(strtoupper($out['order']), array('ASC', 'DESC'))) {

                         $out['order'] = $orderDef; //Default
                     }
 
@@ -1445,30 +1452,30 @@ 
      *
      * @return string LIMIT вставка в SQL запрос
      */
-    protected function LimitSQL($limit = 0, $offset = 0)
-    {
+    protected function LimitSQL($limit = 0, $offset = 0)

+    {

         $this->debug->debug('', 'limitSQL', 2);
         $ret = '';
-        if ($limit == 0) {
+        if ($limit == 0) {

             $limit = $this->getCFGDef('display', 0);
         }
         $maxDocs = $this->getCFGDef('maxDocs', 0);
-        if ($maxDocs > 0 && $limit > $maxDocs) {
+        if ($maxDocs > 0 && $limit > $maxDocs) {

             $limit = $maxDocs;
         }
-        if ($offset == 0) {
+        if ($offset == 0) {

             $offset = $this->getCFGDef('offset', 0);
         }
         $offset += $this->getCFGDef('start', 0);
         $total = $this->getCFGDef('total', 0);
-        if ($limit < ($total - $limit)) {
+        if ($limit < ($total - $limit)) {

             $limit = $total - $offset;
         }
 
-        if ($limit != 0) {
+        if ($limit != 0) {

             $ret = "LIMIT " . (int)$offset . "," . (int)$limit;
-        } else {
-            if ($offset != 0) {
+        } else {

+            if ($offset != 0) {

                 /**
                  * To retrieve all rows from a certain offset up to the end of the result set, you can use some large number for the second parameter
                  * @see http://dev.mysql.com/doc/refman/5.0/en/select.html
@@ -1488,8 +1495,8 @@ 
      * @param string $charset
      * @return string Clear string
      */
-    public function sanitarData($data, $charset = 'UTF-8')
-    {
+    public function sanitarData($data, $charset = 'UTF-8')

+    {

         return APIHelpers::sanitarTag($data, $charset);
     }
 
@@ -1500,8 +1507,8 @@ 
      * @param string $parentField default name parent field
      * @return array
      */
-    public function treeBuild($idField = 'id', $parentField = 'parent')
-    {
+    public function treeBuild($idField = 'id', $parentField = 'parent')

+    {

         return $this->_treeBuild($this->_docs, $this->getCFGDef('idField', $idField),
             $this->getCFGDef('parentField', $parentField));
     }
@@ -1514,16 +1521,16 @@ 
      * @param string $pidName name parent field in associative data array
      * @return array
      */
-    private function _treeBuild($data, $idName, $pidName)
-    {
+    private function _treeBuild($data, $idName, $pidName)

+    {

         $children = array(); // children of each ID
         $ids = array();
-        foreach ($data as $i => $r) {
+        foreach ($data as $i => $r) {

             $row =& $data[$i];
             $id = $row[$idName];
             $pid = $row[$pidName];
             $children[$pid][$id] =& $row;
-            if (!isset($children[$id])) {
+            if (!isset($children[$id])) {

                 $children[$id] = array();
             }
             $row['#childNodes'] =& $children[$id];
@@ -1531,9 +1538,9 @@ 
         }
         // Root elements are elements with non-found PIDs.
         $this->_tree = array();
-        foreach ($data as $i => $r) {
+        foreach ($data as $i => $r) {

             $row =& $data[$i];
-            if (!isset($ids[$row[$pidName]])) {
+            if (!isset($ids[$row[$pidName]])) {

                 $this->_tree[$row[$idName]] = $row;
             }
         }
@@ -1547,12 +1554,12 @@ 
      * @param bool $full если true то возвращается значение для подстановки в запрос
      * @return string PrimaryKey основной таблицы
      */
-    public function getPK($full = true)
-    {
+    public function getPK($full = true)

+    {

         $idField = isset($this->idField) ? $this->idField: 'id';
-        if ($full) {
+        if ($full) {

             $idField = '`' . $idField . '`';
-            if (!empty($this->alias)) {
+            if (!empty($this->alias)) {

                 $idField = '`' . $this->alias . '`.' . $idField;
             }
         }
@@ -1566,12 +1573,12 @@ 
      * @param bool $full если true то возвращается значение для подстановки в запрос
      * @return string Parent Key основной таблицы
      */
-    public function getParentField($full = true)
-    {
+    public function getParentField($full = true)

+    {

         $parentField = isset($this->parentField) ? $this->parentField : '';
-        if ($full && !empty($parentField)) {
+        if ($full && !empty($parentField)) {

             $parentField = '`' . $parentField . '`';
-            if (!empty($this->alias)) {
+            if (!empty($this->alias)) {

                 $parentField = '`' . $this->alias . '`.' . $parentField;
             }
         }
@@ -1586,31 +1593,31 @@ 
      * @param string $filter_string строка со всеми фильтрами
      * @return mixed результат разбора фильтров
      */
-    protected function getFilters($filter_string)
-    {
+    protected function getFilters($filter_string)

+    {

         $this->debug->debug("getFilters: " . $this->debug->dumpData($filter_string), 'getFilter', 1);
         // the filter parameter tells us, which filters can be used in this query
         $filter_string = trim($filter_string, ' ;');
-        if (!$filter_string) {
+        if (!$filter_string) {

             return;
         }
         $output = array('join' => '', 'where' => '');
         $logic_op_found = false;
         $joins = $wheres = array();
-        foreach ($this->_logic_ops as $op => $sql) {
-            if (strpos($filter_string, $op) === 0) {
+        foreach ($this->_logic_ops as $op => $sql) {

+            if (strpos($filter_string, $op) === 0) {

                 $logic_op_found = true;
                 $subfilters = mb_substr($filter_string, strlen($op) + 1, mb_strlen($filter_string, "UTF-8"), "UTF-8");
                 $subfilters = $this->smartSplit($subfilters);
-                foreach ($subfilters as $subfilter) {
+                foreach ($subfilters as $subfilter) {

                     $subfilter = $this->getFilters(trim($subfilter));
-                    if (!$subfilter) {
+                    if (!$subfilter) {

                         continue;
                     }
-                    if ($subfilter['join']) {
+                    if ($subfilter['join']) {

                         $joins[] = $subfilter['join'];
                     }
-                    if ($subfilter['where']) {
+                    if ($subfilter['where']) {

                         $wheres[] = $subfilter['where'];
                     }
                 }
@@ -1619,12 +1626,12 @@ 
             }
         }
 
-        if (!$logic_op_found) {
+        if (!$logic_op_found) {

             $filter = $this->loadFilter($filter_string);
-            if (!$filter) {
+            if (!$filter) {

                 $this->debug->warning('Error while loading DocLister filter "' . $this->debug->dumpData($filter_string) . '": check syntax!');
                 $output = false;
-            } else {
+            } else {

                 $output['join'] = $filter->get_join();
                 $output['where'] = stripslashes($filter->get_where());
             }
@@ -1637,16 +1644,16 @@ 
     /**
      * @return mixed
      */
-    public function filtersWhere()
-    {
+    public function filtersWhere()

+    {

         return APIHelpers::getkey($this->_filters, 'where', '');
     }
 
     /**
      * @return mixed
      */
-    public function filtersJoin()
-    {
+    public function filtersJoin()

+    {

         return APIHelpers::getkey($this->_filters, 'join', '');
     }
 
@@ -1654,11 +1661,12 @@ 
      * @param string $join
      * @return $this
      */
-    public function setFiltersJoin($join = '') {
-        if (!empty($join)) {
-            if (!empty($this->_filters['join'])) {
+    public function setFiltersJoin($join = '')

+    {

+        if (!empty($join)) {

+            if (!empty($this->_filters['join'])) {

                 $this->_filters['join'] .= ' ' . $join;
-            } else {
+            } else {

                 $this->_filters['join'] = $join;
             }
         }
@@ -1673,10 +1681,10 @@ 
      * @param $type string тип фильтрации
      * @return string имя поля с учетом приведения типа
      */
-    public function changeSortType($field, $type)
-    {
+    public function changeSortType($field, $type)

+    {

         $type = trim($type);
-        switch (strtoupper($type)) {
+        switch (strtoupper($type)) {

             case 'DECIMAL':
                 $field = 'CAST(' . $field . ' as DECIMAL(10,2))';
                 break;
@@ -1702,8 +1710,8 @@ 
      * @param string $filter срока с параметрами фильтрации
      * @return bool
      */
-    protected function loadFilter($filter)
-    {
+    protected function loadFilter($filter)

+    {

         $this->debug->debug('Load filter ' . $this->debug->dumpData($filter), 'loadFilter', 2);
         $out = false;
         $fltr_params = explode(':', $filter, 2);
@@ -1713,21 +1721,21 @@ 
         */
         $fltr_class = $fltr . '_DL_filter';
         // check if the filter is implemented
-        if (!is_null($fltr)) {
-            if (!class_exists($fltr_class) && file_exists(__DIR__ . '/filter/' . $fltr . '.filter.php')) {
+        if (!is_null($fltr)) {

+            if (!class_exists($fltr_class) && file_exists(__DIR__ . '/filter/' . $fltr . '.filter.php')) {

                 require_once dirname(__FILE__) . '/filter/' . $fltr . '.filter.php';
             }
-            if (class_exists($fltr_class)) {
+            if (class_exists($fltr_class)) {

                 $this->totalFilters++;
                 $fltr_obj = new $fltr_class();
-                if ($fltr_obj->init($this, $filter)) {
+                if ($fltr_obj->init($this, $filter)) {

                     $out = $fltr_obj;
-                } else {
+                } else {

                     $this->debug->error("Wrong filter parameter: '{$this->debug->dumpData($filter)}'", 'Filter');
                 }
             }
         }
-        if (!$out) {
+        if (!$out) {

             $this->debug->error("Error load Filter: '{$this->debug->dumpData($filter)}'", 'Filter');
         }
 
@@ -1740,8 +1748,8 @@ 
      * Общее число фильтров
      * @return int
      */
-    public function getCountFilters()
-    {
+    public function getCountFilters()

+    {

         return (int)$this->totalFilters;
     }
 
@@ -1749,8 +1757,8 @@ 
      * Выполнить SQL запрос
      * @param string $q SQL запрос
      */
-    public function dbQuery($q)
-    {
+    public function dbQuery($q)

+    {

         $this->debug->debug($q, "query", 1, 'sql');
         $out = $this->modx->db->query($q);
         $this->debug->debugEnd("query");
@@ -1768,8 +1776,8 @@ 
      * @param string $tpl шаблон подстановки значения в SQL запрос
      * @return string строка для подстановки в SQL запрос
      */
-    public function LikeEscape($field, $value, $escape = '=', $tpl = '%[+value+]%')
-    {
+    public function LikeEscape($field, $value, $escape = '=', $tpl = '%[+value+]%')

+    {

         return sqlHelper::LikeEscape($this->modx, $field, $value, $escape, $tpl);
     }
 
@@ -1777,8 +1785,8 @@ 
      * Получение REQUEST_URI без GET-ключа с
      * @return string
      */
-    public function getRequest()
-    {
+    public function getRequest()

+    {

         $URL = null;
         parse_str(parse_url(MODX_SITE_URL . $_SERVER['REQUEST_URI'], PHP_URL_QUERY), $URL);
 

assets/snippets/DocLister/snippet.DLBeforeAfter.php

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 include_once(MODX_BASE_PATH . 'assets/lib/APIHelpers.class.php');
-if (!function_exists('validateMonth')) {
+if ( ! function_exists('validateMonth')) {
     /**
      * @param $val
      * @return bool
@@ -20,7 +20,7 @@ 
     }
 }
 
-if (!function_exists('buildUrl')) {
+if ( ! function_exists('buildUrl')) {
     /**
      * @param $url
      * @param int $start
@@ -33,13 +33,13 @@ 
         $requestName = 'start';
         if ($requestName != '' && is_array($params)) {
             $params = array_merge($params, array($requestName => null));
-            if (!empty($start)) {
+            if ( ! empty($start)) {
                 $params[$requestName] = $start;
             }
             $q = http_build_query($params);
             $url = explode("?", $url, 2);
             $url = $url[0];
-            if (!empty($q)) {
+            if ( ! empty($q)) {
                 $url .= "?" . $q;
             }
         }
@@ -59,7 +59,7 @@ 
 
 $tmp = date("Y-m-d H:i:s");
 $currentDay = APIHelpers::getkey($params, 'currentDay', $tmp); // Текущий день
-if (!validateDate($currentDay)) {
+if ( ! validateDate($currentDay)) {
     $currentDay = $tmp;
 }
 
@@ -155,7 +155,7 @@ 
     'pagesAfter'     => ceil($elements['after'] / $elements['display'])
 );
 
-if (!is_null($beforeStart)) {
+if ( ! is_null($beforeStart)) {
     $tpl = $DLObj->getCFGDef('TplPrevP', '@CODE: <a href="[+url+]">Назад</a>');
     $beforePage = $DLObj->parseChunk($tpl, array_merge($pageParams, array(
         'url'      => buildUrl($DLObj->getUrl(), $beforeStart),
@@ -174,7 +174,7 @@ 
 }
 $modx->setPlaceholder('pages.before', $beforePage);
 
-if (!is_null($afterStart)) {
+if ( ! is_null($afterStart)) {
     $tpl = $DLObj->getCFGDef('TplNextP', '@CODE: <a href="[+url+]">Далее</a>');
     $afterPage = $DLObj->parseChunk($tpl, array_merge($pageParams, array(
         'url'      => buildUrl($DLObj->getUrl(), $afterStart),

Braces +32 added lines, -32 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 include_once(MODX_BASE_PATH . 'assets/lib/APIHelpers.class.php');
-if (!function_exists('validateMonth')) {
+if (!function_exists('validateMonth')) {

     /**
      * @param $val
      * @return bool
      */
-    function validateDate($val)
-    {
+    function validateDate($val)

+    {

         $flag = false;
-        if (is_string($val)) {
+        if (is_string($val)) {

             $val = explode("-", $val, 3);
             $flag = (count($val) == 3 && is_array($val) && strlen($val[2]) == 2 && strlen($val[1]) == 2 && strlen($val[0]) == 4); //Валидация содержимого массива
             $flag = ($flag && (int)$val[2] > 0 && (int)$val[2] <= 31); //Валидация дня
@@ -20,26 +20,26 @@ 
     }
 }
 
-if (!function_exists('buildUrl')) {
+if (!function_exists('buildUrl')) {

     /**
      * @param $url
      * @param int $start
      * @return array|string
      */
-    function buildUrl($url, $start = 0)
-    {
+    function buildUrl($url, $start = 0)

+    {

         $params = parse_url($url, PHP_URL_QUERY);
         parse_str(html_entity_decode($params), $params);
         $requestName = 'start';
-        if ($requestName != '' && is_array($params)) {
+        if ($requestName != '' && is_array($params)) {

             $params = array_merge($params, array($requestName => null));
-            if (!empty($start)) {
+            if (!empty($start)) {

                 $params[$requestName] = $start;
             }
             $q = http_build_query($params);
             $url = explode("?", $url, 2);
             $url = $url[0];
-            if (!empty($q)) {
+            if (!empty($q)) {

                 $url .= "?" . $q;
             }
         }
@@ -59,7 +59,7 @@ 
 
 $tmp = date("Y-m-d H:i:s");
 $currentDay = APIHelpers::getkey($params, 'currentDay', $tmp); // Текущий день
-if (!validateDate($currentDay)) {
+if (!validateDate($currentDay)) {

     $currentDay = $tmp;
 }
 
@@ -70,17 +70,17 @@ 
 //Если положительное значение, то нужы события предстоящие. Если отрицательное - прошедшее
 $rule = ($start >= 0) ? 'after' : 'before';
 $noRule = ($start >= 0) ? 'before' : 'after';
-if ($start < 0) {
+if ($start < 0) {

     $start = abs($start) > $display ? ($start + $display) : 0;
 }
 $d = $modx->db->escape($currentDay);
-if ($dateSource == 'tv') {
+if ($dateSource == 'tv') {

     $params['tvSortType'] = 'TVDATETIME';
     $query = array(
         'after'  => "STR_TO_DATE(`dltv_" . $dateField . "_1`.`value`,'%d-%m-%Y %H:%i:%s') >= '" . $d . "'",
         'before' => "STR_TO_DATE(`dltv_" . $dateField . "_1`.`value`,'%d-%m-%Y %H:%i:%s') < '" . $d . "'"
     );
-} else {
+} else {

     $query = array(
         'after'  => "FROM_UNIXTIME(" . $dateField . ") >= '" . $d . "'",
         'before' => "FROM_UNIXTIME(" . $dateField . ") < '" . $d . "'"
@@ -119,32 +119,32 @@ 
 $elements[$noRule] = $DLObj->getChildrenCount();
 
 $afterStart = $beforeStart = null;
-switch (true) {
+switch (true) {

     case ($elements['offset'] > 0):
         $beforeStart = $elements['offset'] - $elements['display'];
-        if ($elements['offset'] + $elements['display'] < $elements['after']) {
+        if ($elements['offset'] + $elements['display'] < $elements['after']) {

             $afterStart = $elements['offset'] + $elements['display'];
-        } else {
+        } else {

             $afterStart = null;
         }
         break;
     case ($elements['offset'] < 0):
         $afterStart = $elements['offset'] + $elements['display'];
-        if (abs($elements['offset']) + $elements['display'] <= $elements['before']) {
+        if (abs($elements['offset']) + $elements['display'] <= $elements['before']) {

             $beforeStart = $elements['offset'] - $elements['display'];
-        } else {
+        } else {

             $beforeStart = null;
         }
         break;
     default: // ($start = 0)
-        if ($elements['display'] < $elements['after']) {
+        if ($elements['display'] < $elements['after']) {

             $afterStart = $elements['display'];
-        } else {
+        } else {

             $afterStart = null;
         }
-        if ($elements['display'] <= $elements['before']) {
+        if ($elements['display'] <= $elements['before']) {

             $beforeStart = -1 * $elements['display'];
-        } else {
+        } else {

             $beforeStart = null;
         }
 }
@@ -155,7 +155,7 @@ 
     'pagesAfter'     => ceil($elements['after'] / $elements['display'])
 );
 
-if (!is_null($beforeStart)) {
+if (!is_null($beforeStart)) {

     $tpl = $DLObj->getCFGDef('TplPrevP', '@CODE: <a href="[+url+]">Назад</a>');
     $beforePage = $DLObj->parseChunk($tpl, array_merge($pageParams, array(
         'url'      => buildUrl($DLObj->getUrl(), $beforeStart),
@@ -163,8 +163,8 @@ 
         'elements' => $elements['before'],
         'pages'    => ceil($elements['before'] / $elements['display'])
     )));
-} else {
-    if ($DLObj->getCFGDef("PrevNextAlwaysShow", 0)) {
+} else {

+    if ($DLObj->getCFGDef("PrevNextAlwaysShow", 0)) {

         $tpl = $DLObj->getCFGDef('TplPrevI', '@CODE: Назад');
         $beforePage = $DLObj->parseChunk($tpl, array_merge($pageParams, array(
             'elements' => $elements['before'],
@@ -174,7 +174,7 @@ 
 }
 $modx->setPlaceholder('pages.before', $beforePage);
 
-if (!is_null($afterStart)) {
+if (!is_null($afterStart)) {

     $tpl = $DLObj->getCFGDef('TplNextP', '@CODE: <a href="[+url+]">Далее</a>');
     $afterPage = $DLObj->parseChunk($tpl, array_merge($pageParams, array(
         'url'      => buildUrl($DLObj->getUrl(), $afterStart),
@@ -182,8 +182,8 @@ 
         'elements' => $elements['after'],
         'pages'    => ceil($elements['before'] / $elements['display'])
     )));
-} else {
-    if ($DLObj->getCFGDef("PrevNextAlwaysShow", 0)) {
+} else {

+    if ($DLObj->getCFGDef("PrevNextAlwaysShow", 0)) {

         $tpl = $DLObj->getCFGDef('TplNextI', '@CODE: Далее');
         $afterPage = $DLObj->parseChunk($tpl, array_merge($pageParams, array(
             'elements' => $elements['after'],
@@ -194,10 +194,10 @@ 
 $modx->setPlaceholder('pages.after', $afterPage);
 
 $debug = $DLObj->getCFGDef('debug', 0);
-if ($debug) {
-    if ($debug > 0) {
+if ($debug) {

+    if ($debug > 0) {

         $out = $DLObj->debug->showLog() . $out;
-    } else {
+    } else {

         $out .= $DLObj->debug->showLog();
     }
 }

assets/snippets/DocLister/snippet.DLReflectFilter.php

Spacing +6 added lines, -6 removed lines

@@ -26,13 +26,13 @@ 
  *            year - по годам
  */
 $reflectType = APIHelpers::getkey($params, 'reflectType', 'month');
-if (!in_array($reflectType, array('year', 'month'))) {
+if ( ! in_array($reflectType, array('year', 'month'))) {
     return '';
 }
 
-list($dateFormat, $sqlDateFormat, $reflectValidator) = DLReflect::switchReflect($reflectType, function () {
+list($dateFormat, $sqlDateFormat, $reflectValidator) = DLReflect::switchReflect($reflectType, function() {
     return array('m-Y', '%m-%Y', array('DLReflect', 'validateMonth'));
-}, function () {
+}, function() {
     return array('Y', '%Y', array('DLReflect', 'validateYear'));
 });
 
@@ -50,7 +50,7 @@ 
 $selectCurrentReflect = APIHelpers::getkey($params, 'selectCurrentReflect', 1);
 if ($selectCurrentReflect) {
     $currentReflect = APIHelpers::getkey($params, 'currentReflect', $tmp);
-    if (!call_user_func($reflectValidator, $currentReflect)) {
+    if ( ! call_user_func($reflectValidator, $currentReflect)) {
         $currentReflect = $tmp;
     }
 } else {
@@ -65,9 +65,9 @@ 
  */
 $tmp = APIHelpers::getkey($params, 'activeReflect', $currentReflect);
 $tmpGet = APIHelpers::getkey($_GET, $reflectType, $tmp);
-if (!call_user_func($reflectValidator, $tmpGet)) {
+if ( ! call_user_func($reflectValidator, $tmpGet)) {
     $activeReflect = $tmp;
-    if (!call_user_func($reflectValidator, $activeReflect)) {
+    if ( ! call_user_func($reflectValidator, $activeReflect)) {
         $activeReflect = $currentReflect;
     }
 } else {

Braces +14 added lines, -14 removed lines

@@ -26,13 +26,13 @@ 
  *            year - по годам
  */
 $reflectType = APIHelpers::getkey($params, 'reflectType', 'month');
-if (!in_array($reflectType, array('year', 'month'))) {
+if (!in_array($reflectType, array('year', 'month'))) {

     return '';
 }
 
-list($dateFormat, $sqlDateFormat, $reflectValidator) = DLReflect::switchReflect($reflectType, function () {
+list($dateFormat, $sqlDateFormat, $reflectValidator) = DLReflect::switchReflect($reflectType, function () {

     return array('m-Y', '%m-%Y', array('DLReflect', 'validateMonth'));
-}, function () {
+}, function () {

     return array('Y', '%Y', array('DLReflect', 'validateYear'));
 });
 
@@ -48,12 +48,12 @@ 
  *        Если не указан в параметре, то генерируется автоматически текущая дата
  */
 $selectCurrentReflect = APIHelpers::getkey($params, 'selectCurrentReflect', 1);
-if ($selectCurrentReflect) {
+if ($selectCurrentReflect) {

     $currentReflect = APIHelpers::getkey($params, 'currentReflect', $tmp);
-    if (!call_user_func($reflectValidator, $currentReflect)) {
+    if (!call_user_func($reflectValidator, $currentReflect)) {

         $currentReflect = $tmp;
     }
-} else {
+} else {

     $currentReflect = null;
 }
 /**
@@ -65,24 +65,24 @@ 
  */
 $tmp = APIHelpers::getkey($params, 'activeReflect', $currentReflect);
 $tmpGet = APIHelpers::getkey($_GET, $reflectType, $tmp);
-if (!call_user_func($reflectValidator, $tmpGet)) {
+if (!call_user_func($reflectValidator, $tmpGet)) {

     $activeReflect = $tmp;
-    if (!call_user_func($reflectValidator, $activeReflect)) {
+    if (!call_user_func($reflectValidator, $activeReflect)) {

         $activeReflect = $currentReflect;
     }
-} else {
+} else {

     $activeReflect = $tmpGet;
 }
-if ($activeReflect) {
+if ($activeReflect) {

     $v = $modx->db->escape($activeReflect);
-    if ($reflectSource == 'tv') {
+    if ($reflectSource == 'tv') {

         $params['tvSortType'] = 'TVDATETIME';
         $params['addWhereList'] = "DATE_FORMAT(STR_TO_DATE(`dltv_" . $reflectField . "_1`.`value`,'%d-%m-%Y %H:%i:%s'), '" . $sqlDateFormat . "')='" . $v . "'";
-    } else {
+    } else {

         $params['addWhereList'] = "DATE_FORMAT(FROM_UNIXTIME(" . $reflectField . "), '" . $sqlDateFormat . "')='" . $v . "'";
     }
-} else {
-    if ($reflectSource == 'tv') {
+} else {

+    if ($reflectSource == 'tv') {

         $params['tvSortType'] = 'TVDATETIME';
     }
 }

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|array|string $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/lib/DLReflect.class.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-if (!class_exists("DLReflect", false)) {
+if ( ! class_exists("DLReflect", false)) {
     /**
      * Class DLReflect
      */

Braces +11 added lines, -11 removed lines

@@ -1,19 +1,19 @@ 
 <?php
 
-if (!class_exists("DLReflect", false)) {
+if (!class_exists("DLReflect", false)) {

     /**
      * Class DLReflect
      */
-    class DLReflect
-    {
+    class DLReflect

+    {

         /**
          * @param $val
          * @return bool
          */
-        public static function validateMonth($val)
-        {
+        public static function validateMonth($val)

+        {

             $flag = false;
-            if (is_scalar($val)) {
+            if (is_scalar($val)) {

                 $val = explode("-", $val, 2);
                 $flag = (count($val) && is_array($val) && strlen($val[0]) == 2 && strlen($val[1]) == 4); //Валидация содержимого массива
                 $flag = ($flag && (int)$val[0] > 0 && (int)$val[0] <= 12); //Валидация месяца
@@ -27,10 +27,10 @@ 
          * @param $val
          * @return bool
          */
-        public static function validateYear($val)
-        {
+        public static function validateYear($val)

+        {

             $flag = false;
-            if (is_scalar($val)) {
+            if (is_scalar($val)) {

                 $flag = (strlen($val) == 4); //Валидация строки
                 $flag = ($flag && (int)$val > 1900 && (int)$val <= 2100); //Валидация года
             }
@@ -44,8 +44,8 @@ 
          * @param $yearAction
          * @return mixed|null
          */
-        public static function switchReflect($type, $monthAction, $yearAction)
-        {
+        public static function switchReflect($type, $monthAction, $yearAction)

+        {

             $out = null;
             $action = $type . "Action";
 

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

Spacing +4 added lines, -4 removed lines

@@ -13,8 +13,8 @@ 
     public static function tildeField($field, $table = '')
     {
         $out = '';
-        if (!empty($field) && is_scalar($field)) {
-            if (!empty($table) && is_scalar($table) && $tmp = strpos($field, $table)) {
+        if ( ! empty($field) && is_scalar($field)) {
+            if ( ! empty($table) && is_scalar($table) && $tmp = strpos($field, $table)) {
                 $tmp = substr($field, $tmp + strlen($table), 1);
                 if ($tmp != '.' && $tmp != '`') {
                     $field = $table . "." . $field;
@@ -74,9 +74,9 @@ 
     {
         $str = '';
         $escaped = false;
-        if (!empty($field) && is_string($field) && is_scalar($value) && $value !== '') {
+        if ( ! empty($field) && is_string($field) && is_scalar($value) && $value !== '') {
             $field = sqlHelper::tildeField($field);
-            if (is_scalar($escape) && !empty($escape) && !in_array($escape, array("_", "%", "'"))) {
+            if (is_scalar($escape) && ! empty($escape) && ! in_array($escape, array("_", "%", "'"))) {
                 $str = str_replace(array($escape, '_', '%'), array($escape . $escape, $escape . '_', $escape . '%'),
                     $value);
                 $escaped = true;

Braces +20 added lines, -20 removed lines

@@ -3,30 +3,30 @@ 
 /**
  * Class sqlHelper
  */
-class sqlHelper
-{
+class sqlHelper

+{

     /**
      * @param $field
      * @param string $table
      * @return bool|float|int|string
      */
-    public static function tildeField($field, $table = '')
-    {
+    public static function tildeField($field, $table = '')

+    {

         $out = '';
-        if (!empty($field) && is_scalar($field)) {
-            if (!empty($table) && is_scalar($table) && $tmp = strpos($field, $table)) {
+        if (!empty($field) && is_scalar($field)) {

+            if (!empty($table) && is_scalar($table) && $tmp = strpos($field, $table)) {

                 $tmp = substr($field, $tmp + strlen($table), 1);
-                if ($tmp != '.' && $tmp != '`') {
+                if ($tmp != '.' && $tmp != '`') {

                     $field = $table . "." . $field;
-                } else {
+                } else {

                     $out = $field;
                 }
-            } elseif (empty($table) && strpos($field, "`")) {
+            } elseif (empty($table) && strpos($field, "`")) {

                 $out = $field;
             }
-            if (empty($out)) {
+            if (empty($out)) {

                 $field = explode(".", $field);
-                foreach ($field as &$f) {
+                foreach ($field as &$f) {

                     $f = "`" . str_replace("`", "", $f) . "`";
                 }
                 $out = implode(".", $field);
@@ -41,10 +41,10 @@ 
      * @param string $mode
      * @return mixed|string
      */
-    public static function trimLogicalOp($string, $mode = '')
-    {
+    public static function trimLogicalOp($string, $mode = '')

+    {

         $regex = 'AND|and|OR|or|\&\&|\|\||NOT|not|\!';
-        switch ($mode) {
+        switch ($mode) {

             case 'right':
                 $regex = '\s+(' . $regex . ')\s*$';
                 break;
@@ -70,13 +70,13 @@ 
      * @param string $tpl шаблон подстановки значения в SQL запрос
      * @return string строка для подстановки в SQL запрос
      */
-    public static function LikeEscape(DocumentParser $modx, $field, $value, $escape = '=', $tpl = '%[+value+]%')
-    {
+    public static function LikeEscape(DocumentParser $modx, $field, $value, $escape = '=', $tpl = '%[+value+]%')

+    {

         $str = '';
         $escaped = false;
-        if (!empty($field) && is_string($field) && is_scalar($value) && $value !== '') {
+        if (!empty($field) && is_string($field) && is_scalar($value) && $value !== '') {

             $field = sqlHelper::tildeField($field);
-            if (is_scalar($escape) && !empty($escape) && !in_array($escape, array("_", "%", "'"))) {
+            if (is_scalar($escape) && !empty($escape) && !in_array($escape, array("_", "%", "'"))) {

                 $str = str_replace(array($escape, '_', '%'), array($escape . $escape, $escape . '_', $escape . '%'),
                     $value);
                 $escaped = true;
@@ -84,9 +84,9 @@ 
             $str = $modx->db->escape($str);
             $str = str_replace('[+value+]', $str, $tpl);
 
-            if ($escaped) {
+            if ($escaped) {

                 $str = "{$field} LIKE '{$str}' ESCAPE '{$escape}'";
-            } else {
+            } else {

                 $str = "{$field} LIKE '{$str}'";
             }
         }