Merge pull request #262 from dotkernel/develop

Develop

Author: arhimede

composer.json

@@ -32,7 +32,9 @@
         "doctrine/data-fixtures": "^2.2",
         "doctrine/doctrine-fixtures-bundle": "^4.3",
         "dotkernel/dot-cache": "^4.0",
+        "dotkernel/dot-dependency-injection": "^1.4",
         "dotkernel/dot-errorhandler": "^5.0.0",
+        "dotkernel/dot-mail": "^5.4",
         "dotkernel/dot-response-header": "^3.6",
         "laminas/laminas-component-installer": "^3.5.0",
         "laminas/laminas-config-aggregator": "^1.17.0",

config/autoload/local.php.dist

@@ -83,13 +83,12 @@ return [
     'sitemap' => [
         'path' => realpath(__DIR__ . '/../../public/sitemap.xml'),
     ],
-    // `dotkernel-packages-oss-lifecycle` is intentionally absent: it has a dedicated handler
-    // and is routed in Light\App\RoutesDelegator. Re-adding it here registers the path twice.
+    // `dotkernel-packages-oss-lifecycle` and `contact` are intentionally absent: they have dedicated
+    // handlers and are routed in Light\App\RoutesDelegator. Re-adding them here registers the path twice.
     'routes' => [
         'page' => [
             // Linked from the footer on every page, so this route must stay registered.
             'about'        => 'about',
-            'contact'      => 'contact',
             'api'          => 'api',
             'admin'        => 'admin',
             'queue'        => 'queue',

config/autoload/mail.global.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+$contactEmail = 'example@mail.com';
+
+return [
+    'dot_mail' => [
+        'contact' => [
+            'message_options' => [
+                'from'        => $contactEmail,
+                'from_name'   => 'Dotkernel',
+                'to'          => [$contactEmail],
+                'subject'     => 'New contact form submission',
+                'body'        => [
+                    'content' => '',
+                    'charset' => 'utf-8',
+                ],
+                'attachments' => [
+                    'files' => [],
+                    'dir'   => [
+                        'iterate'   => false,
+                        'path'      => 'data/mail/attachments',
+                        'recursive' => false,
+                    ],
+                ],
+            ],
+            'transport'       => 'sendmail',
+        ],
+        'log'     => [
+            'sent' => getcwd() . '/log/mail-sent.log',
+        ],
+    ],
+    'twig'     => [
+        'globals' => [
+            'contact_email' => $contactEmail,
+        ],
+    ],
+];

config/config.php

@@ -25,8 +25,10 @@
     \Mezzio\Twig\ConfigProvider::class,
 
     // Dotkernel packages
+    \Dot\DependencyInjection\ConfigProvider::class,
     \Dot\ErrorHandler\ConfigProvider::class,
     \Dot\Log\ConfigProvider::class,
+    \Dot\Mail\ConfigProvider::class,
     \Dot\Cache\ConfigProvider::class,
     \Dot\ResponseHeader\ConfigProvider::class,
 

public/.htaccess

@@ -6,6 +6,7 @@ RedirectMatch 404 ^/(wp-login\.php|wp-admin|wp-content|wp-includes|xmlrpc\.php)
 # Block known spam/probe queries on any URL -> 404
 RewriteCond %{REQUEST_URI} ^/
 RewriteCond %{QUERY_STRING} ^post_type=wfacp_checkout$ [OR]
+RewriteCond %{QUERY_STRING} (^|&)feed= [OR]
 RewriteCond %{QUERY_STRING} rest_route
 RewriteRule .* - [R=404,L]