Refine pinnwand backend behavior and fix frontend template rendering

README.md

@@ -14,6 +14,12 @@ Contao 5.7 Bundle für eine Pinwand mit frei angeordneten Pinnwandeinträgen.
 ## Installation (Bundle im Projekt einbinden)
 
 1. Bundle per Composer einbinden.
-2. Cache leeren.
-3. Datenbank aktualisieren.
-4. Assets installieren, damit CSS/JS unter `bundles/contaopinboard/` verfügbar sind.
+2. Falls Composer-Plugins im Zielsystem eingeschränkt sind, Bundle manuell in `config/bundles.php` aktivieren:
+
+	```php
+	Eiswurm\ContaoPinboardBundle\ContaoPinboardBundle::class => ['all' => true],
+	```
+
+3. Cache leeren.
+4. Datenbank aktualisieren.
+5. Assets installieren, damit CSS/JS unter `bundles/contaopinboard/` verfügbar sind.

composer.json

@@ -5,7 +5,8 @@
   "license": "proprietary",
   "require": {
     "php": "^8.4",
-    "contao/core-bundle": "^5.7"
+    "contao/core-bundle": "^5.7",
+    "contao/manager-plugin": "^2.0"
   },
   "autoload": {
     "psr-4": {

contao/config/services.yaml

@@ -19,4 +19,4 @@ services:
 
   Eiswurm\ContaoPinboardBundle\EventListener\DataContainer\PinboardTimestampListener:
     tags:
-      - { name: contao.callback, table: tl_pinnwand, target: config.onsubmit }
+      - { name: contao.callback, table: tl_pinnwand, target: config.onbeforesubmit, method: onBeforeSubmit }

contao/dca/tl_pinnwand.php

@@ -2,6 +2,10 @@
 
 declare(strict_types=1);
 
+use Contao\DataContainer;
+use Contao\Database;
+use Contao\Input;
+
 $GLOBALS['TL_DCA']['tl_pinnwand'] = [
     'config' => [
         'dataContainer' => Contao\DC_Table::class,
@@ -22,8 +26,8 @@ $GLOBALS['TL_DCA']['tl_pinnwand'] = [
             'panelLayout' => 'filter;sort,search,limit',
         ],
         'label' => [
-            'fields' => ['ueberschrift', 'dateAdded'],
-            'format' => '%s <span style="color:#999;padding-left:3px">[%s]</span>',
+            'fields' => ['ueberschrift', 'dateAdded', 'dateModified'],
+            'showColumns' => true,
         ],
         'global_operations' => [
             'all' => [
@@ -46,6 +50,10 @@ $GLOBALS['TL_DCA']['tl_pinnwand'] = [
                 'icon' => 'delete.svg',
                 'attributes' => 'onclick="if(!confirm(\'' . ($GLOBALS['TL_LANG']['MSC']['deleteConfirm'] ?? 'Möchten Sie den Eintrag wirklich löschen?') . '\'))return false;Backend.getScrollOffset()"',
             ],
+            'toggle' => [
+                'href' => 'act=toggle&amp;field=published',
+                'icon' => 'visible.svg',
+            ],
             'show' => [
                 'href' => 'act=show',
                 'icon' => 'show.svg',
@@ -74,7 +82,7 @@ $GLOBALS['TL_DCA']['tl_pinnwand'] = [
             'exclude' => true,
             'search' => true,
             'inputType' => 'textarea',
-            'eval' => ['mandatory' => true, 'maxlength' => 3000, 'rte' => 'tinyMCE', 'allowHtml' => true, 'tl_class' => 'clr'],
+            'eval' => ['mandatory' => true, 'maxlength' => 3000, 'tl_class' => 'clr'],
             'sql' => 'text NULL',
         ],
         'link' => [
@@ -94,14 +102,14 @@ $GLOBALS['TL_DCA']['tl_pinnwand'] = [
             'sorting' => true,
             'flag' => 6,
             'inputType' => 'text',
-            'eval' => ['rgxp' => 'datim', 'datepicker' => true, 'mandatory' => true, 'tl_class' => 'w50 wizard'],
+            'eval' => ['rgxp' => 'datim', 'datepicker' => true, 'mandatory' => true, 'default' => time(), 'tl_class' => 'w50 wizard'],
             'sql' => 'int(10) unsigned NOT NULL default 0',
         ],
         'dateModified' => [
             'sorting' => true,
             'flag' => 6,
             'inputType' => 'text',
-            'eval' => ['rgxp' => 'datim', 'readonly' => true, 'disabled' => true, 'tl_class' => 'w50'],
+            'eval' => ['rgxp' => 'datim', 'readonly' => true, 'default' => time(), 'tl_class' => 'w50'],
             'sql' => 'int(10) unsigned NOT NULL default 0',
         ],
         'published' => [
@@ -122,3 +130,40 @@ $GLOBALS['TL_DCA']['tl_pinnwand'] = [
         ],
     ],
 ];
+
+$GLOBALS['TL_DCA']['tl_pinnwand']['fields']['ueberschrift']['save_callback'][] = static function (string $value, DataContainer $dataContainer): string {
+    if ('copy' !== Input::get('act')) {
+        return $value;
+    }
+
+    $baseHeadline = trim($value);
+
+    if ('' === $baseHeadline) {
+        return $value;
+    }
+
+    $start = 2;
+    $base = $baseHeadline;
+
+    if (preg_match('/^(.*)\s-\s(\d+)$/', $baseHeadline, $matches)) {
+        $base = trim($matches[1]);
+        $start = (int) $matches[2] + 1;
+    }
+
+    $id = (int) ($dataContainer->id ?? 0);
+    $number = max(2, $start);
+    $candidate = sprintf('%s - %d', $base, $number);
+
+    do {
+        $exists = Database::getInstance()
+            ->prepare('SELECT id FROM tl_pinnwand WHERE ueberschrift=? AND id!=?')
+            ->execute($candidate, $id);
+
+        if ($exists->numRows < 1) {
+            return $candidate;
+        }
+
+        ++$number;
+        $candidate = sprintf('%s - %d', $base, $number);
+    } while (true);
+};

contao/languages/de/modules.php

@@ -2,5 +2,5 @@
 
 declare(strict_types=1);
 
-$GLOBALS['TL_LANG']['MOD']['pinnwand'] = ['Pinwand', 'Pinnwandeinträge verwalten'];
-$GLOBALS['TL_LANG']['FMD']['pinnwand'] = ['Pinwand', 'Zeigt veröffentlichte Pinnwandeinträge als frei angeordnete Notizzettel an'];
+$GLOBALS['TL_LANG']['MOD']['pinnwand'] = ['Pinnwand', 'Pinnwandeinträge verwalten'];
+$GLOBALS['TL_LANG']['FMD']['pinnwand'] = ['Pinnwand', 'Zeigt veröffentlichte Pinnwandeinträge als frei angeordnete Notizzettel an'];

src/ContaoPinboardBundle.php

@@ -8,4 +8,8 @@ use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 final class ContaoPinboardBundle extends Bundle
 {
+	public function getPath(): string
+	{
+		return dirname(__DIR__);
+	}
 }

src/Controller/FrontendModule/PinboardController.php

@@ -5,16 +5,16 @@ declare(strict_types=1);
 namespace Eiswurm\ContaoPinboardBundle\Controller\FrontendModule;
 
 use Contao\CoreBundle\Controller\FrontendModule\AbstractFrontendModuleController;
+use Contao\CoreBundle\Twig\FragmentTemplate;
 use Contao\FilesModel;
 use Contao\ModuleModel;
-use Contao\Template;
 use Eiswurm\ContaoPinboardBundle\Model\PinboardModel;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
 final class PinboardController extends AbstractFrontendModuleController
 {
-    protected function getResponse(Template $template, ModuleModel $model, Request $request): Response
+    protected function getResponse(FragmentTemplate $template, ModuleModel $model, Request $request): Response
     {
         $collection = PinboardModel::findBy(
             ['published = ?'],
@@ -46,9 +46,9 @@ final class PinboardController extends AbstractFrontendModuleController
             }
         }
 
-        return $this->render('@Contao/frontend_module/pinnwand.html.twig', [
-            'entries' => $notes,
-            'module' => $model,
-        ]);
+        $template->set('entries', $notes);
+        $template->set('module', $model);
+
+        return $template->getResponse();
     }
 }

src/DependencyInjection/ContaoPinboardExtension.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Eiswurm\ContaoPinboardBundle\DependencyInjection;
+
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+
+final class ContaoPinboardExtension extends Extension
+{
+    public function load(array $configs, ContainerBuilder $container): void
+    {
+        $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../../contao/config'));
+        $loader->load('services.yaml');
+    }
+}

src/EventListener/DataContainer/PinboardTimestampListener.php

@@ -5,31 +5,30 @@ declare(strict_types=1);
 namespace Eiswurm\ContaoPinboardBundle\EventListener\DataContainer;
 
 use Contao\DataContainer;
-use Contao\Database;
+use Contao\Input;
 
 final class PinboardTimestampListener
 {
-    public function __invoke(DataContainer $dataContainer): void
+    /**
+     * @param array<string, mixed> $values
+     *
+     * @return array<string, mixed>
+     */
+    public function onBeforeSubmit(array $values, DataContainer|null $dataContainer = null): array
     {
-        if (null === $dataContainer->id) {
-            return;
-        }
-
         $timestamp = time();
+        $isCopyAction = 'copy' === Input::get('act');
 
-        $record = Database::getInstance()
-            ->prepare('SELECT dateAdded FROM tl_pinnwand WHERE id = ?')
-            ->limit(1)
-            ->execute($dataContainer->id);
-
-        if (!$record->numRows) {
-            return;
+        if ($isCopyAction || empty($values['dateAdded'])) {
+            $values['dateAdded'] = $timestamp;
         }
 
-        $dateAdded = (int) $record->dateAdded;
+        if ($isCopyAction || empty($values['dateModified'])) {
+            $values['dateModified'] = $timestamp;
+        }
 
-        Database::getInstance()
-            ->prepare('UPDATE tl_pinnwand SET dateAdded = ?, dateModified = ?, tstamp = ? WHERE id = ?')
-            ->execute($dateAdded > 0 ? $dateAdded : $timestamp, $timestamp, $timestamp, $dataContainer->id);
+        $values['tstamp'] = $timestamp;
+
+        return $values;
     }
 }

src/Model/PinboardModel.php

@@ -8,5 +8,5 @@ use Contao\Model;
 
 final class PinboardModel extends Model
 {
-    protected static string $strTable = 'tl_pinnwand';
+    protected static $strTable = 'tl_pinnwand';
 }

templates/frontend_module/pinnwand.html.twig

@@ -20,7 +20,7 @@
           {% endif %}
 
           <h3 class="pin-note__headline">{{ entry.headline }}</h3>
-          <div class="pin-note__text">{{ entry.text|raw }}</div>
+          <div class="pin-note__text">{{ entry.text|e|nl2br }}</div>
 
           {% if entry.link %}
             <p class="pin-note__link-wrap">