[#4] Fixed a bug with HTML entities in the resource pagetitle

Author: createit-ru

assets/components/fileman/js/mgr/widgets/files.grid.js

@@ -395,8 +395,10 @@ Ext.extend(FileMan.grid.Files, MODx.grid.Grid, {
         if (!FileMan.config.resource_id)
             columns.push({
                 header: _('resource'),
-                dataIndex: 'pagetitle',
-                sortable: true
+                dataIndex: 'resource_pagetitle',
+                sortable: true,
+                xtype: 'templatecolumn',
+                tpl: '<a href="?a=resource/update&id={resource_id}" target="_blank">{resource_pagetitle}</a>'
             }, {
                 header: _('user'),
                 dataIndex: 'username',

core/components/fileman/src/FileMan.php

@@ -61,7 +61,7 @@ public function __construct(modX $modx, array $config = [])
      * */
     public function getFileFields()
     {
-        return array_merge(array_keys($this->modx->getFields(File::class)), array('pagetitle', 'username'));
+        return array_merge(array_keys($this->modx->getFields(File::class)), array('resource_pagetitle', 'username'));
     }
 
     /**

core/components/fileman/src/Processors/File/GetList.php

@@ -3,8 +3,10 @@
 namespace FileMan\Processors\File;
 
 use FileMan\Model\File;
+use MODX\Revolution\modResource;
 use MODX\Revolution\modUser;
 use MODX\Revolution\Processors\Model\GetListProcessor;
+use xPDO\Om\xPDOObject;
 use xPDO\Om\xPDOQuery;
 
 class GetList extends GetListProcessor
@@ -54,36 +56,50 @@ public function beforeQuery()
     public function prepareQueryBeforeCount(xPDOQuery $c)
     {
         $resourceId = (int) $this->getProperty('resource_id');
-		$user = trim($this->getProperty('user'));
-		$query = trim($this->getProperty('query'));
+        $user = trim($this->getProperty('user'));
+        $query = trim($this->getProperty('query'));
 
         $c->select($this->modx->getSelectColumns(File::class, 'File'));
 
-		if ($query){
-			$c->where(array(
+        if ($query){
+            $c->where(array(
                 'name:LIKE' => "%{$query}%",
                 'OR:title:LIKE' => "%{$query}%",
                 'OR:description:LIKE' => "%{$query}%",
                 'OR:group:LIKE' => "%{$query}%"
             ));
         }
 
-		if ($user || ($resourceId == 0)) {
-			$c->select('User.username');
-			$c->leftJoin(modUser::class, 'User', 'User.id=File.user_id');
-		}
+        if ($user || ($resourceId == 0)) {
+            $c->select('User.username');
+            $c->leftJoin(modUser::class, 'User', 'User.id=File.user_id');
+        }
 
-		if ($user)
-			$c->where(array('User.username:LIKE' => "%$user%"));
+        if ($user)
+            $c->where(array('User.username:LIKE' => "%$user%"));
 
-		if ($resourceId > 0)
-			$c->where(array('resource_id' => $resourceId));
-		else {
-			$c->select('Resource.pagetitle');
-			$c->leftJoin('modResource', 'Resource', 'Resource.id=File.resource_id');
-		}
+        if ($resourceId > 0)
+            $c->where(array('resource_id' => $resourceId));
+        else {
+            $c->leftJoin('modResource', 'Resource', 'Resource.id=File.resource_id');
+            $c->select($this->modx->getSelectColumns(modResource::class, 'Resource', 'resource_', ['pagetitle']));
+        }
 
         return $c;
     }
 
+    /**
+     * Prepare the row for iteration
+     *
+     * @param xPDOObject $object
+     *
+     * @return array
+     */
+    public function prepareRow(xPDOObject $object)
+    {
+        $array = $object->toArray();
+        $array['resource_pagetitle'] = strip_tags($array['resource_pagetitle']);
+        return $array;
+    }
+
 }

core/components/fileman/src/Processors/Resource/Combo.php

@@ -20,7 +20,7 @@ class Combo extends GetListProcessor
     public $contextKeys = array();
 
     /** @var string $charset */
-	public $charset = 'UTF-8';
+    public $charset = 'UTF-8';
 
     public function beforeQuery()
     {
@@ -50,9 +50,9 @@ public function getContextKeys()
     }
 
     public function beforeIteration(array $list) {
-		$this->charset = $this->modx->getOption('modx_charset',null,'UTF-8');
-		return $list;
-	}
+        $this->charset = $this->modx->getOption('modx_charset',null,'UTF-8');
+        return $list;
+    }
 
     public function prepareQueryBeforeCount(xPDOQuery $c)
     {
@@ -83,8 +83,8 @@ public function prepareRow(xPDOObject $object)
     {
         $objectArray = $object->toArray();
 
-        $objectArray['pagetitle'] = htmlentities($objectArray['pagetitle'], ENT_COMPAT, $this->charset);
-        $objectArray['description'] = htmlentities($objectArray['description'], ENT_COMPAT, $this->charset);
+        $objectArray['pagetitle'] = html_entity_decode($objectArray['pagetitle'], ENT_COMPAT, $this->charset);
+        $objectArray['description'] = html_entity_decode($objectArray['description'], ENT_COMPAT, $this->charset);
 
         return array(
             'id' => $objectArray['id'],