AgelxNash / DocLister

assets/lib/APIHelpers.class.php

Doc Comments +4 added lines, -1 removed lines

@@ -70,7 +70,7 @@ 
      * @license    GNU General Public License (GPL), http://www.gnu.org/copyleft/gpl.html
      * @param string $email проверяемый email
      * @param boolean $dns проверять ли DNS записи
-     * @return boolean Результат проверки почтового ящика
+     * @return false|string Результат проверки почтового ящика
      * @author Anton Shevchuk
      */
     public static function emailValidate($email, $dns = true)
@@ -142,6 +142,9 @@ 
         return $pass;
     }
 
+    /**
+     * @param string $data
+     */
     private function _getEnv($data)
     {
         $out = false;

Indentation +1 added lines, -1 removed lines

@@ -125,7 +125,7 @@
         for ($i = $len; $i > 0; $i--) {
             switch ($data[rand(0, ($opt - 1))]) {
                 case 'A':
-                	$tmp = rand(65, 90);
+                    $tmp = rand(65, 90);
                     break;
                 case 'a':
                     $tmp = rand(97, 122);

Braces +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
         $text = mb_substr($text, 0, $len+1, $encoding);
         if(mb_substr($text, -1, null, $encoding) == ' '){
             $out = trim($text);
-        }else{
+        } else{
             $out = mb_substr($text, 0, mb_strripos($text, ' ', null, $encoding), $encoding);
         }
         return preg_replace("/(([\.,\-:!?;\s])|(&\w+;))+$/ui", "", $out);

Spacing +16 added lines, -16 removed lines

@@ -8,8 +8,8 @@ 
      * @param string $encoding - кодировка, по-умолчанию UTF-8
      * @return string
      */
-    public static function mb_lcfirst($str, $encoding='UTF-8'){
-        return mb_strtolower(mb_substr($str, 0, 1, $encoding), $encoding).mb_substr($str,1, mb_strlen($str), $encoding);
+    public static function mb_lcfirst($str, $encoding = 'UTF-8') {
+        return mb_strtolower(mb_substr($str, 0, 1, $encoding), $encoding).mb_substr($str, 1, mb_strlen($str), $encoding);
     }
 
     /**
@@ -18,7 +18,7 @@ 
      * @param string $encoding - кодировка, по-умолчанию UTF-8
      * @return string
      */
-    public static function mb_ucfirst($str, $encoding='UTF-8')
+    public static function mb_ucfirst($str, $encoding = 'UTF-8')
     {
         $str = mb_ereg_replace('^[\ ]+', '', $str);
         $str = mb_strtoupper(mb_substr($str, 0, 1, $encoding), $encoding).mb_substr($str, 1, mb_strlen($str), $encoding);
@@ -36,12 +36,12 @@ 
      * @param string $encoding кодировка
      * @return string
      */
-    public static function mb_trim_word($html, $len, $encoding = 'UTF-8'){
+    public static function mb_trim_word($html, $len, $encoding = 'UTF-8') {
         $text = trim(preg_replace('|\s+|', ' ', strip_tags($html)));
-        $text = mb_substr($text, 0, $len+1, $encoding);
-        if(mb_substr($text, -1, null, $encoding) == ' '){
+        $text = mb_substr($text, 0, $len + 1, $encoding);
+        if (mb_substr($text, -1, null, $encoding) == ' ') {
             $out = trim($text);
-        }else{
+        } else {
             $out = mb_substr($text, 0, mb_strripos($text, ' ', null, $encoding), $encoding);
         }
         return preg_replace("/(([\.,\-:!?;\s])|(&\w+;))+$/ui", "", $out);
@@ -216,8 +216,8 @@ 
         '[' => '[', '%5B' => '[', ']' => ']', '%5D' => ']',
         '{' => '{', '%7B' => '{', '}' => '}', '%7D' => '}',
         '`' => '`', '%60' => '`'
-    )){
-        switch(true){
+    )) {
+        switch (true) {
             case is_scalar($data):
                 $out = str_replace(
                     array_keys($chars),
@@ -227,7 +227,7 @@ 
                 break;
             case is_array($data):
                 $out = $data;
-                foreach($out as $key => &$val){
+                foreach ($out as $key => &$val) {
                     $val = self::sanitarTag($val, $charset, $chars);
                 }
                 break;
@@ -237,7 +237,7 @@ 
         return $out;
     }
 
-    public static function e($text, $charset = 'UTF-8'){
+    public static function e($text, $charset = 'UTF-8') {
         return is_scalar($text) ? htmlspecialchars($text, ENT_QUOTES, $charset, false) : '';
     }
     /**
@@ -319,12 +319,12 @@ 
         if ($prefix == '' && $suffix == '') {
             $out = $data;
         } else {
-            $InsertPrefix = ($prefix != '') ? ($prefix . $addPS) : '';
-            $InsertSuffix = ($suffix != '') ? ($addPS. $suffix) : '';
+            $InsertPrefix = ($prefix != '') ? ($prefix.$addPS) : '';
+            $InsertSuffix = ($suffix != '') ? ($addPS.$suffix) : '';
             foreach ($data as $key => $item) {
-                $key = $InsertPrefix . $key;
+                $key = $InsertPrefix.$key;
                 $val = null;
-                switch(true){
+                switch (true) {
                     case is_scalar($item):
                         $val = $item;
                         break;
@@ -334,7 +334,7 @@ 
                         $val = '';
                         break;
                 }
-                $out[$key . $InsertSuffix] = $val;
+                $out[$key.$InsertSuffix] = $val;
             }
         }
         return $out;

assets/lib/class.summary.php

Doc Comments +11 added lines

@@ -101,6 +101,10 @@ 
         return $summary;
     }
 
+    /**
+     * @param integer $truncOffset
+     * @param boolean $truncChars
+     */
     protected function summary($resource, $truncLen, $truncOffset, $truncChars, $splitter = '')
     {
         if (isset($this->_useCut) && $splitter != '' && mb_strstr($resource, $splitter, 'UTF-8')) {
@@ -180,6 +184,10 @@ 
      * @see summary extender for Ditto (truncate::textTrunc)
      * @link https://github.com/modxcms/evolution/blob/develop/assets/snippets/ditto/extenders/summary.extender.inc.php#L213
      */
+
+    /**
+     * @param integer $limit
+     */
     protected function textTrunc($string, $limit, $break = ". ")
     {
         // Original PHP code from The Art of Web: www.the-art-of-web.com
@@ -198,6 +206,9 @@ 
         return $string;
     }
 
+    /**
+     * @param string $str
+     */
     protected function rTriming($str)
     {
         $str = preg_replace('/[\r\n]++/', ' ', $str);

Braces +18 added lines, -6 removed lines

@@ -108,7 +108,9 @@ 
         } else if ($this->_useCut !== true && (mb_strlen($resource, 'UTF-8') > $truncLen)) {
 
             $summary = $this->html_substr($resource, $truncLen, $truncOffset, $truncChars);
-            if ($resource != $summary) $this->_useSubstr = true;
+            if ($resource != $summary) {

+                $this->_useSubstr = true;

+            }

         } else {
             $summary = $resource;
         }
@@ -149,15 +151,23 @@ 
                     }
                     // Slash signifies an ending (like </a> or ... />)
                     // substract 2
-                    if ($current_char == '/' && $tag_counter <> 0) $tag_counter -= 2;
+                    if ($current_char == '/' && $tag_counter <> 0) {

+                        $tag_counter -= 2;

+                    }

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

+                        $tag_counter -= 1;

+                    }

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

+                        $quotes_on = TRUE;

+                    }

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

+                        $quotes_on = FALSE;

+                    }

                 }
 
                 // Count only the chars outside html tags
@@ -185,7 +195,9 @@ 
         // Original PHP code from The Art of Web: www.the-art-of-web.com
 
         // return with no change if string is shorter than $limit
-        if (mb_strlen($string, 'UTF-8') < $limit) return $string;
+        if (mb_strlen($string, 'UTF-8') < $limit) {

+            return $string;

+        }

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

Indentation +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
                 $process = explode(":", $doing);
                 switch ($process[0]) {
                     case 'notags':
-                    	$this->_cfg['content'] = strip_tags($this->_cfg['content']);
+                        $this->_cfg['content'] = strip_tags($this->_cfg['content']);
                         break;
                     case 'noparser':
                         $this->_cfg['content'] = APIhelpers::sanitarTag($this->_cfg['content']);

Spacing +4 added lines, -4 removed lines

@@ -12,7 +12,7 @@ 
  * @date 31.07.2013
  * @version 1.0.3
  */
-include_once(MODX_BASE_PATH . 'assets/lib/APIHelpers.class.php');
+include_once(MODX_BASE_PATH.'assets/lib/APIHelpers.class.php');
 class SummaryText
 {
     private $_cfg = array('content' => '', 'summary' => '', 'original' => '', 'break' => '');
@@ -91,7 +91,7 @@ 
     protected  function beforeCut($resource, $splitter = '')
     {
         if ($splitter !== '') {
-            $summary = str_replace('<p>' . $splitter . '</p>', $splitter, $resource); // For TinyMCE or if it isn't wrapped inside paragraph tags
+            $summary = str_replace('<p>'.$splitter.'</p>', $splitter, $resource); // For TinyMCE or if it isn't wrapped inside paragraph tags
             $summary = explode($splitter, $summary, 2);
             $this->_useCut = isset($summary[1]);
             $summary = $summary['0'];
@@ -252,10 +252,10 @@ 
                     $tag = mb_substr($tag, 0, strpos($tag, ' '), 'UTF-8');
                 }
                 if (!mb_stristr($tag, 'br', 'UTF-8') && !mb_stristr($tag, 'img', 'UTF-8') && !empty ($tag)) {
-                    $endTags .= '</' . $tag . '>';
+                    $endTags .= '</'.$tag.'>';
                 }
             }
         }
-        return $text . $endTags;
+        return $text.$endTags;
     }
 }
\ No newline at end of file

assets/lib/Formatter/SqlFormatter.php

Doc Comments +3 added lines

@@ -329,6 +329,9 @@
         );

     }

 

+    /**
+     * @param string $string
+     */
     protected static function getQuotedString($string)

     {

         $ret = null;

Braces +17 added lines, -6 removed lines

@@ -176,7 +176,9 @@ 
      */

     protected static function init()

     {

-        if (self::$init) return;

+        if (self::$init) {

+            return;

+        }

 

         // Sort reserved word list from longest word to shortest, 3x faster than usort

         $reservedMap = array_combine(self::$reserved, array_map('strlen', self::$reserved));

@@ -263,7 +265,9 @@ 
                 }

             }

             

-            if($ret[self::TOKEN_VALUE] !== null) return $ret;

+            if($ret[self::TOKEN_VALUE] !== null) {

+                return $ret;

+            }

         }

 

         // Number (decimal, binary, or hex)

@@ -536,7 +540,9 @@ 
                 $length = 0;

                 for ($j=1;$j<=250;$j++) {

                     // Reached end of string

-                    if (!isset($tokens[$i+$j])) break;

+                    if (!isset($tokens[$i+$j])) {

+                        break;

+                    }

 

                     $next = $tokens[$i+$j];

 

@@ -954,7 +960,9 @@ 
      */

     protected static function highlightBoundary($value)

     {

-        if ($value==='(' || $value===')') return $value;

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

+            return $value;

+        }

 

         if (self::is_cli()) {

             return self::$cli_boundary . $value . "\x1b[0m";

@@ -1078,8 +1086,11 @@ 
 

     private static function is_cli()

     {

-        if (isset(self::$cli)) return self::$cli;

-        else return php_sapi_name() === 'cli';

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

+            return self::$cli;

+        } else {

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

+        }

     }

 

 }
\ No newline at end of file

Indentation +2 added lines, -2 removed lines

@@ -862,9 +862,9 @@
             $token = $token[self::TOKEN_VALUE];

         } else {

             if (defined('ENT_IGNORE')) {

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

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

             } else {

-              $token = htmlentities($token[self::TOKEN_VALUE],ENT_COMPAT,'UTF-8');

+                $token = htmlentities($token[self::TOKEN_VALUE],ENT_COMPAT,'UTF-8');

             }

         }

 

Spacing +116 added lines, -116 removed lines

@@ -45,14 +45,14 @@ 
         'HOUR_SECOND', 'IDENTIFIED', 'IF', 'IFNULL', 'IGNORE', 'IN', 'INDEX', 'INDEXES', 'INFILE', 'INSERT', 'INSERT_ID', 'INSERT_METHOD', 'INTERVAL',

         'INTO', 'INVOKER', 'IS', 'ISOLATION', 'KEY', 'KEYS', 'KILL', 'LAST_INSERT_ID', 'LEADING', 'LEVEL', 'LIKE', 'LINEAR',

         'LINES', 'LOAD', 'LOCAL', 'LOCK', 'LOCKS', 'LOGS', 'LOW_PRIORITY', 'MARIA', 'MASTER', 'MASTER_CONNECT_RETRY', 'MASTER_HOST', 'MASTER_LOG_FILE',

-        'MATCH','MAX_CONNECTIONS_PER_HOUR', 'MAX_QUERIES_PER_HOUR', 'MAX_ROWS', 'MAX_UPDATES_PER_HOUR', 'MAX_USER_CONNECTIONS',

+        'MATCH', 'MAX_CONNECTIONS_PER_HOUR', 'MAX_QUERIES_PER_HOUR', 'MAX_ROWS', 'MAX_UPDATES_PER_HOUR', 'MAX_USER_CONNECTIONS',

         'MEDIUM', 'MERGE', 'MINUTE', 'MINUTE_SECOND', 'MIN_ROWS', 'MODE', 'MODIFY',

-        'MONTH', 'MRG_MYISAM', 'MYISAM', 'NAMES', 'NATURAL', 'NOT', 'NOW()','NULL', 'OFFSET', 'ON', 'OPEN', 'OPTIMIZE', 'OPTION', 'OPTIONALLY',

+        'MONTH', 'MRG_MYISAM', 'MYISAM', 'NAMES', 'NATURAL', 'NOT', 'NOW()', 'NULL', 'OFFSET', 'ON', 'OPEN', 'OPTIMIZE', 'OPTION', 'OPTIONALLY',

         'ON UPDATE', 'ON DELETE', 'OUTFILE', 'PACK_KEYS', 'PAGE', 'PARTIAL', 'PARTITION', 'PARTITIONS', 'PASSWORD', 'PRIMARY', 'PRIVILEGES', 'PROCEDURE',

-        'PROCESS', 'PROCESSLIST', 'PURGE', 'QUICK', 'RANGE', 'RAID0', 'RAID_CHUNKS', 'RAID_CHUNKSIZE','RAID_TYPE', 'READ', 'READ_ONLY',

+        'PROCESS', 'PROCESSLIST', 'PURGE', 'QUICK', 'RANGE', 'RAID0', 'RAID_CHUNKS', 'RAID_CHUNKSIZE', 'RAID_TYPE', 'READ', 'READ_ONLY',

         'READ_WRITE', 'REFERENCES', 'REGEXP', 'RELOAD', 'RENAME', 'REPAIR', 'REPEATABLE', 'REPLACE', 'REPLICATION', 'RESET', 'RESTORE', 'RESTRICT',

         'RETURN', 'RETURNS', 'REVOKE', 'RLIKE', 'ROLLBACK', 'ROW', 'ROWS', 'ROW_FORMAT', 'SECOND', 'SECURITY', 'SEPARATOR',

-        'SERIALIZABLE', 'SESSION', 'SHARE', 'SHOW', 'SHUTDOWN', 'SLAVE', 'SONAME', 'SOUNDS', 'SQL',  'SQL_AUTO_IS_NULL', 'SQL_BIG_RESULT',

+        'SERIALIZABLE', 'SESSION', 'SHARE', 'SHOW', 'SHUTDOWN', 'SLAVE', 'SONAME', 'SOUNDS', 'SQL', 'SQL_AUTO_IS_NULL', 'SQL_BIG_RESULT',

         'SQL_BIG_SELECTS', 'SQL_BIG_TABLES', 'SQL_BUFFER_RESULT', 'SQL_CALC_FOUND_ROWS', 'SQL_LOG_BIN', 'SQL_LOG_OFF', 'SQL_LOG_UPDATE',

         'SQL_LOW_PRIORITY_UPDATES', 'SQL_MAX_JOIN_SIZE', 'SQL_QUOTE_SHOW_CREATE', 'SQL_SAFE_UPDATES', 'SQL_SELECT_LIMIT', 'SQL_SLAVE_SKIP_COUNTER',

         'SQL_SMALL_RESULT', 'SQL_WARNINGS', 'SQL_CACHE', 'SQL_NO_CACHE', 'START', 'STARTING', 'STATUS', 'STOP', 'STORAGE',

@@ -72,25 +72,25 @@ 
         'LEFT OUTER JOIN', 'RIGHT OUTER JOIN', 'LEFT JOIN', 'RIGHT JOIN', 'OUTER JOIN', 'INNER JOIN', 'JOIN', 'XOR', 'OR', 'AND'

     );

 

-    protected static $functions = array (

+    protected static $functions = array(

         'ABS', 'ACOS', 'ADDDATE', 'ADDTIME', 'AES_DECRYPT', 'AES_ENCRYPT', 'AREA', 'ASBINARY', 'ASCII', 'ASIN', 'ASTEXT', 'ATAN', 'ATAN2',

-        'AVG', 'BDMPOLYFROMTEXT',  'BDMPOLYFROMWKB', 'BDPOLYFROMTEXT', 'BDPOLYFROMWKB', 'BENCHMARK', 'BIN', 'BIT_AND', 'BIT_COUNT', 'BIT_LENGTH',

-        'BIT_OR', 'BIT_XOR', 'BOUNDARY',  'BUFFER',  'CAST', 'CEIL', 'CEILING', 'CENTROID',  'CHAR', 'CHARACTER_LENGTH', 'CHARSET', 'CHAR_LENGTH',

-        'COALESCE', 'COERCIBILITY', 'COLLATION',  'COMPRESS', 'CONCAT', 'CONCAT_WS', 'CONNECTION_ID', 'CONTAINS', 'CONV', 'CONVERT', 'CONVERT_TZ',

-        'CONVEXHULL',  'COS', 'COT', 'COUNT', 'CRC32', 'CROSSES', 'CURDATE', 'CURRENT_DATE', 'CURRENT_TIME', 'CURRENT_TIMESTAMP', 'CURRENT_USER',

+        'AVG', 'BDMPOLYFROMTEXT', 'BDMPOLYFROMWKB', 'BDPOLYFROMTEXT', 'BDPOLYFROMWKB', 'BENCHMARK', 'BIN', 'BIT_AND', 'BIT_COUNT', 'BIT_LENGTH',

+        'BIT_OR', 'BIT_XOR', 'BOUNDARY', 'BUFFER', 'CAST', 'CEIL', 'CEILING', 'CENTROID', 'CHAR', 'CHARACTER_LENGTH', 'CHARSET', 'CHAR_LENGTH',

+        'COALESCE', 'COERCIBILITY', 'COLLATION', 'COMPRESS', 'CONCAT', 'CONCAT_WS', 'CONNECTION_ID', 'CONTAINS', 'CONV', 'CONVERT', 'CONVERT_TZ',

+        'CONVEXHULL', 'COS', 'COT', 'COUNT', 'CRC32', 'CROSSES', 'CURDATE', 'CURRENT_DATE', 'CURRENT_TIME', 'CURRENT_TIMESTAMP', 'CURRENT_USER',

         'CURTIME', 'DATABASE', 'DATE', 'DATEDIFF', 'DATE_ADD', 'DATE_DIFF', 'DATE_FORMAT', 'DATE_SUB', 'DAY', 'DAYNAME', 'DAYOFMONTH', 'DAYOFWEEK',

         'DAYOFYEAR', 'DECODE', 'DEFAULT', 'DEGREES', 'DES_DECRYPT', 'DES_ENCRYPT', 'DIFFERENCE', 'DIMENSION', 'DISJOINT', 'DISTANCE', 'ELT', 'ENCODE',

         'ENCRYPT', 'ENDPOINT', 'ENVELOPE', 'EQUALS', 'EXP', 'EXPORT_SET', 'EXTERIORRING', 'EXTRACT', 'EXTRACTVALUE', 'FIELD', 'FIND_IN_SET', 'FLOOR',

         'FORMAT', 'FOUND_ROWS', 'FROM_DAYS', 'FROM_UNIXTIME', 'GEOMCOLLFROMTEXT', 'GEOMCOLLFROMWKB', 'GEOMETRYCOLLECTION', 'GEOMETRYCOLLECTIONFROMTEXT',

         'GEOMETRYCOLLECTIONFROMWKB', 'GEOMETRYFROMTEXT', 'GEOMETRYFROMWKB', 'GEOMETRYN', 'GEOMETRYTYPE', 'GEOMFROMTEXT', 'GEOMFROMWKB', 'GET_FORMAT',

         'GET_LOCK', 'GLENGTH', 'GREATEST', 'GROUP_CONCAT', 'GROUP_UNIQUE_USERS', 'HEX', 'HOUR', 'IF', 'IFNULL', 'INET_ATON', 'INET_NTOA', 'INSERT', 'INSTR',

-        'INTERIORRINGN', 'INTERSECTION', 'INTERSECTS',  'INTERVAL', 'ISCLOSED', 'ISEMPTY', 'ISNULL', 'ISRING', 'ISSIMPLE', 'IS_FREE_LOCK', 'IS_USED_LOCK',

+        'INTERIORRINGN', 'INTERSECTION', 'INTERSECTS', 'INTERVAL', 'ISCLOSED', 'ISEMPTY', 'ISNULL', 'ISRING', 'ISSIMPLE', 'IS_FREE_LOCK', 'IS_USED_LOCK',

         'LAST_DAY', 'LAST_INSERT_ID', 'LCASE', 'LEAST', 'LEFT', 'LENGTH', 'LINEFROMTEXT', 'LINEFROMWKB', 'LINESTRING', 'LINESTRINGFROMTEXT', 'LINESTRINGFROMWKB',

         'LN', 'LOAD_FILE', 'LOCALTIME', 'LOCALTIMESTAMP', 'LOCATE', 'LOG', 'LOG10', 'LOG2', 'LOWER', 'LPAD', 'LTRIM', 'MAKEDATE', 'MAKETIME', 'MAKE_SET',

         'MASTER_POS_WAIT', 'MAX', 'MBRCONTAINS', 'MBRDISJOINT', 'MBREQUAL', 'MBRINTERSECTS', 'MBROVERLAPS', 'MBRTOUCHES', 'MBRWITHIN', 'MD5', 'MICROSECOND',

         'MID', 'MIN', 'MINUTE', 'MLINEFROMTEXT', 'MLINEFROMWKB', 'MOD', 'MONTH', 'MONTHNAME', 'MPOINTFROMTEXT', 'MPOINTFROMWKB', 'MPOLYFROMTEXT', 'MPOLYFROMWKB',

-        'MULTILINESTRING', 'MULTILINESTRINGFROMTEXT', 'MULTILINESTRINGFROMWKB', 'MULTIPOINT',  'MULTIPOINTFROMTEXT', 'MULTIPOINTFROMWKB', 'MULTIPOLYGON',

-        'MULTIPOLYGONFROMTEXT', 'MULTIPOLYGONFROMWKB', 'NAME_CONST', 'NULLIF', 'NUMGEOMETRIES', 'NUMINTERIORRINGS',  'NUMPOINTS', 'OCT', 'OCTET_LENGTH',

+        'MULTILINESTRING', 'MULTILINESTRINGFROMTEXT', 'MULTILINESTRINGFROMWKB', 'MULTIPOINT', 'MULTIPOINTFROMTEXT', 'MULTIPOINTFROMWKB', 'MULTIPOLYGON',

+        'MULTIPOLYGONFROMTEXT', 'MULTIPOLYGONFROMWKB', 'NAME_CONST', 'NULLIF', 'NUMGEOMETRIES', 'NUMINTERIORRINGS', 'NUMPOINTS', 'OCT', 'OCTET_LENGTH',

         'OLD_PASSWORD', 'ORD', 'OVERLAPS', 'PASSWORD', 'PERIOD_ADD', 'PERIOD_DIFF', 'PI', 'POINT', 'POINTFROMTEXT', 'POINTFROMWKB', 'POINTN', 'POINTONSURFACE',

         'POLYFROMTEXT', 'POLYFROMWKB', 'POLYGON', 'POLYGONFROMTEXT', 'POLYGONFROMWKB', 'POSITION', 'POW', 'POWER', 'QUARTER', 'QUOTE', 'RADIANS', 'RAND',

         'RELATED', 'RELEASE_LOCK', 'REPEAT', 'REPLACE', 'REVERSE', 'RIGHT', 'ROUND', 'ROW_COUNT', 'RPAD', 'RTRIM', 'SCHEMA', 'SECOND', 'SEC_TO_TIME',

@@ -102,7 +102,7 @@ 
     );

 

     // Punctuation that can be used as a boundary between other tokens

-    protected static $boundaries = array(',', ';',':', ')', '(', '.', '=', '<', '>', '+', '-', '*', '/', '!', '^', '%', '|', '&', '#');

+    protected static $boundaries = array(',', ';', ':', ')', '(', '.', '=', '<', '>', '+', '-', '*', '/', '!', '^', '%', '|', '&', '#');

 

     // For HTML syntax highlighting

     // Styles applied to different token types

@@ -184,12 +184,12 @@ 
         self::$reserved = array_keys($reservedMap);

 

         // Set up regular expressions

-        self::$regex_boundaries = '('.implode('|',array_map(array(__CLASS__, 'quote_regex'),self::$boundaries)).')';

-        self::$regex_reserved = '('.implode('|',array_map(array(__CLASS__, 'quote_regex'),self::$reserved)).')';

-        self::$regex_reserved_toplevel = str_replace(' ','\\s+','('.implode('|',array_map(array(__CLASS__, 'quote_regex'),self::$reserved_toplevel)).')');

-        self::$regex_reserved_newline = str_replace(' ','\\s+','('.implode('|',array_map(array(__CLASS__, 'quote_regex'),self::$reserved_newline)).')');

+        self::$regex_boundaries = '('.implode('|', array_map(array(__CLASS__, 'quote_regex'), self::$boundaries)).')';

+        self::$regex_reserved = '('.implode('|', array_map(array(__CLASS__, 'quote_regex'), self::$reserved)).')';

+        self::$regex_reserved_toplevel = str_replace(' ', '\\s+', '('.implode('|', array_map(array(__CLASS__, 'quote_regex'), self::$reserved_toplevel)).')');

+        self::$regex_reserved_newline = str_replace(' ', '\\s+', '('.implode('|', array_map(array(__CLASS__, 'quote_regex'), self::$reserved_newline)).')');

 

-        self::$regex_function = '('.implode('|',array_map(array(__CLASS__, 'quote_regex'),self::$functions)).')';

+        self::$regex_function = '('.implode('|', array_map(array(__CLASS__, 'quote_regex'), self::$functions)).')';

 

         self::$init = true;

     }

@@ -206,7 +206,7 @@ 
     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

@@ -214,7 +214,7 @@ 
         }

 

         // 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] === '#') {

                 $last = strpos($string, "\n");

@@ -235,9 +235,9 @@ 
         }

 

         // 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_TYPE => (($string[0] === '`' || $string[0] === '[') ? self::TOKEN_TYPE_BACKTICK_QUOTE : self::TOKEN_TYPE_QUOTE),

                 self::TOKEN_VALUE => self::getQuotedString($string)

             );

 

@@ -252,22 +252,22 @@ 
             );

             

             // If the variable name is quoted

-            if ($string[1]==='"' || $string[1]==='\'' || $string[1]==='`') {

-                $ret[self::TOKEN_VALUE] = $string[0].self::getQuotedString(substr($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 {

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

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

                 if ($matches) {

                     $ret[self::TOKEN_VALUE] = $matches[1];

                 }

             }

             

-            if($ret[self::TOKEN_VALUE] !== null) return $ret;

+            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)) {

+        if (preg_match('/^([0-9]+(\.[0-9]+)?|0x[0-9a-fA-F]+|0b[01]+)($|\s|"\'`|'.self::$regex_boundaries.')/', $string, $matches)) {

             return array(

                 self::TOKEN_VALUE => $matches[1],

                 self::TOKEN_TYPE=>self::TOKEN_TYPE_NUMBER

@@ -275,7 +275,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

@@ -287,24 +287,24 @@ 
         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)) {

+            if (preg_match('/^('.self::$regex_reserved_toplevel.')($|\s|'.self::$regex_boundaries.')/', $upper, $matches)) {

                 return array(

                     self::TOKEN_TYPE=>self::TOKEN_TYPE_RESERVED_TOPLEVEL,

-                    self::TOKEN_VALUE=>substr($string,0,strlen($matches[1]))

+                    self::TOKEN_VALUE=>substr($string, 0, strlen($matches[1]))

                 );

             }

             // Newline Reserved Word

-            if (preg_match('/^('.self::$regex_reserved_newline.')($|\s|'.self::$regex_boundaries.')/', $upper,$matches)) {

+            if (preg_match('/^('.self::$regex_reserved_newline.')($|\s|'.self::$regex_boundaries.')/', $upper, $matches)) {

                 return array(

                     self::TOKEN_TYPE=>self::TOKEN_TYPE_RESERVED_NEWLINE,

-                    self::TOKEN_VALUE=>substr($string,0,strlen($matches[1]))

+                    self::TOKEN_VALUE=>substr($string, 0, strlen($matches[1]))

                 );

             }

             // Other Reserved Word

-            if (preg_match('/^('.self::$regex_reserved.')($|\s|'.self::$regex_boundaries.')/', $upper,$matches)) {

+            if (preg_match('/^('.self::$regex_reserved.')($|\s|'.self::$regex_boundaries.')/', $upper, $matches)) {

                 return array(

                     self::TOKEN_TYPE=>self::TOKEN_TYPE_RESERVED,

-                    self::TOKEN_VALUE=>substr($string,0,strlen($matches[1]))

+                    self::TOKEN_VALUE=>substr($string, 0, strlen($matches[1]))

                 );

             }

         }

@@ -313,15 +313,15 @@ 
         // 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)

+                self::TOKEN_VALUE=>substr($string, 0, strlen($matches[1]) - 1)

             );

         }

 

         // Non reserved word

-        preg_match('/^(.*?)($|\s|["\'`]|'.self::$regex_boundaries.')/',$string,$matches);

+        preg_match('/^(.*?)($|\s|["\'`]|'.self::$regex_boundaries.')/', $string, $matches);

 

         return array(

             self::TOKEN_VALUE => $matches[1],

@@ -338,7 +338,7 @@ 
         // 2. square bracket quoted string (SQL Server) using ]] to escape

         // 3. double quoted string using "" or \" to escape

         // 4. single quoted string using '' or \' to escape

-        if ( preg_match('/^(((`[^`]*($|`))+)|((\[[^\]]*($|\]))(\][^\]]*($|\]))*)|(("[^"\\\\]*(?:\\\\.[^"\\\\]*)*("|$))+)|((\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*(\'|$))+))/s', $string, $matches)) {

+        if (preg_match('/^(((`[^`]*($|`))+)|((\[[^\]]*($|\]))(\][^\]]*($|\]))*)|(("[^"\\\\]*(?:\\\\.[^"\\\\]*)*("|$))+)|((\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*(\'|$))+))/s', $string, $matches)) {

             $ret = $matches[1];

         }

         

@@ -377,11 +377,11 @@ 
 

                 return $tokens;

             }

-            $old_string_len =  $current_length;

+            $old_string_len = $current_length;

 

             // Determine if we can use caching

             if ($current_length >= self::$max_cachekey_size) {

-                $cacheKey = substr($string,0,self::$max_cachekey_size);

+                $cacheKey = substr($string, 0, self::$max_cachekey_size);

             } else {

                 $cacheKey = false;

             }

@@ -423,7 +423,7 @@ 
      *

      * @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 = '';

@@ -466,18 +466,18 @@ 
             if ($increase_special_indent) {

                 $indent_level++;

                 $increase_special_indent = false;

-                array_unshift($indent_types,'special');

+                array_unshift($indent_types, 'special');

             }

             // If we are increasing the block indent level now

             if ($increase_block_indent) {

                 $indent_level++;

                 $increase_block_indent = false;

-                array_unshift($indent_types,'block');

+                array_unshift($indent_types, 'block');

             }

 

             // If we need a new line before the token

             if ($newline) {

-                $return .= "\n" . str_repeat($tab, $indent_level);

+                $return .= "\n".str_repeat($tab, $indent_level);

                 $newline = false;

                 $added_newline = true;

             } else {

@@ -487,9 +487,9 @@ 
             // 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) {

-                    $indent = str_repeat($tab,$indent_level);

-                    $return .= "\n" . $indent;

-                    $highlighted = str_replace("\n","\n".$indent,$highlighted);

+                    $indent = str_repeat($tab, $indent_level);

+                    $return .= "\n".$indent;

+                    $highlighted = str_replace("\n", "\n".$indent, $highlighted);

                 }

 

                 $return .= $highlighted;

@@ -500,17 +500,17 @@ 
             if ($inline_parentheses) {

                 // End of inline parentheses

                 if ($token[self::TOKEN_VALUE] === ')') {

-                    $return = rtrim($return,' ');

+                    $return = rtrim($return, ' ');

 

                     if ($inline_indented) {

                         array_shift($indent_types);

-                        $indent_level --;

-                        $return .= "\n" . str_repeat($tab, $indent_level);

+                        $indent_level--;

+                        $return .= "\n".str_repeat($tab, $indent_level);

                     }

 

                     $inline_parentheses = false;

 

-                    $return .= $highlighted . ' ';

+                    $return .= $highlighted.' ';

                     continue;

                 }

 

@@ -530,11 +530,11 @@ 
                 // 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])) break;

+                    if (!isset($tokens[$i + $j])) break;

 

-                    $next = $tokens[$i+$j];

+                    $next = $tokens[$i + $j];

 

                     // Reached closing parentheses, able to inline it

                     if ($next[self::TOKEN_VALUE] === ')') {

@@ -545,12 +545,12 @@ 
                     }

 

                     // 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;

                     }

 

@@ -564,8 +564,8 @@ 
                 }

 

                 // 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) {

-                    $return = rtrim($return,' ');

+                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) {

@@ -579,13 +579,13 @@ 
             // Closing parentheses decrease the block indent level

             elseif ($token[self::TOKEN_VALUE] === ')') {

                 // Remove whitespace before the closing parentheses

-                $return = rtrim($return,' ');

+                $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 {

                         break;

@@ -604,7 +604,7 @@ 
 

                 // Add a newline before the closing parentheses (if not already added)

                 if (!$added_newline) {

-                    $return .= "\n" . str_repeat($tab, $indent_level);

+                    $return .= "\n".str_repeat($tab, $indent_level);

                 }

             }

 

@@ -614,7 +614,7 @@ 
 

                 // 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);

                 }

@@ -623,16 +623,16 @@ 
                 $newline = true;

                 // Add a newline before the top level reserved word (if not already added)

                 if (!$added_newline) {

-                    $return .= "\n" . str_repeat($tab, $indent_level);

+                    $return .= "\n".str_repeat($tab, $indent_level);

                 }

                 // If we already added a newline, redo the indentation since it may be different now

                 else {

-                    $return = rtrim($return,$tab).str_repeat($tab, $indent_level);

+                    $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 (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) {

@@ -662,20 +662,20 @@ 
             elseif ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_RESERVED_NEWLINE) {

                 // Add a newline before the reserved word (if not already added)

                 if (!$added_newline) {

-                    $return .= "\n" . str_repeat($tab, $indent_level);

+                    $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);

+                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) {

-                        $return = rtrim($return,' ');

+                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, ' ');

                     }

                 }

             }

@@ -689,25 +689,25 @@ 
 

             // If the token shouldn't have a space after it

             if ($token[self::TOKEN_VALUE] === '(' || $token[self::TOKEN_VALUE] === '.') {

-                $return = rtrim($return,' ');

+                $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])) {

-                $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) {

-                    $return = rtrim($return,' ');

+            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) {

+                    $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));

+        $return = trim(str_replace("\t", self::$tab, $return));

 

         if ($highlight) {

             $return = self::output($return);

@@ -799,7 +799,7 @@ 
 

             $result .= $token[self::TOKEN_VALUE];

         }

-        $result = self::format( $result,false);

+        $result = self::format($result, false);

 

         return $result;

     }

@@ -825,7 +825,7 @@ 
             }

             // 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) {

-                $token[self::TOKEN_VALUE] = preg_replace('/\s+/',' ',$token[self::TOKEN_VALUE]);

+                $token[self::TOKEN_VALUE] = preg_replace('/\s+/', ' ', $token[self::TOKEN_VALUE]);

             }

 

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

@@ -862,31 +862,31 @@ 
             $token = $token[self::TOKEN_VALUE];

         } else {

             if (defined('ENT_IGNORE')) {

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

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

             } else {

-              $token = htmlentities($token[self::TOKEN_VALUE],ENT_COMPAT,'UTF-8');

+              $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);

         }

 

@@ -903,9 +903,9 @@ 
     protected static function highlightQuote($value)

     {

         if (self::is_cli()) {

-            return self::$cli_quote . $value . "\x1b[0m";

+            return self::$cli_quote.$value."\x1b[0m";

         } else {

-            return '<span ' . self::$quote_attributes . '>' . $value . '</span>';

+            return '<span '.self::$quote_attributes.'>'.$value.'</span>';

         }

     }

 

@@ -919,9 +919,9 @@ 
     protected static function highlightBacktickQuote($value)

     {

         if (self::is_cli()) {

-            return self::$cli_backtick_quote . $value . "\x1b[0m";

+            return self::$cli_backtick_quote.$value."\x1b[0m";

         } else {

-            return '<span ' . self::$backtick_quote_attributes . '>' . $value . '</span>';

+            return '<span '.self::$backtick_quote_attributes.'>'.$value.'</span>';

         }

     }

 

@@ -935,9 +935,9 @@ 
     protected static function highlightReservedWord($value)

     {

         if (self::is_cli()) {

-            return self::$cli_reserved . $value . "\x1b[0m";

+            return self::$cli_reserved.$value."\x1b[0m";

         } else {

-            return '<span ' . self::$reserved_attributes . '>' . $value . '</span>';

+            return '<span '.self::$reserved_attributes.'>'.$value.'</span>';

         }

     }

 

@@ -950,12 +950,12 @@ 
      */

     protected static function highlightBoundary($value)

     {

-        if ($value==='(' || $value===')') return $value;

+        if ($value === '(' || $value === ')') return $value;

 

         if (self::is_cli()) {

-            return self::$cli_boundary . $value . "\x1b[0m";

+            return self::$cli_boundary.$value."\x1b[0m";

         } else {

-            return '<span ' . self::$boundary_attributes . '>' . $value . '</span>';

+            return '<span '.self::$boundary_attributes.'>'.$value.'</span>';

         }

     }

 

@@ -969,9 +969,9 @@ 
     protected static function highlightNumber($value)

     {

         if (self::is_cli()) {

-            return self::$cli_number . $value . "\x1b[0m";

+            return self::$cli_number.$value."\x1b[0m";

         } else {

-            return '<span ' . self::$number_attributes . '>' . $value . '</span>';

+            return '<span '.self::$number_attributes.'>'.$value.'</span>';

         }

     }

 

@@ -985,9 +985,9 @@ 
     protected static function highlightError($value)

     {

         if (self::is_cli()) {

-            return self::$cli_error . $value . "\x1b[0m";

+            return self::$cli_error.$value."\x1b[0m";

         } else {

-            return '<span ' . self::$error_attributes . '>' . $value . '</span>';

+            return '<span '.self::$error_attributes.'>'.$value.'</span>';

         }

     }

 

@@ -1001,9 +1001,9 @@ 
     protected static function highlightComment($value)

     {

         if (self::is_cli()) {

-            return self::$cli_comment . $value . "\x1b[0m";

+            return self::$cli_comment.$value."\x1b[0m";

         } else {

-            return '<span ' . self::$comment_attributes . '>' . $value . '</span>';

+            return '<span '.self::$comment_attributes.'>'.$value.'</span>';

         }

     }

 

@@ -1017,9 +1017,9 @@ 
     protected static function highlightWord($value)

     {

         if (self::is_cli()) {

-            return self::$cli_word . $value . "\x1b[0m";

+            return self::$cli_word.$value."\x1b[0m";

         } else {

-            return '<span ' . self::$word_attributes . '>' . $value . '</span>';

+            return '<span '.self::$word_attributes.'>'.$value.'</span>';

         }

     }

 

@@ -1033,9 +1033,9 @@ 
     protected static function highlightVariable($value)

     {

         if (self::is_cli()) {

-            return self::$cli_variable . $value . "\x1b[0m";

+            return self::$cli_variable.$value."\x1b[0m";

         } else {

-            return '<span ' . self::$variable_attributes . '>' . $value . '</span>';

+            return '<span '.self::$variable_attributes.'>'.$value.'</span>';

         }

     }

 

@@ -1048,7 +1048,7 @@ 
      */

     private static function quote_regex($a)

     {

-        return preg_quote($a,'/');

+        return preg_quote($a, '/');

     }

 

     /**

@@ -1063,12 +1063,12 @@ 
         if (self::is_cli()) {

             return $string."\n";

         } else {

-            $string=trim($string);

+            $string = trim($string);

             if (!self::$use_pre) {

                 return $string;

             }

 

-            return '<pre '.self::$pre_attributes.'>' . $string . '</pre>';

+            return '<pre '.self::$pre_attributes.'>'.$string.'</pre>';

         }

     }

 

assets/lib/Helpers/Collection.php

Doc Comments +1 added lines, -1 removed lines

@@ -212,7 +212,7 @@
     /**

      * Reduce the collection to a single value.

      *

-     * @param  callable  $callback

+     * @param  Closure  $callback

      * @param  mixed     $initial

      * @return mixed

      */

Spacing +17 added lines, -17 removed lines

@@ -9,10 +9,10 @@ 
 class Collection implements \Countable, \IteratorAggregate, \ArrayAccess{

     protected $data = array();

 

-    public function __construct(array $data = array()){

+    public function __construct(array $data = array()) {

         $this->data = $data;

     }

-    public function create(array $data = array()){

+    public function create(array $data = array()) {

         return new static($data);

     }

     public function getIterator()

@@ -38,7 +38,7 @@ 
     public function forAll(Closure $p)

     {

         foreach ($this->data as $key => $element) {

-            if ( ! $p($key, $element)) {

+            if (!$p($key, $element)) {

                 return false;

             }

         }

@@ -64,7 +64,7 @@ 
     {

         return empty($this->data);

     }

-    public function clear(){

+    public function clear() {

         $this->data = array();

         return $this;

     }

@@ -72,20 +72,20 @@ 
         $this->data[] = $value;

         return $this;

     }

-    public function add($data, $id = null){

-        if((is_int($id) || is_string($id)) && $id !== ''){

+    public function add($data, $id = null) {

+        if ((is_int($id) || is_string($id)) && $id !== '') {

             $this->data[$id] = $data;

-        }else{

+        } else {

             $this->append($data);

         }

         return $this;

     }

-    public function count(){

+    public function count() {

         return count($this->data);

     }

-    public function get($id){

+    public function get($id) {

         $out = null;

-        if(is_scalar($id) && $id!=='' && $this->containsKey($id)){

+        if (is_scalar($id) && $id !== '' && $this->containsKey($id)) {

             $out = $this->data[$id];

         }

         return $out;

@@ -108,7 +108,7 @@ 
     {

         return key($this->data);

     }

-    public function prev(){

+    public function prev() {

         return prev($this->data);

     }

 

@@ -124,7 +124,7 @@ 
 

     public function remove($key)

     {

-        if ( ! isset($this->data[$key]) && ! array_key_exists($key, $this->data)) {

+        if (!isset($this->data[$key]) && !array_key_exists($key, $this->data)) {

             return null;

         }

         $removed = $this->data[$key];

@@ -146,10 +146,10 @@ 
     {

         return $this->containsKey($offset);

     }

-    public function dump(){

+    public function dump() {

         return var_dump($this->data);

     }

-    public function show(){

+    public function show() {

         print_r($this->data);

     }

 

@@ -160,7 +160,7 @@ 
 

     public function offsetSet($offset, $value)

     {

-        if ( ! isset($offset)) {

+        if (!isset($offset)) {

             return $this->add($value);

         }

         $this->set($offset, $value);

@@ -205,7 +205,7 @@ 
         return array_values($this->data);

     }

 

-    public function toArray(){

+    public function toArray() {

         return $this->data;

     }

 

@@ -270,7 +270,7 @@ 
         return $this;

     }

 

-    public function reindex(){

+    public function reindex() {

         $this->data = array_values($this->data);

         return $this;

     }

Braces +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
     public function add($data, $id = null){

         if((is_int($id) || is_string($id)) && $id !== ''){

             $this->data[$id] = $data;

-        }else{

+        } else{

             $this->append($data);

         }

         return $this;

assets/lib/Helpers/PHPThumb.php

Doc Comments +7 added lines

@@ -15,6 +15,10 @@ 
 		$this->fs = FS::getInstance();
     }
 
+    /**
+     * @param string $inputFile
+     * @param string $outputFile
+     */
     public function create($inputFile, $outputFile, $options) {
         $this->thumb->sourceFilename = $inputFile;
 		$ext = explode('.',$inputFile);
@@ -48,6 +52,9 @@ 
         }
     }
 
+    /**
+     * @param string $options
+     */
     private function setOptions($options) {
         $options = strtr($options, Array("," => "&", "_" => "=", '{' => '[', '}' => ']'));
         parse_str($options, $params);

Indentation +5 added lines, -5 removed lines

@@ -7,17 +7,17 @@ 
 
     private $thumb = null;
     protected $fs = null;
-	public $debugMessages = '';
+    public $debugMessages = '';
 
     public function __construct()
     {
-       	$this->thumb = new \phpthumb();
-		$this->fs = FS::getInstance();
+            $this->thumb = new \phpthumb();
+        $this->fs = FS::getInstance();
     }
 
     public function create($inputFile, $outputFile, $options) {
         $this->thumb->sourceFilename = $inputFile;
-		$ext = explode('.',$inputFile);
+        $ext = explode('.',$inputFile);
         $ext = str_replace('jpeg','jpg',strtolower(array_pop($ext)));
         $options = 'f='.$ext.'&'.$options;
         $this->setOptions($options);
@@ -32,7 +32,7 @@ 
     public function optimize($file, $type = 'jpg') {
         switch ($type) {
             case 'jpg':
-				$ext = $this->fs->takeFileExt($file);
+                $ext = $this->fs->takeFileExt($file);
                 if ($ext == 'jpeg' || $ext == 'jpg') {
                     $cmd = '/usr/bin/jpegtran -optimize -progressive -copy none -outfile '.escapeshellarg($file.'_').' '.escapeshellarg($file);
                     exec($cmd, $result, $return_var);

Spacing +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@ 
 <?php namespace Helpers;
 
 include_once(MODX_BASE_PATH.'assets/snippets/phpthumb/phpthumb.class.php');
-require_once(MODX_BASE_PATH . 'assets/lib/Helpers/FS.php');
+require_once(MODX_BASE_PATH.'assets/lib/Helpers/FS.php');
 
-class PHPThumb{
+class PHPThumb {
 
     private $thumb = null;
     protected $fs = null;
@@ -17,8 +17,8 @@ 
 
     public function create($inputFile, $outputFile, $options) {
         $this->thumb->sourceFilename = $inputFile;
-		$ext = explode('.',$inputFile);
-        $ext = str_replace('jpeg','jpg',strtolower(array_pop($ext)));
+		$ext = explode('.', $inputFile);
+        $ext = str_replace('jpeg', 'jpg', strtolower(array_pop($ext)));
         $options = 'f='.$ext.'&'.$options;
         $this->setOptions($options);
         if ($this->thumb->GenerateThumbnail() && $this->thumb->RenderToFile($outputFile)) {

assets/lib/Module/Helper.php

Doc Comments +9 added lines

@@ -15,11 +15,17 @@ 
 		return self::$mode;
 	}
 
+	/**
+	 * @param string $text
+	 */
 	public static function setMode($text)
 	{
 		self::$mode = $text;
 	}
 
+    /**
+     * @param string $from
+     */
     protected static function _counter($from, $where = ''){
         $q = self::$modx->db->select('count(id)', self::$modx->getFullTableName($from), $where);
         return self::$modx->db->getValue($q);
@@ -71,6 +77,9 @@ 
 		return $error;
 	}
 
+	/**
+	 * @param \Closure $callback
+	 */
 	public static function readFileLine($path, $callback, array $callbackParams = array(), $lines = 0, $size = 4096)
 	{
 		$handle = fopen($path, "r");

Indentation +72 added lines, -72 removed lines

@@ -3,22 +3,22 @@ 
 include_once(dirname(dirname(__FILE__)).'/APIHelpers.class.php');
 class Helper extends \APIhelpers{
     protected static $modx = null;
-	protected static $mode = 'list';
+    protected static $mode = 'list';
 
     public static function init(\DocumentParser $modx, $mode = 'list'){
         self::$modx = $modx;
-		self::setMode($mode);
+        self::setMode($mode);
     }
 
-	public static function getMode()
-	{
-		return self::$mode;
-	}
+    public static function getMode()
+    {
+        return self::$mode;
+    }
 
-	public static function setMode($text)
-	{
-		self::$mode = $text;
-	}
+    public static function setMode($text)
+    {
+        self::$mode = $text;
+    }
 
     protected static function _counter($from, $where = ''){
         $q = self::$modx->db->select('count(id)', self::$modx->getFullTableName($from), $where);
@@ -26,70 +26,70 @@ 
     }
 
     public static function jeditable($key = 'id', $post = true){
-       $data = array();
-       $request = $post ? $_POST : $_GET;
-       $match = (isset($request[$key]) && is_scalar($request[$key]) && preg_match("/^(.*)_(\d+)$/i", $request[$key], $match)) ? $match : array();
-       if(!empty($match)){
-           $data = array(
-               'key' => $match[1],
-               'id' => $match[2]
-           );
-       }
-       return $data;
+        $data = array();
+        $request = $post ? $_POST : $_GET;
+        $match = (isset($request[$key]) && is_scalar($request[$key]) && preg_match("/^(.*)_(\d+)$/i", $request[$key], $match)) ? $match : array();
+        if(!empty($match)){
+            $data = array(
+                'key' => $match[1],
+                'id' => $match[2]
+            );
+        }
+        return $data;
     }
 
-	public static function curl($url, $data = '', $post = false, array $header = array())
-	{
-		$ch = curl_init();
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		$post = (bool)$post;
-		curl_setopt($ch, CURLOPT_POST, $post);
-		if ($post) {
-			curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
-		}
-		if (!empty($header)) {
-			curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
-		}
-		curl_setopt($ch, CURLOPT_TIMEOUT, 10);
-		curl_setopt($ch, CURLOPT_URL, $url);
-		return curl_exec($ch);
-	}
+    public static function curl($url, $data = '', $post = false, array $header = array())
+    {
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        $post = (bool)$post;
+        curl_setopt($ch, CURLOPT_POST, $post);
+        if ($post) {
+            curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+        }
+        if (!empty($header)) {
+            curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
+        }
+        curl_setopt($ch, CURLOPT_TIMEOUT, 10);
+        curl_setopt($ch, CURLOPT_URL, $url);
+        return curl_exec($ch);
+    }
 
-	/**
-	 * Были ли ошибки во время работы с JSON
-	 *
-	 * @param $json string строка с JSON для записи в лог при отладке
-	 * @return bool|string
-	 */
-	public function isErrorJSON($json)
-	{
-		require_once(MODX_BASE_PATH . "assets/snippets/DocLister/lib/jsonHelper.class.php");
-		$error = \jsonHelper::json_last_error_msg();
-		if (!in_array($error, array('error_none', 'other'))) {
-			$error = true;
-		}
-		return $error;
-	}
+    /**
+     * Были ли ошибки во время работы с JSON
+     *
+     * @param $json string строка с JSON для записи в лог при отладке
+     * @return bool|string
+     */
+    public function isErrorJSON($json)
+    {
+        require_once(MODX_BASE_PATH . "assets/snippets/DocLister/lib/jsonHelper.class.php");
+        $error = \jsonHelper::json_last_error_msg();
+        if (!in_array($error, array('error_none', 'other'))) {
+            $error = true;
+        }
+        return $error;
+    }
 
-	public static function readFileLine($path, $callback, array $callbackParams = array(), $lines = 0, $size = 4096)
-	{
-		$handle = fopen($path, "r");
-		$i = $total = 0;
-		while (!feof($handle)) {
-			$i++;
-			$buffer = fgets($handle, $size);
-			if (is_callable($callback)) {
-				$callbackParams['line'] = $buffer;
-				$callbackParams['numLine'] = $i;
-				if (call_user_func($callback, $callbackParams)) {
-					$total++;
-				}
-			}
-			if ($lines > 0 && $i >= $lines) {
-				break;
-			}
-		}
-		fclose($handle);
-		return array('line' => $i, 'add' => $total);
-	}
+    public static function readFileLine($path, $callback, array $callbackParams = array(), $lines = 0, $size = 4096)
+    {
+        $handle = fopen($path, "r");
+        $i = $total = 0;
+        while (!feof($handle)) {
+            $i++;
+            $buffer = fgets($handle, $size);
+            if (is_callable($callback)) {
+                $callbackParams['line'] = $buffer;
+                $callbackParams['numLine'] = $i;
+                if (call_user_func($callback, $callbackParams)) {
+                    $total++;
+                }
+            }
+            if ($lines > 0 && $i >= $lines) {
+                break;
+            }
+        }
+        fclose($handle);
+        return array('line' => $i, 'add' => $total);
+    }
 }
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@ 
 <?php namespace Module;
 
 include_once(dirname(dirname(__FILE__)).'/APIHelpers.class.php');
-class Helper extends \APIhelpers{
+class Helper extends \APIhelpers {
     protected static $modx = null;
 	protected static $mode = 'list';
 
-    public static function init(\DocumentParser $modx, $mode = 'list'){
+    public static function init(\DocumentParser $modx, $mode = 'list') {
         self::$modx = $modx;
 		self::setMode($mode);
     }
@@ -20,16 +20,16 @@ 
 		self::$mode = $text;
 	}
 
-    protected static function _counter($from, $where = ''){
+    protected static function _counter($from, $where = '') {
         $q = self::$modx->db->select('count(id)', self::$modx->getFullTableName($from), $where);
         return self::$modx->db->getValue($q);
     }
 
-    public static function jeditable($key = 'id', $post = true){
+    public static function jeditable($key = 'id', $post = true) {
        $data = array();
        $request = $post ? $_POST : $_GET;
        $match = (isset($request[$key]) && is_scalar($request[$key]) && preg_match("/^(.*)_(\d+)$/i", $request[$key], $match)) ? $match : array();
-       if(!empty($match)){
+       if (!empty($match)) {
            $data = array(
                'key' => $match[1],
                'id' => $match[2]
@@ -63,7 +63,7 @@ 
 	 */
 	public function isErrorJSON($json)
 	{
-		require_once(MODX_BASE_PATH . "assets/snippets/DocLister/lib/jsonHelper.class.php");
+		require_once(MODX_BASE_PATH."assets/snippets/DocLister/lib/jsonHelper.class.php");
 		$error = \jsonHelper::json_last_error_msg();
 		if (!in_array($error, array('error_none', 'other'))) {
 			$error = true;

assets/lib/MODxAPI/modResource.php

Doc Comments +10 added lines

@@ -171,6 +171,9 @@ 
         return $out;
     }
 
+    /**
+     * @param string $key
+     */
     public function set($key, $value)
     {
         if (is_scalar($value) && is_scalar($key) && !empty($key)) {
@@ -261,6 +264,9 @@ 
         return $value;
     }
 
+    /**
+     * @param integer $data
+     */
     protected function findUserBy($data)
     {
         switch (true) {
@@ -568,6 +574,10 @@ 
         }
         return $this;
     }
+
+    /**
+     * @param string $tpl
+     */
     public function setTemplate($tpl)
     {
         if (!is_numeric($tpl) || $tpl != (int)$tpl) {

Indentation +38 added lines, -38 removed lines

@@ -115,21 +115,21 @@ 
         );
         return \APIhelpers::renameKeyArr($out, $prefix, $suffix, $sep);
     }
-	public function getUrl(){
-		$out = null;
-		$id = (int)$this->getID();
-		if(!empty($id)){
-			$out = $this->modx->makeUrl($id);
-		}
-		return $out;
-	}
-	public function getTitle($main = 'menutitle', $second = 'pagetitle'){
-		$title = $this->get($main);
-		if(empty($title) && $title !== '0'){
-			$title = $this->get($second);
-		}
-		return $title;
-	}
+    public function getUrl(){
+        $out = null;
+        $id = (int)$this->getID();
+        if(!empty($id)){
+            $out = $this->modx->makeUrl($id);
+        }
+        return $out;
+    }
+    public function getTitle($main = 'menutitle', $second = 'pagetitle'){
+        $title = $this->get($main);
+        if(empty($title) && $title !== '0'){
+            $title = $this->get($second);
+        }
+        return $title;
+    }
 	
     public function isWebShow()
     {
@@ -432,9 +432,9 @@ 
         $ignore = $this->systemID();
         $_ids = $this->cleanIDs($ids, ',', $ignore);
         if (is_array($_ids) && $_ids != array()) {
-        	$id = $this->sanitarIn($_ids);
+            $id = $this->sanitarIn($_ids);
             $this->query("UPDATE {$this->makeTable('site_content')} SET `deleted`='1' WHERE `id` IN ({$id})");
-		} else throw new Exception('Invalid IDs list for mark trash: <pre>' . print_r($ids, 1) . '</pre> please, check ignore list: <pre>' . print_r($ignore, 1) . '</pre>');
+        } else throw new Exception('Invalid IDs list for mark trash: <pre>' . print_r($ids, 1) . '</pre> please, check ignore list: <pre>' . print_r($ignore, 1) . '</pre>');
         return $this;
     }
     public function clearTrash($fire_events = null){
@@ -442,7 +442,7 @@ 
         $q = $this->modx->makeArray($q);
         $_ids = array();
         foreach($q as $item){
-              $_ids[] = $item['id'];
+                $_ids[] = $item['id'];
         }
         if (is_array($_ids) && $_ids != array()) {
             $this->invokeEvent('OnBeforeEmptyTrash', array(
@@ -465,19 +465,19 @@ 
         $ignore = $this->systemID();
         $_ids = $this->cleanIDs($ids, ',', $ignore);
         if (is_array($_ids) && $_ids != array()) {
-        	$this->invokeEvent('OnBeforeEmptyTrash', array(
-            	"ids" => $_ids
-			), $fire_events);
-
-			$id = $this->sanitarIn($_ids);
-			if(!empty($id)){
-				$this->query("DELETE from {$this->makeTable('site_content')} where `id` IN ({$id})");
-				$this->query("DELETE from {$this->makeTable('site_tmplvar_contentvalues')} where `contentid` IN ({$id})");
-				$this->invokeEvent('OnEmptyTrash', array(
-					"ids" => $_ids
-				), $fire_events);
-			}
-		} else throw new Exception('Invalid IDs list for delete: <pre>' . print_r($ids, 1) . '</pre> please, check ignore list: <pre>' . print_r($ignore, 1) . '</pre>');
+            $this->invokeEvent('OnBeforeEmptyTrash', array(
+                "ids" => $_ids
+            ), $fire_events);
+
+            $id = $this->sanitarIn($_ids);
+            if(!empty($id)){
+                $this->query("DELETE from {$this->makeTable('site_content')} where `id` IN ({$id})");
+                $this->query("DELETE from {$this->makeTable('site_tmplvar_contentvalues')} where `contentid` IN ({$id})");
+                $this->invokeEvent('OnEmptyTrash', array(
+                    "ids" => $_ids
+                ), $fire_events);
+            }
+        } else throw new Exception('Invalid IDs list for delete: <pre>' . print_r($ids, 1) . '</pre> please, check ignore list: <pre>' . print_r($ignore, 1) . '</pre>');
 
         return $this;
     }
@@ -572,13 +572,13 @@ 
     {
         if (!is_numeric($tpl) || $tpl != (int)$tpl) {
             if (is_scalar($tpl)) {
-            	$sql = "SELECT `id` FROM {$this->makeTable('site_templates')} WHERE `templatename` = '".$this->escape($tpl)."'";
-				$rs = $this->query($sql);
-				if (!$rs || $this->modx->db->getRecordCount($rs) <= 0) throw new Exception("Template {$tpl} is not exists");
-				$tpl = $this->modx->db->getValue($rs);
-			} else {
-				throw new Exception("Invalid template name: " . print_r($tpl, 1));
-			}
+                $sql = "SELECT `id` FROM {$this->makeTable('site_templates')} WHERE `templatename` = '".$this->escape($tpl)."'";
+                $rs = $this->query($sql);
+                if (!$rs || $this->modx->db->getRecordCount($rs) <= 0) throw new Exception("Template {$tpl} is not exists");
+                $tpl = $this->modx->db->getValue($rs);
+            } else {
+                throw new Exception("Invalid template name: " . print_r($tpl, 1));
+            }
         }
         return (int)$tpl;
     }

Braces +13 added lines, -5 removed lines

@@ -212,7 +212,7 @@ 
                     $value = (int)((bool)$value);
                     if($value){
                         $this->field['deletedon'] = time() + $this->modxConfig('server_offset_time');
-                    }else{
+                    } else{
                         $this->field['deletedon'] = 0;
                     }
                     break;
@@ -402,7 +402,9 @@ 
         }
 
         foreach ($fld as $key => $value) {
-            if (empty($this->tv[$key])) continue;
+            if (empty($this->tv[$key])) {

+                continue;

+            }

             if ($value === '') {
                 $this->query("DELETE FROM {$this->makeTable('site_tmplvar_contentvalues')} WHERE `contentid` = '{$this->id}' AND `tmplvarid` = '{$this->tv[$key]}'");
             } else {
@@ -434,7 +436,9 @@ 
         if (is_array($_ids) && $_ids != array()) {
         	$id = $this->sanitarIn($_ids);
             $this->query("UPDATE {$this->makeTable('site_content')} SET `deleted`='1' WHERE `id` IN ({$id})");
-		} else throw new Exception('Invalid IDs list for mark trash: <pre>' . print_r($ids, 1) . '</pre> please, check ignore list: <pre>' . print_r($ignore, 1) . '</pre>');
+		} else {

+		    throw new Exception('Invalid IDs list for mark trash: <pre>' . print_r($ids, 1) . '</pre> please, check ignore list: <pre>' . print_r($ignore, 1) . '</pre>');

+		}

         return $this;
     }
     public function clearTrash($fire_events = null){
@@ -477,7 +481,9 @@ 
 					"ids" => $_ids
 				), $fire_events);
 			}
-		} else throw new Exception('Invalid IDs list for delete: <pre>' . print_r($ids, 1) . '</pre> please, check ignore list: <pre>' . print_r($ignore, 1) . '</pre>');
+		} else {

+		    throw new Exception('Invalid IDs list for delete: <pre>' . print_r($ids, 1) . '</pre> please, check ignore list: <pre>' . print_r($ignore, 1) . '</pre>');

+		}

 
         return $this;
     }
@@ -574,7 +580,9 @@ 
             if (is_scalar($tpl)) {
             	$sql = "SELECT `id` FROM {$this->makeTable('site_templates')} WHERE `templatename` = '".$this->escape($tpl)."'";
 				$rs = $this->query($sql);
-				if (!$rs || $this->modx->db->getRecordCount($rs) <= 0) throw new Exception("Template {$tpl} is not exists");
+				if (!$rs || $this->modx->db->getRecordCount($rs) <= 0) {

+				    throw new Exception("Template {$tpl} is not exists");

+				}

 				$tpl = $this->modx->db->getValue($rs);
 			} else {
 				throw new Exception("Invalid template name: " . print_r($tpl, 1));

Spacing +56 added lines, -56 removed lines

@@ -95,20 +95,20 @@ 
         $out = array_diff_key(parent::toArray(), $this->default_field);
         $tpl = $this->get('template');
         $tvTPL = APIHelpers::getkey($this->tvTpl, $tpl, array());
-        foreach($tvTPL as $item){
-            if(isset($this->tvid[$item]) && !array_key_exists($this->tvid[$item], $out)){
+        foreach ($tvTPL as $item) {
+            if (isset($this->tvid[$item]) && !array_key_exists($this->tvid[$item], $out)) {
                 $out[$this->tvid[$item]] = $this->get($this->tvid[$item]);
             }
         }
-        if($render){
-            foreach($out as $key => $val){
+        if ($render) {
+            foreach ($out as $key => $val) {
                 $out[$key] = $this->renderTV($key);
             }
         }
         return $out;
     }
 
-    public function toArray($prefix = '', $suffix = '', $sep = '_', $render = true){
+    public function toArray($prefix = '', $suffix = '', $sep = '_', $render = true) {
         $out = array_merge(
             $this->toArrayMain(),
             $this->toArrayTV($render),
@@ -116,17 +116,17 @@ 
         );
         return \APIhelpers::renameKeyArr($out, $prefix, $suffix, $sep);
     }
-	public function getUrl(){
+	public function getUrl() {
 		$out = null;
 		$id = (int)$this->getID();
-		if(!empty($id)){
+		if (!empty($id)) {
 			$out = $this->modx->makeUrl($id);
 		}
 		return $out;
 	}
-	public function getTitle($main = 'menutitle', $second = 'pagetitle'){
+	public function getTitle($main = 'menutitle', $second = 'pagetitle') {
 		$title = $this->get($main);
-		if(empty($title) && $title !== '0'){
+		if (empty($title) && $title !== '0') {
 			$title = $this->get($second);
 		}
 		return $title;
@@ -139,16 +139,16 @@ 
         $del = ($this->get('deleted') == 0 && ($this->get('deletedon') == 0 || $this->get('deletedon') > time()));
         return ($pub && $unpub && $del);
     }
-    public function touch(){
+    public function touch() {
         $this->set('editedon', time());
         return $this;
     }
 
-    public function renderTV($tvname){
+    public function renderTV($tvname) {
         $out = null;
-        if($this->getID() > 0){
-            include_once MODX_MANAGER_PATH . "includes/tmplvars.format.inc.php";
-            include_once MODX_MANAGER_PATH . "includes/tmplvars.commands.inc.php";
+        if ($this->getID() > 0) {
+            include_once MODX_MANAGER_PATH."includes/tmplvars.format.inc.php";
+            include_once MODX_MANAGER_PATH."includes/tmplvars.commands.inc.php";
             $tvval = $this->get($tvname);
             $param = APIHelpers::getkey($this->tvd, $tvname, array());
             $display = APIHelpers::getkey($param, 'display', '');
@@ -159,13 +159,13 @@ 
         return $out;
     }
 
-    public function get($key){
+    public function get($key) {
         $out = parent::get($key);
-        if(isset($this->tv[$key])){
+        if (isset($this->tv[$key])) {
             $tpl = $this->get('template');
             $tvTPL = APIHelpers::getkey($this->tvTpl, $tpl, array());
             $tvID = APIHelpers::getkey($this->tv, $key, 0);
-            if(in_array($tvID, $tvTPL) && is_null($out)){
+            if (in_array($tvID, $tvTPL) && is_null($out)) {
                 $out = APIHelpers::getkey($this->tvd[$key], 'value', null);
             }
         }
@@ -185,38 +185,38 @@ 
                     break;
                 case 'published':
                     $value = (int)((bool)$value);
-                    if($value){
+                    if ($value) {
                         $this->field['publishedon'] = time() + $this->modxConfig('server_offset_time');
                     }
                     break;
                 case 'pub_date':
                     $value = $this->getTime($value);
-                    if($value > 0 && time() + $this->modxConfig('server_offset_time') > $value){
+                    if ($value > 0 && time() + $this->modxConfig('server_offset_time') > $value) {
                         $this->field['published'] = 1;
                         $this->field['publishedon'] = $value;
                     }
                     break;
                 case 'unpub_date':
                     $value = $this->getTime($value);
-                    if($value > 0 && time() + $this->modxConfig('server_offset_time') > $value){
+                    if ($value > 0 && time() + $this->modxConfig('server_offset_time') > $value) {
                         $this->field['published'] = 0;
                         $this->field['publishedon'] = 0;
                     }
                     break;
                 case 'deleted':
                     $value = (int)((bool)$value);
-                    if($value){
+                    if ($value) {
                         $this->field['deletedon'] = time() + $this->modxConfig('server_offset_time');
-                    }else{
+                    } else {
                         $this->field['deletedon'] = 0;
                     }
                     break;
                 case 'deletedon':
                     $value = $this->getTime($value);
-                    if($value > 0 && time() + $this->modxConfig('server_offset_time') < $value){
+                    if ($value > 0 && time() + $this->modxConfig('server_offset_time') < $value) {
                         $value = 0;
                     }
-                    if($value){
+                    if ($value) {
                         $this->field['deleted'] = 1;
                     }
                     break;
@@ -237,19 +237,19 @@ 
         return $this;
     }
 
-    protected function getUser($value, $default = 0){
+    protected function getUser($value, $default = 0) {
         $currentAdmin = APIHelpers::getkey($_SESSION, 'mgrInternalKey', 0);
         $value = (int)$value;
-        if(!empty($value)){
+        if (!empty($value)) {
             $by = $this->findUserBy($value);
             $exists = $this->managerUsers->exists(function($key, $val) use ($by, $value){
                 return ($val->containsKey($by) && $val->get($by) === (string)$value);
             });
-            if(!$exists){
+            if (!$exists) {
                 $value = 0;
             }
         }
-        if(empty($value)){
+        if (empty($value)) {
             $value = empty($currentAdmin) ? $default : $currentAdmin;
         }
         return $value;
@@ -273,13 +273,13 @@ 
         return $find;
     }
 
-    protected function getTime($value){
+    protected function getTime($value) {
         $value = trim($value);
-        if(!empty($value)){
-            if(!is_numeric($value)){
+        if (!empty($value)) {
+            if (!is_numeric($value)) {
                 $value = (int)strtotime($value);
             }
-            if(!empty($value)){
+            if (!empty($value)) {
                 $value += $this->modxConfig('server_offset_time');
             }
         }
@@ -302,9 +302,9 @@ 
             $this->close();
             $this->newDoc = false;
 
-            $result = $this->query("SELECT * from {$this->makeTable('site_content')} where `id`=" . (int)$id);
+            $result = $this->query("SELECT * from {$this->makeTable('site_content')} where `id`=".(int)$id);
             $this->fromArray($this->modx->db->getRow($result));
-            $result = $this->query("SELECT * from {$this->makeTable('site_tmplvar_contentvalues')} where `contentid`=" . (int)$id);
+            $result = $this->query("SELECT * from {$this->makeTable('site_tmplvar_contentvalues')} where `contentid`=".(int)$id);
             while ($row = $this->modx->db->getRow($result)) {
                 $this->field[$this->tvid[$row['tmplvarid']]] = $row['value'];
             }
@@ -323,7 +323,7 @@ 
     {
         $parent = null;
         if ($this->field['pagetitle'] == '') {
-            $this->log['emptyPagetitle'] = 'Pagetitle is empty in <pre>' . print_r($this->field, true) . '</pre>';
+            $this->log['emptyPagetitle'] = 'Pagetitle is empty in <pre>'.print_r($this->field, true).'</pre>';
             return false;
         }
 
@@ -339,8 +339,8 @@ 
         $fld = $this->toArray(null, null, null, false);
         foreach ($this->default_field as $key => $value) {
             $tmp = $this->get($key);
-            if ($this->newDoc && ( !is_int($tmp) && $tmp=='')) {
-                if($tmp == $value){
+            if ($this->newDoc && (!is_int($tmp) && $tmp == '')) {
+                if ($tmp == $value) {
                     switch ($key) {
                         case 'cacheable':
                             $value = $this->modxConfig('cache_default');
@@ -361,11 +361,11 @@ 
                 }
                 $this->field[$key] = $value;
             }
-            switch(true){
+            switch (true) {
                 case $key == 'parent':
                     $parent = (int)$this->get($key);
                     $q = $this->query("SELECT count(`id`) FROM {$this->makeTable('site_content')} WHERE `id`='{$parent}'");
-                    if($this->modx->db->getValue($q)!=1){
+                    if ($this->modx->db->getValue($q) != 1) {
                         $parent = $value;
                     }
                     $this->field[$key] = $parent;
@@ -382,9 +382,9 @@ 
 
         if (!empty($this->set)) {
             if ($this->newDoc) {
-                $SQL = "INSERT into {$this->makeTable('site_content')} SET " . implode(', ', $this->set);
+                $SQL = "INSERT into {$this->makeTable('site_content')} SET ".implode(', ', $this->set);
             } else {
-                $SQL = "UPDATE {$this->makeTable('site_content')} SET " . implode(', ', $this->set) . " WHERE `id` = " . $this->id;
+                $SQL = "UPDATE {$this->makeTable('site_content')} SET ".implode(', ', $this->set)." WHERE `id` = ".$this->id;
             }
             $this->query($SQL);
 
@@ -428,20 +428,20 @@ 
         return $this->id;
     }
 
-    public function toTrash($ids){
+    public function toTrash($ids) {
         $ignore = $this->systemID();
         $_ids = $this->cleanIDs($ids, ',', $ignore);
         if (is_array($_ids) && $_ids != array()) {
         	$id = $this->sanitarIn($_ids);
             $this->query("UPDATE {$this->makeTable('site_content')} SET `deleted`='1' WHERE `id` IN ({$id})");
-		} else throw new Exception('Invalid IDs list for mark trash: <pre>' . print_r($ids, 1) . '</pre> please, check ignore list: <pre>' . print_r($ignore, 1) . '</pre>');
+		} else throw new Exception('Invalid IDs list for mark trash: <pre>'.print_r($ids, 1).'</pre> please, check ignore list: <pre>'.print_r($ignore, 1).'</pre>');
         return $this;
     }
-    public function clearTrash($fire_events = null){
+    public function clearTrash($fire_events = null) {
         $q = $this->query("SELECT `id` FROM {$this->makeTable('site_content')} WHERE `deleted`='1'");
         $q = $this->modx->makeArray($q);
         $_ids = array();
-        foreach($q as $item){
+        foreach ($q as $item) {
               $_ids[] = $item['id'];
         }
         if (is_array($_ids) && $_ids != array()) {
@@ -465,10 +465,10 @@ 
         $_ids = $this->cleanIDs($ids, ',');
         if (is_array($_ids) && $_ids != array()) {
             $id = $this->sanitarIn($_ids);
-            if(!empty($id)) {
+            if (!empty($id)) {
                 $q = $this->query("SELECT `id` FROM {$this->makeTable('site_content')} where `parent` IN ({$id})");
                 $id = $this->modx->db->getColumn('id', $q);
-                if($depth > 0 || (is_bool($depth) && $depth == true)){
+                if ($depth > 0 || (is_bool($depth) && $depth == true)) {
                     $id = $this->childrens($id, is_bool($depth) ? $depth : ($depth - 1));
                 }
                 $_ids = array_merge($_ids, $id);
@@ -487,14 +487,14 @@ 
 			), $fire_events);
 
 			$id = $this->sanitarIn($_ids);
-			if(!empty($id)){
+			if (!empty($id)) {
 				$this->query("DELETE from {$this->makeTable('site_content')} where `id` IN ({$id})");
 				$this->query("DELETE from {$this->makeTable('site_tmplvar_contentvalues')} where `contentid` IN ({$id})");
 				$this->invokeEvent('OnEmptyTrash', array(
 					"ids" => $_ids
 				), $fire_events);
 			}
-		} else throw new Exception('Invalid IDs list for delete: <pre>' . print_r($ids, 1) . '</pre> please, check ignore list: <pre>' . print_r($ignore, 1) . '</pre>');
+		} else throw new Exception('Invalid IDs list for delete: <pre>'.print_r($ids, 1).'</pre> please, check ignore list: <pre>'.print_r($ignore, 1).'</pre>');
 
         return $this;
     }
@@ -531,7 +531,7 @@ 
                 $suffix = substr($alias, -2);
                 if (preg_match('/-(\d+)/', $suffix, $tmp) && isset($tmp[1]) && (int)$tmp[1] > 1) {
                     $suffix = (int)$tmp[1] + 1;
-                    $alias = substr($alias, 0, -2) . '-' . $suffix;
+                    $alias = substr($alias, 0, -2).'-'.$suffix;
                 } else {
                     $alias .= '-2';
                 }
@@ -549,30 +549,30 @@ 
     protected function get_TV($reload = false)
     {
         if (empty($this->modx->_TVnames) || $reload) {
-            $result = $this->query('SELECT `id`,`name` FROM ' . $this->makeTable('site_tmplvars'));
+            $result = $this->query('SELECT `id`,`name` FROM '.$this->makeTable('site_tmplvars'));
             while ($row = $this->modx->db->GetRow($result)) {
                 $this->modx->_TVnames[$row['name']] = $row['id'];
             }
         }
-        foreach($this->modx->_TVnames as $name => $id){
+        foreach ($this->modx->_TVnames as $name => $id) {
             $this->tvid[$id] = $name;
             $this->tv[$name] = $id;
         }
         $this->loadTVTemplate()->loadTVDefault(array_values($this->tv));
         return $this;
     }
-    protected function loadTVTemplate(){
+    protected function loadTVTemplate() {
         $q = $this->query("SELECT `tmplvarid`, `templateid` FROM ".$this->makeTable('site_tmplvar_templates'));
         $q = $this->modx->db->makeArray($q);
         $this->tvTpl = array();
-        foreach($q as $item){
+        foreach ($q as $item) {
             $this->tvTpl[$item['templateid']][] = $item['tmplvarid'];
         }
         return $this;
     }
     protected function loadTVDefault(array $tvId = array())
     {
-        if(is_array($tvId) && !empty($tvId)){
+        if (is_array($tvId) && !empty($tvId)) {
             $tbl_site_tmplvars = $this->makeTable('site_tmplvars');
             $fields = 'id,name,default_text as value,display,display_params,type';
             $implodeTvId = implode(',', $tvId);
@@ -594,7 +594,7 @@ 
 				if (!$rs || $this->modx->db->getRecordCount($rs) <= 0) throw new Exception("Template {$tpl} is not exists");
 				$tpl = $this->modx->db->getValue($rs);
 			} else {
-				throw new Exception("Invalid template name: " . print_r($tpl, 1));
+				throw new Exception("Invalid template name: ".print_r($tpl, 1));
 			}
         }
         return (int)$tpl;

assets/snippets/DLUsers/src/Actions.php

Doc Comments +12 added lines

@@ -46,6 +46,8 @@ 
     /**

      * is not allowed to call from outside: private!

      *

+     * @param string $userClass
+     * @param boolean $debug
      */

     private function __construct(DocumentParser $modx, $userClass, $debug)

     {

@@ -277,6 +279,12 @@ 
 			'errorCode' => $errorCode

 		));

 	}

+
+	/**
+	 * @param string $method
+	 * @param string $error
+	 * @param string $errorCode
+	 */
 	protected function Auth($pwdField, $emailField, $rememberField, $backUrl, $method, &$error, &$errorCode, $params = array()){

 		$POST = array(

 			'backUrl' => urlencode($backUrl)

@@ -458,6 +466,10 @@ 
 		}

 		return $url;

 	}

+
+	/**
+	 * @param string $name
+	 */
 	protected function getTemplate($name){

 		$out = '';

 		$file = dirname(dirname(__FILE__)).'/tpl/'.$name.'.html';

Unused Use Statements +4 added lines, -1 removed lines

@@ -6,7 +6,10 @@
 include_once(MODX_BASE_PATH . 'assets/snippets/DocLister/lib/DLTemplate.class.php');

 include_once(MODX_BASE_PATH . 'assets/snippets/DocLister/lib/DLCollection.class.php');

 

-use APIHelpers, DocumentParser, DLCollection, DLTemplate;

+use APIHelpers;
+use DocumentParser;
+use DLCollection;
+use DLTemplate;
 use Helpers\FS;

 

 class Actions{

Braces +17 added lines, -17 removed lines

@@ -117,11 +117,11 @@ 
 			    $start = $this->makeUrl($this->config['site_start']);

 			    if($start == $go){

 			        $go = $this->config['site_url'];

-			    }else{

+			    } else{

 			        $go = $this->config['site_url'].ltrim($go, '/');

 			    }

 			    $this->moveTo(array('url' => $go));

-    		}else{

+    		} else{

     			//Если юзер не авторизован, то показываем ему 404 ошибку

     			$this->modx->sendErrorPage();

     		}

@@ -170,7 +170,7 @@ 
 			if(!empty($homeID)){

 				$dataTPL['url.profile'] = $this->makeUrl($homeID);

 			}

-		}else{

+		} else{

 			$tpl = APIHelpers::getkey($params, 'tplForm', '');

 			if(empty($tpl)){

 				$tpl = $this->getTemplate('authForm');

@@ -220,12 +220,12 @@ 
 			 * Thank you for super protection against hacking in protect.inc.php:-)

 			 */

 			$refer = htmlspecialchars_decode($_SERVER['HTTP_REFERER'], ENT_QUOTES);

-		}else{

+		} else{

 			$selfHost = rtrim(str_replace("http://", "", $this->config['site_url']), '/');

 			if(empty( $request['host']) ||  $request['host']==$selfHost){

 				$query = !empty($uri['query']) ? '?'.$uri['query'] : '';

 			    $refer = !empty($uri['path']) ? $uri['path'].$query : '';

-			}else{

+			} else{

 				$refer = '';

 			}

 		}

@@ -234,21 +234,21 @@ 
 			$backUrl = APIHelpers::getkey($_POST, 'backUrl', $POST['backUrl']);

 			if(!is_scalar($backUrl)){

 				$backUrl = $refer;

-			}else{

+			} else{

 				$backUrl = urldecode($backUrl);

 			}

-		}else{

+		} else{

 			$backUrl = $refer;

 		}

 		$backUrl = parse_url($backUrl);

 		if(!empty($backUrl['path']) && $request['path'] != $backUrl['path']){

 		    $POST['backUrl'] = $backUrl['path'];

-		}else{

+		} else{

 			$selfHost = rtrim(str_replace("http://", "", $this->config['site_url']), '/');

 			if(empty($uri['host']) || $uri['host']==$selfHost){

 				$query = !empty($uri['query']) ? '?'.$uri['query'] : '';

 			    $POST['backUrl'] = !empty($uri['path']) ? $uri['path'].$query : '';

-			}else{

+			} else{

 				$POST['backUrl'] = '';

 			}

 		}

@@ -257,7 +257,7 @@ 
 				'url' => '/'.ltrim($POST['backUrl'], '/'),

 			    'validate' => true

 			));

-		}else{

+		} else{

 			$idURL = 0;

 		}

 		if(empty($idURL)){

@@ -322,16 +322,16 @@ 
 			                "rememberme"	=> $POST['remember'],

 			            ));

 						$this->moveTo(array('url' => urldecode($POST['backUrl'])));

-					}else{

+					} else{

 						$userObj->set('failedlogincount', (int)$userObj->get('failedlogincount') + 1);

 						$userObj->save(false, false);

 

 						$error = 'error.incorrect_password';

 					}

-				}else{

+				} else{

 					$error = 'error.no_user';

 				}

-			}else{

+			} else{

 				$error = 'error.incorrect_mail';

 				$POST['email'] = '';

 			}

@@ -429,10 +429,10 @@ 
 				if(empty($out)){

 					$uri = '';

 				}

-			}else{

+			} else{

 				$uri = DLTemplate::getInstance($this->modx)->sanitarTag($uri);

 			}

-		}else{

+		} else{

 			//$modx->sendRedirect($url, 0, 'REDIRECT_HEADER', 'HTTP/1.1 307 Temporary Redirect');

 			header("Location: ".$uri, true, ($code>0 ? $code : 307));

 		}

@@ -452,7 +452,7 @@ 
 		}

 		if($this->url->containsKey($id)){

 			$url = $this->url->get($id);

-		}else{

+		} else{

 			$url = $this->modx->makeUrl($id);

 			$this->url->set($id, $url);

 		}

@@ -475,7 +475,7 @@ 
 			static::$langDic[$lang] = include_once($file);

 			if(is_array(static::$langDic[$lang])){

 				static::$langDic[$lang] = APIHelpers::renameKeyArr(static::$langDic[$lang], $lang);

-			}else{

+			} else{

 				static::$langDic[$lang] = array();

 			}

 		}

Indentation +395 added lines, -395 removed lines

@@ -12,9 +12,9 @@ 
 class Actions{

     protected $modx = null;

     public $userObj = null;

-	/**

-	 * @var DLCollection

-	 */

+    /**

+     * @var DLCollection

+     */

     public $url;

     protected static $lang = null;

     protected static $langDic = array();

@@ -23,7 +23,7 @@ 
      */

     protected static $instance;

 

-	protected $config = array();

+    protected $config = array();

 

     /**

      * gets the instance via lazy initialization (created on first usage)

@@ -50,15 +50,15 @@ 
     private function __construct(DocumentParser $modx, $userClass, $debug)

     {

         $this->modx = $modx;

-		$this->userObj = new $userClass($this->modx, $debug);

-		$this->url = new DLCollection($this->modx);

+        $this->userObj = new $userClass($this->modx, $debug);

+        $this->url = new DLCollection($this->modx);

 

-		$site_url = $this->modx->getConfig('site_url');

-		$site_start = $this->modx->getConfig('site_start', 1);

-		$error_page = $this->modx->getConfig('error_page', $site_start);

-		$unauthorized_page = $this->modx->getConfig('unauthorized_page', $error_page);

+        $site_url = $this->modx->getConfig('site_url');

+        $site_start = $this->modx->getConfig('site_start', 1);

+        $error_page = $this->modx->getConfig('error_page', $site_start);

+        $unauthorized_page = $this->modx->getConfig('unauthorized_page', $error_page);

 

-		$this->config = compact('site_url', 'site_start', 'error_page', 'unauthorized_page');

+        $this->config = compact('site_url', 'site_start', 'error_page', 'unauthorized_page');

     }

 

     /**

@@ -85,47 +85,47 @@ 
      * Сброс авторизации и обновление страницы

      */

     public function logout($params){

-    	$LogoutName = APIHelpers::getkey($params, 'LogoutName', 'logout');

-    	if(is_scalar($LogoutName) && !empty($LogoutName) && isset($_GET[$LogoutName])){

-    		$userID = $this->UserID('web');

-    		if($userID){

-    			$this->userObj->edit($userID);

-    			if($this->userObj->getID()){

-	    			$this->modx->invokeEvent("OnBeforeWebLogout", array(

-		    			"userid"   => $this->userObj->getID(),

-		    			"username" => $this->userObj->get('username')

-		    		));

-	    		}

-		    	$this->userObj->logOut();

-		    	if($this->userObj->getID()){

-		    		$this->modx->invokeEvent("OnWebLogout", array(

-		    			"userid"        => $this->userObj->getID(),

-		    			"username"      => $this->userObj->get('username')

-		    		));

-		    	}

-

-			    $go = APIHelpers::getkey($params, 'url', '');

-			    if(empty($go)){

-			    	$go = str_replace(

-			    		array("?".$LogoutName, "&".$LogoutName),

-			    		array("", ""),

-			    		$_SERVER['REQUEST_URI']

-			    	);

-			    }

-

-			    $start = $this->makeUrl($this->config['site_start']);

-			    if($start == $go){

-			        $go = $this->config['site_url'];

-			    }else{

-			        $go = $this->config['site_url'].ltrim($go, '/');

-			    }

-			    $this->moveTo(array('url' => $go));

-    		}else{

-    			//Если юзер не авторизован, то показываем ему 404 ошибку

-    			$this->modx->sendErrorPage();

-    		}

-		}

-	    return true;

+        $LogoutName = APIHelpers::getkey($params, 'LogoutName', 'logout');

+        if(is_scalar($LogoutName) && !empty($LogoutName) && isset($_GET[$LogoutName])){

+            $userID = $this->UserID('web');

+            if($userID){

+                $this->userObj->edit($userID);

+                if($this->userObj->getID()){

+                    $this->modx->invokeEvent("OnBeforeWebLogout", array(

+                        "userid"   => $this->userObj->getID(),

+                        "username" => $this->userObj->get('username')

+                    ));

+                }

+                $this->userObj->logOut();

+                if($this->userObj->getID()){

+                    $this->modx->invokeEvent("OnWebLogout", array(

+                        "userid"        => $this->userObj->getID(),

+                        "username"      => $this->userObj->get('username')

+                    ));

+                }

+

+                $go = APIHelpers::getkey($params, 'url', '');

+                if(empty($go)){

+                    $go = str_replace(

+                        array("?".$LogoutName, "&".$LogoutName),

+                        array("", ""),

+                        $_SERVER['REQUEST_URI']

+                    );

+                }

+

+                $start = $this->makeUrl($this->config['site_start']);

+                if($start == $go){

+                    $go = $this->config['site_url'];

+                }else{

+                    $go = $this->config['site_url'].ltrim($go, '/');

+                }

+                $this->moveTo(array('url' => $go));

+            }else{

+                //Если юзер не авторизован, то показываем ему 404 ошибку

+                $this->modx->sendErrorPage();

+            }

+        }

+        return true;

     }

 

     /**

@@ -133,14 +133,14 @@ 
      * @return string

      */

     public function logoutUrl($params){

-    	$LogoutName = APIHelpers::getkey($params, 'LogoutName', 'logout');

-    	$request = parse_url($_SERVER['REQUEST_URI']);

+        $LogoutName = APIHelpers::getkey($params, 'LogoutName', 'logout');

+        $request = parse_url($_SERVER['REQUEST_URI']);

 

-    	//Во избежании XSS мы не сохраняем весь REQUEST_URI, а берем только path

-    	/*$query = (!empty($request['query'])) ? $request['query'].'&' : '';*/

-    	$query = '?'.$LogoutName;

+        //Во избежании XSS мы не сохраняем весь REQUEST_URI, а берем только path

+        /*$query = (!empty($request['query'])) ? $request['query'].'&' : '';*/

+        $query = '?'.$LogoutName;

 

-    	return $request['path'].$query;

+        return $request['path'].$query;

     }

 

     /**

@@ -149,343 +149,343 @@ 
      *   	В противном случае вся работа происходит внутри самого блока

      */

     public function AuthBlock($params){

-    	$POST = array('backUrl' => $_SERVER['REQUEST_URI']);

-

-    	$error = $errorCode = '';

-

-    	$pwdField = APIHelpers::getkey($params, 'pwdField', 'password');

-		$emailField = APIHelpers::getkey($params, 'emailField', 'email');

-		$rememberField = APIHelpers::getkey($params, 'rememberField', 'remember');

-

-    	if($this->UserID('web')){

-			$tpl = APIHelpers::getkey($params, 'tplProfile', '');

-			if(empty($tpl)){

-				$tpl = $this->getTemplate('tplProfile');

-			}

-			$dataTPL = $this->userObj->toArray();

-			$dataTPL['url.logout'] = $this->logoutUrl($params);

-    		$homeID = APIHelpers::getkey($params, 'homeID');

-			if(!empty($homeID)){

-				$dataTPL['url.profile'] = $this->makeUrl($homeID);

-			}

-		}else{

-			$tpl = APIHelpers::getkey($params, 'tplForm', '');

-			if(empty($tpl)){

-				$tpl = $this->getTemplate('authForm');

-			}

-			$POST = $this->Auth($pwdField, $emailField, $rememberField, $POST['backUrl'], __METHOD__, $error, $errorCode, $params);

-	    	$dataTPL = array(

-				'backUrl' => APIHelpers::getkey($POST, 'backUrl', ''),

-				'emailValue' => APIHelpers::getkey($POST, 'email', ''),

-				'emailField' => $emailField,

-				'pwdField' => $pwdField,

-		    	'method' => strtolower(__METHOD__),

-				'error' => $error,

-				'errorCode' => $errorCode

-			);

-			$authId = APIHelpers::getkey($params, 'authId');

-			if(!empty($authId)){

-				$dataTPL['authPage'] = $this->makeUrl($authId);

-				$dataTPL['method'] = strtolower(__CLASS__ . '::'. 'authpage');

-			}

-		}

-		return DLTemplate::getInstance($this->modx)->parseChunk($tpl, $dataTPL);

+        $POST = array('backUrl' => $_SERVER['REQUEST_URI']);

+

+        $error = $errorCode = '';

+

+        $pwdField = APIHelpers::getkey($params, 'pwdField', 'password');

+        $emailField = APIHelpers::getkey($params, 'emailField', 'email');

+        $rememberField = APIHelpers::getkey($params, 'rememberField', 'remember');

+

+        if($this->UserID('web')){

+            $tpl = APIHelpers::getkey($params, 'tplProfile', '');

+            if(empty($tpl)){

+                $tpl = $this->getTemplate('tplProfile');

+            }

+            $dataTPL = $this->userObj->toArray();

+            $dataTPL['url.logout'] = $this->logoutUrl($params);

+            $homeID = APIHelpers::getkey($params, 'homeID');

+            if(!empty($homeID)){

+                $dataTPL['url.profile'] = $this->makeUrl($homeID);

+            }

+        }else{

+            $tpl = APIHelpers::getkey($params, 'tplForm', '');

+            if(empty($tpl)){

+                $tpl = $this->getTemplate('authForm');

+            }

+            $POST = $this->Auth($pwdField, $emailField, $rememberField, $POST['backUrl'], __METHOD__, $error, $errorCode, $params);

+            $dataTPL = array(

+                'backUrl' => APIHelpers::getkey($POST, 'backUrl', ''),

+                'emailValue' => APIHelpers::getkey($POST, 'email', ''),

+                'emailField' => $emailField,

+                'pwdField' => $pwdField,

+                'method' => strtolower(__METHOD__),

+                'error' => $error,

+                'errorCode' => $errorCode

+            );

+            $authId = APIHelpers::getkey($params, 'authId');

+            if(!empty($authId)){

+                $dataTPL['authPage'] = $this->makeUrl($authId);

+                $dataTPL['method'] = strtolower(__CLASS__ . '::'. 'authpage');

+            }

+        }

+        return DLTemplate::getInstance($this->modx)->parseChunk($tpl, $dataTPL);

     }

 

-	/**

-	 * Авторизация на сайте со страницы авторизации

-	 * [!Auth? &login=`password` &pwdField=`password` &homeID=`72`!]

-	 */

-	public function AuthPage($params){

-		$homeID = APIHelpers::getkey($params, 'homeID');

-		$this->isAuthGoHome(array('id' => $homeID));

-

-		$error = $errorCode = '';

-		$POST = array('backUrl' => '');

-

-		$pwdField = APIHelpers::getkey($params, 'pwdField', 'password');

-		$emailField = APIHelpers::getkey($params, 'emailField', 'email');

-		$rememberField = APIHelpers::getkey($params, 'rememberField', 'remember');

-

-		$tpl = APIHelpers::getkey($params, 'tpl', '');

-		if(empty($tpl)){

-			$tpl = $this->getTemplate('authForm');

-		}

-

-		$request = parse_url($_SERVER['REQUEST_URI']);

-		if(!empty($_SERVER['HTTP_REFERER'])){

-			/**

-			 * Thank you for super protection against hacking in protect.inc.php:-)

-			 */

-			$refer = htmlspecialchars_decode($_SERVER['HTTP_REFERER'], ENT_QUOTES);

-		}else{

-			$selfHost = rtrim(str_replace("http://", "", $this->config['site_url']), '/');

-			if(empty( $request['host']) ||  $request['host']==$selfHost){

-				$query = !empty($request['query']) ? '?'.$request['query'] : '';

-			    $refer = !empty($request['path']) ? $request['path'].$query : '';

-			}else{

-				$refer = '';

-			}

-		}

-

-		if($_SERVER['REQUEST_METHOD'] == 'POST'){

-			$backUrl = APIHelpers::getkey($_POST, 'backUrl', $POST['backUrl']);

-			if(!is_scalar($backUrl)){

-				$backUrl = $refer;

-			}else{

-				$backUrl = urldecode($backUrl);

-			}

-		}else{

-			$backUrl = $refer;

-		}

-		$backUrl = parse_url($backUrl);

-		if(!empty($backUrl['path']) && $request['path'] != $backUrl['path']){

-		    $POST['backUrl'] = $backUrl['path'];

-		}else{

-			$selfHost = rtrim(str_replace("http://", "", $this->config['site_url']), '/');

-			if(empty($backUrl['host']) || $backUrl['host']==$selfHost){

-				$query = !empty($backUrl['query']) ? '?'.$backUrl['query'] : '';

-			    $POST['backUrl'] = !empty($backUrl['path']) ? $backUrl['path'].$query : '';

-			}else{

-				$POST['backUrl'] = '';

-			}

-		}

-		if(!empty($POST['backUrl'])){

-			$idURL = $this->moveTo(array(

-				'url' => '/'.ltrim($POST['backUrl'], '/'),

-			    'validate' => true

-			));

-		}else{

-			$idURL = 0;

-		}

-		if(empty($idURL)){

-			if(empty($homeID)){

-				$homeID = $this->config['site_start'];

-			}

-			$POST['backUrl'] = $this->makeUrl($homeID);

-		}

-		$POST = $this->Auth($pwdField, $emailField, $rememberField, $POST['backUrl'], __METHOD__, $error, $errorCode, $params);

-		return DLTemplate::getInstance($this->modx)->parseChunk($tpl, array(

-		    'backUrl' => APIHelpers::getkey($POST, 'backUrl', ''),

-			'emailValue' => APIHelpers::getkey($POST, 'email', ''),

-			'emailField' => $emailField,

-		    'pwdField' => $pwdField,

-		    'method' => strtolower(__METHOD__),

-			'error' => $error,

-			'errorCode' => $errorCode

-		));

-	}

-	protected function Auth($pwdField, $emailField, $rememberField, $backUrl, $method, &$error, &$errorCode, $params = array()){

-		$POST = array(

-			'backUrl' => urlencode($backUrl)

-		);

-		$userObj = &$this->userObj;

-		if($_SERVER['REQUEST_METHOD']=='POST' && APIHelpers::getkey($_POST, 'method', '') == strtolower($method)){

-			$POST = array_merge($POST, array(

-				'password' => APIHelpers::getkey($_POST, $pwdField, ''),

-				'email' => APIHelpers::getkey($_POST, $emailField, ''),

-				'remember' => (bool)((int)APIHelpers::getkey($_POST, $rememberField, 0))

-			));

-			if(!empty($POST['email']) && is_scalar($POST['email']) && !$userObj->emailValidate($POST['email'], false)){

-				$userObj->edit($POST['email']);

-

-				$this->modx->invokeEvent("OnBeforeWebLogin", array(

-		            "username"		=> $POST['email'],

-		            "userpassword"	=> $POST['password'],

-		            "rememberme"	=> $POST['remember'],

-		            'userObj'		=> $userObj

-		        ));

-				if($userObj->getID() && !$userObj->checkBlock($userObj->getID())){

-					$pluginFlag = $this->modx->invokeEvent("OnWebAuthentication", array(

-	                    "userid"        => $userObj->getID(),

-	                    "username"      => $userObj->get('username'),

-	                    "userpassword"  => $POST['password'],

-	                    "savedpassword" => $userObj->get('password'),

-	                    "rememberme"    => $POST['remember'],

-	                ));

-					if(

-						($pluginFlag === true || $userObj->testAuth($userObj->getID(), $POST['password'], 0))

-							&&

-						$userObj->authUser($userObj->getID(), $POST['remember'])

-					){

-						$userObj->set('logincount', (int)$userObj->get('logincount') + 1);

-						$userObj->set('lastlogin', time());

-						$userObj->set('failedlogincount', 0);

-						$userObj->save(false, false);

-

-						$this->modx->invokeEvent("OnWebLogin", array(

-			                "userid"		=> $userObj->getID(),

-			                "username"		=> $userObj->get('username'),

-			                "userpassword"	=> $POST['password'],

-			                "rememberme"	=> $POST['remember'],

-			            ));

-						$this->moveTo(array('url' => urldecode($POST['backUrl'])));

-					}else{

-						$userObj->set('failedlogincount', (int)$userObj->get('failedlogincount') + 1);

-						$userObj->save(false, false);

-

-						$error = 'error.incorrect_password';

-					}

-				}else{

-					$error = 'error.no_user';

-				}

-			}else{

-				$error = 'error.incorrect_mail';

-				$POST['email'] = '';

-			}

-		}

-		if(!empty($error)){

-			$errorCode = $error;

-			$error = APIHelpers::getkey($params, $error, '');

-			$error = static::getLangMsg($error, $error);

-		}

-		return $POST;

-	}

-	/**

-	 * Информация о пользователе

-	 * [!DLUsers? &action=`UserInfo` &field=`fullname` &id=`2`!]

-	 */

-	public function UserInfo($params){

-		$out = '';

-		$userID = APIHelpers::getkey($params, 'id', 0);

-		if(empty($userID)){

-			$userID = $this->UserID('web');

-		}

-		$field = APIHelpers::getkey($params, 'field', 'username');

-		if($userID > 0){

-			$this->userObj->edit($userID);

-			switch(true){

-				case ($field == $this->userObj->fieldPKName()):

-					$out = $this->userObj->getID();

-					break;

-				case ($this->userObj->issetField($field)):

-					$out = $this->userObj->get($field);

-					break;

-			}

-		}

-		return $out;

-	}

-	/**

-	 * ID пользователя

-	 */

-	public function UserID($type = 'web'){

-		return $this->modx->getLoginUserID($type);

-	}

-	/**

-	 * Если не авторизован - то отправить на страницу

-	 */

-	public function isGuestGoHome($params){

-		if(!$this->UserID('web')){

-			/**

-			 * @see : http://modx.im/blog/triks/105.html

-			 */

-			$this->modx->invokeEvent('OnPageUnauthorized');

-			$id = APIHelpers::getkey($params, 'id', $this->config['unauthorized_page']);

-		    $this->moveTo(compact('id'));

-		}

-		return;

-	}

-

-	/**

-	 * Если авторизован - то открыть личный кабинет

-	 */

-	public function isAuthGoHome($params){

-		$userID = $this->UserID('web');

-		if($userID>0){

-			$id = APIHelpers::getkey($params, 'homeID');

-		    if(empty($id)){

-				$id = $this->modx->getConfig('login_home', $this->config['site_start']);

-		    }

-		    $this->moveTo(compact('id'));

-		}

-		return;

-	}

-

-	/**

-	 * Редирект

-	 */

-	public function moveTo($params){

-		$id = (int)APIHelpers::getkey($params, 'id', 0);

-		$uri = APIHelpers::getkey($params, 'url', '');

-		if((empty($uri) && !empty($id)) || !is_string($uri)){

-			$uri = $this->makeUrl($id);

-		}

-		$code = (int)APIHelpers::getkey($params, 'code', 0);

-		$addUrl = APIHelpers::getkey($params, 'addUrl', '');

-		if(is_scalar($addUrl) && $addUrl!=''){

-		    $uri .= "?".$addUrl;

-		}

-		if(APIHelpers::getkey($params, 'validate', false)){

-			if(isset($this->modx->snippetCache['getPageID'])){

-				$out = $this->modx->runSnippet('getPageID', compact('uri'));

-				if(empty($out)){

-					$uri = '';

-				}

-			}else{

-				$uri = APIhelpers::sanitarTag($uri);

-			}

-		}else{

-			//$modx->sendRedirect($url, 0, 'REDIRECT_HEADER', 'HTTP/1.1 307 Temporary Redirect');

-			header("Location: ".$uri, true, ($code>0 ? $code : 307));

-		}

-		return $uri;

-	}

-

-	/**

-	 * Создание ссылки на страницу

-	 *

-	 * @param  int $id ID документа

-	 * @return string

-	 */

-	protected function makeUrl($id = null){

-		$id = (int)$id;

-		if($id <= 0){

-			$id = $this->modx->documentObject['id'];

-		}

-		if($this->url->containsKey($id)){

-			$url = $this->url->get($id);

-		}else{

-			$url = $this->modx->makeUrl($id);

-			$this->url->set($id, $url);

-		}

-		return $url;

-	}

-	protected function getTemplate($name){

-		$out = '';

-		$file = dirname(dirname(__FILE__)).'/tpl/'.$name.'.html';

-		if( FS::getInstance()->checkFile($file)){

-			$out = '@CODE: '.file_get_contents($file);

-		}

-		return $out;

-	}

-	protected static function loadLang($lang){

-		$file = dirname(dirname(__FILE__)).'/lang/'.$lang.'.php';

-		if( ! FS::getInstance()->checkFile($file)){

-			$file = false;

-		}

-		if(!empty($lang) && !isset(static::$langDic[$lang]) && !empty($file)){

-			static::$langDic[$lang] = include_once($file);

-			if(is_array(static::$langDic[$lang])){

-				static::$langDic[$lang] = APIHelpers::renameKeyArr(static::$langDic[$lang], $lang);

-			}else{

-				static::$langDic[$lang] = array();

-			}

-		}

-		return !(empty($lang) || empty(static::$langDic[$lang]));

-	}

-	protected static function getLangMsg($key, $default){

-		$out = $default;

-		$lng = static::$lang;

-		$dic = static::$langDic;

-		if(isset($dic[$lng], $dic[$lng][$lng.'.'.$key])){

-			$out = $dic[$lng][$lng.'.'.$key];

-		}

-		if(class_exists('evoBabel', false) && isset(self::$instance->modx->snippetCache['lang'])){

-			$msg = self::$instance->modx->runSnippet('lang', array('a' => 'DLUsers.'.$key));

-			if(!empty($msg)){

-				$out = $msg;

-			}

-		}

-		return $out;

-	}

+    /**

+     * Авторизация на сайте со страницы авторизации

+     * [!Auth? &login=`password` &pwdField=`password` &homeID=`72`!]

+     */

+    public function AuthPage($params){

+        $homeID = APIHelpers::getkey($params, 'homeID');

+        $this->isAuthGoHome(array('id' => $homeID));

+

+        $error = $errorCode = '';

+        $POST = array('backUrl' => '');

+

+        $pwdField = APIHelpers::getkey($params, 'pwdField', 'password');

+        $emailField = APIHelpers::getkey($params, 'emailField', 'email');

+        $rememberField = APIHelpers::getkey($params, 'rememberField', 'remember');

+

+        $tpl = APIHelpers::getkey($params, 'tpl', '');

+        if(empty($tpl)){

+            $tpl = $this->getTemplate('authForm');

+        }

+

+        $request = parse_url($_SERVER['REQUEST_URI']);

+        if(!empty($_SERVER['HTTP_REFERER'])){

+            /**

+             * Thank you for super protection against hacking in protect.inc.php:-)

+             */

+            $refer = htmlspecialchars_decode($_SERVER['HTTP_REFERER'], ENT_QUOTES);

+        }else{

+            $selfHost = rtrim(str_replace("http://", "", $this->config['site_url']), '/');

+            if(empty( $request['host']) ||  $request['host']==$selfHost){

+                $query = !empty($request['query']) ? '?'.$request['query'] : '';

+                $refer = !empty($request['path']) ? $request['path'].$query : '';

+            }else{

+                $refer = '';

+            }

+        }

+

+        if($_SERVER['REQUEST_METHOD'] == 'POST'){

+            $backUrl = APIHelpers::getkey($_POST, 'backUrl', $POST['backUrl']);

+            if(!is_scalar($backUrl)){

+                $backUrl = $refer;

+            }else{

+                $backUrl = urldecode($backUrl);

+            }

+        }else{

+            $backUrl = $refer;

+        }

+        $backUrl = parse_url($backUrl);

+        if(!empty($backUrl['path']) && $request['path'] != $backUrl['path']){

+            $POST['backUrl'] = $backUrl['path'];

+        }else{

+            $selfHost = rtrim(str_replace("http://", "", $this->config['site_url']), '/');

+            if(empty($backUrl['host']) || $backUrl['host']==$selfHost){

+                $query = !empty($backUrl['query']) ? '?'.$backUrl['query'] : '';

+                $POST['backUrl'] = !empty($backUrl['path']) ? $backUrl['path'].$query : '';

+            }else{

+                $POST['backUrl'] = '';

+            }

+        }

+        if(!empty($POST['backUrl'])){

+            $idURL = $this->moveTo(array(

+                'url' => '/'.ltrim($POST['backUrl'], '/'),

+                'validate' => true

+            ));

+        }else{

+            $idURL = 0;

+        }

+        if(empty($idURL)){

+            if(empty($homeID)){

+                $homeID = $this->config['site_start'];

+            }

+            $POST['backUrl'] = $this->makeUrl($homeID);

+        }

+        $POST = $this->Auth($pwdField, $emailField, $rememberField, $POST['backUrl'], __METHOD__, $error, $errorCode, $params);

+        return DLTemplate::getInstance($this->modx)->parseChunk($tpl, array(

+            'backUrl' => APIHelpers::getkey($POST, 'backUrl', ''),

+            'emailValue' => APIHelpers::getkey($POST, 'email', ''),

+            'emailField' => $emailField,

+            'pwdField' => $pwdField,

+            'method' => strtolower(__METHOD__),

+            'error' => $error,

+            'errorCode' => $errorCode

+        ));

+    }

+    protected function Auth($pwdField, $emailField, $rememberField, $backUrl, $method, &$error, &$errorCode, $params = array()){

+        $POST = array(

+            'backUrl' => urlencode($backUrl)

+        );

+        $userObj = &$this->userObj;

+        if($_SERVER['REQUEST_METHOD']=='POST' && APIHelpers::getkey($_POST, 'method', '') == strtolower($method)){

+            $POST = array_merge($POST, array(

+                'password' => APIHelpers::getkey($_POST, $pwdField, ''),

+                'email' => APIHelpers::getkey($_POST, $emailField, ''),

+                'remember' => (bool)((int)APIHelpers::getkey($_POST, $rememberField, 0))

+            ));

+            if(!empty($POST['email']) && is_scalar($POST['email']) && !$userObj->emailValidate($POST['email'], false)){

+                $userObj->edit($POST['email']);

+

+                $this->modx->invokeEvent("OnBeforeWebLogin", array(

+                    "username"		=> $POST['email'],

+                    "userpassword"	=> $POST['password'],

+                    "rememberme"	=> $POST['remember'],

+                    'userObj'		=> $userObj

+                ));

+                if($userObj->getID() && !$userObj->checkBlock($userObj->getID())){

+                    $pluginFlag = $this->modx->invokeEvent("OnWebAuthentication", array(

+                        "userid"        => $userObj->getID(),

+                        "username"      => $userObj->get('username'),

+                        "userpassword"  => $POST['password'],

+                        "savedpassword" => $userObj->get('password'),

+                        "rememberme"    => $POST['remember'],

+                    ));

+                    if(

+                        ($pluginFlag === true || $userObj->testAuth($userObj->getID(), $POST['password'], 0))

+                            &&

+                        $userObj->authUser($userObj->getID(), $POST['remember'])

+                    ){

+                        $userObj->set('logincount', (int)$userObj->get('logincount') + 1);

+                        $userObj->set('lastlogin', time());

+                        $userObj->set('failedlogincount', 0);

+                        $userObj->save(false, false);

+

+                        $this->modx->invokeEvent("OnWebLogin", array(

+                            "userid"		=> $userObj->getID(),

+                            "username"		=> $userObj->get('username'),

+                            "userpassword"	=> $POST['password'],

+                            "rememberme"	=> $POST['remember'],

+                        ));

+                        $this->moveTo(array('url' => urldecode($POST['backUrl'])));

+                    }else{

+                        $userObj->set('failedlogincount', (int)$userObj->get('failedlogincount') + 1);

+                        $userObj->save(false, false);

+

+                        $error = 'error.incorrect_password';

+                    }

+                }else{

+                    $error = 'error.no_user';

+                }

+            }else{

+                $error = 'error.incorrect_mail';

+                $POST['email'] = '';

+            }

+        }

+        if(!empty($error)){

+            $errorCode = $error;

+            $error = APIHelpers::getkey($params, $error, '');

+            $error = static::getLangMsg($error, $error);

+        }

+        return $POST;

+    }

+    /**

+     * Информация о пользователе

+     * [!DLUsers? &action=`UserInfo` &field=`fullname` &id=`2`!]

+     */

+    public function UserInfo($params){

+        $out = '';

+        $userID = APIHelpers::getkey($params, 'id', 0);

+        if(empty($userID)){

+            $userID = $this->UserID('web');

+        }

+        $field = APIHelpers::getkey($params, 'field', 'username');

+        if($userID > 0){

+            $this->userObj->edit($userID);

+            switch(true){

+                case ($field == $this->userObj->fieldPKName()):

+                    $out = $this->userObj->getID();

+                    break;

+                case ($this->userObj->issetField($field)):

+                    $out = $this->userObj->get($field);

+                    break;

+            }

+        }

+        return $out;

+    }

+    /**

+     * ID пользователя

+     */

+    public function UserID($type = 'web'){

+        return $this->modx->getLoginUserID($type);

+    }

+    /**

+     * Если не авторизован - то отправить на страницу

+     */

+    public function isGuestGoHome($params){

+        if(!$this->UserID('web')){

+            /**

+             * @see : http://modx.im/blog/triks/105.html

+             */

+            $this->modx->invokeEvent('OnPageUnauthorized');

+            $id = APIHelpers::getkey($params, 'id', $this->config['unauthorized_page']);

+            $this->moveTo(compact('id'));

+        }

+        return;

+    }

+

+    /**

+     * Если авторизован - то открыть личный кабинет

+     */

+    public function isAuthGoHome($params){

+        $userID = $this->UserID('web');

+        if($userID>0){

+            $id = APIHelpers::getkey($params, 'homeID');

+            if(empty($id)){

+                $id = $this->modx->getConfig('login_home', $this->config['site_start']);

+            }

+            $this->moveTo(compact('id'));

+        }

+        return;

+    }

+

+    /**

+     * Редирект

+     */

+    public function moveTo($params){

+        $id = (int)APIHelpers::getkey($params, 'id', 0);

+        $uri = APIHelpers::getkey($params, 'url', '');

+        if((empty($uri) && !empty($id)) || !is_string($uri)){

+            $uri = $this->makeUrl($id);

+        }

+        $code = (int)APIHelpers::getkey($params, 'code', 0);

+        $addUrl = APIHelpers::getkey($params, 'addUrl', '');

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

+            $uri .= "?".$addUrl;

+        }

+        if(APIHelpers::getkey($params, 'validate', false)){

+            if(isset($this->modx->snippetCache['getPageID'])){

+                $out = $this->modx->runSnippet('getPageID', compact('uri'));

+                if(empty($out)){

+                    $uri = '';

+                }

+            }else{

+                $uri = APIhelpers::sanitarTag($uri);

+            }

+        }else{

+            //$modx->sendRedirect($url, 0, 'REDIRECT_HEADER', 'HTTP/1.1 307 Temporary Redirect');

+            header("Location: ".$uri, true, ($code>0 ? $code : 307));

+        }

+        return $uri;

+    }

+

+    /**

+     * Создание ссылки на страницу

+     *

+     * @param  int $id ID документа

+     * @return string

+     */

+    protected function makeUrl($id = null){

+        $id = (int)$id;

+        if($id <= 0){

+            $id = $this->modx->documentObject['id'];

+        }

+        if($this->url->containsKey($id)){

+            $url = $this->url->get($id);

+        }else{

+            $url = $this->modx->makeUrl($id);

+            $this->url->set($id, $url);

+        }

+        return $url;

+    }

+    protected function getTemplate($name){

+        $out = '';

+        $file = dirname(dirname(__FILE__)).'/tpl/'.$name.'.html';

+        if( FS::getInstance()->checkFile($file)){

+            $out = '@CODE: '.file_get_contents($file);

+        }

+        return $out;

+    }

+    protected static function loadLang($lang){

+        $file = dirname(dirname(__FILE__)).'/lang/'.$lang.'.php';

+        if( ! FS::getInstance()->checkFile($file)){

+            $file = false;

+        }

+        if(!empty($lang) && !isset(static::$langDic[$lang]) && !empty($file)){

+            static::$langDic[$lang] = include_once($file);

+            if(is_array(static::$langDic[$lang])){

+                static::$langDic[$lang] = APIHelpers::renameKeyArr(static::$langDic[$lang], $lang);

+            }else{

+                static::$langDic[$lang] = array();

+            }

+        }

+        return !(empty($lang) || empty(static::$langDic[$lang]));

+    }

+    protected static function getLangMsg($key, $default){

+        $out = $default;

+        $lng = static::$lang;

+        $dic = static::$langDic;

+        if(isset($dic[$lng], $dic[$lng][$lng.'.'.$key])){

+            $out = $dic[$lng][$lng.'.'.$key];

+        }

+        if(class_exists('evoBabel', false) && isset(self::$instance->modx->snippetCache['lang'])){

+            $msg = self::$instance->modx->runSnippet('lang', array('a' => 'DLUsers.'.$key));

+            if(!empty($msg)){

+                $out = $msg;

+            }

+        }

+        return $out;

+    }

 }
\ No newline at end of file

Spacing +86 added lines, -86 removed lines

@@ -1,15 +1,15 @@ 
 <?php namespace DLUsers;

 

-include_once(MODX_BASE_PATH . 'assets/lib/APIHelpers.class.php');

-include_once(MODX_BASE_PATH . 'assets/lib/Helpers/FS.php');

-include_once(MODX_BASE_PATH . 'assets/lib/MODxAPI/modUsers.php');

-include_once(MODX_BASE_PATH . 'assets/snippets/DocLister/lib/DLTemplate.class.php');

-include_once(MODX_BASE_PATH . 'assets/snippets/DocLister/lib/DLCollection.class.php');

+include_once(MODX_BASE_PATH.'assets/lib/APIHelpers.class.php');

+include_once(MODX_BASE_PATH.'assets/lib/Helpers/FS.php');

+include_once(MODX_BASE_PATH.'assets/lib/MODxAPI/modUsers.php');

+include_once(MODX_BASE_PATH.'assets/snippets/DocLister/lib/DLTemplate.class.php');

+include_once(MODX_BASE_PATH.'assets/snippets/DocLister/lib/DLCollection.class.php');

 

 use APIHelpers, DocumentParser, DLCollection, DLTemplate;

 use Helpers\FS;

 

-class Actions{

+class Actions {

     protected $modx = null;

     public $userObj = null;

 	/**

@@ -84,20 +84,20 @@ 
     /**

      * Сброс авторизации и обновление страницы

      */

-    public function logout($params){

+    public function logout($params) {

     	$LogoutName = APIHelpers::getkey($params, 'LogoutName', 'logout');

-    	if(is_scalar($LogoutName) && !empty($LogoutName) && isset($_GET[$LogoutName])){

+    	if (is_scalar($LogoutName) && !empty($LogoutName) && isset($_GET[$LogoutName])) {

     		$userID = $this->UserID('web');

-    		if($userID){

+    		if ($userID) {

     			$this->userObj->edit($userID);

-    			if($this->userObj->getID()){

+    			if ($this->userObj->getID()) {

 	    			$this->modx->invokeEvent("OnBeforeWebLogout", array(

 		    			"userid"   => $this->userObj->getID(),

 		    			"username" => $this->userObj->get('username')

 		    		));

 	    		}

 		    	$this->userObj->logOut();

-		    	if($this->userObj->getID()){

+		    	if ($this->userObj->getID()) {

 		    		$this->modx->invokeEvent("OnWebLogout", array(

 		    			"userid"        => $this->userObj->getID(),

 		    			"username"      => $this->userObj->get('username')

@@ -105,7 +105,7 @@ 
 		    	}

 

 			    $go = APIHelpers::getkey($params, 'url', '');

-			    if(empty($go)){

+			    if (empty($go)) {

 			    	$go = str_replace(

 			    		array("?".$LogoutName, "&".$LogoutName),

 			    		array("", ""),

@@ -114,13 +114,13 @@ 
 			    }

 

 			    $start = $this->makeUrl($this->config['site_start']);

-			    if($start == $go){

+			    if ($start == $go) {

 			        $go = $this->config['site_url'];

-			    }else{

+			    } else {

 			        $go = $this->config['site_url'].ltrim($go, '/');

 			    }

 			    $this->moveTo(array('url' => $go));

-    		}else{

+    		} else {

     			//Если юзер не авторизован, то показываем ему 404 ошибку

     			$this->modx->sendErrorPage();

     		}

@@ -132,7 +132,7 @@ 
      * Генерация ссылки под кнопку выход

      * @return string

      */

-    public function logoutUrl($params){

+    public function logoutUrl($params) {

     	$LogoutName = APIHelpers::getkey($params, 'LogoutName', 'logout');

     	$request = parse_url($_SERVER['REQUEST_URI']);

 

@@ -148,7 +148,7 @@ 
      * 		если указан параметр authId, то данные из формы перекидываются в метод AuthPage

      *   	В противном случае вся работа происходит внутри самого блока

      */

-    public function AuthBlock($params){

+    public function AuthBlock($params) {

     	$POST = array('backUrl' => $_SERVER['REQUEST_URI']);

 

     	$error = $errorCode = '';

@@ -157,20 +157,20 @@ 
 		$emailField = APIHelpers::getkey($params, 'emailField', 'email');

 		$rememberField = APIHelpers::getkey($params, 'rememberField', 'remember');

 

-    	if($this->UserID('web')){

+    	if ($this->UserID('web')) {

 			$tpl = APIHelpers::getkey($params, 'tplProfile', '');

-			if(empty($tpl)){

+			if (empty($tpl)) {

 				$tpl = $this->getTemplate('tplProfile');

 			}

 			$dataTPL = $this->userObj->toArray();

 			$dataTPL['url.logout'] = $this->logoutUrl($params);

     		$homeID = APIHelpers::getkey($params, 'homeID');

-			if(!empty($homeID)){

+			if (!empty($homeID)) {

 				$dataTPL['url.profile'] = $this->makeUrl($homeID);

 			}

-		}else{

+		} else {

 			$tpl = APIHelpers::getkey($params, 'tplForm', '');

-			if(empty($tpl)){

+			if (empty($tpl)) {

 				$tpl = $this->getTemplate('authForm');

 			}

 			$POST = $this->Auth($pwdField, $emailField, $rememberField, $POST['backUrl'], __METHOD__, $error, $errorCode, $params);

@@ -184,9 +184,9 @@ 
 				'errorCode' => $errorCode

 			);

 			$authId = APIHelpers::getkey($params, 'authId');

-			if(!empty($authId)){

+			if (!empty($authId)) {

 				$dataTPL['authPage'] = $this->makeUrl($authId);

-				$dataTPL['method'] = strtolower(__CLASS__ . '::'. 'authpage');

+				$dataTPL['method'] = strtolower(__CLASS__.'::'.'authpage');

 			}

 		}

 		return DLTemplate::getInstance($this->modx)->parseChunk($tpl, $dataTPL);

@@ -196,7 +196,7 @@ 
 	 * Авторизация на сайте со страницы авторизации

 	 * [!Auth? &login=`password` &pwdField=`password` &homeID=`72`!]

 	 */

-	public function AuthPage($params){

+	public function AuthPage($params) {

 		$homeID = APIHelpers::getkey($params, 'homeID');

 		$this->isAuthGoHome(array('id' => $homeID));

 

@@ -208,58 +208,58 @@ 
 		$rememberField = APIHelpers::getkey($params, 'rememberField', 'remember');

 

 		$tpl = APIHelpers::getkey($params, 'tpl', '');

-		if(empty($tpl)){

+		if (empty($tpl)) {

 			$tpl = $this->getTemplate('authForm');

 		}

 

 		$request = parse_url($_SERVER['REQUEST_URI']);

-		if(!empty($_SERVER['HTTP_REFERER'])){

+		if (!empty($_SERVER['HTTP_REFERER'])) {

 			/**

 			 * Thank you for super protection against hacking in protect.inc.php:-)

 			 */

 			$refer = htmlspecialchars_decode($_SERVER['HTTP_REFERER'], ENT_QUOTES);

-		}else{

+		} else {

 			$selfHost = rtrim(str_replace("http://", "", $this->config['site_url']), '/');

-			if(empty( $request['host']) ||  $request['host']==$selfHost){

+			if (empty($request['host']) || $request['host'] == $selfHost) {

 				$query = !empty($request['query']) ? '?'.$request['query'] : '';

 			    $refer = !empty($request['path']) ? $request['path'].$query : '';

-			}else{

+			} else {

 				$refer = '';

 			}

 		}

 

-		if($_SERVER['REQUEST_METHOD'] == 'POST'){

+		if ($_SERVER['REQUEST_METHOD'] == 'POST') {

 			$backUrl = APIHelpers::getkey($_POST, 'backUrl', $POST['backUrl']);

-			if(!is_scalar($backUrl)){

+			if (!is_scalar($backUrl)) {

 				$backUrl = $refer;

-			}else{

+			} else {

 				$backUrl = urldecode($backUrl);

 			}

-		}else{

+		} else {

 			$backUrl = $refer;

 		}

 		$backUrl = parse_url($backUrl);

-		if(!empty($backUrl['path']) && $request['path'] != $backUrl['path']){

+		if (!empty($backUrl['path']) && $request['path'] != $backUrl['path']) {

 		    $POST['backUrl'] = $backUrl['path'];

-		}else{

+		} else {

 			$selfHost = rtrim(str_replace("http://", "", $this->config['site_url']), '/');

-			if(empty($backUrl['host']) || $backUrl['host']==$selfHost){

+			if (empty($backUrl['host']) || $backUrl['host'] == $selfHost) {

 				$query = !empty($backUrl['query']) ? '?'.$backUrl['query'] : '';

 			    $POST['backUrl'] = !empty($backUrl['path']) ? $backUrl['path'].$query : '';

-			}else{

+			} else {

 				$POST['backUrl'] = '';

 			}

 		}

-		if(!empty($POST['backUrl'])){

+		if (!empty($POST['backUrl'])) {

 			$idURL = $this->moveTo(array(

 				'url' => '/'.ltrim($POST['backUrl'], '/'),

 			    'validate' => true

 			));

-		}else{

+		} else {

 			$idURL = 0;

 		}

-		if(empty($idURL)){

-			if(empty($homeID)){

+		if (empty($idURL)) {

+			if (empty($homeID)) {

 				$homeID = $this->config['site_start'];

 			}

 			$POST['backUrl'] = $this->makeUrl($homeID);

@@ -275,18 +275,18 @@ 
 			'errorCode' => $errorCode

 		));

 	}

-	protected function Auth($pwdField, $emailField, $rememberField, $backUrl, $method, &$error, &$errorCode, $params = array()){

+	protected function Auth($pwdField, $emailField, $rememberField, $backUrl, $method, &$error, &$errorCode, $params = array()) {

 		$POST = array(

 			'backUrl' => urlencode($backUrl)

 		);

 		$userObj = &$this->userObj;

-		if($_SERVER['REQUEST_METHOD']=='POST' && APIHelpers::getkey($_POST, 'method', '') == strtolower($method)){

+		if ($_SERVER['REQUEST_METHOD'] == 'POST' && APIHelpers::getkey($_POST, 'method', '') == strtolower($method)) {

 			$POST = array_merge($POST, array(

 				'password' => APIHelpers::getkey($_POST, $pwdField, ''),

 				'email' => APIHelpers::getkey($_POST, $emailField, ''),

 				'remember' => (bool)((int)APIHelpers::getkey($_POST, $rememberField, 0))

 			));

-			if(!empty($POST['email']) && is_scalar($POST['email']) && !$userObj->emailValidate($POST['email'], false)){

+			if (!empty($POST['email']) && is_scalar($POST['email']) && !$userObj->emailValidate($POST['email'], false)) {

 				$userObj->edit($POST['email']);

 

 				$this->modx->invokeEvent("OnBeforeWebLogin", array(

@@ -295,7 +295,7 @@ 
 		            "rememberme"	=> $POST['remember'],

 		            'userObj'		=> $userObj

 		        ));

-				if($userObj->getID() && !$userObj->checkBlock($userObj->getID())){

+				if ($userObj->getID() && !$userObj->checkBlock($userObj->getID())) {

 					$pluginFlag = $this->modx->invokeEvent("OnWebAuthentication", array(

 	                    "userid"        => $userObj->getID(),

 	                    "username"      => $userObj->get('username'),

@@ -303,11 +303,11 @@ 
 	                    "savedpassword" => $userObj->get('password'),

 	                    "rememberme"    => $POST['remember'],

 	                ));

-					if(

+					if (

 						($pluginFlag === true || $userObj->testAuth($userObj->getID(), $POST['password'], 0))

 							&&

 						$userObj->authUser($userObj->getID(), $POST['remember'])

-					){

+					) {

 						$userObj->set('logincount', (int)$userObj->get('logincount') + 1);

 						$userObj->set('lastlogin', time());

 						$userObj->set('failedlogincount', 0);

@@ -320,21 +320,21 @@ 
 			                "rememberme"	=> $POST['remember'],

 			            ));

 						$this->moveTo(array('url' => urldecode($POST['backUrl'])));

-					}else{

+					} else {

 						$userObj->set('failedlogincount', (int)$userObj->get('failedlogincount') + 1);

 						$userObj->save(false, false);

 

 						$error = 'error.incorrect_password';

 					}

-				}else{

+				} else {

 					$error = 'error.no_user';

 				}

-			}else{

+			} else {

 				$error = 'error.incorrect_mail';

 				$POST['email'] = '';

 			}

 		}

-		if(!empty($error)){

+		if (!empty($error)) {

 			$errorCode = $error;

 			$error = APIHelpers::getkey($params, $error, '');

 			$error = static::getLangMsg($error, $error);

@@ -345,16 +345,16 @@ 
 	 * Информация о пользователе

 	 * [!DLUsers? &action=`UserInfo` &field=`fullname` &id=`2`!]

 	 */

-	public function UserInfo($params){

+	public function UserInfo($params) {

 		$out = '';

 		$userID = APIHelpers::getkey($params, 'id', 0);

-		if(empty($userID)){

+		if (empty($userID)) {

 			$userID = $this->UserID('web');

 		}

 		$field = APIHelpers::getkey($params, 'field', 'username');

-		if($userID > 0){

+		if ($userID > 0) {

 			$this->userObj->edit($userID);

-			switch(true){

+			switch (true) {

 				case ($field == $this->userObj->fieldPKName()):

 					$out = $this->userObj->getID();

 					break;

@@ -368,14 +368,14 @@ 
 	/**

 	 * ID пользователя

 	 */

-	public function UserID($type = 'web'){

+	public function UserID($type = 'web') {

 		return $this->modx->getLoginUserID($type);

 	}

 	/**

 	 * Если не авторизован - то отправить на страницу

 	 */

-	public function isGuestGoHome($params){

-		if(!$this->UserID('web')){

+	public function isGuestGoHome($params) {

+		if (!$this->UserID('web')) {

 			/**

 			 * @see : http://modx.im/blog/triks/105.html

 			 */

@@ -389,11 +389,11 @@ 
 	/**

 	 * Если авторизован - то открыть личный кабинет

 	 */

-	public function isAuthGoHome($params){

+	public function isAuthGoHome($params) {

 		$userID = $this->UserID('web');

-		if($userID>0){

+		if ($userID > 0) {

 			$id = APIHelpers::getkey($params, 'homeID');

-		    if(empty($id)){

+		    if (empty($id)) {

 				$id = $this->modx->getConfig('login_home', $this->config['site_start']);

 		    }

 		    $this->moveTo(compact('id'));

@@ -404,29 +404,29 @@ 
 	/**

 	 * Редирект

 	 */

-	public function moveTo($params){

+	public function moveTo($params) {

 		$id = (int)APIHelpers::getkey($params, 'id', 0);

 		$uri = APIHelpers::getkey($params, 'url', '');

-		if((empty($uri) && !empty($id)) || !is_string($uri)){

+		if ((empty($uri) && !empty($id)) || !is_string($uri)) {

 			$uri = $this->makeUrl($id);

 		}

 		$code = (int)APIHelpers::getkey($params, 'code', 0);

 		$addUrl = APIHelpers::getkey($params, 'addUrl', '');

-		if(is_scalar($addUrl) && $addUrl!=''){

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

 		    $uri .= "?".$addUrl;

 		}

-		if(APIHelpers::getkey($params, 'validate', false)){

-			if(isset($this->modx->snippetCache['getPageID'])){

+		if (APIHelpers::getkey($params, 'validate', false)) {

+			if (isset($this->modx->snippetCache['getPageID'])) {

 				$out = $this->modx->runSnippet('getPageID', compact('uri'));

-				if(empty($out)){

+				if (empty($out)) {

 					$uri = '';

 				}

-			}else{

+			} else {

 				$uri = APIhelpers::sanitarTag($uri);

 			}

-		}else{

+		} else {

 			//$modx->sendRedirect($url, 0, 'REDIRECT_HEADER', 'HTTP/1.1 307 Temporary Redirect');

-			header("Location: ".$uri, true, ($code>0 ? $code : 307));

+			header("Location: ".$uri, true, ($code > 0 ? $code : 307));

 		}

 		return $uri;

 	}

@@ -437,52 +437,52 @@ 
 	 * @param  int $id ID документа

 	 * @return string

 	 */

-	protected function makeUrl($id = null){

+	protected function makeUrl($id = null) {

 		$id = (int)$id;

-		if($id <= 0){

+		if ($id <= 0) {

 			$id = $this->modx->documentObject['id'];

 		}

-		if($this->url->containsKey($id)){

+		if ($this->url->containsKey($id)) {

 			$url = $this->url->get($id);

-		}else{

+		} else {

 			$url = $this->modx->makeUrl($id);

 			$this->url->set($id, $url);

 		}

 		return $url;

 	}

-	protected function getTemplate($name){

+	protected function getTemplate($name) {

 		$out = '';

 		$file = dirname(dirname(__FILE__)).'/tpl/'.$name.'.html';

-		if( FS::getInstance()->checkFile($file)){

+		if (FS::getInstance()->checkFile($file)) {

 			$out = '@CODE: '.file_get_contents($file);

 		}

 		return $out;

 	}

-	protected static function loadLang($lang){

+	protected static function loadLang($lang) {

 		$file = dirname(dirname(__FILE__)).'/lang/'.$lang.'.php';

-		if( ! FS::getInstance()->checkFile($file)){

+		if (!FS::getInstance()->checkFile($file)) {

 			$file = false;

 		}

-		if(!empty($lang) && !isset(static::$langDic[$lang]) && !empty($file)){

+		if (!empty($lang) && !isset(static::$langDic[$lang]) && !empty($file)) {

 			static::$langDic[$lang] = include_once($file);

-			if(is_array(static::$langDic[$lang])){

+			if (is_array(static::$langDic[$lang])) {

 				static::$langDic[$lang] = APIHelpers::renameKeyArr(static::$langDic[$lang], $lang);

-			}else{

+			} else {

 				static::$langDic[$lang] = array();

 			}

 		}

 		return !(empty($lang) || empty(static::$langDic[$lang]));

 	}

-	protected static function getLangMsg($key, $default){

+	protected static function getLangMsg($key, $default) {

 		$out = $default;

 		$lng = static::$lang;

 		$dic = static::$langDic;

-		if(isset($dic[$lng], $dic[$lng][$lng.'.'.$key])){

+		if (isset($dic[$lng], $dic[$lng][$lng.'.'.$key])) {

 			$out = $dic[$lng][$lng.'.'.$key];

 		}

-		if(class_exists('evoBabel', false) && isset(self::$instance->modx->snippetCache['lang'])){

+		if (class_exists('evoBabel', false) && isset(self::$instance->modx->snippetCache['lang'])) {

 			$msg = self::$instance->modx->runSnippet('lang', array('a' => 'DLUsers.'.$key));

-			if(!empty($msg)){

+			if (!empty($msg)) {

 				$out = $msg;

 			}

 		}

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

Doc Comments +4 added lines

@@ -436,6 +436,10 @@
         return $out;

     }

 

+    /**
+     * @param string $table
+     * @param string $sort
+     */
     protected function injectSortByTV($table, $sort)

     {

         $out = $this->getExtender('tv', true, true)->injectSortByTV($table, $sort);

Braces +4 added lines, -4 removed lines

@@ -47,7 +47,7 @@ 
         $link = $this->checkExtender('request') ? $this->extender['request']->getLink() : $this->getRequest();

         if($id == $this->modx->config['site_start']){

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

-        }else{

+        } else{

             $url = $this->modx->makeUrl($id, '', $link, $this->getCFGDef('urlScheme', ''));

         }

         return $url;

@@ -157,7 +157,7 @@ 
                     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', ''));

                         }

                     }

@@ -248,7 +248,7 @@ 
                 {

                     if($row['type'] == 'reference'){

                         $row['url'] = is_numeric($row['content']) ? $this->modx->makeUrl($row['content'], '', '', $this->getCFGDef('urlScheme', '')) : $row['content'];

-                    }else{

+                    } else{

                         $row['url'] = $this->modx->makeUrl($row['id'], '', '', $this->getCFGDef('urlScheme', ''));

                     }

                 }

@@ -493,7 +493,7 @@ 
             $addDocs = $this->sanitarIn($this->cleanIDs($addDocs));

             if(empty($tmpWhere)){

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

-            }else{

+            } else{

                 $tmpWhere = "((" . $tmpWhere . ") OR c.id IN({$addDocs}))";

             }

         }

Indentation +34 added lines, -34 removed lines

@@ -136,7 +136,7 @@ 
                     $comments = $extJotCount->countComments(array_keys($this->_docs));

                 }

 

-				$this->skippedDocs = 0;

+                $this->skippedDocs = 0;

                 foreach ($this->_docs as $item) {

                     $this->renderTPL = $tpl;

                     if ($extUser) {

@@ -170,7 +170,7 @@ 
 

                     $findTpl = $this->renderTPL;

                     $tmp = $this->uniformPrepare($item, $i);

-					extract($tmp, EXTR_SKIP);

+                    extract($tmp, EXTR_SKIP);

                     if ($this->renderTPL == '') {

                         $this->renderTPL = $findTpl;

                     }

@@ -181,7 +181,7 @@ 
                             'nameParam' => 'prepare'

                         ));

                         if (is_bool($item) && $item === false) {

-							$this->skippedDocs++;

+                            $this->skippedDocs++;

                             continue;

                         }

                     }

@@ -217,13 +217,13 @@ 
         $extSummary = $this->getExtender('summary');

 

         /**

-        * @var $extPrepare prepare_DL_Extender

-        */

+         * @var $extPrepare prepare_DL_Extender

+         */

         $extPrepare = $this->getExtender('prepare');

 

         /**

-        * @var $extE e_DL_Extender

-        */

+         * @var $extE e_DL_Extender

+         */

         $extE = $this->getExtender('e', true, true);

 

         foreach ($data as $num => $item) {

@@ -231,21 +231,21 @@ 
             switch (true) {

                 case ((array('1') == $fields || in_array('summary', $fields)) && $extSummary):

                     $row['summary'] = $this->getSummary($this->_docs[$num], $extSummary, 'introtext', 'content');

-					// no break

+                    // no break

                 case (array('1') == $fields || in_array('date', $fields)):

                     $tmp = (isset($this->_docs[$num][$date]) && $date != 'createdon' && $this->_docs[$num][$date] != 0 && $this->_docs[$num][$date] == (int)$this->_docs[$num][$date]) ? $this->_docs[$num][$date] : $this->_docs[$num]['createdon'];

                     $row['date'] = strftime($this->getCFGDef('dateFormat', '%d.%b.%y %H:%M'), $tmp + $this->modx->config['server_offset_time']);

-					// no break

+                    // no break

                 case (array('1') == $fields || in_array(array('menutitle', 'pagetitle'), $fields)):

                     $row['title'] = ($row['menutitle'] == '' ? $row['pagetitle'] : $row['menutitle']);

-					// no break

+                    // no break

                 case ((array('1') == $fields || in_array(array('content', 'type'), $fields)) && $this->getCFGDef('makeUrl', 1)):

                     if($row['type'] == 'reference'){

                         $row['url'] = is_numeric($row['content']) ? $this->modx->makeUrl($row['content'], '', '', $this->getCFGDef('urlScheme', '')) : $row['content'];

                     }else{

                         $row['url'] = $this->modx->makeUrl($row['id'], '', '', $this->getCFGDef('urlScheme', ''));

                     }

-					// no break

+                    // no break

             }

 

             if($extE && $tmp = $extE->init($this, array('data' => $row))){

@@ -294,18 +294,18 @@ 
             if ($sanitarInIDs != "''") {

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

                     case 'parents':

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

-							case '-1':

-								$tmpWhere = "c.parent IN (" . $sanitarInIDs . ")";

-								break;

-							case 0:

-								$tmpWhere = "c.parent IN ({$sanitarInIDs}) AND c.id NOT IN({$sanitarInIDs})";

-								break;

-							case 1:

-							default:

-								$tmpWhere = "(c.parent IN ({$sanitarInIDs}) OR c.id IN({$sanitarInIDs}))";

-								break;

-						}

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

+                            case '-1':

+                                $tmpWhere = "c.parent IN (" . $sanitarInIDs . ")";

+                                break;

+                            case 0:

+                                $tmpWhere = "c.parent IN ({$sanitarInIDs}) AND c.id NOT IN({$sanitarInIDs})";

+                                break;

+                            case 1:

+                            default:

+                                $tmpWhere = "(c.parent IN ({$sanitarInIDs}) OR c.id IN({$sanitarInIDs}))";

+                                break;

+                        }

                         if (($addDocs = $this->getCFGDef('documents', '')) != '') {

                             $addDocs = $this->sanitarIn($this->cleanIDs($addDocs));

                             $whereArr[] = "((" . $tmpWhere . ") OR c.id IN({$addDocs}))";

@@ -461,17 +461,17 @@ 
         $tmpWhere = null;

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

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

-				case '-1':

-					$tmpWhere = "c.parent IN (" . $sanitarInIDs . ")";

-					break;

-				case 0:

-					$tmpWhere = "c.parent IN (" . $sanitarInIDs . ") AND c.id NOT IN(" . $sanitarInIDs . ")";

-					break;

-				case 1:

-				default:

-					$tmpWhere = "(c.parent IN (" . $sanitarInIDs . ") OR c.id IN({$sanitarInIDs}))";

-					break;

-			}

+                case '-1':

+                    $tmpWhere = "c.parent IN (" . $sanitarInIDs . ")";

+                    break;

+                case 0:

+                    $tmpWhere = "c.parent IN (" . $sanitarInIDs . ") AND c.id NOT IN(" . $sanitarInIDs . ")";

+                    break;

+                case 1:

+                default:

+                    $tmpWhere = "(c.parent IN (" . $sanitarInIDs . ") OR c.id IN({$sanitarInIDs}))";

+                    break;

+            }

         }

         if (($addDocs = $this->getCFGDef('documents', '')) != '') {

             $addDocs = $this->sanitarIn($this->cleanIDs($addDocs));

Spacing +31 added lines, -31 removed lines

@@ -45,9 +45,9 @@ 
         $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', ''));

         }

         return $url;

@@ -154,10 +154,10 @@ 
 

                     $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', ''));

                         }

                     }

@@ -188,7 +188,7 @@ 
                     $tmp = $this->parseChunk($this->renderTPL, $item);

 

                     if ($this->getCFGDef('contentPlaceholder', 0) !== 0) {

-                        $this->toPlaceholders($tmp, 1, "item[" . $i . "]"); // [+item[x]+] – individual placeholder for each iteration documents on this page

+                        $this->toPlaceholders($tmp, 1, "item[".$i."]"); // [+item[x]+] – individual placeholder for each iteration documents on this page

                     }

                     $out .= $tmp;

                     $i++;

@@ -240,16 +240,16 @@ 
                     $row['title'] = ($row['menutitle'] == '' ? $row['pagetitle'] : $row['menutitle']);

 					// no break

                 case ((array('1') == $fields || in_array(array('content', 'type'), $fields)) && $this->getCFGDef('makeUrl', 1)):

-                    if($row['type'] == 'reference'){

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

                         $row['url'] = is_numeric($row['content']) ? $this->modx->makeUrl($row['content'], '', '', $this->getCFGDef('urlScheme', '')) : $row['content'];

-                    }else{

+                    } else {

                         $row['url'] = $this->modx->makeUrl($row['id'], '', '', $this->getCFGDef('urlScheme', ''));

                     }

 					// no break

             }

 

-            if($extE && $tmp = $extE->init($this, array('data' => $row))){

-                if(is_array($tmp)){

+            if ($extE && $tmp = $extE->init($this, array('data' => $row))) {

+                if (is_array($tmp)) {

                     $row = $tmp;

                 }

             }

@@ -277,7 +277,7 @@ 
         if ($sanitarInIDs != "''" || $this->getCFGDef('ignoreEmpty', '0')) {

             $where = $this->getCFGDef('addWhereList', '');

             $where = sqlHelper::trimLogicalOp($where);

-            $where = ($where ? $where . ' AND ' : '') . $this->_filters['where'];

+            $where = ($where ? $where.' AND ' : '').$this->_filters['where'];

             if ($where != '' && $this->_filters['where'] != '') {

                 $where .= " AND ";

             }

@@ -294,9 +294,9 @@ 
             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 . ")";

+								$tmpWhere = "c.parent IN (".$sanitarInIDs.")";

 								break;

 							case 0:

 								$tmpWhere = "c.parent IN ({$sanitarInIDs}) AND c.id NOT IN({$sanitarInIDs})";

@@ -308,7 +308,7 @@ 
 						}

                         if (($addDocs = $this->getCFGDef('documents', '')) != '') {

                             $addDocs = $this->sanitarIn($this->cleanIDs($addDocs));

-                            $whereArr[] = "((" . $tmpWhere . ") OR c.id IN({$addDocs}))";

+                            $whereArr[] = "((".$tmpWhere.") OR c.id IN({$addDocs}))";

                         } else {

                             $whereArr[] = $tmpWhere;

                         }

@@ -319,7 +319,7 @@ 
                         break;

                 }

             }

-            $from = $tbl_site_content . " " . $this->_filters['join'];

+            $from = $tbl_site_content." ".$this->_filters['join'];

             $where = sqlHelper::trimLogicalOp($where);

 

             if (trim($where) != 'WHERE') {

@@ -350,12 +350,12 @@ 
             $where = $this->getCFGDef('addWhereList', '');

             $where = sqlHelper::trimLogicalOp($where);

 

-            $where = ($where ? $where . ' AND ' : '') . $this->_filters['where'];

+            $where = ($where ? $where.' AND ' : '').$this->_filters['where'];

             $where = sqlHelper::trimLogicalOp($where);

 

             $tbl_site_content = $this->getTable('site_content', 'c');

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

-                $where .= ($where ? " AND " : "") . "c.id IN ({$sanitarInIDs}) AND";

+                $where .= ($where ? " AND " : "")."c.id IN ({$sanitarInIDs}) AND";

             }

             $where = sqlHelper::trimLogicalOp($where);

 

@@ -378,7 +378,7 @@ 
             $fields = $this->getCFGDef('selectFields', 'c.*');

             $group = $this->getGroupSQL($this->getCFGDef('groupBy', 'c.id'));

             $sort = $this->SortOrderSQL("if(c.pub_date=0,c.createdon,c.pub_date)");

-            list($tbl_site_content, $sort) = $this->injectSortByTV($tbl_site_content . ' ' . $this->_filters['join'], $sort);

+            list($tbl_site_content, $sort) = $this->injectSortByTV($tbl_site_content.' '.$this->_filters['join'], $sort);

 

             $limit = $this->LimitSQL($this->getCFGDef('queryLimit', 0));

 

@@ -455,30 +455,30 @@ 
         $tbl_site_content = $this->getTable('site_content', 'c');

 

         $sort = $this->SortOrderSQL("if(c.pub_date=0,c.createdon,c.pub_date)");

-        list($from, $sort) = $this->injectSortByTV($tbl_site_content . ' ' . $this->_filters['join'], $sort);

+        list($from, $sort) = $this->injectSortByTV($tbl_site_content.' '.$this->_filters['join'], $sort);

         $sanitarInIDs = $this->sanitarIn($this->IDs);

 

         $tmpWhere = null;

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

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

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

 				case '-1':

-					$tmpWhere = "c.parent IN (" . $sanitarInIDs . ")";

+					$tmpWhere = "c.parent IN (".$sanitarInIDs.")";

 					break;

 				case 0:

-					$tmpWhere = "c.parent IN (" . $sanitarInIDs . ") AND c.id NOT IN(" . $sanitarInIDs . ")";

+					$tmpWhere = "c.parent IN (".$sanitarInIDs.") AND c.id NOT IN(".$sanitarInIDs.")";

 					break;

 				case 1:

 				default:

-					$tmpWhere = "(c.parent IN (" . $sanitarInIDs . ") OR c.id IN({$sanitarInIDs}))";

+					$tmpWhere = "(c.parent IN (".$sanitarInIDs.") OR c.id IN({$sanitarInIDs}))";

 					break;

 			}

         }

         if (($addDocs = $this->getCFGDef('documents', '')) != '') {

             $addDocs = $this->sanitarIn($this->cleanIDs($addDocs));

-            if(empty($tmpWhere)){

+            if (empty($tmpWhere)) {

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

-            }else{

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

+            } else {

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

             }

         }

         if (!empty($tmpWhere)) {

@@ -488,7 +488,7 @@ 
             $where[] = "c.deleted=0 AND c.published=1";

         }

         if (!empty($where)) {

-            $where = "WHERE " . implode(" AND ", $where);

+            $where = "WHERE ".implode(" AND ", $where);

         } else {

             $where = '';

         }

@@ -496,9 +496,9 @@ 
         $group = $this->getGroupSQL($this->getCFGDef('groupBy', 'c.id'));

 

         if ($sanitarInIDs != "''" || $this->getCFGDef('ignoreEmpty', '0')) {

-            $sql = $this->dbQuery("SELECT {$fields} FROM " . $from . " " . $where . " " .

-                $group . " ".

-                $sort . " " .

+            $sql = $this->dbQuery("SELECT {$fields} FROM ".$from." ".$where." ".

+                $group." ".

+                $sort." ".

                 $this->LimitSQL($this->getCFGDef('queryLimit', 0))

             );

 

@@ -516,7 +516,7 @@ 
         $type = trim($type);

         switch (strtoupper($type)) {

             case 'TVDATETIME':

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

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

                 break;

             default:

                 $field = parent::changeSortType($field, $type);