Changeset 3358498

Timestamp:

09/09/2025 10:39:24 AM (7 months ago)

Author:

costasovo

Message:

Release 5.14.2

Location:

mailpoet/trunk

Files:

• generated/FreeCachedContainer.php (modified) (2 diffs)
• lang/mailpoet.pot (modified) (3 diffs)
• lib/AdminPages/Pages/DynamicSegments.php (modified) (1 diff)
• lib/Analytics/Reporter.php (modified) (1 diff)
• lib/Captcha/CaptchaFormRenderer.php (modified) (6 diffs)
• lib/Cron/CronWorkerScheduler.php (modified) (1 diff)
• lib/Cron/Daemon.php (modified) (1 diff)
• lib/Cron/Workers/LogCleanup.php (added)
• lib/Cron/Workers/WorkersFactory.php (modified) (2 diffs)
• lib/DI/ContainerConfigurator.php (modified) (1 diff)
• lib/EmailEditor/Integrations/MailPoet/Blocks/BlockTypes/PoweredByMailpoet.php (modified) (1 diff)
• lib/Form/AssetsController.php (modified) (1 diff)
• lib/Form/Block/Image.php (modified) (2 diffs)
• lib/Logging/LogHandler.php (modified) (3 diffs)
• lib/Logging/LogRepository.php (modified) (2 diffs)
• lib/Migrations/Db/Migration_20250903_151331_Db.php (added)
• mailpoet.php (modified) (2 diffs)
• readme.txt (modified) (2 diffs)
• vendor/composer/installed.php (modified) (2 diffs)

mailpoet/trunk/generated/FreeCachedContainer.php

@@ -265 +265 @@
             'MailPoet\\Cron\\Workers\\KeyCheck\\PremiumKeyCheck' => 'getPremiumKeyCheckService',
             'MailPoet\\Cron\\Workers\\KeyCheck\\SendingServiceKeyCheck' => 'getSendingServiceKeyCheckService',
+            'MailPoet\\Cron\\Workers\\LogCleanup' => 'getLogCleanupService',
             'MailPoet\\Cron\\Workers\\Mixpanel' => 'getMixpanelService',
             'MailPoet\\Cron\\Workers\\NewsletterTemplateThumbnails' => 'getNewsletterTemplateThumbnailsService',
@@ -3152 +3153 @@
 
     /**
+     * Gets the public 'MailPoet\Cron\Workers\LogCleanup' shared autowired service.
+     *
+     * @return \MailPoet\Cron\Workers\LogCleanup
+     */
+    protected function getLogCleanupService()
+    {
+        return $this->services['MailPoet\\Cron\\Workers\\LogCleanup'] = new \MailPoet\Cron\Workers\LogCleanup(($this->services['MailPoet\\Logging\\LogRepository'] ?? $this->getLogRepositoryService()));
+    }
+
+    /**
      * Gets the public 'MailPoet\Cron\Workers\Mixpanel' shared autowired service.
      *

mailpoet/trunk/lang/mailpoet.pot

@@ -3 +3 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: MailPoet 5.14.1\n"
+"Project-Id-Version: MailPoet 5.14.2\n"
 "Report-Msgid-Bugs-To: http://support.mailpoet.com/\n"
 "Last-Translator: MailPoet i18n (https://www.transifex.com/organization/wysija)\n"
@@ -10 +10 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2025-09-01T17:39:39+00:00\n"
+"POT-Creation-Date: 2025-09-09T07:26:19+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
@@ -8780 +8780 @@
 msgstr ""
 
-#: lib/Captcha/CaptchaFormRenderer.php:112
+#: lib/Captcha/CaptchaFormRenderer.php:113
 msgid "Subscribe"
 msgstr ""
 
-#: lib/Captcha/CaptchaFormRenderer.php:157
+#: lib/Captcha/CaptchaFormRenderer.php:159
 msgid "Type in the characters you see in the picture above:"
 msgstr ""
 
-#: lib/Captcha/CaptchaFormRenderer.php:197
+#: lib/Captcha/CaptchaFormRenderer.php:199
 msgid "CAPTCHA"
 msgstr ""
 
-#: lib/Captcha/CaptchaFormRenderer.php:199
+#: lib/Captcha/CaptchaFormRenderer.php:201
 msgid "Reload CAPTCHA"
 msgstr ""
 
-#: lib/Captcha/CaptchaFormRenderer.php:200
+#: lib/Captcha/CaptchaFormRenderer.php:202
 msgid "Play CAPTCHA"
 msgstr ""
 
-#: lib/Captcha/CaptchaFormRenderer.php:227
+#: lib/Captcha/CaptchaFormRenderer.php:229
 msgid "The characters you entered did not match the CAPTCHA image. Please try again with this new image."
 msgstr ""

mailpoet/trunk/lib/AdminPages/Pages/DynamicSegments.php

@@ -147 +147 @@
         );
 
-        if (!isset($attributeTerms['errors'])) {
+        if ((!$attributeTerms instanceof \WP_Error) && !isset($attributeTerms['errors'])) {
           $data['product_attributes'][$taxonomy] = [ // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
             'id' => $attribute->attribute_id, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps

mailpoet/trunk/lib/Analytics/Reporter.php

@@ -189 +189 @@
       'Open and click tracking' => $this->trackingConfig->isEmailTrackingEnabled(),
       'Tracking level' => $this->settings->get('tracking.level', TrackingConfig::LEVEL_FULL),
+      'Logging level' => $this->settings->get('logging', 'errors'),
       'Premium key valid' => $this->servicesChecker->isPremiumKeyValid(),
       'New subscriber notifications' => NewSubscriberNotificationMailer::isDisabled($this->settings->get(NewSubscriberNotificationMailer::SETTINGS_KEY)),

mailpoet/trunk/lib/Captcha/CaptchaFormRenderer.php

@@ -67 +67 @@
     }
 
-    if ($data['referrer_form'] == CaptchaUrlFactory::REFERER_MP_FORM) {
+    $ref = $data['referrer_form'] ?? null;
+    if ($ref === CaptchaUrlFactory::REFERER_MP_FORM) {
       return $this->renderFormInSubscriptionForm($sessionId);
-    } elseif ($data['referrer_form'] == CaptchaUrlFactory::REFERER_WP_FORM) {
+    } elseif ($ref === CaptchaUrlFactory::REFERER_WP_FORM) {
       return $this->renderFormInWPRegisterForm($data, 'wp-submit');
-    } elseif ($data['referrer_form'] == CaptchaUrlFactory::REFERER_WC_FORM) {
+    } elseif ($ref === CaptchaUrlFactory::REFERER_WC_FORM) {
       return $this->renderFormInWPRegisterForm($data, 'register');
     }
@@ -106 +107 @@
     $hiddenFields .= '<input type="hidden" name="endpoint" value="subscribers" />';
     $hiddenFields .= '<input type="hidden" name="mailpoet_method" value="subscribe" />';
-    $hiddenFields .= '<input type="hidden" name="mailpoet_redirect" value="' . $this->wp->escAttr($redirectUrl) . '" />';
+    $hiddenFields .= '<input type="hidden" name="mailpoet_redirect" value="' . $this->wp->escUrl($redirectUrl) . '" />';
 
     $actionUrl = admin_url('admin-post.php?action=mailpoet_subscription_form');
@@ -135 +136 @@
     unset($data['referrer_form']);
     foreach ($data as $key => $value) {
-      $hiddenFields .= '<input type="hidden" name="' . $key . '" value="' . $this->wp->escAttr($value) . '" />';
+      if (!is_scalar($value)) continue;
+      $hiddenFields .= '<input type="hidden" name="' . $this->wp->escAttr($key) . '" value="' . $this->wp->escAttr($value) . '" />';
     }
 
@@ -186 +188 @@
     }
 
-    $formHtml = '<form method="POST" action="' . $this->wp->escAttr($actionUrl) . '" class="' . $this->wp->escAttr($classes) . '" id="mailpoet_captcha_form" novalidate>';
+    $formHtml = '<form method="POST" action="' . $this->wp->escUrl($actionUrl) . '" class="' . $this->wp->escAttr($classes) . '" id="mailpoet_captcha_form" novalidate>';
     $formHtml .= $hiddenFields;
 
@@ -198 +200 @@
     $formHtml .= '<div class="mailpoet_form_hide_on_success">';
     $formHtml .= '<p class="mailpoet_paragraph">';
-    $formHtml .= '<img class="mailpoet_captcha" src="' . $this->wp->escAttr($captchaUrl) . '" width="' . $this->wp->escAttr($width) . '" height="' . $this->wp->escAttr($height) . '" title="' . esc_attr__('CAPTCHA', 'mailpoet') . '" />';
+    $formHtml .= '<img class="mailpoet_captcha" src="' . $this->wp->escUrl($captchaUrl) . '" width="' . $this->wp->escAttr($width) . '" height="' . $this->wp->escAttr($height) . '" title="' . esc_attr__('CAPTCHA', 'mailpoet') . '" />';
     $formHtml .= '</p>';
-    $formHtml .= '<button type="button" class="mailpoet_icon_button mailpoet_captcha_update" title="' . esc_attr(__('Reload CAPTCHA', 'mailpoet')) . '"><img src="' . $this->wp->escAttr($reloadIcon) . '" alt="" /></button>';
-    $formHtml .= '<button type="button" class="mailpoet_icon_button mailpoet_captcha_audio" title="' . esc_attr(__('Play CAPTCHA', 'mailpoet')) . '"><img src="' . $this->wp->escAttr($playIcon) . '" alt="" /></button>';
+    $formHtml .= '<button type="button" class="mailpoet_icon_button mailpoet_captcha_update" title="' . esc_attr(__('Reload CAPTCHA', 'mailpoet')) . '"><img src="' . $this->wp->escUrl($reloadIcon) . '" alt="" /></button>';
+    $formHtml .= '<button type="button" class="mailpoet_icon_button mailpoet_captcha_audio" title="' . esc_attr(__('Play CAPTCHA', 'mailpoet')) . '"><img src="' . $this->wp->escUrl($playIcon) . '" alt="" /></button>';
     $formHtml .= '<audio class="mailpoet_captcha_player">';
-    $formHtml .= '<source src="' . $this->wp->escAttr($mp3CaptchaUrl) . '" type="audio/mpeg">';
+    $formHtml .= '<source src="' . $this->wp->escUrl($mp3CaptchaUrl) . '" type="audio/mpeg">';
     $formHtml .= '</audio>';
 
@@ -230 +232 @@
     $errorMessage = __('The characters you entered did not match the CAPTCHA image. Please try again with this new image.', 'mailpoet');
 
+    $success = isset($settings['success_message']) ? (string)$settings['success_message'] : '';
+
     $formHtml = '<div class="mailpoet_message" role="alert" aria-live="assertive">';
-    $formHtml .= '<p class="mailpoet_validate_success" ' . ($showSuccessMessage ? '' : ' style="display:none;"') . '>' . $this->wp->escHtml($settings['success_message']) . '</p>';
+    $formHtml .= '<p class="mailpoet_validate_success" ' . ($showSuccessMessage ? '' : ' style="display:none;"') . '>' . $this->wp->escHtml($success) . '</p>';
     $formHtml .= '<p class="mailpoet_validate_error" ' . ($showErrorMessage ? '' : ' style="display:none;"') . '>' . $this->wp->escHtml($errorMessage) . '</p>';
     $formHtml .= '</div>';

mailpoet/trunk/lib/Cron/CronWorkerScheduler.php

@@ -42 +42 @@
       return $alreadyScheduled;
     }
+    return $this->createAndPersistTask($taskType, $nextRunDate, $priority);
+  }
+
+  public function scheduleMultiple($taskType, $nextRunDate, $priority = ScheduledTaskEntity::PRIORITY_LOW): ScheduledTaskEntity {
+    // Allow multiple tasks of the same type with different run dates
+    return $this->createAndPersistTask($taskType, $nextRunDate, $priority);
+  }
+
+  private function createAndPersistTask($taskType, $nextRunDate, $priority): ScheduledTaskEntity {
     $task = new ScheduledTaskEntity();
     $task->setType($taskType);

mailpoet/trunk/lib/Cron/Daemon.php

@@ -100 +100 @@
     yield $this->workersFactory->createBounceWorker();
     yield $this->workersFactory->createExportFilesCleanupWorker();
+    yield $this->workersFactory->createLogCleanupWorker();
     yield $this->workersFactory->createSubscribersEmailCountsWorker();
     yield $this->workersFactory->createInactiveSubscribersWorker();

mailpoet/trunk/lib/Cron/Workers/WorkersFactory.php

@@ -36 +36 @@
     Mixpanel::TASK_TYPE,
     AbandonedCartWorker::TASK_TYPE,
+    LogCleanup::TASK_TYPE,
   ];
 
@@ -90 +91 @@
   public function createExportFilesCleanupWorker() {
     return $this->container->get(ExportFilesCleanup::class);
+  }
+
+  /** @return LogCleanup */
+  public function createLogCleanupWorker() {
+    return $this->container->get(LogCleanup::class);
   }
 

mailpoet/trunk/lib/DI/ContainerConfigurator.php

@@ -326 +326 @@
     $container->autowire(\MailPoet\Cron\Workers\WooCommerceSync::class)->setPublic(true);
     $container->autowire(\MailPoet\Cron\Workers\ExportFilesCleanup::class)->setPublic(true);
+    $container->autowire(\MailPoet\Cron\Workers\LogCleanup::class)->setPublic(true);
     $container->autowire(\MailPoet\Cron\Workers\SubscribersEmailCount::class)->setPublic(true);
     $container->autowire(\MailPoet\Cron\Workers\InactiveSubscribers::class)->setPublic(true);

mailpoet/trunk/lib/EmailEditor/Integrations/MailPoet/Blocks/BlockTypes/PoweredByMailpoet.php

@@ -33 +33 @@
       '<div class="%1$s" style="text-align:center">%2$s</div>',
       esc_attr('wp-block-' . $this->blockName),
-      '<img src="' . esc_attr($logoUrl) . '" alt="Powered by MailPoet" width="100px" />'
+      '<img src="' . esc_url($logoUrl) . '" alt="Powered by MailPoet" width="100px" />'
     ), $block->parsed_block['email_attrs'] ?? []); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
   }

mailpoet/trunk/lib/Form/AssetsController.php

@@ -42 +42 @@
     $captcha = $this->settings->get('captcha');
     if (!empty($captcha['type']) && CaptchaConstants::isReCaptcha($captcha['type'])) {
-      echo '<script src="' . esc_attr(self::RECAPTCHA_API_URL) . '" async defer></script>';
+      echo '<script src="' . esc_url(self::RECAPTCHA_API_URL) . '" async defer></script>';
     }
 

mailpoet/trunk/lib/Form/Block/Image.php

@@ -34 +34 @@
     $attributes = [];
     $styles = [];
-    $attributes[] = 'src="' . $this->wp->escAttr($params['url']) . '"';
+    $attributes[] = 'src="' . $this->wp->escUrl($params['url']) . '"';
     $attributes[] = $params['alt'] ? 'alt="' . $this->wp->escAttr($params['alt']) . '"' : 'alt';
     if ($params['title']) {
@@ -78 +78 @@
 
   private function wrapToLink(array $params, string $img): string {
-    $attributes = ['href="' . $this->wp->escAttr($params['href']) . '"'];
+    $attributes = ['href="' . $this->wp->escUrl($params['href']) . '"'];
     if ($params['link_class']) {
       $attributes[] = 'class="' . $this->wp->escAttr($params['link_class']) . '"';

mailpoet/trunk/lib/Logging/LogHandler.php

@@ -10 +10 @@
 
 class LogHandler extends AbstractProcessingHandler {
-  /**
-   * Logs older than this many days will be deleted
-   */
-  const DAYS_TO_KEEP_LOGS = 30;
-
-  /**
-   * How many records to delete on one run of purge routine
-   */
-  const PURGE_LIMIT = 1000;
-
-  /**
-   * Percentage value, what is the probability of running purge routine
-   * @var int
-   */
-  const LOG_PURGE_PROBABILITY = 5;
-
-  /** @var callable|null */
-  private $randFunction;
 
   /** @var LogRepository */
@@ -35 +17 @@
     LogRepository $logRepository,
     $level = \MailPoetVendor\Monolog\Logger::DEBUG,
-    $bubble = \true,
-    $randFunction = null
+    $bubble = \true
   ) {
     parent::__construct($level, $bubble);
-    $this->randFunction = $randFunction;
     $this->logRepository = $logRepository;
   }
@@ -53 +33 @@
     $entity->setContext($record['context']);
     $this->logRepository->saveLog($entity);
-
-    if ($this->getRandom() <= self::LOG_PURGE_PROBABILITY) {
-      $this->purgeOldLogs();
-    }
-  }
-
-  private function getRandom() {
-    if ($this->randFunction) {
-      return call_user_func($this->randFunction, 0, 100);
-    }
-    return rand(0, 100);
-  }
-
-  private function purgeOldLogs() {
-    $this->logRepository->purgeOldLogs(self::DAYS_TO_KEEP_LOGS, self::PURGE_LIMIT);
   }
 }

mailpoet/trunk/lib/Logging/LogRepository.php

@@ -94 +94 @@
   }
 
-  public function purgeOldLogs(int $daysToKeepLogs, int $limit = 1000) {
+  public function purgeOldLogs(int $daysToKeepLogs, int $limit = 1000): int {
     $logsTable = $this->entityManager->getClassMetadata(LogEntity::class)->getTableName();
-    $this->entityManager->getConnection()->executeStatement(
+    $result = $this->entityManager->getConnection()->executeStatement(
       "
-      DELETE FROM $logsTable
+      DELETE FROM `{$logsTable}`
       WHERE `created_at` < :date
-      ORDER BY `id` ASC LIMIT :limit
+      ORDER BY `created_at` ASC, `id` ASC
+      LIMIT :limit
     ",
       [
@@ -111 +112 @@
       ]
     );
+
+    return (int)$result;
   }
 

mailpoet/trunk/mailpoet.php

@@ -6 +6 @@
 /*
  * Plugin Name: MailPoet
- * Version: 5.14.1
+ * Version: 5.14.2
  * Plugin URI: https://www.mailpoet.com
  * Description: Create and send newsletters, post notifications and welcome emails from your WordPress.
@@ -24 +24 @@
 
 $mailpoetPlugin = [
-  'version' => '5.14.1',
+  'version' => '5.14.2',
   'filename' => __FILE__,
   'path' => dirname(__FILE__),

mailpoet/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 6.7
 Tested up to: 6.8
-Stable tag: 5.14.1
+Stable tag: 5.14.2
 Requires PHP: 7.4
 License: GPLv3
@@ -228 +228 @@
 == Changelog ==
 
-= 5.14.1 - 2025-09-01 =
-* Improved: Use specific version when downloading premium plugin.
+= 5.14.2 - 2025-09-09 =
+* Improved: Optimized log cleanup by moving it to a dedicated recurring task.;
+* Improved: Enhanced CAPTCHA form HTML output processing;
+* Fixed: Invalid product attributes may break the Segments page.
 
 [See the changelog for all versions.](https://github.com/mailpoet/mailpoet/blob/trunk/mailpoet/changelog.txt)

mailpoet/trunk/vendor/composer/installed.php

@@ -6 +6 @@
  'pretty_version' => 'dev-trunk',
  'version' => 'dev-trunk',
- 'reference' => 'aedf8f4c5c21ce058e3fe283df12b423a801acd7',
+ 'reference' => '83548afce56cbf857c32a5dfded296868e43afa2',
  'type' => 'library',
  'install_path' => __DIR__ . '/../../',
@@ -16 +16 @@
  'pretty_version' => 'dev-trunk',
  'version' => 'dev-trunk',
- 'reference' => 'aedf8f4c5c21ce058e3fe283df12b423a801acd7',
+ 'reference' => '83548afce56cbf857c32a5dfded296868e43afa2',
  'type' => 'library',
  'install_path' => __DIR__ . '/../../',