Changeset 2462242
- Timestamp:
- 01/25/2021 12:46:14 PM (5 years ago)
- Location:
- fooevents-calendar
- Files:
-
- 64 added
- 2 deleted
- 5 edited
-
tags/1.5.26 (deleted)
-
tags/1.6.0 (deleted)
-
tags/1.6.7 (added)
-
tags/1.6.7/.gitignore (added)
-
tags/1.6.7/classes (added)
-
tags/1.6.7/classes/calendarwidget.php (added)
-
tags/1.6.7/config.php (added)
-
tags/1.6.7/css (added)
-
tags/1.6.7/css/calendar-admin.css (added)
-
tags/1.6.7/css/fooevents-fullcalendar-dark.css (added)
-
tags/1.6.7/css/fooevents-fullcalendar-flat.css (added)
-
tags/1.6.7/css/fooevents-fullcalendar-light.css (added)
-
tags/1.6.7/css/fooevents-fullcalendar-minimalist.css (added)
-
tags/1.6.7/css/fooevents-list-dark-card.css (added)
-
tags/1.6.7/css/fooevents-list-light-card.css (added)
-
tags/1.6.7/css/fullcalendar.css (added)
-
tags/1.6.7/css/fullcalendar.min.css (added)
-
tags/1.6.7/css/fullcalendar.print.css (added)
-
tags/1.6.7/css/fullcalendar.print.min.css (added)
-
tags/1.6.7/css/style.css (added)
-
tags/1.6.7/default.mo (added)
-
tags/1.6.7/default.po (added)
-
tags/1.6.7/fooevents-calendar.php (added)
-
tags/1.6.7/getting-started-readme.txt (added)
-
tags/1.6.7/js (added)
-
tags/1.6.7/js/calendar-admin.js (added)
-
tags/1.6.7/js/fullcalendar.js (added)
-
tags/1.6.7/js/fullcalendar.min.js (added)
-
tags/1.6.7/js/gcal.js (added)
-
tags/1.6.7/js/gcal.min.js (added)
-
tags/1.6.7/js/locale-all.js (added)
-
tags/1.6.7/js/moment.min.js (added)
-
tags/1.6.7/languages (added)
-
tags/1.6.7/languages/fooevents-calendar-zh_TW.po (added)
-
tags/1.6.7/languages/readme.txt (added)
-
tags/1.6.7/license.txt (added)
-
tags/1.6.7/readme.txt (added)
-
tags/1.6.7/screenshot-1.png (added)
-
tags/1.6.7/screenshot-2.png (added)
-
tags/1.6.7/screenshot-3.png (added)
-
tags/1.6.7/screenshot-4.png (added)
-
tags/1.6.7/screenshot-5.png (added)
-
tags/1.6.7/screenshot-6.png (added)
-
tags/1.6.7/templates (added)
-
tags/1.6.7/templates/calendar-options-eventbrite.php (added)
-
tags/1.6.7/templates/calendar-options-layout.php (added)
-
tags/1.6.7/templates/calendar-options.php (added)
-
tags/1.6.7/templates/calendar.php (added)
-
tags/1.6.7/templates/event.php (added)
-
tags/1.6.7/templates/eventbrite-options.php (added)
-
tags/1.6.7/templates/eventmetabox.php (added)
-
tags/1.6.7/templates/list_of_events.php (added)
-
tags/1.6.7/templates/pluginintroduction.php (added)
-
tags/1.6.7/updatelog.txt (added)
-
tags/1.6.7/vendors (added)
-
tags/1.6.7/vendors/eventbrite (added)
-
tags/1.6.7/vendors/eventbrite/.travis.yml (added)
-
tags/1.6.7/vendors/eventbrite/AccessMethods.php (added)
-
tags/1.6.7/vendors/eventbrite/Authenticate.php (added)
-
tags/1.6.7/vendors/eventbrite/HttpClient.php (added)
-
tags/1.6.7/vendors/eventbrite/README.md (added)
-
tags/1.6.7/vendors/eventbrite/composer.json (added)
-
tags/1.6.7/vendors/eventbrite/phpunit.xml (added)
-
tags/1.6.7/vendors/eventbrite/tests (added)
-
tags/1.6.7/vendors/eventbrite/tests/ClientTest.php (added)
-
tags/1.6.7/vendors/index.php (added)
-
trunk/default.mo (modified) (previous)
-
trunk/default.po (modified) (3 diffs)
-
trunk/fooevents-calendar.php (modified) (13 diffs)
-
trunk/readme.txt (modified) (1 diff)
-
trunk/updatelog.txt (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
fooevents-calendar/trunk/default.po
r2438934 r2462242 2 2 msgstr "" 3 3 "Project-Id-Version: FooEvents Calendar\n" 4 "POT-Creation-Date: 202 0-12-14 10:33+0200\n"5 "PO-Revision-Date: 202 0-12-14 10:33+0200\n"4 "POT-Creation-Date: 2021-01-25 09:03+0200\n" 5 "PO-Revision-Date: 2021-01-25 09:03+0200\n" 6 6 "Last-Translator: \n" 7 7 "Language-Team: \n" … … 59 59 msgstr "" 60 60 61 #: fooevents-calendar.php:184 fooevents-calendar.php:13 1861 #: fooevents-calendar.php:184 fooevents-calendar.php:1321 62 62 msgid "Today" 63 63 msgstr "" … … 99 99 msgstr "" 100 100 101 #: fooevents-calendar.php:102 0101 #: fooevents-calendar.php:1023 102 102 #, php-format 103 103 msgid "%d events added. %d events updated." 104 104 msgstr "" 105 105 106 #: fooevents-calendar.php:108 3 fooevents-calendar.php:1234106 #: fooevents-calendar.php:1086 fooevents-calendar.php:1237 107 107 msgid "Book ticket" 108 108 msgstr "" 109 109 110 #: fooevents-calendar.php: 1990110 #: fooevents-calendar.php:2017 111 111 msgid "Calendar Settings" 112 112 msgstr "" 113 113 114 #: fooevents-calendar.php: 1996114 #: fooevents-calendar.php:2023 115 115 msgid "Enable 24 hour time format" 116 116 msgstr "" 117 117 118 #: fooevents-calendar.php:20 00118 #: fooevents-calendar.php:2027 119 119 msgid "Uses 24 hour time format on the calendar." 120 120 msgstr "" 121 121 122 #: fooevents-calendar.php:20 05templates/calendar-options.php:16122 #: fooevents-calendar.php:2032 templates/calendar-options.php:16 123 123 msgid "Only display start day" 124 124 msgstr "" 125 125 126 #: fooevents-calendar.php:20 09126 #: fooevents-calendar.php:2036 127 127 msgid "When multi-day plugin is active only display the event start day" 128 128 msgstr "" 129 129 130 #: fooevents-calendar.php:20 13130 #: fooevents-calendar.php:2040 131 131 msgid "Enable full day events" 132 132 msgstr "" 133 133 134 #: fooevents-calendar.php:20 17134 #: fooevents-calendar.php:2044 135 135 msgid "Removes event time from calendar entry titles." 136 136 msgstr "" 137 137 138 #: fooevents-calendar.php:20 21templates/calendar-options.php:30138 #: fooevents-calendar.php:2048 templates/calendar-options.php:30 139 139 msgid "Calendar theme" 140 140 msgstr "" 141 141 142 #: fooevents-calendar.php:20 27 fooevents-calendar.php:2043142 #: fooevents-calendar.php:2054 fooevents-calendar.php:2070 143 143 msgid "Default" 144 144 msgstr "" 145 145 146 #: fooevents-calendar.php:20 28146 #: fooevents-calendar.php:2055 147 147 msgid "Light" 148 148 msgstr "" 149 149 150 #: fooevents-calendar.php:20 29150 #: fooevents-calendar.php:2056 151 151 msgid "Dark" 152 152 msgstr "" 153 153 154 #: fooevents-calendar.php:20 30154 #: fooevents-calendar.php:2057 155 155 msgid "Flat" 156 156 msgstr "" 157 157 158 #: fooevents-calendar.php:20 31158 #: fooevents-calendar.php:2058 159 159 msgid "Minimalist" 160 160 msgstr "" 161 161 162 #: fooevents-calendar.php:20 33162 #: fooevents-calendar.php:2060 163 163 msgid "Selects calendar theme to be used on Wordpress frontend." 164 164 msgstr "" 165 165 166 #: fooevents-calendar.php:20 37templates/calendar-options.php:43166 #: fooevents-calendar.php:2064 templates/calendar-options.php:43 167 167 msgid "Events list theme" 168 168 msgstr "" 169 169 170 #: fooevents-calendar.php:20 44170 #: fooevents-calendar.php:2071 171 171 msgid "Light Card" 172 172 msgstr "" 173 173 174 #: fooevents-calendar.php:20 45174 #: fooevents-calendar.php:2072 175 175 msgid "Dark Card" 176 176 msgstr "" 177 177 178 #: fooevents-calendar.php:20 47178 #: fooevents-calendar.php:2074 179 179 msgid "Selects events list theme to be used on Wordpress frontend." 180 180 msgstr "" -
fooevents-calendar/trunk/fooevents-calendar.php
r2438934 r2462242 3 3 * Plugin Name: FooEvents Calendar 4 4 * Description: Add event information to any post, page or custom post type and display it in a stylish calendar. 5 * Version: 1.6. 35 * Version: 1.6.7 6 6 * Author: FooEvents 7 7 * Plugin URI: https://www.fooevents.com/fooevents-calendar/ … … 42 42 add_action('save_post', array($this, 'save_posts_meta_box')); 43 43 add_action('admin_menu', array($this, 'add_admin_menu'), 12); 44 add_action('admin_ init', array($this, 'display_meta_errors'));44 add_action('admin_notices', array($this, 'display_meta_errors')); 45 45 add_action('activated_plugin', array($this, 'activate_plugin')); 46 46 add_action('admin_menu', array( $this, 'add_intro_menu_item')); … … 784 784 $_SESSION['fooevents_calendar_errors'] = $errors; 785 785 session_write_close(); 786 786 787 return; 787 788 } … … 896 897 $_SESSION['fooevents_calendar_errors'] = $errors; 897 898 session_write_close(); 899 898 900 return; 899 901 } 900 902 903 session_write_close(); 901 904 902 905 } … … 1177 1180 1178 1181 $FooEvents_Bookings = new FooEvents_Bookings(); 1179 $booking_events = $FooEvents_Bookings->get_bookings_for_calendar( );1182 $booking_events = $FooEvents_Bookings->get_bookings_for_calendar($include_cats); 1180 1183 1181 1184 $events = array_merge_recursive($events, $booking_events); … … 1183 1186 } 1184 1187 1185 $non_product_events = $this->get_non_product_events( );1188 $non_product_events = $this->get_non_product_events($include_cats); 1186 1189 $non_product_events = $this->fetch_events($non_product_events, 'events_list', true); 1187 1190 … … 1334 1337 1335 1338 } 1336 1339 1340 if($display_type == 'listWeek' || $display_type == 'listMonth') { 1341 1342 $attributes['displayEventEnd'] = false; 1343 1344 } 1345 1337 1346 $events = array(); 1338 1347 $non_product_events = array(); … … 1345 1354 } 1346 1355 1347 $non_product_events = $this->get_non_product_events( );1356 $non_product_events = $this->get_non_product_events($include_cats); 1348 1357 $non_product_events = $this->fetch_events($non_product_events, $display_type, false); 1349 1358 … … 1360 1369 1361 1370 $FooEvents_Bookings = new FooEvents_Bookings(); 1362 $booking_events = $FooEvents_Bookings->get_bookings_for_calendar( );1371 $booking_events = $FooEvents_Bookings->get_bookings_for_calendar($include_cats); 1363 1372 1364 1373 $events = array_merge_recursive($events, $booking_events); … … 1570 1579 * @return array 1571 1580 */ 1572 public function get_non_product_events( ) {1581 public function get_non_product_events($include_cats = array()) { 1573 1582 1574 1583 $globalFooEventsCalendarPostTypes = get_option('globalFooEventsCalendarPostTypes'); 1575 1584 1585 1576 1586 if(empty($globalFooEventsCalendarPostTypes)) { 1577 1587 … … 1581 1591 1582 1592 array_push($globalFooEventsCalendarPostTypes, 'fe_eventbrite_event'); 1583 1593 1584 1594 $args = array ( 1585 1595 'post_type' => $globalFooEventsCalendarPostTypes, … … 1593 1603 ), 1594 1604 ); 1605 1606 if(!empty($include_cats)) { 1607 1608 $args['tax_query'] = array('relation' => 'OR'); 1609 1610 foreach($include_cats as $include_cat) { 1611 1612 $args['tax_query'][] = array( 1613 'taxonomy' => 'category', 1614 'field' => 'slug', 1615 'terms' => $include_cat 1616 ); 1617 1618 } 1619 1620 } 1595 1621 1596 1622 $events = new WP_Query($args); 1597 1623 1624 1598 1625 return $events->get_posts(); 1599 1626 … … 3081 3108 } 3082 3109 3083 3110 //session_write_close(); 3084 3111 3085 3112 } -
fooevents-calendar/trunk/readme.txt
r2438941 r2462242 4 4 Requires at least: 5 5 5 Tested up to: 5.6 6 Stable tag: 1.6. 36 Stable tag: 1.6.7 7 7 License: GPLv2 8 8 License URI: http://www.gnu.org/licenses/gpl-2.0.html -
fooevents-calendar/trunk/updatelog.txt
r2438934 r2462242 3 3 4 4 ------------------ 5 1.6.7 6 FIXED: SESSION warning 7 FIXED: listWeek end time bug 8 FIXED: Various other small bugs 9 TESTED ON: WordPress 5.6 and WooCommerce 4.9.1 10 5 11 1.6.3 6 12 FIXED: Bookings on events list
Note: See TracChangeset
for help on using the changeset viewer.