Changeset 2413440

Timestamp:

11/05/2020 05:35:29 PM (4 years ago)

Author:

activecampaign

Message:

Release 8.1.0

Location:

activecampaign-subscription-forms/trunk

Files:

• README.md (modified) (2 diffs)
• activecampaign.php (modified) (7 diffs)
• readme.txt (modified) (3 diffs)

activecampaign-subscription-forms/trunk/README.md

@@ -25 +25 @@
 4. Choose which subscription forms to cache locally, any optional sub-settings for each, then hit Update again.
 5. Use `[activecampaign form=ID]` shortcode to display a form anywhere on your site where shortcode syntax is supported.
-6. Embed multiple forms onto a single page!
-7. Enable site tracking to have page visits tracked to ActiveCampaign.
+6. Add optional shortcode parameters `css=1` or `css=0` to override the plugin setting's "Use ActiveCampaign's form CSS" value.
+7. Embed multiple forms onto a single page!
+8. Enable site tracking to have page visits tracked to ActiveCampaign.
 
 ## Frequently Asked Questions
@@ -72 +73 @@
 ## Changelog
 
+### 8.1.0
+* Improvements to Gutenberg Editor experience, including live preview of Form embeds
+* Background color bug fix
+* Shortcode support for optional 'css' and 'static' attributes that default to plugin settings
+* Avoiding global namespace conflicts of on-demand chunks bug fix
+
 ### 8.0.3
 * Pluggable bug fix

activecampaign-subscription-forms/trunk/activecampaign.php

@@ -5 +5 @@
 Description: Allows you to add ActiveCampaign contact forms to any post, page, or sidebar. Also allows you to embed <a href="http://www.activecampaign.com/help/site-event-tracking/" target="_blank">ActiveCampaign site tracking</a> code in your pages. To get started, please activate the plugin and add your <a href="http://www.activecampaign.com/help/using-the-api/" target="_blank">API credentials</a> in the <a href="options-general.php?page=activecampaign">plugin settings</a>.
 Author: ActiveCampaign
-Version: 8.0.3
+Version: 8.1.0
 Author URI: http://www.activecampaign.com
 */
@@ -51 +51 @@
 ## version 8.0.2: Security fix to address CSRF vulnerability, general fix to address browser warning for invalid cookie attribute
 ## version 8.0.3: Pluggable bug fix
+## version 8.1.0: Improvements to Gutenberg Editor experience, including live preview of Form embeds. Background color bug fix. Shortcode support for optional 'css' and 'static' attributes that default to plugin settings. Avoiding global namespace conflicts of on-demand chunks bug fix.
 
 define("ACTIVECAMPAIGN_URL", "");
@@ -64 +65 @@
  * @param  array   form      The individual form metadata (that we obtained from the forms/getforms API call).
  * @param  boolean static    Set to true so the "floating" forms don't float. Typically this is done for the admin section only.
+ * @param  boolean nostyles  Manual override value for nostyles URL Param. Used in shortcode eval to bypass plugin setting.
+ * @param  boolean preview   Manual value for preview URL Param.
  * @return string            The raw source code that will render the form in the browser.
  */
-function activecampaign_form_source($settings, $form, $static = false) {
+function activecampaign_form_source($settings, $form, $static = false, $nostyles = null, $preview = false) {
     $source = "";
     if (isset($form["version"]) && $form["version"] == 2) {
@@ -72 +75 @@
             $source .= "<div class='_form_" . $form["id"] . "'></div>";
         }
-        // Set to activehosted.com domain by default.
-        $domain = $settings["account_view"]["account"];
-        $source .= "<script type='text/javascript' src='";
-        $source .= sprintf("https://%s/f/embed.php?", $domain);
-        if ($static) {
-            $source .= "static=1&";
-        }
-        $source .= sprintf("id=%d&%s", $form["id"], strtoupper(uniqid()));
-        if (!isset($settings["css"][$form["id"]]) || !$settings["css"][$form["id"]]) {
-            $source .= "&nostyles=1";
-        }
-        $source .= "'></script>";
+        $source .= "<script type='text/javascript' src='".activecampaign_form_script_src($settings, $form, $static, $nostyles, $preview)."'></script>";
     } else {
         // Version 1 forms.
     }
     return $source;
+}
+/**
+ * Get the script src attribute value for the form's embed.
+ * This is used in shortcode rendering as well as block editor initialization.
+ *
+ * @param  array   settings  The saved ActiveCampaign settings (from the WordPress admin section).
+ * @param  array   form      The individual form metadata (that we obtained from the forms/getforms API call).
+ * @param  boolean static    Set to true so the "floating" forms don't float. Typically this is done for the admin section only.
+ * @param  boolean nostyles  Manual override value for nostyles URL Param. Used in shortcode eval to bypass plugin setting.
+ * @param  boolean preview   Manual value for preview URL Param.
+ * @return string            The URL-Encoded src for the rendered script tag
+ */
+function activecampaign_form_script_src($settings, $form, $static = false, $nostyles = null, $preview = false){
+    // Set to activehosted.com domain by default.
+    $domain = $settings["account_view"]["account"];
+    $source = sprintf("https://%s/f/embed.php?", $domain);
+
+    // Always passing params for JS eval in block editor
+    $source .= ($static)? "static=1&" : "static=0&";
+
+    $source .= sprintf("id=%d&%s", $form["id"], strtoupper(uniqid()));
+
+    $source .= (
+        (isset($nostyles) && $nostyles === true)
+        || (!isset($nostyles) && (!isset($settings["css"][$form["id"]]) || !$settings["css"][$form["id"]]))
+    )? "&nostyles=1" : "&nostyles=0";
+
+    $source .= ($preview)? "&preview=1" : "&preview=0";
+
+    return $source;
 }
 
@@ -95 +117 @@
     if ($settings) {
         if (isset($settings["forms"]) && $settings["forms"]) {
-            if (isset($args) && isset($args["form"])) {
+            if (isset($args) && isset($args["form"]) && isset($settings["forms"][$args["form"]])) {
                 $form_id = $args["form"];
                 $form = $settings["forms"][$form_id];
-                $form_source = activecampaign_form_source($settings, $form);
-                return $form_source;
+
+                $static = false;
+                if(isset($args["static"]) && ($args["static"] === 1 || $args["static"] === '1' || $args["static"] === 'true')){
+                    $static = true;
+                }
+
+                $preview = false;
+                if(isset($args["preview"]) && ($args["preview"] === 1 || $args["preview"] === '1' || $args["preview"] === 'true')){
+                    $preview = true;
+                }
+
+                // Use null default for undefined settings fallback
+                $nostyles = null;
+                if(isset($args["css"])){
+                    if($args["css"] === 1 || $args["css"] === '1' || $args["css"] === 'true'){
+                        $nostyles = false;
+                    }
+                    else if($args["css"] === 0 || $args["css"] === '0' || $args["css"] === 'false'){
+                        $nostyles = true;
+                    }
+                }
+
+                return activecampaign_form_source($settings, $form, $static, $nostyles, $preview);
             }
         }
+        // Returning un-filtered tag for block editor eval
+        return "[activecampaign]";
     }
     else {
@@ -362 +407 @@
                             <div style="display: none;">
                                 <input type="radio" name="syim[<?php echo $form["id"]; ?>]" id="activecampaign_form_swim_<?php echo $form["id"]; ?>" value="swim" <?php echo $settings_swim_checked; ?> onchange="swim_toggle(<?php echo $form["id"]; ?>, this.checked);" />
-                                <label for="activecampaign_form_swim_<?php echo $form["id"]; ?>" style="">Add Subscriber</label>
+                                <label for="activecampaign_form_swim_<?php echo $form["id"]; ?>" style=""><?php echo __("Add Subscriber", "menu-activecampaign"); ?></label>
                                 <br />
                                 <input type="radio" name="syim[<?php echo $form["id"]; ?>]" id="activecampaign_form_sync_<?php echo $form["id"]; ?>" value="sync" <?php echo $settings_sync_checked; ?> onchange="sync_toggle(<?php echo $form["id"]; ?>, this.checked);" />
-                                <label for="activecampaign_form_sync_<?php echo $form["id"]; ?>" style="">Sync Subscriber</label>
+                                <label for="activecampaign_form_sync_<?php echo $form["id"]; ?>" style=""><?php echo __("Sync Subscriber", "menu-activecampaign"); ?></label>
                                 <br />
                                 <br />
@@ -371 +416 @@
                             <?php if (!isset($form["version"]) || $form["version"] != 2): ?>
                             <input type="checkbox" name="ajax[<?php echo $form["id"]; ?>]" id="activecampaign_form_ajax_<?php echo $form["id"]; ?>" value="1" <?php echo $settings_ajax_checked; ?> onchange="ajax_toggle(<?php echo $form["id"]; ?>, this.checked);" />
-                            <label for="activecampaign_form_ajax_<?php echo $form["id"]; ?>" style="">Submit form without refreshing page</label>
+                            <label for="activecampaign_form_ajax_<?php echo $form["id"]; ?>" style=""><?php echo __("Submit form without refreshing page", "menu-activecampaign"); ?></label>
                             <br />
                             <?php endif; ?>
                             <input type="checkbox" name="css[<?php echo $form["id"]; ?>]" id="activecampaign_form_css_<?php echo $form["id"]; ?>" value="1" <?php echo $settings_css_checked; ?> />
-                            <label for="activecampaign_form_css_<?php echo $form["id"]; ?>" style="">Keep original form CSS</label>
+                            <label for="activecampaign_form_css_<?php echo $form["id"]; ?>" style=""><?php echo __("Use ActiveCampaign's form CSS", "menu-activecampaign"); ?></label>
                         </div>
 

activecampaign-subscription-forms/trunk/readme.txt

@@ -3 +3 @@
 Tags: activecampaign, active campaign, email-marketing, newsletter, marketing-automation, subscribe, forms, emails, automation, live-chat, customer-messaging, customer-experience-automation
 Requires at least: 2.0
-Tested up to: 5.4.2
+Tested up to: 5.5.1
 Stable tag: trunk
 
@@ -42 +42 @@
 4. Choose which subscription forms to cache locally, any optional sub-settings for each, then hit Update again.
 5. Use `[activecampaign form=ID]` shortcode to display a form anywhere on your site where shortcode syntax is supported.
-6. Embed multiple forms onto a single page!
-7. Enable site tracking to have page visits tracked to ActiveCampaign.
+6. Add optional shortcode parameters `css=1` or `css=0` to override the plugin setting's "Use ActiveCampaign's form CSS" value.
+7. Embed multiple forms onto a single page!
+8. Enable site tracking to have page visits tracked to ActiveCampaign.
 
 == Frequently Asked Questions ==
@@ -88 +89 @@
 
 == Changelog ==
+= 8.1.0 =
+* Improvements to Gutenberg Editor experience, including live preview of Form embeds
+* Background color bug fix
+* Shortcode support for optional 'css' and 'static' attributes that default to plugin settings
+* Avoiding global namespace conflicts of on-demand chunks bug fix
+
 = 8.0.3 =
 * Pluggable bug fix