AgelxNash / DocLister

assets/lib/APIHelpers.class.php

Indentation +1 added lines, -1 removed lines

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

Braces +1 added lines, -1 removed lines

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

Spacing +16 added lines, -16 removed lines

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

Doc Comments +2 added lines, -2 removed lines

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

assets/lib/Module/Action.php

Braces +3 added lines, -3 removed lines

@@ -59,7 +59,7 @@ 
                     $textMethod = $data['key'].'Text';
                     if(method_exists($modObj, $textMethod)){
                         $out['value'] = $modObj->$textMethod();
-                    }else{
+                    } else{
                         $out['value'] = $modObj->get($data['key']);
                     }
                 }
@@ -84,10 +84,10 @@ 
                 ), self::$modx->getFullTableName(self::TABLE()), "id = ".$dataID);
             if($q){
                 $data['log'] = $oldValue ? 'Запись с ID '.$dataID.' восстановлена' : 'Запись с ID '.$dataID.' удалена';
-            }else{
+            } else{
                 $data['log'] = $oldValue ? 'Не удалось восстановить запись с ID '.$dataID : 'Не удалось удалить запись с ID '.$dataID;
             }
-        }else{
+        } else{
             $data['log'] = '<span class="error">Ошибка</span>. Не удалось определить обновляему запись';
         }
         return $data;

Indentation +5 added lines, -5 removed lines

@@ -9,7 +9,7 @@ 
     public static $TPL = null;
     protected static $TABLE = "site_content";
     protected static $classTable = null;
-	protected static $_tplObj = null;
+    protected static $_tplObj = null;
 
     /**
      * @param \DocumentParser $modx
@@ -26,7 +26,7 @@ 
     public static function init(\DocumentParser $modx, Template $tpl, \MODxAPI $classTable){
         self::setMODX($modx);
         self::$TPL = Template::showLog();
-		self::$_tplObj = $tpl;
+        self::$_tplObj = $tpl;
         self::$classTable = $classTable;
     }
 
@@ -124,7 +124,7 @@ 
      * @return array
      */
     public static function deleted(){
-		$data = array();
+        $data = array();
         $dataID = (int)Template::getParam('docId', $_GET);
         if($dataID>0 && self::_checkObj($dataID)){
             $oldValue = self::_getValue('deleted_at', $dataID);
@@ -149,6 +149,6 @@ 
      * @return null
      */
     public static function getClassTable(){
-		return self::$classTable;
-	}
+        return self::$classTable;
+    }
 }
\ No newline at end of file

Spacing +28 added lines, -28 removed lines

@@ -4,7 +4,7 @@ 
  * Class Action
  * @package Module
  */
-abstract class Action{
+abstract class Action {
     protected static $modx = null;
     public static $TPL = null;
     protected static $TABLE = "site_content";
@@ -14,7 +14,7 @@ 
     /**
      * @param \DocumentParser $modx
      */
-    public static function setMODX(\DocumentParser $modx){
+    public static function setMODX(\DocumentParser $modx) {
         self::$modx = $modx;
     }
 
@@ -23,7 +23,7 @@ 
      * @param Template $tpl
      * @param \MODxAPI $classTable
      */
-    public static function init(\DocumentParser $modx, Template $tpl, \MODxAPI $classTable){
+    public static function init(\DocumentParser $modx, Template $tpl, \MODxAPI $classTable) {
         self::setMODX($modx);
         self::$TPL = Template::showLog();
 		self::$_tplObj = $tpl;
@@ -33,7 +33,7 @@ 
     /**
      * @return string
      */
-    public static function TABLE(){
+    public static function TABLE() {
         return static::$TABLE;
     }
 
@@ -41,9 +41,9 @@ 
      * @param $id
      * @return bool
      */
-    protected static function _checkObj($id){
+    protected static function _checkObj($id) {
         $q = self::$modx->db->select('id', self::$modx->getFullTableName(self::TABLE()), "id = ".$id);
-        return (self::$modx->db->getRecordCount($q)==1);
+        return (self::$modx->db->getRecordCount($q) == 1);
     }
 
     /**
@@ -51,7 +51,7 @@ 
      * @param $id
      * @return mixed
      */
-    protected static function _getValue($field, $id){
+    protected static function _getValue($field, $id) {
         $q = self::$modx->db->select($field, self::$modx->getFullTableName(self::TABLE()), "id = ".$id);
         return self::$modx->db->getValue($q);
     }
@@ -59,11 +59,11 @@ 
     /**
      * @return array|mixed
      */
-    public static function listValue(){
-        $out = self::_workValue(function($data, $modObj){
+    public static function listValue() {
+        $out = self::_workValue(function($data, $modObj) {
             $listFunction = $data['key'].'Lists';
             $out = method_exists($modObj, $listFunction) ? $modObj->$listFunction() : array();
-            $out['selected'] =  $modObj->get($data['key']);
+            $out['selected'] = $modObj->get($data['key']);
             return $out;
         });
         self::$TPL = null;
@@ -75,14 +75,14 @@ 
      * @param $callback
      * @return array|mixed
      */
-    protected static function _workValue($callback){
+    protected static function _workValue($callback) {
         self::$TPL = 'ajax/getValue';
         $data = Helper::jeditable('data');
         $out = array();
-        if(!empty($data)){
+        if (!empty($data)) {
             $modObj = self::$classTable;
             $modObj->edit($data['id']);
-            if($modObj->getID() && ((is_object($callback) && ($callback instanceof \Closure)) || is_callable($callback))){
+            if ($modObj->getID() && ((is_object($callback) && ($callback instanceof \Closure)) || is_callable($callback))) {
                 $out = call_user_func($callback, $data, $modObj);
             }
         }
@@ -92,15 +92,15 @@ 
     /**
      * @return array|mixed
      */
-    public static function saveValue(){
-        return self::_workValue(function($data, $modObj){
+    public static function saveValue() {
+        return self::_workValue(function($data, $modObj) {
             $out = array();
-            if(isset($_POST['value']) && is_scalar($_POST['value'])){
-                if($modObj->set($data['key'], $_POST['value'])->save()){
+            if (isset($_POST['value']) && is_scalar($_POST['value'])) {
+                if ($modObj->set($data['key'], $_POST['value'])->save()) {
                     $textMethod = $data['key'].'Text';
-                    if(method_exists($modObj, $textMethod)){
+                    if (method_exists($modObj, $textMethod)) {
                         $out['value'] = $modObj->$textMethod();
-                    }else{
+                    } else {
                         $out['value'] = $modObj->get($data['key']);
                     }
                 }
@@ -112,8 +112,8 @@ 
     /**
      * @return array|mixed
      */
-    public static function getValue(){
-        return self::_workValue(function($data, $modObj){
+    public static function getValue() {
+        return self::_workValue(function($data, $modObj) {
             return array(
                 'value' => $modObj->get($data['key'])
             );
@@ -123,32 +123,32 @@ 
     /**
      * @return array
      */
-    public static function deleted(){
+    public static function deleted() {
 		$data = array();
         $dataID = (int)Template::getParam('docId', $_GET);
-        if($dataID>0 && self::_checkObj($dataID)){
+        if ($dataID > 0 && self::_checkObj($dataID)) {
             $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);
-            if($q){
+            if ($q) {
                 $data['log'] = $oldValue ? 'Запись с ID '.$dataID.' восстановлена' : 'Запись с ID '.$dataID.' удалена';
-            }else{
+            } else {
                 $data['log'] = $oldValue ? 'Не удалось восстановить запись с ID '.$dataID : 'Не удалось удалить запись с ID '.$dataID;
             }
-        }else{
+        } else {
             $data['log'] = '<span class="error">Ошибка</span>. Не удалось определить обновляему запись';
         }
         return $data;
     }
-    public static function lists(){
+    public static function lists() {
         self::$TPL = 'ajax/lists';
     }
 
     /**
      * @return null
      */
-    public static function getClassTable(){
+    public static function getClassTable() {
 		return self::$classTable;
 	}
 }
\ No newline at end of file

Doc Comments +4 added lines, -4 removed lines

@@ -58,7 +58,7 @@ 
     }
 
     /**
-     * @param $id
+     * @param integer $id
      * @return bool
      */
     protected static function _checkObj($id){
@@ -67,8 +67,8 @@ 
     }
 
     /**
-     * @param $field
-     * @param $id
+     * @param string $field
+     * @param integer $id
      * @return mixed
      */
     protected static function _getValue($field, $id){
@@ -92,7 +92,7 @@ 
     }
 
     /**
-     * @param $callback
+     * @param \Closure $callback
      * @return array|mixed
      */
     protected static function _workValue($callback){

assets/lib/Formatter/HtmlFormatter.php

Braces +3 added lines, -2 removed lines

@@ -22,8 +22,9 @@
             '<span style="color:'.$tag.';">$1</span>',
             '<span style="font-style:italic;">$1</span>',
         );
-        if($decode)
-            $string = htmlentities($string);
+        if($decode) {

+                    $string = htmlentities($string);

+        }

         return '<pre>'.preg_replace($find, $replace, $string).'</pre>';
     }
 }
\ No newline at end of file

Spacing +9 added lines, -9 removed lines

@@ -4,24 +4,24 @@ 
  * Class HtmlFormatter
  * @package Formatter
  */
-class HtmlFormatter{
+class HtmlFormatter {
     /**
      * @param $string
      * @param bool $decode
      * @return string
      */
-    public static function format($string, $decode = TRUE){
+    public static function format($string, $decode = TRUE) {
         $tag = '#0000ff';
         $att = '#ff0000';
         $val = '#8000ff';
         $com = '#34803a';
         $find = array(
-            '~(\s[a-z].*?=)~',                    // Highlight the attributes
-            '~(<\!--.*?-->)~s',            // Hightlight comments
-            '~("[a-zA-Z0-9\/].*?")~',    // Highlight the values
-            '~(<[a-z].*?>)~',                // Highlight the beginning of the opening tag
-            '~(</[a-z].*?>)~',            // Highlight the closing tag
-            '~(&.*?;)~',                    // Stylize HTML entities
+            '~(\s[a-z].*?=)~', // Highlight the attributes
+            '~(<\!--.*?-->)~s', // Hightlight comments
+            '~("[a-zA-Z0-9\/].*?")~', // Highlight the values
+            '~(<[a-z].*?>)~', // Highlight the beginning of the opening tag
+            '~(</[a-z].*?>)~', // Highlight the closing tag
+            '~(&.*?;)~', // Stylize HTML entities
         );
         $replace = array(
             '<span style="color:'.$att.';">$1</span>',
@@ -31,7 +31,7 @@ 
             '<span style="color:'.$tag.';">$1</span>',
             '<span style="font-style:italic;">$1</span>',
         );
-        if($decode)
+        if ($decode)
             $string = htmlentities($string);
         return '<pre>'.preg_replace($find, $replace, $string).'</pre>';
     }

assets/lib/SimpleTab/table.abstract.php

Braces +21 added lines, -7 removed lines

@@ -42,7 +42,9 @@ 
     public function place($ids, $dir, $rid) {
         $table = $this->makeTable($this->table);
         $ids = $this->cleanIDs($ids, ',', array(0));
-        if(empty($ids) || is_scalar($ids)) return false;
+        if(empty($ids) || is_scalar($ids)) {

+            return false;

+        }

         $rows = $this->query("SELECT count(`{$this->pkName}`) FROM {$table} WHERE `{$this->rfName}`={$rid}");
         $index = $this->modx->db->getValue($rows);
         $cnt = count($ids);
@@ -67,15 +69,25 @@ 
      */
     public function deleteThumb($url, $cache = false) {
         $url = $this->fs->relativePath($url);
-        if (empty($url)) return;
-        if ($this->fs->checkFile($url)) unlink(MODX_BASE_PATH . $url);
+        if (empty($url)) {

+            return;

+        }

+        if ($this->fs->checkFile($url)) {

+            unlink(MODX_BASE_PATH . $url);

+        }

         $dir = $this->fs->takeFileDir($url);
         $iterator = new \FilesystemIterator($dir);
-        if (!$iterator->valid()) rmdir($dir);
-        if ($cache) return;
+        if (!$iterator->valid()) {

+            rmdir($dir);

+        }

+        if ($cache) {

+            return;

+        }

         $thumbsCache = isset($this->params['thumbsCache']) ? $this->params['thumbsCache'] : $this->thumbsCache;
         $thumb = $thumbsCache.$url;
-        if ($this->fs->checkFile($thumb)) $this->deleteThumb($thumb, true);
+        if ($this->fs->checkFile($thumb)) {

+            $this->deleteThumb($thumb, true);

+        }

     }
 
     public function delete($ids, $fire_events = NULL) {
@@ -141,7 +153,9 @@ 
      * @return bool
      */
     public function makeThumb($folder,$url,$options) {
-        if (empty($url)) return false;
+        if (empty($url)) {

+            return false;

+        }

         $thumb = new \Helpers\PHPThumb();
         $inputFile = MODX_BASE_PATH . $this->fs->relativePath($url);
         $outputFile = MODX_BASE_PATH. $this->fs->relativePath($folder). '/' . $this->fs->relativePath($url);

Spacing +24 added lines, -24 removed lines

@@ -1,7 +1,7 @@ 
 <?php namespace SimpleTab;
-require_once (MODX_BASE_PATH . 'assets/lib/MODxAPI/autoTable.abstract.php');
-require_once (MODX_BASE_PATH . 'assets/lib/Helpers/FS.php');
-require_once (MODX_BASE_PATH . 'assets/lib/Helpers/PHPThumb.php');
+require_once (MODX_BASE_PATH.'assets/lib/MODxAPI/autoTable.abstract.php');
+require_once (MODX_BASE_PATH.'assets/lib/Helpers/FS.php');
+require_once (MODX_BASE_PATH.'assets/lib/Helpers/PHPThumb.php');
 
 class dataTable extends \autoTable {
     protected $params = array();
@@ -30,7 +30,7 @@ 
         return $out;
     }
 
-    public function touch($field){
+    public function touch($field) {
         $this->set($field, date('Y-m-d H:i:s', time() + $this->modx->config['server_offset_time']));
         return $this;
     }
@@ -43,19 +43,19 @@ 
     public function place($ids, $dir, $rid) {
         $table = $this->makeTable($this->table);
         $ids = $this->cleanIDs($ids, ',', array(0));
-        if(empty($ids) || is_scalar($ids)) return false;
+        if (empty($ids) || is_scalar($ids)) return false;
         $rows = $this->query("SELECT count(`{$this->pkName}`) FROM {$table} WHERE `{$this->rfName}`={$rid}");
         $index = $this->modx->db->getValue($rows);
         $cnt = count($ids);
-        $ids = implode(',',$ids);
+        $ids = implode(',', $ids);
         if ($dir == 'top') {
-            $this->query("SET @index := " . ($index - $cnt - 1));
+            $this->query("SET @index := ".($index - $cnt - 1));
             $this->query("UPDATE {$table} SET `{$this->indexName}` = (@index := @index + 1) WHERE (`{$this->pkName}` IN ({$ids})) ORDER BY `{$this->indexName}` ASC");
             $this->query("SET @index := -1");
         } else {
             $this->query("SET @index := -1");
             $this->query("UPDATE {$table} SET `{$this->indexName}` = (@index := @index + 1) WHERE (`{$this->pkName}` IN ({$ids})) ORDER BY `{$this->indexName}` ASC");
-            $this->query("SET @index := " . ($cnt - 1));
+            $this->query("SET @index := ".($cnt - 1));
         }
         $this->query("UPDATE {$table} SET `{$this->indexName}` = (@index := @index + 1) WHERE (`{$this->pkName}` NOT IN ({$ids})) AND `{$this->rfName}` = {$rid} ORDER BY `{$this->indexName}` ASC");
         $out = $this->modx->db->getAffectedRows();
@@ -69,7 +69,7 @@ 
     public function deleteThumb($url, $cache = false) {
         $url = $this->fs->relativePath($url);
         if (empty($url)) return;
-        if ($this->fs->checkFile($url)) unlink(MODX_BASE_PATH . $url);
+        if ($this->fs->checkFile($url)) unlink(MODX_BASE_PATH.$url);
         $dir = $this->fs->takeFileDir($url);
         $iterator = new \FilesystemIterator($dir);
         if (!$iterator->valid()) rmdir($dir);
@@ -85,12 +85,12 @@ 
         return $out;
     }
 
-    public function deleteAll ($ids, $rid, $fire_events = NULL) {
+    public function deleteAll($ids, $rid, $fire_events = NULL) {
         $this->clearIndexes($ids, $rid);
         return $this->delete($ids, $fire_events);
     }
 
-    public function fieldNames(){
+    public function fieldNames() {
         $fields = array_keys($this->getDefaultFields());
         $fields[] = $this->fieldPKName();
         return $fields;
@@ -118,19 +118,19 @@ 
         /* more refactoring  needed */
         if ($targetIndex < $sourceIndex) {
             if (($point == 'top' && $orderDir == 'asc') || ($point == 'bottom' && $orderDir == 'desc')) {
-                $this->modx->db->update("`{$this->indexName}`=`{$this->indexName}`+1",$table,"`{$this->indexName}`>={$targetIndex} AND `{$this->indexName}`<{$sourceIndex} AND `{$this->rfName}`={$rid}");
-                $rows = $this->modx->db->update("`{$this->indexName}`={$targetIndex}",$table,"`{$this->pkName}`={$sourceId}");             
+                $this->modx->db->update("`{$this->indexName}`=`{$this->indexName}`+1", $table, "`{$this->indexName}`>={$targetIndex} AND `{$this->indexName}`<{$sourceIndex} AND `{$this->rfName}`={$rid}");
+                $rows = $this->modx->db->update("`{$this->indexName}`={$targetIndex}", $table, "`{$this->pkName}`={$sourceId}");             
             } elseif (($point == 'bottom' && $orderDir == 'asc') || ($point == 'top' && $orderDir == 'desc')) {
-                $this->modx->db->update("`{$this->indexName}`=`{$this->indexName}`+1",$table,"`{$this->indexName}`>{$targetIndex} AND `{$this->indexName}`<{$sourceIndex} AND `{$this->rfName}`={$rid}");
-                $rows = $this->modx->db->update("`{$this->indexName}`=1+{$targetIndex}",$table,"`{$this->pkName}`={$sourceId}");             
+                $this->modx->db->update("`{$this->indexName}`=`{$this->indexName}`+1", $table, "`{$this->indexName}`>{$targetIndex} AND `{$this->indexName}`<{$sourceIndex} AND `{$this->rfName}`={$rid}");
+                $rows = $this->modx->db->update("`{$this->indexName}`=1+{$targetIndex}", $table, "`{$this->pkName}`={$sourceId}");             
             }
         } else {
             if (($point == 'bottom' && $orderDir == 'asc') || ($point == 'top' && $orderDir == 'desc')) {
-                $this->modx->db->update("`{$this->indexName}`=`{$this->indexName}`-1",$table,"`{$this->indexName}`<={$targetIndex} AND `{$this->indexName}`>={$sourceIndex} AND `{$this->rfName}`={$rid}");
-                $rows = $this->modx->db->update("`{$this->indexName}`={$targetIndex}",$table,"`{$this->pkName}`={$sourceId}");             
+                $this->modx->db->update("`{$this->indexName}`=`{$this->indexName}`-1", $table, "`{$this->indexName}`<={$targetIndex} AND `{$this->indexName}`>={$sourceIndex} AND `{$this->rfName}`={$rid}");
+                $rows = $this->modx->db->update("`{$this->indexName}`={$targetIndex}", $table, "`{$this->pkName}`={$sourceId}");             
             } elseif (($point == 'top' && $orderDir == 'asc') || ($point == 'bottom' && $orderDir == 'desc')) {
-                $this->modx->db->update("`{$this->indexName}`=`{$this->indexName}`-1",$table,"`{$this->indexName}`<{$targetIndex} AND `{$this->indexName}`>={$sourceIndex} AND `{$this->rfName}`={$rid}");
-                $rows = $this->modx->db->update("`{$this->indexName}`=-1+{$targetIndex}",$table,"`{$this->pkName}`={$sourceId}");                
+                $this->modx->db->update("`{$this->indexName}`=`{$this->indexName}`-1", $table, "`{$this->indexName}`<{$targetIndex} AND `{$this->indexName}`>={$sourceIndex} AND `{$this->rfName}`={$rid}");
+                $rows = $this->modx->db->update("`{$this->indexName}`=-1+{$targetIndex}", $table, "`{$this->pkName}`={$sourceId}");                
             }
         }
         
@@ -143,17 +143,17 @@ 
      * @param $options
      * @return bool
      */
-    public function makeThumb($folder,$url,$options) {
+    public function makeThumb($folder, $url, $options) {
         if (empty($url)) return false;
         $thumb = new \Helpers\PHPThumb();
-        $inputFile = MODX_BASE_PATH . $this->fs->relativePath($url);
-        $outputFile = MODX_BASE_PATH. $this->fs->relativePath($folder). '/' . $this->fs->relativePath($url);
+        $inputFile = MODX_BASE_PATH.$this->fs->relativePath($url);
+        $outputFile = MODX_BASE_PATH.$this->fs->relativePath($folder).'/'.$this->fs->relativePath($url);
         $dir = $this->fs->takeFileDir($outputFile);
         $this->fs->makeDir($dir, $this->modx->config['new_folder_permissions']);
-        if ($thumb->create($inputFile,$outputFile,$options)) {
+        if ($thumb->create($inputFile, $outputFile, $options)) {
             return true;
         } else {
-            $this->modx->logEvent(0, 3, $thumb->debugMessages,  __NAMESPACE__);
+            $this->modx->logEvent(0, 3, $thumb->debugMessages, __NAMESPACE__);
             return false;
         }
     }

Indentation +3 added lines, -3 removed lines

@@ -21,17 +21,17 @@
     /**
      * @var null
      */
-	protected $indexName = null;
+    protected $indexName = null;
 
     /**
      * @var null
      */
-	protected $rfName = null;
+    protected $rfName = null;
 
     /**
      * @var null
      */
-	protected $thumbsCache = null;
+    protected $thumbsCache = null;
 
     /**
      * dataTable constructor.

assets/lib/SimpleTab/plugin.class.php

Braces +13 added lines, -6 removed lines

@@ -45,9 +45,10 @@ 
         }
         //overload plugin and class properties
         $_params = $modx->parseProperties('&template=;;'.$this->params['template'].' &id=;;'.$this->params['id'],$modx->event->activePlugin,'plugin');
-        foreach ($_params as $key=>$value) 
-            if (property_exists ($this, $key)) 
-                $this->$key = $value;
+        foreach ($_params as $key=>$value) {

+                    if (property_exists ($this, $key)) 
+                $this->$key = $value;

+        }

 
         $this->params = array_merge($this->params,$_params);
         $modx->event->_output = "";
@@ -57,7 +58,9 @@ 
     }
 
 	public function clearFolders($ids = array(), $folder) {
-        foreach ($ids as $id) $this->fs->rmDir($folder.$id.'/');
+        foreach ($ids as $id) {

+            $this->fs->rmDir($folder.$id.'/');

+        }

     }
 
     public function checkPermissions() {
@@ -124,7 +127,9 @@ 
 			$scripts = isset($scripts['scripts']) ? $scripts['scripts'] : $scripts['styles'];
 			foreach ($scripts as $name => $params) {
 				$script = $this->assets->registerScript($name,$params);
-                if ($script !== false) $js .= $script;
+                if ($script !== false) {

+                    $js .= $script;

+                }

 			}
 		} else {
 			if ($list == $this->jsListDefault) {
@@ -197,7 +202,9 @@ 
 			$result = $this->modx->db->select('`id`',$eventsTable,"`name` = '{$event}'");
 			if (!$this->modx->db->getRecordCount($result)) {
 				$sql = "INSERT INTO {$eventsTable} VALUES (NULL, '{$event}', '{$eventsType}', '{$this->pluginName} Events')";
-				if (!$this->modx->db->query($sql)) $this->modx->logEvent(0, 3, "Cannot register {$event} event.", $this->pluginName);
+				if (!$this->modx->db->query($sql)) {

+				    $this->modx->logEvent(0, 3, "Cannot register {$event} event.", $this->pluginName);

+				}

 			}
 		}
 	}

Spacing +32 added lines, -32 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 namespace SimpleTab;
-include_once (MODX_BASE_PATH . 'assets/snippets/DocLister/lib/DLTemplate.class.php');
-include_once (MODX_BASE_PATH . 'assets/lib/APIHelpers.class.php');
-require_once (MODX_BASE_PATH . 'assets/lib/Helpers/FS.php');
-require_once (MODX_BASE_PATH . 'assets/lib/Helpers/Assets.php');
+include_once (MODX_BASE_PATH.'assets/snippets/DocLister/lib/DLTemplate.class.php');
+include_once (MODX_BASE_PATH.'assets/lib/APIHelpers.class.php');
+require_once (MODX_BASE_PATH.'assets/lib/Helpers/FS.php');
+require_once (MODX_BASE_PATH.'assets/lib/Helpers/Assets.php');
 
 abstract class Plugin {
 	public $modx = null;
@@ -40,16 +40,16 @@ 
         $this->lang_attribute = $lang_attribute;
         $this->params = $modx->event->params;
         if ($this->checkTemplate && !isset($this->params['template']) && $modx->event->name != 'OnEmptyTrash') {
-			$doc = $modx->getDocument($this->params['id'],'template','all','all');
+			$doc = $modx->getDocument($this->params['id'], 'template', 'all', 'all');
             $this->params['template'] = is_array($doc) ? end($doc) : null;
         }
         //overload plugin and class properties
-        $_params = $modx->parseProperties('&template=;;'.$this->params['template'].' &id=;;'.$this->params['id'],$modx->event->activePlugin,'plugin');
+        $_params = $modx->parseProperties('&template=;;'.$this->params['template'].' &id=;;'.$this->params['id'], $modx->event->activePlugin, 'plugin');
         foreach ($_params as $key=>$value) 
-            if (property_exists ($this, $key)) 
+            if (property_exists($this, $key)) 
                 $this->$key = $value;
 
-        $this->params = array_merge($this->params,$_params);
+        $this->params = array_merge($this->params, $_params);
         $modx->event->_output = "";
         $this->DLTemplate = \DLTemplate::getInstance($this->modx);
         $this->fs = \Helpers\FS::getInstance();
@@ -61,18 +61,18 @@ 
     }
 
     public function checkPermissions() {
-        $templates = isset($this->params['templates']) ? explode(',',$this->params['templates']) : false;
-        $roles = isset($this->params['roles']) ? explode(',',$this->params['roles']) : false;
+        $templates = isset($this->params['templates']) ? explode(',', $this->params['templates']) : false;
+        $roles = isset($this->params['roles']) ? explode(',', $this->params['roles']) : false;
 
-        $tplFlag = ($this->checkTemplate && !$templates || ($templates && !in_array($this->params['template'],$templates)));
+        $tplFlag = ($this->checkTemplate && !$templates || ($templates && !in_array($this->params['template'], $templates)));
 
-        $documents = isset($this->params['documents']) ? explode(',',$this->params['documents']) : false;
+        $documents = isset($this->params['documents']) ? explode(',', $this->params['documents']) : false;
         $docFlag = ($this->checkId && $tplFlag) ? !($documents && in_array($this->params['id'], $documents)) : $tplFlag;
 
-        $ignoreDocs = isset($this->params['ignoreDoc']) ? explode(',',$this->params['ignoreDoc']) : false;
+        $ignoreDocs = isset($this->params['ignoreDoc']) ? explode(',', $this->params['ignoreDoc']) : false;
         $ignoreFlag = ($this->checkId && $ignoreDocs && in_array($this->params['id'], $ignoreDocs));
 
-        return ($docFlag || $ignoreFlag || ($roles && !in_array($_SESSION['mgrRole'],$roles)));
+        return ($docFlag || $ignoreFlag || ($roles && !in_array($_SESSION['mgrRole'], $roles)));
     }
 
     /**
@@ -89,18 +89,18 @@ 
         }
         $output = '';
 		$plugins = $this->modx->pluginEvent;
-		if(($this->renderEvent!=='OnDocFormRender' || (array_search('ManagerManager', $plugins['OnDocFormRender']) === false))) {
-			$jquery = $this->assets->registerScript('jQuery',array(
+		if (($this->renderEvent !== 'OnDocFormRender' || (array_search('ManagerManager', $plugins['OnDocFormRender']) === false))) {
+			$jquery = $this->assets->registerScript('jQuery', array(
                 'version' => '1.9.1',
                 'src'     => 'assets/js/jquery/jquery-1.9.1.min.js'
             ));
             if ($jquery !== false) {
                 $output .= $jquery;
-                $output .='<script type="text/javascript">var jQuery = jQuery.noConflict(true);</script>';    
+                $output .= '<script type="text/javascript">var jQuery = jQuery.noConflict(true);</script>';    
             }
 		}
 		$tpl = MODX_BASE_PATH.$this->tpl;
-		if($this->fs->checkFile($tpl)) {
+		if ($this->fs->checkFile($tpl)) {
 			$output .= '[+js+][+styles+]'.file_get_contents($tpl);
 		} else {
 			$this->modx->logEvent(0, 3, "Cannot load {$this->tpl} .", $this->pluginName);
@@ -114,16 +114,16 @@ 
      * @param array $ph
      * @return string
      */
-    public function renderJS($list,$ph = array()) {
+    public function renderJS($list, $ph = array()) {
     	$js = '';
     	$scripts = MODX_BASE_PATH.$list;
-		if($this->fs->checkFile($scripts)) {
+		if ($this->fs->checkFile($scripts)) {
 			$scripts = @file_get_contents($scripts);
-			$scripts = $this->DLTemplate->parseChunk('@CODE:'.$scripts,$ph);
-			$scripts = json_decode($scripts,true);
+			$scripts = $this->DLTemplate->parseChunk('@CODE:'.$scripts, $ph);
+			$scripts = json_decode($scripts, true);
 			$scripts = isset($scripts['scripts']) ? $scripts['scripts'] : $scripts['styles'];
 			foreach ($scripts as $name => $params) {
-				$script = $this->assets->registerScript($name,$params);
+				$script = $this->assets->registerScript($name, $params);
                 if ($script !== false) $js .= $script;
 			}
 		} else {
@@ -140,7 +140,7 @@ 
 	 * @return array
 	 */
 	public function getTplPlaceholders() {
-		$ph = array ();
+		$ph = array();
 		return $ph;
 	}
 
@@ -152,9 +152,9 @@ 
             $output = $this->prerender();
     		if ($output !== false) {
     			$ph = $this->getTplPlaceholders();
-    			$ph['js'] = $this->renderJS($this->jsListDefault,$ph) . $this->renderJS($this->jsListCustom,$ph);
-    			$ph['styles'] = $this->renderJS($this->cssListDefault,$ph) . $this->renderJS($this->cssListCustom,$ph);
-    			$output = $this->DLTemplate->parseChunk('@CODE:'.$output,$ph);
+    			$ph['js'] = $this->renderJS($this->jsListDefault, $ph).$this->renderJS($this->jsListCustom, $ph);
+    			$ph['styles'] = $this->renderJS($this->cssListDefault, $ph).$this->renderJS($this->cssListCustom, $ph);
+    			$output = $this->DLTemplate->parseChunk('@CODE:'.$output, $ph);
     		}
     		return $output;
         }
@@ -166,11 +166,11 @@ 
     public function renderEmpty() {
         if (!$this->checkPermissions()) {
             $tpl = MODX_BASE_PATH.$this->emptyTpl;
-            if($this->fs->checkFile($tpl)) {
+            if ($this->fs->checkFile($tpl)) {
                 $output = '[+js+]'.file_get_contents($tpl);
                 $ph = $this->getTplPlaceholders();
-                $ph['js'] = $this->renderJS($this->jsListEmpty,$ph);
-                $output = $this->DLTemplate->parseChunk('@CODE:'.$output,$ph);
+                $ph['js'] = $this->renderJS($this->jsListEmpty, $ph);
+                $output = $this->DLTemplate->parseChunk('@CODE:'.$output, $ph);
                 return $output;
             } else {
                 $this->modx->logEvent(0, 3, "Cannot load {$this->emptyTpl} .", $this->pluginName);
@@ -183,7 +183,7 @@ 
      */
     public function checkTable() {
         $sql = "SHOW TABLES LIKE '{$this->_table}'";
-        return $this->modx->db->getRecordCount( $this->modx->db->query($sql));
+        return $this->modx->db->getRecordCount($this->modx->db->query($sql));
     }
 
     public function createTable() {
@@ -194,7 +194,7 @@ 
 	public function registerEvents($events = array(), $eventsType = '6') {
 		$eventsTable = $this->modx->getFullTableName('system_eventnames');
 		foreach ($events as $event) {
-			$result = $this->modx->db->select('`id`',$eventsTable,"`name` = '{$event}'");
+			$result = $this->modx->db->select('`id`', $eventsTable, "`name` = '{$event}'");
 			if (!$this->modx->db->getRecordCount($result)) {
 				$sql = "INSERT INTO {$eventsTable} VALUES (NULL, '{$event}', '{$eventsType}', '{$this->pluginName} Events')";
 				if (!$this->modx->db->query($sql)) $this->modx->logEvent(0, 3, "Cannot register {$event} event.", $this->pluginName);

Indentation +74 added lines, -74 removed lines

@@ -14,17 +14,17 @@ 
     /**
      * @var \DocumentParser|null
      */
-	public $modx = null;
+    public $modx = null;
 
     /**
      * @var string
      */
-	public $pluginName = '';
+    public $pluginName = '';
 
     /**
      * @var array
      */
-	public $params = array();
+    public $params = array();
 
     /**
      * @var string
@@ -34,32 +34,32 @@ 
     /**
      * @var string
      */
-	public $tpl = '';
+    public $tpl = '';
 
     /**
      * @var string
      */
-	public $jsListDefault = '';
+    public $jsListDefault = '';
 
     /**
      * @var string
      */
-	public $jsListCustom = '';
+    public $jsListCustom = '';
 
     /**
      * @var string
      */
-	public $cssListDefault = '';
+    public $cssListDefault = '';
 
     /**
      * @var string
      */
-	public $cssListCustom = '';
+    public $cssListCustom = '';
 
     /**
      * @var array
      */
-	public $pluginEvents = array();
+    public $pluginEvents = array();
 
     /**
      * @var string
@@ -69,7 +69,7 @@ 
     /**
      * @var \Helpers\FS|null
      */
-	protected $fs = null;
+    protected $fs = null;
 
     /**
      * @var \AssetsHelper|null
@@ -79,39 +79,39 @@ 
     /**
      * @var null
      */
-	protected $emptyTpl = null;
+    protected $emptyTpl = null;
 
     /**
      * @var string
      */
-	protected $jsListEmpty = '';
+    protected $jsListEmpty = '';
 
     /**
      * @var \DLTemplate|null
      */
-	public $DLTemplate = null;
+    public $DLTemplate = null;
 
     /**
      * @var string
      */
-	public $lang_attribute = '';
+    public $lang_attribute = '';
 
     /**
      * @var bool
      */
-	protected $checkTemplate = true;
+    protected $checkTemplate = true;
 
     /**
      * @var string
      */
-	protected $renderEvent = 'OnDocFormRender';
+    protected $renderEvent = 'OnDocFormRender';
 
     /**
      * @var bool
      */
-	protected $checkId = true;
+    protected $checkId = true;
 
-	/**
+    /**
      * @param $modx
      * @param string $lang_attribute
      */
@@ -121,7 +121,7 @@ 
         $this->lang_attribute = $lang_attribute;
         $this->params = $modx->event->params;
         if ($this->checkTemplate && !isset($this->params['template']) && $modx->event->name != 'OnEmptyTrash') {
-			$doc = $modx->getDocument($this->params['id'],'template','all','all');
+            $doc = $modx->getDocument($this->params['id'],'template','all','all');
             $this->params['template'] = is_array($doc) ? end($doc) : null;
         }
         //overload plugin and class properties
@@ -173,12 +173,12 @@ 
                 $this->modx->logEvent(0, 3, "Cannot create {$this->table} table.", $this->pluginName);
                 return;
             }
-			$this->registerEvents($this->pluginEvents);
+            $this->registerEvents($this->pluginEvents);
         }
         $output = '';
-		$plugins = $this->modx->pluginEvent;
-		if(($this->renderEvent!=='OnDocFormRender' || (array_search('ManagerManager', $plugins['OnDocFormRender']) === false))) {
-			$jquery = $this->assets->registerScript('jQuery',array(
+        $plugins = $this->modx->pluginEvent;
+        if(($this->renderEvent!=='OnDocFormRender' || (array_search('ManagerManager', $plugins['OnDocFormRender']) === false))) {
+            $jquery = $this->assets->registerScript('jQuery',array(
                 'version' => '1.9.1',
                 'src'     => 'assets/js/jquery/jquery-1.9.1.min.js'
             ));
@@ -186,14 +186,14 @@ 
                 $output .= $jquery;
                 $output .='<script type="text/javascript">var jQuery = jQuery.noConflict(true);</script>';    
             }
-		}
-		$tpl = MODX_BASE_PATH.$this->tpl;
-		if($this->fs->checkFile($tpl)) {
-			$output .= '[+js+][+styles+]'.file_get_contents($tpl);
-		} else {
-			$this->modx->logEvent(0, 3, "Cannot load {$this->tpl} .", $this->pluginName);
+        }
+        $tpl = MODX_BASE_PATH.$this->tpl;
+        if($this->fs->checkFile($tpl)) {
+            $output .= '[+js+][+styles+]'.file_get_contents($tpl);
+        } else {
+            $this->modx->logEvent(0, 3, "Cannot load {$this->tpl} .", $this->pluginName);
             return false;
-		}
+        }
         return $output;
     }
 
@@ -203,48 +203,48 @@ 
      * @return string
      */
     public function renderJS($list,$ph = array()) {
-    	$js = '';
-    	$scripts = MODX_BASE_PATH.$list;
-		if($this->fs->checkFile($scripts)) {
-			$scripts = @file_get_contents($scripts);
-			$scripts = $this->DLTemplate->parseChunk('@CODE:'.$scripts,$ph);
-			$scripts = json_decode($scripts,true);
-			$scripts = isset($scripts['scripts']) ? $scripts['scripts'] : $scripts['styles'];
-			foreach ($scripts as $name => $params) {
-				$script = $this->assets->registerScript($name,$params);
+        $js = '';
+        $scripts = MODX_BASE_PATH.$list;
+        if($this->fs->checkFile($scripts)) {
+            $scripts = @file_get_contents($scripts);
+            $scripts = $this->DLTemplate->parseChunk('@CODE:'.$scripts,$ph);
+            $scripts = json_decode($scripts,true);
+            $scripts = isset($scripts['scripts']) ? $scripts['scripts'] : $scripts['styles'];
+            foreach ($scripts as $name => $params) {
+                $script = $this->assets->registerScript($name,$params);
                 if ($script !== false) $js .= $script;
-			}
-		} else {
-			if ($list == $this->jsListDefault) {
-				$this->modx->logEvent(0, 3, "Cannot load {$this->jsListDefault} .", $this->pluginName);
-			} elseif ($list == $this->cssListDefault) {
-				$this->modx->logEvent(0, 3, "Cannot load {$this->cssListDefault} .", $this->pluginName);
-			}
-		}
-		return $js;
+            }
+        } else {
+            if ($list == $this->jsListDefault) {
+                $this->modx->logEvent(0, 3, "Cannot load {$this->jsListDefault} .", $this->pluginName);
+            } elseif ($list == $this->cssListDefault) {
+                $this->modx->logEvent(0, 3, "Cannot load {$this->cssListDefault} .", $this->pluginName);
+            }
+        }
+        return $js;
     }
 
-	/**
-	 * @return array
-	 */
-	public function getTplPlaceholders() {
-		$ph = array ();
-		return $ph;
-	}
+    /**
+     * @return array
+     */
+    public function getTplPlaceholders() {
+        $ph = array ();
+        return $ph;
+    }
 
     /**
      * @return string
      */
     public function render() {
-		if (!$this->checkPermissions()) {
+        if (!$this->checkPermissions()) {
             $output = $this->prerender();
-    		if ($output !== false) {
-    			$ph = $this->getTplPlaceholders();
-    			$ph['js'] = $this->renderJS($this->jsListDefault,$ph) . $this->renderJS($this->jsListCustom,$ph);
-    			$ph['styles'] = $this->renderJS($this->cssListDefault,$ph) . $this->renderJS($this->cssListCustom,$ph);
-    			$output = $this->DLTemplate->parseChunk('@CODE:'.$output,$ph);
-    		}
-    		return $output;
+            if ($output !== false) {
+                $ph = $this->getTplPlaceholders();
+                $ph['js'] = $this->renderJS($this->jsListDefault,$ph) . $this->renderJS($this->jsListCustom,$ph);
+                $ph['styles'] = $this->renderJS($this->cssListDefault,$ph) . $this->renderJS($this->cssListCustom,$ph);
+                $output = $this->DLTemplate->parseChunk('@CODE:'.$output,$ph);
+            }
+            return $output;
         }
     }
 
@@ -278,8 +278,8 @@ 
      * @return mixed
      */
     public function createTable() {
-    	$sql = '';
-    	return $this->modx->db->query($sql);
+        $sql = '';
+        return $this->modx->db->query($sql);
     }
 
     /**
@@ -287,13 +287,13 @@ 
      * @param string $eventsType
      */
     public function registerEvents($events = array(), $eventsType = '6') {
-		$eventsTable = $this->modx->getFullTableName('system_eventnames');
-		foreach ($events as $event) {
-			$result = $this->modx->db->select('`id`',$eventsTable,"`name` = '{$event}'");
-			if (!$this->modx->db->getRecordCount($result)) {
-				$sql = "INSERT INTO {$eventsTable} VALUES (NULL, '{$event}', '{$eventsType}', '{$this->pluginName} Events')";
-				if (!$this->modx->db->query($sql)) $this->modx->logEvent(0, 3, "Cannot register {$event} event.", $this->pluginName);
-			}
-		}
-	}
+        $eventsTable = $this->modx->getFullTableName('system_eventnames');
+        foreach ($events as $event) {
+            $result = $this->modx->db->select('`id`',$eventsTable,"`name` = '{$event}'");
+            if (!$this->modx->db->getRecordCount($result)) {
+                $sql = "INSERT INTO {$eventsTable} VALUES (NULL, '{$event}', '{$eventsType}', '{$this->pluginName} Events')";
+                if (!$this->modx->db->query($sql)) $this->modx->logEvent(0, 3, "Cannot register {$event} event.", $this->pluginName);
+            }
+        }
+    }
 }
\ No newline at end of file

assets/lib/SimpleTab/controller.abstract.php

Indentation +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
     public $isExit = false;
     public $output = null;
     public $params = null;
-	public $fireEvents = true;
+    public $fireEvents = true;
 	
     public $dlParams = array(
         "controller"    =>  "onetable",

Braces +6 added lines, -2 removed lines

@@ -101,7 +101,9 @@ 
         $this->dlParams['table'] = $this->data->tableName();
         $this->dlParams['idField'] = $this->data->fieldPKName();
         $this->dlParams['addWhereList'] = "`{$this->rfName}`={$this->rid}";
-        if (isset($_REQUEST['rows'])) $this->dlParams['display'] = (int)$_REQUEST['rows'];
+        if (isset($_REQUEST['rows'])) {

+            $this->dlParams['display'] = (int)$_REQUEST['rows'];

+        }

         $offset = isset($_REQUEST['page']) ? (int)$_REQUEST['page'] : 1;
         $offset = $offset ? $offset : 1;
         $offset = $this->dlParams['display']*abs($offset-1);
@@ -113,7 +115,9 @@ 
             $this->dlParams['sortDir'] = $_REQUEST['order'];
         }
         foreach ($this->dlParams as &$param) {
-            if (empty($param)) unset($param);
+            if (empty($param)) {

+                unset($param);

+            }

         }
     }
 

Spacing +8 added lines, -8 removed lines

@@ -1,6 +1,6 @@ 
 <?php namespace SimpleTab;
 
-require_once (MODX_BASE_PATH . 'assets/lib/Helpers/FS.php');
+require_once (MODX_BASE_PATH.'assets/lib/Helpers/FS.php');
 
 abstract class AbstractController {
     public $rfName = '';
@@ -30,15 +30,15 @@ 
 
     protected $modx = null;
 
-    public function __construct(\DocumentParser $modx){
+    public function __construct(\DocumentParser $modx) {
         $this->FS = \Helpers\FS::getInstance();
         $this->modx = $modx;
         $this->params = $modx->event->params;
         $this->rid = isset($_REQUEST[$this->rfName]) ? (int)$_REQUEST[$this->rfName] : 0;
     }
 
-    public function callExit(){
-        if($this->isExit){
+    public function callExit() {
+        if ($this->isExit) {
             echo $this->output;
             exit;
         }
@@ -104,12 +104,12 @@ 
         if (isset($_REQUEST['rows'])) $this->dlParams['display'] = (int)$_REQUEST['rows'];
         $offset = isset($_REQUEST['page']) ? (int)$_REQUEST['page'] : 1;
         $offset = $offset ? $offset : 1;
-        $offset = $this->dlParams['display']*abs($offset-1);
+        $offset = $this->dlParams['display'] * abs($offset - 1);
         $this->dlParams['offset'] = $offset;
-        if(isset($_REQUEST['sort'])){
+        if (isset($_REQUEST['sort'])) {
             $this->dlParams['sortBy'] = preg_replace('/[^A-Za-z0-9_\-]/', '', $_REQUEST['sort']);
         }
-        if(isset($_REQUEST['order']) && in_array(strtoupper($_REQUEST['order']), array("ASC","DESC"))){
+        if (isset($_REQUEST['order']) && in_array(strtoupper($_REQUEST['order']), array("ASC", "DESC"))) {
             $this->dlParams['sortDir'] = $_REQUEST['order'];
         }
         foreach ($this->dlParams as &$param) {
@@ -119,7 +119,7 @@ 
 
     public function getLanguageCode() {
         $manager_language = $this->modx->config['manager_language'];
-        if(file_exists(MODX_MANAGER_PATH."includes/lang/".$manager_language.".inc.php")) {
+        if (file_exists(MODX_MANAGER_PATH."includes/lang/".$manager_language.".inc.php")) {
             include_once MODX_MANAGER_PATH."includes/lang/".$manager_language.".inc.php";
         }
         return $modx_lang_attribute;

assets/lib/Helpers/PHPThumb.php

Indentation +5 added lines, -5 removed lines

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

Spacing +4 added lines, -4 removed lines

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

Doc Comments +3 added lines, -3 removed lines

@@ -23,8 +23,8 @@ 
     }
 
     /**
-     * @param $inputFile
-     * @param $outputFile
+     * @param string $inputFile
+     * @param string $outputFile
      * @param $options
      * @return bool
      */
@@ -66,7 +66,7 @@ 
     }
 
     /**
-     * @param $options
+     * @param string $options
      */
     private function setOptions($options) {
         $options = strtr($options, Array("," => "&", "_" => "=", '{' => '[', '}' => ']'));

assets/lib/class.summary.php

Braces +18 added lines, -6 removed lines

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

+                $this->_useSubstr = true;

+            }

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

+                        $tag_counter -= 2;

+                    }

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

+                        $tag_counter -= 1;

+                    }

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

+                        $quotes_on = TRUE;

+                    }

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

+                        $quotes_on = FALSE;

+                    }

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

+            return $string;

+        }

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

Indentation +1 added lines, -1 removed lines

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

Spacing +4 added lines, -4 removed lines

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

Doc Comments +5 added lines, -5 removed lines

@@ -69,7 +69,7 @@ 
     }
 
     /**
-     * @return mixed
+     * @return string
      */
     public function getCut()
     {
@@ -149,8 +149,8 @@ 
     /**
      * @param $resource
      * @param $truncLen
-     * @param $truncOffset
-     * @param $truncChars
+     * @param integer $truncOffset
+     * @param boolean $truncChars
      * @param string $splitter
      * @return array|mixed|string
      */
@@ -242,7 +242,7 @@ 
      */
     /**
      * @param $string
-     * @param $limit
+     * @param integer $limit
      * @param string $break
      * @return string
      */
@@ -265,7 +265,7 @@ 
     }
 
     /**
-     * @param $str
+     * @param string $str
      * @return mixed
      */
     protected function rTriming($str)

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

Braces +70 added lines, -28 removed lines

@@ -47,7 +47,9 @@ 
         $this->maxPasses = ($maxpass != '') ? $maxpass : 50;
 
         $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
@@ -67,7 +69,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: [, ]
@@ -85,7 +89,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);
@@ -203,9 +209,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;
     }
@@ -224,7 +234,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":
@@ -267,7 +279,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;
@@ -386,11 +400,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);
@@ -400,7 +418,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") {
@@ -412,11 +432,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;
@@ -460,12 +484,14 @@ 
 							$msg = ob_get_contents();
 							$output = $msg . $custom;
 							ob_end_clean();
-						}else{
+						} else{
 							$output = '';
 						}
                         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 . "'");
             }
         }
@@ -545,7 +571,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) {
@@ -562,8 +590,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;
@@ -586,52 +615,65 @@ 
     // Sets a placeholder variable which can only be access by PHx
 	public function setPHxVariable($name, $value)
     {
-        if ($name != "phx") $this->placeholders[$name] = $value;
+        if ($name != "phx") {

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

+        }

     }
 
     //mbstring
 	public 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);
     }
 
 	public function strlen($str)
     {
-        if (function_exists('mb_strlen')) return mb_strlen($str);
+        if (function_exists('mb_strlen')) {

+            return mb_strlen($str);

+        }

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

+            return mb_strtolower($str);

+        }

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

+            return mb_strtoupper($str);

+        }

         return strtoupper($str);
     }
 
 	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));
+        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);
     }
 
 	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));
+        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);
     }
 
 	public 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 +39 added lines, -39 removed lines

@@ -10,7 +10,7 @@ 
 #	Date: March 22, 2013
 #
 ####*/
-include_once(MODX_BASE_PATH . 'assets/lib/APIHelpers.class.php');
+include_once(MODX_BASE_PATH.'assets/lib/APIHelpers.class.php');
 
 class DLphx
 {
@@ -78,7 +78,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);
@@ -88,7 +88,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
@@ -115,8 +115,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);
@@ -132,10 +132,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
@@ -164,19 +164,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.
@@ -207,7 +207,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
@@ -215,8 +215,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":
@@ -271,14 +271,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 {
@@ -287,7 +287,7 @@ 
                         break;
                     case "else":
                         $conditional = implode(' ', $condition);
-						$isvalid = intval(eval("return (" . $conditional . ");"));
+						$isvalid = intval(eval("return (".$conditional.");"));
                         if (!$isvalid) {
                             $output = $modifier_value[$i];
                         }
@@ -374,7 +374,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];
@@ -395,7 +395,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;
@@ -416,25 +416,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");
@@ -444,20 +444,20 @@ 
                         $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;
+							$output = $msg.$custom;
 							ob_end_clean();
-						}else{
+						} 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;
@@ -469,7 +469,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>';
         }
     }
 
@@ -486,7 +486,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);
         }
     }
 
@@ -495,20 +495,20 @@ 
     {
         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
 	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);
     }
 
 
@@ -547,7 +547,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];
@@ -608,14 +608,14 @@ 
 	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);
     }
 
 	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);
     }
 

Doc Comments +17 added lines, -17 removed lines

@@ -120,7 +120,7 @@ 
     // Parser: Preparation, cleaning and checkup
     /**
      * @param string $template
-     * @return mixed|string
+     * @return string
      */
     public function Parse($template = '')
     {
@@ -268,7 +268,7 @@ 
     // Parser: modifier detection and eXtended processing if needed
     /**
      * @param $input
-     * @param $modifiers
+     * @param string $modifiers
      * @return mixed|null|string
      */
     public function Filter($input, $modifiers)
@@ -600,8 +600,8 @@ 
     // positive userid = manager, negative integer = webuser
     /**
      * @param $userid
-     * @param $field
-     * @return mixed
+     * @param string $field
+     * @return string
      */
     public function ModUser($userid, $field)
     {
@@ -656,7 +656,7 @@ 
 
     // Returns the value of a PHx/MODx placeholder.
     /**
-     * @param $name
+     * @param string $name
      * @return mixed
      */
     public function getPHxVariable($name)
@@ -684,9 +684,9 @@ 
 
     //mbstring
     /**
-     * @param $str
-     * @param $s
-     * @param null $l
+     * @param string $str
+     * @param integer $s
+     * @param integer $l
      * @return string
      */
     public function substr($str, $s, $l = null)
@@ -696,7 +696,7 @@ 
     }
 
     /**
-     * @param $str
+     * @param string $str
      * @return int
      */
     public function strlen($str)
@@ -706,7 +706,7 @@ 
     }
 
     /**
-     * @param $str
+     * @param string $str
      * @return string
      */
     public function strtolower($str)
@@ -716,7 +716,7 @@ 
     }
 
     /**
-     * @param $str
+     * @param string $str
      * @return string
      */
     public function strtoupper($str)
@@ -726,7 +726,7 @@ 
     }
 
     /**
-     * @param $str
+     * @param string $str
      * @return string
      */
     public function ucfirst($str)
@@ -737,7 +737,7 @@ 
     }
 
     /**
-     * @param $str
+     * @param string $str
      * @return string
      */
     public function lcfirst($str)
@@ -748,7 +748,7 @@ 
     }
 
     /**
-     * @param $str
+     * @param string $str
      * @return string
      */
     public function ucwords($str)
@@ -759,7 +759,7 @@ 
     }
 
     /**
-     * @param $str
+     * @param string $str
      * @return string
      */
     public function strrev($str)
@@ -769,7 +769,7 @@ 
     }
 
     /**
-     * @param $str
+     * @param string $str
      * @return string
      */
     public function str_shuffle($str)
@@ -780,7 +780,7 @@ 
     }
 
     /**
-     * @param $str
+     * @param string $str
      * @return int
      */
     public function str_word_count($str)

Indentation +42 added lines, -42 removed lines

@@ -25,65 +25,65 @@ 
     /**
      * @var string
      */
-	public $name = 'PHx';
+    public $name = 'PHx';
 
     /**
      * @var string
      */
-	public $version = '2.2.0';
+    public $version = '2.2.0';
 
     /**
      * @var array
      */
-	public $user = array();
+    public $user = array();
 
     /**
      * @var array
      */
-	public $cache = array(
-		'cm' => array(),
-		'ui' => array(),
-		'mo' => array()
-	);
+    public $cache = array(
+        'cm' => array(),
+        'ui' => array(),
+        'mo' => array()
+    );
 
     /**
      * @var array
      */
-	public $safetags = array(
-		array('~(?<![\[]|^\^)\[(?=[^\+\*\(\[]|$)~s', '~(?<=[^\+\*\)\]]|^)\](?=[^\]]|$)~s'),
-		array('&_PHX_INTERNAL_091_&', '&_PHX_INTERNAL_093_&'),
-		array('[', ']')
-	);
+    public $safetags = array(
+        array('~(?<![\[]|^\^)\[(?=[^\+\*\(\[]|$)~s', '~(?<=[^\+\*\)\]]|^)\](?=[^\]]|$)~s'),
+        array('&_PHX_INTERNAL_091_&', '&_PHX_INTERNAL_093_&'),
+        array('[', ']')
+    );
 
     /**
      * @var array
      */
-	public $console = array();
+    public $console = array();
 
     /**
      * @var bool|int
      */
-	public $debug = false;
+    public $debug = false;
 
     /**
      * @var bool
      */
-	public $debugLog = false;
+    public $debugLog = false;
 
     /**
      * @var int
      */
-	public $curPass = 0;
+    public $curPass = 0;
 
     /**
      * @var int
      */
-	public $maxPasses = 50;
+    public $maxPasses = 50;
 
     /**
      * @var array
      */
-	public $swapSnippetCache = array();
+    public $swapSnippetCache = array();
 
     /**
      * DLphx constructor.
@@ -97,7 +97,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 = ($debug != '') ? $debug : 0;
+        $this->debug = ($debug != '') ? $debug : 0;
 
         $this->maxPasses = ($maxpass != '') ? $maxpass : 50;
 
@@ -176,9 +176,9 @@ 
             $var_search = array();
             $var_replace = array();
             for ($i = 0; $i < $count; $i++) {
-				$var_search[] = $matches[0][$i];
-				$input = $matches[1][$i];
-				$this->Log('MODX Chunk: ' . $input);
+                $var_search[] = $matches[0][$i];
+                $input = $matches[1][$i];
+                $this->Log('MODX Chunk: ' . $input);
                 $input = $modx->mergeChunkContent('{{' . $input . '}}');
                 $var_replace[] = $this->Filter($input, $matches[2][$i]);
             }
@@ -296,9 +296,9 @@ 
                     case "eq":
                         $condition[] = intval(($output == $modifier_value[$i]));
                         break;
-					case "empty":
-						 $condition[] = intval(empty($output));
-						break;
+                    case "empty":
+                         $condition[] = intval(empty($output));
+                        break;
                     case "notequals":
                     case "isnot":
                     case "isnt":
@@ -343,7 +343,7 @@ 
                         if (!$isvalid) {
                             $output = NULL;
                         }
-						break;
+                        break;
                     case "then":
                         $conditional = implode(' ', $condition);
                         $isvalid = intval(eval("return (" . $conditional . ");"));
@@ -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];
                         }
@@ -363,7 +363,7 @@ 
                     case "select":
                         $raw = explode("&", $modifier_value[$i]);
                         $map = array();
-						$count = count($raw);
+                        $count = count($raw);
                         for ($m = 0; $m < $count; $m++) {
                             $mi = explode("=", $raw[$m]);
                             $map[$mi[0]] = $mi[1];
@@ -373,7 +373,7 @@ 
                     ##### End of Conditional Modifiers
 
                     #####  String Modifiers
-					case "default":
+                    case "default":
                         $output = ($output === '') ? $modifier_value[0] : $output;
                         break;
                     case "lcase":
@@ -482,7 +482,7 @@ 
 
                     // If we haven't yet found the modifier, let's look elsewhere
                     default:
-						$snippet = '';
+                        $snippet = '';
                         // modified by Anton Kuzmin (23.06.2010) //
                         $snippetName = 'phx:' . $modifier_cmd[$i];
                         if (isset($modx->snippetCache[$snippetName])) {
@@ -512,16 +512,16 @@ 
                         $cm = $snippet;
                         // end //
 
-						if(!empty($cm)){
-							ob_start();
-							$options = $modifier_value[$i];
-							$custom = eval($cm);
-							$msg = ob_get_contents();
-							$output = $msg . $custom;
-							ob_end_clean();
-						}else{
-							$output = '';
-						}
+                        if(!empty($cm)){
+                            ob_start();
+                            $options = $modifier_value[$i];
+                            $custom = eval($cm);
+                            $msg = ob_get_contents();
+                            $output = $msg . $custom;
+                            ob_end_clean();
+                        }else{
+                            $output = '';
+                        }
                         break;
                 }
                 if (count($condition)) $this->Log("  |--- Condition = '" . $condition[count($condition) - 1] . "'");
@@ -581,7 +581,7 @@ 
     }
 
     // Log pass
-	public function LogPass()
+    public function LogPass()
     {
         $this->console[] = "<div style='margin: 2px;margin-top: 5px;border-bottom: 1px solid black;'>Pass " . $this->curPass . "</div>";
     }