Version 5.0.6

applications/calendar/data/javascript.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <javascript app="calendar">
- <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/browse" javascript_name="ips.browse.main.js" javascript_type="controller" javascript_version="5000049" javascript_position="1000250"><![CDATA[/**
+ <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/browse" javascript_name="ips.browse.main.js" javascript_type="controller" javascript_version="5000074" javascript_position="1000250"><![CDATA[/**
  * Invision Community
  * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
  *
@@ -110,7 +110,7 @@
 		}
 	});
 }(jQuery, _));]]></file>
- <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/browse" javascript_name="ips.browse.monthView.js" javascript_type="controller" javascript_version="5000049" javascript_position="1000250"><![CDATA[/**
+ <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/browse" javascript_name="ips.browse.monthView.js" javascript_type="controller" javascript_version="5000074" javascript_position="1000250"><![CDATA[/**
  * Invision Community
  * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
  *
@@ -229,7 +229,7 @@
 		}
 	});
 }(jQuery, _));]]></file>
- <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/overview" javascript_name="ips.overview.eventList.js" javascript_type="controller" javascript_version="5000049" javascript_position="1000300"><![CDATA[/**
+ <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/overview" javascript_name="ips.overview.eventList.js" javascript_type="controller" javascript_version="5000074" javascript_position="1000300"><![CDATA[/**
  * Invision Community
  * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
  *
@@ -347,7 +347,7 @@ var PER_PAGE = 16;
         }
     });
 }(jQuery, _));]]></file>
- <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/overview" javascript_name="ips.overview.nearMe.js" javascript_type="controller" javascript_version="5000049" javascript_position="1000300"><![CDATA[/**
+ <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/overview" javascript_name="ips.overview.nearMe.js" javascript_type="controller" javascript_version="5000074" javascript_position="1000300"><![CDATA[/**
  * Invision Community
  * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
  *
@@ -711,7 +711,7 @@ var PER_PAGE = 16;
         }
     });
 }(jQuery, _));]]></file>
- <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/overview" javascript_name="ips.overview.search.js" javascript_type="controller" javascript_version="5000049" javascript_position="1000300"><![CDATA[/**
+ <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/overview" javascript_name="ips.overview.search.js" javascript_type="controller" javascript_version="5000074" javascript_position="1000300"><![CDATA[/**
  * Invision Community
  * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
  *
@@ -1265,7 +1265,7 @@ var PER_PAGE = 16;
     });
 }(jQuery, _));
 ]]></file>
- <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/submit" javascript_name="ips.submit.dates.js" javascript_type="controller" javascript_version="5000049" javascript_position="1000100"><![CDATA[/**
+ <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/submit" javascript_name="ips.submit.dates.js" javascript_type="controller" javascript_version="5000074" javascript_position="1000100"><![CDATA[/**
  * Invision Community
  * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
  *
@@ -1813,7 +1813,7 @@ var PER_PAGE = 16;
 		}
 	});
 }(jQuery, _));]]></file>
- <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/venue" javascript_name="ips.venue.main.js" javascript_type="controller" javascript_version="5000049" javascript_position="1000200"><![CDATA[/**
+ <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/venue" javascript_name="ips.venue.main.js" javascript_type="controller" javascript_version="5000074" javascript_position="1000200"><![CDATA[/**
  * Invision Community
  * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
  *
@@ -1920,7 +1920,7 @@ var PER_PAGE = 16;
 		}
 	});
 }(jQuery, _));]]></file>
- <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/view" javascript_name="ips.view.reminderButton.js" javascript_type="controller" javascript_version="5000049" javascript_position="1000150"><![CDATA[/**
+ <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/view" javascript_name="ips.view.reminderButton.js" javascript_type="controller" javascript_version="5000074" javascript_position="1000150"><![CDATA[/**
  * Invision Community
  * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
  *
@@ -2003,7 +2003,7 @@ var PER_PAGE = 16;
 		}
 	});
 }(jQuery, _));]]></file>
- <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/view" javascript_name="ips.view.reminderForm.js" javascript_type="controller" javascript_version="5000049" javascript_position="1000150">/**
+ <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/view" javascript_name="ips.view.reminderForm.js" javascript_type="controller" javascript_version="5000074" javascript_position="1000150">/**
  * Invision Community
  * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
  *
@@ -2113,7 +2113,7 @@ var PER_PAGE = 16;
 	});
 }(jQuery, _));
 </file>
- <file javascript_app="calendar" javascript_location="front" javascript_path="templates" javascript_name="ips.calendar.templates.js" javascript_type="framework" javascript_version="5000049" javascript_position="1000050"><![CDATA[/**
+ <file javascript_app="calendar" javascript_location="front" javascript_path="templates" javascript_name="ips.calendar.templates.js" javascript_type="framework" javascript_version="5000074" javascript_position="1000050"><![CDATA[/**
  * Invision Community
  * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
  */
@@ -2122,7 +2122,7 @@ var PER_PAGE = 16;
 ips.templates.set('calendar.reminder.loading', " \
 <div class='ipsLoading ipsLoading--tiny'></div>\
 ");]]></file>
- <file javascript_app="calendar" javascript_location="front" javascript_path="templates" javascript_name="ips.templates.overview.js" javascript_type="template" javascript_version="5000049" javascript_position="1000050"><![CDATA[ips.templates.set("eventLoading", `
+ <file javascript_app="calendar" javascript_location="front" javascript_path="templates" javascript_name="ips.templates.overview.js" javascript_type="template" javascript_version="5000074" javascript_position="1000050"><![CDATA[ips.templates.set("eventLoading", `
 	<li class='ipsData__item ipsData__item--loading'>
 		<div class="ipsData__image"></div>
 		<div class="ipsData__content">
@@ -2154,8 +2154,7 @@ mustache
 Debug.js
 app.js</order>
  <order app="global" path="/dev/js//library//jquery">jquery.js
-jquery-migrate.js
-jquery.transform.js</order>
+jquery-migrate.js</order>
  <order app="global" path="/dev/js//library//linkify">linkify.min.js
 linkify-jquery.min.js</order>
 </javascript>

applications/calendar/data/lang.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language>
- <app key="calendar" version="5000049">
+ <app key="calendar" version="5000074">
   <word key="__app_calendar" js="0">Events</word>
   <word key="frontnavigation_calendar" js="0">Events</word>
   <word key="__indefart_calendar_event_comment" js="0">a comment on an event</word>

applications/calendar/data/settings.json

@@ -46,7 +46,7 @@
     },
     {
         "key": "ipb_calendar_mon",
-        "default": "0",
+        "default": "1",
         "report": "full"
     },
     {

applications/calendar/data/theme.xml

@@ -314,8 +314,8 @@
 		{{$coverPhoto = $event->coverPhoto();}}
 		{{if $coverPhoto->file}}
 			{{$image = $coverPhoto->file;}}
-		{{elseif $event->container()->club() !== NULL && $event->container()->club()->profile_photo}}
-			{{$image = \IPS\File::get('core_Clubs', $event->container()->club()->profile_photo );}}
+		{{elseif $event->container()->club() !== NULL && $event->container()->club()->cover_photo}}
+			{{$image = \IPS\File::get('core_Clubs', $event->container()->club()->cover_photo );}}
 		{{endif}}
 	{{endif}}
 	<figure class="ipsData__image">
@@ -483,8 +483,8 @@
 {{$coverPhoto = $event->coverPhoto();}}
 {{if $coverPhoto->file}}
 	{{$image = $coverPhoto->file;}}
-{{elseif $event->container()->club() !== NULL && $event->container()->club()->profile_photo}}
-	{{$image = \IPS\File::get('core_Clubs', $event->container()->club()->profile_photo );}}
+{{elseif $event->container()->club() !== NULL && $event->container()->club()->cover_photo}}
+	{{$image = \IPS\File::get('core_Clubs', $event->container()->club()->cover_photo );}}
 {{endif}}
 
 <li class='ipsData__item'>
@@ -629,11 +629,13 @@
 	<section class='ipsBox i-margin-bottom_block'>
 		<h2 class='ipsBox__header'>{lang="events_online_events"}</h2>
 		<div class='i-padding_3 i-background_2 i-border-end-start-radius_box i-border-end-end-radius_box'>
-			<ul class='ipsEventList ipsData ipsData--grid ipsData--events-list'>
-				{{foreach $events as $event}}
-					{template="event" app="calendar" group="events" params="$event, 'small'"}
-				{{endforeach}}
-			</ul>
+			<i-data>
+				<ul class='ipsEventList ipsData ipsData--grid ipsData--events-list'>
+					{{foreach $events as $event}}
+						{template="event" app="calendar" group="events" params="$event, 'small'"}
+					{{endforeach}}
+				</ul>
+			</i-data>
 		</div>
 	</section>
 {{endif}}]]></template>
@@ -715,6 +717,13 @@
 		<a href='{$url}' title='{$item->mapped('title')}' class='ipsRichEmbed_masthead'>
 			<img src='{$photo->url}' alt='{$item->mapped('title')}' loading="lazy">
 		</a>
+	{{elseif $club = $item->container()->club()}}
+	    {{if $club->coverPhoto() and $club->coverPhoto()->file}}
+	        {{$photo = $club->coverPhoto()->file;}}
+	        <a href='{$url}' title='{$item->mapped('title')}' class='ipsRichEmbed_masthead'>
+       			<img src='{$photo->url}' alt='{$item->mapped('title')}' loading="lazy">
+       		</a>
+	    {{endif}}
 	{{endif}}
 	<div class='ipsRichEmbed__content'>
 		<div class='ipsColumns'>
@@ -814,6 +823,13 @@
 					<a href='{$url}' title='{$item->mapped('title')}' class='ipsRichEmbed_masthead ipsRichEmbed_masthead_small'>
 						<img src='{$photo->url}' alt='{$item->mapped('title')}' loading="lazy">
 					</div>
+				{{elseif $club = $item->container()->club()}}
+                    {{if $club->coverPhoto() and $club->coverPhoto()->file}}
+                        {{$photo = $club->coverPhoto()->file;}}
+                        <a href='{$url}' title='{$item->mapped('title')}' class='ipsRichEmbed_masthead'>
+                   			<img src='{$photo->url}' alt='{$item->mapped('title')}' loading="lazy">
+                   		</a>
+                    {{endif}}
 				{{endif}}
 				<div class='i-padding_3'>
 					<div class='ipsPhotoPanel'>
@@ -886,6 +902,13 @@
 					<a href='{$url}' title='{$item->mapped('title')}' class='ipsRichEmbed_masthead ipsRichEmbed_masthead_small'>
 						<img src='{$photo->url}' alt='{$item->mapped('title')}' loading="lazy">
 					</a>
+				{{elseif $club = $item->container()->club()}}
+                    {{if $club->coverPhoto() and $club->coverPhoto()->file}}
+                        {{$photo = $club->coverPhoto()->file;}}
+                        <a href='{$url}' title='{$item->mapped('title')}' class='ipsRichEmbed_masthead'>
+                   			<img src='{$photo->url}' alt='{$item->mapped('title')}' loading="lazy">
+                   		</a>
+                    {{endif}}
 				{{endif}}
 				<div class='i-padding_3'>
 					<div class='ipsPhotoPanel'>
@@ -1204,9 +1227,9 @@
 		</div>
 	</div>
 {{endif}}]]></template>
- <template template_group="overview" template_name="byMonth" template_data="$calendars, $date, $featured, $events, $thisCalendar, $months=array()" template_location="front" template_app="calendar"><![CDATA[<section class='ipsBox' data-controller="calendar.front.overview.eventList">
+ <template template_group="overview" template_name="byMonth" template_data="$calendars, $date, $featured, $events, $thisCalendar, $months=array()" template_location="front" template_app="calendar"><![CDATA[<section class='ipsBox' data-controller="calendar.front.overview.eventList" data-ips-hook="main">
 	<h2 class='ipsBox__header'>{lang="events_browse_by_month"}</h2>
-	<div class='cEvents__monthNav' data-role='monthNav'>
+	<div class='cEvents__monthNav' data-role='monthNav' data-ips-hook="navigation">
 		{{foreach $months as $monthObj }}
 			<a class='cEvents__monthNav__monthItem {{if $monthObj->format( 'n' ) == $date->mon}}cEvents__monthNav__monthItem--active{{endif}}' href="{{if $thisCalendar}}{url="app=calendar&module=calendar&controller=view&id={$thisCalendar->_id}&y={$monthObj->format( 'Y' )}&m={$monthObj->format( 'n' )}"}{{else}}{url="app=calendar&module=calendar&controller=view&y={$monthObj->format( 'Y' )}&m={$monthObj->format( 'n' )}"}{{endif}}" rel='nofollow' data-action='changeMonth' data-month='{$monthObj->format( 'n' )}' data-year='{$monthObj->format( 'Y' )}'>
 			<span class='cEvents__monthNav__month'>{lang="_date_month_short" pluralize="$monthObj->format( 'n' )"}</span>
@@ -1216,7 +1239,7 @@
 	</div>
 	{{if \count($events) }}
 		<i-data>
-			<ul class='ipsEventList ipsData ipsData--grid ipsData--events-list' data-role='eventList'>
+			<ul class='ipsEventList ipsData ipsData--grid ipsData--events-list' data-role='eventList' data-ips-hook="eventsList">
 				{{foreach $events as $event}}
 					{template="event" app="calendar" group="events" params="$event, 'normal', \IPS\calendar\Date::getDate( $date->firstDayOfMonth('year'), $date->firstDayOfMonth('mon'), $date->firstDayOfMonth('mday') )"}
 				{{endforeach}}
@@ -1737,7 +1760,7 @@
 	{{endif}}
 </div>]]></template>
  <template template_group="view" template_name="comments" template_data="$event" template_location="front" template_app="calendar"><![CDATA[
-<div class='' data-controller='core.front.core.commentFeed, core.front.core.ignoredComments' {{if settings.auto_polling_enabled}}data-autoPoll{{endif}} data-baseURL='{$event->url()}' {{if $event->isLastPage()}}data-lastPage{{endif}} data-feedID='{$event->feedId}' id='comments'>
+<div class='' data-controller='core.front.core.commentFeed, core.front.core.ignoredComments' {{if settings.auto_polling_enabled}}data-autoPoll{{endif}} data-baseURL='{$event->url()}' {{if $event->isLastPage()}}data-lastPage{{endif}} data-feedID='{$event->feedId}' id='comments' data-follow-area-id="event-{$event->id}">
 
 	{template="featuredComments" group="global" app="core" params="$event->featuredComments(), $event->url()->setQueryString('tab', 'comments')->setQueryString('recommended', 'comments')"}
 	<div class="ipsButtonBar ipsButtonBar--top">
@@ -1861,6 +1884,9 @@
 	</div>
 </div>]]></template>
  <template template_group="view" template_name="eventBlock" template_data="$event, $date, $truncate=FALSE, $map=array( 300, 200 ), $revertToFirst=FALSE" template_location="front" template_app="calendar"><![CDATA[{{$coverPhoto = $event->coverPhoto();}}
+{{if ( $coverPhoto === null or $coverPhoto->file === null ) and $club = $event->container()->club()}}
+    {{$coverPhoto = $club->coverPhoto();}}
+{{endif}}
 <li class="ipsData__item  {$event->ui('css')}" data-eventID='{$event->id}' {$event->ui( 'dataAttributes' )}>
 	<a href="{$event->url( 'getPrefComment' )}" class="ipsLinkPanel" aria-hidden="true" tabindex="-1"><span>{$event->title}</span></a>
 	<div class="ipsData__image">
@@ -1993,7 +2019,7 @@
 </i-data>]]></template>
  <template template_group="view" template_name="eventSidebar" template_data="$event, $attendees, $tabId='', $address=NULL" template_location="front" template_app="calendar"><![CDATA[
 <div class='ipsBlockSpacer'>
-	{{if $address || $event->map( 500, 500 )}}
+	{{if !$event->online and ( $address || $event->map( 500, 500 ) )}}
 		<div data-ips-hook="mapWrapper" class='ipsBox ipsPull'>
 			{{if $event->map( 500, 500 )}}
 				<div data-ips-hook="map" class='cEvents__sidebarMap'>
@@ -2166,6 +2192,9 @@
 	{{endif}}
 </div>]]></template>
  <template template_group="view" template_name="eventStreamBlock" template_data="$event, $date, $truncate=FALSE, $map=array( 300, 200 ), $revertToFirst=FALSE" template_location="front" template_app="calendar"><![CDATA[{{$coverPhoto = $event->coverPhoto();}}
+{{if ( $coverPhoto === null or $coverPhoto->file === null ) and $club = $event->container()->club()}}
+    {{$coverPhoto = $club->coverPhoto();}}
+{{endif}}
 
 <div class='cCalendarBlock i-background_1 ipsInnerBox i-margin-bottom_block {$event->ui( 'css' )}' {$event->ui( 'dataAttributes' )}>
 	<div class='ipsCoverPhoto' data-controller='core.global.core.coverPhoto' data-coverOffset='{$coverPhoto->offset}' style='--offset:{$coverPhoto->offset}'>
@@ -2310,7 +2339,7 @@
 	</div>
 </form>]]></template>
  <template template_group="view" template_name="reviews" template_data="$event" template_location="front" template_app="calendar"><![CDATA[
-<div data-controller='core.front.core.commentFeed' {{if settings.auto_polling_enabled}}data-autoPoll{{endif}} data-commentsType='reviews' data-baseURL='{$event->url()}' {{if $event->isLastPage('reviews')}}data-lastPage{{endif}} data-feedID='{$event->reviewFeedId}' id='reviews'>
+<div data-controller='core.front.core.commentFeed' {{if settings.auto_polling_enabled}}data-autoPoll{{endif}} data-commentsType='reviews' data-baseURL='{$event->url()}' {{if $event->isLastPage('reviews')}}data-lastPage{{endif}} data-feedID='{$event->reviewFeedId}' id='reviews' data-follow-area-id="event-{$event->id}">
 	{{if $event->reviewForm()}}
 		{{if $event->locked()}}
 			<strong class='i-color_warning'><i class='fa-solid fa-circle-info'></i> {lang="item_locked_can_review"}</strong>
@@ -2558,7 +2587,7 @@
 	<div class='ipsBox i-padding_2 ipsPull ipsResponsive_showPhone'>
 		<div class='ipsPageActions'>
 			{{if \count( $event->shareLinks() )}}
-				{template="shareButton" app="core" group="sharelinks" params="$event, 'verySmall', 'light'"}
+				{template="shareButton" app="core" group="sharelinks" params="$event"}
 			{{endif}}
 			{{if $event->canRemind()}}
 				{template="reminder" app="calendar" group="view" params="$event, $reminder, 'ipsButton--wide'"}

applications/calendar/data/versions.json

@@ -268,6 +268,13 @@
     "107785": "4.7.19",
     "107786": "4.7.19",
     "107787": "4.7.19",
+    "107795": "4.7.20 Beta 1",
+    "107796": "4.7.20 Beta 2",
+    "107797": "4.7.20 Beta 3",
+    "107798": "4.7.20 Beta 4",
+    "107799": "4.7.20 Beta 5",
+    "107800": "4.7.20",
+    "107801": "4.7.20",
     "500001": "5.0.0 Alpha 1",
     "500002": "5.0.0 Alpha 2",
     "5000003": "5.0.0 Alpha 3",
@@ -316,5 +323,30 @@
     "5000046": "5.0.0 Beta 14",
     "5000047": "5.0.0 Beta 14.1",
     "5000048": "5.0.0 Beta 14.2",
-    "5000049": "5.0.0"
+    "5000049": "5.0.0",
+    "5000050": "5.0.0",
+    "5000051": "5.0.0",
+    "5000052": "5.0.1",
+    "5000053": "5.0.1",
+    "5000054": "5.0.2",
+    "5000055": "5.0.2",
+    "5000056": "5.0.2",
+    "5000057": "5.0.3",
+    "5000058": "5.0.3",
+    "5000059": "5.0.3",
+    "5000060": "5.0.3",
+    "5000061": "5.0.4 Beta 1",
+    "5000062": "5.0.4 Beta 1",
+    "5000063": "5.0.4 Beta 1",
+    "5000064": "5.0.4 Beta 2",
+    "5000065": "5.0.4 Beta 3",
+    "5000066": "5.0.4",
+    "5000067": "5.0.5 Beta 1",
+    "5000068": "5.0.5 Beta 2",
+    "5000069": "5.0.5",
+    "5000070": "5.0.6 Beta 1",
+    "5000071": "5.0.6 Beta 2",
+    "5000072": "5.0.6 Beta 3",
+    "5000073": "5.0.6 Beta 4",
+    "5000074": "5.0.6"
 }

applications/calendar/modules/front/calendar/event.php

@@ -423,7 +423,7 @@ class event extends Controller
 		];
 
 		Webhook::fire( 'calendarEvent_rsvp', $webhookData );
-		\IPS\Events\Event::fire( 'onEventRsvp', Member::loggedIn(), array( $this->event, $_go ) );
+		\IPS\Events\Event::fire( 'onEventRsvp', Member::loggedIn(), array( $this->event, $_go ?? EventClass::RSVP_LEFT ) );
 		$message	= 'rsvp_selection_' . Request::i()->action;
 
 		Output::i()->redirect( $this->event->url(), $message );

applications/calendar/modules/front/calendar/submit.php

@@ -191,6 +191,9 @@ class submit extends Controller
 			}
 		}
 
+		/* Make sure we fire extensions */
+		Event::extendForm( $form, $existing, $existing->container() );
+
 		if ( $values = $form->values() )
 		{
 			/* Set the container */

applications/calendar/modules/front/calendar/view.php

@@ -17,13 +17,11 @@ use BadFunctionCallException;
 use DateInterval;
 use DatePeriod;
 use DateTime;
-use DateTimeZone;
 use Exception;
 use InvalidArgumentException;
 use IPS\calendar\Calendar;
 use IPS\calendar\Date;
 use IPS\calendar\Event;
-use IPS\Db;
 use IPS\Dispatcher\Controller;
 use IPS\GeoLocation;
 use IPS\Helpers\Form;
@@ -33,7 +31,6 @@ use IPS\Helpers\Form\Text;
 use IPS\Http\Url;
 use IPS\Member;
 use IPS\Output;
-use IPS\Patterns\ActiveRecordIterator;
 use IPS\Request;
 use IPS\Session;
 use IPS\Settings;
@@ -158,12 +155,10 @@ class view extends Controller
 			if( method_exists( $this, '_view' . ucwords( Request::i()->view ) ) )
 			{
 				$method	= "_view" . ucwords( Request::i()->view );
-				$this->$method( $jump );
 			}
 			else
 			{
 				$method	= "_view" . ucwords( Settings::i()->calendar_default_view );
-				$this->$method( $jump );
 			}
 		}
 		/* Otherwise use ACP default preference */
@@ -171,9 +166,16 @@ class view extends Controller
 		{
 			Request::i()->view = Settings::i()->calendar_default_view;
 			$method	= "_view" . ucwords( Settings::i()->calendar_default_view );
-			$this->$method( $jump );
 		}
 
+		/* Remove overview for club calendars only */
+		if( Request::i()->view == 'overview' and $this->_calendar and $club = $this->_calendar->club() )
+		{
+			$method = '_viewMonth';
+		}
+
+		$this->$method( $jump );
+
 		/* Online User Location */
 		if ( $this->_calendar )
 		{
@@ -196,6 +198,13 @@ class view extends Controller
 		/* Get the month data */
 		$day		= NULL;
 
+		preg_match( '/^\d{4}$/', Request::i()->y, $y );
+		preg_match( '/^\d{1,2}$/', Request::i()->m, $m );
+		if( ( empty( $y ) and !empty( $m ) ) or ( !empty( $y ) and empty( $m ) ) )
+		{
+			Output::i()->error( 'error_bad_date', '2L182/4', 403 );
+		}
+
 		if( ( !Request::i()->y OR Request::i()->y == $this->_today->year ) AND ( !Request::i()->m OR Request::i()->m == $this->_today->mon ) )
 		{
 			$day	= $this->_today->mday;
@@ -253,6 +262,16 @@ class view extends Controller
 	 */
 	protected function _viewWeek( Form $jump ) : void
 	{
+		/* Make sure we have a valid date */
+		if( isset( Request::i()->w ) )
+		{
+			preg_match( '/^\d{4}-\d{2}-\d{2}$/', Request::i()->w, $match );
+			if( empty( $match ) )
+			{
+				Output::i()->error( 'error_bad_date', '2L182/1', 403, '' );
+			}
+		}
+
 		/* Get the week data */
 		$week		= Request::i()->w ? explode( '-', Request::i()->w ) : NULL;
 		try
@@ -332,6 +351,19 @@ class view extends Controller
 	 */
 	protected function _viewDay( Form $jump ) : void
 	{
+		/* Did Esther have a bad date? */
+		if( isset( Request::i()->y ) or isset( Request::i()->m ) or isset( Request::i()->d ) )
+		{
+			preg_match( '/^\d{4}$/', Request::i()->y, $y );
+			preg_match( '/^\d{1,2}$/', Request::i()->m, $m );
+			preg_match( '/^\d{1,2}$/', Request::i()->d, $d );
+			if( empty( $y ) or empty( $m ) or empty( $d ) )
+			{
+				/* All signs point to yes */
+				Output::i()->error( 'error_bad_date', '2L182/3', 403 );
+			}
+		}
+
 		/* Get the day data */
 		try
 		{
@@ -499,7 +531,7 @@ class view extends Controller
 		$featured = iterator_to_array( Event::featured( 13, '_rand' ) );
 
 		/* Get the calendars we can view */
-		$calendars	= \IPS\Settings::i()->club_nodes_in_apps ? \IPS\calendar\Calendar::rootsWithClubs() : \IPS\calendar\Calendar::roots();
+		$calendars	= Settings::i()->club_nodes_in_apps ? Calendar::rootsWithClubs() : Calendar::roots();
 
 		/* If there are no featured get upcoming */
 		if( count( $featured ) === 0 )

applications/calendar/setup/upg_107795/data.json

@@ -0,0 +1,23 @@
+{
+    "id": 107795,
+    "name": "4.7.20 Beta 1",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeSettings": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "hooks": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_107796/data.json

@@ -0,0 +1,23 @@
+{
+    "id": 107796,
+    "name": "4.7.20 Beta 2",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeSettings": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "hooks": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_107797/data.json

@@ -0,0 +1,23 @@
+{
+    "id": 107797,
+    "name": "4.7.20 Beta 3",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeSettings": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "hooks": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_107798/data.json

@@ -0,0 +1,23 @@
+{
+    "id": 107798,
+    "name": "4.7.20 Beta 4",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeSettings": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "hooks": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_107799/data.json

@@ -0,0 +1,23 @@
+{
+    "id": 107799,
+    "name": "4.7.20 Beta 5",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeSettings": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "hooks": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_107800/data.json

@@ -0,0 +1,23 @@
+{
+    "id": 107800,
+    "name": "4.7.20",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeSettings": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "hooks": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_107801/data.json

@@ -0,0 +1,23 @@
+{
+    "id": 107801,
+    "name": "4.7.20",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeSettings": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "hooks": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000050/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000050,
+    "name": "5.0.0",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000051/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000051,
+    "name": "5.0.0",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000052/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000052,
+    "name": "5.0.1",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000053/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000053,
+    "name": "5.0.1",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000054/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000054,
+    "name": "5.0.2",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000055/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000055,
+    "name": "5.0.2",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000056/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000056,
+    "name": "5.0.2",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000057/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000057,
+    "name": "5.0.3",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": true,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000057/theme.json

@@ -0,0 +1,19 @@
+{
+    "html": {
+        "added": [],
+        "edited": [
+            "front\/view\/eventSidebar"
+        ],
+        "removed": []
+    },
+    "css": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "resources": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    }
+}

applications/calendar/setup/upg_5000058/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000058,
+    "name": "5.0.3",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000059/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000059,
+    "name": "5.0.3",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000060/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000060,
+    "name": "5.0.3",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000061/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000061,
+    "name": "5.0.4 Beta 1",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": true,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000061/theme.json

@@ -0,0 +1,20 @@
+{
+    "html": {
+        "added": [],
+        "edited": [
+            "front\/view\/comments",
+            "front\/view\/reviews"
+        ],
+        "removed": []
+    },
+    "css": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "resources": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    }
+}

applications/calendar/setup/upg_5000062/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000062,
+    "name": "5.0.4 Beta 1",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000063/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000063,
+    "name": "5.0.4 Beta 1",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000064/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000064,
+    "name": "5.0.4 Beta 2",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000065/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000065,
+    "name": "5.0.4 Beta 3",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000066/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000066,
+    "name": "5.0.4",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000067/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000067,
+    "name": "5.0.5 Beta 1",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": true,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000067/theme.json

@@ -0,0 +1,25 @@
+{
+    "html": {
+        "added": [],
+        "edited": [
+            "front\/events\/event",
+            "front\/events\/featuredEvent",
+            "front\/global\/embedEvent",
+            "front\/global\/embedEventComment",
+            "front\/global\/embedEventReview",
+            "front\/view\/eventBlock",
+            "front\/view\/eventStreamBlock"
+        ],
+        "removed": []
+    },
+    "css": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "resources": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    }
+}

applications/calendar/setup/upg_5000068/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000068,
+    "name": "5.0.5 Beta 2",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": true,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000068/theme.json

@@ -0,0 +1,19 @@
+{
+    "html": {
+        "added": [],
+        "edited": [
+            "front\/view\/view"
+        ],
+        "removed": []
+    },
+    "css": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "resources": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    }
+}

applications/calendar/setup/upg_5000069/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000069,
+    "name": "5.0.5",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000070/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000070,
+    "name": "5.0.6 Beta 1",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": true,
+        "themeeditor": false,
+        "javascript": true,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": true,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000070/javascript.json

@@ -0,0 +1,14 @@
+{
+    "files": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "orders": {
+        "added": [],
+        "edited": [
+            "global\/\/dev\/js\/\/library\/\/jquery"
+        ],
+        "removed": []
+    }
+}

applications/calendar/setup/upg_5000070/theme.json

@@ -0,0 +1,19 @@
+{
+    "html": {
+        "added": [],
+        "edited": [
+            "front\/events\/online"
+        ],
+        "removed": []
+    },
+    "css": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "resources": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    }
+}

applications/calendar/setup/upg_5000071/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000071,
+    "name": "5.0.6 Beta 2",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": true,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000071/theme.json

@@ -0,0 +1,19 @@
+{
+    "html": {
+        "added": [],
+        "edited": [
+            "front\/overview\/byMonth"
+        ],
+        "removed": []
+    },
+    "css": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "resources": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    }
+}

applications/calendar/setup/upg_5000072/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000072,
+    "name": "5.0.6 Beta 3",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000073/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000073,
+    "name": "5.0.6 Beta 4",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000074/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000074,
+    "name": "5.0.6",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/sources/Calendar/Calendar.php

@@ -375,7 +375,7 @@ class Calendar extends Model implements Permissions
 	 * @param Club $club
 	 * @return    void
 	 */
-	public function clubForm( Form $form, Club $club ) : void
+	public function _clubForm( Form $form, Club $club ) : void
 	{
 		/* @var Item $itemClass */
 		$itemClass = static::$contentItemClass;

applications/calendar/sources/Event/Event.php

@@ -246,6 +246,11 @@ class Event extends Item implements Embeddable,
 	 * @brief		RSVP statuses
 	 */
 	const RSVP_MAYBE	= 2;
+
+	/**
+	 * @brief		Left the event
+	 */
+	const RSVP_LEFT		= 3;
 	
 	/**
 	 * Columns needed to query for search result / stream view
@@ -1878,6 +1883,19 @@ class Event extends Item implements Embeddable,
 		$this->cover_photo	= ( $values['event_cover_photo'] !== NULL ) ? (string) $values['event_cover_photo'] : NULL;
 
 		/* Set location */
+		if( $values['event_location'] instanceof GeoLocation )
+		{
+			/* Make sure we have coordinates, we need to store them later */
+			if( !$values['event_location']->lat or !$values['event_location']->long )
+			{
+				try
+				{
+					$values['event_location']->getLatLong();
+				}
+				catch( BadMethodCallException ){}
+			}
+		}
+
 		$this->location		= ( $values['event_location'] !== NULL ) ? json_encode( $values['event_location'] ) : NULL;
 
 		if ( Settings::i()->calendar_venues_enabled )
@@ -1914,15 +1932,8 @@ class Event extends Item implements Embeddable,
 
 		}
 
-		if ( isset( $this->venue ) or isset( $this->location ) )
-		{
-			$location = json_decode( ( isset( $this->venue ) ) ? $this->venue()->address : $this->location, true );
-			$this->latitude = $location['lat'];
-			$this->longitude = $location['long'];
-		}
-
 		$this->online = $values['event_online'];
-		$this->url = $values['event_url'];
+		$this->url = $values['event_online'] ? $values['event_url'] : null;
 
 		/* Do we know the event type */
 		if( $this->online and $values['event_url'] )
@@ -1939,6 +1950,15 @@ class Event extends Item implements Embeddable,
 			{
 				$this->online_type = NULL;
 			}
+
+			$this->location = null;
+		}
+
+		if ( isset( $this->venue ) or isset( $this->location ) )
+		{
+			$location = json_decode( ( isset( $this->venue ) ) ? $this->venue()->address : $this->location, true );
+			$this->latitude = $location['lat'];
+			$this->longitude = $location['long'];
 		}
 
 		/* Gallery album association */