WordPress.org
Get WordPress

Plugin Directory

Changeset 3114258


Ignore:
Timestamp:
07/08/2024 11:47:21 AM (20 months ago)
Author:
gtmserver
Message:

Update to version 2.1.17 from GitHub

Location:
gtm-server-side
Files:
8 edited
1 copied

Legend:

Unmodified
Added
Removed

  • gtm-server-side/tags/2.1.17/README.txt

    r3094348 r3114258  
    33Tags: google tag manager, google tag manager server side, gtm, gtm server side, tag manager, tagmanager, analytics, google, serverside, server-side, gtag
    44Requires at least: 5.2.0
    5 Tested up to: 6.4.2
    6 Stable tag: 2.1.14
     5Tested up to: 6.6.0
     6Stable tag: 2.1.17
    77License: GPLv2 or later
    88License URI: http://www.gnu.org/licenses/gpl-2.0.html
    … …  
    6767
    6868== Changelog ==
     69
     70= 2.1.17 =
     71* Tested up to WordPress 6.6
     72
     73= 2.1.16 =
     74* Hidden option "Update existing web GTM script"
     75
    6976= 2.1.15 =
    7077* Removing empty field fields user_data before sending event

  • gtm-server-side/tags/2.1.17/assets/js/admin-javascript.js

    r3011549 r3114258  
    6464        // Tab "General".
    6565        pluginGtmServerSide.changeContainerId();
     66        pluginGtmServerSide.validateContainerIdByPlacementPlugin(); // tmp.
    6667        jQuery( '.js-gtm_server_side_placement' ).on(
    6768            'click',
    6869            function() {
     70                pluginGtmServerSide.changeFieldPlacement(); // tmp.
    6971                pluginGtmServerSide.changeContainerId();
    7072            }
    … …  
    161163        var $elCI = jQuery( '#gtm_server_side_web_container_id' );
    162164
    163         if ( 'code' === val || 'plugin' === val ) {
     165        if ( [ 'code', 'plugin' ].includes( val ) ) {
    164166            $elCI.rules(
    165167                'add',
    … …  
    188190        }
    189191    },
     192
     193    changeFieldPlacement: function() {
     194        var $placementPlugin = jQuery( 'input[type=hidden]#gtm_server_side_placement-plugin' );
     195        if ( ! $placementPlugin.length ) {
     196            return;
     197        }
     198
     199        var name = 'gtm_server_side_placement';
     200        $placementPlugin.attr( 'name', name + '-tmp' );
     201
     202        jQuery( '.js-gtm_server_side_placement' ).each(
     203            function() {
     204                jQuery( this ).attr( 'name', name );
     205            }
     206        );
     207    },
     208
     209    validateContainerIdByPlacementPlugin: function() {
     210        var $placementPlugin = jQuery( 'input[type=hidden]#gtm_server_side_placement-plugin' );
     211        if ( ! $placementPlugin.length ) {
     212            return;
     213        }
     214
     215        if ( 'plugin' === $placementPlugin.val() ) {
     216            jQuery( '#gtm_server_side_web_container_id' ).rules(
     217                'add',
     218                {
     219                    required: true,
     220                }
     221            );
     222        }
     223    },
    190224};

  • gtm-server-side/tags/2.1.17/gtm-server-side.php

    r3094348 r3114258  
    1111 * Plugin URI:        https://wordpress.org/plugins/gtm-server-side/
    1212 * Description:       Enhance conversion tracking by implementing server-side tagging using server Google Tag Manager container. Effortlessly configure data layer events in web GTM, send webhooks, set up custom loader, and extend cookie lifetime.
    13  * Version:           2.1.15
     13 * Version:           2.1.17
    1414 * Author:            Stape
    1515 * Author URI:        https://stape.io

  • gtm-server-side/tags/2.1.17/includes/class-gtm-server-side-admin-settings.php

    r3054430 r3114258  
    5454     */
    5555    public function settings_tab_general() {
     56
     57        $placement = GTM_Server_Side_Helpers::get_option( GTM_SERVER_SIDE_FIELD_PLACEMENT );
    5658        add_settings_section(
    5759            GTM_SERVER_SIDE_ADMIN_GROUP_GENERAL,
    5860            __( 'General', 'gtm-server-side' ),
    59             null,
     61            function() use ( $placement ) {
     62                if ( GTM_SERVER_SIDE_FIELD_PLACEMENT_VALUE_PLUGIN === $placement ) {
     63                    echo '<input
     64                        type="hidden"
     65                        id="' . esc_attr( GTM_SERVER_SIDE_FIELD_PLACEMENT . '-' . GTM_SERVER_SIDE_FIELD_PLACEMENT_VALUE_PLUGIN ) . '"
     66                        name="' . esc_attr( GTM_SERVER_SIDE_FIELD_PLACEMENT ) . '"
     67                        value="' . esc_attr( GTM_SERVER_SIDE_FIELD_PLACEMENT_VALUE_PLUGIN ) . '">';
     68                }
     69            },
    6070            GTM_SERVER_SIDE_ADMIN_SLUG
    6171        );
    … …  
    7686        );
    7787
    78         $placement = GTM_Server_Side_Helpers::get_option( GTM_SERVER_SIDE_FIELD_PLACEMENT );
     88        $field_placement = GTM_SERVER_SIDE_FIELD_PLACEMENT . '-tmp';
     89        if ( in_array( $placement, array( GTM_SERVER_SIDE_FIELD_PLACEMENT_VALUE_CODE, GTM_SERVER_SIDE_FIELD_PLACEMENT_VALUE_DISABLE ), true ) ) {
     90            $field_placement = GTM_SERVER_SIDE_FIELD_PLACEMENT;
     91        }
     92
    7993        add_settings_field(
    8094            GTM_SERVER_SIDE_FIELD_PLACEMENT . '-' . GTM_SERVER_SIDE_FIELD_PLACEMENT_VALUE_CODE,
    8195            __( 'Add web GTM script onto every page of your website', 'gtm-server-side' ),
    82             function() use ( $placement ) {
     96            function() use ( $placement, $field_placement ) {
    8397                echo '<input
    8498                    type="radio"
    8599                    id="' . esc_attr( GTM_SERVER_SIDE_FIELD_PLACEMENT . '-' . GTM_SERVER_SIDE_FIELD_PLACEMENT_VALUE_CODE ) . '"
    86100                    class="js-' . esc_attr( GTM_SERVER_SIDE_FIELD_PLACEMENT ) . '"
    87                     name="' . esc_attr( GTM_SERVER_SIDE_FIELD_PLACEMENT ) . '"
     101                    name="' . esc_attr( $field_placement ) . '"
    88102                    ' . checked( $placement, GTM_SERVER_SIDE_FIELD_PLACEMENT_VALUE_CODE, false ) . '
    89103                    value="' . esc_attr( GTM_SERVER_SIDE_FIELD_PLACEMENT_VALUE_CODE ) . '">';
    … …  
    93107            GTM_SERVER_SIDE_ADMIN_GROUP_GENERAL
    94108        );
     109        /* phpcs:ignore Squiz.Commenting.BlockComment.NoCapital *
    95110        add_settings_field(
    96111            GTM_SERVER_SIDE_FIELD_PLACEMENT . '-' . GTM_SERVER_SIDE_FIELD_PLACEMENT_VALUE_PLUGIN,
    … …  
    110125            GTM_SERVER_SIDE_ADMIN_GROUP_GENERAL
    111126        );
     127        /**/
    112128        add_settings_field(
    113129            GTM_SERVER_SIDE_FIELD_PLACEMENT . '-' . GTM_SERVER_SIDE_FIELD_PLACEMENT_VALUE_DISABLE,
    114130            __( 'Disable', 'gtm-server-side' ),
    115             function() use ( $placement ) {
     131            function() use ( $placement, $field_placement ) {
    116132                echo '<input
    117133                    type="radio"
    118134                    id="' . esc_attr( GTM_SERVER_SIDE_FIELD_PLACEMENT . '-' . GTM_SERVER_SIDE_FIELD_PLACEMENT_VALUE_DISABLE ) . '"
    119135                    class="js-' . esc_attr( GTM_SERVER_SIDE_FIELD_PLACEMENT ) . '"
    120                     name="' . esc_attr( GTM_SERVER_SIDE_FIELD_PLACEMENT ) . '"
     136                    name="' . esc_attr( $field_placement ) . '"
    121137                    ' . checked( $placement, GTM_SERVER_SIDE_FIELD_PLACEMENT_VALUE_DISABLE, false ) . '
    122138                    value="' . esc_attr( GTM_SERVER_SIDE_FIELD_PLACEMENT_VALUE_DISABLE ) . '">';

  • gtm-server-side/trunk/README.txt

    r3094348 r3114258  
    33Tags: google tag manager, google tag manager server side, gtm, gtm server side, tag manager, tagmanager, analytics, google, serverside, server-side, gtag
    44Requires at least: 5.2.0
    5 Tested up to: 6.4.2
    6 Stable tag: 2.1.14
     5Tested up to: 6.6.0
     6Stable tag: 2.1.17
    77License: GPLv2 or later
    88License URI: http://www.gnu.org/licenses/gpl-2.0.html
    … …  
    6767
    6868== Changelog ==
     69
     70= 2.1.17 =
     71* Tested up to WordPress 6.6
     72
     73= 2.1.16 =
     74* Hidden option "Update existing web GTM script"
     75
    6976= 2.1.15 =
    7077* Removing empty field fields user_data before sending event

  • gtm-server-side/trunk/assets/js/admin-javascript.js

    r3011549 r3114258  
    6464        // Tab "General".
    6565        pluginGtmServerSide.changeContainerId();
     66        pluginGtmServerSide.validateContainerIdByPlacementPlugin(); // tmp.
    6667        jQuery( '.js-gtm_server_side_placement' ).on(
    6768            'click',
    6869            function() {
     70                pluginGtmServerSide.changeFieldPlacement(); // tmp.
    6971                pluginGtmServerSide.changeContainerId();
    7072            }
    … …  
    161163        var $elCI = jQuery( '#gtm_server_side_web_container_id' );
    162164
    163         if ( 'code' === val || 'plugin' === val ) {
     165        if ( [ 'code', 'plugin' ].includes( val ) ) {
    164166            $elCI.rules(
    165167                'add',
    … …  
    188190        }
    189191    },
     192
     193    changeFieldPlacement: function() {
     194        var $placementPlugin = jQuery( 'input[type=hidden]#gtm_server_side_placement-plugin' );
     195        if ( ! $placementPlugin.length ) {
     196            return;
     197        }
     198
     199        var name = 'gtm_server_side_placement';
     200        $placementPlugin.attr( 'name', name + '-tmp' );
     201
     202        jQuery( '.js-gtm_server_side_placement' ).each(
     203            function() {
     204                jQuery( this ).attr( 'name', name );
     205            }
     206        );
     207    },
     208
     209    validateContainerIdByPlacementPlugin: function() {
     210        var $placementPlugin = jQuery( 'input[type=hidden]#gtm_server_side_placement-plugin' );
     211        if ( ! $placementPlugin.length ) {
     212            return;
     213        }
     214
     215        if ( 'plugin' === $placementPlugin.val() ) {
     216            jQuery( '#gtm_server_side_web_container_id' ).rules(
     217                'add',
     218                {
     219                    required: true,
     220                }
     221            );
     222        }
     223    },
    190224};

  • gtm-server-side/trunk/gtm-server-side.php

    r3094348 r3114258  
    1111 * Plugin URI:        https://wordpress.org/plugins/gtm-server-side/
    1212 * Description:       Enhance conversion tracking by implementing server-side tagging using server Google Tag Manager container. Effortlessly configure data layer events in web GTM, send webhooks, set up custom loader, and extend cookie lifetime.
    13  * Version:           2.1.15
     13 * Version:           2.1.17
    1414 * Author:            Stape
    1515 * Author URI:        https://stape.io

  • gtm-server-side/trunk/includes/class-gtm-server-side-admin-settings.php

    r3054430 r3114258  
    5454     */
    5555    public function settings_tab_general() {
     56
     57        $placement = GTM_Server_Side_Helpers::get_option( GTM_SERVER_SIDE_FIELD_PLACEMENT );
    5658        add_settings_section(
    5759            GTM_SERVER_SIDE_ADMIN_GROUP_GENERAL,
    5860            __( 'General', 'gtm-server-side' ),
    59             null,
     61            function() use ( $placement ) {
     62                if ( GTM_SERVER_SIDE_FIELD_PLACEMENT_VALUE_PLUGIN === $placement ) {
     63                    echo '<input
     64                        type="hidden"
     65                        id="' . esc_attr( GTM_SERVER_SIDE_FIELD_PLACEMENT . '-' . GTM_SERVER_SIDE_FIELD_PLACEMENT_VALUE_PLUGIN ) . '"
     66                        name="' . esc_attr( GTM_SERVER_SIDE_FIELD_PLACEMENT ) . '"
     67                        value="' . esc_attr( GTM_SERVER_SIDE_FIELD_PLACEMENT_VALUE_PLUGIN ) . '">';
     68                }
     69            },
    6070            GTM_SERVER_SIDE_ADMIN_SLUG
    6171        );
    … …  
    7686        );
    7787
    78         $placement = GTM_Server_Side_Helpers::get_option( GTM_SERVER_SIDE_FIELD_PLACEMENT );
     88        $field_placement = GTM_SERVER_SIDE_FIELD_PLACEMENT . '-tmp';
     89        if ( in_array( $placement, array( GTM_SERVER_SIDE_FIELD_PLACEMENT_VALUE_CODE, GTM_SERVER_SIDE_FIELD_PLACEMENT_VALUE_DISABLE ), true ) ) {
     90            $field_placement = GTM_SERVER_SIDE_FIELD_PLACEMENT;
     91        }
     92
    7993        add_settings_field(
    8094            GTM_SERVER_SIDE_FIELD_PLACEMENT . '-' . GTM_SERVER_SIDE_FIELD_PLACEMENT_VALUE_CODE,
    8195            __( 'Add web GTM script onto every page of your website', 'gtm-server-side' ),
    82             function() use ( $placement ) {
     96            function() use ( $placement, $field_placement ) {
    8397                echo '<input
    8498                    type="radio"
    8599                    id="' . esc_attr( GTM_SERVER_SIDE_FIELD_PLACEMENT . '-' . GTM_SERVER_SIDE_FIELD_PLACEMENT_VALUE_CODE ) . '"
    86100                    class="js-' . esc_attr( GTM_SERVER_SIDE_FIELD_PLACEMENT ) . '"
    87                     name="' . esc_attr( GTM_SERVER_SIDE_FIELD_PLACEMENT ) . '"
     101                    name="' . esc_attr( $field_placement ) . '"
    88102                    ' . checked( $placement, GTM_SERVER_SIDE_FIELD_PLACEMENT_VALUE_CODE, false ) . '
    89103                    value="' . esc_attr( GTM_SERVER_SIDE_FIELD_PLACEMENT_VALUE_CODE ) . '">';
    … …  
    93107            GTM_SERVER_SIDE_ADMIN_GROUP_GENERAL
    94108        );
     109        /* phpcs:ignore Squiz.Commenting.BlockComment.NoCapital *
    95110        add_settings_field(
    96111            GTM_SERVER_SIDE_FIELD_PLACEMENT . '-' . GTM_SERVER_SIDE_FIELD_PLACEMENT_VALUE_PLUGIN,
    … …  
    110125            GTM_SERVER_SIDE_ADMIN_GROUP_GENERAL
    111126        );
     127        /**/
    112128        add_settings_field(
    113129            GTM_SERVER_SIDE_FIELD_PLACEMENT . '-' . GTM_SERVER_SIDE_FIELD_PLACEMENT_VALUE_DISABLE,
    114130            __( 'Disable', 'gtm-server-side' ),
    115             function() use ( $placement ) {
     131            function() use ( $placement, $field_placement ) {
    116132                echo '<input
    117133                    type="radio"
    118134                    id="' . esc_attr( GTM_SERVER_SIDE_FIELD_PLACEMENT . '-' . GTM_SERVER_SIDE_FIELD_PLACEMENT_VALUE_DISABLE ) . '"
    119135                    class="js-' . esc_attr( GTM_SERVER_SIDE_FIELD_PLACEMENT ) . '"
    120                     name="' . esc_attr( GTM_SERVER_SIDE_FIELD_PLACEMENT ) . '"
     136                    name="' . esc_attr( $field_placement ) . '"
    121137                    ' . checked( $placement, GTM_SERVER_SIDE_FIELD_PLACEMENT_VALUE_DISABLE, false ) . '
    122138                    value="' . esc_attr( GTM_SERVER_SIDE_FIELD_PLACEMENT_VALUE_DISABLE ) . '">';
Note: See TracChangeset for help on using the changeset viewer.