Event Calendar WD – Responsive Event Calendar plugin - Version 1.0.61

Version Description

  • Fixed: Conflict with Page Builder by SiteOrigin
  • Fixed: Bug on trashed events
Download this release

Release Info

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

Code changes from version 1.0.60 to 1.0.61

Files changed (8) hide show
  1. ecwd.php +1 -1
  2. ecwd_admin_class.php +1 -1
  3. ecwd_class.php +1 -1
  4. includes/calendar-class.php +10 -4
  5. includes/ecwd-cpt-class.php +1 -1
  6. includes/ecwd-display-class.php +81 -8
  7. includes/ecwd_config.php +1 -1
  8. readme.txt +6 -2
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.60
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.61
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.60';
10
  protected $ecwd_page = null;
11
  protected $notices = null;
12
 
6
  class ECWD_Admin {
7
 
8
  protected static $instance = null;
9
+ protected $version = '1.0.61';
10
  protected $ecwd_page = null;
11
  protected $notices = null;
12
 
ecwd_class.php CHANGED
@@ -6,7 +6,7 @@
6
  */
7
  class ECWD {
8
 
9
- protected $version = '1.0.60';
10
  protected $plugin_name = 'event-calendar-wd';
11
  protected $prefix = 'ecwd';
12
  protected static $instance = null;
6
  */
7
  class ECWD {
8
 
9
+ protected $version = '1.0.61';
10
  protected $plugin_name = 'event-calendar-wd';
11
  protected $prefix = 'ecwd';
12
  protected static $instance = null;
includes/calendar-class.php CHANGED
@@ -75,6 +75,12 @@ class Calendar {
75
  // types: mini,full,list,mini-list,(default=full)
76
  public function __construct($type = 'full', $date = '', $staticdisplaytype = false, $widget = 0, $limit = false, $page = 1, $displays = null, $filters = null, $event_search = 'yes', $ecwd_views = array(), $preview) {
77
  // static displaytype
 
 
 
 
 
 
78
  global $ecwd_options;
79
  $this->eventemptytext = isset($ecwd_options['event_default_description']) ? $ecwd_options['event_default_description'] : $this->eventemptytext;
80
  if (isset($ecwd_options['date_format']) && $ecwd_options['date_format'] != '') {
@@ -494,7 +500,7 @@ class Calendar {
494
  </div>';
495
  }
496
  $desc = $event['details'] ? $event['details'] : $this->eventemptytext;
497
- $desc = apply_filters('the_content', $desc);
498
  $html .= '<div class="event-content" itemprop="description">' . $desc . '</div></div>';
499
  } else { // mini event list
500
  $html .= '<li style="background:' . $event['color'] . ';"';
@@ -1140,7 +1146,7 @@ class Calendar {
1140
  $cellevent['details'] = $image['content'];
1141
  }
1142
  $desc = $cellevent['details'] ? $cellevent['details'] : $this->eventemptytext;
1143
- $desc = apply_filters('the_content', $desc);
1144
  $eventcontent .= $desc . '</div>';
1145
  }
1146
 
@@ -1153,7 +1159,7 @@ class Calendar {
1153
  // }
1154
  }
1155
 
1156
- $content .= apply_filters('the_content', $eventcontent);
1157
 
1158
  if ($i > 2 && $this->displaytype !== 'mini') {
1159
  $content .= '<li class="ecwd-calendar-more-event">
@@ -1279,7 +1285,7 @@ class Calendar {
1279
  </div>';
1280
  }
1281
  $desc = $cellevent['details'] ? $cellevent['details'] : $this->eventemptytext;
1282
- $desc = apply_filters('the_content', $desc);
1283
  $html .= '<div class="event-content" itemprop="description">' . $desc . '</div></div>';
1284
  }
1285
  $html .= '</div>';
75
  // types: mini,full,list,mini-list,(default=full)
76
  public function __construct($type = 'full', $date = '', $staticdisplaytype = false, $widget = 0, $limit = false, $page = 1, $displays = null, $filters = null, $event_search = 'yes', $ecwd_views = array(), $preview) {
77
  // static displaytype
78
+ add_filter( 'format_content', 'wptexturize' );
79
+ add_filter( 'format_content', 'convert_smilies' );
80
+ add_filter( 'format_content', 'wpautop' );
81
+ add_filter( 'format_content', 'shortcode_unautop' );
82
+ add_filter( 'format_content', 'prepend_attachment' );
83
+ add_filter( 'format_content', 'wp_make_content_images_responsive' );
84
  global $ecwd_options;
85
  $this->eventemptytext = isset($ecwd_options['event_default_description']) ? $ecwd_options['event_default_description'] : $this->eventemptytext;
86
  if (isset($ecwd_options['date_format']) && $ecwd_options['date_format'] != '') {
500
  </div>';
501
  }
502
  $desc = $event['details'] ? $event['details'] : $this->eventemptytext;
503
+ $desc = apply_filters('format_content', $desc);
504
  $html .= '<div class="event-content" itemprop="description">' . $desc . '</div></div>';
505
  } else { // mini event list
506
  $html .= '<li style="background:' . $event['color'] . ';"';
1146
  $cellevent['details'] = $image['content'];
1147
  }
1148
  $desc = $cellevent['details'] ? $cellevent['details'] : $this->eventemptytext;
1149
+ $desc = apply_filters('format_content', $desc);
1150
  $eventcontent .= $desc . '</div>';
1151
  }
1152
 
1159
  // }
1160
  }
1161
 
1162
+ $content .= apply_filters('format_content', $eventcontent);
1163
 
1164
  if ($i > 2 && $this->displaytype !== 'mini') {
1165
  $content .= '<li class="ecwd-calendar-more-event">
1285
  </div>';
1286
  }
1287
  $desc = $cellevent['details'] ? $cellevent['details'] : $this->eventemptytext;
1288
+ $desc = apply_filters('format_content', $desc);
1289
  $html .= '<div class="event-content" itemprop="description">' . $desc . '</div></div>';
1290
  }
1291
  $html .= '</div>';
includes/ecwd-cpt-class.php CHANGED
@@ -1321,7 +1321,7 @@ class ECWD_Cpt {
1321
  }
1322
 
1323
  public function events_archive_page_query($query) {
1324
- if (is_archive()) {
1325
  if (isset($query->query_vars['post_type']) && $query->query_vars['post_type'] == 'ecwd_event') {
1326
  global $ecwd_options;
1327
  $query->set('meta_key', 'ecwd_event_date_from');
1321
  }
1322
 
1323
  public function events_archive_page_query($query) {
1324
+ if (is_archive() && !is_admin()) {
1325
  if (isset($query->query_vars['post_type']) && $query->query_vars['post_type'] == 'ecwd_event') {
1326
  global $ecwd_options;
1327
  $query->set('meta_key', 'ecwd_event_date_from');
includes/ecwd-display-class.php CHANGED
@@ -804,6 +804,7 @@ class ECWD_Display {
804
  }
805
  $eventdays = $this->dateDiff($from, $until);
806
  $eventdayslong = $this->dateDiff($from, $to);
 
807
  if ($eventdays < 0) {
808
  continue;
809
  }
@@ -822,9 +823,22 @@ class ECWD_Display {
822
  }
823
  $from = $eventdate;
824
 
825
- if (strtotime($until) >= strtotime(date('Y-m-d', strtotime($from)))) {
826
- $to = date('Y-m-d', strtotime($from . ' + ' . $eventdayslong . ' days'));
827
- if (!$current_month || ( strtotime($from) <= strtotime($this->end_date) && in_array(strtolower(date('l', strtotime($from))), $weekdays) )) {
 
 
 
 
 
 
 
 
 
 
 
 
 
828
  $this->set_long_event($eventdate, $from, $to);
829
  }
830
  }
@@ -839,6 +853,7 @@ class ECWD_Display {
839
  $how = ( isset($metas[ECWD_PLUGIN_PREFIX . '_event_repeat_how'][0]) ? $metas[ECWD_PLUGIN_PREFIX . '_event_repeat_how'][0] : 1 );
840
  $eventdays = $this->dateDiff($from, $until);
841
  $eventdayslong = $this->dateDiff($from, $to);
 
842
  if ($eventdays < 0) {
843
  continue;
844
  }
@@ -853,7 +868,21 @@ class ECWD_Display {
853
  $from = $date;
854
  $to = date('Y-m-d', strtotime($from . ' + ' . $eventdayslong . ' days'));
855
 
856
- if (!$current_month || ( strtotime($from) <= strtotime($this->end_date) && strtotime($from) >= strtotime($this->start_date) && in_array(strtolower(date('l', strtotime($from))), $weekdays) )) {
 
 
 
 
 
 
 
 
 
 
 
 
 
 
857
  $this->set_long_event($date, $from, $to);
858
  }
859
  }
@@ -863,6 +892,7 @@ class ECWD_Display {
863
  $how = ( isset($metas[ECWD_PLUGIN_PREFIX . '_event_repeat_how'][0]) ? $metas[ECWD_PLUGIN_PREFIX . '_event_repeat_how'][0] : 1 );
864
  $eventdays = $this->dateDiff($from, $until);
865
  $eventdayslong = $this->dateDiff($from, $to);
 
866
  $event_from = $from;
867
  $from_date = $from;
868
  $repeat_days = isset($metas[ECWD_PLUGIN_PREFIX . '_event_repeat_month_on_days'][0]) ? $metas[ECWD_PLUGIN_PREFIX . '_event_repeat_month_on_days'][0] : 1;
@@ -898,7 +928,21 @@ class ECWD_Display {
898
  $from = $date;
899
  $to = strtotime(( date("Y-m-d", ( strtotime($from))) . " +" . ( $eventdayslong ) . " days"));
900
  $to = date('Y-m-d', $to);
901
- if (!$current_month || ( strtotime($from) <= strtotime($this->end_date) && strtotime($from) >= strtotime($this->start_date) && in_array(strtolower(date('l', strtotime($from))), $weekdays) )) {
 
 
 
 
 
 
 
 
 
 
 
 
 
 
902
  $this->set_long_event($date, $from, $to);
903
  }
904
  }
@@ -909,6 +953,7 @@ class ECWD_Display {
909
  $how = ( isset($metas[ECWD_PLUGIN_PREFIX . '_event_repeat_how'][0]) ? $metas[ECWD_PLUGIN_PREFIX . '_event_repeat_how'][0] : 1 );
910
  $eventdays = $this->dateDiff($from, $until);
911
  $eventdayslong = $this->dateDiff($from, $to);
 
912
  $event_from = $from;
913
  $from_date = $from;
914
  $repeat_days = isset($metas[ECWD_PLUGIN_PREFIX . '_event_repeat_year_on_days'][0]) ? $metas[ECWD_PLUGIN_PREFIX . '_event_repeat_year_on_days'][0] : 1;
@@ -956,17 +1001,45 @@ class ECWD_Display {
956
  $from = $date;
957
  $to = strtotime(( date("Y-m-d", ( strtotime($from_date))) . " +" . ( $eventdayslong ) . " days"));
958
  $to = date('Y-m-d', $to);
959
- if (!$current_month || ( strtotime($from) <= strtotime($this->end_date) && strtotime($from) >= strtotime($this->start_date) && in_array(strtolower(date('l', strtotime($from))), $weekdays) )) {
 
 
 
 
 
 
 
 
 
 
 
 
 
 
960
  $this->set_long_event($date, $from, $to);
961
  }
962
  }
963
  }
964
  }
965
  } else {
966
- $eventdays = $this->dateDiff($from, $to); // get the difference in days between the two dates
967
  $date = strtotime(date("Y-m-d", strtotime($from)));
968
  $date = date("Y-n-j", $date);
969
- if (!$current_month || ( strtotime($from) <= strtotime($this->end_date) && strtotime($from) >= strtotime($this->start_date) && in_array(strtolower(date('l', strtotime($from))), $weekdays) )) {
 
 
 
 
 
 
 
 
 
 
 
 
 
 
970
  $this->set_long_event($date, $from, $to);
971
  }
972
  }
804
  }
805
  $eventdays = $this->dateDiff($from, $until);
806
  $eventdayslong = $this->dateDiff($from, $to);
807
+ $eventdayslong_def = $this->dateDiff($from, $to);
808
  if ($eventdays < 0) {
809
  continue;
810
  }
823
  }
824
  $from = $eventdate;
825
 
826
+ $eventdayslong = $eventdayslong_def;
827
+ if (isset($ecwd_options["long_events"]) && $ecwd_options["long_events"] == '1') {
828
+ if (strtotime($to) <= strtotime($this->end_date)) {
829
+ if (strtotime($from) < strtotime($this->start_date)) {
830
+ $diff = $this->dateDiff($eventdate, $this->start_date);
831
+ if ($diff > 0) {
832
+ $eventdayslong -= $diff;
833
+ }
834
+ $eventdate = $this->start_date;
835
+ }
836
+ }
837
+ }
838
+
839
+ if (strtotime($until) >= strtotime(date('Y-m-d', strtotime($eventdate)))) {
840
+ $to = date('Y-m-d', strtotime($eventdate . ' + ' . $eventdayslong . ' days'));
841
+ if (!$current_month || ( strtotime($eventdate) <= strtotime($this->end_date) && in_array(strtolower(date('l', strtotime($eventdate))), $weekdays) )) {
842
  $this->set_long_event($eventdate, $from, $to);
843
  }
844
  }
853
  $how = ( isset($metas[ECWD_PLUGIN_PREFIX . '_event_repeat_how'][0]) ? $metas[ECWD_PLUGIN_PREFIX . '_event_repeat_how'][0] : 1 );
854
  $eventdays = $this->dateDiff($from, $until);
855
  $eventdayslong = $this->dateDiff($from, $to);
856
+ $eventdayslong_def = $this->dateDiff($from, $to);
857
  if ($eventdays < 0) {
858
  continue;
859
  }
868
  $from = $date;
869
  $to = date('Y-m-d', strtotime($from . ' + ' . $eventdayslong . ' days'));
870
 
871
+
872
+ $eventdayslong = $eventdayslong_def;
873
+ if (isset($ecwd_options["long_events"]) && $ecwd_options["long_events"] == '1') {
874
+ if (strtotime($to) <= strtotime($this->end_date)) {
875
+ if (strtotime($from) < strtotime($this->start_date)) {
876
+ $diff = $this->dateDiff($date, $this->start_date);
877
+ if ($diff > 0) {
878
+ $eventdayslong -= $diff;
879
+ }
880
+ $date = $this->start_date;
881
+ }
882
+ }
883
+ }
884
+
885
+ if (!$current_month || ( strtotime($date) <= strtotime($this->end_date) && strtotime($date) >= strtotime($this->start_date) && in_array(strtolower(date('l', strtotime($date))), $weekdays) )) {
886
  $this->set_long_event($date, $from, $to);
887
  }
888
  }
892
  $how = ( isset($metas[ECWD_PLUGIN_PREFIX . '_event_repeat_how'][0]) ? $metas[ECWD_PLUGIN_PREFIX . '_event_repeat_how'][0] : 1 );
893
  $eventdays = $this->dateDiff($from, $until);
894
  $eventdayslong = $this->dateDiff($from, $to);
895
+ $eventdayslong_def = $this->dateDiff($from, $to);
896
  $event_from = $from;
897
  $from_date = $from;
898
  $repeat_days = isset($metas[ECWD_PLUGIN_PREFIX . '_event_repeat_month_on_days'][0]) ? $metas[ECWD_PLUGIN_PREFIX . '_event_repeat_month_on_days'][0] : 1;
928
  $from = $date;
929
  $to = strtotime(( date("Y-m-d", ( strtotime($from))) . " +" . ( $eventdayslong ) . " days"));
930
  $to = date('Y-m-d', $to);
931
+
932
+ $eventdayslong = $eventdayslong_def;
933
+ if (isset($ecwd_options["long_events"]) && $ecwd_options["long_events"] == '1') {
934
+ if (strtotime($to) <= strtotime($this->end_date)) {
935
+ if (strtotime($from) < strtotime($this->start_date)) {
936
+ $diff = $this->dateDiff($date, $this->start_date);
937
+ if ($diff > 0) {
938
+ $eventdayslong -= $diff;
939
+ }
940
+ $date = $this->start_date;
941
+ }
942
+ }
943
+ }
944
+
945
+ if (!$current_month || ( strtotime($date) <= strtotime($this->end_date) && strtotime($date) >= strtotime($this->start_date) && in_array(strtolower(date('l', strtotime($date))), $weekdays) )) {
946
  $this->set_long_event($date, $from, $to);
947
  }
948
  }
953
  $how = ( isset($metas[ECWD_PLUGIN_PREFIX . '_event_repeat_how'][0]) ? $metas[ECWD_PLUGIN_PREFIX . '_event_repeat_how'][0] : 1 );
954
  $eventdays = $this->dateDiff($from, $until);
955
  $eventdayslong = $this->dateDiff($from, $to);
956
+ $eventdayslong_def = $this->dateDiff($from, $to);
957
  $event_from = $from;
958
  $from_date = $from;
959
  $repeat_days = isset($metas[ECWD_PLUGIN_PREFIX . '_event_repeat_year_on_days'][0]) ? $metas[ECWD_PLUGIN_PREFIX . '_event_repeat_year_on_days'][0] : 1;
1001
  $from = $date;
1002
  $to = strtotime(( date("Y-m-d", ( strtotime($from_date))) . " +" . ( $eventdayslong ) . " days"));
1003
  $to = date('Y-m-d', $to);
1004
+
1005
+ $eventdayslong = $eventdayslong_def;
1006
+ if (isset($ecwd_options["long_events"]) && $ecwd_options["long_events"] == '1') {
1007
+ if (strtotime($to) <= strtotime($this->end_date)) {
1008
+ if (strtotime($from) < strtotime($this->start_date)) {
1009
+ $diff = $this->dateDiff($date, $this->start_date);
1010
+ if ($diff > 0) {
1011
+ $eventdayslong -= $diff;
1012
+ }
1013
+ $date = $this->start_date;
1014
+ }
1015
+ }
1016
+ }
1017
+
1018
+ if (!$current_month || ( strtotime($date) <= strtotime($this->end_date) && strtotime($date) >= strtotime($this->start_date) && in_array(strtolower(date('l', strtotime($date))), $weekdays) )) {
1019
  $this->set_long_event($date, $from, $to);
1020
  }
1021
  }
1022
  }
1023
  }
1024
  } else {
1025
+ $eventdayslong = $this->dateDiff($from, $to); // get the difference in days between the two dates
1026
  $date = strtotime(date("Y-m-d", strtotime($from)));
1027
  $date = date("Y-n-j", $date);
1028
+
1029
+
1030
+ if (isset($ecwd_options["long_events"]) && $ecwd_options["long_events"] == '1') {
1031
+ if (strtotime($to) <= strtotime($this->end_date)) {
1032
+ if (strtotime($from) < strtotime($this->start_date)) {
1033
+ $diff = $this->dateDiff($date, $this->start_date);
1034
+ if ($diff > 0) {
1035
+ $eventdayslong -= $diff;
1036
+ }
1037
+ $date = $this->start_date;
1038
+ }
1039
+ }
1040
+ }
1041
+
1042
+ if (!$current_month || ( strtotime($date) <= strtotime($this->end_date) && strtotime($date) >= strtotime($this->start_date) && in_array(strtolower(date('l', strtotime($date))), $weekdays) )) {
1043
  $this->set_long_event($date, $from, $to);
1044
  }
1045
  }
includes/ecwd_config.php CHANGED
@@ -43,7 +43,7 @@ class ECWD_Config {
43
  }
44
 
45
  private function set_file_path() {
46
- $upload_dir = wp_upload_dir(__FILE__);
47
  $dir = $upload_dir['basedir'] . '/wd_configs/';
48
  $this->file_dir = $dir . $this->file_name;
49
  if (!is_dir($dir)) {
43
  }
44
 
45
  private function set_file_path() {
46
+ $upload_dir = wp_upload_dir();
47
  $dir = $upload_dir['basedir'] . '/wd_configs/';
48
  $this->file_dir = $dir . $this->file_name;
49
  if (!is_dir($dir)) {
readme.txt CHANGED
@@ -1,10 +1,10 @@
1
- === Event Calendar WD ===
2
  Contributors: webdorado
3
  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, facebook integration, widget, reservation
5
  Requires at least: 3.9
6
  Tested up to: 4.5
7
- Stable tag: 1.0.60
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -155,6 +155,10 @@ After downloading the ZIP file of the Event Calendar WD plugin,
155
 
156
  == Changelog ==
157
 
 
 
 
 
158
  = 1.0.60 =
159
  * Added: Embed add-on
160
 
1
+ === Calendar Event WD ===
2
  Contributors: webdorado
3
  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, facebook integration, widget, reservation
5
  Requires at least: 3.9
6
  Tested up to: 4.5
7
+ Stable tag: 1.0.61
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
155
 
156
  == Changelog ==
157
 
158
+ = 1.0.61 =
159
+ * Fixed: Conflict with Page Builder by SiteOrigin
160
+ * Fixed: Bug on trashed events
161
+
162
  = 1.0.60 =
163
  * Added: Embed add-on
164