Cookie Law / GDPR Info - Version 1.5.3

Version Description

  • Bug fix: Buttons now handle apostrophes correctly
  • Bug fix: Added to table head for [cookie_audit] table for W3 Validator (thanks to davidebabylonia for finding and suggesting the solution)
Download this release

Release Info

Developer markwt
Plugin Icon Cookie Law / GDPR Info
Version 1.5.3
Comparing to
See all releases

Code changes from version 1.5.2 to 1.5.3

Files changed (6) hide show
  1. admin/cli-admin-page.php +2 -2
  2. cookie-law-info.php +2 -2
  3. js/cookielawinfo.js +1 -1
  4. php/functions.php +1 -1
  5. php/shortcodes.php +6 -6
  6. readme.txt +8 -4
admin/cli-admin-page.php CHANGED
@@ -381,7 +381,7 @@ function cookielawinfo_print_admin_page() {
381
  <tr valign="top">
382
  <th scope="row"><label for="button_1_text_field">Link Text</label></th>
383
  <td>
384
- <input type="text" name="button_1_text_field" value="<?php echo $the_options['button_1_text'] ?>" />
385
  </td>
386
  </tr>
387
  <tr valign="top">
@@ -447,7 +447,7 @@ function cookielawinfo_print_admin_page() {
447
  <tr valign="top">
448
  <th scope="row"><label for="button_2_text_field">Link Text</label></th>
449
  <td>
450
- <input type="text" name="button_2_text_field" value="<?php echo $the_options['button_2_text'] ?>" />
451
  </td>
452
  </tr>
453
  <tr valign="top">
381
  <tr valign="top">
382
  <th scope="row"><label for="button_1_text_field">Link Text</label></th>
383
  <td>
384
+ <input type="text" name="button_1_text_field" value="<?php echo stripslashes( $the_options['button_1_text'] ) ?>" />
385
  </td>
386
  </tr>
387
  <tr valign="top">
447
  <tr valign="top">
448
  <th scope="row"><label for="button_2_text_field">Link Text</label></th>
449
  <td>
450
+ <input type="text" name="button_2_text_field" value="<?php echo stripslashes( $the_options['button_2_text'] ) ?>" />
451
  </td>
452
  </tr>
453
  <tr valign="top">
cookie-law-info.php CHANGED
@@ -3,9 +3,9 @@
3
  Plugin Name: Cookie Law Info
4
  Plugin URI: http://wordpress.org/extend/plugins/cookie-law-info/description/
5
  Description: A simple way of 'implied consent' to show your website complies with the EU Cookie Law, which came into force on 26 May 2012.
6
- Author: Richard Ashby
7
  Author URI: http://cookielawinfo.com/
8
- Version: 1.5.2
9
  License: GPL2
10
  */
11
 
3
  Plugin Name: Cookie Law Info
4
  Plugin URI: http://wordpress.org/extend/plugins/cookie-law-info/description/
5
  Description: A simple way of 'implied consent' to show your website complies with the EU Cookie Law, which came into force on 26 May 2012.
6
+ Author: markwt
7
  Author URI: http://cookielawinfo.com/
8
+ Version: 1.5.3
9
  License: GPL2
10
  */
11
 
js/cookielawinfo.js CHANGED
@@ -1,5 +1,5 @@
1
  function cli_show_cookiebar(p) {
2
- /* plugin version 1.5.2 */
3
  var Cookie = {
4
  set: function(name,value,days) {
5
  if (days) {
1
  function cli_show_cookiebar(p) {
2
+ /* plugin version 1.5.3 */
3
  var Cookie = {
4
  set: function(name,value,days) {
5
  if (days) {
php/functions.php CHANGED
@@ -127,7 +127,7 @@ function cookielawinfo_enqueue_frontend_scripts() {
127
  /**
128
  * Force reload
129
  */
130
- $version = '1.5.2';
131
 
132
  wp_register_style( 'cookielawinfo-style', CLI_PLUGIN_URL . 'css/cli-style.css', null, $version );
133
  wp_enqueue_style( 'cookielawinfo-style' );
127
  /**
128
  * Force reload
129
  */
130
+ $version = '1.5.3';
131
 
132
  wp_register_style( 'cookielawinfo-style', CLI_PLUGIN_URL . 'css/cli-style.css', null, $version );
133
  wp_enqueue_style( 'cookielawinfo-style' );
php/shortcodes.php CHANGED
@@ -81,11 +81,11 @@ function cookielawinfo_table_shortcode( $atts ) {
81
  );
82
  $cookies = new WP_Query( $args );
83
 
84
- $ret = '<table class="cookielawinfo-' . $style . '"><thead>';
85
  $ret .= '<th class="cookielawinfo-column-1">Cookie</th>';
86
  $ret .= '<th class="cookielawinfo-column-2">Type</th>';
87
  $ret .= '<th class="cookielawinfo-column-3">Duration</th>';
88
- $ret .= '<th class="cookielawinfo-column-4">Description</th>';
89
  $ret .= '</thead><tbody>';
90
 
91
  if ( !$cookies->have_posts() ) {
@@ -122,7 +122,7 @@ function cookielawinfo_shortcode_accept_button( $atts ) {
122
  );
123
  $settings = wp_parse_args( cookielawinfo_get_admin_settings(), $defaults );
124
 
125
- return '<a href="#" id="cookie_action_close_header" class="medium cli-plugin-button ' . $colour . '">' . $settings['button_1_text'] . '</a>';
126
  }
127
 
128
 
@@ -160,7 +160,7 @@ function cookielawinfo_shortcode_main_button( $atts ) {
160
 
161
  $link_tag = '<a href="' . $url . '" id="' . cookielawinfo_remove_hash ( $settings['button_1_action'] ) . '" ';
162
  $link_tag .= ( $settings['button_1_new_win'] ) ? 'target="_blank" ' : '' ;
163
- $link_tag .= $class . ' >' . $settings['button_1_text'] . '</a>';
164
 
165
  return $link_tag;
166
  }
@@ -174,7 +174,7 @@ function cookielawinfo_shortcode_button_DRY_code( $name ) {
174
 
175
  if ( $name == "button_1" ) {
176
  $settings = array(
177
- 'button_x_text' => $arr['button_1_text'],
178
  'button_x_url' => $arr['button_1_url'],
179
  'button_x_action' => $arr['button_1_action'],
180
 
@@ -188,7 +188,7 @@ function cookielawinfo_shortcode_button_DRY_code( $name ) {
188
  }
189
  elseif ( $name == "button_2" ) {
190
  $settings = array(
191
- 'button_x_text' => $arr['button_2_text'],
192
  'button_x_url' => $arr['button_2_url'],
193
  'button_x_action' => $arr['button_2_action'],
194
 
81
  );
82
  $cookies = new WP_Query( $args );
83
 
84
+ $ret = '<table class="cookielawinfo-' . $style . '"><thead><tr>';
85
  $ret .= '<th class="cookielawinfo-column-1">Cookie</th>';
86
  $ret .= '<th class="cookielawinfo-column-2">Type</th>';
87
  $ret .= '<th class="cookielawinfo-column-3">Duration</th>';
88
+ $ret .= '<th class="cookielawinfo-column-4">Description</th></tr>';
89
  $ret .= '</thead><tbody>';
90
 
91
  if ( !$cookies->have_posts() ) {
122
  );
123
  $settings = wp_parse_args( cookielawinfo_get_admin_settings(), $defaults );
124
 
125
+ return '<a href="#" id="cookie_action_close_header" class="medium cli-plugin-button ' . $colour . '">' . stripslashes( $settings['button_1_text'] ) . '</a>';
126
  }
127
 
128
 
160
 
161
  $link_tag = '<a href="' . $url . '" id="' . cookielawinfo_remove_hash ( $settings['button_1_action'] ) . '" ';
162
  $link_tag .= ( $settings['button_1_new_win'] ) ? 'target="_blank" ' : '' ;
163
+ $link_tag .= $class . ' >' . stripslashes( $settings['button_1_text'] ) . '</a>';
164
 
165
  return $link_tag;
166
  }
174
 
175
  if ( $name == "button_1" ) {
176
  $settings = array(
177
+ 'button_x_text' => stripslashes( $arr['button_1_text'] ),
178
  'button_x_url' => $arr['button_1_url'],
179
  'button_x_action' => $arr['button_1_action'],
180
 
188
  }
189
  elseif ( $name == "button_2" ) {
190
  $settings = array(
191
+ 'button_x_text' => stripslashes( $arr['button_2_text'] ),
192
  'button_x_url' => $arr['button_2_url'],
193
  'button_x_action' => $arr['button_2_action'],
194
 
readme.txt CHANGED
@@ -1,10 +1,10 @@
1
- === Plugin Name ===
2
- Contributors: richardashby
3
  Donate link: http://cookielawinfo.com/donate
4
  Tags: eu cookie law, cookie law, eu privacy directive, privacy directive, cookies, privacy, compliance
5
  Requires at least: 3.3.1
6
- Tested up to: 4.2.2
7
- Stable tag: 1.5.2
8
  License: GPLv2
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -141,6 +141,10 @@ See http://cookielawinfo.com for more information on what is required.
141
 
142
  == Changelog ==
143
 
 
 
 
 
144
  = 1.5.2 =
145
  * Minor bug fix: adds version number to cli-admin.css
146
 
1
+ === Cookie Law Info ===
2
+ Contributors: markwt
3
  Donate link: http://cookielawinfo.com/donate
4
  Tags: eu cookie law, cookie law, eu privacy directive, privacy directive, cookies, privacy, compliance
5
  Requires at least: 3.3.1
6
+ Tested up to: 4.9.5
7
+ Stable tag: 1.5.3
8
  License: GPLv2
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
141
 
142
  == Changelog ==
143
 
144
+ = 1.5.3 =
145
+ * Bug fix: Buttons now handle apostrophes correctly
146
+ * Bug fix: Added <tr> to table head for [cookie_audit] table for W3 Validator (thanks to davidebabylonia for finding and suggesting the solution)
147
+
148
  = 1.5.2 =
149
  * Minor bug fix: adds version number to cli-admin.css
150