@@ -7,3 +7,10 @@ services:

     vonRotenberg\MemberfilesBundle\:

         resource: ../src

         exclude: ../src/{VonrotenbergMemberfilesBundle.php,ContaoManager,Entity,Migrations,Model,Resources,Tests,Widget}

+

+    vonrotenberg.cron.secure_downloads_service:

+        class: vonRotenberg\MemberfilesBundle\Cron\SecureDownloadsJob

+        public: true

+        arguments:

+            - "@database_connection"

+            - "@logger"

@@ -10,4 +10,37 @@

 use vonRotenberg\MemberfilesBundle\Model\SecureDownloadsModel;

+/**

+ * Notification types

+ */

+$GLOBALS['NOTIFICATION_CENTER']['NOTIFICATION_TYPE']['contao']['secDownloads_submitted'] = array

+(

+    'recipients'    => array

+    (

+        'member_email' // The email address of the recipient

+    ),

+    'email_text'    => array

+    (

+        'member_firstname', // The firstname of the recipient

+        'member_lastname', // The lastname of the recipient

+        'downloads' // The names of all new files

+    ),

+    'email_html'    => array

+    (

+        'member_firstname', // The firstname of the recipient

+        'member_lastname', // The lastname of the recipient

+        'downloads_html', // The names of all new files

+    )

+);

+

+/**

+ * Permissions

+ */

+

+$GLOBALS['TL_PERMISSIONS'][] = 'sec_dl_access';

+

+/**

+ * Models

+ */

+

 $GLOBALS['TL_MODELS']['tl_member_secureDownloads'] = SecureDownloadsModel::class;

@@ -15,13 +15,15 @@ use Contao\CoreBundle\DataContainer\PaletteManipulator;

  */

 PaletteManipulator::create()

-    ->addLegend('sec_dl_legend','publish_legend',PaletteManipulator::POSITION_BEFORE)

-    ->addField('secureDownloadsEnabled','sec_dl_legend',PaletteManipulator::POSITION_APPEND)

-    ->applyToPalette('root','tl_page')

-    ->applyToPalette('rootfallback','tl_page');

+    ->addLegend('sec_dl_legend', 'publish_legend', PaletteManipulator::POSITION_BEFORE)

+    ->addField('secureDownloadsEnabled', 'sec_dl_legend', PaletteManipulator::POSITION_APPEND)

+    ->applyToPalette('root', 'tl_page')

+    ->applyToPalette('rootfallback', 'tl_page');

 $GLOBALS['TL_DCA']['tl_page']['palettes']['__selector__'][] = 'secureDownloadsEnabled';

-$GLOBALS['TL_DCA']['tl_page']['subpalettes']['secureDownloadsEnabled'] = 'secureDownloadsSRC,secureDownloadsTarget,secureDownloadsRegExp,secureDownloadsFields,sd_nc_enable,sd_nc_notification';

+$GLOBALS['TL_DCA']['tl_page']['palettes']['__selector__'][] = 'sd_nc_enable';

+$GLOBALS['TL_DCA']['tl_page']['subpalettes']['secureDownloadsEnabled'] = 'secureDownloadsSRC,secureDownloadsTarget,secureDownloadsRegExp,secureDownloadsFields,sd_nc_enable';

+$GLOBALS['TL_DCA']['tl_page']['subpalettes']['sd_nc_enable'] = 'sd_nc_notification';

 /**

@@ -29,64 +31,55 @@ $GLOBALS['TL_DCA']['tl_page']['subpalettes']['secureDownloadsEnabled'] = 'secure

  */

 $GLOBALS['TL_DCA']['tl_page']['fields']['secureDownloadsEnabled'] = array

 (

-  'label'                   => &$GLOBALS['TL_LANG']['tl_page']['secureDownloadsEnabled'],

-  'exclude'                 => true,

-  'inputType'               => 'checkbox',

-  'eval'                    => array('submitOnChange'=>true),

-  'sql'                     => "char(1) NOT NULL default ''"

+    'exclude' => true,

+    'inputType' => 'checkbox',

+    'eval' => array('submitOnChange' => true),

+    'sql' => "char(1) NOT NULL default ''"

 );

 $GLOBALS['TL_DCA']['tl_page']['fields']['secureDownloadsSRC'] = array

 (

-    'label'                   => &$GLOBALS['TL_LANG']['tl_page']['secureDownloadsSRC'],

-    'exclude'                 => true,

-    'inputType'               => 'fileTree',

-    'eval'                    => array('mandatory'=>true,'fieldType'=>'radio', 'tl_class'=>'clr'),

-    'sql'                     => 'binary(16) NULL'

+    'exclude' => true,

+    'inputType' => 'fileTree',

+    'eval' => array('mandatory' => true, 'fieldType' => 'radio', 'tl_class' => 'clr'),

+    'sql' => 'binary(16) NULL'

 );

 $GLOBALS['TL_DCA']['tl_page']['fields']['secureDownloadsTarget'] = array

 (

-  'label'                   => &$GLOBALS['TL_LANG']['tl_page']['secureDownloadsTarget'],

-  'exclude'                 => true,

-  'inputType'               => 'fileTree',

-  'eval'                    => array('mandatory'=>true,'fieldType'=>'radio', 'tl_class'=>'clr'),

-  'sql'                     => 'binary(16) NULL'

+    'exclude' => true,

+    'inputType' => 'fileTree',

+    'eval' => array('mandatory' => true, 'fieldType' => 'radio', 'tl_class' => 'clr'),

+    'sql' => 'binary(16) NULL'

 );

 $GLOBALS['TL_DCA']['tl_page']['fields']['secureDownloadsRegExp'] = array

 (

-  'label'                   => &$GLOBALS['TL_LANG']['tl_page']['secureDownloadsRegExp'],

-  'exclude'                 => true,

-  'inputType'               => 'text',

-  'eval'                    => array('mandatory'=>true,'maxlength'=>64,'preserveTags'=>true,'decodeEntities'=>true),

-  'sql'                     => 'varchar(64) NULL'

+    'exclude' => true,

+    'inputType' => 'text',

+    'eval' => array('mandatory' => true, 'maxlength' => 64, 'preserveTags' => true, 'decodeEntities' => true),

+    'sql' => 'varchar(64) NULL'

 );

 $GLOBALS['TL_DCA']['tl_page']['fields']['secureDownloadsFields'] = array

 (

-  'label'                   => &$GLOBALS['TL_LANG']['tl_page']['secureDownloadsFields'],

-  'exclude'                 => true,

-  'inputType'               => 'checkboxWizard',

-  'options_callback'        => array('tl_page_eSM_secureDownloads','getMemberProperties'),

-  'eval'                    => array('mandatory'=>true,'multiple'=>true),

-  'sql'                     => 'varchar(255) NULL'

+    'exclude' => true,

+    'inputType' => 'checkboxWizard',

+    'eval' => array('mandatory' => true, 'multiple' => true),

+    'sql' => 'varchar(255) NULL'

 );

 $GLOBALS['TL_DCA']['tl_page']['fields']['sd_nc_enable'] = array

 (

-  'label'                   => &$GLOBALS['TL_LANG']['tl_page']['sd_nc_enable'],

-  'exclude'                 => true,

-  'inputType'               => 'checkbox',

-  'eval'                    => array('tl_class'=>'w50 m12','submitOnChange'=>true),

-  'sql'                     => "char(1) NOT NULL default ''"

+    'exclude' => true,

+    'inputType' => 'checkbox',

+    'eval' => array('tl_class' => 'w50 m12', 'submitOnChange' => true),

+    'sql' => "char(1) NOT NULL default ''"

 );

 $GLOBALS['TL_DCA']['tl_page']['fields']['sd_nc_notification'] = array

 (

-  'label'                     => &$GLOBALS['TL_LANG']['tl_page']['sd_nc_enable'],

-  'exclude'                   => true,

-  'inputType'                 => 'select',

-  'options_callback'          => array('tl_page_eSM_secureDownloads', 'getNotificationChoices'),

-  'eval'                      => array('mandatory'=>true,'includeBlankOption'=>true, 'chosen'=>true, 'tl_class'=>'w50'),

-  'sql'                       => "int(10) unsigned NOT NULL default '0'"

+    'exclude' => true,

+    'inputType' => 'select',

+    'eval' => array('mandatory' => true, 'includeBlankOption' => true, 'chosen' => true, 'tl_class' => 'w50'),

+    'sql' => "int(10) unsigned NOT NULL default '0'"

 );

@@ -16,8 +16,8 @@ use Contao\CoreBundle\DataContainer\PaletteManipulator;

 PaletteManipulator::create()

     ->addLegend('sec_dl_legend','account_legend',PaletteManipulator::POSITION_BEFORE)

     ->addField('sec_dl_access','sec_dl_legend',PaletteManipulator::POSITION_APPEND)

-    ->applyToPalette('extend')

-    ->applyToPalette('custom');

+    ->applyToPalette('extend','tl_user')

+    ->applyToPalette('custom','tl_user');

 /**

@@ -16,7 +16,7 @@ use Contao\CoreBundle\DataContainer\PaletteManipulator;

 PaletteManipulator::create()

     ->addLegend('sec_dl_legend','alexf_legend',PaletteManipulator::POSITION_BEFORE)

     ->addField('sec_dl_access','sec_dl_legend',PaletteManipulator::POSITION_APPEND)

-    ->applyToPalette('default');

+    ->applyToPalette('default', 'tl_user');

 /**

  * Add fields to tl_user_group

@@ -21,6 +21,10 @@ $GLOBALS['TL_LANG']['tl_page']['secureDownloadsRegExp'][0] = 'Automatisierungs-F

 $GLOBALS['TL_LANG']['tl_page']['secureDownloadsRegExp'][1] = 'Regulärer Ausdruck um ein oder mehrere Zuordnungsfragmente aus dem Dateinamen zu extrahieren.';

 $GLOBALS['TL_LANG']['tl_page']['secureDownloadsFields'][0] = 'Fragment-Felder';

 $GLOBALS['TL_LANG']['tl_page']['secureDownloadsFields'][1] = 'Felder welche den Fragmenten zugeordnet werden.';

+$GLOBALS['TL_LANG']['tl_page']['sd_nc_enable'][0] = 'Benachrichtigung senden';

+$GLOBALS['TL_LANG']['tl_page']['sd_nc_enable'][1] = 'Sendet eine Benachrichtigung bei neuen Dateien.';

+$GLOBALS['TL_LANG']['tl_page']['sd_nc_notification*'][0] = 'Benachrichtigung';

+$GLOBALS['TL_LANG']['tl_page']['sd_nc_notification*'][1] = 'Die Benachrichtigung, welche gesendet werden soll.';

 /**

  * Legends

new file mode 100644

@@ -0,0 +1,48 @@

+<?php

+

+declare(strict_types=1);

+

+/*

+ * This file is part of eSales Media SinglereisenBundle

+ *

+ * (c) Benjamin Roth

+ *

+ * @license proprietary

+ */

+

+namespace vonRotenberg\MemberfilesBundle\Command;

+

+use Contao\CoreBundle\Framework\ContaoFramework;

+use Contao\System;

+use Symfony\Component\Console\Command\Command;

+use Symfony\Component\Console\Input\InputInterface;

+use Symfony\Component\Console\Output\OutputInterface;

+

+class SecureDownloadsCommand extends Command

+{

+    public function __construct(ContaoFramework $framework)

+    {

+        $this->framework = $framework;

+

+        parent::__construct();

+    }

+

+    protected function configure(): void

+    {

+        $this

+            ->setName('secureDownloads:sendNotifications')

+            ->setDescription('Sends notifications about newly added files.')

+        ;

+    }

+

+    protected function execute(InputInterface $input, OutputInterface $output): int

+    {

+        $this->framework->initialize();

+

+        $secdl_service = System::getContainer()->get("vonrotenberg.cron.secure_downloads_service");

+

+        $secdl_service->sendFileNotifications('cli');

+

+        return 0;

+    }

+}

new file mode 100644

@@ -0,0 +1,45 @@

+<?php

+

+declare(strict_types=1);

+

+/*

+ * This file is part of memberfiles bundle.

+ *

+ * (c) vonRotenberg

+ *

+ * @license commercial

+ */

+

+namespace vonRotenberg\MemberfilesBundle\Cron;

+

+use Contao\BackendUser;

+use Contao\Controller;

+use Contao\CoreBundle\ServiceAnnotation\Callback;

+use Contao\DataContainer;

+use Contao\System;

+use Doctrine\DBAL\Connection;

+use Psr\Log\LoggerInterface;

+

+class SecureDownloadsJob

+{

+

+    /** @var LoggerInterface */

+    private $logger;

+

+    /** @var Connection */

+    protected $db;

+

+    public function __construct(Connection $db, LoggerInterface $logger)

+    {

+        $this->logger = $logger;

+        $this->db = $db;

+    }

+

+    /**

+     * @CronJob("* * * * *")

+     */

+    public function sendFileNotifications(string $scope)

+    {

+

+    }

+}

@@ -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)

     {

@@ -49,7 +49,7 @@ class MemberSecureDownloadsListener {

     }

     /**

-     * @Callback(table="tl_member_secureDownloads", target="list.operations.edit.button"

+     * @Callback(table="tl_member_secureDownloads", target="list.operations.edit.button")

      */

     public function onListEditOperationCallback(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)

     {

@@ -68,7 +68,7 @@ class MemberSecureDownloadsListener {

     }

     /**

-     * @Callback(table="tl_member_secureDownloads", target="list.operations.delete.button"

+     * @Callback(table="tl_member_secureDownloads", target="list.operations.delete.button")

      */

     public function onListDeleteOperationCallback(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)

     {

@@ -88,7 +88,7 @@ class MemberSecureDownloadsListener {

     }

     /**

-     * @Callback(table="tl_member_secureDownloads", target="list.operations.show.button"

+     * @Callback(table="tl_member_secureDownloads", target="list.operations.show.button")

      */

     public function onListShowOperationCallback(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)

     {

@@ -31,7 +31,7 @@ class PageListener {

     }

     /**

-     * @Callback(table="tl_page", target="fields.secureDownloadsFields.options"

+     * @Callback(table="tl_page", target="fields.secureDownloadsFields.options")

      */

     public function onSecureDownloadsFieldsOptionsCallback(?DataContainer $dc)

     {

@@ -52,7 +52,7 @@ class PageListener {

     }

     /**

-     * @Callback(table="tl_page", target="fields.sd_nc_notification.options"

+     * @Callback(table="tl_page", target="fields.sd_nc_notification.options")

      */

     public function onSdNcNotificationOptionsCallback(?DataContainer $dc)

     {