evolution-cms / evolution

core/src/Models/UserAttribute.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php namespace EvolutionCMS\Models;
 
-use Illuminate\Database\Eloquent;
 use EvolutionCMS\Traits;
+use Illuminate\Database\Eloquent;
 
 /**
  * EvolutionCMS\Models\UserAttribute

Indentation +43 added lines, -43 removed lines

@@ -46,52 +46,52 @@
 {
     use Traits\Models\TimeMutator;
 
-	const CREATED_AT = 'createdon';
-	const UPDATED_AT = 'editedon';
+    const CREATED_AT = 'createdon';
+    const UPDATED_AT = 'editedon';
     protected $dateFormat = 'U';
 
-	protected $casts = [
-		'internalKey' => 'int',
-		'role' => 'int',
-		'blocked' => 'int',
-		'blockeduntil' => 'int',
-		'blockedafter' => 'int',
-		'logincount' => 'int',
-		'lastlogin' => 'int',
-		'thislogin' => 'int',
-		'failedlogincount' => 'int',
-		'dob' => 'int',
-		'gender' => 'int',
-		'createdon' => 'int',
-		'editedon' => 'int'
-	];
+    protected $casts = [
+        'internalKey' => 'int',
+        'role' => 'int',
+        'blocked' => 'int',
+        'blockeduntil' => 'int',
+        'blockedafter' => 'int',
+        'logincount' => 'int',
+        'lastlogin' => 'int',
+        'thislogin' => 'int',
+        'failedlogincount' => 'int',
+        'dob' => 'int',
+        'gender' => 'int',
+        'createdon' => 'int',
+        'editedon' => 'int'
+    ];
 
-	protected $fillable = [
-		'internalKey',
-		'fullname',
-		'role',
-		'email',
-		'phone',
-		'mobilephone',
-		'blocked',
-		'blockeduntil',
-		'blockedafter',
-		'logincount',
-		'lastlogin',
-		'thislogin',
-		'failedlogincount',
-		'sessionid',
-		'dob',
-		'gender',
-		'country',
-		'street',
-		'city',
-		'state',
-		'zip',
-		'fax',
-		'photo',
-		'comment'
-	];
+    protected $fillable = [
+        'internalKey',
+        'fullname',
+        'role',
+        'email',
+        'phone',
+        'mobilephone',
+        'blocked',
+        'blockeduntil',
+        'blockedafter',
+        'logincount',
+        'lastlogin',
+        'thislogin',
+        'failedlogincount',
+        'sessionid',
+        'dob',
+        'gender',
+        'country',
+        'street',
+        'city',
+        'state',
+        'zip',
+        'fax',
+        'photo',
+        'comment'
+    ];
 
     public function getCreatedAtAttribute()
     {

Spacing +1 added lines, -1 removed lines

@@ -105,6 +105,6 @@
 
     public function user()
     {
-        return $this->belongsTo(ManagerUser::class,'internalKey','id');
+        return $this->belongsTo(ManagerUser::class, 'internalKey', 'id');
     }
 }

core/src/Models/UserRole.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php namespace EvolutionCMS\Models;
 
-use Illuminate\Database\Eloquent;
 use EvolutionCMS\Traits;
+use Illuminate\Database\Eloquent;
 
 /**
  * EvolutionCMS\Models\UserRole

Indentation +153 added lines, -153 removed lines

@@ -93,162 +93,162 @@
 {
     use Traits\Models\ManagerActions;
 
-	public $timestamps = false;
+    public $timestamps = false;
 
-	protected $casts = [
-		'frames' => 'int',
-		'home' => 'int',
-		'view_document' => 'int',
-		'new_document' => 'int',
-		'save_document' => 'int',
-		'publish_document' => 'int',
-		'delete_document' => 'int',
-		'empty_trash' => 'int',
-		'action_ok' => 'int',
-		'logout' => 'int',
-		'help' => 'int',
-		'messages' => 'int',
-		'new_user' => 'int',
-		'edit_user' => 'int',
-		'logs' => 'int',
-		'edit_parser' => 'int',
-		'save_parser' => 'int',
-		'edit_template' => 'int',
-		'settings' => 'int',
-		'credits' => 'int',
-		'new_template' => 'int',
-		'save_template' => 'int',
-		'delete_template' => 'int',
-		'edit_snippet' => 'int',
-		'new_snippet' => 'int',
-		'save_snippet' => 'int',
-		'delete_snippet' => 'int',
-		'edit_chunk' => 'int',
-		'new_chunk' => 'int',
-		'save_chunk' => 'int',
-		'delete_chunk' => 'int',
-		'empty_cache' => 'int',
-		'edit_document' => 'int',
-		'change_password' => 'int',
-		'error_dialog' => 'int',
-		'about' => 'int',
-		'category_manager' => 'int',
-		'file_manager' => 'int',
-		'assets_files' => 'int',
-		'assets_images' => 'int',
-		'save_user' => 'int',
-		'delete_user' => 'int',
-		'save_password' => 'int',
-		'edit_role' => 'int',
-		'save_role' => 'int',
-		'delete_role' => 'int',
-		'new_role' => 'int',
-		'access_permissions' => 'int',
-		'bk_manager' => 'int',
-		'new_plugin' => 'int',
-		'edit_plugin' => 'int',
-		'save_plugin' => 'int',
-		'delete_plugin' => 'int',
-		'new_module' => 'int',
-		'edit_module' => 'int',
-		'save_module' => 'int',
-		'delete_module' => 'int',
-		'exec_module' => 'int',
-		'view_eventlog' => 'int',
-		'delete_eventlog' => 'int',
-		'new_web_user' => 'int',
-		'edit_web_user' => 'int',
-		'save_web_user' => 'int',
-		'delete_web_user' => 'int',
-		'web_access_permissions' => 'int',
-		'view_unpublished' => 'int',
-		'import_static' => 'int',
-		'export_static' => 'int',
-		'remove_locks' => 'int',
-		'display_locks' => 'int',
-		'change_resourcetype' => 'int'
-	];
+    protected $casts = [
+        'frames' => 'int',
+        'home' => 'int',
+        'view_document' => 'int',
+        'new_document' => 'int',
+        'save_document' => 'int',
+        'publish_document' => 'int',
+        'delete_document' => 'int',
+        'empty_trash' => 'int',
+        'action_ok' => 'int',
+        'logout' => 'int',
+        'help' => 'int',
+        'messages' => 'int',
+        'new_user' => 'int',
+        'edit_user' => 'int',
+        'logs' => 'int',
+        'edit_parser' => 'int',
+        'save_parser' => 'int',
+        'edit_template' => 'int',
+        'settings' => 'int',
+        'credits' => 'int',
+        'new_template' => 'int',
+        'save_template' => 'int',
+        'delete_template' => 'int',
+        'edit_snippet' => 'int',
+        'new_snippet' => 'int',
+        'save_snippet' => 'int',
+        'delete_snippet' => 'int',
+        'edit_chunk' => 'int',
+        'new_chunk' => 'int',
+        'save_chunk' => 'int',
+        'delete_chunk' => 'int',
+        'empty_cache' => 'int',
+        'edit_document' => 'int',
+        'change_password' => 'int',
+        'error_dialog' => 'int',
+        'about' => 'int',
+        'category_manager' => 'int',
+        'file_manager' => 'int',
+        'assets_files' => 'int',
+        'assets_images' => 'int',
+        'save_user' => 'int',
+        'delete_user' => 'int',
+        'save_password' => 'int',
+        'edit_role' => 'int',
+        'save_role' => 'int',
+        'delete_role' => 'int',
+        'new_role' => 'int',
+        'access_permissions' => 'int',
+        'bk_manager' => 'int',
+        'new_plugin' => 'int',
+        'edit_plugin' => 'int',
+        'save_plugin' => 'int',
+        'delete_plugin' => 'int',
+        'new_module' => 'int',
+        'edit_module' => 'int',
+        'save_module' => 'int',
+        'delete_module' => 'int',
+        'exec_module' => 'int',
+        'view_eventlog' => 'int',
+        'delete_eventlog' => 'int',
+        'new_web_user' => 'int',
+        'edit_web_user' => 'int',
+        'save_web_user' => 'int',
+        'delete_web_user' => 'int',
+        'web_access_permissions' => 'int',
+        'view_unpublished' => 'int',
+        'import_static' => 'int',
+        'export_static' => 'int',
+        'remove_locks' => 'int',
+        'display_locks' => 'int',
+        'change_resourcetype' => 'int'
+    ];
 
-	protected $hidden = [
-		'change_password',
-		'save_password'
-	];
+    protected $hidden = [
+        'change_password',
+        'save_password'
+    ];
 
-	protected $fillable = [
-		'name',
-		'description',
-		'frames',
-		'home',
-		'view_document',
-		'new_document',
-		'save_document',
-		'publish_document',
-		'delete_document',
-		'empty_trash',
-		'action_ok',
-		'logout',
-		'help',
-		'messages',
-		'new_user',
-		'edit_user',
-		'logs',
-		'edit_parser',
-		'save_parser',
-		'edit_template',
-		'settings',
-		'credits',
-		'new_template',
-		'save_template',
-		'delete_template',
-		'edit_snippet',
-		'new_snippet',
-		'save_snippet',
-		'delete_snippet',
-		'edit_chunk',
-		'new_chunk',
-		'save_chunk',
-		'delete_chunk',
-		'empty_cache',
-		'edit_document',
-		'change_password',
-		'error_dialog',
-		'about',
-		'category_manager',
-		'file_manager',
-		'assets_files',
-		'assets_images',
-		'save_user',
-		'delete_user',
-		'save_password',
-		'edit_role',
-		'save_role',
-		'delete_role',
-		'new_role',
-		'access_permissions',
-		'bk_manager',
-		'new_plugin',
-		'edit_plugin',
-		'save_plugin',
-		'delete_plugin',
-		'new_module',
-		'edit_module',
-		'save_module',
-		'delete_module',
-		'exec_module',
-		'view_eventlog',
-		'delete_eventlog',
-		'new_web_user',
-		'edit_web_user',
-		'save_web_user',
-		'delete_web_user',
-		'web_access_permissions',
-		'view_unpublished',
-		'import_static',
-		'export_static',
-		'remove_locks',
-		'display_locks',
-		'change_resourcetype'
-	];
+    protected $fillable = [
+        'name',
+        'description',
+        'frames',
+        'home',
+        'view_document',
+        'new_document',
+        'save_document',
+        'publish_document',
+        'delete_document',
+        'empty_trash',
+        'action_ok',
+        'logout',
+        'help',
+        'messages',
+        'new_user',
+        'edit_user',
+        'logs',
+        'edit_parser',
+        'save_parser',
+        'edit_template',
+        'settings',
+        'credits',
+        'new_template',
+        'save_template',
+        'delete_template',
+        'edit_snippet',
+        'new_snippet',
+        'save_snippet',
+        'delete_snippet',
+        'edit_chunk',
+        'new_chunk',
+        'save_chunk',
+        'delete_chunk',
+        'empty_cache',
+        'edit_document',
+        'change_password',
+        'error_dialog',
+        'about',
+        'category_manager',
+        'file_manager',
+        'assets_files',
+        'assets_images',
+        'save_user',
+        'delete_user',
+        'save_password',
+        'edit_role',
+        'save_role',
+        'delete_role',
+        'new_role',
+        'access_permissions',
+        'bk_manager',
+        'new_plugin',
+        'edit_plugin',
+        'save_plugin',
+        'delete_plugin',
+        'new_module',
+        'edit_module',
+        'save_module',
+        'delete_module',
+        'exec_module',
+        'view_eventlog',
+        'delete_eventlog',
+        'new_web_user',
+        'edit_web_user',
+        'save_web_user',
+        'delete_web_user',
+        'web_access_permissions',
+        'view_unpublished',
+        'import_static',
+        'export_static',
+        'remove_locks',
+        'display_locks',
+        'change_resourcetype'
+    ];
 
     protected $managerActionsMap = [
         'actions.new' => 38,

Spacing +1 added lines, -1 removed lines

@@ -267,7 +267,7 @@
         return array_key_exists($this->getKey(), self::getLockedElements());
     }
 
-    public function getAlreadyEditInfoAttribute() :? array
+    public function getAlreadyEditInfoAttribute() : ? array
     {
         return $this->isAlreadyEdit ? self::getLockedElements()[$this->getKey()] : null;
     }

core/src/Models/WebUser.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php namespace EvolutionCMS\Models;
 
-use Illuminate\Database\Eloquent;
 use EvolutionCMS\Traits;
+use Illuminate\Database\Eloquent;
 
 /**
  * EvolutionCMS\Models\WebUser

Indentation +9 added lines, -9 removed lines

@@ -17,17 +17,17 @@
 {
     use Traits\Models\ManagerActions;
 
-	public $timestamps = false;
+    public $timestamps = false;
 
-	protected $hidden = [
-		'password'
-	];
+    protected $hidden = [
+        'password'
+    ];
 
-	protected $fillable = [
-		'username',
-		'password',
-		'cachepwd'
-	];
+    protected $fillable = [
+        'username',
+        'password',
+        'cachepwd'
+    ];
 
     public function attributes()
     {

Spacing +3 added lines, -3 removed lines

@@ -31,17 +31,17 @@
 
     public function attributes()
     {
-        return $this->hasOne(WebUserAttribute::class,'internalKey','id');
+        return $this->hasOne(WebUserAttribute::class, 'internalKey', 'id');
     }
 
     public function memberGroups()
     {
-        return $this->hasMany(WebGroup::class,'webuser','id');
+        return $this->hasMany(WebGroup::class, 'webuser', 'id');
     }
 
     public function settings()
     {
-        return $this->hasMany(WebUserSetting::class,'webuser','id');
+        return $this->hasMany(WebUserSetting::class, 'webuser', 'id');
     }
 
     public function delete()

core/src/Models/WebUserAttribute.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php namespace EvolutionCMS\Models;
 
-use Illuminate\Database\Eloquent;
 use EvolutionCMS\Traits;
+use Illuminate\Database\Eloquent;
 
 /**
  * EvolutionCMS\Models\WebUserAttribute

Indentation +43 added lines, -43 removed lines

@@ -46,52 +46,52 @@
 {
     use Traits\Models\TimeMutator;
 
-	const CREATED_AT = 'createdon';
-	const UPDATED_AT = 'editedon';
+    const CREATED_AT = 'createdon';
+    const UPDATED_AT = 'editedon';
     protected $dateFormat = 'U';
 
-	protected $casts = [
-		'internalKey' => 'int',
-		'role' => 'int',
-		'blocked' => 'int',
-		'blockeduntil' => 'int',
-		'blockedafter' => 'int',
-		'logincount' => 'int',
-		'lastlogin' => 'int',
-		'thislogin' => 'int',
-		'failedlogincount' => 'int',
-		'dob' => 'int',
-		'gender' => 'int',
-		'createdon' => 'int',
-		'editedon' => 'int'
-	];
+    protected $casts = [
+        'internalKey' => 'int',
+        'role' => 'int',
+        'blocked' => 'int',
+        'blockeduntil' => 'int',
+        'blockedafter' => 'int',
+        'logincount' => 'int',
+        'lastlogin' => 'int',
+        'thislogin' => 'int',
+        'failedlogincount' => 'int',
+        'dob' => 'int',
+        'gender' => 'int',
+        'createdon' => 'int',
+        'editedon' => 'int'
+    ];
 
-	protected $fillable = [
-		'internalKey',
-		'fullname',
-		'role',
-		'email',
-		'phone',
-		'mobilephone',
-		'blocked',
-		'blockeduntil',
-		'blockedafter',
-		'logincount',
-		'lastlogin',
-		'thislogin',
-		'failedlogincount',
-		'sessionid',
-		'dob',
-		'gender',
-		'country',
-		'street',
-		'city',
-		'state',
-		'zip',
-		'fax',
-		'photo',
-		'comment'
-	];
+    protected $fillable = [
+        'internalKey',
+        'fullname',
+        'role',
+        'email',
+        'phone',
+        'mobilephone',
+        'blocked',
+        'blockeduntil',
+        'blockedafter',
+        'logincount',
+        'lastlogin',
+        'thislogin',
+        'failedlogincount',
+        'sessionid',
+        'dob',
+        'gender',
+        'country',
+        'street',
+        'city',
+        'state',
+        'zip',
+        'fax',
+        'photo',
+        'comment'
+    ];
 
     public function getCreatedAtAttribute()
     {

Spacing +1 added lines, -1 removed lines

@@ -105,6 +105,6 @@
 
     public function user()
     {
-        return $this->belongsTo(WebUser::class,'internalKey','id');
+        return $this->belongsTo(WebUser::class, 'internalKey', 'id');
     }
 }

core/src/Parser.php

Doc Comments +2 added lines, -2 removed lines

@@ -381,7 +381,7 @@ 
      *

      * @param string $name

      * @param string $tpl

-     * @return null

+     * @return string

      */

     protected function getTwig($name, $tpl)

     {

@@ -448,7 +448,7 @@ 
     /**

      * @param $out

      * @param Core|null $modx

-     * @return mixed|string

+     * @return string

      */

     public function parseDocumentSource($out, $modx = null)

     {

Spacing +12 added lines, -12 removed lines

@@ -164,16 +164,16 @@ 
                 ) && isset($tmp[2], $tmp[3])) ? $tmp[2] : false;

             $subTmp = (isset($tmp[3])) ? trim($tmp[3]) : null;

             if ($this->twigEnabled) {

-                $mode = '@' . substr($mode, 3);

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

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

                     }

@@ -264,14 +264,14 @@ 
      */

     public function renderDoc($id, $events = false, $tpl = null)

     {

-        $id = (int)$id;

+        $id = (int) $id;

         if ($id <= 0) {

             return '';

         }

 

         $m = clone $this->modx; //Чтобы была возможность вызывать события

         $m->documentIdentifier = $id;

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

@@ -306,7 +306,7 @@ 
     public function getTemplate($id)

     {

         $tpl = null;

-        $id = (int)$id;

+        $id = (int) $id;

         if ($id > 0) {

             $tpl = $this->modx->getDatabase()->getValue("SELECT `content` FROM {$this->modx->getDatabase()->getFullTableName("site_templates")} WHERE `id` = {$id}");

         }

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

@@ -425,7 +425,7 @@ 
     public function createPHx($debug = 0, $maxpass = 50)

     {

         if (!class_exists('DLphx')) {

-            include_once(__DIR__ . '/DLphx.class.php');

+            include_once(__DIR__.'/DLphx.class.php');

         }

 

         return new DLphx($this->modx, $debug, $maxpass);

Braces +83 added lines, -83 removed lines

@@ -2,8 +2,8 @@ 
 

 /**

  */

-class Parser

-{

+class Parser
+{
     /**

      * Объект Core - основной класс MODX

      * @var Core $modx

@@ -36,10 +36,10 @@ 
      *

      * @return self

      */

-    public static function getInstance(Core $modx)

-    {

+    public static function getInstance(Core $modx)
+    {
 

-        if (null === self::$instance) {

+        if (null === self::$instance) {
             self::$instance = new self($modx);

         }

 

@@ -50,8 +50,8 @@ 
      * is not allowed to call from outside: private!

      *

      */

-    private function __construct(Core $modx)

-    {

+    private function __construct(Core $modx)
+    {
         $this->modx = $modx;

     }

 

@@ -60,8 +60,8 @@ 
      *

      * @return void

      */

-    private function __clone()

-    {

+    private function __clone()
+    {
     }

 

     /**

@@ -69,8 +69,8 @@ 
      *

      * @return void

      */

-    private function __wakeup()

-    {

+    private function __wakeup()
+    {
     }

 

     /**

@@ -79,15 +79,15 @@ 
      * @param $path

      * @return $this

      */

-    public function setTemplatePath($path)

-    {

+    public function setTemplatePath($path)
+    {
         $path = trim($path);

         $path = preg_replace(array(

             '/\.*[\/|\\\]/i',

             '/[\/|\\\]+/i'

         ), array('/', '/'), $path);

 

-        if (!empty($path)) {

+        if (!empty($path)) {
             $this->templatePath = $path;

         }

 

@@ -100,10 +100,10 @@ 
      * @param $ext

      * @return $this

      */

-    public function setTemplateExtension($ext)

-    {

+    public function setTemplateExtension($ext)
+    {
         $ext = trim($ext, ". \t\n\r\0\x0B");

-        if (!empty($ext)) {

+        if (!empty($ext)) {
             $this->templateExtension = $ext;

         }

 

@@ -116,9 +116,9 @@ 
      * @param array $data

      * @return $this

      */

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

-    {

-        if (is_array($data)) {

+    public function setTwigTemplateVars($data = array())
+    {
+        if (is_array($data)) {
             $this->twigTemplateVars = $data;

         }

 

@@ -134,12 +134,12 @@ 
      * @param string $prefix префикс для ключей массива

      * @return string

      */

-    public function toPlaceholders($data, $set = 0, $key = 'contentPlaceholder', $prefix = '')

-    {

+    public function toPlaceholders($data, $set = 0, $key = 'contentPlaceholder', $prefix = '')
+    {
         $out = '';

-        if ($set != 0) {

+        if ($set != 0) {
             $this->modx->toPlaceholder($key, $data, $prefix);

-        } else {

+        } else {
             $out = $data;

         }

 

@@ -152,23 +152,23 @@ 
      * @param string $name Template: chunk name || @CODE: template || @FILE: file with template

      * @return string html template with placeholders without data

      */

-    public function getChunk($name)

-    {

+    public function getChunk($name)
+    {
         $tpl = '';

         $this->twigEnabled = substr($name, 0, 3) == '@T_';

-        if ($name != '' && !isset($this->modx->chunkCache[$name])) {

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

+            if ($this->twigEnabled) {
                 $mode = '@' . substr($mode, 3);

             }

-            switch ($mode) {

+            switch ($mode) {
                 case '@FILE':

-                    if ($subTmp != '') {

+                    if ($subTmp != '') {
                         $real = realpath(MODX_BASE_PATH . $this->templatePath);

                         $path = realpath(MODX_BASE_PATH . $this->templatePath . preg_replace(array(

                                 '/\.*[\/|\\\]/i',

@@ -180,13 +180,13 @@ 
                                 0,

                                 strlen($real)

                             ) && end($fname) == $this->templateExtension && file_exists($path)

-                        ) {

+                        ) {
                             $tpl = file_get_contents($path);

                         }

                     }

                     break;

                 case '@CHUNK':

-                    if ($subTmp != '') {

+                    if ($subTmp != '') {
                         $tpl = $this->modx->getChunk($subTmp);

                     }

                     break;

@@ -197,7 +197,7 @@ 
                     break;

                 case '@DOCUMENT':

                 case '@DOC':

-                    switch (true) {

+                    switch (true) {
                         case ((int)$subTmp > 0):

                             $tpl = $this->modx->getPageInfo((int)$subTmp, 0, "content");

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

@@ -209,19 +209,19 @@ 
                     break;

                 case '@PLH':

                 case '@PLACEHOLDER':

-                    if ($subTmp != '') {

+                    if ($subTmp != '') {
                         $tpl = $this->modx->getPlaceholder($subTmp);

                     }

                     break;

                 case '@CFG':

                 case '@CONFIG':

                 case '@OPTIONS':

-                    if ($subTmp != '') {

+                    if ($subTmp != '') {
                         $tpl = $this->modx->getConfig($subTmp);

                     }

                     break;

                 case '@SNIPPET':

-                    if ($subTmp != '') {

+                    if ($subTmp != '') {
                         $tpl = $this->modx->runSnippet($subTmp, $this->modx->event->params);

                     }

                     break;

@@ -238,8 +238,8 @@ 
                     $tpl = $this->modx->getChunk($name);

             }

             $this->modx->chunkCache[$name] = $tpl;

-        } else {

-            if ($name != '') {

+        } else {
+            if ($name != '') {
                 $tpl = $this->modx->getChunk($name);

             }

         }

@@ -262,22 +262,22 @@ 
      *       - с источиком от куда произошел вызов события

      *       - оригинальный экземпляр класса Core

      */

-    public function renderDoc($id, $events = false, $tpl = null)

-    {

+    public function renderDoc($id, $events = false, $tpl = null)
+    {
         $id = (int)$id;

-        if ($id <= 0) {

+        if ($id <= 0) {
             return '';

         }

 

         $m = clone $this->modx; //Чтобы была возможность вызывать события

         $m->documentIdentifier = $id;

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

+        if ($m->documentObject['type'] == "reference") {
+            if (is_numeric($m->documentObject['content']) && $m->documentObject['content'] > 0) {
                 $m->documentObject['content'] = $this->renderDoc($m->documentObject['content'], $events);

             }

         }

-        switch (true) {

+        switch (true) {
             case is_integer($tpl):

                 $tpl = $this->getTemplate($tpl);

                 break;

@@ -288,7 +288,7 @@ 
                 $tpl = $this->getTemplate($m->documentObject['template']);

         }

         $m->documentContent = $tpl;

-        if ($events) {

+        if ($events) {
             $m->invokeEvent("OnLoadWebDocument", array(

                 'source'   => 'DLTemplate',

                 'mainModx' => $this->modx,

@@ -303,14 +303,14 @@ 
      * @param int $id Номер шаблона

      * @return string HTML код шаблона

      */

-    public function getTemplate($id)

-    {

+    public function getTemplate($id)
+    {
         $tpl = null;

         $id = (int)$id;

-        if ($id > 0) {

+        if ($id > 0) {
             $tpl = $this->modx->getDatabase()->getValue("SELECT `content` FROM {$this->modx->getDatabase()->getFullTableName("site_templates")} WHERE `id` = {$id}");

         }

-        if (is_null($tpl)) {

+        if (is_null($tpl)) {
             $tpl = '[*content*]';

         }

 

@@ -325,22 +325,22 @@ 
      * @param bool $parseDocumentSource render html template via Core::parseDocumentSource()

      * @return string html template with data without placeholders

      */

-    public function parseChunk($name, $data = array(), $parseDocumentSource = false, $disablePHx = false)

-    {

+    public function parseChunk($name, $data = array(), $parseDocumentSource = false, $disablePHx = false)
+    {
         $out = $this->getChunk($name);

-        if ($this->twigEnabled && ($out != '') && ($twig = $this->getTwig($name, $out))) {

+        if ($this->twigEnabled && ($out != '') && ($twig = $this->getTwig($name, $out))) {
             $plh = $this->twigTemplateVars;

             $plh['data'] = $data;

             $plh['modx'] = $this->modx;

             $out = $twig->render(md5($name), $plh);

-        } else {

-            if (is_array($data) && ($out != '')) {

-                if (preg_match("/\[\+[A-Z0-9\.\_\-]+\+\]/is", $out)) {

+        } else {
+            if (is_array($data) && ($out != '')) {
+                if (preg_match("/\[\+[A-Z0-9\.\_\-]+\+\]/is", $out)) {
                     $item = $this->renameKeyArr($data, '[', ']', '+');

                     $out = str_replace(array_keys($item), array_values($item), $out);

                 }

-                if (!$disablePHx && preg_match("/:([^:=]+)(?:=`(.*?)`(?=:[^:=]+|$))?/is", $out)) {

-                    if (is_null($this->phx) || !($this->phx instanceof DLphx)) {

+                if (!$disablePHx && preg_match("/:([^:=]+)(?:=`(.*?)`(?=:[^:=]+|$))?/is", $out)) {
+                    if (is_null($this->phx) || !($this->phx instanceof DLphx)) {
                         $this->phx = $this->createPHx(0, 1000);

                     }

                     $this->phx->placeholders = array();

@@ -350,7 +350,7 @@ 
                 }

             }

         }

-        if ($parseDocumentSource) {

+        if ($parseDocumentSource) {
             $out = $this->parseDocumentSource($out);

         }

 

@@ -363,15 +363,15 @@ 
      * @param string $key

      * @param string $path

      */

-    public function setPHxPlaceholders($value = '', $key = '', $path = '')

-    {

+    public function setPHxPlaceholders($value = '', $key = '', $path = '')
+    {
         $keypath = !empty($path) ? $path . "." . $key : $key;

         $this->phx->curPass = 0;

-        if (is_array($value)) {

-            foreach ($value as $subkey => $subval) {

+        if (is_array($value)) {
+            foreach ($value as $subkey => $subval) {
                 $this->setPHxPlaceholders($subval, $subkey, $keypath);

             }

-        } else {

+        } else {
             $this->phx->setPHxVariable($keypath, $value);

         }

     }

@@ -383,15 +383,15 @@ 
      * @param string $tpl

      * @return null

      */

-    protected function getTwig($name, $tpl)

-    {

-        if (is_null($this->twig) && isset($this->modx->twig)) {

+    protected function getTwig($name, $tpl)
+    {
+        if (is_null($this->twig) && isset($this->modx->twig)) {
             $twig = clone $this->modx->twig;

             $this->twig = $twig;

-        } else {

+        } else {
             $twig = $this->twig;

         }

-        if ($twig && class_exists('Twig_Loader_Array')) {

+        if ($twig && class_exists('Twig_Loader_Array')) {
             $twig->getLoader()->addLoader(

                 new Twig_Loader_Array(array(

                     md5($name) => $tpl

@@ -407,10 +407,10 @@ 
      * @param string $string

      * @return string

      */

-    public function cleanPHx($string)

-    {

+    public function cleanPHx($string)
+    {
         preg_match_all('~\[(\+|\*|\()([^:\+\[\]]+)([^\[\]]*?)(\1|\))\]~s', $string, $matches);

-        if ($matches[0]) {

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

         }

 

@@ -422,9 +422,9 @@ 
      * @param int $maxpass

      * @return DLphx

      */

-    public function createPHx($debug = 0, $maxpass = 50)

-    {

-        if (!class_exists('DLphx')) {

+    public function createPHx($debug = 0, $maxpass = 50)
+    {
+        if (!class_exists('DLphx')) {
             include_once(__DIR__ . '/DLphx.class.php');

         }

 

@@ -440,8 +440,8 @@ 
      * @param string $sep разделитель суффиксов, префиксов и ключей массива

      * @return array массив с переименованными ключами

      */

-    public function renameKeyArr($data, $prefix = '', $suffix = '', $sep = '.')

-    {

+    public function renameKeyArr($data, $prefix = '', $suffix = '', $sep = '.')
+    {
         return APIhelpers::renameKeyArr($data, $prefix, $suffix, $sep);

     }

 

@@ -450,23 +450,23 @@ 
      * @param Core|null $modx

      * @return mixed|string

      */

-    public function parseDocumentSource($out, $modx = null)

-    {

-        if (!is_object($modx)) {

+    public function parseDocumentSource($out, $modx = null)
+    {
+        if (!is_object($modx)) {
             $modx = $this->modx;

         }

         $minPasses = empty($modx->minParserPasses) ? 2 : $modx->minParserPasses;

         $maxPasses = empty($modx->maxParserPasses) ? 10 : $modx->maxParserPasses;

         $site_status = $modx->getConfig('site_status');

         $modx->config['site_status'] = 0;

-        for ($i = 1; $i <= $maxPasses; $i++) {

+        for ($i = 1; $i <= $maxPasses; $i++) {
             $html = $out;

-            if (preg_match('/\[\!(.*)\!\]/us', $out)) {

+            if (preg_match('/\[\!(.*)\!\]/us', $out)) {
                 $out = str_replace(array('[!', '!]'), array('[[', ']]'), $out);

             }

-            if ($i <= $minPasses || $out != $html) {

+            if ($i <= $minPasses || $out != $html) {
                 $out = $modx->parseDocumentSource($out);

-            } else {

+            } else {
                 break;

             }

         }

core/src/ProviderRepository.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -1,8 +1,8 @@
 <?php namespace EvolutionCMS;
 
 use Exception;
-use Illuminate\Filesystem\Filesystem;
 use Illuminate\Contracts\Foundation\Application as ApplicationContract;
+use Illuminate\Filesystem\Filesystem;
 
 class ProviderRepository
 {

Spacing +2 added lines, -2 removed lines

@@ -107,7 +107,7 @@ 
         if (count($events) < 1) {
             return;
         }
-        $this->app->make('events')->listen($events, function () use ($provider) {
+        $this->app->make('events')->listen($events, function() use ($provider) {
             $this->app->register($provider);
         });
     }
@@ -163,7 +163,7 @@ 
      */
     public function writeManifest($manifest)
     {
-        if (! is_writable(dirname($this->manifestPath))) {
+        if (!is_writable(dirname($this->manifestPath))) {
             throw new Exception('The bootstrap/cache directory must be present and writable.');
         }
         $this->files->put(

Braces +1 added lines, -1 removed lines

@@ -107,7 +107,7 @@
         if (count($events) < 1) {
             return;
         }
-        $this->app->make('events')->listen($events, function () use ($provider) {
+        $this->app->make('events')->listen($events, function () use ($provider){
             $this->app->register($provider);
         });
     }

core/src/Providers/ManagerThemeServiceProvider.php

Doc Comments +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
     /**
      * Get the services provided by the provider.
      *
-     * @return array
+     * @return string[]
      */
     public function provides()
     {

Unused Use Statements +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php namespace EvolutionCMS\Providers;
 
-use EvolutionCMS\ServiceProvider;
 use EvolutionCMS\ManagerTheme;
+use EvolutionCMS\ServiceProvider;
 
 class ManagerThemeServiceProvider extends ServiceProvider
 {

Spacing +5 added lines, -5 removed lines

@@ -23,22 +23,22 @@
     {
         $theme = $this->app->getConfig('manager_theme', 'default');
 
-        $this->app->singleton('ManagerTheme', function ($app) use ($theme) {
+        $this->app->singleton('ManagerTheme', function($app) use ($theme) {
             return new ManagerTheme($app, $theme);
         });
 
         $this->loadViewsFrom([
-            MODX_MANAGER_PATH . 'media/style/' . $theme . '/views/',
-            MODX_MANAGER_PATH . '/views/'
+            MODX_MANAGER_PATH.'media/style/'.$theme.'/views/',
+            MODX_MANAGER_PATH.'/views/'
         ], $this->namespace);
 
         $this->loadSnippetsFrom(
-            MODX_MANAGER_PATH . 'media/style/' . $theme . '/snippets/',
+            MODX_MANAGER_PATH.'media/style/'.$theme.'/snippets/',
             $this->namespace
         );
 
         $this->loadChunksFrom(
-            MODX_MANAGER_PATH . 'media/style/' . $theme . '/chunks/',
+            MODX_MANAGER_PATH.'media/style/'.$theme.'/chunks/',
             $this->namespace
         );
     }

Braces +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
     {
         $theme = $this->app->getConfig('manager_theme', 'default');
 
-        $this->app->singleton('ManagerTheme', function ($app) use ($theme) {
+        $this->app->singleton('ManagerTheme', function ($app) use ($theme){
             return new ManagerTheme($app, $theme);
         });
 

core/src/Support/DataGrid.php

Doc Comments +7 added lines

@@ -75,6 +75,10 @@ 
 
     public static $dataGridCnt;
 
+    /**
+     * @param null|string $id
+     * @param string $ds
+     */
     public function __construct($id, $ds, $pageSize = 20, $pageNumber = -1) {
 		// set id
 		self::$dataGridCnt++;
@@ -207,6 +211,9 @@ 
 
 	// format column values
 
+    /**
+     * @param integer $n
+     */
     public function RenderRowFnc($n, $row) {
 		if($this->_alt == 0) {
 			$Style = $this->_itemStyle;

Indentation +223 added lines, -223 removed lines

@@ -13,7 +13,7 @@ 
 
 class DataGrid implements DataGridInterface{
 
-	public $ds; // datasource
+    public $ds; // datasource
     public $id;
     public $pageSize;            // pager settings
     public $pageNumber;
@@ -37,7 +37,7 @@ 
     public $colWraps;
     public $colColors;
     public $colTypes;            // coltype1, coltype2, etc or coltype1:format1, e.g. date:%Y %m
-	// data type: integer,float,currency,date
+    // data type: integer,float,currency,date
 
     public $header;
     public $footer;
@@ -76,236 +76,236 @@ 
     public static $dataGridCnt;
 
     public function __construct($id, $ds, $pageSize = 20, $pageNumber = -1) {
-		// set id
-		self::$dataGridCnt++;
-		$this->id = $this->id ? empty($id) : "dg" . self::$dataGridCnt;
+        // set id
+        self::$dataGridCnt++;
+        $this->id = $this->id ? empty($id) : "dg" . self::$dataGridCnt;
 
-		// set datasource
-		$this->ds = $ds;
+        // set datasource
+        $this->ds = $ds;
 
-		// set pager
-		$this->pageSize = $pageSize;
-		$this->pageNumber = $pageNumber; // by setting pager to -1 will cause pager to load it's last page number
-		$this->pagerLocation = 'top-right';
-	}
+        // set pager
+        $this->pageSize = $pageSize;
+        $this->pageNumber = $pageNumber; // by setting pager to -1 will cause pager to load it's last page number
+        $this->pagerLocation = 'top-right';
+    }
 
     public function setDataSource($ds) {
-		$this->ds = $ds;
-	}
+        $this->ds = $ds;
+    }
 
     public function render() {
         $modx = evolutionCMS();
-		$columnHeaderStyle = ($this->columnHeaderStyle) ? "style='" . $this->columnHeaderStyle . "'" : '';
-		$columnHeaderClass = ($this->columnHeaderClass) ? "class='" . $this->columnHeaderClass . "'" : "";
-		$cssStyle = ($this->cssStyle) ? "style='" . $this->cssStyle . "'" : '';
-		$cssClass = ($this->cssClass) ? "class='" . $this->cssClass . "'" : '';
-
-		$pagerClass = ($this->pagerClass) ? "class='" . $this->pagerClass . "'" : '';
-		$pagerStyle = ($this->pagerStyle) ? "style='" . $this->pagerStyle . "'" : "style='background-color:#ffffff;'";
-
-		$this->_itemStyle = ($this->itemStyle) ? "style='" . $this->itemStyle . "'" : '';
-		$this->_itemClass = ($this->itemClass) ? "class='" . $this->itemClass . "'" : '';
-		$this->_altItemStyle = ($this->altItemStyle) ? "style='" . $this->altItemStyle . "'" : '';
-		$this->_altItemClass = ($this->altItemClass) ? "class='" . $this->altItemClass . "'" : '';
-
-		$this->_alt = 0;
-		$this->_total = 0;
-
-		$this->_isDataset = $modx->getDatabase()->isResult($this->ds); // if not dataset then treat as array
-
-		if(!$cssStyle && !$cssClass) {
-			$cssStyle = "style='width:100%;border:1px solid silver;font-family:verdana,arial; font-size:11px;'";
-		}
-		if(!$columnHeaderStyle && !$columnHeaderClass) {
-			$columnHeaderStyle = "style='color:black;background-color:silver'";
-		}
-		if(!$this->_itemStyle && !$this->_itemClass) {
-			$this->_itemStyle = "style='color:black;'";
-		}
-		if(!$this->_altItemStyle && !$this->_altItemClass) {
-			$this->_altItemStyle = "style='color:black;background-color:#eeeeee'";
-		}
-
-		if($this->_isDataset && !$this->columns) {
-			$cols = $modx->getDatabase()->numFields($this->ds);
-			for($i = 0; $i < $cols; $i++) $this->columns .= ($i ? "," : "") . $modx->getDatabase()->fieldName($this->ds, $i);
-		}
-
-		// start grid
-		$tblStart = "<table $cssClass $cssStyle cellpadding='" . (isset($this->cellPadding) ? (int) $this->cellPadding : 1) . "' cellspacing='" . (isset($this->cellSpacing) ? (int) $this->cellSpacing : 1) . "'>";
-		$tblEnd = "</table>";
-
-		// build column header
-		$this->_colnames = explode((strstr($this->columns, "||") !== false ? "||" : ","), $this->columns);
-		$this->_colwidths = explode((strstr($this->colWidths, "||") !== false ? "||" : ","), $this->colWidths);
-		$this->_colaligns = explode((strstr($this->colAligns, "||") !== false ? "||" : ","), $this->colAligns);
-		$this->_colwraps = explode((strstr($this->colWraps, "||") !== false ? "||" : ","), $this->colWraps);
-		$this->_colcolors = explode((strstr($this->colColors, "||") !== false ? "||" : ","), $this->colColors);
-		$this->_coltypes = explode((strstr($this->colTypes, "||") !== false ? "||" : ","), $this->colTypes);
-		$this->_colcount = count($this->_colnames);
-		if(!$this->_isDataset) {
-			$this->ds = explode((strstr($this->ds, "||") !== false ? "||" : ","), $this->ds);
-			$this->ds = array_chunk($this->ds, $this->_colcount);
-		}
-		$tblColHdr = "<thead><tr>";
-		for($c = 0; $c < $this->_colcount; $c++) {
-			$name = $this->_colnames[$c];
-			$width = $this->_colwidths[$c];
-			$tblColHdr .= "<td $columnHeaderStyle $columnHeaderClass" . ($width ? " width='$width'" : "") . ">$name</td>";
-		}
-		$tblColHdr .= "</tr></thead>\n";
-
-		// build rows
-		$rowcount = $this->_isDataset ? $modx->getDatabase()->getRecordCount($this->ds) : count($this->ds);
-		$this->_fieldnames = explode(",", $this->fields);
-		if($rowcount == 0) {
-			$tblRows .= "<tr><td " . $this->_itemStyle . " " . $this->_itemClass . " colspan='" . $this->_colcount . "'>" . $this->noRecordMsg . "</td></tr>\n";
-		} else {
-			// render grid items
-			if($this->pageSize <= 0) {
-				for($r = 0; $r < $rowcount; $r++) {
-					$row = $this->_isDataset ? $modx->getDatabase()->getRow($this->ds) : $this->ds[$r];
-					$tblRows .= $this->RenderRowFnc($r + 1, $row);
-				}
-			} else {
-				if(!$this->pager) {
-					$this->pager = new DataSetPager($this->id, $this->ds, $this->pageSize, $this->pageNumber);
-					$this->pager->setRenderRowFnc($this); // pass this object
-					$this->pager->cssStyle = $pagerStyle;
-					$this->pager->cssClass = $pagerClass;
-				} else {
-					$this->pager->pageSize = $this->pageSize;
-					$this->pager->pageNumber = $this->pageNumber;
-				}
-
-				$this->pager->render();
-				$tblRows = $this->pager->getRenderedRows();
-				$tblPager = $this->pager->getRenderedPager();
-			}
-		}
-
-		// setup header,pager and footer
-		$o = $tblStart;
-		$ptop = (substr($this->pagerLocation, 0, 3) == "top") || (substr($this->pagerLocation, 0, 4) == "both");
-		$pbot = (substr($this->pagerLocation, 0, 3) == "bot") || (substr($this->pagerLocation, 0, 4) == "both");
-		if($this->header) {
-			$o .= "<tr><td bgcolor='#ffffff' colspan='" . $this->_colcount . "'>" . $this->header . "</td></tr>";
-		}
-		if($tblPager && $ptop) {
-			$o .= "<tr><td align='" . (substr($this->pagerLocation, -4) == "left" ? "left" : "right") . "' $pagerClass $pagerStyle colspan='" . $this->_colcount . "'>" . $tblPager . "&nbsp;</td></tr>";
-		}
-		$o .= $tblColHdr . $tblRows;
-		if($tblPager && $pbot) {
-			$o .= "<tr><td align='" . (substr($this->pagerLocation, -4) == "left" ? "left" : "right") . "' $pagerClass $pagerStyle colspan='" . $this->_colcount . "'>" . $tblPager . "&nbsp;</td></tr>";
-		}
-		if($this->footer) {
-			$o .= "<tr><td bgcolor='#ffffff' colspan='" . $this->_colcount . "'>" . $this->footer . "</td></tr>";
-		}
-		$o .= $tblEnd;
-		return $o;
-	}
-
-	// format column values
+        $columnHeaderStyle = ($this->columnHeaderStyle) ? "style='" . $this->columnHeaderStyle . "'" : '';
+        $columnHeaderClass = ($this->columnHeaderClass) ? "class='" . $this->columnHeaderClass . "'" : "";
+        $cssStyle = ($this->cssStyle) ? "style='" . $this->cssStyle . "'" : '';
+        $cssClass = ($this->cssClass) ? "class='" . $this->cssClass . "'" : '';
+
+        $pagerClass = ($this->pagerClass) ? "class='" . $this->pagerClass . "'" : '';
+        $pagerStyle = ($this->pagerStyle) ? "style='" . $this->pagerStyle . "'" : "style='background-color:#ffffff;'";
+
+        $this->_itemStyle = ($this->itemStyle) ? "style='" . $this->itemStyle . "'" : '';
+        $this->_itemClass = ($this->itemClass) ? "class='" . $this->itemClass . "'" : '';
+        $this->_altItemStyle = ($this->altItemStyle) ? "style='" . $this->altItemStyle . "'" : '';
+        $this->_altItemClass = ($this->altItemClass) ? "class='" . $this->altItemClass . "'" : '';
+
+        $this->_alt = 0;
+        $this->_total = 0;
+
+        $this->_isDataset = $modx->getDatabase()->isResult($this->ds); // if not dataset then treat as array
+
+        if(!$cssStyle && !$cssClass) {
+            $cssStyle = "style='width:100%;border:1px solid silver;font-family:verdana,arial; font-size:11px;'";
+        }
+        if(!$columnHeaderStyle && !$columnHeaderClass) {
+            $columnHeaderStyle = "style='color:black;background-color:silver'";
+        }
+        if(!$this->_itemStyle && !$this->_itemClass) {
+            $this->_itemStyle = "style='color:black;'";
+        }
+        if(!$this->_altItemStyle && !$this->_altItemClass) {
+            $this->_altItemStyle = "style='color:black;background-color:#eeeeee'";
+        }
+
+        if($this->_isDataset && !$this->columns) {
+            $cols = $modx->getDatabase()->numFields($this->ds);
+            for($i = 0; $i < $cols; $i++) $this->columns .= ($i ? "," : "") . $modx->getDatabase()->fieldName($this->ds, $i);
+        }
+
+        // start grid
+        $tblStart = "<table $cssClass $cssStyle cellpadding='" . (isset($this->cellPadding) ? (int) $this->cellPadding : 1) . "' cellspacing='" . (isset($this->cellSpacing) ? (int) $this->cellSpacing : 1) . "'>";
+        $tblEnd = "</table>";
+
+        // build column header
+        $this->_colnames = explode((strstr($this->columns, "||") !== false ? "||" : ","), $this->columns);
+        $this->_colwidths = explode((strstr($this->colWidths, "||") !== false ? "||" : ","), $this->colWidths);
+        $this->_colaligns = explode((strstr($this->colAligns, "||") !== false ? "||" : ","), $this->colAligns);
+        $this->_colwraps = explode((strstr($this->colWraps, "||") !== false ? "||" : ","), $this->colWraps);
+        $this->_colcolors = explode((strstr($this->colColors, "||") !== false ? "||" : ","), $this->colColors);
+        $this->_coltypes = explode((strstr($this->colTypes, "||") !== false ? "||" : ","), $this->colTypes);
+        $this->_colcount = count($this->_colnames);
+        if(!$this->_isDataset) {
+            $this->ds = explode((strstr($this->ds, "||") !== false ? "||" : ","), $this->ds);
+            $this->ds = array_chunk($this->ds, $this->_colcount);
+        }
+        $tblColHdr = "<thead><tr>";
+        for($c = 0; $c < $this->_colcount; $c++) {
+            $name = $this->_colnames[$c];
+            $width = $this->_colwidths[$c];
+            $tblColHdr .= "<td $columnHeaderStyle $columnHeaderClass" . ($width ? " width='$width'" : "") . ">$name</td>";
+        }
+        $tblColHdr .= "</tr></thead>\n";
+
+        // build rows
+        $rowcount = $this->_isDataset ? $modx->getDatabase()->getRecordCount($this->ds) : count($this->ds);
+        $this->_fieldnames = explode(",", $this->fields);
+        if($rowcount == 0) {
+            $tblRows .= "<tr><td " . $this->_itemStyle . " " . $this->_itemClass . " colspan='" . $this->_colcount . "'>" . $this->noRecordMsg . "</td></tr>\n";
+        } else {
+            // render grid items
+            if($this->pageSize <= 0) {
+                for($r = 0; $r < $rowcount; $r++) {
+                    $row = $this->_isDataset ? $modx->getDatabase()->getRow($this->ds) : $this->ds[$r];
+                    $tblRows .= $this->RenderRowFnc($r + 1, $row);
+                }
+            } else {
+                if(!$this->pager) {
+                    $this->pager = new DataSetPager($this->id, $this->ds, $this->pageSize, $this->pageNumber);
+                    $this->pager->setRenderRowFnc($this); // pass this object
+                    $this->pager->cssStyle = $pagerStyle;
+                    $this->pager->cssClass = $pagerClass;
+                } else {
+                    $this->pager->pageSize = $this->pageSize;
+                    $this->pager->pageNumber = $this->pageNumber;
+                }
+
+                $this->pager->render();
+                $tblRows = $this->pager->getRenderedRows();
+                $tblPager = $this->pager->getRenderedPager();
+            }
+        }
+
+        // setup header,pager and footer
+        $o = $tblStart;
+        $ptop = (substr($this->pagerLocation, 0, 3) == "top") || (substr($this->pagerLocation, 0, 4) == "both");
+        $pbot = (substr($this->pagerLocation, 0, 3) == "bot") || (substr($this->pagerLocation, 0, 4) == "both");
+        if($this->header) {
+            $o .= "<tr><td bgcolor='#ffffff' colspan='" . $this->_colcount . "'>" . $this->header . "</td></tr>";
+        }
+        if($tblPager && $ptop) {
+            $o .= "<tr><td align='" . (substr($this->pagerLocation, -4) == "left" ? "left" : "right") . "' $pagerClass $pagerStyle colspan='" . $this->_colcount . "'>" . $tblPager . "&nbsp;</td></tr>";
+        }
+        $o .= $tblColHdr . $tblRows;
+        if($tblPager && $pbot) {
+            $o .= "<tr><td align='" . (substr($this->pagerLocation, -4) == "left" ? "left" : "right") . "' $pagerClass $pagerStyle colspan='" . $this->_colcount . "'>" . $tblPager . "&nbsp;</td></tr>";
+        }
+        if($this->footer) {
+            $o .= "<tr><td bgcolor='#ffffff' colspan='" . $this->_colcount . "'>" . $this->footer . "</td></tr>";
+        }
+        $o .= $tblEnd;
+        return $o;
+    }
+
+    // format column values
 
     public function RenderRowFnc($n, $row) {
-		if($this->_alt == 0) {
-			$Style = $this->_itemStyle;
-			$Class = $this->_itemClass;
-			$this->_alt = 1;
-		} else {
-			$Style = $this->_altItemStyle;
-			$Class = $this->_altItemClass;
-			$this->_alt = 0;
-		}
-		$o = "<tr>";
-		for($c = 0; $c < $this->_colcount; $c++) {
-			$colStyle = $Style;
-			$fld = trim($this->_fieldnames[$c]);
-			$width = isset($this->_colwidths[$c]) ? $this->_colwidths[$c] : null;
-			$align = isset($this->_colaligns[$c]) ? $this->_colaligns[$c] : null;
-			$color = isset($this->_colcolors[$c]) ? $this->_colcolors[$c] : null;
-			$type = isset($this->_coltypes[$c]) ? $this->_coltypes[$c] : null;
-			$nowrap = isset($this->_colwraps[$c]) ? $this->_colwraps[$c] : null;
-			$value = $row[($this->_isDataset && $fld ? $fld : $c)];
-			if($color && $Style) {
-				$colStyle = substr($colStyle, 0, -1) . ";background-color:$color;'";
-			}
-			$value = $this->formatColumnValue($row, $value, $type, $align);
-			$o .= "<td $colStyle $Class" . ($align ? " align='$align'" : "") . ($color ? " bgcolor='$color'" : "") . ($nowrap ? " nowrap='$nowrap'" : "") . ($width ? " width='$width'" : "") . ">$value</td>";
-		}
-		$o .= "</tr>\n";
-		return $o;
-	}
+        if($this->_alt == 0) {
+            $Style = $this->_itemStyle;
+            $Class = $this->_itemClass;
+            $this->_alt = 1;
+        } else {
+            $Style = $this->_altItemStyle;
+            $Class = $this->_altItemClass;
+            $this->_alt = 0;
+        }
+        $o = "<tr>";
+        for($c = 0; $c < $this->_colcount; $c++) {
+            $colStyle = $Style;
+            $fld = trim($this->_fieldnames[$c]);
+            $width = isset($this->_colwidths[$c]) ? $this->_colwidths[$c] : null;
+            $align = isset($this->_colaligns[$c]) ? $this->_colaligns[$c] : null;
+            $color = isset($this->_colcolors[$c]) ? $this->_colcolors[$c] : null;
+            $type = isset($this->_coltypes[$c]) ? $this->_coltypes[$c] : null;
+            $nowrap = isset($this->_colwraps[$c]) ? $this->_colwraps[$c] : null;
+            $value = $row[($this->_isDataset && $fld ? $fld : $c)];
+            if($color && $Style) {
+                $colStyle = substr($colStyle, 0, -1) . ";background-color:$color;'";
+            }
+            $value = $this->formatColumnValue($row, $value, $type, $align);
+            $o .= "<td $colStyle $Class" . ($align ? " align='$align'" : "") . ($color ? " bgcolor='$color'" : "") . ($nowrap ? " nowrap='$nowrap'" : "") . ($width ? " width='$width'" : "") . ">$value</td>";
+        }
+        $o .= "</tr>\n";
+        return $o;
+    }
 
     public function formatColumnValue($row, $value, $type, &$align) {
-		if(strpos($type, ":") !== false) {
-			list($type, $type_format) = explode(":", $type, 2);
-		}
-		switch(strtolower($type)) {
-			case "integer":
-				if($align == "") {
-					$align = "right";
-				}
-				$value = number_format($value);
-				break;
-
-			case "float":
-				if($align == "") {
-					$align = "right";
-				}
-				if(!$type_format) {
-					$type_format = 2;
-				}
-				$value = number_format($value, $type_format);
-				break;
-
-			case "currency":
-				if($align == "") {
-					$align = "right";
-				}
-				if(!$type_format) {
-					$type_format = 2;
-				}
-				$value = "$" . number_format($value, $type_format);
-				break;
-
-			case "date":
-				if($align == "") {
-					$align = "right";
-				}
-				if(!is_numeric($value)) {
-					$value = strtotime($value);
-				}
-				if(!$type_format) {
-					$type_format = "%A %d, %B %Y";
-				}
-				$value = strftime($type_format, $value);
-				break;
-
-			case "boolean":
-				if($align == '') {
-					$align = "center";
-				}
-				$value = number_format($value);
-				if($value) {
-					$value = '&bull;';
-				} else {
-					$value = '&nbsp;';
-				}
-				break;
-
-			case "template":
-				// replace [+value+] first
-				$value = str_replace("[+value+]", $value, $type_format);
-				// replace other [+fields+]
-				if(strpos($value, "[+") !== false) {
-					foreach($row as $k => $v) {
-						$value = str_replace("[+$k+]", $v, $value);
-					}
-				}
-				break;
-
-		}
-		return $value;
-	}
+        if(strpos($type, ":") !== false) {
+            list($type, $type_format) = explode(":", $type, 2);
+        }
+        switch(strtolower($type)) {
+            case "integer":
+                if($align == "") {
+                    $align = "right";
+                }
+                $value = number_format($value);
+                break;
+
+            case "float":
+                if($align == "") {
+                    $align = "right";
+                }
+                if(!$type_format) {
+                    $type_format = 2;
+                }
+                $value = number_format($value, $type_format);
+                break;
+
+            case "currency":
+                if($align == "") {
+                    $align = "right";
+                }
+                if(!$type_format) {
+                    $type_format = 2;
+                }
+                $value = "$" . number_format($value, $type_format);
+                break;
+
+            case "date":
+                if($align == "") {
+                    $align = "right";
+                }
+                if(!is_numeric($value)) {
+                    $value = strtotime($value);
+                }
+                if(!$type_format) {
+                    $type_format = "%A %d, %B %Y";
+                }
+                $value = strftime($type_format, $value);
+                break;
+
+            case "boolean":
+                if($align == '') {
+                    $align = "center";
+                }
+                $value = number_format($value);
+                if($value) {
+                    $value = '&bull;';
+                } else {
+                    $value = '&nbsp;';
+                }
+                break;
+
+            case "template":
+                // replace [+value+] first
+                $value = str_replace("[+value+]", $value, $type_format);
+                // replace other [+fields+]
+                if(strpos($value, "[+") !== false) {
+                    foreach($row as $k => $v) {
+                        $value = str_replace("[+$k+]", $v, $value);
+                    }
+                }
+                break;
+
+        }
+        return $value;
+    }
 }

Spacing +64 added lines, -64 removed lines

@@ -15,10 +15,10 @@ 
 
 	public $ds; // datasource
     public $id;
-    public $pageSize;            // pager settings
+    public $pageSize; // pager settings
     public $pageNumber;
     public $pager;
-    public $pagerLocation;        // top-right, top-left, bottom-left, bottom-right, both-left, both-right
+    public $pagerLocation; // top-right, top-left, bottom-left, bottom-right, both-left, both-right
 
     public $cssStyle;
     public $cssClass;
@@ -36,7 +36,7 @@ 
     public $colAligns;
     public $colWraps;
     public $colColors;
-    public $colTypes;            // coltype1, coltype2, etc or coltype1:format1, e.g. date:%Y %m
+    public $colTypes; // coltype1, coltype2, etc or coltype1:format1, e.g. date:%Y %m
 	// data type: integer,float,currency,date
 
     public $header;
@@ -44,7 +44,7 @@ 
     public $cellPadding;
     public $cellSpacing;
 
-    public $rowAlign;            // vertical alignment: top, middle, bottom
+    public $rowAlign; // vertical alignment: top, middle, bottom
     public $rowIdField;
 
     public $pagerStyle;
@@ -75,10 +75,10 @@ 
 
     public static $dataGridCnt;
 
-    public function __construct($id, $ds, $pageSize = 20, $pageNumber = -1) {
+    public function __construct($id, $ds, $pageSize = 20, $pageNumber = -1){
 		// set id
 		self::$dataGridCnt++;
-		$this->id = $this->id ? empty($id) : "dg" . self::$dataGridCnt;
+		$this->id = $this->id ? empty($id) : "dg".self::$dataGridCnt;
 
 		// set datasource
 		$this->ds = $ds;
@@ -89,50 +89,50 @@ 
 		$this->pagerLocation = 'top-right';
 	}
 
-    public function setDataSource($ds) {
+    public function setDataSource($ds){
 		$this->ds = $ds;
 	}
 
-    public function render() {
+    public function render(){
         $modx = evolutionCMS();
-		$columnHeaderStyle = ($this->columnHeaderStyle) ? "style='" . $this->columnHeaderStyle . "'" : '';
-		$columnHeaderClass = ($this->columnHeaderClass) ? "class='" . $this->columnHeaderClass . "'" : "";
-		$cssStyle = ($this->cssStyle) ? "style='" . $this->cssStyle . "'" : '';
-		$cssClass = ($this->cssClass) ? "class='" . $this->cssClass . "'" : '';
+		$columnHeaderStyle = ($this->columnHeaderStyle) ? "style='".$this->columnHeaderStyle."'" : '';
+		$columnHeaderClass = ($this->columnHeaderClass) ? "class='".$this->columnHeaderClass."'" : "";
+		$cssStyle = ($this->cssStyle) ? "style='".$this->cssStyle."'" : '';
+		$cssClass = ($this->cssClass) ? "class='".$this->cssClass."'" : '';
 
-		$pagerClass = ($this->pagerClass) ? "class='" . $this->pagerClass . "'" : '';
-		$pagerStyle = ($this->pagerStyle) ? "style='" . $this->pagerStyle . "'" : "style='background-color:#ffffff;'";
+		$pagerClass = ($this->pagerClass) ? "class='".$this->pagerClass."'" : '';
+		$pagerStyle = ($this->pagerStyle) ? "style='".$this->pagerStyle."'" : "style='background-color:#ffffff;'";
 
-		$this->_itemStyle = ($this->itemStyle) ? "style='" . $this->itemStyle . "'" : '';
-		$this->_itemClass = ($this->itemClass) ? "class='" . $this->itemClass . "'" : '';
-		$this->_altItemStyle = ($this->altItemStyle) ? "style='" . $this->altItemStyle . "'" : '';
-		$this->_altItemClass = ($this->altItemClass) ? "class='" . $this->altItemClass . "'" : '';
+		$this->_itemStyle = ($this->itemStyle) ? "style='".$this->itemStyle."'" : '';
+		$this->_itemClass = ($this->itemClass) ? "class='".$this->itemClass."'" : '';
+		$this->_altItemStyle = ($this->altItemStyle) ? "style='".$this->altItemStyle."'" : '';
+		$this->_altItemClass = ($this->altItemClass) ? "class='".$this->altItemClass."'" : '';
 
 		$this->_alt = 0;
 		$this->_total = 0;
 
 		$this->_isDataset = $modx->getDatabase()->isResult($this->ds); // if not dataset then treat as array
 
-		if(!$cssStyle && !$cssClass) {
+		if (!$cssStyle && !$cssClass) {
 			$cssStyle = "style='width:100%;border:1px solid silver;font-family:verdana,arial; font-size:11px;'";
 		}
-		if(!$columnHeaderStyle && !$columnHeaderClass) {
+		if (!$columnHeaderStyle && !$columnHeaderClass) {
 			$columnHeaderStyle = "style='color:black;background-color:silver'";
 		}
-		if(!$this->_itemStyle && !$this->_itemClass) {
+		if (!$this->_itemStyle && !$this->_itemClass) {
 			$this->_itemStyle = "style='color:black;'";
 		}
-		if(!$this->_altItemStyle && !$this->_altItemClass) {
+		if (!$this->_altItemStyle && !$this->_altItemClass) {
 			$this->_altItemStyle = "style='color:black;background-color:#eeeeee'";
 		}
 
-		if($this->_isDataset && !$this->columns) {
+		if ($this->_isDataset && !$this->columns) {
 			$cols = $modx->getDatabase()->numFields($this->ds);
-			for($i = 0; $i < $cols; $i++) $this->columns .= ($i ? "," : "") . $modx->getDatabase()->fieldName($this->ds, $i);
+			for ($i = 0; $i < $cols; $i++) $this->columns .= ($i ? "," : "").$modx->getDatabase()->fieldName($this->ds, $i);
 		}
 
 		// start grid
-		$tblStart = "<table $cssClass $cssStyle cellpadding='" . (isset($this->cellPadding) ? (int) $this->cellPadding : 1) . "' cellspacing='" . (isset($this->cellSpacing) ? (int) $this->cellSpacing : 1) . "'>";
+		$tblStart = "<table $cssClass $cssStyle cellpadding='".(isset($this->cellPadding) ? (int) $this->cellPadding : 1)."' cellspacing='".(isset($this->cellSpacing) ? (int) $this->cellSpacing : 1)."'>";
 		$tblEnd = "</table>";
 
 		// build column header
@@ -143,32 +143,32 @@ 
 		$this->_colcolors = explode((strstr($this->colColors, "||") !== false ? "||" : ","), $this->colColors);
 		$this->_coltypes = explode((strstr($this->colTypes, "||") !== false ? "||" : ","), $this->colTypes);
 		$this->_colcount = count($this->_colnames);
-		if(!$this->_isDataset) {
+		if (!$this->_isDataset) {
 			$this->ds = explode((strstr($this->ds, "||") !== false ? "||" : ","), $this->ds);
 			$this->ds = array_chunk($this->ds, $this->_colcount);
 		}
 		$tblColHdr = "<thead><tr>";
-		for($c = 0; $c < $this->_colcount; $c++) {
+		for ($c = 0; $c < $this->_colcount; $c++) {
 			$name = $this->_colnames[$c];
 			$width = $this->_colwidths[$c];
-			$tblColHdr .= "<td $columnHeaderStyle $columnHeaderClass" . ($width ? " width='$width'" : "") . ">$name</td>";
+			$tblColHdr .= "<td $columnHeaderStyle $columnHeaderClass".($width ? " width='$width'" : "").">$name</td>";
 		}
 		$tblColHdr .= "</tr></thead>\n";
 
 		// build rows
 		$rowcount = $this->_isDataset ? $modx->getDatabase()->getRecordCount($this->ds) : count($this->ds);
 		$this->_fieldnames = explode(",", $this->fields);
-		if($rowcount == 0) {
-			$tblRows .= "<tr><td " . $this->_itemStyle . " " . $this->_itemClass . " colspan='" . $this->_colcount . "'>" . $this->noRecordMsg . "</td></tr>\n";
+		if ($rowcount == 0) {
+			$tblRows .= "<tr><td ".$this->_itemStyle." ".$this->_itemClass." colspan='".$this->_colcount."'>".$this->noRecordMsg."</td></tr>\n";
 		} else {
 			// render grid items
-			if($this->pageSize <= 0) {
-				for($r = 0; $r < $rowcount; $r++) {
+			if ($this->pageSize <= 0) {
+				for ($r = 0; $r < $rowcount; $r++) {
 					$row = $this->_isDataset ? $modx->getDatabase()->getRow($this->ds) : $this->ds[$r];
 					$tblRows .= $this->RenderRowFnc($r + 1, $row);
 				}
 			} else {
-				if(!$this->pager) {
+				if (!$this->pager) {
 					$this->pager = new DataSetPager($this->id, $this->ds, $this->pageSize, $this->pageNumber);
 					$this->pager->setRenderRowFnc($this); // pass this object
 					$this->pager->cssStyle = $pagerStyle;
@@ -188,18 +188,18 @@ 
 		$o = $tblStart;
 		$ptop = (substr($this->pagerLocation, 0, 3) == "top") || (substr($this->pagerLocation, 0, 4) == "both");
 		$pbot = (substr($this->pagerLocation, 0, 3) == "bot") || (substr($this->pagerLocation, 0, 4) == "both");
-		if($this->header) {
-			$o .= "<tr><td bgcolor='#ffffff' colspan='" . $this->_colcount . "'>" . $this->header . "</td></tr>";
+		if ($this->header) {
+			$o .= "<tr><td bgcolor='#ffffff' colspan='".$this->_colcount."'>".$this->header."</td></tr>";
 		}
-		if($tblPager && $ptop) {
-			$o .= "<tr><td align='" . (substr($this->pagerLocation, -4) == "left" ? "left" : "right") . "' $pagerClass $pagerStyle colspan='" . $this->_colcount . "'>" . $tblPager . "&nbsp;</td></tr>";
+		if ($tblPager && $ptop) {
+			$o .= "<tr><td align='".(substr($this->pagerLocation, -4) == "left" ? "left" : "right")."' $pagerClass $pagerStyle colspan='".$this->_colcount."'>".$tblPager."&nbsp;</td></tr>";
 		}
-		$o .= $tblColHdr . $tblRows;
-		if($tblPager && $pbot) {
-			$o .= "<tr><td align='" . (substr($this->pagerLocation, -4) == "left" ? "left" : "right") . "' $pagerClass $pagerStyle colspan='" . $this->_colcount . "'>" . $tblPager . "&nbsp;</td></tr>";
+		$o .= $tblColHdr.$tblRows;
+		if ($tblPager && $pbot) {
+			$o .= "<tr><td align='".(substr($this->pagerLocation, -4) == "left" ? "left" : "right")."' $pagerClass $pagerStyle colspan='".$this->_colcount."'>".$tblPager."&nbsp;</td></tr>";
 		}
-		if($this->footer) {
-			$o .= "<tr><td bgcolor='#ffffff' colspan='" . $this->_colcount . "'>" . $this->footer . "</td></tr>";
+		if ($this->footer) {
+			$o .= "<tr><td bgcolor='#ffffff' colspan='".$this->_colcount."'>".$this->footer."</td></tr>";
 		}
 		$o .= $tblEnd;
 		return $o;
@@ -207,8 +207,8 @@ 
 
 	// format column values
 
-    public function RenderRowFnc($n, $row) {
-		if($this->_alt == 0) {
+    public function RenderRowFnc($n, $row){
+		if ($this->_alt == 0) {
 			$Style = $this->_itemStyle;
 			$Class = $this->_itemClass;
 			$this->_alt = 1;
@@ -218,7 +218,7 @@ 
 			$this->_alt = 0;
 		}
 		$o = "<tr>";
-		for($c = 0; $c < $this->_colcount; $c++) {
+		for ($c = 0; $c < $this->_colcount; $c++) {
 			$colStyle = $Style;
 			$fld = trim($this->_fieldnames[$c]);
 			$width = isset($this->_colwidths[$c]) ? $this->_colwidths[$c] : null;
@@ -227,67 +227,67 @@ 
 			$type = isset($this->_coltypes[$c]) ? $this->_coltypes[$c] : null;
 			$nowrap = isset($this->_colwraps[$c]) ? $this->_colwraps[$c] : null;
 			$value = $row[($this->_isDataset && $fld ? $fld : $c)];
-			if($color && $Style) {
-				$colStyle = substr($colStyle, 0, -1) . ";background-color:$color;'";
+			if ($color && $Style) {
+				$colStyle = substr($colStyle, 0, -1).";background-color:$color;'";
 			}
 			$value = $this->formatColumnValue($row, $value, $type, $align);
-			$o .= "<td $colStyle $Class" . ($align ? " align='$align'" : "") . ($color ? " bgcolor='$color'" : "") . ($nowrap ? " nowrap='$nowrap'" : "") . ($width ? " width='$width'" : "") . ">$value</td>";
+			$o .= "<td $colStyle $Class".($align ? " align='$align'" : "").($color ? " bgcolor='$color'" : "").($nowrap ? " nowrap='$nowrap'" : "").($width ? " width='$width'" : "").">$value</td>";
 		}
 		$o .= "</tr>\n";
 		return $o;
 	}
 
-    public function formatColumnValue($row, $value, $type, &$align) {
-		if(strpos($type, ":") !== false) {
+    public function formatColumnValue($row, $value, $type, &$align){
+		if (strpos($type, ":") !== false) {
 			list($type, $type_format) = explode(":", $type, 2);
 		}
-		switch(strtolower($type)) {
+		switch (strtolower($type)) {
 			case "integer":
-				if($align == "") {
+				if ($align == "") {
 					$align = "right";
 				}
 				$value = number_format($value);
 				break;
 
 			case "float":
-				if($align == "") {
+				if ($align == "") {
 					$align = "right";
 				}
-				if(!$type_format) {
+				if (!$type_format) {
 					$type_format = 2;
 				}
 				$value = number_format($value, $type_format);
 				break;
 
 			case "currency":
-				if($align == "") {
+				if ($align == "") {
 					$align = "right";
 				}
-				if(!$type_format) {
+				if (!$type_format) {
 					$type_format = 2;
 				}
-				$value = "$" . number_format($value, $type_format);
+				$value = "$".number_format($value, $type_format);
 				break;
 
 			case "date":
-				if($align == "") {
+				if ($align == "") {
 					$align = "right";
 				}
-				if(!is_numeric($value)) {
+				if (!is_numeric($value)) {
 					$value = strtotime($value);
 				}
-				if(!$type_format) {
+				if (!$type_format) {
 					$type_format = "%A %d, %B %Y";
 				}
 				$value = strftime($type_format, $value);
 				break;
 
 			case "boolean":
-				if($align == '') {
+				if ($align == '') {
 					$align = "center";
 				}
 				$value = number_format($value);
-				if($value) {
+				if ($value) {
 					$value = '&bull;';
 				} else {
 					$value = '&nbsp;';
@@ -298,8 +298,8 @@ 
 				// replace [+value+] first
 				$value = str_replace("[+value+]", $value, $type_format);
 				// replace other [+fields+]
-				if(strpos($value, "[+") !== false) {
-					foreach($row as $k => $v) {
+				if (strpos($value, "[+") !== false) {
+					foreach ($row as $k => $v) {
 						$value = str_replace("[+$k+]", $v, $value);
 					}
 				}

Braces +15 added lines, -7 removed lines

@@ -11,7 +11,8 @@ 
 # -----------------------------------------
 #
 
-class DataGrid implements DataGridInterface{
+class DataGrid implements DataGridInterface
+{
 
 	public $ds; // datasource
     public $id;
@@ -75,7 +76,8 @@ 
 
     public static $dataGridCnt;
 
-    public function __construct($id, $ds, $pageSize = 20, $pageNumber = -1) {
+    public function __construct($id, $ds, $pageSize = 20, $pageNumber = -1)
+    {
 		// set id
 		self::$dataGridCnt++;
 		$this->id = $this->id ? empty($id) : "dg" . self::$dataGridCnt;
@@ -89,11 +91,13 @@ 
 		$this->pagerLocation = 'top-right';
 	}
 
-    public function setDataSource($ds) {
+    public function setDataSource($ds)
+    {
 		$this->ds = $ds;
 	}
 
-    public function render() {
+    public function render()
+    {
         $modx = evolutionCMS();
 		$columnHeaderStyle = ($this->columnHeaderStyle) ? "style='" . $this->columnHeaderStyle . "'" : '';
 		$columnHeaderClass = ($this->columnHeaderClass) ? "class='" . $this->columnHeaderClass . "'" : "";
@@ -128,7 +132,9 @@ 
 
 		if($this->_isDataset && !$this->columns) {
 			$cols = $modx->getDatabase()->numFields($this->ds);
-			for($i = 0; $i < $cols; $i++) $this->columns .= ($i ? "," : "") . $modx->getDatabase()->fieldName($this->ds, $i);
+			for($i = 0; $i < $cols; $i++) {
+			    $this->columns .= ($i ? "," : "") . $modx->getDatabase()->fieldName($this->ds, $i);
+			}
 		}
 
 		// start grid
@@ -207,7 +213,8 @@ 
 
 	// format column values
 
-    public function RenderRowFnc($n, $row) {
+    public function RenderRowFnc($n, $row)
+    {
 		if($this->_alt == 0) {
 			$Style = $this->_itemStyle;
 			$Class = $this->_itemClass;
@@ -237,7 +244,8 @@ 
 		return $o;
 	}
 
-    public function formatColumnValue($row, $value, $type, &$align) {
+    public function formatColumnValue($row, $value, $type, &$align)
+    {
 		if(strpos($type, ":") !== false) {
 			list($type, $type_format) = explode(":", $type, 2);
 		}

core/src/Support/DataSetPager.php

Doc Comments +6 added lines

@@ -33,6 +33,9 @@ 
     public $renderPagerFncArgs;
     public static $dataSetPagerCnt;
 
+    /**
+     * @param boolean|string $id
+     */
     public function __construct($id, $ds, $pageSize = 10, $pageNumber = -1) {
 		global $_PAGE; // use view state object
 
@@ -77,6 +80,9 @@ 
 		$this->pageSize = $ps;
 	}
 
+    /**
+     * @param DataGrid $fncName
+     */
     public function setRenderRowFnc($fncName, $args = "") {
 		$this->renderRowFnc = &$fncName;
 		$this->renderRowFncArgs = $args;    // extra agruments

Indentation +147 added lines, -147 removed lines

@@ -13,18 +13,18 @@ 
 
 class DataSetPager implements DataSetPagerInterface{
 
-	public $ds; // datasource
+    public $ds; // datasource
     public $pageSize;
     public $pageNumber;
     public $rows;
     public $pager;
     public $id;
 
-	// normal page
+    // normal page
     public $pageStyle;
     public $pageClass;
 
-	// selected page
+    // selected page
     public $selPageStyle;
     public $selPageClass;
     public $renderRowFnc;
@@ -34,164 +34,164 @@ 
     public static $dataSetPagerCnt;
 
     public function __construct($id, $ds, $pageSize = 10, $pageNumber = -1) {
-		global $_PAGE; // use view state object
-
-		// set id
-		self::$dataSetPagerCnt++;
-		$this->id = !empty($id) ? $id : "dsp" . self::$dataSetPagerCnt;
-
-		// get pagenumber
-		// by setting pager to -1 cause pager to load it's last page number
-		if($pageNumber == -1) {
-			$pageNumber = 1;
-			if(isset($_GET["dpgn" . $this->id])) {
-				$pageNumber = $_GET["dpgn" . $this->id];
-			} elseif(isset($_PAGE['vs'][$id . '_dpgn'])) {
-				$pageNumber = $_PAGE['vs'][$id . '_dpgn'];
-			}
-		}
-		if(!is_numeric($pageNumber)) {
-			$pageNumber = 1;
-		}
-
-		$this->ds = $ds; // datasource
-		$this->pageSize = $pageSize;
-		$this->pageNumber = $pageNumber;
-		$this->rows = '';
-		$this->pager = '';
-	}
+        global $_PAGE; // use view state object
+
+        // set id
+        self::$dataSetPagerCnt++;
+        $this->id = !empty($id) ? $id : "dsp" . self::$dataSetPagerCnt;
+
+        // get pagenumber
+        // by setting pager to -1 cause pager to load it's last page number
+        if($pageNumber == -1) {
+            $pageNumber = 1;
+            if(isset($_GET["dpgn" . $this->id])) {
+                $pageNumber = $_GET["dpgn" . $this->id];
+            } elseif(isset($_PAGE['vs'][$id . '_dpgn'])) {
+                $pageNumber = $_PAGE['vs'][$id . '_dpgn'];
+            }
+        }
+        if(!is_numeric($pageNumber)) {
+            $pageNumber = 1;
+        }
+
+        $this->ds = $ds; // datasource
+        $this->pageSize = $pageSize;
+        $this->pageNumber = $pageNumber;
+        $this->rows = '';
+        $this->pager = '';
+    }
 
     public function getRenderedPager() {
-		return $this->pager;
-	}
+        return $this->pager;
+    }
 
     public function getRenderedRows() {
-		return $this->rows;
-	}
+        return $this->rows;
+    }
 
     public function setDataSource($ds) {
-		$this->ds = $ds;
-	}
+        $this->ds = $ds;
+    }
 
     public function setPageSize($ps) {
-		$this->pageSize = $ps;
-	}
+        $this->pageSize = $ps;
+    }
 
     public function setRenderRowFnc($fncName, $args = "") {
-		$this->renderRowFnc = &$fncName;
-		$this->renderRowFncArgs = $args;    // extra agruments
+        $this->renderRowFnc = &$fncName;
+        $this->renderRowFncArgs = $args;    // extra agruments
 
 
-	}
+    }
 
     public function setRenderPagerFnc($fncName, $args = "") {
-		$this->renderPagerFnc = $fncName;
-		$this->renderPagerFncArgs = $args;    // extra agruments
-	}
+        $this->renderPagerFnc = $fncName;
+        $this->renderPagerFncArgs = $args;    // extra agruments
+    }
 
     public function render() {
-		$modx = evolutionCMS(); global $_PAGE;
-
-		$isDataset = $modx->getDatabase()->isResult($this->ds);
-
-		if(!$this->selPageStyle) {
-			$this->selPageStyle = "font-weight:bold";
-		}
-
-		// get total number of rows
-		$tnr = ($isDataset) ? $modx->getDatabase()->getRecordCount($this->ds) : count($this->ds);
-
-		// render: no records found
-		if($tnr <= 0) {
-			$fnc = $this->renderRowFnc;
-			$args = $this->renderRowFncArgs;
-			if(isset($fnc)) {
-				if($args != "") {
-					$this->rows .= $fnc(0, null, $args);
-				} // if agrs was specified then we will pass three params
-				else {
-					$this->rows .= $fnc(0, null);
-				}                 // otherwise two will be passed
-			}
-			return;
-		}
-
-		// get total pages
-		$tp = ceil($tnr / $this->pageSize);
-		if($this->pageNumber > $tp) {
-			$this->pageNumber = 1;
-		}
-
-		// get page number
-		$p = $this->pageNumber;
-
-		// save page number to view state if available
-		if(isset($_PAGE['vs'])) {
-			$_PAGE['vs'][$this->id . '_dpgn'] = $p;
-		}
-
-		// render pager : renderPagerFnc($cuurentPage,$pagerNumber,$arguments="");
-		if($tp > 1) {
-		    $url = '';
-			$fnc = $this->renderPagerFnc;
-			$args = $this->renderPagerFncArgs;
-			if(!isset($fnc)) {
-				if($modx->isFrontend()) {
-					$url = $modx->makeUrl($modx->documentIdentifier, '', '', 'full') . '?';
-				} else {
-					$url = $_SERVER['PHP_SELF'] . '?';
-				}
-				$i = 0;
-				foreach($_GET as $n => $v) if($n != 'dpgn' . $this->id) {
-					$i++;
-					$url .= (($i > 1) ? "&" : "") . "$n=$v";
-				}
-				if($i >= 1) {
-					$url .= "&";
-				}
-			}
-			for($i = 1; $i <= $tp; $i++) {
-				if(isset($fnc)) {
-					if($args != "") {
-						$this->pager .= $fnc($p, $i, $args);
-					} else {
-						$this->pager .= $fnc($p, $i);
-					}
-				} else {
-					$this->pager .= ($p == $i) ? " <span class='" . $this->selPageClass . "' style='" . $this->selPageStyle . "'>$i</span> " : " <a href='" . $url . "dpgn" . $this->id . "=$i' class='" . $this->pageClass . "' style='" . $this->pageStyle . "'>$i</a> ";
-				}
-			}
-		}
-
-		// render row : renderRowFnc($rowNumber,$row,$arguments="")
-		$fnc = $this->renderRowFnc;
-		$args = $this->renderRowFncArgs;
-
-		if(isset($fnc)) {
-			$i = 1;
-			$fncObject = is_object($fnc);
-			$minitems = (($p - 1) * $this->pageSize) + 1;
-			$maxitems = (($p - 1) * $this->pageSize) + $this->pageSize;
-			while($i <= $maxitems && ($row = ($isDataset) ? $modx->getDatabase()->getRow($this->ds) : $this->ds[$i - 1])) {
-				if($i >= $minitems && $i <= $maxitems) {
-					if($fncObject) {
-						if($args != "") {
-							$this->rows .= $fnc->RenderRowFnc($i, $row, $args);
-						} else {
-							$this->rows .= $fnc->RenderRowFnc($i, $row);
-						}
-					} else {
-						if($args != "") {
-							$this->rows .= $fnc($i, $row, $args);
-						} // if agrs was specified then we wil pass three params
-						else {
-							$this->rows .= $fnc($i, $row);
-						}                 // otherwise two will be passed
-					}
-
-				}
-				$i++;
-			}
-		}
-	}
+        $modx = evolutionCMS(); global $_PAGE;
+
+        $isDataset = $modx->getDatabase()->isResult($this->ds);
+
+        if(!$this->selPageStyle) {
+            $this->selPageStyle = "font-weight:bold";
+        }
+
+        // get total number of rows
+        $tnr = ($isDataset) ? $modx->getDatabase()->getRecordCount($this->ds) : count($this->ds);
+
+        // render: no records found
+        if($tnr <= 0) {
+            $fnc = $this->renderRowFnc;
+            $args = $this->renderRowFncArgs;
+            if(isset($fnc)) {
+                if($args != "") {
+                    $this->rows .= $fnc(0, null, $args);
+                } // if agrs was specified then we will pass three params
+                else {
+                    $this->rows .= $fnc(0, null);
+                }                 // otherwise two will be passed
+            }
+            return;
+        }
+
+        // get total pages
+        $tp = ceil($tnr / $this->pageSize);
+        if($this->pageNumber > $tp) {
+            $this->pageNumber = 1;
+        }
+
+        // get page number
+        $p = $this->pageNumber;
+
+        // save page number to view state if available
+        if(isset($_PAGE['vs'])) {
+            $_PAGE['vs'][$this->id . '_dpgn'] = $p;
+        }
+
+        // render pager : renderPagerFnc($cuurentPage,$pagerNumber,$arguments="");
+        if($tp > 1) {
+            $url = '';
+            $fnc = $this->renderPagerFnc;
+            $args = $this->renderPagerFncArgs;
+            if(!isset($fnc)) {
+                if($modx->isFrontend()) {
+                    $url = $modx->makeUrl($modx->documentIdentifier, '', '', 'full') . '?';
+                } else {
+                    $url = $_SERVER['PHP_SELF'] . '?';
+                }
+                $i = 0;
+                foreach($_GET as $n => $v) if($n != 'dpgn' . $this->id) {
+                    $i++;
+                    $url .= (($i > 1) ? "&" : "") . "$n=$v";
+                }
+                if($i >= 1) {
+                    $url .= "&";
+                }
+            }
+            for($i = 1; $i <= $tp; $i++) {
+                if(isset($fnc)) {
+                    if($args != "") {
+                        $this->pager .= $fnc($p, $i, $args);
+                    } else {
+                        $this->pager .= $fnc($p, $i);
+                    }
+                } else {
+                    $this->pager .= ($p == $i) ? " <span class='" . $this->selPageClass . "' style='" . $this->selPageStyle . "'>$i</span> " : " <a href='" . $url . "dpgn" . $this->id . "=$i' class='" . $this->pageClass . "' style='" . $this->pageStyle . "'>$i</a> ";
+                }
+            }
+        }
+
+        // render row : renderRowFnc($rowNumber,$row,$arguments="")
+        $fnc = $this->renderRowFnc;
+        $args = $this->renderRowFncArgs;
+
+        if(isset($fnc)) {
+            $i = 1;
+            $fncObject = is_object($fnc);
+            $minitems = (($p - 1) * $this->pageSize) + 1;
+            $maxitems = (($p - 1) * $this->pageSize) + $this->pageSize;
+            while($i <= $maxitems && ($row = ($isDataset) ? $modx->getDatabase()->getRow($this->ds) : $this->ds[$i - 1])) {
+                if($i >= $minitems && $i <= $maxitems) {
+                    if($fncObject) {
+                        if($args != "") {
+                            $this->rows .= $fnc->RenderRowFnc($i, $row, $args);
+                        } else {
+                            $this->rows .= $fnc->RenderRowFnc($i, $row);
+                        }
+                    } else {
+                        if($args != "") {
+                            $this->rows .= $fnc($i, $row, $args);
+                        } // if agrs was specified then we wil pass three params
+                        else {
+                            $this->rows .= $fnc($i, $row);
+                        }                 // otherwise two will be passed
+                    }
+
+                }
+                $i++;
+            }
+        }
+    }
 }

Spacing +42 added lines, -42 removed lines

@@ -33,24 +33,24 @@ 
     public $renderPagerFncArgs;
     public static $dataSetPagerCnt;
 
-    public function __construct($id, $ds, $pageSize = 10, $pageNumber = -1) {
+    public function __construct($id, $ds, $pageSize = 10, $pageNumber = -1){
 		global $_PAGE; // use view state object
 
 		// set id
 		self::$dataSetPagerCnt++;
-		$this->id = !empty($id) ? $id : "dsp" . self::$dataSetPagerCnt;
+		$this->id = !empty($id) ? $id : "dsp".self::$dataSetPagerCnt;
 
 		// get pagenumber
 		// by setting pager to -1 cause pager to load it's last page number
-		if($pageNumber == -1) {
+		if ($pageNumber == -1) {
 			$pageNumber = 1;
-			if(isset($_GET["dpgn" . $this->id])) {
-				$pageNumber = $_GET["dpgn" . $this->id];
-			} elseif(isset($_PAGE['vs'][$id . '_dpgn'])) {
-				$pageNumber = $_PAGE['vs'][$id . '_dpgn'];
+			if (isset($_GET["dpgn".$this->id])) {
+				$pageNumber = $_GET["dpgn".$this->id];
+			} elseif (isset($_PAGE['vs'][$id.'_dpgn'])) {
+				$pageNumber = $_PAGE['vs'][$id.'_dpgn'];
 			}
 		}
-		if(!is_numeric($pageNumber)) {
+		if (!is_numeric($pageNumber)) {
 			$pageNumber = 1;
 		}
 
@@ -61,40 +61,40 @@ 
 		$this->pager = '';
 	}
 
-    public function getRenderedPager() {
+    public function getRenderedPager(){
 		return $this->pager;
 	}
 
-    public function getRenderedRows() {
+    public function getRenderedRows(){
 		return $this->rows;
 	}
 
-    public function setDataSource($ds) {
+    public function setDataSource($ds){
 		$this->ds = $ds;
 	}
 
-    public function setPageSize($ps) {
+    public function setPageSize($ps){
 		$this->pageSize = $ps;
 	}
 
-    public function setRenderRowFnc($fncName, $args = "") {
+    public function setRenderRowFnc($fncName, $args = ""){
 		$this->renderRowFnc = &$fncName;
-		$this->renderRowFncArgs = $args;    // extra agruments
+		$this->renderRowFncArgs = $args; // extra agruments
 
 
 	}
 
-    public function setRenderPagerFnc($fncName, $args = "") {
+    public function setRenderPagerFnc($fncName, $args = ""){
 		$this->renderPagerFnc = $fncName;
-		$this->renderPagerFncArgs = $args;    // extra agruments
+		$this->renderPagerFncArgs = $args; // extra agruments
 	}
 
-    public function render() {
+    public function render(){
 		$modx = evolutionCMS(); global $_PAGE;
 
 		$isDataset = $modx->getDatabase()->isResult($this->ds);
 
-		if(!$this->selPageStyle) {
+		if (!$this->selPageStyle) {
 			$this->selPageStyle = "font-weight:bold";
 		}
 
@@ -102,11 +102,11 @@ 
 		$tnr = ($isDataset) ? $modx->getDatabase()->getRecordCount($this->ds) : count($this->ds);
 
 		// render: no records found
-		if($tnr <= 0) {
+		if ($tnr <= 0) {
 			$fnc = $this->renderRowFnc;
 			$args = $this->renderRowFncArgs;
-			if(isset($fnc)) {
-				if($args != "") {
+			if (isset($fnc)) {
+				if ($args != "") {
 					$this->rows .= $fnc(0, null, $args);
 				} // if agrs was specified then we will pass three params
 				else {
@@ -118,7 +118,7 @@ 
 
 		// get total pages
 		$tp = ceil($tnr / $this->pageSize);
-		if($this->pageNumber > $tp) {
+		if ($this->pageNumber > $tp) {
 			$this->pageNumber = 1;
 		}
 
@@ -126,39 +126,39 @@ 
 		$p = $this->pageNumber;
 
 		// save page number to view state if available
-		if(isset($_PAGE['vs'])) {
-			$_PAGE['vs'][$this->id . '_dpgn'] = $p;
+		if (isset($_PAGE['vs'])) {
+			$_PAGE['vs'][$this->id.'_dpgn'] = $p;
 		}
 
 		// render pager : renderPagerFnc($cuurentPage,$pagerNumber,$arguments="");
-		if($tp > 1) {
+		if ($tp > 1) {
 		    $url = '';
 			$fnc = $this->renderPagerFnc;
 			$args = $this->renderPagerFncArgs;
-			if(!isset($fnc)) {
-				if($modx->isFrontend()) {
-					$url = $modx->makeUrl($modx->documentIdentifier, '', '', 'full') . '?';
+			if (!isset($fnc)) {
+				if ($modx->isFrontend()) {
+					$url = $modx->makeUrl($modx->documentIdentifier, '', '', 'full').'?';
 				} else {
-					$url = $_SERVER['PHP_SELF'] . '?';
+					$url = $_SERVER['PHP_SELF'].'?';
 				}
 				$i = 0;
-				foreach($_GET as $n => $v) if($n != 'dpgn' . $this->id) {
+				foreach ($_GET as $n => $v) if ($n != 'dpgn'.$this->id) {
 					$i++;
-					$url .= (($i > 1) ? "&" : "") . "$n=$v";
+					$url .= (($i > 1) ? "&" : "")."$n=$v";
 				}
-				if($i >= 1) {
+				if ($i >= 1) {
 					$url .= "&";
 				}
 			}
-			for($i = 1; $i <= $tp; $i++) {
-				if(isset($fnc)) {
-					if($args != "") {
+			for ($i = 1; $i <= $tp; $i++) {
+				if (isset($fnc)) {
+					if ($args != "") {
 						$this->pager .= $fnc($p, $i, $args);
 					} else {
 						$this->pager .= $fnc($p, $i);
 					}
 				} else {
-					$this->pager .= ($p == $i) ? " <span class='" . $this->selPageClass . "' style='" . $this->selPageStyle . "'>$i</span> " : " <a href='" . $url . "dpgn" . $this->id . "=$i' class='" . $this->pageClass . "' style='" . $this->pageStyle . "'>$i</a> ";
+					$this->pager .= ($p == $i) ? " <span class='".$this->selPageClass."' style='".$this->selPageStyle."'>$i</span> " : " <a href='".$url."dpgn".$this->id."=$i' class='".$this->pageClass."' style='".$this->pageStyle."'>$i</a> ";
 				}
 			}
 		}
@@ -167,21 +167,21 @@ 
 		$fnc = $this->renderRowFnc;
 		$args = $this->renderRowFncArgs;
 
-		if(isset($fnc)) {
+		if (isset($fnc)) {
 			$i = 1;
 			$fncObject = is_object($fnc);
 			$minitems = (($p - 1) * $this->pageSize) + 1;
 			$maxitems = (($p - 1) * $this->pageSize) + $this->pageSize;
-			while($i <= $maxitems && ($row = ($isDataset) ? $modx->getDatabase()->getRow($this->ds) : $this->ds[$i - 1])) {
-				if($i >= $minitems && $i <= $maxitems) {
-					if($fncObject) {
-						if($args != "") {
+			while ($i <= $maxitems && ($row = ($isDataset) ? $modx->getDatabase()->getRow($this->ds) : $this->ds[$i - 1])) {
+				if ($i >= $minitems && $i <= $maxitems) {
+					if ($fncObject) {
+						if ($args != "") {
 							$this->rows .= $fnc->RenderRowFnc($i, $row, $args);
 						} else {
 							$this->rows .= $fnc->RenderRowFnc($i, $row);
 						}
 					} else {
-						if($args != "") {
+						if ($args != "") {
 							$this->rows .= $fnc($i, $row, $args);
 						} // if agrs was specified then we wil pass three params
 						else {

Braces +21 added lines, -10 removed lines

@@ -11,7 +11,8 @@ 
 # -----------------------------------------
 #
 
-class DataSetPager implements DataSetPagerInterface{
+class DataSetPager implements DataSetPagerInterface
+{
 
 	public $ds; // datasource
     public $pageSize;
@@ -33,7 +34,8 @@ 
     public $renderPagerFncArgs;
     public static $dataSetPagerCnt;
 
-    public function __construct($id, $ds, $pageSize = 10, $pageNumber = -1) {
+    public function __construct($id, $ds, $pageSize = 10, $pageNumber = -1)
+    {
 		global $_PAGE; // use view state object
 
 		// set id
@@ -61,35 +63,42 @@ 
 		$this->pager = '';
 	}
 
-    public function getRenderedPager() {
+    public function getRenderedPager()
+    {
 		return $this->pager;
 	}
 
-    public function getRenderedRows() {
+    public function getRenderedRows()
+    {
 		return $this->rows;
 	}
 
-    public function setDataSource($ds) {
+    public function setDataSource($ds)
+    {
 		$this->ds = $ds;
 	}
 
-    public function setPageSize($ps) {
+    public function setPageSize($ps)
+    {
 		$this->pageSize = $ps;
 	}
 
-    public function setRenderRowFnc($fncName, $args = "") {
+    public function setRenderRowFnc($fncName, $args = "")
+    {
 		$this->renderRowFnc = &$fncName;
 		$this->renderRowFncArgs = $args;    // extra agruments
 
 
 	}
 
-    public function setRenderPagerFnc($fncName, $args = "") {
+    public function setRenderPagerFnc($fncName, $args = "")
+    {
 		$this->renderPagerFnc = $fncName;
 		$this->renderPagerFncArgs = $args;    // extra agruments
 	}
 
-    public function render() {
+    public function render()
+    {
 		$modx = evolutionCMS(); global $_PAGE;
 
 		$isDataset = $modx->getDatabase()->isResult($this->ds);
@@ -142,8 +151,10 @@ 
 					$url = $_SERVER['PHP_SELF'] . '?';
 				}
 				$i = 0;
-				foreach($_GET as $n => $v) if($n != 'dpgn' . $this->id) {
+				foreach($_GET as $n => $v) {
+				    if($n != 'dpgn' . $this->id) {
 					$i++;
+				}
 					$url .= (($i > 1) ? "&" : "") . "$n=$v";
 				}
 				if($i >= 1) {