WordPress.org
Get WordPress

Plugin Directory

Changeset 3368511 for cookieadmin


Ignore:
Timestamp:
09/26/2025 01:40:10 PM (6 months ago)
Author:
softaculous
Message:

New Version 1.1.1

Location:
cookieadmin/trunk
Files:
1 added
1 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • cookieadmin/trunk/assets/cookie/template.json

    r3353807 r3368511  
    1414        "down": "<div class='cookieadmin_cookie_modal'> <div class='cookieadmin_mod_head'> <span class='cookieadmin_preference_title' id='cookieadmin_preference_title'></span> <button class='cookieadmin_close_pref'>&#10006;</button>  </div> <div class='cookieadmin_details_wrapper'> <div class='cookieadmin_preference_details' role='dialog' aria-modal='true' aria-label='[[cookie_preferences]]'> <div id='cookieadmin_preference' class='cookieadmin_preference'> </div> </div> <div id='cookieadmin_wrapper'> <div class='cookieadmin_types' role='region' aria-labelledby='cookieadmin-necessary-heading'> <div class='cookieadmin_header'> <span> <span class='cookieadmin_show_pref_cookies' id='cookieadmin-necessary-container'>&#9658;</span> <label class='stitle' id='cookieadmin-necessary-heading' for='cookieadmin-necessary'>[[necessary_cookies]]</label> <label class='cookieadmin_remark cookieadmin_act'>[[remark_standard]]</label> </span> <label class='cookieadmin_toggle_disabled' aria-labelledby='cookieadmin-necessary-heading'>  <input type='checkbox' id='cookieadmin-necessary' disabled> <span class='cookieadmin_slider'></span> </label> </div> <div class='cookieadmin_desc'> [[necessary_cookies_desc]] </div> <div class='cookieadmin-nece-cookies cookieadmin-necessary'>[[none]]</div> </div> <div class='cookieadmin_types' role='region' aria-labelledby='cookieadmin-functional-heading'> <div class='cookieadmin_header'> <span> <span class='cookieadmin_show_pref_cookies' id='cookieadmin-functional-container'>&#9658;</span> <label class='stitle' id='cookieadmin-functional-heading' for='cookieadmin-functional'>[[functional_cookies]]</label> <label class='cookieadmin_remark'>[[remark]]</label> </span> <label class='cookieadmin_toggle' aria-labelledby='cookieadmin-functional-heading'>  <input type='checkbox' id='cookieadmin-functional'>  <span class='cookieadmin_slider'></span> </label> </div> <div class='cookieadmin_desc'> [[functional_cookies_desc]] </div> <div class='cookieadmin-nece-cookies cookieadmin-functional'>[[none]]</div> </div> <div class='cookieadmin_types' role='region' aria-labelledby='cookieadmin-analytics-heading'> <div class='cookieadmin_header'> <span> <span class='cookieadmin_show_pref_cookies' id='cookieadmin-analytics-container'>&#9658;</span> <label class='stitle' id='cookieadmin-analytics-heading' for='cookieadmin-analytics'>[[analytical_cookies]]</label> <label class='cookieadmin_remark'>[[remark]]</label> </span> <label class='cookieadmin_toggle' aria-labelledby='cookieadmin-analytics-heading'>  <input type='checkbox' id='cookieadmin-analytics'>  <span class='cookieadmin_slider'></span> </label> </div> <div class='cookieadmin_desc'> [[analytical_cookies_desc]] </div> <div class='cookieadmin-nece-cookies cookieadmin-analytics'>[[none]]</div> </div> <div class='cookieadmin_types' role='region' aria-labelledby='cookieadmin-marketing-heading'> <div class='cookieadmin_header'> <span> <span class='cookieadmin_show_pref_cookies' id='cookieadmin-marketing-container'>&#9658;</span> <label class='stitle' id='cookieadmin-marketing-heading' for='cookieadmin-marketing'>[[advertisement_cookies]]</label> <label class='cookieadmin_remark'>[[remark]]</label> </span> <label class='cookieadmin_toggle' aria-labelledby='cookieadmin-marketing-heading'>  <input type='checkbox' id='cookieadmin-marketing'>  <span class='cookieadmin_slider'></span> </label> </div> <div class='cookieadmin_desc'> [[advertisement_cookies_desc]] </div> <div class='cookieadmin-nece-cookies cookieadmin-marketing'>[[none]]</div> </div> <div class='cookieadmin_types' role='region' aria-labelledby='cookieadmin-unclassified-heading' hidden> <div class='cookieadmin_header'> <span> <span class='cookieadmin_show_pref_cookies' id='un_c-container'>&#9658;</span> <label class='stitle' id='cookieadmin-unclassified-heading' for='cookieadmin-unclassified'>[[unclassified_cookies]]</label> <label class='cookieadmin_remark'>[[remark]]</label> </span> </div> <div class='cookieadmin_desc'> [[unclassified_cookies_desc]] </div> <div class='cookieadmin-nece-cookies un_c'>[[none]]</div> </div> </div> </div> <div class='cookieadmin_modal_footer'> <button class='cookieadmin_btn cookieadmin_reject_btn' id='cookieadmin_reject_modal_button'>Reject All</button> <button class='cookieadmin_btn cookieadmin_save_btn' id='cookieadmin_prf_modal_button'>Save My Preferences</button> <button class='cookieadmin_btn cookieadmin_accept_btn' id='cookieadmin_accept_modal_button'>Accept All</button> [[powered_by_html]]</div> </div>"
    1515    },
    16     "cookieadmin_reconsent":"<div> <button class='cookieadmin_re_consent'> <img class='cookieadmin_reconsent_img' style='width:40px;' src='[[plugin_url]]assets/images/cookieadmin_icon.svg' alt='[[reconsent]]'> </button> </div>"
     16    "cookieadmin_reconsent":"<div> <button class='cookieadmin_re_consent'> <img class='cookieadmin_reconsent_img' height='40' width='40' src='[[plugin_url]]assets/images/cookieadmin_icon.svg' alt='[[reconsent]]'> </button> </div>"
    1717}

  • cookieadmin/trunk/cookieadmin.php

    r3353807 r3368511  
    44Plugin URI: https://cookieadmin.net
    55Description: CookieAdmin provides easy to configure cookie consent banner with GDPR and CCPA law support.
    6 Version: 1.1.0
     6Version: 1.1.1
    77Author: Softaculous
    88Author URI: https://www.softaculous.com
    … …  
    3838define('COOKIEADMIN_BASE', plugin_basename(COOKIEADMIN_FILE));
    3939define('COOKIEADMIN_DIR', plugin_dir_path(__FILE__));
    40 define('COOKIEADMIN_VERSION', '1.1.0');
     40define('COOKIEADMIN_VERSION', '1.1.1');
    4141define('COOKIEADMIN_URL', plugins_url('', COOKIEADMIN_FILE));
    4242define('COOKIEADMIN_PLUGIN_URL', plugin_dir_url(__FILE__));
    … …  
    5050    load_plugin_textdomain( 'cookieadmin', false, dirname(plugin_basename( __FILE__ ) ) . '/languages/');
    5151}
    52 
    53 add_action( 'plugins_loaded', 'cookieadmin_load_textdomain' );
     52add_action( 'plugins_loaded', 'cookieadmin_load_textdomain', 9 );
    5453
    5554include_once(dirname(__FILE__).'/init.php');

  • cookieadmin/trunk/includes/admin.php

    r3353807 r3368511  
    8484        if(defined('COOKIEADMIN_PREMIUM')){
    8585            add_submenu_page('cookieadmin', __('Consent Logs', 'cookieadmin'), __('Consent Logs', 'cookieadmin'), $capability, 'cookieadmin-consent-logs', '\CookieAdminPro\Admin::show_consent_logs');
    86            
    87             add_submenu_page('cookieadmin', __('License', 'cookieadmin'), __('License', 'cookieadmin'), $capability, 'cookieadmin-license', '\CookieAdminPro\License::cookieadmin_show_license');
    88         }else{
    89            
     86
     87            if(!defined('SITEPAD')){
     88                add_submenu_page('cookieadmin', __('License', 'cookieadmin'), __('License', 'cookieadmin'), $capability, 'cookieadmin-license', '\CookieAdminPro\License::cookieadmin_show_license');
     89            }
     90        }else if(!defined('SITEPAD')){
    9091            // Go Pro link
    9192            add_submenu_page('cookieadmin', __('CookieAdmin Go Pro', 'cookieadmin'), __('Go Pro', 'cookieadmin'), $capability, COOKIEADMIN_PRO_URL);
    … …  
    121122        global $cookieadmin_lang, $cookieadmin_error, $cookieadmin_msg;
    122123       
    123         echo '</div>
    124         <div class="cookieadmin-footer">';
    125 
    126         if(empty($no_twitter)){
    127        
    128             echo '<br/><div class="cookieadmin-twitter">
    129                 <span>'.esc_html__('Share with your followers', 'cookieadmin').'</span><br /><br />
    130                 <form method="get" action="https://twitter.com/intent/tweet" id="tweet" onsubmit="return cookieadmin_dotweet(this);">
    131                     <textarea name="text" cols="60" row="4" style="resize:none;">'.esc_html__('I easily manage Cookie Consent Banner on my #WordPress site using @cookieadmin', 'cookieadmin').'</textarea>
    132                     <br />
    133                     <input type="submit" value="Tweet!" class="cookieadmin-btn cookieadmin-btn-secondary" onsubmit="return false;" id="twitter-btn" style="margin-top:7px;"/>   
    134                 </form>             
    135             </div>
    136             <br/>
    137             <hr>';
    138        
    139         }
    140        
    141         echo '<a href="'.esc_url(COOKIEADMIN_WWW_URL).'" target="_blank">CookieAdmin</a><span> v'.esc_html(COOKIEADMIN_VERSION).esc_html__(' You can report any bugs ', 'cookieadmin').'</span><a href="http://wordpress.org/support/plugin/cookieadmin" target="_blank">'.esc_html__('here', 'cookieadmin').'</a>. ';
    142        
    143         if(defined('COOKIEADMIN_PREMIUM')){
    144             echo 'Or email us at <a href="mailto:support@cookieadmin.net">support@cookieadmin.net</a>';
    145         }
    146        
    147         echo '</div>
    148         </div>';
     124        if(!defined('SITEPAD')){
     125            echo '</div>
     126            <div class="cookieadmin-footer">';
     127
     128            if(empty($no_twitter)){
     129       
     130                echo '<br/><div class="cookieadmin-twitter">
     131                    <span>'.esc_html__('Share with your followers', 'cookieadmin').'</span><br /><br />
     132                    <form method="get" action="https://twitter.com/intent/tweet" id="tweet" onsubmit="return cookieadmin_dotweet(this);">
     133                        <textarea name="text" cols="60" row="4" style="resize:none;">'.esc_html__('I easily manage Cookie Consent Banner on my #WordPress site using @cookieadmin', 'cookieadmin').'</textarea>
     134                        <br />
     135                        <input type="submit" value="Tweet!" class="cookieadmin-btn cookieadmin-btn-secondary" onsubmit="return false;" id="twitter-btn" style="margin-top:7px;"/>   
     136                    </form>             
     137                </div>
     138                <br/>
     139                <hr>';
     140       
     141            }
     142       
     143            echo '<a href="'.esc_url(COOKIEADMIN_WWW_URL).'" target="_blank">CookieAdmin</a><span> v'.esc_html(COOKIEADMIN_VERSION).esc_html__(' You can report any bugs ', 'cookieadmin').'</span><a href="http://wordpress.org/support/plugin/cookieadmin" target="_blank">'.esc_html__('here', 'cookieadmin').'</a>. ';
     144       
     145            if(defined('COOKIEADMIN_PREMIUM')){
     146                echo 'Or email us at <a href="mailto:support@cookieadmin.net">support@cookieadmin.net</a>';
     147            }
     148       
     149            echo '</div>
     150            </div>';
     151        }
    149152    }
    150153   
    … …  
    759762    static function cookieadmin_save_settings(){
    760763       
    761         global $cookieadmin_lang, $cookieadmin_error, $cookieadmin_msg, $cookieadmin_settings;
     764        global $cookieadmin_lang, $cookieadmin_error, $cookieadmin_msg, $cookieadmin_settings, $cookieadmin_policies;
    762765   
    763766        // debug_print_backtrace();die;
    … …  
    823826        $setting['cookieadmin_notice_title_color'] = !empty($_REQUEST['cookieadmin_notice_title_color']) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_notice_title_color'])) : (!empty($policy[$law]['cookieadmin_notice_title_color']) ? $policy[$law]['cookieadmin_notice_title_color'] : '#000000');
    824827       
    825         $setting['cookieadmin_notice'] = !empty($_REQUEST['cookieadmin_notice']) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_notice'])) : $policy[$law]['cookieadmin_notice'];
     828        $setting['cookieadmin_notice'] = !empty($_REQUEST['cookieadmin_notice']) ? wp_kses(wp_unslash($_REQUEST['cookieadmin_notice']), cookieadmin_kses_allowed_html()) : $policy[$law]['cookieadmin_notice'];
    826829        $setting['cookieadmin_notice_color'] = !empty($_REQUEST['cookieadmin_notice_color']) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_notice_color'])) : (!empty($policy[$law]['cookieadmin_notice_color']) ? $policy[$law]['cookieadmin_notice_color'] : '#000000');
    827830       
    … …  
    848851        $setting['cookieadmin_preference_title_color'] = !empty($_REQUEST['cookieadmin_preference_title_color']) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_preference_title_color'])) : (!empty($policy[$law]['cookieadmin_preference_title_color']) ? $policy[$law]['cookieadmin_preference_title_color'] : '#000000');
    849852       
    850         $setting['cookieadmin_preference'] = !empty($_REQUEST['cookieadmin_preference']) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_preference'])) : $policy[$law]['cookieadmin_preference'];
     853        $setting['cookieadmin_preference'] = !empty($_REQUEST['cookieadmin_preference']) ? wp_kses(wp_unslash($_REQUEST['cookieadmin_preference']), cookieadmin_kses_allowed_html()) : $policy[$law]['cookieadmin_preference'];
    851854        $setting['cookieadmin_details_wrapper_color'] = !empty($_REQUEST['cookieadmin_details_wrapper_color']) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_details_wrapper_color'])) : (!empty($policy[$law]['cookieadmin_details_wrapper_color']) ? $policy[$law]['cookieadmin_details_wrapper_color'] : '#000000');
    852855       
    … …  
    861864       
    862865        $policy[$law] = $setting;
     866       
     867        // Check for certain fields to be saved only if their values is not the same as default
     868        $cookieadmin_check_changes = array('cookieadmin_notice_title', 'cookieadmin_notice', 'cookieadmin_preference_title', 'cookieadmin_preference', 'reConsent_title', 'cookieadmin_customize_btn', 'cookieadmin_reject_btn', 'cookieadmin_accept_btn', 'cookieadmin_save_btn');
     869       
     870        foreach($cookieadmin_check_changes as $c_field){
     871            foreach($policy as $c_law => $c_val){
     872                if(!empty($c_val[$c_field]) && $c_val[$c_field] == $cookieadmin_policies[$c_law][$c_field]){
     873                    unset($policy[$c_law][$c_field]);
     874                }
     875            }
     876        }
    863877       
    864878        update_option('cookieadmin_consent_settings', $policy);

  • cookieadmin/trunk/includes/database.php

    r3328224 r3368511  
    2424       
    2525        $charset_collate = self::$wpdb->get_charset_collate();
    26         require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
     26        $db_path = !defined('SITEPAD') ? ABSPATH . 'wp-admin/includes/upgrade.php' : ABSPATH . 'site-admin/includes/upgrade.php';
     27        require_once($db_path);
    2728       
    2829        //Create scanned Cookies table

  • cookieadmin/trunk/includes/enduser.php

    r3353807 r3368511  
    103103                       
    104104                        if ( $category !== 'necessary' &&
    105                             (empty($cookieadmin_consent) ||
    106                             (!empty($cookieadmin_consent[$category]) && $cookieadmin_consent[$category] == 'false') ||
    107                             $cookieadmin_consent['reject'] == 'true')
     105                                (empty($cookieadmin_consent) ||
     106                                    (!empty($cookieadmin_consent[$category]) && $cookieadmin_consent[$category] == 'false') ||
     107                                    (!empty($cookieadmin_consent['reject']) && $cookieadmin_consent['reject'] == 'true')
     108                                )
    108109                            ) {
    109110                           

  • cookieadmin/trunk/includes/functions.php

    r3353807 r3368511  
    172172// Load policies from the file and database and merge them.
    173173function cookieadmin_load_policy(){
     174    global $cookieadmin_policies;
    174175   
    175176    $policy = get_option('cookieadmin_consent_settings', array());
    … …  
    179180    }
    180181   
    181     if(!file_exists(COOKIEADMIN_DIR.'assets/cookie/policy.json')){
     182    if(!file_exists(COOKIEADMIN_DIR.'assets/cookie/policies.php')){
    182183        return $policy;
    183184    }
    184185   
    185     $j_policy = file_get_contents(COOKIEADMIN_DIR.'assets/cookie/policy.json');
    186    
    187     $j_policy = json_decode($j_policy, true);
     186    include_once(COOKIEADMIN_DIR.'assets/cookie/policies.php');
     187    $j_policy = $cookieadmin_policies;
     188    // print_r($j_policy);
    188189   
    189190    if(empty($j_policy) || !is_array($j_policy)){
    … …  
    440441    $allowed_tags['defs'] = array();
    441442   
     443    $allowed_tags['a'] = array(
     444        'href' => true,
     445    );
     446   
     447    $allowed_tags['br'] = array();
     448   
    442449    $allowed_tags['image'] = array(
    443450        'href' => true,
    … …  
    480487    if(empty($cookieadmin_settings['hide_powered_by'])){
    481488        $protocols[] = 'data';
    482         return $protocols;
    483     }
     489    }
     490
     491    return $protocols;
    484492}
    485493

  • cookieadmin/trunk/readme.txt

    r3353807 r3368511  
    55Tested up to: 6.8
    66Requires PHP: 7.0
    7 Stable tag: 1.1.0
     7Stable tag: 1.1.1
    88License: LGPLv2.1
    99License URI: http://www.gnu.org/licenses/lgpl-2.1.html
    … …  
    3434* Google Consent Mode v2
    3535* User Country Detection
     36* Multilingual - 17 Languages supported
    3637* Consent Logs
    3738* Export Consent Logs
     39
     40Supported Languages (requires pro) :
     41* English
     42* Bulgarian
     43* Chinese
     44* Czech
     45* Dutch
     46* French
     47* German
     48* Hungarian
     49* Italian
     50* Japanese
     51* Polish
     52* Portuguese
     53* Portuguese Brazilian
     54* Russian
     55* Slovak
     56* Spanish
     57* Turkish
    3858
    3959== Installation ==
    … …  
    4565
    4666== Changelog ==
     67
     68= 1.1.1 =
     69* [Pro Feature] Multilingual - 17 Languages added
     70* [Improvement] Added support for common HTML tags in cookie banner while customizing the content to be displayed.
     71* [Bug Fix] Users were unable to save posts/pages when error reporting was enabled in PHP configuration (this is generally disabled in production environments). This is fixed now.
     72* [Bug Fix] Users were unable to save posts/pages when using CookieAdmin Pro v1.0.9 and higher. This is fixed now.
     73* [Bug Fix] In rare cases, due to conflict with some cache plugin the reconsent icon was not visible. This is fixed now.
    4774
    4875= 1.1.0 =
Note: See TracChangeset for help on using the changeset viewer.