- updated copyright

- removed core-bundle as requirement to be compatible with Contao 3.5 via composer
- moved settings into a subpalette

README.md

@@ -10,18 +10,12 @@ Santizes the filenames of files uploaded via the Contao File manager.
 System requirements
 --
 
-* [Contao](https://github.com/contao/core) 3.2.5 or newer  / successfully tested with Contao 4.3.9
+* [Contao](https://github.com/contao/core) 3.5
+* [Contao](https://github.com/contao/contao) 4.4 or newer
 
 
 Installation & Configuration
 --
 
-* Create a folder named `proper-filenames` in `system/modules`
-* Clone this repository into the new folder
-* In the Backend go to System Settings and click `Check filenames` under `Upload settings`
-
-**Additional step for Contao 4.X:**
-Open `app/AppKernel.php` and add the following line to the $bundles array
-```php
-new Contao\CoreBundle\HttpKernel\Bundle\ContaoModuleBundle('proper-filenames', $this->getRootDir())
-```
+* Install via Contao Manager or Composer (`composer require numero2/contao-proper-filenames`)
+* In the Backend go to `System Settings` and click `Check filenames` under `Upload settings`

classes/CheckFilenames.php

@@ -3,24 +3,22 @@
 /**
  * Contao Open Source CMS
  *
- * Copyright (c) 2005-2017 Leo Feyer
+ * Copyright (c) 2005-2020 Leo Feyer
  *
  * @package   ProperFilenames
  * @author    Benny Born <[email protected]>
  * @license   LGPL
- * @copyright 2017 numero2 - Agentur für Internetdienstleistungen
+ * @copyright 2020 numero2 - Agentur für digitales Marketing GbR
  */
 
 
-/**
- * Namespace
- */
 namespace numero2\ProperFilenames;
 
 use Ausi\SlugGenerator\SlugGenerator;
 use Contao\CoreBundle\Slug\ValidCharacters;
 use Contao\System;
 
+
 class CheckFilenames extends \Frontend {
 
 

composer.json

@@ -3,12 +3,11 @@
     "type": "contao-module",
     "license": "LGPL-3.0-or-later",
     "authors": [{
-            "name": "numero2 - Agentur für Internetdienstleistungen",
+            "name": "numero2 - Agentur für digitales Marketing GbR",
             "homepage": "http://www.numero2.de"
         }
     ],
     "require": {
-        "contao/core-bundle": "4.*",
         "contao-community-alliance/composer-plugin": "3.*",
         "ausi/slug-generator": "1.*"
     },

config/autoload.php

@@ -3,12 +3,12 @@
 /**
  * Contao Open Source CMS
  *
- * Copyright (c) 2005-2017 Leo Feyer
+ * Copyright (c) 2005-2020 Leo Feyer
  *
  * @package   ProperFilenames
  * @author    Benny Born <[email protected]>
  * @license   LGPL
- * @copyright 2017 numero2 - Agentur für Internetdienstleistungen
+ * @copyright 2020 numero2 - Agentur für digitales Marketing GbR
  */
 
 
@@ -25,7 +25,7 @@
 /**
  * Register the classes
  */
-ClassLoader::addClasses( array
+ClassLoader::addClasses(array
 (
     // Classes
     'numero2\ProperFilenames\CheckFilenames' => 'system/modules/proper-filenames/classes/CheckFilenames.php',

config/config.php

@@ -3,12 +3,12 @@
 /**
  * Contao Open Source CMS
  *
- * Copyright (c) 2005-2017 Leo Feyer
+ * Copyright (c) 2005-2020 Leo Feyer
  *
  * @package   ProperFilenames
  * @author    Benny Born <[email protected]>
  * @license   LGPL
- * @copyright 2017 numero2 - Agentur für Internetdienstleistungen
+ * @copyright 2020 numero2 - Agentur für digitales Marketing GbR
  */
 
 

dca/tl_files.php

@@ -3,12 +3,12 @@
 /**
  * Contao Open Source CMS
  *
- * Copyright (c) 2005-2017 Leo Feyer
+ * Copyright (c) 2005-2020 Leo Feyer
  *
  * @package   ProperFilenames
  * @author    Benny Born <[email protected]>
  * @license   LGPL
- * @copyright 2017 numero2 - Agentur für Internetdienstleistungen
+ * @copyright 2020 numero2 - Agentur für digitales Marketing GbR
  */
 
 

dca/tl_settings.php

@@ -3,43 +3,41 @@
 /**
  * Contao Open Source CMS
  *
- * Copyright (c) 2005-2017 Leo Feyer
+ * Copyright (c) 2005-2020 Leo Feyer
  *
  * @package   ProperFilenames
  * @author    Benny Born <[email protected]>
  * @license   LGPL
- * @copyright 2017 numero2 - Agentur für Internetdienstleistungen
+ * @copyright 2020 numero2 - Agentur für digitales Marketing GbR
  */
 
 use Contao\System;
 use numero2\ProperFilenames\CheckFilenames;
 
+
 /**
  * Add palettes to tl_settings
  */
+$GLOBALS['TL_DCA']['tl_settings']['palettes']['__selector__'][] = 'checkFilenames';
 $GLOBALS['TL_DCA']['tl_settings']['palettes']['default'] = str_replace(
     ',imageHeight',
-    ',imageHeight,checkFilenames,doNotTrimFilenames,filenameValidCharacters,filenameValidCharactersLocale',
+    ',imageHeight,checkFilenames',
     $GLOBALS['TL_DCA']['tl_settings']['palettes']['default']
 );
 
+$GLOBALS['TL_DCA']['tl_settings']['subpalettes']['checkFilenames'] = 'filenameValidCharacters,filenameValidCharactersLocale,doNotTrimFilenames';
+
 
 /**
  * Add fields to tl_settings
  */
 $GLOBALS['TL_DCA']['tl_settings']['fields']['checkFilenames'] = array(
     'label'     => &$GLOBALS['TL_LANG']['tl_settings']['checkFilenames'],
     'inputType' => 'checkbox',
-    'eval'      => array( 'tl_class' => 'w50 cbx' ),
+    'eval'      => array( 'submitOnChange'=>true, 'tl_class' => 'w50 cbx' ),
     'default'   => true
 );
 
-$GLOBALS['TL_DCA']['tl_settings']['fields']['doNotTrimFilenames'] = array(
-    'label'     => &$GLOBALS['TL_LANG']['tl_settings']['doNotTrimFilenames'],
-    'inputType' => 'checkbox',
-    'eval'      => array( 'tl_class' => 'w50 cbx' ),
-);
-
 $GLOBALS['TL_DCA']['tl_settings']['fields']['filenameValidCharacters'] = array(
     'label'     => &$GLOBALS['TL_LANG']['tl_settings']['filenameValidCharacters'],
     'inputType' => 'select',
@@ -56,3 +54,9 @@
     },
     'eval'      => array( 'tl_class' => 'w50', 'includeBlankOption' => true, 'chosen' => true ),
 );
+
+$GLOBALS['TL_DCA']['tl_settings']['fields']['doNotTrimFilenames'] = array(
+    'label'     => &$GLOBALS['TL_LANG']['tl_settings']['doNotTrimFilenames'],
+    'inputType' => 'checkbox',
+    'eval'      => array( 'tl_class' => 'w50 cbx' ),
+);