AgelxNash / DocLister

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

Spacing +39 added lines, -39 removed lines

@@ -10,7 +10,7 @@ 
 #	Date: March 22, 2013

 #

 ####*/

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

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

 

 /**

  * Class DLphx

@@ -51,7 +51,7 @@ 
         $this->user["usrid"] = isset($_SESSION['webInternalKey']) ? intval($_SESSION['webInternalKey']) : 0;

         $this->user["id"] = ($this->user["usrid"] > 0) ? (-$this->user["usrid"]) : $this->user["mgrid"];

 

-        $this->debug = (bool)$debug;

+        $this->debug = (bool) $debug;

 

         $this->maxPasses = ($maxpass != '') ? $maxpass : 50;

 

@@ -95,7 +95,7 @@ 
         preg_match_all('~(?:=`[^`@]*?)(\[\+([^:\+\[\]]+)([^\[\]]*?)\+\])~s', $template, $matches);

         if ($matches[0]) {

             $template = str_replace($matches[1], '', $template);

-            $this->Log("Cleaning unsolved tags: \n" . implode("\n", $matches[2]));

+            $this->Log("Cleaning unsolved tags: \n".implode("\n", $matches[2]));

         }

         // Restore non-call characters in the template: [, ]

         $template = str_replace($this->safetags[1], $this->safetags[2], $template);

@@ -107,7 +107,7 @@ 
         }

         // Write an event log if debugging is enabled and there is something to log

         if ($this->debug && $this->debugLog) {

-            $modx->logEvent($this->curPass, 1, $this->createEventLog(), $this->name . ' ' . $this->version);

+            $modx->logEvent($this->curPass, 1, $this->createEventLog(), $this->name.' '.$this->version);

             $this->debugLog = false;

         }

 

@@ -138,8 +138,8 @@ 
             for ($i = 0; $i < $count; $i++) {

                 $var_search[] = $matches[0][$i];

                 $input = $matches[1][$i];

-                $this->Log('MODX Chunk: ' . $input);

-                $input = $modx->mergeChunkContent('{{' . $input . '}}');

+                $this->Log('MODX Chunk: '.$input);

+                $input = $modx->mergeChunkContent('{{'.$input.'}}');

                 $var_replace[] = $this->Filter($input, $matches[2][$i]);

             }

             $template = str_replace($var_search, $var_replace, $template);

@@ -155,10 +155,10 @@ 
             // for each detected snippet

             for ($i = 0; $i < $count; $i++) {

                 $snippet = $matches[2][$i]; // snippet call

-                $this->Log("MODx Snippet -> " . $snippet);

+                $this->Log("MODx Snippet -> ".$snippet);

 

                 // Let MODx evaluate snippet

-                $replace = $modx->evalSnippets("[[" . $snippet . "]]");

+                $replace = $modx->evalSnippets("[[".$snippet."]]");

                 $this->LogSnippet($replace);

 

                 // Replace values

@@ -187,19 +187,19 @@ 
                 switch ($matches[1][$i]) {

                     // Document / Template Variable eXtended

                     case "*":

-                        $this->Log("MODx TV/DV: " . $input);

-                        $input = $modx->mergeDocumentContent("[*" . $input . "*]");

+                        $this->Log("MODx TV/DV: ".$input);

+                        $input = $modx->mergeDocumentContent("[*".$input."*]");

                         $replace = $this->Filter($input, $modifiers);

                         break;

                     // MODx Setting eXtended

                     case "(":

-                        $this->Log("MODx Setting variable: " . $input);

-                        $input = $modx->mergeSettingsContent("[(" . $input . ")]");

+                        $this->Log("MODx Setting variable: ".$input);

+                        $input = $modx->mergeSettingsContent("[(".$input.")]");

                         $replace = $this->Filter($input, $modifiers);

                         break;

                     // MODx Placeholder eXtended

                     default:

-                        $this->Log("MODx / PHx placeholder variable: " . $input);

+                        $this->Log("MODx / PHx placeholder variable: ".$input);

                         // Check if placeholder is set

                         if (!array_key_exists($input, $this->placeholders) && !array_key_exists($input,

                                 $modx->placeholders)

@@ -241,7 +241,7 @@ 
     {

         global $modx;

         $output = $input;

-        $this->Log("  |--- Input = '" . $output . "'");

+        $this->Log("  |--- Input = '".$output."'");

         if (preg_match_all('~:([^:=]+)(?:=`(.*?)`(?=:[^:=]+|$))?~s', $modifiers, $matches)) {

             $modifier_cmd = $matches[1]; // modifier command

             $modifier_value = $matches[2]; // modifier value

@@ -249,9 +249,9 @@ 
             $condition = array();

             for ($i = 0; $i < $count; $i++) {

                 $output = trim($output);

-                $this->Log("  |--- Modifier = '" . $modifier_cmd[$i] . "'");

+                $this->Log("  |--- Modifier = '".$modifier_cmd[$i]."'");

                 if ($modifier_value[$i] != '') {

-                    $this->Log("  |--- Options = '" . $modifier_value[$i] . "'");

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

                 }

                 switch ($modifier_cmd[$i]) {

                     #####  Conditional Modifiers

@@ -392,7 +392,7 @@ 
                         break;

                     case "wordwrap": // default: 70

                         $wrapat = intval($modifier_value[$i]) ? intval($modifier_value[$i]) : 70;

-                        $output = preg_replace_callback("@(\b\w+\b)@",function($m) use($wrapat) {return wordwrap($m[1],$wrapat,' ',1);},$output);

+                        $output = preg_replace_callback("@(\b\w+\b)@", function($m) use($wrapat) {return wordwrap($m[1], $wrapat, ' ', 1); },$output);

                         break;

                     case "limit": // default: 100

                         $limit = intval($modifier_value[$i]) ? intval($modifier_value[$i]) : 100;

@@ -412,7 +412,7 @@ 
                     case "math":

                         $filter = preg_replace("~([a-zA-Z\n\r\t\s])~", "", $modifier_value[$i]);

                         $filter = str_replace("?", $output, $filter);

-                        $output = eval("return " . $filter . ";");

+                        $output = eval("return ".$filter.";");

                         break;

                     case "isnotempty":

                         if (!empty($output)) {

@@ -439,7 +439,7 @@ 
                         break;

                     case "value":

                         if ($i > 0 && $modifier_cmd[$i - 1] == "set") {

-                            $modx->SetPlaceholder("phx." . $output, $modifier_value[$i]);

+                            $modx->SetPlaceholder("phx.".$output, $modifier_value[$i]);

                         }

                         $output = null;

                         break;

@@ -464,12 +464,12 @@ 
                     default:

                         $snippet = '';

                         // modified by Anton Kuzmin (23.06.2010) //

-                        $snippetName = 'phx:' . $modifier_cmd[$i];

+                        $snippetName = 'phx:'.$modifier_cmd[$i];

                         if (isset($modx->snippetCache[$snippetName])) {

                             $snippet = $modx->snippetCache[$snippetName];

                         } else {

 // not in cache so let's check the db

-                            $sql = "SELECT snippet FROM " . $modx->getFullTableName("site_snippets") . " WHERE " . $modx->getFullTableName("site_snippets") . ".name='" . $modx->db->escape($snippetName) . "';";

+                            $sql = "SELECT snippet FROM ".$modx->getFullTableName("site_snippets")." WHERE ".$modx->getFullTableName("site_snippets").".name='".$modx->db->escape($snippetName)."';";

                             $result = $modx->dbQuery($sql);

                             if ($modx->recordCount($result) == 1) {

                                 $row = $modx->fetchRow($result);

@@ -478,14 +478,14 @@ 
                             } else {

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

 // If snippet not found, look in the modifiers folder

-                                    $filename = $modx->config['rb_base_dir'] . 'plugins/phx/modifiers/' . $modifier_cmd[$i] . '.phx.php';

+                                    $filename = $modx->config['rb_base_dir'].'plugins/phx/modifiers/'.$modifier_cmd[$i].'.phx.php';

                                     if (@file_exists($filename)) {

                                         $file_contents = @file_get_contents($filename);

-                                        $file_contents = str_replace('<' . '?php', '', $file_contents);

-                                        $file_contents = str_replace('?' . '>', '', $file_contents);

+                                        $file_contents = str_replace('<'.'?php', '', $file_contents);

+                                        $file_contents = str_replace('?'.'>', '', $file_contents);

                                         $file_contents = str_replace('<?', '', $file_contents);

                                         $snippet = $modx->snippetCache[$snippetName] = $file_contents;

-                                        $modx->snippetCache[$snippetName . 'Props'] = '';

+                                        $modx->snippetCache[$snippetName.'Props'] = '';

                                         $this->Log("  |--- File ($filename) -> Custom Modifier");

                                     } else {

                                         $this->Log("  |--- PHX Error:  {$modifier_cmd[$i]} could not be found");

@@ -501,7 +501,7 @@ 
                             $options = $modifier_value[$i];

                             $custom = eval($cm);

                             $msg = ob_get_contents();

-                            $output = $msg . $custom;

+                            $output = $msg.$custom;

                             ob_end_clean();

                         } else {

                             $output = '';

@@ -509,9 +509,9 @@ 
                         break;

                 }

                 if (count($condition)) {

-                    $this->Log("  |--- Condition = '" . $condition[count($condition) - 1] . "'");

+                    $this->Log("  |--- Condition = '".$condition[count($condition) - 1]."'");

                 }

-                $this->Log("  |--- Output = '" . $output . "'");

+                $this->Log("  |--- Output = '".$output."'");

             }

         }

 

@@ -520,7 +520,7 @@ 
 

     private function runCode($code)

     {

-        return eval("return (" . $code . ");");

+        return eval("return (".$code.");");

     }

     // Event logging (debug)

     /**

@@ -532,7 +532,7 @@ 
             $console = implode("\n", $this->console);

             $this->console = array();

 

-            return '<pre style="overflow: auto;">' . $console . '</pre>';

+            return '<pre style="overflow: auto;">'.$console.'</pre>';

         }

     }

 

@@ -557,8 +557,8 @@ 
     {

         if ($this->debug) {

             $this->debugLog = true;

-            $this->console[] = (count($this->console) + 1 - $this->curPass) . " [" . strftime("%H:%M:%S",

-                    time()) . "] " . $this->LogClean($string);

+            $this->console[] = (count($this->console) + 1 - $this->curPass)." [".strftime("%H:%M:%S",

+                    time())."] ".$this->LogClean($string);

         }

     }

 

@@ -570,15 +570,15 @@ 
     {

         if ($this->debug) {

             $this->debugLog = true;

-            $this->console[] = (count($this->console) + 1 - $this->curPass) . " [" . strftime("%H:%M:%S",

-                    time()) . "] " . "  |--- Returns: <div style='margin: 10px;'>" . $this->LogClean($string) . "</div>";

+            $this->console[] = (count($this->console) + 1 - $this->curPass)." [".strftime("%H:%M:%S",

+                    time())."] "."  |--- Returns: <div style='margin: 10px;'>".$this->LogClean($string)."</div>";

         }

     }

 

     // Log pass

     public function LogPass()

     {

-        $this->console[] = "<div style='margin: 2px;margin-top: 5px;border-bottom: 1px solid black;'>Pass " . $this->curPass . "</div>";

+        $this->console[] = "<div style='margin: 2px;margin-top: 5px;border-bottom: 1px solid black;'>Pass ".$this->curPass."</div>";

     }

 

     // Log pass

@@ -587,7 +587,7 @@ 
      */

     public function LogSource($string)

     {

-        $this->console[] = "<div style='margin: 2px;margin-top: 5px;border-bottom: 1px solid black;'>Source:</div>" . $this->LogClean($string);

+        $this->console[] = "<div style='margin: 2px;margin-top: 5px;border-bottom: 1px solid black;'>Source:</div>".$this->LogClean($string);

     }

 

 

@@ -639,7 +639,7 @@ 
         if (!array_key_exists($userid, $this->cache["mo"])) {

             $tbl = $modx->getFullTableName("webgroup_names");

             $tbl2 = $modx->getFullTableName("web_groups");

-            $sql = "SELECT wgn.name FROM $tbl wgn INNER JOIN $tbl2 wg ON wg.webgroup=wgn.id AND wg.webuser='" . $userid . "'";

+            $sql = "SELECT wgn.name FROM $tbl wgn INNER JOIN $tbl2 wg ON wg.webgroup=wgn.id AND wg.webuser='".$userid."'";

             $this->cache["mo"][$userid] = $grpNames = $modx->db->getColumn("name", $sql);

         } else {

             $grpNames = $this->cache["mo"][$userid];

@@ -747,7 +747,7 @@ 
     public function ucfirst($str)

     {

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

-            return mb_strtoupper(mb_substr($str, 0, 1)) . mb_substr($str, 1, mb_strlen($str));

+            return mb_strtoupper(mb_substr($str, 0, 1)).mb_substr($str, 1, mb_strlen($str));

         }

 

         return ucfirst($str);

@@ -760,7 +760,7 @@ 
     public function lcfirst($str)

     {

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

-            return mb_strtolower(mb_substr($str, 0, 1)) . mb_substr($str, 1, mb_strlen($str));

+            return mb_strtolower(mb_substr($str, 0, 1)).mb_substr($str, 1, mb_strlen($str));

         }

 

         return lcfirst($str);

Braces +119 added lines, -119 removed lines

@@ -15,8 +15,8 @@ 
 /**

  * Class DLphx

  */

-class DLphx

-{

+class DLphx
+{
     public $placeholders = array();

     public $name = 'PHx';

     public $version = '2.2.0';

@@ -43,8 +43,8 @@ 
      * @param int|bool|string $debug

      * @param int $maxpass

      */

-    public function __construct($debug = false, $maxpass = 50)

-    {

+    public function __construct($debug = false, $maxpass = 50)
+    {
         global $modx;

 

         $this->user["mgrid"] = isset($_SESSION['mgrInternalKey']) ? intval($_SESSION['mgrInternalKey']) : 0;

@@ -56,14 +56,14 @@ 
         $this->maxPasses = ($maxpass != '') ? $maxpass : 50;

 

         $modx->setPlaceholder("phx", "&_PHX_INTERNAL_&");

-        if (function_exists('mb_internal_encoding')) {

+        if (function_exists('mb_internal_encoding')) {
             mb_internal_encoding($modx->config['modx_charset']);

         }

     }

 

     // Plugin event hook for MODx

-    public function OnParseDocument()

-    {

+    public function OnParseDocument()
+    {
         global $modx;

         // Get document output from MODx

         $template = $modx->documentOutput;

@@ -78,11 +78,11 @@ 
      * @param string $template

      * @return mixed|string

      */

-    public function Parse($template = '')

-    {

+    public function Parse($template = '')
+    {
         global $modx;

         // If we already reached max passes don't get at it again.

-        if ($this->curPass == $this->maxPasses) {

+        if ($this->curPass == $this->maxPasses) {
             return $template;

         }

         // Set template pre-process hash

@@ -93,7 +93,7 @@ 
         $template = $this->ParseValues($template);

         // clean up unused placeholders that have modifiers attached (MODx can't clean them)

         preg_match_all('~(?:=`[^`@]*?)(\[\+([^:\+\[\]]+)([^\[\]]*?)\+\])~s', $template, $matches);

-        if ($matches[0]) {

+        if ($matches[0]) {
             $template = str_replace($matches[1], '', $template);

             $this->Log("Cleaning unsolved tags: \n" . implode("\n", $matches[2]));

         }

@@ -102,11 +102,11 @@ 
         // Set template post-process hash

         $et = md5($template);

         // If template has changed, parse it once more...

-        if ($st != $et) {

+        if ($st != $et) {
             $template = $this->Parse($template);

         }

         // Write an event log if debugging is enabled and there is something to log

-        if ($this->debug && $this->debugLog) {

+        if ($this->debug && $this->debugLog) {
             $modx->logEvent($this->curPass, 1, $this->createEventLog(), $this->name . ' ' . $this->version);

             $this->debugLog = false;

         }

@@ -120,8 +120,8 @@ 
      * @param string $template

      * @return mixed|string

      */

-    public function ParseValues($template = '')

-    {

+    public function ParseValues($template = '')
+    {
         global $modx;

 

         $this->curPass = $this->curPass + 1;

@@ -130,12 +130,12 @@ 
         $this->LogPass();

 

         // MODX Chunks

-        if (preg_match_all('~(?<!(?:then|else)=`){{([^:\+{}]+)([^{}]*?)}}~s', $template, $matches)) {

+        if (preg_match_all('~(?<!(?:then|else)=`){{([^:\+{}]+)([^{}]*?)}}~s', $template, $matches)) {
             $this->Log('MODX Chunks -> Merging all chunk tags');

             $count = count($matches[0]);

             $var_search = array();

             $var_replace = array();

-            for ($i = 0; $i < $count; $i++) {

+            for ($i = 0; $i < $count; $i++) {
                 $var_search[] = $matches[0][$i];

                 $input = $matches[1][$i];

                 $this->Log('MODX Chunk: ' . $input);

@@ -147,13 +147,13 @@ 
 

         // MODx Snippets

         //if ( preg_match_all('~\[(\[|!)([^\[]*?)(!|\])\]~s',$template, $matches)) {

-        if (preg_match_all('~(?<!(?:then|else)=`)\[(\[)([^\[]*?)(\])\]~s', $template, $matches)) {

+        if (preg_match_all('~(?<!(?:then|else)=`)\[(\[)([^\[]*?)(\])\]~s', $template, $matches)) {
             $count = count($matches[0]);

             $var_search = array();

             $var_replace = array();

 

             // for each detected snippet

-            for ($i = 0; $i < $count; $i++) {

+            for ($i = 0; $i < $count; $i++) {
                 $snippet = $matches[2][$i]; // snippet call

                 $this->Log("MODx Snippet -> " . $snippet);

 

@@ -169,7 +169,7 @@ 
         }

 

         // PHx / MODx Tags

-        if (preg_match_all('~\[(\+|\*|\()([^:\+\[\]]+)([^\[\]]*?)(\1|\))\]~s', $template, $matches)) {

+        if (preg_match_all('~\[(\+|\*|\()([^:\+\[\]]+)([^\[\]]*?)(\1|\))\]~s', $template, $matches)) {
 

             //$matches[0] // Complete string that's need to be replaced

             //$matches[1] // Type

@@ -180,11 +180,11 @@ 
             $count = count($matches[0]);

             $var_search = array();

             $var_replace = array();

-            for ($i = 0; $i < $count; $i++) {

+            for ($i = 0; $i < $count; $i++) {
                 $input = $matches[2][$i];

                 $modifiers = $matches[3][$i];

                 $var_search[] = $matches[0][$i];

-                switch ($matches[1][$i]) {

+                switch ($matches[1][$i]) {
                     // Document / Template Variable eXtended

                     case "*":

                         $this->Log("MODx TV/DV: " . $input);

@@ -203,10 +203,10 @@ 
                         // Check if placeholder is set

                         if (!array_key_exists($input, $this->placeholders) && !array_key_exists($input,

                                 $modx->placeholders)

-                        ) {

+                        ) {
                             // not set so try again later.

                             $input = '';

-                        } else {

+                        } else {
                             // is set, get value and run filter

                             $input = $this->getPHxVariable($input);

                         }

@@ -220,11 +220,11 @@ 
         $et = md5($template); // Post-process template hash

 

         // Log an event if this was the maximum pass

-        if ($this->curPass == $this->maxPasses) {

+        if ($this->curPass == $this->maxPasses) {
             $this->Log("Max passes reached. infinite loop protection so exiting.\n If you need the extra passes set the max passes to the highest count of nested tags in your template.");

         }

         // If this pass is not at maximum passes and the template hash is not the same, get at it again.

-        if (($this->curPass < $this->maxPasses) && ($st != $et)) {

+        if (($this->curPass < $this->maxPasses) && ($st != $et)) {
             $template = $this->ParseValues($template);

         }

 

@@ -237,23 +237,23 @@ 
      * @param $modifiers

      * @return mixed|null|string

      */

-    public function Filter($input, $modifiers)

-    {

+    public function Filter($input, $modifiers)
+    {
         global $modx;

         $output = $input;

         $this->Log("  |--- Input = '" . $output . "'");

-        if (preg_match_all('~:([^:=]+)(?:=`(.*?)`(?=:[^:=]+|$))?~s', $modifiers, $matches)) {

+        if (preg_match_all('~:([^:=]+)(?:=`(.*?)`(?=:[^:=]+|$))?~s', $modifiers, $matches)) {
             $modifier_cmd = $matches[1]; // modifier command

             $modifier_value = $matches[2]; // modifier value

             $count = count($modifier_cmd);

             $condition = array();

-            for ($i = 0; $i < $count; $i++) {

+            for ($i = 0; $i < $count; $i++) {
                 $output = trim($output);

                 $this->Log("  |--- Modifier = '" . $modifier_cmd[$i] . "'");

-                if ($modifier_value[$i] != '') {

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

                 }

-                switch ($modifier_cmd[$i]) {

+                switch ($modifier_cmd[$i]) {
                     #####  Conditional Modifiers

                     case "input":

                     case "if":

@@ -295,7 +295,7 @@ 
                     case "ir":

                     case "memberof":

                     case "mo": // Is Member Of  (same as inrole but this one can be stringed as a conditional)

-                        if ($output == "&_PHX_INTERNAL_&") {

+                        if ($output == "&_PHX_INTERNAL_&") {
                             $output = $this->user["id"];

                         }

                         $grps = ($this->strlen($modifier_value[$i]) > 0) ? explode(",", $modifier_value[$i]) : array();

@@ -310,23 +310,23 @@ 
                     case "show":

                         $conditional = implode(' ', $condition);

                         $isvalid = intval($this->runCode($conditional));

-                        if (!$isvalid) {

+                        if (!$isvalid) {
                             $output = null;

                         }

                         break;

                     case "then":

                         $conditional = implode(' ', $condition);

                         $isvalid = intval($this->runCode($conditional));

-                        if ($isvalid) {

+                        if ($isvalid) {
                             $output = $modifier_value[$i];

-                        } else {

+                        } else {
                             $output = null;

                         }

                         break;

                     case "else":

                         $conditional = implode(' ', $condition);

                         $isvalid = intval($this->runCode($condition));

-                        if (!$isvalid) {

+                        if (!$isvalid) {
                             $output = $modifier_value[$i];

                         }

                         break;

@@ -334,7 +334,7 @@ 
                         $raw = explode("&", $modifier_value[$i]);

                         $map = array();

                         $count = count($raw);

-                        for ($m = 0; $m < $count; $m++) {

+                        for ($m = 0; $m < $count; $m++) {
                             $mi = explode("=", $raw[$m]);

                             $map[$mi[0]] = $mi[1];

                         }

@@ -415,13 +415,13 @@ 
                         $output = eval("return " . $filter . ";");

                         break;

                     case "isnotempty":

-                        if (!empty($output)) {

+                        if (!empty($output)) {
                             $output = $modifier_value[$i];

                         }

                         break;

                     case "isempty":

                     case "ifempty":

-                        if (empty($output)) {

+                        if (empty($output)) {
                             $output = $modifier_value[$i];

                         }

                         break;

@@ -433,12 +433,12 @@ 
                         break;

                     case "set":

                         $c = $i + 1;

-                        if ($count > $c && $modifier_cmd[$c] == "value") {

+                        if ($count > $c && $modifier_cmd[$c] == "value") {
                             $output = preg_replace("~([^a-zA-Z0-9])~", "", $modifier_value[$i]);

                         }

                         break;

                     case "value":

-                        if ($i > 0 && $modifier_cmd[$i - 1] == "set") {

+                        if ($i > 0 && $modifier_cmd[$i - 1] == "set") {
                             $modx->SetPlaceholder("phx." . $output, $modifier_value[$i]);

                         }

                         $output = null;

@@ -447,13 +447,13 @@ 
                         $output = md5($output);

                         break;

                     case "userinfo":

-                        if ($output == "&_PHX_INTERNAL_&") {

+                        if ($output == "&_PHX_INTERNAL_&") {
                             $output = $this->user["id"];

                         }

                         $output = $this->ModUser($output, $modifier_value[$i]);

                         break;

                     case "inrole": // deprecated

-                        if ($output == "&_PHX_INTERNAL_&") {

+                        if ($output == "&_PHX_INTERNAL_&") {
                             $output = $this->user["id"];

                         }

                         $grps = ($this->strlen($modifier_value[$i]) > 0) ? explode(",", $modifier_value[$i]) : array();

@@ -465,21 +465,21 @@ 
                         $snippet = '';

                         // modified by Anton Kuzmin (23.06.2010) //

                         $snippetName = 'phx:' . $modifier_cmd[$i];

-                        if (isset($modx->snippetCache[$snippetName])) {

+                        if (isset($modx->snippetCache[$snippetName])) {
                             $snippet = $modx->snippetCache[$snippetName];

-                        } else {

+                        } else {
 // not in cache so let's check the db

                             $sql = "SELECT snippet FROM " . $modx->getFullTableName("site_snippets") . " WHERE " . $modx->getFullTableName("site_snippets") . ".name='" . $modx->db->escape($snippetName) . "';";

                             $result = $modx->dbQuery($sql);

-                            if ($modx->recordCount($result) == 1) {

+                            if ($modx->recordCount($result) == 1) {
                                 $row = $modx->fetchRow($result);

                                 $snippet = $modx->snippetCache[$row['name']] = $row['snippet'];

                                 $this->Log("  |--- DB -> Custom Modifier");

-                            } else {

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

+                            } else {
+                                if ($modx->recordCount($result) == 0) {
 // If snippet not found, look in the modifiers folder

                                     $filename = $modx->config['rb_base_dir'] . 'plugins/phx/modifiers/' . $modifier_cmd[$i] . '.phx.php';

-                                    if (@file_exists($filename)) {

+                                    if (@file_exists($filename)) {
                                         $file_contents = @file_get_contents($filename);

                                         $file_contents = str_replace('<' . '?php', '', $file_contents);

                                         $file_contents = str_replace('?' . '>', '', $file_contents);

@@ -487,7 +487,7 @@ 
                                         $snippet = $modx->snippetCache[$snippetName] = $file_contents;

                                         $modx->snippetCache[$snippetName . 'Props'] = '';

                                         $this->Log("  |--- File ($filename) -> Custom Modifier");

-                                    } else {

+                                    } else {
                                         $this->Log("  |--- PHX Error:  {$modifier_cmd[$i]} could not be found");

                                     }

                                 }

@@ -496,19 +496,19 @@ 
                         $cm = $snippet;

                         // end //

 

-                        if (!empty($cm)) {

+                        if (!empty($cm)) {
                             ob_start();

                             $options = $modifier_value[$i];

                             $custom = eval($cm);

                             $msg = ob_get_contents();

                             $output = $msg . $custom;

                             ob_end_clean();

-                        } else {

+                        } else {
                             $output = '';

                         }

                         break;

                 }

-                if (count($condition)) {

+                if (count($condition)) {
                     $this->Log("  |--- Condition = '" . $condition[count($condition) - 1] . "'");

                 }

                 $this->Log("  |--- Output = '" . $output . "'");

@@ -518,17 +518,17 @@ 
         return $output;

     }

 

-    private function runCode($code)

-    {

+    private function runCode($code)
+    {
         return eval("return (" . $code . ");");

     }

     // Event logging (debug)

     /**

      * @return string

      */

-    public function createEventLog()

-    {

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

+    public function createEventLog()
+    {
+        if (!empty($this->console)) {
             $console = implode("\n", $this->console);

             $this->console = array();

 

@@ -541,8 +541,8 @@ 
      * @param $string

      * @return array|mixed|string

      */

-    public function LogClean($string)

-    {

+    public function LogClean($string)
+    {
         $string = preg_replace("/&amp;(#[0-9]+|[a-z]+);/i", "&$1;", $string);

         $string = APIHelpers::sanitarTag($string);

 

@@ -553,9 +553,9 @@ 
     /**

      * @param $string

      */

-    public function Log($string)

-    {

-        if ($this->debug) {

+    public function Log($string)
+    {
+        if ($this->debug) {
             $this->debugLog = true;

             $this->console[] = (count($this->console) + 1 - $this->curPass) . " [" . strftime("%H:%M:%S",

                     time()) . "] " . $this->LogClean($string);

@@ -566,9 +566,9 @@ 
     /**

      * @param $string

      */

-    public function LogSnippet($string)

-    {

-        if ($this->debug) {

+    public function LogSnippet($string)
+    {
+        if ($this->debug) {
             $this->debugLog = true;

             $this->console[] = (count($this->console) + 1 - $this->curPass) . " [" . strftime("%H:%M:%S",

                     time()) . "] " . "  |--- Returns: <div style='margin: 10px;'>" . $this->LogClean($string) . "</div>";

@@ -576,8 +576,8 @@ 
     }

 

     // Log pass

-    public function LogPass()

-    {

+    public function LogPass()
+    {
         $this->console[] = "<div style='margin: 2px;margin-top: 5px;border-bottom: 1px solid black;'>Pass " . $this->curPass . "</div>";

     }

 

@@ -585,8 +585,8 @@ 
     /**

      * @param $string

      */

-    public function LogSource($string)

-    {

+    public function LogSource($string)
+    {
         $this->console[] = "<div style='margin: 2px;margin-top: 5px;border-bottom: 1px solid black;'>Source:</div>" . $this->LogClean($string);

     }

 

@@ -598,17 +598,17 @@ 
      * @param $field

      * @return mixed

      */

-    public function ModUser($userid, $field)

-    {

+    public function ModUser($userid, $field)
+    {
         global $modx;

-        if (!array_key_exists($userid, $this->cache["ui"])) {

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

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

-            } else {

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

             }

             $this->cache["ui"][$userid] = $user;

-        } else {

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

         }

 

@@ -621,32 +621,32 @@ 
      * @param array $groupNames

      * @return bool

      */

-    public function isMemberOfWebGroupByUserId($userid = 0, $groupNames = array())

-    {

+    public function isMemberOfWebGroupByUserId($userid = 0, $groupNames = array())
+    {
         global $modx;

 

         // if $groupNames is not an array return false

-        if (!is_array($groupNames)) {

+        if (!is_array($groupNames)) {
             return false;

         }

 

         // if the user id is a negative number make it positive

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

+        if (intval($userid) < 0) {
             $userid = -($userid);

         }

 

         // Creates an array with all webgroups the user id is in

-        if (!array_key_exists($userid, $this->cache["mo"])) {

+        if (!array_key_exists($userid, $this->cache["mo"])) {
             $tbl = $modx->getFullTableName("webgroup_names");

             $tbl2 = $modx->getFullTableName("web_groups");

             $sql = "SELECT wgn.name FROM $tbl wgn INNER JOIN $tbl2 wg ON wg.webgroup=wgn.id AND wg.webuser='" . $userid . "'";

             $this->cache["mo"][$userid] = $grpNames = $modx->db->getColumn("name", $sql);

-        } else {

+        } else {
             $grpNames = $this->cache["mo"][$userid];

         }

         // Check if a supplied group matches a webgroup from the array we just created

-        foreach ($groupNames as $k => $v) {

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

+        foreach ($groupNames as $k => $v) {
+            if (in_array(trim($v), $grpNames)) {
                 return true;

             }

         }

@@ -660,14 +660,14 @@ 
      * @param $name

      * @return mixed|string

      */

-    public function getPHxVariable($name)

-    {

+    public function getPHxVariable($name)
+    {
         global $modx;

         // Check if this variable is created by PHx

-        if (array_key_exists($name, $this->placeholders)) {

+        if (array_key_exists($name, $this->placeholders)) {
             // Return the value from PHx

             return $this->placeholders[$name];

-        } else {

+        } else {
             // Return the value from MODx

             return $modx->getPlaceholder($name);

         }

@@ -678,9 +678,9 @@ 
      * @param $name

      * @param $value

      */

-    public function setPHxVariable($name, $value)

-    {

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

+    public function setPHxVariable($name, $value)
+    {
+        if ($name != "phx") {
             $this->placeholders[$name] = $value;

         }

     }

@@ -692,9 +692,9 @@ 
      * @param null $l

      * @return string

      */

-    public function substr($str, $s, $l = null)

-    {

-        if (function_exists('mb_substr')) {

+    public function substr($str, $s, $l = null)
+    {
+        if (function_exists('mb_substr')) {
             return mb_substr($str, $s, $l);

         }

 

@@ -705,9 +705,9 @@ 
      * @param $str

      * @return int

      */

-    public function strlen($str)

-    {

-        if (function_exists('mb_strlen')) {

+    public function strlen($str)
+    {
+        if (function_exists('mb_strlen')) {
             return mb_strlen($str);

         }

 

@@ -718,9 +718,9 @@ 
      * @param $str

      * @return string

      */

-    public function strtolower($str)

-    {

-        if (function_exists('mb_strtolower')) {

+    public function strtolower($str)
+    {
+        if (function_exists('mb_strtolower')) {
             return mb_strtolower($str);

         }

 

@@ -731,9 +731,9 @@ 
      * @param $str

      * @return string

      */

-    public function strtoupper($str)

-    {

-        if (function_exists('mb_strtoupper')) {

+    public function strtoupper($str)
+    {
+        if (function_exists('mb_strtoupper')) {
             return mb_strtoupper($str);

         }

 

@@ -744,9 +744,9 @@ 
      * @param $str

      * @return string

      */

-    public function ucfirst($str)

-    {

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

+    public function ucfirst($str)
+    {
+        if (function_exists('mb_strtoupper') && function_exists('mb_substr') && function_exists('mb_strlen')) {
             return mb_strtoupper(mb_substr($str, 0, 1)) . mb_substr($str, 1, mb_strlen($str));

         }

 

@@ -757,9 +757,9 @@ 
      * @param $str

      * @return string

      */

-    public function lcfirst($str)

-    {

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

+    public function lcfirst($str)
+    {
+        if (function_exists('mb_strtolower') && function_exists('mb_substr') && function_exists('mb_strlen')) {
             return mb_strtolower(mb_substr($str, 0, 1)) . mb_substr($str, 1, mb_strlen($str));

         }

 

@@ -770,9 +770,9 @@ 
      * @param $str

      * @return string

      */

-    public function ucwords($str)

-    {

-        if (function_exists('mb_convert_case')) {

+    public function ucwords($str)
+    {
+        if (function_exists('mb_convert_case')) {
             return mb_convert_case($str, MB_CASE_TITLE);

         }

 

@@ -783,8 +783,8 @@ 
      * @param $str

      * @return string

      */

-    public function strrev($str)

-    {

+    public function strrev($str)
+    {
         preg_match_all('/./us', $str, $ar);

 

         return implode(array_reverse($ar[0]));

@@ -794,8 +794,8 @@ 
      * @param $str

      * @return string

      */

-    public function str_shuffle($str)

-    {

+    public function str_shuffle($str)
+    {
         preg_match_all('/./us', $str, $ar);

         shuffle($ar[0]);

 

@@ -806,8 +806,8 @@ 
      * @param $str

      * @return int

      */

-    public function str_word_count($str)

-    {

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

     }

 }

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

Spacing +7 added lines, -7 removed lines

@@ -18,10 +18,10 @@ 
      */
     protected function run()
     {
-        $result = (bool)$this->getCFGDef('cache', 1) && isset($this->modx->cache) && ($this->modx->cache instanceof Cache);
+        $result = (bool) $this->getCFGDef('cache', 1) && isset($this->modx->cache) && ($this->modx->cache instanceof Cache);
         $this->enabled = $result;
         if ($result) {
-            $this->setCacheLifetime((int)$this->getCFGDef('cacheLifetime', 0));
+            $this->setCacheLifetime((int) $this->getCFGDef('cacheLifetime', 0));
             $this->setCacheKey();
         }
         return $result;
@@ -37,7 +37,7 @@ 
     {
         $out = false;
         if ($this->enabled) {
-            $key = $this->getCacheKey() . '_' . $postfix;
+            $key = $this->getCacheKey().'_'.$postfix;
             $lifetime = $this->getCacheLifetime();
             $out = $this->modx->cache->save($key, $data, $lifetime);
         }
@@ -53,7 +53,7 @@ 
     {
         $out = false;
         if ($this->enabled) {
-            $key = $this->getCacheKey() . '_' . $postfix;
+            $key = $this->getCacheKey().'_'.$postfix;
             $out = $this->modx->cache->fetch($key);
         }
 
@@ -79,7 +79,7 @@ 
      */
     public function setCacheLifetime($time = 0)
     {
-        $time = (int)$time;
+        $time = (int) $time;
         $this->lifetime = $time;
 
         return $this;
@@ -98,7 +98,7 @@ 
         } else {
             $config = $this->DocLister->config->getConfig();
             $key = md5(json_encode($config));
-            $strategy = $this->getCFGDef('cacheStrategy','');
+            $strategy = $this->getCFGDef('cacheStrategy', '');
             switch ($strategy) {
                 case 'user':
                     $uid = $this->modx->getLoginUserID('web');
@@ -107,7 +107,7 @@ 
                 case 'usergroup':
                     $uid = $this->modx->getLoginUserID('web');
                     if ($uid && !empty($_SESSION['webUserGroupNames'])) {
-                        $key .= '_webgroups_' . md5(implode(',', $_SESSION['webUserGroupNames']));
+                        $key .= '_webgroups_'.md5(implode(',', $_SESSION['webUserGroupNames']));
                     }
                     break;
             }

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

Spacing +12 added lines, -12 removed lines

@@ -125,7 +125,7 @@ 
         $tvPrefix = $this->_TVprefix;

 

         while ($item = $this->modx->db->getRow($rs)) {

-            $out[$item['contentid']][$tvPrefix . $tv[$item['tmplvarid']]] = $item['value'];

+            $out[$item['contentid']][$tvPrefix.$tv[$item['tmplvarid']]] = $item['value'];

         }

         $tmp = explode(",", $this->DocLister->sanitarIn($IDs, ',', false));

         foreach ($tmp as $item) {

@@ -177,7 +177,7 @@ 
                 $out = array_unique($tmp);

                 $tmp = array();

                 foreach ($out as $item) {

-                    $tmp[] = $this->_TVprefix . $item;

+                    $tmp[] = $this->_TVprefix.$item;

                 }

             }

         } else {

@@ -196,8 +196,8 @@ 
      */

     public function renderTV($iddoc, $tvname, $tvval, $param)

     {

-        include_once MODX_MANAGER_PATH . "includes/tmplvars.format.inc.php";

-        include_once MODX_MANAGER_PATH . "includes/tmplvars.commands.inc.php";

+        include_once MODX_MANAGER_PATH."includes/tmplvars.format.inc.php";

+        include_once MODX_MANAGER_PATH."includes/tmplvars.commands.inc.php";

 

         return getTVDisplayFormat($tvname, $tvval, $param['display'], $param['display_params'], $param['type'], $iddoc,

             '');

@@ -233,7 +233,7 @@ 
         $out = array();

         foreach ($tvId as $id) {

             $name = $tvs[$id];

-            $out[$this->_TVprefix . $name] = $this->modx->_TVnames[$name]['default'];

+            $out[$this->_TVprefix.$name] = $this->modx->_TVnames[$name]['default'];

         }

 

         return $out;

@@ -272,20 +272,20 @@ 
                 $item = explode(" ", trim($item), 2);

                 if (isset($TVnames[$item[0]])) {

                     $exists = $this->DocLister->checkTableAlias($item[0], $this->tvValuesTable());

-                    $prefix = 'dltv_' . $item[0] . '_' . ($i + 1);

+                    $prefix = 'dltv_'.$item[0].'_'.($i + 1);

                     $prefix = $this->storeTable ? $this->DocLister->TableAlias($item[0], $this->tvValuesTable(),

                         $prefix) : $prefix;

                     if (!$exists) {

-                        $table .= " LEFT JOIN " . $this->DocLister->getTable($this->tvValuesTable(), $prefix) . "

-                        on `" . $prefix . "`.`contentid`=`c`.`id` AND `" . $prefix . "`.`tmplvarid`=" . $TVnames[$item[0]];

+                        $table .= " LEFT JOIN ".$this->DocLister->getTable($this->tvValuesTable(), $prefix)."

+                        on `" . $prefix."`.`contentid`=`c`.`id` AND `".$prefix."`.`tmplvarid`=".$TVnames[$item[0]];

                     }

                     if (in_array($item[0], $withDefault)) {

                         $exists = $this->DocLister->checkTableAlias($item[0], "site_tmplvars");

                         $dPrefix = $this->storeTable ? $this->DocLister->TableAlias($item[0], "site_tmplvars",

-                            'd_' . $prefix) : 'd_' . $prefix;

+                            'd_'.$prefix) : 'd_'.$prefix;

                         if (!$exists) {

-                            $table .= " LEFT JOIN " . $this->DocLister->getTable("site_tmplvars",

-                                    $dPrefix) . " on `" . $dPrefix . "`.`id` = " . $TVnames[$item[0]];

+                            $table .= " LEFT JOIN ".$this->DocLister->getTable("site_tmplvars",

+                                    $dPrefix)." on `".$dPrefix."`.`id` = ".$TVnames[$item[0]];

                         }

                         $field = "IFNULL(`{$prefix}`.`value`, `{$dPrefix}`.`default_text`)";

                     } else {

@@ -295,7 +295,7 @@ 
                 }

                 $item = implode(" ", $item);

             }

-            $sort = "ORDER BY " . implode(",", $matches);

+            $sort = "ORDER BY ".implode(",", $matches);

         }

 

         return array($table, $sort);

Braces +65 added lines, -65 removed lines

@@ -13,8 +13,8 @@ 
  * Обработка TV параметров перед выводом

  *

  */

-class tv_DL_Extender extends extDocLister

-{

+class tv_DL_Extender extends extDocLister
+{
     /**

      * @var mixed|string

      */

@@ -37,10 +37,10 @@ 
      * @param DocLister $DocLister

      * @param $name

      */

-    public function __construct($DocLister, $name)

-    {

+    public function __construct($DocLister, $name)
+    {
         parent::__construct($DocLister, $name);

-        if (!isset($this->modx->_TVnames)) {

+        if (!isset($this->modx->_TVnames)) {
             $this->modx->_TVnames = array();

         }

         $this->tvValuesTable = $this->DocLister->getCFGDef('tvValuesTable', $this->tvValuesTable());

@@ -51,26 +51,26 @@ 
     /**

      * @return bool

      */

-    protected function run()

-    {

+    protected function run()
+    {
         return true;

     }

 

     /**

      * @return mixed|string

      */

-    public function tvValuesTable()

-    {

+    public function tvValuesTable()
+    {
         return $this->tvValuesTable;

     }

 

     /**

      * @return mixed

      */

-    public function getTVnames()

-    {

+    public function getTVnames()
+    {
         $out = array();

-        foreach ($this->modx->_TVnames as $name => $tv) {

+        foreach ($this->modx->_TVnames as $name => $tv) {
             $out[$name] = $tv['id'];

         }

 

@@ -81,16 +81,16 @@ 
      * @param bool $reload

      * @return mixed

      */

-    public function getAllTV_Name($reload = false)

-    {

-        if (empty($this->modx->_TVnames) || $reload) {

+    public function getAllTV_Name($reload = false)
+    {
+        if (empty($this->modx->_TVnames) || $reload) {
             $this->modx->_TVnames = $this->loadFromCache('_TVnames');

-            if ($this->modx->_TVnames === false) {

+            if ($this->modx->_TVnames === false) {
                 $this->modx->_TVnames = array();

                 $from = $this->DocLister->getTable('site_tmplvars');

                 $rs = $this->DocLister->dbQuery("SELECT `id`, `name`, `default_text`, `type` FROM {$from}");

 

-                while ($item = $this->modx->db->getRow($rs)) {

+                while ($item = $this->modx->db->getRow($rs)) {
                     $this->modx->_TVnames[$item['name']] = array(

                         "id"   => $item['id'],

                         "type" => $item['type'],

@@ -109,11 +109,11 @@ 
      * @param $tvlist

      * @return array

      */

-    public function getTVList($IDs, $tvlist)

-    {

+    public function getTVList($IDs, $tvlist)
+    {
         $out = array();

         $tv = $this->getTVid($tvlist);

-        if (empty($tv)) {

+        if (empty($tv)) {
             return $out;

         }

         $tvId = array_keys($tv);

@@ -124,24 +124,24 @@ 
         $rs = $this->DocLister->dbQuery("SELECT tmplvarid,value,contentid FROM {$tbl_site_tmplvar_contentvalues} WHERE {$where}");

         $tvPrefix = $this->_TVprefix;

 

-        while ($item = $this->modx->db->getRow($rs)) {

+        while ($item = $this->modx->db->getRow($rs)) {
             $out[$item['contentid']][$tvPrefix . $tv[$item['tmplvarid']]] = $item['value'];

         }

         $tmp = explode(",", $this->DocLister->sanitarIn($IDs, ',', false));

-        foreach ($tmp as $item) {

-            if (!isset($out[$item])) {

+        foreach ($tmp as $item) {
+            if (!isset($out[$item])) {
                 $out[$item] = array();

             };

         }

         $renderTV = $this->getListRenderTV();

         $tvDef = $this->loadTVDefault($tvId);

         $TVkeys = array_keys($tvDef);

-        foreach ($out as $itemid => $item) {

-            foreach ($TVkeys as $name) {

-                if (!isset($out[$itemid][$name])) {

+        foreach ($out as $itemid => $item) {
+            foreach ($TVkeys as $name) {
+                if (!isset($out[$itemid][$name])) {
                     $out[$itemid][$name] = $tvDef[$name];

                 }

-                if (in_array($name, $renderTV) || $renderTV == array("*")) {

+                if (in_array($name, $renderTV) || $renderTV == array("*")) {
                     $out[$itemid][$name] = $this->renderTV($itemid, $name, $out[$itemid][$name], $tvDef[$name]);

                 }

             }

@@ -153,10 +153,10 @@ 
     /**

      * @return mixed|string

      */

-    public function getTVprefix()

-    {

+    public function getTVprefix()
+    {
         $tvPrefix = $this->DocLister->getCFGDef('tvPrefix', 'tv');

-        if (!empty($tvPrefix)) {

+        if (!empty($tvPrefix)) {
             $tvPrefix .= '.';

         }

 

@@ -166,21 +166,21 @@ 
     /**

      * @return array|mixed

      */

-    public function getListRenderTV()

-    {

+    public function getListRenderTV()
+    {
         $tmp = $this->DocLister->getCFGDef('renderTV', '');

-        if ($tmp != '' && $tmp != '*') {

+        if ($tmp != '' && $tmp != '*') {
             $tmp = explode(",", $tmp);

-            if (in_array("*", $tmp)) {

+            if (in_array("*", $tmp)) {
                 $tmp = array("*");

-            } else {

+            } else {
                 $out = array_unique($tmp);

                 $tmp = array();

-                foreach ($out as $item) {

+                foreach ($out as $item) {
                     $tmp[] = $this->_TVprefix . $item;

                 }

             }

-        } else {

+        } else {
             $tmp = array($tmp);

         }

 

@@ -194,8 +194,8 @@ 
      * @param $param

      * @return mixed

      */

-    public function renderTV($iddoc, $tvname, $tvval, $param)

-    {

+    public function renderTV($iddoc, $tvname, $tvval, $param)
+    {
         include_once MODX_MANAGER_PATH . "includes/tmplvars.format.inc.php";

         include_once MODX_MANAGER_PATH . "includes/tmplvars.commands.inc.php";

 

@@ -207,15 +207,15 @@ 
      * @param $tvlist

      * @return array

      */

-    public function getTVid($tvlist)

-    {

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

+    public function getTVid($tvlist)
+    {
+        if (!empty($tvlist) && is_scalar($tvlist)) {
             $tvlist = explode(",", $tvlist);

         }

         $out = array();

-        foreach ($tvlist as $tv) {

+        foreach ($tvlist as $tv) {
             $tv = trim($tv);

-            if (isset($this->modx->_TVnames[$tv])) {

+            if (isset($this->modx->_TVnames[$tv])) {
                 $out[$this->modx->_TVnames[$tv]['id']] = $tv;

             }

         }

@@ -227,11 +227,11 @@ 
      * @param array $tvId

      * @return array

      */

-    public function loadTVDefault($tvId)

-    {

+    public function loadTVDefault($tvId)
+    {
         $tvs = array_flip($this->getTVnames());

         $out = array();

-        foreach ($tvId as $id) {

+        foreach ($tvId as $id) {
             $name = $tvs[$id];

             $out[$this->_TVprefix . $name] = $this->modx->_TVnames[$name]['default'];

         }

@@ -243,8 +243,8 @@ 
      * @param $name

      * @return string

      */

-    public function addTVSortWithDefault($name)

-    {

+    public function addTVSortWithDefault($name)
+    {
         $dTV = explode(',', $this->DocLister->getCFGDef('tvSortWithDefault', ''));

         $dTV[] = $name;

         $tvList = implode(",", array_unique($dTV));

@@ -258,37 +258,37 @@ 
      * @param $sort

      * @return array

      */

-    public function injectSortByTV($table, $sort)

-    {

-        if (preg_match("/^ORDER BY (.*)/", $sort, $match)) {

+    public function injectSortByTV($table, $sort)
+    {
+        if (preg_match("/^ORDER BY (.*)/", $sort, $match)) {
             $TVnames = $this->getTVnames();

-            if (!is_array($TVnames)) {

+            if (!is_array($TVnames)) {
                 $TVnames = array();

             }

             $matches = explode(",", $match[1]);

             $sortType = explode(",", $this->DocLister->getCFGDef('tvSortType'));

             $withDefault = explode(",", $this->DocLister->getCFGDef('tvSortWithDefault'));

-            foreach ($matches as $i => &$item) {

+            foreach ($matches as $i => &$item) {
                 $item = explode(" ", trim($item), 2);

-                if (isset($TVnames[$item[0]])) {

+                if (isset($TVnames[$item[0]])) {
                     $exists = $this->DocLister->checkTableAlias($item[0], $this->tvValuesTable());

                     $prefix = 'dltv_' . $item[0] . '_' . ($i + 1);

                     $prefix = $this->storeTable ? $this->DocLister->TableAlias($item[0], $this->tvValuesTable(),

                         $prefix) : $prefix;

-                    if (!$exists) {

+                    if (!$exists) {
                         $table .= " LEFT JOIN " . $this->DocLister->getTable($this->tvValuesTable(), $prefix) . "

                         on `" . $prefix . "`.`contentid`=`c`.`id` AND `" . $prefix . "`.`tmplvarid`=" . $TVnames[$item[0]];

                     }

-                    if (in_array($item[0], $withDefault)) {

+                    if (in_array($item[0], $withDefault)) {
                         $exists = $this->DocLister->checkTableAlias($item[0], "site_tmplvars");

                         $dPrefix = $this->storeTable ? $this->DocLister->TableAlias($item[0], "site_tmplvars",

                             'd_' . $prefix) : 'd_' . $prefix;

-                        if (!$exists) {

+                        if (!$exists) {
                             $table .= " LEFT JOIN " . $this->DocLister->getTable("site_tmplvars",

                                     $dPrefix) . " on `" . $dPrefix . "`.`id` = " . $TVnames[$item[0]];

                         }

                         $field = "IFNULL(`{$prefix}`.`value`, `{$dPrefix}`.`default_text`)";

-                    } else {

+                    } else {
                         $field = "`{$prefix}`.`value`";

                     }

                     $item[0] = $this->DocLister->changeSortType($field, isset($sortType[$i]) ? $sortType[$i] : null);

@@ -305,10 +305,10 @@ 
      * @param $key

      * @return mixed

      */

-    private function loadFromCache($key)

-    {

+    private function loadFromCache($key)
+    {
         $out = false;

-        if ($this->cache) {

+        if ($this->cache) {
             $out = $this->modx->cache->fetch($key);

         }

 

@@ -320,10 +320,10 @@ 
      * @param string $key

      * @return bool

      */

-    private function saveToCache($data, $key)

-    {

+    private function saveToCache($data, $key)
+    {
         $out = false;

-        if ($this->cache) {

+        if ($this->cache) {
             $out = $this->modx->cache->save($key, $data, 0);

         }

 

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

Spacing +21 added lines, -21 removed lines

@@ -156,7 +156,7 @@ 
                         if (!$item[$date] && $date == 'pub_date' && isset($item['createdon'])) {
                             $date = 'createdon';
                         }
-                        $_date = is_numeric($item[$date]) && $item[$date] == (int)$item[$date] ? $item[$date] : strtotime($item[$date]);
+                        $_date = is_numeric($item[$date]) && $item[$date] == (int) $item[$date] ? $item[$date] : strtotime($item[$date]);
                         if ($_date !== false) {
                             $_date = $_date + $this->modx->config['server_offset_time'];
                             $dateFormat = $this->getCFGDef('dateFormat', '%d.%b.%y %H:%M');
@@ -187,7 +187,7 @@ 
 
                     if ($this->getCFGDef('contentPlaceholder', 0) !== 0) {
                         $this->toPlaceholders($tmp, 1,
-                            "item[" . $i . "]"); // [+item[x]+] – individual placeholder for each iteration documents on this page
+                            "item[".$i."]"); // [+item[x]+] – individual placeholder for each iteration documents on this page
                     }
                     $out .= $tmp;
                     if (next($this->_docs) !== false) {
@@ -241,7 +241,7 @@ 
                     if (!$row[$date] && $date == 'pub_date' && isset($row['createdon'])) {
                         $date = 'createdon';
                     }
-                    $_date = is_numeric($row[$date]) && $row[$date] == (int)$row[$date] ? $row[$date] : strtotime($row[$date]);
+                    $_date = is_numeric($row[$date]) && $row[$date] == (int) $row[$date] ? $row[$date] : strtotime($row[$date]);
                     if ($_date !== false) {
                         $_date = $_date + $this->modx->config['server_offset_time'];
                         $dateFormat = $this->getCFGDef('dateFormat', '%d.%b.%y %H:%M');
@@ -257,7 +257,7 @@ 
                     $row['title'] = empty($row['menutitle']) ? $row['pagetitle'] : $row['menutitle'];
                 }
             }
-            if ((bool)$this->getCFGDef('makeUrl', 1) && (array('1') == $fields || in_array('url', $fields))
+            if ((bool) $this->getCFGDef('makeUrl', 1) && (array('1') == $fields || in_array('url', $fields))
             ) {
                 if (isset($row['type']) && $row['type'] == 'reference' && isset($row['content'])) {
                     $row['url'] = is_numeric($row['content']) ? $this->modx->makeUrl($row['content'], '', '',
@@ -298,7 +298,7 @@ 
                 $q_true = $q_true ? $q_true : $this->getCFGDef('idType', 'parents') == 'parents';
                 $where = $this->getCFGDef('addWhereList', '');
                 $where = sqlHelper::trimLogicalOp($where);
-                $where = ($where ? $where . ' AND ' : '') . $this->_filters['where'];
+                $where = ($where ? $where.' AND ' : '').$this->_filters['where'];
                 if ($where != '' && $this->_filters['where'] != '') {
                     $where .= " AND ";
                 }
@@ -319,7 +319,7 @@ 
                         case 'parents':
                             switch ($this->getCFGDef('showParent', '0')) {
                                 case '-1':
-                                    $tmpWhere = "c.parent IN (" . $sanitarInIDs . ")";
+                                    $tmpWhere = "c.parent IN (".$sanitarInIDs.")";
                                     break;
                                 case 0:
                                     $tmpWhere = "c.parent IN ({$sanitarInIDs}) AND c.id NOT IN({$sanitarInIDs})";
@@ -331,7 +331,7 @@ 
                             }
                             if (($addDocs = $this->getCFGDef('documents', '')) != '') {
                                 $addDocs = $this->sanitarIn($this->cleanIDs($addDocs));
-                                $whereArr[] = "((" . $tmpWhere . ") OR c.id IN({$addDocs}))";
+                                $whereArr[] = "((".$tmpWhere.") OR c.id IN({$addDocs}))";
                             } else {
                                 $whereArr[] = $tmpWhere;
                             }
@@ -342,7 +342,7 @@ 
                             break;
                     }
                 }
-                $from = $tbl_site_content . " " . $this->_filters['join'];
+                $from = $tbl_site_content." ".$this->_filters['join'];
                 $where = sqlHelper::trimLogicalOp($where);
 
                 $q_true = $q_true ? $q_true : trim($where) != 'WHERE';
@@ -386,12 +386,12 @@ 
             $where = $this->getCFGDef('addWhereList', '');
             $where = sqlHelper::trimLogicalOp($where);
 
-            $where = ($where ? $where . ' AND ' : '') . $this->_filters['where'];
+            $where = ($where ? $where.' AND ' : '').$this->_filters['where'];
             $where = sqlHelper::trimLogicalOp($where);
 
             $tbl_site_content = $this->getTable('site_content', 'c');
             if ($sanitarInIDs != "''") {
-                $where .= ($where ? " AND " : "") . "c.id IN ({$sanitarInIDs}) AND";
+                $where .= ($where ? " AND " : "")."c.id IN ({$sanitarInIDs}) AND";
             }
             $where = sqlHelper::trimLogicalOp($where);
 
@@ -414,7 +414,7 @@ 
             $fields = $this->getCFGDef('selectFields', 'c.*');
             $group = $this->getGroupSQL($this->getCFGDef('groupBy', ''));
             $sort = $this->SortOrderSQL("if(c.pub_date=0,c.createdon,c.pub_date)");
-            list($tbl_site_content, $sort) = $this->injectSortByTV($tbl_site_content . ' ' . $this->_filters['join'],
+            list($tbl_site_content, $sort) = $this->injectSortByTV($tbl_site_content.' '.$this->_filters['join'],
                 $sort);
 
             $limit = $this->LimitSQL($this->getCFGDef('queryLimit', 0));
@@ -501,21 +501,21 @@ 
         $tbl_site_content = $this->getTable('site_content', 'c');
 
         $sort = $this->SortOrderSQL("if(c.pub_date=0,c.createdon,c.pub_date)");
-        list($from, $sort) = $this->injectSortByTV($tbl_site_content . ' ' . $this->_filters['join'], $sort);
+        list($from, $sort) = $this->injectSortByTV($tbl_site_content.' '.$this->_filters['join'], $sort);
         $sanitarInIDs = $this->sanitarIn($this->IDs);
 
         $tmpWhere = null;
         if ($sanitarInIDs != "''") {
             switch ($this->getCFGDef('showParent', '0')) {
                 case '-1':
-                    $tmpWhere = "c.parent IN (" . $sanitarInIDs . ")";
+                    $tmpWhere = "c.parent IN (".$sanitarInIDs.")";
                     break;
                 case 0:
-                    $tmpWhere = "c.parent IN (" . $sanitarInIDs . ") AND c.id NOT IN(" . $sanitarInIDs . ")";
+                    $tmpWhere = "c.parent IN (".$sanitarInIDs.") AND c.id NOT IN(".$sanitarInIDs.")";
                     break;
                 case 1:
                 default:
-                    $tmpWhere = "(c.parent IN (" . $sanitarInIDs . ") OR c.id IN({$sanitarInIDs}))";
+                    $tmpWhere = "(c.parent IN (".$sanitarInIDs.") OR c.id IN({$sanitarInIDs}))";
                     break;
             }
         }
@@ -524,7 +524,7 @@ 
             if (empty($tmpWhere)) {
                 $tmpWhere = "c.id IN({$addDocs})";
             } else {
-                $tmpWhere = "((" . $tmpWhere . ") OR c.id IN({$addDocs}))";
+                $tmpWhere = "((".$tmpWhere.") OR c.id IN({$addDocs}))";
             }
         }
         if (!empty($tmpWhere)) {
@@ -534,7 +534,7 @@ 
             $where[] = "c.deleted=0 AND c.published=1";
         }
         if (!empty($where)) {
-            $where = "WHERE " . implode(" AND ", $where);
+            $where = "WHERE ".implode(" AND ", $where);
         } else {
             $where = '';
         }
@@ -542,9 +542,9 @@ 
         $group = $this->getGroupSQL($this->getCFGDef('groupBy', ''));
 
         if ($sanitarInIDs != "''" || $this->getCFGDef('ignoreEmpty', '0')) {
-            $rs = $this->dbQuery("SELECT {$fields} FROM " . $from . " " . $where . " " .
-                $group . " " .
-                $sort . " " .
+            $rs = $this->dbQuery("SELECT {$fields} FROM ".$from." ".$where." ".
+                $group." ".
+                $sort." ".
                 $this->LimitSQL($this->getCFGDef('queryLimit', 0))
             );
 
@@ -566,7 +566,7 @@ 
         $type = trim($type);
         switch (strtoupper($type)) {
             case 'TVDATETIME':
-                $field = "STR_TO_DATE(" . $field . ",'%d-%m-%Y %H:%i:%s')";
+                $field = "STR_TO_DATE(".$field.",'%d-%m-%Y %H:%i:%s')";
                 break;
             default:
                 $field = parent::changeSortType($field, $type);

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

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

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

Spacing +9 added lines, -9 removed lines

@@ -27,7 +27,7 @@ 
      */

     public function setIDs($IDs)

     {

-        $this->debug->debug('set ID list ' . $this->debug->dumpData($IDs), 'setIDs', 2);

+        $this->debug->debug('set ID list '.$this->debug->dumpData($IDs), 'setIDs', 2);

         $IDs = $this->cleanIDs($IDs);

         $this->debug->debugEnd("setIDs");

 

@@ -280,13 +280,13 @@ 
                 }

 

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

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

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

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

                     }

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

                 }

                 $hideSubMenus = $this->getCFGDef('hideSubMenus', 0);

-                $hideSubMenus = !$hideSubMenus || ($hideSubMenus && in_array((int)$data['parent'],

+                $hideSubMenus = !$hideSubMenus || ($hideSubMenus && in_array((int) $data['parent'],

                             $this->activeBranch));

                 if ($hideSubMenus) {

                     $docs[$currentLevel - 1][$data['parent']]['wrap'][] = $data;

@@ -437,8 +437,8 @@ 
      */

     public function getHereId()

     {

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

-            $hereId = isset($this->modx->documentIdentifier) ? (int)$this->modx->documentIdentifier : 0;

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

+            $hereId = isset($this->modx->documentIdentifier) ? (int) $this->modx->documentIdentifier : 0;

         }

 

         return $hereId;

@@ -464,7 +464,7 @@ 
             'evenClass'    => ''

         );

         if (isset($data['state'])) {

-            $classes['stateClass'] = $this->getCFGDef($data['state'] . 'Class', $data['state']);

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

         }

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

             $classes['hereClass'] = $this->getCFGDef('hereClass', 'current');

@@ -485,7 +485,7 @@ 
             $classes['lastClass'] = $this->getCFGDef('lastClass', 'last');

         }

         if ($levelClass = $this->getCFGDef('levelClass', 'level')) {

-            $classes['levelClass'] = $levelClass . $data['level'];

+            $classes['levelClass'] = $levelClass.$data['level'];

         }

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

             $classes['webLinkClass'] = $this->getCFGDef('webLinkClass');

@@ -576,7 +576,7 @@ 
                 }

 

                 $hideSubMenus = $this->getCFGDef('hideSubMenus', 0);

-                $hideSubMenus = !$hideSubMenus || ($hideSubMenus && in_array((int)$data['parent'],

+                $hideSubMenus = !$hideSubMenus || ($hideSubMenus && in_array((int) $data['parent'],

                             $this->activeBranch));

                 if ($hideSubMenus) {

                     $docs[$currentLevel - 1][$data['parent']]['children'][] = $data;

@@ -611,6 +611,6 @@ 
      */

     public function getCFGDef($name, $def = null)

     {

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

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

     }

 }

Braces +137 added lines, -137 removed lines

@@ -9,8 +9,8 @@ 
  * @license GNU General Public License (GPL), http://www.gnu.org/copyleft/gpl.html

  * @author Agel_Nash <Agel_Nash@xaker.ru>, kabachello <kabachnik@hotmail.com>

  */

-class site_content_menuDocLister extends site_contentDocLister

-{

+class site_content_menuDocLister extends site_contentDocLister
+{
     public $levels = array();

     protected $currentLevel = 1;

     protected $docTvs = array();

@@ -25,8 +25,8 @@ 
      * @param mixed $IDs список id документов по которым необходима выборка

      * @return array очищенный массив

      */

-    public function setIDs($IDs)

-    {

+    public function setIDs($IDs)
+    {
         $this->debug->debug('set ID list ' . $this->debug->dumpData($IDs), 'setIDs', 2);

         $IDs = $this->cleanIDs($IDs);

         $this->debug->debugEnd("setIDs");

@@ -38,15 +38,15 @@ 
      * @param string $tvlist

      * @return array

      */

-    public function getDocs($tvlist = '')

-    {

+    public function getDocs($tvlist = '')
+    {
         $this->extTV->getAllTV_Name();

-        if ($ids = $this->getCFGDef('documents')) {

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

             $docs = $this->getDocList();

             $display = count($docs);

             $iteration = 1;

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

+            foreach ($docs as $id => &$item) {
                 $item['iteration'] = $iteration++;

                 $item['_display'] = $display;

                 $item['_parent'] = $item['parent'];

@@ -54,53 +54,53 @@ 
             }

             $this->levels[1] = $docs;

             $this->setActiveBranch($this->getHereId(), 1);

-        } else {

+        } else {
             $this->_getChildren();

         }

 

-        if ($tvlist == '') {

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

         }

 

-        if ($tvlist != '') {

+        if ($tvlist != '') {
             $ids = array();

-            foreach ($this->levels as $level => $docs) {

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

             }

-            if (!empty($ids)) {

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

-                if (!is_array($tv)) {

+                if (!is_array($tv)) {
                     $tv = array();

                 }

                 $this->docTvs = $tv;

             }

 

         }

-        if ($this->getCFGDef('countChildren', 0)) {

+        if ($this->getCFGDef('countChildren', 0)) {
             $this->countChildren();

         }

         //TODO кэширование

         return $this->levels;

     }

 

-    public function _getChildren()

-    {

+    public function _getChildren()
+    {
         $maxDepth = $this->getCFGDef('maxDepth', 10);

-        if ($this->getCFGDef('hideSubMenus', 0) && empty($this->getCFGDef('openIds'))) {

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

-            if (empty(array_intersect($this->IDs, $this->activeBranch))) {

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

                 $this->config->setConfig(array('hideSubMenus' => 0));

             };

-        } else {

+        } else {
             $this->setActiveBranch($this->getHereId());

         }

-        if ($oIds = $this->getCFGDef('openIds')) {

+        if ($oIds = $this->getCFGDef('openIds')) {
             $maxDepth = 1;

             $oIds = $this->cleanIDs($oIds);

             $oIds[] = $this->getHereId();

-            foreach ($oIds as $id) {

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

+            foreach ($oIds as $id) {
+                if (($c = $this->setActiveBranch($id)) > $maxDepth) {
                     $maxDepth = $c;

                 }

             }

@@ -108,44 +108,44 @@ 
         }

         $currentLevel = &$this->currentLevel;

         $currentLevel = 1;

-        if ($this->getCFGDef('showParent', 0) && in_array(0, $this->IDs)) {

+        if ($this->getCFGDef('showParent', 0) && in_array(0, $this->IDs)) {
             $this->config->setConfig(array('showParent' => 0));

         }

         $joinMenus = $this->getCFGDef('joinMenus', 0) && !$this->getCFGDef('showParent', 0);

-        while ($currentLevel <= $maxDepth) {

+        while ($currentLevel <= $maxDepth) {
             $orderBy = $this->getCFGDef('orderBy');

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

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

                 $this->config->setConfig(array('showParent' => 0));

-            } else {

+            } else {
                 $docs = $this->getChildrenList();

             }

-            if ($currentLevel == 1 && $joinMenus) {

+            if ($currentLevel == 1 && $joinMenus) {
                 $tmp = array();

                 $display = 0;

                 $iteration = 1;

-                foreach ($docs as $id => $item) {

+                foreach ($docs as $id => $item) {
                     $tmp[$item['parent']][] = $item['id'];

                     $display++;

                 }

-                foreach ($tmp as $id => $item) {

-                    foreach ($item as $_id) {

+                foreach ($tmp as $id => $item) {
+                    foreach ($item as $_id) {
                         $docs[$_id]['_display'] = $display;

                         $docs[$_id]['iteration'] = $iteration++;

                     }

                 }

                 unset($tmp);

-            } else {

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

+            } else {
+                foreach ($docs as $id => &$item) {
                     $parent = $item['parent'];

-                    if (!isset($this->display[$parent])) {

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

                     }

                     $item['iteration'] = $this->display[$parent]++;

                 }

             }

             $this->config->setConfig(array('orderBy' => $orderBy));

-            if (empty($docs)) {

+            if (empty($docs)) {
                 break;

             }

             $this->levels[$currentLevel++] = $docs;

@@ -159,8 +159,8 @@ 
      * @param $id

      * @param int $maxDepth

      */

-    public function setActiveBranch($id, $maxDepth = 10)

-    {

+    public function setActiveBranch($id, $maxDepth = 10)
+    {
         $ids = array_values($this->modx->getParentIds($id, $maxDepth));

         $ids[] = $id;

         $ids[] = 0;

@@ -173,29 +173,29 @@ 
     /**

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

      */

-    public function countChildren()

-    {

+    public function countChildren()
+    {
         $ids = array();

         $out = &$this->countChildren;

-        foreach ($this->levels as $level => $docs) {

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

         }

         $maxDepth = count($this->levels);

         $currentDepth = 1;

-        while ($currentDepth <= $maxDepth) {

+        while ($currentDepth <= $maxDepth) {
             $_ids = implode(',', $ids);

-            if (empty($_ids)) {

+            if (empty($_ids)) {
                 break;

             }

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

             $_ids = array();

-            while ($row = $this->modx->db->getRow($q)) {

+            while ($row = $this->modx->db->getRow($q)) {
                 $_ids[] = $row['parent'];

                 $out[$row['parent']] = $row['count'];

             }

-            if (!empty($_ids)) {

+            if (!empty($_ids)) {
                 $ids = $this->diff($ids, $_ids);

-            } else {

+            } else {
                 break;

             }

             $currentDepth++;

@@ -208,12 +208,12 @@ 
      * @param $a

      * @return array

      */

-    private function diff($b, $a)

-    {

+    private function diff($b, $a)
+    {
         $at = array_flip($a);

         $d = array();

-        foreach ($b as $i) {

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

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

             }

         }

@@ -228,17 +228,17 @@ 
      * @param string $tpl шаблон

      * @return string

      */

-    public function render($tpl = '')

-    {

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

-        if (empty($this->levels)) {

+        if (empty($this->levels)) {
             $noneTpl = $this->getCFGDef('noneTpl');

             $out = $noneTpl ? $this->parseChunk($noneTpl, array()) : '';

-        } else {

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

         }

 

-        if ($out) {

+        if ($out) {
             $this->outData = DLTemplate::getInstance($this->modx)->parseDocumentSource($out);

         }

         $this->debug->debugEnd('render');

@@ -250,37 +250,37 @@ 
      * @param string $tpl

      * @return string

      */

-    public function _render($tpl = '')

-    {

+    public function _render($tpl = '')
+    {
         $currentLevel = &$this->currentLevel;

         $currentLevel = count($this->levels);

         $docs = $this->levels;

         /** @var prepare_DL_Extender_ $extPrepare */

         $extPrepare = $this->getExtender('prepare');

-        while ($currentLevel > 0) {

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

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

-                    if (is_array($out)) {

+        while ($currentLevel > 0) {
+            foreach ($docs[$currentLevel] as $id => &$data) {
+                if ($out = $this->prepareData($data)) {
+                    if (is_array($out)) {
                         $data = $out;

                     }

                 };

-                if (!isset($data['maxLevel'])) {

+                if (!isset($data['maxLevel'])) {
                     $data['maxLevel'] = 1;

                     $docs[$currentLevel - 1][$data['parent']]['maxLevel'] = 0;

                 }

 

-                if ($extPrepare) {

+                if ($extPrepare) {
                     $data = $extPrepare->init($this, array(

                         'data'      => $data,

                         'nameParam' => 'prepare'

                     ));

-                    if (is_bool($data) && $data === false) {

+                    if (is_bool($data) && $data === false) {
                         continue;

                     }

                 }

 

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

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

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

                     }

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

@@ -288,7 +288,7 @@ 
                 $hideSubMenus = $this->getCFGDef('hideSubMenus', 0);

                 $hideSubMenus = !$hideSubMenus || ($hideSubMenus && in_array((int)$data['parent'],

                             $this->activeBranch));

-                if ($hideSubMenus) {

+                if ($hideSubMenus) {
                     $docs[$currentLevel - 1][$data['parent']]['wrap'][] = $data;

                 }

             }

@@ -298,17 +298,17 @@ 
         unset($data);

         $out = '';

         $joinMenus = $this->getCFGDef('joinMenus', 0) && !$this->getCFGDef('showParent', 0);

-        foreach ($docs[0] as $id => $data) {

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

-                if ($joinMenus) {

+        foreach ($docs[0] as $id => $data) {
+            if (isset($data['wrap'])) {
+                if ($joinMenus) {
                     $out .= $this->parseRow($data['wrap']);

-                } else {

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

                     $out .= $this->parseOuter($data);

                 }

             }

         }

-        if ($joinMenus) {

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

         }

 

@@ -320,33 +320,33 @@ 
      * @param $data

      * @return array

      */

-    public function prepareData($data)

-    {

+    public function prepareData($data)
+    {
         /**

          * @var e_DL_Extender $extE

          */

         $extE = $this->getExtender('e', true, true);

         $id = $data['id'];

-        if (isset($this->docTvs[$id])) {

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

         }

-        if ($id == $this->getHereId()) {

+        if ($id == $this->getHereId()) {
             $data['here'] = 1;

         }

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

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

         }

-        if ($this->getCFGDef('hideSubMenus') && isset($data['isfolder']) && $data['isfolder']) {

+        if ($this->getCFGDef('hideSubMenus') && isset($data['isfolder']) && $data['isfolder']) {
             $data['state'] = in_array($data['id'], $this->activeBranch) ? 'open' : 'closed';

         }

 

-        if (!isset($data['_display'])) {

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

         }

-        if ($data['iteration'] == 1) {

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

         }

-        if ($data['iteration'] == $data['_display']) {

+        if ($data['iteration'] == $data['_display']) {
             $data['last'] = 1;

         }

 

@@ -354,12 +354,12 @@ 
         $data[$titleField] = isset($data['menutitle']) && !empty($data['menutitle']) ? $data['menutitle'] : $data['pagetitle'];

         $data['level'] = $this->currentLevel;

         $data['url'] = $this->makeUrl($data);

-        if ($this->getCFGDef('countChildren', 0)) {

+        if ($this->getCFGDef('countChildren', 0)) {
             $data['count'] = isset($this->countChildren[$data['id']]) ? $this->countChildren[$data['id']] : 0;

         }

 

-        if ($out = $extE->init($this, compact('data'))) {

-            if (is_array($out)) {

+        if ($out = $extE->init($this, compact('data'))) {
+            if (is_array($out)) {
                 $data = $out;

             }

         }

@@ -372,16 +372,16 @@ 
      * @param array $data

      * @return string

      */

-    public function parseOuter($data = array())

-    {

+    public function parseOuter($data = array())
+    {
         $tpl = $this->getCFGDef('outerTpl', '@CODE:<ul[+classes+]>[+wrap+]</ul>');

         $classes = '';

         $classNames = $this->getCFGDef('outerClass');

-        if ($this->currentLevel >= 1) {

+        if ($this->currentLevel >= 1) {
             $tpl = $this->getCFGDef('innerTpl', $tpl);

             $classNames = $this->getCFGDef('innerClass');

         }

-        if ($classNames) {

+        if ($classNames) {
             $classes = " class=\"{$classNames}\"";

         }

         $tpl = isset($data['_renderOuterTpl']) ? $data['_renderOuterTpl'] : $tpl;

@@ -398,10 +398,10 @@ 
      * @param array $data

      * @return string

      */

-    public function parseRow($data = array())

-    {

+    public function parseRow($data = array())
+    {
         $out = '';

-        foreach ($data as $iteration => $item) {

+        foreach ($data as $iteration => $item) {
             $tpl = isset($item['_renderRowTpl']) ? $item['_renderRowTpl'] : $this->getRowTemplate($item);

             $item = array_merge($item, $this->getClasses($item));

             $out .= $this->parseChunk($tpl, $item);

@@ -415,14 +415,14 @@ 
      * @param array $data

      * @return string

      */

-    protected function makeUrl($data = array())

-    {

+    protected function makeUrl($data = array())
+    {
         $out = '';

-        if ($this->getCFGDef('makeUrl', 1)) {

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

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

                     $this->getCFGDef('urlScheme', '')) : $data['content'];

-            } else {

+            } else {
                 $out = isset($data['id']) && is_numeric($data['id']) ? $this->modx->makeUrl($data['id'], '', '',

                     $this->getCFGDef('urlScheme', '')) : '';

             }

@@ -435,9 +435,9 @@ 
      * Вовзращает id текущего документа

      * @return int

      */

-    public function getHereId()

-    {

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

+    public function getHereId()
+    {
+        if (!$hereId = (int)$this->getCFGDef('hereId')) {
             $hereId = isset($this->modx->documentIdentifier) ? (int)$this->modx->documentIdentifier : 0;

         }

 

@@ -449,8 +449,8 @@ 
      * @param array $data

      * @return array

      */

-    protected function getClasses($data = array())

-    {

+    protected function getClasses($data = array())
+    {
         $classes = isset($data['classes']) ? $data['classes'] : array(

             'rowClass'     => '',

             'firstClass'   => '',

@@ -463,34 +463,34 @@ 
             'oddClass'     => '',

             'evenClass'    => ''

         );

-        if (isset($data['state'])) {

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

         }

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

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

         }

-        if (isset($data['active'])) {

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

         }

         $classes['rowClass'] = $this->getCFGDef('rowClass');

-        if ($data['iteration'] % 2 == 1) {

+        if ($data['iteration'] % 2 == 1) {
             $classes['oddClass'] = $this->getCFGDef('oddClass', 'odd');

-        } else {

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

         }

-        if (isset($data['first'])) {

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

         }

-        if (isset($data['last'])) {

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

         }

-        if ($levelClass = $this->getCFGDef('levelClass', 'level')) {

+        if ($levelClass = $this->getCFGDef('levelClass', 'level')) {
             $classes['levelClass'] = $levelClass . $data['level'];

         }

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

+        if (isset($data['type']) && $data['type'] == 'reference') {
             $classes['webLinkClass'] = $this->getCFGDef('webLinkClass');

         }

-        if (!empty($data['wrap'])) {

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

         }

         $classNames = implode(' ', array_filter(array_values($classes)));

@@ -505,28 +505,28 @@ 
      * @param array $data

      * @return string

      */

-    protected function getRowTemplate($data = array())

-    {

+    protected function getRowTemplate($data = array())
+    {
         $tpl = $this->getCFGDef('rowTpl', '@CODE:<li[+classes+]><a href="[+url+]">[+title+]</a></li>');

-        if (!empty($data['wrap'])) {

+        if (!empty($data['wrap'])) {
             $tpl = $this->getCFGDef('parentRowTpl',

                 '@CODE:<li[+classes+]><a href="[+url+]">[+title+]</a>[+wrap+]</li>');

             if ((isset($data['template']) && !$data['template']) || (isset($data['link_attributes']) && strpos($data['link_attributes'],

                         'category') !== false)

-            ) {

+            ) {
                 $tpl = $this->getCFGDef('categoryFolderTpl', $tpl);

-            } elseif (isset($data['here'])) {

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

-            } elseif (isset($data['active'])) {

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

             }

-        } elseif ($data['level'] > 1) {

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

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

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

             }

-        } else {

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

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

             }

         }

@@ -540,37 +540,37 @@ 
      * @param array $array

      * @return string

      */

-    public function getJSON($data, $fields, $array = array())

-    {

+    public function getJSON($data, $fields, $array = array())
+    {
         $currentLevel = &$this->currentLevel;

         $currentLevel = count($this->levels);

         $docs = $this->levels;

 

-        if (empty($docs)) {

+        if (empty($docs)) {
             return '[]';

         }

 

         /** @var prepare_DL_Extender_ $extPrepare */

         $extPrepare = $this->getExtender('prepare');

 

-        while ($currentLevel > 0) {

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

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

-                    if (is_array($out)) {

+        while ($currentLevel > 0) {
+            foreach ($docs[$currentLevel] as $id => &$data) {
+                if ($out = $this->prepareData($data)) {
+                    if (is_array($out)) {
                         $data = $out;

                     }

                 };

 

-                if (isset($data['here']) || isset($data['active'])) {

+                if (isset($data['here']) || isset($data['active'])) {
                     $docs[$currentLevel - 1][$data['parent']]['active'] = 1;

                 }

 

-                if ($extPrepare) {

+                if ($extPrepare) {
                     $data = $extPrepare->init($this, array(

                         'data'      => $data,

                         'nameParam' => 'prepare'

                     ));

-                    if (is_bool($data) && $data === false) {

+                    if (is_bool($data) && $data === false) {
                         continue;

                     }

                 }

@@ -578,7 +578,7 @@ 
                 $hideSubMenus = $this->getCFGDef('hideSubMenus', 0);

                 $hideSubMenus = !$hideSubMenus || ($hideSubMenus && in_array((int)$data['parent'],

                             $this->activeBranch));

-                if ($hideSubMenus) {

+                if ($hideSubMenus) {
                     $docs[$currentLevel - 1][$data['parent']]['children'][] = $data;

                 }

             }

@@ -588,11 +588,11 @@ 
         unset($data);

         $out = array();

         $joinMenus = $this->getCFGDef('joinMenus', 0) && !$this->getCFGDef('showParent', 0);

-        foreach ($docs[0] as $id => $data) {

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

-                if ($joinMenus) {

+        foreach ($docs[0] as $id => $data) {
+            if (isset($data['children'])) {
+                if ($joinMenus) {
                     $out = array_merge($out, $data['children']);

-                } else {

+                } else {
                     $out[] = $data['children'];

                 }

             }

@@ -609,8 +609,8 @@ 
      * @param mixed $def значение по умолчанию, если в конфиге нет искомого параметра

      * @return mixed значение из конфига

      */

-    public function getCFGDef($name, $def = null)

-    {

+    public function getCFGDef($name, $def = null)
+    {
         return parent::getCFGDef($name . $this->currentLevel, parent::getCFGDef($name, $def));

     }

 }

assets/lib/Formatter/SqlFormatter.php

Spacing +48 added lines, -48 removed lines

@@ -757,15 +757,15 @@ 
         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_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)) . ')');

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

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

     }

@@ -830,10 +830,10 @@ 
 

             // If the variable name is quoted

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

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

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

                 }

@@ -845,7 +845,7 @@ 
         }

 

         // Number (decimal, binary, or hex)

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

+        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],

@@ -854,7 +854,7 @@ 
         }

 

         // Boundary Character (punctuation and symbols)

-        if (preg_match('/^(' . self::$regex_boundaries . ')/', $string, $matches)) {

+        if (preg_match('/^('.self::$regex_boundaries.')/', $string, $matches)) {

             return array(

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

                 self::TOKEN_TYPE  => self::TOKEN_TYPE_BOUNDARY

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

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

                 $matches)) {

                 return array(

                     self::TOKEN_TYPE  => self::TOKEN_TYPE_RESERVED_TOPLEVEL,

@@ -874,7 +874,7 @@ 
                 );

             }

             // Newline Reserved Word

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

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

                 $matches)) {

                 return array(

                     self::TOKEN_TYPE  => self::TOKEN_TYPE_RESERVED_NEWLINE,

@@ -882,7 +882,7 @@ 
                 );

             }

             // Other Reserved Word

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

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

                 $matches)) {

                 return array(

                     self::TOKEN_TYPE  => self::TOKEN_TYPE_RESERVED,

@@ -895,7 +895,7 @@ 
         // this makes it so "count(" is considered a function, but "count" alone is not

         $upper = strtoupper($string);

         // function

-        if (preg_match('/^(' . self::$regex_function . '[(]|\s|[)])/', $upper, $matches)) {

+        if (preg_match('/^('.self::$regex_function.'[(]|\s|[)])/', $upper, $matches)) {

             return array(

                 self::TOKEN_TYPE  => self::TOKEN_TYPE_RESERVED,

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

@@ -903,7 +903,7 @@ 
         }

 

         // 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],

@@ -1065,7 +1065,7 @@ 
 

             // If we need a new line before the token

             if ($newline) {

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

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

                 $newline = false;

                 $added_newline = true;

             } else {

@@ -1076,8 +1076,8 @@ 
             if ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_COMMENT || $token[self::TOKEN_TYPE] === self::TOKEN_TYPE_BLOCK_COMMENT) {

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

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

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

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

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

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

                 }

 

                 $return .= $highlighted;

@@ -1093,12 +1093,12 @@ 
                     if ($inline_indented) {

                         array_shift($indent_types);

                         $indent_level--;

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

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

                     }

 

                     $inline_parentheses = false;

 

-                    $return .= $highlighted . ' ';

+                    $return .= $highlighted.' ';

                     continue;

                 }

 

@@ -1185,14 +1185,14 @@ 
                     $indent_level = 0;

 

                     if ($highlight) {

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

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

                         continue;

                     }

                 }

 

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

                 if (!$added_newline) {

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

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

                 }

             } // Top level reserved words start a new line and increase the special indent level

             elseif ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_RESERVED_TOPLEVEL) {

@@ -1209,10 +1209,10 @@ 
                 $newline = true;

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

                 if (!$added_newline) {

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

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

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

                 else {

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

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

                 }

 

                 // If the token may have extra whitespace

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

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

                 if (!$added_newline) {

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

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

                 }

 

                 // If the token may have extra whitespace

@@ -1265,7 +1265,7 @@ 
                 $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] === '.') {

@@ -1283,7 +1283,7 @@ 
 

         // If there are unmatched parentheses

         if ($highlight && array_search('block', $indent_types) !== false) {

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

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

         }

 

         // Replace tab characters with the configuration tab character

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

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

                 if (!$empty) {

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

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

                 }

                 $current_query = '';

                 $empty = true;

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

     {

         if (self::is_cli()) {

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

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

         } else {

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

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

         }

     }

 

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

     {

         if (self::is_cli()) {

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

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

         } else {

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

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

         }

     }

 

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

     {

         if (self::is_cli()) {

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

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

         } else {

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

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

         }

     }

 

@@ -1534,9 +1534,9 @@ 
         }

 

         if (self::is_cli()) {

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

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

         } else {

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

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

         }

     }

 

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

     {

         if (self::is_cli()) {

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

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

         } else {

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

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

         }

     }

 

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

     {

         if (self::is_cli()) {

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

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

         } else {

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

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

         }

     }

 

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

     {

         if (self::is_cli()) {

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

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

         } else {

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

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

         }

     }

 

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

     {

         if (self::is_cli()) {

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

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

         } else {

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

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

         }

     }

 

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

     {

         if (self::is_cli()) {

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

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

         } else {

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

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

         }

     }

 

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

     {

         if (self::is_cli()) {

-            return $string . "\n";

+            return $string."\n";

         } else {

             $string = trim($string);

             if (!self::$use_pre) {

                 return $string;

             }

 

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

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

         }

     }

 

Braces +182 added lines, -182 removed lines

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

  * @version    1.2.18

  */

-class SqlFormatter

-{

+class SqlFormatter
+{
     // Constants for token types

     const TOKEN_TYPE_WHITESPACE = 0;

     const TOKEN_TYPE_WORD = 1;

@@ -732,8 +732,8 @@ 
      * Get stats about the token cache

      * @return Array An array containing the keys 'hits', 'misses', 'entries', and 'size' in bytes

      */

-    public static function getCacheStats()

-    {

+    public static function getCacheStats()
+    {
         return array(

             'hits'    => self::$cache_hits,

             'misses'  => self::$cache_misses,

@@ -745,9 +745,9 @@ 
     /**

      * Stuff that only needs to be done once.  Builds regular expressions and sorts the reserved words.

      */

-    protected static function init()

-    {

-        if (self::$init) {

+    protected static function init()
+    {
+        if (self::$init) {
             return;

         }

 

@@ -779,10 +779,10 @@ 
      *

      * @return Array An associative array containing the type and value of the token.

      */

-    protected static function getNextToken($string, $previous = null)

-    {

+    protected static function getNextToken($string, $previous = null)
+    {
         // Whitespace

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

+        if (preg_match('/^\s+/', $string, $matches)) {
             return array(

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

                 self::TOKEN_TYPE  => self::TOKEN_TYPE_WHITESPACE

@@ -790,18 +790,18 @@ 
         }

 

         // Comment

-        if ($string[0] === '#' || (isset($string[1]) && ($string[0] === '-' && $string[1] === '-') || ($string[0] === '/' && $string[1] === '*'))) {

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

-            if ($string[0] === '-' || $string[0] === '#') {

+            if ($string[0] === '-' || $string[0] === '#') {
                 $last = strpos($string, "\n");

                 $type = self::TOKEN_TYPE_COMMENT;

-            } else {

+            } else {
 // Comment until closing comment tag

                 $last = strpos($string, "*/", 2) + 2;

                 $type = self::TOKEN_TYPE_BLOCK_COMMENT;

             }

 

-            if ($last === false) {

+            if ($last === false) {
                 $last = strlen($string);

             }

 

@@ -812,7 +812,7 @@ 
         }

 

         // Quoted String

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

+        if ($string[0] === '"' || $string[0] === '\'' || $string[0] === '`' || $string[0] === '[') {
             $return = array(

                 self::TOKEN_TYPE  => (($string[0] === '`' || $string[0] === '[') ? self::TOKEN_TYPE_BACKTICK_QUOTE : self::TOKEN_TYPE_QUOTE),

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

@@ -822,31 +822,31 @@ 
         }

 

         // User-defined Variable

-        if (($string[0] === '@' || $string[0] === ':') && isset($string[1])) {

+        if (($string[0] === '@' || $string[0] === ':') && isset($string[1])) {
             $ret = array(

                 self::TOKEN_VALUE => null,

                 self::TOKEN_TYPE  => self::TOKEN_TYPE_VARIABLE

             );

 

             // If the variable name is quoted

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

+            if ($string[1] === '"' || $string[1] === '\'' || $string[1] === '`') {
                 $ret[self::TOKEN_VALUE] = $string[0] . self::getQuotedString(substr($string, 1));

             } // Non-quoted variable name

-            else {

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

-                if (!empty($matches)) {

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

                 }

             }

 

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

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

             }

         }

 

         // Number (decimal, binary, or hex)

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

-            $string, $matches)) {

+            $string, $matches)) {
             return array(

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

                 self::TOKEN_TYPE  => self::TOKEN_TYPE_NUMBER

@@ -854,7 +854,7 @@ 
         }

 

         // Boundary Character (punctuation and symbols)

-        if (preg_match('/^(' . self::$regex_boundaries . ')/', $string, $matches)) {

+        if (preg_match('/^(' . self::$regex_boundaries . ')/', $string, $matches)) {
             return array(

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

                 self::TOKEN_TYPE  => self::TOKEN_TYPE_BOUNDARY

@@ -863,11 +863,11 @@ 
 

         // A reserved word cannot be preceded by a '.'

         // this makes it so in "mytable.from", "from" is not considered a reserved word

-        if (!$previous || !isset($previous[self::TOKEN_VALUE]) || $previous[self::TOKEN_VALUE] !== '.') {

+        if (!$previous || !isset($previous[self::TOKEN_VALUE]) || $previous[self::TOKEN_VALUE] !== '.') {
             $upper = strtoupper($string);

             // Top Level Reserved Word

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

-                $matches)) {

+                $matches)) {
                 return array(

                     self::TOKEN_TYPE  => self::TOKEN_TYPE_RESERVED_TOPLEVEL,

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

@@ -875,7 +875,7 @@ 
             }

             // Newline Reserved Word

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

-                $matches)) {

+                $matches)) {
                 return array(

                     self::TOKEN_TYPE  => self::TOKEN_TYPE_RESERVED_NEWLINE,

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

@@ -883,7 +883,7 @@ 
             }

             // Other Reserved Word

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

-                $matches)) {

+                $matches)) {
                 return array(

                     self::TOKEN_TYPE  => self::TOKEN_TYPE_RESERVED,

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

@@ -895,7 +895,7 @@ 
         // this makes it so "count(" is considered a function, but "count" alone is not

         $upper = strtoupper($string);

         // function

-        if (preg_match('/^(' . self::$regex_function . '[(]|\s|[)])/', $upper, $matches)) {

+        if (preg_match('/^(' . self::$regex_function . '[(]|\s|[)])/', $upper, $matches)) {
             return array(

                 self::TOKEN_TYPE  => self::TOKEN_TYPE_RESERVED,

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

@@ -915,8 +915,8 @@ 
      * @param $string

      * @return null

      */

-    protected static function getQuotedString($string)

-    {

+    protected static function getQuotedString($string)
+    {
         $ret = null;

 

         // This checks for the following patterns:

@@ -925,7 +925,7 @@ 
         // 3. double quoted string using "" or \" to escape

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

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

-            $string, $matches)) {

+            $string, $matches)) {
             $ret = $matches[1];

         }

 

@@ -940,8 +940,8 @@ 
      *

      * @return Array An array of tokens.

      */

-    protected static function tokenize($string)

-    {

+    protected static function tokenize($string)
+    {
         self::init();

 

         $tokens = array();

@@ -954,9 +954,9 @@ 
         $current_length = strlen($string);

 

         // Keep processing the string until it is empty

-        while ($current_length) {

+        while ($current_length) {
             // If the string stopped shrinking, there was a problem

-            if ($old_string_len <= $current_length) {

+            if ($old_string_len <= $current_length) {
                 $tokens[] = array(

                     self::TOKEN_VALUE => $string,

                     self::TOKEN_TYPE  => self::TOKEN_TYPE_ERROR

@@ -967,26 +967,26 @@ 
             $old_string_len = $current_length;

 

             // Determine if we can use caching

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

+            if ($current_length >= self::$max_cachekey_size) {
                 $cacheKey = substr($string, 0, self::$max_cachekey_size);

-            } else {

+            } else {
                 $cacheKey = false;

             }

 

             // See if the token is already cached

-            if ($cacheKey !== false && isset(self::$token_cache[$cacheKey])) {

+            if ($cacheKey !== false && isset(self::$token_cache[$cacheKey])) {
                 // Retrieve from cache

                 $token = self::$token_cache[$cacheKey];

                 $token_length = strlen($token[self::TOKEN_VALUE]);

                 self::$cache_hits++;

-            } else {

+            } else {
                 // Get the next token and the token type

                 $token = self::getNextToken($string, $token);

                 $token_length = strlen($token[self::TOKEN_VALUE]);

                 self::$cache_misses++;

 

                 // If the token is shorter than the max length, store it in cache

-                if ($cacheKey !== false && $token_length < self::$max_cachekey_size) {

+                if ($cacheKey !== false && $token_length < self::$max_cachekey_size) {
                     self::$token_cache[$cacheKey] = $token;

                 }

             }

@@ -1010,8 +1010,8 @@ 
      *

      * @return String The SQL string with HTML styles and formatting wrapped in a <pre> tag

      */

-    public static function format($string, $highlight = true)

-    {

+    public static function format($string, $highlight = true)
+    {
         // This variable will be populated with formatted html

         $return = '';

 

@@ -1033,48 +1033,48 @@ 
 

         // Remove existing whitespace

         $tokens = array();

-        foreach ($original_tokens as $i => $token) {

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

+        foreach ($original_tokens as $i => $token) {
+            if ($token[self::TOKEN_TYPE] !== self::TOKEN_TYPE_WHITESPACE) {
                 $token['i'] = $i;

                 $tokens[] = $token;

             }

         }

 

         // Format token by token

-        foreach ($tokens as $i => $token) {

+        foreach ($tokens as $i => $token) {
             // Get highlighted token if doing syntax highlighting

-            if ($highlight) {

+            if ($highlight) {
                 $highlighted = self::highlightToken($token);

-            } else {

+            } else {
 // If returning raw text

                 $highlighted = $token[self::TOKEN_VALUE];

             }

 

             // If we are increasing the special indent level now

-            if ($increase_special_indent) {

+            if ($increase_special_indent) {
                 $indent_level++;

                 $increase_special_indent = false;

                 array_unshift($indent_types, 'special');

             }

             // If we are increasing the block indent level now

-            if ($increase_block_indent) {

+            if ($increase_block_indent) {
                 $indent_level++;

                 $increase_block_indent = false;

                 array_unshift($indent_types, 'block');

             }

 

             // If we need a new line before the token

-            if ($newline) {

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

                 $newline = false;

                 $added_newline = true;

-            } else {

+            } else {
                 $added_newline = false;

             }

 

             // Display comments directly where they appear in the source

-            if ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_COMMENT || $token[self::TOKEN_TYPE] === self::TOKEN_TYPE_BLOCK_COMMENT) {

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

+            if ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_COMMENT || $token[self::TOKEN_TYPE] === self::TOKEN_TYPE_BLOCK_COMMENT) {
+                if ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_BLOCK_COMMENT) {
                     $indent = str_repeat($tab, $indent_level);

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

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

@@ -1085,12 +1085,12 @@ 
                 continue;

             }

 

-            if ($inline_parentheses) {

+            if ($inline_parentheses) {
                 // End of inline parentheses

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

+                if ($token[self::TOKEN_VALUE] === ')') {
                     $return = rtrim($return, ' ');

 

-                    if ($inline_indented) {

+                    if ($inline_indented) {
                         array_shift($indent_types);

                         $indent_level--;

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

@@ -1102,8 +1102,8 @@ 
                     continue;

                 }

 

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

-                    if ($inline_count >= 30) {

+                if ($token[self::TOKEN_VALUE] === ',') {
+                    if ($inline_count >= 30) {
                         $inline_count = 0;

                         $newline = true;

                     }

@@ -1113,21 +1113,21 @@ 
             }

 

             // Opening parentheses increase the block indent level and start a new line

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

+            if ($token[self::TOKEN_VALUE] === '(') {
                 // First check if this should be an inline parentheses block

                 // Examples are "NOW()", "COUNT(*)", "int(10)", key(`somecolumn`), DECIMAL(7,2)

                 // Allow up to 3 non-whitespace tokens inside inline parentheses

                 $length = 0;

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

+                for ($j = 1; $j <= 250; $j++) {
                     // Reached end of string

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

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

                     }

 

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

 

                     // Reached closing parentheses, able to inline it

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

+                    if ($next[self::TOKEN_VALUE] === ')') {
                         $inline_parentheses = true;

                         $inline_count = 0;

                         $inline_indented = false;

@@ -1135,72 +1135,72 @@ 
                     }

 

                     // Reached an invalid token for inline parentheses

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

+                    if ($next[self::TOKEN_VALUE] === ';' || $next[self::TOKEN_VALUE] === '(') {
                         break;

                     }

 

                     // Reached an invalid token type for inline parentheses

-                    if ($next[self::TOKEN_TYPE] === self::TOKEN_TYPE_RESERVED_TOPLEVEL || $next[self::TOKEN_TYPE] === self::TOKEN_TYPE_RESERVED_NEWLINE || $next[self::TOKEN_TYPE] === self::TOKEN_TYPE_COMMENT || $next[self::TOKEN_TYPE] === self::TOKEN_TYPE_BLOCK_COMMENT) {

+                    if ($next[self::TOKEN_TYPE] === self::TOKEN_TYPE_RESERVED_TOPLEVEL || $next[self::TOKEN_TYPE] === self::TOKEN_TYPE_RESERVED_NEWLINE || $next[self::TOKEN_TYPE] === self::TOKEN_TYPE_COMMENT || $next[self::TOKEN_TYPE] === self::TOKEN_TYPE_BLOCK_COMMENT) {
                         break;

                     }

 

                     $length += strlen($next[self::TOKEN_VALUE]);

                 }

 

-                if ($inline_parentheses && $length > 30) {

+                if ($inline_parentheses && $length > 30) {
                     $increase_block_indent = true;

                     $inline_indented = true;

                     $newline = true;

                 }

 

                 // Take out the preceding space unless there was whitespace there in the original query

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

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

                 }

 

-                if (!$inline_parentheses) {

+                if (!$inline_parentheses) {
                     $increase_block_indent = true;

                     // Add a newline after the parentheses

                     $newline = true;

                 }

 

             } // Closing parentheses decrease the block indent level

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

+            elseif ($token[self::TOKEN_VALUE] === ')') {
                 // Remove whitespace before the closing parentheses

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

 

                 $indent_level--;

 

                 // Reset indent level

-                while ($j = array_shift($indent_types)) {

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

+                while ($j = array_shift($indent_types)) {
+                    if ($j === 'special') {
                         $indent_level--;

-                    } else {

+                    } else {
                         break;

                     }

                 }

 

-                if ($indent_level < 0) {

+                if ($indent_level < 0) {
                     // This is an error

                     $indent_level = 0;

 

-                    if ($highlight) {

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

                         continue;

                     }

                 }

 

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

-                if (!$added_newline) {

+                if (!$added_newline) {
                     $return .= "\n" . str_repeat($tab, $indent_level);

                 }

             } // Top level reserved words start a new line and increase the special indent level

-            elseif ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_RESERVED_TOPLEVEL) {

+            elseif ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_RESERVED_TOPLEVEL) {
                 $increase_special_indent = true;

 

                 // If the last indent type was 'special', decrease the special indent for this round

                 reset($indent_types);

-                if (current($indent_types) === 'special') {

+                if (current($indent_types) === 'special') {
                     $indent_level--;

                     array_shift($indent_types);

                 }

@@ -1208,88 +1208,88 @@ 
                 // Add a newline after the top level reserved word

                 $newline = true;

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

-                if (!$added_newline) {

+                if (!$added_newline) {
                     $return .= "\n" . str_repeat($tab, $indent_level);

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

-                else {

+                else {
                     $return = rtrim($return, $tab) . str_repeat($tab, $indent_level);

                 }

 

                 // If the token may have extra whitespace

                 if (strpos($token[self::TOKEN_VALUE], ' ') !== false || strpos($token[self::TOKEN_VALUE],

                         "\n") !== false || strpos($token[self::TOKEN_VALUE], "\t") !== false

-                ) {

+                ) {
                     $highlighted = preg_replace('/\s+/', ' ', $highlighted);

                 }

                 //if SQL 'LIMIT' clause, start variable to reset newline

-                if ($token[self::TOKEN_VALUE] === 'LIMIT' && !$inline_parentheses) {

+                if ($token[self::TOKEN_VALUE] === 'LIMIT' && !$inline_parentheses) {
                     $clause_limit = true;

                 }

             } // Checks if we are out of the limit clause

-            elseif ($clause_limit && $token[self::TOKEN_VALUE] !== "," && $token[self::TOKEN_TYPE] !== self::TOKEN_TYPE_NUMBER && $token[self::TOKEN_TYPE] !== self::TOKEN_TYPE_WHITESPACE) {

+            elseif ($clause_limit && $token[self::TOKEN_VALUE] !== "," && $token[self::TOKEN_TYPE] !== self::TOKEN_TYPE_NUMBER && $token[self::TOKEN_TYPE] !== self::TOKEN_TYPE_WHITESPACE) {
                 $clause_limit = false;

             } // Commas start a new line (unless within inline parentheses or SQL 'LIMIT' clause)

-            elseif ($token[self::TOKEN_VALUE] === ',' && !$inline_parentheses) {

+            elseif ($token[self::TOKEN_VALUE] === ',' && !$inline_parentheses) {
                 //If the previous TOKEN_VALUE is 'LIMIT', resets new line

-                if ($clause_limit === true) {

+                if ($clause_limit === true) {
                     $newline = false;

                     $clause_limit = false;

                 } // All other cases of commas

-                else {

+                else {
                     $newline = true;

                 }

             } // Newline reserved words start a new line

-            elseif ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_RESERVED_NEWLINE) {

+            elseif ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_RESERVED_NEWLINE) {
                 // Add a newline before the reserved word (if not already added)

-                if (!$added_newline) {

+                if (!$added_newline) {
                     $return .= "\n" . str_repeat($tab, $indent_level);

                 }

 

                 // If the token may have extra whitespace

                 if (strpos($token[self::TOKEN_VALUE], ' ') !== false || strpos($token[self::TOKEN_VALUE],

                         "\n") !== false || strpos($token[self::TOKEN_VALUE], "\t") !== false

-                ) {

+                ) {
                     $highlighted = preg_replace('/\s+/', ' ', $highlighted);

                 }

             } // Multiple boundary characters in a row should not have spaces between them (not including parentheses)

-            elseif ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_BOUNDARY) {

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

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

+            elseif ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_BOUNDARY) {
+                if (isset($tokens[$i - 1]) && $tokens[$i - 1][self::TOKEN_TYPE] === self::TOKEN_TYPE_BOUNDARY) {
+                    if (isset($original_tokens[$token['i'] - 1]) && $original_tokens[$token['i'] - 1][self::TOKEN_TYPE] !== self::TOKEN_TYPE_WHITESPACE) {
                         $return = rtrim($return, ' ');

                     }

                 }

             }

 

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

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

+            if ($token[self::TOKEN_VALUE] === '.' || $token[self::TOKEN_VALUE] === ',' || $token[self::TOKEN_VALUE] === ';') {
                 $return = rtrim($return, ' ');

             }

 

             $return .= $highlighted . ' ';

 

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

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

+            if ($token[self::TOKEN_VALUE] === '(' || $token[self::TOKEN_VALUE] === '.') {
                 $return = rtrim($return, ' ');

             }

 

             // If this is the "-" of a negative number, it shouldn't have a space after it

-            if ($token[self::TOKEN_VALUE] === '-' && isset($tokens[$i + 1]) && $tokens[$i + 1][self::TOKEN_TYPE] === self::TOKEN_TYPE_NUMBER && isset($tokens[$i - 1])) {

+            if ($token[self::TOKEN_VALUE] === '-' && isset($tokens[$i + 1]) && $tokens[$i + 1][self::TOKEN_TYPE] === self::TOKEN_TYPE_NUMBER && isset($tokens[$i - 1])) {
                 $prev = $tokens[$i - 1][self::TOKEN_TYPE];

-                if ($prev !== self::TOKEN_TYPE_QUOTE && $prev !== self::TOKEN_TYPE_BACKTICK_QUOTE && $prev !== self::TOKEN_TYPE_WORD && $prev !== self::TOKEN_TYPE_NUMBER) {

+                if ($prev !== self::TOKEN_TYPE_QUOTE && $prev !== self::TOKEN_TYPE_BACKTICK_QUOTE && $prev !== self::TOKEN_TYPE_WORD && $prev !== self::TOKEN_TYPE_NUMBER) {
                     $return = rtrim($return, ' ');

                 }

             }

         }

 

         // If there are unmatched parentheses

-        if ($highlight && array_search('block', $indent_types) !== false) {

+        if ($highlight && array_search('block', $indent_types) !== false) {
             $return .= "\n" . self::highlightError("WARNING: unclosed parentheses or section");

         }

 

         // Replace tab characters with the configuration tab character

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

 

-        if ($highlight) {

+        if ($highlight) {
             $return = self::output($return);

         }

 

@@ -1303,13 +1303,13 @@ 
      *

      * @return String The SQL string with HTML styles applied

      */

-    public static function highlight($string)

-    {

+    public static function highlight($string)
+    {
         $tokens = self::tokenize($string);

 

         $return = '';

 

-        foreach ($tokens as $token) {

+        foreach ($tokens as $token) {
             $return .= self::highlightToken($token);

         }

 

@@ -1324,18 +1324,18 @@ 
      *

      * @return Array An array of individual query strings without trailing semicolons

      */

-    public static function splitQuery($string)

-    {

+    public static function splitQuery($string)
+    {
         $queries = array();

         $current_query = '';

         $empty = true;

 

         $tokens = self::tokenize($string);

 

-        foreach ($tokens as $token) {

+        foreach ($tokens as $token) {
             // If this is a query separator

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

-                if (!$empty) {

+            if ($token[self::TOKEN_VALUE] === ';') {
+                if (!$empty) {
                     $queries[] = $current_query . ';';

                 }

                 $current_query = '';

@@ -1344,14 +1344,14 @@ 
             }

 

             // If this is a non-empty character

-            if ($token[self::TOKEN_TYPE] !== self::TOKEN_TYPE_WHITESPACE && $token[self::TOKEN_TYPE] !== self::TOKEN_TYPE_COMMENT && $token[self::TOKEN_TYPE] !== self::TOKEN_TYPE_BLOCK_COMMENT) {

+            if ($token[self::TOKEN_TYPE] !== self::TOKEN_TYPE_WHITESPACE && $token[self::TOKEN_TYPE] !== self::TOKEN_TYPE_COMMENT && $token[self::TOKEN_TYPE] !== self::TOKEN_TYPE_BLOCK_COMMENT) {
                 $empty = false;

             }

 

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

         }

 

-        if (!$empty) {

+        if (!$empty) {
             $queries[] = trim($current_query);

         }

 

@@ -1365,15 +1365,15 @@ 
      *

      * @return String The SQL string without comments

      */

-    public static function removeComments($string)

-    {

+    public static function removeComments($string)
+    {
         $result = '';

 

         $tokens = self::tokenize($string);

 

-        foreach ($tokens as $token) {

+        foreach ($tokens as $token) {
             // Skip comment tokens

-            if ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_COMMENT || $token[self::TOKEN_TYPE] === self::TOKEN_TYPE_BLOCK_COMMENT) {

+            if ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_COMMENT || $token[self::TOKEN_TYPE] === self::TOKEN_TYPE_BLOCK_COMMENT) {
                 continue;

             }

 

@@ -1391,32 +1391,32 @@ 
      *

      * @return String The SQL string without comments

      */

-    public static function compress($string)

-    {

+    public static function compress($string)
+    {
         $result = '';

 

         $tokens = self::tokenize($string);

 

         $whitespace = true;

-        foreach ($tokens as $token) {

+        foreach ($tokens as $token) {
             // Skip comment tokens

-            if ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_COMMENT || $token[self::TOKEN_TYPE] === self::TOKEN_TYPE_BLOCK_COMMENT) {

+            if ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_COMMENT || $token[self::TOKEN_TYPE] === self::TOKEN_TYPE_BLOCK_COMMENT) {
                 continue;

             } // Remove extra whitespace in reserved words (e.g "OUTER     JOIN" becomes "OUTER JOIN")

-            elseif ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_RESERVED || $token[self::TOKEN_TYPE] === self::TOKEN_TYPE_RESERVED_NEWLINE || $token[self::TOKEN_TYPE] === self::TOKEN_TYPE_RESERVED_TOPLEVEL) {

+            elseif ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_RESERVED || $token[self::TOKEN_TYPE] === self::TOKEN_TYPE_RESERVED_NEWLINE || $token[self::TOKEN_TYPE] === self::TOKEN_TYPE_RESERVED_TOPLEVEL) {
                 $token[self::TOKEN_VALUE] = preg_replace('/\s+/', ' ', $token[self::TOKEN_VALUE]);

             }

 

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

+            if ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_WHITESPACE) {
                 // If the last token was whitespace, don't add another one

-                if ($whitespace) {

+                if ($whitespace) {
                     continue;

-                } else {

+                } else {
                     $whitespace = true;

                     // Convert all whitespace to a single space

                     $token[self::TOKEN_VALUE] = ' ';

                 }

-            } else {

+            } else {
                 $whitespace = false;

             }

 

@@ -1433,39 +1433,39 @@ 
      *

      * @return String HTML code of the highlighted token.

      */

-    protected static function highlightToken($token)

-    {

+    protected static function highlightToken($token)
+    {
         $type = $token[self::TOKEN_TYPE];

 

-        if (self::is_cli()) {

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

-        } else {

-            if (defined('ENT_IGNORE')) {

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

-            } else {

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

             }

         }

 

-        if ($type === self::TOKEN_TYPE_BOUNDARY) {

+        if ($type === self::TOKEN_TYPE_BOUNDARY) {
             return self::highlightBoundary($token);

-        } elseif ($type === self::TOKEN_TYPE_WORD) {

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

-        } elseif ($type === self::TOKEN_TYPE_BACKTICK_QUOTE) {

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

-        } elseif ($type === self::TOKEN_TYPE_QUOTE) {

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

-        } elseif ($type === self::TOKEN_TYPE_RESERVED) {

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

-        } elseif ($type === self::TOKEN_TYPE_RESERVED_TOPLEVEL) {

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

-        } elseif ($type === self::TOKEN_TYPE_RESERVED_NEWLINE) {

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

-        } elseif ($type === self::TOKEN_TYPE_NUMBER) {

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

-        } elseif ($type === self::TOKEN_TYPE_VARIABLE) {

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

-        } elseif ($type === self::TOKEN_TYPE_COMMENT || $type === self::TOKEN_TYPE_BLOCK_COMMENT) {

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

         }

 

@@ -1479,11 +1479,11 @@ 
      *

      * @return String HTML code of the highlighted token.

      */

-    protected static function highlightQuote($value)

-    {

-        if (self::is_cli()) {

+    protected static function highlightQuote($value)
+    {
+        if (self::is_cli()) {
             return self::$cli_quote . $value . "\x1b[0m";

-        } else {

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

         }

     }

@@ -1495,11 +1495,11 @@ 
      *

      * @return String HTML code of the highlighted token.

      */

-    protected static function highlightBacktickQuote($value)

-    {

-        if (self::is_cli()) {

+    protected static function highlightBacktickQuote($value)
+    {
+        if (self::is_cli()) {
             return self::$cli_backtick_quote . $value . "\x1b[0m";

-        } else {

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

         }

     }

@@ -1511,11 +1511,11 @@ 
      *

      * @return String HTML code of the highlighted token.

      */

-    protected static function highlightReservedWord($value)

-    {

-        if (self::is_cli()) {

+    protected static function highlightReservedWord($value)
+    {
+        if (self::is_cli()) {
             return self::$cli_reserved . $value . "\x1b[0m";

-        } else {

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

         }

     }

@@ -1527,15 +1527,15 @@ 
      *

      * @return String HTML code of the highlighted token.

      */

-    protected static function highlightBoundary($value)

-    {

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

+    protected static function highlightBoundary($value)
+    {
+        if ($value === '(' || $value === ')') {
             return $value;

         }

 

-        if (self::is_cli()) {

+        if (self::is_cli()) {
             return self::$cli_boundary . $value . "\x1b[0m";

-        } else {

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

         }

     }

@@ -1547,11 +1547,11 @@ 
      *

      * @return String HTML code of the highlighted token.

      */

-    protected static function highlightNumber($value)

-    {

-        if (self::is_cli()) {

+    protected static function highlightNumber($value)
+    {
+        if (self::is_cli()) {
             return self::$cli_number . $value . "\x1b[0m";

-        } else {

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

         }

     }

@@ -1563,11 +1563,11 @@ 
      *

      * @return String HTML code of the highlighted token.

      */

-    protected static function highlightError($value)

-    {

-        if (self::is_cli()) {

+    protected static function highlightError($value)
+    {
+        if (self::is_cli()) {
             return self::$cli_error . $value . "\x1b[0m";

-        } else {

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

         }

     }

@@ -1579,11 +1579,11 @@ 
      *

      * @return String HTML code of the highlighted token.

      */

-    protected static function highlightComment($value)

-    {

-        if (self::is_cli()) {

+    protected static function highlightComment($value)
+    {
+        if (self::is_cli()) {
             return self::$cli_comment . $value . "\x1b[0m";

-        } else {

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

         }

     }

@@ -1595,11 +1595,11 @@ 
      *

      * @return String HTML code of the highlighted token.

      */

-    protected static function highlightWord($value)

-    {

-        if (self::is_cli()) {

+    protected static function highlightWord($value)
+    {
+        if (self::is_cli()) {
             return self::$cli_word . $value . "\x1b[0m";

-        } else {

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

         }

     }

@@ -1611,11 +1611,11 @@ 
      *

      * @return String HTML code of the highlighted token.

      */

-    protected static function highlightVariable($value)

-    {

-        if (self::is_cli()) {

+    protected static function highlightVariable($value)
+    {
+        if (self::is_cli()) {
             return self::$cli_variable . $value . "\x1b[0m";

-        } else {

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

         }

     }

@@ -1627,8 +1627,8 @@ 
      *

      * @return String The quoted string

      */

-    private static function quote_regex($a)

-    {

+    private static function quote_regex($a)
+    {
         return preg_quote($a, '/');

     }

 

@@ -1639,13 +1639,13 @@ 
      *

      * @return String The quoted string

      */

-    private static function output($string)

-    {

-        if (self::is_cli()) {

+    private static function output($string)
+    {
+        if (self::is_cli()) {
             return $string . "\n";

-        } else {

+        } else {
             $string = trim($string);

-            if (!self::$use_pre) {

+            if (!self::$use_pre) {
                 return $string;

             }

 

@@ -1656,11 +1656,11 @@ 
     /**

      * @return bool

      */

-    private static function is_cli()

-    {

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

+    private static function is_cli()
+    {
+        if (isset(self::$cli)) {
             return self::$cli;

-        } else {

+        } else {
             return php_sapi_name() === 'cli';

         }

     }

assets/lib/SimpleTab/table.abstract.php

Spacing +16 added lines, -16 removed lines

@@ -1,8 +1,8 @@ 
 <?php namespace SimpleTab;

 

-require_once(MODX_BASE_PATH . 'assets/lib/MODxAPI/autoTable.abstract.php');

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

-require_once(MODX_BASE_PATH . 'assets/lib/Helpers/PHPThumb.php');

+require_once(MODX_BASE_PATH.'assets/lib/MODxAPI/autoTable.abstract.php');

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

+require_once(MODX_BASE_PATH.'assets/lib/Helpers/PHPThumb.php');

 

 /**

  * Class dataTable

@@ -59,7 +59,7 @@ 
         $rows = $this->query("SELECT MIN(`{$this->indexName}`) FROM {$table} WHERE `{$this->pkName}` IN ({$ids})");

         $index = $this->modx->db->getValue($rows);

         $index = $index - 1;

-        $this->query("SET @index := " . $index);

+        $this->query("SET @index := ".$index);

         $this->query("UPDATE {$table} SET `{$this->indexName}` = (@index := @index + 1) WHERE (`{$this->indexName}`>{$index} AND `{$this->rfName}`={$rid} AND `{$this->pkName}` NOT IN ({$ids})) ORDER BY `{$this->indexName}` ASC");

         $out = $this->modx->db->getAffectedRows();

 

@@ -94,13 +94,13 @@ 
         $cnt = count($ids);

         $ids = implode(',', $ids);

         if ($dir == 'top') {

-            $this->query("SET @index := " . ($index - $cnt - 1));

+            $this->query("SET @index := ".($index - $cnt - 1));

             $this->query("UPDATE {$table} SET `{$this->indexName}` = (@index := @index + 1) WHERE (`{$this->pkName}` IN ({$ids})) ORDER BY `{$this->indexName}` ASC");

             $this->query("SET @index := -1");

         } else {

             $this->query("SET @index := -1");

             $this->query("UPDATE {$table} SET `{$this->indexName}` = (@index := @index + 1) WHERE (`{$this->pkName}` IN ({$ids})) ORDER BY `{$this->indexName}` ASC");

-            $this->query("SET @index := " . ($cnt - 1));

+            $this->query("SET @index := ".($cnt - 1));

         }

         $this->query("UPDATE {$table} SET `{$this->indexName}` = (@index := @index + 1) WHERE (`{$this->pkName}` NOT IN ({$ids})) AND `{$this->rfName}` = {$rid} ORDER BY `{$this->indexName}` ASC");

         $out = $this->modx->db->getAffectedRows();

@@ -119,7 +119,7 @@ 
             return;

         }

         if ($this->fs->checkFile($url)) {

-            unlink(MODX_BASE_PATH . $url);

+            unlink(MODX_BASE_PATH.$url);

         }

         $dir = $this->fs->takeFileDir($url);

         $iterator = new \FilesystemIterator($dir);

@@ -129,8 +129,8 @@ 
         if ($cache) {

             return;

         }

-        $thumbsCache = \APIhelpers::getkey($this->params,'thumbsCache',$this->thumbsCache);

-        $thumb = $thumbsCache . $url;

+        $thumbsCache = \APIhelpers::getkey($this->params, 'thumbsCache', $this->thumbsCache);

+        $thumb = $thumbsCache.$url;

         if ($this->fs->checkFile($thumb)) {

             $this->deleteThumb($thumb, true);

         }

@@ -183,7 +183,7 @@ 
         $filename = $this->fs->takeFileName($name);

         $ext = $this->fs->takeFileExt($name);

 

-        return $this->modx->stripAlias($filename) . '.' . $ext;

+        return $this->modx->stripAlias($filename).'.'.$ext;

     }

 

     /**

@@ -196,12 +196,12 @@ 
      */

     public function reorder($source, $target, $point, $rid, $orderDir)

     {

-        $rid = (int)$rid;

+        $rid = (int) $rid;

         $point = strtolower($point);

         $orderDir = strtolower($orderDir);

-        $sourceIndex = (int)$source[$this->indexName];

-        $targetIndex = (int)$target[$this->indexName];

-        $sourceId = (int)$source[$this->pkName];

+        $sourceIndex = (int) $source[$this->indexName];

+        $targetIndex = (int) $target[$this->indexName];

+        $sourceId = (int) $source[$this->pkName];

         $table = $this->makeTable($this->table);

         $rows = 0;

         /* more refactoring  needed */

@@ -246,8 +246,8 @@ 
             return false;

         }

         $thumb = new \Helpers\PHPThumb();

-        $inputFile = MODX_BASE_PATH . $this->fs->relativePath($url);

-        $outputFile = MODX_BASE_PATH . $this->fs->relativePath($folder) . '/' . $this->fs->relativePath($url);

+        $inputFile = MODX_BASE_PATH.$this->fs->relativePath($url);

+        $outputFile = MODX_BASE_PATH.$this->fs->relativePath($folder).'/'.$this->fs->relativePath($url);

         $dir = $this->fs->takeFileDir($outputFile);

         $this->fs->makeDir($dir, $this->modx->config['new_folder_permissions']);

         if ($thumb->create($inputFile, $outputFile, $options)) {

Braces +46 added lines, -46 removed lines

@@ -8,8 +8,8 @@ 
  * Class dataTable

  * @package SimpleTab

  */

-class dataTable extends \autoTable

-{

+class dataTable extends \autoTable
+{
     /**

      * @var array

      */

@@ -40,8 +40,8 @@ 
      * @param \DocumentParser $modx

      * @param bool $debug

      */

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

-    {

+    public function __construct($modx, $debug = false)
+    {
         parent::__construct($modx, $debug);

         $this->modx = $modx;

         $this->fs = \Helpers\FS::getInstance();

@@ -51,8 +51,8 @@ 
      * @param $ids

      * @param $rid

      */

-    protected function clearIndexes($ids, $rid)

-    {

+    protected function clearIndexes($ids, $rid)
+    {
         $ids = $this->cleanIDs($ids, ',', array(0));

         $ids = $this->sanitarIn($ids);

         $table = $this->makeTable($this->table);

@@ -70,8 +70,8 @@ 
      * @param $field

      * @return $this

      */

-    public function touch($field)

-    {

+    public function touch($field)
+    {
         $this->set($field, date('Y-m-d H:i:s', time() + $this->modx->config['server_offset_time']));

 

         return $this;

@@ -82,22 +82,22 @@ 
      * @param $dir

      * @param $rid

      */

-    public function place($ids, $dir, $rid)

-    {

+    public function place($ids, $dir, $rid)
+    {
         $table = $this->makeTable($this->table);

         $ids = $this->cleanIDs($ids, ',', array(0));

-        if (empty($ids) || is_scalar($ids)) {

+        if (empty($ids) || is_scalar($ids)) {
             return false;

         }

         $rows = $this->query("SELECT count(`{$this->pkName}`) FROM {$table} WHERE `{$this->rfName}`={$rid}");

         $index = $this->modx->db->getValue($rows);

         $cnt = count($ids);

         $ids = implode(',', $ids);

-        if ($dir == 'top') {

+        if ($dir == 'top') {
             $this->query("SET @index := " . ($index - $cnt - 1));

             $this->query("UPDATE {$table} SET `{$this->indexName}` = (@index := @index + 1) WHERE (`{$this->pkName}` IN ({$ids})) ORDER BY `{$this->indexName}` ASC");

             $this->query("SET @index := -1");

-        } else {

+        } else {
             $this->query("SET @index := -1");

             $this->query("UPDATE {$table} SET `{$this->indexName}` = (@index := @index + 1) WHERE (`{$this->pkName}` IN ({$ids})) ORDER BY `{$this->indexName}` ASC");

             $this->query("SET @index := " . ($cnt - 1));

@@ -112,26 +112,26 @@ 
      * @param $url

      * @param bool $cache

      */

-    public function deleteThumb($url, $cache = false)

-    {

+    public function deleteThumb($url, $cache = false)
+    {
         $url = $this->fs->relativePath($url);

-        if (empty($url)) {

+        if (empty($url)) {
             return;

         }

-        if ($this->fs->checkFile($url)) {

+        if ($this->fs->checkFile($url)) {
             unlink(MODX_BASE_PATH . $url);

         }

         $dir = $this->fs->takeFileDir($url);

         $iterator = new \FilesystemIterator($dir);

-        if (!$iterator->valid()) {

+        if (!$iterator->valid()) {
             rmdir($dir);

         }

-        if ($cache) {

+        if ($cache) {
             return;

         }

         $thumbsCache = \APIhelpers::getkey($this->params,'thumbsCache',$this->thumbsCache);

         $thumb = $thumbsCache . $url;

-        if ($this->fs->checkFile($thumb)) {

+        if ($this->fs->checkFile($thumb)) {
             $this->deleteThumb($thumb, true);

         }

     }

@@ -141,8 +141,8 @@ 
      * @param bool $fire_events

      * @return $this

      */

-    public function delete($ids, $fire_events = false)

-    {

+    public function delete($ids, $fire_events = false)
+    {
         $out = parent::delete($ids, $fire_events);

         $this->query("ALTER TABLE {$this->makeTable($this->table)} AUTO_INCREMENT = 1");

 

@@ -155,8 +155,8 @@ 
      * @param bool $fire_events

      * @return $this

      */

-    public function deleteAll($ids, $rid, $fire_events = false)

-    {

+    public function deleteAll($ids, $rid, $fire_events = false)
+    {
         $this->clearIndexes($ids, $rid);

 

         return $this->delete($ids, $fire_events);

@@ -165,8 +165,8 @@ 
     /**

      * @return array

      */

-    public function fieldNames()

-    {

+    public function fieldNames()
+    {
         $fields = array_keys($this->getDefaultFields());

         $fields[] = $this->fieldPKName();

 

@@ -177,8 +177,8 @@ 
      * @param  string $name

      * @return string

      */

-    public function stripName($name)

-    {

+    public function stripName($name)
+    {
 

         $filename = $this->fs->takeFileName($name);

         $ext = $this->fs->takeFileExt($name);

@@ -194,8 +194,8 @@ 
      * @param $orderDir

      * @return int|void

      */

-    public function reorder($source, $target, $point, $rid, $orderDir)

-    {

+    public function reorder($source, $target, $point, $rid, $orderDir)
+    {
         $rid = (int)$rid;

         $point = strtolower($point);

         $orderDir = strtolower($orderDir);

@@ -205,25 +205,25 @@ 
         $table = $this->makeTable($this->table);

         $rows = 0;

         /* more refactoring  needed */

-        if ($targetIndex < $sourceIndex) {

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

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

                     "`{$this->indexName}`>={$targetIndex} AND `{$this->indexName}`<{$sourceIndex} AND `{$this->rfName}`={$rid}");

                 $rows = $this->modx->db->update("`{$this->indexName}`={$targetIndex}", $table,

                     "`{$this->pkName}`={$sourceId}");

-            } elseif (($point == 'bottom' && $orderDir == 'asc') || ($point == 'top' && $orderDir == 'desc')) {

+            } elseif (($point == 'bottom' && $orderDir == 'asc') || ($point == 'top' && $orderDir == 'desc')) {
                 $this->modx->db->update("`{$this->indexName}`=`{$this->indexName}`+1", $table,

                     "`{$this->indexName}`>{$targetIndex} AND `{$this->indexName}`<{$sourceIndex} AND `{$this->rfName}`={$rid}");

                 $rows = $this->modx->db->update("`{$this->indexName}`=1+{$targetIndex}", $table,

                     "`{$this->pkName}`={$sourceId}");

             }

-        } else {

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

+        } else {
+            if (($point == 'bottom' && $orderDir == 'asc') || ($point == 'top' && $orderDir == 'desc')) {
                 $this->modx->db->update("`{$this->indexName}`=`{$this->indexName}`-1", $table,

                     "`{$this->indexName}`<={$targetIndex} AND `{$this->indexName}`>={$sourceIndex} AND `{$this->rfName}`={$rid}");

                 $rows = $this->modx->db->update("`{$this->indexName}`={$targetIndex}", $table,

                     "`{$this->pkName}`={$sourceId}");

-            } elseif (($point == 'top' && $orderDir == 'asc') || ($point == 'bottom' && $orderDir == 'desc')) {

+            } elseif (($point == 'top' && $orderDir == 'asc') || ($point == 'bottom' && $orderDir == 'desc')) {
                 $this->modx->db->update("`{$this->indexName}`=`{$this->indexName}`-1", $table,

                     "`{$this->indexName}`<{$targetIndex} AND `{$this->indexName}`>={$sourceIndex} AND `{$this->rfName}`={$rid}");

                 $rows = $this->modx->db->update("`{$this->indexName}`=-1+{$targetIndex}", $table,

@@ -240,9 +240,9 @@ 
      * @param $options

      * @return bool

      */

-    public function makeThumb($folder, $url, $options)

-    {

-        if (empty($url)) {

+    public function makeThumb($folder, $url, $options)
+    {
+        if (empty($url)) {
             return false;

         }

         $thumb = new \Helpers\PHPThumb();

@@ -250,9 +250,9 @@ 
         $outputFile = MODX_BASE_PATH . $this->fs->relativePath($folder) . '/' . $this->fs->relativePath($url);

         $dir = $this->fs->takeFileDir($outputFile);

         $this->fs->makeDir($dir, $this->modx->config['new_folder_permissions']);

-        if ($thumb->create($inputFile, $outputFile, $options)) {

+        if ($thumb->create($inputFile, $outputFile, $options)) {
             return true;

-        } else {

+        } else {
             $this->modx->logEvent(0, 3, $thumb->debugMessages, __NAMESPACE__);

 

             return false;

@@ -262,17 +262,17 @@ 
     /**

      * @return array

      */

-    public function getParams()

-    {

+    public function getParams()
+    {
         return $this->params;

     }

 

     /**

      * @param array $params

      */

-    public function setParams($params = array())

-    {

-        if (is_array($params)) {

+    public function setParams($params = array())
+    {
+        if (is_array($params)) {
             $this->params = $params;

         }

     }

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

@@ -60,7 +60,7 @@ 
         $index = $this->modx->db->getValue($rows);

         $index = $index - 1;

         $this->query("SET @index := " . $index);

-        $this->query("UPDATE {$table} SET `{$this->indexName}` = (@index := @index + 1) WHERE (`{$this->indexName}`>{$index} AND `{$this->rfName}`={$rid} AND `{$this->pkName}` NOT IN ({$ids})) ORDER BY `{$this->indexName}` ASC");

+        $this->query("update {$table} SET `{$this->indexName}` = (@index := @index + 1) WHERE (`{$this->indexName}`>{$index} AND `{$this->rfName}`={$rid} AND `{$this->pkName}` NOT IN ({$ids})) ORDER BY `{$this->indexName}` ASC");

         $out = $this->modx->db->getAffectedRows();

 

         return $out;

@@ -95,14 +95,14 @@ 
         $ids = implode(',', $ids);

         if ($dir == 'top') {

             $this->query("SET @index := " . ($index - $cnt - 1));

-            $this->query("UPDATE {$table} SET `{$this->indexName}` = (@index := @index + 1) WHERE (`{$this->pkName}` IN ({$ids})) ORDER BY `{$this->indexName}` ASC");

+            $this->query("update {$table} SET `{$this->indexName}` = (@index := @index + 1) WHERE (`{$this->pkName}` IN ({$ids})) ORDER BY `{$this->indexName}` ASC");

             $this->query("SET @index := -1");

         } else {

             $this->query("SET @index := -1");

-            $this->query("UPDATE {$table} SET `{$this->indexName}` = (@index := @index + 1) WHERE (`{$this->pkName}` IN ({$ids})) ORDER BY `{$this->indexName}` ASC");

+            $this->query("update {$table} SET `{$this->indexName}` = (@index := @index + 1) WHERE (`{$this->pkName}` IN ({$ids})) ORDER BY `{$this->indexName}` ASC");

             $this->query("SET @index := " . ($cnt - 1));

         }

-        $this->query("UPDATE {$table} SET `{$this->indexName}` = (@index := @index + 1) WHERE (`{$this->pkName}` NOT IN ({$ids})) AND `{$this->rfName}` = {$rid} ORDER BY `{$this->indexName}` ASC");

+        $this->query("update {$table} SET `{$this->indexName}` = (@index := @index + 1) WHERE (`{$this->pkName}` NOT IN ({$ids})) AND `{$this->rfName}` = {$rid} ORDER BY `{$this->indexName}` ASC");

         $out = $this->modx->db->getAffectedRows();

 

         return $out;

assets/lib/MODxAPI/MODx.php

Spacing +31 added lines, -31 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');
 
 use \Doctrine\Common\Cache\Cache;
 
@@ -169,7 +169,7 @@ 
      */
     public function setDebug($flag)
     {
-        $this->_debug = (bool)$flag;
+        $this->_debug = (bool) $flag;
 
         return $this;
     }
@@ -199,7 +199,7 @@ 
         $value = trim($value);
         if (!empty($value)) {
             if (!is_numeric($value)) {
-                $value = (int)strtotime($value);
+                $value = (int) strtotime($value);
             }
             if (!empty($value)) {
                 $value += $this->modxConfig('server_offset_time');
@@ -276,7 +276,7 @@ 
      */
     final public function invokeEvent($name, $data = array(), $flag = false)
     {
-        if ((bool)$flag === true) {
+        if ((bool) $flag === true) {
             $this->modx->invokeEvent($name, $data);
         }
 
@@ -291,7 +291,7 @@ 
      */
     final public function getInvokeEventResult($name, $data = array(), $flag = null)
     {
-        $flag = (isset($flag) && $flag != '') ? (bool)$flag : false;
+        $flag = (isset($flag) && $flag != '') ? (bool) $flag : false;
 
         return $flag ? $this->modx->invokeEvent($name, $data) : false;
     }
@@ -320,7 +320,7 @@ 
      */
     final public function list_log($flush = false)
     {
-        echo '<pre>' . print_r(APIHelpers::sanitarTag($this->log), true) . '</pre>';
+        echo '<pre>'.print_r(APIHelpers::sanitarTag($this->log), true).'</pre>';
         if ($flush) {
             $this->clearLog();
         }
@@ -336,7 +336,7 @@ 
     {
         $path = $this->modx->getCachePath();
         if ($full) {
-            $path = MODX_BASE_PATH . substr($path, strlen(MODX_BASE_URL));
+            $path = MODX_BASE_PATH.substr($path, strlen(MODX_BASE_URL));
         }
 
         return $path;
@@ -351,7 +351,7 @@ 
         $IDs = array();
         if ($custom === false) {
             $this->modx->clearCache();
-            include_once(MODX_MANAGER_PATH . 'processors/cache_sync.class.processor.php');
+            include_once(MODX_MANAGER_PATH.'processors/cache_sync.class.processor.php');
             $sync = new synccache();
             $path = $this->getCachePath(true);
             $sync->setCachepath($path);
@@ -370,7 +370,7 @@ 
             }
             if (is_array($custom)) {
                 foreach ($custom as $id) {
-                    $tmp = glob(MODX_BASE_PATH . "assets/cache/docid_" . $id . $cacheFile);
+                    $tmp = glob(MODX_BASE_PATH."assets/cache/docid_".$id.$cacheFile);
                     foreach ($tmp as $file) {
                         if (is_readable($file)) {
                             unlink($file);
@@ -424,7 +424,7 @@ 
      */
     public function hasIgnore()
     {
-        return (bool)$this->ignoreError;
+        return (bool) $this->ignoreError;
     }
 
     /**
@@ -490,7 +490,7 @@ 
             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>");
+                throw new Exception("{$key} is invalid <pre>".print_r($this->field[$key], true)."</pre>");
             }
         }
         if (!empty($tmp) && $this->isChanged($key)) {
@@ -564,16 +564,16 @@ 
                 $IDs = explode($sep, $IDs);
             } else {
                 $IDs = array();
-                throw new Exception('Invalid IDs list <pre>' . print_r($IDs, 1) . '</pre>');
+                throw new Exception('Invalid IDs list <pre>'.print_r($IDs, 1).'</pre>');
             }
         }
         foreach ($IDs as $item) {
             $item = trim($item);
-            if (is_scalar($item) && (int)$item >= 0) { //Fix 0xfffffffff
-                if (!empty($ignore) && in_array((int)$item, $ignore, true)) {
-                    $this->log[] = 'Ignore id ' . (int)$item;
+            if (is_scalar($item) && (int) $item >= 0) { //Fix 0xfffffffff
+                if (!empty($ignore) && in_array((int) $item, $ignore, true)) {
+                    $this->log[] = 'Ignore id '.(int) $item;
                 } else {
-                    $out[] = (int)$item;
+                    $out[] = (int) $item;
                 }
             }
         }
@@ -601,14 +601,14 @@ 
                 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>");
+                    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>');
+            throw new Exception('Error from JSON decode: <pre>'.print_r($data, 1).'</pre>');
         }
 
         return $this;
@@ -626,13 +626,13 @@ 
             $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>");
+                throw new Exception("Can't call callback JSON pre pack <pre>".print_r($callback, 1)."</pre>");
             }
         }
         $json = json_encode($data);
 
         if ($this->jsonError($data)) {
-            throw new Exception('Error from JSON decode: <pre>' . print_r($data, 1) . '</pre>');
+            throw new Exception('Error from JSON decode: <pre>'.print_r($data, 1).'</pre>');
         }
 
         return $json;
@@ -663,11 +663,11 @@ 
         $tpl = '';
         $plh = '[+key+]';
         if ($prefix !== '') {
-            $tpl = $prefix . $sep;
+            $tpl = $prefix.$sep;
         }
         $tpl .= $plh;
         if ($suffix !== '') {
-            $tpl .= $sep . $suffix;
+            $tpl .= $sep.$suffix;
         }
         $out = array();
         $fields = $this->field;
@@ -717,7 +717,7 @@ 
                 $out[] = $this->escape($item);
             }
         }
-        $out = empty($out) ? '' : "'" . implode("','", $out) . "'";
+        $out = empty($out) ? '' : "'".implode("','", $out)."'";
 
         return $out;
     }
@@ -735,7 +735,7 @@ 
             foreach ($field as $_field) {
                 $val = $this->get($_field);
                 if ($val != '') {
-                    $where[] = "`" . $this->escape($_field) . "` = '" . $this->escape($val) . "'";
+                    $where[] = "`".$this->escape($_field)."` = '".$this->escape($val)."'";
                 }
             }
             $where = implode(' AND ', $where);
@@ -743,12 +743,12 @@ 
             $where = '';
             $val = $this->get($field);
             if ($val != '') {
-                $where = "`" . $this->escape($field) . "` = '" . $this->escape($val) . "'";
+                $where = "`".$this->escape($field)."` = '".$this->escape($val)."'";
             }
         }
 
         if ($where != '') {
-            $sql = $this->query("SELECT `" . $this->escape($PK) . "` FROM " . $this->makeTable($table) . " WHERE " . $where);
+            $sql = $this->query("SELECT `".$this->escape($PK)."` FROM ".$this->makeTable($table)." WHERE ".$where);
             $id = $this->modx->db->getValue($sql);
             if (!$id || (!$this->newDoc && $id == $this->getID())) {
                 $flag = true;
@@ -854,7 +854,7 @@ 
         if (version_compare($tmp, $version, '>=')) {
             $flag = true;
             if ($dmi3yy) {
-                $flag = (boolean)preg_match('/^' . $tmp . '(.*)\-d/', $currentVer);
+                $flag = (boolean) preg_match('/^'.$tmp.'(.*)\-d/', $currentVer);
             }
         }
 
@@ -948,7 +948,7 @@ 
      */
     public function getNoEncodeFields()
     {
-        return $this->_decodedFields->filter(function ($value) {
+        return $this->_decodedFields->filter(function($value){
             return ($value === false);
         });
     }
@@ -959,7 +959,7 @@ 
      */
     public function getNoDecodeFields()
     {
-        return $this->_decodedFields->filter(function ($value) {
+        return $this->_decodedFields->filter(function($value){
             return ($value === true);
         });
     }

Braces +4 added lines, -3 removed lines

@@ -569,7 +569,8 @@ 
         }
         foreach ($IDs as $item) {
             $item = trim($item);
-            if (is_scalar($item) && (int)$item >= 0) { //Fix 0xfffffffff
+            if (is_scalar($item) && (int)$item >= 0) {
+//Fix 0xfffffffff
                 if (!empty($ignore) && in_array((int)$item, $ignore, true)) {
                     $this->log[] = 'Ignore id ' . (int)$item;
                 } else {
@@ -948,7 +949,7 @@ 
      */
     public function getNoEncodeFields()
     {
-        return $this->_decodedFields->filter(function ($value) {
+        return $this->_decodedFields->filter(function ($value){
             return ($value === false);
         });
     }
@@ -959,7 +960,7 @@ 
      */
     public function getNoDecodeFields()
     {
-        return $this->_decodedFields->filter(function ($value) {
+        return $this->_decodedFields->filter(function ($value){
             return ($value === true);
         });
     }

assets/lib/MODxAPI/modResource.php

Spacing +37 added lines, -37 removed lines

@@ -164,7 +164,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`";

         $query = $this->query($query);

         $this->managerUsers = new DLCollection($modx, empty($query) ? array() : $query);

     }

@@ -228,7 +228,7 @@ 
     public function getUrl()

     {

         $out = null;

-        $id = (int)$this->getID();

+        $id = (int) $this->getID();

         if (!empty($id)) {

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

         }

@@ -281,8 +281,8 @@ 
     {

         $out = null;

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

-            include_once MODX_MANAGER_PATH . "includes/tmplvars.format.inc.php";

-            include_once MODX_MANAGER_PATH . "includes/tmplvars.commands.inc.php";

+            include_once MODX_MANAGER_PATH."includes/tmplvars.format.inc.php";

+            include_once MODX_MANAGER_PATH."includes/tmplvars.commands.inc.php";

             $tvval = $this->get($tvname);

             if ($this->isTVarrayField($tvname) && is_array($tvval)) {

                 $tvval = implode('||', $tvval);

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

             switch ($key) {

                 case 'parent':

-                    $value = (int)$value;

+                    $value = (int) $value;

                     break;

                 case 'template':

                     $value = trim($value);

                     $value = $this->setTemplate($value);

                     break;

                 case 'published':

-                    $value = (int)((bool)$value);

+                    $value = (int) ((bool) $value);

                     if ($value) {

                         $this->field['publishedon'] = time() + $this->modxConfig('server_offset_time');

                     }

@@ -353,7 +353,7 @@ 
                     }

                     break;

                 case 'deleted':

-                    $value = (int)((bool)$value);

+                    $value = (int) ((bool) $value);

                     if ($value) {

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

                     } else {

@@ -395,11 +395,11 @@ 
     protected function getUser($value, $default = 0)

     {

         $currentAdmin = APIHelpers::getkey($_SESSION, 'mgrInternalKey', 0);

-        $value = (int)$value;

+        $value = (int) $value;

         if (!empty($value)) {

             $by = $this->findUserBy($value);

-            $exists = $this->managerUsers->exists(function ($key, Helpers\Collection $val) use ($by, $value) {

-                return ($val->containsKey($by) && $val->get($by) === (string)$value);

+            $exists = $this->managerUsers->exists(function($key, Helpers\Collection $val) use ($by, $value) {

+                return ($val->containsKey($by) && $val->get($by) === (string) $value);

             });

             if (!$exists) {

                 $value = 0;

@@ -419,7 +419,7 @@ 
     protected function findUserBy($data)

     {

         switch (true) {

-            case (is_int($data) || ((int)$data > 0 && (string)intval($data) === $data)):

+            case (is_int($data) || ((int) $data > 0 && (string) intval($data) === $data)):

                 $find = 'id';

                 break;

             case filter_var($data, FILTER_VALIDATE_EMAIL):

@@ -469,9 +469,9 @@ 
             $this->markAllEncode();

             $this->newDoc = false;

 

-            $result = $this->query("SELECT * from {$this->makeTable('site_content')} where `id`=" . (int)$id);

+            $result = $this->query("SELECT * from {$this->makeTable('site_content')} where `id`=".(int) $id);

             $this->fromArray($this->modx->db->getRow($result));

-            $result = $this->query("SELECT * from {$this->makeTable('site_tmplvar_contentvalues')} where `contentid`=" . (int)$id);

+            $result = $this->query("SELECT * from {$this->makeTable('site_tmplvar_contentvalues')} where `contentid`=".(int) $id);

             while ($row = $this->modx->db->getRow($result)) {

                 $this->field[$this->tvid[$row['tmplvarid']]] = $row['value'];

             }

@@ -498,7 +498,7 @@ 
     {

         $parent = null;

         if ($this->field['pagetitle'] == '') {

-            $this->log['emptyPagetitle'] = 'Pagetitle is empty in <pre>' . print_r($this->field, true) . '</pre>';

+            $this->log['emptyPagetitle'] = 'Pagetitle is empty in <pre>'.print_r($this->field, true).'</pre>';

 

             return false;

         }

@@ -551,7 +551,7 @@ 
             }

             switch (true) {

                 case $key == 'parent':

-                    $parent = (int)$this->get($key);

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

                         $parent = 0;

@@ -570,10 +570,10 @@ 
 

         if (!empty($this->set)) {

             if ($this->newDoc) {

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

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

             } else {

-                $SQL = "UPDATE {$this->makeTable('site_content')} SET " . implode(', ',

-                        $this->set) . " WHERE `id` = " . $this->id;

+                $SQL = "UPDATE {$this->makeTable('site_content')} SET ".implode(', ',

+                        $this->set)." WHERE `id` = ".$this->id;

             }

             $this->query($SQL);

 

@@ -657,12 +657,12 @@ 
         $_ids = $this->cleanIDs($ids, ',', $ignore);

         if (is_array($_ids) && $_ids != array()) {

             $id = $this->sanitarIn($_ids);

-            $uid = (int)$this->modx->getLoginUserId();

+            $uid = (int) $this->modx->getLoginUserId();

             $deletedon = time() + $this->modxConfig('server_offset_time');

             $this->query("UPDATE {$this->makeTable('site_content')} SET `deleted`=1, `deletedby`={$uid}, `deletedon`={$deletedon} WHERE `id` IN ({$id})");

         } else {

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

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

@@ -744,15 +744,15 @@ 
     {

         $ignore = array(

             0, //empty document

-            (int)$this->modxConfig('site_start'),

-            (int)$this->modxConfig('error_page'),

-            (int)$this->modxConfig('unauthorized_page'),

-            (int)$this->modxConfig('site_unavailable_page')

+            (int) $this->modxConfig('site_start'),

+            (int) $this->modxConfig('error_page'),

+            (int) $this->modxConfig('unauthorized_page'),

+            (int) $this->modxConfig('site_unavailable_page')

         );

         $data = $this->query("SELECT DISTINCT setting_value FROM {$this->makeTable('web_user_settings')} WHERE `setting_name`='login_home' AND `setting_value`!=''");

         $data = $this->modx->db->makeArray($data);

         foreach ($data as $item) {

-            $ignore[] = (int)$item['setting_value'];

+            $ignore[] = (int) $item['setting_value'];

         }

 

         return array_unique($ignore);

@@ -775,9 +775,9 @@ 
             }

             if (($flag && $this->newDoc) || (!$this->newDoc && $flag && $this->id != $flag)) {

                 $suffix = substr($alias, -2);

-                if (preg_match('/-(\d+)/', $suffix, $tmp) && isset($tmp[1]) && (int)$tmp[1] > 1) {

-                    $suffix = (int)$tmp[1] + 1;

-                    $alias = substr($alias, 0, -2) . '-' . $suffix;

+                if (preg_match('/-(\d+)/', $suffix, $tmp) && isset($tmp[1]) && (int) $tmp[1] > 1) {

+                    $suffix = (int) $tmp[1] + 1;

+                    $alias = substr($alias, 0, -2).'-'.$suffix;

                 } else {

                     $alias .= '-2';

                 }

@@ -806,7 +806,7 @@ 
         $this->modx->_TVnames = $this->loadFromCache('_TVnames');

         if ($this->modx->_TVnames === false || empty($this->modx->_TVnames) || $reload) {

             $this->modx->_TVnames = array();

-            $result = $this->query('SELECT `id`,`name`,`default_text`,`type` FROM ' . $this->makeTable('site_tmplvars'));

+            $result = $this->query('SELECT `id`,`name`,`default_text`,`type` FROM '.$this->makeTable('site_tmplvars'));

             while ($row = $this->modx->db->GetRow($result)) {

                 $this->modx->_TVnames[$row['name']] = array(

                     "id"      => $row['id'],

@@ -840,7 +840,7 @@ 
     {

         $this->tvTpl = $this->loadFromCache('_tvTpl');

         if ($this->tvTpl === false) {

-            $q = $this->query("SELECT `tmplvarid`, `templateid` FROM " . $this->makeTable('site_tmplvar_templates'));

+            $q = $this->query("SELECT `tmplvarid`, `templateid` FROM ".$this->makeTable('site_tmplvar_templates'));

             $this->tvTpl = array();

             while ($item = $this->modx->db->getRow($q)) {

                 $this->tvTpl[$item['templateid']][] = $item['tmplvarid'];

@@ -875,20 +875,20 @@ 
      */

     public function setTemplate($tpl)

     {

-        if (!is_numeric($tpl) || $tpl != (int)$tpl) {

+        if (!is_numeric($tpl) || $tpl != (int) $tpl) {

             if (is_scalar($tpl)) {

-                $sql = "SELECT `id` FROM {$this->makeTable('site_templates')} WHERE `templatename` = '" . $this->escape($tpl) . "'";

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

+                throw new Exception("Invalid template name: ".print_r($tpl, 1));

             }

         }

 

-        return (int)$tpl;

+        return (int) $tpl;

     }

 

     /**

@@ -1012,7 +1012,7 @@ 
         if ($this->isEncodableField($field)) {

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

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

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

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

             } else {

                 $out = json_encode($data);

             }

@@ -1075,7 +1075,7 @@ 
             $docgroup_names = $this->makeTable('documentgroup_names');

 

             $rs = $this->query("SELECT `dg`.`document_group`, `dgn`.`name` FROM {$doc_groups} as `dg` INNER JOIN {$docgroup_names} as `dgn` ON `dgn`.`id`=`dg`.`document_group`

-                WHERE `dg`.`document` = " . $doc->getID());

+                WHERE `dg`.`document` = ".$doc->getID());

             while ($row = $this->modx->db->getRow($rs)) {

                 $out[$row['document_group']] = $row['name'];

             }

Braces +188 added lines, -188 removed lines

@@ -4,8 +4,8 @@ 
 /**

  * Class modResource

  */

-class modResource extends MODxAPI

-{

+class modResource extends MODxAPI
+{
     /**

      * @var string

      */

@@ -158,8 +158,8 @@ 
      * @param DocumentParser $modx

      * @param bool $debug

      */

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

-    {

+    public function __construct($modx, $debug = false)
+    {
         parent::__construct($modx, $debug);

         $this->get_TV();

         $uTable = $this->makeTable("manager_users");

@@ -172,8 +172,8 @@ 
     /**

      * @return array

      */

-    public function toArrayMain()

-    {

+    public function toArrayMain()
+    {
         $out = array_intersect_key(parent::toArray(), $this->default_field);

 

         return $out;

@@ -183,20 +183,20 @@ 
      * @param bool $render

      * @return array

      */

-    public function toArrayTV($render = false)

-    {

+    public function toArrayTV($render = false)
+    {
         $out = array_diff_key(parent::toArray(), $this->default_field);

         $tpl = $this->get('template');

         $tvTPL = APIHelpers::getkey($this->tvTpl, $tpl, array());

-        foreach ($tvTPL as $item) {

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

+        foreach ($tvTPL as $item) {
+            if (isset($this->tvid[$item]) && !array_key_exists($this->tvid[$item], $out)) {
                 $value = $this->get($this->tvid[$item]);

                 $out[$this->tvid[$item]] = empty($value) ? $this->tvd[$this->tvid[$item]] : $value;

             }

 

         }

-        if ($render) {

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

+        if ($render) {
+            foreach ($out as $key => $val) {
                 $out[$key] = $this->renderTV($key);

             }

         }

@@ -211,8 +211,8 @@ 
      * @param bool $render

      * @return array

      */

-    public function toArray($prefix = '', $suffix = '', $sep = '_', $render = true)

-    {

+    public function toArray($prefix = '', $suffix = '', $sep = '_', $render = true)
+    {
         $out = array_merge(

             $this->toArrayMain(),

             $this->toArrayTV($render),

@@ -225,11 +225,11 @@ 
     /**

      * @return null|string

      */

-    public function getUrl()

-    {

+    public function getUrl()
+    {
         $out = null;

         $id = (int)$this->getID();

-        if (!empty($id)) {

+        if (!empty($id)) {
             $out = $this->modx->makeUrl($id);

         }

 

@@ -241,10 +241,10 @@ 
      * @param string $second

      * @return mixed

      */

-    public function getTitle($main = 'menutitle', $second = 'pagetitle')

-    {

+    public function getTitle($main = 'menutitle', $second = 'pagetitle')
+    {
         $title = $this->get($main);

-        if (empty($title) && $title !== '0') {

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

         }

 

@@ -254,8 +254,8 @@ 
     /**

      * @return bool

      */

-    public function isWebShow()

-    {

+    public function isWebShow()
+    {
         $pub = ($this->get('publishedon') < time() && $this->get('published'));

         $unpub = ($this->get('unpub_date') == 0 || $this->get('unpub_date') > time());

         $del = ($this->get('deleted') == 0 && ($this->get('deletedon') == 0 || $this->get('deletedon') > time()));

@@ -266,8 +266,8 @@ 
     /**

      * @return $this

      */

-    public function touch()

-    {

+    public function touch()
+    {
         $this->set('editedon', time());

 

         return $this;

@@ -277,14 +277,14 @@ 
      * @param $tvname

      * @return null|string

      */

-    public function renderTV($tvname)

-    {

+    public function renderTV($tvname)
+    {
         $out = null;

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

+        if ($this->getID() > 0) {
             include_once MODX_MANAGER_PATH . "includes/tmplvars.format.inc.php";

             include_once MODX_MANAGER_PATH . "includes/tmplvars.commands.inc.php";

             $tvval = $this->get($tvname);

-            if ($this->isTVarrayField($tvname) && is_array($tvval)) {

+            if ($this->isTVarrayField($tvname) && is_array($tvval)) {
                 $tvval = implode('||', $tvval);

             }

             $param = APIHelpers::getkey($this->tvd, $tvname, array());

@@ -301,14 +301,14 @@ 
      * @param $key

      * @return mixed

      */

-    public function get($key)

-    {

+    public function get($key)
+    {
         $out = parent::get($key);

-        if (isset($this->tv[$key])) {

+        if (isset($this->tv[$key])) {
             $tpl = $this->get('template');

             $tvTPL = APIHelpers::getkey($this->tvTpl, $tpl, array());

             $tvID = APIHelpers::getkey($this->tv, $key, 0);

-            if (in_array($tvID, $tvTPL) && is_null($out)) {

+            if (in_array($tvID, $tvTPL) && is_null($out)) {
                 $out = APIHelpers::getkey($this->tvd, $key, null);

             }

         }

@@ -321,10 +321,10 @@ 
      * @param $value

      * @return $this

      */

-    public function set($key, $value)

-    {

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

-            switch ($key) {

+    public function set($key, $value)
+    {
+        if ((is_scalar($value) || $this->isTVarrayField($key) || $this->isJsonField($key)) && is_scalar($key) && !empty($key)) {
+            switch ($key) {
                 case 'parent':

                     $value = (int)$value;

                     break;

@@ -334,38 +334,38 @@ 
                     break;

                 case 'published':

                     $value = (int)((bool)$value);

-                    if ($value) {

+                    if ($value) {
                         $this->field['publishedon'] = time() + $this->modxConfig('server_offset_time');

                     }

                     break;

                 case 'pub_date':

                     $value = $this->getTime($value);

-                    if ($value > 0 && time() + $this->modxConfig('server_offset_time') > $value) {

+                    if ($value > 0 && time() + $this->modxConfig('server_offset_time') > $value) {
                         $this->field['published'] = 1;

                         $this->field['publishedon'] = $value;

                     }

                     break;

                 case 'unpub_date':

                     $value = $this->getTime($value);

-                    if ($value > 0 && time() + $this->modxConfig('server_offset_time') > $value) {

+                    if ($value > 0 && time() + $this->modxConfig('server_offset_time') > $value) {
                         $this->field['published'] = 0;

                         $this->field['publishedon'] = 0;

                     }

                     break;

                 case 'deleted':

                     $value = (int)((bool)$value);

-                    if ($value) {

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

-                    } else {

+                    } else {
                         $this->field['deletedon'] = 0;

                     }

                     break;

                 case 'deletedon':

                     $value = $this->getTime($value);

-                    if ($value > 0 && time() + $this->modxConfig('server_offset_time') < $value) {

+                    if ($value > 0 && time() + $this->modxConfig('server_offset_time') < $value) {
                         $value = 0;

                     }

-                    if ($value) {

+                    if ($value) {
                         $this->field['deleted'] = 1;

                     }

                     break;

@@ -392,20 +392,20 @@ 
      * @param int $default

      * @return int|mixed

      */

-    protected function getUser($value, $default = 0)

-    {

+    protected function getUser($value, $default = 0)
+    {
         $currentAdmin = APIHelpers::getkey($_SESSION, 'mgrInternalKey', 0);

         $value = (int)$value;

-        if (!empty($value)) {

+        if (!empty($value)) {
             $by = $this->findUserBy($value);

-            $exists = $this->managerUsers->exists(function ($key, Helpers\Collection $val) use ($by, $value) {

+            $exists = $this->managerUsers->exists(function ($key, Helpers\Collection $val) use ($by, $value){
                 return ($val->containsKey($by) && $val->get($by) === (string)$value);

             });

-            if (!$exists) {

+            if (!$exists) {
                 $value = 0;

             }

         }

-        if (empty($value)) {

+        if (empty($value)) {
             $value = empty($currentAdmin) ? $default : $currentAdmin;

         }

 

@@ -416,9 +416,9 @@ 
      * @param $data

      * @return bool|string

      */

-    protected function findUserBy($data)

-    {

-        switch (true) {

+    protected function findUserBy($data)
+    {
+        switch (true) {
             case (is_int($data) || ((int)$data > 0 && (string)intval($data) === $data)):

                 $find = 'id';

                 break;

@@ -439,11 +439,11 @@ 
      * @param array $data

      * @return $this

      */

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

-    {

+    public function create($data = array())
+    {
         $this->close();

         $fld = array();

-        foreach ($this->tvd as $name => $tv) {

+        foreach ($this->tvd as $name => $tv) {
             $fld[$name] = $tv['value'];

         };

         $this->store($fld);

@@ -461,10 +461,10 @@ 
      * @param $id

      * @return $this

      */

-    public function edit($id)

-    {

+    public function edit($id)
+    {
         $id = is_scalar($id) ? trim($id) : '';

-        if ($this->getID() != $id) {

+        if ($this->getID() != $id) {
             $this->close();

             $this->markAllEncode();

             $this->newDoc = false;

@@ -472,12 +472,12 @@ 
             $result = $this->query("SELECT * from {$this->makeTable('site_content')} where `id`=" . (int)$id);

             $this->fromArray($this->modx->db->getRow($result));

             $result = $this->query("SELECT * from {$this->makeTable('site_tmplvar_contentvalues')} where `contentid`=" . (int)$id);

-            while ($row = $this->modx->db->getRow($result)) {

+            while ($row = $this->modx->db->getRow($result)) {
                 $this->field[$this->tvid[$row['tmplvarid']]] = $row['value'];

             }

-            if (empty($this->field['id'])) {

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

-            } else {

+            } else {
                 $this->id = $this->field['id'];

                 $this->set('editedby', null)->touch();

                 $this->decodeFields();

@@ -494,10 +494,10 @@ 
      * @param bool $clearCache

      * @return bool|null

      */

-    public function save($fire_events = false, $clearCache = false)

-    {

+    public function save($fire_events = false, $clearCache = false)
+    {
         $parent = null;

-        if ($this->field['pagetitle'] == '') {

+        if ($this->field['pagetitle'] == '') {
             $this->log['emptyPagetitle'] = 'Pagetitle is empty in <pre>' . print_r($this->field, true) . '</pre>';

 

             return false;

@@ -509,7 +509,7 @@ 
             $this->field['parent'] == 0 &&

             !$this->modxConfig('udperms_allowroot') &&

             !($uid && isset($_SESSION['mgrRole']) && $_SESSION['mgrRole'] == 1)

-        ) {

+        ) {
             $this->log['rootForbidden'] = 'Only Administrators can create documents in the root folder because udperms_allowroot setting is off';

 

             return false;

@@ -525,11 +525,11 @@ 
         ), $fire_events);

 

         $fld = $this->encodeFields()->toArray(null, null, null, false);

-        foreach ($this->default_field as $key => $value) {

+        foreach ($this->default_field as $key => $value) {
             $tmp = $this->get($key);

-            if ($this->newDoc && (!is_int($tmp) && $tmp == '')) {

-                if ($tmp == $value) {

-                    switch ($key) {

+            if ($this->newDoc && (!is_int($tmp) && $tmp == '')) {
+                if ($tmp == $value) {
+                    switch ($key) {
                         case 'cacheable':

                             $value = $this->modxConfig('cache_default');

                             break;

@@ -549,11 +549,11 @@ 
                 }

                 $this->field[$key] = $value;

             }

-            switch (true) {

+            switch (true) {
                 case $key == 'parent':

                     $parent = (int)$this->get($key);

                     $q = $this->query("SELECT count(`id`) FROM {$this->makeTable('site_content')} WHERE `id`='{$parent}'");

-                    if ($this->modx->db->getValue($q) != 1) {

+                    if ($this->modx->db->getValue($q) != 1) {
                         $parent = 0;

                     }

                     $this->field[$key] = $parent;

@@ -568,38 +568,38 @@ 
             unset($fld[$key]);

         }

 

-        if (!empty($this->set)) {

-            if ($this->newDoc) {

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

-            } else {

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

                         $this->set) . " WHERE `id` = " . $this->id;

             }

             $this->query($SQL);

 

-            if ($this->newDoc) {

+            if ($this->newDoc) {
                 $this->id = $this->modx->db->getInsertId();

             }

 

-            if ($parent > 0) {

+            if ($parent > 0) {
                 $this->query("UPDATE {$this->makeTable('site_content')} SET `isfolder`='1' WHERE `id`='{$parent}'");

             }

         }

 

         $_deleteTVs = $_insertTVs = array();

-        foreach ($fld as $key => $value) {

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

+        foreach ($fld as $key => $value) {
+            if (empty($this->tv[$key]) || !$this->isChanged($key) || !$this->belongsToTemplate($this->tv[$key])) {
                 continue;

-            } elseif ($value === '') {

+            } elseif ($value === '') {
                 $_deleteTVs[] = $this->tv[$key];

-            } else {

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

             }

         }

 

-        if (!empty($_insertTVs)) {

+        if (!empty($_insertTVs)) {
             $values = array();

-            foreach ($_insertTVs as $id => $value) {

+            foreach ($_insertTVs as $id => $value) {
                 $values[] = "({$this->id}, {$id}, '{$value}')";

             }

             $values = implode(',', $values);

@@ -607,17 +607,17 @@ 
     `value` = VALUES(`value`)");

         }

 

-        if (!empty($_deleteTVs)) {

+        if (!empty($_deleteTVs)) {
             $ids = implode(',', $_deleteTVs);

             $this->query("DELETE FROM {$this->makeTable('site_tmplvar_contentvalues')} WHERE `contentid` = '{$this->id}' AND `tmplvarid` IN ({$ids})");

         }

 

-        if (!isset($this->mode)) {

+        if (!isset($this->mode)) {
             $this->mode = $this->newDoc ? "new" : "upd";

             $this->newDoc = false;

         }

 

-        if (!empty($this->groupIds)) {

+        if (!empty($this->groupIds)) {
             $this->setDocumentGroups($this->id, $this->groupIds);

         }

         $this->invokeEvent('OnDocFormSave', array(

@@ -627,7 +627,7 @@ 
             'docObj' => $this

         ), $fire_events);

 

-        if ($clearCache) {

+        if ($clearCache) {
             $this->clearCache($fire_events);

         }

         $this->decodeFields();

@@ -639,8 +639,8 @@ 
      * @param $tvId

      * @return bool

      */

-    protected function belongsToTemplate($tvId)

-    {

+    protected function belongsToTemplate($tvId)
+    {
         $template = $this->get('template');

 

         return isset($this->tvTpl[$template]) && in_array($tvId, $this->tvTpl[$template]);

@@ -651,16 +651,16 @@ 
      * @return $this

      * @throws Exception

      */

-    public function toTrash($ids)

-    {

+    public function toTrash($ids)
+    {
         $ignore = $this->systemID();

         $_ids = $this->cleanIDs($ids, ',', $ignore);

-        if (is_array($_ids) && $_ids != array()) {

+        if (is_array($_ids) && $_ids != array()) {
             $id = $this->sanitarIn($_ids);

             $uid = (int)$this->modx->getLoginUserId();

             $deletedon = time() + $this->modxConfig('server_offset_time');

             $this->query("UPDATE {$this->makeTable('site_content')} SET `deleted`=1, `deletedby`={$uid}, `deletedon`={$deletedon} WHERE `id` IN ({$id})");

-        } else {

+        } else {
             throw new Exception('Invalid IDs list for mark trash: <pre>' . print_r($ids,

                     1) . '</pre> please, check ignore list: <pre>' . print_r($ignore, 1) . '</pre>');

         }

@@ -672,11 +672,11 @@ 
      * @param bool $fire_events

      * @return $this

      */

-    public function clearTrash($fire_events = false)

-    {

+    public function clearTrash($fire_events = false)
+    {
         $q = $this->query("SELECT `id` FROM {$this->makeTable('site_content')} WHERE `deleted`='1'");

         $_ids = $this->modx->db->getColumn('id', $q);

-        if (is_array($_ids) && $_ids != array()) {

+        if (is_array($_ids) && $_ids != array()) {
             $this->invokeEvent('OnBeforeEmptyTrash', array(

                 "ids" => $_ids

             ), $fire_events);

@@ -698,15 +698,15 @@ 
      * @param int|bool $depth

      * @return array

      */

-    public function children($ids, $depth)

-    {

+    public function children($ids, $depth)
+    {
         $_ids = $this->cleanIDs($ids, ',');

-        if (is_array($_ids) && $_ids != array()) {

+        if (is_array($_ids) && $_ids != array()) {
             $id = $this->sanitarIn($_ids);

-            if (!empty($id)) {

+            if (!empty($id)) {
                 $q = $this->query("SELECT `id` FROM {$this->makeTable('site_content')} where `parent` IN ({$id})");

                 $id = $this->modx->db->getColumn('id', $q);

-                if ($depth > 0 || $depth === true) {

+                if ($depth > 0 || $depth === true) {
                     $id = $this->children($id, is_bool($depth) ? $depth : ($depth - 1));

                 }

                 $_ids = array_merge($_ids, $id);

@@ -722,8 +722,8 @@ 
      * @return $this

      * @throws Exception

      */

-    public function delete($ids, $fire_events = false)

-    {

+    public function delete($ids, $fire_events = false)
+    {
         $ids = $this->children($ids, true);

         $_ids = $this->cleanIDs($ids, ',', $this->systemID());

         $this->invokeEvent('OnBeforeDocFormDelete', array(

@@ -740,8 +740,8 @@ 
     /**

      * @return array

      */

-    private function systemID()

-    {

+    private function systemID()
+    {
         $ignore = array(

             0, //empty document

             (int)$this->modxConfig('site_start'),

@@ -751,7 +751,7 @@ 
         );

         $data = $this->query("SELECT DISTINCT setting_value FROM {$this->makeTable('web_user_settings')} WHERE `setting_name`='login_home' AND `setting_value`!=''");

         $data = $this->modx->db->makeArray($data);

-        foreach ($data as $item) {

+        foreach ($data as $item) {
             $ignore[] = (int)$item['setting_value'];

         }

 

@@ -763,22 +763,22 @@ 
      * @param $alias

      * @return string

      */

-    protected function checkAlias($alias)

-    {

+    protected function checkAlias($alias)
+    {
         $alias = strtolower($alias);

-        if ($this->modxConfig('friendly_urls')) {

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

-            if ((!$this->modxConfig('allow_duplicate_alias') && !$this->modxConfig('use_alias_path')) || ($this->modxConfig('allow_duplicate_alias') && $this->modxConfig('use_alias_path'))) {

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

-            } else {

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

             }

-            if (($flag && $this->newDoc) || (!$this->newDoc && $flag && $this->id != $flag)) {

+            if (($flag && $this->newDoc) || (!$this->newDoc && $flag && $this->id != $flag)) {
                 $suffix = substr($alias, -2);

-                if (preg_match('/-(\d+)/', $suffix, $tmp) && isset($tmp[1]) && (int)$tmp[1] > 1) {

+                if (preg_match('/-(\d+)/', $suffix, $tmp) && isset($tmp[1]) && (int)$tmp[1] > 1) {
                     $suffix = (int)$tmp[1] + 1;

                     $alias = substr($alias, 0, -2) . '-' . $suffix;

-                } else {

+                } else {
                     $alias .= '-2';

                 }

                 $alias = $this->checkAlias($alias);

@@ -792,8 +792,8 @@ 
      * @param $key

      * @return bool

      */

-    public function issetField($key)

-    {

+    public function issetField($key)
+    {
         return (array_key_exists($key, $this->default_field) || array_key_exists($key, $this->tv));

     }

 

@@ -801,13 +801,13 @@ 
      * @param bool $reload

      * @return $this

      */

-    protected function get_TV($reload = false)

-    {

+    protected function get_TV($reload = false)
+    {
         $this->modx->_TVnames = $this->loadFromCache('_TVnames');

-        if ($this->modx->_TVnames === false || empty($this->modx->_TVnames) || $reload) {

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

             $result = $this->query('SELECT `id`,`name`,`default_text`,`type` FROM ' . $this->makeTable('site_tmplvars'));

-            while ($row = $this->modx->db->GetRow($result)) {

+            while ($row = $this->modx->db->GetRow($result)) {
                 $this->modx->_TVnames[$row['name']] = array(

                     "id"      => $row['id'],

                     "type"    => $row['type'],

@@ -818,14 +818,14 @@ 
         }

         $arrayTypes = array('checkbox', 'listbox-multiple');

         $arrayTVs = array();

-        foreach ($this->modx->_TVnames as $name => $data) {

+        foreach ($this->modx->_TVnames as $name => $data) {
             $this->tvid[$data['id']] = $name;

             $this->tv[$name] = $data['id'];

-            if (in_array($data['type'], $arrayTypes)) {

+            if (in_array($data['type'], $arrayTypes)) {
                 $arrayTVs[] = $name;

             }

         }

-        if (empty($this->tvaFields)) {

+        if (empty($this->tvaFields)) {
             $this->tvaFields = $arrayTVs;

         }

         $this->loadTVTemplate()->loadTVDefault(array_values($this->tv));

@@ -836,13 +836,13 @@ 
     /**

      * @return $this

      */

-    protected function loadTVTemplate()

-    {

+    protected function loadTVTemplate()
+    {
         $this->tvTpl = $this->loadFromCache('_tvTpl');

-        if ($this->tvTpl === false) {

+        if ($this->tvTpl === false) {
             $q = $this->query("SELECT `tmplvarid`, `templateid` FROM " . $this->makeTable('site_tmplvar_templates'));

             $this->tvTpl = array();

-            while ($item = $this->modx->db->getRow($q)) {

+            while ($item = $this->modx->db->getRow($q)) {
                 $this->tvTpl[$item['templateid']][] = $item['tmplvarid'];

             }

             $this->saveToCache($this->tvTpl, '_tvTpl');

@@ -855,11 +855,11 @@ 
      * @param array $tvId

      * @return $this

      */

-    protected function loadTVDefault(array $tvId = array())

-    {

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

+    protected function loadTVDefault(array $tvId = array())
+    {
+        if (is_array($tvId) && !empty($tvId)) {
             $this->tvd = array();

-            foreach ($tvId as $id) {

+            foreach ($tvId as $id) {
                 $name = $this->tvid[$id];

                 $this->tvd[$name] = $this->modx->_TVnames[$name]['default'];

             }

@@ -873,17 +873,17 @@ 
      * @return int

      * @throws Exception

      */

-    public function setTemplate($tpl)

-    {

-        if (!is_numeric($tpl) || $tpl != (int)$tpl) {

-            if (is_scalar($tpl)) {

+    public function setTemplate($tpl)
+    {
+        if (!is_numeric($tpl) || $tpl != (int)$tpl) {
+            if (is_scalar($tpl)) {
                 $sql = "SELECT `id` FROM {$this->makeTable('site_templates')} WHERE `templatename` = '" . $this->escape($tpl) . "'";

                 $rs = $this->query($sql);

-                if (!$rs || $this->modx->db->getRecordCount($rs) <= 0) {

+                if (!$rs || $this->modx->db->getRecordCount($rs) <= 0) {
                     throw new Exception("Template {$tpl} is not exists");

                 }

                 $tpl = $this->modx->db->getValue($rs);

-            } else {

+            } else {
                 throw new Exception("Invalid template name: " . print_r($tpl, 1));

             }

         }

@@ -894,14 +894,14 @@ 
     /**

      * @return string

      */

-    protected function getAlias()

-    {

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

+    protected function getAlias()
+    {
+        if ($this->modxConfig('friendly_urls') && $this->modxConfig('automatic_alias') && $this->get('alias') == '') {
             $alias = strtr($this->get('pagetitle'), $this->table);

-        } else {

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

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

-            } else {

+            } else {
                 $alias = '';

             }

         }

@@ -918,10 +918,10 @@ 
      *

      * Пересчет menuindex по полю таблицы site_content

      */

-    public function updateMenuindex($parent, $criteria = 'id', $dir = 'asc')

-    {

+    public function updateMenuindex($parent, $criteria = 'id', $dir = 'asc')
+    {
         $dir = strtolower($dir) == 'desc' ? 'desc' : 'asc';

-        if (is_integer($parent) && $criteria !== '') {

+        if (is_integer($parent) && $criteria !== '') {
             $this->query("SET @index := 0");

             $this->query("UPDATE {$this->makeTable('site_content')} SET `menuindex` = (@index := @index + 1) WHERE `parent`={$parent} ORDER BY {$criteria} {$dir}");

         }

@@ -934,37 +934,37 @@ 
      *

      * @return $this

      */

-    public function setDefaultTemplate()

-    {

+    public function setDefaultTemplate()
+    {
         $parent = $this->get('parent');

         $template = $this->modxConfig('default_template');

-        switch ($this->modxConfig('auto_template_logic')) {

+        switch ($this->modxConfig('auto_template_logic')) {
             case 'sibling':

-                if (!$parent) {

+                if (!$parent) {
                     $site_start = $this->modxConfig('site_start');

                     $where = "sc.isfolder=0 AND sc.id!={$site_start}";

                     $sibl = $this->modx->getDocumentChildren($parent, 1, 0, 'template', $where, 'menuindex', 'ASC', 1);

-                    if (isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {

+                    if (isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
                         $template = $sibl[0]['template'];

                     }

-                } else {

+                } else {
                     $sibl = $this->modx->getDocumentChildren($parent, 1, 0, 'template', 'isfolder=0', 'menuindex',

                         'ASC', 1);

-                    if (isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {

+                    if (isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
                         $template = $sibl[0]['template'];

-                    } else {

+                    } else {
                         $sibl = $this->modx->getDocumentChildren($parent, 0, 0, 'template', 'isfolder=0', 'menuindex',

                             'ASC', 1);

-                        if (isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {

+                        if (isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
                             $template = $sibl[0]['template'];

                         }

                     }

                 }

                 break;

             case 'parent':

-                if ($parent) {

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

-                    if (isset($_parent['template'])) {

+                    if (isset($_parent['template'])) {
                         $template = $_parent['template'];

                     }

                 }

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

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

      */

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

-    {

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

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

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

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

+            if ($this->isTVarrayField($field)) {
                 $out = explode('||', $data);

-            } else {

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

             }

         }

-        if ($store) {

+        if ($store) {
             $this->field[$field] = $out;

             $this->markAsDecode($field);

         }

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

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

      */

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

-    {

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

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

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

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

+            if ($this->isTVarrayField($field)) {
                 $out = is_array($data) ? implode('||', $data) : (string)$data;

-            } else {

+            } else {
                 $out = json_encode($data);

             }

         }

-        if ($store) {

+        if ($store) {
             $this->field[$field] = $out;

             $this->markAsEncode($field);

         }

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

      * @return boolean

      */

-    public function isTVarrayField($field)

-    {

+    public function isTVarrayField($field)
+    {
         return (is_scalar($field) && in_array($field, $this->tvaFields));

     }

 

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

      * @return $this

      */

-    public function markAllEncode()

-    {

+    public function markAllEncode()
+    {
         parent::markAllEncode();

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

+        foreach ($this->tvaFields as $field) {
             $this->markAsEncode($field);

         }

 

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

      * @return $this

      */

-    public function markAllDecode()

-    {

+    public function markAllDecode()
+    {
         parent::markAllDecode();

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

+        foreach ($this->tvaFields as $field) {
             $this->markAsDecode($field);

         }

 

@@ -1066,17 +1066,17 @@ 
     /**

      * @param int $docId

      */

-    public function getDocumentGroups($docId = 0)

-    {

+    public function getDocumentGroups($docId = 0)
+    {
         $out = array();

         $doc = $this->switchObject($docId);

-        if (null !== $doc->getID()) {

+        if (null !== $doc->getID()) {
             $doc_groups = $this->makeTable('document_groups');

             $docgroup_names = $this->makeTable('documentgroup_names');

 

             $rs = $this->query("SELECT `dg`.`document_group`, `dgn`.`name` FROM {$doc_groups} as `dg` INNER JOIN {$docgroup_names} as `dgn` ON `dgn`.`id`=`dg`.`document_group`

                 WHERE `dg`.`document` = " . $doc->getID());

-            while ($row = $this->modx->db->getRow($rs)) {

+            while ($row = $this->modx->db->getRow($rs)) {
                 $out[$row['document_group']] = $row['name'];

             }

 

@@ -1091,20 +1091,20 @@ 
      * @param array $groupIds

      * @return $this

      */

-    public function setDocumentGroups($docId = 0, $groupIds = array())

-    {

-        if (!is_array($groupIds)) {

+    public function setDocumentGroups($docId = 0, $groupIds = array())
+    {
+        if (!is_array($groupIds)) {
             return $this;

         }

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

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

-        } else {

+        } else {
             $doc = $this->switchObject($docId);

-            if ($id = $doc->getID()) {

-                foreach ($groupIds as $gid) {

+            if ($id = $doc->getID()) {
+                foreach ($groupIds as $gid) {
                     $this->query("REPLACE INTO {$this->makeTable('document_groups')} (`document_group`, `document`) VALUES ('{$gid}', '{$id}')");

                 }

-                if (!$this->newDoc) {

+                if (!$this->newDoc) {
                     $groupIds = empty($groupIds) ? '0' : implode(',', $groupIds);

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

                 }

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

@@ -572,7 +572,7 @@ 
             if ($this->newDoc) {

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

             } else {

-                $SQL = "UPDATE {$this->makeTable('site_content')} SET " . implode(', ',

+                $SQL = "update {$this->makeTable('site_content')} SET " . implode(', ',

                         $this->set) . " WHERE `id` = " . $this->id;

             }

             $this->query($SQL);

@@ -582,7 +582,7 @@ 
             }

 

             if ($parent > 0) {

-                $this->query("UPDATE {$this->makeTable('site_content')} SET `isfolder`='1' WHERE `id`='{$parent}'");

+                $this->query("update {$this->makeTable('site_content')} SET `isfolder`='1' WHERE `id`='{$parent}'");

             }

         }

 

@@ -659,7 +659,7 @@ 
             $id = $this->sanitarIn($_ids);

             $uid = (int)$this->modx->getLoginUserId();

             $deletedon = time() + $this->modxConfig('server_offset_time');

-            $this->query("UPDATE {$this->makeTable('site_content')} SET `deleted`=1, `deletedby`={$uid}, `deletedon`={$deletedon} WHERE `id` IN ({$id})");

+            $this->query("update {$this->makeTable('site_content')} SET `deleted`=1, `deletedby`={$uid}, `deletedon`={$deletedon} 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>');

@@ -880,7 +880,7 @@ 
                 $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");

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

                 }

                 $tpl = $this->modx->db->getValue($rs);

             } else {

@@ -923,7 +923,7 @@ 
         $dir = strtolower($dir) == 'desc' ? 'desc' : 'asc';

         if (is_integer($parent) && $criteria !== '') {

             $this->query("SET @index := 0");

-            $this->query("UPDATE {$this->makeTable('site_content')} SET `menuindex` = (@index := @index + 1) WHERE `parent`={$parent} ORDER BY {$criteria} {$dir}");

+            $this->query("update {$this->makeTable('site_content')} SET `menuindex` = (@index := @index + 1) WHERE `parent`={$parent} ORDER BY {$criteria} {$dir}");

         }

 

         return $this;