All-in-One Event Calendar - Version 2.5.36

Version Description

Download this release

Release Info

Developer calvinyeh
Plugin Icon 128x128 All-in-One Event Calendar
Version 2.5.36
Comparing to
See all releases

Code changes from version 2.5.35 to 2.5.36

Files changed (9) hide show
  1. all-in-one-event-calendar.php +1 -1
  2. app/config/constants.php +1 -1
  3. language/all-in-one-event-calendar.mo +0 -0
  4. language/all-in-one-event-calendar.po +4 -12
  5. language/all-in-one-event-calendar.pot +3 -11
  6. lib/bootstrap/loader-map.php +12 -0
  7. lib/iCal/iCalcnv-3.0/iCalcnv.class.php +9 -10
  8. lib/import-export/ics.php +0 -5
  9. readme.txt +4 -1
all-in-one-event-calendar.php CHANGED
@@ -5,7 +5,7 @@
5
  * Description: A calendar system with month, week, day, agenda views, upcoming events widget, color-coded categories, recurrence, and import/export of .ics feeds.
6
  * Author: Time.ly Network Inc.
7
  * Author URI: https://time.ly/
8
- * Version: 2.5.35
9
  * Text Domain: all-in-one-event-calendar
10
  * Domain Path: /language
11
  */
5
  * Description: A calendar system with month, week, day, agenda views, upcoming events widget, color-coded categories, recurrence, and import/export of .ics feeds.
6
  * Author: Time.ly Network Inc.
7
  * Author URI: https://time.ly/
8
+ * Version: 2.5.36
9
  * Text Domain: all-in-one-event-calendar
10
  * Domain Path: /language
11
  */
app/config/constants.php CHANGED
@@ -50,7 +50,7 @@ function ai1ec_initiate_constants( $ai1ec_base_dir, $ai1ec_base_url ) {
50
  // = Plugin Version =
51
  // ==================
52
  if ( ! defined( 'AI1EC_VERSION' ) ) {
53
- define( 'AI1EC_VERSION', '2.5.35' );
54
  }
55
 
56
  // ================
50
  // = Plugin Version =
51
  // ==================
52
  if ( ! defined( 'AI1EC_VERSION' ) ) {
53
+ define( 'AI1EC_VERSION', '2.5.36' );
54
  }
55
 
56
  // ================
language/all-in-one-event-calendar.mo CHANGED
Binary file
language/all-in-one-event-calendar.po CHANGED
@@ -2,13 +2,13 @@
2
  # This file is distributed under the same license as the All-in-One Event Calendar by Time.ly package.
3
  msgid ""
4
  msgstr ""
5
- "Project-Id-Version: All-in-One Event Calendar by Time.ly 2.5.35\n"
6
  "Report-Msgid-Bugs-To: http://wordpress.org/tag/all-in-one-event-calendar\n"
7
- "POT-Creation-Date: 2018-12-17 15:03:48+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
11
- "PO-Revision-Date: 2018-12-17 15:03+0000\n"
12
  "Last-Translator: Timely <support@time.ly>\n"
13
  "Language-Team:\n"
14
 
@@ -2126,14 +2126,6 @@ msgstr " – "
2126
  msgid ", and "
2127
  msgstr ", and "
2128
 
2129
- #: cache/twig/dc/78/b950182efb8f436b144938fb0dc48cf395d7daabe20293234dbcf2b26545.php:38
2130
- msgid "Excludes: "
2131
- msgstr "Excludes: "
2132
-
2133
- #: cache/twig/dc/78/b950182efb8f436b144938fb0dc48cf395d7daabe20293234dbcf2b26545.php:49
2134
- msgid "Repeats"
2135
- msgstr "Repeats"
2136
-
2137
  #: lib/calendar-feed/ics.php:40
2138
  msgid "My Feeds"
2139
  msgstr "My Feeds"
@@ -2645,7 +2637,7 @@ msgstr ""
2645
  "page. Do not attempt to embed the calendar via shortcode in a page that "
2646
  "already displays the calendar."
2647
 
2648
- #: lib/import-export/ics.php:884
2649
  msgid "Tickets: "
2650
  msgstr "Tickets: "
2651
 
2
  # This file is distributed under the same license as the All-in-One Event Calendar by Time.ly package.
3
  msgid ""
4
  msgstr ""
5
+ "Project-Id-Version: All-in-One Event Calendar by Time.ly 2.5.36\n"
6
  "Report-Msgid-Bugs-To: http://wordpress.org/tag/all-in-one-event-calendar\n"
7
+ "POT-Creation-Date: 2018-12-18 18:37:38+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
11
+ "PO-Revision-Date: 2018-12-18 18:37+0000\n"
12
  "Last-Translator: Timely <support@time.ly>\n"
13
  "Language-Team:\n"
14
 
2126
  msgid ", and "
2127
  msgstr ", and "
2128
 
 
 
 
 
 
 
 
 
2129
  #: lib/calendar-feed/ics.php:40
2130
  msgid "My Feeds"
2131
  msgstr "My Feeds"
2637
  "page. Do not attempt to embed the calendar via shortcode in a page that "
2638
  "already displays the calendar."
2639
 
2640
+ #: lib/import-export/ics.php:879
2641
  msgid "Tickets: "
2642
  msgstr "Tickets: "
2643
 
language/all-in-one-event-calendar.pot CHANGED
@@ -2,9 +2,9 @@
2
  # This file is distributed under the same license as the All-in-One Event Calendar by Time.ly package.
3
  msgid ""
4
  msgstr ""
5
- "Project-Id-Version: All-in-One Event Calendar by Time.ly 2.5.35\n"
6
  "Report-Msgid-Bugs-To: http://wordpress.org/tag/all-in-one-event-calendar\n"
7
- "POT-Creation-Date: 2018-12-17 15:03:48+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
@@ -1932,14 +1932,6 @@ msgstr ""
1932
  msgid ", and "
1933
  msgstr ""
1934
 
1935
- #: cache/twig/dc/78/b950182efb8f436b144938fb0dc48cf395d7daabe20293234dbcf2b26545.php:38
1936
- msgid "Excludes: "
1937
- msgstr ""
1938
-
1939
- #: cache/twig/dc/78/b950182efb8f436b144938fb0dc48cf395d7daabe20293234dbcf2b26545.php:49
1940
- msgid "Repeats"
1941
- msgstr ""
1942
-
1943
  #: lib/calendar-feed/ics.php:40
1944
  msgid "My Feeds"
1945
  msgstr ""
@@ -2397,7 +2389,7 @@ msgid ""
2397
  "already displays the calendar."
2398
  msgstr ""
2399
 
2400
- #: lib/import-export/ics.php:884
2401
  msgid "Tickets: "
2402
  msgstr ""
2403
 
2
  # This file is distributed under the same license as the All-in-One Event Calendar by Time.ly package.
3
  msgid ""
4
  msgstr ""
5
+ "Project-Id-Version: All-in-One Event Calendar by Time.ly 2.5.36\n"
6
  "Report-Msgid-Bugs-To: http://wordpress.org/tag/all-in-one-event-calendar\n"
7
+ "POT-Creation-Date: 2018-12-18 18:37:38+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
1932
  msgid ", and "
1933
  msgstr ""
1934
 
 
 
 
 
 
 
 
 
1935
  #: lib/calendar-feed/ics.php:40
1936
  msgid "My Feeds"
1937
  msgstr ""
2389
  "already displays the calendar."
2390
  msgstr ""
2391
 
2392
+ #: lib/import-export/ics.php:879
2393
  msgid "Tickets: "
2394
  msgstr ""
2395
 
lib/bootstrap/loader-map.php CHANGED
@@ -2929,6 +2929,12 @@
2929
  'c' => '__TwigTemplate_5438397cd9464722671fd647af1253048c35b31f97a6d5372f3c78b5bc143543',
2930
  'i' => 'g',
2931
  ),
 
 
 
 
 
 
2932
  '__TwigTemplate_5ca1499a9c32090a9a368a28b4c13261022bf5d11f22b5211fb873b104fc70e4' =>
2933
  array (
2934
  'f' => AI1EC_PATH . DIRECTORY_SEPARATOR . 'cache' . DIRECTORY_SEPARATOR . 'twig' . DIRECTORY_SEPARATOR . '5c' . DIRECTORY_SEPARATOR . 'a1' . DIRECTORY_SEPARATOR . '499a9c32090a9a368a28b4c13261022bf5d11f22b5211fb873b104fc70e4.php',
@@ -4926,6 +4932,12 @@
4926
  'c' => '__TwigTemplate_5438397cd9464722671fd647af1253048c35b31f97a6d5372f3c78b5bc143543',
4927
  'i' => 'g',
4928
  ),
 
 
 
 
 
 
4929
  'twig.5c.a1.499a9c32090a9a368a28b4c13261022bf5d11f22b5211fb873b104fc70e4' =>
4930
  array (
4931
  'f' => AI1EC_PATH . DIRECTORY_SEPARATOR . 'cache' . DIRECTORY_SEPARATOR . 'twig' . DIRECTORY_SEPARATOR . '5c' . DIRECTORY_SEPARATOR . 'a1' . DIRECTORY_SEPARATOR . '499a9c32090a9a368a28b4c13261022bf5d11f22b5211fb873b104fc70e4.php',
2929
  'c' => '__TwigTemplate_5438397cd9464722671fd647af1253048c35b31f97a6d5372f3c78b5bc143543',
2930
  'i' => 'g',
2931
  ),
2932
+ '__TwigTemplate_57450188512a8737525f2a834d1b88782d9a19e5e6d3a9e57df3dbed47bab219' =>
2933
+ array (
2934
+ 'f' => AI1EC_PATH . DIRECTORY_SEPARATOR . 'cache' . DIRECTORY_SEPARATOR . 'twig' . DIRECTORY_SEPARATOR . '57' . DIRECTORY_SEPARATOR . '45' . DIRECTORY_SEPARATOR . '0188512a8737525f2a834d1b88782d9a19e5e6d3a9e57df3dbed47bab219.php',
2935
+ 'c' => '__TwigTemplate_57450188512a8737525f2a834d1b88782d9a19e5e6d3a9e57df3dbed47bab219',
2936
+ 'i' => 'g',
2937
+ ),
2938
  '__TwigTemplate_5ca1499a9c32090a9a368a28b4c13261022bf5d11f22b5211fb873b104fc70e4' =>
2939
  array (
2940
  'f' => AI1EC_PATH . DIRECTORY_SEPARATOR . 'cache' . DIRECTORY_SEPARATOR . 'twig' . DIRECTORY_SEPARATOR . '5c' . DIRECTORY_SEPARATOR . 'a1' . DIRECTORY_SEPARATOR . '499a9c32090a9a368a28b4c13261022bf5d11f22b5211fb873b104fc70e4.php',
4932
  'c' => '__TwigTemplate_5438397cd9464722671fd647af1253048c35b31f97a6d5372f3c78b5bc143543',
4933
  'i' => 'g',
4934
  ),
4935
+ 'twig.57.45.0188512a8737525f2a834d1b88782d9a19e5e6d3a9e57df3dbed47bab219' =>
4936
+ array (
4937
+ 'f' => AI1EC_PATH . DIRECTORY_SEPARATOR . 'cache' . DIRECTORY_SEPARATOR . 'twig' . DIRECTORY_SEPARATOR . '57' . DIRECTORY_SEPARATOR . '45' . DIRECTORY_SEPARATOR . '0188512a8737525f2a834d1b88782d9a19e5e6d3a9e57df3dbed47bab219.php',
4938
+ 'c' => '__TwigTemplate_57450188512a8737525f2a834d1b88782d9a19e5e6d3a9e57df3dbed47bab219',
4939
+ 'i' => 'g',
4940
+ ),
4941
  'twig.5c.a1.499a9c32090a9a368a28b4c13261022bf5d11f22b5211fb873b104fc70e4' =>
4942
  array (
4943
  'f' => AI1EC_PATH . DIRECTORY_SEPARATOR . 'cache' . DIRECTORY_SEPARATOR . 'twig' . DIRECTORY_SEPARATOR . '5c' . DIRECTORY_SEPARATOR . 'a1' . DIRECTORY_SEPARATOR . '499a9c32090a9a368a28b4c13261022bf5d11f22b5211fb873b104fc70e4.php',
lib/iCal/iCalcnv-3.0/iCalcnv.class.php CHANGED
@@ -1,7 +1,5 @@
1
  <?php
2
 
3
- use kigkonsult\iCalcreator\vcalendar;
4
-
5
  /**
6
  * iCalcnv ver 3.0
7
  * copyright (c) 2011 Kjell-Inge Gustafsson kigkonsult
@@ -143,7 +141,7 @@ class iCalcnv {
143
  ini_set( 'auto_detect_line_endings', false );
144
  $cntrows = count( $rows );
145
  /** iCalcreator checks when setting directory and filename */
146
- $calendar = new vcalendar();
147
  if( FALSE !== ( $unique_id = $this->getConfig( 'unique_id' )))
148
  $calendar->setConfig( 'unique_id', $unique_id );
149
  if( ! $this->getConfig( 'outputobj' ) ) {
@@ -240,16 +238,16 @@ class iCalcnv {
240
  if( 'VTIMEZONE' == $compname ) {
241
  if( $comp )
242
  $calendar->setComponent( $comp );
243
- $comp = new vtimezone();
244
  $actcomp = & $comp;
245
  $cntprops += 1;
246
  }
247
  elseif( 'STANDARD' == $compname ) {
248
- $subcomp = new vtimezone( 'STANDARD' );
249
  $actcomp = & $subcomp;
250
  }
251
  elseif( 'DAYLIGHT' == $compname ) {
252
- $subcomp = new vtimezone( 'DAYLIGHT' );
253
  $actcomp = & $subcomp;
254
  }
255
  else {
@@ -335,12 +333,13 @@ class iCalcnv {
335
  if( in_array( $compname, $allowedComps )) {
336
  if( $comp )
337
  $calendar->setComponent( $comp );
338
- $comp = new $rows[$row][0];
 
339
  $actcomp = & $comp;
340
  $cntprops += 1;
341
  }
342
  elseif( 'VALARM' == $compname ) {
343
- $subcomp = new valarm();
344
  $actcomp = & $subcomp;
345
  }
346
  else {
@@ -819,7 +818,7 @@ class iCalcnv {
819
  if( $calendar )
820
  $calnl = $calendar->getConfig( 'nl' );
821
  else { /** iCalcreator set config, read and parse input iCal file */
822
- $calendar = new vcalendar();
823
  if( FALSE !== ( $unique_id = $this->getConfig( 'unique_id' )))
824
  $calendar->setConfig( 'unique_id', $unique_id );
825
  $calnl = $calendar->getConfig( 'nl' );
@@ -1393,7 +1392,7 @@ class iCalcnv {
1393
  if( $calendar )
1394
  $calnl = $calendar->getConfig( 'nl' );
1395
  else { /** iCalcreator set config, read and parse input iCal file */
1396
- $calendar = new vcalendar();
1397
  if( FALSE !== ( $unique_id = $this->getConfig( 'unique_id' )))
1398
  $calendar->setConfig( 'unique_id', $unique_id );
1399
  $calnl = $calendar->getConfig( 'nl' );
1
  <?php
2
 
 
 
3
  /**
4
  * iCalcnv ver 3.0
5
  * copyright (c) 2011 Kjell-Inge Gustafsson kigkonsult
141
  ini_set( 'auto_detect_line_endings', false );
142
  $cntrows = count( $rows );
143
  /** iCalcreator checks when setting directory and filename */
144
+ $calendar = new kigkonsult\iCalcreator\vcalendar();
145
  if( FALSE !== ( $unique_id = $this->getConfig( 'unique_id' )))
146
  $calendar->setConfig( 'unique_id', $unique_id );
147
  if( ! $this->getConfig( 'outputobj' ) ) {
238
  if( 'VTIMEZONE' == $compname ) {
239
  if( $comp )
240
  $calendar->setComponent( $comp );
241
+ $comp = new kigkonsult\iCalcreator\vtimezone();
242
  $actcomp = & $comp;
243
  $cntprops += 1;
244
  }
245
  elseif( 'STANDARD' == $compname ) {
246
+ $subcomp = new kigkonsult\iCalcreator\vtimezone( 'STANDARD' );
247
  $actcomp = & $subcomp;
248
  }
249
  elseif( 'DAYLIGHT' == $compname ) {
250
+ $subcomp = new kigkonsult\iCalcreator\vtimezone( 'DAYLIGHT' );
251
  $actcomp = & $subcomp;
252
  }
253
  else {
333
  if( in_array( $compname, $allowedComps )) {
334
  if( $comp )
335
  $calendar->setComponent( $comp );
336
+ $className = 'kigkonsult\\iCalcreator\\' . $rows[$row][0];
337
+ $comp = new $className;
338
  $actcomp = & $comp;
339
  $cntprops += 1;
340
  }
341
  elseif( 'VALARM' == $compname ) {
342
+ $subcomp = new kigkonsult\iCalcreator\valarm();
343
  $actcomp = & $subcomp;
344
  }
345
  else {
818
  if( $calendar )
819
  $calnl = $calendar->getConfig( 'nl' );
820
  else { /** iCalcreator set config, read and parse input iCal file */
821
+ $calendar = new kigkonsult\iCalcreator\vcalendar();
822
  if( FALSE !== ( $unique_id = $this->getConfig( 'unique_id' )))
823
  $calendar->setConfig( 'unique_id', $unique_id );
824
  $calnl = $calendar->getConfig( 'nl' );
1392
  if( $calendar )
1393
  $calnl = $calendar->getConfig( 'nl' );
1394
  else { /** iCalcreator set config, read and parse input iCal file */
1395
+ $calendar = new kigkonsult\iCalcreator\vcalendar();
1396
  if( FALSE !== ( $unique_id = $this->getConfig( 'unique_id' )))
1397
  $calendar->setConfig( 'unique_id', $unique_id );
1398
  $calnl = $calendar->getConfig( 'nl' );
lib/import-export/ics.php CHANGED
@@ -132,11 +132,6 @@ class Ai1ec_Ics_Import_Export_Engine
132
  //sort by event date function _cmpfcn of iCalcreator.class.php
133
  $v->sort();
134
 
135
- // Reverse the sort order, so that RECURRENCE-IDs are listed before the
136
- // defining recurrence events, and therefore take precedence during
137
- // caching.
138
- $v->components = array_reverse( $v->components );
139
-
140
  // TODO: select only VEVENT components that occur after, say, 1 month ago.
141
  // Maybe use $v->selectComponents(), which takes into account recurrence
142
 
132
  //sort by event date function _cmpfcn of iCalcreator.class.php
133
  $v->sort();
134
 
 
 
 
 
 
135
  // TODO: select only VEVENT components that occur after, say, 1 month ago.
136
  // Maybe use $v->selectComponents(), which takes into account recurrence
137
 
readme.txt CHANGED
@@ -3,7 +3,7 @@ Contributors: uchu, calvinyeh, raquelleira, renatotbueno, domanb, elirenato, hub
3
  Tags: calendar, event, ical, feed, ics, icalendar, sync, aggregator, google, venue, calendar widget, events widget
4
  Requires at least: 3.5
5
  Tested up to: 5.0.2
6
- Stable tag: 2.5.35
7
  Requires PHP: 5.4
8
  License: GNU General Public License, version 3 (GPL-3.0)
9
 
@@ -124,6 +124,9 @@ You can help translate by going to [https://translate.time.ly](https://translate
124
 
125
  == Changelog ==
126
 
 
 
 
127
  = Version 2.5.35 =
128
  * Bumping version
129
 
3
  Tags: calendar, event, ical, feed, ics, icalendar, sync, aggregator, google, venue, calendar widget, events widget
4
  Requires at least: 3.5
5
  Tested up to: 5.0.2
6
+ Stable tag: 2.5.36
7
  Requires PHP: 5.4
8
  License: GNU General Public License, version 3 (GPL-3.0)
9
 
124
 
125
  == Changelog ==
126
 
127
+ = Version 2.5.36 =
128
+ * Updating and fixing compatibility with CSV addon
129
+
130
  = Version 2.5.35 =
131
  * Bumping version
132