Changeset 3430112

Timestamp:

12/31/2025 12:41:00 PM (8 weeks ago)

Author:

vinema

Message:

1.3.2 - translation to FI

Location:

vine-ma/trunk

Files:

• languages (added)
• languages/vinema-fi.mo (added)
• languages/vinema-fi.po (added)
• readme.txt (modified) (2 diffs)
• vine_ma_plugin.php (modified) (24 diffs)
• web_form_block.js (modified) (14 diffs)

vine-ma/trunk/readme.txt

@@ -3 +3 @@
 Tags: vine, marketing, automation, visitor tracking, email
 Tested up to: 6.9
-Requires at least: 3.0.1
-Requires PHP: 5.2
-Stable tag: 1.3.1
+Requires at least: 5.0
+Requires PHP: 7.0
+Stable tag: 1.3.2
 License: GPLv2
 License URI: http://www.gnu.org/licenses/gpl-2.0
@@ -21 +21 @@
 
 == Changelog ==
+
+= 1.3.2 =
+* Finnish translation included now. Allow Vine form block usage in modern editors too
 
 = 1.3.1 =

vine-ma/trunk/vine_ma_plugin.php

@@ -3 +3 @@
 /**
  * Plugin Name: Vine MA - Email Marketing, Forms, Interactive Bot Forms, Chatbot, Analytics
- * Version: 1.3.1
+ * Version: 1.3.2
  * Description: Vine is a Marketing automation tool to generate more leads from your web site. Vine includes web forms, interactive bot forms, landing pages, AI chatbot, visitor tracking, and other functionality to help you to make your site more interesting and to know better what your visitors do there.
  * Author: Vine Oy
  * Author URI: https://vine.eu
  * Text Domain: vinema
+ * Domain Path: /languages
  * License: GPLv2
  * License URI: http://www.gnu.org/licenses/gpl-2.0
  */
 
+define("VINEMA_VERSION", "1.3.2");
 define("VINEHOST", "https://vine.eu");
 define("VINECDNHOST", "https://cdn.vine.eu");
@@ -24 +26 @@
 add_action( 'admin_init', 'vine_ma_register_plugin_settings' );
 add_action( 'admin_enqueue_scripts', 'vine_ma_add_vine_script');
+add_action( 'plugins_loaded', 'vine_ma_load_textdomain' );
+
+function vine_ma_load_textdomain() {
+    load_plugin_textdomain( 'vinema', false, dirname( plugin_basename( __FILE__ ) ) . '/languages/' );
+}
 
 function vine_ma_add_vine_script($hook) {
@@ -44 +51 @@
     $links[] = '<a href="' .
         admin_url( 'options-general.php?page=vine_ma_plugin' ) .
-        '">' . __('Settings') . '</a>';
+           '">' . __('Settings', 'vinema') . '</a>';
     return $links;
 }
@@ -68 +75 @@
     add_settings_field( 'vine_ma_plugin_setting_username', 'Username:', 'vine_ma_plugin_setting_username', 'vine_ma_plugin', 'vine_ma_general_settings');
     add_settings_field( 'vine_ma_plugin_setting_organization_id', 'Organization ID:', 'vine_ma_plugin_setting_organization_id', 'vine_ma_plugin', 'vine_ma_general_settings');
-    register_setting( 'vine-plugin-web-forms-cache', 'vine-plugin-web-forms-cache');
 }
 
 //render plugin page
 function vine_ma_render_help_text() {
-    echo "<p>Vine is a Marketing automation tool to generate more leads from your web site. Vine includes web forms, interactive bot forms, landing pages, AI chatbot, visitor tracking, and other functionality to help you to make your site more interesting and to know better what your visitors do there.</p>";
+    echo '<p>' . esc_html__( 'Vine is a Marketing automation tool to generate more leads from your web site. Vine includes web forms, interactive bot forms, landing pages, AI chatbot, visitor tracking, and other functionality to help you to make your site more interesting and to know better what your visitors do there.', 'vinema' ) . '</p>';
     
     $apikey = vine_ma_get_option('apikey');
@@ -79 +85 @@
     if( $apikey != null )
     {
-        echo "<p>You are currently connected to MA</p>";
-        echo "<p><a href='javascript:logoutFromMA();'>Logout from MA</a></p>";
+        echo '<p>' . esc_html__( 'You are currently connected to MA', 'vinema' ) . '</p>';
+        echo '<p><a href="javascript:logoutFromMA();">' . esc_html__( 'Logout from MA', 'vinema' ) . '</a></p>';
     }
     else {
-        echo "<p>You need Vine account to use this plugin. If you do not have one, you can register trial account in <a target='_blank' href='https://vine.eu/en/try-for-free'>https://vine.eu/en/try-for-free</a></p>";
-        echo "<p><a id='vinemaloginbtn' href='javascript:openMaLoginWindow();'>Login to MA</a></p>";
-        echo "<p><b>Please do not use partner account which can be moved between different customers.</b></p>";
+        echo '<p>' . wp_kses_post( sprintf(
+            /* translators: %s is the registration link. */
+            __( 'You need Vine account to use this plugin. If you do not have one, you can register trial account in %s', 'vinema' ),
+            "<a target='_blank' href='https://vine.eu/en/try-for-free'>https://vine.eu/en/try-for-free</a>"
+        ) ) . '</p>';
+        echo '<p><a id="vinemaloginbtn" href="javascript:openMaLoginWindow();">' . esc_html__( 'Login to MA', 'vinema' ) . '</a></p>';
+        echo '<p><b>' . esc_html__( 'Please do not use partner account which can be moved between different customers.', 'vinema' ) . '</b></p>';
     }
 }
 function vine_ma_plugin_setting_organization_id() {
     $orgid = vine_ma_get_option('organization_id');
-    echo "<input id='vine_ma_plugin_setting_organization_id' name='vine-plugin-options[organization_id]' type='text' value='{$orgid}' readonly />";
+    $orgid_attr = esc_attr($orgid ?? '');
+    echo "<input id='vine_ma_plugin_setting_organization_id' name='vine-plugin-options[organization_id]' type='text' value='{$orgid_attr}' readonly />";
 }
 
@@ -97 +108 @@
     if($username == null)
         $username = '';
-    echo "<input id='vine_ma_plugin_setting_username' name='vine-plugin-options[username]' type='text' value='{$username}' readonly />";
+    $username_attr = esc_attr($username);
+    echo "<input id='vine_ma_plugin_setting_username' name='vine-plugin-options[username]' type='text' value='{$username_attr}' readonly />";
 }
 
@@ -104 +116 @@
     if ( is_user_logged_in() && isset($_GET['et_fb']) && isset($_GET['PageSpeed'])) return;
     $orgid = vine_ma_get_option('organization_id');
-    $src = VINECDNHOST."/vscript/{$orgid}.js";
-    $srcac = VINECDNHOST."/vscript/allowCookies.js";
+    if ( empty($orgid) ) {
+        return;
+    }
+
+    $orgid_encoded = rawurlencode($orgid);
+    $src = esc_url(VINECDNHOST . "/vscript/{$orgid_encoded}.js");
+    $srcac = esc_url(VINECDNHOST . '/vscript/allowCookies.js');
     ?>
-        <script type="text/javascript" src="<?php echo $src ?>" data-cookieconsent="ignore"></script>
-        <script type="text/plain" src="<?php echo $srcac ?>" data-cookieconsent="marketing" async></script>
+        <script type="text/javascript" src="<?php echo $src; ?>" data-cookieconsent="ignore"></script>
+        <script type="text/plain" src="<?php echo $srcac; ?>" data-cookieconsent="marketing" async></script>
     <?php
 }
@@ -151 +168 @@
 //get user organization id
 function vine_ma_get_organizationid_username($token) {
-    $url=VINEHOST."/api/rest/2.0/user?\$authtoken={$token}";
-    $args = array(
-      'timeout' => 20,
-      'user-agent'  =>  ''
-    );
+        $url = VINEHOST . "/api/rest/2.0/user";
+        $args = array(
+            'timeout' => 20,
+            'user-agent'  =>  '',
+            'headers' => array(
+                '$authtoken' => $token,
+            ),
+        );
     $html = wp_remote_get($url, $args);
     $returncode = wp_remote_retrieve_response_code($html);
     if ( $returncode === 200 || $returncode === 304) {
         $body = wp_remote_retrieve_body($html);
-        $xml = new SimpleXMLElement($body);
+        $xml = vine_ma_parse_xml($body);
+        if ( ! $xml ) {
+            return null;
+        }
+
         $orgid = '';
         $username = '';
-        foreach($xml->xpath('//m:properties') as $event) {
-          $orgid = (string)$event->xpath('d:ORGANIZATIONID')[0];
-          $firstname = (string)$event->xpath('d:FIRSTNAME')[0];
-          $lastname = (string)$event->xpath('d:LASTNAME')[0];
-          $email = (string)$event->xpath('d:EMAIL')[0];
-          $username = $firstname . ' ' . $lastname . ' (' . $email . ')';
-        }
+        $properties = $xml->xpath('//m:properties');
+        if ( is_array($properties) ) {
+            foreach($properties as $event) {
+              $orgid_node = $event->xpath('d:ORGANIZATIONID');
+              $firstname_node = $event->xpath('d:FIRSTNAME');
+              $lastname_node = $event->xpath('d:LASTNAME');
+              $email_node = $event->xpath('d:EMAIL');
+              $orgid = isset($orgid_node[0]) ? (string)$orgid_node[0] : '';
+              $firstname = isset($firstname_node[0]) ? (string)$firstname_node[0] : '';
+              $lastname = isset($lastname_node[0]) ? (string)$lastname_node[0] : '';
+              $email = isset($email_node[0]) ? (string)$email_node[0] : '';
+              $username = trim($firstname . ' ' . $lastname . ($email ? " ({$email})" : ''));
+            }
+        }
+        if ( $orgid === '' ) {
+            return null;
+        }
+
         return array(
             'orgid' => $orgid,
@@ -210 +245 @@
     ));
 
+    delete_transient('vine_web_forms_cache');
+    delete_transient('vine_multiorg_status_cache');
+
     wp_send_json_success();
 }
@@ -225 +263 @@
         'apikey' => '',
     ));
-    update_option('vine-plugin-web-forms-cache', array());
+    delete_transient('vine_web_forms_cache');
+    delete_transient('vine_multiorg_status_cache');
 
     wp_send_json_success();
@@ -233 +272 @@
 function vine_ma_admin_notice()
 {
+    if ( ! current_user_can( 'manage_options' ) ) {
+        return;
+    }
     $vineLogo = <<<EOD
         <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="9" viewBox='0 0 134 34' style="margin-right: 10px">
@@ -251 +293 @@
             <p>
                 <?php echo $vineLogo ?>
-                <?php _e('Warning! You are not connected to Vine MA. Vine services cannot work on your pages!', 'textdomain') ?>
+                <?php esc_html_e('Warning! You are not connected to Vine MA. Vine services cannot work on your pages!', 'vinema') ?>
             </p>
         </div>
@@ -265 +307 @@
             <p>
                 <?php echo $vineLogo ?>
-                <?php _e('An error occurred while communicating with Vine MA. Please try to relogin.', 'textdomain') ?>
+                <?php esc_html_e('An error occurred while communicating with Vine MA. Please try to relogin.', 'vinema') ?>
             </p>
         </div>
@@ -275 +317 @@
 function vine_ma_admin_notice_multiorg_status()
 {
+    if ( ! current_user_can( 'manage_options' ) ) {
+        return;
+    }
     $vineLogo = <<<EOD
         <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="9" viewBox='0 0 134 34' style="margin-right: 10px">
@@ -294 +339 @@
             <p>
                 <?php echo $vineLogo ?>
-                <?php _e('Warning! The account used should be account which cannot access multiple organizations. Please relogin with proper account.', 'textdomain') ?>
+                <?php esc_html_e('Warning! The account used should be account which cannot access multiple organizations. Please relogin with proper account.', 'vinema') ?>
             </p>
         </div>
@@ -310 +355 @@
 //vine web block hook
 function vine_ma_gutenberg_register_web_form_block() {
-    global $pagenow;
-    if ( $pagenow != 'post.php' && $pagenow != 'post-new.php' )
-        return;
     if ( ! function_exists( 'register_block_type' ) ) {
         // Gutenberg is not active.
@@ -319 +361 @@
     
     $block_script_path = plugin_dir_path(__FILE__) . 'web_form_block.js';
-    $block_script_ver  = file_exists($block_script_path) ? filemtime($block_script_path) : false;
+    $block_script_ver  = file_exists($block_script_path) ? filemtime($block_script_path) : VINEMA_VERSION;
 
     wp_register_script(
         'vine-web-form-01',
         plugins_url( 'web_form_block.js', __FILE__ ),
-        array( 'wp-blocks', 'wp-element' ),
+        array( 'wp-blocks', 'wp-element', 'wp-data', 'wp-i18n' ),
         $block_script_ver
     );
-    
-    $webforms = vine_ma_get_web_forms();
-    
-    wp_localize_script('vine-web-form-01', 'VineFormsData', $webforms);
     
     register_block_type( 'vine-ma-plugin/vine-web-form', array(
@@ -336 +374 @@
         )
     );
+}
+
+add_action( 'enqueue_block_editor_assets', 'vine_ma_localize_block_forms_data' );
+
+function vine_ma_localize_block_forms_data() {
+    if ( ! wp_script_is( 'vine-web-form-01', 'registered' ) ) {
+        return;
+    }
+
+    $webforms = vine_ma_get_web_forms();
+    wp_localize_script( 'vine-web-form-01', 'VineFormsData', $webforms );
+
+    $block_labels = array(
+        'title'      => __( 'Vine: Web Form', 'vinema' ),
+        'formsError' => __( 'Vine form data unavailable.', 'vinema' ),
+        'formType'   => __( 'Form Type:', 'vinema' ),
+        'staticForm' => __( 'Static Form', 'vinema' ),
+        'botForm'    => __( 'Bot Form', 'vinema' ),
+        'vineForm'   => __( 'Vine Form:', 'vinema' ),
+        'notSet'     => __( '<not set>', 'vinema' ),
+    );
+    wp_localize_script( 'vine-web-form-01', 'VineFormsStrings', $block_labels );
 }
 
@@ -346 +406 @@
 }
 
+function vine_ma_parse_xml($body) {
+    if ( ! is_string($body) || $body === '' ) {
+        return null;
+    }
+
+    $previous = libxml_use_internal_errors(true);
+    $xml = simplexml_load_string($body);
+    libxml_clear_errors();
+    libxml_use_internal_errors($previous);
+
+    if ( $xml === false ) {
+        return null;
+    }
+
+    return $xml;
+}
+
 //get vine web forms via rest api
 function vine_ma_get_web_forms() {
-    $cache = get_option( 'vine-plugin-web-forms-cache' );
-    if(is_array( $cache ) && isset($cache['timestamp']) && $cache['timestamp'] != null && (time() - $cache['timestamp']) < 120)
-    {
-        return array(
-            'forms' => isset($cache['forms']) ? $cache['forms'] : array(),
-            'error' => null
-        );
+    $cache = get_transient( 'vine_web_forms_cache' );
+    if ( false !== $cache ) {
+        return $cache;
     }
     $errorMessage = 'An error occurred while communicating with Vine MA. Please try to refresh page.';
@@ -360 +433 @@
     if( $apikey != null) {
       $tokendata = vine_ma_get_authtoken($apikey);
-      $token = $tokendata['token'];
-      $error = $tokendata['error'];
+      $token = is_array($tokendata) ? ($tokendata['token'] ?? null) : null;
+      $error = is_array($tokendata) ? ($tokendata['error'] ?? null) : null;
       if( $token == null ) 
           return array(
             'forms' => array(),
-            'error' => "{$errorMessage} Token:{$error}"
+            'error' => "{$errorMessage} Token:" . ( $error !== null ? $error : 'Unknown error' )
         );
     } else {
@@ -373 +446 @@
         );
     }
-    $url=VINEHOST."/api/rest/2.0/VS_TRACK_FORM([FORMTYPE] <> 1 and [FORMTYPE] <> 2 and [FORMTYPE] <> 3 and [FORMTYPE] <> 4)?order=name&\$authtoken={$token}";
-    $args = array(
-      'timeout' => 20,
-      'user-agent'  =>  ''
-    );
+        $url = VINEHOST . "/api/rest/2.0/VS_TRACK_FORM([FORMTYPE] <> 1 and [FORMTYPE] <> 2 and [FORMTYPE] <> 3 and [FORMTYPE] <> 4)?order=name";
+        $args = array(
+            'timeout' => 20,
+            'user-agent'  =>  '',
+            'headers' => array(
+                '$authtoken' => $token,
+            ),
+        );
     $html = wp_remote_get($url,$args);
     $returncode = wp_remote_retrieve_response_code($html);
-        $body = wp_remote_retrieve_body($html);
-     if ( $returncode === 200 || $returncode === 304 ) {
-        $xml = new SimpleXMLElement($body);
+    $body = wp_remote_retrieve_body($html);
+    if ( $returncode === 200 || $returncode === 304 ) {
+        $xml = vine_ma_parse_xml($body);
+        if ( ! $xml ) {
+            return array(
+                'forms' => array(),
+                'error' => "{$errorMessage} Forms:Invalid XML response"
+            );
+        }
+
         $webforms = array();
-        foreach($xml->xpath('//m:properties') as $event) {
-          array_push($webforms, array(
-            'id' => (string)$event->xpath('d:ID')[0],
-            'name' => (string)$event->xpath('d:NAME')[0],
-            'type' => (string)$event->xpath('d:FORMTYPE')[0],
-          ));
-        }
-        $timestamp = time();
-        update_option( 'vine-plugin-web-forms-cache', array(
-            'forms' => $webforms,
-            'timestamp' => $timestamp
-        ));
-        return array(
+        $properties = $xml->xpath('//m:properties');
+        if ( is_array($properties) ) {
+            foreach ( $properties as $event ) {
+                $id_node   = $event->xpath( 'd:ID' );
+                $name_node = $event->xpath( 'd:NAME' );
+                $type_node = $event->xpath( 'd:FORMTYPE' );
+
+                $raw_id   = isset( $id_node[0] ) ? (string) $id_node[0] : '';
+                $raw_name = isset( $name_node[0] ) ? (string) $name_node[0] : '';
+                $raw_type = isset( $type_node[0] ) ? (string) $type_node[0] : '';
+
+                $sanitized_id = preg_replace( '/[^0-9A-Za-z_-]/', '', $raw_id );
+                if ( $sanitized_id === '' ) {
+                    continue;
+                }
+
+                $sanitized_type = preg_replace( '/[^0-9]/', '', $raw_type );
+
+                $webforms[] = array(
+                    'id'   => $sanitized_id,
+                    'name' => sanitize_text_field( wp_strip_all_tags( $raw_name ) ),
+                    'type' => $sanitized_type === '' ? '0' : $sanitized_type,
+                );
+            }
+        }
+
+        $payload = array(
             'forms' => $webforms,
             'error' => null
         );
+        set_transient( 'vine_web_forms_cache', $payload, 120 );
+        return $payload;
     }
     else {
@@ -411 +510 @@
 //check account multiorg status
 function vine_ma_get_multiorg_status() {
-    $cache = get_option( 'vine-plugin-account-multiorgstatus-cache' );
-    if(is_array( $cache ) && isset($cache['timestamp']) && $cache['timestamp'] != null && (time() - $cache['timestamp']) < 120)
-    {
-        return isset($cache['multiorgstatus']) ? $cache['multiorgstatus'] : false;
+    $cache = get_transient( 'vine_multiorg_status_cache' );
+    if ( false !== $cache ) {
+        return (bool) $cache;
     }
     $errorMessage = 'An error occurred while communicating with Vine MA. Please try to refresh page.';
@@ -420 +518 @@
     if( $apikey != null) {
       $tokendata = vine_ma_get_authtoken($apikey);
-      $token = $tokendata['token'];
-      $error = $tokendata['error'];
+      $token = is_array($tokendata) ? ($tokendata['token'] ?? null) : null;
+      $error = is_array($tokendata) ? ($tokendata['error'] ?? null) : null;
       if( $token == null ) 
           return false;
@@ -427 +525 @@
         return false;
     }
-    $url=VINEHOST."/api/rest/2.0/VY_USERGROUP([STATUS]='B' and [GROUPROLE] in ('SWITCHORGANIZATION','SWITCHTOANYORG'))?\$authtoken={$token}";
-    $args = array(
-      'timeout' => 20,
-      'user-agent'  =>  ''
-    );
+        $url = VINEHOST . "/api/rest/2.0/VY_USERGROUP([STATUS]='B' and [GROUPROLE] in ('SWITCHORGANIZATION','SWITCHTOANYORG'))";
+        $args = array(
+            'timeout' => 20,
+            'user-agent'  =>  '',
+            'headers' => array(
+                '$authtoken' => $token,
+            ),
+        );
     $html = wp_remote_get($url,$args);
     $returncode = wp_remote_retrieve_response_code($html);
-     if ( $returncode === 200 || $returncode === 304 ) {
+    if ( $returncode === 200 || $returncode === 304 ) {
         $body = wp_remote_retrieve_body($html);
-        $xml = new SimpleXMLElement($body);
-        $status = $xml->xpath('//m:count')[0] == 0 ? false : true;
-        $timestamp = time();
-        update_option( 'vine-plugin-account-multiorgstatus-cache', array(
-            'multiorgstatus' => $status,
-            'timestamp' => $timestamp
-        ));
+        $xml = vine_ma_parse_xml($body);
+        if ( ! $xml ) {
+            return false;
+        }
+
+        $counts = $xml->xpath('//m:count');
+        $countValue = isset($counts[0]) ? (int)$counts[0] : 0;
+        $status = $countValue === 0 ? false : true;
+        set_transient( 'vine_multiorg_status_cache', $status ? '1' : '0', 120 );
         return $status;
     }

vine-ma/trunk/web_form_block.js

@@ -1 @@
-(function (blocks, element) {
+
+(function (blocks, element, data) {
     var el = element.createElement;
+    var translations = (typeof VineFormsStrings !== 'undefined' && VineFormsStrings) ? VineFormsStrings : {};
+    function t(key, fallback) {
+        return translations[key] || fallback;
+    }
+
+    function sanitizeId(value) {
+        return String(value || '').replace(/[^A-Za-z0-9_-]/g, '');
+    }
 
     function isBotForm(form) {
@@ -11 +20 @@
     };
 
-    if (VineFormsData.error != null)
-        alert(VineFormsData.error);
-    else
-        blocks.registerBlockType('vine-ma-plugin/vine-web-form', {
-            title: 'Vine: Web Form',
+    var noticeDispatcher = (data && data.dispatch) ? data.dispatch('core/notices') : null;
+    var createNotice = noticeDispatcher && noticeDispatcher.createNotice ? noticeDispatcher.createNotice : null;
+    var hasFormsData = typeof VineFormsData !== 'undefined' && VineFormsData;
+    var formsError = hasFormsData ? VineFormsData.error : t('formsError', 'Vine form data unavailable.');
+    var vineforms = (hasFormsData && VineFormsData.forms) ? VineFormsData.forms : [];
+
+    if (formsError && createNotice) {
+        createNotice('error', formsError, { isDismissible: true });
+    }
+
+    var blockTitle = t('title', 'Vine: Web Form');
+    blocks.registerBlockType('vine-ma-plugin/vine-web-form', {
+                title: blockTitle,
             icon: 'universal-access-alt',
             category: 'layout',
@@ -45 +62 @@
             },
             edit: function (props) {
-                const vineforms = (VineFormsData && VineFormsData.forms) ? VineFormsData.forms : [];
-                const legacyBotMatch = (props.attributes.formclass || '').match(/(?:^|\s)B(\d+)(?:\s|$)/);
-                const legacyBotId = legacyBotMatch ? String(legacyBotMatch[1]) : '-1';
+                if (formsError) {
+                    return el('div', { style: { padding: '12px', border: '1px solid #ccc' } }, formsError);
+                }
+                const legacyBotMatch = (props.attributes.formclass || '').match(/(?:^|\s)B([A-Za-z0-9_-]+)(?:\s|$)/);
+                const legacyBotId = legacyBotMatch ? sanitizeId(legacyBotMatch[1]) : '-1';
+                const normalizedFormId = props.attributes.formid ? sanitizeId(props.attributes.formid) : '-1';
+                const normalizedBotId = props.attributes.botformid ? sanitizeId(props.attributes.botformid) : '-1';
+                if (props.attributes.formid && normalizedFormId !== props.attributes.formid) {
+                    props.setAttributes({ formid: normalizedFormId || '-1' });
+                }
+                if (props.attributes.botformid && normalizedBotId !== props.attributes.botformid) {
+                    props.setAttributes({ botformid: normalizedBotId || '-1' });
+                }
 
                 // Auto-migrate legacy bot blocks (class-only) so next save writes data-bot-id.
@@ -54 +81 @@
                 }
 
-                const hasStaticId = props.attributes.formid && props.attributes.formid !== '-1';
-                const hasBotId = (props.attributes.botformid && props.attributes.botformid !== '-1') || legacyBotId !== '-1';
+                const hasStaticId = normalizedFormId && normalizedFormId !== '-1';
+                const hasBotId = (normalizedBotId && normalizedBotId !== '-1') || legacyBotId !== '-1';
                 const inferredType = hasBotId && !hasStaticId ? 'bot' : 'static';
                 const selectedType = (hasStaticId || hasBotId) ? inferredType : (props.attributes.formtype || 'static');
@@ -70 +97 @@
 
                 const els = [];
-                els.push(el('option', { value: '-1' }, '<not set>'));
+                els.push(el('option', { value: '-1' }, t('notSet', '<not set>')));
                 for (const form of filteredForms) {
-                    els.push(el('option', { value: String(form.id) }, form.name));
+                    const safeId = sanitizeId(form.id);
+                    if (!safeId) {
+                        continue;
+                    }
+                    els.push(el('option', { value: safeId }, form.name));
                 }
 
@@ -86 +117 @@
 
                 function onChangeForm(event) {
-                    const newValue = String(event.target.value || '-1');
+                    const newValue = sanitizeId(event.target.value || '-1') || '-1';
                     if (isBotType) {
                         props.setAttributes({ botformid: newValue, formid: '-1', formtype: 'bot' });
@@ -95 +126 @@
 
                 const selectedId = isBotType
-                    ? ((props.attributes.botformid && props.attributes.botformid !== '-1') ? props.attributes.botformid : legacyBotId)
-                    : props.attributes.formid;
+                    ? ((normalizedBotId && normalizedBotId !== '-1') ? normalizedBotId : legacyBotId)
+                    : (normalizedFormId && normalizedFormId !== '-1' ? normalizedFormId : '-1');
                 return el(
                     'div',
@@ -105 +136 @@
                             {},
                             [
-                                el('span', {}, 'Form Type:'),
+                                el('span', {}, t('formType', 'Form Type:')),
                                 el(
                                     'label',
@@ -117 +148 @@
                                             onChange: onChangeType
                                         }),
-                                        ' Static Form'
+                                        ' ' + t('staticForm', 'Static Form')
                                     ]
                                 ),
@@ -131 +162 @@
                                             onChange: onChangeType
                                         }),
-                                        ' Bot Form'
+                                        ' ' + t('botForm', 'Bot Form')
                                     ]
                                 )
@@ -139 +170 @@
                             'span',
                             {},
-                            'Vine Form:'
+                            t('vineForm', 'Vine Form:')
                         ),
                         el(
@@ -149 +180 @@
                 );
             },
-            save: function (props) {
+                save: function (props) {
                 var form = (props.attributes.formtype === 'bot') ? props.attributes.botformid : props.attributes.formid;
                 if (form === '-1')
                     form = props.attributes.formid === '-1' ? props.attributes.botformid : props.attributes.formid;
+                form = sanitizeId(form);
                 var vineforms = VineFormsData.forms;
                 var targetForm = [];
@@ -162 +194 @@
                 var args = {
                     className: 'VineForm' + (isDataForm ? '' : ' B' + form),
-                    'data-form-id': isDataForm ? form : undefined,
-                    'data-bot-id': !isDataForm ? form : undefined
+                    'data-form-id': isDataForm && form ? form : undefined,
+                    'data-bot-id': !isDataForm && form ? form : undefined
                 }
                 return el(
@@ -171 +203 @@
                 );
             },
-        });
+            });
 }(
     window.wp.blocks,
-    window.wp.element
+    window.wp.element,
+    window.wp.data
 ));