moonstonemedia / Simple-Calendar

includes/updates/update-v220.php

Spacing +17 added lines, -17 removed lines

@@ -6,7 +6,7 @@ 
  */
 namespace SimpleCalendar\Updates;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -20,28 +20,28 @@ 
 	 *
 	 * @param array $posts
 	 */
-	public function __construct( $posts ) {
+	public function __construct($posts) {
 
-		if ( ! empty( $posts ) && is_array( $posts ) ) {
+		if ( ! empty($posts) && is_array($posts)) {
 
-			foreach ( $posts as $post ) {
+			foreach ($posts as $post) {
 
-				$gce_list_max_num        = get_post_meta( $post->ID, 'gce_list_max_num', true );
-				$gce_list_max_length     = get_post_meta( $post->ID, 'gce_list_max_length', true );
-				$gce_feed_start_interval = get_post_meta( $post->ID, 'gce_feed_start_interval', true );
-				$gce_feed_start          = get_post_meta( $post->ID, 'gce_feed_start', true );
-				$gce_feed_end_interval   = get_post_meta( $post->ID, 'gce_feed_end_interval', true );
-				$gce_feed_end            = get_post_meta( $post->ID, 'gce_feed_end', true );
+				$gce_list_max_num        = get_post_meta($post->ID, 'gce_list_max_num', true);
+				$gce_list_max_length     = get_post_meta($post->ID, 'gce_list_max_length', true);
+				$gce_feed_start_interval = get_post_meta($post->ID, 'gce_feed_start_interval', true);
+				$gce_feed_start          = get_post_meta($post->ID, 'gce_feed_start', true);
+				$gce_feed_end_interval   = get_post_meta($post->ID, 'gce_feed_end_interval', true);
+				$gce_feed_end            = get_post_meta($post->ID, 'gce_feed_end', true);
 
-				update_post_meta( $post->ID, 'gce_per_page_num', $gce_list_max_num );
-				update_post_meta( $post->ID, 'gce_events_per_page', $gce_list_max_length );
-				update_post_meta( $post->ID, 'gce_feed_start', $gce_feed_start_interval );
-				update_post_meta( $post->ID, 'gce_feed_start_num', $gce_feed_start );
-				update_post_meta( $post->ID, 'gce_feed_end', $gce_feed_end_interval );
-				update_post_meta( $post->ID, 'gce_feed_end_num', $gce_feed_end );
+				update_post_meta($post->ID, 'gce_per_page_num', $gce_list_max_num);
+				update_post_meta($post->ID, 'gce_events_per_page', $gce_list_max_length);
+				update_post_meta($post->ID, 'gce_feed_start', $gce_feed_start_interval);
+				update_post_meta($post->ID, 'gce_feed_start_num', $gce_feed_start);
+				update_post_meta($post->ID, 'gce_feed_end', $gce_feed_end_interval);
+				update_post_meta($post->ID, 'gce_feed_end_num', $gce_feed_end);
 
 				// Add new show tooltips option checked as default.
-				update_post_meta( $post->ID, 'gce_show_tooltips', 1 );
+				update_post_meta($post->ID, 'gce_show_tooltips', 1);
 			}
 
 		}

includes/updates/update-v300.php

Spacing +123 added lines, -123 removed lines

@@ -9,7 +9,7 @@ 
 use Carbon\Carbon;
 use SimpleCalendar\Post_Types;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -23,13 +23,13 @@ 
 	 *
 	 * @param array $posts
 	 */
-	public function __construct( $posts ) {
+	public function __construct($posts) {
 
 		Post_Types::register_taxonomies();
 		Post_Types::register_post_types();
 
-		if ( ! empty( $posts ) && is_array( $posts ) ) {
-			$this->update_posts( $posts );
+		if ( ! empty($posts) && is_array($posts)) {
+			$this->update_posts($posts);
 			$this->update_post_type();
 			$this->update_widgets();
 		}
@@ -43,201 +43,201 @@ 
 	 *
 	 * @param $posts
 	 */
-	public function update_posts( $posts ) {
+	public function update_posts($posts) {
 
-		foreach ( $posts as $post ) {
+		foreach ($posts as $post) {
 
 			$post_id = $post->ID;
 
 			// Assign a feed taxonomy term (feed type) to legacy posts.
-			wp_set_object_terms( $post_id, 'google', 'calendar_feed' );
+			wp_set_object_terms($post_id, 'google', 'calendar_feed');
 
 			// Assign a calendar taxonomy term (calendar type) to legacy posts.
-			wp_set_object_terms( $post_id, 'default-calendar', 'calendar_type' );
+			wp_set_object_terms($post_id, 'default-calendar', 'calendar_type');
 
 			// Convert legacy list/grid view to default calendar view.
-			$display = get_post_meta( $post_id, 'gce_display_mode', true );
+			$display = get_post_meta($post_id, 'gce_display_mode', true);
 			$views = array();
 			$range = false;
-			if ( 'list' == $display ) {
+			if ('list' == $display) {
 				$views['default-calendar'] = 'list';
-			} elseif ( 'list-grouped' == $display ) {
+			} elseif ('list-grouped' == $display) {
 				$views['default-calendar'] = 'list';
-			} elseif ( 'date-range-list' == $display ) {
+			} elseif ('date-range-list' == $display) {
 				$views['default-calendar'] = 'list';
 				$range                     = true;
-			} elseif ( 'date-range-grid' == $display ) {
+			} elseif ('date-range-grid' == $display) {
 				$views['default-calendar'] = 'grid';
 				$range                     = true;
 			} else {
 				$views['default-calendar'] = 'grid';
 			}
-			update_post_meta( $post_id, '_calendar_view', $views );
+			update_post_meta($post_id, '_calendar_view', $views);
 
 			// List calendar settings.
-			$list_span  = get_post_meta( $post_id, 'gce_events_per_page', true );
-			$list_range = max( absint( get_post_meta( $post_id, 'gce_per_page_num', true ) ), 1 );
-			if ( 'days' == $list_span ) {
+			$list_span  = get_post_meta($post_id, 'gce_events_per_page', true);
+			$list_range = max(absint(get_post_meta($post_id, 'gce_per_page_num', true)), 1);
+			if ('days' == $list_span) {
 				$list_type = 'daily';
-			} elseif ( 'week' == $list_span ) {
+			} elseif ('week' == $list_span) {
 				$list_type = 'weekly';
 				$list_range = 1;
-			} elseif ( 'month' == $list_span ) {
+			} elseif ('month' == $list_span) {
 				$list_type = 'monthly';
 				$list_range = 1;
 			} else {
 				$list_type = 'events';
 			}
-			update_post_meta( $post_id, '_default_calendar_list_range_type', $list_type );
-			update_post_meta( $post_id, '_default_calendar_list_range_span', $list_range );
+			update_post_meta($post_id, '_default_calendar_list_range_type', $list_type);
+			update_post_meta($post_id, '_default_calendar_list_range_span', $list_range);
 
 			$calendar_begins = 'today';
 
 			// Custom calendar range.
-			if ( $range === true ) {
+			if ($range === true) {
 
-				$begins = get_post_meta( $post_id, 'gce_feed_range_start', true );
-				$ends   = get_post_meta( $post_id, 'gce_feed_range_end', true );
+				$begins = get_post_meta($post_id, 'gce_feed_range_start', true);
+				$ends   = get_post_meta($post_id, 'gce_feed_range_end', true);
 
-				if ( $begins && $ends ) {
-					update_post_meta( $post_id, '_calendar_begins', 'custom_date' );
-					update_post_meta( $post_id, '_calendar_begins_custom_date', $this->convert_legacy_range( $begins ) );
+				if ($begins && $ends) {
+					update_post_meta($post_id, '_calendar_begins', 'custom_date');
+					update_post_meta($post_id, '_calendar_begins_custom_date', $this->convert_legacy_range($begins));
 				} else {
-					update_post_meta( $post_id, '_calendar_begins', $calendar_begins );
+					update_post_meta($post_id, '_calendar_begins', $calendar_begins);
 				}
 
 			} else {
 
 				// Legacy list calendars may have a start offset.
-				$offset = absint( get_post_meta( $post_id, 'gce_list_start_offset_num', true ) );
-				if ( 'list' == $display && $offset > 0 ) {
-					$calendar_begins = 'back' == get_post_meta( $post_id, 'gce_list_start_offset_direction', true ) ? 'days_before' : 'days_after';
-					update_post_meta( $post_id, '_calendar_begins_nth', $offset );
+				$offset = absint(get_post_meta($post_id, 'gce_list_start_offset_num', true));
+				if ('list' == $display && $offset > 0) {
+					$calendar_begins = 'back' == get_post_meta($post_id, 'gce_list_start_offset_direction', true) ? 'days_before' : 'days_after';
+					update_post_meta($post_id, '_calendar_begins_nth', $offset);
 				}
 
-				update_post_meta( $post_id, '_calendar_begins', $calendar_begins );
+				update_post_meta($post_id, '_calendar_begins', $calendar_begins);
 			}
 
 			// Earliest event.
-			$start_before = get_post_meta( $post_id, 'gce_feed_start', true );
-			$start_amt = absint( get_post_meta( $post_id, 'gce_feed_start_num', true ) );
-			if ( $start_amt > 0 ) {
-				if ( 'years' == $start_before ) {
+			$start_before = get_post_meta($post_id, 'gce_feed_start', true);
+			$start_amt = absint(get_post_meta($post_id, 'gce_feed_start_num', true));
+			if ($start_amt > 0) {
+				if ('years' == $start_before) {
 					$earliest = 'years_before';
-				} elseif ( 'months' == $start_before ) {
+				} elseif ('months' == $start_before) {
 					$earliest = 'months_before';
 				} else {
 					$earliest = 'days_before';
 				}
-				update_post_meta( $post_id, '_feed_earliest_event_date', $earliest );
-				update_post_meta( $post_id, '_feed_earliest_event_date_range', $start_amt );
+				update_post_meta($post_id, '_feed_earliest_event_date', $earliest);
+				update_post_meta($post_id, '_feed_earliest_event_date_range', $start_amt);
 			} else {
-				update_post_meta( $post_id, '_feed_earliest_event_date', 'calendar_start' );
-				update_post_meta( $post_id, '_feed_earliest_event_date_range', 1 );
+				update_post_meta($post_id, '_feed_earliest_event_date', 'calendar_start');
+				update_post_meta($post_id, '_feed_earliest_event_date_range', 1);
 			}
 
 			// Latest event.
-			$end_after = get_post_meta( $post_id, 'gce_feed_end', true );
-			$end_amt   = absint( get_post_meta( $post_id, 'gce_feed_end_num', true ) );
-			if ( $end_amt > 0 ) {
-				if ( 'years' == $end_after ) {
+			$end_after = get_post_meta($post_id, 'gce_feed_end', true);
+			$end_amt   = absint(get_post_meta($post_id, 'gce_feed_end_num', true));
+			if ($end_amt > 0) {
+				if ('years' == $end_after) {
 					$latest = 'years_after';
-				} elseif ( 'months' == $end_after ) {
+				} elseif ('months' == $end_after) {
 					$latest = 'months_after';
 				} else {
 					$latest = 'days_after';
 				}
-				update_post_meta( $post_id, '_feed_latest_event_date', $latest );
-				update_post_meta( $post_id, '_feed_latest_event_date_range', $end_amt );
+				update_post_meta($post_id, '_feed_latest_event_date', $latest);
+				update_post_meta($post_id, '_feed_latest_event_date_range', $end_amt);
 			} else {
-				update_post_meta( $post_id, '_feed_latest_event_date', 'calendar_start' );
-				update_post_meta( $post_id, '_feed_latest_event_date_range', 1 );
+				update_post_meta($post_id, '_feed_latest_event_date', 'calendar_start');
+				update_post_meta($post_id, '_feed_latest_event_date_range', 1);
 			}
 
 			// Static calendar.
-			if ( false === get_post_meta( $post_id, 'gce_paging', true ) ) {
-				update_post_meta( $post_id, '_calendar_is_static', 'yes' );
+			if (false === get_post_meta($post_id, 'gce_paging', true)) {
+				update_post_meta($post_id, '_calendar_is_static', 'yes');
 			}
 
 			// Default calendar bubble trigger (click was unavailable before 3.0.0).
-			update_post_meta( $post_id, '_default_calendar_event_bubble_trigger', 'hover' );
+			update_post_meta($post_id, '_default_calendar_event_bubble_trigger', 'hover');
 
 			// Default calendar multiple day events.
-			if ( get_post_meta( $post_id, 'gce_multi_day_events', true ) ) {
-				update_post_meta( $post_id, '_default_calendar_expand_multi_day_events', 'yes' );
+			if (get_post_meta($post_id, 'gce_multi_day_events', true)) {
+				update_post_meta($post_id, '_default_calendar_expand_multi_day_events', 'yes');
 			} else {
-				update_post_meta( $post_id, '_default_calendar_expand_multi_day_events', 'no' );
+				update_post_meta($post_id, '_default_calendar_expand_multi_day_events', 'no');
 			}
 
 			// Google Calendar ID.
-			$google_id = get_post_meta( $post_id, 'gce_feed_url', true );
-			update_post_meta( $post_id, '_google_calendar_id', base64_encode( trim( $google_id ) ) );
+			$google_id = get_post_meta($post_id, 'gce_feed_url', true);
+			update_post_meta($post_id, '_google_calendar_id', base64_encode(trim($google_id)));
 
 			// Google max results.
-			update_post_meta( $post_id, '_google_events_max_results', 2500 );
+			update_post_meta($post_id, '_google_events_max_results', 2500);
 
 			// Google calendar feed search terms.
-			$google_search = get_post_meta( $post_id, 'gce_search_query', true );
-			if ( ! empty( $google_search ) ) {
-				update_post_meta( $post_id, '_google_events_search_query', trim( $google_search ) );
+			$google_search = get_post_meta($post_id, 'gce_search_query', true);
+			if ( ! empty($google_search)) {
+				update_post_meta($post_id, '_google_events_search_query', trim($google_search));
 			}
 
 			// Google recurring events.
-			if ( get_post_meta( $post_id, 'gce_expand_recurring', true ) ) {
-				update_post_meta( $post_id, '_google_events_recurring', 'show' );
+			if (get_post_meta($post_id, 'gce_expand_recurring', true)) {
+				update_post_meta($post_id, '_google_events_recurring', 'show');
 			} else {
-				update_post_meta( $post_id, '_google_events_recurring', 'first-only' );
+				update_post_meta($post_id, '_google_events_recurring', 'first-only');
 			}
 
 			// Date and time format.
-			$date_format = get_post_meta( $post_id, 'gce_date_format', true );
-			if ( ! empty( $date_format ) ) {
-				update_post_meta( $post_id, '_calendar_date_format_setting', 'use_custom_php' );
-				update_post_meta( $post_id, '_calendar_date_format_php', $date_format );
+			$date_format = get_post_meta($post_id, 'gce_date_format', true);
+			if ( ! empty($date_format)) {
+				update_post_meta($post_id, '_calendar_date_format_setting', 'use_custom_php');
+				update_post_meta($post_id, '_calendar_date_format_php', $date_format);
 			} else {
-				update_post_meta( $post_id, '_calendar_date_format_setting', 'use_site' );
+				update_post_meta($post_id, '_calendar_date_format_setting', 'use_site');
 			}
-			$time_format = get_post_meta( $post_id, 'gce_time_format', true );
-			if ( ! empty( $time_format ) ) {
-				update_post_meta( $post_id, '_calendar_time_format_setting', 'use_custom_php' );
-				update_post_meta( $post_id, '_calendar_time_format_php', $time_format );
+			$time_format = get_post_meta($post_id, 'gce_time_format', true);
+			if ( ! empty($time_format)) {
+				update_post_meta($post_id, '_calendar_time_format_setting', 'use_custom_php');
+				update_post_meta($post_id, '_calendar_time_format_php', $time_format);
 			} else {
-				update_post_meta( $post_id, '_calendar_time_format_setting', 'use_site' );
+				update_post_meta($post_id, '_calendar_time_format_setting', 'use_site');
 			}
-			update_post_meta( $post_id, '_calendar_datetime_separator', '@' );
-			update_post_meta( $post_id, '_calendar_week_starts_on_setting', 'use_site' );
+			update_post_meta($post_id, '_calendar_datetime_separator', '@');
+			update_post_meta($post_id, '_calendar_week_starts_on_setting', 'use_site');
 
 			// Feed transient cache duration.
-			$cache = get_post_meta( $post_id, 'gce_cache', true );
-			if ( is_numeric( $cache ) ) {
-				$seconds = absint( $cache );
-				if ( $seconds < 3600 ) {
+			$cache = get_post_meta($post_id, 'gce_cache', true);
+			if (is_numeric($cache)) {
+				$seconds = absint($cache);
+				if ($seconds < 3600) {
 					$amount = $seconds / 60;
 					$unit   = 60;
-				} elseif ( $seconds < 86400 ) {
+				} elseif ($seconds < 86400) {
 					$amount = $seconds / 3600;
 					$unit   = 3600;
-				} elseif ( $seconds < 604800 ) {
+				} elseif ($seconds < 604800) {
 					$amount = $seconds / 86400;
 					$unit   = 86400;
 				} else {
 					$amount = $seconds / 604800;
 					$unit   = 604800;
 				}
-				$amount = max( ceil( $amount ), 1 );
-				update_post_meta( $post_id, '_feed_cache_user_unit', $unit );
-				update_post_meta( $post_id, '_feed_cache_user_amount', $amount );
-				update_post_meta( $post_id, '_feed_cache', $unit * $amount );
+				$amount = max(ceil($amount), 1);
+				update_post_meta($post_id, '_feed_cache_user_unit', $unit);
+				update_post_meta($post_id, '_feed_cache_user_amount', $amount);
+				update_post_meta($post_id, '_feed_cache', $unit * $amount);
 			} else {
-				update_post_meta( $post_id, '_feed_cache_user_unit', 2 );
-				update_post_meta( $post_id, '_feed_cache_user_amount', 3600 );
-				update_post_meta( $post_id, '_feed_cache', 7200 );
+				update_post_meta($post_id, '_feed_cache_user_unit', 2);
+				update_post_meta($post_id, '_feed_cache_user_amount', 3600);
+				update_post_meta($post_id, '_feed_cache', 7200);
 			}
 
-			$this->delete_post_meta( $post_id );
+			$this->delete_post_meta($post_id);
 
 			// Post updated.
-			update_post_meta( $post_id, '_calendar_version', '3.0.0' );
+			update_post_meta($post_id, '_calendar_version', '3.0.0');
 		}
 
 	}
@@ -247,7 +247,7 @@ 
 	 *
 	 * @param int $post_id
 	 */
-	public function delete_post_meta( $post_id ) {
+	public function delete_post_meta($post_id) {
 
 		$post_meta = array(
 			'gce_cache',
@@ -295,8 +295,8 @@ 
 			'gce_time_format',
 		);
 
-		foreach ( $post_meta as $meta_key ) {
-			delete_post_meta( $post_id, $meta_key );
+		foreach ($post_meta as $meta_key) {
+			delete_post_meta($post_id, $meta_key);
 		}
 	}
 
@@ -306,7 +306,7 @@ 
 	public function update_post_type() {
 
 		global $wpdb;
-		$table = $wpdb->prefix . 'posts';
+		$table = $wpdb->prefix.'posts';
 
 		$wpdb->query(
 			"
@@ -320,23 +320,23 @@ 
 	 */
 	public function update_options() {
 
-		$old_settings          = get_option( 'gce_settings_general' );
-		$new_settings_feeds    = get_option( 'simple-calendar_settings_feeds' );
-		$new_settings_advanced = get_option( 'simple-calendar_settings_advanced' );
+		$old_settings          = get_option('gce_settings_general');
+		$new_settings_feeds    = get_option('simple-calendar_settings_feeds');
+		$new_settings_advanced = get_option('simple-calendar_settings_advanced');
 
 		// If empty probably using a legacy hardcoded key (no longer recommended).
-		$new_settings_feeds['google']['api_key'] = ! empty( $old_settings['api_key'] ) ? $old_settings['api_key'] : '';
-		update_option( 'simple-calendar_settings_feeds', $new_settings_feeds );
+		$new_settings_feeds['google']['api_key'] = ! empty($old_settings['api_key']) ? $old_settings['api_key'] : '';
+		update_option('simple-calendar_settings_feeds', $new_settings_feeds);
 
-		$new_settings_advanced['assets']['disable_css'] = ! empty( $old_settings['disable_css'] ) ? 'yes' : '';
-		update_option( 'simple-calendar_settings_advanced', $new_settings_advanced );
+		$new_settings_advanced['assets']['disable_css'] = ! empty($old_settings['disable_css']) ? 'yes' : '';
+		update_option('simple-calendar_settings_advanced', $new_settings_advanced);
 
 		// Delete legacy options.
-		delete_option( 'gce_version' );
-		delete_option( 'gce_options' );
-		delete_option( 'gce_upgrade_has_run' );
-		delete_option( 'gce_v240_update_notices' );
-		delete_option( 'gce_show_admin_install_notice' );
+		delete_option('gce_version');
+		delete_option('gce_options');
+		delete_option('gce_upgrade_has_run');
+		delete_option('gce_v240_update_notices');
+		delete_option('gce_show_admin_install_notice');
 	}
 
 	/**
@@ -344,26 +344,26 @@ 
 	 */
 	public function update_widgets() {
 
-		$old_widgets = get_option( 'widget_gce_widget' );
+		$old_widgets = get_option('widget_gce_widget');
 
-		if ( ! empty( $old_widgets ) && is_array( $old_widgets ) ) {
+		if ( ! empty($old_widgets) && is_array($old_widgets)) {
 
 			$new_widgets = array();
 
-			foreach ( $old_widgets as $i => $old_widget ) {
-				if ( isset( $old_widget['id'] ) ) {
+			foreach ($old_widgets as $i => $old_widget) {
+				if (isset($old_widget['id'])) {
 
-					$id = absint( substr( $old_widget['id'], 0, strspn( $old_widget['id'], '0123456789' ) ) );
+					$id = absint(substr($old_widget['id'], 0, strspn($old_widget['id'], '0123456789')));
 
-					if ( $id > 0 ) {
-						$new_widgets[ $i ]['title']       = isset( $old_widget['name'] ) ? $old_widget['name'] : 'Simple Calendar';
-						$new_widgets[ $i ]['calendar_id'] = $id;
+					if ($id > 0) {
+						$new_widgets[$i]['title']       = isset($old_widget['name']) ? $old_widget['name'] : 'Simple Calendar';
+						$new_widgets[$i]['calendar_id'] = $id;
 					}
 				}
 			}
 
-			if ( ! empty( $new_widgets ) ) {
-				update_option( 'widget_gce_widget', $new_widgets );
+			if ( ! empty($new_widgets)) {
+				update_option('widget_gce_widget', $new_widgets);
 			}
 		}
 	}
@@ -377,10 +377,10 @@ 
 	 *
 	 * @return string
 	 */
-	private function convert_legacy_range( $date ) {
-		$date = empty( $date ) ? date( 'm/d/Y', time() ) : $date;
-		$timestamp = Carbon::createFromFormat( 'm/d/Y', $date )->getTimestamp();
-		return date( 'Y-m-d', $timestamp );
+	private function convert_legacy_range($date) {
+		$date = empty($date) ? date('m/d/Y', time()) : $date;
+		$timestamp = Carbon::createFromFormat('m/d/Y', $date)->getTimestamp();
+		return date('Y-m-d', $timestamp);
 	}
 
 }

includes/widgets.php

Spacing +8 added lines, -8 removed lines

@@ -6,7 +6,7 @@ 
  */
 namespace SimpleCalendar;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -34,11 +34,11 @@ 
 	 */
 	public function __construct() {
 
-		$this->widgets = apply_filters( 'simcal_get_widgets', array(
+		$this->widgets = apply_filters('simcal_get_widgets', array(
 			'SimpleCalendar\Widgets\Calendar'
-		), array() );
+		), array());
 
-		add_action( 'widgets_init', array( $this, 'register' ) );
+		add_action('widgets_init', array($this, 'register'));
 	}
 
 	/**
@@ -50,13 +50,13 @@ 
 
 		$widgets = $this->widgets;
 
-		if ( ! empty( $widgets ) && is_array( $widgets ) ) {
-			foreach ( $widgets as $widget ) {
-				register_widget( $widget );
+		if ( ! empty($widgets) && is_array($widgets)) {
+			foreach ($widgets as $widget) {
+				register_widget($widget);
 			}
 		}
 
-		do_action( 'simcal_register_widgets' );
+		do_action('simcal_register_widgets');
 	}
 
 }

includes/widgets/calendar.php

Spacing +29 added lines, -29 removed lines

@@ -9,7 +9,7 @@ 
 use SimpleCalendar\Abstracts\Calendar_View;
 use SimpleCalendar\Abstracts\Widget;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -46,18 +46,18 @@ 
 	public function __construct() {
 
 		$id_base        = 'gce_widget'; // old id kept for legacy reasons
-		$name           = __( 'Simple Calendar', 'google-calendar-events' );
+		$name           = __('Simple Calendar', 'google-calendar-events');
 		$widget_options = array(
-			'description' => __( 'Display a calendar of events from one of your calendar feeds.', 'google-calendar-events' )
+			'description' => __('Display a calendar of events from one of your calendar feeds.', 'google-calendar-events')
 		);
 
-		parent::__construct( $id_base, $name, $widget_options );
+		parent::__construct($id_base, $name, $widget_options);
 
-		if ( is_admin() ) {
-			if ( ! defined( 'DOING_AJAX' ) ) {
+		if (is_admin()) {
+			if ( ! defined('DOING_AJAX')) {
 				$this->calendars = simcal_get_calendars();
 			} else {
-				$this->calendars = get_transient( '_simple-calendar_feed_ids' );
+				$this->calendars = get_transient('_simple-calendar_feed_ids');
 			}
 		}
 	}
@@ -70,18 +70,18 @@ 
 	 * @param array $args     Display arguments.
 	 * @param array $instance The settings for the particular instance of the widget.
 	 */
-	public function widget( $args, $instance ) {
+	public function widget($args, $instance) {
 
 		echo $args['before_widget'];
 
-		if ( ! empty( $instance['title'] ) ) {
+		if ( ! empty($instance['title'])) {
 
-			echo $args['before_title']  . apply_filters( 'widget_title', $instance['title'] ) . $args['after_title'];
+			echo $args['before_title'].apply_filters('widget_title', $instance['title']).$args['after_title'];
 		}
 
-		$id = isset( $instance['calendar_id'] ) ? absint( $instance['calendar_id'] ) : 0;
-		if ( $id > 0 ) {
-			simcal_print_calendar( $id );
+		$id = isset($instance['calendar_id']) ? absint($instance['calendar_id']) : 0;
+		if ($id > 0) {
+			simcal_print_calendar($id);
 		}
 
 		echo $args['after_widget'];
@@ -101,12 +101,12 @@ 
 	 *
 	 * @return array Settings to save or bool false to cancel saving.
 	 */
-	public function update( $new_instance, $old_instance ) {
+	public function update($new_instance, $old_instance) {
 
 		$instance = array();
 
-		$instance['title']          = ( ! empty( $new_instance['title'] ) )        ? sanitize_text_field( $new_instance['title'] ) : '';
-		$instance['calendar_id']    = ( ! empty( $new_instance['calendar_id'] ) )  ? absint( $new_instance['calendar_id'] ) : '';
+		$instance['title']          = ( ! empty($new_instance['title'])) ? sanitize_text_field($new_instance['title']) : '';
+		$instance['calendar_id']    = ( ! empty($new_instance['calendar_id'])) ? absint($new_instance['calendar_id']) : '';
 
 		return $instance;
 	}
@@ -120,34 +120,34 @@ 
 	 *
 	 * @return string
 	 */
-	public function form( $instance ) {
+	public function form($instance) {
 
-		$title          = isset( $instance['title'] )       ? esc_attr( $instance['title'] ) : __( 'Calendar', 'google-calendar-events' );
-		$calendar_id    = isset( $instance['calendar_id'] ) ? esc_attr( $instance['calendar_id'] ) : '';
+		$title          = isset($instance['title']) ? esc_attr($instance['title']) : __('Calendar', 'google-calendar-events');
+		$calendar_id    = isset($instance['calendar_id']) ? esc_attr($instance['calendar_id']) : '';
 
 		?>
 		<div class="simcal-calendar-widget-settings">
 
 			<p>
-				<label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:', 'google-calendar-events' ); ?></label>
+				<label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'google-calendar-events'); ?></label>
 				<br>
 				<input type="text"
-				       name="<?php echo $this->get_field_name( 'title' ); ?>"
-				       id="<?php echo $this->get_field_id( 'title' ); ?>"
+				       name="<?php echo $this->get_field_name('title'); ?>"
+				       id="<?php echo $this->get_field_id('title'); ?>"
 				       class="widefat simcal-field simcal-field-standard simcal-field-text"
 				       value="<?php echo $title; ?>">
 			</p>
 
 			<p>
-				<label for="<?php echo $this->get_field_id( 'calendar_id' ); ?>"><?php _e( 'Calendar:', 'google-calendar-events' ); ?></label>
+				<label for="<?php echo $this->get_field_id('calendar_id'); ?>"><?php _e('Calendar:', 'google-calendar-events'); ?></label>
 				<br>
-				<?php $multiselect = count( $this->calendars ) > 15 ? ' simcal-field-select-enhanced' : ''; ?>
-				<select name="<?php echo $this->get_field_name( 'calendar_id' ) ?>"
-				        id="<?php echo $this->get_field_id( 'calendar_id' ) ?>"
+				<?php $multiselect = count($this->calendars) > 15 ? ' simcal-field-select-enhanced' : ''; ?>
+				<select name="<?php echo $this->get_field_name('calendar_id') ?>"
+				        id="<?php echo $this->get_field_id('calendar_id') ?>"
 						class="simcal-field simcal-field-select<?php echo $multiselect; ?>"
-						data-noresults="<?php __( 'No calendars found.', 'google-calendar-events' ); ?>">
-						<?php foreach ( $this->calendars as $id => $name ) : ?>
-							<option value="<?php echo $id; ?>" <?php selected( $id, $calendar_id, true ); ?>><?php echo $name; ?></option>
+						data-noresults="<?php __('No calendars found.', 'google-calendar-events'); ?>">
+						<?php foreach ($this->calendars as $id => $name) : ?>
+							<option value="<?php echo $id; ?>" <?php selected($id, $calendar_id, true); ?>><?php echo $name; ?></option>
 						<?php endforeach; ?>
 				</select>
 			</p>

uninstall.php

Spacing +12 added lines, -12 removed lines

@@ -6,20 +6,20 @@ 
  */
 
 // Exit if not uninstalling from WordPress.
-if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
+if ( ! defined('WP_UNINSTALL_PLUGIN')) {
 	exit;
 }
 
 // Get user options whether to delete settings and/or data.
-$settings = get_option( 'simple-calendar_settings_advanced' );
+$settings = get_option('simple-calendar_settings_advanced');
 
-if ( isset( $settings['installation']['delete_settings'] ) ) {
+if (isset($settings['installation']['delete_settings'])) {
 	$delete_settings = 'yes' == $settings['installation']['delete_settings'] ? true : false;
 } else {
 	$delete_settings = false;
 }
 
-if ( isset( $settings['installation']['erase_data'] ) ) {
+if (isset($settings['installation']['erase_data'])) {
 	$erase_data = 'yes' == $settings['installation']['erase_data'] ? true : false;
 } else {
 	$erase_data = false;
@@ -28,7 +28,7 @@ 
 global $wpdb;
 
 // Delete settings.
-if ( ( $delete_settings === true ) || ( $erase_data === true ) ) {
+if (($delete_settings === true) || ($erase_data === true)) {
 	$wpdb->query(
 		"
 DELETE FROM $wpdb->options WHERE option_name LIKE '%simple-calendar%';
@@ -37,7 +37,7 @@ 
 }
 
 // Delete calendar data.
-if ( $erase_data === true ) {
+if ($erase_data === true) {
 
 	// Delete calendar posts.
 	$wpdb->query(
@@ -47,20 +47,20 @@ 
 	);
 
 	// Delete calendar postmeta.
-	$wpdb->query( "
+	$wpdb->query("
 DELETE meta FROM {$wpdb->postmeta} meta LEFT JOIN {$wpdb->posts} posts ON posts.ID = meta.post_id WHERE posts.ID IS NULL;
 "
 	);
 
 	// Delete calendar terms.
-	$terms = get_terms( array(
+	$terms = get_terms(array(
 		'calendar_category',
 		'calendar_feed',
 		'calendar_type',
-	) );
-	if ( ! empty( $terms ) && is_array( $terms ) ) {
-		foreach ( $terms as $term ) {
-			wp_delete_term( $term->term_id, $term->taxonomy );
+	));
+	if ( ! empty($terms) && is_array($terms)) {
+		foreach ($terms as $term) {
+			wp_delete_term($term->term_id, $term->taxonomy);
 		}
 	}
 

includes/events/event.php

Spacing +75 added lines, -75 removed lines

@@ -8,7 +8,7 @@ 
 
 use Carbon\Carbon;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -234,30 +234,30 @@ 
 	 *
 	 * @param array $event
 	 */
-	public function __construct( array $event ) {
+	public function __construct(array $event) {
 
 		/* ================= *
 		 * Event Identifiers *
 		 * ================= */
 
 		// Event unique id.
-		if ( ! empty( $event['uid'] ) ) {
-			$this->uid = esc_attr( $event['uid'] );
+		if ( ! empty($event['uid'])) {
+			$this->uid = esc_attr($event['uid']);
 		}
 
 		// Event source.
-		if ( ! empty( $event['source'] ) ) {
-			$this->source = esc_attr( $event['source'] );
+		if ( ! empty($event['source'])) {
+			$this->source = esc_attr($event['source']);
 		}
 
 		// Event parent calendar id.
-		if ( ! empty( $event['calendar'] ) ) {
-			$this->calendar = max( intval( $event['calendar'] ), 0 );
+		if ( ! empty($event['calendar'])) {
+			$this->calendar = max(intval($event['calendar']), 0);
 		}
 
 		// Event parent calendar timezone.
-		if ( ! empty( $event['timezone'] ) ) {
-			$this->timezone = esc_attr( $event['timezone'] );
+		if ( ! empty($event['timezone'])) {
+			$this->timezone = esc_attr($event['timezone']);
 		}
 
 		/* ============= *
@@ -265,23 +265,23 @@ 
 		 * ============= */
 
 		// Event title.
-		if ( ! empty( $event['title'] ) ) {
-			$this->title = esc_html( $event['title'] );
+		if ( ! empty($event['title'])) {
+			$this->title = esc_html($event['title']);
 		}
 
 		// Event description.
-		if ( ! empty( $event['description'] ) ) {
-			$this->description = wp_kses_post( $event['description'] );
+		if ( ! empty($event['description'])) {
+			$this->description = wp_kses_post($event['description']);
 		}
 
 		// Event link URL.
-		if ( ! empty( $event['link'] ) ) {
-			$this->link = esc_url_raw( $event['link'] );
+		if ( ! empty($event['link'])) {
+			$this->link = esc_url_raw($event['link']);
 		}
 
 		// Event visibility.
-		if ( ! empty( $event['visibility'] ) ) {
-			$this->visibility = esc_attr( $event['visibility'] );
+		if ( ! empty($event['visibility'])) {
+			$this->visibility = esc_attr($event['visibility']);
 			$this->public = $this->visibility == 'public' ? true : false;
 		}
 
@@ -289,34 +289,34 @@ 
 		 * Event Start *
 		 * =========== */
 
-		if ( ! empty( $event['start'] ) ) {
-			$this->start = is_numeric( $event['start'] ) ? intval( $event['start'] ) : 0;
-			if ( ! empty( $event['start_utc'] ) ) {
-				$this->start_utc = is_numeric( $event['start_utc'] ) ? intval( $event['start_utc'] ) : 0;
+		if ( ! empty($event['start'])) {
+			$this->start = is_numeric($event['start']) ? intval($event['start']) : 0;
+			if ( ! empty($event['start_utc'])) {
+				$this->start_utc = is_numeric($event['start_utc']) ? intval($event['start_utc']) : 0;
 			}
-			if ( ! empty( $event['start_timezone'] ) ) {
-				$this->start_timezone = esc_attr( $event['start_timezone'] );
+			if ( ! empty($event['start_timezone'])) {
+				$this->start_timezone = esc_attr($event['start_timezone']);
 			}
-			$this->start_dt = Carbon::createFromTimestamp( $this->start, $this->start_timezone );
-			$start_location = isset( $event['start_location'] ) ? $event['start_location'] : '';
-			$this->start_location = $this->esc_location( $start_location );
+			$this->start_dt = Carbon::createFromTimestamp($this->start, $this->start_timezone);
+			$start_location = isset($event['start_location']) ? $event['start_location'] : '';
+			$this->start_location = $this->esc_location($start_location);
 		}
 
 		/* ========= *
 		 * Event End *
 		 * ========= */
 
-		if ( ! empty( $event['end'] ) ) {
-			$this->end = is_numeric( $event['end'] ) ? intval( $event['end'] ): false;
-			if ( ! empty( $event['end_timezone'] ) ) {
-				$this->end_timezone = esc_attr( $event['end_timezone'] );
+		if ( ! empty($event['end'])) {
+			$this->end = is_numeric($event['end']) ? intval($event['end']) : false;
+			if ( ! empty($event['end_timezone'])) {
+				$this->end_timezone = esc_attr($event['end_timezone']);
 			}
-			if ( ! empty( $event['end_utc'] ) ) {
-				$this->end_utc = is_numeric( $event['end_utc'] ) ? intval( $event['end_utc'] ) : false;
-				$this->end_dt = Carbon::createFromTimestamp( $this->end, $this->end_timezone );
+			if ( ! empty($event['end_utc'])) {
+				$this->end_utc = is_numeric($event['end_utc']) ? intval($event['end_utc']) : false;
+				$this->end_dt = Carbon::createFromTimestamp($this->end, $this->end_timezone);
 			}
-			$end_location = isset( $event['end_location'] ) ? $event['end_location'] : '';
-			$this->end_location = $this->esc_location( $end_location );
+			$end_location = isset($event['end_location']) ? $event['end_location'] : '';
+			$this->end_location = $this->esc_location($end_location);
 		}
 
 		/* ================== *
@@ -324,18 +324,18 @@ 
 		 * ================== */
 
 		// Whole day event.
-		if ( ! empty( $event['whole_day'] ) ) {
-			$this->whole_day = true === $event['whole_day'] ? true: false;
+		if ( ! empty($event['whole_day'])) {
+			$this->whole_day = true === $event['whole_day'] ? true : false;
 		}
 
 		// Multi day event.
-		if ( ! empty( $event['multiple_days'] ) ) {
-			$this->multiple_days = max( absint( $event['multiple_days'] ), 1 );
+		if ( ! empty($event['multiple_days'])) {
+			$this->multiple_days = max(absint($event['multiple_days']), 1);
 		}
 
 		// Event recurrence.
-		if ( isset( $event['recurrence'] ) ) {
-			$this->recurrence = ! empty( $event['recurrence'] ) ? $event['recurrence'] : false;
+		if (isset($event['recurrence'])) {
+			$this->recurrence = ! empty($event['recurrence']) ? $event['recurrence'] : false;
 		}
 
 		/* ========== *
@@ -343,18 +343,18 @@ 
 		 * ========== */
 
 		// Event has venue(s).
-		if ( $this->start_location['venue'] || $this->end_location['venue'] ) {
+		if ($this->start_location['venue'] || $this->end_location['venue']) {
 			$this->venue = true;
 		}
 
 		// Event meta.
-		if ( ! empty( $event['meta'] ) ) {
-			$this->meta = is_array( $event['meta'] ) ? $event['meta'] : array();
+		if ( ! empty($event['meta'])) {
+			$this->meta = is_array($event['meta']) ? $event['meta'] : array();
 		}
 
 		// Event template.
-		if ( ! empty( $event['template'] ) ) {
-			$this->template = wp_kses_post( $event['template'] );
+		if ( ! empty($event['template'])) {
+			$this->template = wp_kses_post($event['template']);
 		}
 
 	}
@@ -369,27 +369,27 @@ 
 	 *
 	 * @return array
 	 */
-	private function esc_location( $var = '' ) {
+	private function esc_location($var = '') {
 
 		$location = array();
 
-		if ( is_string( $var ) ) {
+		if (is_string($var)) {
 			$var = array(
 				'name'    => $var,
 				'address' => $var,
 			);
-		} elseif ( is_bool( $var ) || is_null( $var ) ) {
+		} elseif (is_bool($var) || is_null($var)) {
 			$var = array();
 		} else {
 			$var = (array) $var;
 		}
 
-		$location['name']    = isset( $var['name'] )    ? esc_attr( strip_tags( $var['name'] ) ) : '';
-		$location['address'] = isset( $var['address'] ) ? esc_attr( strip_tags( $var['address'] ) ) : '';
-		$location['lat']     = isset( $var['lat'] )     ? $this->esc_coordinate( $var['lat'] ) : 0;
-		$location['lng']     = isset( $var['lng'] )     ? $this->esc_coordinate( $var['lng'] ) : 0;
+		$location['name']    = isset($var['name']) ? esc_attr(strip_tags($var['name'])) : '';
+		$location['address'] = isset($var['address']) ? esc_attr(strip_tags($var['address'])) : '';
+		$location['lat']     = isset($var['lat']) ? $this->esc_coordinate($var['lat']) : 0;
+		$location['lng']     = isset($var['lng']) ? $this->esc_coordinate($var['lng']) : 0;
 
-		if ( ! empty( $location['name'] ) || ! empty( $location['address'] ) ) {
+		if ( ! empty($location['name']) || ! empty($location['address'])) {
 			$location['venue'] = true;
 		} else {
 			$location['venue'] = false;
@@ -408,8 +408,8 @@ 
 	 *
 	 * @return int|float
 	 */
-	private function esc_coordinate( $latlng = 0 ) {
-		return is_numeric( $latlng ) ? floatval( $latlng ) : 0;
+	private function esc_coordinate($latlng = 0) {
+		return is_numeric($latlng) ? floatval($latlng) : 0;
 	}
 
 	/**
@@ -422,8 +422,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function set_timezone( $tz ) {
-		if ( in_array( $tz, timezone_identifiers_list() ) ) {
+	public function set_timezone($tz) {
+		if (in_array($tz, timezone_identifiers_list())) {
 			$this->timezone = $tz;
 			return true;
 		}
@@ -449,7 +449,7 @@ 
 	 * @return bool
 	 */
 	public function starts_today() {
-		return $this->start_dt->setTimezone( $this->timezone )->isToday();
+		return $this->start_dt->setTimezone($this->timezone)->isToday();
 	}
 
 	/**
@@ -460,7 +460,7 @@ 
 	 * @return bool
 	 */
 	public function ends_today() {
-		return ! is_null( $this->end_dt ) ? $this->end_dt->setTimezone( $this->timezone )->isToday() : true;
+		return ! is_null($this->end_dt) ? $this->end_dt->setTimezone($this->timezone)->isToday() : true;
 	}
 
 	/**
@@ -471,7 +471,7 @@ 
 	 * @return bool
 	 */
 	public function starts_tomorrow() {
-		return $this->start_dt->setTimezone( $this->timezone )->isTomorrow();
+		return $this->start_dt->setTimezone($this->timezone)->isTomorrow();
 	}
 
 	/**
@@ -482,7 +482,7 @@ 
 	 * @return bool
 	 */
 	public function ends_tomorrow() {
-		return ! is_null( $this->end_dt ) ? $this->end_dt->setTimezone( $this->timezone )->isTomorrow() : false;
+		return ! is_null($this->end_dt) ? $this->end_dt->setTimezone($this->timezone)->isTomorrow() : false;
 	}
 
 	/**
@@ -493,7 +493,7 @@ 
 	 * @return bool
 	 */
 	public function started_yesterday() {
-		return $this->start_dt->setTimezone( $this->timezone )->isYesterday();
+		return $this->start_dt->setTimezone($this->timezone)->isYesterday();
 	}
 
 	/**
@@ -504,7 +504,7 @@ 
 	 * @return bool
 	 */
 	public function ended_yesterday() {
-		return ! is_null( $this->end_dt ) ? $this->end_dt->setTimezone( $this->timezone )->isYesterday() : false;
+		return ! is_null($this->end_dt) ? $this->end_dt->setTimezone($this->timezone)->isYesterday() : false;
 	}
 
 	/**
@@ -515,7 +515,7 @@ 
 	 * @return bool
 	 */
 	public function starts_future() {
-		return $this->start_dt->setTimezone( $this->timezone )->isFuture();
+		return $this->start_dt->setTimezone($this->timezone)->isFuture();
 	}
 
 	/**
@@ -526,7 +526,7 @@ 
 	 * @return bool
 	 */
 	public function ends_future() {
-		return ! is_null( $this->end_dt ) ? $this->end_dt->setTimezone( $this->timezone )->isFuture() : false;
+		return ! is_null($this->end_dt) ? $this->end_dt->setTimezone($this->timezone)->isFuture() : false;
 	}
 
 	/**
@@ -537,7 +537,7 @@ 
 	 * @return bool
 	 */
 	public function started_past() {
-		return $this->start_dt->setTimezone( $this->timezone )->isPast();
+		return $this->start_dt->setTimezone($this->timezone)->isPast();
 	}
 
 	/**
@@ -548,7 +548,7 @@ 
 	 * @return bool
 	 */
 	public function ended_past() {
-		return ! is_null( $this->end_dt ) ? $this->end_dt->setTimezone( $this->timezone )->isPast() : false;
+		return ! is_null($this->end_dt) ? $this->end_dt->setTimezone($this->timezone)->isPast() : false;
 	}
 
 	/**
@@ -560,9 +560,9 @@ 
 	 *
 	 * @return string
 	 */
-	public function get_color( $default = '' ) {
-		if ( isset( $this->meta['color'] ) ) {
-			return ! empty( $this->meta['color'] ) ? esc_attr( $this->meta['color'] ) : $default;
+	public function get_color($default = '') {
+		if (isset($this->meta['color'])) {
+			return ! empty($this->meta['color']) ? esc_attr($this->meta['color']) : $default;
 		}
 		return $default;
 	}
@@ -575,7 +575,7 @@ 
 	 * @return array
 	 */
 	public function get_attachments() {
-		return isset( $this->meta['attachments'] ) ? $this->meta['attachments'] : array();
+		return isset($this->meta['attachments']) ? $this->meta['attachments'] : array();
 	}
 
 	/**
@@ -586,7 +586,7 @@ 
 	 * @return array
 	 */
 	public function get_attendees() {
-		return isset( $this->meta['attendees'] ) ? $this->meta['attendees'] : array();
+		return isset($this->meta['attendees']) ? $this->meta['attendees'] : array();
 	}
 
 	/**
@@ -597,7 +597,7 @@ 
 	 * @return array
 	 */
 	public function get_organizer() {
-		return isset( $this->meta['organizer'] ) ? $this->meta['organizer'] : array();
+		return isset($this->meta['organizer']) ? $this->meta['organizer'] : array();
 	}
 
 }

includes/feeds/grouped-calendars.php

Spacing +46 added lines, -46 removed lines

@@ -10,7 +10,7 @@ 
 use SimpleCalendar\Abstracts\Feed;
 use SimpleCalendar\Feeds\Admin\Grouped_Calendars_Admin;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -38,22 +38,22 @@ 
 	 *
 	 * @param string|Calendar $calendar
 	 */
-	public function __construct( $calendar = '' ) {
+	public function __construct($calendar = '') {
 
-		parent::__construct( $calendar );
+		parent::__construct($calendar);
 
 		$this->type = 'grouped-calendars';
-		$this->name = __( 'Grouped Calendar', 'google-calendar-events' );
+		$this->name = __('Grouped Calendar', 'google-calendar-events');
 
-		if ( $this->post_id > 0 ) {
+		if ($this->post_id > 0) {
 			$this->set_source();
-			if ( ! is_admin() || defined( 'DOING_AJAX' ) ) {
+			if ( ! is_admin() || defined('DOING_AJAX')) {
 				$this->events = $this->get_events();
 			}
 		}
 
-		if ( is_admin() && ! defined( 'DOING_AJAX' ) ) {
-			new Grouped_Calendars_Admin( $this );
+		if (is_admin() && ! defined('DOING_AJAX')) {
+			new Grouped_Calendars_Admin($this);
 		}
 	}
 
@@ -64,38 +64,38 @@ 
 	 *
 	 * @param array $ids Array of calendar ids.
 	 */
-	public function set_source( $ids = array() ) {
+	public function set_source($ids = array()) {
 
-		$source = get_post_meta( $this->post_id, '_grouped_calendars_source', true );
+		$source = get_post_meta($this->post_id, '_grouped_calendars_source', true);
 
-		if ( 'ids' == $source ) {
+		if ('ids' == $source) {
 
-			if ( empty( $ids ) ) {
-				$ids = get_post_meta( $this->post_id, '_grouped_calendars_ids', true );
+			if (empty($ids)) {
+				$ids = get_post_meta($this->post_id, '_grouped_calendars_ids', true);
 			}
 
-			$this->calendars_ids = ! empty( $ids ) && is_array( $ids ) ? array_map( 'absint', $ids ) : array();
+			$this->calendars_ids = ! empty($ids) && is_array($ids) ? array_map('absint', $ids) : array();
 
-		} elseif ( 'category' == $source ) {
+		} elseif ('category' == $source) {
 
-			$categories = get_post_meta( $this->post_id, '_grouped_calendars_category', true );
+			$categories = get_post_meta($this->post_id, '_grouped_calendars_category', true);
 
-			if ( $categories && is_array( $categories ) ) {
+			if ($categories && is_array($categories)) {
 
 				$tax_query = array(
 					'taxonomy' => 'calendar_category',
 					'field'    => 'term_id',
-					'terms'    => array_map( 'absint', $categories ),
+					'terms'    => array_map('absint', $categories),
 				);
 
-				$calendars = get_posts( array(
+				$calendars = get_posts(array(
 					'post_type' => 'calendar',
-					'tax_query' => array( $tax_query ),
+					'tax_query' => array($tax_query),
 					'nopaging'  => true,
 					'fields'    => 'ids',
-				) );
+				));
 
-				$this->calendars_ids = ! empty( $calendars ) && is_array( $calendars ) ? $calendars : array();
+				$this->calendars_ids = ! empty($calendars) && is_array($calendars) ? $calendars : array();
 			}
 
 		}
@@ -111,40 +111,40 @@ 
 	public function get_events() {
 
 		$ids    = $this->calendars_ids;
-		$events = get_transient( '_simple-calendar_feed_id_' . strval( $this->post_id ) . '_' . $this->type );
+		$events = get_transient('_simple-calendar_feed_id_'.strval($this->post_id).'_'.$this->type);
 
-		if ( empty( $events ) && ! empty( $ids ) && is_array( $ids ) ) {
+		if (empty($events) && ! empty($ids) && is_array($ids)) {
 
 			$events = array();
 
-			foreach ( $ids as $cal_id ) {
+			foreach ($ids as $cal_id) {
 
-				$calendar = simcal_get_calendar( intval( $cal_id ) );
+				$calendar = simcal_get_calendar(intval($cal_id));
 
-				if ( $calendar instanceof Calendar ) {
-					$events = is_array( $calendar->events ) ? $events + $calendar->events : $events;
+				if ($calendar instanceof Calendar) {
+					$events = is_array($calendar->events) ? $events + $calendar->events : $events;
 				}
 
 			}
 
-			if ( ! empty( $events ) ) {
+			if ( ! empty($events)) {
 
 				// Trim events to set the earliest one as specified in feed settings.
-				$earliest_event = intval( $this->time_min );
-				if ( $earliest_event > 0 ) {
-					$events = $this->array_filter_key( $events, array( $this, 'filter_events_before' ) );
+				$earliest_event = intval($this->time_min);
+				if ($earliest_event > 0) {
+					$events = $this->array_filter_key($events, array($this, 'filter_events_before'));
 				}
 
 				// Trim events to set the latest one as specified in feed settings.
-				$latest_event = intval( $this->time_max );
-				if ( $latest_event > 0 ) {
-					$events = $this->array_filter_key( $events, array( $this, 'filter_events_after' ) );
+				$latest_event = intval($this->time_max);
+				if ($latest_event > 0) {
+					$events = $this->array_filter_key($events, array($this, 'filter_events_after'));
 				}
 
 				set_transient(
-					'_simple-calendar_feed_id_' . strval( $this->post_id ) . '_' . $this->type,
+					'_simple-calendar_feed_id_'.strval($this->post_id).'_'.$this->type,
 					$events,
-					absint( $this->cache )
+					absint($this->cache)
 				);
 			}
 
@@ -166,9 +166,9 @@ 
 	 *
 	 * @return array
 	 */
-	private function array_filter_key( array $array, $callback ) {
-		$matched_keys = array_filter( array_keys( $array ), $callback );
-		return array_intersect_key( $array, array_flip( $matched_keys ) );
+	private function array_filter_key(array $array, $callback) {
+		$matched_keys = array_filter(array_keys($array), $callback);
+		return array_intersect_key($array, array_flip($matched_keys));
 	}
 
 	/**
@@ -181,9 +181,9 @@ 
 	 *
 	 * @return bool
 	 */
-	private function filter_events_before( $event ) {
-		if ( $this->time_min !== 0 ) {
-			return intval( $event ) > intval( $this->time_min );
+	private function filter_events_before($event) {
+		if ($this->time_min !== 0) {
+			return intval($event) > intval($this->time_min);
 		}
 		return true;
 	}
@@ -198,9 +198,9 @@ 
 	 *
 	 * @return bool
 	 */
-	private function filter_events_after( $event ) {
-		if ( $this->time_max !== 0 ) {
-			return intval( $event ) < intval( $this->time_max );
+	private function filter_events_after($event) {
+		if ($this->time_max !== 0) {
+			return intval($event) < intval($this->time_max);
 		}
 		return true;
 	}