@@ -755,7 +755,7 @@ discard block |
||
755 | 755 | 'text' => urlencode( strip_tags( $event->title ) ), |
756 | 756 | 'dates' => $gcal_dt_string, |
757 | 757 | 'details' => urlencode( $event->description ), // works if blank |
758 | - 'location' => urlencode( $event->start_location['address'] ), // works if just a name, just an address, or blank |
|
758 | + 'location' => urlencode( $event->start_location['address'] ), // works if just a name, just an address, or blank |
|
759 | 759 | 'trp' => 'false', |
760 | 760 | ); |
761 | 761 | |
@@ -822,8 +822,8 @@ discard block |
||
822 | 822 | if ( 'yes' == $poweredby ) { |
823 | 823 | $align = is_rtl() ? 'left' : 'right'; |
824 | 824 | echo '<small class="simcal-powered simcal-align-' . $align .'">' . |
825 | - sprintf( __( 'Powered by <a href="%s" target="_blank">Simple Calendar</a>', 'google-calendar-events' ), simcal_get_url( 'home' ) ) . |
|
826 | - '</small>'; |
|
825 | + sprintf( __( 'Powered by <a href="%s" target="_blank">Simple Calendar</a>', 'google-calendar-events' ), simcal_get_url( 'home' ) ) . |
|
826 | + '</small>'; |
|
827 | 827 | } |
828 | 828 | |
829 | 829 | echo '</div>'; |
@@ -259,10 +259,10 @@ discard block |
||
259 | 259 | $meta_location_name_and_address = empty( $location ) ? wp_strip_all_tags( $event->title ) : wp_strip_all_tags( $location ); |
260 | 260 | |
261 | 261 | return ' <span class="simcal-event-address simcal-event-' . $location_class . '-location" itemprop="location" itemscope itemtype="http://schema.org/Place">' . |
262 | - '<meta itemprop="name" content="' . $meta_location_name_and_address . '" />' . |
|
263 | - '<meta itemprop="address" content="' . $meta_location_name_and_address . '" />' . |
|
264 | - wp_strip_all_tags( $location ) . |
|
265 | - '</span>'; |
|
262 | + '<meta itemprop="name" content="' . $meta_location_name_and_address . '" />' . |
|
263 | + '<meta itemprop="address" content="' . $meta_location_name_and_address . '" />' . |
|
264 | + wp_strip_all_tags( $location ) . |
|
265 | + '</span>'; |
|
266 | 266 | |
267 | 267 | case 'start-location-link': |
268 | 268 | case 'end-location-link' : |
@@ -620,21 +620,21 @@ discard block |
||
620 | 620 | if ( ! $event->whole_day ) { |
621 | 621 | |
622 | 622 | $time_start = $this->calendar->datetime_separator . |
623 | - ' <span class="simcal-event-start simcal-event-start-time" ' . |
|
624 | - 'data-event-start="' . $start->getTimestamp() . '" ' . |
|
625 | - 'data-event-format="' . $this->calendar->time_format . '" ' . |
|
626 | - 'itemprop="startDate" content="' . $start->toIso8601String() . '">' . |
|
627 | - date_i18n( $this->calendar->time_format, $start->getTimestamp() ) . |
|
628 | - '</span> '; |
|
623 | + ' <span class="simcal-event-start simcal-event-start-time" ' . |
|
624 | + 'data-event-start="' . $start->getTimestamp() . '" ' . |
|
625 | + 'data-event-format="' . $this->calendar->time_format . '" ' . |
|
626 | + 'itemprop="startDate" content="' . $start->toIso8601String() . '">' . |
|
627 | + date_i18n( $this->calendar->time_format, $start->getTimestamp() ) . |
|
628 | + '</span> '; |
|
629 | 629 | |
630 | 630 | if ( $end instanceof Carbon ) { |
631 | 631 | |
632 | 632 | $time_end = ' <span class="simcal-event-end simcal-event-end-time" ' . |
633 | - 'data-event-end="' . $end->getTimestamp() . '" ' . |
|
634 | - 'data-event-format="' . $this->calendar->time_format . '" ' . |
|
635 | - 'itemprop="endDate" content="' . $end->toIso8601String() . '">' . |
|
636 | - date_i18n( $this->calendar->time_format, $end->getTimestamp() ) . |
|
637 | - '</span> '; |
|
633 | + 'data-event-end="' . $end->getTimestamp() . '" ' . |
|
634 | + 'data-event-format="' . $this->calendar->time_format . '" ' . |
|
635 | + 'itemprop="endDate" content="' . $end->toIso8601String() . '">' . |
|
636 | + date_i18n( $this->calendar->time_format, $end->getTimestamp() ) . |
|
637 | + '</span> '; |
|
638 | 638 | |
639 | 639 | } |
640 | 640 | |
@@ -643,23 +643,23 @@ discard block |
||
643 | 643 | if ( $event->multiple_days ) { |
644 | 644 | |
645 | 645 | $output = ' <span class="simcal-event-start simcal-event-start-date" ' . |
646 | - 'data-event-start="' . $start->getTimestamp() . '" ' . |
|
647 | - 'data-event-format="' . $this->calendar->date_format . '" ' . |
|
648 | - 'itemprop="startDate" content="' . $start->toIso8601String() . '">' . |
|
649 | - date_i18n( $this->calendar->date_format, $start->getTimestamp() ) . |
|
650 | - '</span> ' . |
|
651 | - $time_start; |
|
646 | + 'data-event-start="' . $start->getTimestamp() . '" ' . |
|
647 | + 'data-event-format="' . $this->calendar->date_format . '" ' . |
|
648 | + 'itemprop="startDate" content="' . $start->toIso8601String() . '">' . |
|
649 | + date_i18n( $this->calendar->date_format, $start->getTimestamp() ) . |
|
650 | + '</span> ' . |
|
651 | + $time_start; |
|
652 | 652 | |
653 | 653 | if ( $end instanceof Carbon ) { |
654 | 654 | |
655 | 655 | $output .= '-' . |
656 | - ' <span class="simcal-event-start simcal-event-end-date" ' . |
|
657 | - 'data-event-start="' . $end->getTimestamp() . '" ' . |
|
658 | - 'data-event-format="' . $this->calendar->date_format . '" ' . |
|
659 | - 'itemprop="endDate" content="' . $end->toIso8601String() . '">' . |
|
660 | - date_i18n( $this->calendar->date_format, $end->getTimestamp() ) . |
|
661 | - '</span> ' . |
|
662 | - $time_end; |
|
656 | + ' <span class="simcal-event-start simcal-event-end-date" ' . |
|
657 | + 'data-event-start="' . $end->getTimestamp() . '" ' . |
|
658 | + 'data-event-format="' . $this->calendar->date_format . '" ' . |
|
659 | + 'itemprop="endDate" content="' . $end->toIso8601String() . '">' . |
|
660 | + date_i18n( $this->calendar->date_format, $end->getTimestamp() ) . |
|
661 | + '</span> ' . |
|
662 | + $time_end; |
|
663 | 663 | } |
664 | 664 | |
665 | 665 | } else { |
@@ -668,13 +668,13 @@ discard block |
||
668 | 668 | |
669 | 669 | // All-day events also need startDate for schema data. |
670 | 670 | $output = ' <span class="simcal-event-start simcal-event-start-date" ' . |
671 | - 'data-event-start="' . $start->getTimestamp() . '" ' . |
|
672 | - 'data-event-format="' . $this->calendar->date_format . '" ' . |
|
673 | - 'itemprop="startDate" content="' . $start->toIso8601String() . '">' . |
|
674 | - date_i18n( $this->calendar->date_format, $start->getTimestamp() ) . |
|
675 | - '</span> ' . |
|
676 | - $time_start . |
|
677 | - $time_end; |
|
671 | + 'data-event-start="' . $start->getTimestamp() . '" ' . |
|
672 | + 'data-event-format="' . $this->calendar->date_format . '" ' . |
|
673 | + 'itemprop="startDate" content="' . $start->toIso8601String() . '">' . |
|
674 | + date_i18n( $this->calendar->date_format, $start->getTimestamp() ) . |
|
675 | + '</span> ' . |
|
676 | + $time_start . |
|
677 | + $time_end; |
|
678 | 678 | |
679 | 679 | } |
680 | 680 | |
@@ -733,11 +733,11 @@ discard block |
||
733 | 733 | } |
734 | 734 | |
735 | 735 | return '<span class="simcal-event-' . $bound . ' ' . 'simcal-event-' . $bound . '-' . $format . '" ' . |
736 | - 'data-event-' . $bound . '="' . $event_dt->getTimestamp() . '" ' . |
|
737 | - 'data-event-format="' . $dt_format . '" ' . |
|
738 | - 'itemprop="' . $bound . 'Date" content="' . $event_dt->toIso8601String() . '">' . |
|
739 | - $value . |
|
740 | - '</span>'; |
|
736 | + 'data-event-' . $bound . '="' . $event_dt->getTimestamp() . '" ' . |
|
737 | + 'data-event-format="' . $dt_format . '" ' . |
|
738 | + 'itemprop="' . $bound . 'Date" content="' . $event_dt->toIso8601String() . '">' . |
|
739 | + $value . |
|
740 | + '</span>'; |
|
741 | 741 | } |
742 | 742 | |
743 | 743 | /** |
@@ -956,35 +956,35 @@ discard block |
||
956 | 956 | $tagregexp = implode( '|', array_values( $this->tags ) ); |
957 | 957 | |
958 | 958 | return '/' |
959 | - . '\\[' // Opening bracket |
|
960 | - . '(\\[?)' // 1: Optional second opening bracket for escaping tags: [[tag]] |
|
961 | - . "($tagregexp)" // 2: Tag name |
|
962 | - . '(?![\\w-])' // Not followed by word character or hyphen |
|
963 | - . '(' // 3: Unroll the loop: Inside the opening tag |
|
964 | - . '[^\\]\\/]*' // Not a closing bracket or forward slash |
|
965 | - . '(?:' |
|
966 | - . '\\/(?!\\])' // A forward slash not followed by a closing bracket |
|
967 | - . '[^\\]\\/]*' // Not a closing bracket or forward slash |
|
968 | - . ')*?' |
|
969 | - . ')' |
|
970 | - . '(?:' |
|
971 | - . '(\\/)' // 4: Self closing tag ... |
|
972 | - . '\\]' // ... and closing bracket |
|
973 | - . '|' |
|
974 | - . '\\]' // Closing bracket |
|
975 | - . '(?:' |
|
976 | - . '(' // 5: Unroll the loop: Optionally, anything between the opening and closing tags |
|
977 | - . '[^\\[]*+' // Not an opening bracket |
|
978 | - . '(?:' |
|
979 | - . '\\[(?!\\/\\2\\])' // An opening bracket not followed by the closing tag |
|
980 | - . '[^\\[]*+' // Not an opening bracket |
|
981 | - . ')*+' |
|
982 | - . ')' |
|
983 | - . '\\[\\/\\2\\]' // Closing tag |
|
984 | - . ')?' |
|
985 | - . ')' |
|
986 | - . '(\\]?)' // 6: Optional second closing bracket for escaping tags: [[tag]] |
|
987 | - . '/s'; |
|
959 | + . '\\[' // Opening bracket |
|
960 | + . '(\\[?)' // 1: Optional second opening bracket for escaping tags: [[tag]] |
|
961 | + . "($tagregexp)" // 2: Tag name |
|
962 | + . '(?![\\w-])' // Not followed by word character or hyphen |
|
963 | + . '(' // 3: Unroll the loop: Inside the opening tag |
|
964 | + . '[^\\]\\/]*' // Not a closing bracket or forward slash |
|
965 | + . '(?:' |
|
966 | + . '\\/(?!\\])' // A forward slash not followed by a closing bracket |
|
967 | + . '[^\\]\\/]*' // Not a closing bracket or forward slash |
|
968 | + . ')*?' |
|
969 | + . ')' |
|
970 | + . '(?:' |
|
971 | + . '(\\/)' // 4: Self closing tag ... |
|
972 | + . '\\]' // ... and closing bracket |
|
973 | + . '|' |
|
974 | + . '\\]' // Closing bracket |
|
975 | + . '(?:' |
|
976 | + . '(' // 5: Unroll the loop: Optionally, anything between the opening and closing tags |
|
977 | + . '[^\\[]*+' // Not an opening bracket |
|
978 | + . '(?:' |
|
979 | + . '\\[(?!\\/\\2\\])' // An opening bracket not followed by the closing tag |
|
980 | + . '[^\\[]*+' // Not an opening bracket |
|
981 | + . ')*+' |
|
982 | + . ')' |
|
983 | + . '\\[\\/\\2\\]' // Closing tag |
|
984 | + . ')?' |
|
985 | + . ')' |
|
986 | + . '(\\]?)' // 6: Optional second closing bracket for escaping tags: [[tag]] |
|
987 | + . '/s'; |
|
988 | 988 | } |
989 | 989 | |
990 | 990 | } |
@@ -337,9 +337,9 @@ |
||
337 | 337 | |
338 | 338 | if ( version_compare( PHP_VERSION, '5.6', '<' ) ) { |
339 | 339 | $php = '<mark>' . PHP_VERSION . ' - ' . |
340 | - __( 'WordPress.org recommends upgrading to PHP 5.6 or higher for better security.', 'google-calendar-events' ) . |
|
341 | - ' <a href="https://wordpress.org/about/requirements/" target="_blank">' . __( 'Read more.', 'google-calendar-events' ) . '</a>' . |
|
342 | - '</mark>'; |
|
340 | + __( 'WordPress.org recommends upgrading to PHP 5.6 or higher for better security.', 'google-calendar-events' ) . |
|
341 | + ' <a href="https://wordpress.org/about/requirements/" target="_blank">' . __( 'Read more.', 'google-calendar-events' ) . '</a>' . |
|
342 | + '</mark>'; |
|
343 | 343 | } else { |
344 | 344 | $php = '<mark class="ok">' . PHP_VERSION . '</mark>'; |
345 | 345 | } |
@@ -82,12 +82,12 @@ discard block |
||
82 | 82 | return array( |
83 | 83 | 'name' => $this->feed->name, |
84 | 84 | 'description' => __( "To read events from your public Google Calendars you'll need create a Google API key and save it here.", 'google-calendar-events' ) . |
85 | - '<br/><br/>' . |
|
86 | - '<em style="font-size: 14px;">' . |
|
87 | - sprintf( __( '<strong>Note:</strong> Calendars configured to use the <strong><a href="%s" target="_blank">Google Calendar Pro add-on</a></strong> use a different method of authorization.', 'google-calendar-events' ), |
|
88 | - simcal_ga_campaign_url( simcal_get_url( 'addons' ), 'core-plugin', 'settings-link' ) |
|
89 | - ) . |
|
90 | - '</em>', |
|
85 | + '<br/><br/>' . |
|
86 | + '<em style="font-size: 14px;">' . |
|
87 | + sprintf( __( '<strong>Note:</strong> Calendars configured to use the <strong><a href="%s" target="_blank">Google Calendar Pro add-on</a></strong> use a different method of authorization.', 'google-calendar-events' ), |
|
88 | + simcal_ga_campaign_url( simcal_get_url( 'addons' ), 'core-plugin', 'settings-link' ) |
|
89 | + ) . |
|
90 | + '</em>', |
|
91 | 91 | 'fields' => array( |
92 | 92 | 'api_key' => array( |
93 | 93 | 'type' => 'standard', |
@@ -273,12 +273,12 @@ discard block |
||
273 | 273 | 'post' => $post_id, |
274 | 274 | 'dismissable' => false, |
275 | 275 | 'content' => '<p>' . |
276 | - '<i class="simcal-icon-warning"></i> ' . |
|
277 | - sprintf( |
|
278 | - __( 'Your Google Calendar events will not show up until you <a href="%s">create and save a Google API key</a>.', 'google-calendar-events' ), |
|
279 | - admin_url( 'edit.php?post_type=calendar&page=simple-calendar_settings&tab=feeds' ) |
|
280 | - ) . |
|
281 | - '</p>', |
|
276 | + '<i class="simcal-icon-warning"></i> ' . |
|
277 | + sprintf( |
|
278 | + __( 'Your Google Calendar events will not show up until you <a href="%s">create and save a Google API key</a>.', 'google-calendar-events' ), |
|
279 | + admin_url( 'edit.php?post_type=calendar&page=simple-calendar_settings&tab=feeds' ) |
|
280 | + ) . |
|
281 | + '</p>', |
|
282 | 282 | ) |
283 | 283 | ); |
284 | 284 | |
@@ -305,11 +305,11 @@ discard block |
||
305 | 305 | 'post' => $post_id, |
306 | 306 | 'dismissable' => false, |
307 | 307 | 'content' => '<p>' . |
308 | - '<i class="simcal-icon-warning"></i> ' . |
|
309 | - __( 'While trying to retrieve events, Google returned an error:', 'google-calendar-events' ) . |
|
310 | - '<br>' . $message . '<br>' . |
|
311 | - __( 'Please ensure that both your Google Calendar ID and API Key are valid and that the Google Calendar you want to display is public.', 'google-calendar-events' ) . |
|
312 | - '</p>', |
|
308 | + '<i class="simcal-icon-warning"></i> ' . |
|
309 | + __( 'While trying to retrieve events, Google returned an error:', 'google-calendar-events' ) . |
|
310 | + '<br>' . $message . '<br>' . |
|
311 | + __( 'Please ensure that both your Google Calendar ID and API Key are valid and that the Google Calendar you want to display is public.', 'google-calendar-events' ) . |
|
312 | + '</p>', |
|
313 | 313 | ) |
314 | 314 | ); |
315 | 315 |