Merge tractorcow changes

code/CachedCalendarBuildTask.php

@@ -4,12 +4,10 @@ class CachedCalendarBuildTask extends BuildTask {
 
 	protected $title = "Cache the Event Calendars";
 
-
 	protected $description = 'Generates a given number of years of events and populates a readonly table with all the event information. Useful when using recurring events or multiple calendars.';
 
-
 	public function run($request) {
 		CachedCalendarTask::create()->process();
 	}
 
-}
+}

code/CachedCalendarEntry.php

@@ -1,11 +1,8 @@
 <?php
 
-
 class CachedCalendarEntry extends DataObject {
 
-
-
-	 static $db = array (		
+	 private static $db = array (		
 		'StartDate' => 'Date',
 		'StartTime' => 'Time',
 		'EndDate' => 'Date',
@@ -18,30 +15,21 @@ class CachedCalendarEntry extends DataObject {
 		'Title' => 'Varchar(255)',
 		'Content' => 'HTMLText'
 	);
-
 
-	static $has_one = array (
+	private static $has_one = array (
 		'CachedCalendar' => 'Calendar',
 		'Calendar' => 'Calendar',
 		'Event' => 'CalendarEvent'
 	);
-
-
 
-	static $default_sort = "StartDate ASC, StartTime ASC";
-
-
-
-
+	private static $default_sort = "StartDate ASC, StartTime ASC";
 
 	public static function create_from_datetime(CalendarDateTime $dt, Calendar $calendar) {
 		$cached = CachedCalendarEntry::create();
 		$cached->hydrate($dt, $calendar);
 		return $cached;
 	}
 
-
-
 	public static function create_from_announcement(CalendarAnnouncement $dt, Calendar $calendar) {
 		$cached = CachedCalendarEntry::create();
 		$cached->hydrate($dt, $calendar);
@@ -50,9 +38,6 @@ public static function create_from_announcement(CalendarAnnouncement $dt, Calend
 		return $cached;
 	}
 
-
-
-
 	public function OtherDates() {
 		if($this->Announcement) {
 			return false;
@@ -82,6 +67,4 @@ public function hydrate(CalendarDateTime $dt, Calendar $calendar) {
 		return $this;
 	}
 
-
-
-}
+}

code/CachedCalendarTask.php

@@ -1,6 +1,5 @@
 <?php
 
-
 class CachedCalendarTask extends HourlyTask {
 
 	public function process() {
@@ -55,4 +54,4 @@ public function process() {
 		}
 		echo "Done!";
 	}
-}
+}