diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index eed25b1f94..2289df27c4 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: true matrix: - php: [7.1, 7.2, 7.3, 7.4] + php: [7.4, 8.0] testsuite: ["functional", "unit", "installer"] name: PHPUnit - ${{ matrix.testsuite }} (PHP ${{ matrix.php }}) services: @@ -100,7 +100,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 7.1 + php-version: 7.4 extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, bcmath, intl, gd, exif, iconv, imagick coverage: none @@ -134,7 +134,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 7.1 + php-version: 7.4 extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, bcmath, intl, gd, exif, iconv, imagick coverage: none @@ -173,7 +173,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 7.1 + php-version: 7.4 extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, bcmath, intl, gd, exif, iconv, imagick coverage: none diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 11656cee08..6ee71fce11 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -3,7 +3,7 @@ build: analysis: environment: php: - version: 7.1 + version: 7.4 cache: disabled: false directories: diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ff91c76ca..0643036033 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,26 @@ +5.12.0 (2023-07-31) +------------------ + +Fixed: +* Core: Fix redirecting in parseWidget [#3513](https://github.com/forkcms/forkcms/pull/3513) +* Core: Make privacy consent dialog scrollable on mobile [#3507](https://github.com/forkcms/forkcms/pull/3507) +* Core: Make the old session clean-up method timezone aware [#3511](https://github.com/forkcms/forkcms/pull/3511) +* Core: Move the apple touch icon to the theme [#3512](https://github.com/forkcms/forkcms/pull/3512) +* Pages: Allow the use of install in a page title [#3533](https://github.com/forkcms/forkcms/pull/3533) +* Pages: Skip empty images while copying a page [#3545](https://github.com/forkcms/forkcms/pull/3545) + +Security: +* Core: Fix Open Redirect issue [#3547](https://github.com/forkcms/forkcms/pull/3547) + +Added: +* CLI: Reset password CLI command [#3491](https://github.com/forkcms/forkcms/pull/3491) +* Profiles: Autocomplete attributes [#3508](https://github.com/forkcms/forkcms/pull/3508)[#3548](https://github.com/forkcms/forkcms/pull/3548) + +Changed: +* Core: Added PHP8 support and bumped minimum to 7.4 [#3538](https://github.com/forkcms/forkcms/pull/3538) +* Core: Switched to symfony 4.4 [#3538](https://github.com/forkcms/forkcms/pull/3538) + + 5.11.1 (2022-03-24) ------------------ diff --git a/Dockerfile b/Dockerfile index 8fdcab2403..3c8cb674e6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.1-apache +FROM php:7.4-apache LABEL maintainer="Fork CMS " # Enable Apache mod_rewrite @@ -8,10 +8,11 @@ RUN a2enmod rewrite RUN apt-get update && apt-get install -y --no-install-recommends --allow-downgrades \ libfreetype6-dev \ libjpeg62-turbo-dev \ + libonig-dev \ libz-dev \ zlib1g-dev \ libpng-dev && \ - docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ && \ + docker-php-ext-configure gd --with-freetype --with-jpeg && \ docker-php-ext-install -j$(nproc) gd && \ rm -rf /var/lib/apt/lists/* @@ -22,7 +23,9 @@ RUN docker-php-ext-install pdo_mysql RUN docker-php-ext-install mbstring # Install zip & unzip -RUN apt-get update && apt-get install -y unzip && \ +RUN apt-get update && apt-get install -y \ + libzip-dev \ + unzip && \ docker-php-ext-install zip && \ rm -rf /var/lib/apt/lists/* diff --git a/README.md b/README.md index a2b5a4910c..8128d863bc 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,6 @@ [![Latest Stable Version](https://poser.pugx.org/forkcms/forkcms/v/stable)](https://packagist.org/packages/forkcms/forkcms) [![License](https://poser.pugx.org/forkcms/forkcms/license)](https://packagist.org/packages/forkcms/forkcms) [![Code Coverage](https://codecov.io/gh/forkcms/forkcms/branch/master/graph/badge.svg?token=ahj70hVO29)](http://codecov.io/github/forkcms/forkcms?branch=master) -[![Slack Status](https://fork-cms.herokuapp.com/badge.svg)](https://fork-cms.herokuapp.com/) [![Documentation Status](https://img.shields.io/badge/docs-latest-brightgreen.svg)](http://docs.fork-cms.com/) [![huntr.dev | the place to protect open source](https://cdn.huntr.dev/huntr_security_badge.svg)](https://huntr.dev) diff --git a/VERSION.md b/VERSION.md index 32447ce31d..dd0ad7ae60 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -5.11.1 +5.12.0 diff --git a/app/AppKernel.php b/app/AppKernel.php index db33dca52d..9d13a1040f 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -20,7 +20,6 @@ public function registerBundles(): array new \Symfony\Bundle\TwigBundle\TwigBundle(), new \Symfony\Bundle\MonologBundle\MonologBundle(), new \Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(), - new \Symfony\Bundle\AsseticBundle\AsseticBundle(), new \ForkCMS\Bundle\InstallerBundle\ForkCMSInstallerBundle(), new \ForkCMS\Bundle\CoreBundle\ForkCMSCoreBundle(), new \Doctrine\Bundle\DoctrineBundle\DoctrineBundle(), diff --git a/app/ForkController.php b/app/ForkController.php index 858064acee..ed6c629ffa 100644 --- a/app/ForkController.php +++ b/app/ForkController.php @@ -6,17 +6,17 @@ use Backend\Core\Engine\Backend; use Frontend\Core\Engine\Ajax as FrontendAjax; use Frontend\Core\Engine\Frontend; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Backend\Init as BackendInit; use Frontend\Init as FrontendInit; use Common\Exception\RedirectException; use Symfony\Component\HttpFoundation\Response; -use Twig_Error; +use Twig\Error\Error; /** * Application routing */ -class ForkController extends Controller +class ForkController extends AbstractController { const DEFAULT_APPLICATION = 'Frontend'; @@ -106,7 +106,7 @@ protected function handleApplication(ApplicationInterface $application): Respons return $application->display(); } catch (RedirectException $ex) { return $ex->getResponse(); - } catch (Twig_Error $twigError) { + } catch (Error $twigError) { if ($twigError->getPrevious() instanceof RedirectException) { return $twigError->getPrevious()->getResponse(); } diff --git a/app/config/config.yml b/app/config/config.yml index ec29007a48..73bbd3ade0 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -30,12 +30,12 @@ framework: default_lifetime: 3600 # Assetic Configuration -assetic: - debug: "%kernel.debug%" - use_controller: false - bundles: [ 'ForkCMSInstallerBundle' ] - filters: - cssrewrite: ~ +#assetic: +# debug: "%kernel.debug%" +# use_controller: false +# bundles: [ 'ForkCMSInstallerBundle' ] +# filters: +# cssrewrite: ~ twig: debug: "%kernel.debug%" @@ -77,8 +77,6 @@ liip_imagine: locator: filesystem_insecure cache: default data_loader: default - controller: - filter_action: ForkCMS\ImagineController:filterAction # your filter sets are defined here filter_sets: @@ -222,6 +220,10 @@ services: tags: - { name: kernel.event_listener, event: kernel.response, method: onKernelResponse } + ForkCMS\Imagine\Service\FilterService: + alias: 'liip_imagine.service.filter' + public: true + ForkCMS\Utility\Geolocation: public: true arguments: @@ -274,7 +276,3 @@ services: arguments: - "@fork.settings" - "@fork.cookie" - - ForkCMS\ImagineController: - public: true - autowire: true diff --git a/app/config/config_install.yml b/app/config/config_install.yml index 398febaedd..74d8badcaa 100644 --- a/app/config/config_install.yml +++ b/app/config/config_install.yml @@ -26,12 +26,12 @@ framework: default_lifetime: 3600 # Assetic Configuration -assetic: - debug: "%kernel.debug%" - use_controller: false - bundles: [ 'ForkCMSInstallerBundle' ] - filters: - cssrewrite: ~ +#assetic: +# debug: "%kernel.debug%" +# use_controller: false +# bundles: [ 'ForkCMSInstallerBundle' ] +# filters: +# cssrewrite: ~ monolog: handlers: diff --git a/app/config/doctrine.yml b/app/config/doctrine.yml index f57df9b77b..f48a3f4de9 100644 --- a/app/config/doctrine.yml +++ b/app/config/doctrine.yml @@ -24,6 +24,7 @@ doctrine: datetime: Common\Doctrine\Type\UTCDateTimeType datetimetz: Common\Doctrine\Type\UTCDateTimeType time: Common\Doctrine\Type\UTCTimeType + uuid: Ramsey\Uuid\Doctrine\UuidType orm: auto_generate_proxy_classes: "%kernel.debug%" diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index 01a5275524..513820f57d 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -10,7 +10,7 @@ parameters: fork.debug_email: fork.debug_message: 'Internal error.' - fork.version: '5.11.1' + fork.version: '5.12.0' session.cookie_secure: false site.protocol: diff --git a/app/config/parameters.yml.test b/app/config/parameters.yml.test index 060da33dd0..79ceb24042 100644 --- a/app/config/parameters.yml.test +++ b/app/config/parameters.yml.test @@ -10,7 +10,7 @@ parameters: fork.debug_email: '' fork.debug_message: 'Internal error.' - fork.version: '5.11.1' + fork.version: '5.12.0' session.cookie_secure: false site.protocol: http diff --git a/app/config/parameters_install.yml b/app/config/parameters_install.yml index 9488fbb434..9a8d150852 100644 --- a/app/config/parameters_install.yml +++ b/app/config/parameters_install.yml @@ -10,7 +10,7 @@ parameters: fork.debug_email: noreply@fork.com fork.debug_message: 'Internal error.' - fork.version: '5.11.1' + fork.version: '5.12.0' session.cookie_secure: false site.protocol: diff --git a/app/config/routing.yml b/app/config/routing.yml index 32173af4bf..a35cd4b692 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -1,7 +1,7 @@ # Add your custom routes for Symfony bundles above this line _liip_imagine: - resource: "@LiipImagineBundle/Resources/config/routing.xml" + resource: "@LiipImagineBundle/Resources/config/routing.yaml" backend: path: /private/{_locale}/{module}/{action} defaults: diff --git a/autoload.php b/autoload.php index e63c8b685a..ea338c52ba 100644 --- a/autoload.php +++ b/autoload.php @@ -2,12 +2,10 @@ // @TODO rename this file to bootstrap.php to better reflect its function -use Doctrine\Common\Annotations\AnnotationRegistry; use Symfony\Component\Dotenv\Dotenv; // use vendor generated autoloader $loader = require __DIR__ . '/vendor/autoload.php'; -AnnotationRegistry::registerLoader(array($loader, 'loadClass')); // Spoon is not autoloaded via Composer but uses its own old skool autoloader set_include_path(__DIR__ . '/vendor/spoon/library' . PATH_SEPARATOR . get_include_path()); diff --git a/composer.json b/composer.json index cf3b382c1f..6dcc4780c7 100644 --- a/composer.json +++ b/composer.json @@ -10,53 +10,53 @@ "blog", "php" ], - "homepage": "http://www.fork-cms.com/", + "homepage": "https://www.fork-cms.com/", "license": "MIT", "require": { - "php": "^7.1", + "php": "^7.4||^8.0", "ext-json": "*", "ext-zip": "*", "ext-gd": "*", "ext-intl": "*", "ext-simplexml": "*", "behat/transliterator": "~1.0", - "doctrine/doctrine-bundle": "^1.6", - "doctrine/orm": "^2.5", + "doctrine/doctrine-bundle": "^2.0", + "doctrine/orm": "^2.7", "google/apiclient": "~1.1.2", - "google/recaptcha": "~1.1", + "google/recaptcha": "^1.2", "jeroendesloovere/geolocation-php-api": "^2.1", "league/flysystem": "~1.0", "league/flysystem-aws-s3-v3": "^1.0.13", "league/flysystem-cached-adapter": "^1.0.6", - "liip/imagine-bundle": "^1.7", - "mailmotor/campaignmonitor-bundle": "^2.0", - "mailmotor/mailchimp-bundle": "^3.0", - "mailmotor/mailmotor-bundle": "^3.0", + "liip/imagine-bundle": "*", + "mailmotor/campaignmonitor-bundle": "^3.0", + "mailmotor/mailchimp-bundle": "^4.0", + "mailmotor/mailmotor-bundle": "^4.0", "matthiasmullie/minify": "~1.3", "matthiasmullie/scrapbook": "^1.3", "pimple/pimple": "^3.2", - "ramsey/uuid": "^3.5", - "ramsey/uuid-doctrine": "^1.2", - "simple-bus/doctrine-orm-bridge": "^4.0", - "simple-bus/symfony-bridge": "^4.1", + "ramsey/uuid": "^4.0", + "ramsey/uuid-doctrine": "^2.0", + "simple-bus/doctrine-orm-bridge": "6.2.*", + "simple-bus/symfony-bridge": "~6.2", "spoon/library": "^3.0", "swiftmailer/swiftmailer": "^6.0", - "symfony/assetic-bundle": "^2.8", "symfony/monolog-bundle": "^3.1", "symfony/swiftmailer-bundle": "^3.0", - "symfony/symfony": "^3.3", - "tijsverkoyen/akismet": "1.1.*", - "tijsverkoyen/css-to-inline-styles": "1.5.*", + "symfony/symfony": "^4.0", + "tijsverkoyen/css-to-inline-styles": "^2.0", "phpoffice/phpspreadsheet": "^1.12", "composer/package-versions-deprecated": "^1.11", + "guzzlehttp/guzzle": "^6.5", + "doctrine/annotations": "^1.14", "sentry/sentry-symfony": "^4.1", "tijsverkoyen/convert-to-junit-xml": "^1.9.0" }, "require-dev": { "jdorn/sql-formatter": "1.2.17", - "symfony/var-dumper": "^3.3", + "symfony/var-dumper": "^4.0", "squizlabs/php_codesniffer": "^3.5", - "symfony/phpunit-bridge": "*", + "symfony/phpunit-bridge": "^4.3", "phpstan/phpstan": "^0.12.52", "phpstan/phpstan-symfony": "^0.12.7", "deployer/deployer": "^7.0@beta", @@ -71,18 +71,19 @@ "issues": "https://github.com/forkcms/forkcms/issues" }, "scripts": { - "test": "./bin/simple-phpunit", + "test": [ + "Composer\\Config::disableProcessTimeout", + "./bin/simple-phpunit" + ], "post-install-cmd": [ - "@php bin/console assetic:dump .", - "@php bin/console forkcms:cache:clear", - "@php bin/console cache:clear --no-warmup", - "@php bin/console cache:warmup" + "php bin/console forkcms:cache:clear", + "php bin/console cache:clear --no-warmup", + "php bin/console cache:warmup" ], "post-update-cmd": [ - "@php bin/console assetic:dump .", - "@php bin/console forkcms:cache:clear", - "@php bin/console cache:clear --no-warmup", - "@php bin/console cache:warmup" + "php bin/console forkcms:cache:clear", + "php bin/console cache:clear --no-warmup", + "php bin/console cache:warmup" ] }, "autoload": { diff --git a/docs/07. media library/03. integrating in your module.md b/docs/07. media library/03. integrating in your module.md index c79313c25f..52b3a45aac 100644 --- a/docs/07. media library/03. integrating in your module.md +++ b/docs/07. media library/03. integrating in your module.md @@ -20,7 +20,7 @@ use Backend\Modules\MediaLibrary\Domain\MediaGroup\MediaGroup; * * @ORM\OneToOne( * targetEntity="Backend\Modules\MediaLibrary\Domain\MediaGroup\MediaGroup", - * cascade="persist", + * cascade={"persist"}, * orphanRemoval=true * ) * @ORM\JoinColumn( diff --git a/index.php b/index.php index 991895dd77..b4d63dbc3e 100644 --- a/index.php +++ b/index.php @@ -53,7 +53,7 @@ } if ($debug) { - Debug::enable(); + \Symfony\Component\ErrorHandler\Debug::enable(); } $kernel = new AppKernel($env, $debug); diff --git a/phpstan.neon b/phpstan.neon index 33388057da..b703f4b898 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -57,4 +57,4 @@ parameters: - '#Constant BACKEND_CACHE_PATH not found.#' - '#Constant SITE_DEFAULT_TITLE not found.#' symfony: - container_xml_path: var/cache/dev/appDevDebugProjectContainer.xml + container_xml_path: var/cache/dev/appForkCMS_App_AppKernelDevDebugContainer.xml diff --git a/phpunit.xml.dist b/phpunit.xml.dist index cd9dc9871b..bb586e3c43 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -2,12 +2,39 @@ + + + src + + + src/*/*Bundle/Resources + src/*/*Bundle/Tests + src/*/Bundle/*Bundle/Resources + src/*/Bundle/*Bundle/Tests + src/*Bundle/Resources + src/*Bundle/Tests + src/Backend/Cache + src/Backend/Core/Js + src/Backend/Core/Tests + src/Backend/Core/Installer + src/Backend/Modules/*/DataFixtures + src/Backend/Modules/*/Installer + src/Backend/Modules/*/Tests + src/Common/Tests + src/Frontend/Cache + src/Frontend/Core/Tests + src/Frontend/Modules/*/DataFixtures + src/Frontend/Modules/*/Tests + src/Common/WebTestCase.php + + + src/ForkCMS/Bundle/InstallerBundle/Tests @@ -53,7 +80,7 @@ src/Backend/Modules/Settings/Tests/Actions src/Backend/Modules/Tags/Tests/Actions src/Backend/Modules/Users/Tests/Actions - src/Frontend/Core/Tests/AjaxTest.php + src/Frontend/Core/Tests/Engine/AjaxTest.php @@ -62,37 +89,11 @@ src/*/Bundle/*Bundle/Tests/Controller src/*Bundle/Tests/Controller src/Frontend/Modules/*/Tests/Actions - src/Frontend/Core/Tests/AjaxTest.php + src/Frontend/Core/Tests/Engine/AjaxTest.php src/ForkCMS/Bundle/InstallerBundle/Tests - - - src - - src/*/*Bundle/Resources - src/*/*Bundle/Tests - src/*/Bundle/*Bundle/Resources - src/*/Bundle/*Bundle/Tests - src/*Bundle/Resources - src/*Bundle/Tests - src/Backend/Cache - src/Backend/Core/Js - src/Backend/Core/Tests - src/Backend/Core/Installer - src/Backend/Modules/*/DataFixtures - src/Backend/Modules/*/Installer - src/Backend/Modules/*/Tests - src/Common/Tests - src/Frontend/Cache - src/Frontend/Core/Tests - src/Frontend/Modules/*/DataFixtures - src/Frontend/Modules/*/Tests - src/Common/WebTestCase.php - - - diff --git a/src/Backend/Core/Engine/TwigTemplate.php b/src/Backend/Core/Engine/TwigTemplate.php index 89eb5e496c..11c6f42098 100644 --- a/src/Backend/Core/Engine/TwigTemplate.php +++ b/src/Backend/Core/Engine/TwigTemplate.php @@ -14,10 +14,10 @@ use Symfony\Bundle\FrameworkBundle\Templating\Loader\TemplateLocator; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\Form\FormRenderer; -use Twig_Environment; -use Twig_Extension_Debug; -use Twig_FactoryRuntimeLoader; -use Twig_Loader_Filesystem; +use Twig\Environment; +use Twig\Extension\DebugExtension; +use Twig\Loader\FilesystemLoader; +use Twig\RuntimeLoader\FactoryRuntimeLoader; /** * This is a twig template wrapper @@ -49,7 +49,7 @@ public function __construct(bool $addToReference = true) if ($this->debugMode) { $this->environment->enableAutoReload(); $this->environment->setCache(false); - $this->environment->addExtension(new Twig_Extension_Debug()); + $this->environment->addExtension(new DebugExtension()); } $this->language = BL::getWorkingLanguage(); $this->connectSymfonyForms(); @@ -80,16 +80,16 @@ public function getContent(string $template): string } /** - * @return Twig_Environment + * @return Environment */ - private function buildTwigEnvironmentForTheBackend(): Twig_Environment + private function buildTwigEnvironmentForTheBackend(): Environment { // path to TwigBridge library so we can locate the form theme files. $appVariableReflection = new ReflectionClass(AppVariable::class); $vendorTwigBridgeDir = dirname($appVariableReflection->getFileName()); // render the compiled File - $loader = new Twig_Loader_Filesystem( + $loader = new FilesystemLoader( [ BACKEND_MODULES_PATH, BACKEND_CORE_PATH, @@ -97,7 +97,7 @@ private function buildTwigEnvironmentForTheBackend(): Twig_Environment ] ); - return new Twig_Environment( + return new Environment( $loader, [ 'cache' => Model::getContainer()->getParameter('kernel.cache_dir') . '/twig', @@ -117,7 +117,7 @@ private function connectSymfonyForms(): void ); $csrfTokenManager = Model::get('security.csrf.token_manager'); $this->environment->addRuntimeLoader( - new Twig_FactoryRuntimeLoader( + new FactoryRuntimeLoader( [ FormRenderer::class => function () use ($rendererEngine, $csrfTokenManager): FormRenderer { return new FormRenderer($rendererEngine, $csrfTokenManager); @@ -254,8 +254,8 @@ private function parseDebug(): void { $this->assign('debug', Model::getContainer()->getParameter('kernel.debug')); - if ($this->debugMode === true && !$this->environment->hasExtension(Twig_Extension_Debug::class)) { - $this->environment->addExtension(new Twig_Extension_Debug()); + if ($this->debugMode === true && !$this->environment->hasExtension(DebugExtension::class)) { + $this->environment->addExtension(new DebugExtension()); } } diff --git a/src/Backend/Core/Layout/Templates/FormLayout.html.twig b/src/Backend/Core/Layout/Templates/FormLayout.html.twig index 7bae3a07f7..0ffbcf11f4 100644 --- a/src/Backend/Core/Layout/Templates/FormLayout.html.twig +++ b/src/Backend/Core/Layout/Templates/FormLayout.html.twig @@ -65,10 +65,10 @@ {% endblock checkbox_radio_label %} {%- block label_asterisk -%} - {% spaceless %} + {% apply spaceless %} {% import 'Layout/Templates/macros.html.twig' as macro %} {{ macro.required }} - {% endspaceless %} + {% endapply %} {%- endblock label_asterisk -%} {% block form_errors -%} @@ -241,7 +241,7 @@ {%- endblock meta_widget -%} {% block fork_image_widget %} - {% spaceless %} + {% apply spaceless %}
{% set show_preview = show_preview and data is not null and data.fileName is not empty %} {% if show_preview or show_remove_image %} @@ -262,12 +262,12 @@ {% endif %}
- {% endspaceless %} + {% endapply %} {% endblock %} {% block fork_file_widget %} {% import "Layout/Templates/macros.html.twig" as macro %} - {% spaceless %} + {% apply spaceless %}
{{ form_widget(form.file) }} {% if help_text_message %} @@ -289,11 +289,11 @@ {% endif %}
{% endif %} - {% endspaceless %} + {% endapply %} {% endblock %} {% block bootstrap_collection_row %} - {% spaceless %} + {% apply spaceless %} {% import "Layout/Templates/macros.html.twig" as macro %} {% if prototype is defined %} {% set prototype_vars = {} %} @@ -351,7 +351,7 @@ - {% endspaceless %} + {% endapply %} {% endblock bootstrap_collection_row %} {% block media_group_row %} diff --git a/src/Backend/Core/Layout/Templates/breadcrumb.html.twig b/src/Backend/Core/Layout/Templates/breadcrumb.html.twig index 7d5f4f87e8..f031ed966e 100644 --- a/src/Backend/Core/Layout/Templates/breadcrumb.html.twig +++ b/src/Backend/Core/Layout/Templates/breadcrumb.html.twig @@ -1,15 +1,15 @@
    - {% for topLevelItem in navigation if topLevelItem.active %} + {% for topLevelItem in navigation|filter(topLevelItem => topLevelItem.active) %}
  1. {{ ('lbl.'~topLevelItem.label)|trans|ucfirst }}
    2. {% if topLevelItem.children is not empty %} - {% for secondaryItem in topLevelItem.children if secondaryItem.active %} + {% for secondaryItem in topLevelItem.children|filter(secondaryItem => secondaryItem.active) %}
  2. {{ ('lbl.'~secondaryItem.label)|trans|ucfirst }}
    3. {% if secondaryItem.children is not empty %} - {% for tertiaryItem in secondaryItem.children if tertiaryItem.active %} + {% for tertiaryItem in secondaryItem.children|filter(tertiaryItem => tertiaryItem.active) %}
  3. {{ ('lbl.'~tertiaryItem.label)|trans|ucfirst }}
    4. diff --git a/src/Backend/Core/Layout/Templates/subnavigation.html.twig b/src/Backend/Core/Layout/Templates/subnavigation.html.twig index f6dec7ccdb..a07e5f8fd2 100644 --- a/src/Backend/Core/Layout/Templates/subnavigation.html.twig +++ b/src/Backend/Core/Layout/Templates/subnavigation.html.twig @@ -1,6 +1,6 @@
      - {% for mainItem in navigation %} - {% for subItem in mainItem.children if mainItem.active %} + {% for mainItem in navigation|filter(mainItem => mainItem.active) %} + {% for subItem in mainItem.children %}
    • {{ ('lbl.'~subItem.label)|trans|ucfirst }} {% if subItem.children is defined and subItem.active %} diff --git a/src/Backend/Modules/Authentication/Actions/Index.php b/src/Backend/Modules/Authentication/Actions/Index.php index ff78576944..cae5138bf5 100644 --- a/src/Backend/Modules/Authentication/Actions/Index.php +++ b/src/Backend/Modules/Authentication/Actions/Index.php @@ -53,14 +53,19 @@ private function buildForm(): void ->addText('backend_email') ->setAttribute('placeholder', \SpoonFilter::ucfirst(BL::lbl('Email'))) ->setAttribute('type', 'email') + ->setAttribute('autocomplete', 'email') ; $this->form ->addPassword('backend_password') ->setAttribute('placeholder', \SpoonFilter::ucfirst(BL::lbl('Password'))) + ->setAttribute('autocomplete', 'current-password') ; $this->formForgotPassword = new BackendForm('forgotPassword'); - $this->formForgotPassword->addText('backend_email_forgot'); + $this->formForgotPassword + ->addText('backend_email_forgot') + ->setAttribute('autocomplete', 'email') + ; } public function parse(): void diff --git a/src/Backend/Modules/Authentication/Actions/ResetPassword.php b/src/Backend/Modules/Authentication/Actions/ResetPassword.php index 11401be0b9..83f868bee3 100644 --- a/src/Backend/Modules/Authentication/Actions/ResetPassword.php +++ b/src/Backend/Modules/Authentication/Actions/ResetPassword.php @@ -89,8 +89,8 @@ private function loadForm(): void $this->form->addPassword('backend_new_password'); $this->form->addPassword('backend_new_password_repeated'); - $this->form->getField('backend_new_password')->setAttributes(['autocomplete' => 'off']); - $this->form->getField('backend_new_password_repeated')->setAttributes(['autocomplete' => 'off']); + $this->form->getField('backend_new_password')->setAttributes(['autocomplete' => 'new-password']); + $this->form->getField('backend_new_password_repeated')->setAttributes(['autocomplete' => 'new-password']); } private function validateForm(): void diff --git a/src/Backend/Modules/Extensions/Layout/Templates/Templates.html.twig b/src/Backend/Modules/Extensions/Layout/Templates/Templates.html.twig index 4b4b058250..f5765ac799 100644 --- a/src/Backend/Modules/Extensions/Layout/Templates/Templates.html.twig +++ b/src/Backend/Modules/Extensions/Layout/Templates/Templates.html.twig @@ -4,7 +4,7 @@ {% for row in table %} {% for template in row %} - 1 %} rowspan="{{ template.rowspan }}"{% endif %} {% if template.colspan > 1 %} colspan="{{ template.colspan }}"{% endif %} {% if not template.exists %} @@ -14,7 +14,7 @@ {% else %} > {% endif %} - {% endspaceless %} + {% endapply %} {% if not template.exists %}   diff --git a/src/Backend/Modules/MediaGalleries/Domain/MediaGallery/MediaGallery.php b/src/Backend/Modules/MediaGalleries/Domain/MediaGallery/MediaGallery.php index cafdfe0fc5..1a6b0171af 100644 --- a/src/Backend/Modules/MediaGalleries/Domain/MediaGallery/MediaGallery.php +++ b/src/Backend/Modules/MediaGalleries/Domain/MediaGallery/MediaGallery.php @@ -86,7 +86,7 @@ class MediaGallery * * @ORM\OneToOne( * targetEntity="Backend\Modules\MediaLibrary\Domain\MediaGroup\MediaGroup", - * cascade="persist", + * cascade={"persist"}, * orphanRemoval=true * ) * @ORM\JoinColumn( diff --git a/src/Backend/Modules/MediaLibrary/Ajax/MediaItemAddMovie.php b/src/Backend/Modules/MediaLibrary/Ajax/MediaItemAddMovie.php index 5468d2f304..3f979cb59b 100644 --- a/src/Backend/Modules/MediaLibrary/Ajax/MediaItemAddMovie.php +++ b/src/Backend/Modules/MediaLibrary/Ajax/MediaItemAddMovie.php @@ -65,7 +65,7 @@ protected function getMovieId(): string } // Make sure the movie id is valid - if (!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', (string) $movieId)) { + if (!preg_match('/^[a-zA-Z0-9._-]+$/', (string) $movieId)) { throw new AjaxExitException(Language::err('InvalidValue')); } diff --git a/src/Backend/Modules/MediaLibrary/Domain/MediaFolder/MediaFolder.php b/src/Backend/Modules/MediaLibrary/Domain/MediaFolder/MediaFolder.php index fdf42dcda5..d144ed7736 100644 --- a/src/Backend/Modules/MediaLibrary/Domain/MediaFolder/MediaFolder.php +++ b/src/Backend/Modules/MediaLibrary/Domain/MediaFolder/MediaFolder.php @@ -31,7 +31,7 @@ class MediaFolder implements JsonSerializable * @ORM\ManyToOne( * targetEntity="Backend\Modules\MediaLibrary\Domain\MediaFolder\MediaFolder", * inversedBy="children", - * cascade="persist" + * cascade={"persist"} * ) * @ORM\JoinColumn( * name="parentMediaFolderId", diff --git a/src/Backend/Modules/MediaLibrary/Domain/MediaGroupMediaItem/MediaGroupMediaItem.php b/src/Backend/Modules/MediaLibrary/Domain/MediaGroupMediaItem/MediaGroupMediaItem.php index c2c6254af1..45df73de6e 100644 --- a/src/Backend/Modules/MediaLibrary/Domain/MediaGroupMediaItem/MediaGroupMediaItem.php +++ b/src/Backend/Modules/MediaLibrary/Domain/MediaGroupMediaItem/MediaGroupMediaItem.php @@ -7,6 +7,8 @@ use Backend\Modules\MediaLibrary\Domain\MediaItem\MediaItem; use Backend\Modules\MediaLibrary\Domain\MediaGroup\MediaGroup; use JsonSerializable; +use Ramsey\Uuid\Doctrine\UuidGenerator; +use Ramsey\Uuid\UuidInterface; /** * MediaGroup MediaItem @@ -16,11 +18,12 @@ class MediaGroupMediaItem implements JsonSerializable { /** - * @var string + * @var UuidInterface * * @ORM\Id() - * @ORM\GeneratedValue(strategy="UUID") - * @ORM\Column(type="guid") + * @ORM\GeneratedValue(strategy="CUSTOM") + * @ORM\CustomIdGenerator(class=UuidGenerator::class) + * @ORM\Column(type="uuid", unique=true) */ private $id; @@ -30,7 +33,7 @@ class MediaGroupMediaItem implements JsonSerializable * @ORM\ManyToOne( * targetEntity="Backend\Modules\MediaLibrary\Domain\MediaGroup\MediaGroup", * inversedBy="connectedItems", - * cascade="persist" + * cascade={"persist"} * ) * @ORM\JoinColumn( * name="mediaGroupId", @@ -47,7 +50,7 @@ class MediaGroupMediaItem implements JsonSerializable * @ORM\ManyToOne( * targetEntity="Backend\Modules\MediaLibrary\Domain\MediaItem\MediaItem", * inversedBy="groups", - * cascade="persist", + * cascade={"persist"}, * fetch="EAGER" * ) * @ORM\JoinColumn( diff --git a/src/Backend/Modules/MediaLibrary/Domain/MediaItem/MediaItem.php b/src/Backend/Modules/MediaLibrary/Domain/MediaItem/MediaItem.php index c646d1f302..c8bfc73e2f 100644 --- a/src/Backend/Modules/MediaLibrary/Domain/MediaItem/MediaItem.php +++ b/src/Backend/Modules/MediaLibrary/Domain/MediaItem/MediaItem.php @@ -39,7 +39,7 @@ class MediaItem implements JsonSerializable * @ORM\ManyToOne( * targetEntity="Backend\Modules\MediaLibrary\Domain\MediaFolder\MediaFolder", * inversedBy="items", - * cascade="persist" + * cascade={"persist"} * ) * @ORM\JoinColumn( * name="mediaFolderId", diff --git a/src/Backend/Modules/MediaLibrary/Domain/MediaItem/MediaItemSelectionDataGrid.php b/src/Backend/Modules/MediaLibrary/Domain/MediaItem/MediaItemSelectionDataGrid.php index cd637f7dea..443355d0cf 100644 --- a/src/Backend/Modules/MediaLibrary/Domain/MediaItem/MediaItemSelectionDataGrid.php +++ b/src/Backend/Modules/MediaLibrary/Domain/MediaItem/MediaItemSelectionDataGrid.php @@ -166,7 +166,7 @@ private function addDataAttributes(): void $this->setRowAttributes($attributes); } - protected function addButton(string $id, string $type, string $storageType) + public static function addButton(string $id, string $type, string $storageType) { switch ($type) { case Type::MOVIE: diff --git a/src/Backend/Modules/MediaLibrary/EventListener/MediaFolderInvalidateBackendCacheSubscriber.php b/src/Backend/Modules/MediaLibrary/EventListener/MediaFolderInvalidateBackendCacheSubscriber.php index a71716fa99..83b7b84b38 100644 --- a/src/Backend/Modules/MediaLibrary/EventListener/MediaFolderInvalidateBackendCacheSubscriber.php +++ b/src/Backend/Modules/MediaLibrary/EventListener/MediaFolderInvalidateBackendCacheSubscriber.php @@ -6,7 +6,10 @@ use Backend\Modules\MediaLibrary\Domain\MediaFolder\MediaFolder; use Backend\Modules\MediaLibrary\Domain\MediaItem\MediaItem; use Doctrine\Common\EventSubscriber; -use Doctrine\Common\Persistence\Event\LifecycleEventArgs; +use Doctrine\ORM\Event\LifecycleEventArgs; +use Doctrine\ORM\Event\PostPersistEventArgs; +use Doctrine\ORM\Event\PostRemoveEventArgs; +use Doctrine\ORM\Event\PostUpdateEventArgs; use Doctrine\ORM\Events; /** @@ -40,17 +43,17 @@ private function invalidateBackendCacheForMediaFolders(LifecycleEventArgs $event } } - public function postPersist(LifecycleEventArgs $eventArgs): void + public function postPersist(PostPersistEventArgs $eventArgs): void { $this->invalidateBackendCacheForMediaFolders($eventArgs); } - public function postUpdate(LifecycleEventArgs $eventArgs): void + public function postUpdate(PostUpdateEventArgs $eventArgs): void { $this->invalidateBackendCacheForMediaFolders($eventArgs); } - public function postRemove(LifecycleEventArgs $eventArgs): void + public function postRemove(PostRemoveEventArgs $eventArgs): void { $this->invalidateBackendCacheForMediaFolders($eventArgs); } diff --git a/src/Backend/Modules/MediaLibrary/EventListener/MediaItemDeletedReSequenceMediaGroupMediaItemListener.php b/src/Backend/Modules/MediaLibrary/EventListener/MediaItemDeletedReSequenceMediaGroupMediaItemListener.php index aef93844a8..848e3d865a 100644 --- a/src/Backend/Modules/MediaLibrary/EventListener/MediaItemDeletedReSequenceMediaGroupMediaItemListener.php +++ b/src/Backend/Modules/MediaLibrary/EventListener/MediaItemDeletedReSequenceMediaGroupMediaItemListener.php @@ -4,7 +4,7 @@ use Backend\Modules\MediaLibrary\Domain\MediaItem\MediaItem; use Doctrine\Common\Collections\ArrayCollection; -use Doctrine\Common\Persistence\Event\LifecycleEventArgs; +use Doctrine\ORM\Event\LifecycleEventArgs; use SimpleBus\Message\Bus\MessageBus; use Backend\Modules\MediaLibrary\Domain\MediaGroup\Command\SaveMediaGroup; use Backend\Modules\MediaLibrary\Domain\MediaGroup\MediaGroup; diff --git a/src/Backend/Modules/MediaLibrary/EventListener/MediaItemSubscriber.php b/src/Backend/Modules/MediaLibrary/EventListener/MediaItemSubscriber.php index 8844a1da2d..a03f1c2e43 100644 --- a/src/Backend/Modules/MediaLibrary/EventListener/MediaItemSubscriber.php +++ b/src/Backend/Modules/MediaLibrary/EventListener/MediaItemSubscriber.php @@ -6,6 +6,8 @@ use Backend\Modules\MediaLibrary\Domain\MediaItem\MediaItem; use Doctrine\Common\EventSubscriber; use Doctrine\Common\Persistence\Event\LifecycleEventArgs; +use Doctrine\ORM\Event\PostPersistEventArgs; +use Doctrine\ORM\Event\PostRemoveEventArgs; use Doctrine\ORM\Events; use Liip\ImagineBundle\Imagine\Cache\CacheManager; use SimpleBus\Message\Bus\MessageBus; @@ -65,7 +67,7 @@ private function generateThumbnails(MediaItem $mediaItem): void } } - public function postPersist(LifecycleEventArgs $eventArgs): void + public function postPersist(PostPersistEventArgs $eventArgs): void { $entity = $eventArgs->getObject(); if (!$entity instanceof MediaItem) { @@ -75,7 +77,7 @@ public function postPersist(LifecycleEventArgs $eventArgs): void $this->generateThumbnails($entity); } - public function postRemove(LifecycleEventArgs $eventArgs): void + public function postRemove(PostRemoveEventArgs $eventArgs): void { $entity = $eventArgs->getObject(); if (!$entity instanceof MediaItem) { diff --git a/src/Backend/Modules/Profiles/Actions/Add.php b/src/Backend/Modules/Profiles/Actions/Add.php index 1a6e4a7f27..082dbe2466 100644 --- a/src/Backend/Modules/Profiles/Actions/Add.php +++ b/src/Backend/Modules/Profiles/Actions/Add.php @@ -76,21 +76,43 @@ private function loadForm(): void ->setAttribute('type', 'email') ->makeRequired() ; - $this->form->addPassword('password'); + $this->form + ->addPassword('password') + ->setAttribute('autocomplete', 'new-password') + ; if (!$this->notifyProfile) { $this->form->getField('password')->makeRequired(); } - $this->form->addText('display_name')->makeRequired(); - $this->form->addText('first_name'); - $this->form->addText('last_name'); - $this->form->addText('city'); - $this->form->addDropdown('gender', $genderValues); - $this->form->addDropdown('day', array_combine($days, $days)); - $this->form->addDropdown('month', $months); - $this->form->addDropdown('year', array_combine($years, $years)); - $this->form->addDropdown('country', Intl::getRegionBundle()->getCountryNames(BL::getInterfaceLanguage())); + $this->form + ->addText('display_name') + ->makeRequired() + ; + $this->form + ->addText('first_name') + ; + $this->form + ->addText('last_name') + ; + $this->form + ->addText('city') + ; + $this->form + ->addDropdown('gender', $genderValues) + ; + $this->form + ->addDropdown('day', array_combine($days, $days)) + ; + $this->form + ->addDropdown('month', $months) + ; + $this->form + ->addDropdown('year', array_combine($years, $years)) + ; + $this->form + ->addDropdown('country', Intl::getRegionBundle()->getCountryNames(BL::getInterfaceLanguage())) + ; $this->form->addTextarea('about'); // set default elements dropdowns diff --git a/src/Backend/Modules/Profiles/Actions/Edit.php b/src/Backend/Modules/Profiles/Actions/Edit.php index 4913e09b00..f054eba066 100644 --- a/src/Backend/Modules/Profiles/Actions/Edit.php +++ b/src/Backend/Modules/Profiles/Actions/Edit.php @@ -99,23 +99,51 @@ private function loadForm(): void // create elements $this->form->addCheckbox('new_email'); - $this->form->addText('email', $this->profile['email']); + $this->form + ->addText('email', $this->profile['email']) + ; $this->form->addCheckbox('new_password'); - $this->form->addPassword('password'); - $this->form->addPassword('password_repeat'); - $this->form->addText('display_name', $this->profile['display_name'])->makeRequired(); - $this->form->addText('first_name', BackendProfilesModel::getSetting($this->id, 'first_name')); - $this->form->addText('last_name', BackendProfilesModel::getSetting($this->id, 'last_name')); - $this->form->addText('city', BackendProfilesModel::getSetting($this->id, 'city')); - $this->form->addDropdown('gender', $genderValues, BackendProfilesModel::getSetting($this->id, 'gender')); - $this->form->addDropdown('day', array_combine($days, $days), $birthDay); - $this->form->addDropdown('month', $months, $birthMonth); - $this->form->addDropdown('year', array_combine($years, $years), (int) $birthYear); - $this->form->addDropdown( - 'country', - Intl::getRegionBundle()->getCountryNames(BL::getInterfaceLanguage()), - BackendProfilesModel::getSetting($this->id, 'country') - ); + $this->form + ->addPassword('password') + ->setAttribute('autocomplete', 'new-password') + ; + $this->form + ->addPassword('password_repeat') + ->setAttribute('autocomplete', 'new-password') + ; + $this->form + ->addText('display_name', $this->profile['display_name']) + ->makeRequired() + ; + $this->form + ->addText('first_name', BackendProfilesModel::getSetting($this->id, 'first_name')) + ; + $this->form + ->addText('last_name', BackendProfilesModel::getSetting($this->id, 'last_name')) + ; + $this->form + ->addText('city', BackendProfilesModel::getSetting($this->id, 'city')) + ; + $this->form + ->addDropdown('gender', $genderValues, BackendProfilesModel::getSetting($this->id, 'gender')) + ; + $this->form + ->addDropdown('day', array_combine($days, $days), $birthDay) + ; + $this->form + ->addDropdown('month', $months, $birthMonth) + ; + $this->form + ->addDropdown('year', array_combine($years, $years), (int) $birthYear) + ; + $this->form + ->addDropdown( + 'country', + Intl::getRegionBundle()->getCountryNames(BL::getInterfaceLanguage()), + BackendProfilesModel::getSetting($this->id, 'country') + ) + ->setAttribute('autocomplete', 'country-name') + ; $this->form->addTextarea('about', BackendProfilesModel::getSetting($this->id, 'about')); // set default elements dropdowns diff --git a/src/Backend/Modules/Profiles/Tests/Engine/ModelTest.php b/src/Backend/Modules/Profiles/Tests/Engine/ModelTest.php index 339eb53571..bfb038c9f7 100644 --- a/src/Backend/Modules/Profiles/Tests/Engine/ModelTest.php +++ b/src/Backend/Modules/Profiles/Tests/Engine/ModelTest.php @@ -192,8 +192,8 @@ public function testInsertingProfileGroup(Client $client): void self::assertContains( [ - 'id' => $profileGroupId, - 'group_id' => LoadProfilesGroup::getGroupId(), + 'id' => (string) $profileGroupId, + 'group_id' => (string) LoadProfilesGroup::getGroupId(), 'group_name' => LoadProfilesGroup::PROFILES_GROUP_NAME, 'expires_on' => $profileGroupData['expires_on'], ], diff --git a/src/Backend/Modules/Settings/Actions/Index.php b/src/Backend/Modules/Settings/Actions/Index.php index 0120aff2f0..40bb4bec57 100644 --- a/src/Backend/Modules/Settings/Actions/Index.php +++ b/src/Backend/Modules/Settings/Actions/Index.php @@ -2,8 +2,8 @@ namespace Backend\Modules\Settings\Actions; +use ForkCMS\Utility\Akismet; use SpoonFilter; -use TijsVerkoyen\Akismet\Akismet; use Backend\Core\Engine\Base\ActionIndex as BackendBaseActionIndex; use Backend\Core\Engine\Form as BackendForm; use Backend\Core\Language\Language as BL; diff --git a/src/Backend/Modules/Users/Actions/Add.php b/src/Backend/Modules/Users/Actions/Add.php index 9e8972c0db..932f89d87c 100644 --- a/src/Backend/Modules/Users/Actions/Add.php +++ b/src/Backend/Modules/Users/Actions/Add.php @@ -47,11 +47,17 @@ private function loadForm(): void 75, 'form-control passwordGenerator', 'form-control danger passwordGenerator' - )->setAttributes(['autocomplete' => 'off']); - $this->form->addPassword('confirm_password', null, 75)->setAttributes(['autocomplete' => 'off']); - $this->form->addText('name', null, 255); - $this->form->addText('surname', null, 255); - $this->form->addText('nickname', null, 24); + )->setAttributes(['autocomplete' => 'new-password']); + $this->form->addPassword('confirm_password', null, 75)->setAttributes(['autocomplete' => 'new-password']); + $this->form + ->addText('name', null, 255) + ; + $this->form + ->addText('surname', null, 255) + ; + $this->form + ->addText('nickname', null, 24) + ; $this->form->addImage('avatar'); $this->form->addDropdown( diff --git a/src/Backend/Modules/Users/Actions/Edit.php b/src/Backend/Modules/Users/Actions/Edit.php index 6d84e3e35f..0657b4ebef 100644 --- a/src/Backend/Modules/Users/Actions/Edit.php +++ b/src/Backend/Modules/Users/Actions/Edit.php @@ -120,9 +120,15 @@ private function loadForm(): void if ($this->user->isGod()) { $this->form->getField('email')->setAttributes(['disabled' => 'disabled']); } - $this->form->addText('name', $this->record['settings']['name'], 255); - $this->form->addText('surname', $this->record['settings']['surname'], 255); - $this->form->addText('nickname', $this->record['settings']['nickname'], 24); + $this->form + ->addText('name', $this->record['settings']['name'], 255) + ; + $this->form + ->addText('surname', $this->record['settings']['surname'], 255) + ; + $this->form + ->addText('nickname', $this->record['settings']['nickname'], 24) + ; $this->form->addImage('avatar'); // password @@ -132,9 +138,9 @@ private function loadForm(): void $this->form->addPassword('new_password', null, 75); $this->form->addPassword('confirm_password', null, 75); - // disable autocomplete - $this->form->getField('new_password')->setAttributes(['autocomplete' => 'off']); - $this->form->getField('confirm_password')->setAttributes(['autocomplete' => 'off']); + // add autocomplete attributes + $this->form->getField('new_password')->setAttributes(['autocomplete' => 'new-password']); + $this->form->getField('confirm_password')->setAttributes(['autocomplete' => 'new-password']); } // settings diff --git a/src/Backend/Modules/Users/Console/ResetPasswordCommand.php b/src/Backend/Modules/Users/Console/ResetPasswordCommand.php new file mode 100644 index 0000000000..1b3a6dc5d5 --- /dev/null +++ b/src/Backend/Modules/Users/Console/ResetPasswordCommand.php @@ -0,0 +1,62 @@ +setName('forkcms:users:reset-password') + ->setDescription('Reset a users password') + ->addArgument('email', InputArgument::OPTIONAL, '(Optional) The users email-address') + ->addArgument('password', InputArgument::OPTIONAL, '(Optional) The desired new password'); + } + + protected function execute(InputInterface $input, OutputInterface $output): void + { + $helper = $this->getHelper('question'); + + $questionEmailAddress = new Question('Please provide the users email-address: '); + $questionEmailAddressAnswer = $input->getArgument('email'); + + if ($questionEmailAddressAnswer === null) { + $questionEmailAddressAnswer = $helper->ask($input, $output, $questionEmailAddress); + } + + $subjectUserId = BackendUsersModel::getIdByEmail( + $questionEmailAddressAnswer + ); + + if ($subjectUserId === false) { + $output->writeln( + sprintf('User not found with email-address "%s".', $questionEmailAddressAnswer) + ); + + return; + } + + $questionPassword = new Question('Please provide the users new desired password: '); + $questionPassword->setHidden(true); + $questionPasswordAnswer = $input->getArgument('password'); + + if ($questionPasswordAnswer === null) { + $questionPasswordAnswer = $helper->ask($input, $output, $questionPassword); + } + + BackendUsersModel::updatePassword( + new BackendUser($subjectUserId, $questionEmailAddressAnswer), + $questionPasswordAnswer + ); + + $output->writeln('Password has been updated'); + } +} diff --git a/src/Backend/Modules/Users/DependencyInjection/UsersExtension.php b/src/Backend/Modules/Users/DependencyInjection/UsersExtension.php new file mode 100755 index 0000000000..235489a9fa --- /dev/null +++ b/src/Backend/Modules/Users/DependencyInjection/UsersExtension.php @@ -0,0 +1,17 @@ +load('services.yml'); + } +} diff --git a/src/Backend/Modules/Users/Resources/config/services.yml b/src/Backend/Modules/Users/Resources/config/services.yml new file mode 100755 index 0000000000..5bd4d0b989 --- /dev/null +++ b/src/Backend/Modules/Users/Resources/config/services.yml @@ -0,0 +1,3 @@ +services: + Backend\Modules\Users\Console\ResetPasswordCommand: + tags: [console.command] diff --git a/src/Common/Core/Model.php b/src/Common/Core/Model.php index 9fd6317389..40515aa97a 100644 --- a/src/Common/Core/Model.php +++ b/src/Common/Core/Model.php @@ -3,6 +3,7 @@ namespace Common\Core; use ForkCMS\App\BaseModel; +use ForkCMS\Utility\Akismet; use ForkCMS\Utility\Thumbnails; use InvalidArgumentException; use RuntimeException; @@ -10,7 +11,6 @@ use Symfony\Component\HttpFoundation\Session\Session; use Symfony\Component\HttpFoundation\Session\SessionInterface; use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage; -use TijsVerkoyen\Akismet\Akismet; /** * This class will initiate the frontend-application @@ -351,10 +351,7 @@ public static function recursiveHtmlspecialchars(array $data): array { array_walk_recursive( $data, - static function (&$key, &$value) { - if (is_string($key)) { - $key = htmlspecialchars($key); - } + static function (&$value) { if (is_string($value)) { $value = htmlspecialchars($value); } diff --git a/src/Common/Core/Twig/BaseTwigTemplate.php b/src/Common/Core/Twig/BaseTwigTemplate.php index 62e8f24fee..a013a19fa6 100644 --- a/src/Common/Core/Twig/BaseTwigTemplate.php +++ b/src/Common/Core/Twig/BaseTwigTemplate.php @@ -7,7 +7,7 @@ use Common\ModulesSettings; use SpoonForm; use Symfony\Bundle\TwigBundle\TwigEngine; -use Twig_Environment; +use Twig\Environment; /** * This is a twig template wrapper @@ -109,9 +109,9 @@ public function getAssignedVariables(): array /** @todo Refactor out constants #1106 * We need to deprecate this asap * - * @param Twig_Environment $twig + * @param Environment $twig */ - protected function startGlobals(Twig_Environment $twig) + protected function startGlobals(Environment $twig) { // some old globals $twig->addGlobal('var', ''); diff --git a/src/Common/Core/Twig/Extensions/TwigFilters.php b/src/Common/Core/Twig/Extensions/TwigFilters.php index 9ea7c240e0..a7a95666cf 100644 --- a/src/Common/Core/Twig/Extensions/TwigFilters.php +++ b/src/Common/Core/Twig/Extensions/TwigFilters.php @@ -7,9 +7,9 @@ */ use Backend\Core\Engine\Authentication; +use Twig\Environment; use Twig\TwigFilter; use Twig\TwigFunction; -use Twig_Environment; class TwigFilters { @@ -17,10 +17,10 @@ class TwigFilters * //http://twig.sensiolabs.org/doc/advanced.html#id2 * returns a collection of Twig SimpleFilters * - * @param Twig_Environment $twig + * @param Environment $twig * @param string $app */ - public static function addFilters(Twig_Environment $twig, string $app): void + public static function addFilters(Environment $twig, string $app): void { if ($app === 'Backend') { $twig->addFunction( diff --git a/src/Common/Mailer/Message.php b/src/Common/Mailer/Message.php index 4f0134a44e..2a9da17f9c 100644 --- a/src/Common/Mailer/Message.php +++ b/src/Common/Mailer/Message.php @@ -172,10 +172,10 @@ private function getTemplateContent(string $template, array $variables = null): private function cssToInlineStyles(string $html): string { $cssToInlineStyles = new CssToInlineStyles(); - $cssToInlineStyles->setHTML($html); - $cssToInlineStyles->setUseInlineStylesBlock(true); - return (string) $cssToInlineStyles->convert(); + return (string) $cssToInlineStyles->convert( + $html + ); } /** diff --git a/src/Common/WebTestCase.php b/src/Common/WebTestCase.php index ae34c203c2..d0d17dac11 100644 --- a/src/Common/WebTestCase.php +++ b/src/Common/WebTestCase.php @@ -37,7 +37,7 @@ protected function setUp(): void $client = static::createClient(); $data = $this->getProvidedData(); $data[] = $client; - $this->__construct($this->getName(), $data, $this->dataDescription()); + $this->__construct($this->getName(), $data, $this->dataName()); $this->resetDataBase($client); } diff --git a/src/ForkCMS/Bundle/CoreBundle/Validator/UniqueDataTransferObjectValidator.php b/src/ForkCMS/Bundle/CoreBundle/Validator/UniqueDataTransferObjectValidator.php index 7373791501..13423f4eb3 100644 --- a/src/ForkCMS/Bundle/CoreBundle/Validator/UniqueDataTransferObjectValidator.php +++ b/src/ForkCMS/Bundle/CoreBundle/Validator/UniqueDataTransferObjectValidator.php @@ -2,10 +2,10 @@ namespace ForkCMS\Bundle\CoreBundle\Validator; -use Doctrine\Common\Persistence\ManagerRegistry; -use Doctrine\Common\Persistence\Mapping\ClassMetadata; -use Doctrine\Common\Persistence\ObjectManager; -use Doctrine\Common\Persistence\ObjectRepository; +use Doctrine\Persistence\ManagerRegistry; +use Doctrine\Persistence\Mapping\ClassMetadata; +use Doctrine\Persistence\ObjectManager; +use Doctrine\Persistence\ObjectRepository; use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Exception\UnexpectedTypeException; use Symfony\Component\Validator\Exception\ConstraintDefinitionException; diff --git a/src/ForkCMS/Bundle/InstallerBundle/Resources/views/Installer/base.html.twig b/src/ForkCMS/Bundle/InstallerBundle/Resources/views/Installer/base.html.twig index aee454af09..1c9ea12eee 100644 --- a/src/ForkCMS/Bundle/InstallerBundle/Resources/views/Installer/base.html.twig +++ b/src/ForkCMS/Bundle/InstallerBundle/Resources/views/Installer/base.html.twig @@ -14,14 +14,11 @@ Installer - Fork CMS - {% stylesheets '@ForkCMSInstallerBundle/Resources/public/css/*' %} - - {% endstylesheets %} + - {% javascripts '@ForkCMSInstallerBundle/Resources/public/js/*' %} - - {% endjavascripts %} + +
      diff --git a/src/ForkCMS/Imagine/Service/FilterService.php b/src/ForkCMS/Imagine/Service/FilterService.php new file mode 100644 index 0000000000..0bceae308d --- /dev/null +++ b/src/ForkCMS/Imagine/Service/FilterService.php @@ -0,0 +1,241 @@ +dataManager = $dataManager; + $this->filterManager = $filterManager; + $this->cacheManager = $cacheManager; + $this->webpGenerate = $webpGenerate; + $this->webpOptions = $webpOptions; + $this->logger = $logger ?: new NullLogger(); + } + + /** + * @param string $path + * @param string $filter + * + * @return bool Returns true if we removed at least one cached image + */ + public function bustCache($path, $filter) + { + $busted = false; + + foreach ($this->buildFilterPathContainers($path) as $filterPathContainer) { + if ($this->cacheManager->isStored($filterPathContainer->getTarget(), $filter)) { + $this->cacheManager->remove($filterPathContainer->getTarget(), $filter); + + $busted = true; + } + } + + return $busted; + } + + /** + * @param bool $forced Force warm up cache + * + * @return bool Returns true if the cache is warmed up + */ + public function warmUpCache( + string $path, + string $filter, + ?string $resolver = null, + bool $forced = false + ): bool { + $warmedUp = false; + + foreach ($this->buildFilterPathContainers($path) as $filterPathContainer) { + if ($this->warmUpCacheFilterPathContainer($filterPathContainer, $filter, $resolver, $forced)) { + $warmedUp = true; + } + } + + return $warmedUp; + } + + /** + * @param string $path + * @param string $filter + * @param string|null $resolver + * + * @return string + */ + public function getUrlOfFilteredImage($path, $filter, $resolver = null, bool $webpSupported = false) + { + foreach ($this->buildFilterPathContainers($path) as $filterPathContainer) { + $this->warmUpCacheFilterPathContainer($filterPathContainer, $filter, $resolver); + } + + return $this->resolveFilterPathContainer(new FilterPathContainer($path), $filter, $resolver, $webpSupported); + } + + /** + * @param string $path + * @param string $filter + * @param string|null $resolver + * + * @return string + */ + public function getUrlOfFilteredImageWithRuntimeFilters( + $path, + $filter, + array $runtimeFilters = [], + $resolver = null, + bool $webpSupported = false + ) { + $runtimePath = $this->cacheManager->getRuntimePath($path, $runtimeFilters); + $runtimeOptions = [ + 'filters' => $runtimeFilters, + ]; + + foreach ($this->buildFilterPathContainers($path, $runtimePath, $runtimeOptions) as $filterPathContainer) { + $this->warmUpCacheFilterPathContainer($filterPathContainer, $filter, $resolver); + } + + return $this->resolveFilterPathContainer( + new FilterPathContainer($path, $runtimePath, $runtimeOptions), + $filter, + $resolver, + $webpSupported + ); + } + + /** + * @param mixed[] $options + * + * @return FilterPathContainer[] + */ + private function buildFilterPathContainers(string $source, string $target = '', array $options = []): array + { + $basePathContainer = new FilterPathContainer($source, $target, $options); + $filterPathContainers = [$basePathContainer]; + + if ($this->webpGenerate) { + $filterPathContainers[] = $basePathContainer->createWebp($this->webpOptions); + } + + return $filterPathContainers; + } + + private function resolveFilterPathContainer( + FilterPathContainer $filterPathContainer, + string $filter, + ?string $resolver = null, + bool $webpSupported = false + ): string { + $path = $filterPathContainer->getTarget(); + + if ($this->webpGenerate && $webpSupported) { + $path = $filterPathContainer->createWebp($this->webpOptions)->getTarget(); + } + + return $this->cacheManager->resolve($path, $filter, $resolver); + } + + /** + * @param bool $forced Force warm up cache + * + * @return bool Returns true if the cache is warmed up + */ + private function warmUpCacheFilterPathContainer( + FilterPathContainer $filterPathContainer, + string $filter, + ?string $resolver = null, + bool $forced = false + ): bool { + if ($forced || !$this->cacheManager->isStored($filterPathContainer->getTarget(), $filter, $resolver)) { + $binary = $this->dataManager->find($filter, $filterPathContainer->getSource()); + + if (in_array($binary->getMimeType(), ['image/svg', 'image/svg+xml'])) { + $this->cacheManager->store( + $binary, + $filterPathContainer->getTarget(), + $filter, + $resolver + ); + } else { + $this->cacheManager->store( + $this->createFilteredBinary($binary, $filterPathContainer, $filter), + $filterPathContainer->getTarget(), + $filter, + $resolver + ); + } + + return true; + } + + return false; + } + + /** + * @throws NonExistingFilterException + */ + private function createFilteredBinary( + BinaryInterface $binary, + FilterPathContainer $filterPathContainer, + string $filter + ): BinaryInterface { + try { + return $this->filterManager->applyFilter($binary, $filter, $filterPathContainer->getOptions()); + } catch (NonExistingFilterException $e) { + $this->logger->debug(sprintf( + 'Could not locate filter "%s" for path "%s". Message was "%s"', + $filter, + $filterPathContainer->getSource(), + $e->getMessage() + )); + + throw $e; + } + } +} diff --git a/src/ForkCMS/ImagineController.php b/src/ForkCMS/ImagineController.php deleted file mode 100644 index 264d1ce375..0000000000 --- a/src/ForkCMS/ImagineController.php +++ /dev/null @@ -1,75 +0,0 @@ -get('resolver'); - - try { - if (!$this->cacheManager->isStored($path, $filter, $resolver)) { - try { - $binary = $this->dataManager->find($filter, $path); - } catch (NotLoadableException $e) { - if ($defaultImageUrl = $this->dataManager->getDefaultImageUrl($filter)) { - return new RedirectResponse($defaultImageUrl); - } - - throw new NotFoundHttpException('Source image could not be found', $e); - } - - if (in_array($binary->getMimeType(), ['image/svg', 'image/svg+xml'])) { - $this->cacheManager->store( - $binary, - $path, - $filter, - $resolver - ); - } else { - $this->cacheManager->store( - $this->filterManager->applyFilter($binary, $filter), - $path, - $filter, - $resolver - ); - } - } - - return new RedirectResponse($this->cacheManager->resolve($path, $filter, $resolver), $this->redirectResponseCode); - } catch (NonExistingFilterException $e) { - $message = sprintf('Could not locate filter "%s" for path "%s". Message was "%s"', $filter, $path, $e->getMessage()); - - if (null !== $this->logger) { - $this->logger->debug($message); - } - - throw new NotFoundHttpException($message, $e); - } catch (RuntimeException $e) { - throw new \RuntimeException(sprintf('Unable to create image for path "%s" and filter "%s". Message was "%s"', $path, $filter, $e->getMessage()), 0, $e); - } - } -} diff --git a/src/ForkCMS/Utility/Akismet.php b/src/ForkCMS/Utility/Akismet.php new file mode 100755 index 0000000000..14738b08a3 --- /dev/null +++ b/src/ForkCMS/Utility/Akismet.php @@ -0,0 +1,509 @@ + + * @author Jacob van Dam + * @version 2.0.0 + * @copyright Copyright (c) Tijs Verkoyen. All rights reserved. + * @license BSD License + */ +class Akismet +{ + // internal constant to enable/disable debugging + const DEBUG = false; + + // url for the api + const API_URL = 'https://rest.akismet.com'; + + // version of the api + const API_VERSION = '1.1'; + + // current version + const VERSION = '2.0.0'; + + /** + * The key for the API + * @var string + */ + private string $apiKey; + + /** + * The timeout + * @var int + */ + private int $timeOut = 60; + + /** + * The user agent + * @var string + */ + private string $userAgent; + + /** + * The url + * @var string + */ + private string $url; + + /** + * Default constructor + * Creates an instance of the Akismet Class. + * + * @param string $apiKey API key being verified for use with the API. + * @param string $url The front page or home URL of the instance making + * the request. For a blog or wiki this would be the + * front page. Note: Must be a full URI, including + * http://. + */ + public function __construct(string $apiKey, string $url) + { + $this->setApiKey($apiKey); + $this->setUrl($url); + } + + /** + * Make the call + * @param string $url URL to call. + * @param array $parameters The parameters to pass. + * @param bool $authenticate Should we authenticate? + * @return string + * @throws \Exception + */ + private function doCall(string $url, array $parameters = [], bool $authenticate = true) + { + // add key in front of url + if ($authenticate) { + // get api key + $apiKey = $this->getApiKey(); + + // validate apiKey + if ($apiKey == '') { + throw new \Exception('Invalid API-key'); + } + } + + // add url into the parameters + $parameters['blog'] = $this->getUrl(); + + $client = new Client([ + 'base_uri' => self::API_URL . '/' . self::API_VERSION . '/', + 'timeout' => self::getTimeOut(), + ]); + + try { + $response = $client->post($url, [ + 'form_params' => $parameters, + 'headers' => [ + 'User-Agent' => $this->getUserAgent(), + ], + ]); + } catch (ClientException|ServerException $e) { + throw new \Exception($e->getMessage(), $e->getCode()); + } + + return $response->getBody()->getContents(); + } + + /** + * Get the API-key that will be used + * + * @return string + */ + private function getApiKey(): string + { + return $this->apiKey; + } + + /** + * Get the timeout that will be used + * + * @return int + */ + public function getTimeOut(): int + { + return $this->timeOut; + } + + /** + * Get the url of the instance making the request + * + * @return string + */ + public function getUrl(): string + { + return $this->url; + } + + /** + * Get the useragent that will be used. + * Our version will be prepended to yours. It will look like: + * "PHP Akismet/ " + * + * @return string + */ + public function getUserAgent(): string + { + return 'PHP Akismet/' . self::VERSION . ' ' . $this->userAgent; + } + + /** + * Set API key that has to be used + * + * @param string $apiKey API key to use. + */ + private function setApiKey(string $apiKey) + { + $this->apiKey = $apiKey; + } + + /** + * Set the timeout + * After this time the request will stop. You should handle any errors + * triggered by this. + * + * @param int $seconds The timeout in seconds. + */ + public function setTimeOut(int $seconds) + { + $this->timeOut = $seconds; + } + + /** + * Set the url of the instance making the request + * @param string $url The URL making the request. + */ + private function setUrl(string $url) + { + $this->url = $url; + } + + /** + * Set the user-agent for you application + * It will be appended to ours, the result will look like: + * "PHP Akismet/ " + * + * @param string $userAgent The user-agent, it should look like: + * /. + */ + public function setUserAgent(string $userAgent) + { + $this->userAgent = $userAgent; + } + + // api methods + + /** + * Verifies the key + * @return bool if the key is valid it will return true, otherwise false + * will be returned. + * @throws \Exception + */ + public function verifyKey(): bool + { + // possible answers + $aPossibleResponses = ['valid', 'invalid']; + + // build parameters + $aParameters['key'] = $this->getApiKey(); + + // make the call + $response = $this->doCall('verify-key', $aParameters, false); + + // validate response + if (!in_array($response, $aPossibleResponses)) { + throw new \Exception($response, 400); + } + + // valid key + return $response == 'valid'; + } + + /** + * Check if the comment is spam or not + * This is basically the core of everything. This call takes a number of + * arguments and characteristics about the submitted content and then + * returns a thumbs up or thumbs down. + * Almost everything is optional, but performance can drop dramatically if + * you exclude certain elements. + * REMARK: If you are having trouble triggering you can send + * "viagra-test-123" as the author and it will trigger a true response, + * always. + * + * @param string $content The content that was submitted. + * @param string|null $author The name. + * @param string|null $email The email address. + * @param string|null $url The URL. + * @param string|null $permalink The permanent location of the entry + * the comment was submitted to. + * @param string|null $type The type, can be blank, comment, + * trackback, pingback, or a made up + * value like "registration". + * @return bool If the comment is spam true will be + * returned, otherwise false. + * @throws \Exception + */ + public function isSpam( + string $content, + string $author = null, + string $email = null, + string $url = null, + string $permalink = null, + string $type = null + ): bool { + // possible answers + $possibleResponses = ['true', 'false']; + + // get stuff from the $_SERVER-array + if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) { + $ip = $_SERVER['HTTP_X_FORWARDED_FOR']; + } elseif (isset($_SERVER['REMOTE_ADDR'])) { + $ip = $_SERVER['REMOTE_ADDR']; + } else { + $ip = ''; + } + + if (isset($_SERVER['HTTP_USER_AGENT'])) { + $userAgent = (string)$_SERVER['HTTP_USER_AGENT']; + } else { + $userAgent = ''; + } + + if (isset($_SERVER['HTTP_REFERER'])) { + $referrer = (string)$_SERVER['HTTP_REFERER']; + } else { + $referrer = ''; + } + + // build parameters + $parameters = []; + $parameters['user_ip'] = $ip; + $parameters['user_agent'] = $userAgent; + if ($referrer) { + $parameters['referrer'] = $referrer; + } + if ($permalink) { + $parameters['permalink'] = $permalink; + } + if ($type) { + $parameters['comment_type'] = $type; + } + if ($author) { + $parameters['comment_author'] = $author; + } + if ($email) { + $parameters['comment_author_email'] = $email; + } + if ($url) { + $parameters['comment_author_url'] = $url; + } + $parameters['comment_content'] = $content; + + // add all stuff from $_SERVER + foreach ($_SERVER as $key => $value) { + // keys to ignore + $keysToIgnore = [ + 'HTTP_COOKIE', + 'HTTP_X_FORWARDED_FOR', + 'HTTP_X_FORWARDED_HOST', + 'HTTP_MAX_FORWARDS', + 'HTTP_X_FORWARDED_SERVER', + 'REDIRECT_STATUS', + 'SERVER_PORT', + 'PATH', + 'DOCUMENT_ROOT', + 'SERVER_ADMIN', + 'QUERY_STRING', + 'PHP_SELF', + 'argv', + 'argc', + 'SCRIPT_FILENAME', + 'SCRIPT_NAME', + ]; + + // add to parameters if not in ignore list + if (!in_array($key, $keysToIgnore)) { + $parameters[$key] = $value; + } + } + + // make the call + $response = $this->doCall('comment-check', $parameters); + + // validate response + if (!in_array($response, $possibleResponses)) { + throw new \Exception($response, 400); + } + + return $response == 'true'; + } + + /** + * Submit ham to Akismet + * This call is intended for the marking of false positives, things that + * were incorrectly marked as spam. + * @param string $userIp The address of the comment submitter. + * @param string $userAgent The agent information. + * @param string $content The content that was submitted. + * @param string|null $author The name of the author. + * @param string|null $email The email address. + * @param string|null $url The URL. + * @param string|null $permalink The permanent location of the entry + * the comment was submitted to. + * @param string|null $type The type, can be blank, comment, + * trackback, pingback, or a made up + * value like "registration". + * @param string|null $referrer The content of the HTTP_REFERER + * header should be sent here. + * @param array $others Extra data (the variables from + * $_SERVER). + * @return bool If everything went fine true will be + * returned, otherwise an exception + * will be triggered. + * @throws \Exception + */ + public function submitHam( + string $userIp, + string $userAgent, + string $content, + string $author = null, + string $email = null, + string $url = null, + string $permalink = null, + string $type = null, + string $referrer = null, + array $others = [] + ): bool { + // possible answers + $possibleResponses = ['Thanks for making the web a better place.']; + + // build parameters + $parameters = []; + $parameters['user_ip'] = $userIp; + $parameters['user_agent'] = $userAgent; + + if ($referrer) { + $parameters['referrer'] = $referrer; + } + + if ($permalink) { + $parameters['permalink'] = $permalink; + } + + if ($type) { + $parameters['comment_type'] = $type; + } + if ($author) { + $parameters['comment_author'] = $author; + } + if ($email) { + $parameters['comment_author_email'] = $email; + } + if ($url) { + $parameters['comment_author_url'] = $url; + } + $parameters['comment_content'] = $content; + + // add other parameters + foreach ($others as $key => $value) { + $parameters[$key] = $value; + } + + // make the call + $response = $this->doCall('submit-ham', $parameters); + + // validate response + if (in_array($response, $possibleResponses)) { + return true; + } + + // fallback + throw new \Exception($response); + } + + /** + * Submit spam to Akismet + * This call is for submitting comments that weren't marked as spam but + * should have been. + * @param string $userIp The address of the comment submitter. + * @param string $userAgent The agent information. + * @param string $content The content that was submitted. + * @param string|null $author The name of the author. + * @param string|null $email The email address. + * @param string|null $url The URL. + * @param string|null $permalink The permanent location of the entry + * the comment was submitted to. + * @param string|null $type The type, can be blank, comment, + * trackback, pingback, or a made up + * value like "registration". + * @param string|null $referrer The content of the HTTP_REFERER + * header should be sent here. + * @param array $others Extra data (the variables from + * $_SERVER). + * @return bool If everything went fine true will be + * returned, otherwise an exception + * will be triggered. + * @throws \Exception + */ + public function submitSpam( + string $userIp, + string $userAgent, + string $content, + string $author = null, + string $email = null, + string $url = null, + string $permalink = null, + string $type = null, + string $referrer = null, + array $others = [] + ): bool { + // possible answers + $possibleResponses = ['Thanks for making the web a better place.']; + + // build parameters + $parameters['user_ip'] = $userIp; + $parameters['user_agent'] = $userAgent; + if ($referrer) { + $parameters['referrer'] = $referrer; + } + if ($permalink) { + $parameters['permalink'] = $permalink; + } + if ($type) { + $parameters['comment_type'] = $type; + } + if ($author) { + $parameters['comment_author'] = $author; + } + if ($email) { + $parameters['comment_author_email'] = $email; + } + if ($url) { + $parameters['comment_author_url'] = $url; + } + $parameters['comment_content'] = $content; + + // add other parameters + foreach ($others as $key => $value) { + $parameters[$key] = $value; + } + + // make the call + $response = $this->doCall('submit-spam', $parameters); + + // validate response + if (in_array($response, $possibleResponses)) { + return true; + } + + // fallback + throw new \Exception($response); + } +} diff --git a/src/Frontend/Core/Engine/SeoFormTokenParser.php b/src/Frontend/Core/Engine/SeoFormTokenParser.php index c767845fa8..60569c690c 100644 --- a/src/Frontend/Core/Engine/SeoFormTokenParser.php +++ b/src/Frontend/Core/Engine/SeoFormTokenParser.php @@ -17,7 +17,7 @@ public function parse(Token $token): Node $stream = $this->parser->getStream(); if ($stream->getCurrent()->getType() !== Token::BLOCK_END_TYPE) { $error = sprintf("'%s' does not require any arguments.", $this->getTag()); - throw new \Twig_Error_Syntax( + throw new SyntaxError( $error, $token->getLine(), $this->parser->getStream()->getSourceContext()->getPath() diff --git a/src/Frontend/Core/Engine/TemplateModifiers.php b/src/Frontend/Core/Engine/TemplateModifiers.php index 5988b75071..b6adc61253 100644 --- a/src/Frontend/Core/Engine/TemplateModifiers.php +++ b/src/Frontend/Core/Engine/TemplateModifiers.php @@ -11,6 +11,7 @@ use Frontend\Modules\Profiles\Engine\Model as FrontendProfilesModel; use Common\Core\Twig\Extensions\BaseTwigModifiers; use SpoonDate; +use Twig\Error\Error; /** * Contains all Frontend-related custom modifiers @@ -392,7 +393,7 @@ public static function parseWidget(string $module, string $action, string $id = return (string) $content; } catch (RedirectException $redirectException) { - throw new \Twig_Error('redirect fix from template modifier', -1, null, $redirectException); + throw new Error('redirect fix from template modifier', -1, null, $redirectException); } catch (Exception $e) { // if we are debugging, we want to see the exception if (FrontendModel::getContainer()->getParameter('kernel.debug')) { diff --git a/src/Frontend/Core/Engine/TwigTemplate.php b/src/Frontend/Core/Engine/TwigTemplate.php index b033609473..ca857e5975 100644 --- a/src/Frontend/Core/Engine/TwigTemplate.php +++ b/src/Frontend/Core/Engine/TwigTemplate.php @@ -11,8 +11,10 @@ use Symfony\Bridge\Twig\Extension\FormExtension as SymfonyFormExtension; use Symfony\Component\Form\FormRenderer; use Symfony\Component\Templating\TemplateNameParserInterface; -use Twig_Environment; -use Twig_FactoryRuntimeLoader; +use Twig\Environment; +use Twig\Loader\ChainLoader; +use Twig\Loader\FilesystemLoader; +use Twig\RuntimeLoader\FactoryRuntimeLoader; /** * This is a twig template wrapper @@ -26,7 +28,7 @@ class TwigTemplate extends BaseTwigTemplate private $themePath; public function __construct( - Twig_Environment $environment, + Environment $environment, TemplateNameParserInterface $parser, FileLocatorInterface $locator ) { @@ -58,8 +60,8 @@ private function addFrontendPathsToTheTemplateLoader(string $theme): void { $this->themePath = FRONTEND_PATH . '/Themes/' . $theme; $this->environment->setLoader( - new \Twig_Loader_Chain( - [$this->environment->getLoader(), new \Twig_Loader_Filesystem($this->getLoadingFolders())] + new ChainLoader( + [$this->environment->getLoader(), new FilesystemLoader($this->getLoadingFolders())] ) ); } @@ -69,7 +71,7 @@ private function connectSymfonyForms(): void $rendererEngine = new TwigRendererEngine($this->getFormTemplates('FormLayout.html.twig'), $this->environment); $csrfTokenManager = Model::get('security.csrf.token_manager'); $this->environment->addRuntimeLoader( - new Twig_FactoryRuntimeLoader( + new FactoryRuntimeLoader( [ FormRenderer::class => function () use ($rendererEngine, $csrfTokenManager): FormRenderer { return new FormRenderer($rendererEngine, $csrfTokenManager); diff --git a/src/Frontend/Core/Layout/Templates/FormLayout.html.twig b/src/Frontend/Core/Layout/Templates/FormLayout.html.twig index 373f4b1725..41d74a4631 100644 --- a/src/Frontend/Core/Layout/Templates/FormLayout.html.twig +++ b/src/Frontend/Core/Layout/Templates/FormLayout.html.twig @@ -38,7 +38,7 @@ {%- endblock form_errors %} {% block fork_image_widget %} - {% spaceless %} + {% apply spaceless %}
      {{ form_widget(form.file) }} {% if help_text_message %} @@ -57,11 +57,11 @@ {% endif %}
      {% endif %} - {% endspaceless %} + {% endapply %} {% endblock %} {% block fork_file_widget %} - {% spaceless %} + {% apply spaceless %}
      {{ form_widget(form.file) }} {% if help_text_message %} @@ -83,11 +83,11 @@ {% endif %}
      {% endif %} - {% endspaceless %} + {% endapply %} {% endblock %} {% block bootstrap_collection_row %} - {% spaceless %} + {% apply spaceless %} {% if prototype is defined %} {% set prototype_vars = {} %} {% if style is defined %} @@ -131,5 +131,5 @@
      - {% endspaceless %} + {% endapply %} {% endblock bootstrap_collection_row %} diff --git a/src/Frontend/Modules/Profiles/Actions/ChangeEmail.php b/src/Frontend/Modules/Profiles/Actions/ChangeEmail.php index 42cc3f8b15..b42187125c 100644 --- a/src/Frontend/Modules/Profiles/Actions/ChangeEmail.php +++ b/src/Frontend/Modules/Profiles/Actions/ChangeEmail.php @@ -50,8 +50,17 @@ private function getData(): void private function buildForm(): void { $this->form = new FrontendForm('updateEmail', null, null, 'updateEmailForm'); - $this->form->addPassword('password')->makeRequired(); - $this->form->addText('email', $this->profile->getEmail())->makeRequired()->setAttribute('type', 'email'); + $this->form + ->addPassword('password') + ->setAttribute('autocomplete', 'current-password') + ->makeRequired() + ; + $this->form + ->addText('email', $this->profile->getEmail()) + ->setAttribute('type', 'email') + ->setAttribute('autocomplete', 'email') + ->makeRequired() + ; } private function parse(): void diff --git a/src/Frontend/Modules/Profiles/Actions/ChangePassword.php b/src/Frontend/Modules/Profiles/Actions/ChangePassword.php index a3f7d3c604..e7a1e14d36 100644 --- a/src/Frontend/Modules/Profiles/Actions/ChangePassword.php +++ b/src/Frontend/Modules/Profiles/Actions/ChangePassword.php @@ -49,9 +49,23 @@ private function getData(): void private function buildForm(): void { $this->form = new FrontendForm('updatePassword', null, null, 'updatePasswordForm'); - $this->form->addPassword('old_password')->makeRequired(); - $this->form->addPassword('new_password')->makeRequired()->setAttribute('data-role', 'fork-new-password'); - $this->form->addPassword('verify_new_password')->makeRequired()->setAttribute('data-role', 'fork-new-password'); + $this->form + ->addPassword('old_password') + ->setAttribute('autocomplete', 'current-password') + ->makeRequired() + ; + $this->form + ->addPassword('new_password') + ->setAttribute('data-role', 'fork-new-password') + ->setAttribute('autocomplete', 'new-password') + ->makeRequired() + ; + $this->form + ->addPassword('verify_new_password') + ->setAttribute('data-role', 'fork-new-password') + ->setAttribute('autocomplete', 'new-password') + ->makeRequired() + ; $this->form->addCheckbox('show_password')->setAttributes( [ 'data-role' => 'fork-toggle-visible-password', diff --git a/src/Frontend/Modules/Profiles/Actions/ForgotPassword.php b/src/Frontend/Modules/Profiles/Actions/ForgotPassword.php index 0106032cb3..c55c5a607f 100644 --- a/src/Frontend/Modules/Profiles/Actions/ForgotPassword.php +++ b/src/Frontend/Modules/Profiles/Actions/ForgotPassword.php @@ -36,7 +36,12 @@ public function execute(): void private function buildForm(): void { $this->form = new FrontendForm('forgotPassword', null, null, 'forgotPasswordForm'); - $this->form->addText('email')->makeRequired()->setAttribute('type', 'email'); + $this->form + ->addText('email') + ->setAttribute('type', 'email') + ->setAttribute('autocomplete', 'email') + ->makeRequired() + ; } private function parse(): void diff --git a/src/Frontend/Modules/Profiles/Actions/Login.php b/src/Frontend/Modules/Profiles/Actions/Login.php index 2e207fb779..db823d5931 100644 --- a/src/Frontend/Modules/Profiles/Actions/Login.php +++ b/src/Frontend/Modules/Profiles/Actions/Login.php @@ -40,8 +40,17 @@ private function buildForm(): void $action .= '?queryString=' . $this->getRequest()->query->get('queryString'); } $this->form = new FrontendForm('login', $action, 'post', 'loginForm'); - $this->form->addText('email')->makeRequired()->setAttribute('type', 'email'); - $this->form->addPassword('password')->makeRequired(); + $this->form + ->addText('email') + ->setAttribute('type', 'email') + ->setAttribute('autocomplete', 'email') + ->makeRequired() + ; + $this->form + ->addPassword('password') + ->setAttribute('autocomplete', 'current-password') + ->makeRequired() + ; $this->form->addCheckbox('remember', true)->setAttribute('class', 'custom-control-input'); } diff --git a/src/Frontend/Modules/Profiles/Actions/Register.php b/src/Frontend/Modules/Profiles/Actions/Register.php index 0569e46ee9..6b37e3c867 100644 --- a/src/Frontend/Modules/Profiles/Actions/Register.php +++ b/src/Frontend/Modules/Profiles/Actions/Register.php @@ -43,9 +43,23 @@ private function buildForm(): void { $this->form = new FrontendForm('register', null, null, 'registerForm'); - $this->form->addText('display_name')->makeRequired(); - $this->form->addText('email')->makeRequired()->setAttribute('type', 'email'); - $this->form->addPassword('password')->makeRequired()->setAttribute('data-role', 'fork-new-password'); + $this->form + ->addText('display_name') + ->setAttribute('autocomplete', 'username') + ->makeRequired() + ; + $this->form + ->addText('email') + ->setAttribute('type', 'email') + ->setAttribute('autocomplete', 'email') + ->makeRequired() + ; + $this->form + ->addPassword('password') + ->setAttribute('data-role', 'fork-new-password') + ->setAttribute('autocomplete', 'new-password') + ->makeRequired() + ; $this->form->addCheckbox('show_password')->setAttributes( [ 'data-role' => 'fork-toggle-visible-password', diff --git a/src/Frontend/Modules/Profiles/Actions/ResendActivation.php b/src/Frontend/Modules/Profiles/Actions/ResendActivation.php index d15c9f72c6..7dc8b998c2 100644 --- a/src/Frontend/Modules/Profiles/Actions/ResendActivation.php +++ b/src/Frontend/Modules/Profiles/Actions/ResendActivation.php @@ -41,7 +41,12 @@ public function execute(): void private function buildForm(): void { $this->form = new FrontendForm('resendActivation', null, null, 'resendActivation'); - $this->form->addText('email')->makeRequired()->setAttribute('type', 'email'); + $this->form + ->addText('email') + ->setAttribute('type', 'email') + ->setAttribute('autocomplete', 'email') + ->makeRequired() + ; } private function parse(): void diff --git a/src/Frontend/Modules/Profiles/Actions/ResetPassword.php b/src/Frontend/Modules/Profiles/Actions/ResetPassword.php index ea312e2a4c..197631e9b5 100644 --- a/src/Frontend/Modules/Profiles/Actions/ResetPassword.php +++ b/src/Frontend/Modules/Profiles/Actions/ResetPassword.php @@ -70,7 +70,12 @@ private function buildForm(): void { $this->form = new FrontendForm('resetPassword', null, null, 'resetPasswordForm'); - $this->form->addPassword('password')->makeRequired()->setAttribute('data-role', 'fork-new-password'); + $this->form + ->addPassword('password') + ->setAttribute('data-role', 'fork-new-password') + ->setAttribute('autocomplete', 'new-password') + ->makeRequired() + ; $this->form->addCheckbox('show_password')->setAttributes( [ 'data-role' => 'fork-toggle-visible-password', diff --git a/src/Frontend/Modules/Profiles/Actions/Settings.php b/src/Frontend/Modules/Profiles/Actions/Settings.php index 0b1563f224..0aa6957f4e 100644 --- a/src/Frontend/Modules/Profiles/Actions/Settings.php +++ b/src/Frontend/Modules/Profiles/Actions/Settings.php @@ -72,29 +72,62 @@ private function buildForm(): void { $this->form = new FrontendForm('updateSettings', null, null, 'updateSettingsForm'); - $this->form->addText('display_name', $this->profile->getDisplayName())->makeRequired(); + $this->form + ->addText('display_name', $this->profile->getDisplayName()) + ->setAttribute('autocomplete', 'username') + ->makeRequired() + ; if (!$this->displayNameCanStillBeChanged()) { $this->form->getField('display_name')->setAttribute('disabled', 'disabled'); } - $this->form->addText('first_name', $this->profile->getSetting('first_name')); - $this->form->addText('last_name', $this->profile->getSetting('last_name')); + $this->form + ->addText('first_name', $this->profile->getSetting('first_name')) + ->setAttribute('autocomplete', 'given-name') + ; + $this->form + ->addText('last_name', $this->profile->getSetting('last_name')) + ->setAttribute('autocomplete', 'family-name') + ; $this->form->addText('email', $this->profile->getEmail())->setAttribute('disabled', 'disabled'); - $this->form->addText('city', $this->profile->getSetting('city')); - $this->form->addDropdown( - 'country', - Intl::getRegionBundle()->getCountryNames(LANGUAGE), - $this->profile->getSetting('country') - )->setDefaultElement(''); - $this->form->addDropdown( - 'gender', - $this->getGenderOptions(), - $this->profile->getSetting('gender') - )->setDefaultElement(''); + $this->form + ->addText('city', $this->profile->getSetting('city')) + ->setAttribute('autocomplete', 'address-level2') + ; + $this->form + ->addDropdown( + 'country', + Intl::getRegionBundle()->getCountryNames(LANGUAGE), + $this->profile->getSetting('country') + ) + ->setDefaultElement('') + ->setAttribute('autocomplete', 'country-name') + ; + $this->form + ->addDropdown( + 'gender', + $this->getGenderOptions(), + $this->profile->getSetting('gender') + ) + ->setDefaultElement('') + ->setAttribute('autocomplete', 'sex') + ; ['days' => $days, 'months' => $months, 'years' => $years] = $this->getBirthDateOptions(); ['year' => $birthYear, 'month' => $birthMonth, 'day' => $birthDay] = $this->getBirthDate(); - $this->form->addDropdown('day', array_combine($days, $days), $birthDay)->setDefaultElement(''); - $this->form->addDropdown('month', $months, $birthMonth)->setDefaultElement(''); - $this->form->addDropdown('year', array_combine($years, $years), (int) $birthYear)->setDefaultElement(''); + $this->form + ->addDropdown('day', array_combine($days, $days), $birthDay) + ->setAttribute('autocomplete', 'bday-day') + ->setDefaultElement('') + ; + $this->form + ->addDropdown('month', $months, $birthMonth) + ->setAttribute('autocomplete', 'bday-month') + ->setDefaultElement('') + ; + $this->form + ->addDropdown('year', array_combine($years, $years), (int) $birthYear) + ->setAttribute('autocomplete', 'bday-year') + ->setDefaultElement('') + ; $this->form->addImage('avatar'); $this->form->addTextarea('about', $this->profile->getSetting('about')); } diff --git a/src/Frontend/Modules/Profiles/Widgets/LoginBox.php b/src/Frontend/Modules/Profiles/Widgets/LoginBox.php index f23216c94e..210e395cd3 100644 --- a/src/Frontend/Modules/Profiles/Widgets/LoginBox.php +++ b/src/Frontend/Modules/Profiles/Widgets/LoginBox.php @@ -36,8 +36,17 @@ private function buildForm(): void 'login', FrontendNavigation::getUrlForBlock('Profiles', 'Login') . '?queryString=' . $this->url->getQueryString() ); - $this->form->addText('email')->makeRequired()->setAttribute('type', 'email'); - $this->form->addPassword('password')->makeRequired(); + $this->form + ->addText('email') + ->setAttribute('type', 'email') + ->setAttribute('autocomplete', 'email') + ->makeRequired() + ; + $this->form + ->addPassword('password') + ->setAttribute('autocomplete', 'current-password') + ->makeRequired() + ; $this->form->addCheckbox('remember', true); // parse the form diff --git a/src/Frontend/Modules/Search/Ajax/Livesuggest.php b/src/Frontend/Modules/Search/Ajax/Livesuggest.php index f50522343f..c7626da8f6 100644 --- a/src/Frontend/Modules/Search/Ajax/Livesuggest.php +++ b/src/Frontend/Modules/Search/Ajax/Livesuggest.php @@ -65,7 +65,7 @@ private function display(): void $this->output( Response::HTTP_OK, $this->template->render( - Theme::getPath(FRONTEND_MODULES_PATH . '/Search/Layout/Templates/Results.html.twig'), + '/Search/Layout/Templates/Results.html.twig', $this->template->getAssignedVariables() ) );