@@ -42,7 +42,7 @@ class MemberListener {

      */

     public function onListSecureDownloadsOperationCallback(array $row, ?string $href, string $label, string $title, ?string $icon, string $attributes, string $table, array $rootRecordIds, ?array $childRecordIds, bool $circularReference, ?string $previous, ?string $next, DataContainer $dc)

     {

-        if (!$this->User->isAdmin && !$this->User->hasAccess('edit','sec_dl_access'))

+        if (!$this->User->isAdmin && !$this->User->hasAccess('tl_member_secureDownloads::ctime','alexf'))

         {

             return '';

         }

@@ -42,7 +42,7 @@ class MemberListener {

      */

     public function onListSecureDownloadsOperationCallback(array $row, ?string $href, string $label, string $title, ?string $icon, string $attributes, string $table, array $rootRecordIds, ?array $childRecordIds, bool $circularReference, ?string $previous, ?string $next, DataContainer $dc)

     {

-        if (!$this->User->isAdmin && !$this->User->hasAccess(1,'sec_dl_access'))

+        if (!$this->User->isAdmin && !$this->User->hasAccess('edit','sec_dl_access'))

         {

             return '';

         }

@@ -42,23 +42,14 @@ class MemberListener {

      */

     public function onListSecureDownloadsOperationCallback(array $row, ?string $href, string $label, string $title, ?string $icon, string $attributes, string $table, array $rootRecordIds, ?array $childRecordIds, bool $circularReference, ?string $previous, ?string $next, DataContainer $dc)

     {

-        if (Input::get('popup'))

+        if (!$this->User->isAdmin && !$this->User->hasAccess(1,'sec_dl_access'))

         {

             return '';

-        } else

-        {

-            $objSecFile = SecureDownloadsModel::findByPk($row['id']);

-            $objFile = $objSecFile->getRelated('uuid');

-            $title = sprintf($GLOBALS['TL_LANG']['tl_member_secureDownloads']['show'][1], $objFile->name);

-

-            if ($objFile !== null)

-            {

-                return '<a href="contao/popup.php?src=' . base64_encode($objFile->path) . '" title="' . StringUtil::specialchars($title, false, true) . '"' . $attributes . ' onclick="Backend.openModalIframe({\'width\':600,\'title\':\'' . str_replace("'", "\\'", StringUtil::specialchars($objFile->name, false, true)) . '\',\'url\':this.href,\'height\':300});return false">' . Image::getHtml($icon, $label) . '</a> ';

-            } else

-            {

-                return '';

-            }

         }

+

+        $href .= '&id='.$row['id'];

+

+        return '<a href="'.Backend::addToUrl($href).'" title="'.StringUtil::specialchars($title).'">'.Image::getHtml($icon, $label).'</a> ';

     }

 }

@@ -38,7 +38,7 @@ class MemberListener {

     }

     /**

-     * @Callback(table="tl_member", target="list.operations.secureDownloads.button"

+     * @Callback(table="tl_member", target="list.operations.secureDownloads.button")

      */

     public function onListSecureDownloadsOperationCallback(array $row, ?string $href, string $label, string $title, ?string $icon, string $attributes, string $table, array $rootRecordIds, ?array $childRecordIds, bool $circularReference, ?string $previous, ?string $next, DataContainer $dc)

     {

new file mode 100644

@@ -0,0 +1,64 @@

+<?php

+

+declare(strict_types=1);

+

+/*

+ * This file is part of memberfiles bundle.

+ *

+ * (c) vonRotenberg

+ *

+ * @license commercial

+ */

+

+namespace vonRotenberg\MemberfilesBundle\EventListener\DataContainer;

+

+use Contao\Backend;

+use Contao\BackendUser;

+use Contao\CoreBundle\ServiceAnnotation\Callback;

+use Contao\DataContainer;

+use Contao\File;

+use Contao\Image;

+use Contao\Input;

+use Contao\StringUtil;

+use Contao\System;

+use Contao\Date;

+use Contao\Config;

+use vonRotenberg\MemberfilesBundle\Model\SecureDownloadsModel;

+

+class MemberListener {

+

+    /**

+     * @var BackendUser

+     */

+    protected $User;

+

+    public function __construct()

+    {

+        $this->User = BackendUser::getInstance();

+    }

+

+    /**

+     * @Callback(table="tl_member", target="list.operations.secureDownloads.button"

+     */

+    public function onListSecureDownloadsOperationCallback(array $row, ?string $href, string $label, string $title, ?string $icon, string $attributes, string $table, array $rootRecordIds, ?array $childRecordIds, bool $circularReference, ?string $previous, ?string $next, DataContainer $dc)

+    {

+        if (Input::get('popup'))

+        {

+            return '';

+        } else

+        {

+            $objSecFile = SecureDownloadsModel::findByPk($row['id']);

+            $objFile = $objSecFile->getRelated('uuid');

+            $title = sprintf($GLOBALS['TL_LANG']['tl_member_secureDownloads']['show'][1], $objFile->name);

+

+            if ($objFile !== null)

+            {

+                return '<a href="contao/popup.php?src=' . base64_encode($objFile->path) . '" title="' . StringUtil::specialchars($title, false, true) . '"' . $attributes . ' onclick="Backend.openModalIframe({\'width\':600,\'title\':\'' . str_replace("'", "\\'", StringUtil::specialchars($objFile->name, false, true)) . '\',\'url\':this.href,\'height\':300});return false">' . Image::getHtml($icon, $label) . '</a> ';

+            } else

+            {

+                return '';

+            }

+        }

+    }

+

+}