AgelxNash / DocLister

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

Spacing +40 added lines, -40 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

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

 

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

@@ -106,7 +106,7 @@ 
         }

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

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

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

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

             $this->debugLog = false;

         }

 

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

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

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

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

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

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

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

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

             }

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

@@ -152,10 +152,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 = $this->modx->evalSnippets("[[" . $snippet . "]]");

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

                 $this->LogSnippet($replace);

 

                 // Replace values

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

                     // Document / Template Variable eXtended

                     case "*":

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

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

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

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

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

                         break;

                     // MODx Setting eXtended

                     case "(":

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

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

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

+                        $input = $this->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,

                                 $this->modx->placeholders)

@@ -237,7 +237,7 @@ 
     public function Filter($input, $modifiers)

     {

         $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

@@ -245,9 +245,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

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

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

@@ -425,7 +425,7 @@ 
                         $output = nl2br($output);

                         break;

                     case "date":

-                        $output = strftime($modifier_value[$i], (int)$output);

+                        $output = strftime($modifier_value[$i], (int) $output);

                         break;

                     case "set":

                         $c = $i + 1;

@@ -435,7 +435,7 @@ 
                         break;

                     case "value":

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

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

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

                         }

                         $output = null;

                         break;

@@ -460,12 +460,12 @@ 
                     default:

                         $snippet = '';

                         // modified by Anton Kuzmin (23.06.2010) //

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

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

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

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

                         } else {

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

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

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

                             $result = $this->modx->db->query($sql);

                             if ($this->modx->db->getRecordCount($result) == 1) {

                                 $row = $this->modx->db->getRow($result);

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

                                 if ($this->modx->db->getRecordCount($result) == 0) {

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

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

+                                    $filename = $this->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 = $this->modx->snippetCache[$snippetName] = $file_contents;

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

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

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

                                     } else {

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

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

                             $custom = eval($cm);

                             $msg = ob_get_contents();

-                            $output = $msg . $custom;

+                            $output = $msg.$custom;

                             ob_end_clean();

                         } else {

                             $output = '';

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

     /**

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

             $this->console = array();

 

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

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

         }

 

         return $out;

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

         }

     }

 

@@ -573,15 +573,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: 5px 2px 2px;border-bottom: 1px solid black;'>Pass " . $this->curPass . "</div>";

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

     }

 

     // Log pass

@@ -590,7 +590,7 @@ 
      */

     public function LogSource($string)

     {

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

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

     }

 

 

@@ -625,7 +625,7 @@ 
      */

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

     {

-        $userid = (int)$userid;

+        $userid = (int) $userid;

         // if $groupNames is not an array return false

         if (!is_array($groupNames)) {

             return false;

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

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

      * @param int $maxpass

      */

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

-    {

+    public function __construct(DocumentParser $modx, $debug = false, $maxpass = 50)
+    {
         $this->modx = $modx;

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

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

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

 

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

-        if (function_exists('mb_internal_encoding')) {

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

         }

     }

 

     // Plugin event hook for MODx

-    public function OnParseDocument()

-    {

+    public function OnParseDocument()
+    {
         // Get document output from MODx

         $template = $this->modx->documentOutput;

         // To the parse cave .. let's go! *insert batman tune here*

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

      * @return mixed|string

      */

-    public function Parse($template = '')

-    {

+    public function Parse($template = '')
+    {
         // 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

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

         }

@@ -101,11 +101,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) {
             $this->modx->logEvent($this->curPass, 1, $this->createEventLog(), $this->name . ' ' . $this->version);

             $this->debugLog = false;

         }

@@ -119,20 +119,20 @@ 
      * @param string $template

      * @return mixed|string

      */

-    public function ParseValues($template = '')

-    {

+    public function ParseValues($template = '')
+    {
         $this->curPass = $this->curPass + 1;

         $st = md5($template);

 

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

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

 

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

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

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

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

                                 $this->modx->placeholders)

-                        ) {

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

                             $input = '';

-                        } else {

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

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

                         }

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

         }

 

@@ -234,22 +234,22 @@ 
      * @param $modifiers

      * @return mixed|null|string

      */

-    public function Filter($input, $modifiers)

-    {

+    public function Filter($input, $modifiers)
+    {
         $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":

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

@@ -306,23 +306,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($conditional));

-                        if (!$isvalid) {

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

                         }

                         break;

@@ -330,7 +330,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];

                         }

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

@@ -429,12 +429,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") {
                             $this->modx->SetPlaceholder("phx." . $output, $modifier_value[$i]);

                         }

                         $output = null;

@@ -443,13 +443,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();

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

                         // modified by Anton Kuzmin (23.06.2010) //

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

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

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

-                        } else {

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

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

                             $result = $this->modx->db->query($sql);

-                            if ($this->modx->db->getRecordCount($result) == 1) {

+                            if ($this->modx->db->getRecordCount($result) == 1) {
                                 $row = $this->modx->db->getRow($result);

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

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

-                            } else {

-                                if ($this->modx->db->getRecordCount($result) == 0) {

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

                                     $filename = $this->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);

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

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

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

-                                    } else {

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

                                     }

                                 }

@@ -492,19 +492,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,18 +518,18 @@ 
      * @param string $code

      * @return mixed

      */

-    private function runCode($code)

-    {

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

     }

     // Event logging (debug)

     /**

      * @return string

      */

-    public function createEventLog()

-    {

+    public function createEventLog()
+    {
         $out = '';

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

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

             $this->console = array();

 

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

 

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

@@ -569,9 +569,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>";

@@ -579,8 +579,8 @@ 
     }

 

     // Log pass

-    public function LogPass()

-    {

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

     }

 

@@ -588,8 +588,8 @@ 
     /**

      * @param $string

      */

-    public function LogSource($string)

-    {

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

     }

 

@@ -601,16 +601,16 @@ 
      * @param $field

      * @return mixed

      */

-    public function ModUser($userid, $field)

-    {

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

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

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

-            } else {

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

             }

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

-        } else {

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

         }

 

@@ -623,31 +623,31 @@ 
      * @param array $groupNames

      * @return bool

      */

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

-    {

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

         // 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 = $this->modx->getFullTableName("webgroup_names");

             $tbl2 = $this->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 = $this->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;

             }

         }

@@ -661,13 +661,13 @@ 
      * @param $name

      * @return mixed|string

      */

-    public function getPHxVariable($name)

-    {

+    public function getPHxVariable($name)
+    {
         // 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 $this->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/lib/DLTemplate.class.php

Spacing +17 added lines, -17 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once(MODX_BASE_PATH . 'assets/lib/APIHelpers.class.php');
+include_once(MODX_BASE_PATH.'assets/lib/APIHelpers.class.php');
 
 /**
  * Class DLTemplate
@@ -121,7 +121,7 @@ 
      * @param array $data
      * @return $this
      */
-    public function setTwigTemplateVars($data = array()) {
+    public function setTwigTemplateVars($data = array()){
         if (is_array($data)) $this->twigTemplateVars = $data;
         return $this;
     }
@@ -156,20 +156,20 @@ 
     public function getChunk($name)
     {
         $tpl = '';
-        $this->twigEnabled = substr($name,0,3) == '@T_';
+        $this->twigEnabled = substr($name, 0, 3) == '@T_';
         if ($name != '' && !isset($this->modx->chunkCache[$name])) {
             $mode = (preg_match('/^((@[A-Z_]+)[:]{0,1})(.*)/Asu', trim($name),
                     $tmp) && isset($tmp[2], $tmp[3])) ? $tmp[2] : false;
             $subTmp = (isset($tmp[3])) ? trim($tmp[3]) : null;
-            if ($this->twigEnabled) $mode = '@'.substr($mode,3);
+            if ($this->twigEnabled) $mode = '@'.substr($mode, 3);
             switch ($mode) {
                 case '@FILE':
                     if ($subTmp != '') {
-                        $real = realpath(MODX_BASE_PATH . $this->templatePath);
-                        $path = realpath(MODX_BASE_PATH . $this->templatePath . preg_replace(array(
+                        $real = realpath(MODX_BASE_PATH.$this->templatePath);
+                        $path = realpath(MODX_BASE_PATH.$this->templatePath.preg_replace(array(
                                 '/\.*[\/|\\\]/i',
                                 '/[\/|\\\]+/i'
-                            ), array('/', '/'), $subTmp) . '.' . $this->templateExtension);
+                            ), array('/', '/'), $subTmp).'.'.$this->templateExtension);
                         $fname = explode(".", $path);
                         if ($real == substr($path, 0,
                                 strlen($real)) && end($fname) == $this->templateExtension && file_exists($path)
@@ -191,11 +191,11 @@ 
                 case '@DOCUMENT':
                 case '@DOC':
                     switch (true) {
-                        case ((int)$subTmp > 0):
-                            $tpl = $this->modx->getPageInfo((int)$subTmp, 0, "content");
+                        case ((int) $subTmp > 0):
+                            $tpl = $this->modx->getPageInfo((int) $subTmp, 0, "content");
                             $tpl = isset($tpl['content']) ? $tpl['content'] : '';
                             break;
-                        case ((int)$subTmp == 0):
+                        case ((int) $subTmp == 0):
                             $tpl = $this->modx->documentObject['content'];
                             break;
                     }
@@ -257,12 +257,12 @@ 
      */
     public function renderDoc($id, $events = false, $tpl = null)
     {
-        if ((int)$id <= 0) {
+        if ((int) $id <= 0) {
             return '';
         }
 
         $m = clone $this->modx; //Чтобы была возможность вызывать события
-        $m->documentObject = $m->getDocumentObject('id', (int)$id, $events ? 'prepareResponse' : null);
+        $m->documentObject = $m->getDocumentObject('id', (int) $id, $events ? 'prepareResponse' : null);
         if ($m->documentObject['type'] == "reference") {
             if (is_numeric($m->documentObject['content']) && $m->documentObject['content'] > 0) {
                 $m->documentObject['content'] = $this->renderDoc($m->documentObject['content'], $events);
@@ -297,7 +297,7 @@ 
     public function getTemplate($id)
     {
         $tpl = null;
-        $id = (int)$id;
+        $id = (int) $id;
         if ($id > 0) {
             $tpl = $this->modx->db->getValue("SELECT `content` FROM {$this->modx->getFullTableName("site_templates")} WHERE `id` = {$id}");
         }
@@ -323,7 +323,7 @@ 
             $plh = $this->twigTemplateVars;
             $plh['data'] = $data;
             $plh['modx'] = $this->modx;
-            $out = $twig->render(md5($name),$plh);
+            $out = $twig->render(md5($name), $plh);
         } else {
             if (is_array($data) && ($out != '')) {
                 if (preg_match("/\[\+[A-Z0-9\.\_\-]+\+\]/is", $out)) {
@@ -356,7 +356,7 @@ 
      */
     public function setPHxPlaceholders($value = '', $key = '', $path = '')
     {
-        $keypath = !empty($path) ? $path . "." . $key : $key;
+        $keypath = !empty($path) ? $path.".".$key : $key;
         $this->phx->curPass = 0;
         if (is_array($value)) {
             foreach ($value as $subkey => $subval) {
@@ -374,7 +374,7 @@ 
      * @param string $tpl
      * @return null
      */
-    protected function getTwig($name, $tpl) {
+    protected function getTwig($name, $tpl){
         if (is_null($this->twig) && isset($this->modx->twig)) {
             $twig = clone $this->modx->twig;
             $this->twig = $twig;
@@ -415,7 +415,7 @@ 
     public function createPHx($debug = 0, $maxpass = 50)
     {
         if (!class_exists('DLphx', false)) {
-            include_once(__DIR__ . '/DLphx.class.php');
+            include_once(__DIR__.'/DLphx.class.php');
         }
 
         return new DLphx($this->modx, $debug, $maxpass);

Braces +10 added lines, -4 removed lines

@@ -121,8 +121,11 @@ 
      * @param array $data
      * @return $this
      */
-    public function setTwigTemplateVars($data = array()) {
-        if (is_array($data)) $this->twigTemplateVars = $data;
+    public function setTwigTemplateVars($data = array())
+    {
+        if (is_array($data)) {
+            $this->twigTemplateVars = $data;
+        }
         return $this;
     }
 
@@ -161,7 +164,9 @@ 
             $mode = (preg_match('/^((@[A-Z_]+)[:]{0,1})(.*)/Asu', trim($name),
                     $tmp) && isset($tmp[2], $tmp[3])) ? $tmp[2] : false;
             $subTmp = (isset($tmp[3])) ? trim($tmp[3]) : null;
-            if ($this->twigEnabled) $mode = '@'.substr($mode,3);
+            if ($this->twigEnabled) {
+                $mode = '@'.substr($mode,3);
+            }
             switch ($mode) {
                 case '@FILE':
                     if ($subTmp != '') {
@@ -374,7 +379,8 @@ 
      * @param string $tpl
      * @return null
      */
-    protected function getTwig($name, $tpl) {
+    protected function getTwig($name, $tpl)
+    {
         if (is_null($this->twig) && isset($this->modx->twig)) {
             $twig = clone $this->modx->twig;
             $this->twig = $twig;