perf: remove default_form_id logic, can just query form with lowest ID directly

Author: dannyvankooten

includes/admin/migrations/3.0.0-form-1-post-type.php

@@ -36,9 +36,6 @@
     ]
 );
 
-// set default_form_id
-update_option('mc4wp_default_form_id', $id);
-
 // set form settings
 $setting_keys = [
     'css',

includes/admin/migrations/4.13.0-remove-default-form-id.php

@@ -0,0 +1,5 @@
+<?php
+
+defined('ABSPATH') or exit;
+
+delete_option('mc4wp_default_form_id');

includes/forms/class-admin.php

@@ -168,9 +168,6 @@ public function process_add_form()
             update_post_meta($form_id, '_mc4wp_settings', $form_data['settings']);
         }
 
-        // set default form ID
-        $this->set_default_form_id($form_id);
-
         $this->messages->flash(__('Form saved.', 'mailchimp-for-wp'));
         $edit_form_url = mc4wp_get_edit_form_url($form_id);
         wp_redirect($edit_form_url);
@@ -299,22 +296,9 @@ public function process_save_form()
         $form_data = $_POST['mc4wp_form'];
 
         $this->save_form($form_id, $form_data);
-        $this->set_default_form_id($form_id);
         $this->messages->flash(__('Form saved.', 'mailchimp-for-wp'));
     }
 
-    /**
-     * @param int $form_id
-     */
-    private function set_default_form_id($form_id)
-    {
-        $default_form_id = get_option('mc4wp_default_form_id', 0);
-
-        if (empty($default_form_id)) {
-            update_option('mc4wp_default_form_id', $form_id);
-        }
-    }
-
     /**
      * Goes through each form and aggregates array of stylesheet slugs to load.
      *

includes/forms/class-form.php

@@ -26,6 +26,7 @@ public static function throw_not_found_exception($post_id)
     {
         // translators: %d is the form post ID.
         $message = sprintf(__('There is no form with ID %d, perhaps it was deleted?', 'mailchimp-for-wp'), $post_id);
+
         // phpcs:ignore WordPress.Security.EscapeOutput.ExceptionNotEscaped -- Exception text is not direct output and is escaped at render time.
         throw new Exception($message);
     }
@@ -44,8 +45,19 @@ public static function get_instance($post = 0)
         } else {
             $post_id = (int) $post;
 
+            // if no explicit ID given, query the first published form
             if ($post_id === 0) {
-                $post_id = (int) get_option('mc4wp_default_form_id', 0);
+                $posts = get_posts([
+                    'post_type' => 'mc4wp-form',
+                    'numberposts' => 1,
+                    'post_status' => 'publish',
+                    'orderby' => 'ID',
+                    'order' => 'ASC',
+                ]);
+                if ($posts) {
+                    $post = $posts[0];
+                    $post_id = $post->ID;
+                }
             }
         }
 

includes/forms/class-output-manager.php

@@ -96,7 +96,7 @@ protected function generate_html($id = 0, $config = [])
             $form = mc4wp_get_form($id);
         } catch (Exception $e) {
             if (current_user_can('manage_options')) {
-                return sprintf('<strong style="color: indianred;">Mailchimp for WordPress error:</strong> %s', $e->getMessage());
+                return '<p><strong style="color: indianred;">Mailchimp for WordPress error:</strong> ' . esc_html($e->getMessage()) . '.</p>';
             }
 
             return '';
@@ -106,10 +106,9 @@ protected function generate_html($id = 0, $config = [])
 
         if (!mc4wp_get_api_key()) {
             if (current_user_can('manage_options')) {
-                $html .= '<p style="color: indianred;">' . __('You need to configure your Mailchimp API key for this form to work properly.', 'mailchimp-for-wp') . '</p>';
+                $html .= '<p style="color: indianred;">' . esc_html__('You need to configure your Mailchimp API key for this form to work properly.', 'mailchimp-for-wp') . '</p>';
             } else {
-                // if no API key set and request is for an unauthorized user
-                // show nothing
+                // show nothing if no API key set and request is for an unauthorized user
                 return '';
             }
         }