WordPress.org
Get WordPress

Plugin Directory

Changeset 2876942


Ignore:
Timestamp:
03/09/2023 07:45:06 AM (3 years ago)
Author:
themebeez
Message:

Update to version 1.1.3 from GitHub

Location:
simple-gdpr-cookie-compliance
Files:
28 edited
1 copied

Legend:

Unmodified
Added
Removed

  • simple-gdpr-cookie-compliance/tags/1.1.3/README.txt

    r2874093 r2876942  
    77Tested up to: 6.1.1
    88Requires PHP: 7.0.0
    9 Stable tag: 1.1.2
     9Stable tag: 1.1.3
    1010License: GPLv2 or later
    1111License URI: http://www.gnu.org/licenses/gpl-2.0.html
    … …  
    8282== Changelog ==
    8383
     84= 1.1.3 - 07 March, 2023 =
     85
     86- Update: Static texts in UDP Agents are now translation ready.
     87- Update: WPCS implemented.
     88- Fix: Minor PHP error.
     89
    8490= 1.1.2 - 03 March, 2023 =
    8591

  • simple-gdpr-cookie-compliance/tags/1.1.3/admin/class-simple-gdpr-cookie-compliance-admin.php

    r2662024 r2876942  
    11<?php
     2/**
     3 * The admin-specific functionality of the plugin.
     4 *
     5 * Defines the plugin name, version, and two examples hooks for how to
     6 * enqueue the admin-specific stylesheet and JavaScript.
     7 *
     8 * @package    Simple_GDPR_Cookie_Compliance
     9 * @subpackage Simple_GDPR_Cookie_Compliance/admin
     10 * @author     themebeez <themebeez@gmail.com>
     11 */
     12
    213/**
    314 * The admin-specific functionality of the plugin.
    … …  
    3445     *
    3546     * @since    1.0.0
    36      * @param      string    $plugin_name      The name of this plugin.
    37      * @param      string    $version    The version of this plugin.
     47     * @param string $plugin_name The name of this plugin.
     48     * @param string $version The version of this plugin.
    3849     */
    3950    public function __construct( $plugin_name, $version ) {
    4051
    4152        $this->plugin_name = $plugin_name;
    42         $this->version = $version;
    43 
     53        $this->version     = $version;
    4454    }
    4555
    … …  
    6575        global $pagenow;
    6676
    67         if ( 'admin.php' == $pagenow && ( isset( $_GET['page'] ) && 'simple-gdpr-cookie-compliance' == $_GET['page'] ) ) {
     77        if (
     78            'admin.php' === $pagenow &&
     79            (
     80                isset( $_GET['page'] ) && // phpcs:ignore
     81                'simple-gdpr-cookie-compliance' == sanitize_text_field( wp_unslash( $_GET['page'] ) ) // phpcs:ignore
     82            )
     83        ) {
    6884
    6985            wp_enqueue_style( 'wp-color-picker' );
    7086
    71             wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/simple-gdpr-cookie-compliance-admin.css', array(), $this->version, 'all' );
     87            wp_enqueue_style(
     88                $this->plugin_name,
     89                plugin_dir_url( __FILE__ ) . 'css/simple-gdpr-cookie-compliance-admin.css',
     90                array(),
     91                $this->version,
     92                'all'
     93            );
    7294        }
    7395
    … …  
    95117        global $pagenow;
    96118
    97         if ( 'admin.php' == $pagenow && ( isset( $_GET['page'] ) && 'simple-gdpr-cookie-compliance' == $_GET['page'] ) ) {
     119        if (
     120            'admin.php' === $pagenow &&
     121            (
     122                isset( $_GET['page'] ) && // phpcs:ignore
     123                'simple-gdpr-cookie-compliance' == sanitize_text_field( wp_unslash( $_GET['page'] ) ) // phpcs:ignore
     124            )
     125        ) {
    98126
    99127            wp_enqueue_script( 'wp-color-picker' );
    100128
    101             wp_enqueue_script( 'wp-color-picker-alpha', plugin_dir_url( __FILE__ ) . 'js/wp-color-picker-alpha.js', array( 'jquery', 'wp-color-picker' ), $this->version, false );
     129            wp_enqueue_script(
     130                'wp-color-picker-alpha',
     131                plugin_dir_url( __FILE__ ) . 'js/wp-color-picker-alpha.js',
     132                array( 'jquery', 'wp-color-picker' ),
     133                $this->version,
     134                false
     135            );
    102136
    103             wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/simple-gdpr-cookie-compliance-admin.js', array( 'jquery' ), $this->version, false );
     137            wp_enqueue_script(
     138                $this->plugin_name,
     139                plugin_dir_url( __FILE__ ) . 'js/simple-gdpr-cookie-compliance-admin.js',
     140                array( 'jquery' ),
     141                $this->version,
     142                false
     143            );
    104144        }
    105145
    … …  
    113153    public function plugin_menu() {
    114154
    115         add_menu_page( __( 'Simple GDPR Cookie Compliance', 'simple-gdpr-cookie-compliance' ), 'Simple GDPR', 'manage_options', 'simple-gdpr-cookie-compliance', array( $this, 'plugin_page' ), 'dashicons-lock' );
     155        add_menu_page(
     156            esc_html__( 'Simple GDPR Cookie Compliance', 'simple-gdpr-cookie-compliance' ),
     157            esc_html__( 'Simple GDPR', 'simple-gdpr-cookie-compliance' ),
     158            'manage_options',
     159            'simple-gdpr-cookie-compliance',
     160            array( $this, 'plugin_page' ),
     161            'dashicons-lock'
     162        );
    116163    }
    117164
    … …  
    130177     *
    131178     * @since    1.0.4
     179     *
     180     * @param array $actions Actions.
    132181     */
    133182    public function plugin_page_links( $actions ) {
    134183
    135         $actions[] = '<a href="' . esc_url( admin_url( 'admin.php?page=simple-gdpr-cookie-compliance' ) ) . '">' . __( 'Settings', 'simple-gdpr-cookie-compliance' ) . '</a>';
     184        $actions[] = '<a href="' . esc_url( admin_url( 'admin.php?page=simple-gdpr-cookie-compliance' ) ) . '">' . esc_html__( 'Settings', 'simple-gdpr-cookie-compliance' ) . '</a>';
    136185
    137186        return $actions;
    138 
    139187    }
    140188}

  • simple-gdpr-cookie-compliance/tags/1.1.3/admin/class-simple-gdpr-cookie-compliance-settings.php

    r2662024 r2876942  
    88 */
    99
    10 class Simple_GDPR_Cookie_Compliance_Admin_Settings {
     10/**
     11 * Class that defines the admin-settings functionality of the plugin.
     12 *
     13 * @package    Simple_GDPR_Cookie_Compliance
     14 * @subpackage Simple_GDPR_Cookie_Compliance/admin
     15 * @author     themebeez <themebeez@gmail.com>
     16 */
     17class Simple_GDPR_Cookie_Compliance_Settings {
    1118
    1219    /**
    … …  
    4148     *
    4249     * @since    1.0.0
    43      * @param      string    $plugin_name      The name of this plugin.
    44      * @param      string    $version    The version of this plugin.
     50     * @param string $plugin_name The name of this plugin.
     51     * @param string $version The version of this plugin.
    4552     */
    4653    public function __construct( $plugin_name, $version ) {
    4754
    4855        $this->plugin_name = $plugin_name;
    49         $this->version = $version;
    50 
    51         if( get_option( 'simple_gdpr_cookie_compliance_options' ) ) {
     56        $this->version     = $version;
     57
     58        if ( get_option( 'simple_gdpr_cookie_compliance_options' ) ) {
    5259
    5360            $this->options = get_option( 'simple_gdpr_cookie_compliance_options' );
    … …  
    6269    public function register_settings() {
    6370
    64         register_setting( 'simple_gdpr_cookie_compliance_settings', // Option Group ID
    65             'simple_gdpr_cookie_compliance_options', // Settings ID
    66             array( $this, 'sanitize_fields' ) // Sanitization Callback
    67         );
    68 
    69         add_settings_section( 'simple_gdpr_cookie_compliance_fields_section', // Section ID
    70             __( 'Configure Settings', 'simple-gdpr-cookie-compliance' ), // Section Title
    71             array( $this, 'section_callback' ), // Section Callback
    72             'simple_gdpr_cookie_compliance_settings' // Option Group ID
    73         );
    74 
    75         add_settings_field( 's_gdpr_c_n_notice_text',
    76             __( 'Notice Content', 'simple-gdpr-cookie-compliance' ),
    77             array( $this, 'notice_field' ),
    78             'simple_gdpr_cookie_compliance_settings',
    79             'simple_gdpr_cookie_compliance_fields_section'
    80         );
    81 
    82         add_settings_field( 's_gdpr_c_n_cookie',
    83             __( 'Cookie', 'simple-gdpr-cookie-compliance' ),
    84             array( $this, 'cookie_fields' ),
    85             'simple_gdpr_cookie_compliance_settings',
    86             'simple_gdpr_cookie_compliance_fields_section'
    87         );
    88 
    89         add_settings_field( 's_gdpr_c_n_styles',
    90             __( 'Style', 'simple-gdpr-cookie-compliance' ),
    91             array( $this, 'style_fields' ),
    92             'simple_gdpr_cookie_compliance_settings',
    93             'simple_gdpr_cookie_compliance_fields_section'
    94         );
    95 
    96         add_settings_field( 's_gdpr_c_n_colors',
    97             __( 'Colors', 'simple-gdpr-cookie-compliance' ),
    98             array( $this, 'color_fields' ),
    99             'simple_gdpr_cookie_compliance_settings',
    100             'simple_gdpr_cookie_compliance_fields_section'
    101         );
    102 
    103         add_settings_field( 's_gdpr_c_n_custom_css',
    104             __( 'Custom CSS', 'simple-gdpr-cookie-compliance' ),
    105             array( $this, 'custom_css_fields' ),
    106             'simple_gdpr_cookie_compliance_settings',
    107             'simple_gdpr_cookie_compliance_fields_section'
     71        register_setting(
     72            'simple_gdpr_cookie_compliance_settings', // Option Group ID.
     73            'simple_gdpr_cookie_compliance_options', // Settings ID.
     74            array( $this, 'sanitize_fields' ) // Sanitization Callback.
     75        );
     76
     77        add_settings_section(
     78            'simple_gdpr_cookie_compliance_fields_section', // Section ID.
     79            __( 'Configure Settings', 'simple-gdpr-cookie-compliance' ), // Section Title.
     80            array( $this, 'section_callback' ), // Section Callback.
     81            'simple_gdpr_cookie_compliance_settings' // Option Group ID.
     82        );
     83
     84        add_settings_field(
     85            's_gdpr_c_n_notice_text',
     86            __( 'Notice Content', 'simple-gdpr-cookie-compliance' ),
     87            array( $this, 'notice_field' ),
     88            'simple_gdpr_cookie_compliance_settings',
     89            'simple_gdpr_cookie_compliance_fields_section'
     90        );
     91
     92        add_settings_field(
     93            's_gdpr_c_n_cookie',
     94            __( 'Cookie', 'simple-gdpr-cookie-compliance' ),
     95            array( $this, 'cookie_fields' ),
     96            'simple_gdpr_cookie_compliance_settings',
     97            'simple_gdpr_cookie_compliance_fields_section'
     98        );
     99
     100        add_settings_field(
     101            's_gdpr_c_n_styles',
     102            __( 'Style', 'simple-gdpr-cookie-compliance' ),
     103            array( $this, 'style_fields' ),
     104            'simple_gdpr_cookie_compliance_settings',
     105            'simple_gdpr_cookie_compliance_fields_section'
     106        );
     107
     108        add_settings_field(
     109            's_gdpr_c_n_colors',
     110            __( 'Colors', 'simple-gdpr-cookie-compliance' ),
     111            array( $this, 'color_fields' ),
     112            'simple_gdpr_cookie_compliance_settings',
     113            'simple_gdpr_cookie_compliance_fields_section'
     114        );
     115
     116        add_settings_field(
     117            's_gdpr_c_n_custom_css',
     118            __( 'Custom CSS', 'simple-gdpr-cookie-compliance' ),
     119            array( $this, 'custom_css_fields' ),
     120            'simple_gdpr_cookie_compliance_settings',
     121            'simple_gdpr_cookie_compliance_fields_section'
    108122        );
    109123    }
    … …  
    150164        <div class="s_gdpr_c_n_field" id="s_gdpr_c_n_notice_text">
    151165            <p>
    152                 <label for="simple_gdpr_cookie_compliance_options[notice_text]"><?php _e( 'Message', 'simple-gdpr-cookie-compliance' ); ?></label>
     166                <label for="simple_gdpr_cookie_compliance_options[notice_text]">
     167                    <?php esc_html_e( 'Message', 'simple-gdpr-cookie-compliance' ); ?>
     168                </label>
    153169                <br/>
    154                 <small class="description"><?php echo __( 'Enter the notice message. You can also insert &lt;span class=&quot;..&quot;&gt;...&lt;/span&gt;, &lt;a href=&quot;..&quot; target=&quot;..&quot; class=&quot;..&quot; title=&quot;..&quot;&gt;...&lt;/a&gt;, and &lt;i class=&quot;..&quot;&gt;...&lt;/i&gt; HTML tags along with the message.', 'simple-gdpr-cookie-compliance' ); ?></small>
     170                <small class="description">
     171                    <?php echo esc_html__( 'Enter the notice message. You can also insert &lt;span class=&quot;..&quot;&gt;...&lt;/span&gt;, &lt;a href=&quot;..&quot; target=&quot;..&quot; class=&quot;..&quot; title=&quot;..&quot;&gt;...&lt;/a&gt;, and &lt;i class=&quot;..&quot;&gt;...&lt;/i&gt; HTML tags along with the message.', 'simple-gdpr-cookie-compliance' ); ?>
     172                </small>
    155173                <textarea id="simple_gdpr_cookie_compliance_options[notice_text]" name="simple_gdpr_cookie_compliance_options[notice_text]" class="s_gdpr_c_n_textarea" cols="50" rows="5"><?php echo wp_kses_post( $notice ); ?></textarea>               
    156174            </p>
    157175
    158176            <p>
    159                 <label for="simple_gdpr_cookie_compliance_options['link']['link_type']"><?php _e( 'Link Type', 'simple-gdpr-cookie-compliance' ); ?></label>
     177                <label for="simple_gdpr_cookie_compliance_options['link']['link_type']"><?php esc_html_e( 'Link Type', 'simple-gdpr-cookie-compliance' ); ?></label>
    160178                <?php
    161179                $link_types = array(
    162                     'no_link' => __( 'No Link', 'simple-gdpr-cookie-compliance' ),
    163                     'custom_url' => __( 'Custom Link', 'simple-gdpr-cookie-compliance' ),
    164                     'page' => __( 'Page', 'simple-gdpr-cookie-compliance' )
     180                    'no_link'    => esc_html__( 'No Link', 'simple-gdpr-cookie-compliance' ),
     181                    'custom_url' => esc_html__( 'Custom Link', 'simple-gdpr-cookie-compliance' ),
     182                    'page'       => esc_html__( 'Page', 'simple-gdpr-cookie-compliance' ),
    165183                );
    166184                ?>
    167185                <select class="sgdpr_link_type" name="simple_gdpr_cookie_compliance_options[link][link_type]" id="simple_gdpr_cookie_compliance_options[link][link_type]">
    168186                    <?php
    169                     foreach( $link_types as $key => $value ) {
     187                    foreach ( $link_types as $key => $value ) {
    170188                        ?>
    171                         <option value="<?php echo esc_attr( $key ); ?>" <?php selected( $key, $link_type ); ?>><?php echo esc_html( $value ); ?></option>
     189                        <option value="<?php echo esc_attr( $key ); ?>" <?php selected( $key, $link_type ); ?>>
     190                            <?php echo esc_html( $value ); ?>
     191                        </option>
    172192                        <?php
    173193                    }
    … …  
    176196            </p>
    177197
    178             <div class="s_gdpr_c_n_field_link_content_wrapper <?php echo ( $link_type == 'no_link' ) ? 'sgdpr_hidden' : ''; ?>">
    179                
    180                 <h3><?php echo __( 'Link Content', 'simple-gdpr-cookie-compliance' ); ?></h3>
    181                 <p><small><?php echo __( 'Link content will be appended after the message.', 'simple-gdpr-cookie-compliance' ); ?></small></p>
     198            <div class="s_gdpr_c_n_field_link_content_wrapper <?php echo ( 'no_link' === $link_type ) ? 'sgdpr_hidden' : ''; ?>">
     199                <h3><?php echo esc_html__( 'Link Content', 'simple-gdpr-cookie-compliance' ); ?></h3>
     200                <p><small><?php echo esc_html__( 'Link content will be appended after the message.', 'simple-gdpr-cookie-compliance' ); ?></small></p>
    182201
    183202                <p>
    184                     <label for="simple_gdpr_cookie_compliance_options[link][before_link]"><?php _e( 'Text Before Link', 'simple-gdpr-cookie-compliance' ); ?></label>
     203                    <label for="simple_gdpr_cookie_compliance_options[link][before_link]"><?php esc_html_e( 'Text Before Link', 'simple-gdpr-cookie-compliance' ); ?></label>
    185204                    <input type="text" id="simple_gdpr_cookie_compliance_options[link][before_link]" name="simple_gdpr_cookie_compliance_options[link][before_link]" class="s_gdpr_c_c_text" value="<?php echo esc_attr( $before_link ); ?>">
    186205                </p>
    187206
    188207                <p>
    189                     <label for="simple_gdpr_cookie_compliance_options[link][after_link]"><?php _e( 'Text After Link', 'simple-gdpr-cookie-compliance' ); ?></label>
     208                    <label for="simple_gdpr_cookie_compliance_options[link][after_link]"><?php esc_html_e( 'Text After Link', 'simple-gdpr-cookie-compliance' ); ?></label>
    190209                    <input type="text" id="simple_gdpr_cookie_compliance_options[link][after_link]" name="simple_gdpr_cookie_compliance_options[link][after_link]" class="s_gdpr_c_c_text" value="<?php echo esc_attr( $after_link ); ?>">
    191210                </p>
    192    
    193                 <div class="s_gdpr_c_n_field_custom_link_wrapper <?php echo ( $link_type == 'custom_url' ) ? '' : 'sgdpr_hidden'; ?>">
     211
     212                <div class="s_gdpr_c_n_field_custom_link_wrapper <?php echo ( 'custom_url' === $link_type ) ? '' : 'sgdpr_hidden'; ?>">
    194213                    <p>
    195                         <label for="simple_gdpr_cookie_compliance_options[link][link_title]"><?php _e( 'Custom Link Title', 'simple-gdpr-cookie-compliance' ); ?></label>
     214                        <label for="simple_gdpr_cookie_compliance_options[link][link_title]"><?php esc_html_e( 'Custom Link Title', 'simple-gdpr-cookie-compliance' ); ?></label>
    196215                        <input type="text" id="simple_gdpr_cookie_compliance_options[link][link_title]" name="simple_gdpr_cookie_compliance_options[link][link_title]" class="s_gdpr_c_c_text" value="<?php echo esc_attr( $link_title ); ?>">
    197216                    </p>
    198217
    199218                    <p>
    200                         <label for="simple_gdpr_cookie_compliance_options[link][link_url]"><?php _e( 'Custom URL', 'simple-gdpr-cookie-compliance' ); ?></label>
     219                        <label for="simple_gdpr_cookie_compliance_options[link][link_url]"><?php esc_html_e( 'Custom URL', 'simple-gdpr-cookie-compliance' ); ?></label>
    201220                        <input type="text" id="simple_gdpr_cookie_compliance_options[link][link_url]" name="simple_gdpr_cookie_compliance_options[link][link_url]" class="s_gdpr_c_c_text" value="<?php echo esc_attr( $link_url ); ?>">
    202221                    </p>
    203222                </div>
    204223
    205                 <div class="s_gdpr_c_n_field_page_selection_wrapper <?php echo ( $link_type == 'page' ) ? '' : 'sgdpr_hidden'; ?>">
     224                <div class="s_gdpr_c_n_field_page_selection_wrapper <?php echo ( 'page' === $link_type ) ? '' : 'sgdpr_hidden'; ?>">
    206225                    <p>
    207                         <label for="simple_gdpr_cookie_compliance_options[link][page]"><?php _e( 'Link Page', 'simple-gdpr-cookie-compliance' ); ?></label>
     226                        <label for="simple_gdpr_cookie_compliance_options[link][page]"><?php esc_html_e( 'Link Page', 'simple-gdpr-cookie-compliance' ); ?></label>
    208227                        <?php
    209                         wp_dropdown_pages( array(
    210                             'id'               => 'simple_gdpr_cookie_compliance_options[link][page]',
    211                             'class'            => 's_gdpr_c_c_text',
    212                             'name'             => 'simple_gdpr_cookie_compliance_options[link][page]',
    213                             'selected'         => esc_attr( $page ),
    214                             'show_option_none' => __( 'Select Page', 'simple-gdpr-cookie-compliance' ),
    215                             )
    216                         );
     228                        wp_dropdown_pages(
     229                            array(
     230                                'id'               => 'simple_gdpr_cookie_compliance_options[link][page]',
     231                                'class'            => 's_gdpr_c_c_text',
     232                                'name'             => 'simple_gdpr_cookie_compliance_options[link][page]',
     233                                'selected'         => esc_attr( $page ),
     234                                'show_option_none' => esc_html__( 'Select Page', 'simple-gdpr-cookie-compliance' ),
     235                            )
     236                        );
    217237                        ?>
    218238                    </p>
    … …  
    220240
    221241                <p>
    222                     <label for="simple_gdpr_cookie_compliance_options[show_in_new_tab]"><input type="checkbox" id="simple_gdpr_cookie_compliance_options[show_in_new_tab]" name="simple_gdpr_cookie_compliance_options[show_in_new_tab]" class="s_gdpr_c_c_text" value="1" <?php checked( 1, absint( $show_in_new_tab ) ); ?>><?php _e( 'Show link in a new tab', 'simple-gdpr-cookie-compliance' ); ?></label>
     242                    <label for="simple_gdpr_cookie_compliance_options[show_in_new_tab]"><input type="checkbox" id="simple_gdpr_cookie_compliance_options[show_in_new_tab]" name="simple_gdpr_cookie_compliance_options[show_in_new_tab]" class="s_gdpr_c_c_text" value="1" <?php checked( 1, absint( $show_in_new_tab ) ); ?>><?php esc_html_e( 'Show link in a new tab', 'simple-gdpr-cookie-compliance' ); ?></label>
    223243                </p>
    224244            </div>
    225245
    226246            <p>
    227                 <label for="simple_gdpr_cookie_compliance_options[accept_btn_title]"><?php _e( 'Accept Button Title', 'simple-gdpr-cookie-compliance' ); ?></label>
     247                <label for="simple_gdpr_cookie_compliance_options[accept_btn_title]"><?php esc_html_e( 'Accept Button Title', 'simple-gdpr-cookie-compliance' ); ?></label>
    228248                <input type="text" id="simple_gdpr_cookie_compliance_options[accept_btn_title]" name="simple_gdpr_cookie_compliance_options[accept_btn_title]" class="s_gdpr_c_c_text" value="<?php echo esc_attr( $accept_btn_title ); ?>">
    229249            </p>
    230250
    231251            <p>
    232                
    233                 <label for="simple_gdpr_cookie_compliance_options[show_close_btn]"><input type="checkbox" id="simple_gdpr_cookie_compliance_options[show_close_btn]" name="simple_gdpr_cookie_compliance_options[show_close_btn]" class="s_gdpr_c_c_text" <?php checked( $show_close_btn, true ); ?>><?php _e( 'Display Close Button', 'simple-gdpr-cookie-compliance' ); ?></label>               
    234             </p>
    235 
    236             <p>
    237                
    238                 <label for="simple_gdpr_cookie_compliance_options[show_cookie_icon]"><input type="checkbox" id="simple_gdpr_cookie_compliance_options[show_cookie_icon]" name="simple_gdpr_cookie_compliance_options[show_cookie_icon]" class="s_gdpr_c_c_text" <?php checked( $show_cookie_icon, true ); ?>><?php _e( 'Display Cookie Icon', 'simple-gdpr-cookie-compliance' ); ?></label>             
     252                <label for="simple_gdpr_cookie_compliance_options[show_close_btn]"><input type="checkbox" id="simple_gdpr_cookie_compliance_options[show_close_btn]" name="simple_gdpr_cookie_compliance_options[show_close_btn]" class="s_gdpr_c_c_text" <?php checked( $show_close_btn, true ); ?>><?php esc_html_e( 'Display Close Button', 'simple-gdpr-cookie-compliance' ); ?></label>               
     253            </p>
     254
     255            <p>
     256                <label for="simple_gdpr_cookie_compliance_options[show_cookie_icon]"><input type="checkbox" id="simple_gdpr_cookie_compliance_options[show_cookie_icon]" name="simple_gdpr_cookie_compliance_options[show_cookie_icon]" class="s_gdpr_c_c_text" <?php checked( $show_cookie_icon, true ); ?>><?php esc_html_e( 'Display Cookie Icon', 'simple-gdpr-cookie-compliance' ); ?></label>             
    239257            </p>
    240258        </div>
    … …  
    253271        <div class="s_gdpr_c_n_field" id="s_gdpr_c_n_cookie">
    254272            <p>
    255                 <label for="simple_gdpr_cookie_compliance_options[cookie_expire_time]"><?php echo __( 'Cookie Expire Time', 'simple-gdpr-cookie-compliance' ); ?></label>
     273                <label for="simple_gdpr_cookie_compliance_options[cookie_expire_time]"><?php echo esc_html__( 'Cookie Expire Time', 'simple-gdpr-cookie-compliance' ); ?></label>
    256274                <input type="number" id="simple_gdpr_cookie_compliance_options[cookie_expire_time]" name="simple_gdpr_cookie_compliance_options[cookie_expire_time]" class="s_gdpr_c_n_number" value="<?php echo esc_attr( $cookie_expire_time ); ?>">
    257                 <small><?php echo __( 'Once the user clicks on Accept button, cookie notice will disappear. Expire Time sets the time duration for which cookie notice will disappear. Set &quot;0&quot; for SESSION cookie.', 'simple-gdpr-cookie-compliance' ); ?></small>
     275                <small><?php echo esc_html__( 'Once the user clicks on Accept button, cookie notice will disappear. Expire Time sets the time duration for which cookie notice will disappear. Set &quot;0&quot; for SESSION cookie.', 'simple-gdpr-cookie-compliance' ); ?></small>
    258276            </p>
    259277        <?php
    … …  
    267285    public function style_fields() {
    268286
    269         $type = ! empty( $this->options['style']['type'] ) ? $this->options['style']['type'] : 'custom_width';
    270 
    271         $width = ! empty( $this->options['style']['width'] ) ? $this->options['style']['width'] : 450;
    272 
    273         $fullwidth_position =  ! empty( $this->options['style']['fullwidth_position'] ) ? $this->options['style']['fullwidth_position'] : 'top';
    274 
    275         $customwidth_position =  ! empty( $this->options['style']['customwidth_position'] ) ? $this->options['style']['customwidth_position'] : 'bottom_right';
     287        $type = isset( $this->options['style']['type'] ) ? $this->options['style']['type'] : 'custom_width';
     288
     289        $width = isset( $this->options['style']['width'] ) ? $this->options['style']['width'] : 450;
     290
     291        $fullwidth_position = isset( $this->options['style']['fullwidth_position'] ) ? $this->options['style']['fullwidth_position'] : 'top';
     292
     293        $customwidth_position = isset( $this->options['style']['customwidth_position'] ) ? $this->options['style']['customwidth_position'] : 'bottom_right';
    276294
    277295        $enable_bg_overlay = isset( $this->options['style']['enable_bg_overlay'] ) ? $this->options['style']['enable_bg_overlay'] : true;
    278296
    279         $top_offset = ! empty( $this->options['style']['top_offset'] ) ? $this->options['style']['top_offset'] : 30;
    280 
    281         $left_offset = ! empty( $this->options['style']['left_offset'] ) ? $this->options['style']['left_offset'] : 30;
    282 
    283         $bottom_offset = ! empty( $this->options['style']['bottom_offset'] ) ? $this->options['style']['bottom_offset'] : 30;
    284 
    285         $right_offset = ! empty( $this->options['style']['right_offset'] ) ? $this->options['style']['right_offset'] : 30;
     297        $top_offset = isset( $this->options['style']['top_offset'] ) ? $this->options['style']['top_offset'] : 30;
     298
     299        $left_offset = isset( $this->options['style']['left_offset'] ) ? $this->options['style']['left_offset'] : 30;
     300
     301        $bottom_offset = isset( $this->options['style']['bottom_offset'] ) ? $this->options['style']['bottom_offset'] : 30;
     302
     303        $right_offset = isset( $this->options['style']['right_offset'] ) ? $this->options['style']['right_offset'] : 30;
    286304        ?>
    287305        <div class="s_gdpr_c_n_field" id="s_gdpr_c_n_style">
    288306            <p>
    289                 <label for="simple_gdpr_cookie_compliance_options[style][type]"><?php echo __( 'Width Style', 'simple-gdpr-cookie-compliance' ); ?></label>
     307                <label for="simple_gdpr_cookie_compliance_options[style][type]"><?php echo esc_html__( 'Width Style', 'simple-gdpr-cookie-compliance' ); ?></label>
    290308                <?php
    291309                $styles = array(
    292                     'full_width' => __( 'Full Width', 'simple-gdpr-cookie-compliance' ),
    293                     'custom_width' => __( 'Custom Width', 'simple-gdpr-cookie-compliance' ),
    294                     'pop_up' => __( 'Pop Up', 'simple-gdpr-cookie-compliance' )
     310                    'full_width'   => esc_html__( 'Full Width', 'simple-gdpr-cookie-compliance' ),
     311                    'custom_width' => esc_html__( 'Custom Width', 'simple-gdpr-cookie-compliance' ),
     312                    'pop_up'       => esc_html__( 'Pop Up', 'simple-gdpr-cookie-compliance' ),
    295313                );
    296314                ?>
    297315                <select class="sgdpr_notice_type" name="simple_gdpr_cookie_compliance_options[style][type]" id="simple_gdpr_cookie_compliance_options[style][type]">
    298316                    <?php
    299                     foreach( $styles as $key => $value ) {
     317                    foreach ( $styles as $key => $value ) {
    300318                        ?>
    301319                        <option value="<?php echo esc_attr( $key ); ?>" <?php selected( $key, $type ); ?>><?php echo esc_html( $value ); ?></option>
    … …  
    306324            </p>
    307325
    308             <p id="s_gdpr_c_n_width" class="<?php echo ( $type == 'full_width' ) ? 'sgdpr_hidden' : ''; ?>">
    309                 <label for="simple_gdpr_cookie_compliance_options[style][width]"><?php echo __( 'Width', 'simple-gdpr-cookie-compliance' ); ?></label>
     326            <p id="s_gdpr_c_n_width" class="<?php echo ( 'full_width' === $type ) ? 'sgdpr_hidden' : ''; ?>">
     327                <label for="simple_gdpr_cookie_compliance_options[style][width]"><?php echo esc_html__( 'Width', 'simple-gdpr-cookie-compliance' ); ?></label>
    310328                <input type="number" id="simple_gdpr_cookie_compliance_options[style][width]" name="simple_gdpr_cookie_compliance_options[style][width]" class="s_gdpr_c_n_number" value="<?php echo esc_attr( $width ); ?>">
    311329            </p>
    312330
    313             <p id="s_gdpr_c_n_fullwidth_position" class="<?php echo ( $type == 'full_width' ) ? '' : 'sgdpr_hidden'; ?>">
    314                 <label for="simple_gdpr_cookie_compliance_options[style][fullwidth_position]"><?php echo __( 'Position', 'simple-gdpr-cookie-compliance' ); ?></label>
     331            <p id="s_gdpr_c_n_fullwidth_position" class="<?php echo ( 'full_width' === $type ) ? '' : 'sgdpr_hidden'; ?>">
     332                <label for="simple_gdpr_cookie_compliance_options[style][fullwidth_position]"><?php echo esc_html__( 'Position', 'simple-gdpr-cookie-compliance' ); ?></label>
    315333                <?php
    316334                $styles = array(
    317                     'top' => __( 'Top', 'simple-gdpr-cookie-compliance' ),
    318                     'bottom' => __( 'Bottom', 'simple-gdpr-cookie-compliance' )
     335                    'top'    => esc_html__( 'Top', 'simple-gdpr-cookie-compliance' ),
     336                    'bottom' => esc_html__( 'Bottom', 'simple-gdpr-cookie-compliance' ),
    319337                );
    320338                ?>
    321339                <select class="sgdpr_position" name="simple_gdpr_cookie_compliance_options[style][fullwidth_position]" id="simple_gdpr_cookie_compliance_options[style][fullwidth_position]">
    322340                    <?php
    323                     foreach( $styles as $key => $value ) {
     341                    foreach ( $styles as $key => $value ) {
    324342                        ?>
    325343                        <option value="<?php echo esc_attr( $key ); ?>" <?php selected( $key, $fullwidth_position ); ?>><?php echo esc_html( $value ); ?></option>
    … …  
    330348            </p>
    331349
    332             <p id="s_gdpr_c_n_customwidth_position" class="<?php echo ( $type != 'custom_width' ) ? 'sgdpr_hidden' : ''; ?>">
    333                 <label for="simple_gdpr_cookie_compliance_options[style][customwidth_position]"><?php echo __( 'Position', 'simple-gdpr-cookie-compliance' ); ?></label>
     350            <p id="s_gdpr_c_n_customwidth_position" class="<?php echo ( 'custom_width' !== $type ) ? 'sgdpr_hidden' : ''; ?>">
     351                <label for="simple_gdpr_cookie_compliance_options[style][customwidth_position]"><?php echo esc_html__( 'Position', 'simple-gdpr-cookie-compliance' ); ?></label>
    334352                <?php
    335353                $styles = array(
    336                     'top_left' => __( 'Top Left', 'simple-gdpr-cookie-compliance' ),
    337                     'top_center' => __( 'Top Center', 'simple-gdpr-cookie-compliance' ),
    338                     'top_right' => __( 'Top Right', 'simple-gdpr-cookie-compliance' ),
    339                     'bottom_left' => __( 'Bottom Left', 'simple-gdpr-cookie-compliance' ),
    340                     'bottom_center' => __( 'Bottom Center', 'simple-gdpr-cookie-compliance' ),
    341                     'bottom_right' => __( 'Bottom Right', 'simple-gdpr-cookie-compliance' )
     354                    'top_left'      => esc_html__( 'Top Left', 'simple-gdpr-cookie-compliance' ),
     355                    'top_center'    => esc_html__( 'Top Center', 'simple-gdpr-cookie-compliance' ),
     356                    'top_right'     => esc_html__( 'Top Right', 'simple-gdpr-cookie-compliance' ),
     357                    'bottom_left'   => esc_html__( 'Bottom Left', 'simple-gdpr-cookie-compliance' ),
     358                    'bottom_center' => esc_html__( 'Bottom Center', 'simple-gdpr-cookie-compliance' ),
     359                    'bottom_right'  => esc_html__( 'Bottom Right', 'simple-gdpr-cookie-compliance' ),
    342360                );
    343361                ?>
    344362                <select class="sgdpr_customwidth_position" name="simple_gdpr_cookie_compliance_options[style][customwidth_position]" id="simple_gdpr_cookie_compliance_options[style][customwidth_position]">
    345363                    <?php
    346                     foreach( $styles as $key => $value ) {
     364                    foreach ( $styles as $key => $value ) {
    347365                        ?>
    348366                        <option value="<?php echo esc_attr( $key ); ?>" <?php selected( $key, $customwidth_position ); ?>><?php echo esc_html( $value ); ?></option>
    … …  
    352370                </select>
    353371            </p>
    354             <p id="s_gdpr_c_n_enable_bg_overlay" class="s_gdpr_c_n_checkbox_field <?php echo ( $type != 'pop_up' ) ? 'sgdpr_hidden' : ''; ?>">
    355                 <label for="simple_gdpr_cookie_compliance_options[style][enable_bg_overlay]"><input type="checkbox" class="s_gdpr_c_n_bg_overlay_field" name="simple_gdpr_cookie_compliance_options[style][enable_bg_overlay]" id="simple_gdpr_cookie_compliance_options[style][enable_bg_overlay]" <?php checked( true, $enable_bg_overlay ); ?>><?php echo __( 'Enable Background Overlay', 'simple-gdpr-cookie-compliance' ); ?></label>
    356 
    357             </p>
    358 
    359             <div id="s_gdpr_c_n_offset_group_wrapper" class="s_gdpr_c_n_group_wrapper <?php echo ( $type != 'custom_width' ) ? 'sgdpr_hidden' : ''; ?>">
    360                 <h4 class="s_grpd_c_n_group_title"><?php echo __( 'Offsets', 'simple-gdpr-cookie-compliance' ); ?></h4>
     372            <p id="s_gdpr_c_n_enable_bg_overlay" class="s_gdpr_c_n_checkbox_field <?php echo ( 'pop_up' !== $type ) ? 'sgdpr_hidden' : ''; ?>">
     373                <label for="simple_gdpr_cookie_compliance_options[style][enable_bg_overlay]"><input type="checkbox" class="s_gdpr_c_n_bg_overlay_field" name="simple_gdpr_cookie_compliance_options[style][enable_bg_overlay]" id="simple_gdpr_cookie_compliance_options[style][enable_bg_overlay]" <?php checked( true, $enable_bg_overlay ); ?>><?php echo esc_html__( 'Enable Background Overlay', 'simple-gdpr-cookie-compliance' ); ?></label>
     374
     375            </p>
     376
     377            <div id="s_gdpr_c_n_offset_group_wrapper" class="s_gdpr_c_n_group_wrapper <?php echo ( 'custom_width' !== $type ) ? 'sgdpr_hidden' : ''; ?>">
     378                <h4 class="s_grpd_c_n_group_title"><?php echo esc_html__( 'Offsets', 'simple-gdpr-cookie-compliance' ); ?></h4>
    361379                <div class="s_gdpr_c_n_group s_gdpr_c_n_group-4">
    362380                    <div class="s_gdpr_c_n_group_field" id="s_gdpr_c_n_top_offset_group_field">
    363                         <label for="simple_gdpr_cookie_compliance_options[style][top_offset]"><?php echo __( 'Top (px)', 'simple-gdpr-cookie-compliance' ); ?></label>
     381                        <label for="simple_gdpr_cookie_compliance_options[style][top_offset]"><?php echo esc_html__( 'Top (px)', 'simple-gdpr-cookie-compliance' ); ?></label>
    364382                        <input type="number" id="simple_gdpr_cookie_compliance_options[style][top_offset]" name="simple_gdpr_cookie_compliance_options[style][top_offset]" class="s_gdpr_c_n_number" value="<?php echo esc_attr( $top_offset ); ?>">
    365383                    </div>
    366384                    <div class="s_gdpr_c_n_group_field" id="s_gdpr_c_n_right_offset_group_field">
    367                         <label for="simple_gdpr_cookie_compliance_options[style][right_offset]"><?php echo __( 'Right (px)', 'simple-gdpr-cookie-compliance' ); ?></label>
     385                        <label for="simple_gdpr_cookie_compliance_options[style][right_offset]"><?php echo esc_html__( 'Right (px)', 'simple-gdpr-cookie-compliance' ); ?></label>
    368386                        <input type="number" id="simple_gdpr_cookie_compliance_options[style][right_offset]" name="simple_gdpr_cookie_compliance_options[style][right_offset]" class="s_gdpr_c_n_number" value="<?php echo esc_attr( $right_offset ); ?>">
    369387                    </div>                 
    370388                    <div class="s_gdpr_c_n_group_field" id="s_gdpr_c_n_bottom_offset_group_field">
    371                         <label for="simple_gdpr_cookie_compliance_options[style][bottom_offset]"><?php echo __( 'Bottom (px)', 'simple-gdpr-cookie-compliance' ); ?></label>
     389                        <label for="simple_gdpr_cookie_compliance_options[style][bottom_offset]"><?php echo esc_html__( 'Bottom (px)', 'simple-gdpr-cookie-compliance' ); ?></label>
    372390                        <input type="number" id="simple_gdpr_cookie_compliance_options[style][bottom_offset]" name="simple_gdpr_cookie_compliance_options[style][bottom_offset]" class="s_gdpr_c_n_number" value="<?php echo esc_attr( $bottom_offset ); ?>">
    373391                    </div>
    374392                    <div class="s_gdpr_c_n_group_field" id="s_gdpr_c_n_left_offset_group_field">
    375                         <label for="simple_gdpr_cookie_compliance_options[style][left_offset]"><?php echo __( 'Left (px)', 'simple-gdpr-cookie-compliance' ); ?></label>
     393                        <label for="simple_gdpr_cookie_compliance_options[style][left_offset]"><?php echo esc_html__( 'Left (px)', 'simple-gdpr-cookie-compliance' ); ?></label>
    376394                        <input type="number" id="simple_gdpr_cookie_compliance_options[style][left_offset]" name="simple_gdpr_cookie_compliance_options[style][left_offset]" class="s_gdpr_c_n_number" value="<?php echo esc_attr( $left_offset ); ?>">
    377395                    </div>
    … …  
    389407    public function color_fields() {
    390408
    391 
    392         $notice_background_color = ! empty( $this->options['color']['notice_background'] ) ? $this->options['color']['notice_background'] : '#fbf01e';
    393 
    394         $notice_text_color = ! empty( $this->options['color']['notice_text'] ) ? $this->options['color']['notice_text'] : '#222222';
    395 
    396         $notice_link_color = ! empty( $this->options['color']['notice_link_color'] ) ? $this->options['color']['notice_link_color'] : '#222222';
    397 
    398         $notice_link_hover_color = ! empty( $this->options['color']['notice_link_hover_color'] ) ? $this->options['color']['notice_link_hover_color'] : '#4CC500';
    399 
    400         $notice_cookie_icon_color = ! empty( $this->options['color']['notice_cookie_icon_color'] ) ? $this->options['color']['notice_cookie_icon_color'] : '#222222';
    401 
    402         $notice_compliance_button_bg = ! empty( $this->options['color']['notice_compliance_button_bg'] ) ? $this->options['color']['notice_compliance_button_bg'] : '#222222';
    403 
    404         $notice_compliance_button_hover_bg_color = ! empty( $this->options['color']['notice_compliance_button_hover_bg_color'] ) ? $this->options['color']['notice_compliance_button_hover_bg_color'] : '#4cc500';
    405 
    406         $notice_compliance_button_border_color = ! empty( $this->options['color']['notice_compliance_button_border_color'] ) ? $this->options['color']['notice_compliance_button_border_color'] : '#222222';
    407 
    408         $notice_compliance_button_hover_border_color = ! empty( $this->options['color']['notice_compliance_button_hover_border_color'] ) ? $this->options['color']['notice_compliance_button_hover_border_color'] : '#4cc500';
    409 
    410         $notice_compliance_button_text_color = ! empty( $this->options['color']['notice_compliance_button_text_color'] ) ? $this->options['color']['notice_compliance_button_text_color'] : '#ffffff';
    411 
    412         $notice_compliance_button_hover_text_color = ! empty( $this->options['color']['notice_compliance_button_hover_text_color'] ) ? $this->options['color']['notice_compliance_button_hover_text_color'] : '#ffffff';
    413 
    414         $notice_box_close_btn_bg_color = ! empty( $this->options['color']['notice_box_close_btn_bg_color'] ) ? $this->options['color']['notice_box_close_btn_bg_color'] : '#222222';
    415 
    416         $notice_box_close_btn_bg_hover_color = ! empty( $this->options['color']['notice_box_close_btn_bg_hover_color'] ) ? $this->options['color']['notice_box_close_btn_bg_hover_color'] : '#4cc500';
    417 
    418         $notice_box_close_btn_text_color = ! empty( $this->options['color']['notice_box_close_btn_text_color'] ) ? $this->options['color']['notice_box_close_btn_text_color'] : '#ffffff';
    419 
    420         $notice_box_close_btn_hover_text_color = ! empty( $this->options['color']['notice_box_close_btn_hover_text_color'] ) ? $this->options['color']['notice_box_close_btn_hover_text_color'] : '#ffffff';
    421 
    422         $notice_bg_overlay_color = ! empty( $this->options['color']['notice_bg_overlay_color'] ) ? $this->options['color']['notice_bg_overlay_color'] : 'rgba(0,0,0,0.8)';
    423 
    424         $enable_bg_overlay = ! empty( $this->options['style']['enable_bg_overlay'] ) ? $this->options['style']['enable_bg_overlay'] : true;
    425 
    426         $type = ! empty( $this->options['style']['type'] ) ? $this->options['style']['type'] : 'custom_width';
     409        $notice_background_color = isset( $this->options['color']['notice_background'] ) ? $this->options['color']['notice_background'] : '#fbf01e';
     410
     411        $notice_text_color = isset( $this->options['color']['notice_text'] ) ? $this->options['color']['notice_text'] : '#222222';
     412
     413        $notice_link_color = isset( $this->options['color']['notice_link_color'] ) ? $this->options['color']['notice_link_color'] : '#222222';
     414
     415        $notice_link_hover_color = isset( $this->options['color']['notice_link_hover_color'] ) ? $this->options['color']['notice_link_hover_color'] : '#4CC500';
     416
     417        $notice_cookie_icon_color = isset( $this->options['color']['notice_cookie_icon_color'] ) ? $this->options['color']['notice_cookie_icon_color'] : '#222222';
     418
     419        $notice_compliance_button_bg = isset( $this->options['color']['notice_compliance_button_bg'] ) ? $this->options['color']['notice_compliance_button_bg'] : '#222222';
     420
     421        $notice_compliance_button_hover_bg_color = isset( $this->options['color']['notice_compliance_button_hover_bg_color'] ) ? $this->options['color']['notice_compliance_button_hover_bg_color'] : '#4cc500';
     422
     423        $notice_compliance_button_border_color = isset( $this->options['color']['notice_compliance_button_border_color'] ) ? $this->options['color']['notice_compliance_button_border_color'] : '#222222';
     424
     425        $notice_compliance_button_hover_border_color = isset( $this->options['color']['notice_compliance_button_hover_border_color'] ) ? $this->options['color']['notice_compliance_button_hover_border_color'] : '#4cc500';
     426
     427        $notice_compliance_button_text_color = isset( $this->options['color']['notice_compliance_button_text_color'] ) ? $this->options['color']['notice_compliance_button_text_color'] : '#ffffff';
     428
     429        $notice_compliance_button_hover_text_color = isset( $this->options['color']['notice_compliance_button_hover_text_color'] ) ? $this->options['color']['notice_compliance_button_hover_text_color'] : '#ffffff';
     430
     431        $notice_box_close_btn_bg_color = isset( $this->options['color']['notice_box_close_btn_bg_color'] ) ? $this->options['color']['notice_box_close_btn_bg_color'] : '#222222';
     432
     433        $notice_box_close_btn_bg_hover_color = isset( $this->options['color']['notice_box_close_btn_bg_hover_color'] ) ? $this->options['color']['notice_box_close_btn_bg_hover_color'] : '#4cc500';
     434
     435        $notice_box_close_btn_text_color = isset( $this->options['color']['notice_box_close_btn_text_color'] ) ? $this->options['color']['notice_box_close_btn_text_color'] : '#ffffff';
     436
     437        $notice_box_close_btn_hover_text_color = isset( $this->options['color']['notice_box_close_btn_hover_text_color'] ) ? $this->options['color']['notice_box_close_btn_hover_text_color'] : '#ffffff';
     438
     439        $notice_bg_overlay_color = isset( $this->options['color']['notice_bg_overlay_color'] ) ? $this->options['color']['notice_bg_overlay_color'] : 'rgba(0,0,0,0.8)';
     440
     441        $enable_bg_overlay = isset( $this->options['style']['enable_bg_overlay'] ) ? $this->options['style']['enable_bg_overlay'] : true;
     442
     443        $type = isset( $this->options['style']['type'] ) ? $this->options['style']['type'] : 'custom_width';
    427444
    428445        ?>
    429446        <div class="s_gdpr_c_n_field s_gdpr_c_n_color_options_field" id="s_gdpr_c_n_link">
    430447
    431             <div class="s_gdpr_c_n_group_wrapper <?php echo ( $enable_bg_overlay == true && $type == 'pop_up' ) ? '' : 'sgdpr_hidden'; ?>" id="s_gdpr_c_n_bg_overlay">
    432                 <h4 class="s_grpd_c_n_group_title"><?php echo __( 'Overlay Color', 'simple-gdpr-cookie-compliance' ); ?></h4>
     448            <div class="s_gdpr_c_n_group_wrapper <?php echo ( true === $enable_bg_overlay && 'pop_up' === $type ) ? '' : 'sgdpr_hidden'; ?>" id="s_gdpr_c_n_bg_overlay">
     449                <h4 class="s_grpd_c_n_group_title"><?php echo esc_html__( 'Overlay Color', 'simple-gdpr-cookie-compliance' ); ?></h4>
    433450                <div class="s_gdpr_c_n_group">
    434451                    <div class="s_gdpr_c_n_group_field">
    435                         <label for="simple_gdpr_cookie_compliance_options[color][notice_bg_overlay_color]"><?php echo __( 'Background', 'simple-gdpr-cookie-compliance' ); ?></label>
     452                        <label for="simple_gdpr_cookie_compliance_options[color][notice_bg_overlay_color]"><?php echo esc_html__( 'Background', 'simple-gdpr-cookie-compliance' ); ?></label>
    436453                        <input type="text" id="simple_gdpr_cookie_compliance_options[color][notice_bg_overlay_color]" name="simple_gdpr_cookie_compliance_options[color][notice_bg_overlay_color]" class="s_gdpr_c_n_color" data-alpha-enabled="true" value="<?php echo esc_attr( $notice_bg_overlay_color ); ?>">
    437454                    </div>
    … …  
    440457
    441458            <div class="s_gdpr_c_n_group_wrapper">
    442                 <h4 class="s_grpd_c_n_group_title"><?php echo __( 'Notice Color', 'simple-gdpr-cookie-compliance' ); ?></h4>
     459                <h4 class="s_grpd_c_n_group_title"><?php echo esc_html__( 'Notice Color', 'simple-gdpr-cookie-compliance' ); ?></h4>
    443460                <div class="s_gdpr_c_n_group">
    444461                    <div class="s_gdpr_c_n_group_field">
    445                         <label for="simple_gdpr_cookie_compliance_options[color][notice_background]"><?php echo __( 'Background', 'simple-gdpr-cookie-compliance' ); ?></label>
     462                        <label for="simple_gdpr_cookie_compliance_options[color][notice_background]"><?php echo esc_html__( 'Background', 'simple-gdpr-cookie-compliance' ); ?></label>
    446463                        <input type="text" id="simple_gdpr_cookie_compliance_options[color][notice_background]" name="simple_gdpr_cookie_compliance_options[color][notice_background]" class="s_gdpr_c_n_color" data-alpha-enabled="true" value="<?php echo esc_attr( $notice_background_color ); ?>">
    447464                    </div>
    448465                    <div class="s_gdpr_c_n_group_field">
    449                         <label for="simple_gdpr_cookie_compliance_options[color][notice_cookie_icon_color]"><?php echo __( 'Cookie Icon', 'simple-gdpr-cookie-compliance' ); ?></label>
     466                        <label for="simple_gdpr_cookie_compliance_options[color][notice_cookie_icon_color]"><?php echo esc_html__( 'Cookie Icon', 'simple-gdpr-cookie-compliance' ); ?></label>
    450467                        <input type="text" id="simple_gdpr_cookie_compliance_options[color][notice_cookie_icon_color]" name="simple_gdpr_cookie_compliance_options[color][notice_cookie_icon_color]" class="s_gdpr_c_n_color" value="<?php echo esc_attr( $notice_cookie_icon_color ); ?>">
    451468                    </div>
    452469                    <div class="s_gdpr_c_n_group_field">
    453                         <label for="simple_gdpr_cookie_compliance_options[color][notice_text]"><?php _e( 'Text', 'simple-gdpr-cookie-compliance' ); ?></label>
     470                        <label for="simple_gdpr_cookie_compliance_options[color][notice_text]"><?php echo esc_html__( 'Text', 'simple-gdpr-cookie-compliance' ); ?></label>
    454471                        <input type="text" id="simple_gdpr_cookie_compliance_options[color][notice_text]" name="simple_gdpr_cookie_compliance_options[color][notice_text]" class="s_gdpr_c_n_color" value="<?php echo esc_attr( $notice_text_color ); ?>">
    455472                    </div>
    456473                    <div class="s_gdpr_c_n_group_field">
    457                         <label for="simple_gdpr_cookie_compliance_options[color][notice_link_color]"><?php echo __( 'Link', 'simple-gdpr-cookie-compliance' ); ?></label>
     474                        <label for="simple_gdpr_cookie_compliance_options[color][notice_link_color]"><?php echo esc_html__( 'Link', 'simple-gdpr-cookie-compliance' ); ?></label>
    458475                        <input type="text" id="simple_gdpr_cookie_compliance_options[color][notice_link_color]" name="simple_gdpr_cookie_compliance_options[color][notice_link_color]" class="s_gdpr_c_n_color" value="<?php echo esc_attr( $notice_link_color ); ?>">
    459476                    </div>
    460477                    <div class="s_gdpr_c_n_group_field">
    461                         <label for="simple_gdpr_cookie_compliance_options[color][notice_link_hover_color]"><?php echo __( 'Link - On Hover', 'simple-gdpr-cookie-compliance' ); ?></label>
     478                        <label for="simple_gdpr_cookie_compliance_options[color][notice_link_hover_color]"><?php echo esc_html__( 'Link - On Hover', 'simple-gdpr-cookie-compliance' ); ?></label>
    462479                        <input type="text" id="simple_gdpr_cookie_compliance_options[color][notice_link_hover_color]" name="simple_gdpr_cookie_compliance_options[color][notice_link_hover_color]" class="s_gdpr_c_n_color" value="<?php echo esc_attr( $notice_link_hover_color ); ?>">
    463480                    </div>
    … …  
    466483
    467484            <div class="s_gdpr_c_n_group_wrapper">
    468                 <h4 class="s_grpd_c_n_group_title"><?php echo __( 'Close Button Color', 'simple-gdpr-cookie-compliance' ); ?></h4>
     485                <h4 class="s_grpd_c_n_group_title"><?php echo esc_html__( 'Close Button Color', 'simple-gdpr-cookie-compliance' ); ?></h4>
    469486                <div class="s_gdpr_c_n_group">
    470487                    <div class="s_gdpr_c_n_group_field">
    471                         <label for="simple_gdpr_cookie_compliance_options[color][notice_box_close_btn_bg_color]"><?php echo __( 'Background', 'simple-gdpr-cookie-compliance' ); ?></label>
     488                        <label for="simple_gdpr_cookie_compliance_options[color][notice_box_close_btn_bg_color]"><?php echo esc_html__( 'Background', 'simple-gdpr-cookie-compliance' ); ?></label>
    472489                        <input type="text" id="simple_gdpr_cookie_compliance_options[color][notice_box_close_btn_bg_color]" name="simple_gdpr_cookie_compliance_options[color][notice_box_close_btn_bg_color]" class="s_gdpr_c_n_color" data-alpha-enabled="true" value="<?php echo esc_attr( $notice_box_close_btn_bg_color ); ?>">
    473490                    </div>
    474491                    <div class="s_gdpr_c_n_group_field">
    475                         <label for="simple_gdpr_cookie_compliance_options[color][notice_box_close_btn_bg_hover_color]"><?php echo __( 'Background - On Hover', 'simple-gdpr-cookie-compliance' ); ?></label>
     492                        <label for="simple_gdpr_cookie_compliance_options[color][notice_box_close_btn_bg_hover_color]"><?php echo esc_html__( 'Background - On Hover', 'simple-gdpr-cookie-compliance' ); ?></label>
    476493                        <input type="text" id="simple_gdpr_cookie_compliance_options[color][notice_box_close_btn_bg_hover_color]" name="simple_gdpr_cookie_compliance_options[color][notice_box_close_btn_bg_hover_color]" class="s_gdpr_c_n_color" data-alpha-enabled="true" value="<?php echo esc_attr( $notice_box_close_btn_bg_hover_color ); ?>">
    477494                    </div>
    478495                    <div class="s_gdpr_c_n_group_field">
    479                         <label for="simple_gdpr_cookie_compliance_options[color][notice_box_close_btn_text_color]"><?php echo __( 'Text', 'simple-gdpr-cookie-compliance' ); ?></label>
     496                        <label for="simple_gdpr_cookie_compliance_options[color][notice_box_close_btn_text_color]"><?php echo esc_html__( 'Text', 'simple-gdpr-cookie-compliance' ); ?></label>
    480497                        <input type="text" id="simple_gdpr_cookie_compliance_options[color][notice_box_close_btn_text_color]" name="simple_gdpr_cookie_compliance_options[color][notice_box_close_btn_text_color]" class="s_gdpr_c_n_color" value="<?php echo esc_attr( $notice_box_close_btn_text_color ); ?>">   
    481498                    </div>
    482499                    <div class="s_gdpr_c_n_group_field">
    483                         <label for="simple_gdpr_cookie_compliance_options[color][notice_box_close_btn_hover_text_color]"><?php echo __( 'Text - On Hover', 'simple-gdpr-cookie-compliance' ); ?></label>
     500                        <label for="simple_gdpr_cookie_compliance_options[color][notice_box_close_btn_hover_text_color]"><?php echo esc_html__( 'Text - On Hover', 'simple-gdpr-cookie-compliance' ); ?></label>
    484501                        <input type="text" id="simple_gdpr_cookie_compliance_options[color][notice_box_close_btn_hover_text_color]" name="simple_gdpr_cookie_compliance_options[color][notice_box_close_btn_hover_text_color]" class="s_gdpr_c_n_color" value="<?php echo esc_attr( $notice_box_close_btn_hover_text_color ); ?>">
    485502                    </div>
    … …  
    488505
    489506            <div class="s_gdpr_c_n_group_wrapper">
    490                 <h4 class="s_grpd_c_n_group_title"><?php echo __( 'Accept Button Color', 'simple-gdpr-cookie-compliance' ); ?></h4>
     507                <h4 class="s_grpd_c_n_group_title"><?php echo esc_html__( 'Accept Button Color', 'simple-gdpr-cookie-compliance' ); ?></h4>
    491508                <div class="s_gdpr_c_n_group">
    492509                    <div class="s_gdpr_c_n_group_field">
    493                         <label for="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_bg]"><?php echo __( 'Background', 'simple-gdpr-cookie-compliance' ); ?></label>
     510                        <label for="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_bg]"><?php echo esc_html__( 'Background', 'simple-gdpr-cookie-compliance' ); ?></label>
    494511                        <input type="text" id="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_bg]" name="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_bg]" class="s_gdpr_c_n_color" data-alpha-enabled="true" value="<?php echo esc_attr( $notice_compliance_button_bg ); ?>">
    495512                    </div>
    496513                    <div class="s_gdpr_c_n_group_field">
    497                         <label for="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_hover_bg_color]"><?php echo __( 'Background - On Hover', 'simple-gdpr-cookie-compliance' ); ?></label>
     514                        <label for="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_hover_bg_color]"><?php echo esc_html__( 'Background - On Hover', 'simple-gdpr-cookie-compliance' ); ?></label>
    498515                        <input type="text" id="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_hover_bg_color]" name="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_hover_bg_color]" class="s_gdpr_c_n_color" data-alpha-enabled="true" value="<?php echo esc_attr( $notice_compliance_button_hover_bg_color ); ?>">
    499516                    </div>
    500517                    <div class="s_gdpr_c_n_group_field">
    501                         <label for="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_border_color]"><?php echo __( 'Border', 'simple-gdpr-cookie-compliance' ); ?></label>
     518                        <label for="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_border_color]"><?php echo esc_html__( 'Border', 'simple-gdpr-cookie-compliance' ); ?></label>
    502519                        <input type="text" id="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_border_color]" name="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_border_color]" class="s_gdpr_c_n_color" data-alpha-enabled="true" value="<?php echo esc_attr( $notice_compliance_button_border_color ); ?>">   
    503520                    </div>
    504521                    <div class="s_gdpr_c_n_group_field">
    505                         <label for="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_hover_border_color]"><?php echo __( 'Border - On Hover', 'simple-gdpr-cookie-compliance' ); ?></label>
     522                        <label for="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_hover_border_color]"><?php echo esc_html__( 'Border - On Hover', 'simple-gdpr-cookie-compliance' ); ?></label>
    506523                        <input type="text" id="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_hover_border_color]" name="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_hover_border_color]" class="s_gdpr_c_n_color" data-alpha-enabled="true" value="<?php echo esc_attr( $notice_compliance_button_hover_border_color ); ?>">
    507524                    </div>
    508525                    <div class="s_gdpr_c_n_group_field">
    509                         <label for="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_text_color]"><?php echo __( 'Text', 'simple-gdpr-cookie-compliance' ); ?></label>
     526                        <label for="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_text_color]"><?php echo esc_html__( 'Text', 'simple-gdpr-cookie-compliance' ); ?></label>
    510527                        <input type="text" id="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_text_color]" name="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_text_color]" class="s_gdpr_c_n_color" value="<?php echo esc_attr( $notice_compliance_button_text_color ); ?>">   
    511528                    </div>
    512529                    <div class="s_gdpr_c_n_group_field">
    513                         <label for="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_hover_text_color]"><?php echo __( 'Text - On Hover', 'simple-gdpr-cookie-compliance' ); ?></label>
     530                        <label for="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_hover_text_color]"><?php echo esc_html__( 'Text - On Hover', 'simple-gdpr-cookie-compliance' ); ?></label>
    514531                        <input type="text" id="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_hover_text_color]" name="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_hover_text_color]" class="s_gdpr_c_n_color" value="<?php echo esc_attr( $notice_compliance_button_hover_text_color ); ?>">
    515532                    </div>
    … …  
    526543     */
    527544    public function custom_css_fields() {
     545
    528546        $custom_css = ! empty( $this->options['custom_css'] ) ? $this->options['custom_css'] : '';
    529547        ?>
    530548        <div class="s_gdpr_c_n_field" id="s_gdpr_c_n_custom_css">
    531549            <p>
    532                 <label for="simple_gdpr_cookie_compliance_options[custom_css]"><?php echo __( 'CSS Codes', 'simple-gdpr-cookie-compliance' ); ?></label>
     550                <label for="simple_gdpr_cookie_compliance_options[custom_css]">
     551                    <?php echo esc_html__( 'CSS Codes', 'simple-gdpr-cookie-compliance' ); ?>
     552                </label>
    533553                <textarea id="simple_gdpr_cookie_compliance_options[custom_css]" name="simple_gdpr_cookie_compliance_options[custom_css]" class="s_gdpr_c_n_number"><?php echo esc_html( $custom_css ); ?></textarea>
    534554            </p>
    … …  
    539559     * Function for sanitization of fields.
    540560     *
    541      * @since    1.0.0
     561     * @since 1.0.0
     562     *
     563     * @param array $inputs Settings.
    542564     */
    543565    public function sanitize_fields( $inputs ) {
    … …  
    552574                'class' => array(),
    553575            ),
    554             'a' => array(
    555                 'class' => array(),
    556                 'href' => array(),
     576            'a'    => array(
     577                'class'  => array(),
     578                'href'   => array(),
    557579                'target' => array(),
    558                 'title' => array(),
     580                'title'  => array(),
    559581            ),
    560             'i' => array(
     582            'i'    => array(
    561583                'class' => array(),
    562584            ),
    … …  
    639661        $inputs['custom_css'] = isset( $inputs['custom_css'] ) ? sanitize_textarea_field( $inputs['custom_css'] ) : '';
    640662
    641         return $inputs;     
     663        return $inputs;
    642664    }
    643665}

  • simple-gdpr-cookie-compliance/tags/1.1.3/includes/class-simple-gdpr-cookie-compliance-activator.php

    r2662024 r2876942  
    11<?php
     2/**
     3 * Fired during plugin activation.
     4 *
     5 * This class defines all code necessary to run during the plugin's activation.
     6 *
     7 * @since      1.0.0
     8 * @package    Simple_GDPR_Cookie_Compliance
     9 * @subpackage Simple_GDPR_Cookie_Compliance/includes
     10 * @author     themebeez <themebeez@gmail.com>
     11 */
     12
    213/**
    314 * Fired during plugin activation.
    … …  
    2132    public function activate() {
    2233
    23         // This code runs at the time of activations
    24 
     34        // This code runs at the time of activations.
    2535    }
    26 
    2736}

  • simple-gdpr-cookie-compliance/tags/1.1.3/includes/class-simple-gdpr-cookie-compliance-deactivator.php

    r2662024 r2876942  
    11<?php
     2/**
     3 * Fired during plugin deactivation.
     4 *
     5 * This class defines all code necessary to run during the plugin's deactivation.
     6 *
     7 * @since      1.0.0
     8 * @package    Simple_GDPR_Cookie_Compliance
     9 * @subpackage Simple_GDPR_Cookie_Compliance/includes
     10 * @author     themebeez <themebeez@gmail.com>
     11 */
     12
    213/**
    314 * Fired during plugin deactivation.
    … …  
    2233
    2334    }
    24 
    2535}

  • simple-gdpr-cookie-compliance/tags/1.1.3/includes/class-simple-gdpr-cookie-compliance-i18n.php

    r2662024 r2876942  
    1111 * @author     themebeez <themebeez@gmail.com>
    1212 */
    13 class Simple_GDPR_Cookie_Compliance_i18n {
    1413
     14/**
     15 * Define the internationalization functionality.
     16 *
     17 * Loads and defines the internationalization files for this plugin
     18 * so that it is ready for translation.
     19 *
     20 * @since      1.0.0
     21 * @package    Simple_GDPR_Cookie_Compliance
     22 * @subpackage Simple_GDPR_Cookie_Compliance/includes
     23 * @author     themebeez <themebeez@gmail.com>
     24 */
     25class Simple_GDPR_Cookie_Compliance_i18n { // phpcs:ignore
    1526
    1627    /**
    … …  
    2637            dirname( dirname( plugin_basename( __FILE__ ) ) ) . '/languages/'
    2738        );
    28 
    2939    }
    30 
    31 
    32 
    3340}

  • simple-gdpr-cookie-compliance/tags/1.1.3/includes/class-simple-gdpr-cookie-compliance-loader.php

    r2662024 r2876942  
    11<?php
     2/**
     3 * Register all actions and filters for the plugin.
     4 *
     5 * Maintain a list of all hooks that are registered throughout
     6 * the plugin, and register them with the WordPress API. Call the
     7 * run function to execute the list of actions and filters.
     8 *
     9 * @package    Simple_GDPR_Cookie_Compliance
     10 * @subpackage Simple_GDPR_Cookie_Compliance/includes
     11 * @author     themebeez <themebeez@gmail.com>
     12 */
     13
    214/**
    315 * Register all actions and filters for the plugin.
    … …  
    4052        $this->actions = array();
    4153        $this->filters = array();
    42 
    4354    }
    4455
    … …  
    4758     *
    4859     * @since    1.0.0
    49      * @param    string               $hook             The name of the WordPress action that is being registered.
    50      * @param    object               $component        A reference to the instance of the object on which the action is defined.
    51      * @param    string               $callback         The name of the function definition on the $component.
    52      * @param    int                  $priority         Optional. The priority at which the function should be fired. Default is 10.
    53      * @param    int                  $accepted_args    Optional. The number of arguments that should be passed to the $callback. Default is 1.
     60     * @param string $hook          The name of the WordPress action that is being registered.
     61     * @param object $component     A reference to the instance of the object on which the action is defined.
     62     * @param string $callback      The name of the function definition on the $component.
     63     * @param int    $priority      Optional. The priority at which the function should be fired. Default is 10.
     64     * @param int    $accepted_args Optional. The number of arguments that should be passed to the $callback. Default is 1.
    5465     */
    5566    public function add_action( $hook, $component, $callback, $priority = 10, $accepted_args = 1 ) {
    … …  
    6172     *
    6273     * @since    1.0.0
    63      * @param    string               $hook             The name of the WordPress filter that is being registered.
    64      * @param    object               $component        A reference to the instance of the object on which the filter is defined.
    65      * @param    string               $callback         The name of the function definition on the $component.
    66      * @param    int                  $priority         Optional. The priority at which the function should be fired. Default is 10.
    67      * @param    int                  $accepted_args    Optional. The number of arguments that should be passed to the $callback. Default is 1
     74     * @param string $hook          The name of the WordPress filter that is being registered.
     75     * @param object $component     A reference to the instance of the object on which the filter is defined.
     76     * @param string $callback      The name of the function definition on the $component.
     77     * @param int    $priority      Optional. The priority at which the function should be fired. Default is 10.
     78     * @param int    $accepted_args Optional. The number of arguments that should be passed to the $callback. Default is 1.
    6879     */
    6980    public function add_filter( $hook, $component, $callback, $priority = 10, $accepted_args = 1 ) {
    … …  
    7687     *
    7788     * @since    1.0.0
    78      * @access   private
    79      * @param    array                $hooks            The collection of hooks that is being registered (that is, actions or filters).
    80      * @param    string              $hook             The name of the WordPress filter that is being registered.
    81      * @param    object              $component        A reference to the instance of the object on which the filter is defined.
    82      * @param    string              $callback         The name of the function definition on the $component.
    83      * @param    int                  $priority         The priority at which the function should be fired.
    84      * @param    int                  $accepted_args    The number of arguments that should be passed to the $callback.
     89     * @accessprivate
     90     * @param array  $hooks            The collection of hooks that is being registered (that is, actions or filters).
     91     * @param string $hook             The name of the WordPress filter that is being registered.
     92     * @param object $component        A reference to the instance of the object on which the filter is defined.
     93     * @param string $callback         The name of the function definition on the $component.
     94     * @param int    $priority         The priority at which the function should be fired.
     95     * @param int    $accepted_args    The number of arguments that should be passed to the $callback.
    8596     * @return   array                                  The collection of actions and filters registered with WordPress.
    8697     */
    … …  
    92103            'callback'      => $callback,
    93104            'priority'      => $priority,
    94             'accepted_args' => $accepted_args
     105            'accepted_args' => $accepted_args,
    95106        );
    96107
    … …  
    113124            add_action( $hook['hook'], array( $hook['component'], $hook['callback'] ), $hook['priority'], $hook['accepted_args'] );
    114125        }
    115 
    116126    }
    117 
    118127}

  • simple-gdpr-cookie-compliance/tags/1.1.3/includes/class-simple-gdpr-cookie-compliance.php

    r2867952 r2876942  
    11<?php
     2/**
     3 * The core plugin class.
     4 *
     5 * This is used to define internationalization, admin-specific hooks, and
     6 * public-facing site hooks.
     7 *
     8 * Also maintains the unique identifier of this plugin as well as the current
     9 * version of the plugin.
     10 *
     11 * @since      1.0.0
     12 * @package    Simple_GDPR_Cookie_Compliance
     13 * @subpackage Simple_GDPR_Cookie_Compliance/includes
     14 * @author     themebeez <themebeez@gmail.com>
     15 */
     16
    217/**
    318 * The core plugin class.
    … …  
    153168        $plugin_admin = new Simple_GDPR_Cookie_Compliance_Admin( $this->get_plugin_name(), $this->get_version() );
    154169
    155         if ( 'admin.php' == $pagenow && isset( $_GET['page'] ) && 'simple-gdpr-cookie-compliance' == $_GET['page'] ) {
     170        if (
     171            'admin.php' === $pagenow &&
     172            isset( $_GET['page'] ) && // phpcs:ignore
     173            'simple-gdpr-cookie-compliance' === sanitize_text_field( wp_unslash( $_GET['page'] ) ) // phpcs:ignore
     174        ) {
    156175            $this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
    157176            $this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts' );
    … …  
    160179        $this->loader->add_action( 'admin_menu', $plugin_admin, 'plugin_menu' );
    161180
    162         // $this->loader->add_filter( 'plugin_action_links', $plugin_admin, 'plugin_page_links' );
    163181        $plugin_basename = SIMPLE_GDPR_COOKIE_COMPLIANCE_BASENAME;
    164182
    165183        $this->loader->add_filter( "plugin_action_links_{$plugin_basename}", $plugin_admin, 'plugin_page_links' );
    166184
    167         $plugin_options = new Simple_GDPR_Cookie_Compliance_Admin_Settings( $this->get_plugin_name(), $this->get_version() );
     185        $plugin_options = new Simple_GDPR_Cookie_Compliance_Settings( $this->get_plugin_name(), $this->get_version() );
    168186
    169187        $this->loader->add_action( 'admin_init', $plugin_options, 'register_settings' );

  • simple-gdpr-cookie-compliance/tags/1.1.3/includes/udp/class-udp-agent.php

    r2874093 r2876942  
    55 * @link       https://creamcode.org/user-data-processing/
    66 * @since      1.0.0
    7  * @author     CreamCode
     7 * @author     CreamCode <contact@creamcode.org>
    88 * @package    Udp_Agent
    99 */
    … …  
    6060
    6161        $this->hooks();
    62 
    6362    }
    6463
    … …  
    7473     */
    7574    private function hooks() {
     75
    7676        add_action( 'init', array( $this, 'on_init' ) );
    7777        add_action( 'admin_init', array( $this, 'on_admin_init' ) );
    7878
    79         // custom cron.
     79        // Custom WP Schedule.
    8080        add_action( 'init', array( $this, 'udp_schedule_cron' ) );
    8181    }
    … …  
    8888     */
    8989    public function on_init() {
    90         // process user tracking actions.
     90
     91        // Process user tracking actions.
    9192        if ( isset( $_GET['udp-agent-allow-access'] ) ) { //phpcs:ignore
    9293            $this->process_user_tracking_choice();
    9394        }
    94 
    9595    }
    9696
    … …  
    102102    public function on_admin_init() {
    103103
    104         // register and save settings data.
     104        // Register setting to get user's consent for data collection.
    105105        register_setting(
    106106            'general',
    … …  
    111111        );
    112112
    113         // show ui in settings page.
     113        // Render setting field to get user's consent for data collection.
    114114        add_settings_field(
    115115            'udp_agent_allow_tracking',
    … …  
    126126
    127127    /**
    128      * Change the value of checkbox ( in settings page ) from integer to "yes" or "no"
    129      * and store in database.
    130      *
    131      * @since    1.0.0
    132      * @param    string $data Data to modify.
     128     * Sanitization callback function for sanitizing value of 'udp_agent_allow_tracking' setting.
     129     *
     130     * @since 1.0.0
     131     *
     132     * @param string $data Raw data.
     133     * @return string
    133134     */
    134135    public function get_settings_field_val( $data ) {
    135         if ( 1 === (int) $data ) {
    136             return 'yes';
    137         } else {
    138             return 'no';
    139         }
    140 
     136
     137        return ( 'yes' === sanitize_text_field( $data ) ) ? 'yes' : 'no';
    141138    }
    142139
    … …  
    147144
    148145    /**
    149      * Generate markups to show in settings page.
     146     * Generate markups for setting field, 'udp_agent_allow_tracking'.
    150147     *
    151148     * @since    1.0.0
    152149     */
    153150    public function show_settings_ui() {
     151
    154152        echo '<p>';
    155         echo "<input type='checkbox' name='udp_agent_allow_tracking' id='udp_agent_allow_tracking' value='1'";
     153        echo "<input type='checkbox' name='udp_agent_allow_tracking' id='udp_agent_allow_tracking' value='yes'";
    156154        if ( 'yes' === get_option( 'udp_agent_allow_tracking' ) ) {
    157155            echo ' checked';
    … …  
    175173     */
    176174    private function process_user_tracking_choice() {
     175
    177176        $users_choice = isset( $_GET['udp-agent-allow-access'] ) ? sanitize_text_field( wp_unslash( $_GET['udp-agent-allow-access'] ) ) : ''; //phpcs:ignore
    178177
    … …  
    181180        }
    182181
    183         // add data into database.
     182        // Add data into database.
    184183        update_option( 'udp_agent_allow_tracking', $users_choice );
    185184        if ( 'yes' === $users_choice ) {
    … …  
    188187        update_option( 'udp_agent_tracking_msg_last_shown_at', time() );
    189188
    190         // redirect back.
    191         wp_safe_redirect( remove_query_arg( 'udp-agent-allow-access' ) );
     189        // Redirect back to dashboard.
     190        wp_safe_redirect( admin_url() );
    192191        exit;
    193192
    … …  
    242241
    243242        return $data;
    244 
    245243    }
    246244
    … …  
    259257
    260258        if ( 'yes' !== $track_user ) {
    261             // do not send data.
     259            // Do not send data.
    262260            return;
    263261        }
    264262
    265         // secret key will be same for all agents.
    266         $secret_key = get_option( 'udp_agent_secret_key' );
    267         if ( ! empty( $secret_key ) ) {
    268 
    269             // secret_key already exists.
    270             // do nothing.
    271             return true;
    272         }
    273 
    274         // authenticate with engine.
    275 
    276263        $data['agent_data'] = serialize( $this->get_data() ); //phpcs:ignore
    277         $data['site_url']   = get_bloginfo( 'url' );
    278264        $url                = untrailingslashit( $this->engine_url ) . '/wp-json/udp-engine/v1/handshake';
    279265
    … …  
    281267
    282268        return true;
    283 
    284269    }
    285270
    … …  
    292277     *
    293278     * @since 1.0.0
     279     *
    294280     * @return void
    295281     */
    … …  
    302288            wp_schedule_event( time(), 'daily', $cron_hook_name );
    303289        }
    304 
    305290    }
    306291
    … …  
    310295     *
    311296     * @since 1.0.0
     297     *
    312298     * @return void
    313299     */
    … …  
    317303
    318304        if ( 'yes' !== $track_user ) {
    319             // do not send data.
     305            // Do not send data.
    320306            return;
    321307        }
    322308
    323309        $data_to_send['agent_data'] = serialize( $this->get_data() ); //phpcs:ignore
    324         $data_to_send['secret_key'] = get_option( 'udp_agent_secret_key' );
    325310        $url                        = untrailingslashit( $this->engine_url ) . '/wp-json/udp-engine/v1/process-data';
    326         // $this->write_log( __FUNCTION__ . $this->do_curl( $url, $data_to_send ) );
    327311        $this->do_curl( $url, $data_to_send );
    328312        exit;
    329 
    330313    }
    331314
    … …  
    337320     */
    338321    private function write_log( $log ) {
     322
    339323        if ( true === WP_DEBUG && true === WP_DEBUG_LOG ) {
    340324            if ( is_array( $log ) || is_object( $log ) ) {
    … …  
    350334     *
    351335     * @since    1.0.0
     336     *
    352337     * @param string $url URL.
    353338     * @param array  $data_to_send Data to send.
    … …  
    355340     */
    356341    private function do_curl( $url, $data_to_send ) {
     342
    357343        if ( empty( $url ) ) {
    358344            return;
    … …  
    367353        return wp_remote_retrieve_body( $return_data );
    368354    }
    369 
    370355}

  • simple-gdpr-cookie-compliance/tags/1.1.3/includes/udp/init.php

    r2874093 r2876942  
    9999                    esc_html__( '%s is asking to allow tracking your non-sensitive WordPress data?', 'simple-gdpr-cookie-compliance' ),
    100100                    $agent_name
    101                 ) . '</p><p>';
    102 
    103                 $content .= sprintf(
    104                     /* translators: %s: agent allow access link, %s: Allow */
    105                     '<a href="%1$s" class="button button-primary udp-agent-access_tracking-yes" style="margin-right: 10px" >%2$s</a>',
    106                     add_query_arg( 'udp-agent-allow-access', 'yes' ),
    107                     esc_html__( 'Allow', 'simple-gdpr-cookie-compliance' )
    108                 );
    109 
    110                 $content .= sprintf(
    111                     /* translators: %s: agent allow access link, %s: Allow */
    112                     '<a href="%1$s" class="button button-secondary udp-agent-access_tracking-no" style="margin-right: 10px" >%2$s</a>',
    113                     add_query_arg( 'udp-agent-allow-access', 'no' ),
    114                     esc_html__( 'Do not show again', 'simple-gdpr-cookie-compliance' )
    115                 );
    116 
    117                 $content .= sprintf(
    118                     /* translators: %s: agent allow access link, %s: Allow */
    119                     '<a href="%1$s" class="button button-secondary udp-agent-access_tracking-yes" style="margin-right: 10px" >%2$s</a>',
    120                     add_query_arg( 'udp-agent-allow-access', 'later' ),
    121                     esc_html__( 'Later', 'simple-gdpr-cookie-compliance' )
    122                 );
     101                ) . '</p>';
     102
     103                $content .= '<p>';
     104
     105                $content .= '<a href="' . esc_url( admin_url( '?udp-agent-allow-access=yes' ) ) . '" class="button button-primary udp-agent-access_tracking-yes" style="margin-right: 10px">' . esc_html__( 'Allow', 'simple-gdpr-cookie-compliance' ) . '</a>';
     106
     107                $content .= '<a href="' . esc_url( admin_url( '?udp-agent-allow-access=no' ) ) . '" class="button button-secondary udp-agent-access_tracking-yes" style="margin-right: 10px">' . esc_html__( 'Do not show again', 'simple-gdpr-cookie-compliance' ) . '</a>';
     108
     109                $content .= '<a href="' . esc_url( admin_url( '?udp-agent-allow-access=later' ) ) . '" class="button button-secondary udp-agent-access_tracking-yes" style="margin-right: 10px">' . esc_html__( 'Later', 'simple-gdpr-cookie-compliance' ) . '</a>';
    123110
    124111                $content .= '</p>';
     112
    125113                add_action(
    126114                    'load-index.php',

  • simple-gdpr-cookie-compliance/tags/1.1.3/languages/simple-gdpr-cookie-compliance.pot

    r2874093 r2876942  
    33msgid ""
    44msgstr ""
    5 "Project-Id-Version: Simple GDPR Cookie Compliance 1.1.2\n"
     5"Project-Id-Version: Simple GDPR Cookie Compliance 1.1.3\n"
    66"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/simple-gdpr-cookie-compliance\n"
    77"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
    … …  
    1010"Content-Type: text/plain; charset=UTF-8\n"
    1111"Content-Transfer-Encoding: 8bit\n"
    12 "POT-Creation-Date: 2023-03-03T06:22:18+00:00\n"
     12"POT-Creation-Date: 2023-03-07T10:54:57+00:00\n"
    1313"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
    1414"X-Generator: WP-CLI 2.7.1\n"
    … …  
    1616
    1717#. Plugin Name of the plugin
    18 #: admin/class-simple-gdpr-cookie-compliance-admin.php:115
     18#: admin/class-simple-gdpr-cookie-compliance-admin.php:156
    1919#: admin/partials/simple-gdpr-cookie-compliance-admin-page.php:21
    2020msgid "Simple GDPR Cookie Compliance"
    … …  
    3737msgstr ""
    3838
    39 #: admin/class-simple-gdpr-cookie-compliance-admin.php:135
     39#: admin/class-simple-gdpr-cookie-compliance-admin.php:157
     40msgid "Simple GDPR"
     41msgstr ""
     42
     43#: admin/class-simple-gdpr-cookie-compliance-admin.php:184
    4044msgid "Settings"
    4145msgstr ""
    4246
    43 #: admin/class-simple-gdpr-cookie-compliance-settings.php:70
     47#: admin/class-simple-gdpr-cookie-compliance-settings.php:79
    4448msgid "Configure Settings"
    4549msgstr ""
    4650
    47 #: admin/class-simple-gdpr-cookie-compliance-settings.php:76
     51#: admin/class-simple-gdpr-cookie-compliance-settings.php:86
    4852msgid "Notice Content"
    4953msgstr ""
    5054
    51 #: admin/class-simple-gdpr-cookie-compliance-settings.php:83
     55#: admin/class-simple-gdpr-cookie-compliance-settings.php:94
    5256msgid "Cookie"
    5357msgstr ""
    5458
    55 #: admin/class-simple-gdpr-cookie-compliance-settings.php:90
     59#: admin/class-simple-gdpr-cookie-compliance-settings.php:102
    5660msgid "Style"
    5761msgstr ""
    5862
    59 #: admin/class-simple-gdpr-cookie-compliance-settings.php:97
     63#: admin/class-simple-gdpr-cookie-compliance-settings.php:110
    6064msgid "Colors"
    6165msgstr ""
    6266
    63 #: admin/class-simple-gdpr-cookie-compliance-settings.php:104
     67#: admin/class-simple-gdpr-cookie-compliance-settings.php:118
    6468msgid "Custom CSS"
    6569msgstr ""
    6670
    67 #: admin/class-simple-gdpr-cookie-compliance-settings.php:127
    68 #: public/class-simple-gdpr-cookie-compliance-public.php:153
     71#: admin/class-simple-gdpr-cookie-compliance-settings.php:141
     72#: public/class-simple-gdpr-cookie-compliance-public.php:175
    6973msgid "Our website uses cookies to provide you the best experience. However, by continuing to use our website, you agree to our use of cookies. For more information, read our <a href=\"#\">Cookie Policy</a>."
    7074msgstr ""
    7175
    72 #: admin/class-simple-gdpr-cookie-compliance-settings.php:137
     76#: admin/class-simple-gdpr-cookie-compliance-settings.php:151
    7377msgid "More Information"
    7478msgstr ""
    7579
    76 #: admin/class-simple-gdpr-cookie-compliance-settings.php:141
     80#: admin/class-simple-gdpr-cookie-compliance-settings.php:155
    7781msgid "Accept"
    7882msgstr ""
    7983
    80 #: admin/class-simple-gdpr-cookie-compliance-settings.php:152
     84#: admin/class-simple-gdpr-cookie-compliance-settings.php:167
    8185msgid "Message"
    8286msgstr ""
    8387
    84 #: admin/class-simple-gdpr-cookie-compliance-settings.php:154
     88#: admin/class-simple-gdpr-cookie-compliance-settings.php:171
    8589msgid "Enter the notice message. You can also insert &lt;span class=&quot;..&quot;&gt;...&lt;/span&gt;, &lt;a href=&quot;..&quot; target=&quot;..&quot; class=&quot;..&quot; title=&quot;..&quot;&gt;...&lt;/a&gt;, and &lt;i class=&quot;..&quot;&gt;...&lt;/i&gt; HTML tags along with the message."
    8690msgstr ""
    8791
    88 #: admin/class-simple-gdpr-cookie-compliance-settings.php:159
     92#: admin/class-simple-gdpr-cookie-compliance-settings.php:177
    8993msgid "Link Type"
    9094msgstr ""
    9195
    92 #: admin/class-simple-gdpr-cookie-compliance-settings.php:162
     96#: admin/class-simple-gdpr-cookie-compliance-settings.php:180
    9397msgid "No Link"
    9498msgstr ""
    9599
    96 #: admin/class-simple-gdpr-cookie-compliance-settings.php:163
     100#: admin/class-simple-gdpr-cookie-compliance-settings.php:181
    97101msgid "Custom Link"
    98102msgstr ""
    99103
    100 #: admin/class-simple-gdpr-cookie-compliance-settings.php:164
     104#: admin/class-simple-gdpr-cookie-compliance-settings.php:182
    101105msgid "Page"
    102106msgstr ""
    103107
    104 #: admin/class-simple-gdpr-cookie-compliance-settings.php:180
     108#: admin/class-simple-gdpr-cookie-compliance-settings.php:199
    105109msgid "Link Content"
    106110msgstr ""
    107111
    108 #: admin/class-simple-gdpr-cookie-compliance-settings.php:181
     112#: admin/class-simple-gdpr-cookie-compliance-settings.php:200
    109113msgid "Link content will be appended after the message."
    110114msgstr ""
    111115
    112 #: admin/class-simple-gdpr-cookie-compliance-settings.php:184
     116#: admin/class-simple-gdpr-cookie-compliance-settings.php:203
    113117msgid "Text Before Link"
    114118msgstr ""
    115119
    116 #: admin/class-simple-gdpr-cookie-compliance-settings.php:189
     120#: admin/class-simple-gdpr-cookie-compliance-settings.php:208
    117121msgid "Text After Link"
    118122msgstr ""
    119123
    120 #: admin/class-simple-gdpr-cookie-compliance-settings.php:195
     124#: admin/class-simple-gdpr-cookie-compliance-settings.php:214
    121125msgid "Custom Link Title"
    122126msgstr ""
    123127
    124 #: admin/class-simple-gdpr-cookie-compliance-settings.php:200
     128#: admin/class-simple-gdpr-cookie-compliance-settings.php:219
    125129msgid "Custom URL"
    126130msgstr ""
    127131
    128 #: admin/class-simple-gdpr-cookie-compliance-settings.php:207
     132#: admin/class-simple-gdpr-cookie-compliance-settings.php:226
    129133msgid "Link Page"
    130134msgstr ""
    131135
    132 #: admin/class-simple-gdpr-cookie-compliance-settings.php:214
     136#: admin/class-simple-gdpr-cookie-compliance-settings.php:234
    133137msgid "Select Page"
    134138msgstr ""
    135139
    136 #: admin/class-simple-gdpr-cookie-compliance-settings.php:222
     140#: admin/class-simple-gdpr-cookie-compliance-settings.php:242
    137141msgid "Show link in a new tab"
    138142msgstr ""
    139143
    140 #: admin/class-simple-gdpr-cookie-compliance-settings.php:227
     144#: admin/class-simple-gdpr-cookie-compliance-settings.php:247
    141145msgid "Accept Button Title"
    142146msgstr ""
    143147
    144 #: admin/class-simple-gdpr-cookie-compliance-settings.php:233
     148#: admin/class-simple-gdpr-cookie-compliance-settings.php:252
    145149msgid "Display Close Button"
    146150msgstr ""
    147151
    148 #: admin/class-simple-gdpr-cookie-compliance-settings.php:238
     152#: admin/class-simple-gdpr-cookie-compliance-settings.php:256
    149153msgid "Display Cookie Icon"
    150154msgstr ""
    151155
    152 #: admin/class-simple-gdpr-cookie-compliance-settings.php:255
     156#: admin/class-simple-gdpr-cookie-compliance-settings.php:273
    153157msgid "Cookie Expire Time"
    154158msgstr ""
    155159
    156 #: admin/class-simple-gdpr-cookie-compliance-settings.php:257
     160#: admin/class-simple-gdpr-cookie-compliance-settings.php:275
    157161msgid "Once the user clicks on Accept button, cookie notice will disappear. Expire Time sets the time duration for which cookie notice will disappear. Set &quot;0&quot; for SESSION cookie."
    158162msgstr ""
    159163
    160 #: admin/class-simple-gdpr-cookie-compliance-settings.php:289
     164#: admin/class-simple-gdpr-cookie-compliance-settings.php:307
    161165msgid "Width Style"
    162166msgstr ""
    163167
    164 #: admin/class-simple-gdpr-cookie-compliance-settings.php:292
     168#: admin/class-simple-gdpr-cookie-compliance-settings.php:310
    165169msgid "Full Width"
    166170msgstr ""
    167171
    168 #: admin/class-simple-gdpr-cookie-compliance-settings.php:293
     172#: admin/class-simple-gdpr-cookie-compliance-settings.php:311
    169173msgid "Custom Width"
    170174msgstr ""
    171175
    172 #: admin/class-simple-gdpr-cookie-compliance-settings.php:294
     176#: admin/class-simple-gdpr-cookie-compliance-settings.php:312
    173177msgid "Pop Up"
    174178msgstr ""
    175179
    176 #: admin/class-simple-gdpr-cookie-compliance-settings.php:309
     180#: admin/class-simple-gdpr-cookie-compliance-settings.php:327
    177181msgid "Width"
    178182msgstr ""
    179183
    180 #: admin/class-simple-gdpr-cookie-compliance-settings.php:314
    181 #: admin/class-simple-gdpr-cookie-compliance-settings.php:333
     184#: admin/class-simple-gdpr-cookie-compliance-settings.php:332
     185#: admin/class-simple-gdpr-cookie-compliance-settings.php:351
    182186msgid "Position"
    183187msgstr ""
    184188
    185 #: admin/class-simple-gdpr-cookie-compliance-settings.php:317
     189#: admin/class-simple-gdpr-cookie-compliance-settings.php:335
    186190msgid "Top"
    187191msgstr ""
    188192
    189 #: admin/class-simple-gdpr-cookie-compliance-settings.php:318
     193#: admin/class-simple-gdpr-cookie-compliance-settings.php:336
    190194msgid "Bottom"
    191195msgstr ""
    192196
    193 #: admin/class-simple-gdpr-cookie-compliance-settings.php:336
     197#: admin/class-simple-gdpr-cookie-compliance-settings.php:354
    194198msgid "Top Left"
    195199msgstr ""
    196200
    197 #: admin/class-simple-gdpr-cookie-compliance-settings.php:337
     201#: admin/class-simple-gdpr-cookie-compliance-settings.php:355
    198202msgid "Top Center"
    199203msgstr ""
    200204
    201 #: admin/class-simple-gdpr-cookie-compliance-settings.php:338
     205#: admin/class-simple-gdpr-cookie-compliance-settings.php:356
    202206msgid "Top Right"
    203207msgstr ""
    204208
    205 #: admin/class-simple-gdpr-cookie-compliance-settings.php:339
     209#: admin/class-simple-gdpr-cookie-compliance-settings.php:357
    206210msgid "Bottom Left"
    207211msgstr ""
    208212
    209 #: admin/class-simple-gdpr-cookie-compliance-settings.php:340
     213#: admin/class-simple-gdpr-cookie-compliance-settings.php:358
    210214msgid "Bottom Center"
    211215msgstr ""
    212216
    213 #: admin/class-simple-gdpr-cookie-compliance-settings.php:341
     217#: admin/class-simple-gdpr-cookie-compliance-settings.php:359
    214218msgid "Bottom Right"
    215219msgstr ""
    216220
    217 #: admin/class-simple-gdpr-cookie-compliance-settings.php:355
     221#: admin/class-simple-gdpr-cookie-compliance-settings.php:373
    218222msgid "Enable Background Overlay"
    219223msgstr ""
    220224
    221 #: admin/class-simple-gdpr-cookie-compliance-settings.php:360
     225#: admin/class-simple-gdpr-cookie-compliance-settings.php:378
    222226msgid "Offsets"
    223227msgstr ""
    224228
    225 #: admin/class-simple-gdpr-cookie-compliance-settings.php:363
     229#: admin/class-simple-gdpr-cookie-compliance-settings.php:381
    226230msgid "Top (px)"
    227231msgstr ""
    228232
    229 #: admin/class-simple-gdpr-cookie-compliance-settings.php:367
     233#: admin/class-simple-gdpr-cookie-compliance-settings.php:385
    230234msgid "Right (px)"
    231235msgstr ""
    232236
    233 #: admin/class-simple-gdpr-cookie-compliance-settings.php:371
     237#: admin/class-simple-gdpr-cookie-compliance-settings.php:389
    234238msgid "Bottom (px)"
    235239msgstr ""
    236240
    237 #: admin/class-simple-gdpr-cookie-compliance-settings.php:375
     241#: admin/class-simple-gdpr-cookie-compliance-settings.php:393
    238242msgid "Left (px)"
    239243msgstr ""
    240244
    241 #: admin/class-simple-gdpr-cookie-compliance-settings.php:432
     245#: admin/class-simple-gdpr-cookie-compliance-settings.php:449
    242246msgid "Overlay Color"
    243247msgstr ""
    244248
    245 #: admin/class-simple-gdpr-cookie-compliance-settings.php:435
    246 #: admin/class-simple-gdpr-cookie-compliance-settings.php:445
    247 #: admin/class-simple-gdpr-cookie-compliance-settings.php:471
    248 #: admin/class-simple-gdpr-cookie-compliance-settings.php:493
     249#: admin/class-simple-gdpr-cookie-compliance-settings.php:452
     250#: admin/class-simple-gdpr-cookie-compliance-settings.php:462
     251#: admin/class-simple-gdpr-cookie-compliance-settings.php:488
     252#: admin/class-simple-gdpr-cookie-compliance-settings.php:510
    249253msgid "Background"
    250254msgstr ""
    251255
    252 #: admin/class-simple-gdpr-cookie-compliance-settings.php:442
     256#: admin/class-simple-gdpr-cookie-compliance-settings.php:459
    253257msgid "Notice Color"
    254258msgstr ""
    255259
    256 #: admin/class-simple-gdpr-cookie-compliance-settings.php:449
     260#: admin/class-simple-gdpr-cookie-compliance-settings.php:466
    257261msgid "Cookie Icon"
    258262msgstr ""
    259263
    260 #: admin/class-simple-gdpr-cookie-compliance-settings.php:453
    261 #: admin/class-simple-gdpr-cookie-compliance-settings.php:479
    262 #: admin/class-simple-gdpr-cookie-compliance-settings.php:509
     264#: admin/class-simple-gdpr-cookie-compliance-settings.php:470
     265#: admin/class-simple-gdpr-cookie-compliance-settings.php:496
     266#: admin/class-simple-gdpr-cookie-compliance-settings.php:526
    263267msgid "Text"
    264268msgstr ""
    265269
    266 #: admin/class-simple-gdpr-cookie-compliance-settings.php:457
     270#: admin/class-simple-gdpr-cookie-compliance-settings.php:474
    267271msgid "Link"
    268272msgstr ""
    269273
    270 #: admin/class-simple-gdpr-cookie-compliance-settings.php:461
     274#: admin/class-simple-gdpr-cookie-compliance-settings.php:478
    271275msgid "Link - On Hover"
    272276msgstr ""
    273277
    274 #: admin/class-simple-gdpr-cookie-compliance-settings.php:468
     278#: admin/class-simple-gdpr-cookie-compliance-settings.php:485
    275279msgid "Close Button Color"
    276280msgstr ""
    277281
    278 #: admin/class-simple-gdpr-cookie-compliance-settings.php:475
    279 #: admin/class-simple-gdpr-cookie-compliance-settings.php:497
     282#: admin/class-simple-gdpr-cookie-compliance-settings.php:492
     283#: admin/class-simple-gdpr-cookie-compliance-settings.php:514
    280284msgid "Background - On Hover"
    281285msgstr ""
    282286
    283 #: admin/class-simple-gdpr-cookie-compliance-settings.php:483
    284 #: admin/class-simple-gdpr-cookie-compliance-settings.php:513
     287#: admin/class-simple-gdpr-cookie-compliance-settings.php:500
     288#: admin/class-simple-gdpr-cookie-compliance-settings.php:530
    285289msgid "Text - On Hover"
    286290msgstr ""
    287291
    288 #: admin/class-simple-gdpr-cookie-compliance-settings.php:490
     292#: admin/class-simple-gdpr-cookie-compliance-settings.php:507
    289293msgid "Accept Button Color"
    290294msgstr ""
    291295
    292 #: admin/class-simple-gdpr-cookie-compliance-settings.php:501
     296#: admin/class-simple-gdpr-cookie-compliance-settings.php:518
    293297msgid "Border"
    294298msgstr ""
    295299
    296 #: admin/class-simple-gdpr-cookie-compliance-settings.php:505
     300#: admin/class-simple-gdpr-cookie-compliance-settings.php:522
    297301msgid "Border - On Hover"
    298302msgstr ""
    299303
    300 #: admin/class-simple-gdpr-cookie-compliance-settings.php:532
     304#: admin/class-simple-gdpr-cookie-compliance-settings.php:551
    301305msgid "CSS Codes"
    302306msgstr ""
    … …  
    310314msgstr ""
    311315
    312 #: includes/udp/class-udp-agent.php:160
     316#: includes/udp/class-udp-agent.php:158
    313317msgid "Become a super contributor by sharing your non-sensitive WordPress data. We guarantee no sensitive data is collected."
    314318msgstr ""
    315319
    316 #: includes/udp/class-udp-agent.php:161
     320#: includes/udp/class-udp-agent.php:159
    317321msgid " What data do we collect?"
    318322msgstr ""
    … …  
    323327msgstr ""
    324328
     329#: includes/udp/init.php:105
     330msgid "Allow"
     331msgstr ""
     332
    325333#: includes/udp/init.php:107
    326 msgid "Allow"
    327 msgstr ""
    328 
    329 #: includes/udp/init.php:114
    330334msgid "Do not show again"
    331335msgstr ""
    332336
    333 #: includes/udp/init.php:121
     337#: includes/udp/init.php:109
    334338msgid "Later"
    335339msgstr ""
    336340
    337 #: public/class-simple-gdpr-cookie-compliance-public.php:151
     341#. translators: %s is link to plugin's setting page
     342#: public/class-simple-gdpr-cookie-compliance-public.php:171
    338343msgid "Notice regarding cookie compliance is not set. Go to %s to set the notice."
    339344msgstr ""
    340345
    341 #: public/class-simple-gdpr-cookie-compliance-public.php:151
     346#: public/class-simple-gdpr-cookie-compliance-public.php:172
    342347msgid "Dashboard > Simple GDPR"
    343348msgstr ""

  • simple-gdpr-cookie-compliance/tags/1.1.3/public/class-simple-gdpr-cookie-compliance-public.php

    r2770232 r2876942  
    33 * The public-facing functionality of the plugin.
    44 *
     5 * @package    Simple_GDPR_Cookie_Compliance
     6 * @subpackage Simple_GDPR_Cookie_Compliance/public
     7 * @author     themebeez <themebeez@gmail.com>
     8 */
     9
     10/**
    511 * Defines the plugin name, version, and two examples hooks for how to
    612 * enqueue the public-facing stylesheet and JavaScript.
    … …  
    3440     *
    3541     * @since    1.0.0
    36      * @param      string    $plugin_name      The name of the plugin.
    37      * @param      string    $version    The version of this plugin.
     42     * @param string $plugin_name The name of the plugin.
     43     * @param string $version The version of this plugin.
    3844     */
    3945    public function __construct( $plugin_name, $version ) {
    4046
    4147        $this->plugin_name = $plugin_name;
    42         $this->version = $version;
    43 
     48        $this->version     = $version;
    4449    }
    4550
    … …  
    6267         * class.
    6368         */
    64         if( is_rtl() ) {
    65 
    66             wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'assets/build/css/simple-gdpr-cookie-compliance-public-rtl.css', array(), $this->version, 'all' );
     69        if ( is_rtl() ) {
     70            wp_enqueue_style(
     71                $this->plugin_name,
     72                plugin_dir_url( __FILE__ ) . 'assets/build/css/simple-gdpr-cookie-compliance-public-rtl.css',
     73                array(),
     74                $this->version,
     75                'all'
     76            );
    6777        } else {
    68 
    69         wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'assets/build/css/simple-gdpr-cookie-compliance-public.css', array(), $this->version, 'all' );
    70 
    71         }
    72 
     78            wp_enqueue_style(
     79                $this->plugin_name,
     80                plugin_dir_url( __FILE__ ) . 'assets/build/css/simple-gdpr-cookie-compliance-public.css',
     81                array(),
     82                $this->version,
     83                'all'
     84            );
     85        }
    7386    }
    7487
    … …  
    92105         */
    93106
    94         wp_register_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'assets/build/js/simple-gdpr-cookie-compliance-public.js', array( 'jquery' ), $this->version, true );
     107        wp_register_script(
     108            $this->plugin_name,
     109            plugin_dir_url( __FILE__ ) . 'assets/build/js/simple-gdpr-cookie-compliance-public.js',
     110            array( 'jquery' ),
     111            $this->version,
     112            true
     113        );
    95114
    96115        $simple_gdpr_cookie_compliance_options = get_option( 'simple_gdpr_cookie_compliance_options' );
    97116
    98         $noticeObjArray = array(
    99             'cookieExpireTime' => (int) $simple_gdpr_cookie_compliance_options['cookie_expire_time'],
     117        $notice_obj_array = array(
     118            'cookieExpireTime' => isset( $simple_gdpr_cookie_compliance_options['cookie_expire_time'] ) ? (int) $simple_gdpr_cookie_compliance_options['cookie_expire_time'] : 0,
    100119        );
    101120
    102121        if ( is_multisite() ) {
    103             $noticeObjArray['isMultisite'] = true;
     122            $notice_obj_array['isMultisite'] = true;
    104123            if ( SUBDOMAIN_INSTALL === false ) {
    105                 $noticeObjArray['subdomainInstall'] = false;
    106                 $noticeObjArray['path'] = get_site()->path;
     124                $notice_obj_array['subdomainInstall'] = false;
     125                $notice_obj_array['path']            = get_site()->path;
    107126            } else {
    108                 $noticeObjArray['subdomainInstall'] = true;
     127                $notice_obj_array['subdomainInstall'] = true;
    109128            }
    110129        } else {
    111             $noticeObjArray['isMultisite'] = false;
    112         }
    113 
    114         wp_localize_script( $this->plugin_name, 'simpleGDPRCCJsObj', $noticeObjArray );
     130            $notice_obj_array['isMultisite'] = false;
     131        }
     132
     133        wp_localize_script( $this->plugin_name, 'simpleGDPRCCJsObj', $notice_obj_array );
    115134
    116135        wp_enqueue_script( $this->plugin_name );
    117 
    118136    }
    119137
    … …  
    141159        $args = array(
    142160            'enable_bg_overlay' => false,
    143             'show_cookie_icon' => false,
    144             'notice' => '',
    145             'btn_title' => '',
    146             'show_close_btn' => false,
    147             'link_type' => 'no_link'
    148         ); 
     161            'show_cookie_icon'  => false,
     162            'notice'            => '',
     163            'btn_title'         => '',
     164            'show_close_btn'    => false,
     165            'link_type'         => 'no_link',
     166        );
    149167
    150168        if ( is_admin() || current_user_can( 'manage_options' ) ) {
    151             $args['notice'] = sprintf( __( 'Notice regarding cookie compliance is not set. Go to %s to set the notice.', 'simple-gdpr-cookie-compliance' ), '<a href="' . esc_url( admin_url( 'admin.php?page=simple-gdpr-cookie-compliance' ) ) . '">' . __( 'Dashboard > Simple GDPR', 'simple-gdpr-cookie-compliance' ) . '</a>' );
     169            $args['notice'] = sprintf(
     170                /* translators: %s is link to plugin's setting page*/
     171                __( 'Notice regarding cookie compliance is not set. Go to %s to set the notice.', 'simple-gdpr-cookie-compliance' ),
     172                '<a href="' . esc_url( admin_url( 'admin.php?page=simple-gdpr-cookie-compliance' ) ) . '">' . __( 'Dashboard > Simple GDPR', 'simple-gdpr-cookie-compliance' ) . '</a>'
     173            );
    152174        } else {
    153175            $args['notice'] = __( 'Our website uses cookies to provide you the best experience. However, by continuing to use our website, you agree to our use of cookies. For more information, read our <a href="#">Cookie Policy</a>.', 'simple-gdpr-cookie-compliance' );
    … …  
    162184                $args['link_type'] = $options['link']['link_type'];
    163185                switch ( $options['link']['link_type'] ) {
    164                     case 'custom_url' :
    165                         if( isset( $options['link']['link_title'] ) ) {
     186                    case 'custom_url':
     187                        if ( isset( $options['link']['link_title'] ) ) {
    166188                            $args['link_title'] = $options['link']['link_title'];
    167189                        }
    … …  
    176198                        }
    177199                        break;
    178                     case 'page' :
     200                    case 'page':
    179201                        if ( isset( $options['link']['page'] ) ) {
    180202                            $args['page_title'] = get_the_title( absint( $options['link']['page'] ) );
    181                             $args['page_link'] = get_the_permalink( absint( $options['link']['page'] ) );
     203                            $args['page_link']  = get_the_permalink( absint( $options['link']['page'] ) );
    182204                        }
    183205                        if ( isset( $options['link']['before_link'] ) ) {
    … …  
    188210                        }
    189211                        break;
    190                     default :
     212                    default:
    191213                        break;
    192214                }
    … …  
    228250     *
    229251     * @since    1.0.4
     252     *
     253     * @param array $options Settings.
     254     * @return string $class CSS classes.
    230255     */
    231256    private function get_wrapper_css_class( $options ) {
    … …  
    238263
    239264                switch ( $options['style']['type'] ) {
    240                     case 'full_width' :
     265                    case 'full_width':
    241266                        if ( isset( $options['style']['fullwidth_position'] ) ) {
    242                             $class = 's-gdpr-c-c-fullwidth ';
     267                            $class              = 's-gdpr-c-c-fullwidth ';
    243268                            $fullwidth_position = $options['style']['fullwidth_position'];
    244                             if ( $fullwidth_position == 'top' ) {
     269                            if ( 'top' === $fullwidth_position ) {
    245270                                $class .= 's-gdpr-c-c-fullwidth-top';
    246271                            } else {
    … …  
    249274                        }
    250275                        break;
    251                     case 'custom_width' :
     276                    case 'custom_width':
    252277                        if ( isset( $options['style']['customwidth_position'] ) ) {
    253                             $class = 's-gdpr-c-c-customwidth ';
     278                            $class                = 's-gdpr-c-c-customwidth ';
    254279                            $customwidth_position = $options['style']['customwidth_position'];
    255                             if ( $customwidth_position == 'top_left' ) {
    256                                 $class .= 's-gdpr-c-c-customwidth-top-left';
    257                             } elseif ( $customwidth_position == 'top_center' ) {
    258                                 $class .= 's-gdpr-c-c-customwidth-top-center';
    259                             } elseif ( $customwidth_position == 'top_right' ) {
    260                                 $class .= 's-gdpr-c-c-customwidth-top-right';
    261                             } elseif ( $customwidth_position == 'bottom_left' ) {
    262                                 $class .= 's-gdpr-c-c-customwidth-bottom-left';
    263                             } elseif ( $customwidth_position == 'bottom_center' ) {
    264                                 $class .= 's-gdpr-c-c-customwidth-bottom-center';
    265                             } else {
    266                                 $class .= 's-gdpr-c-c-customwidth-bottom-right';
     280                            switch ( $customwidth_position ) {
     281                                case 'top_left':
     282                                    $class .= 's-gdpr-c-c-customwidth-top-left';
     283                                    break;
     284                                case 'top_center':
     285                                    $class .= 's-gdpr-c-c-customwidth-top-center';
     286                                    break;
     287                                case 'top_right':
     288                                    $class .= 's-gdpr-c-c-customwidth-top-right';
     289                                    break;
     290                                case 'bottom_left':
     291                                    $class .= 's-gdpr-c-c-customwidth-bottom-left';
     292                                    break;
     293                                case 'bottom_center':
     294                                    $class .= 's-gdpr-c-c-customwidth-bottom-center';
     295                                    break;
     296                                case 'bottom_right':
     297                                    $class .= 's-gdpr-c-c-customwidth-bottom-right';
     298                                    break;
     299                                default:
     300                                    break;
    267301                            }
    268302                        }
    269303                        break;
    270                     default :
     304                    default:
    271305                        $class = 's-gdpr-c-c-pop-up';
    272306                }
    273307            }
    274308
    275             if ( isset( $options['show_close_btn'] ) && $options['show_close_btn'] == false ) {
     309            if (
     310                isset( $options['show_close_btn'] ) &&
     311                false === $options['show_close_btn']
     312            ) {
    276313                $class .= ' s-gdpr-c-c-no-close-btn';
    277314            }
    278315
    279             if ( isset( $options['show_cookie_icon'] ) && $options['show_cookie_icon'] == false ) {
     316            if (
     317                isset( $options['show_cookie_icon'] ) &&
     318                false === $options['show_cookie_icon']
     319            ) {
    280320                $class .= ' s-gdpr-c-c-no-cookie-icon';
    281321            }
    … …  
    409449            // Dynamic CSS for pop-up notice.
    410450
    411             if ( $dynamic_options['style']['type'] == 'pop_up' ) {
    412 
    413                 if ( isset( $dynamic_options['style']['enable_bg_overlay'] ) && $dynamic_options['style']['enable_bg_overlay'] == true ) {
     451            if ( 'pop_up' === $dynamic_options['style']['type'] ) {
     452
     453                if (
     454                    isset( $dynamic_options['style']['enable_bg_overlay'] ) &&
     455                    true === $dynamic_options['style']['enable_bg_overlay']
     456                ) {
    414457                    $css .= '
    415458                    .s-gdpr-c-c-bg-overlay {
    … …  
    445488                        .s-gdpr-c-c-pop-up {
    446489                            width: ' . $width . 'px;
    447                         }'; 
     490                        }';
    448491                }
    449492
    … …  
    476519                }
    477520
    478                 if ( isset( $dynamic_options['style']['enable_bg_overlay'] ) && isset( $dynamic_options['color']['notice_bg_overlay_color'] ) ) {
     521                if (
     522                    isset( $dynamic_options['style']['enable_bg_overlay'] ) &&
     523                    isset( $dynamic_options['color']['notice_bg_overlay_color'] )
     524                ) {
    479525                    $css .= '
    480526                        .s-gdpr-c-c-bg-overlay {
    481527                            background-color: ' . $dynamic_options['color']['notice_bg_overlay_color'] . ';
    482                         }';
    483                 }
    484             }
    485 
     528                        }';
     529                }
     530            }
    486531
    487532            // Dynamic CSS for full-width notice.
    488533
    489             if ( $dynamic_options['style']['type'] == 'full_width' ) {
     534            if ( 'full_width' === $dynamic_options['style']['type'] ) {
    490535
    491536                if ( isset( $dynamic_options['style']['fullwidth_position'] ) ) {
    … …  
    589634                        }';
    590635
    591                     if ( $dynamic_options['style']['fullwidth_position'] == 'top' ) {
     636                    if ( 'top' === $dynamic_options['style']['fullwidth_position'] ) {
    592637                        $css .= '
    593638                            .s-gdpr-c-c-fullwidth-top {
    … …  
    597642                    }
    598643
    599                     if ( $dynamic_options['style']['fullwidth_position'] == 'bottom' ) {
     644                    if ( 'bottom' === $dynamic_options['style']['fullwidth_position'] ) {
    600645                        $css .= '
    601646                            .s-gdpr-c-c-fullwidth-bottom {
    … …  
    607652            }
    608653
    609 
    610654            // Dynamic CSS for custom-width notice.
    611655
    612             if ( $dynamic_options['style']['type'] == 'custom_width' ) {
     656            if ( 'custom_width' === $dynamic_options['style']['type'] ) {
    613657
    614658                $width = null;
    … …  
    621665                        .s-gdpr-c-c-customwidth {
    622666                            width: ' . $width . 'px;
    623                         }'; 
     667                        }';
    624668                }
    625669
    … …  
    640684                if ( isset( $dynamic_options['style']['customwidth_position'] ) ) {
    641685
    642                     if ( $dynamic_options['style']['customwidth_position'] == 'top_left' && isset( $dynamic_options['style']['top_offset'] ) && isset( $dynamic_options['style']['left_offset'] ) ) {
     686                    if (
     687                        'top_left' === $dynamic_options['style']['customwidth_position'] &&
     688                        isset( $dynamic_options['style']['top_offset'] ) &&
     689                        isset( $dynamic_options['style']['left_offset'] )
     690                    ) {
    643691                        $css .= '
    644692                            .s-gdpr-c-c-customwidth-top-left {
    … …  
    650698                    }
    651699
    652                     if ( $dynamic_options['style']['customwidth_position'] == 'top_center' && isset( $dynamic_options['style']['top_offset'] ) ) {
     700                    if (
     701                        'top_center' === $dynamic_options['style']['customwidth_position'] &&
     702                        isset( $dynamic_options['style']['top_offset'] )
     703                    ) {
    653704                        $css .= '
    654705                            .s-gdpr-c-c-customwidth-top-center {
    … …  
    660711                    }
    661712
    662                     if ( $dynamic_options['style']['customwidth_position'] == 'top_right' && isset( $dynamic_options['style']['top_offset'] ) && isset( $dynamic_options['style']['right_offset'] ) ) {
     713                    if (
     714                        'top_right' === $dynamic_options['style']['customwidth_position'] &&
     715                        isset( $dynamic_options['style']['top_offset'] ) &&
     716                        isset( $dynamic_options['style']['right_offset'] )
     717                    ) {
    663718                        $css .= '
    664719                            .s-gdpr-c-c-customwidth-top-right {
    … …  
    670725                    }
    671726
    672                     if ( $dynamic_options['style']['customwidth_position'] == 'bottom_left' && isset( $dynamic_options['style']['bottom_offset'] ) && isset( $dynamic_options['style']['left_offset'] ) ) {
     727                    if (
     728                        'bottom_left' === $dynamic_options['style']['customwidth_position'] &&
     729                        isset( $dynamic_options['style']['bottom_offset'] ) &&
     730                        isset( $dynamic_options['style']['left_offset'] )
     731                    ) {
    673732                        $css .= '
    674733                            .s-gdpr-c-c-customwidth-bottom-left {
    … …  
    680739                    }
    681740
    682                     if ( $dynamic_options['style']['customwidth_position'] == 'bottom_center' && isset( $dynamic_options['style']['bottom_offset'] ) ) {
     741                    if (
     742                        'bottom_center' === $dynamic_options['style']['customwidth_position'] &&
     743                        isset( $dynamic_options['style']['bottom_offset'] )
     744                    ) {
    683745                        $css .= '
    684746                            .s-gdpr-c-c-customwidth-bottom-center {
    … …  
    690752                    }
    691753
    692                     if ( $dynamic_options['style']['customwidth_position'] == 'bottom_right' && isset( $dynamic_options['style']['bottom_offset'] ) && isset( $dynamic_options['style']['right_offset'] ) ) {
     754                    if (
     755                        'bottom_right' === $dynamic_options['style']['customwidth_position'] &&
     756                        isset( $dynamic_options['style']['bottom_offset'] ) &&
     757                        isset( $dynamic_options['style']['right_offset'] )
     758                    ) {
    693759                        $css .= '
    694760                            .s-gdpr-c-c-customwidth-bottom-right {
    … …  
    703769        }
    704770
    705 
    706771        // Add custom CSS from custom css option.
    707772
    … …  
    711776
    712777        // Allow CSS to be filtered.
    713         $css = apply_filters( 'simple_gdpr_cookie_compliance_dynamic_css', $css ); 
     778        $css = apply_filters( 'simple_gdpr_cookie_compliance_dynamic_css', $css );
    714779
    715780        // Minify the CSS code.
    … …  
    723788     *
    724789     * @since    1.0.4
     790     *
     791     * @param string $css CSS rules.
     792     * @return string $css Trimmed CSS rules.
    725793     */
    726794    private function minify_css( $css ) {

  • simple-gdpr-cookie-compliance/tags/1.1.3/public/partials/simple-gdpr-cookie-compliance-public-display.php

    r2662024 r2876942  
    11<?php
    2 
    32/**
    43 * Provide a public-facing view for the plugin
    … …  
    1716}
    1817
    19 if ( $args['enable_bg_overlay'] == true ) {
     18if (
     19    isset( $args['enable_bg_overlay'] ) &&
     20    true === $args['enable_bg_overlay']
     21) {
    2022    ?>
    2123    <div id="s-gdpr-c-c-bg-overlay" class="s-gdpr-c-c-bg-overlay"></div>
    … …  
    2325}
    2426?>
    25 <div class="sgcc-main-wrapper hidden <?php echo ( $args['wrapper_class'] ) ? esc_attr( $args['wrapper_class'] ) : ''; ?>">
    26     <div class="sgcc-cookies">
    27         <?php
    28         if ( $args['show_cookie_icon'] && $args['notice_type'] != 'full_width' ) {
    29             ?>
    30             <span class="cookie-icon"><i class="sgcc sgcc-icon-cookie"></i></span>
    31             <?php
    32         }
    33         ?>
    34         <div class="sgcc-notice-content">
    35             <?php
    36             if ( $args['notice'] ) {
     27<div class="sgcc-main-wrapper hidden <?php echo ( isset( $args['wrapper_class'] ) ) ? esc_attr( $args['wrapper_class'] ) : ''; ?>">
     28    <div class="sgcc-cookies">
     29        <?php
     30        if (
     31            (
     32                isset( $args['show_cookie_icon'] ) &&
     33                true === $args['show_cookie_icon']
     34            ) &&
     35            (
     36                isset( $args['notice_type'] ) &&
     37                'full_width' !== $args['notice_type']
     38            )
     39        ) {
     40            ?>
     41            <span class="cookie-icon"><i class="sgcc sgcc-icon-cookie"></i></span>
     42            <?php
     43        }
     44        ?>
     45        <div class="sgcc-notice-content">
     46            <?php
     47            if ( isset( $args['notice'] ) ) {
    3748
    38                 if ( $args['show_cookie_icon'] && $args['notice_type'] == 'full_width' ) {
    39                     ?>
    40                     <span class="cookie-icon"><i class="sgcc sgcc-icon-cookie"></i></span>
    41                     <?php
    42                 }
    43                 ?>
    44                 <div class="message-block">
    45                     <p>
    46                         <?php
    47                         if ( $args['link_type'] == 'no_link' ) {
    48                             echo wp_kses_post( $args['notice'] );
    49                         } else {
    50                             $link_title = '';
     49                if (
     50                    (
     51                        isset( $args['show_cookie_icon'] ) &&
     52                        true === $args['show_cookie_icon']
     53                    ) &&
     54                    (
     55                        isset( $args['notice_type'] ) &&
     56                        'full_width' === $args['notice_type']
     57                    )
     58                ) {
     59                    ?>
     60                    <span class="cookie-icon"><i class="sgcc sgcc-icon-cookie"></i></span>
     61                    <?php
     62                }
     63                ?>
     64                <div class="message-block">
     65                    <p>
     66                        <?php
     67                        if (
     68                            isset( $args['link_type'] ) &&
     69                            'no_link' === $args['link_type']
     70                        ) {
     71                            echo wp_kses_post( $args['notice'] );
     72                        } else {
     73                            $link_title = '';
    5174
    52                             $link_url = '';
     75                            $link_url = '';
    5376
    54                             $before_link = isset( $args['before_link'] ) ? esc_html( $args['before_link'] ) : '';
     77                            $before_link = isset( $args['before_link'] ) ? esc_html( $args['before_link'] ) : '';
    5578
    56                             $after_link = isset( $args['after_link'] ) ? esc_html( $args['after_link'] ) : '';
     79                            $after_link = isset( $args['after_link'] ) ? esc_html( $args['after_link'] ) : '';
    5780
    58                             if( $args['link_type'] == 'custom_url' ) {
     81                            if (
     82                                isset( $args['link_type'] ) &&
     83                                'custom_url' === $args['link_type']
     84                            ) {
    5985
    60                                 $link_title = isset( $args['link_title'] ) ? $args['link_title'] : '';
    61                                 $link_url = isset( $args['link_url'] ) ? $args['link_url'] : '';
    62                             }
     86                                $link_title = isset( $args['link_title'] ) ? $args['link_title'] : '';
     87                                $link_url  = isset( $args['link_url'] ) ? $args['link_url'] : '';
     88                            }
    6389
    64                             if ( $args['link_type'] == 'page' ) {
    65                                 $link_title = isset( $args['page_title'] ) ? $args['page_title'] : '';
    66                                 $link_url = isset( $args['page_link'] ) ? $args['page_link'] : '';
    67                             }
     90                            if (
     91                                isset( $args['link_type'] ) &&
     92                                'page' === $args['link_type']
     93                            ) {
     94                                $link_title = isset( $args['page_title'] ) ? $args['page_title'] : '';
     95                                $link_url   = isset( $args['page_link'] ) ? $args['page_link'] : '';
     96                            }
    6897
    69                             $link = $before_link . ' ';
    70                             $link .= '<a href="' . esc_url( $link_url ) . '" ' . ( ( isset( $args['show_in_new_tab'] ) && $args['show_in_new_tab'] == true ) ? 'target="_blank"' : 'target="_self"' ) . '>' . esc_html( $link_title ) . ' </a>';
    71                             $link .= ' ' . $after_link;
     98                            $message_link = $before_link . ' ';
     99                            $message_link .= '<a href="' . esc_url( $link_url ) . '" ' . ( ( isset( $args['show_in_new_tab'] ) && true === $args['show_in_new_tab'] ) ? 'target="_blank"' : 'target="_self"' ) . '>' . esc_html( $link_title ) . ' </a>';
     100                            $message_link .= ' ' . $after_link;
    72101
    73                             echo wp_kses_post( $args['notice'] ) . ' ' . $link;
    74                         }
    75                         ?>
     102                            echo wp_kses_post( $args['notice'] . ' ' . $message_link );
     103                        }
     104                        ?>
    76105                    </p>
    77106                </div>
    78107                <?php
    79108            }
    80             if ( $args['btn_title'] ) {
    81                 ?> 
     109            if ( isset( $args['btn_title'] ) && ! empty( $args['btn_title'] ) ) {
     110                ?>
    82111                <p class="cookie-compliance-button-block">
    83112                    <button id="sgcc-accept" class="close-sgcc cookie-compliance-button">
    … …  
    90119        </div>
    91120        <?php
    92         if ( $args['show_close_btn'] ) {
    93             ?>
    94             <span id="close-sgcc" class="close close-sgcc"><i class="sgcc sgcc-icon-close"></i></span>
    95             <?php
    96         }
     121        if (
     122            isset( $args['show_close_btn'] ) &&
     123            true === $args['show_close_btn']
     124        ) {
     125            ?>
     126            <span id="close-sgcc" class="close close-sgcc"><i class="sgcc sgcc-icon-close"></i></span>
     127            <?php
     128        }
    97129        ?>
    98     </div>
     130    </div>
    99131</div>
    100 

  • simple-gdpr-cookie-compliance/tags/1.1.3/simple-gdpr-cookie-compliance.php

    r2874093 r2876942  
    11<?php
    2 
    32/**
     3 * Simple GDPR Cookie Compliance
     4 *
     5 * @link              https://themebeez.com/
     6 * @since             1.0.0
     7 * @package           Simple_GDPR_Cookie_Compliance
     8 *
    49 * Plugin Name:       Simple GDPR Cookie Compliance
    510 * Plugin URI:        https://themebeez.com/plugins/simple-gdpr-cookie-compliance
    611 * Description:       Simple GDPR Cookie Compliance is a simple notifier to inform users that your site uses of cookies and show your complies with EU GDPR cookie law and CCPA regulations.
    7  * Version:           1.1.2
     12 * Version:           1.1.3
    813 * Author:            themebeez
    914 * Author URI:        https://themebeez.com/
    … …  
    2429 * Rename this for your plugin and update it as you release new versions.
    2530 */
    26 define( 'SIMPLE_GDPR_COOKIE_COMPLIANCE_VERSION', '1.1.2' );
     31define( 'SIMPLE_GDPR_COOKIE_COMPLIANCE_VERSION', '1.1.3' );
    2732define( 'SIMPLE_GDPR_COOKIE_COMPLIANCE_BASENAME', plugin_basename( __FILE__ ) );
    2833
    … …  
    3641
    3742    $activator = new Simple_GDPR_Cookie_Compliance_Activator();
    38    
    39     $activator -> activate();
     43
     44    $activator->activate();
    4045}
    4146
    … …  
    4752
    4853    require_once plugin_dir_path( __FILE__ ) . 'includes/class-simple-gdpr-cookie-compliance-deactivator.php';
    49    
     54
    5055    Simple_GDPR_Cookie_Compliance_Deactivator::deactivate();
    5156}
    … …  
    6974 * @since    1.0.0
    7075 */
    71 function run_simple_gdpr_cookie_compliance() {
     76function simple_gdpr_cookie_compliance_start() {
    7277
    7378    $plugin = new Simple_GDPR_Cookie_Compliance();
    7479    $plugin->run();
    7580}
    76 run_simple_gdpr_cookie_compliance();
     81simple_gdpr_cookie_compliance_start();

  • simple-gdpr-cookie-compliance/trunk/README.txt

    r2874093 r2876942  
    77Tested up to: 6.1.1
    88Requires PHP: 7.0.0
    9 Stable tag: 1.1.2
     9Stable tag: 1.1.3
    1010License: GPLv2 or later
    1111License URI: http://www.gnu.org/licenses/gpl-2.0.html
    … …  
    8282== Changelog ==
    8383
     84= 1.1.3 - 07 March, 2023 =
     85
     86- Update: Static texts in UDP Agents are now translation ready.
     87- Update: WPCS implemented.
     88- Fix: Minor PHP error.
     89
    8490= 1.1.2 - 03 March, 2023 =
    8591

  • simple-gdpr-cookie-compliance/trunk/admin/class-simple-gdpr-cookie-compliance-admin.php

    r2662024 r2876942  
    11<?php
     2/**
     3 * The admin-specific functionality of the plugin.
     4 *
     5 * Defines the plugin name, version, and two examples hooks for how to
     6 * enqueue the admin-specific stylesheet and JavaScript.
     7 *
     8 * @package    Simple_GDPR_Cookie_Compliance
     9 * @subpackage Simple_GDPR_Cookie_Compliance/admin
     10 * @author     themebeez <themebeez@gmail.com>
     11 */
     12
    213/**
    314 * The admin-specific functionality of the plugin.
    … …  
    3445     *
    3546     * @since    1.0.0
    36      * @param      string    $plugin_name      The name of this plugin.
    37      * @param      string    $version    The version of this plugin.
     47     * @param string $plugin_name The name of this plugin.
     48     * @param string $version The version of this plugin.
    3849     */
    3950    public function __construct( $plugin_name, $version ) {
    4051
    4152        $this->plugin_name = $plugin_name;
    42         $this->version = $version;
    43 
     53        $this->version     = $version;
    4454    }
    4555
    … …  
    6575        global $pagenow;
    6676
    67         if ( 'admin.php' == $pagenow && ( isset( $_GET['page'] ) && 'simple-gdpr-cookie-compliance' == $_GET['page'] ) ) {
     77        if (
     78            'admin.php' === $pagenow &&
     79            (
     80                isset( $_GET['page'] ) && // phpcs:ignore
     81                'simple-gdpr-cookie-compliance' == sanitize_text_field( wp_unslash( $_GET['page'] ) ) // phpcs:ignore
     82            )
     83        ) {
    6884
    6985            wp_enqueue_style( 'wp-color-picker' );
    7086
    71             wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/simple-gdpr-cookie-compliance-admin.css', array(), $this->version, 'all' );
     87            wp_enqueue_style(
     88                $this->plugin_name,
     89                plugin_dir_url( __FILE__ ) . 'css/simple-gdpr-cookie-compliance-admin.css',
     90                array(),
     91                $this->version,
     92                'all'
     93            );
    7294        }
    7395
    … …  
    95117        global $pagenow;
    96118
    97         if ( 'admin.php' == $pagenow && ( isset( $_GET['page'] ) && 'simple-gdpr-cookie-compliance' == $_GET['page'] ) ) {
     119        if (
     120            'admin.php' === $pagenow &&
     121            (
     122                isset( $_GET['page'] ) && // phpcs:ignore
     123                'simple-gdpr-cookie-compliance' == sanitize_text_field( wp_unslash( $_GET['page'] ) ) // phpcs:ignore
     124            )
     125        ) {
    98126
    99127            wp_enqueue_script( 'wp-color-picker' );
    100128
    101             wp_enqueue_script( 'wp-color-picker-alpha', plugin_dir_url( __FILE__ ) . 'js/wp-color-picker-alpha.js', array( 'jquery', 'wp-color-picker' ), $this->version, false );
     129            wp_enqueue_script(
     130                'wp-color-picker-alpha',
     131                plugin_dir_url( __FILE__ ) . 'js/wp-color-picker-alpha.js',
     132                array( 'jquery', 'wp-color-picker' ),
     133                $this->version,
     134                false
     135            );
    102136
    103             wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/simple-gdpr-cookie-compliance-admin.js', array( 'jquery' ), $this->version, false );
     137            wp_enqueue_script(
     138                $this->plugin_name,
     139                plugin_dir_url( __FILE__ ) . 'js/simple-gdpr-cookie-compliance-admin.js',
     140                array( 'jquery' ),
     141                $this->version,
     142                false
     143            );
    104144        }
    105145
    … …  
    113153    public function plugin_menu() {
    114154
    115         add_menu_page( __( 'Simple GDPR Cookie Compliance', 'simple-gdpr-cookie-compliance' ), 'Simple GDPR', 'manage_options', 'simple-gdpr-cookie-compliance', array( $this, 'plugin_page' ), 'dashicons-lock' );
     155        add_menu_page(
     156            esc_html__( 'Simple GDPR Cookie Compliance', 'simple-gdpr-cookie-compliance' ),
     157            esc_html__( 'Simple GDPR', 'simple-gdpr-cookie-compliance' ),
     158            'manage_options',
     159            'simple-gdpr-cookie-compliance',
     160            array( $this, 'plugin_page' ),
     161            'dashicons-lock'
     162        );
    116163    }
    117164
    … …  
    130177     *
    131178     * @since    1.0.4
     179     *
     180     * @param array $actions Actions.
    132181     */
    133182    public function plugin_page_links( $actions ) {
    134183
    135         $actions[] = '<a href="' . esc_url( admin_url( 'admin.php?page=simple-gdpr-cookie-compliance' ) ) . '">' . __( 'Settings', 'simple-gdpr-cookie-compliance' ) . '</a>';
     184        $actions[] = '<a href="' . esc_url( admin_url( 'admin.php?page=simple-gdpr-cookie-compliance' ) ) . '">' . esc_html__( 'Settings', 'simple-gdpr-cookie-compliance' ) . '</a>';
    136185
    137186        return $actions;
    138 
    139187    }
    140188}

  • simple-gdpr-cookie-compliance/trunk/admin/class-simple-gdpr-cookie-compliance-settings.php

    r2662024 r2876942  
    88 */
    99
    10 class Simple_GDPR_Cookie_Compliance_Admin_Settings {
     10/**
     11 * Class that defines the admin-settings functionality of the plugin.
     12 *
     13 * @package    Simple_GDPR_Cookie_Compliance
     14 * @subpackage Simple_GDPR_Cookie_Compliance/admin
     15 * @author     themebeez <themebeez@gmail.com>
     16 */
     17class Simple_GDPR_Cookie_Compliance_Settings {
    1118
    1219    /**
    … …  
    4148     *
    4249     * @since    1.0.0
    43      * @param      string    $plugin_name      The name of this plugin.
    44      * @param      string    $version    The version of this plugin.
     50     * @param string $plugin_name The name of this plugin.
     51     * @param string $version The version of this plugin.
    4552     */
    4653    public function __construct( $plugin_name, $version ) {
    4754
    4855        $this->plugin_name = $plugin_name;
    49         $this->version = $version;
    50 
    51         if( get_option( 'simple_gdpr_cookie_compliance_options' ) ) {
     56        $this->version     = $version;
     57
     58        if ( get_option( 'simple_gdpr_cookie_compliance_options' ) ) {
    5259
    5360            $this->options = get_option( 'simple_gdpr_cookie_compliance_options' );
    … …  
    6269    public function register_settings() {
    6370
    64         register_setting( 'simple_gdpr_cookie_compliance_settings', // Option Group ID
    65             'simple_gdpr_cookie_compliance_options', // Settings ID
    66             array( $this, 'sanitize_fields' ) // Sanitization Callback
    67         );
    68 
    69         add_settings_section( 'simple_gdpr_cookie_compliance_fields_section', // Section ID
    70             __( 'Configure Settings', 'simple-gdpr-cookie-compliance' ), // Section Title
    71             array( $this, 'section_callback' ), // Section Callback
    72             'simple_gdpr_cookie_compliance_settings' // Option Group ID
    73         );
    74 
    75         add_settings_field( 's_gdpr_c_n_notice_text',
    76             __( 'Notice Content', 'simple-gdpr-cookie-compliance' ),
    77             array( $this, 'notice_field' ),
    78             'simple_gdpr_cookie_compliance_settings',
    79             'simple_gdpr_cookie_compliance_fields_section'
    80         );
    81 
    82         add_settings_field( 's_gdpr_c_n_cookie',
    83             __( 'Cookie', 'simple-gdpr-cookie-compliance' ),
    84             array( $this, 'cookie_fields' ),
    85             'simple_gdpr_cookie_compliance_settings',
    86             'simple_gdpr_cookie_compliance_fields_section'
    87         );
    88 
    89         add_settings_field( 's_gdpr_c_n_styles',
    90             __( 'Style', 'simple-gdpr-cookie-compliance' ),
    91             array( $this, 'style_fields' ),
    92             'simple_gdpr_cookie_compliance_settings',
    93             'simple_gdpr_cookie_compliance_fields_section'
    94         );
    95 
    96         add_settings_field( 's_gdpr_c_n_colors',
    97             __( 'Colors', 'simple-gdpr-cookie-compliance' ),
    98             array( $this, 'color_fields' ),
    99             'simple_gdpr_cookie_compliance_settings',
    100             'simple_gdpr_cookie_compliance_fields_section'
    101         );
    102 
    103         add_settings_field( 's_gdpr_c_n_custom_css',
    104             __( 'Custom CSS', 'simple-gdpr-cookie-compliance' ),
    105             array( $this, 'custom_css_fields' ),
    106             'simple_gdpr_cookie_compliance_settings',
    107             'simple_gdpr_cookie_compliance_fields_section'
     71        register_setting(
     72            'simple_gdpr_cookie_compliance_settings', // Option Group ID.
     73            'simple_gdpr_cookie_compliance_options', // Settings ID.
     74            array( $this, 'sanitize_fields' ) // Sanitization Callback.
     75        );
     76
     77        add_settings_section(
     78            'simple_gdpr_cookie_compliance_fields_section', // Section ID.
     79            __( 'Configure Settings', 'simple-gdpr-cookie-compliance' ), // Section Title.
     80            array( $this, 'section_callback' ), // Section Callback.
     81            'simple_gdpr_cookie_compliance_settings' // Option Group ID.
     82        );
     83
     84        add_settings_field(
     85            's_gdpr_c_n_notice_text',
     86            __( 'Notice Content', 'simple-gdpr-cookie-compliance' ),
     87            array( $this, 'notice_field' ),
     88            'simple_gdpr_cookie_compliance_settings',
     89            'simple_gdpr_cookie_compliance_fields_section'
     90        );
     91
     92        add_settings_field(
     93            's_gdpr_c_n_cookie',
     94            __( 'Cookie', 'simple-gdpr-cookie-compliance' ),
     95            array( $this, 'cookie_fields' ),
     96            'simple_gdpr_cookie_compliance_settings',
     97            'simple_gdpr_cookie_compliance_fields_section'
     98        );
     99
     100        add_settings_field(
     101            's_gdpr_c_n_styles',
     102            __( 'Style', 'simple-gdpr-cookie-compliance' ),
     103            array( $this, 'style_fields' ),
     104            'simple_gdpr_cookie_compliance_settings',
     105            'simple_gdpr_cookie_compliance_fields_section'
     106        );
     107
     108        add_settings_field(
     109            's_gdpr_c_n_colors',
     110            __( 'Colors', 'simple-gdpr-cookie-compliance' ),
     111            array( $this, 'color_fields' ),
     112            'simple_gdpr_cookie_compliance_settings',
     113            'simple_gdpr_cookie_compliance_fields_section'
     114        );
     115
     116        add_settings_field(
     117            's_gdpr_c_n_custom_css',
     118            __( 'Custom CSS', 'simple-gdpr-cookie-compliance' ),
     119            array( $this, 'custom_css_fields' ),
     120            'simple_gdpr_cookie_compliance_settings',
     121            'simple_gdpr_cookie_compliance_fields_section'
    108122        );
    109123    }
    … …  
    150164        <div class="s_gdpr_c_n_field" id="s_gdpr_c_n_notice_text">
    151165            <p>
    152                 <label for="simple_gdpr_cookie_compliance_options[notice_text]"><?php _e( 'Message', 'simple-gdpr-cookie-compliance' ); ?></label>
     166                <label for="simple_gdpr_cookie_compliance_options[notice_text]">
     167                    <?php esc_html_e( 'Message', 'simple-gdpr-cookie-compliance' ); ?>
     168                </label>
    153169                <br/>
    154                 <small class="description"><?php echo __( 'Enter the notice message. You can also insert &lt;span class=&quot;..&quot;&gt;...&lt;/span&gt;, &lt;a href=&quot;..&quot; target=&quot;..&quot; class=&quot;..&quot; title=&quot;..&quot;&gt;...&lt;/a&gt;, and &lt;i class=&quot;..&quot;&gt;...&lt;/i&gt; HTML tags along with the message.', 'simple-gdpr-cookie-compliance' ); ?></small>
     170                <small class="description">
     171                    <?php echo esc_html__( 'Enter the notice message. You can also insert &lt;span class=&quot;..&quot;&gt;...&lt;/span&gt;, &lt;a href=&quot;..&quot; target=&quot;..&quot; class=&quot;..&quot; title=&quot;..&quot;&gt;...&lt;/a&gt;, and &lt;i class=&quot;..&quot;&gt;...&lt;/i&gt; HTML tags along with the message.', 'simple-gdpr-cookie-compliance' ); ?>
     172                </small>
    155173                <textarea id="simple_gdpr_cookie_compliance_options[notice_text]" name="simple_gdpr_cookie_compliance_options[notice_text]" class="s_gdpr_c_n_textarea" cols="50" rows="5"><?php echo wp_kses_post( $notice ); ?></textarea>               
    156174            </p>
    157175
    158176            <p>
    159                 <label for="simple_gdpr_cookie_compliance_options['link']['link_type']"><?php _e( 'Link Type', 'simple-gdpr-cookie-compliance' ); ?></label>
     177                <label for="simple_gdpr_cookie_compliance_options['link']['link_type']"><?php esc_html_e( 'Link Type', 'simple-gdpr-cookie-compliance' ); ?></label>
    160178                <?php
    161179                $link_types = array(
    162                     'no_link' => __( 'No Link', 'simple-gdpr-cookie-compliance' ),
    163                     'custom_url' => __( 'Custom Link', 'simple-gdpr-cookie-compliance' ),
    164                     'page' => __( 'Page', 'simple-gdpr-cookie-compliance' )
     180                    'no_link'    => esc_html__( 'No Link', 'simple-gdpr-cookie-compliance' ),
     181                    'custom_url' => esc_html__( 'Custom Link', 'simple-gdpr-cookie-compliance' ),
     182                    'page'       => esc_html__( 'Page', 'simple-gdpr-cookie-compliance' ),
    165183                );
    166184                ?>
    167185                <select class="sgdpr_link_type" name="simple_gdpr_cookie_compliance_options[link][link_type]" id="simple_gdpr_cookie_compliance_options[link][link_type]">
    168186                    <?php
    169                     foreach( $link_types as $key => $value ) {
     187                    foreach ( $link_types as $key => $value ) {
    170188                        ?>
    171                         <option value="<?php echo esc_attr( $key ); ?>" <?php selected( $key, $link_type ); ?>><?php echo esc_html( $value ); ?></option>
     189                        <option value="<?php echo esc_attr( $key ); ?>" <?php selected( $key, $link_type ); ?>>
     190                            <?php echo esc_html( $value ); ?>
     191                        </option>
    172192                        <?php
    173193                    }
    … …  
    176196            </p>
    177197
    178             <div class="s_gdpr_c_n_field_link_content_wrapper <?php echo ( $link_type == 'no_link' ) ? 'sgdpr_hidden' : ''; ?>">
    179                
    180                 <h3><?php echo __( 'Link Content', 'simple-gdpr-cookie-compliance' ); ?></h3>
    181                 <p><small><?php echo __( 'Link content will be appended after the message.', 'simple-gdpr-cookie-compliance' ); ?></small></p>
     198            <div class="s_gdpr_c_n_field_link_content_wrapper <?php echo ( 'no_link' === $link_type ) ? 'sgdpr_hidden' : ''; ?>">
     199                <h3><?php echo esc_html__( 'Link Content', 'simple-gdpr-cookie-compliance' ); ?></h3>
     200                <p><small><?php echo esc_html__( 'Link content will be appended after the message.', 'simple-gdpr-cookie-compliance' ); ?></small></p>
    182201
    183202                <p>
    184                     <label for="simple_gdpr_cookie_compliance_options[link][before_link]"><?php _e( 'Text Before Link', 'simple-gdpr-cookie-compliance' ); ?></label>
     203                    <label for="simple_gdpr_cookie_compliance_options[link][before_link]"><?php esc_html_e( 'Text Before Link', 'simple-gdpr-cookie-compliance' ); ?></label>
    185204                    <input type="text" id="simple_gdpr_cookie_compliance_options[link][before_link]" name="simple_gdpr_cookie_compliance_options[link][before_link]" class="s_gdpr_c_c_text" value="<?php echo esc_attr( $before_link ); ?>">
    186205                </p>
    187206
    188207                <p>
    189                     <label for="simple_gdpr_cookie_compliance_options[link][after_link]"><?php _e( 'Text After Link', 'simple-gdpr-cookie-compliance' ); ?></label>
     208                    <label for="simple_gdpr_cookie_compliance_options[link][after_link]"><?php esc_html_e( 'Text After Link', 'simple-gdpr-cookie-compliance' ); ?></label>
    190209                    <input type="text" id="simple_gdpr_cookie_compliance_options[link][after_link]" name="simple_gdpr_cookie_compliance_options[link][after_link]" class="s_gdpr_c_c_text" value="<?php echo esc_attr( $after_link ); ?>">
    191210                </p>
    192    
    193                 <div class="s_gdpr_c_n_field_custom_link_wrapper <?php echo ( $link_type == 'custom_url' ) ? '' : 'sgdpr_hidden'; ?>">
     211
     212                <div class="s_gdpr_c_n_field_custom_link_wrapper <?php echo ( 'custom_url' === $link_type ) ? '' : 'sgdpr_hidden'; ?>">
    194213                    <p>
    195                         <label for="simple_gdpr_cookie_compliance_options[link][link_title]"><?php _e( 'Custom Link Title', 'simple-gdpr-cookie-compliance' ); ?></label>
     214                        <label for="simple_gdpr_cookie_compliance_options[link][link_title]"><?php esc_html_e( 'Custom Link Title', 'simple-gdpr-cookie-compliance' ); ?></label>
    196215                        <input type="text" id="simple_gdpr_cookie_compliance_options[link][link_title]" name="simple_gdpr_cookie_compliance_options[link][link_title]" class="s_gdpr_c_c_text" value="<?php echo esc_attr( $link_title ); ?>">
    197216                    </p>
    198217
    199218                    <p>
    200                         <label for="simple_gdpr_cookie_compliance_options[link][link_url]"><?php _e( 'Custom URL', 'simple-gdpr-cookie-compliance' ); ?></label>
     219                        <label for="simple_gdpr_cookie_compliance_options[link][link_url]"><?php esc_html_e( 'Custom URL', 'simple-gdpr-cookie-compliance' ); ?></label>
    201220                        <input type="text" id="simple_gdpr_cookie_compliance_options[link][link_url]" name="simple_gdpr_cookie_compliance_options[link][link_url]" class="s_gdpr_c_c_text" value="<?php echo esc_attr( $link_url ); ?>">
    202221                    </p>
    203222                </div>
    204223
    205                 <div class="s_gdpr_c_n_field_page_selection_wrapper <?php echo ( $link_type == 'page' ) ? '' : 'sgdpr_hidden'; ?>">
     224                <div class="s_gdpr_c_n_field_page_selection_wrapper <?php echo ( 'page' === $link_type ) ? '' : 'sgdpr_hidden'; ?>">
    206225                    <p>
    207                         <label for="simple_gdpr_cookie_compliance_options[link][page]"><?php _e( 'Link Page', 'simple-gdpr-cookie-compliance' ); ?></label>
     226                        <label for="simple_gdpr_cookie_compliance_options[link][page]"><?php esc_html_e( 'Link Page', 'simple-gdpr-cookie-compliance' ); ?></label>
    208227                        <?php
    209                         wp_dropdown_pages( array(
    210                             'id'               => 'simple_gdpr_cookie_compliance_options[link][page]',
    211                             'class'            => 's_gdpr_c_c_text',
    212                             'name'             => 'simple_gdpr_cookie_compliance_options[link][page]',
    213                             'selected'         => esc_attr( $page ),
    214                             'show_option_none' => __( 'Select Page', 'simple-gdpr-cookie-compliance' ),
    215                             )
    216                         );
     228                        wp_dropdown_pages(
     229                            array(
     230                                'id'               => 'simple_gdpr_cookie_compliance_options[link][page]',
     231                                'class'            => 's_gdpr_c_c_text',
     232                                'name'             => 'simple_gdpr_cookie_compliance_options[link][page]',
     233                                'selected'         => esc_attr( $page ),
     234                                'show_option_none' => esc_html__( 'Select Page', 'simple-gdpr-cookie-compliance' ),
     235                            )
     236                        );
    217237                        ?>
    218238                    </p>
    … …  
    220240
    221241                <p>
    222                     <label for="simple_gdpr_cookie_compliance_options[show_in_new_tab]"><input type="checkbox" id="simple_gdpr_cookie_compliance_options[show_in_new_tab]" name="simple_gdpr_cookie_compliance_options[show_in_new_tab]" class="s_gdpr_c_c_text" value="1" <?php checked( 1, absint( $show_in_new_tab ) ); ?>><?php _e( 'Show link in a new tab', 'simple-gdpr-cookie-compliance' ); ?></label>
     242                    <label for="simple_gdpr_cookie_compliance_options[show_in_new_tab]"><input type="checkbox" id="simple_gdpr_cookie_compliance_options[show_in_new_tab]" name="simple_gdpr_cookie_compliance_options[show_in_new_tab]" class="s_gdpr_c_c_text" value="1" <?php checked( 1, absint( $show_in_new_tab ) ); ?>><?php esc_html_e( 'Show link in a new tab', 'simple-gdpr-cookie-compliance' ); ?></label>
    223243                </p>
    224244            </div>
    225245
    226246            <p>
    227                 <label for="simple_gdpr_cookie_compliance_options[accept_btn_title]"><?php _e( 'Accept Button Title', 'simple-gdpr-cookie-compliance' ); ?></label>
     247                <label for="simple_gdpr_cookie_compliance_options[accept_btn_title]"><?php esc_html_e( 'Accept Button Title', 'simple-gdpr-cookie-compliance' ); ?></label>
    228248                <input type="text" id="simple_gdpr_cookie_compliance_options[accept_btn_title]" name="simple_gdpr_cookie_compliance_options[accept_btn_title]" class="s_gdpr_c_c_text" value="<?php echo esc_attr( $accept_btn_title ); ?>">
    229249            </p>
    230250
    231251            <p>
    232                
    233                 <label for="simple_gdpr_cookie_compliance_options[show_close_btn]"><input type="checkbox" id="simple_gdpr_cookie_compliance_options[show_close_btn]" name="simple_gdpr_cookie_compliance_options[show_close_btn]" class="s_gdpr_c_c_text" <?php checked( $show_close_btn, true ); ?>><?php _e( 'Display Close Button', 'simple-gdpr-cookie-compliance' ); ?></label>               
    234             </p>
    235 
    236             <p>
    237                
    238                 <label for="simple_gdpr_cookie_compliance_options[show_cookie_icon]"><input type="checkbox" id="simple_gdpr_cookie_compliance_options[show_cookie_icon]" name="simple_gdpr_cookie_compliance_options[show_cookie_icon]" class="s_gdpr_c_c_text" <?php checked( $show_cookie_icon, true ); ?>><?php _e( 'Display Cookie Icon', 'simple-gdpr-cookie-compliance' ); ?></label>             
     252                <label for="simple_gdpr_cookie_compliance_options[show_close_btn]"><input type="checkbox" id="simple_gdpr_cookie_compliance_options[show_close_btn]" name="simple_gdpr_cookie_compliance_options[show_close_btn]" class="s_gdpr_c_c_text" <?php checked( $show_close_btn, true ); ?>><?php esc_html_e( 'Display Close Button', 'simple-gdpr-cookie-compliance' ); ?></label>               
     253            </p>
     254
     255            <p>
     256                <label for="simple_gdpr_cookie_compliance_options[show_cookie_icon]"><input type="checkbox" id="simple_gdpr_cookie_compliance_options[show_cookie_icon]" name="simple_gdpr_cookie_compliance_options[show_cookie_icon]" class="s_gdpr_c_c_text" <?php checked( $show_cookie_icon, true ); ?>><?php esc_html_e( 'Display Cookie Icon', 'simple-gdpr-cookie-compliance' ); ?></label>             
    239257            </p>
    240258        </div>
    … …  
    253271        <div class="s_gdpr_c_n_field" id="s_gdpr_c_n_cookie">
    254272            <p>
    255                 <label for="simple_gdpr_cookie_compliance_options[cookie_expire_time]"><?php echo __( 'Cookie Expire Time', 'simple-gdpr-cookie-compliance' ); ?></label>
     273                <label for="simple_gdpr_cookie_compliance_options[cookie_expire_time]"><?php echo esc_html__( 'Cookie Expire Time', 'simple-gdpr-cookie-compliance' ); ?></label>
    256274                <input type="number" id="simple_gdpr_cookie_compliance_options[cookie_expire_time]" name="simple_gdpr_cookie_compliance_options[cookie_expire_time]" class="s_gdpr_c_n_number" value="<?php echo esc_attr( $cookie_expire_time ); ?>">
    257                 <small><?php echo __( 'Once the user clicks on Accept button, cookie notice will disappear. Expire Time sets the time duration for which cookie notice will disappear. Set &quot;0&quot; for SESSION cookie.', 'simple-gdpr-cookie-compliance' ); ?></small>
     275                <small><?php echo esc_html__( 'Once the user clicks on Accept button, cookie notice will disappear. Expire Time sets the time duration for which cookie notice will disappear. Set &quot;0&quot; for SESSION cookie.', 'simple-gdpr-cookie-compliance' ); ?></small>
    258276            </p>
    259277        <?php
    … …  
    267285    public function style_fields() {
    268286
    269         $type = ! empty( $this->options['style']['type'] ) ? $this->options['style']['type'] : 'custom_width';
    270 
    271         $width = ! empty( $this->options['style']['width'] ) ? $this->options['style']['width'] : 450;
    272 
    273         $fullwidth_position =  ! empty( $this->options['style']['fullwidth_position'] ) ? $this->options['style']['fullwidth_position'] : 'top';
    274 
    275         $customwidth_position =  ! empty( $this->options['style']['customwidth_position'] ) ? $this->options['style']['customwidth_position'] : 'bottom_right';
     287        $type = isset( $this->options['style']['type'] ) ? $this->options['style']['type'] : 'custom_width';
     288
     289        $width = isset( $this->options['style']['width'] ) ? $this->options['style']['width'] : 450;
     290
     291        $fullwidth_position = isset( $this->options['style']['fullwidth_position'] ) ? $this->options['style']['fullwidth_position'] : 'top';
     292
     293        $customwidth_position = isset( $this->options['style']['customwidth_position'] ) ? $this->options['style']['customwidth_position'] : 'bottom_right';
    276294
    277295        $enable_bg_overlay = isset( $this->options['style']['enable_bg_overlay'] ) ? $this->options['style']['enable_bg_overlay'] : true;
    278296
    279         $top_offset = ! empty( $this->options['style']['top_offset'] ) ? $this->options['style']['top_offset'] : 30;
    280 
    281         $left_offset = ! empty( $this->options['style']['left_offset'] ) ? $this->options['style']['left_offset'] : 30;
    282 
    283         $bottom_offset = ! empty( $this->options['style']['bottom_offset'] ) ? $this->options['style']['bottom_offset'] : 30;
    284 
    285         $right_offset = ! empty( $this->options['style']['right_offset'] ) ? $this->options['style']['right_offset'] : 30;
     297        $top_offset = isset( $this->options['style']['top_offset'] ) ? $this->options['style']['top_offset'] : 30;
     298
     299        $left_offset = isset( $this->options['style']['left_offset'] ) ? $this->options['style']['left_offset'] : 30;
     300
     301        $bottom_offset = isset( $this->options['style']['bottom_offset'] ) ? $this->options['style']['bottom_offset'] : 30;
     302
     303        $right_offset = isset( $this->options['style']['right_offset'] ) ? $this->options['style']['right_offset'] : 30;
    286304        ?>
    287305        <div class="s_gdpr_c_n_field" id="s_gdpr_c_n_style">
    288306            <p>
    289                 <label for="simple_gdpr_cookie_compliance_options[style][type]"><?php echo __( 'Width Style', 'simple-gdpr-cookie-compliance' ); ?></label>
     307                <label for="simple_gdpr_cookie_compliance_options[style][type]"><?php echo esc_html__( 'Width Style', 'simple-gdpr-cookie-compliance' ); ?></label>
    290308                <?php
    291309                $styles = array(
    292                     'full_width' => __( 'Full Width', 'simple-gdpr-cookie-compliance' ),
    293                     'custom_width' => __( 'Custom Width', 'simple-gdpr-cookie-compliance' ),
    294                     'pop_up' => __( 'Pop Up', 'simple-gdpr-cookie-compliance' )
     310                    'full_width'   => esc_html__( 'Full Width', 'simple-gdpr-cookie-compliance' ),
     311                    'custom_width' => esc_html__( 'Custom Width', 'simple-gdpr-cookie-compliance' ),
     312                    'pop_up'       => esc_html__( 'Pop Up', 'simple-gdpr-cookie-compliance' ),
    295313                );
    296314                ?>
    297315                <select class="sgdpr_notice_type" name="simple_gdpr_cookie_compliance_options[style][type]" id="simple_gdpr_cookie_compliance_options[style][type]">
    298316                    <?php
    299                     foreach( $styles as $key => $value ) {
     317                    foreach ( $styles as $key => $value ) {
    300318                        ?>
    301319                        <option value="<?php echo esc_attr( $key ); ?>" <?php selected( $key, $type ); ?>><?php echo esc_html( $value ); ?></option>
    … …  
    306324            </p>
    307325
    308             <p id="s_gdpr_c_n_width" class="<?php echo ( $type == 'full_width' ) ? 'sgdpr_hidden' : ''; ?>">
    309                 <label for="simple_gdpr_cookie_compliance_options[style][width]"><?php echo __( 'Width', 'simple-gdpr-cookie-compliance' ); ?></label>
     326            <p id="s_gdpr_c_n_width" class="<?php echo ( 'full_width' === $type ) ? 'sgdpr_hidden' : ''; ?>">
     327                <label for="simple_gdpr_cookie_compliance_options[style][width]"><?php echo esc_html__( 'Width', 'simple-gdpr-cookie-compliance' ); ?></label>
    310328                <input type="number" id="simple_gdpr_cookie_compliance_options[style][width]" name="simple_gdpr_cookie_compliance_options[style][width]" class="s_gdpr_c_n_number" value="<?php echo esc_attr( $width ); ?>">
    311329            </p>
    312330
    313             <p id="s_gdpr_c_n_fullwidth_position" class="<?php echo ( $type == 'full_width' ) ? '' : 'sgdpr_hidden'; ?>">
    314                 <label for="simple_gdpr_cookie_compliance_options[style][fullwidth_position]"><?php echo __( 'Position', 'simple-gdpr-cookie-compliance' ); ?></label>
     331            <p id="s_gdpr_c_n_fullwidth_position" class="<?php echo ( 'full_width' === $type ) ? '' : 'sgdpr_hidden'; ?>">
     332                <label for="simple_gdpr_cookie_compliance_options[style][fullwidth_position]"><?php echo esc_html__( 'Position', 'simple-gdpr-cookie-compliance' ); ?></label>
    315333                <?php
    316334                $styles = array(
    317                     'top' => __( 'Top', 'simple-gdpr-cookie-compliance' ),
    318                     'bottom' => __( 'Bottom', 'simple-gdpr-cookie-compliance' )
     335                    'top'    => esc_html__( 'Top', 'simple-gdpr-cookie-compliance' ),
     336                    'bottom' => esc_html__( 'Bottom', 'simple-gdpr-cookie-compliance' ),
    319337                );
    320338                ?>
    321339                <select class="sgdpr_position" name="simple_gdpr_cookie_compliance_options[style][fullwidth_position]" id="simple_gdpr_cookie_compliance_options[style][fullwidth_position]">
    322340                    <?php
    323                     foreach( $styles as $key => $value ) {
     341                    foreach ( $styles as $key => $value ) {
    324342                        ?>
    325343                        <option value="<?php echo esc_attr( $key ); ?>" <?php selected( $key, $fullwidth_position ); ?>><?php echo esc_html( $value ); ?></option>
    … …  
    330348            </p>
    331349
    332             <p id="s_gdpr_c_n_customwidth_position" class="<?php echo ( $type != 'custom_width' ) ? 'sgdpr_hidden' : ''; ?>">
    333                 <label for="simple_gdpr_cookie_compliance_options[style][customwidth_position]"><?php echo __( 'Position', 'simple-gdpr-cookie-compliance' ); ?></label>
     350            <p id="s_gdpr_c_n_customwidth_position" class="<?php echo ( 'custom_width' !== $type ) ? 'sgdpr_hidden' : ''; ?>">
     351                <label for="simple_gdpr_cookie_compliance_options[style][customwidth_position]"><?php echo esc_html__( 'Position', 'simple-gdpr-cookie-compliance' ); ?></label>
    334352                <?php
    335353                $styles = array(
    336                     'top_left' => __( 'Top Left', 'simple-gdpr-cookie-compliance' ),
    337                     'top_center' => __( 'Top Center', 'simple-gdpr-cookie-compliance' ),
    338                     'top_right' => __( 'Top Right', 'simple-gdpr-cookie-compliance' ),
    339                     'bottom_left' => __( 'Bottom Left', 'simple-gdpr-cookie-compliance' ),
    340                     'bottom_center' => __( 'Bottom Center', 'simple-gdpr-cookie-compliance' ),
    341                     'bottom_right' => __( 'Bottom Right', 'simple-gdpr-cookie-compliance' )
     354                    'top_left'      => esc_html__( 'Top Left', 'simple-gdpr-cookie-compliance' ),
     355                    'top_center'    => esc_html__( 'Top Center', 'simple-gdpr-cookie-compliance' ),
     356                    'top_right'     => esc_html__( 'Top Right', 'simple-gdpr-cookie-compliance' ),
     357                    'bottom_left'   => esc_html__( 'Bottom Left', 'simple-gdpr-cookie-compliance' ),
     358                    'bottom_center' => esc_html__( 'Bottom Center', 'simple-gdpr-cookie-compliance' ),
     359                    'bottom_right'  => esc_html__( 'Bottom Right', 'simple-gdpr-cookie-compliance' ),
    342360                );
    343361                ?>
    344362                <select class="sgdpr_customwidth_position" name="simple_gdpr_cookie_compliance_options[style][customwidth_position]" id="simple_gdpr_cookie_compliance_options[style][customwidth_position]">
    345363                    <?php
    346                     foreach( $styles as $key => $value ) {
     364                    foreach ( $styles as $key => $value ) {
    347365                        ?>
    348366                        <option value="<?php echo esc_attr( $key ); ?>" <?php selected( $key, $customwidth_position ); ?>><?php echo esc_html( $value ); ?></option>
    … …  
    352370                </select>
    353371            </p>
    354             <p id="s_gdpr_c_n_enable_bg_overlay" class="s_gdpr_c_n_checkbox_field <?php echo ( $type != 'pop_up' ) ? 'sgdpr_hidden' : ''; ?>">
    355                 <label for="simple_gdpr_cookie_compliance_options[style][enable_bg_overlay]"><input type="checkbox" class="s_gdpr_c_n_bg_overlay_field" name="simple_gdpr_cookie_compliance_options[style][enable_bg_overlay]" id="simple_gdpr_cookie_compliance_options[style][enable_bg_overlay]" <?php checked( true, $enable_bg_overlay ); ?>><?php echo __( 'Enable Background Overlay', 'simple-gdpr-cookie-compliance' ); ?></label>
    356 
    357             </p>
    358 
    359             <div id="s_gdpr_c_n_offset_group_wrapper" class="s_gdpr_c_n_group_wrapper <?php echo ( $type != 'custom_width' ) ? 'sgdpr_hidden' : ''; ?>">
    360                 <h4 class="s_grpd_c_n_group_title"><?php echo __( 'Offsets', 'simple-gdpr-cookie-compliance' ); ?></h4>
     372            <p id="s_gdpr_c_n_enable_bg_overlay" class="s_gdpr_c_n_checkbox_field <?php echo ( 'pop_up' !== $type ) ? 'sgdpr_hidden' : ''; ?>">
     373                <label for="simple_gdpr_cookie_compliance_options[style][enable_bg_overlay]"><input type="checkbox" class="s_gdpr_c_n_bg_overlay_field" name="simple_gdpr_cookie_compliance_options[style][enable_bg_overlay]" id="simple_gdpr_cookie_compliance_options[style][enable_bg_overlay]" <?php checked( true, $enable_bg_overlay ); ?>><?php echo esc_html__( 'Enable Background Overlay', 'simple-gdpr-cookie-compliance' ); ?></label>
     374
     375            </p>
     376
     377            <div id="s_gdpr_c_n_offset_group_wrapper" class="s_gdpr_c_n_group_wrapper <?php echo ( 'custom_width' !== $type ) ? 'sgdpr_hidden' : ''; ?>">
     378                <h4 class="s_grpd_c_n_group_title"><?php echo esc_html__( 'Offsets', 'simple-gdpr-cookie-compliance' ); ?></h4>
    361379                <div class="s_gdpr_c_n_group s_gdpr_c_n_group-4">
    362380                    <div class="s_gdpr_c_n_group_field" id="s_gdpr_c_n_top_offset_group_field">
    363                         <label for="simple_gdpr_cookie_compliance_options[style][top_offset]"><?php echo __( 'Top (px)', 'simple-gdpr-cookie-compliance' ); ?></label>
     381                        <label for="simple_gdpr_cookie_compliance_options[style][top_offset]"><?php echo esc_html__( 'Top (px)', 'simple-gdpr-cookie-compliance' ); ?></label>
    364382                        <input type="number" id="simple_gdpr_cookie_compliance_options[style][top_offset]" name="simple_gdpr_cookie_compliance_options[style][top_offset]" class="s_gdpr_c_n_number" value="<?php echo esc_attr( $top_offset ); ?>">
    365383                    </div>
    366384                    <div class="s_gdpr_c_n_group_field" id="s_gdpr_c_n_right_offset_group_field">
    367                         <label for="simple_gdpr_cookie_compliance_options[style][right_offset]"><?php echo __( 'Right (px)', 'simple-gdpr-cookie-compliance' ); ?></label>
     385                        <label for="simple_gdpr_cookie_compliance_options[style][right_offset]"><?php echo esc_html__( 'Right (px)', 'simple-gdpr-cookie-compliance' ); ?></label>
    368386                        <input type="number" id="simple_gdpr_cookie_compliance_options[style][right_offset]" name="simple_gdpr_cookie_compliance_options[style][right_offset]" class="s_gdpr_c_n_number" value="<?php echo esc_attr( $right_offset ); ?>">
    369387                    </div>                 
    370388                    <div class="s_gdpr_c_n_group_field" id="s_gdpr_c_n_bottom_offset_group_field">
    371                         <label for="simple_gdpr_cookie_compliance_options[style][bottom_offset]"><?php echo __( 'Bottom (px)', 'simple-gdpr-cookie-compliance' ); ?></label>
     389                        <label for="simple_gdpr_cookie_compliance_options[style][bottom_offset]"><?php echo esc_html__( 'Bottom (px)', 'simple-gdpr-cookie-compliance' ); ?></label>
    372390                        <input type="number" id="simple_gdpr_cookie_compliance_options[style][bottom_offset]" name="simple_gdpr_cookie_compliance_options[style][bottom_offset]" class="s_gdpr_c_n_number" value="<?php echo esc_attr( $bottom_offset ); ?>">
    373391                    </div>
    374392                    <div class="s_gdpr_c_n_group_field" id="s_gdpr_c_n_left_offset_group_field">
    375                         <label for="simple_gdpr_cookie_compliance_options[style][left_offset]"><?php echo __( 'Left (px)', 'simple-gdpr-cookie-compliance' ); ?></label>
     393                        <label for="simple_gdpr_cookie_compliance_options[style][left_offset]"><?php echo esc_html__( 'Left (px)', 'simple-gdpr-cookie-compliance' ); ?></label>
    376394                        <input type="number" id="simple_gdpr_cookie_compliance_options[style][left_offset]" name="simple_gdpr_cookie_compliance_options[style][left_offset]" class="s_gdpr_c_n_number" value="<?php echo esc_attr( $left_offset ); ?>">
    377395                    </div>
    … …  
    389407    public function color_fields() {
    390408
    391 
    392         $notice_background_color = ! empty( $this->options['color']['notice_background'] ) ? $this->options['color']['notice_background'] : '#fbf01e';
    393 
    394         $notice_text_color = ! empty( $this->options['color']['notice_text'] ) ? $this->options['color']['notice_text'] : '#222222';
    395 
    396         $notice_link_color = ! empty( $this->options['color']['notice_link_color'] ) ? $this->options['color']['notice_link_color'] : '#222222';
    397 
    398         $notice_link_hover_color = ! empty( $this->options['color']['notice_link_hover_color'] ) ? $this->options['color']['notice_link_hover_color'] : '#4CC500';
    399 
    400         $notice_cookie_icon_color = ! empty( $this->options['color']['notice_cookie_icon_color'] ) ? $this->options['color']['notice_cookie_icon_color'] : '#222222';
    401 
    402         $notice_compliance_button_bg = ! empty( $this->options['color']['notice_compliance_button_bg'] ) ? $this->options['color']['notice_compliance_button_bg'] : '#222222';
    403 
    404         $notice_compliance_button_hover_bg_color = ! empty( $this->options['color']['notice_compliance_button_hover_bg_color'] ) ? $this->options['color']['notice_compliance_button_hover_bg_color'] : '#4cc500';
    405 
    406         $notice_compliance_button_border_color = ! empty( $this->options['color']['notice_compliance_button_border_color'] ) ? $this->options['color']['notice_compliance_button_border_color'] : '#222222';
    407 
    408         $notice_compliance_button_hover_border_color = ! empty( $this->options['color']['notice_compliance_button_hover_border_color'] ) ? $this->options['color']['notice_compliance_button_hover_border_color'] : '#4cc500';
    409 
    410         $notice_compliance_button_text_color = ! empty( $this->options['color']['notice_compliance_button_text_color'] ) ? $this->options['color']['notice_compliance_button_text_color'] : '#ffffff';
    411 
    412         $notice_compliance_button_hover_text_color = ! empty( $this->options['color']['notice_compliance_button_hover_text_color'] ) ? $this->options['color']['notice_compliance_button_hover_text_color'] : '#ffffff';
    413 
    414         $notice_box_close_btn_bg_color = ! empty( $this->options['color']['notice_box_close_btn_bg_color'] ) ? $this->options['color']['notice_box_close_btn_bg_color'] : '#222222';
    415 
    416         $notice_box_close_btn_bg_hover_color = ! empty( $this->options['color']['notice_box_close_btn_bg_hover_color'] ) ? $this->options['color']['notice_box_close_btn_bg_hover_color'] : '#4cc500';
    417 
    418         $notice_box_close_btn_text_color = ! empty( $this->options['color']['notice_box_close_btn_text_color'] ) ? $this->options['color']['notice_box_close_btn_text_color'] : '#ffffff';
    419 
    420         $notice_box_close_btn_hover_text_color = ! empty( $this->options['color']['notice_box_close_btn_hover_text_color'] ) ? $this->options['color']['notice_box_close_btn_hover_text_color'] : '#ffffff';
    421 
    422         $notice_bg_overlay_color = ! empty( $this->options['color']['notice_bg_overlay_color'] ) ? $this->options['color']['notice_bg_overlay_color'] : 'rgba(0,0,0,0.8)';
    423 
    424         $enable_bg_overlay = ! empty( $this->options['style']['enable_bg_overlay'] ) ? $this->options['style']['enable_bg_overlay'] : true;
    425 
    426         $type = ! empty( $this->options['style']['type'] ) ? $this->options['style']['type'] : 'custom_width';
     409        $notice_background_color = isset( $this->options['color']['notice_background'] ) ? $this->options['color']['notice_background'] : '#fbf01e';
     410
     411        $notice_text_color = isset( $this->options['color']['notice_text'] ) ? $this->options['color']['notice_text'] : '#222222';
     412
     413        $notice_link_color = isset( $this->options['color']['notice_link_color'] ) ? $this->options['color']['notice_link_color'] : '#222222';
     414
     415        $notice_link_hover_color = isset( $this->options['color']['notice_link_hover_color'] ) ? $this->options['color']['notice_link_hover_color'] : '#4CC500';
     416
     417        $notice_cookie_icon_color = isset( $this->options['color']['notice_cookie_icon_color'] ) ? $this->options['color']['notice_cookie_icon_color'] : '#222222';
     418
     419        $notice_compliance_button_bg = isset( $this->options['color']['notice_compliance_button_bg'] ) ? $this->options['color']['notice_compliance_button_bg'] : '#222222';
     420
     421        $notice_compliance_button_hover_bg_color = isset( $this->options['color']['notice_compliance_button_hover_bg_color'] ) ? $this->options['color']['notice_compliance_button_hover_bg_color'] : '#4cc500';
     422
     423        $notice_compliance_button_border_color = isset( $this->options['color']['notice_compliance_button_border_color'] ) ? $this->options['color']['notice_compliance_button_border_color'] : '#222222';
     424
     425        $notice_compliance_button_hover_border_color = isset( $this->options['color']['notice_compliance_button_hover_border_color'] ) ? $this->options['color']['notice_compliance_button_hover_border_color'] : '#4cc500';
     426
     427        $notice_compliance_button_text_color = isset( $this->options['color']['notice_compliance_button_text_color'] ) ? $this->options['color']['notice_compliance_button_text_color'] : '#ffffff';
     428
     429        $notice_compliance_button_hover_text_color = isset( $this->options['color']['notice_compliance_button_hover_text_color'] ) ? $this->options['color']['notice_compliance_button_hover_text_color'] : '#ffffff';
     430
     431        $notice_box_close_btn_bg_color = isset( $this->options['color']['notice_box_close_btn_bg_color'] ) ? $this->options['color']['notice_box_close_btn_bg_color'] : '#222222';
     432
     433        $notice_box_close_btn_bg_hover_color = isset( $this->options['color']['notice_box_close_btn_bg_hover_color'] ) ? $this->options['color']['notice_box_close_btn_bg_hover_color'] : '#4cc500';
     434
     435        $notice_box_close_btn_text_color = isset( $this->options['color']['notice_box_close_btn_text_color'] ) ? $this->options['color']['notice_box_close_btn_text_color'] : '#ffffff';
     436
     437        $notice_box_close_btn_hover_text_color = isset( $this->options['color']['notice_box_close_btn_hover_text_color'] ) ? $this->options['color']['notice_box_close_btn_hover_text_color'] : '#ffffff';
     438
     439        $notice_bg_overlay_color = isset( $this->options['color']['notice_bg_overlay_color'] ) ? $this->options['color']['notice_bg_overlay_color'] : 'rgba(0,0,0,0.8)';
     440
     441        $enable_bg_overlay = isset( $this->options['style']['enable_bg_overlay'] ) ? $this->options['style']['enable_bg_overlay'] : true;
     442
     443        $type = isset( $this->options['style']['type'] ) ? $this->options['style']['type'] : 'custom_width';
    427444
    428445        ?>
    429446        <div class="s_gdpr_c_n_field s_gdpr_c_n_color_options_field" id="s_gdpr_c_n_link">
    430447
    431             <div class="s_gdpr_c_n_group_wrapper <?php echo ( $enable_bg_overlay == true && $type == 'pop_up' ) ? '' : 'sgdpr_hidden'; ?>" id="s_gdpr_c_n_bg_overlay">
    432                 <h4 class="s_grpd_c_n_group_title"><?php echo __( 'Overlay Color', 'simple-gdpr-cookie-compliance' ); ?></h4>
     448            <div class="s_gdpr_c_n_group_wrapper <?php echo ( true === $enable_bg_overlay && 'pop_up' === $type ) ? '' : 'sgdpr_hidden'; ?>" id="s_gdpr_c_n_bg_overlay">
     449                <h4 class="s_grpd_c_n_group_title"><?php echo esc_html__( 'Overlay Color', 'simple-gdpr-cookie-compliance' ); ?></h4>
    433450                <div class="s_gdpr_c_n_group">
    434451                    <div class="s_gdpr_c_n_group_field">
    435                         <label for="simple_gdpr_cookie_compliance_options[color][notice_bg_overlay_color]"><?php echo __( 'Background', 'simple-gdpr-cookie-compliance' ); ?></label>
     452                        <label for="simple_gdpr_cookie_compliance_options[color][notice_bg_overlay_color]"><?php echo esc_html__( 'Background', 'simple-gdpr-cookie-compliance' ); ?></label>
    436453                        <input type="text" id="simple_gdpr_cookie_compliance_options[color][notice_bg_overlay_color]" name="simple_gdpr_cookie_compliance_options[color][notice_bg_overlay_color]" class="s_gdpr_c_n_color" data-alpha-enabled="true" value="<?php echo esc_attr( $notice_bg_overlay_color ); ?>">
    437454                    </div>
    … …  
    440457
    441458            <div class="s_gdpr_c_n_group_wrapper">
    442                 <h4 class="s_grpd_c_n_group_title"><?php echo __( 'Notice Color', 'simple-gdpr-cookie-compliance' ); ?></h4>
     459                <h4 class="s_grpd_c_n_group_title"><?php echo esc_html__( 'Notice Color', 'simple-gdpr-cookie-compliance' ); ?></h4>
    443460                <div class="s_gdpr_c_n_group">
    444461                    <div class="s_gdpr_c_n_group_field">
    445                         <label for="simple_gdpr_cookie_compliance_options[color][notice_background]"><?php echo __( 'Background', 'simple-gdpr-cookie-compliance' ); ?></label>
     462                        <label for="simple_gdpr_cookie_compliance_options[color][notice_background]"><?php echo esc_html__( 'Background', 'simple-gdpr-cookie-compliance' ); ?></label>
    446463                        <input type="text" id="simple_gdpr_cookie_compliance_options[color][notice_background]" name="simple_gdpr_cookie_compliance_options[color][notice_background]" class="s_gdpr_c_n_color" data-alpha-enabled="true" value="<?php echo esc_attr( $notice_background_color ); ?>">
    447464                    </div>
    448465                    <div class="s_gdpr_c_n_group_field">
    449                         <label for="simple_gdpr_cookie_compliance_options[color][notice_cookie_icon_color]"><?php echo __( 'Cookie Icon', 'simple-gdpr-cookie-compliance' ); ?></label>
     466                        <label for="simple_gdpr_cookie_compliance_options[color][notice_cookie_icon_color]"><?php echo esc_html__( 'Cookie Icon', 'simple-gdpr-cookie-compliance' ); ?></label>
    450467                        <input type="text" id="simple_gdpr_cookie_compliance_options[color][notice_cookie_icon_color]" name="simple_gdpr_cookie_compliance_options[color][notice_cookie_icon_color]" class="s_gdpr_c_n_color" value="<?php echo esc_attr( $notice_cookie_icon_color ); ?>">
    451468                    </div>
    452469                    <div class="s_gdpr_c_n_group_field">
    453                         <label for="simple_gdpr_cookie_compliance_options[color][notice_text]"><?php _e( 'Text', 'simple-gdpr-cookie-compliance' ); ?></label>
     470                        <label for="simple_gdpr_cookie_compliance_options[color][notice_text]"><?php echo esc_html__( 'Text', 'simple-gdpr-cookie-compliance' ); ?></label>
    454471                        <input type="text" id="simple_gdpr_cookie_compliance_options[color][notice_text]" name="simple_gdpr_cookie_compliance_options[color][notice_text]" class="s_gdpr_c_n_color" value="<?php echo esc_attr( $notice_text_color ); ?>">
    455472                    </div>
    456473                    <div class="s_gdpr_c_n_group_field">
    457                         <label for="simple_gdpr_cookie_compliance_options[color][notice_link_color]"><?php echo __( 'Link', 'simple-gdpr-cookie-compliance' ); ?></label>
     474                        <label for="simple_gdpr_cookie_compliance_options[color][notice_link_color]"><?php echo esc_html__( 'Link', 'simple-gdpr-cookie-compliance' ); ?></label>
    458475                        <input type="text" id="simple_gdpr_cookie_compliance_options[color][notice_link_color]" name="simple_gdpr_cookie_compliance_options[color][notice_link_color]" class="s_gdpr_c_n_color" value="<?php echo esc_attr( $notice_link_color ); ?>">
    459476                    </div>
    460477                    <div class="s_gdpr_c_n_group_field">
    461                         <label for="simple_gdpr_cookie_compliance_options[color][notice_link_hover_color]"><?php echo __( 'Link - On Hover', 'simple-gdpr-cookie-compliance' ); ?></label>
     478                        <label for="simple_gdpr_cookie_compliance_options[color][notice_link_hover_color]"><?php echo esc_html__( 'Link - On Hover', 'simple-gdpr-cookie-compliance' ); ?></label>
    462479                        <input type="text" id="simple_gdpr_cookie_compliance_options[color][notice_link_hover_color]" name="simple_gdpr_cookie_compliance_options[color][notice_link_hover_color]" class="s_gdpr_c_n_color" value="<?php echo esc_attr( $notice_link_hover_color ); ?>">
    463480                    </div>
    … …  
    466483
    467484            <div class="s_gdpr_c_n_group_wrapper">
    468                 <h4 class="s_grpd_c_n_group_title"><?php echo __( 'Close Button Color', 'simple-gdpr-cookie-compliance' ); ?></h4>
     485                <h4 class="s_grpd_c_n_group_title"><?php echo esc_html__( 'Close Button Color', 'simple-gdpr-cookie-compliance' ); ?></h4>
    469486                <div class="s_gdpr_c_n_group">
    470487                    <div class="s_gdpr_c_n_group_field">
    471                         <label for="simple_gdpr_cookie_compliance_options[color][notice_box_close_btn_bg_color]"><?php echo __( 'Background', 'simple-gdpr-cookie-compliance' ); ?></label>
     488                        <label for="simple_gdpr_cookie_compliance_options[color][notice_box_close_btn_bg_color]"><?php echo esc_html__( 'Background', 'simple-gdpr-cookie-compliance' ); ?></label>
    472489                        <input type="text" id="simple_gdpr_cookie_compliance_options[color][notice_box_close_btn_bg_color]" name="simple_gdpr_cookie_compliance_options[color][notice_box_close_btn_bg_color]" class="s_gdpr_c_n_color" data-alpha-enabled="true" value="<?php echo esc_attr( $notice_box_close_btn_bg_color ); ?>">
    473490                    </div>
    474491                    <div class="s_gdpr_c_n_group_field">
    475                         <label for="simple_gdpr_cookie_compliance_options[color][notice_box_close_btn_bg_hover_color]"><?php echo __( 'Background - On Hover', 'simple-gdpr-cookie-compliance' ); ?></label>
     492                        <label for="simple_gdpr_cookie_compliance_options[color][notice_box_close_btn_bg_hover_color]"><?php echo esc_html__( 'Background - On Hover', 'simple-gdpr-cookie-compliance' ); ?></label>
    476493                        <input type="text" id="simple_gdpr_cookie_compliance_options[color][notice_box_close_btn_bg_hover_color]" name="simple_gdpr_cookie_compliance_options[color][notice_box_close_btn_bg_hover_color]" class="s_gdpr_c_n_color" data-alpha-enabled="true" value="<?php echo esc_attr( $notice_box_close_btn_bg_hover_color ); ?>">
    477494                    </div>
    478495                    <div class="s_gdpr_c_n_group_field">
    479                         <label for="simple_gdpr_cookie_compliance_options[color][notice_box_close_btn_text_color]"><?php echo __( 'Text', 'simple-gdpr-cookie-compliance' ); ?></label>
     496                        <label for="simple_gdpr_cookie_compliance_options[color][notice_box_close_btn_text_color]"><?php echo esc_html__( 'Text', 'simple-gdpr-cookie-compliance' ); ?></label>
    480497                        <input type="text" id="simple_gdpr_cookie_compliance_options[color][notice_box_close_btn_text_color]" name="simple_gdpr_cookie_compliance_options[color][notice_box_close_btn_text_color]" class="s_gdpr_c_n_color" value="<?php echo esc_attr( $notice_box_close_btn_text_color ); ?>">   
    481498                    </div>
    482499                    <div class="s_gdpr_c_n_group_field">
    483                         <label for="simple_gdpr_cookie_compliance_options[color][notice_box_close_btn_hover_text_color]"><?php echo __( 'Text - On Hover', 'simple-gdpr-cookie-compliance' ); ?></label>
     500                        <label for="simple_gdpr_cookie_compliance_options[color][notice_box_close_btn_hover_text_color]"><?php echo esc_html__( 'Text - On Hover', 'simple-gdpr-cookie-compliance' ); ?></label>
    484501                        <input type="text" id="simple_gdpr_cookie_compliance_options[color][notice_box_close_btn_hover_text_color]" name="simple_gdpr_cookie_compliance_options[color][notice_box_close_btn_hover_text_color]" class="s_gdpr_c_n_color" value="<?php echo esc_attr( $notice_box_close_btn_hover_text_color ); ?>">
    485502                    </div>
    … …  
    488505
    489506            <div class="s_gdpr_c_n_group_wrapper">
    490                 <h4 class="s_grpd_c_n_group_title"><?php echo __( 'Accept Button Color', 'simple-gdpr-cookie-compliance' ); ?></h4>
     507                <h4 class="s_grpd_c_n_group_title"><?php echo esc_html__( 'Accept Button Color', 'simple-gdpr-cookie-compliance' ); ?></h4>
    491508                <div class="s_gdpr_c_n_group">
    492509                    <div class="s_gdpr_c_n_group_field">
    493                         <label for="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_bg]"><?php echo __( 'Background', 'simple-gdpr-cookie-compliance' ); ?></label>
     510                        <label for="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_bg]"><?php echo esc_html__( 'Background', 'simple-gdpr-cookie-compliance' ); ?></label>
    494511                        <input type="text" id="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_bg]" name="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_bg]" class="s_gdpr_c_n_color" data-alpha-enabled="true" value="<?php echo esc_attr( $notice_compliance_button_bg ); ?>">
    495512                    </div>
    496513                    <div class="s_gdpr_c_n_group_field">
    497                         <label for="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_hover_bg_color]"><?php echo __( 'Background - On Hover', 'simple-gdpr-cookie-compliance' ); ?></label>
     514                        <label for="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_hover_bg_color]"><?php echo esc_html__( 'Background - On Hover', 'simple-gdpr-cookie-compliance' ); ?></label>
    498515                        <input type="text" id="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_hover_bg_color]" name="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_hover_bg_color]" class="s_gdpr_c_n_color" data-alpha-enabled="true" value="<?php echo esc_attr( $notice_compliance_button_hover_bg_color ); ?>">
    499516                    </div>
    500517                    <div class="s_gdpr_c_n_group_field">
    501                         <label for="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_border_color]"><?php echo __( 'Border', 'simple-gdpr-cookie-compliance' ); ?></label>
     518                        <label for="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_border_color]"><?php echo esc_html__( 'Border', 'simple-gdpr-cookie-compliance' ); ?></label>
    502519                        <input type="text" id="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_border_color]" name="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_border_color]" class="s_gdpr_c_n_color" data-alpha-enabled="true" value="<?php echo esc_attr( $notice_compliance_button_border_color ); ?>">   
    503520                    </div>
    504521                    <div class="s_gdpr_c_n_group_field">
    505                         <label for="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_hover_border_color]"><?php echo __( 'Border - On Hover', 'simple-gdpr-cookie-compliance' ); ?></label>
     522                        <label for="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_hover_border_color]"><?php echo esc_html__( 'Border - On Hover', 'simple-gdpr-cookie-compliance' ); ?></label>
    506523                        <input type="text" id="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_hover_border_color]" name="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_hover_border_color]" class="s_gdpr_c_n_color" data-alpha-enabled="true" value="<?php echo esc_attr( $notice_compliance_button_hover_border_color ); ?>">
    507524                    </div>
    508525                    <div class="s_gdpr_c_n_group_field">
    509                         <label for="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_text_color]"><?php echo __( 'Text', 'simple-gdpr-cookie-compliance' ); ?></label>
     526                        <label for="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_text_color]"><?php echo esc_html__( 'Text', 'simple-gdpr-cookie-compliance' ); ?></label>
    510527                        <input type="text" id="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_text_color]" name="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_text_color]" class="s_gdpr_c_n_color" value="<?php echo esc_attr( $notice_compliance_button_text_color ); ?>">   
    511528                    </div>
    512529                    <div class="s_gdpr_c_n_group_field">
    513                         <label for="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_hover_text_color]"><?php echo __( 'Text - On Hover', 'simple-gdpr-cookie-compliance' ); ?></label>
     530                        <label for="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_hover_text_color]"><?php echo esc_html__( 'Text - On Hover', 'simple-gdpr-cookie-compliance' ); ?></label>
    514531                        <input type="text" id="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_hover_text_color]" name="simple_gdpr_cookie_compliance_options[color][notice_compliance_button_hover_text_color]" class="s_gdpr_c_n_color" value="<?php echo esc_attr( $notice_compliance_button_hover_text_color ); ?>">
    515532                    </div>
    … …  
    526543     */
    527544    public function custom_css_fields() {
     545
    528546        $custom_css = ! empty( $this->options['custom_css'] ) ? $this->options['custom_css'] : '';
    529547        ?>
    530548        <div class="s_gdpr_c_n_field" id="s_gdpr_c_n_custom_css">
    531549            <p>
    532                 <label for="simple_gdpr_cookie_compliance_options[custom_css]"><?php echo __( 'CSS Codes', 'simple-gdpr-cookie-compliance' ); ?></label>
     550                <label for="simple_gdpr_cookie_compliance_options[custom_css]">
     551                    <?php echo esc_html__( 'CSS Codes', 'simple-gdpr-cookie-compliance' ); ?>
     552                </label>
    533553                <textarea id="simple_gdpr_cookie_compliance_options[custom_css]" name="simple_gdpr_cookie_compliance_options[custom_css]" class="s_gdpr_c_n_number"><?php echo esc_html( $custom_css ); ?></textarea>
    534554            </p>
    … …  
    539559     * Function for sanitization of fields.
    540560     *
    541      * @since    1.0.0
     561     * @since 1.0.0
     562     *
     563     * @param array $inputs Settings.
    542564     */
    543565    public function sanitize_fields( $inputs ) {
    … …  
    552574                'class' => array(),
    553575            ),
    554             'a' => array(
    555                 'class' => array(),
    556                 'href' => array(),
     576            'a'    => array(
     577                'class'  => array(),
     578                'href'   => array(),
    557579                'target' => array(),
    558                 'title' => array(),
     580                'title'  => array(),
    559581            ),
    560             'i' => array(
     582            'i'    => array(
    561583                'class' => array(),
    562584            ),
    … …  
    639661        $inputs['custom_css'] = isset( $inputs['custom_css'] ) ? sanitize_textarea_field( $inputs['custom_css'] ) : '';
    640662
    641         return $inputs;     
     663        return $inputs;
    642664    }
    643665}

  • simple-gdpr-cookie-compliance/trunk/includes/class-simple-gdpr-cookie-compliance-activator.php

    r2662024 r2876942  
    11<?php
     2/**
     3 * Fired during plugin activation.
     4 *
     5 * This class defines all code necessary to run during the plugin's activation.
     6 *
     7 * @since      1.0.0
     8 * @package    Simple_GDPR_Cookie_Compliance
     9 * @subpackage Simple_GDPR_Cookie_Compliance/includes
     10 * @author     themebeez <themebeez@gmail.com>
     11 */
     12
    213/**
    314 * Fired during plugin activation.
    … …  
    2132    public function activate() {
    2233
    23         // This code runs at the time of activations
    24 
     34        // This code runs at the time of activations.
    2535    }
    26 
    2736}

  • simple-gdpr-cookie-compliance/trunk/includes/class-simple-gdpr-cookie-compliance-deactivator.php

    r2662024 r2876942  
    11<?php
     2/**
     3 * Fired during plugin deactivation.
     4 *
     5 * This class defines all code necessary to run during the plugin's deactivation.
     6 *
     7 * @since      1.0.0
     8 * @package    Simple_GDPR_Cookie_Compliance
     9 * @subpackage Simple_GDPR_Cookie_Compliance/includes
     10 * @author     themebeez <themebeez@gmail.com>
     11 */
     12
    213/**
    314 * Fired during plugin deactivation.
    … …  
    2233
    2334    }
    24 
    2535}

  • simple-gdpr-cookie-compliance/trunk/includes/class-simple-gdpr-cookie-compliance-i18n.php

    r2662024 r2876942  
    1111 * @author     themebeez <themebeez@gmail.com>
    1212 */
    13 class Simple_GDPR_Cookie_Compliance_i18n {
    1413
     14/**
     15 * Define the internationalization functionality.
     16 *
     17 * Loads and defines the internationalization files for this plugin
     18 * so that it is ready for translation.
     19 *
     20 * @since      1.0.0
     21 * @package    Simple_GDPR_Cookie_Compliance
     22 * @subpackage Simple_GDPR_Cookie_Compliance/includes
     23 * @author     themebeez <themebeez@gmail.com>
     24 */
     25class Simple_GDPR_Cookie_Compliance_i18n { // phpcs:ignore
    1526
    1627    /**
    … …  
    2637            dirname( dirname( plugin_basename( __FILE__ ) ) ) . '/languages/'
    2738        );
    28 
    2939    }
    30 
    31 
    32 
    3340}

  • simple-gdpr-cookie-compliance/trunk/includes/class-simple-gdpr-cookie-compliance-loader.php

    r2662024 r2876942  
    11<?php
     2/**
     3 * Register all actions and filters for the plugin.
     4 *
     5 * Maintain a list of all hooks that are registered throughout
     6 * the plugin, and register them with the WordPress API. Call the
     7 * run function to execute the list of actions and filters.
     8 *
     9 * @package    Simple_GDPR_Cookie_Compliance
     10 * @subpackage Simple_GDPR_Cookie_Compliance/includes
     11 * @author     themebeez <themebeez@gmail.com>
     12 */
     13
    214/**
    315 * Register all actions and filters for the plugin.
    … …  
    4052        $this->actions = array();
    4153        $this->filters = array();
    42 
    4354    }
    4455
    … …  
    4758     *
    4859     * @since    1.0.0
    49      * @param    string               $hook             The name of the WordPress action that is being registered.
    50      * @param    object               $component        A reference to the instance of the object on which the action is defined.
    51      * @param    string               $callback         The name of the function definition on the $component.
    52      * @param    int                  $priority         Optional. The priority at which the function should be fired. Default is 10.
    53      * @param    int                  $accepted_args    Optional. The number of arguments that should be passed to the $callback. Default is 1.
     60     * @param string $hook          The name of the WordPress action that is being registered.
     61     * @param object $component     A reference to the instance of the object on which the action is defined.
     62     * @param string $callback      The name of the function definition on the $component.
     63     * @param int    $priority      Optional. The priority at which the function should be fired. Default is 10.
     64     * @param int    $accepted_args Optional. The number of arguments that should be passed to the $callback. Default is 1.
    5465     */
    5566    public function add_action( $hook, $component, $callback, $priority = 10, $accepted_args = 1 ) {
    … …  
    6172     *
    6273     * @since    1.0.0
    63      * @param    string               $hook             The name of the WordPress filter that is being registered.
    64      * @param    object               $component        A reference to the instance of the object on which the filter is defined.
    65      * @param    string               $callback         The name of the function definition on the $component.
    66      * @param    int                  $priority         Optional. The priority at which the function should be fired. Default is 10.
    67      * @param    int                  $accepted_args    Optional. The number of arguments that should be passed to the $callback. Default is 1
     74     * @param string $hook          The name of the WordPress filter that is being registered.
     75     * @param object $component     A reference to the instance of the object on which the filter is defined.
     76     * @param string $callback      The name of the function definition on the $component.
     77     * @param int    $priority      Optional. The priority at which the function should be fired. Default is 10.
     78     * @param int    $accepted_args Optional. The number of arguments that should be passed to the $callback. Default is 1.
    6879     */
    6980    public function add_filter( $hook, $component, $callback, $priority = 10, $accepted_args = 1 ) {
    … …  
    7687     *
    7788     * @since    1.0.0
    78      * @access   private
    79      * @param    array                $hooks            The collection of hooks that is being registered (that is, actions or filters).
    80      * @param    string              $hook             The name of the WordPress filter that is being registered.
    81      * @param    object              $component        A reference to the instance of the object on which the filter is defined.
    82      * @param    string              $callback         The name of the function definition on the $component.
    83      * @param    int                  $priority         The priority at which the function should be fired.
    84      * @param    int                  $accepted_args    The number of arguments that should be passed to the $callback.
     89     * @accessprivate
     90     * @param array  $hooks            The collection of hooks that is being registered (that is, actions or filters).
     91     * @param string $hook             The name of the WordPress filter that is being registered.
     92     * @param object $component        A reference to the instance of the object on which the filter is defined.
     93     * @param string $callback         The name of the function definition on the $component.
     94     * @param int    $priority         The priority at which the function should be fired.
     95     * @param int    $accepted_args    The number of arguments that should be passed to the $callback.
    8596     * @return   array                                  The collection of actions and filters registered with WordPress.
    8697     */
    … …  
    92103            'callback'      => $callback,
    93104            'priority'      => $priority,
    94             'accepted_args' => $accepted_args
     105            'accepted_args' => $accepted_args,
    95106        );
    96107
    … …  
    113124            add_action( $hook['hook'], array( $hook['component'], $hook['callback'] ), $hook['priority'], $hook['accepted_args'] );
    114125        }
    115 
    116126    }
    117 
    118127}

  • simple-gdpr-cookie-compliance/trunk/includes/class-simple-gdpr-cookie-compliance.php

    r2867952 r2876942  
    11<?php
     2/**
     3 * The core plugin class.
     4 *
     5 * This is used to define internationalization, admin-specific hooks, and
     6 * public-facing site hooks.
     7 *
     8 * Also maintains the unique identifier of this plugin as well as the current
     9 * version of the plugin.
     10 *
     11 * @since      1.0.0
     12 * @package    Simple_GDPR_Cookie_Compliance
     13 * @subpackage Simple_GDPR_Cookie_Compliance/includes
     14 * @author     themebeez <themebeez@gmail.com>
     15 */
     16
    217/**
    318 * The core plugin class.
    … …  
    153168        $plugin_admin = new Simple_GDPR_Cookie_Compliance_Admin( $this->get_plugin_name(), $this->get_version() );
    154169
    155         if ( 'admin.php' == $pagenow && isset( $_GET['page'] ) && 'simple-gdpr-cookie-compliance' == $_GET['page'] ) {
     170        if (
     171            'admin.php' === $pagenow &&
     172            isset( $_GET['page'] ) && // phpcs:ignore
     173            'simple-gdpr-cookie-compliance' === sanitize_text_field( wp_unslash( $_GET['page'] ) ) // phpcs:ignore
     174        ) {
    156175            $this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
    157176            $this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts' );
    … …  
    160179        $this->loader->add_action( 'admin_menu', $plugin_admin, 'plugin_menu' );
    161180
    162         // $this->loader->add_filter( 'plugin_action_links', $plugin_admin, 'plugin_page_links' );
    163181        $plugin_basename = SIMPLE_GDPR_COOKIE_COMPLIANCE_BASENAME;
    164182
    165183        $this->loader->add_filter( "plugin_action_links_{$plugin_basename}", $plugin_admin, 'plugin_page_links' );
    166184
    167         $plugin_options = new Simple_GDPR_Cookie_Compliance_Admin_Settings( $this->get_plugin_name(), $this->get_version() );
     185        $plugin_options = new Simple_GDPR_Cookie_Compliance_Settings( $this->get_plugin_name(), $this->get_version() );
    168186
    169187        $this->loader->add_action( 'admin_init', $plugin_options, 'register_settings' );

  • simple-gdpr-cookie-compliance/trunk/includes/udp/class-udp-agent.php

    r2874093 r2876942  
    55 * @link       https://creamcode.org/user-data-processing/
    66 * @since      1.0.0
    7  * @author     CreamCode
     7 * @author     CreamCode <contact@creamcode.org>
    88 * @package    Udp_Agent
    99 */
    … …  
    6060
    6161        $this->hooks();
    62 
    6362    }
    6463
    … …  
    7473     */
    7574    private function hooks() {
     75
    7676        add_action( 'init', array( $this, 'on_init' ) );
    7777        add_action( 'admin_init', array( $this, 'on_admin_init' ) );
    7878
    79         // custom cron.
     79        // Custom WP Schedule.
    8080        add_action( 'init', array( $this, 'udp_schedule_cron' ) );
    8181    }
    … …  
    8888     */
    8989    public function on_init() {
    90         // process user tracking actions.
     90
     91        // Process user tracking actions.
    9192        if ( isset( $_GET['udp-agent-allow-access'] ) ) { //phpcs:ignore
    9293            $this->process_user_tracking_choice();
    9394        }
    94 
    9595    }
    9696
    … …  
    102102    public function on_admin_init() {
    103103
    104         // register and save settings data.
     104        // Register setting to get user's consent for data collection.
    105105        register_setting(
    106106            'general',
    … …  
    111111        );
    112112
    113         // show ui in settings page.
     113        // Render setting field to get user's consent for data collection.
    114114        add_settings_field(
    115115            'udp_agent_allow_tracking',
    … …  
    126126
    127127    /**
    128      * Change the value of checkbox ( in settings page ) from integer to "yes" or "no"
    129      * and store in database.
    130      *
    131      * @since    1.0.0
    132      * @param    string $data Data to modify.
     128     * Sanitization callback function for sanitizing value of 'udp_agent_allow_tracking' setting.
     129     *
     130     * @since 1.0.0
     131     *
     132     * @param string $data Raw data.
     133     * @return string
    133134     */
    134135    public function get_settings_field_val( $data ) {
    135         if ( 1 === (int) $data ) {
    136             return 'yes';
    137         } else {
    138             return 'no';
    139         }
    140 
     136
     137        return ( 'yes' === sanitize_text_field( $data ) ) ? 'yes' : 'no';
    141138    }
    142139
    … …  
    147144
    148145    /**
    149      * Generate markups to show in settings page.
     146     * Generate markups for setting field, 'udp_agent_allow_tracking'.
    150147     *
    151148     * @since    1.0.0
    152149     */
    153150    public function show_settings_ui() {
     151
    154152        echo '<p>';
    155         echo "<input type='checkbox' name='udp_agent_allow_tracking' id='udp_agent_allow_tracking' value='1'";
     153        echo "<input type='checkbox' name='udp_agent_allow_tracking' id='udp_agent_allow_tracking' value='yes'";
    156154        if ( 'yes' === get_option( 'udp_agent_allow_tracking' ) ) {
    157155            echo ' checked';
    … …  
    175173     */
    176174    private function process_user_tracking_choice() {
     175
    177176        $users_choice = isset( $_GET['udp-agent-allow-access'] ) ? sanitize_text_field( wp_unslash( $_GET['udp-agent-allow-access'] ) ) : ''; //phpcs:ignore
    178177
    … …  
    181180        }
    182181
    183         // add data into database.
     182        // Add data into database.
    184183        update_option( 'udp_agent_allow_tracking', $users_choice );
    185184        if ( 'yes' === $users_choice ) {
    … …  
    188187        update_option( 'udp_agent_tracking_msg_last_shown_at', time() );
    189188
    190         // redirect back.
    191         wp_safe_redirect( remove_query_arg( 'udp-agent-allow-access' ) );
     189        // Redirect back to dashboard.
     190        wp_safe_redirect( admin_url() );
    192191        exit;
    193192
    … …  
    242241
    243242        return $data;
    244 
    245243    }
    246244
    … …  
    259257
    260258        if ( 'yes' !== $track_user ) {
    261             // do not send data.
     259            // Do not send data.
    262260            return;
    263261        }
    264262
    265         // secret key will be same for all agents.
    266         $secret_key = get_option( 'udp_agent_secret_key' );
    267         if ( ! empty( $secret_key ) ) {
    268 
    269             // secret_key already exists.
    270             // do nothing.
    271             return true;
    272         }
    273 
    274         // authenticate with engine.
    275 
    276263        $data['agent_data'] = serialize( $this->get_data() ); //phpcs:ignore
    277         $data['site_url']   = get_bloginfo( 'url' );
    278264        $url                = untrailingslashit( $this->engine_url ) . '/wp-json/udp-engine/v1/handshake';
    279265
    … …  
    281267
    282268        return true;
    283 
    284269    }
    285270
    … …  
    292277     *
    293278     * @since 1.0.0
     279     *
    294280     * @return void
    295281     */
    … …  
    302288            wp_schedule_event( time(), 'daily', $cron_hook_name );
    303289        }
    304 
    305290    }
    306291
    … …  
    310295     *
    311296     * @since 1.0.0
     297     *
    312298     * @return void
    313299     */
    … …  
    317303
    318304        if ( 'yes' !== $track_user ) {
    319             // do not send data.
     305            // Do not send data.
    320306            return;
    321307        }
    322308
    323309        $data_to_send['agent_data'] = serialize( $this->get_data() ); //phpcs:ignore
    324         $data_to_send['secret_key'] = get_option( 'udp_agent_secret_key' );
    325310        $url                        = untrailingslashit( $this->engine_url ) . '/wp-json/udp-engine/v1/process-data';
    326         // $this->write_log( __FUNCTION__ . $this->do_curl( $url, $data_to_send ) );
    327311        $this->do_curl( $url, $data_to_send );
    328312        exit;
    329 
    330313    }
    331314
    … …  
    337320     */
    338321    private function write_log( $log ) {
     322
    339323        if ( true === WP_DEBUG && true === WP_DEBUG_LOG ) {
    340324            if ( is_array( $log ) || is_object( $log ) ) {
    … …  
    350334     *
    351335     * @since    1.0.0
     336     *
    352337     * @param string $url URL.
    353338     * @param array  $data_to_send Data to send.
    … …  
    355340     */
    356341    private function do_curl( $url, $data_to_send ) {
     342
    357343        if ( empty( $url ) ) {
    358344            return;
    … …  
    367353        return wp_remote_retrieve_body( $return_data );
    368354    }
    369 
    370355}

  • simple-gdpr-cookie-compliance/trunk/includes/udp/init.php

    r2874093 r2876942  
    9999                    esc_html__( '%s is asking to allow tracking your non-sensitive WordPress data?', 'simple-gdpr-cookie-compliance' ),
    100100                    $agent_name
    101                 ) . '</p><p>';
    102 
    103                 $content .= sprintf(
    104                     /* translators: %s: agent allow access link, %s: Allow */
    105                     '<a href="%1$s" class="button button-primary udp-agent-access_tracking-yes" style="margin-right: 10px" >%2$s</a>',
    106                     add_query_arg( 'udp-agent-allow-access', 'yes' ),
    107                     esc_html__( 'Allow', 'simple-gdpr-cookie-compliance' )
    108                 );
    109 
    110                 $content .= sprintf(
    111                     /* translators: %s: agent allow access link, %s: Allow */
    112                     '<a href="%1$s" class="button button-secondary udp-agent-access_tracking-no" style="margin-right: 10px" >%2$s</a>',
    113                     add_query_arg( 'udp-agent-allow-access', 'no' ),
    114                     esc_html__( 'Do not show again', 'simple-gdpr-cookie-compliance' )
    115                 );
    116 
    117                 $content .= sprintf(
    118                     /* translators: %s: agent allow access link, %s: Allow */
    119                     '<a href="%1$s" class="button button-secondary udp-agent-access_tracking-yes" style="margin-right: 10px" >%2$s</a>',
    120                     add_query_arg( 'udp-agent-allow-access', 'later' ),
    121                     esc_html__( 'Later', 'simple-gdpr-cookie-compliance' )
    122                 );
     101                ) . '</p>';
     102
     103                $content .= '<p>';
     104
     105                $content .= '<a href="' . esc_url( admin_url( '?udp-agent-allow-access=yes' ) ) . '" class="button button-primary udp-agent-access_tracking-yes" style="margin-right: 10px">' . esc_html__( 'Allow', 'simple-gdpr-cookie-compliance' ) . '</a>';
     106
     107                $content .= '<a href="' . esc_url( admin_url( '?udp-agent-allow-access=no' ) ) . '" class="button button-secondary udp-agent-access_tracking-yes" style="margin-right: 10px">' . esc_html__( 'Do not show again', 'simple-gdpr-cookie-compliance' ) . '</a>';
     108
     109                $content .= '<a href="' . esc_url( admin_url( '?udp-agent-allow-access=later' ) ) . '" class="button button-secondary udp-agent-access_tracking-yes" style="margin-right: 10px">' . esc_html__( 'Later', 'simple-gdpr-cookie-compliance' ) . '</a>';
    123110
    124111                $content .= '</p>';
     112
    125113                add_action(
    126114                    'load-index.php',

  • simple-gdpr-cookie-compliance/trunk/languages/simple-gdpr-cookie-compliance.pot

    r2874093 r2876942  
    33msgid ""
    44msgstr ""
    5 "Project-Id-Version: Simple GDPR Cookie Compliance 1.1.2\n"
     5"Project-Id-Version: Simple GDPR Cookie Compliance 1.1.3\n"
    66"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/simple-gdpr-cookie-compliance\n"
    77"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
    … …  
    1010"Content-Type: text/plain; charset=UTF-8\n"
    1111"Content-Transfer-Encoding: 8bit\n"
    12 "POT-Creation-Date: 2023-03-03T06:22:18+00:00\n"
     12"POT-Creation-Date: 2023-03-07T10:54:57+00:00\n"
    1313"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
    1414"X-Generator: WP-CLI 2.7.1\n"
    … …  
    1616
    1717#. Plugin Name of the plugin
    18 #: admin/class-simple-gdpr-cookie-compliance-admin.php:115
     18#: admin/class-simple-gdpr-cookie-compliance-admin.php:156
    1919#: admin/partials/simple-gdpr-cookie-compliance-admin-page.php:21
    2020msgid "Simple GDPR Cookie Compliance"
    … …  
    3737msgstr ""
    3838
    39 #: admin/class-simple-gdpr-cookie-compliance-admin.php:135
     39#: admin/class-simple-gdpr-cookie-compliance-admin.php:157
     40msgid "Simple GDPR"
     41msgstr ""
     42
     43#: admin/class-simple-gdpr-cookie-compliance-admin.php:184
    4044msgid "Settings"
    4145msgstr ""
    4246
    43 #: admin/class-simple-gdpr-cookie-compliance-settings.php:70
     47#: admin/class-simple-gdpr-cookie-compliance-settings.php:79
    4448msgid "Configure Settings"
    4549msgstr ""
    4650
    47 #: admin/class-simple-gdpr-cookie-compliance-settings.php:76
     51#: admin/class-simple-gdpr-cookie-compliance-settings.php:86
    4852msgid "Notice Content"
    4953msgstr ""
    5054
    51 #: admin/class-simple-gdpr-cookie-compliance-settings.php:83
     55#: admin/class-simple-gdpr-cookie-compliance-settings.php:94
    5256msgid "Cookie"
    5357msgstr ""
    5458
    55 #: admin/class-simple-gdpr-cookie-compliance-settings.php:90
     59#: admin/class-simple-gdpr-cookie-compliance-settings.php:102
    5660msgid "Style"
    5761msgstr ""
    5862
    59 #: admin/class-simple-gdpr-cookie-compliance-settings.php:97
     63#: admin/class-simple-gdpr-cookie-compliance-settings.php:110
    6064msgid "Colors"
    6165msgstr ""
    6266
    63 #: admin/class-simple-gdpr-cookie-compliance-settings.php:104
     67#: admin/class-simple-gdpr-cookie-compliance-settings.php:118
    6468msgid "Custom CSS"
    6569msgstr ""
    6670
    67 #: admin/class-simple-gdpr-cookie-compliance-settings.php:127
    68 #: public/class-simple-gdpr-cookie-compliance-public.php:153
     71#: admin/class-simple-gdpr-cookie-compliance-settings.php:141
     72#: public/class-simple-gdpr-cookie-compliance-public.php:175
    6973msgid "Our website uses cookies to provide you the best experience. However, by continuing to use our website, you agree to our use of cookies. For more information, read our <a href=\"#\">Cookie Policy</a>."
    7074msgstr ""
    7175
    72 #: admin/class-simple-gdpr-cookie-compliance-settings.php:137
     76#: admin/class-simple-gdpr-cookie-compliance-settings.php:151
    7377msgid "More Information"
    7478msgstr ""
    7579
    76 #: admin/class-simple-gdpr-cookie-compliance-settings.php:141
     80#: admin/class-simple-gdpr-cookie-compliance-settings.php:155
    7781msgid "Accept"
    7882msgstr ""
    7983
    80 #: admin/class-simple-gdpr-cookie-compliance-settings.php:152
     84#: admin/class-simple-gdpr-cookie-compliance-settings.php:167
    8185msgid "Message"
    8286msgstr ""
    8387
    84 #: admin/class-simple-gdpr-cookie-compliance-settings.php:154
     88#: admin/class-simple-gdpr-cookie-compliance-settings.php:171
    8589msgid "Enter the notice message. You can also insert &lt;span class=&quot;..&quot;&gt;...&lt;/span&gt;, &lt;a href=&quot;..&quot; target=&quot;..&quot; class=&quot;..&quot; title=&quot;..&quot;&gt;...&lt;/a&gt;, and &lt;i class=&quot;..&quot;&gt;...&lt;/i&gt; HTML tags along with the message."
    8690msgstr ""
    8791
    88 #: admin/class-simple-gdpr-cookie-compliance-settings.php:159
     92#: admin/class-simple-gdpr-cookie-compliance-settings.php:177
    8993msgid "Link Type"
    9094msgstr ""
    9195
    92 #: admin/class-simple-gdpr-cookie-compliance-settings.php:162
     96#: admin/class-simple-gdpr-cookie-compliance-settings.php:180
    9397msgid "No Link"
    9498msgstr ""
    9599
    96 #: admin/class-simple-gdpr-cookie-compliance-settings.php:163
     100#: admin/class-simple-gdpr-cookie-compliance-settings.php:181
    97101msgid "Custom Link"
    98102msgstr ""
    99103
    100 #: admin/class-simple-gdpr-cookie-compliance-settings.php:164
     104#: admin/class-simple-gdpr-cookie-compliance-settings.php:182
    101105msgid "Page"
    102106msgstr ""
    103107
    104 #: admin/class-simple-gdpr-cookie-compliance-settings.php:180
     108#: admin/class-simple-gdpr-cookie-compliance-settings.php:199
    105109msgid "Link Content"
    106110msgstr ""
    107111
    108 #: admin/class-simple-gdpr-cookie-compliance-settings.php:181
     112#: admin/class-simple-gdpr-cookie-compliance-settings.php:200
    109113msgid "Link content will be appended after the message."
    110114msgstr ""
    111115
    112 #: admin/class-simple-gdpr-cookie-compliance-settings.php:184
     116#: admin/class-simple-gdpr-cookie-compliance-settings.php:203
    113117msgid "Text Before Link"
    114118msgstr ""
    115119
    116 #: admin/class-simple-gdpr-cookie-compliance-settings.php:189
     120#: admin/class-simple-gdpr-cookie-compliance-settings.php:208
    117121msgid "Text After Link"
    118122msgstr ""
    119123
    120 #: admin/class-simple-gdpr-cookie-compliance-settings.php:195
     124#: admin/class-simple-gdpr-cookie-compliance-settings.php:214
    121125msgid "Custom Link Title"
    122126msgstr ""
    123127
    124 #: admin/class-simple-gdpr-cookie-compliance-settings.php:200
     128#: admin/class-simple-gdpr-cookie-compliance-settings.php:219
    125129msgid "Custom URL"
    126130msgstr ""
    127131
    128 #: admin/class-simple-gdpr-cookie-compliance-settings.php:207
     132#: admin/class-simple-gdpr-cookie-compliance-settings.php:226
    129133msgid "Link Page"
    130134msgstr ""
    131135
    132 #: admin/class-simple-gdpr-cookie-compliance-settings.php:214
     136#: admin/class-simple-gdpr-cookie-compliance-settings.php:234
    133137msgid "Select Page"
    134138msgstr ""
    135139
    136 #: admin/class-simple-gdpr-cookie-compliance-settings.php:222
     140#: admin/class-simple-gdpr-cookie-compliance-settings.php:242
    137141msgid "Show link in a new tab"
    138142msgstr ""
    139143
    140 #: admin/class-simple-gdpr-cookie-compliance-settings.php:227
     144#: admin/class-simple-gdpr-cookie-compliance-settings.php:247
    141145msgid "Accept Button Title"
    142146msgstr ""
    143147
    144 #: admin/class-simple-gdpr-cookie-compliance-settings.php:233
     148#: admin/class-simple-gdpr-cookie-compliance-settings.php:252
    145149msgid "Display Close Button"
    146150msgstr ""
    147151
    148 #: admin/class-simple-gdpr-cookie-compliance-settings.php:238
     152#: admin/class-simple-gdpr-cookie-compliance-settings.php:256
    149153msgid "Display Cookie Icon"
    150154msgstr ""
    151155
    152 #: admin/class-simple-gdpr-cookie-compliance-settings.php:255
     156#: admin/class-simple-gdpr-cookie-compliance-settings.php:273
    153157msgid "Cookie Expire Time"
    154158msgstr ""
    155159
    156 #: admin/class-simple-gdpr-cookie-compliance-settings.php:257
     160#: admin/class-simple-gdpr-cookie-compliance-settings.php:275
    157161msgid "Once the user clicks on Accept button, cookie notice will disappear. Expire Time sets the time duration for which cookie notice will disappear. Set &quot;0&quot; for SESSION cookie."
    158162msgstr ""
    159163
    160 #: admin/class-simple-gdpr-cookie-compliance-settings.php:289
     164#: admin/class-simple-gdpr-cookie-compliance-settings.php:307
    161165msgid "Width Style"
    162166msgstr ""
    163167
    164 #: admin/class-simple-gdpr-cookie-compliance-settings.php:292
     168#: admin/class-simple-gdpr-cookie-compliance-settings.php:310
    165169msgid "Full Width"
    166170msgstr ""
    167171
    168 #: admin/class-simple-gdpr-cookie-compliance-settings.php:293
     172#: admin/class-simple-gdpr-cookie-compliance-settings.php:311
    169173msgid "Custom Width"
    170174msgstr ""
    171175
    172 #: admin/class-simple-gdpr-cookie-compliance-settings.php:294
     176#: admin/class-simple-gdpr-cookie-compliance-settings.php:312
    173177msgid "Pop Up"
    174178msgstr ""
    175179
    176 #: admin/class-simple-gdpr-cookie-compliance-settings.php:309
     180#: admin/class-simple-gdpr-cookie-compliance-settings.php:327
    177181msgid "Width"
    178182msgstr ""
    179183
    180 #: admin/class-simple-gdpr-cookie-compliance-settings.php:314
    181 #: admin/class-simple-gdpr-cookie-compliance-settings.php:333
     184#: admin/class-simple-gdpr-cookie-compliance-settings.php:332
     185#: admin/class-simple-gdpr-cookie-compliance-settings.php:351
    182186msgid "Position"
    183187msgstr ""
    184188
    185 #: admin/class-simple-gdpr-cookie-compliance-settings.php:317
     189#: admin/class-simple-gdpr-cookie-compliance-settings.php:335
    186190msgid "Top"
    187191msgstr ""
    188192
    189 #: admin/class-simple-gdpr-cookie-compliance-settings.php:318
     193#: admin/class-simple-gdpr-cookie-compliance-settings.php:336
    190194msgid "Bottom"
    191195msgstr ""
    192196
    193 #: admin/class-simple-gdpr-cookie-compliance-settings.php:336
     197#: admin/class-simple-gdpr-cookie-compliance-settings.php:354
    194198msgid "Top Left"
    195199msgstr ""
    196200
    197 #: admin/class-simple-gdpr-cookie-compliance-settings.php:337
     201#: admin/class-simple-gdpr-cookie-compliance-settings.php:355
    198202msgid "Top Center"
    199203msgstr ""
    200204
    201 #: admin/class-simple-gdpr-cookie-compliance-settings.php:338
     205#: admin/class-simple-gdpr-cookie-compliance-settings.php:356
    202206msgid "Top Right"
    203207msgstr ""
    204208
    205 #: admin/class-simple-gdpr-cookie-compliance-settings.php:339
     209#: admin/class-simple-gdpr-cookie-compliance-settings.php:357
    206210msgid "Bottom Left"
    207211msgstr ""
    208212
    209 #: admin/class-simple-gdpr-cookie-compliance-settings.php:340
     213#: admin/class-simple-gdpr-cookie-compliance-settings.php:358
    210214msgid "Bottom Center"
    211215msgstr ""
    212216
    213 #: admin/class-simple-gdpr-cookie-compliance-settings.php:341
     217#: admin/class-simple-gdpr-cookie-compliance-settings.php:359
    214218msgid "Bottom Right"
    215219msgstr ""
    216220
    217 #: admin/class-simple-gdpr-cookie-compliance-settings.php:355
     221#: admin/class-simple-gdpr-cookie-compliance-settings.php:373
    218222msgid "Enable Background Overlay"
    219223msgstr ""
    220224
    221 #: admin/class-simple-gdpr-cookie-compliance-settings.php:360
     225#: admin/class-simple-gdpr-cookie-compliance-settings.php:378
    222226msgid "Offsets"
    223227msgstr ""
    224228
    225 #: admin/class-simple-gdpr-cookie-compliance-settings.php:363
     229#: admin/class-simple-gdpr-cookie-compliance-settings.php:381
    226230msgid "Top (px)"
    227231msgstr ""
    228232
    229 #: admin/class-simple-gdpr-cookie-compliance-settings.php:367
     233#: admin/class-simple-gdpr-cookie-compliance-settings.php:385
    230234msgid "Right (px)"
    231235msgstr ""
    232236
    233 #: admin/class-simple-gdpr-cookie-compliance-settings.php:371
     237#: admin/class-simple-gdpr-cookie-compliance-settings.php:389
    234238msgid "Bottom (px)"
    235239msgstr ""
    236240
    237 #: admin/class-simple-gdpr-cookie-compliance-settings.php:375
     241#: admin/class-simple-gdpr-cookie-compliance-settings.php:393
    238242msgid "Left (px)"
    239243msgstr ""
    240244
    241 #: admin/class-simple-gdpr-cookie-compliance-settings.php:432
     245#: admin/class-simple-gdpr-cookie-compliance-settings.php:449
    242246msgid "Overlay Color"
    243247msgstr ""
    244248
    245 #: admin/class-simple-gdpr-cookie-compliance-settings.php:435
    246 #: admin/class-simple-gdpr-cookie-compliance-settings.php:445
    247 #: admin/class-simple-gdpr-cookie-compliance-settings.php:471
    248 #: admin/class-simple-gdpr-cookie-compliance-settings.php:493
     249#: admin/class-simple-gdpr-cookie-compliance-settings.php:452
     250#: admin/class-simple-gdpr-cookie-compliance-settings.php:462
     251#: admin/class-simple-gdpr-cookie-compliance-settings.php:488
     252#: admin/class-simple-gdpr-cookie-compliance-settings.php:510
    249253msgid "Background"
    250254msgstr ""
    251255
    252 #: admin/class-simple-gdpr-cookie-compliance-settings.php:442
     256#: admin/class-simple-gdpr-cookie-compliance-settings.php:459
    253257msgid "Notice Color"
    254258msgstr ""
    255259
    256 #: admin/class-simple-gdpr-cookie-compliance-settings.php:449
     260#: admin/class-simple-gdpr-cookie-compliance-settings.php:466
    257261msgid "Cookie Icon"
    258262msgstr ""
    259263
    260 #: admin/class-simple-gdpr-cookie-compliance-settings.php:453
    261 #: admin/class-simple-gdpr-cookie-compliance-settings.php:479
    262 #: admin/class-simple-gdpr-cookie-compliance-settings.php:509
     264#: admin/class-simple-gdpr-cookie-compliance-settings.php:470
     265#: admin/class-simple-gdpr-cookie-compliance-settings.php:496
     266#: admin/class-simple-gdpr-cookie-compliance-settings.php:526
    263267msgid "Text"
    264268msgstr ""
    265269
    266 #: admin/class-simple-gdpr-cookie-compliance-settings.php:457
     270#: admin/class-simple-gdpr-cookie-compliance-settings.php:474
    267271msgid "Link"
    268272msgstr ""
    269273
    270 #: admin/class-simple-gdpr-cookie-compliance-settings.php:461
     274#: admin/class-simple-gdpr-cookie-compliance-settings.php:478
    271275msgid "Link - On Hover"
    272276msgstr ""
    273277
    274 #: admin/class-simple-gdpr-cookie-compliance-settings.php:468
     278#: admin/class-simple-gdpr-cookie-compliance-settings.php:485
    275279msgid "Close Button Color"
    276280msgstr ""
    277281
    278 #: admin/class-simple-gdpr-cookie-compliance-settings.php:475
    279 #: admin/class-simple-gdpr-cookie-compliance-settings.php:497
     282#: admin/class-simple-gdpr-cookie-compliance-settings.php:492
     283#: admin/class-simple-gdpr-cookie-compliance-settings.php:514
    280284msgid "Background - On Hover"
    281285msgstr ""
    282286
    283 #: admin/class-simple-gdpr-cookie-compliance-settings.php:483
    284 #: admin/class-simple-gdpr-cookie-compliance-settings.php:513
     287#: admin/class-simple-gdpr-cookie-compliance-settings.php:500
     288#: admin/class-simple-gdpr-cookie-compliance-settings.php:530
    285289msgid "Text - On Hover"
    286290msgstr ""
    287291
    288 #: admin/class-simple-gdpr-cookie-compliance-settings.php:490
     292#: admin/class-simple-gdpr-cookie-compliance-settings.php:507
    289293msgid "Accept Button Color"
    290294msgstr ""
    291295
    292 #: admin/class-simple-gdpr-cookie-compliance-settings.php:501
     296#: admin/class-simple-gdpr-cookie-compliance-settings.php:518
    293297msgid "Border"
    294298msgstr ""
    295299
    296 #: admin/class-simple-gdpr-cookie-compliance-settings.php:505
     300#: admin/class-simple-gdpr-cookie-compliance-settings.php:522
    297301msgid "Border - On Hover"
    298302msgstr ""
    299303
    300 #: admin/class-simple-gdpr-cookie-compliance-settings.php:532
     304#: admin/class-simple-gdpr-cookie-compliance-settings.php:551
    301305msgid "CSS Codes"
    302306msgstr ""
    … …  
    310314msgstr ""
    311315
    312 #: includes/udp/class-udp-agent.php:160
     316#: includes/udp/class-udp-agent.php:158
    313317msgid "Become a super contributor by sharing your non-sensitive WordPress data. We guarantee no sensitive data is collected."
    314318msgstr ""
    315319
    316 #: includes/udp/class-udp-agent.php:161
     320#: includes/udp/class-udp-agent.php:159
    317321msgid " What data do we collect?"
    318322msgstr ""
    … …  
    323327msgstr ""
    324328
     329#: includes/udp/init.php:105
     330msgid "Allow"
     331msgstr ""
     332
    325333#: includes/udp/init.php:107
    326 msgid "Allow"
    327 msgstr ""
    328 
    329 #: includes/udp/init.php:114
    330334msgid "Do not show again"
    331335msgstr ""
    332336
    333 #: includes/udp/init.php:121
     337#: includes/udp/init.php:109
    334338msgid "Later"
    335339msgstr ""
    336340
    337 #: public/class-simple-gdpr-cookie-compliance-public.php:151
     341#. translators: %s is link to plugin's setting page
     342#: public/class-simple-gdpr-cookie-compliance-public.php:171
    338343msgid "Notice regarding cookie compliance is not set. Go to %s to set the notice."
    339344msgstr ""
    340345
    341 #: public/class-simple-gdpr-cookie-compliance-public.php:151
     346#: public/class-simple-gdpr-cookie-compliance-public.php:172
    342347msgid "Dashboard > Simple GDPR"
    343348msgstr ""

  • simple-gdpr-cookie-compliance/trunk/public/class-simple-gdpr-cookie-compliance-public.php

    r2770232 r2876942  
    33 * The public-facing functionality of the plugin.
    44 *
     5 * @package    Simple_GDPR_Cookie_Compliance
     6 * @subpackage Simple_GDPR_Cookie_Compliance/public
     7 * @author     themebeez <themebeez@gmail.com>
     8 */
     9
     10/**
    511 * Defines the plugin name, version, and two examples hooks for how to
    612 * enqueue the public-facing stylesheet and JavaScript.
    … …  
    3440     *
    3541     * @since    1.0.0
    36      * @param      string    $plugin_name      The name of the plugin.
    37      * @param      string    $version    The version of this plugin.
     42     * @param string $plugin_name The name of the plugin.
     43     * @param string $version The version of this plugin.
    3844     */
    3945    public function __construct( $plugin_name, $version ) {
    4046
    4147        $this->plugin_name = $plugin_name;
    42         $this->version = $version;
    43 
     48        $this->version     = $version;
    4449    }
    4550
    … …  
    6267         * class.
    6368         */
    64         if( is_rtl() ) {
    65 
    66             wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'assets/build/css/simple-gdpr-cookie-compliance-public-rtl.css', array(), $this->version, 'all' );
     69        if ( is_rtl() ) {
     70            wp_enqueue_style(
     71                $this->plugin_name,
     72                plugin_dir_url( __FILE__ ) . 'assets/build/css/simple-gdpr-cookie-compliance-public-rtl.css',
     73                array(),
     74                $this->version,
     75                'all'
     76            );
    6777        } else {
    68 
    69         wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'assets/build/css/simple-gdpr-cookie-compliance-public.css', array(), $this->version, 'all' );
    70 
    71         }
    72 
     78            wp_enqueue_style(
     79                $this->plugin_name,
     80                plugin_dir_url( __FILE__ ) . 'assets/build/css/simple-gdpr-cookie-compliance-public.css',
     81                array(),
     82                $this->version,
     83                'all'
     84            );
     85        }
    7386    }
    7487
    … …  
    92105         */
    93106
    94         wp_register_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'assets/build/js/simple-gdpr-cookie-compliance-public.js', array( 'jquery' ), $this->version, true );
     107        wp_register_script(
     108            $this->plugin_name,
     109            plugin_dir_url( __FILE__ ) . 'assets/build/js/simple-gdpr-cookie-compliance-public.js',
     110            array( 'jquery' ),
     111            $this->version,
     112            true
     113        );
    95114
    96115        $simple_gdpr_cookie_compliance_options = get_option( 'simple_gdpr_cookie_compliance_options' );
    97116
    98         $noticeObjArray = array(
    99             'cookieExpireTime' => (int) $simple_gdpr_cookie_compliance_options['cookie_expire_time'],
     117        $notice_obj_array = array(
     118            'cookieExpireTime' => isset( $simple_gdpr_cookie_compliance_options['cookie_expire_time'] ) ? (int) $simple_gdpr_cookie_compliance_options['cookie_expire_time'] : 0,
    100119        );
    101120
    102121        if ( is_multisite() ) {
    103             $noticeObjArray['isMultisite'] = true;
     122            $notice_obj_array['isMultisite'] = true;
    104123            if ( SUBDOMAIN_INSTALL === false ) {
    105                 $noticeObjArray['subdomainInstall'] = false;
    106                 $noticeObjArray['path'] = get_site()->path;
     124                $notice_obj_array['subdomainInstall'] = false;
     125                $notice_obj_array['path']            = get_site()->path;
    107126            } else {
    108                 $noticeObjArray['subdomainInstall'] = true;
     127                $notice_obj_array['subdomainInstall'] = true;
    109128            }
    110129        } else {
    111             $noticeObjArray['isMultisite'] = false;
    112         }
    113 
    114         wp_localize_script( $this->plugin_name, 'simpleGDPRCCJsObj', $noticeObjArray );
     130            $notice_obj_array['isMultisite'] = false;
     131        }
     132
     133        wp_localize_script( $this->plugin_name, 'simpleGDPRCCJsObj', $notice_obj_array );
    115134
    116135        wp_enqueue_script( $this->plugin_name );
    117 
    118136    }
    119137
    … …  
    141159        $args = array(
    142160            'enable_bg_overlay' => false,
    143             'show_cookie_icon' => false,
    144             'notice' => '',
    145             'btn_title' => '',
    146             'show_close_btn' => false,
    147             'link_type' => 'no_link'
    148         ); 
     161            'show_cookie_icon'  => false,
     162            'notice'            => '',
     163            'btn_title'         => '',
     164            'show_close_btn'    => false,
     165            'link_type'         => 'no_link',
     166        );
    149167
    150168        if ( is_admin() || current_user_can( 'manage_options' ) ) {
    151             $args['notice'] = sprintf( __( 'Notice regarding cookie compliance is not set. Go to %s to set the notice.', 'simple-gdpr-cookie-compliance' ), '<a href="' . esc_url( admin_url( 'admin.php?page=simple-gdpr-cookie-compliance' ) ) . '">' . __( 'Dashboard > Simple GDPR', 'simple-gdpr-cookie-compliance' ) . '</a>' );
     169            $args['notice'] = sprintf(
     170                /* translators: %s is link to plugin's setting page*/
     171                __( 'Notice regarding cookie compliance is not set. Go to %s to set the notice.', 'simple-gdpr-cookie-compliance' ),
     172                '<a href="' . esc_url( admin_url( 'admin.php?page=simple-gdpr-cookie-compliance' ) ) . '">' . __( 'Dashboard > Simple GDPR', 'simple-gdpr-cookie-compliance' ) . '</a>'
     173            );
    152174        } else {
    153175            $args['notice'] = __( 'Our website uses cookies to provide you the best experience. However, by continuing to use our website, you agree to our use of cookies. For more information, read our <a href="#">Cookie Policy</a>.', 'simple-gdpr-cookie-compliance' );
    … …  
    162184                $args['link_type'] = $options['link']['link_type'];
    163185                switch ( $options['link']['link_type'] ) {
    164                     case 'custom_url' :
    165                         if( isset( $options['link']['link_title'] ) ) {
     186                    case 'custom_url':
     187                        if ( isset( $options['link']['link_title'] ) ) {
    166188                            $args['link_title'] = $options['link']['link_title'];
    167189                        }
    … …  
    176198                        }
    177199                        break;
    178                     case 'page' :
     200                    case 'page':
    179201                        if ( isset( $options['link']['page'] ) ) {
    180202                            $args['page_title'] = get_the_title( absint( $options['link']['page'] ) );
    181                             $args['page_link'] = get_the_permalink( absint( $options['link']['page'] ) );
     203                            $args['page_link']  = get_the_permalink( absint( $options['link']['page'] ) );
    182204                        }
    183205                        if ( isset( $options['link']['before_link'] ) ) {
    … …  
    188210                        }
    189211                        break;
    190                     default :
     212                    default:
    191213                        break;
    192214                }
    … …  
    228250     *
    229251     * @since    1.0.4
     252     *
     253     * @param array $options Settings.
     254     * @return string $class CSS classes.
    230255     */
    231256    private function get_wrapper_css_class( $options ) {
    … …  
    238263
    239264                switch ( $options['style']['type'] ) {
    240                     case 'full_width' :
     265                    case 'full_width':
    241266                        if ( isset( $options['style']['fullwidth_position'] ) ) {
    242                             $class = 's-gdpr-c-c-fullwidth ';
     267                            $class              = 's-gdpr-c-c-fullwidth ';
    243268                            $fullwidth_position = $options['style']['fullwidth_position'];
    244                             if ( $fullwidth_position == 'top' ) {
     269                            if ( 'top' === $fullwidth_position ) {
    245270                                $class .= 's-gdpr-c-c-fullwidth-top';
    246271                            } else {
    … …  
    249274                        }
    250275                        break;
    251                     case 'custom_width' :
     276                    case 'custom_width':
    252277                        if ( isset( $options['style']['customwidth_position'] ) ) {
    253                             $class = 's-gdpr-c-c-customwidth ';
     278                            $class                = 's-gdpr-c-c-customwidth ';
    254279                            $customwidth_position = $options['style']['customwidth_position'];
    255                             if ( $customwidth_position == 'top_left' ) {
    256                                 $class .= 's-gdpr-c-c-customwidth-top-left';
    257                             } elseif ( $customwidth_position == 'top_center' ) {
    258                                 $class .= 's-gdpr-c-c-customwidth-top-center';
    259                             } elseif ( $customwidth_position == 'top_right' ) {
    260                                 $class .= 's-gdpr-c-c-customwidth-top-right';
    261                             } elseif ( $customwidth_position == 'bottom_left' ) {
    262                                 $class .= 's-gdpr-c-c-customwidth-bottom-left';
    263                             } elseif ( $customwidth_position == 'bottom_center' ) {
    264                                 $class .= 's-gdpr-c-c-customwidth-bottom-center';
    265                             } else {
    266                                 $class .= 's-gdpr-c-c-customwidth-bottom-right';
     280                            switch ( $customwidth_position ) {
     281                                case 'top_left':
     282                                    $class .= 's-gdpr-c-c-customwidth-top-left';
     283                                    break;
     284                                case 'top_center':
     285                                    $class .= 's-gdpr-c-c-customwidth-top-center';
     286                                    break;
     287                                case 'top_right':
     288                                    $class .= 's-gdpr-c-c-customwidth-top-right';
     289                                    break;
     290                                case 'bottom_left':
     291                                    $class .= 's-gdpr-c-c-customwidth-bottom-left';
     292                                    break;
     293                                case 'bottom_center':
     294                                    $class .= 's-gdpr-c-c-customwidth-bottom-center';
     295                                    break;
     296                                case 'bottom_right':
     297                                    $class .= 's-gdpr-c-c-customwidth-bottom-right';
     298                                    break;
     299                                default:
     300                                    break;
    267301                            }
    268302                        }
    269303                        break;
    270                     default :
     304                    default:
    271305                        $class = 's-gdpr-c-c-pop-up';
    272306                }
    273307            }
    274308
    275             if ( isset( $options['show_close_btn'] ) && $options['show_close_btn'] == false ) {
     309            if (
     310                isset( $options['show_close_btn'] ) &&
     311                false === $options['show_close_btn']
     312            ) {
    276313                $class .= ' s-gdpr-c-c-no-close-btn';
    277314            }
    278315
    279             if ( isset( $options['show_cookie_icon'] ) && $options['show_cookie_icon'] == false ) {
     316            if (
     317                isset( $options['show_cookie_icon'] ) &&
     318                false === $options['show_cookie_icon']
     319            ) {
    280320                $class .= ' s-gdpr-c-c-no-cookie-icon';
    281321            }
    … …  
    409449            // Dynamic CSS for pop-up notice.
    410450
    411             if ( $dynamic_options['style']['type'] == 'pop_up' ) {
    412 
    413                 if ( isset( $dynamic_options['style']['enable_bg_overlay'] ) && $dynamic_options['style']['enable_bg_overlay'] == true ) {
     451            if ( 'pop_up' === $dynamic_options['style']['type'] ) {
     452
     453                if (
     454                    isset( $dynamic_options['style']['enable_bg_overlay'] ) &&
     455                    true === $dynamic_options['style']['enable_bg_overlay']
     456                ) {
    414457                    $css .= '
    415458                    .s-gdpr-c-c-bg-overlay {
    … …  
    445488                        .s-gdpr-c-c-pop-up {
    446489                            width: ' . $width . 'px;
    447                         }'; 
     490                        }';
    448491                }
    449492
    … …  
    476519                }
    477520
    478                 if ( isset( $dynamic_options['style']['enable_bg_overlay'] ) && isset( $dynamic_options['color']['notice_bg_overlay_color'] ) ) {
     521                if (
     522                    isset( $dynamic_options['style']['enable_bg_overlay'] ) &&
     523                    isset( $dynamic_options['color']['notice_bg_overlay_color'] )
     524                ) {
    479525                    $css .= '
    480526                        .s-gdpr-c-c-bg-overlay {
    481527                            background-color: ' . $dynamic_options['color']['notice_bg_overlay_color'] . ';
    482                         }';
    483                 }
    484             }
    485 
     528                        }';
     529                }
     530            }
    486531
    487532            // Dynamic CSS for full-width notice.
    488533
    489             if ( $dynamic_options['style']['type'] == 'full_width' ) {
     534            if ( 'full_width' === $dynamic_options['style']['type'] ) {
    490535
    491536                if ( isset( $dynamic_options['style']['fullwidth_position'] ) ) {
    … …  
    589634                        }';
    590635
    591                     if ( $dynamic_options['style']['fullwidth_position'] == 'top' ) {
     636                    if ( 'top' === $dynamic_options['style']['fullwidth_position'] ) {
    592637                        $css .= '
    593638                            .s-gdpr-c-c-fullwidth-top {
    … …  
    597642                    }
    598643
    599                     if ( $dynamic_options['style']['fullwidth_position'] == 'bottom' ) {
     644                    if ( 'bottom' === $dynamic_options['style']['fullwidth_position'] ) {
    600645                        $css .= '
    601646                            .s-gdpr-c-c-fullwidth-bottom {
    … …  
    607652            }
    608653
    609 
    610654            // Dynamic CSS for custom-width notice.
    611655
    612             if ( $dynamic_options['style']['type'] == 'custom_width' ) {
     656            if ( 'custom_width' === $dynamic_options['style']['type'] ) {
    613657
    614658                $width = null;
    … …  
    621665                        .s-gdpr-c-c-customwidth {
    622666                            width: ' . $width . 'px;
    623                         }'; 
     667                        }';
    624668                }
    625669
    … …  
    640684                if ( isset( $dynamic_options['style']['customwidth_position'] ) ) {
    641685
    642                     if ( $dynamic_options['style']['customwidth_position'] == 'top_left' && isset( $dynamic_options['style']['top_offset'] ) && isset( $dynamic_options['style']['left_offset'] ) ) {
     686                    if (
     687                        'top_left' === $dynamic_options['style']['customwidth_position'] &&
     688                        isset( $dynamic_options['style']['top_offset'] ) &&
     689                        isset( $dynamic_options['style']['left_offset'] )
     690                    ) {
    643691                        $css .= '
    644692                            .s-gdpr-c-c-customwidth-top-left {
    … …  
    650698                    }
    651699
    652                     if ( $dynamic_options['style']['customwidth_position'] == 'top_center' && isset( $dynamic_options['style']['top_offset'] ) ) {
     700                    if (
     701                        'top_center' === $dynamic_options['style']['customwidth_position'] &&
     702                        isset( $dynamic_options['style']['top_offset'] )
     703                    ) {
    653704                        $css .= '
    654705                            .s-gdpr-c-c-customwidth-top-center {
    … …  
    660711                    }
    661712
    662                     if ( $dynamic_options['style']['customwidth_position'] == 'top_right' && isset( $dynamic_options['style']['top_offset'] ) && isset( $dynamic_options['style']['right_offset'] ) ) {
     713                    if (
     714                        'top_right' === $dynamic_options['style']['customwidth_position'] &&
     715                        isset( $dynamic_options['style']['top_offset'] ) &&
     716                        isset( $dynamic_options['style']['right_offset'] )
     717                    ) {
    663718                        $css .= '
    664719                            .s-gdpr-c-c-customwidth-top-right {
    … …  
    670725                    }
    671726
    672                     if ( $dynamic_options['style']['customwidth_position'] == 'bottom_left' && isset( $dynamic_options['style']['bottom_offset'] ) && isset( $dynamic_options['style']['left_offset'] ) ) {
     727                    if (
     728                        'bottom_left' === $dynamic_options['style']['customwidth_position'] &&
     729                        isset( $dynamic_options['style']['bottom_offset'] ) &&
     730                        isset( $dynamic_options['style']['left_offset'] )
     731                    ) {
    673732                        $css .= '
    674733                            .s-gdpr-c-c-customwidth-bottom-left {
    … …  
    680739                    }
    681740
    682                     if ( $dynamic_options['style']['customwidth_position'] == 'bottom_center' && isset( $dynamic_options['style']['bottom_offset'] ) ) {
     741                    if (
     742                        'bottom_center' === $dynamic_options['style']['customwidth_position'] &&
     743                        isset( $dynamic_options['style']['bottom_offset'] )
     744                    ) {
    683745                        $css .= '
    684746                            .s-gdpr-c-c-customwidth-bottom-center {
    … …  
    690752                    }
    691753
    692                     if ( $dynamic_options['style']['customwidth_position'] == 'bottom_right' && isset( $dynamic_options['style']['bottom_offset'] ) && isset( $dynamic_options['style']['right_offset'] ) ) {
     754                    if (
     755                        'bottom_right' === $dynamic_options['style']['customwidth_position'] &&
     756                        isset( $dynamic_options['style']['bottom_offset'] ) &&
     757                        isset( $dynamic_options['style']['right_offset'] )
     758                    ) {
    693759                        $css .= '
    694760                            .s-gdpr-c-c-customwidth-bottom-right {
    … …  
    703769        }
    704770
    705 
    706771        // Add custom CSS from custom css option.
    707772
    … …  
    711776
    712777        // Allow CSS to be filtered.
    713         $css = apply_filters( 'simple_gdpr_cookie_compliance_dynamic_css', $css ); 
     778        $css = apply_filters( 'simple_gdpr_cookie_compliance_dynamic_css', $css );
    714779
    715780        // Minify the CSS code.
    … …  
    723788     *
    724789     * @since    1.0.4
     790     *
     791     * @param string $css CSS rules.
     792     * @return string $css Trimmed CSS rules.
    725793     */
    726794    private function minify_css( $css ) {

  • simple-gdpr-cookie-compliance/trunk/public/partials/simple-gdpr-cookie-compliance-public-display.php

    r2662024 r2876942  
    11<?php
    2 
    32/**
    43 * Provide a public-facing view for the plugin
    … …  
    1716}
    1817
    19 if ( $args['enable_bg_overlay'] == true ) {
     18if (
     19    isset( $args['enable_bg_overlay'] ) &&
     20    true === $args['enable_bg_overlay']
     21) {
    2022    ?>
    2123    <div id="s-gdpr-c-c-bg-overlay" class="s-gdpr-c-c-bg-overlay"></div>
    … …  
    2325}
    2426?>
    25 <div class="sgcc-main-wrapper hidden <?php echo ( $args['wrapper_class'] ) ? esc_attr( $args['wrapper_class'] ) : ''; ?>">
    26     <div class="sgcc-cookies">
    27         <?php
    28         if ( $args['show_cookie_icon'] && $args['notice_type'] != 'full_width' ) {
    29             ?>
    30             <span class="cookie-icon"><i class="sgcc sgcc-icon-cookie"></i></span>
    31             <?php
    32         }
    33         ?>
    34         <div class="sgcc-notice-content">
    35             <?php
    36             if ( $args['notice'] ) {
     27<div class="sgcc-main-wrapper hidden <?php echo ( isset( $args['wrapper_class'] ) ) ? esc_attr( $args['wrapper_class'] ) : ''; ?>">
     28    <div class="sgcc-cookies">
     29        <?php
     30        if (
     31            (
     32                isset( $args['show_cookie_icon'] ) &&
     33                true === $args['show_cookie_icon']
     34            ) &&
     35            (
     36                isset( $args['notice_type'] ) &&
     37                'full_width' !== $args['notice_type']
     38            )
     39        ) {
     40            ?>
     41            <span class="cookie-icon"><i class="sgcc sgcc-icon-cookie"></i></span>
     42            <?php
     43        }
     44        ?>
     45        <div class="sgcc-notice-content">
     46            <?php
     47            if ( isset( $args['notice'] ) ) {
    3748
    38                 if ( $args['show_cookie_icon'] && $args['notice_type'] == 'full_width' ) {
    39                     ?>
    40                     <span class="cookie-icon"><i class="sgcc sgcc-icon-cookie"></i></span>
    41                     <?php
    42                 }
    43                 ?>
    44                 <div class="message-block">
    45                     <p>
    46                         <?php
    47                         if ( $args['link_type'] == 'no_link' ) {
    48                             echo wp_kses_post( $args['notice'] );
    49                         } else {
    50                             $link_title = '';
     49                if (
     50                    (
     51                        isset( $args['show_cookie_icon'] ) &&
     52                        true === $args['show_cookie_icon']
     53                    ) &&
     54                    (
     55                        isset( $args['notice_type'] ) &&
     56                        'full_width' === $args['notice_type']
     57                    )
     58                ) {
     59                    ?>
     60                    <span class="cookie-icon"><i class="sgcc sgcc-icon-cookie"></i></span>
     61                    <?php
     62                }
     63                ?>
     64                <div class="message-block">
     65                    <p>
     66                        <?php
     67                        if (
     68                            isset( $args['link_type'] ) &&
     69                            'no_link' === $args['link_type']
     70                        ) {
     71                            echo wp_kses_post( $args['notice'] );
     72                        } else {
     73                            $link_title = '';
    5174
    52                             $link_url = '';
     75                            $link_url = '';
    5376
    54                             $before_link = isset( $args['before_link'] ) ? esc_html( $args['before_link'] ) : '';
     77                            $before_link = isset( $args['before_link'] ) ? esc_html( $args['before_link'] ) : '';
    5578
    56                             $after_link = isset( $args['after_link'] ) ? esc_html( $args['after_link'] ) : '';
     79                            $after_link = isset( $args['after_link'] ) ? esc_html( $args['after_link'] ) : '';
    5780
    58                             if( $args['link_type'] == 'custom_url' ) {
     81                            if (
     82                                isset( $args['link_type'] ) &&
     83                                'custom_url' === $args['link_type']
     84                            ) {
    5985
    60                                 $link_title = isset( $args['link_title'] ) ? $args['link_title'] : '';
    61                                 $link_url = isset( $args['link_url'] ) ? $args['link_url'] : '';
    62                             }
     86                                $link_title = isset( $args['link_title'] ) ? $args['link_title'] : '';
     87                                $link_url  = isset( $args['link_url'] ) ? $args['link_url'] : '';
     88                            }
    6389
    64                             if ( $args['link_type'] == 'page' ) {
    65                                 $link_title = isset( $args['page_title'] ) ? $args['page_title'] : '';
    66                                 $link_url = isset( $args['page_link'] ) ? $args['page_link'] : '';
    67                             }
     90                            if (
     91                                isset( $args['link_type'] ) &&
     92                                'page' === $args['link_type']
     93                            ) {
     94                                $link_title = isset( $args['page_title'] ) ? $args['page_title'] : '';
     95                                $link_url   = isset( $args['page_link'] ) ? $args['page_link'] : '';
     96                            }
    6897
    69                             $link = $before_link . ' ';
    70                             $link .= '<a href="' . esc_url( $link_url ) . '" ' . ( ( isset( $args['show_in_new_tab'] ) && $args['show_in_new_tab'] == true ) ? 'target="_blank"' : 'target="_self"' ) . '>' . esc_html( $link_title ) . ' </a>';
    71                             $link .= ' ' . $after_link;
     98                            $message_link = $before_link . ' ';
     99                            $message_link .= '<a href="' . esc_url( $link_url ) . '" ' . ( ( isset( $args['show_in_new_tab'] ) && true === $args['show_in_new_tab'] ) ? 'target="_blank"' : 'target="_self"' ) . '>' . esc_html( $link_title ) . ' </a>';
     100                            $message_link .= ' ' . $after_link;
    72101
    73                             echo wp_kses_post( $args['notice'] ) . ' ' . $link;
    74                         }
    75                         ?>
     102                            echo wp_kses_post( $args['notice'] . ' ' . $message_link );
     103                        }
     104                        ?>
    76105                    </p>
    77106                </div>
    78107                <?php
    79108            }
    80             if ( $args['btn_title'] ) {
    81                 ?> 
     109            if ( isset( $args['btn_title'] ) && ! empty( $args['btn_title'] ) ) {
     110                ?>
    82111                <p class="cookie-compliance-button-block">
    83112                    <button id="sgcc-accept" class="close-sgcc cookie-compliance-button">
    … …  
    90119        </div>
    91120        <?php
    92         if ( $args['show_close_btn'] ) {
    93             ?>
    94             <span id="close-sgcc" class="close close-sgcc"><i class="sgcc sgcc-icon-close"></i></span>
    95             <?php
    96         }
     121        if (
     122            isset( $args['show_close_btn'] ) &&
     123            true === $args['show_close_btn']
     124        ) {
     125            ?>
     126            <span id="close-sgcc" class="close close-sgcc"><i class="sgcc sgcc-icon-close"></i></span>
     127            <?php
     128        }
    97129        ?>
    98     </div>
     130    </div>
    99131</div>
    100 

  • simple-gdpr-cookie-compliance/trunk/simple-gdpr-cookie-compliance.php

    r2874093 r2876942  
    11<?php
    2 
    32/**
     3 * Simple GDPR Cookie Compliance
     4 *
     5 * @link              https://themebeez.com/
     6 * @since             1.0.0
     7 * @package           Simple_GDPR_Cookie_Compliance
     8 *
    49 * Plugin Name:       Simple GDPR Cookie Compliance
    510 * Plugin URI:        https://themebeez.com/plugins/simple-gdpr-cookie-compliance
    611 * Description:       Simple GDPR Cookie Compliance is a simple notifier to inform users that your site uses of cookies and show your complies with EU GDPR cookie law and CCPA regulations.
    7  * Version:           1.1.2
     12 * Version:           1.1.3
    813 * Author:            themebeez
    914 * Author URI:        https://themebeez.com/
    … …  
    2429 * Rename this for your plugin and update it as you release new versions.
    2530 */
    26 define( 'SIMPLE_GDPR_COOKIE_COMPLIANCE_VERSION', '1.1.2' );
     31define( 'SIMPLE_GDPR_COOKIE_COMPLIANCE_VERSION', '1.1.3' );
    2732define( 'SIMPLE_GDPR_COOKIE_COMPLIANCE_BASENAME', plugin_basename( __FILE__ ) );
    2833
    … …  
    3641
    3742    $activator = new Simple_GDPR_Cookie_Compliance_Activator();
    38    
    39     $activator -> activate();
     43
     44    $activator->activate();
    4045}
    4146
    … …  
    4752
    4853    require_once plugin_dir_path( __FILE__ ) . 'includes/class-simple-gdpr-cookie-compliance-deactivator.php';
    49    
     54
    5055    Simple_GDPR_Cookie_Compliance_Deactivator::deactivate();
    5156}
    … …  
    6974 * @since    1.0.0
    7075 */
    71 function run_simple_gdpr_cookie_compliance() {
     76function simple_gdpr_cookie_compliance_start() {
    7277
    7378    $plugin = new Simple_GDPR_Cookie_Compliance();
    7479    $plugin->run();
    7580}
    76 run_simple_gdpr_cookie_compliance();
     81simple_gdpr_cookie_compliance_start();
Note: See TracChangeset for help on using the changeset viewer.