DRY out sending the ics to the browser (for files and feeds)

includes/core/classes/class-calendars.php

@@ -679,7 +679,7 @@ public static function generate_ics_filename() {
 			}
 		}
 
-		return $file_name . '.ics';
+		return $filename . '.ics';
 	}
 
 	/**
@@ -711,6 +711,41 @@ public static function send_ics_headers( string $filename ) {
 		header( 'X-Content-Type-Options: nosniff' );
 	}
 
+	/**
+	 * Output the event(s) as an iCalendar (.ics) file.
+	 *
+	 * @return void
+	 */
+	public static function send_ics_file() {
+		// Start output buffering to capture all output.
+		ob_start();
+
+		// Prepare the filename.
+		$filename = Calendars::generate_ics_filename();
+
+		// Send headers for downloading the .ics file.
+		Calendars::send_ics_headers( $filename );
+
+		// Output the generated iCalendar content.
+		$get_ical_method = ( is_feed() ) ? 'get_ical_feed' : 'get_ical_file';
+		echo wp_kses_post( Calendars::$get_ical_method() );
+
+		// Get the generated output and calculate file size.
+		$ics_content = ob_get_contents();
+		$filesize    = strlen( $ics_content );
+
+		// Send the file size in the header.
+		header( 'Content-Length: ' . $filesize );
+
+		// End output buffering and clean up.
+		ob_end_clean();
+
+		// Output the iCalendar content.
+		echo wp_kses_post( $ics_content );
+
+		exit(); // Terminate the script after the file has been output.
+	}
+
 	/**
 	 * @author Stephen Harris (@stephenharris)
 	 * @source https://github.com/stephenharris/Event-Organiser/blob/develop/includes/event-organiser-utility-functions.php#L1663

includes/templates/endpoints/ical-download.php

@@ -12,38 +12,6 @@
 defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore
 
 use GatherPress\Core\Calendars;
-use GatherPress\Core\Event;
-
-
-// Output the event as an iCalendar (.ics) file.
-function gatherpress_output_ics_file() {
-	// Start output buffering to capture all output.
-	ob_start();
-
-	// Prepare the filename.
-	$filename = Calendars::generate_ics_filename();
-
-	// Send headers for downloading the .ics file.
-    Calendars::send_ics_headers( $filename );
-
-	// Output the generated iCalendar content.
-	echo wp_kses_post( Calendars::get_ical_file() );
-
-	// Get the generated output and calculate file size.
-	$ics_content = ob_get_contents();
-	$filesize    = strlen( $ics_content );
-
-	// Send the file size in the header.
-	header( 'Content-Length: ' . $filesize );
-
-	// End output buffering and clean up.
-	ob_end_clean();
-
-	// Output the iCalendar content.
-	echo wp_kses_post( $ics_content );
-
-	exit(); // Terminate the script after the file has been output.
-}
 
 // Call the function to output the .ics file.
-gatherpress_output_ics_file();
+Calendars::send_ics_file();

includes/templates/endpoints/ical-feed.php

@@ -12,38 +12,6 @@
 defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore
 
 use GatherPress\Core\Calendars;
-use GatherPress\Core\Event;
-
-
-// Output the event as an iCalendar (.ics) file.
-function gatherpress_output_ics_file() {
-	// Start output buffering to capture all output.
-	ob_start();
-
-	// Prepare the filename.
-	$filename = Calendars::generate_ics_filename();
-
-	// Send headers for downloading the .ics file.
-    Calendars::send_ics_headers( $filename );
-
-	// Output the generated iCalendar content.
-	echo wp_kses_post( Calendars::get_ical_feed() );
-
-	// Get the generated output and calculate file size.
-	$ics_content = ob_get_contents();
-	$filesize    = strlen( $ics_content );
-
-	// Send the file size in the header.
-	header( 'Content-Length: ' . $filesize );
-
-	// End output buffering and clean up.
-	ob_end_clean();
-
-	// Output the iCalendar content.
-	echo wp_kses_post( $ics_content );
-
-	exit(); // Terminate the script after the file has been output.
-}
 
 // Call the function to output the .ics file.
-gatherpress_output_ics_file();
+Calendars::send_ics_file();