From 77f09055c93843a5e57a4b0dfeb281e8d27c3771 Mon Sep 17 00:00:00 2001
From: Brandon Shipley <bshipley@hipowered.dev>
Date: Fri, 10 Jan 2025 01:34:02 -0800
Subject: [PATCH] only load captcha helper if requiring captcha, use our own
 constant for mysql datetime

---
 src/CakeContactUsPlugin.php                       | 2 +-
 src/Controller/Component/ContactUsComponent.php   | 3 ++-
 src/Model/Table/ContactUsFormSubmissionsTable.php | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/CakeContactUsPlugin.php b/src/CakeContactUsPlugin.php
index 65d719a..13a7214 100644
--- a/src/CakeContactUsPlugin.php
+++ b/src/CakeContactUsPlugin.php
@@ -17,7 +17,7 @@ class CakeContactUsPlugin extends BasePlugin
 {
     public const EVENT_BEFORE_CONTACT_US_FORM_SAVED = 'ContactUs.Global.beforeRegister';
     public const EVENT_AFTER_CONTACT_US_FORM_SAVED = 'ContactUs.Global.afterRegister';
-
+    public const CAKE_CONTACT_US_MYSQL_DATETIME = 'Y-m-d H:i:s';
     /**
      * Load all the plugin configuration and bootstrap logic.
      *
diff --git a/src/Controller/Component/ContactUsComponent.php b/src/Controller/Component/ContactUsComponent.php
index a74f392..d2353a9 100644
--- a/src/Controller/Component/ContactUsComponent.php
+++ b/src/Controller/Component/ContactUsComponent.php
@@ -57,7 +57,8 @@ class ContactUsComponent extends Component
         $this->setConfig('requireEmail', Configure::readOrFail('ContactUs.fields.email'));
         $this->setConfig('requireCaptcha', $requireCaptcha);
         if ($requireCaptcha) {
-            $this->_registry->load('Captcha.Captcha');
+//            $this->_registry->load('Captcha.Captcha');
+            $this->getController()->viewBuilder()->addHelpers(['Captcha.Captcha']);
         }
     }
 
diff --git a/src/Model/Table/ContactUsFormSubmissionsTable.php b/src/Model/Table/ContactUsFormSubmissionsTable.php
index bf4ad1d..36c3712 100644
--- a/src/Model/Table/ContactUsFormSubmissionsTable.php
+++ b/src/Model/Table/ContactUsFormSubmissionsTable.php
@@ -15,6 +15,7 @@ use Cake\ORM\Query\SelectQuery;
 use Cake\ORM\RulesChecker;
 use Cake\ORM\Table;
 use Cake\Validation\Validator;
+use CakeContactUs\CakeContactUsPlugin;
 use CakeContactUs\Model\Entity\ContactUsFormSubmission;
 use Closure;
 use Psr\SimpleCache\CacheInterface;
@@ -126,7 +127,7 @@ class ContactUsFormSubmissionsTable extends Table
         if (!$contactUsFormSubmission->isNew()) {
             return;
         }
-        $now = DateTime::now()->format(DATETIME_MYSQL);
+        $now = DateTime::now()->format(CakeContactUsPlugin::CAKE_CONTACT_US_MYSQL_DATETIME);
         $updateData = [];
         if (Configure::read('ContactUs.email.confirmation.enabled') && isset($contactUsFormSubmission->email)) {
             $mailer = Configure::read('ContactUs.email.mailerClass', 'CakeContactUs.ContactUsFormSubmissions');