Cookie Law / GDPR Info - Version 1.6.0

Version Description

  • Issue with dual accept button.
Download this release

Release Info

Developer webtoffee
Plugin Icon Cookie Law / GDPR Info
Version 1.6.0
Comparing to
See all releases

Code changes from version 1.5.9 to 1.6.0

Files changed (9) hide show
  1. cookie-law-info.php +1 -1
  2. js/cookielawinfo.js +6 -3
  3. nbproject/private/private.properties +0 -6
  4. nbproject/private/private.xml +0 -10
  5. nbproject/project.properties +0 -7
  6. nbproject/project.xml +0 -9
  7. php/functions.php +1 -1
  8. php/shortcodes.php +10 -10
  9. readme.txt +8 -4
cookie-law-info.php CHANGED
@@ -5,7 +5,7 @@ Plugin URI: https://wordpress.org/plugins/cookie-law-info/
5
  Description: A simple way of to show your website complies with the EU Cookie Law / GDPR.
6
  Author: webtoffee
7
  Author URI: https://www.webtoffee.com/product/gdpr-cookie-consent/
8
- Version: 1.5.9
9
  License: GPL2
10
  Text Domain: cookie-law-info
11
  */
5
  Description: A simple way of to show your website complies with the EU Cookie Law / GDPR.
6
  Author: webtoffee
7
  Author URI: https://www.webtoffee.com/product/gdpr-cookie-consent/
8
+ Version: 1.6.0
9
  License: GPL2
10
  Text Domain: cookie-law-info
11
  */
js/cookielawinfo.js CHANGED
@@ -1,5 +1,5 @@
1
  function cli_show_cookiebar(p) {
2
- /* plugin version 1.5.9 */
3
  var Cookie = {
4
  set: function(name,value,days) {
5
  if (days) {
@@ -186,20 +186,22 @@ function cli_show_cookiebar(p) {
186
  return false;
187
  });
188
 
189
- jQuery("#cookie_action_close_header").click(function(e) {
190
  e.preventDefault();
191
  accept_close();
192
  });
193
 
194
- jQuery("#cookie_action_close_header_reject").click(function(e) {
195
  e.preventDefault();
196
  reject_close();
197
  });
198
 
199
  function accept_close() {
 
200
  Cookie.set(ACCEPT_COOKIE_NAME, 'yes', ACCEPT_COOKIE_EXPIRE);
201
 
202
  if (settings.notify_animate_hide) {
 
203
  cached_header.slideUp(settings.animate_speed_hide);
204
  }
205
  else {
@@ -253,6 +255,7 @@ function cli_show_cookiebar(p) {
253
  cached_showagain_tab.hide();
254
  }
255
  function hideHeader() {
 
256
  if (settings.notify_animate_show) {
257
  cached_showagain_tab.slideDown(settings.animate_speed_show);
258
  }
1
  function cli_show_cookiebar(p) {
2
+ /* plugin version 1.6.0 */
3
  var Cookie = {
4
  set: function(name,value,days) {
5
  if (days) {
186
  return false;
187
  });
188
 
189
+ jQuery(".cookie_action_close_header").click(function(e) {
190
  e.preventDefault();
191
  accept_close();
192
  });
193
 
194
+ jQuery(".cookie_action_close_header_reject").click(function(e) {
195
  e.preventDefault();
196
  reject_close();
197
  });
198
 
199
  function accept_close() {
200
+
201
  Cookie.set(ACCEPT_COOKIE_NAME, 'yes', ACCEPT_COOKIE_EXPIRE);
202
 
203
  if (settings.notify_animate_hide) {
204
+
205
  cached_header.slideUp(settings.animate_speed_hide);
206
  }
207
  else {
255
  cached_showagain_tab.hide();
256
  }
257
  function hideHeader() {
258
+
259
  if (settings.notify_animate_show) {
260
  cached_showagain_tab.slideDown(settings.animate_speed_show);
261
  }
nbproject/private/private.properties DELETED
@@ -1,6 +0,0 @@
1
- copy.src.files=false
2
- copy.src.on.open=false
3
- copy.src.target=
4
- index.file=
5
- run.as=LOCAL
6
- url=http://localhost/cookie-law-info/
 
 
 
 
 
 
nbproject/private/private.xml DELETED
@@ -1,10 +0,0 @@
1
- <?xml version="1.0" encoding="UTF-8"?>
2
- <project-private xmlns="http://www.netbeans.org/ns/project-private/1">
3
- <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
4
- <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
5
- <group>
6
- <file>file:/C:/wamp64/www/clcheck4/wp-content/plugins/cookie-law-info/php/functions.php</file>
7
- <file>file:/C:/wamp64/www/clcheck4/wp-content/plugins/cookie-law-info/admin/cli-admin-page.php</file>
8
- </group>
9
- </open-files>
10
- </project-private>
 
 
 
 
 
 
 
 
 
 
nbproject/project.properties DELETED
@@ -1,7 +0,0 @@
1
- include.path=${php.global.include.path}
2
- php.version=PHP_56
3
- source.encoding=UTF-8
4
- src.dir=.
5
- tags.asp=false
6
- tags.short=false
7
- web.root=.
 
 
 
 
 
 
 
nbproject/project.xml DELETED
@@ -1,9 +0,0 @@
1
- <?xml version="1.0" encoding="UTF-8"?>
2
- <project xmlns="http://www.netbeans.org/ns/project/1">
3
- <type>org.netbeans.modules.php.project</type>
4
- <configuration>
5
- <data xmlns="http://www.netbeans.org/ns/php-project/1">
6
- <name>cookie-law-info</name>
7
- </data>
8
- </configuration>
9
- </project>
 
 
 
 
 
 
 
 
 
php/functions.php CHANGED
@@ -132,7 +132,7 @@ function cookielawinfo_enqueue_frontend_scripts() {
132
  /**
133
  * Force reload
134
  */
135
- $version = '1.5.9';
136
 
137
  wp_register_style( 'cookielawinfo-style', CLI_PLUGIN_URL . 'css/cli-style.css', null, $version );
138
  wp_enqueue_style( 'cookielawinfo-style' );
132
  /**
133
  * Force reload
134
  */
135
+ $version = '1.6.0';
136
 
137
  wp_register_style( 'cookielawinfo-style', CLI_PLUGIN_URL . 'css/cli-style.css', null, $version );
138
  wp_enqueue_style( 'cookielawinfo-style' );
php/shortcodes.php CHANGED
@@ -134,7 +134,7 @@ function cookielawinfo_shortcode_accept_button( $atts ) {
134
  );
135
  $settings = wp_parse_args( cookielawinfo_get_admin_settings(), $defaults );
136
 
137
- return '<a href="#" id="cookie_action_close_header" class="medium cli-plugin-button ' . $colour . '">' . stripslashes( $settings['button_1_text'] ) . '</a>';
138
  }
139
 
140
  /** Returns HTML for a standard (green, medium sized) 'Accept' button */
@@ -166,16 +166,16 @@ function cookielawinfo_shortcode_reject_button( $atts ) {
166
 
167
  $classr = '';
168
  if ( $settings['button_3_as_button'] ) {
169
- $classr .= ' class="' . $settings['button_3_button_size'] . ' cli-plugin-button cli-plugin-main-button"';
170
  }
171
  else {
172
- $classr .= ' class="cli-plugin-main-button" ' ;
173
  }
174
 
175
  $url_reject = ( $settings['button_3_action'] == "cookie_action_open_url_reject" ) ? $settings['button_3_url'] : "#";
176
 
177
  $link_tag = '';
178
- $link_tag .= '<a href="' . $url_reject . '" id="' . cookielawinfo_remove_hash ( $settings['button_3_action'] ) . '" ';
179
  $link_tag .= ( $settings['button_3_new_win'] ) ? 'target="_blank" ' : '' ;
180
  $link_tag .= $classr . ' >' . stripslashes( $settings['button_3_text'] ) . '</a>';
181
  return $link_tag;
@@ -215,17 +215,17 @@ function cookielawinfo_shortcode_main_button( $atts ) {
215
 
216
  $class = '';
217
  if ( $settings['button_1_as_button'] ) {
218
- $class .= ' class="' . $settings['button_1_button_size'] . ' cli-plugin-button cli-plugin-main-button"';
219
  }
220
  else {
221
- $class .= ' class="cli-plugin-main-button" ' ;
222
  }
223
 
224
  // If is action not URL then don't use URL!
225
  $url = ( $settings['button_1_action'] == "CONSTANT_OPEN_URL" ) ? $settings['button_1_url'] : "#";
226
 
227
 
228
- $link_tag = '<a href="' . $url . '" id="' . cookielawinfo_remove_hash ( $settings['button_1_action'] ) . '" ';
229
  $link_tag .= ( $settings['button_1_new_win'] ) ? 'target="_blank" ' : '' ;
230
  $link_tag .= $class . ' >' . stripslashes( $settings['button_1_text'] ) . '</a>';
231
 
@@ -234,16 +234,16 @@ function cookielawinfo_shortcode_main_button( $atts ) {
234
 
235
  $classr = '';
236
  if ( $settings['button_3_as_button'] ) {
237
- $classr .= ' class="' . $settings['button_3_button_size'] . ' cli-plugin-button cli-plugin-main-button"';
238
  }
239
  else {
240
- $classr .= ' class="cli-plugin-main-button" ' ;
241
  }
242
 
243
  $url_reject = ( $settings['button_3_action'] == "cookie_action_open_url_reject" ) ? $settings['button_3_url'] : "#";
244
 
245
 
246
- $link_tag .= '<a href="' . $url_reject . '" id="' . cookielawinfo_remove_hash ( $settings['button_3_action'] ) . '" ';
247
  $link_tag .= ( $settings['button_3_new_win'] ) ? 'target="_blank" ' : '' ;
248
  $link_tag .= $classr . ' >' . stripslashes( $settings['button_3_text'] ) . '</a>';
249
  }
134
  );
135
  $settings = wp_parse_args( cookielawinfo_get_admin_settings(), $defaults );
136
 
137
+ return '<a href="#" class="medium cookie_action_close_header cli-plugin-button ' . $colour . '">' . stripslashes( $settings['button_1_text'] ) . '</a>';
138
  }
139
 
140
  /** Returns HTML for a standard (green, medium sized) 'Accept' button */
166
 
167
  $classr = '';
168
  if ( $settings['button_3_as_button'] ) {
169
+ $classr .= ' class="' . cookielawinfo_remove_hash ( $settings['button_3_action'] ) . ' ' . $settings['button_3_button_size'] . ' cli-plugin-button cli-plugin-main-button"';
170
  }
171
  else {
172
+ $classr .= ' class="' . cookielawinfo_remove_hash ( $settings['button_3_action'] ) . ' cli-plugin-main-button" ' ;
173
  }
174
 
175
  $url_reject = ( $settings['button_3_action'] == "cookie_action_open_url_reject" ) ? $settings['button_3_url'] : "#";
176
 
177
  $link_tag = '';
178
+ $link_tag .= '<a href="' . $url_reject . '" ';
179
  $link_tag .= ( $settings['button_3_new_win'] ) ? 'target="_blank" ' : '' ;
180
  $link_tag .= $classr . ' >' . stripslashes( $settings['button_3_text'] ) . '</a>';
181
  return $link_tag;
215
 
216
  $class = '';
217
  if ( $settings['button_1_as_button'] ) {
218
+ $class .= ' class="' . cookielawinfo_remove_hash ( $settings['button_1_action'] ) . ' ' . $settings['button_1_button_size'] . ' cli-plugin-button cli-plugin-main-button"';
219
  }
220
  else {
221
+ $class .= ' class="' . cookielawinfo_remove_hash ( $settings['button_1_action'] ) . ' cli-plugin-main-button" ' ;
222
  }
223
 
224
  // If is action not URL then don't use URL!
225
  $url = ( $settings['button_1_action'] == "CONSTANT_OPEN_URL" ) ? $settings['button_1_url'] : "#";
226
 
227
 
228
+ $link_tag = '<a href="' . $url . '" ';
229
  $link_tag .= ( $settings['button_1_new_win'] ) ? 'target="_blank" ' : '' ;
230
  $link_tag .= $class . ' >' . stripslashes( $settings['button_1_text'] ) . '</a>';
231
 
234
 
235
  $classr = '';
236
  if ( $settings['button_3_as_button'] ) {
237
+ $classr .= ' class="' . cookielawinfo_remove_hash ( $settings['button_3_action'] ) . ' ' . $settings['button_3_button_size'] . ' cli-plugin-button cli-plugin-main-button"';
238
  }
239
  else {
240
+ $classr .= ' class="' . cookielawinfo_remove_hash ( $settings['button_3_action'] ) . ' cli-plugin-main-button" ' ;
241
  }
242
 
243
  $url_reject = ( $settings['button_3_action'] == "cookie_action_open_url_reject" ) ? $settings['button_3_url'] : "#";
244
 
245
 
246
+ $link_tag .= '<a href="' . $url_reject . '"';
247
  $link_tag .= ( $settings['button_3_new_win'] ) ? 'target="_blank" ' : '' ;
248
  $link_tag .= $classr . ' >' . stripslashes( $settings['button_3_text'] ) . '</a>';
249
  }
readme.txt CHANGED
@@ -3,8 +3,8 @@ Contributors: webtoffee,markwt
3
  Donate link:
4
  Tags: eu cookie law, GDPR, cookie law, cookie consent, eu privacy directive, privacy directive, cookies, privacy, compliance
5
  Requires at least: 3.3.1
6
- Tested up to: 4.9.6
7
- Stable tag: 1.5.9
8
  License: GPLv2
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -166,6 +166,10 @@ See http://cookielawinfo.com for more information on what is required.
166
 
167
  == Changelog ==
168
 
 
 
 
 
169
  = 1.5.9 =
170
 
171
  * Issue with the plugin interfering with breadcrumb fixed.
@@ -273,8 +277,8 @@ See http://cookielawinfo.com for more information on what is required.
273
 
274
  == Upgrade Notice ==
275
 
276
- = 1.5.9 =
277
 
278
- * Issue with the plugin interfering with breadcrumb fixed.
279
 
280
 
3
  Donate link:
4
  Tags: eu cookie law, GDPR, cookie law, cookie consent, eu privacy directive, privacy directive, cookies, privacy, compliance
5
  Requires at least: 3.3.1
6
+ Tested up to: 4.9.7
7
+ Stable tag: 1.6.0
8
  License: GPLv2
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
166
 
167
  == Changelog ==
168
 
169
+ = 1.6.0 =
170
+
171
+ * Issue with dual accept button.
172
+
173
  = 1.5.9 =
174
 
175
  * Issue with the plugin interfering with breadcrumb fixed.
277
 
278
  == Upgrade Notice ==
279
 
280
+ = 1.6.0 =
281
 
282
+ * Issue with dual accept button.
283
 
284