Simple Calendar – Google Calendar Plugin - Version 2.0.5.1

Version Description

  • Fix timezone issue.
Download this release

Release Info

Developer pderksen
Plugin Icon 128x128 Simple Calendar – Google Calendar Plugin
Version 2.0.5.1
Comparing to
See all releases

Code changes from version 2.0.5 to 2.0.5.1

Files changed (7) hide show
  1. class-google-calendar-events.php +1 -1
  2. css/gce-style.css +1 -0
  3. google-calendar-events.php +1 -1
  4. includes/class-gce-event.php +9 -2
  5. includes/class-gce-feed.php +8 -1
  6. readme.txt +8 -4
  7. views/admin/gce-feed-meta-display.php +6 -3
class-google-calendar-events.php CHANGED
@@ -18,7 +18,7 @@ class Google_Calendar_Events {
18
  *
19
  * @var string
20
  */
21
- protected $version = '2.0.5';
22
 
23
  /**
24
  * Unique identifier for the plugin.
18
  *
19
  * @var string
20
  */
21
+ protected $version = '2.0.5.1';
22
 
23
  /**
24
  * Unique identifier for the plugin.
css/gce-style.css CHANGED
@@ -190,6 +190,7 @@
190
  width: 100%;
191
  text-align: center;
192
  clear: both;
 
193
  }
194
 
195
  .gce-next,
190
  width: 100%;
191
  text-align: center;
192
  clear: both;
193
+ overflow: hidden;
194
  }
195
 
196
  .gce-next,
google-calendar-events.php CHANGED
@@ -12,7 +12,7 @@
12
  * Plugin Name: Google Calendar Events
13
  * Plugin URI: https://github.com/pderksen/WP-Google-Calendar-Events
14
  * Description: Parses Google Calendar feeds and displays the events as a calendar grid or list on a page, post or widget.
15
- * Version: 2.0.5
16
  * Author: Phil Derksen
17
  * Author URI: http://philderksen.com
18
  * License: GPL-2.0+
12
  * Plugin Name: Google Calendar Events
13
  * Plugin URI: https://github.com/pderksen/WP-Google-Calendar-Events
14
  * Description: Parses Google Calendar feeds and displays the events as a calendar grid or list on a page, post or widget.
15
+ * Version: 2.0.5.1
16
  * Author: Phil Derksen
17
  * Author URI: http://philderksen.com
18
  * License: GPL-2.0+
includes/class-gce-event.php CHANGED
@@ -189,7 +189,12 @@ class GCE_Event {
189
  //If link should be displayed add to $markup
190
  if ( isset($display_options['display_link'] ) ) {
191
  $target = ( ! empty( $display_options['display_link_target'] ) ? 'target="blank"' : '' );
192
- $markup .= '<p class="gce-' . $this->type . '-link"><a href="' . esc_url( $this->link ) . '" ' . $target . '>' . esc_html( $display_options['display_link_text'] ) . '</a></p>';
 
 
 
 
 
193
  }
194
 
195
  return $markup;
@@ -358,7 +363,9 @@ class GCE_Event {
358
 
359
  case 'link':
360
  $new_window = ( $newwindow ) ? ' target="_blank"' : '';
361
- return $m[1] . '<a href="' . esc_url( $this->link ) . '"' . $new_window . '>' . $this->look_for_shortcodes( $m[5] ) . '</a>' . $m[6];
 
 
362
 
363
  case 'url':
364
  return $m[1] . esc_url( $this->link ) . $m[6];
189
  //If link should be displayed add to $markup
190
  if ( isset($display_options['display_link'] ) ) {
191
  $target = ( ! empty( $display_options['display_link_target'] ) ? 'target="blank"' : '' );
192
+
193
+ $ctz = get_option( 'timezone_string' );
194
+
195
+ $link = $this->link . ( ! empty( $ctz ) ? '&ctz=' . $ctz : '' );
196
+
197
+ $markup .= '<p class="gce-' . $this->type . '-link"><a href="' . esc_url( $link ) . '" ' . $target . '>' . esc_html( $display_options['display_link_text'] ) . '</a></p>';
198
  }
199
 
200
  return $markup;
363
 
364
  case 'link':
365
  $new_window = ( $newwindow ) ? ' target="_blank"' : '';
366
+ $ctz = get_option( 'timezone_string' );
367
+ $link = $this->link . ( ! empty( $ctz ) ? '&ctz=' . $ctz : '' );
368
+ return $m[1] . '<a href="' . esc_url( $link ) . '"' . $new_window . '>' . $this->look_for_shortcodes( $m[5] ) . '</a>' . $m[6];
369
 
370
  case 'url':
371
  return $m[1] . esc_url( $this->link ) . $m[6];
includes/class-gce-feed.php CHANGED
@@ -100,7 +100,14 @@ class GCE_Feed {
100
  $query .= '&start-min=' . date( 'Y-m-d\TH:i:s', mktime( 0, 0, 0, 1, 1, date( 'Y' ) - 1 ) );
101
  $query .= '&start-max=' . date( 'Y-m-d\TH:i:s', mktime( 0, 0, 0, 1, 1, date( 'Y' ) + 5 ) );
102
 
103
- $query .= '&max-results=1000';
 
 
 
 
 
 
 
104
 
105
  if ( ! empty( $this->search_query ) ) {
106
  $query .= '&q=' . rawurlencode( $this->search_query );
100
  $query .= '&start-min=' . date( 'Y-m-d\TH:i:s', mktime( 0, 0, 0, 1, 1, date( 'Y' ) - 1 ) );
101
  $query .= '&start-max=' . date( 'Y-m-d\TH:i:s', mktime( 0, 0, 0, 1, 1, date( 'Y' ) + 5 ) );
102
 
103
+ // Max results limit for performance.
104
+ $query .= '&max-results=1000';
105
+
106
+ $ctz = get_option( 'timezone_string' );
107
+
108
+ if( ! empty( $ctz ) ) {
109
+ $query .= '&ctz=' . $ctz;
110
+ }
111
 
112
  if ( ! empty( $this->search_query ) ) {
113
  $query .= '&q=' . rawurlencode( $this->search_query );
readme.txt CHANGED
@@ -38,8 +38,8 @@ This plugin was originally created by [Ross Hanney](http://www.rhanney.co.uk), a
38
  * Spanish - Provided by Eduardo Larequi of [educacion.navarra.es/web/pnte/](http://www.educacion.navarra.es/web/pnte/).
39
  * Italian - Provided by Francesco Paccagnella of [pacca.it](http://www.pacca.it/).
40
  * French - Provided by Vincent Bray.
41
- * German - Provided by Stefanie Drucker.
42
- * Norwegian - Provided by Tore Hjartland.
43
 
44
  == Installation ==
45
 
@@ -85,14 +85,18 @@ There are three ways to install this plugin.
85
 
86
  == Changelog ==
87
 
 
 
 
 
88
  = 2.0.5 =
89
 
90
  * Fixed display bug with event date and grouped lists.
91
  * Fixed broken paging links when feed IDs contain spaces between them.
92
  * Fixed bug with start offset and grouped lists not working properly.
93
  * Fixed bug where clear cache link was showing on any type of CPT.
94
- * Added German translation - Provided by Stefanie Drucker.
95
- * Added Norwegian translation - Provided by Tore Hjartland.
96
 
97
  = 2.0.4 =
98
 
38
  * Spanish - Provided by Eduardo Larequi of [educacion.navarra.es/web/pnte/](http://www.educacion.navarra.es/web/pnte/).
39
  * Italian - Provided by Francesco Paccagnella of [pacca.it](http://www.pacca.it/).
40
  * French - Provided by Vincent Bray.
41
+ * German - Provided by Stefanie Drucker of [kreativhuhn.at](http://www.kreativhuhn.at/).
42
+ * Norwegian - Provided by Tore Hjartland of [aliom.no](http://www.aliom.no/).
43
 
44
  == Installation ==
45
 
85
 
86
  == Changelog ==
87
 
88
+ = 2.0.5.1 =
89
+
90
+ * Fix timezone issue.
91
+
92
  = 2.0.5 =
93
 
94
  * Fixed display bug with event date and grouped lists.
95
  * Fixed broken paging links when feed IDs contain spaces between them.
96
  * Fixed bug with start offset and grouped lists not working properly.
97
  * Fixed bug where clear cache link was showing on any type of CPT.
98
+ * Added German translation - Provided by Stefanie Drucker of [kreativhuhn.at](http://www.kreativhuhn.at/).
99
+ * Added Norwegian translation - Provided by Tore Hjartland of [aliom.no](http://www.aliom.no/).
100
 
101
  = 2.0.4 =
102
 
views/admin/gce-feed-meta-display.php CHANGED
@@ -61,7 +61,10 @@
61
  <th scope="row"><?php _e( 'Feed Shortcode', 'gce' ); ?></th>
62
  <td>
63
  <code>[gcal id="<?php echo $post_id; ?>"]</code>
64
- <p class="description"><?php _e( 'Copy and paste this shortcode to display this Google Calendar feed in any post or page.', 'gce' ); ?></p>
 
 
 
65
  </td>
66
  </tr>
67
  <tr>
@@ -69,8 +72,8 @@
69
  <td>
70
  <input type="text" class="large-text" name="gce_feed_url" id="gce_feed_url" value="<?php echo $gce_feed_url; ?>" />
71
  <p class="description">
72
- <?php _e( 'The Google Calendar feed URL.', 'gce' ); ?><br/>
73
- <?php _e( 'Example', 'gce' ); ?>: <code>https://www.google.com/calendar/feeds/em3luo1919fjcjum4j874j5ejg%40group.calendar.google.com/public/basic</code><br/>
74
  <a href="http://wpdocs.philderksen.com/google-calendar-events/getting-started/find-feed-url/" target="_blank"><?php _e( 'How to find your GCal feed URL', 'gce' ); ?></a>
75
  </p>
76
  </td>
61
  <th scope="row"><?php _e( 'Feed Shortcode', 'gce' ); ?></th>
62
  <td>
63
  <code>[gcal id="<?php echo $post_id; ?>"]</code>
64
+ <p class="description">
65
+ <?php _e( 'Copy and paste this shortcode to display this Google Calendar feed on any post or page.', 'gce' ); ?>
66
+ <?php _e( 'To avoid display issues, make sure to paste the shortcode in the Text tab of the post editor.', 'gce' ); ?>
67
+ </p>
68
  </td>
69
  </tr>
70
  <tr>
72
  <td>
73
  <input type="text" class="large-text" name="gce_feed_url" id="gce_feed_url" value="<?php echo $gce_feed_url; ?>" />
74
  <p class="description">
75
+ <?php _e( 'The Google Calendar feed URL.', 'gce' ); ?> <?php _e( 'Example', 'gce' ); ?>:<br/>
76
+ <code>https://www.google.com/calendar/feeds/em3luo1919fjcjum4j874j5ejg%40group.calendar.google.com/public/basic</code><br/>
77
  <a href="http://wpdocs.philderksen.com/google-calendar-events/getting-started/find-feed-url/" target="_blank"><?php _e( 'How to find your GCal feed URL', 'gce' ); ?></a>
78
  </p>
79
  </td>