AgelxNash / DocLister

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

Braces +69 added lines, -27 removed lines

@@ -40,7 +40,9 @@ 
         $this->maxPasses = ($maxpass != '') ? $maxpass : 50;
         $this->swapSnippetCache = array();
         $modx->setPlaceholder("phx", "&_PHX_INTERNAL_&");
-        if (function_exists('mb_internal_encoding')) mb_internal_encoding($modx->config['modx_charset']);
+        if (function_exists('mb_internal_encoding')) {

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

+        }

     }
 
     // Plugin event hook for MODx
@@ -60,7 +62,9 @@ 
     {
         global $modx;
         // If we already reached max passes don't get at it again.
-        if ($this->curPass == $this->maxPasses) return $template;
+        if ($this->curPass == $this->maxPasses) {

+            return $template;

+        }

         // Set template pre-process hash
         $st = md5($template);
         // Replace non-call characters in the template: [, ]
@@ -78,7 +82,9 @@ 
         // Set template post-process hash
         $et = md5($template);
         // If template has changed, parse it once more...
-        if ($st != $et) $template = $this->Parse($template);
+        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) {
             $modx->logEvent($this->curPass, 1, $this->createEventLog(), $this->name . ' ' . $this->version);
@@ -196,9 +202,13 @@ 
         $et = md5($template); // Post-process template hash
 
         // Log an event if this was the maximum pass
-        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->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)) $template = $this->ParseValues($template);
+        if (($this->curPass < $this->maxPasses) && ($st != $et)) {

+            $template = $this->ParseValues($template);

+        }

 
         return $template;
     }
@@ -217,7 +227,9 @@ 
             for ($i = 0; $i < $count; $i++) {
                 $output = trim($output);
                 $this->Log("  |--- Modifier = '" . $modifier_cmd[$i] . "'");
-                if ($modifier_value[$i] != '') $this->Log("  |--- Options = '" . $modifier_value[$i] . "'");
+                if ($modifier_value[$i] != '') {

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

+                }

                 switch ($modifier_cmd[$i]) {
                     #####  Conditional Modifiers
                     case "input":
@@ -260,7 +272,9 @@ 
                     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_&") $output = $this->user["id"];
+                        if ($output == "&_PHX_INTERNAL_&") {

+                            $output = $this->user["id"];

+                        }

                         $grps = ($this->strlen($modifier_value[$i]) > 0) ? explode(",", $modifier_value[$i]) : array();
                         $condition[] = intval($this->isMemberOfWebGroupByUserId($output, $grps));
                         break;
@@ -377,11 +391,15 @@ 
                         $output = eval("return " . $filter . ";");
                         break;
                     case "isnotempty":
-                        if (!empty($output)) $output = $modifier_value[$i];
+                        if (!empty($output)) {

+                            $output = $modifier_value[$i];

+                        }

                         break;
                     case "isempty":
                     case "ifempty":
-                        if (empty($output)) $output = $modifier_value[$i];
+                        if (empty($output)) {

+                            $output = $modifier_value[$i];

+                        }

                         break;
                     case "nl2br":
                         $output = nl2br($output);
@@ -391,7 +409,9 @@ 
                         break;
                     case "set":
                         $c = $i + 1;
-                        if ($count > $c && $modifier_cmd[$c] == "value") $output = preg_replace("~([^a-zA-Z0-9])~", "", $modifier_value[$i]);
+                        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") {
@@ -403,11 +423,15 @@ 
                         $output = md5($output);
                         break;
                     case "userinfo":
-                        if ($output == "&_PHX_INTERNAL_&") $output = $this->user["id"];
+                        if ($output == "&_PHX_INTERNAL_&") {

+                            $output = $this->user["id"];

+                        }

                         $output = $this->ModUser($output, $modifier_value[$i]);
                         break;
                     case "inrole": // deprecated
-                        if ($output == "&_PHX_INTERNAL_&") $output = $this->user["id"];
+                        if ($output == "&_PHX_INTERNAL_&") {

+                            $output = $this->user["id"];

+                        }

                         $grps = ($this->strlen($modifier_value[$i]) > 0) ? explode(",", $modifier_value[$i]) : array();
                         $output = intval($this->isMemberOfWebGroupByUserId($output, $grps));
                         break;
@@ -451,7 +475,9 @@ 
                         ob_end_clean();
                         break;
                 }
-                if (count($condition)) $this->Log("  |--- Condition = '" . $condition[count($condition) - 1] . "'");
+                if (count($condition)) {

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

+                }

                 $this->Log("  |--- Output = '" . $output . "'");
             }
         }
@@ -531,7 +557,9 @@ 
         global $modx;
 
         // if $groupNames is not an array return false
-        if (!is_array($groupNames)) return false;
+        if (!is_array($groupNames)) {

+            return false;

+        }

 
         // if the user id is a negative number make it positive
         if (intval($userid) < 0) {
@@ -548,8 +576,9 @@ 
             $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)) return true;
+        foreach ($groupNames as $k => $v) {

+                    if (in_array(trim($v), $grpNames)) return true;

+        }

 
         // If we get here the above logic did not find a match, so return false
         return false;
@@ -572,52 +601,65 @@ 
     // Sets a placeholder variable which can only be access by PHx
     function setPHxVariable($name, $value)
     {
-        if ($name != "phx") $this->placeholders[$name] = $value;
+        if ($name != "phx") {

+            $this->placeholders[$name] = $value;

+        }

     }
 
     //mbstring
     function substr($str, $s, $l = null)
     {
-        if (function_exists('mb_substr')) return mb_substr($str, $s, $l);
+        if (function_exists('mb_substr')) {

+            return mb_substr($str, $s, $l);

+        }

         return substr($str, $s, $l);
     }
 
     function strlen($str)
     {
-        if (function_exists('mb_strlen')) return mb_strlen($str);
+        if (function_exists('mb_strlen')) {

+            return mb_strlen($str);

+        }

         return strlen($str);
     }
 
     function strtolower($str)
     {
-        if (function_exists('mb_strtolower')) return mb_strtolower($str);
+        if (function_exists('mb_strtolower')) {

+            return mb_strtolower($str);

+        }

         return strtolower($str);
     }
 
     function strtoupper($str)
     {
-        if (function_exists('mb_strtoupper')) return mb_strtoupper($str);
+        if (function_exists('mb_strtoupper')) {

+            return mb_strtoupper($str);

+        }

         return strtoupper($str);
     }
 
     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));
+        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 ucfirst($str);
     }
 
     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));
+        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 lcfirst($str);
     }
 
     function ucwords($str)
     {
-        if (function_exists('mb_convert_case'))
-            return mb_convert_case($str, MB_CASE_TITLE);
+        if (function_exists('mb_convert_case')) {

+                    return mb_convert_case($str, MB_CASE_TITLE);

+        }

         return ucwords($str);
     }
 

Spacing +37 added lines, -37 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
@@ -137,7 +137,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);
@@ -147,7 +147,7 @@ 
         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) {
-            $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;
         }
         // Return the processed template
@@ -178,8 +178,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);
@@ -195,10 +195,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
@@ -227,19 +227,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)) {
                             // not set so try again later.
@@ -275,7 +275,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
@@ -283,8 +283,8 @@ 
             $condition = array();
             for ($i = 0; $i < $count; $i++) {
                 $output = trim($output);
-                $this->Log("  |--- Modifier = '" . $modifier_cmd[$i] . "'");
-                if ($modifier_value[$i] != '') $this->Log("  |--- Options = '" . $modifier_value[$i] . "'");
+                $this->Log("  |--- Modifier = '".$modifier_cmd[$i]."'");
+                if ($modifier_value[$i] != '') $this->Log("  |--- Options = '".$modifier_value[$i]."'");
                 switch ($modifier_cmd[$i]) {
                     #####  Conditional Modifiers
                     case "input":
@@ -339,14 +339,14 @@ 
                         break;
                     case "show":
                         $conditional = implode(' ', $condition);
-                        $isvalid = intval(eval("return (" . $conditional . ");"));
+                        $isvalid = intval(eval("return (".$conditional.");"));
                         if (!$isvalid) {
                             $output = NULL;
                         }
                         break;
                     case "then":
                         $conditional = implode(' ', $condition);
-                        $isvalid = intval(eval("return (" . $conditional . ");"));
+                        $isvalid = intval(eval("return (".$conditional.");"));
                         if ($isvalid) {
                             $output = $modifier_value[$i];
                         } else {
@@ -355,7 +355,7 @@ 
                         break;
                     case "else":
                         $conditional = implode(' ', $condition);
-                        $isvalid = intval(eval("return (" . $conditional . ");"));
+                        $isvalid = intval(eval("return (".$conditional.");"));
                         if (!$isvalid) {
                             $output = $modifier_value[$i];
                         }
@@ -442,7 +442,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)) $output = $modifier_value[$i];
@@ -463,7 +463,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;
@@ -484,25 +484,25 @@ 
                     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);
                                 $snippet = $modx->snippetCache[$row['name']] = $row['snippet'];
                                 $this->Log("  |--- DB -> Custom Modifier");
                             } 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");
@@ -517,15 +517,15 @@ 
                             $options = $modifier_value[$i];
                             $custom = eval($cm);
                             $msg = ob_get_contents();
-                            $output = $msg . $custom;
+                            $output = $msg.$custom;
                             ob_end_clean();
                         } else {
                             $output = '';
                         }
                         break;
                 }
-                if (count($condition)) $this->Log("  |--- Condition = '" . $condition[count($condition) - 1] . "'");
-                $this->Log("  |--- Output = '" . $output . "'");
+                if (count($condition)) $this->Log("  |--- Condition = '".$condition[count($condition) - 1]."'");
+                $this->Log("  |--- Output = '".$output."'");
             }
         }
         return $output;
@@ -540,7 +540,7 @@ 
         if (!empty($this->console)) {
             $console = implode("\n", $this->console);
             $this->console = array();
-            return '<pre style="overflow: auto;">' . $console . '</pre>';
+            return '<pre style="overflow: auto;">'.$console.'</pre>';
         }
     }
 
@@ -564,7 +564,7 @@ 
     {
         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);
         }
     }
 
@@ -576,14 +576,14 @@ 
     {
         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
@@ -592,7 +592,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);
     }
 
 
@@ -641,7 +641,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];
@@ -732,7 +732,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);
     }
 
@@ -743,7 +743,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);
     }
 

assets/lib/Helpers/FS.php

Spacing +18 added lines, -18 removed lines

@@ -68,7 +68,7 @@ 
             $file = $mode = '';
         }
         $flag = !(empty($file) || empty($mode));
-        $f = MODX_BASE_PATH . $this->relativePath($file);
+        $f = MODX_BASE_PATH.$this->relativePath($file);
         if ($flag && !isset($this->_fileInfo[$f], $this->_fileInfo[$f][$mode])) {
             $this->_fileInfo[$f] = pathinfo($f);
         }
@@ -118,7 +118,7 @@ 
      */
     public function checkFile($file)
     {
-        $f = is_scalar($file) ? MODX_BASE_PATH . $this->relativePath($file) : '';
+        $f = is_scalar($file) ? MODX_BASE_PATH.$this->relativePath($file) : '';
         return (!empty($f) && is_file($f) && is_readable($f));
     }
 
@@ -129,7 +129,7 @@ 
     public function checkDir($path)
     {
         $f = is_scalar($path) ? $this->relativePath($path) : '';
-        return (!empty($f) && is_dir(MODX_BASE_PATH . $f) && is_readable(MODX_BASE_PATH . $f));
+        return (!empty($f) && is_dir(MODX_BASE_PATH.$f) && is_readable(MODX_BASE_PATH.$f));
     }
 
     /**
@@ -141,12 +141,12 @@ 
     {
         $out = 0;
         if ($this->checkFile($file)) {
-            $out = filesize(MODX_BASE_PATH . $this->relativePath($file));
+            $out = filesize(MODX_BASE_PATH.$this->relativePath($file));
         }
         if ($format) {
             $types = array('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
             $size = $out > 0 ? floor(log($out, 1024)) : 0;
-            $out = number_format($out / pow(1024, $size), 2, '.', ',') . ' ' . $types[$size];
+            $out = number_format($out / pow(1024, $size), 2, '.', ',').' '.$types[$size];
         }
         return $out;
     }
@@ -166,7 +166,7 @@ 
         $out = null;
         $path = $this->relativePath($file);
         if ($this->checkFile($path)) {
-            $fname = MODX_BASE_PATH . $path;
+            $fname = MODX_BASE_PATH.$path;
             switch (true) {
                 /** need fileinfo extension */
                 case (extension_loaded('fileinfo') && class_exists('\finfo')):
@@ -216,7 +216,7 @@ 
     public function makeDir($path, $perm = 0755)
     {
         if (!$this->checkDir($path)) {
-            $path = MODX_BASE_PATH . $this->relativePath($path);
+            $path = MODX_BASE_PATH.$this->relativePath($path);
             $flag = mkdir($path, $this->toOct($perm), true);
         } else {
             $flag = true;
@@ -234,8 +234,8 @@ 
     public function copyFile($from, $to, $chmod = 0644)
     {
         $flag = false;
-        $from = MODX_BASE_PATH . $this->relativePath($from);
-        $to = MODX_BASE_PATH . $this->relativePath($to);
+        $from = MODX_BASE_PATH.$this->relativePath($from);
+        $to = MODX_BASE_PATH.$this->relativePath($to);
         $dir = $this->takeFileDir($to);
         if ($this->checkFile($from) && $this->makeDir($dir) && copy($from, $to)) {
             chmod($to, $this->toOct($chmod));
@@ -254,8 +254,8 @@ 
     public function moveFile($from, $to, $chmod = 0644)
     {
         $flag = false;
-        $from = MODX_BASE_PATH . $this->relativePath($from);
-        $to = MODX_BASE_PATH . $this->relativePath($to);
+        $from = MODX_BASE_PATH.$this->relativePath($from);
+        $to = MODX_BASE_PATH.$this->relativePath($to);
         $dir = $this->takeFileDir($to);
         if ($this->checkFile($from) && $this->makeDir($dir) && rename($from, $to)) {
             chmod($to, $this->toOct($chmod));
@@ -277,7 +277,7 @@ 
             $owner = MODX_BASE_PATH;
         }
         if (!(empty($path) || !is_scalar($path)) && !preg_match("/^http(s)?:\/\/\w+/", $path)) {
-            $path = trim(preg_replace("#^" . $owner . "#", '', $path), '/');
+            $path = trim(preg_replace("#^".$owner."#", '', $path), '/');
         } else {
             $path = '';
         }
@@ -308,7 +308,7 @@ 
     public function rmDir($dirPath)
     {
         $flag = false;
-        $path = $_path = MODX_BASE_PATH . $this->relativePath($dirPath);
+        $path = $_path = MODX_BASE_PATH.$this->relativePath($dirPath);
         if ($this->checkDir($path)) {
             $dirIterator = new \RecursiveDirectoryIterator($path, \FilesystemIterator::SKIP_DOTS);
             $dirRecursiveIterator = new \RecursiveIteratorIterator($dirIterator, \RecursiveIteratorIterator::CHILD_FIRST);
@@ -328,7 +328,7 @@ 
     {
         $flag = false;
         if ($this->checkFile($file)) {
-            $flag = unlink(MODX_BASE_PATH . $this->relativePath($file));
+            $flag = unlink(MODX_BASE_PATH.$this->relativePath($file));
         }
         return $flag;
     }
@@ -339,7 +339,7 @@ 
      */
     public function delete($path)
     {
-        $path = MODX_BASE_PATH . $this->relativePath($path);
+        $path = MODX_BASE_PATH.$this->relativePath($path);
         switch (true) {
             case $this->checkDir($path):
                 $flag = $this->rmDir($path);
@@ -361,11 +361,11 @@ 
     public function getInexistantFilename($file, $full = false)
     {
         $i = 1;
-        $file = $mainFile = MODX_BASE_PATH . $this->relativePath($file);
+        $file = $mainFile = MODX_BASE_PATH.$this->relativePath($file);
         while ($this->checkFile($file)) {
             $i++;
-            $out = $this->takeFileDir($file) . '/';
-            $out .= $this->takeFileName($mainFile) . "({$i})." . $this->takeFileExt($file);
+            $out = $this->takeFileDir($file).'/';
+            $out .= $this->takeFileName($mainFile)."({$i}).".$this->takeFileExt($file);
             $file = $out;
         }
         return $full ? $file : $this->takeFileBasename($file);

assets/lib/Helpers/PHPThumb.php

Spacing +7 added lines, -7 removed lines

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

assets/lib/Helpers/Collection.php

Spacing +2 added lines, -2 removed lines

@@ -373,7 +373,7 @@ 
      */
     public function max($key)
     {
-        return $this->reduce(function ($result, $item) use ($key) {
+        return $this->reduce(function($result, $item) use ($key) {
             return (is_null($result) || $item[$key] > $result) ? $item[$key] : $result;
         });
     }
@@ -386,7 +386,7 @@ 
      */
     public function min($key)
     {
-        return $this->reduce(function ($result, $item) use ($key) {
+        return $this->reduce(function($result, $item) use ($key) {
             return (is_null($result) || $item[$key] < $result) ? $item[$key] : $result;
         });
     }

assets/lib/Helpers/Video.php

Spacing +16 added lines, -16 removed lines

@@ -180,7 +180,7 @@ 
     /** Ссылка на превью */
     public function getImage()
     {
-        return $this->getScheme() . $this->image;
+        return $this->getScheme().$this->image;
     }
 
     /** Ссылка на видео */
@@ -191,7 +191,7 @@ 
             $url .= '&autoplay=1';
         }
 
-        return $this->getScheme() . $url;
+        return $this->getScheme().$url;
     }
 
     /** Название видео */
@@ -251,7 +251,7 @@ 
     protected function cleanLink()
     {
         if (!preg_match('/^(http|https)\:\/\//i', $this->link)) {
-            $this->link = 'http://' . $this->link;
+            $this->link = 'http://'.$this->link;
         }
 
         if (!$this->link_parts = parse_url($this->link)) {
@@ -329,9 +329,9 @@ 
 
         $this->hosting = self::YOUTUBE;
         $this->id = $id;
-        $this->image = 'img.youtube.com/vi/' . $id . '/0.jpg';
+        $this->image = 'img.youtube.com/vi/'.$id.'/0.jpg';
         /** @see https://developers.google.com/youtube/player_parameters */
-        $this->video = 'www.youtube.com/embed/' . $id . '?showinfo=0&modestbranding=1&rel=0';
+        $this->video = 'www.youtube.com/embed/'.$id.'?showinfo=0&modestbranding=1&rel=0';
 
         if ($this->info) {
             $this->getYoutubeInfo($id);
@@ -348,7 +348,7 @@ 
 
         $this->hosting = self::VIMEO;
         $this->id = $id;
-        $this->video = 'player.vimeo.com/video/' . $id . '?';
+        $this->video = 'player.vimeo.com/video/'.$id.'?';
 
         if ($this->info) {
             $this->getVimeoInfo($id);
@@ -361,7 +361,7 @@ 
     {
         $this->hosting = self::RUTUBE;
         $this->id = $id;
-        $this->video = 'rutube.ru/video/embed/' . $id . '?';
+        $this->video = 'rutube.ru/video/embed/'.$id.'?';
 
         if ($this->info) {
             $this->getRutubeInfo($id);
@@ -372,7 +372,7 @@ 
     /** Парсинг XML от RUTUBE и определение превьюхи */
     protected function getRutubeInfo($id)
     {
-        if (@$xml = simplexml_load_file("http://rutube.ru/cgi-bin/xmlapi.cgi?rt_mode=movie&rt_movie_id=" . $id . "&utf=1")) {
+        if (@$xml = simplexml_load_file("http://rutube.ru/cgi-bin/xmlapi.cgi?rt_mode=movie&rt_movie_id=".$id."&utf=1")) {
             $this->title = (string)$xml->title;
             $this->image = (string)$xml->thumbnail_url;
         }
@@ -381,7 +381,7 @@ 
     /** Парсинг XML от VIMEO и определение превьюхи */
     protected function getVimeoInfo($id)
     {
-        if (@$xml = simplexml_load_file('http://vimeo.com/api/v2/video/' . $id . '.xml')) {
+        if (@$xml = simplexml_load_file('http://vimeo.com/api/v2/video/'.$id.'.xml')) {
             $this->title = (string)$xml->video->title;
             $this->image = (string)$xml->video->thumbnail_large ?: $xml->video->thumbnail_medium;
         }
@@ -390,7 +390,7 @@ 
     /** Получение названия ролика */
     protected function getYoutubeInfo($id)
     {
-        if (@$xml = simplexml_load_file('http://gdata.youtube.com/feeds/api/videos/' . $id)) {
+        if (@$xml = simplexml_load_file('http://gdata.youtube.com/feeds/api/videos/'.$id)) {
             $this->title = (string)$xml->title;
         }
     }
@@ -420,9 +420,9 @@ 
 
         $url = $this->getVideo($autoplay);
         if (!empty($class)) {
-            $class = ' class="' . $class . '"';
+            $class = ' class="'.$class.'"';
         }
-        return '<iframe src="' . $url . '" width="' . $width . '" height="' . $height . '" frameborder="0" allowfullscreen' . $class . '></iframe>';
+        return '<iframe src="'.$url.'" width="'.$width.'" height="'.$height.'" frameborder="0" allowfullscreen'.$class.'></iframe>';
     }
 
     /** Прогоняем тест по видам URL */
@@ -435,10 +435,10 @@ 
         foreach ($links as $link) {
             $v = new static($link);
             echo "<h1>$link</h1>\n"
-                . "<h3>" . $v->getHosting() . "</h3>"
-                . "<b>Видео:</b> " . $v->getVideo() . "<br />\n"
-                . "<b>Название:</b> " . $v->getTitle() . "<br />\n"
-                . "<b>Картинка:</b> " . $v->getImage() . "<hr />\n";
+                . "<h3>".$v->getHosting()."</h3>"
+                . "<b>Видео:</b> ".$v->getVideo()."<br />\n"
+                . "<b>Название:</b> ".$v->getTitle()."<br />\n"
+                . "<b>Картинка:</b> ".$v->getImage()."<hr />\n";
         }
     }
 }
\ No newline at end of file

Braces +6 added lines, -2 removed lines

@@ -211,8 +211,12 @@
     /** Обработка ссылки. Возвращает идентификатор видеохостинга или false */
     public function process($link = null, $info = null)
     {
-        if (!empty($link)) $this->setLink($link);
-        if (!empty($info)) $this->setInfo($info);
+        if (!empty($link)) {

+            $this->setLink($link);

+        }

+        if (!empty($info)) {

+            $this->setInfo($info);

+        }

 
         if ($this->cleanLink()) {
             if ($this->maybeYoutube()) {

assets/lib/Helpers/Assets.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-require_once(MODX_BASE_PATH . 'assets/lib/Helpers/FS.php');
+require_once(MODX_BASE_PATH.'assets/lib/Helpers/FS.php');
 
 /**
  * Class AssetsHelper
@@ -97,9 +97,9 @@ 
             $src = $params['src'];
             $remote = strpos($src, "http") !== false;
             if (!$remote) {
-                $src = $this->modx->config['site_url'] . $src;
+                $src = $this->modx->config['site_url'].$src;
                 if (!$this->fs->checkFile($params['src'])) {
-                    $this->modx->logEvent(0, 3, 'Cannot load ' . $src, 'Assets helper');
+                    $this->modx->logEvent(0, 3, 'Cannot load '.$src, 'Assets helper');
                     return $out;
                 }
             }
@@ -107,9 +107,9 @@ 
             $tmp = explode('.', $src);
             $type = isset($params['type']) ? $params['type'] : end($tmp);
             if ($type == 'js') {
-                $out = '<script type="text/javascript" src="' . $src . '"></script>';
+                $out = '<script type="text/javascript" src="'.$src.'"></script>';
             } else {
-                $out = '<link rel="stylesheet" type="text/css" href="' . $src . '">';
+                $out = '<link rel="stylesheet" type="text/css" href="'.$src.'">';
             }
 
             $this->modx->loadedjscripts[$name] = $params;

assets/lib/Module/Helper.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php namespace Module;
 
-include_once(dirname(dirname(__FILE__)) . '/APIHelpers.class.php');
+include_once(dirname(dirname(__FILE__)).'/APIHelpers.class.php');
 
 /**
  * Class Helper
@@ -109,7 +109,7 @@ 
      */
     public function isErrorJSON($json)
     {
-        require_once(MODX_BASE_PATH . "assets/snippets/DocLister/lib/jsonHelper.class.php");
+        require_once(MODX_BASE_PATH."assets/snippets/DocLister/lib/jsonHelper.class.php");
         $error = \jsonHelper::json_last_error_msg();
         if (!in_array($error, array('error_none', 'other'))) {
             $error = true;

assets/lib/Module/Template.php

Spacing +8 added lines, -8 removed lines

@@ -65,8 +65,8 @@ 
         $FS = \Helpers\FS::getInstance();
         $tplFolder = $FS->relativePath($tplFolder);
 
-        $this->_publicFolder = "/" . $tplFolder . "/public/";
-        $this->_tplFolder = MODX_BASE_PATH . $tplFolder . "/template/";
+        $this->_publicFolder = "/".$tplFolder."/public/";
+        $this->_tplFolder = MODX_BASE_PATH.$tplFolder."/template/";
 
         if (!defined('MODX_MAIN_URL')) {
             define('MODX_MAIN_URL', MODX_SITE_URL);
@@ -95,7 +95,7 @@ 
      */
     public function src($path)
     {
-        return rtrim(MODX_MAIN_URL, '/') . $this->publicFolder() . ltrim($path, '/');
+        return rtrim(MODX_MAIN_URL, '/').$this->publicFolder().ltrim($path, '/');
     }
 
     /**
@@ -117,8 +117,8 @@ 
 
             ob_start();
             extract($this->vars);
-            if (file_exists($incPath . $name)) {
-                include($incPath . $name);
+            if (file_exists($incPath.$name)) {
+                include($incPath.$name);
                 $content = ob_get_contents();
             }
             ob_end_clean();
@@ -157,9 +157,9 @@ 
     public function showBody($TplName, array $tplParams = array())
     {
         ob_start();
-        if (file_exists($this->_tplFolder . $TplName . "." . self::TPL_EXT)) {
+        if (file_exists($this->_tplFolder.$TplName.".".self::TPL_EXT)) {
             extract($this->vars);
-            include($this->_tplFolder . $TplName . "." . self::TPL_EXT);
+            include($this->_tplFolder.$TplName.".".self::TPL_EXT);
         }
         $content = ob_get_contents();
         ob_end_clean();
@@ -201,7 +201,7 @@ 
         );
         $out = implode("?", array($this->_modx->getManagerPath(), http_build_query($data)));
         if ($full) {
-            $out = $this->_modx->getConfig('site_url') . ltrim($out, '/');
+            $out = $this->_modx->getConfig('site_url').ltrim($out, '/');
         }
         return $out;
     }

assets/lib/Module/Action.php

Spacing +10 added lines, -10 removed lines

@@ -69,7 +69,7 @@ 
      */
     protected static function _checkObj($id)
     {
-        $q = self::$modx->db->select('id', self::$modx->getFullTableName(self::TABLE()), "id = " . $id);
+        $q = self::$modx->db->select('id', self::$modx->getFullTableName(self::TABLE()), "id = ".$id);
         return (self::$modx->db->getRecordCount($q) == 1);
     }
 
@@ -80,7 +80,7 @@ 
      */
     protected static function _getValue($field, $id)
     {
-        $q = self::$modx->db->select($field, self::$modx->getFullTableName(self::TABLE()), "id = " . $id);
+        $q = self::$modx->db->select($field, self::$modx->getFullTableName(self::TABLE()), "id = ".$id);
         return self::$modx->db->getValue($q);
     }
 
@@ -89,8 +89,8 @@ 
      */
     public static function listValue()
     {
-        $out = self::_workValue(function ($data, $modObj) {
-            $listFunction = $data['key'] . 'Lists';
+        $out = self::_workValue(function($data, $modObj) {
+            $listFunction = $data['key'].'Lists';
             $out = method_exists($modObj, $listFunction) ? $modObj->$listFunction() : array();
             $out['selected'] = $modObj->get($data['key']);
             return $out;
@@ -124,11 +124,11 @@ 
      */
     public static function saveValue()
     {
-        return self::_workValue(function ($data, $modObj) {
+        return self::_workValue(function($data, $modObj) {
             $out = array();
             if (isset($_POST['value']) && is_scalar($_POST['value'])) {
                 if ($modObj->set($data['key'], $_POST['value'])->save()) {
-                    $textMethod = $data['key'] . 'Text';
+                    $textMethod = $data['key'].'Text';
                     if (method_exists($modObj, $textMethod)) {
                         $out['value'] = $modObj->$textMethod();
                     } else {
@@ -145,7 +145,7 @@ 
      */
     public static function getValue()
     {
-        return self::_workValue(function ($data, $modObj) {
+        return self::_workValue(function($data, $modObj) {
             return array(
                 'value' => $modObj->get($data['key'])
             );
@@ -163,11 +163,11 @@ 
             $oldValue = self::_getValue('deleted_at', $dataID);
             $q = self::$modx->db->update(array(
                 'deleted_at' => empty($oldValue) ? date('Y-m-d H:i:s') : null
-            ), self::$modx->getFullTableName(self::TABLE()), "id = " . $dataID);
+            ), self::$modx->getFullTableName(self::TABLE()), "id = ".$dataID);
             if ($q) {
-                $data['log'] = $oldValue ? 'Запись с ID ' . $dataID . ' восстановлена' : 'Запись с ID ' . $dataID . ' удалена';
+                $data['log'] = $oldValue ? 'Запись с ID '.$dataID.' восстановлена' : 'Запись с ID '.$dataID.' удалена';
             } else {
-                $data['log'] = $oldValue ? 'Не удалось восстановить запись с ID ' . $dataID : 'Не удалось удалить запись с ID ' . $dataID;
+                $data['log'] = $oldValue ? 'Не удалось восстановить запись с ID '.$dataID : 'Не удалось удалить запись с ID '.$dataID;
             }
         } else {
             $data['log'] = '<span class="error">Ошибка</span>. Не удалось определить обновляему запись';