Event Calendar WD – Responsive Event Calendar plugin - Version 1.0.14

Version Description

Fixed: Conflict with Avada theme Added: Date to events link

Download this release

Release Info

Developer webdorado
Plugin Icon 128x128 Event Calendar WD – Responsive Event Calendar plugin
Version 1.0.14
Comparing to
See all releases

Code changes from version 1.0.13 to 1.0.14

Files changed (12) hide show
  1. ecwd.php +1 -1
  2. ecwd_admin_class.php +1 -1
  3. ecwd_class.php +2 -2
  4. includes/ecwd-cpt-class.php +8 -0
  5. includes/ecwd-display-class.php +48 -18
  6. includes/ecwd-event-class.php +23 -1
  7. readme.txt +5 -1
  8. views/admin/addons.php +7 -1
  9. views/ecwd-event-content.php +3 -3
  10. views/ecwd-organizer-content.php +3 -3
  11. views/ecwd-venue-content.php +3 -3
  12. views/single-event.php +84 -42
ecwd.php CHANGED
@@ -3,7 +3,7 @@
3
  * Plugin Name: Event Calendar WD
4
  * Plugin URI: https://web-dorado.com/products/wordpress-event-calendar-wd.html
5
  * Description: Event Calendar WD is an easy event management and planning tool with advanced features.
6
- * Version: 1.0.13
7
  * Author: WebDorado
8
  * Author URI: http://web-dorado.com
9
  * License: GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
3
  * Plugin Name: Event Calendar WD
4
  * Plugin URI: https://web-dorado.com/products/wordpress-event-calendar-wd.html
5
  * Description: Event Calendar WD is an easy event management and planning tool with advanced features.
6
+ * Version: 1.0.14
7
  * Author: WebDorado
8
  * Author URI: http://web-dorado.com
9
  * License: GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
ecwd_admin_class.php CHANGED
@@ -6,7 +6,7 @@
6
  class ECWD_Admin {
7
 
8
  protected static $instance = null;
9
- protected $version = '1.0.13';
10
  protected $ecwd_page = null;
11
 
12
  private function __construct() {
6
  class ECWD_Admin {
7
 
8
  protected static $instance = null;
9
+ protected $version = '1.0.14';
10
  protected $ecwd_page = null;
11
 
12
  private function __construct() {
ecwd_class.php CHANGED
@@ -6,10 +6,10 @@
6
  */
7
  class ECWD {
8
 
9
- protected $version = '1.0.13';
10
  protected $plugin_name = 'event-calendar-wd';
11
  protected $prefix = 'ecwd';
12
- protected $old_version = '1.4.11';
13
  protected static $instance = null;
14
 
15
  private function __construct() {
6
  */
7
  class ECWD {
8
 
9
+ protected $version = '1.0.14';
10
  protected $plugin_name = 'event-calendar-wd';
11
  protected $prefix = 'ecwd';
12
+ protected $old_version = '1.0.13';
13
  protected static $instance = null;
14
 
15
  private function __construct() {
includes/ecwd-cpt-class.php CHANGED
@@ -64,6 +64,7 @@ class ECWD_Cpt {
64
  $this,
65
  'taxonomy_column'
66
  ), 10, 3 );
 
67
  add_filter( 'generate_rewrite_rules', array( $this, 'filterRewriteRules' ), 2 );
68
 
69
 
@@ -392,6 +393,13 @@ class ECWD_Cpt {
392
 
393
  }
394
 
 
 
 
 
 
 
 
395
  public function filterRewriteRules( $wp_rewrite ) {
396
  global $ecwd_options;
397
  if ( ! isset( $ecwd_options['enable_rewrite'] ) || $ecwd_options['enable_rewrite'] == 1 ) {
64
  $this,
65
  'taxonomy_column'
66
  ), 10, 3 );
67
+ add_filter( 'query_vars', array( $this, 'ecwdEventQueryVars' ) );
68
  add_filter( 'generate_rewrite_rules', array( $this, 'filterRewriteRules' ), 2 );
69
 
70
 
393
 
394
  }
395
 
396
+ public function ecwdEventQueryVars( $qvars ) {
397
+ $qvars[] = 'eventDate';
398
+ $qvars[] = self::EVENT_POST_TYPE;
399
+
400
+ return $qvars;
401
+ }
402
+
403
  public function filterRewriteRules( $wp_rewrite ) {
404
  global $ecwd_options;
405
  if ( ! isset( $ecwd_options['enable_rewrite'] ) || $ecwd_options['enable_rewrite'] == 1 ) {
includes/ecwd-display-class.php CHANGED
@@ -309,11 +309,19 @@ class ECWD_Display {
309
  /**
310
  * Returns array of days with events, with sub-arrays of events for that day
311
  */
312
- public function get_event_days( $events = '', $current_month = 1 ) {
 
 
 
313
  if ( ! $events ) {
314
  $events = $this->merged_events;
315
 
316
  }
 
 
 
 
 
317
  foreach ( $events as $id => $arr ) {
318
 
319
  if ( is_int( $arr->start_time ) ) {
@@ -359,21 +367,23 @@ class ECWD_Display {
359
  if ( $metas && isset( $metas[ ECWD_PLUGIN_PREFIX . '_event_organizers' ][0] ) ) {
360
  if ( is_serialized( $metas[ ECWD_PLUGIN_PREFIX . '_event_organizers' ][0] ) ) {
361
  $organizers_ids = unserialize( $metas[ ECWD_PLUGIN_PREFIX . '_event_organizers' ][0] );
362
- }elseif(is_array($metas[ ECWD_PLUGIN_PREFIX . '_event_organizers' ][0] )){
363
  $organizers_ids = $metas[ ECWD_PLUGIN_PREFIX . '_event_organizers' ][0];
364
- }else{
365
  $organizers_ids = array();
366
  }
367
- foreach ( $organizers_ids as $organizer_id ) {
368
- if ( $organizer_id ) {
369
- $opost = get_post( $organizer_id );
370
- if ( $opost ) {
371
- $organizers[] = array(
372
- 'id' => $opost->ID,
373
- 'name' => $opost->post_title,
374
- 'permalink' => get_permalink( $opost->ID )
375
- );
376
- $organizersIDs[] = $opost->ID;
 
 
377
  }
378
  }
379
  }
@@ -423,8 +433,7 @@ class ECWD_Display {
423
  $event_week_last_day = '';
424
  if ( $metas[ ECWD_PLUGIN_PREFIX . '_event_repeat_event' ][0] == 'weekly' ) {
425
  $days = array();
426
- if ( isset( $metas[ ECWD_PLUGIN_PREFIX . '_event_day' ][0] ) && $metas[ ECWD_PLUGIN_PREFIX . '_event_day' ][0] != '' ) {
427
-
428
 
429
  if ( is_serialized( $metas[ ECWD_PLUGIN_PREFIX . '_event_day' ][0] ) ) {
430
  $days = unserialize( $metas[ ECWD_PLUGIN_PREFIX . '_event_day' ][0] );
@@ -436,6 +445,9 @@ class ECWD_Display {
436
  }
437
 
438
  $until = ( isset( $metas[ ECWD_PLUGIN_PREFIX . '_event_repeat_repeat_until' ][0] ) ? $metas[ ECWD_PLUGIN_PREFIX . '_event_repeat_repeat_until' ][0] : $to );
 
 
 
439
  $how = ( isset( $metas[ ECWD_PLUGIN_PREFIX . '_event_repeat_how' ][0] ) ? $metas[ ECWD_PLUGIN_PREFIX . '_event_repeat_how' ][0] : 1 );
440
  if ( count( $days ) ) {
441
  $event_week_last_day = $days[ count( $days ) - 1 ];
@@ -468,6 +480,9 @@ class ECWD_Display {
468
 
469
 
470
  if ( ! $current_month || ( strtotime( $from ) <= strtotime( $this->end_date ) && strtotime( $from ) >= strtotime( $this->start_date ) && in_array( strtolower( date( 'l', strtotime( $from ) ) ), $weekdays ) ) ) {
 
 
 
471
  $this->events[] = array(
472
  'color' => $color,
473
  'title' => $title,
@@ -497,6 +512,10 @@ class ECWD_Display {
497
  }
498
  } elseif ( $metas[ ECWD_PLUGIN_PREFIX . '_event_repeat_event' ][0] == 'daily' ) {
499
  $until = ( isset( $metas[ ECWD_PLUGIN_PREFIX . '_event_repeat_repeat_until' ][0] ) ? $metas[ ECWD_PLUGIN_PREFIX . '_event_repeat_repeat_until' ][0] : $to );
 
 
 
 
500
  $how = ( isset( $metas[ ECWD_PLUGIN_PREFIX . '_event_repeat_how' ][0] ) ? $metas[ ECWD_PLUGIN_PREFIX . '_event_repeat_how' ][0] : 1 );
501
  $eventdays = $this->dateDiff( $from, $until );
502
  $eventdayslong = $this->dateDiff( $from, $to );
@@ -514,7 +533,11 @@ class ECWD_Display {
514
  $from_date = date( 'Y-m-d', $from_date );
515
  $from = $date;
516
  $to = date( 'Y-m-d', strtotime( $from . ' + ' . $eventdayslong . ' days' ) );
 
517
  if ( ! $current_month || ( strtotime( $from ) <= strtotime( $this->end_date ) && strtotime( $from ) >= strtotime( $this->start_date ) && in_array( strtolower( date( 'l', strtotime( $from ) ) ), $weekdays ) ) ) {
 
 
 
518
  $this->events[] = array(
519
  'color' => $color,
520
  'title' => $title,
@@ -581,7 +604,9 @@ class ECWD_Display {
581
  $to = strtotime( ( date( "Y-m-d", ( strtotime( $from ) ) ) . " +" . ( $eventdayslong ) . " days" ) );
582
  $to = date( 'Y-m-d', $to );
583
  if ( ! $current_month || ( strtotime( $from ) <= strtotime( $this->end_date ) && strtotime( $from ) >= strtotime( $this->start_date ) && in_array( strtolower( date( 'l', strtotime( $from ) ) ), $weekdays ) ) ) {
584
-
 
 
585
  $this->events[] = array(
586
  'color' => $color,
587
  'title' => $title,
@@ -662,7 +687,9 @@ class ECWD_Display {
662
  $to = strtotime( ( date( "Y-m-d", ( strtotime( $from_date ) ) ) . " +" . ( $eventdayslong ) . " days" ) );
663
  $to = date( 'Y-m-d', $to );
664
  if ( ! $current_month || ( strtotime( $from ) <= strtotime( $this->end_date ) && strtotime( $from ) >= strtotime( $this->start_date ) && in_array( strtolower( date( 'l', strtotime( $from ) ) ), $weekdays ) ) ) {
665
-
 
 
666
  $this->events[] = array(
667
  'color' => $color,
668
  'title' => $title,
@@ -699,7 +726,10 @@ class ECWD_Display {
699
 
700
  $date = strtotime( date( "Y-m-d", strtotime( $from ) ) );
701
  $date = date( "Y-n-j", $date );
702
- if ( ! $current_month || ( strtotime( $from ) <= strtotime( date( 'Y-m-t', strtotime( $this->date ) ) ) && strtotime( $from ) >= strtotime( $this->year . '-' . $this->month . '-1' ) && in_array( strtolower( date( 'l', strtotime( $from ) ) ), $weekdays ) ) ) {
 
 
 
703
  $this->events[] = array(
704
  'color' => $color,
705
  'title' => $title,
309
  /**
310
  * Returns array of days with events, with sub-arrays of events for that day
311
  */
312
+ /**
313
+ * Returns array of days with events, with sub-arrays of events for that day
314
+ */
315
+ public function get_event_days( $events = '', $current_month = 1, $start_date = '', $end_date = '' ) {
316
  if ( ! $events ) {
317
  $events = $this->merged_events;
318
 
319
  }
320
+ if ( $start_date && $end_date ) {
321
+ $this->start_date = $start_date;
322
+ $this->end_date = $end_date;
323
+ }
324
+
325
  foreach ( $events as $id => $arr ) {
326
 
327
  if ( is_int( $arr->start_time ) ) {
367
  if ( $metas && isset( $metas[ ECWD_PLUGIN_PREFIX . '_event_organizers' ][0] ) ) {
368
  if ( is_serialized( $metas[ ECWD_PLUGIN_PREFIX . '_event_organizers' ][0] ) ) {
369
  $organizers_ids = unserialize( $metas[ ECWD_PLUGIN_PREFIX . '_event_organizers' ][0] );
370
+ } elseif ( is_array( $metas[ ECWD_PLUGIN_PREFIX . '_event_organizers' ][0] ) ) {
371
  $organizers_ids = $metas[ ECWD_PLUGIN_PREFIX . '_event_organizers' ][0];
372
+ } else {
373
  $organizers_ids = array();
374
  }
375
+ if ( $organizers_ids ) {
376
+ foreach ( $organizers_ids as $organizer_id ) {
377
+ if ( $organizer_id ) {
378
+ $opost = get_post( $organizer_id );
379
+ if ( $opost ) {
380
+ $organizers[] = array(
381
+ 'id' => $opost->ID,
382
+ 'name' => $opost->post_title,
383
+ 'permalink' => get_permalink( $opost->ID )
384
+ );
385
+ $organizersIDs[] = $opost->ID;
386
+ }
387
  }
388
  }
389
  }
433
  $event_week_last_day = '';
434
  if ( $metas[ ECWD_PLUGIN_PREFIX . '_event_repeat_event' ][0] == 'weekly' ) {
435
  $days = array();
436
+ if ( isset( $metas[ ECWD_PLUGIN_PREFIX . '_event_day' ][0] ) && $metas[ ECWD_PLUGIN_PREFIX . '_event_day' ][0] != '' && $metas[ ECWD_PLUGIN_PREFIX . '_event_day' ][0] != 1 ) {
 
437
 
438
  if ( is_serialized( $metas[ ECWD_PLUGIN_PREFIX . '_event_day' ][0] ) ) {
439
  $days = unserialize( $metas[ ECWD_PLUGIN_PREFIX . '_event_day' ][0] );
445
  }
446
 
447
  $until = ( isset( $metas[ ECWD_PLUGIN_PREFIX . '_event_repeat_repeat_until' ][0] ) ? $metas[ ECWD_PLUGIN_PREFIX . '_event_repeat_repeat_until' ][0] : $to );
448
+ if(strtotime($until)>strtotime($this->end_date)){
449
+ $until = $this->end_date;
450
+ }
451
  $how = ( isset( $metas[ ECWD_PLUGIN_PREFIX . '_event_repeat_how' ][0] ) ? $metas[ ECWD_PLUGIN_PREFIX . '_event_repeat_how' ][0] : 1 );
452
  if ( count( $days ) ) {
453
  $event_week_last_day = $days[ count( $days ) - 1 ];
480
 
481
 
482
  if ( ! $current_month || ( strtotime( $from ) <= strtotime( $this->end_date ) && strtotime( $from ) >= strtotime( $this->start_date ) && in_array( strtolower( date( 'l', strtotime( $from ) ) ), $weekdays ) ) ) {
483
+ if($permalink){
484
+ $permalink = ECWD_Event::getLink($post, $from);
485
+ }
486
  $this->events[] = array(
487
  'color' => $color,
488
  'title' => $title,
512
  }
513
  } elseif ( $metas[ ECWD_PLUGIN_PREFIX . '_event_repeat_event' ][0] == 'daily' ) {
514
  $until = ( isset( $metas[ ECWD_PLUGIN_PREFIX . '_event_repeat_repeat_until' ][0] ) ? $metas[ ECWD_PLUGIN_PREFIX . '_event_repeat_repeat_until' ][0] : $to );
515
+
516
+ if(strtotime($until)>strtotime($this->end_date)){
517
+ $until = $this->end_date;
518
+ }
519
  $how = ( isset( $metas[ ECWD_PLUGIN_PREFIX . '_event_repeat_how' ][0] ) ? $metas[ ECWD_PLUGIN_PREFIX . '_event_repeat_how' ][0] : 1 );
520
  $eventdays = $this->dateDiff( $from, $until );
521
  $eventdayslong = $this->dateDiff( $from, $to );
533
  $from_date = date( 'Y-m-d', $from_date );
534
  $from = $date;
535
  $to = date( 'Y-m-d', strtotime( $from . ' + ' . $eventdayslong . ' days' ) );
536
+
537
  if ( ! $current_month || ( strtotime( $from ) <= strtotime( $this->end_date ) && strtotime( $from ) >= strtotime( $this->start_date ) && in_array( strtolower( date( 'l', strtotime( $from ) ) ), $weekdays ) ) ) {
538
+ if($permalink){
539
+ $permalink = ECWD_Event::getLink($post, $from);
540
+ }
541
  $this->events[] = array(
542
  'color' => $color,
543
  'title' => $title,
604
  $to = strtotime( ( date( "Y-m-d", ( strtotime( $from ) ) ) . " +" . ( $eventdayslong ) . " days" ) );
605
  $to = date( 'Y-m-d', $to );
606
  if ( ! $current_month || ( strtotime( $from ) <= strtotime( $this->end_date ) && strtotime( $from ) >= strtotime( $this->start_date ) && in_array( strtolower( date( 'l', strtotime( $from ) ) ), $weekdays ) ) ) {
607
+ if($permalink){
608
+ $permalink = ECWD_Event::getLink($post, $from);
609
+ }
610
  $this->events[] = array(
611
  'color' => $color,
612
  'title' => $title,
687
  $to = strtotime( ( date( "Y-m-d", ( strtotime( $from_date ) ) ) . " +" . ( $eventdayslong ) . " days" ) );
688
  $to = date( 'Y-m-d', $to );
689
  if ( ! $current_month || ( strtotime( $from ) <= strtotime( $this->end_date ) && strtotime( $from ) >= strtotime( $this->start_date ) && in_array( strtolower( date( 'l', strtotime( $from ) ) ), $weekdays ) ) ) {
690
+ if($permalink){
691
+ $permalink = ECWD_Event::getLink($post, $from);
692
+ }
693
  $this->events[] = array(
694
  'color' => $color,
695
  'title' => $title,
726
 
727
  $date = strtotime( date( "Y-m-d", strtotime( $from ) ) );
728
  $date = date( "Y-n-j", $date );
729
+ if ( ! $current_month || ( strtotime( $from ) <= strtotime( $this->end_date ) && strtotime( $from ) >= strtotime( $this->start_date ) && in_array( strtolower( date( 'l', strtotime( $from ) ) ), $weekdays ) ) ) {
730
+ if($permalink){
731
+ $permalink = ECWD_Event::getLink($post, $from);
732
+ }
733
  $this->events[] = array(
734
  'color' => $color,
735
  'title' => $title,
includes/ecwd-event-class.php CHANGED
@@ -10,7 +10,6 @@ class ECWD_Event {
10
  *
11
  */
12
  public function __construct($id, $calendar_id, $title, $description, $location, $start_time, $end_time, $url, $latLong = '', $permalink = '', $event='', $term_metas = '', $metas = '', $image='') {
13
-
14
  $this->event_id = $id;
15
  $this->calendar_id = $calendar_id;
16
  $this->title = $title;
@@ -229,4 +228,27 @@ class ECWD_Event {
229
  }
230
  }
231
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
232
  }
10
  *
11
  */
12
  public function __construct($id, $calendar_id, $title, $description, $location, $start_time, $end_time, $url, $latLong = '', $permalink = '', $event='', $term_metas = '', $metas = '', $image='') {
 
13
  $this->event_id = $id;
14
  $this->calendar_id = $calendar_id;
15
  $this->title = $title;
228
  }
229
  }
230
 
231
+
232
+ public static function getLink( $event, $date ) {
233
+ // if permalinks are off use ugly links.
234
+ $date = date('Y-m-d', strtotime($date));
235
+ if ( '' == get_option( 'permalink_structure' ) ) {
236
+ return esc_url_raw( self::uglyLink($event,$date ) );
237
+ }
238
+
239
+ $link = trailingslashit( get_permalink( $event->ID ) );
240
+ $eventUrl = trailingslashit( esc_url_raw( $link ) );
241
+ $eventUrl = trailingslashit( esc_url_raw( $eventUrl . $date ) );
242
+ //$eventUrl = add_query_arg('eventDate', $date, $eventUrl );
243
+ return $eventUrl;
244
+
245
+ }
246
+
247
+ public static function uglyLink( $event, $date ) {
248
+ $eventUrl = add_query_arg( 'post_type', 'ecwd_event', home_url() );
249
+ $eventUrl = add_query_arg( array( 'eventDate' => $date ), get_permalink($event->ID) );
250
+ return $eventUrl;
251
+ }
252
+
253
+
254
  }
readme.txt CHANGED
@@ -4,7 +4,7 @@ Donate link: https://web-dorado.com/products/wordpress-event-calendar-wd.html
4
  Tags: calendar, calendars, event, event calendar, event manager, events calendar, calendar widget, event registration, event management,events, agenda, holiday calendar , scheduling, free calendar, Calender, upcoming events , event widget , event list, calendar localization, Organizer, editorial calendar, Interactive Calendar, news calendar, meeting , appointment, event tracking, event organizer, upcoming events widget, event page, event bookings, recurring, recurring events, conference, date, dates, schedule, times, venue, AJAX, responsive, shortcode, seminar, summit
5
  Requires at least: 3.9
6
  Tested up to: 4.2
7
- Stable tag: 1.0.13
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -130,6 +130,10 @@ After downloading the ZIP file of the Event Calendar WD plugin,
130
 
131
  == Changelog ==
132
 
 
 
 
 
133
  = 1.0.13 =
134
  Changed: Calendar Add-ons page
135
 
4
  Tags: calendar, calendars, event, event calendar, event manager, events calendar, calendar widget, event registration, event management,events, agenda, holiday calendar , scheduling, free calendar, Calender, upcoming events , event widget , event list, calendar localization, Organizer, editorial calendar, Interactive Calendar, news calendar, meeting , appointment, event tracking, event organizer, upcoming events widget, event page, event bookings, recurring, recurring events, conference, date, dates, schedule, times, venue, AJAX, responsive, shortcode, seminar, summit
5
  Requires at least: 3.9
6
  Tested up to: 4.2
7
+ Stable tag: 1.0.14
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
130
 
131
  == Changelog ==
132
 
133
+ = 1.0.14 =
134
+ Fixed: Conflict with Avada theme
135
+ Added: Date to events link
136
+
137
  = 1.0.13 =
138
  Changed: Calendar Add-ons page
139
 
views/admin/addons.php CHANGED
@@ -18,6 +18,12 @@ if (!defined('ABSPATH')) {
18
  <div id="ecwd-settings">
19
  <div id="ecwd-settings-content" >
20
  <h2 id="add_on_title"><?php echo esc_html(get_admin_page_title()); ?></h2>
 
 
 
 
 
 
21
  <?php
22
  if($addons){
23
  foreach ($addons as $name=>$cat) {
@@ -67,4 +73,4 @@ if (!defined('ABSPATH')) {
67
  <!-- #ecwd-settings-content -->
68
  </div>
69
  <!-- #ecwd-settings -->
70
- </div><!-- .wrap -->
18
  <div id="ecwd-settings">
19
  <div id="ecwd-settings-content" >
20
  <h2 id="add_on_title"><?php echo esc_html(get_admin_page_title()); ?></h2>
21
+ <div>
22
+ <p>
23
+ <span style="color: #ba281e; font-size: 20px;">Attention:</span> Add-ons are supported by premium version of Event Calendar WD
24
+ </p>
25
+ </div>
26
+
27
  <?php
28
  if($addons){
29
  foreach ($addons as $name=>$cat) {
73
  <!-- #ecwd-settings-content -->
74
  </div>
75
  <!-- #ecwd-settings -->
76
+ </div><!-- .wrap -->``
views/ecwd-event-content.php CHANGED
@@ -11,7 +11,7 @@ $meta = get_post_meta( $post_id );
11
 
12
  $date_format = 'Y-m-d';
13
  $time_format = 'H:i';
14
- $social_icons = false;
15
  if ( isset( $ecwd_options['date_format'] ) && $ecwd_options['date_format'] != '' ) {
16
  $date_format = $ecwd_options['date_format'];
17
  }
@@ -19,7 +19,7 @@ if ( isset( $ecwd_options['time_format'] ) && $ecwd_options['time_format'] != ''
19
  $time_format = $ecwd_options['time_format'];
20
  }
21
  if ( isset( $ecwd_options['social_icons'] ) && $ecwd_options['social_icons'] != '' ) {
22
- $social_icons = $ecwd_options['social_icons'];
23
  }
24
  // Load up all post meta data
25
  $ecwd_event_location = get_post_meta( $post->ID, ECWD_PLUGIN_PREFIX . '_event_location', true );
@@ -121,7 +121,7 @@ if ( is_array( $ecwd_event_organizers ) || is_object( $ecwd_event_organizers ) )
121
  <?php } ?>
122
  </div>
123
  </div>
124
- <?php if ( $social_icons ) {
125
  ?>
126
  <div class="ecwd-social">
127
  <span class="share-links">
11
 
12
  $date_format = 'Y-m-d';
13
  $time_format = 'H:i';
14
+ $ecwd_social_icons = false;
15
  if ( isset( $ecwd_options['date_format'] ) && $ecwd_options['date_format'] != '' ) {
16
  $date_format = $ecwd_options['date_format'];
17
  }
19
  $time_format = $ecwd_options['time_format'];
20
  }
21
  if ( isset( $ecwd_options['social_icons'] ) && $ecwd_options['social_icons'] != '' ) {
22
+ $ecwd_social_icons = $ecwd_options['social_icons'];
23
  }
24
  // Load up all post meta data
25
  $ecwd_event_location = get_post_meta( $post->ID, ECWD_PLUGIN_PREFIX . '_event_location', true );
121
  <?php } ?>
122
  </div>
123
  </div>
124
+ <?php if ( $ecwd_social_icons ) {
125
  ?>
126
  <div class="ecwd-social">
127
  <span class="share-links">
views/ecwd-organizer-content.php CHANGED
@@ -8,7 +8,7 @@ $post_id = $post->ID;
8
 
9
  $date_format = 'Y-m-d';
10
  $time_format = 'H:i';
11
- $social_icons = false;
12
  $events = array();
13
  if ( isset( $ecwd_options['date_format'] ) && $ecwd_options['date_format'] != '' ) {
14
  $date_format = $ecwd_options['date_format'];
@@ -17,7 +17,7 @@ if ( isset( $ecwd_options['time_format'] ) && $ecwd_options['time_format'] != ''
17
  $time_format = $ecwd_options['time_format'];
18
  }
19
  if ( isset( $ecwd_options['social_icons'] ) && $ecwd_options['social_icons'] != '' ) {
20
- $social_icons = $ecwd_options['social_icons'];
21
  }
22
  $organizer_url = get_permalink( $post_id );
23
 
@@ -81,7 +81,7 @@ echo $content;
81
  ?>
82
 
83
  <div class="ecwd-organizer">
84
- <?php if ( $social_icons ) { ?>
85
  <div class="ecwd-social">
86
  <span class="share-links">
87
  <a href="http://twitter.com/home?status=<?php echo get_permalink( $post_id ) ?>" class="ecwd-twitter"
8
 
9
  $date_format = 'Y-m-d';
10
  $time_format = 'H:i';
11
+ $ecwd_social_icons = false;
12
  $events = array();
13
  if ( isset( $ecwd_options['date_format'] ) && $ecwd_options['date_format'] != '' ) {
14
  $date_format = $ecwd_options['date_format'];
17
  $time_format = $ecwd_options['time_format'];
18
  }
19
  if ( isset( $ecwd_options['social_icons'] ) && $ecwd_options['social_icons'] != '' ) {
20
+ $ecwd_social_icons = $ecwd_options['social_icons'];
21
  }
22
  $organizer_url = get_permalink( $post_id );
23
 
81
  ?>
82
 
83
  <div class="ecwd-organizer">
84
+ <?php if ( $ecwd_social_icons ) { ?>
85
  <div class="ecwd-social">
86
  <span class="share-links">
87
  <a href="http://twitter.com/home?status=<?php echo get_permalink( $post_id ) ?>" class="ecwd-twitter"
views/ecwd-venue-content.php CHANGED
@@ -5,7 +5,7 @@
5
 
6
  $date_format = 'Y-m-d';
7
  $time_format = 'H:i';
8
- $social_icons = false;
9
  if ( isset( $ecwd_options['date_format'] ) && $ecwd_options['date_format'] != '' ) {
10
  $date_format = $ecwd_options['date_format'];
11
  }
@@ -13,7 +13,7 @@ if ( isset( $ecwd_options['time_format'] ) && $ecwd_options['time_format'] != ''
13
  $time_format = $ecwd_options['time_format'];
14
  }
15
  if ( isset( $ecwd_options['social_icons'] ) && $ecwd_options['social_icons'] != '' ) {
16
- $social_icons = $ecwd_options['social_icons'];
17
  }
18
 
19
  $post_id = $post->ID;
@@ -92,7 +92,7 @@ echo $content;
92
  ?>
93
 
94
  <div class="ecwd-venue">
95
- <?php if ( $social_icons ) { ?>
96
  <div class="ecwd-social">
97
  <span class="share-links">
98
  <a href="http://twitter.com/home?status=<?php echo get_permalink( $post_id ) ?>" class="ecwd-twitter"
5
 
6
  $date_format = 'Y-m-d';
7
  $time_format = 'H:i';
8
+ $ecwd_social_icons = false;
9
  if ( isset( $ecwd_options['date_format'] ) && $ecwd_options['date_format'] != '' ) {
10
  $date_format = $ecwd_options['date_format'];
11
  }
13
  $time_format = $ecwd_options['time_format'];
14
  }
15
  if ( isset( $ecwd_options['social_icons'] ) && $ecwd_options['social_icons'] != '' ) {
16
+ $ecwd_social_icons = $ecwd_options['social_icons'];
17
  }
18
 
19
  $post_id = $post->ID;
92
  ?>
93
 
94
  <div class="ecwd-venue">
95
+ <?php if ( $ecwd_social_icons ) { ?>
96
  <div class="ecwd-social">
97
  <span class="share-links">
98
  <a href="http://twitter.com/home?status=<?php echo get_permalink( $post_id ) ?>" class="ecwd-twitter"
views/single-event.php CHANGED
@@ -9,13 +9,14 @@ if ( ! defined( 'ABSPATH' ) ) {
9
  global $post;
10
  global $wp;
11
  global $ecwd_options;
 
12
 
13
  $post_id = $post->ID;
14
  $meta = get_post_meta( $post_id );
15
 
16
- $date_format = 'Y-m-d';
17
- $time_format = 'H:i';
18
- $social_icons = false;
19
  if ( isset( $ecwd_options['date_format'] ) && $ecwd_options['date_format'] != '' ) {
20
  $date_format = $ecwd_options['date_format'];
21
  }
@@ -23,13 +24,49 @@ if ( isset( $ecwd_options['time_format'] ) && $ecwd_options['time_format'] != ''
23
  $time_format = $ecwd_options['time_format'];
24
  }
25
  if ( isset( $ecwd_options['social_icons'] ) && $ecwd_options['social_icons'] != '' ) {
26
- $social_icons = $ecwd_options['social_icons'];
27
  }
28
  // Load up all post meta data
29
- $ecwd_event_location = get_post_meta( $post->ID, ECWD_PLUGIN_PREFIX . '_event_location', true );
30
- $ecwd_event_latlong = get_post_meta( $post->ID, ECWD_PLUGIN_PREFIX . '_lat_long', true );
31
- $ecwd_event_zoom = get_post_meta( $post->ID, ECWD_PLUGIN_PREFIX . '_map_zoom', true );
32
- $ecwd_event_show_map = get_post_meta( $post->ID, ECWD_PLUGIN_PREFIX . '_event_show_map', true );
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
33
  if ( $ecwd_event_show_map == '' ) {
34
  $ecwd_event_show_map = 1;
35
  }
@@ -37,15 +74,16 @@ if ( ! $ecwd_event_zoom ) {
37
  $ecwd_event_zoom = 17;
38
  }
39
 
40
- $ecwd_event_organizers = get_post_meta( $post->ID, ECWD_PLUGIN_PREFIX . '_event_organizers', true );
41
- $ecwd_event_date_from = get_post_meta( $post->ID, ECWD_PLUGIN_PREFIX . '_event_date_from', true );
42
- $ecwd_event_date_to = get_post_meta( $post->ID, ECWD_PLUGIN_PREFIX . '_event_date_to', true );
43
- $ecwd_event_url = get_post_meta( $post->ID, ECWD_PLUGIN_PREFIX . '_event_url', true );
44
- $ecwd_event_video = get_post_meta( $post->ID, ECWD_PLUGIN_PREFIX . '_event_video', true );
45
- $ecwd_all_day_event = get_post_meta( $post->ID, ECWD_PLUGIN_PREFIX . '_all_day_event', true );
46
- $venue = '';
47
- $venue_permalink = '';
48
- $venue_post_id = get_post_meta( $post->ID, ECWD_PLUGIN_PREFIX . '_event_venue', true );
 
49
  if ( $venue_post_id ) {
50
  $venue_post = get_post( $venue_post_id );
51
  if ( $venue_post ) {
@@ -54,8 +92,8 @@ if ( $venue_post_id ) {
54
  }
55
  }
56
 
57
- $this_event_url = get_permalink( $post->ID );
58
- $organizers = array();
59
  if ( is_array( $ecwd_event_organizers ) || is_object( $ecwd_event_organizers ) ) {
60
  foreach ( $ecwd_event_organizers as $ecwd_event_organizer ) {
61
  $organizers[] = get_post( $ecwd_event_organizer, ARRAY_A );
@@ -100,24 +138,24 @@ get_header();
100
  <div class="event-detalis-date">
101
  <label class="ecwd-event-date-info"
102
  title="<?php _e( 'Date', 'ecwd' ); ?>"></label>
103
- <span class="ecwd-event-date" itemprop="startDate"
104
- content="<?php echo date( 'Y-m-d', strtotime( $ecwd_event_date_from ) ) . 'T' . date( 'H:i', strtotime( $ecwd_event_date_from ) ) ?>">
105
- <?php if ( $ecwd_all_day_event == 1 ) {
106
- echo date( $date_format, strtotime( $ecwd_event_date_from ) );
107
- if ( $ecwd_all_day_event == 1 ) {
108
- if ( $ecwd_event_date_to && date( $date_format, strtotime( $ecwd_event_date_from ) ) !== date( $date_format, strtotime( $ecwd_event_date_to ) ) ) {
109
- echo ' - ' . date( $date_format, strtotime( $ecwd_event_date_to ) );
110
- }
111
- echo ' ' . __( 'All day', 'ecwd' );
112
- }
113
- } else {
114
- echo date( $date_format, strtotime( $ecwd_event_date_from ) ) . ' ' . date( $time_format, strtotime( $ecwd_event_date_from ) );
115
-
116
- if ( $ecwd_event_date_to ) {
117
- echo ' - ' . date( $date_format, strtotime( $ecwd_event_date_to ) ) . ' ' . date( $time_format, strtotime( $ecwd_event_date_to ) );
118
- }
119
- } ?>
120
- </span>
121
  </div>
122
  <?php if ( $ecwd_event_url ) { ?>
123
  <div class="ecwd-url">
@@ -161,20 +199,24 @@ get_header();
161
  </span>
162
  <?php } ?>
163
  </div>
 
164
  </div>
165
  </div>
166
- <?php if ( $social_icons ) {
167
  ?>
168
 
169
  <div class="ecwd-social">
170
  <span class="share-links">
171
- <a href="http://twitter.com/home?status=<?php echo get_permalink( $post_id ) ?>" class="ecwd-twitter"
 
172
  target="_blank" data-original-title="Tweet It">
173
  <span class="visuallyhidden">Twitter</span></a>
174
- <a href="http://www.facebook.com/sharer.php?u=<?php echo get_permalink( $post_id ) ?>" class="ecwd-facebook"
 
175
  target="_blank" data-original-title="Share on Facebook">
176
  <span class="visuallyhidden">Facebook</span></a>
177
- <a href="http://plus.google.com/share?url=<?php echo get_permalink( $post_id ) ?>" class="ecwd-google-plus"
 
178
  target="_blank" data-original-title="Share on Google+">
179
  <span class="visuallyhidden">Google+</span></a>
180
  </span>
@@ -269,7 +311,7 @@ get_header();
269
  $metas = get_option( "ecwd_event_category_$category->term_id" );
270
 
271
  ?>
272
- <li class="event_category event-details-title" >
273
  <?php if ( $metas['color'] ) { ?>
274
  <span class="event-metalabel"
275
  style="background:<?php echo $metas['color']; ?>"></span>
9
  global $post;
10
  global $wp;
11
  global $ecwd_options;
12
+ global $wp_query;
13
 
14
  $post_id = $post->ID;
15
  $meta = get_post_meta( $post_id );
16
 
17
+ $date_format = 'Y-m-d';
18
+ $time_format = 'H:i';
19
+ $ecwd_social_icons = false;
20
  if ( isset( $ecwd_options['date_format'] ) && $ecwd_options['date_format'] != '' ) {
21
  $date_format = $ecwd_options['date_format'];
22
  }
24
  $time_format = $ecwd_options['time_format'];
25
  }
26
  if ( isset( $ecwd_options['social_icons'] ) && $ecwd_options['social_icons'] != '' ) {
27
+ $ecwd_social_icons = $ecwd_options['social_icons'];
28
  }
29
  // Load up all post meta data
30
+
31
+
32
+ $ecwd_event = $post;
33
+ $ecwd_event_metas = get_post_meta( $ecwd_event->ID, '', true );
34
+ $ecwd_event_date_from = $ecwd_event_metas[ ECWD_PLUGIN_PREFIX . '_event_date_from' ][0];
35
+ $ecwd_event_date_to = $ecwd_event_metas[ ECWD_PLUGIN_PREFIX . '_event_date_to' ][0];
36
+ $ecwd_event_metas[ ECWD_PLUGIN_PREFIX . '_event_url' ] = array( 0 => '' );
37
+ if ( ! isset( $ecwd_event_metas[ ECWD_PLUGIN_PREFIX . '_event_location' ] ) ) {
38
+ $ecwd_event_metas[ ECWD_PLUGIN_PREFIX . '_event_location' ] = array( 0 => '' );
39
+ }
40
+ if ( ! isset( $ecwd_event_metas[ ECWD_PLUGIN_PREFIX . '_lat_long' ] ) ) {
41
+ $ecwd_event_metas[ ECWD_PLUGIN_PREFIX . '_lat_long' ] = array( 0 => '' );
42
+ }
43
+ if ( ! isset( $ecwd_event_metas[ ECWD_PLUGIN_PREFIX . '_event_date_to' ] ) ) {
44
+ $ecwd_event_metas[ ECWD_PLUGIN_PREFIX . '_event_date_to' ] = array( 0 => '' );
45
+ }
46
+ if ( ! isset( $ecwd_event_metas[ ECWD_PLUGIN_PREFIX . '_event_date_from' ] ) ) {
47
+ $ecwd_event_metas[ ECWD_PLUGIN_PREFIX . '_event_date_from' ] = array( 0 => '' );
48
+ }
49
+
50
+ $permalink = get_the_permalink($ecwd_event->ID);
51
+ $this_event = $events[ $ecwd_event->ID ] = new ECWD_Event( $ecwd_event->ID, '', $ecwd_event->post_title, $ecwd_event->post_content, $ecwd_event_metas[ ECWD_PLUGIN_PREFIX . '_event_location' ][0], $ecwd_event_metas[ ECWD_PLUGIN_PREFIX . '_event_date_from' ][0], $ecwd_event_metas[ ECWD_PLUGIN_PREFIX . '_event_date_to' ][0], $ecwd_event_metas[ ECWD_PLUGIN_PREFIX . '_event_url' ][0], $ecwd_event_metas[ ECWD_PLUGIN_PREFIX . '_lat_long' ][0], $permalink, $ecwd_event, '', $ecwd_event_metas );
52
+ $d = new ECWD_Display('');
53
+ if ( isset( $_GET['eventDate'] ) || isset($wp_query->query_vars['eventDate'] )) {
54
+ $fromDate = isset( $_GET['eventDate'] )?$_GET['eventDate']:$wp_query->query_vars['eventDate'];
55
+
56
+ $eventdayslong = $d->dateDiff( $ecwd_event_metas[ ECWD_PLUGIN_PREFIX . '_event_date_from' ][0], $ecwd_event_metas[ ECWD_PLUGIN_PREFIX . '_event_date_to' ][0] );
57
+ $toDate = date('Y-m-d', strtotime( ( date( "Y-m-d", ( strtotime( $fromDate ) ) ) . " +" . ( $eventdayslong + 2 ) . " days" ) ));
58
+ $this_event_dates = $d->get_event_days( array($ecwd_event->ID=> $this_event ), 1, $fromDate, $toDate );
59
+ if(isset($this_event_dates[0]['from']) && strtotime($fromDate)==strtotime($this_event_dates[0]['from'])) {
60
+ $ecwd_event_date_from = $this_event_dates[0]['from'].' '.$this_event_dates[0]['starttime'];
61
+ $ecwd_event_date_to = $this_event_dates[0]['to'].' '.$this_event_dates[0]['endtime'];
62
+ }
63
+ }
64
+
65
+
66
+ $ecwd_event_location = isset($ecwd_event_metas[ ECWD_PLUGIN_PREFIX . '_event_location' ][0])?$ecwd_event_metas[ ECWD_PLUGIN_PREFIX . '_event_location' ][0]:'';
67
+ $ecwd_event_latlong = isset($ecwd_event_metas[ ECWD_PLUGIN_PREFIX . '_lat_long' ][0])?$ecwd_event_metas[ ECWD_PLUGIN_PREFIX . '_lat_long' ][0]:'';
68
+ $ecwd_event_zoom = isset($ecwd_event_metas[ ECWD_PLUGIN_PREFIX . '_map_zoom' ][0])?$ecwd_event_metas[ ECWD_PLUGIN_PREFIX . '_map_zoom' ][0]:'';
69
+ $ecwd_event_show_map = isset($ecwd_event_metas[ ECWD_PLUGIN_PREFIX . '_event_show_map' ][0])?$ecwd_event_metas[ ECWD_PLUGIN_PREFIX . '_event_show_map' ][0]:0;
70
  if ( $ecwd_event_show_map == '' ) {
71
  $ecwd_event_show_map = 1;
72
  }
74
  $ecwd_event_zoom = 17;
75
  }
76
 
77
+ $ecwd_event_organizers = $ecwd_event_metas[ ECWD_PLUGIN_PREFIX . '_event_organizers' ][0];
78
+
79
+
80
+
81
+ $ecwd_event_url = isset($ecwd_event_metas[ ECWD_PLUGIN_PREFIX . '_event_url' ][0])?$ecwd_event_metas[ ECWD_PLUGIN_PREFIX . '_event_url' ][0]:'';
82
+ $ecwd_event_video = isset($ecwd_event_metas[ ECWD_PLUGIN_PREFIX . '_event_video' ][0])?$ecwd_event_metas[ ECWD_PLUGIN_PREFIX . '_event_video' ][0]:'';
83
+ $ecwd_all_day_event = isset($ecwd_event_metas[ ECWD_PLUGIN_PREFIX . '_all_day_event' ][0])?$ecwd_event_metas[ ECWD_PLUGIN_PREFIX . '_all_day_event' ][0]:0;
84
+ $venue = '';
85
+ $venue_permalink = '';
86
+ $venue_post_id = isset($ecwd_event_metas[ ECWD_PLUGIN_PREFIX . '_event_venue' ][0])?$ecwd_event_metas[ ECWD_PLUGIN_PREFIX . '_event_venue' ][0]:0;
87
  if ( $venue_post_id ) {
88
  $venue_post = get_post( $venue_post_id );
89
  if ( $venue_post ) {
92
  }
93
  }
94
 
95
+ $organizers = array();
96
+
97
  if ( is_array( $ecwd_event_organizers ) || is_object( $ecwd_event_organizers ) ) {
98
  foreach ( $ecwd_event_organizers as $ecwd_event_organizer ) {
99
  $organizers[] = get_post( $ecwd_event_organizer, ARRAY_A );
138
  <div class="event-detalis-date">
139
  <label class="ecwd-event-date-info"
140
  title="<?php _e( 'Date', 'ecwd' ); ?>"></label>
141
+ <span class="ecwd-event-date" itemprop="startDate"
142
+ content="<?php echo date( 'Y-m-d', strtotime( $ecwd_event_date_from ) ) . 'T' . date( 'H:i', strtotime( $ecwd_event_date_from ) ) ?>">
143
+ <?php if ( $ecwd_all_day_event == 1 ) {
144
+ echo date( $date_format, strtotime( $ecwd_event_date_from ) );
145
+ if ( $ecwd_all_day_event == 1 ) {
146
+ if ( $ecwd_event_date_to && date( $date_format, strtotime( $ecwd_event_date_from ) ) !== date( $date_format, strtotime( $ecwd_event_date_to ) ) ) {
147
+ echo ' - ' . date( $date_format, strtotime( $ecwd_event_date_to ) );
148
+ }
149
+ echo ' ' . __( 'All day', 'ecwd' );
150
+ }
151
+ } else {
152
+ echo date( $date_format, strtotime( $ecwd_event_date_from ) ) . ' ' . date( $time_format, strtotime( $ecwd_event_date_from ) );
153
+
154
+ if ( $ecwd_event_date_to ) {
155
+ echo ' - ' . date( $date_format, strtotime( $ecwd_event_date_to ) ) . ' ' . date( $time_format, strtotime( $ecwd_event_date_to ) );
156
+ }
157
+ } ?>
158
+ </span>
159
  </div>
160
  <?php if ( $ecwd_event_url ) { ?>
161
  <div class="ecwd-url">
199
  </span>
200
  <?php } ?>
201
  </div>
202
+ <?php do_action( 'ecwd_view_ext' );?>
203
  </div>
204
  </div>
205
+ <?php if ( $ecwd_social_icons ) {
206
  ?>
207
 
208
  <div class="ecwd-social">
209
  <span class="share-links">
210
+ <a href="http://twitter.com/home?status=<?php echo get_permalink( $post_id ) ?>"
211
+ class="ecwd-twitter"
212
  target="_blank" data-original-title="Tweet It">
213
  <span class="visuallyhidden">Twitter</span></a>
214
+ <a href="http://www.facebook.com/sharer.php?u=<?php echo get_permalink( $post_id ) ?>"
215
+ class="ecwd-facebook"
216
  target="_blank" data-original-title="Share on Facebook">
217
  <span class="visuallyhidden">Facebook</span></a>
218
+ <a href="http://plus.google.com/share?url=<?php echo get_permalink( $post_id ) ?>"
219
+ class="ecwd-google-plus"
220
  target="_blank" data-original-title="Share on Google+">
221
  <span class="visuallyhidden">Google+</span></a>
222
  </span>
311
  $metas = get_option( "ecwd_event_category_$category->term_id" );
312
 
313
  ?>
314
+ <li class="event_category event-details-title">
315
  <?php if ( $metas['color'] ) { ?>
316
  <span class="event-metalabel"
317
  style="background:<?php echo $metas['color']; ?>"></span>