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

Spacing +15 added lines, -15 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,10 +18,10 @@ 
      * @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);
+        $str = mb_strtoupper(mb_substr($str, 0, 1, $encoding), $encoding) . mb_substr($str, 1, mb_strlen($str), $encoding);
         return $str;
     }
 
@@ -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);
@@ -217,8 +217,8 @@ 
         '[' => '[', '%5B' => '[', ']' => ']', '%5D' => ']',
         '{' => '{', '%7B' => '{', '}' => '}', '%7D' => '}',
         '`' => '`', '%60' => '`'
-    )){
-        switch(true){
+    )) {
+        switch (true) {
             case is_scalar($data):
                 $out = str_replace(
                     array_keys($chars),
@@ -228,7 +228,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;
@@ -238,7 +238,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_COMPAT, $charset, false) : '';
     }
     /**
@@ -321,16 +321,16 @@ 
             $out = $data;
         } else {
             $InsertPrefix = ($prefix != '') ? ($prefix . $addPS) : '';
-            $InsertSuffix = ($suffix != '') ? ($addPS. $suffix) : '';
+            $InsertSuffix = ($suffix != '') ? ($addPS . $suffix) : '';
             foreach ($data as $key => $item) {
                 $key = $InsertPrefix . $key;
                 $val = null;
-                switch(true){
+                switch (true) {
                     case is_scalar($item):
                         $val = $item;
                         break;
                     case is_array($item):
-                        $val = self::renameKeyArr($item, $key.$sep, $InsertSuffix, '', $sep);
+                        $val = self::renameKeyArr($item, $key . $sep, $InsertSuffix, '', $sep);
                         $out = array_merge($out, $val);
                         $val = '';
                         break;

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

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

Indentation +13 added lines, -13 removed lines

@@ -1,17 +1,17 @@ 
 <?php
 /**
- * summary
- * Truncates the HTML string to the specified length
- *
- * Copyright 2013 by Agel_Nash <Agel_Nash@xaker.ru>
- *
- * @category extender
- * @license GNU General Public License (GPL), http://www.gnu.org/copyleft/gpl.html
- * @author Agel_Nash <Agel_Nash@xaker.ru>
- * @see http://blog.agel-nash.ru/addon/summary.html
- * @date 31.07.2013
- * @version 1.0.3
- */
+     * summary
+     * Truncates the HTML string to the specified length
+     *
+     * Copyright 2013 by Agel_Nash <Agel_Nash@xaker.ru>
+     *
+     * @category extender
+     * @license GNU General Public License (GPL), http://www.gnu.org/copyleft/gpl.html
+     * @author Agel_Nash <Agel_Nash@xaker.ru>
+     * @see http://blog.agel-nash.ru/addon/summary.html
+     * @date 31.07.2013
+     * @version 1.0.3
+     */
 include_once(MODX_BASE_PATH . 'assets/lib/APIHelpers.class.php');
 class SummaryText
 {
@@ -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']);

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

assets/lib/Formatter/SqlFormatter.php

Doc Comments +3 added lines

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

     }

 

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

     {

         $ret = null;

Indentation +13 added lines, -13 removed lines

@@ -1,16 +1,16 @@ 
 <?php namespace Formatter;

 /**

- * SQL Formatter is a collection of utilities for debugging SQL queries.

- * It includes methods for formatting, syntax highlighting, removing comments, etc.

- *

- * @package    SqlFormatter

- * @author     Jeremy Dorn <jeremy@jeremydorn.com>

- * @author     Florin Patan <florinpatan@gmail.com>

- * @copyright  2013 Jeremy Dorn

- * @license    http://opensource.org/licenses/MIT

- * @link       http://github.com/jdorn/sql-formatter

- * @version    1.2.18

- */

+     * SQL Formatter is a collection of utilities for debugging SQL queries.

+     * It includes methods for formatting, syntax highlighting, removing comments, etc.

+     *

+     * @package    SqlFormatter

+     * @author     Jeremy Dorn <jeremy@jeremydorn.com>

+     * @author     Florin Patan <florinpatan@gmail.com>

+     * @copyright  2013 Jeremy Dorn

+     * @license    http://opensource.org/licenses/MIT

+     * @link       http://github.com/jdorn/sql-formatter

+     * @version    1.2.18

+     */

 class SqlFormatter

 {

     // Constants for token types

@@ -866,9 +866,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 +96 added lines, -96 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];

         }

         

@@ -380,11 +380,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;

             }

@@ -426,7 +426,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 = '';

@@ -470,13 +470,13 @@ 
             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

@@ -491,9 +491,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);

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

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

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

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

                 }

 

                 $return .= $highlighted;

@@ -504,11 +504,11 @@ 
             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 --;

+                        $indent_level--;

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

                     }

 

@@ -534,11 +534,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] === ')') {

@@ -549,12 +549,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;

                     }

 

@@ -568,8 +568,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) {

@@ -583,13 +583,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;

@@ -601,7 +601,7 @@ 
                     $indent_level = 0;

 

                     if ($highlight) {

-                        $return .= "\n".self::highlightError($token[self::TOKEN_VALUE]);

+                        $return .= "\n" . self::highlightError($token[self::TOKEN_VALUE]);

                         continue;

                     }

                 }

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

                 }

@@ -631,12 +631,12 @@ 
                 }

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

@@ -670,16 +670,16 @@ 
                 }

 

                 // 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,29 +689,29 @@ 
                 $return = rtrim($return, ' ');

             }

 

-            $return .= $highlighted.' ';

+            $return .= $highlighted . ' ';

 

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

-            $return .= "\n".self::highlightError("WARNING: unclosed parentheses or section");

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

@@ -760,7 +760,7 @@ 
             // If this is a query separator

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

                 if (!$empty) {

-                    $queries[] = $current_query.';';

+                    $queries[] = $current_query . ';';

                 }

                 $current_query = '';

                 $empty = true;

@@ -803,7 +803,7 @@ 
 

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

         }

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

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

 

         return $result;

     }

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

@@ -866,31 +866,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);

         }

 

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

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

@@ -1052,7 +1052,7 @@ 
      */

     private static function quote_regex($a)

     {

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

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

     }

 

     /**

@@ -1065,14 +1065,14 @@ 
     private static function output($string)

     {

         if (self::is_cli()) {

-            return $string."\n";

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

         }

     }

 

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

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/FS.php

Doc Comments +20 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
      * Чтобы не дергать постоянно файл который обрабатываем

      *

      * @access private

-     * @param string $name ключ

+     * @param string $mode
      * @return string информация из pathinfo о обрабатываемом файле input

      */

     private function _pathinfo($file, $mode){

@@ -65,14 +65,23 @@ 
         return $out;

     }

 

+    /**
+     * @param string $file
+     */
     public function takeFileDir($file){

         return $this->_pathinfo($file, 'dirname');

     }

 

+    /**
+     * @param string $file
+     */
     public function takeFileBasename($file){ //file name with extension

         return $this->_pathinfo($file, 'basename');

     }

 

+    /**
+     * @param string $file
+     */
     public function takeFileName($file){

         return $this->_pathinfo($file, 'filename');

     }

@@ -151,6 +160,9 @@ 
         return $out;

     }

 

+    /**
+     * @param string $path
+     */
     public function makeDir($path, $perm = 0755){

         if (!$this->checkDir($path)){

             $path = MODX_BASE_PATH . $this->relativePath($path);

@@ -227,13 +239,16 @@ 
      * '0755' => 493

      * '755' => 493

      *

-     * @param  mixed $chmod строка или число в восьмеричной/десятичной системе счисления

+     * @param  integer $chmod строка или число в восьмеричной/десятичной системе счисления

      * @return int        число в восьмеричной системе счисления

      */

     public function toOct($chmod){

         return is_string($chmod) ? octdec($chmod) : $chmod;

     }

 

+    /**
+     * @param string $dirPath
+     */
     public function rmDir($dirPath) {

 		$flag = false;

         $path = $_path = MODX_BASE_PATH . $this->relativePath($dirPath);

@@ -248,6 +263,9 @@ 
 		return $flag;

     }

 	

+	/**
+	 * @param string $file
+	 */
 	public function unlink($file){

 		$flag = false;

         if($this->checkFile($file)){

Indentation +23 added lines, -23 removed lines

@@ -221,9 +221,9 @@ 
     /**

      * Перевод строки/числа из восьмеричной/десятичной системы счисления в 8-ричную систему счисления

      * Если параметр является числом, то он остается без изменений. Обработка применяется только к строкам.

-	 *

-	 * 755 => 755

-	 * 0755 => 493

+     *

+     * 755 => 755

+     * 0755 => 493

      * '0755' => 493

      * '755' => 493

      *

@@ -235,7 +235,7 @@ 
     }

 

     public function rmDir($dirPath) {

-		$flag = false;

+        $flag = false;

         $path = $_path = MODX_BASE_PATH . $this->relativePath($dirPath);

         if ($this->checkDir($path)) {

             $dirIterator = new \RecursiveDirectoryIterator($path, \FilesystemIterator::SKIP_DOTS);

@@ -245,31 +245,31 @@ 
             }

             $flag = rmdir($_path);

         }

-		return $flag;

+        return $flag;

     }

 	

-	public function unlink($file){

-		$flag = false;

+    public function unlink($file){

+        $flag = false;

         if($this->checkFile($file)){

-			$flag = unlink(MODX_BASE_PATH . $this->relativePath($file));

+            $flag = unlink(MODX_BASE_PATH . $this->relativePath($file));

         }

-		return $flag;

+        return $flag;

     }

 

-	public function delete($path){

-		$path = MODX_BASE_PATH . $this->relativePath($path);

-		switch(true){

-			case $this->checkDir($path):

-				$flag = $this->rmDir($path);

-				break;

-			case $this->checkFile($path):

-				$flag = $this->unlink($path);

-				break;

-			default:

-				$flag = false;

-		}

-		return $flag;

-	}

+    public function delete($path){

+        $path = MODX_BASE_PATH . $this->relativePath($path);

+        switch(true){

+            case $this->checkDir($path):

+                $flag = $this->rmDir($path);

+                break;

+            case $this->checkFile($path):

+                $flag = $this->unlink($path);

+                break;

+            default:

+                $flag = false;

+        }

+        return $flag;

+    }

     public function getInexistantFilename($file, $full = false) {

         $i = 1;

         $file = $mainFile = MODX_BASE_PATH.$this->relativePath($file);

Spacing +46 added lines, -46 removed lines

@@ -1,6 +1,6 @@ 
 <?php namespace Helpers;

 

-class FS{

+class FS {

     /**

      * @var FS cached reference to singleton instance

      */

@@ -52,52 +52,52 @@ 
      * @param string $name ключ

      * @return string информация из pathinfo о обрабатываемом файле input

      */

-    private function _pathinfo($file, $mode){

-        if(!is_scalar($file) && !is_scalar($mode)){

+    private function _pathinfo($file, $mode) {

+        if (!is_scalar($file) && !is_scalar($mode)) {

             $file = $mode = '';

         }

         $flag = !(empty($file) || empty($mode));

         $f = MODX_BASE_PATH . $this->relativePath($file);

-        if($flag && !isset($this->_fileInfo[$f], $this->_fileInfo[$f][$mode])){

+        if ($flag && !isset($this->_fileInfo[$f], $this->_fileInfo[$f][$mode])) {

             $this->_fileInfo[$f] = pathinfo($f);

         }

         $out = $flag && isset($this->_fileInfo[$f][$mode]) ? $this->_fileInfo[$f][$mode] : '';

         return $out;

     }

 

-    public function takeFileDir($file){

+    public function takeFileDir($file) {

         return $this->_pathinfo($file, 'dirname');

     }

 

-    public function takeFileBasename($file){ //file name with extension

+    public function takeFileBasename($file) { //file name with extension

         return $this->_pathinfo($file, 'basename');

     }

 

-    public function takeFileName($file){

+    public function takeFileName($file) {

         return $this->_pathinfo($file, 'filename');

     }

 

-    public function takeFileExt($file){

+    public function takeFileExt($file) {

         return strtolower($this->_pathinfo($file, 'extension'));

     }

 

-    public function checkFile($file){

+    public function checkFile($file) {

         $f = is_scalar($file) ? MODX_BASE_PATH . $this->relativePath($file) : '';

         return (!empty($f) && is_file($f) && is_readable($f));

     }

 

-    public function checkDir($path){

+    public function checkDir($path) {

         $f = is_scalar($path) ? $this->relativePath($path) : '';

         return (!empty($f) && is_dir(MODX_BASE_PATH . $f) && is_readable(MODX_BASE_PATH . $f));

     }

 

-    public function fileSize($file, $format = false){

+    public function fileSize($file, $format = false) {

         $out = 0;

-        if($this->checkFile($file)){

+        if ($this->checkFile($file)) {

             $out = filesize(MODX_BASE_PATH . $this->relativePath($file));

         }

-        if($format){

-            $types = array( 'B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');

+        if ($format) {

+            $types = array('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');

             $size = $out > 0 ? floor(log($out, 1024)) : 0;

             $out = number_format($out / pow(1024, $size), 2, '.', ',') . ' ' . $types[$size];

         }

@@ -114,12 +114,12 @@ 
      * @param $fname Имя файла

      * @return string MIME тип файла

      */

-    public function takeFileMIME($file){

+    public function takeFileMIME($file) {

         $out = null;

         $path = $this->relativePath($file);

-        if($this->checkFile($path)){

-            $fname = MODX_BASE_PATH.$path;

-            switch(true){

+        if ($this->checkFile($path)) {

+            $fname = MODX_BASE_PATH . $path;

+            switch (true) {

                 /** need fileinfo extension */

                 case (extension_loaded('fileinfo') && class_exists('\finfo')):

                     $fi = new \finfo(FILEINFO_MIME_TYPE);

@@ -134,15 +134,15 @@ 
                     /**

                      * @see: http://www.php.net/manual/ru/function.finfo-open.php#112617

                      */

-                    $fh=fopen($fname,'rb');

+                    $fh = fopen($fname, 'rb');

                     if ($fh) {

-                        $bytes6=fread($fh,6);

+                        $bytes6 = fread($fh, 6);

                         fclose($fh);

-                        switch(true){

-                            case ($bytes6===false): break;

-                            case (substr($bytes6,0,3)=="\xff\xd8\xff"): $out = 'image/jpeg'; break;

-                            case ($bytes6=="\x89PNG\x0d\x0a"): $out = 'image/png'; break;

-                            case ($bytes6=="GIF87a" || $bytes6=="GIF89a"): $out = 'image/gif'; break;

+                        switch (true) {

+                            case ($bytes6 === false): break;

+                            case (substr($bytes6, 0, 3) == "\xff\xd8\xff"): $out = 'image/jpeg'; break;

+                            case ($bytes6 == "\x89PNG\x0d\x0a"): $out = 'image/png'; break;

+                            case ($bytes6 == "GIF87a" || $bytes6 == "GIF89a"): $out = 'image/gif'; break;

                             default: $out = 'application/octet-stream'; break;

                         }

                     }

@@ -151,11 +151,11 @@ 
         return $out;

     }

 

-    public function makeDir($path, $perm = 0755){

-        if (!$this->checkDir($path)){

+    public function makeDir($path, $perm = 0755) {

+        if (!$this->checkDir($path)) {

             $path = MODX_BASE_PATH . $this->relativePath($path);

             $flag = mkdir($path, $this->toOct($perm), true);

-        }else{

+        } else {

             $flag = true;

         }

         return $flag;

@@ -168,12 +168,12 @@ 
      * @param $to получатель

      * @return bool статус копирования

      */

-    public function copyFile($from, $to, $chmod = 0644){

+    public function copyFile($from, $to, $chmod = 0644) {

         $flag = false;

         $from = MODX_BASE_PATH . $this->relativePath($from);

         $to = MODX_BASE_PATH . $this->relativePath($to);

         $dir = $this->takeFileDir($to);

-        if($this->checkFile($from) && $this->makeDir($dir) && copy($from, $to)){

+        if ($this->checkFile($from) && $this->makeDir($dir) && copy($from, $to)) {

             chmod($to, $this->toOct($chmod));

             $flag = true;

         }

@@ -187,12 +187,12 @@ 
      * @param string $to получатель

      * @return bool статус перемещения

      */

-    public function moveFile($from, $to, $chmod = 0644){

+    public function moveFile($from, $to, $chmod = 0644) {

         $flag = false;

         $from = MODX_BASE_PATH . $this->relativePath($from);

         $to = MODX_BASE_PATH . $this->relativePath($to);

         $dir = $this->takeFileDir($to);

-        if($this->checkFile($from) && $this->makeDir($dir) && rename($from, $to)){

+        if ($this->checkFile($from) && $this->makeDir($dir) && rename($from, $to)) {

             chmod($to, $this->toOct($chmod));

             $flag = true;

         }

@@ -206,13 +206,13 @@ 
      * @param string $owner начальный путь который стоит вырезать

      * @return string относительный путь

      */

-    public function relativePath($path, $owner = null){

-        if(is_null($owner)){

+    public function relativePath($path, $owner = null) {

+        if (is_null($owner)) {

             $owner = MODX_BASE_PATH;

         }

-        if(!(empty($path) || !is_scalar($path)) && !preg_match("/^http(s)?:\/\/\w+/",$path)){

-            $path = trim(preg_replace("#^".$owner."#", '', $path), '/');

-        }else{

+        if (!(empty($path) || !is_scalar($path)) && !preg_match("/^http(s)?:\/\/\w+/", $path)) {

+            $path = trim(preg_replace("#^" . $owner . "#", '', $path), '/');

+        } else {

             $path = '';

         }

         return $path;

@@ -230,7 +230,7 @@ 
      * @param  mixed $chmod строка или число в восьмеричной/десятичной системе счисления

      * @return int        число в восьмеричной системе счисления

      */

-    public function toOct($chmod){

+    public function toOct($chmod) {

         return is_string($chmod) ? octdec($chmod) : $chmod;

     }

 

@@ -240,7 +240,7 @@ 
         if ($this->checkDir($path)) {

             $dirIterator = new \RecursiveDirectoryIterator($path, \FilesystemIterator::SKIP_DOTS);

             $dirRecursiveIterator = new \RecursiveIteratorIterator($dirIterator, \RecursiveIteratorIterator::CHILD_FIRST);

-            foreach($dirRecursiveIterator as $path) {

+            foreach ($dirRecursiveIterator as $path) {

                 $path->isDir() ? rmdir($path->getPathname()) : unlink($path->getPathname());

             }

             $flag = rmdir($_path);

@@ -248,17 +248,17 @@ 
 		return $flag;

     }

 	

-	public function unlink($file){

+	public function unlink($file) {

 		$flag = false;

-        if($this->checkFile($file)){

+        if ($this->checkFile($file)) {

 			$flag = unlink(MODX_BASE_PATH . $this->relativePath($file));

         }

 		return $flag;

     }

 

-	public function delete($path){

+	public function delete($path) {

 		$path = MODX_BASE_PATH . $this->relativePath($path);

-		switch(true){

+		switch (true) {

 			case $this->checkDir($path):

 				$flag = $this->rmDir($path);

 				break;

@@ -272,11 +272,11 @@ 
 	}

     public function getInexistantFilename($file, $full = false) {

         $i = 1;

-        $file = $mainFile = MODX_BASE_PATH.$this->relativePath($file);

+        $file = $mainFile = MODX_BASE_PATH . $this->relativePath($file);

         while ($this->checkFile($file)) {

             $i++;

-            $out = $this->takeFileDir($file).'/';

-            $out .= $this->takeFileName($mainFile)."({$i}).".$this->takeFileExt($file);

+            $out = $this->takeFileDir($file) . '/';

+            $out .= $this->takeFileName($mainFile) . "({$i})." . $this->takeFileExt($file);

             $file = $out;

         }

         return $full ? $file : $this->takeFileBasename($file);

Braces +2 added lines, -2 removed lines

@@ -155,7 +155,7 @@ 
         if (!$this->checkDir($path)){

             $path = MODX_BASE_PATH . $this->relativePath($path);

             $flag = mkdir($path, $this->toOct($perm), true);

-        }else{

+        } else{

             $flag = true;

         }

         return $flag;

@@ -212,7 +212,7 @@ 
         }

         if(!(empty($path) || !is_scalar($path)) && !preg_match("/^http(s)?:\/\/\w+/",$path)){

             $path = trim(preg_replace("#^".$owner."#", '', $path), '/');

-        }else{

+        } else{

             $path = '';

         }

         return $path;

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 +9 added lines, -9 removed lines

@@ -1,9 +1,9 @@ 
 <?php namespace Helpers;
 
-include_once(MODX_BASE_PATH.'assets/snippets/phpthumb/phpthumb.class.php');
+include_once(MODX_BASE_PATH . 'assets/snippets/phpthumb/phpthumb.class.php');
 require_once(MODX_BASE_PATH . 'assets/lib/Helpers/FS.php');
 
-class PHPThumb{
+class PHPThumb {
 
     private $thumb = null;
     protected $fs = null;
@@ -17,9 +17,9 @@ 
 
     public function create($inputFile, $outputFile, $options) {
         $this->thumb->sourceFilename = $inputFile;
-		$ext = explode('.',$inputFile);
-        $ext = str_replace('jpeg','jpg',strtolower(array_pop($ext)));
-        $options = 'f='.$ext.'&'.$options;
+		$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)) {
             return true;
@@ -34,12 +34,12 @@ 
             case 'jpg':
 				$ext = $this->fs->takeFileExt($file);
                 if ($ext == 'jpeg' || $ext == 'jpg') {
-                    $cmd = '/usr/bin/jpegtran -optimize -progressive -copy none -outfile '.escapeshellarg($file.'_').' '.escapeshellarg($file);
+                    $cmd = '/usr/bin/jpegtran -optimize -progressive -copy none -outfile ' . escapeshellarg($file . '_') . ' ' . escapeshellarg($file);
                     exec($cmd, $result, $return_var);
-                    if ($this->fs->fileSize($file) > $this->fs->fileSize($file.'_')) {
-                        $this->fs->moveFile($file.'_', $file);
+                    if ($this->fs->fileSize($file) > $this->fs->fileSize($file . '_')) {
+                        $this->fs->moveFile($file . '_', $file);
                     } else {
-                        $this->fs->unlink($file.'_');
+                        $this->fs->unlink($file . '_');
                     }
                 }
                 break;

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{
+include_once(dirname(dirname(__FILE__)) . '/APIHelpers.class.php');
+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]

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

Spacing +47 added lines, -47 removed lines

@@ -79,7 +79,7 @@ 
         $this->get_TV();
         $uTable = $this->makeTable("manager_users");
         $aTable = $this->makeTable("user_attributes");
-        $query = "SELECT `u`.`id`, `a`.`email`, `u`.`username`  FROM ".$aTable." as `a` LEFT JOIN ".$uTable." as `u` ON `u`.`id`=`a`.`internalKey`";
+        $query = "SELECT `u`.`id`, `a`.`email`, `u`.`username`  FROM " . $aTable . " as `a` LEFT JOIN " . $uTable . " as `u` ON `u`.`id`=`a`.`internalKey`";
         $this->managerUsers = new DLCollection($modx, $this->query($query));
     }
 
@@ -94,20 +94,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),
@@ -115,17 +115,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;
@@ -138,14 +138,14 @@ 
         $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){
+        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);
@@ -158,13 +158,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);
             }
         }
@@ -184,46 +184,46 @@ 
                     break;
                 case 'published':
                     $value = (int)((bool)$value);
-                    if($value){
+                    if ($value) {
                         $this->field['publishedon'] = time() + $this->modxConfig('server_offset_time');
                     }
                     break;
                 case 'publishedon':
                     $value = $this->getTime($value);
-                    if($value){
+                    if ($value) {
                         $this->field['published'] = 1;
-                    }else{
+                    } else {
                         $this->field['published'] = 0;
                     }
                     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;
@@ -243,19 +243,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;
@@ -279,13 +279,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');
             }
         }
@@ -344,8 +344,8 @@ 
 	
         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');
@@ -366,11 +366,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;
@@ -428,7 +428,7 @@ 
         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()) {
@@ -437,11 +437,11 @@ 
 		} 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()) {
@@ -470,7 +470,7 @@ 
 			), $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(
@@ -537,25 +537,25 @@ 
                 $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(){
-        $q = $this->query("SELECT `tmplvarid`, `templateid` FROM ".$this->makeTable('site_tmplvar_templates'));
+    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);
@@ -572,7 +572,7 @@ 
     {
         if (!is_numeric($tpl) || $tpl != (int)$tpl) {
             if (is_scalar($tpl)) {
-            	$sql = "SELECT `id` FROM {$this->makeTable('site_templates')} WHERE `templatename` = '".$this->escape($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);

Braces +14 added lines, -6 removed lines

@@ -192,7 +192,7 @@ 
                     $value = $this->getTime($value);
                     if($value){
                         $this->field['published'] = 1;
-                    }else{
+                    } else{
                         $this->field['published'] = 0;
                     }
                     break;
@@ -214,7 +214,7 @@ 
                     $value = (int)((bool)$value);
                     if($value){
                         $this->field['deletedon'] = time() + $this->modxConfig('server_offset_time');
-                    }else{
+                    } else{
                         $this->field['deletedon'] = 0;
                     }
                     break;
@@ -403,7 +403,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));

assets/lib/MODxAPI/MODx.php

Doc Comments +31 added lines, -3 removed lines

@@ -33,6 +33,9 @@ 
         $this->_decodedFields = new DLCollection($this->modx);

     }

 

+    /**
+     * @param boolean $flag
+     */
     public function setDebug($flag){

         $this->_debug = (bool)$flag;

         return $this;

@@ -43,6 +46,10 @@ 
     public function getDefaultFields(){

         return $this->default_field;

     }

+
+    /**
+     * @param string $name
+     */
     final public function modxConfig($name, $default = null)

     {

         return APIHelpers::getkey($this->modx->config, $name, $default);

@@ -71,6 +78,10 @@ 
         }

         return $value;

      }

+
+    /**
+     * @param string $name
+     */
     final public function invokeEvent($name, $data = array(), $flag = false)

     {

         $flag = (isset($flag) && $flag != '') ? (bool)$flag : false;

@@ -144,6 +155,10 @@ 
 		}

         $this->invokeEvent('OnSiteRefresh', array('IDs' => $IDs), $fire_events);

     }

+
+	/**
+	 * @param integer $id
+	 */
 	public function switchObject($id){

         switch(true){

             //Если загружен другой объект - не тот, с которым мы хотим временно поработать

@@ -345,6 +360,10 @@ 
         return $out;

     }

 

+    /**
+     * @param string $table
+     * @param string $field
+     */
     public function checkUnique($table, $field, $PK = 'id')

     {

         $val = $this->get($field);

@@ -394,6 +413,9 @@ 
 

     abstract public function save($fire_events = null, $clearCache = false);

 

+    /**
+     * @param integer $ids
+     */
     abstract public function delete($ids, $fire_events = null);

 

     final public function sanitarTag($data)

@@ -401,6 +423,9 @@ 
         return parent::sanitarTag($this->modx->stripTags($data));

     }

 

+    /**
+     * @param string $version
+     */
     final protected function checkVersion($version, $dmi3yy = true)

     {

         $flag = false;

@@ -418,6 +443,9 @@ 
         return $flag;

     }

 

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

     {

         $flag = false;

@@ -487,7 +515,7 @@ 
 

     /**

      * Получить список не запакованных полей

-     * @return array

+     * @return DLCollection

      */

     public function getNoEncodeFields(){

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

@@ -497,7 +525,7 @@ 
 

     /**

      * Получить список не распакованных полей

-     * @return array

+     * @return DLCollection

      */

     public function getNoDecodeFields(){

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

@@ -564,7 +592,7 @@ 
      * Запаковывает конкретное поле в JSON

      * @param  string $field Имя поля

      * @param  bool $store обновить запакованное поле

-     * @return array json строка

+     * @return string|null json строка

      */

     public function encodeField($field, $store = false){

         $out = null;

Indentation +72 added lines, -72 removed lines

@@ -13,23 +13,23 @@ 
     protected $set = array();

     protected $newDoc = false;

     protected $pkName = 'id';

-	protected $ignoreError = '';

+    protected $ignoreError = '';

     protected $_debug = false;

     protected $_query = array();

     protected $jsonFields = array();

-	/**

-	 * @var DLCollection

-	 */

+    /**

+     * @var DLCollection

+     */

     private $_decodedFields;

-	private $_table = array();

+    private $_table = array();

 

     public function __construct(DocumentParser $modx, $debug = false)

     {	

         if(function_exists("get_magic_quotes_gpc") && get_magic_quotes_gpc()){

-        	throw new Exception('Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config.');

-		}

+            throw new Exception('Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config.');

+        }

 

-		$this->setDebug($debug);

+        $this->setDebug($debug);

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

     }

 

@@ -70,7 +70,7 @@ 
             $value = $this->modx->db->escape($value);

         }

         return $value;

-     }

+        }

     final public function invokeEvent($name, $data = array(), $flag = false)

     {

         $flag = (isset($flag) && $flag != '') ? (bool)$flag : false;

@@ -109,42 +109,42 @@ 
 

     final public function clearCache($fire_events = null, $custom = false)

     {

-		$IDs = array();

-		if($custom === false) {

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

-			include_once(MODX_MANAGER_PATH . 'processors/cache_sync.class.processor.php');

-			$sync = new synccache();

-			$path = $this->getCachePath(true);

-			$sync->setCachepath($path);

-			$sync->setReport(false);

-			$sync->emptyCache();

-		}else {

-			if(is_scalar($custom)){

-				$custom = array($custom);

-			}

-			switch ($this->modx->config['cache_type']) {

-				case 2:

-					$cacheFile = "_*.pageCache.php";

-					break;

-				default:

-					$cacheFile = ".pageCache.php";

-			}

-			if(is_array($custom)) {

-				foreach($custom as $id) {

-					$tmp = glob(MODX_BASE_PATH."assets/cache/docid_" . $id . $cacheFile);

-					foreach($tmp as $file){

-						if(is_readable($file)){

-							unlink($file);

-						}

-						$IDs[] = $id;

-					}

-				}

-			}

-			clearstatcache();

-		}

+        $IDs = array();

+        if($custom === false) {

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

+            include_once(MODX_MANAGER_PATH . 'processors/cache_sync.class.processor.php');

+            $sync = new synccache();

+            $path = $this->getCachePath(true);

+            $sync->setCachepath($path);

+            $sync->setReport(false);

+            $sync->emptyCache();

+        }else {

+            if(is_scalar($custom)){

+                $custom = array($custom);

+            }

+            switch ($this->modx->config['cache_type']) {

+                case 2:

+                    $cacheFile = "_*.pageCache.php";

+                    break;

+                default:

+                    $cacheFile = ".pageCache.php";

+            }

+            if(is_array($custom)) {

+                foreach($custom as $id) {

+                    $tmp = glob(MODX_BASE_PATH."assets/cache/docid_" . $id . $cacheFile);

+                    foreach($tmp as $file){

+                        if(is_readable($file)){

+                            unlink($file);

+                        }

+                        $IDs[] = $id;

+                    }

+                }

+            }

+            clearstatcache();

+        }

         $this->invokeEvent('OnSiteRefresh', array('IDs' => $IDs), $fire_events);

     }

-	public function switchObject($id){

+    public function switchObject($id){

         switch(true){

             //Если загружен другой объект - не тот, с которым мы хотим временно поработать

             case ($this->getID() != $id && $id):

@@ -161,13 +161,13 @@ 
         }

         return $obj;

     }

-	public function useIgnore($flag = true){

-		$this->ignoreError = $flag ? 'IGNORE' : '';

-		return $this;

-	}

-	public function hasIgnore(){

-		return (bool)$this->ignoreError;

-	}

+    public function useIgnore($flag = true){

+        $this->ignoreError = $flag ? 'IGNORE' : '';

+        return $this;

+    }

+    public function hasIgnore(){

+        return (bool)$this->ignoreError;

+    }

 

     public function set($key, $value)

     {

@@ -255,38 +255,38 @@ 
     final public function fromJson($data, $callback = null)

     {

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

-        	$json = json_decode($data);

-		} else throw new Exception("json is not string with json data");

-

-		if ($this->jsonError($json)) {

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

-            	call_user_func_array($callback, array($json));

-			} else {

-            	if (isset($callback)) throw new Exception("Can't call callback JSON unpack <pre>" . print_r($callback, 1) . "</pre>");

+            $json = json_decode($data);

+        } else throw new Exception("json is not string with json data");

+

+        if ($this->jsonError($json)) {

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

+                call_user_func_array($callback, array($json));

+            } else {

+                if (isset($callback)) throw new Exception("Can't call callback JSON unpack <pre>" . print_r($callback, 1) . "</pre>");

                 foreach ($json as $key => $val) {

-                	$this->set($key, $val);

-				}

-			}

-		} else throw new Exception('Error from JSON decode: <pre>' . print_r($data, 1) . '</pre>');

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

+                }

+            }

+        } else throw new Exception('Error from JSON decode: <pre>' . print_r($data, 1) . '</pre>');

 

-		return $this;

+        return $this;

     }

 

     final public function toJson($callback = null)

     {

         $data = $this->toArray();

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

-        	$data = call_user_func_array($callback, array($data));

-		} else {

-        	if (isset($callback)) throw new Exception("Can't call callback JSON pre pack <pre>" . print_r($callback, 1) . "</pre>");

-		}

+            $data = call_user_func_array($callback, array($data));

+        } else {

+            if (isset($callback)) throw new Exception("Can't call callback JSON pre pack <pre>" . print_r($callback, 1) . "</pre>");

+        }

         $json = json_encode($data);

 

-		if ($this->jsonError($data, $json)) {

-        	throw new Exception('Error from JSON decode: <pre>' . print_r($data, 1) . '</pre>');

-		}

+        if ($this->jsonError($data, $json)) {

+            throw new Exception('Error from JSON decode: <pre>' . print_r($data, 1) . '</pre>');

+        }

 

-		return $json;

+        return $json;

     }

 

     final protected function jsonError($data)

@@ -500,7 +500,7 @@ 
      * @return array

      */

     public function getNoDecodeFields(){

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

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

             return ($value === true);

         });

     }

Spacing +55 added lines, -55 removed lines

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

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

-include_once(MODX_BASE_PATH.'assets/snippets/DocLister/lib/jsonHelper.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/snippets/DocLister/lib/jsonHelper.class.php');

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

 

 abstract class MODxAPI extends MODxAPIhelpers

 {

@@ -25,7 +25,7 @@ 
 

     public function __construct(DocumentParser $modx, $debug = false)

     {	

-        if(function_exists("get_magic_quotes_gpc") && get_magic_quotes_gpc()){

+        if (function_exists("get_magic_quotes_gpc") && get_magic_quotes_gpc()) {

         	throw new Exception('Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config.');

 		}

 

@@ -33,40 +33,40 @@ 
         $this->_decodedFields = new DLCollection($this->modx);

     }

 

-    public function setDebug($flag){

+    public function setDebug($flag) {

         $this->_debug = (bool)$flag;

         return $this;

     }

-    public function getDebug(){

+    public function getDebug() {

         return $this->_debug;

     }

-    public function getDefaultFields(){

+    public function getDefaultFields() {

         return $this->default_field;

     }

     final public function modxConfig($name, $default = null)

     {

         return APIHelpers::getkey($this->modx->config, $name, $default);

     }

-    public function addQuery($q){

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

+    public function addQuery($q) {

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

             $this->_query[] = $q;

         }

         return $this;

     }

-    public function getQueryList(){

+    public function getQueryList() {

         return $this->_query;

     }

     final public function query($SQL)

     {

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

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

             $this->addQuery($SQL);

         }

         return empty($SQL) ? null : $this->modx->db->query($SQL);

     }

-    final public function escape($value){

-        if(!is_scalar($value)){

+    final public function escape($value) {

+        if (!is_scalar($value)) {

             $value = '';

-        }else{

+        } else {

             $value = $this->modx->db->escape($value);

         }

         return $value;

@@ -110,7 +110,7 @@ 
     final public function clearCache($fire_events = null, $custom = false)

     {

 		$IDs = array();

-		if($custom === false) {

+		if ($custom === false) {

 			$this->modx->clearCache();

 			include_once(MODX_MANAGER_PATH . 'processors/cache_sync.class.processor.php');

 			$sync = new synccache();

@@ -118,8 +118,8 @@ 
 			$sync->setCachepath($path);

 			$sync->setReport(false);

 			$sync->emptyCache();

-		}else {

-			if(is_scalar($custom)){

+		} else {

+			if (is_scalar($custom)) {

 				$custom = array($custom);

 			}

 			switch ($this->modx->config['cache_type']) {

@@ -129,11 +129,11 @@ 
 				default:

 					$cacheFile = ".pageCache.php";

 			}

-			if(is_array($custom)) {

-				foreach($custom as $id) {

-					$tmp = glob(MODX_BASE_PATH."assets/cache/docid_" . $id . $cacheFile);

-					foreach($tmp as $file){

-						if(is_readable($file)){

+			if (is_array($custom)) {

+				foreach ($custom as $id) {

+					$tmp = glob(MODX_BASE_PATH . "assets/cache/docid_" . $id . $cacheFile);

+					foreach ($tmp as $file) {

+						if (is_readable($file)) {

 							unlink($file);

 						}

 						$IDs[] = $id;

@@ -144,8 +144,8 @@ 
 		}

         $this->invokeEvent('OnSiteRefresh', array('IDs' => $IDs), $fire_events);

     }

-	public function switchObject($id){

-        switch(true){

+	public function switchObject($id) {

+        switch (true) {

             //Если загружен другой объект - не тот, с которым мы хотим временно поработать

             case ($this->getID() != $id && $id):

                 $obj = clone $this;

@@ -161,11 +161,11 @@ 
         }

         return $obj;

     }

-	public function useIgnore($flag = true){

+	public function useIgnore($flag = true) {

 		$this->ignoreError = $flag ? 'IGNORE' : '';

 		return $this;

 	}

-	public function hasIgnore(){

+	public function hasIgnore() {

 		return (bool)$this->ignoreError;

 	}

 

@@ -321,7 +321,7 @@ 
         }

         return $out;

     }

-    final public function fieldPKName(){

+    final public function fieldPKName() {

         return $this->pkName;

     }

     final public function makeTable($table)

@@ -337,7 +337,7 @@ 
         }

         $out = array();

         foreach ($data as $item) {

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

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

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

             }

         }

@@ -433,7 +433,7 @@ 
      * @param  string $field имя поля

      * @return boolean

      */

-    public function isJsonField($field){

+    public function isJsonField($field) {

         return (is_scalar($field) && in_array($field, $this->jsonFields));

     }

 

@@ -442,8 +442,8 @@ 
      * @param  string $field имя поля

      * @return $this

      */

-    public function markAsDecode($field){

-        if(is_scalar($field)){

+    public function markAsDecode($field) {

+        if (is_scalar($field)) {

             $this->_decodedFields->set($field, false);

         }

         return $this;

@@ -454,8 +454,8 @@ 
      * @param  string $field имя поля

      * @return $this

      */

-    public function markAsEncode($field){

-        if(is_scalar($field)){

+    public function markAsEncode($field) {

+        if (is_scalar($field)) {

             $this->_decodedFields->set($field, true);

         }

         return $this;

@@ -465,9 +465,9 @@ 
      * Пометить все поля как запакованные

      * @return $this

      */

-    public function markAllEncode(){

+    public function markAllEncode() {

         $this->_decodedFields->clear();

-        foreach($this->jsonFields as $field){

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

             $this->markAsEncode($field);

         }

         return $this;

@@ -477,9 +477,9 @@ 
      * Пометить все поля как распакованные

      * @return $this

      */

-    public function markAllDecode(){

+    public function markAllDecode() {

         $this->_decodedFields->clear();

-        foreach($this->jsonFields as $field){

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

             $this->markAsDecode($field);

         }

         return $this;

@@ -489,8 +489,8 @@ 
      * Получить список не запакованных полей

      * @return array

      */

-    public function getNoEncodeFields(){

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

+    public function getNoEncodeFields() {

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

             return ($value === false);

         });

     }

@@ -499,8 +499,8 @@ 
      * Получить список не распакованных полей

      * @return array

      */

-    public function getNoDecodeFields(){

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

+    public function getNoDecodeFields() {

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

             return ($value === true);

         });

     }

@@ -510,12 +510,12 @@ 
      * @param  string $field имя поля

      * @return boolean

      */

-    public function isDecodableField($field){

+    public function isDecodableField($field) {

         $data = $this->get($field);

         /**

          * Если поле скалярного типа и оно не распаковывалось раньше

          */

-        return (is_scalar($data) && is_scalar($field) && $this->_decodedFields->get($field)===true);

+        return (is_scalar($data) && is_scalar($field) && $this->_decodedFields->get($field) === true);

     }

 

     /**

@@ -523,11 +523,11 @@ 
      * @param  string  $field имя поля

      * @return boolean

      */

-    public function isEncodableField($field){

+    public function isEncodableField($field) {

         /**

          * Если поле было распаковано ранее и еще не упаковано

          */

-        return (is_scalar($field) && $this->_decodedFields->get($field)===false);

+        return (is_scalar($field) && $this->_decodedFields->get($field) === false);

     }

 

     /**

@@ -536,13 +536,13 @@ 
      * @param  bool $store обновить распакованное поле

      * @return array ассоциативный массив с данными из json строки

      */

-    public function decodeField($field, $store = false){

+    public function decodeField($field, $store = false) {

         $out = array();

-        if($this->isDecodableField($field)){

+        if ($this->isDecodableField($field)) {

             $data = $this->get($field);

             $out = jsonHelper::jsonDecode($data, array('assoc' => true), true);

         }

-        if($store){

+        if ($store) {

             $this->field[$field] = $out;

             $this->markAsDecode($field);

         }

@@ -553,8 +553,8 @@ 
      * Декодирование всех json полей

      * @return $this

      */

-    protected function decodeFields(){

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

+    protected function decodeFields() {

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

             $this->decodeField($field, true);

         }

         return $this;

@@ -566,13 +566,13 @@ 
      * @param  bool $store обновить запакованное поле

      * @return array json строка

      */

-    public function encodeField($field, $store = false){

+    public function encodeField($field, $store = false) {

         $out = null;

-        if($this->isEncodableField($field)){

+        if ($this->isEncodableField($field)) {

             $data = $this->get($field);

             $out = json_encode($data);

         }

-        if($store){

+        if ($store) {

             $this->field[$field] = $out;

             $this->markAsEncode($field);

         }

@@ -583,8 +583,8 @@ 
      * Запаковка всех json полей

      * @return $this

      */

-    protected function encodeFields(){

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

+    protected function encodeFields() {

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

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

         }

         return $this;

Braces +20 added lines, -8 removed lines

@@ -66,7 +66,7 @@ 
     final public function escape($value){

         if(!is_scalar($value)){

             $value = '';

-        }else{

+        } else{

             $value = $this->modx->db->escape($value);

         }

         return $value;

@@ -94,7 +94,9 @@ 
     final public function list_log($flush = false)

     {

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

-        if ($flush) $this->clearLog();

+        if ($flush) {

+            $this->clearLog();

+        }

         return $this;

     }

 

@@ -118,7 +120,7 @@ 
 			$sync->setCachepath($path);

 			$sync->setReport(false);

 			$sync->emptyCache();

-		}else {

+		} else {

 			if(is_scalar($custom)){

 				$custom = array($custom);

 			}

@@ -207,7 +209,9 @@ 
             try {

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

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

-                } else throw new Exception("{$key} is invalid <pre>" . print_r($this->field[$key], true) . "</pre>");

+                } else {

+                    throw new Exception("{$key} is invalid <pre>" . print_r($this->field[$key], true) . "</pre>");

+                }

             } catch (Exception $e) {

                 die($e->getMessage());

             }

@@ -256,18 +260,24 @@ 
     {

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

         	$json = json_decode($data);

-		} else throw new Exception("json is not string with json data");

+		} else {

+		    throw new Exception("json is not string with json data");

+		}

 

 		if ($this->jsonError($json)) {

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

             	call_user_func_array($callback, array($json));

 			} else {

-            	if (isset($callback)) throw new Exception("Can't call callback JSON unpack <pre>" . print_r($callback, 1) . "</pre>");

+            	if (isset($callback)) {

+            	    throw new Exception("Can't call callback JSON unpack <pre>" . print_r($callback, 1) . "</pre>");

+            	}

                 foreach ($json as $key => $val) {

                 	$this->set($key, $val);

 				}

 			}

-		} else throw new Exception('Error from JSON decode: <pre>' . print_r($data, 1) . '</pre>');

+		} else {

+		    throw new Exception('Error from JSON decode: <pre>' . print_r($data, 1) . '</pre>');

+		}

 

 		return $this;

     }

@@ -278,7 +288,9 @@ 
         if (isset($callback) && is_callable($callback)) {

         	$data = call_user_func_array($callback, array($data));

 		} else {

-        	if (isset($callback)) throw new Exception("Can't call callback JSON pre pack <pre>" . print_r($callback, 1) . "</pre>");

+        	if (isset($callback)) {

+        	    throw new Exception("Can't call callback JSON pre pack <pre>" . print_r($callback, 1) . "</pre>");

+        	}

 		}

         $json = json_encode($data);