Changeset 3310602

Timestamp:

06/12/2025 03:11:31 PM (8 months ago)

Author:

flexfields

Message:

Updated trunk to version2.1.2

Location:

flex-forms/trunk

Files:

• assets/css/flex-forms-admin.css (modified) (1 diff)
• assets/js/flex-forms-admin.js (modified) (2 diffs)
• flex-forms.php (modified) (3 diffs)
• includes/class-flex-forms-ajax.php (modified) (2 diffs)
• includes/class-flex-forms-frontend.php (modified) (1 diff)
• includes/class-flex-forms-main.php (modified) (12 diffs)
• includes/class-flex-forms-mass-email.php (added)
• includes/class-flex-forms-settings.php (modified) (4 diffs)
• includes/class-flex-forms-submissions.php (modified) (6 diffs)
• includes/helpers (added)
• includes/helpers/string.php (added)
• readme.txt (modified) (1 diff)

flex-forms/trunk/assets/css/flex-forms-admin.css

@@ -14 +14 @@
     transition: background-color 0.2s ease;
 }
+#menu-posts-flex_form ul.wp-submenu a[href*="page=flex_forms_mass_email"] {
+    display: none !important;
+}

flex-forms/trunk/assets/js/flex-forms-admin.js

@@ -42 +42 @@
         const isButton = fieldType === 'button';
         $('#flex_forms_flex_field_button_type_row, #flex_forms_flex_field_button_value_row').toggle(isButton);
+
+        /* NEW: hide Placeholder + Default Value for Button */
+        $('#flex_forms_flex_field_placeholder_row, #flex_forms_flex_field_default_row')
+          .toggle(!isButton);
 
         /* Show “Unique?” only for email + DB-store */
@@ -150 +154 @@
         }, 350);
     }
+
+    /* Show/hide SMTP-dependent rows */
+    function toggleSmtpRows() {
+        const enabled = $('#flex_forms_use_smtp').is(':checked');
+        $('.smtp-dependent').toggle(enabled);
+    }
+
+    /* Send test e-mail */
+    function sendTestEmail() {
+        const $btn    = $('#flex_forms_send_test_email_btn');
+        const $result = $('#flex_forms_smtp_test_result').removeClass('success error').text('');
+        const email   = $('#flex_forms_smtp_test_email').val().trim();
+
+        if (!email) {
+            $result.addClass('error').text('Please enter an e-mail address.');
+            return;
+        }
+
+        /* Collect current input values */
+        const data = {
+            action:     'flex_forms_send_test_email',
+            security:   flex_forms_admin_vars.nonce,
+            test_email: email,
+
+            smtp_host:       $('#flex_forms_smtp_host').val().trim(),
+            smtp_port:       $('#flex_forms_smtp_port').val().trim(),
+            smtp_encryption: $('#flex_forms_smtp_encryption').val(),
+            smtp_user:       $('#flex_forms_smtp_user').val().trim(),
+            smtp_pass:       $('#flex_forms_smtp_pass').val().trim()
+        };
+
+        /* Quick client-side check */
+        if (!data.smtp_host || !data.smtp_port || !data.smtp_user || !data.smtp_pass) {
+            $result.addClass('error').text('Fill in all SMTP fields first.');
+            return;
+        }
+
+        $btn.prop('disabled', true);
+
+        $.post(flex_forms_admin_vars.ajaxurl, data)
+          .done(function (resp) {
+              if (resp.success) {
+                  $result.addClass('success').text(resp.data.message);
+              } else {
+                  $result.addClass('error').text(resp.data.message);
+              }
+          })
+          .fail(function () {
+              $result.addClass('error').text('AJAX error.');
+          })
+          .always(function () {
+              $btn.prop('disabled', false);
+          });
+    }
+    /* Init */
+    $(function () {
+        toggleSmtpRows();
+        $('#flex_forms_use_smtp').on('change', toggleSmtpRows);
+        $('#flex_forms_send_test_email_btn').on('click', sendTestEmail);
+    });
+
+    const storeCb   = document.getElementById('flex_forms_store_in_db');
+    const adminCb   = document.getElementById('flex_forms_admin_email_enable');
+
+    function syncAdminCheckbox() {
+        if (storeCb.checked) {
+            adminCb.removeAttribute('disabled');   // free to toggle
+        } else {
+            adminCb.checked = true;               // must stay ON
+            adminCb.setAttribute('disabled', 'disabled');
+        }
+    }
+
+    /* init + on change */
+    syncAdminCheckbox();
+    storeCb.addEventListener('change', syncAdminCheckbox);
 });

flex-forms/trunk/flex-forms.php

@@ -2 +2 @@
 /*
 Plugin Name: Flex Forms
-Plugin URI: https://flex-fields.com/forms/
+Plugin URI:  https://flex-fields.com/forms/
 Description: A modular, customizable form builder plugin for WordPress.
-Version: 2.1.1
+Version:     2.1.2
 Requires at least: 6.6
-Author: Future Systems
-Author URI: https://f-s.am
-License: GPLv2 or later
+Author:      Future Systems
+Author URI:  https://f-s.am
+License:     GPLv2 or later
 Text Domain: flex-forms
 */
 
-// Exit if accessed directly
-if (!defined('ABSPATH')) {
-    exit;
+if ( ! defined( 'ABSPATH' ) ) { exit; }
+
+define( 'FLEX_FORMS_VERSION',    '2.1.2' );
+define( 'FLEX_FORMS_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
+define( 'FLEX_FORMS_PLUGIN_URL', plugin_dir_url(  __FILE__ ) );
+
+/* -------------------------------------------------- *
+ *  Helpers FIRST – makes flex_forms_str() available  *
+ * -------------------------------------------------- */
+foreach ( glob( FLEX_FORMS_PLUGIN_DIR . 'includes/helpers/*.php' ) as $file ) {
+    require_once $file;                // flex_forms_str() defined here
 }
 
-define('FLEX_FORMS_VERSION', '2.1.1');
-define('FLEX_FORMS_PLUGIN_DIR', plugin_dir_path(__FILE__));
-define('FLEX_FORMS_PLUGIN_URL', plugin_dir_url(__FILE__));
-
+/* -------------------------------------------------- *
+ *  Class files                                       *
+ * -------------------------------------------------- */
 require_once FLEX_FORMS_PLUGIN_DIR . 'includes/class-flex-forms-main.php';
 require_once FLEX_FORMS_PLUGIN_DIR . 'includes/class-flex-forms-submissions.php';
@@ -27 +34 @@
 require_once FLEX_FORMS_PLUGIN_DIR . 'includes/class-flex-forms-frontend.php';
 require_once FLEX_FORMS_PLUGIN_DIR . 'includes/class-flex-forms-ajax.php';
+require_once FLEX_FORMS_PLUGIN_DIR . 'includes/class-flex-forms-mass-email.php';
 
-function flex_forms_init()
-{
+/* -------------------------------------------------- *
+ *  Bootstrap                                         *
+ * -------------------------------------------------- */
+add_action( 'plugins_loaded', function () {
+
     new Flex_Forms_Main();
     new Flex_Forms_Submissions();
@@ -36 +47 @@
     new Flex_Forms_Frontend();
     new Flex_Forms_Ajax();
-}
-add_action('plugins_loaded', 'flex_forms_init');
 
-function flex_forms_activate_or_deactivate()
-{
-    flush_rewrite_rules();
-}
-register_activation_hook(__FILE__, 'flex_forms_activate_or_deactivate');
-register_deactivation_hook(__FILE__, 'flex_forms_activate_or_deactivate');
+    if ( is_admin() ) {
+        new Flex_Forms_Mass_Email();
+    }
+} );
+
+/* flush rewrites on (de)activation */
+register_activation_hook(   __FILE__, 'flex_forms_flush_rewrites' );
+register_deactivation_hook( __FILE__, 'flex_forms_flush_rewrites' );
+function flex_forms_flush_rewrites() { flush_rewrite_rules(); }

flex-forms/trunk/includes/class-flex-forms-ajax.php

@@ -1 +1 @@
 <?php
+/**
+ * Flex Forms – AJAX handlers
+ */
 if ( ! defined( 'ABSPATH' ) ) {
     exit;
@@ -7 +10 @@
 
     public function __construct() {
-        add_action( 'wp_ajax_flex_forms_submit', array( $this, 'flex_forms_process_submission' ) );
-        add_action( 'wp_ajax_nopriv_flex_forms_submit', array( $this, 'flex_forms_process_submission' ) );
-        add_action('wp_ajax_flex_forms_validate_unique', [$this, 'flex_forms_validate_unique_fields']);
-        add_action('wp_ajax_nopriv_flex_forms_validate_unique', [$this, 'flex_forms_validate_unique_fields']);
+        /* Front-end submissions */
+        add_action( 'wp_ajax_flex_forms_submit',            array( $this, 'process_submission' ) );
+        add_action( 'wp_ajax_nopriv_flex_forms_submit',     array( $this, 'process_submission' ) );
+
+        /* Unique-field validation */
+        add_action( 'wp_ajax_flex_forms_validate_unique',        array( $this, 'validate_unique_fields' ) );
+        add_action( 'wp_ajax_nopriv_flex_forms_validate_unique', array( $this, 'validate_unique_fields' ) );
+
+        /* NEW: send test SMTP e-mail (admin only) */
+        add_action( 'wp_ajax_flex_forms_send_test_email',   array( $this, 'send_test_email' ) );
     }
 
-    public function flex_forms_process_submission() {
+    /* ============================================================= *
+     *  1. Process submission (stub for brevity)
+     * ============================================================= */
+    public function process_submission() {
         check_ajax_referer( 'flex-forms-nonce', 'security' );
-        wp_send_json_success(['message' => __( 'Form submission successful!', 'flex-forms' )]);
+        wp_send_json_success( array( 'message' => __( 'Form submission successful!', 'flex-forms' ) ) );
     }
 
-    public function flex_forms_validate_unique_fields() {
-        check_ajax_referer('flex-forms-nonce', 'nonce');
+    /* ============================================================= *
+     *  2. Validate “unique” fields
+     * ============================================================= */
+    public function validate_unique_fields() {
+        check_ajax_referer( 'flex-forms-nonce', 'nonce' );
 
-        $form_id = isset($_POST['form_id']) ? absint($_POST['form_id']) : 0;
-        $fields = isset($_POST['fields']) ? (array) $_POST['fields'] : [];
+        $form_id = isset( $_POST['form_id'] ) ? absint( $_POST['form_id'] ) : 0;
+        $fields  = isset( $_POST['fields'] )  ? (array) $_POST['fields']    : array();
 
-        if (!$form_id || empty($fields)) {
-            wp_send_json_error(['message' => 'Invalid request.']);
+        if ( ! $form_id || empty( $fields ) ) {
+            wp_send_json_error( array( 'message' => 'Invalid request.' ) );
         }
 
         $submissions = new Flex_Forms_Submissions();
-        $errors = $submissions->check_duplicate_fields($form_id, $fields);
+        $errors      = $submissions->check_duplicate_fields( $form_id, $fields );
 
-        if (!empty($errors)) {
-            wp_send_json_success(['valid' => false, 'errors' => $errors]);
+        if ( ! empty( $errors ) ) {
+            wp_send_json_success( array( 'valid' => false, 'errors' => $errors ) );
         }
 
-        wp_send_json_success(['valid' => true]);
+        wp_send_json_success( array( 'valid' => true ) );
     }
 
+    /* ============================================================= *
+     *  3. Send SMTP test e-mail
+     * ============================================================= */
+    public function send_test_email() {
+        check_ajax_referer( 'flex-forms-nonce', 'security' );
+
+        if ( ! current_user_can( 'manage_options' ) ) {
+            wp_send_json_error( array( 'message' => __( 'Permission denied.', 'flex-forms' ) ) );
+        }
+
+        $to = isset( $_POST['test_email'] ) ? sanitize_email( wp_unslash( $_POST['test_email'] ) ) : '';
+        if ( ! is_email( $to ) ) {
+            wp_send_json_error( array( 'message' => __( 'Invalid e-mail address.', 'flex-forms' ) ) );
+        }
+
+        /* =========================================================
+         * 1. Pull SMTP params – prefer POST, fall back to options
+         * ========================================================= */
+        $param = function ( $key, $opt ) {
+            return isset( $_POST[ $key ] ) && $_POST[ $key ] !== ''
+                ? sanitize_text_field( wp_unslash( $_POST[ $key ] ) )
+                : trim( get_option( $opt ) );
+        };
+
+        $host       = $param( 'smtp_host',       'flex_forms_smtp_host' );
+        $port       = absint( $param( 'smtp_port',       'flex_forms_smtp_port' ) );
+        $encryption = strtolower( $param( 'smtp_encryption', 'flex_forms_smtp_encryption' ) ?: 'none' );
+        $user       = $param( 'smtp_user',       'flex_forms_smtp_user' );
+        $pass       = $param( 'smtp_pass',       'flex_forms_smtp_pass' );
+
+        if ( ! $host || ! $port || ! $user || ! $pass ) {
+            wp_send_json_error( array( 'message' => __( 'Please fill in all SMTP fields.', 'flex-forms' ) ) );
+        }
+
+        /* =========================================================
+         * 2. Configure PHPMailer only for this request
+         * ========================================================= */
+        add_action( 'phpmailer_init', function ( $phpmailer ) use ( $host, $port, $encryption, $user, $pass ) {
+            $phpmailer->isSMTP();
+            $phpmailer->Host       = $host;
+            $phpmailer->Port       = $port;
+            $phpmailer->SMTPAuth   = true;
+            $phpmailer->Username   = $user;
+            $phpmailer->Password   = $pass;
+            $phpmailer->SMTPSecure = ( $encryption !== 'none' ) ? $encryption : false; // ssl / tls / false
+        } );
+
+        /* =========================================================
+         * 3. Send the message
+         * ========================================================= */
+        $subject = __( 'Flex Forms SMTP Test', 'flex-forms' );
+        $body    = '<p>' . esc_html__( 'If you are reading this, your SMTP settings in Flex Forms SMTP works!', 'flex-forms' ) . '</p>';
+        $headers = array( 'Content-Type: text/html; charset=UTF-8' );
+
+        if ( wp_mail( $to, $subject, $body, $headers ) ) {
+            wp_send_json_success( array( 'message' => __( 'Success! Test e-mail sent.', 'flex-forms' ) ) );
+        }
+
+        wp_send_json_error( array( 'message' => __( 'Failed to send. Check credentials and server logs.', 'flex-forms' ) ) );
+    }
 }

flex-forms/trunk/includes/class-flex-forms-frontend.php

@@ -251 +251 @@
          * 4. Field-type switch
          * ------------------------------------------------------------------ */
+        $add_attr = static function ( &$a, $name, $val ) {
+            if ( $val !== '' ) {
+                $a[] = $name . '="' . esc_attr( $val ) . '"';
+            }
+        };
+
         switch ( $atts['type'] ) {
 
             /* ======== TEXTAREA ======== */
             case 'textarea':
+
+                // Build only the attributes that actually have content
+                $attrs = [
+                    'id="'   . esc_attr( $base_id )      . '"',
+                    'name="' . esc_attr( $atts['name'] ) . '"',
+                ];
+                if ( $atts['placeholder'] !== '' ) {
+                    $attrs[] = 'placeholder="' . esc_attr( $atts['placeholder'] ) . '"';
+                }
+                if ( $atts['class'] !== '' ) {
+                    $attrs[] = 'class="' . esc_attr( $atts['class'] ) . '"';
+                }
+                if ( $atts['required'] === 'true' ) {
+                    $attrs[] = 'required';
+                }
+
                 return $label_html
-                    . '<textarea id="' . esc_attr( $base_id ) . '" name="' . esc_attr( $atts['name'] ) . '"'
-                    . ' placeholder="' . esc_attr( $atts['placeholder'] ) . '"'
-                    . ' class="' . esc_attr( $atts['class'] ) . '"' . $required . '>'
-                    . esc_textarea( $atts['default'] ) . '</textarea>';
+                    . '<textarea ' . implode( ' ', $attrs ) . '>'
+                    . esc_textarea( $atts['default'] )          // prints only if non-empty
+                    . '</textarea>';
 
             /* ======== SELECT ========= */
             case 'select':
+
+                $attr = [
+                    'id="'   . esc_attr( $base_id )      . '"',
+                    'name="' . esc_attr( $atts['name'] ) . '"',
+                ];
+                $add_attr( $attr, 'class', $atts['class'] );
+                if ( $atts['required'] === 'true' ) {
+                    $attr[] = 'required';
+                }
+
                 $options = array_map( 'trim', explode( ',', $atts['options'] ) );
-                $out  = $label_html
-                    . '<select id="' . esc_attr( $base_id ) . '" name="' . esc_attr( $atts['name'] ) . '"'
-                    . ' class="' . esc_attr( $atts['class'] ) . '"' . $required . '>';
+                $out  = $label_html . '<select ' . implode( ' ', $attr ) . '>';
+
                 foreach ( $options as $option ) {
-                    $selected = ( $atts['default'] === $option ) ? ' selected' : '';
-                    $out .= '<option value="' . esc_attr( $option ) . '"' . $selected . '>'
+                    $sel = ( $atts['default'] === $option ) ? ' selected' : '';
+                    $out .= '<option value="' . esc_attr( $option ) . '"' . $sel . '>'
                         . esc_html( $option ) . '</option>';
                 }
                 return $out . '</select>';
+
 
             /* ======== RADIO ========= */
             case 'radio':
+
                 $options = array_map( 'trim', explode( ',', $atts['options'] ) );
                 $out     = $label_html;
+
                 foreach ( $options as $option ) {
-                    $option_id = $base_id . '-' . sanitize_html_class( $option );
-                    $checked   = ( $atts['default'] === $option ) ? ' checked' : '';
-                    $out .= '<label for="' . esc_attr( $option_id ) . '">'
-                        . '<input type="radio" id="' . esc_attr( $option_id ) . '"'
-                        . ' name="' . esc_attr( $atts['name'] ) . '" value="' . esc_attr( $option ) . '"'
-                        . ' class="' . esc_attr( $atts['class'] ) . '"' . $checked . $required . '> '
+                    $opt_id  = $base_id . '-' . sanitize_html_class( $option );
+                    $checked = ( $atts['default'] === $option ) ? ' checked' : '';
+
+                    $attr = [
+                        'type="radio"',
+                        'id="'   . esc_attr( $opt_id )      . '"',
+                        'name="' . esc_attr( $atts['name'] ) . '"',
+                        'value="' . esc_attr( $option ) . '"',
+                    ];
+                    $add_attr( $attr, 'class', $atts['class'] );
+                    if ( $checked )          { $attr[] = 'checked'; }
+                    if ( $atts['required'] === 'true' ) { $attr[] = 'required'; }
+
+                    $out .= '<label for="' . esc_attr( $opt_id ) . '">'
+                        . '<input ' . implode( ' ', $attr ) . '> '
                         . esc_html( $option ) . '</label>';
                 }
                 return $out;
+
 
             /* ======== CHECKBOX ======= */
             case 'checkbox':
-                if ( ! empty( $atts['options'] ) ) {
+
+                // Multi-option list
+                if ( $atts['options'] !== '' ) {
+
                     $options  = array_map( 'trim', explode( ',', $atts['options'] ) );
                     $defaults = array_map( 'trim', explode( ',', $atts['default'] ) );
                     $out      = $label_html;
+
                     foreach ( $options as $option ) {
-                        $option_id = $base_id . '-' . sanitize_html_class( $option );
-                        $checked   = in_array( $option, $defaults, true ) ? ' checked' : '';
-                        $out .= '<label for="' . esc_attr( $option_id ) . '">'
-                            . '<input type="checkbox" id="' . esc_attr( $option_id ) . '"'
-                            . ' name="' . esc_attr( $atts['name'] ) . '[]" value="' . esc_attr( $option ) . '"'
-                            . ' class="' . esc_attr( $atts['class'] ) . '"' . $checked . $required . '> '
+                        $opt_id  = $base_id . '-' . sanitize_html_class( $option );
+                        $checked = in_array( $option, $defaults, true );
+
+                        $attr = [
+                            'type="checkbox"',
+                            'id="'   . esc_attr( $opt_id )      . '"',
+                            'name="' . esc_attr( $atts['name'] ) . '[]"',
+                            'value="' . esc_attr( $option ) . '"',
+                        ];
+                        $add_attr( $attr, 'class', $atts['class'] );
+                        if ( $checked )                      { $attr[] = 'checked'; }
+                        if ( $atts['required'] === 'true' ) { $attr[] = 'required'; }
+
+                        $out .= '<label for="' . esc_attr( $opt_id ) . '">'
+                            . '<input ' . implode( ' ', $attr ) . '> '
                             . esc_html( $option ) . '</label>';
                     }
                     return $out;
                 }
-                /* Single boolean checkbox */
-                return $label_html
-                    . '<input type="checkbox" id="' . esc_attr( $base_id ) . '"'
-                    . ' name="' . esc_attr( $atts['name'] ) . '" value="1"'
-                    . ' class="' . esc_attr( $atts['class'] ) . '"' . $required . ' />';
+
+                // Single boolean checkbox
+                $attr = [
+                    'type="checkbox"',
+                    'id="'   . esc_attr( $base_id )      . '"',
+                    'name="' . esc_attr( $atts['name'] ) . '"',
+                    'value="1"',
+                ];
+                $add_attr( $attr, 'class', $atts['class'] );
+                if ( $atts['required'] === 'true' ) { $attr[] = 'required'; }
+
+                return $label_html . '<input ' . implode( ' ', $attr ) . ' />';
+
 
             /* ======== BUTTON ========= */
             case 'button':
-                return '<button id="' . esc_attr( $base_id ) . '" type="' . esc_attr( $atts['button_type'] ) . '"'
-                    . ' name="' . esc_attr( $atts['name'] ) . '" value="' . esc_attr( $atts['value'] ) . '"'
-                    . ' class="' . esc_attr( $atts['class'] ) . '">'
+
+                $attr = [
+                    'id="'   . esc_attr( $base_id )      . '"',
+                    'type="' . esc_attr( $atts['button_type'] ) . '"',
+                    'name="' . esc_attr( $atts['name'] ) . '"',
+                ];
+                $add_attr( $attr, 'value', $atts['value'] );
+                $add_attr( $attr, 'class', $atts['class'] );
+
+                return '<button ' . implode( ' ', $attr ) . '>'
                     . esc_html( $atts['label'] ) . '</button>';
+
 
             /* ======== DEFAULT INPUT == */
             default:
-                return $label_html
-                    . '<input type="' . esc_attr( $atts['type'] ) . '"'
-                    . ' id="' . esc_attr( $base_id ) . '"'
-                    . ' name="' . esc_attr( $atts['name'] ) . '"'
-                    . ' placeholder="' . esc_attr( $atts['placeholder'] ) . '"'
-                    . ' value="' . esc_attr( $atts['default'] ) . '"'
-                    . ' class="' . esc_attr( $atts['class'] ) . '"'
-                    . $required . $unique_attr . ' />';
-        }
-    }
-
-    public function flex_forms_handle_form_submission_ajax()
-    {
-        check_ajax_referer('flex-forms-nonce', 'nonce');
-
-        $form_id = isset($_POST['flex_form_id']) ? absint($_POST['flex_form_id']) : 0;
-        if (!$form_id) {
-            wp_send_json_error(['message' => 'Invalid form ID.']);
-        }
-
-        $recaptcha_version = get_option('flex_forms_recaptcha_version', 'none');
-        if ('v2' === $recaptcha_version) {
-            $recaptcha_response = sanitize_text_field(wp_unslash($_POST['g-recaptcha-response'] ?? ''));
-            if (!$this->flex_forms_validate_recaptcha_v2($recaptcha_response)) {
-                wp_send_json_error(['message' => 'Invalid reCAPTCHA.']);
-            }
-        } elseif ('v3' === $recaptcha_version) {
-            $recaptcha_token = sanitize_text_field(wp_unslash($_POST['recaptcha_token'] ?? ''));
-            if (!$this->flex_forms_validate_recaptcha_v3($recaptcha_token)) {
-                wp_send_json_error(['message' => 'Invalid reCAPTCHA token.']);
-            }
-        }
-
-        $submission_data = [];
-        if (isset($_POST['flex_forms_all_inputs'])) {
-            $all_inputs = sanitize_text_field(wp_unslash($_POST['flex_forms_all_inputs']));
-            $flex_all_inputs = explode(',', $all_inputs);
-            foreach ($flex_all_inputs as $input) {
-                if (isset($_POST[$input])) {
-                    $submission_data[$input] = wp_kses(wp_unslash($_POST[$input]), 'post');
-                }
-            }
-        }
-
-        $submission_post = array(
-            'post_title' => 'Submission for form ' . $form_id,
-            'post_type' => 'flex_submission',
-            'post_status' => 'publish',
-        );
-
-        $submission_id = wp_insert_post($submission_post);
-        if ($submission_id) {
-            update_post_meta($submission_id, '_flex_form_id', $form_id);
-            update_post_meta($submission_id, '_flex_form_data', $submission_data);
-
-            $admin_email_to = get_post_meta($form_id, '_flex_forms_admin_email_to', true);
-            $admin_email_subject = get_post_meta($form_id, '_flex_forms_admin_email_subject', true);
-            $admin_email_template = get_post_meta($form_id, '_flex_forms_admin_email_template', true);
-            if (!empty($admin_email_to) && !empty($admin_email_subject) && !empty($admin_email_template)) {
-                foreach ($submission_data as $key => $value) {
-                    $admin_email_template = str_replace('[' . $key . ']', $value, $admin_email_template);
-                    $admin_email_subject = str_replace('[' . $key . ']', $value, $admin_email_subject);
-                }
-                $admin_email_template = wpautop($admin_email_template);
-                $this->flex_forms_send_mail($admin_email_to, $admin_email_subject, $admin_email_template, $form_id);
-            }
-
-            $user_email_enabled = get_post_meta($form_id, '_flex_forms_user_email_enable', true);
-            if ($user_email_enabled) {
-                $user_email_shortcode = get_post_meta($form_id, '_flex_forms_user_email_email_shortcode', true);
-                $user_email_subject = get_post_meta($form_id, '_flex_forms_user_email_subject', true);
-                $user_email_template = get_post_meta($form_id, '_flex_forms_user_email_template', true);
-                preg_match('/\[(.*?)\]/', $user_email_shortcode, $matches);
-                $user_email = isset($submission_data[$matches[1]]) ? sanitize_email($submission_data[$matches[1]]) : '';
-                if (!empty($user_email) && !empty($user_email_subject) && !empty($user_email_template)) {
-                    foreach ($submission_data as $key => $value) {
-                        $user_email_template = str_replace('[' . $key . ']', $value, $user_email_template);
-                        $user_email_subject = str_replace('[' . $key . ']', $value, $user_email_subject);
-                    }
-                    $user_email_template = wpautop($user_email_template);
-                    $this->flex_forms_send_mail($user_email, $user_email_subject, $user_email_template, $form_id);
-                }
-            }
-
-            $success_behavior = get_post_meta($form_id, '_flex_forms_success_behavior', true);
-            if ('redirect' === $success_behavior) {
-                $redirect_url = get_post_meta($form_id, '_flex_forms_success_redirect_url', true);
-                wp_send_json_success(array(
-                    'message' => 'Form submitted successfully.',
-                    'success_behavior' => 'redirect',
-                    'redirect_url' => $redirect_url,
-                ));
+
+                $attrs = [
+                    'type="' . esc_attr( $atts['type'] ) . '"',
+                    'id="'   . esc_attr( $base_id )     . '"',
+                    'name="' . esc_attr( $atts['name'] ) . '"',
+                ];
+                if ( $atts['placeholder'] !== '' ) {
+                    $attrs[] = 'placeholder="' . esc_attr( $atts['placeholder'] ) . '"';
+                }
+                if ( $atts['default'] !== '' ) {
+                    $attrs[] = 'value="' . esc_attr( $atts['default'] ) . '"';
+                }
+                if ( $atts['class'] !== '' ) {
+                    $attrs[] = 'class="' . esc_attr( $atts['class'] ) . '"';
+                }
+                if ( $atts['required'] === 'true' ) {
+                    $attrs[] = 'required';
+                }
+                if ( $atts['unique'] === 'true' ) {
+                    $attrs[] = 'data-unique="true"';
+                }
+
+                return $label_html . '<input ' . implode( ' ', $attrs ) . ' />';
+        }
+    }
+
+    public function flex_forms_handle_form_submission_ajax() {
+
+        check_ajax_referer( 'flex-forms-nonce', 'nonce' );
+
+        /* -------------------------------------------------------------
+         * 0. Resolve & validate the form
+         * ---------------------------------------------------------- */
+        $form_id = isset( $_POST['flex_form_id'] ) ? absint( $_POST['flex_form_id'] ) : 0;
+        if ( ! $form_id ) {
+            wp_send_json_error( [ 'message' => 'Invalid form ID.' ] );
+        }
+
+        /* -------------------------------------------------------------
+         * 1. reCAPTCHA (v2 / v3)
+         * ---------------------------------------------------------- */
+        $recaptcha_version = get_option( 'flex_forms_recaptcha_version', 'none' );
+        if ( 'v2' === $recaptcha_version ) {
+            $response = sanitize_text_field( wp_unslash( $_POST['g-recaptcha-response'] ?? '' ) );
+            if ( ! $this->flex_forms_validate_recaptcha_v2( $response ) ) {
+                wp_send_json_error( [ 'message' => 'Invalid reCAPTCHA.' ] );
+            }
+        } elseif ( 'v3' === $recaptcha_version ) {
+            $token = sanitize_text_field( wp_unslash( $_POST['recaptcha_token'] ?? '' ) );
+            if ( ! $this->flex_forms_validate_recaptcha_v3( $token ) ) {
+                wp_send_json_error( [ 'message' => 'Invalid reCAPTCHA token.' ] );
+            }
+        }
+
+        /* -------------------------------------------------------------
+         * 2. Collect submitted values
+         * ---------------------------------------------------------- */
+        $submission_data = array();
+        if ( isset( $_POST['flex_forms_all_inputs'] ) ) {
+            $all   = explode( ',', sanitize_text_field( wp_unslash( $_POST['flex_forms_all_inputs'] ) ) );
+            foreach ( $all as $name ) {
+                if ( isset( $_POST[ $name ] ) ) {
+                    $submission_data[ $name ] = wp_kses( wp_unslash( $_POST[ $name ] ), 'post' );
+                }
+            }
+        }
+
+        /* -------------------------------------------------------------
+         * 3. Read form-level options
+         * ---------------------------------------------------------- */
+        $store_in_db         = (int) get_post_meta( $form_id, '_flex_forms_store_in_db',       true );
+        $admin_email_enabled = (int) get_post_meta( $form_id, '_flex_forms_admin_email_enable', true ); // new
+
+        /* -------------------------------------------------------------
+         * 4. Optionally save the submission to DB
+         * ---------------------------------------------------------- */
+        $submission_id = 0;
+        if ( $store_in_db ) {
+            $submission_id = wp_insert_post( array(
+                'post_title'  => 'Submission for form ' . $form_id,
+                'post_type'   => 'flex_submission',
+                'post_status' => 'publish',
+            ) );
+
+            if ( $submission_id ) {
+                update_post_meta( $submission_id, '_flex_form_id',   $form_id );
+                update_post_meta( $submission_id, '_flex_form_data', $submission_data );
+            }
+        }
+
+        /* -------------------------------------------------------------
+         * 5. Admin notification e-mail (respects new checkbox)
+         * ---------------------------------------------------------- */
+        if ( $admin_email_enabled ) {
+
+            $admin_to       = get_post_meta( $form_id, '_flex_forms_admin_email_to',       true );
+            $admin_subject  = get_post_meta( $form_id, '_flex_forms_admin_email_subject',  true );
+            $admin_body_tpl = get_post_meta( $form_id, '_flex_forms_admin_email_template', true );
+
+            if ( $admin_to && $admin_subject && $admin_body_tpl ) {
+
+                foreach ( $submission_data as $k => $v ) {
+                    $admin_subject  = str_replace( '[' . $k . ']', $v, $admin_subject );
+                    $admin_body_tpl = str_replace( '[' . $k . ']', $v, $admin_body_tpl );
+                }
+
+                $admin_body_tpl = wpautop( $admin_body_tpl );
+
+                $this->flex_forms_send_mail(
+                    $admin_to,
+                    $admin_subject,
+                    $admin_body_tpl,
+                    $form_id
+                );
+            }
+        }
+
+        /* -------------------------------------------------------------
+         * 6. Optional user confirmation e-mail (unchanged logic)
+         * ---------------------------------------------------------- */
+        $user_email_enabled = (int) get_post_meta( $form_id, '_flex_forms_user_email_enable', true );
+        if ( $user_email_enabled ) {
+
+            $shortcode = get_post_meta( $form_id, '_flex_forms_user_email_email_shortcode', true );
+            $subject   = get_post_meta( $form_id, '_flex_forms_user_email_subject',         true );
+            $body_tpl  = get_post_meta( $form_id, '_flex_forms_user_email_template',        true );
+
+            if ( preg_match( '/\[(.*?)\]/', $shortcode, $m ) ) {
+                $user_addr = $submission_data[ $m[1] ] ?? '';
+                $user_addr = sanitize_email( $user_addr );
             } else {
-                $success_message = get_post_meta($form_id, '_flex_forms_success_text', true);
-                wp_send_json_success([
-                    'message' => 'Form submitted successfully.',
-                    'success_behavior' => 'message',
-                    'success_message' => $success_message,
-                ]);
-            }
-        } else {
-            wp_send_json_error(['message' => 'Submission failed.']);
-        }
+                $user_addr = '';
+            }
+
+            if ( $user_addr && $subject && $body_tpl ) {
+                foreach ( $submission_data as $k => $v ) {
+                    $subject = str_replace( '[' . $k . ']', $v, $subject );
+                    $body_tpl = str_replace( '[' . $k . ']', $v, $body_tpl );
+                }
+                $body_tpl = wpautop( $body_tpl );
+
+                $this->flex_forms_send_mail(
+                    $user_addr,
+                    $subject,
+                    $body_tpl,
+                    $form_id
+                );
+            }
+        }
+
+        /* -------------------------------------------------------------
+         * 7. Success response
+         * ---------------------------------------------------------- */
+        $success_behavior = get_post_meta( $form_id, '_flex_forms_success_behavior', true );
+
+        if ( 'redirect' === $success_behavior ) {
+            wp_send_json_success( array(
+                'message'          => 'Form submitted successfully.',
+                'success_behavior' => 'redirect',
+                'redirect_url'     => get_post_meta( $form_id, '_flex_forms_success_redirect_url', true ),
+            ) );
+        }
+
+        wp_send_json_success( array(
+            'message'          => 'Form submitted successfully.',
+            'success_behavior' => 'message',
+            'success_message'  => get_post_meta( $form_id, '_flex_forms_success_text', true ),
+        ) );
     }
 

flex-forms/trunk/includes/class-flex-forms-main.php

@@ -104 +104 @@
         $form_id  = $post->ID;
 
-        // Show shortcode at page top (click-to-copy handled by JS already enqueued)
-        if ( $is_edit ) {
-            printf(
-                '<p style="margin:8px 0 18px;">
-                <strong>%s</strong>
-                <code class="flex-forms-copy-shortcode" title="%s">[flex-form id="%d"]</code>
-            </p>',
-                esc_html__( 'Shortcode:', 'flex-forms' ),
-                esc_attr__( 'Click to copy', 'flex-forms' ),
-                absint( $form_id )
-            );
-        }
-
         /* Core content */
         $content_value                = $is_edit ? $post->post_content : '';
@@ -147 +134 @@
         /* Custom CSS */
         $custom_css_val               = $is_edit ? get_post_meta( $form_id, '_flex_forms_custom_css', true )             : '';
+        $admin_email_enable_val       = $is_edit ? (int) get_post_meta( $form_id, '_flex_forms_admin_email_enable', true ) : 1;
 
         /* ---------------------------------------------------------------------
          * 2. Mark-up
          * ------------------------------------------------------------------ */
+        if ( $is_edit ) {
+
+            /* ► Always show the shortcode element */
+            $html  = sprintf(
+                '<strong>%1$s</strong> ' .
+                '<code class="flex-forms-copy-shortcode" title="%2$s">[flex-form id="%3$d"]</code>',
+                esc_html__( 'Shortcode:',  'flex-forms' ),
+                esc_attr__( 'Click to copy', 'flex-forms' ),
+                absint( $form_id )
+            );
+
+            /* ► Add the button only if submissions are stored in DB */
+            if ( get_post_meta( $form_id, '_flex_forms_store_in_db', true ) ) {
+                $subs_url = admin_url( 'edit.php?post_type=flex_submission&form_id=' . $form_id );
+                $html    .= sprintf(
+                    '&nbsp;&nbsp;<a href="%1$s" class="button button-secondary">%2$s</a>',
+                    esc_url( $subs_url ),
+                    esc_html__( 'View submissions', 'flex-forms' )
+                );
+            }
+
+            printf( '<p style="margin:8px 0 18px;">%s</p>', $html );
+        }
         ?>
+
+        <hr>
         <div class="wrap">
             <form method="post">
@@ -193 +206 @@
                                 <td><input type="text" id="flex_forms_flex_field_label" class="regular-text" /></td>
                             </tr>
-                            <tr>
+                            <tr id="flex_forms_flex_field_placeholder_row">
                                 <th><label for="flex_forms_flex_field_placeholder"><?php esc_html_e( 'Placeholder', 'flex-forms' ); ?></label></th>
                                 <td><input type="text" id="flex_forms_flex_field_placeholder" class="regular-text" /></td>
@@ -206 +219 @@
                                 <td><input type="text" id="flex_forms_flex_field_class" class="regular-text" /></td>
                             </tr>
-                            <tr>
+                            <tr id="flex_forms_flex_field_default_row">
                                 <th><label for="flex_forms_flex_field_default"><?php esc_html_e( 'Default Value', 'flex-forms' ); ?></label></th>
                                 <td><input type="text" id="flex_forms_flex_field_default" class="regular-text" /></td>
@@ -253 +266 @@
                 ?>
 
-                <h2><?php esc_html_e( 'Email Templates', 'flex-forms' ); ?></h2>
-                <p><?php esc_html_e( 'Use shortcodes like [name], [phone], etc. in your email body to include user-submitted data.', 'flex-forms' ); ?></p>
-
                 <!-- Admin email -->
-                <h3><?php esc_html_e( 'Admin Email', 'flex-forms' ); ?></h3>
+                <h3><?php esc_html_e( 'Admin Notification Email', 'flex-forms' ); ?></h3>
                 <table class="form-table">
+                    <tr>
+                        <th><?php esc_html_e( 'Send admin e-mail?', 'flex-forms' ); ?></th>
+                        <td>
+                            <label>
+                                <input type="checkbox"
+                                        id="flex_forms_admin_email_enable"
+                                        name="flex_forms_admin_email_enable"
+                                        value="1"
+                                    <?php checked( 1, $admin_email_enable_val ); ?> />
+                                <?php esc_html_e( 'Notify me when a submission arrives', 'flex-forms' ); ?>
+                            </label>
+                        </td>
+                    </tr>
                     <tr>
                         <th><label for="flex_forms_admin_email_from"><?php esc_html_e( 'From Email', 'flex-forms' ); ?></label></th>
@@ -287 +310 @@
 
                 <!-- User email -->
-                <h2><?php esc_html_e( 'User Email', 'flex-forms' ); ?></h2>
+                <h3><?php esc_html_e( 'User Notification Email', 'flex-forms' ); ?></h3>
                 <table class="form-table">
                     <tr>
@@ -375 +398 @@
 
                 <!-- Success settings -->
-                <h2><?php esc_html_e( 'Success Settings', 'flex-forms' ); ?></h2>
+                <h3><?php esc_html_e( 'Settings for Success', 'flex-forms' ); ?></h3>
                 <table class="form-table">
                     <tr>
@@ -397 +420 @@
 
                 <!-- Error settings -->
-                <h2><?php esc_html_e( 'Error Settings', 'flex-forms' ); ?></h2>
+                <h3><?php esc_html_e( 'Settings for Error', 'flex-forms' ); ?></h3>
                 <table class="form-table">
                     <tr>
@@ -419 +442 @@
 
                 <!-- NEW: form-level attributes -->
-                <h2><?php esc_html_e( 'Form Attributes', 'flex-forms' ); ?></h2>
+                <h3><?php esc_html_e( 'Form Attributes', 'flex-forms' ); ?></h3>
                 <table class="form-table">
                     <tr>
@@ -438 +461 @@
 
                 <!-- Custom CSS -->
-                <h2><?php esc_html_e( 'Custom CSS', 'flex-forms' ); ?></h2>
+                <h3><?php esc_html_e( 'Custom CSS', 'flex-forms' ); ?></h3>
                 <textarea name="flex_forms_custom_css" rows="4" style="width:100%;"><?php echo esc_textarea( $custom_css_val ); ?></textarea>
                 <p class="description"><?php esc_html_e( 'This CSS will be injected on the front end for this form only.', 'flex-forms' ); ?></p>
@@ -447 +470 @@
 
     /**
-     * Save all Flex Form meta-box values.
+     * Save every field from the Flex-Form meta-box.
      *
-     * @param int $post_id The current post ID.
+     * @param int $post_id
      */
     public function flex_forms_save_meta_box_data( $post_id ) {
 
-        /* --------------------------------------------------------------------
-         * 1. Security / early exits
-         * ------------------------------------------------------------------ */
+        /* ───────────────────────── Security ───────────────────────── */
         if (
             ! wp_verify_nonce(
@@ -467 +488 @@
         }
 
-        /* --------------------------------------------------------------------
-         * 2. Success behaviour
-         * ------------------------------------------------------------------ */
-        update_post_meta(
-            $post_id,
-            '_flex_forms_success_behavior',
-            sanitize_text_field( wp_unslash( $_POST['flex_forms_success_behavior'] ?? '' ) )
-        );
-        update_post_meta(
-            $post_id,
-            '_flex_forms_success_redirect_url',
-            esc_url_raw( wp_unslash( $_POST['flex_forms_success_redirect_url'] ?? '' ) )
-        );
-        update_post_meta(
-            $post_id,
-            '_flex_forms_success_text',
-            wp_kses_post( wp_unslash( $_POST['flex_forms_success_text'] ?? '' ) )
-        );
-
-        /* --------------------------------------------------------------------
-         * 3. Error behaviour
-         * ------------------------------------------------------------------ */
-        update_post_meta(
-            $post_id,
-            '_flex_forms_error_behavior',
-            sanitize_text_field( wp_unslash( $_POST['flex_forms_error_behavior'] ?? '' ) )
-        );
-        update_post_meta(
-            $post_id,
-            '_flex_forms_error_redirect_url',
-            esc_url_raw( wp_unslash( $_POST['flex_forms_error_redirect_url'] ?? '' ) )
-        );
-        update_post_meta(
-            $post_id,
-            '_flex_forms_error_text',
-            wp_kses_post( wp_unslash( $_POST['flex_forms_error_text'] ?? '' ) )
-        );
-
-        /* --------------------------------------------------------------------
-         * 4. Store-in-DB option
-         * ------------------------------------------------------------------ */
-        update_post_meta(
-            $post_id,
-            '_flex_forms_store_in_db',
-            isset( $_POST['flex_forms_store_in_db'] ) ? 1 : 0
-        );
-
-        /* --------------------------------------------------------------------
-         * 5. Admin e-mail settings
-         * ------------------------------------------------------------------ */
-        update_post_meta(
-            $post_id,
-            '_flex_forms_admin_email_from',
-            sanitize_email( wp_unslash( $_POST['flex_forms_admin_email_from'] ?? '' ) )
-        );
-        update_post_meta(
-            $post_id,
-            '_flex_forms_admin_email_from_name',
-            sanitize_text_field( wp_unslash( $_POST['flex_forms_admin_email_from_name'] ?? '' ) )
-        );
-        update_post_meta(
-            $post_id,
-            '_flex_forms_admin_email_to',
-            sanitize_email( wp_unslash( $_POST['flex_forms_admin_email_to'] ?? '' ) )
-        );
-        update_post_meta(
-            $post_id,
-            '_flex_forms_admin_email_subject',
-            sanitize_text_field( wp_unslash( $_POST['flex_forms_admin_email_subject'] ?? '' ) )
-        );
-        update_post_meta(
-            $post_id,
-            '_flex_forms_admin_email_template',
-            wp_kses_post( wp_unslash( $_POST['flex_forms_admin_email_template'] ?? '' ) )
-        );
-
-        /* --------------------------------------------------------------------
-         * 6. User e-mail settings
-         * ------------------------------------------------------------------ */
-        update_post_meta(
-            $post_id,
-            '_flex_forms_user_email_email_shortcode',
-            sanitize_text_field( wp_unslash( $_POST['flex_forms_user_email_email_shortcode'] ?? '' ) )
-        );
-        update_post_meta(
-            $post_id,
-            '_flex_forms_user_email_enable',
-            isset( $_POST['flex_forms_user_email_enable'] ) ? 1 : 0
-        );
-        update_post_meta(
-            $post_id,
-            '_flex_forms_user_email_subject',
-            sanitize_text_field( wp_unslash( $_POST['flex_forms_user_email_subject'] ?? '' ) )
-        );
-        update_post_meta(
-            $post_id,
-            '_flex_forms_user_email_template',
-            wp_kses_post( wp_unslash( $_POST['flex_forms_user_email_template'] ?? '' ) )
-        );
-
-        /* --------------------------------------------------------------------
-         * 7. NEW: Form-level attributes
-         * ------------------------------------------------------------------ */
-        update_post_meta(
-            $post_id,
-            '_flex_forms_form_id',
-            sanitize_text_field( wp_unslash( $_POST['flex_forms_form_id'] ?? '' ) )
-        );
-        update_post_meta(
-            $post_id,
-            '_flex_forms_form_class',
-            sanitize_text_field( wp_unslash( $_POST['flex_forms_form_class'] ?? '' ) )
-        );
-        // Use sanitize_textarea_field so quotes (=,") survive for data-* pairs.
-        update_post_meta(
-            $post_id,
-            '_flex_forms_form_attrs',
-            sanitize_textarea_field( wp_unslash( $_POST['flex_forms_form_attrs'] ?? '' ) )
-        );
-
-        /* --------------------------------------------------------------------
-         * 8. Custom CSS
-         * ------------------------------------------------------------------ */
-        update_post_meta(
-            $post_id,
-            '_flex_forms_custom_css',
-            wp_strip_all_tags( wp_unslash( $_POST['flex_forms_custom_css'] ?? '' ), true )
-        );
+        /* ────────────────────── Helper callbacks ─────────────────── */
+        $chk   = fn( $key ) => isset( $_POST[ $key ] ) ? 1 : 0;                       // checkbox → 0/1
+        $raw   = fn( $key ) => wp_unslash( $_POST[ $key ] ?? '' );                    // convenience
+        $sel   = fn( $key ) => sanitize_text_field( $raw( $key ) );                   // simple text
+        $kses  = fn( $key ) => wp_kses_post( $raw( $key ) );                          // textarea / HTML
+        $url   = fn( $key ) => esc_url_raw( $raw( $key ) );                           // url
+        $email = fn( $key ) => sanitize_email( $raw( $key ) );                        // email
+        $attr  = fn( $key ) => sanitize_textarea_field( $raw( $key ) );               // data-theme etc.
+
+        /* ─────────────────────── Mapping table ───────────────────── */
+        $fields = [
+            /* success */
+            '_flex_forms_success_behavior'      => $sel(  'flex_forms_success_behavior'        ),
+            '_flex_forms_success_redirect_url'  => $url(  'flex_forms_success_redirect_url'    ),
+            '_flex_forms_success_text'          => $kses( 'flex_forms_success_text'            ),
+
+            /* error */
+            '_flex_forms_error_behavior'        => $sel(  'flex_forms_error_behavior'          ),
+            '_flex_forms_error_redirect_url'    => $url(  'flex_forms_error_redirect_url'      ),
+            '_flex_forms_error_text'            => $kses( 'flex_forms_error_text'              ),
+
+            /* check-boxes */
+            '_flex_forms_store_in_db'           => $chk(  'flex_forms_store_in_db'             ),
+            '_flex_forms_admin_email_enable'    => $chk(  'flex_forms_admin_email_enable'      ),
+            '_flex_forms_user_email_enable'     => $chk(  'flex_forms_user_email_enable'       ),
+
+            /* admin e-mail */
+            '_flex_forms_admin_email_from'      => $email('flex_forms_admin_email_from'        ),
+            '_flex_forms_admin_email_from_name' => $sel(  'flex_forms_admin_email_from_name'   ),
+            '_flex_forms_admin_email_to'        => $email('flex_forms_admin_email_to'          ),
+            '_flex_forms_admin_email_subject'   => $sel(  'flex_forms_admin_email_subject'     ),
+            '_flex_forms_admin_email_template'  => $kses( 'flex_forms_admin_email_template'    ),
+
+            /* user e-mail */
+            '_flex_forms_user_email_email_shortcode' => $sel(  'flex_forms_user_email_email_shortcode' ),
+            '_flex_forms_user_email_subject'         => $sel(  'flex_forms_user_email_subject'         ),
+            '_flex_forms_user_email_template'        => $kses( 'flex_forms_user_email_template'        ),
+
+            /* form attributes */
+            '_flex_forms_form_id'               => $sel(  'flex_forms_form_id'                ),
+            '_flex_forms_form_class'            => $sel(  'flex_forms_form_class'             ),
+            '_flex_forms_form_attrs'            => $attr( 'flex_forms_form_attrs'             ),
+
+            /* custom CSS */
+            '_flex_forms_custom_css'            => wp_strip_all_tags( $raw( 'flex_forms_custom_css' ), true ),
+        ];
+
+        /* ────────────────────── Single update loop ────────────────── */
+        foreach ( $fields as $meta_key => $value ) {
+            update_post_meta( $post_id, $meta_key, $value );
+        }
     }
 

flex-forms/trunk/includes/class-flex-forms-settings.php

@@ -1 +1 @@
 <?php
-if (!defined('ABSPATH')) {
+/**
+ * Flex Forms – Settings screen
+ */
+if ( ! defined( 'ABSPATH' ) ) {
     exit;
 }
 
-class Flex_Forms_Settings
-{
-    
+class Flex_Forms_Settings {
+
+    /**
+     * Settings group slug
+     *
+     * @var string
+     */
     private $option_group = 'flex_forms_settings_group';
-    
-    public function __construct()
-    {
-        add_action('admin_menu', array($this, 'flex_forms_add_settings_submenu_page'));
-        add_action('admin_init', array($this, 'flex_forms_register_settings'));
-    }
-    
-    public function flex_forms_add_settings_submenu_page()
-    {
+
+    /* --------------------------------------------------------------------- *
+     *  Constructor
+     * --------------------------------------------------------------------- */
+    public function __construct() {
+        add_action( 'admin_menu',            array( $this, 'add_settings_submenu_page' ) );
+        add_action( 'admin_init',            array( $this, 'register_settings' ) );
+        add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_assets' ) );
+    }
+
+    /* --------------------------------------------------------------------- *
+     *  Admin-menu entry (under Flex Forms CPT)
+     * --------------------------------------------------------------------- */
+    public function add_settings_submenu_page() {
         add_submenu_page(
             'edit.php?post_type=flex_form',
-            __('Settings', 'flex-forms'),
-            __('Settings', 'flex-forms'),
+            __( 'Settings', 'flex-forms' ),
+            __( 'Settings', 'flex-forms' ),
             'manage_options',
             'flex-forms-settings',
-            array($this, 'flex_forms_settings_page')
-        );
-    }
-
-    public function flex_forms_register_settings()
-    {
-        register_setting($this->option_group, 'flex_forms_use_smtp', 'sanitize_text_field');
-        register_setting($this->option_group, 'flex_forms_smtp_host', 'sanitize_text_field');
-        register_setting($this->option_group, 'flex_forms_smtp_port', 'sanitize_text_field');
-        register_setting($this->option_group, 'flex_forms_smtp_encryption', 'sanitize_text_field');
-        register_setting($this->option_group, 'flex_forms_smtp_user', 'sanitize_text_field');
-        register_setting($this->option_group, 'flex_forms_smtp_pass', 'sanitize_text_field');
-        register_setting($this->option_group, 'flex_forms_license_key', 'sanitize_text_field');
-        register_setting($this->option_group, 'flex_forms_recaptcha_version', 'sanitize_text_field');
-        register_setting($this->option_group, 'flex_forms_recaptcha_site_key', 'sanitize_text_field');
-        register_setting($this->option_group, 'flex_forms_recaptcha_secret_key', 'sanitize_text_field');
-    }
-    
-    public function flex_forms_settings_page()
-    {
+            array( $this, 'settings_page' )
+        );
+    }
+
+    /* --------------------------------------------------------------------- *
+     *  Register settings
+     * --------------------------------------------------------------------- */
+    public function register_settings() {
+
+        /* SMTP */
+        register_setting( $this->option_group, 'flex_forms_use_smtp',            array( $this, 'sanitize_checkbox' ) );
+        register_setting( $this->option_group, 'flex_forms_smtp_host',           'sanitize_text_field' );
+        register_setting( $this->option_group, 'flex_forms_smtp_port',           'absint' );
+        register_setting( $this->option_group, 'flex_forms_smtp_encryption',     'sanitize_text_field' );
+        register_setting( $this->option_group, 'flex_forms_smtp_user',           'sanitize_text_field' );
+        register_setting( $this->option_group, 'flex_forms_smtp_pass',           'sanitize_text_field' );
+
+        /* License */
+        register_setting( $this->option_group, 'flex_forms_license_key',         'sanitize_text_field' );
+
+        /* reCAPTCHA */
+        register_setting( $this->option_group, 'flex_forms_recaptcha_version',   'sanitize_text_field' );
+        register_setting( $this->option_group, 'flex_forms_recaptcha_site_key',  'sanitize_text_field' );
+        register_setting( $this->option_group, 'flex_forms_recaptcha_secret_key','sanitize_text_field' );
+    }
+
+    /* --------------------------------------------------------------------- *
+     *  Enqueue backend assets
+     * --------------------------------------------------------------------- */
+    public function enqueue_assets( $hook ) {
+
+        // Our submenu slug => hook name becomes "{post_type}_page_{slug}"
+        if ( $hook !== 'flex_form_page_flex-forms-settings' ) {
+            return;
+        }
+
+        wp_enqueue_script(
+            'flex-forms-backend',
+            plugins_url( 'assets/js/backend.js', dirname( __FILE__, 2 ) ),
+            array( 'jquery' ),
+            '1.0.0',
+            true
+        );
+
+        wp_localize_script(
+            'flex-forms-backend',
+            'flex_forms_admin_vars',
+            array(
+                'ajaxurl' => admin_url( 'admin-ajax.php' ),
+                'nonce'   => wp_create_nonce( 'flex-forms-nonce' ),
+            )
+        );
+
+        wp_enqueue_style(
+            'flex-forms-settings',
+            plugins_url( 'assets/css/admin.css', dirname( __FILE__, 2 ) ),
+            array(),
+            '1.0.0'
+        );
+    }
+
+    /* --------------------------------------------------------------------- *
+     *  Settings page HTML
+     * --------------------------------------------------------------------- */
+    public function settings_page() {
+
+        // Helper shortcuts
+        $get = function ( $key, $default = '' ) {
+            return esc_attr( get_option( $key, $default ) );
+        };
+        $checked = function ( $key ) {
+            checked( 1, get_option( $key ) );
+        };
         ?>
         <div class="wrap">
-            <h1>Flex Forms Settings</h1>
+            <h1><?php esc_html_e( 'Flex Forms Settings', 'flex-forms' ); ?></h1>
 
             <form method="post" action="options.php">
-                <?php settings_fields($this->option_group); ?>
-
-                <h2 class="text-xl font-bold mb-2">SMTP Settings</h2>
+                <?php settings_fields( $this->option_group ); ?>
+
+                <!-- ==================== SMTP ==================== -->
+                <h2 class="text-xl font-bold mb-2"><?php esc_html_e( 'SMTP Settings', 'flex-forms' ); ?></h2>
                 <table class="form-table w-full">
                     <tr>
-                        <th scope="row">
-                            <label for="flex_forms_use_smtp">Use SMTP?</label>
-                        </th>
-                        <td>
-                            <input type="checkbox" id="flex_forms_use_smtp" name="flex_forms_use_smtp" value="1"
-                                <?php checked(1, get_option('flex_forms_use_smtp')); ?> />
-                            <p class="description">Check to enable SMTP for form emails.</p>
-                        </td>
-                    </tr>
-
-                    <tr class="smtp-dependent">
-                        <th scope="row">
-                            <label for="flex_forms_smtp_host">SMTP Host</label>
-                        </th>
-                        <td>
-                            <input type="text" class="regular-text"
-                                   id="flex_forms_smtp_host"
-                                   name="flex_forms_smtp_host"
-                                   value="<?php echo esc_attr(get_option('flex_forms_smtp_host')); ?>">
-                        </td>
-                    </tr>
-                    <tr class="smtp-dependent">
-                        <th scope="row">
-                            <label for="flex_forms_smtp_port">SMTP Port</label>
-                        </th>
-                        <td>
-                            <input type="number" class="small-text"
-                                   id="flex_forms_smtp_port"
-                                   name="flex_forms_smtp_port"
-                                   value="<?php echo esc_attr(get_option('flex_forms_smtp_port')); ?>">
-                        </td>
-                    </tr>
-                    <tr class="smtp-dependent">
-                        <th scope="row">
-                            <label for="flex_forms_smtp_encryption">Encryption</label>
-                        </th>
-                        <td>
+                        <th scope="row"><label for="flex_forms_use_smtp"><?php esc_html_e( 'Use SMTP?', 'flex-forms' ); ?></label></th>
+                        <td>
+                            <input type="checkbox" id="flex_forms_use_smtp" name="flex_forms_use_smtp" value="1" <?php $checked( 'flex_forms_use_smtp' ); ?> />
+                            <p class="description"><?php esc_html_e( 'Enable SMTP for all e-mails sent by Flex Forms.', 'flex-forms' ); ?></p>
+                        </td>
+                    </tr>
+
+                    <tr class="smtp-dependent">
+                        <th scope="row"><label for="flex_forms_smtp_host"><?php esc_html_e( 'SMTP Host', 'flex-forms' ); ?></label></th>
+                        <td><input type="text" class="regular-text" id="flex_forms_smtp_host" name="flex_forms_smtp_host" value="<?php echo $get( 'flex_forms_smtp_host' ); ?>"></td>
+                    </tr>
+                    <tr class="smtp-dependent">
+                        <th scope="row"><label for="flex_forms_smtp_port"><?php esc_html_e( 'SMTP Port', 'flex-forms' ); ?></label></th>
+                        <td><input type="number" class="small-text" id="flex_forms_smtp_port" name="flex_forms_smtp_port" value="<?php echo $get( 'flex_forms_smtp_port' ); ?>"></td>
+                    </tr>
+                    <tr class="smtp-dependent">
+                        <th scope="row"><label for="flex_forms_smtp_encryption"><?php esc_html_e( 'Encryption', 'flex-forms' ); ?></label></th>
+                        <td>
+                            <?php
+                            $current = strtolower( get_option( 'flex_forms_smtp_encryption', 'none' ) );
+                            $options = array( 'none' => 'None', 'ssl' => 'SSL', 'tls' => 'TLS' );
+                            ?>
                             <select id="flex_forms_smtp_encryption" name="flex_forms_smtp_encryption">
-                                <?php
-                                $current  = strtolower( get_option( 'flex_forms_smtp_encryption' ) );   // normalise
-                                $options  = array( 'None', 'SSL', 'TLS' );                              // display labels
-
-                                foreach ( $options as $label ) {
-                                    $value = strtolower( $label );                                      // none / ssl / tls
-                                    printf(
-                                        '<option value="%1$s" %2$s>%3$s</option>',
-                                        esc_attr( $value ),
-                                        selected( $value, $current, false ),
-                                        esc_html( $label )
-                                    );
-                                }
-                                ?>
+                                <?php foreach ( $options as $value => $label ) : ?>
+                                    <option value="<?php echo esc_attr( $value ); ?>" <?php selected( $value, $current ); ?>><?php echo esc_html( $label ); ?></option>
+                                <?php endforeach; ?>
                             </select>
-
-                        </td>
-                    </tr>
-                    <tr class="smtp-dependent">
-                        <th scope="row">
-                            <label for="flex_forms_smtp_user">SMTP Username</label>
-                        </th>
-                        <td>
-                            <input type="text" class="regular-text"
-                                   id="flex_forms_smtp_user"
-                                   name="flex_forms_smtp_user"
-                                   value="<?php echo esc_attr(get_option('flex_forms_smtp_user')); ?>">
-                        </td>
-                    </tr>
-                    <tr class="smtp-dependent">
-                        <th scope="row">
-                            <label for="flex_forms_smtp_pass">SMTP Password</label>
-                        </th>
-                        <td>
-                            <input type="password" class="regular-text"
-                                   id="flex_forms_smtp_pass"
-                                   name="flex_forms_smtp_pass"
-                                   value="<?php echo esc_attr(get_option('flex_forms_smtp_pass')); ?>">
+                        </td>
+                    </tr>
+                    <tr class="smtp-dependent">
+                        <th scope="row"><label for="flex_forms_smtp_user"><?php esc_html_e( 'SMTP Username', 'flex-forms' ); ?></label></th>
+                        <td><input type="text" class="regular-text" id="flex_forms_smtp_user" name="flex_forms_smtp_user" value="<?php echo $get( 'flex_forms_smtp_user' ); ?>"></td>
+                    </tr>
+                    <tr class="smtp-dependent">
+                        <th scope="row"><label for="flex_forms_smtp_pass"><?php esc_html_e( 'SMTP Password', 'flex-forms' ); ?></label></th>
+                        <td><input type="password" class="regular-text" id="flex_forms_smtp_pass" name="flex_forms_smtp_pass" value="<?php echo $get( 'flex_forms_smtp_pass' ); ?>"></td>
+                    </tr>
+
+                    <!-- Send test e-mail -->
+                    <tr class="smtp-dependent" id="flex_forms_smtp_test_row">
+                        <th scope="row"><label for="flex_forms_smtp_test_email"><?php esc_html_e( 'Send Test Email', 'flex-forms' ); ?></label></th>
+                        <td>
+                            <input type="email" id="flex_forms_smtp_test_email" placeholder="[email protected]" class="regular-text" />
+                            <button type="button" class="button" id="flex_forms_send_test_email_btn"><?php esc_html_e( 'Send Test', 'flex-forms' ); ?></button>
+                            <span id="flex_forms_smtp_test_result" style="margin-left:10px;"></span>
+                            <p class="description"><?php esc_html_e( 'Enter an address and click “Send Test” to verify your SMTP settings.', 'flex-forms' ); ?></p>
                         </td>
                     </tr>
@@ -135 +171 @@
                 <hr class="my-4"/>
 
-                <h2 class="text-xl font-bold mb-2">License Key</h2>
+                <!-- ==================== License ==================== -->
+                <h2 class="text-xl font-bold mb-2"><?php esc_html_e( 'License Key', 'flex-forms' ); ?></h2>
                 <table class="form-table w-full mb-4">
                     <tr>
-                        <th scope="row">
-                            <label for="flex_forms_license_key">License Key</label>
-                        </th>
-                        <td>
-                            <input type="text" class="regular-text"
-                                   id="flex_forms_license_key"
-                                   name="flex_forms_license_key"
-                                   value="<?php echo esc_attr(get_option('flex_forms_license_key')); ?>">
-                            <p class="description">Enter your license key if you have one.</p>
+                        <th scope="row"><label for="flex_forms_license_key"><?php esc_html_e( 'License Key', 'flex-forms' ); ?></label></th>
+                        <td>
+                            <input type="text" class="regular-text" id="flex_forms_license_key" name="flex_forms_license_key" value="<?php echo $get( 'flex_forms_license_key' ); ?>">
                         </td>
                     </tr>
@@ -153 +184 @@
                 <hr class="my-4"/>
 
-                <h2 class="text-xl font-bold mb-2">reCaptcha Settings</h2>
+                <!-- ==================== reCAPTCHA ==================== -->
+                <h2 class="text-xl font-bold mb-2"><?php esc_html_e( 'reCAPTCHA Settings', 'flex-forms' ); ?></h2>
                 <table class="form-table w-full">
                     <tr>
-                        <th scope="row">
-                            <label for="flex_forms_recaptcha_version">Version</label>
-                        </th>
-                        <td>
+                        <th scope="row"><label for="flex_forms_recaptcha_version"><?php esc_html_e( 'Version', 'flex-forms' ); ?></label></th>
+                        <td>
+                            <?php
+                            $version_current = get_option( 'flex_forms_recaptcha_version', 'none' );
+                            $version_options = array(
+                                'none' => 'None',
+                                'v2'   => 'v2 Checkbox',
+                                'v3'   => 'v3 Invisible',
+                            ); ?>
                             <select id="flex_forms_recaptcha_version" name="flex_forms_recaptcha_version">
-                                <?php
-                                $current = get_option('flex_forms_recaptcha_version', 'none');
-                                $options = array(
-                                    'none' => 'None',
-                                    'v2' => 'v2 Checkbox',
-                                    'v3' => 'v3 Invisible',
-                                );
-                                foreach ($options as $value => $label) {
-                                    printf(
-                                        '<option value="%1$s" %2$s>%3$s</option>',
-                                        esc_attr($value),
-                                        selected($value, $current, false),
-                                        esc_html($label)
-                                    );
-                                }
-                                ?>
+                                <?php foreach ( $version_options as $value => $label ) : ?>
+                                    <option value="<?php echo esc_attr( $value ); ?>" <?php selected( $value, $version_current ); ?>><?php echo esc_html( $label ); ?></option>
+                                <?php endforeach; ?>
                             </select>
                         </td>
                     </tr>
                     <tr>
-                        <th scope="row">
-                            <label for="flex_forms_recaptcha_site_key">Site Key</label>
-                        </th>
-                        <td>
-                            <input type="text" class="regular-text"
-                                   id="flex_forms_recaptcha_site_key"
-                                   name="flex_forms_recaptcha_site_key"
-                                   value="<?php echo esc_attr(get_option('flex_forms_recaptcha_site_key')); ?>">
-                        </td>
-                    </tr>
-                    <tr>
-                        <th scope="row">
-                            <label for="flex_forms_recaptcha_secret_key">Secret Key</label>
-                        </th>
-                        <td>
-                            <input type="text" class="regular-text"
-                                   id="flex_forms_recaptcha_secret_key"
-                                   name="flex_forms_recaptcha_secret_key"
-                                   value="<?php echo esc_attr(get_option('flex_forms_recaptcha_secret_key')); ?>">
-                        </td>
+                        <th scope="row"><label for="flex_forms_recaptcha_site_key"><?php esc_html_e( 'Site Key', 'flex-forms' ); ?></label></th>
+                        <td><input type="text" class="regular-text" id="flex_forms_recaptcha_site_key" name="flex_forms_recaptcha_site_key" value="<?php echo $get( 'flex_forms_recaptcha_site_key' ); ?>"></td>
+                    </tr>
+                    <tr>
+                        <th scope="row"><label for="flex_forms_recaptcha_secret_key"><?php esc_html_e( 'Secret Key', 'flex-forms' ); ?></label></th>
+                        <td><input type="text" class="regular-text" id="flex_forms_recaptcha_secret_key" name="flex_forms_recaptcha_secret_key" value="<?php echo $get( 'flex_forms_recaptcha_secret_key' ); ?>"></td>
                     </tr>
                 </table>
@@ -210 +220 @@
     }
 
-    public function sanitize_checkbox($input)
-    {
-        return ($input === '1') ? 1 : 0;
-    }
-
+    /* --------------------------------------------------------------------- *
+     *  Helpers
+     * --------------------------------------------------------------------- */
+    public function sanitize_checkbox( $input ) {
+        return ( $input === '1' ) ? 1 : 0;
+    }
 }

flex-forms/trunk/includes/class-flex-forms-submissions.php

@@ -63 +63 @@
     }
 
-    public function flex_forms_remove_row_actions($actions, $post) {
-        if ($post->post_type === 'flex_submission') {
-            if (isset($actions['edit'])) {
-                $actions['edit'] = str_replace('Edit', 'View', $actions['edit']);
-            }
-            unset($actions['view']);
-            unset($actions['inline hide-if-no-js']);
-        }
+    public function flex_forms_remove_row_actions( $actions, $post ) {
+
+        if ( $post->post_type !== 'flex_submission' ) {
+            return $actions;
+        }
+
+        /* Rename “Edit” → “View” & hide some links (your old code) */
+        if ( isset( $actions['edit'] ) ) {
+            $actions['edit'] = str_replace( 'Edit', 'View', $actions['edit'] );
+        }
+        unset( $actions['view'], $actions['inline hide-if-no-js'] );
+
+        /* + Add our Send-E-mail link */
+        $nonce  = wp_create_nonce( 'mass_email_nonce' );
+        $mail   = admin_url(
+            'admin.php?page=flex_forms_mass_email'
+            . '&submission_id=' . $post->ID
+            . '&_wpnonce=' . $nonce
+        );
+        $actions['flex_forms_send_email'] =
+            '<a href="' . esc_url( $mail ) . '">' . esc_html__( 'Send E-mail', 'flex-forms' ) . '</a>';
+
         return $actions;
     }
@@ -111 +125 @@
     }
 
-    public function flex_forms_submission_meta_box_callback($post) {
-        $data = get_post_meta($post->ID, '_flex_form_data', true);
-        $form_id = get_post_meta($post->ID, '_flex_form_id', true);
-        $back_url = admin_url('edit.php?post_type=flex_submission&s='.$form_id);
-        unset($data['action']);
-        echo '<h3>' . esc_attr($post->post_title) . '</h3>';
-        if(!empty($data)) {
-            echo '<table class="form-table">';
-            foreach($data as $key => $value) {
-                if($key === '_wp_http_referer') {
-                    $key = 'Referrer';
-                }
-                echo '<tr>';
-                echo '<th>' . esc_attr($key) . '</th>';
-                echo '<td>' . esc_attr($value) . '</td>';
-                echo '</tr>';
+    public function flex_forms_submission_meta_box_callback( $post ) {
+
+        /* --------------------------------------------------------------------
+         * 1. Gather meta + helpers
+         * ----------------------------------------------------------------- */
+        $data       = get_post_meta( $post->ID, '_flex_form_data', true );
+        $form_id    = get_post_meta( $post->ID, '_flex_form_id', true );
+        $back_url   = admin_url( 'edit.php?post_type=flex_submission&s=' . $form_id );
+
+        /* --------------------------------------------------------------------
+         * 2. Heading + submission date
+         * ----------------------------------------------------------------- */
+        echo '<h3>' . esc_html( $post->post_title ) . '</h3>';
+        echo '<p><strong>' . esc_html__( 'Submitted on:', 'flex-forms' ) . '</strong> '
+            . esc_html( get_the_date( 'Y-m-d H:i', $post ) )
+            . '</p>';
+
+        /* --------------------------------------------------------------------
+         * 3. Data table
+         * ----------------------------------------------------------------- */
+        unset( $data['action'] );          // internal key
+
+        if ( ! empty( $data ) ) {
+            echo '<table class="form-table" style="margin-top:8px;">';
+            foreach ( $data as $key => $value ) {
+                if ( $key === '_wp_http_referer' ) { $key = 'Referrer'; }
+                echo '<tr><th>' . esc_html( $key ) . '</th><td>' . esc_html( is_array( $value ) ? implode( ', ', $value ) : $value ) . '</td></tr>';
             }
             echo '</table>';
         }
-        echo '<a href="' . esc_url($back_url) . '" class="button button-primary">Back to Submissions</a>';
+
+        /* --------------------------------------------------------------------
+         * 4. Action buttons: back + send-mail
+         * ----------------------------------------------------------------- */
+        $nonce    = wp_create_nonce( 'mass_email_nonce' );
+        $mail_url = admin_url(
+            'admin.php?page=flex_forms_mass_email'
+            . '&form_id='       . $form_id
+            . '&submission_id=' . $post->ID
+            . '&_wpnonce='      . $nonce
+        );
+
+        echo '<p style="margin-top:15px;">'
+            . '<a href="' . esc_url( $back_url ) . '" class="button button-secondary" style="margin-right:6px;">'
+            . esc_html__( 'Back to Submissions', 'flex-forms' ) . '</a>'
+            . '<a href="' . esc_url( $mail_url ) . '" class="button button-primary">'
+            . esc_html__( 'Send E-mail', 'flex-forms' ) . '</a>'
+            . '</p>';
     }
 
@@ -141 +183 @@
 
     /**
-     *  Replace the default list‑table columns for flex_submission posts.
-     *  – Removes the built‑in “Title” column
-     *  – Adds a “Referrer” column
-     *  – Adds one column for every user field stored in _flex_form_data
+     * Replace the default list-table columns for flex_submission posts.
+     * – Removes the built-in “Title” column
+     * – Adds one column for every user field stored in _flex_form_data
+     * – Renames the Date column to “Date Submitted”
      */
     public function flex_forms_add_data_columns( $columns ) {
 
-        // Remove WP’s built‑in Title column
+        /* 1. Remove WP’s built-in Title column */
         unset( $columns['title'] );
 
-        // Discover one submission to get its keys
+        /* 2. Inspect one submission to get its custom field keys */
         $example = get_posts( [
             'post_type'      => 'flex_submission',
@@ -160 +202 @@
         ] );
 
-        if ( $example ) {
-            $meta_data = get_post_meta( $example[0]->ID, '_flex_form_data', true );
-        }
-
-        $new_columns = [];
+        $meta_data = $example
+            ? get_post_meta( $example[0]->ID, '_flex_form_data', true )
+            : array();
+
+        $new = array();
 
         foreach ( $columns as $key => $label ) {
 
-            /* Insert our custom columns just before the Date column */
-            if ( $key === 'date' ) {
-
-                // 1.  Referrer column
-                $new_columns['referrer'] = __( 'Referrer', 'flex-forms' );
-
-                // 2.  Dynamic user‑field columns
-                if ( ! empty( $meta_data ) && is_array( $meta_data ) ) {
-                    foreach ( $meta_data as $field_key => $value ) {
-                        if ( strpos( $field_key, '_' ) === 0 ) {        // skip internal keys
-                            continue;
-                        }
-                        $label = ucwords( str_replace( '_', ' ', $field_key ) );
-                        $new_columns[ $field_key ] = $label;
+            /* Insert dynamic user-field columns just before Date */
+            if ( $key === 'date' && ! empty( $meta_data ) ) {
+                foreach ( $meta_data as $field_key => $value ) {
+                    if ( strpos( $field_key, '_' ) === 0 ) {        // skip internal keys
+                        continue;
                     }
+                    $nice = ucwords( str_replace( '_', ' ', $field_key ) );
+                    $new[ $field_key ] = $nice;
                 }
             }
 
-            // keep original column (date, author, etc.)
-            $new_columns[ $key ] = $label;
-        }
-
-        return $new_columns;
+            /* Keep WordPress’ original column but rename the heading */
+            $new[ $key ] = ( $key === 'date' )
+                ? __( 'Date Submitted', 'flex-forms' )
+                : $label;
+        }
+
+        return $new;
     }
 
     /**
-     *  Populate our custom columns.
+     * Populate dynamic field columns in the submissions list.
      */
     public function flex_forms_populate_referer_column( $column, $post_id ) {
@@ -203 +240 @@
         }
 
-        /* Referrer column */
-        if ( $column === 'referrer' ) {
-            $ref = $meta['_referrer_url'] ?? '';
-            echo $ref
-                ? sprintf( '<a href="%1$s" target="_blank" rel="noopener">%2$s</a>',
-                    esc_url( $ref ),
-                    esc_html( wp_parse_url( $ref, PHP_URL_HOST ) )
-                )
-                : '<em>' . esc_html__( 'None', 'flex-forms' ) . '</em>';
-            return;
-        }
-
-        /* Dynamic field columns */
+        /* Dynamic user-field columns */
         if ( isset( $meta[ $column ] ) ) {
             $value = $meta[ $column ];
@@ -224 +249 @@
         }
     }
-    public function flex_forms_add_export_button($which) {
-        if ($which === 'top' && get_current_screen()->post_type === 'flex_submission') {
-            $form_id = isset($_GET['form_id']) ? absint($_GET['form_id']) : 0;
-            $export_nonce = wp_create_nonce('export_nonce');
-            $export_url = admin_url('edit.php?post_type=flex_submission&flex_forms_export_csv=1&_wpnonce=' . $export_nonce . '&form_id=' . $form_id);
-            echo '<a href="' . esc_attr($export_url) . '" class="button button-primary">Export to CSV</a>';
+
+    /**
+     * Adds “Export to CSV” (always) and “Send Mass E-Mail” (when possible)
+     * above the Submissions list-table.
+     *
+     * @param string $which  'top' | 'bottom'
+     */
+    public function flex_forms_add_export_button( $which ) {
+
+        /* Only output buttons at the top of the flex_submission list-table */
+        if ( $which !== 'top' || get_current_screen()->post_type !== 'flex_submission' ) {
+            return;
+        }
+
+        /* -------------------------------------------------------------- */
+        /* 1. Resolve the current form-ID (0  ⇒  unknown)                 */
+        /* -------------------------------------------------------------- */
+        $form_id = 0;
+
+        if ( ! empty( $_GET['form_id'] ) && is_numeric( $_GET['form_id'] ) ) {
+            $form_id = absint( $_GET['form_id'] );
+        } elseif ( ! empty( $_GET['s'] ) && is_numeric( $_GET['s'] ) ) {
+            /* When the list is filtered via the “search” box */
+            $form_id = absint( $_GET['s'] );
+        }
+
+        /* -------------------------------------------------------------- */
+        /* 2. “Export to CSV” – always available                           */
+        /* -------------------------------------------------------------- */
+        $export_url = add_query_arg(
+            [
+                'post_type'             => 'flex_submission',
+                'flex_forms_export_csv' => 1,
+                'form_id'               => $form_id,
+                '_wpnonce'              => wp_create_nonce( 'export_nonce' ),
+            ],
+            admin_url( 'edit.php' )
+        );
+
+        echo '<a href="' . esc_url( $export_url ) . '" class="button button-primary" style="margin-right:6px;">'
+            . '<span class="dashicons dashicons-download" style="margin-right:4px; vertical-align:middle;"></span>'
+            . esc_html__( 'Export to CSV', 'flex-forms' ) . '</a>';
+
+
+        /* -------------------------------------------------------------- */
+        /* 3. “Send Mass E-Mail” – only when we have a valid form-ID       */
+        /* -------------------------------------------------------------- */
+        if ( $form_id ) {
+
+            $mail_url = add_query_arg(
+                [
+                    'post_type' => 'flex_form',                // CPT-style parent
+                    'page'      => 'flex_forms_mass_email',    // hidden submenu slug
+                    'form_id'   => $form_id,
+                    '_wpnonce'  => wp_create_nonce( 'mass_email_nonce' ),
+                ],
+                admin_url( 'edit.php' )
+            );
+
+            $edit_form_url = add_query_arg(
+                [
+                    'post_type' => 'flex_form',
+                    'action'    => 'edit',
+                    'post'      => $form_id,
+                ],
+                admin_url( 'post.php' )
+            );
+
+            echo '<a href="' . esc_url( $mail_url ) . '" class="button button-secondary" style="margin-right:6px;">'
+                . '<span class="dashicons dashicons-email" style="margin-right:4px; vertical-align:middle;"></span>'
+                . esc_html__( 'Send Mass E-Mail', 'flex-forms' ) . '</a>';
+
+            echo '<a href="' . esc_url( $edit_form_url ) . '" class="button button-secondary" style="margin-right:6px;">'
+                . '<span class="dashicons dashicons-edit" style="margin-right:4px; vertical-align:middle;"></span>'
+                . esc_html__( 'Edit Form', 'flex-forms' ) . '</a>';
+
         }
     }

flex-forms/trunk/readme.txt

@@ -6 +6 @@
 Tested up to: 6.8
 Requires PHP: 7.0
-Stable tag: 2.1.1
+Stable tag: 2.1.2
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html