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/abstracts/feed.php

Spacing +42 added lines, -42 removed lines

@@ -8,7 +8,7 @@ 
 
 use Carbon\Carbon;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -132,22 +132,22 @@ 
 	 *
 	 * @param string|Calendar $calendar
 	 */
-	public function __construct( $calendar = '' ) {
+	public function __construct($calendar = '') {
 
-		if ( $calendar instanceof Calendar ) {
+		if ($calendar instanceof Calendar) {
 
-			if ( isset( $calendar->id ) ) {
+			if (isset($calendar->id)) {
 				$this->post_id = $calendar->id;
 			}
-			if ( isset( $calendar->start ) ) {
+			if (isset($calendar->start)) {
 				$this->calendar_start = $calendar->start;
 			}
-			$this->week_starts      = isset( $calendar->week_starts ) ? $calendar->week_starts : get_option( 'start_of_week' );
-			$this->events_template  = ! empty( $calendar->events_template ) ? $calendar->events_template : simcal_default_event_template();
+			$this->week_starts      = isset($calendar->week_starts) ? $calendar->week_starts : get_option('start_of_week');
+			$this->events_template  = ! empty($calendar->events_template) ? $calendar->events_template : simcal_default_event_template();
 
-			if ( $this->post_id > 0 ) {
+			if ($this->post_id > 0) {
 				$this->set_cache();
-				$this->timezone_setting = get_post_meta( $this->post_id, '_feed_timezone_setting', true );
+				$this->timezone_setting = get_post_meta($this->post_id, '_feed_timezone_setting', true);
 				$this->timezone = $calendar->timezone;
 				$this->set_earliest_event();
 				$this->set_latest_event();
@@ -173,25 +173,25 @@ 
 	 *
 	 * @param int $timestamp
 	 */
-	public function set_earliest_event( $timestamp = 0 ) {
+	public function set_earliest_event($timestamp = 0) {
 
-		$earliest = intval( $timestamp );
+		$earliest = intval($timestamp);
 
-		if ( $earliest === 0 ) {
+		if ($earliest === 0) {
 
-			$start = Carbon::createFromTimestamp( $this->calendar_start, $this->timezone );
+			$start = Carbon::createFromTimestamp($this->calendar_start, $this->timezone);
 
-			$earliest_date  = esc_attr( get_post_meta( $this->post_id, '_feed_earliest_event_date', true ) );
-			$earliest_range = max( absint( get_post_meta( $this->post_id, '_feed_earliest_event_date_range', true ) ), 1 );
+			$earliest_date  = esc_attr(get_post_meta($this->post_id, '_feed_earliest_event_date', true));
+			$earliest_range = max(absint(get_post_meta($this->post_id, '_feed_earliest_event_date_range', true)), 1);
 
-			if ( 'days_before' == $earliest_date ) {
-				$earliest = $start->subDays( $earliest_range )->getTimestamp();
-			} elseif ( 'weeks_before' == $earliest_date ) {
-				$earliest = $start->subWeeks( $earliest_range )->addDay()->getTimestamp();
-			} elseif ( 'months_before' == $earliest_date ) {
-				$earliest = $start->subMonths( $earliest_range )->addDay()->getTimestamp();
-			} elseif ( 'years_before' == $earliest_date ) {
-				$earliest = $start->subYears( $earliest_range )->addDay()->getTimestamp();
+			if ('days_before' == $earliest_date) {
+				$earliest = $start->subDays($earliest_range)->getTimestamp();
+			} elseif ('weeks_before' == $earliest_date) {
+				$earliest = $start->subWeeks($earliest_range)->addDay()->getTimestamp();
+			} elseif ('months_before' == $earliest_date) {
+				$earliest = $start->subMonths($earliest_range)->addDay()->getTimestamp();
+			} elseif ('years_before' == $earliest_date) {
+				$earliest = $start->subYears($earliest_range)->addDay()->getTimestamp();
 			} else {
 				$earliest = $start->getTimestamp();
 			}
@@ -207,25 +207,25 @@ 
 	 *
 	 * @param int $timestamp
 	 */
-	public function set_latest_event( $timestamp = 0 ) {
+	public function set_latest_event($timestamp = 0) {
 
-		$latest = intval( $timestamp );
+		$latest = intval($timestamp);
 
-		if ( $latest === 0 ) {
+		if ($latest === 0) {
 
-			$start = Carbon::createFromTimestamp( $this->calendar_start, $this->timezone )->endOfDay();
+			$start = Carbon::createFromTimestamp($this->calendar_start, $this->timezone)->endOfDay();
 
-			$latest_date  = esc_attr( get_post_meta( $this->post_id, '_feed_latest_event_date', true ) );
-			$latest_range = max( absint( get_post_meta( $this->post_id, '_feed_latest_event_date_range', true ) ), 1 );
+			$latest_date  = esc_attr(get_post_meta($this->post_id, '_feed_latest_event_date', true));
+			$latest_range = max(absint(get_post_meta($this->post_id, '_feed_latest_event_date_range', true)), 1);
 
-			if ( 'days_after' == $latest_date ) {
-				$latest = $start->addDays( $latest_range )->getTimestamp();
-			} elseif ( 'weeks_after' == $latest_date ) {
-				$latest = $start->addWeeks( $latest_range )->subDay()->getTimestamp();
-			} elseif ( 'months_after' == $latest_date ) {
-				$latest = $start->addMonths( $latest_range )->subDay()->getTimestamp();
-			} elseif ( 'years_after' == $latest_date ) {
-				$latest = $start->addYears( $latest_range )->subDay()->getTimestamp();
+			if ('days_after' == $latest_date) {
+				$latest = $start->addDays($latest_range)->getTimestamp();
+			} elseif ('weeks_after' == $latest_date) {
+				$latest = $start->addWeeks($latest_range)->subDay()->getTimestamp();
+			} elseif ('months_after' == $latest_date) {
+				$latest = $start->addMonths($latest_range)->subDay()->getTimestamp();
+			} elseif ('years_after' == $latest_date) {
+				$latest = $start->addYears($latest_range)->subDay()->getTimestamp();
 			} else {
 				$latest = $start->getTimestamp();
 			}
@@ -242,12 +242,12 @@ 
 	 *
 	 * @param int $time
 	 */
-	public function set_cache( $time = 0 ) {
-		if ( $time === 0 || ! is_numeric( $time ) ) {
-			$cache = get_post_meta( $this->post_id, '_feed_cache', true );
-			$time  = is_numeric( $cache ) && $cache >= 0 ? absint( $cache ) : $this->cache;
+	public function set_cache($time = 0) {
+		if ($time === 0 || ! is_numeric($time)) {
+			$cache = get_post_meta($this->post_id, '_feed_cache', true);
+			$time  = is_numeric($cache) && $cache >= 0 ? absint($cache) : $this->cache;
 		}
-		$this->cache = absint( $time );
+		$this->cache = absint($time);
 	}
 
 	/**

includes/update.php

Spacing +41 added lines, -41 removed lines

@@ -6,7 +6,7 @@ 
  */
 namespace SimpleCalendar;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -63,13 +63,13 @@ 
 	 *
 	 * @param string $version (optional) Current plugin version, defaults to value in plugin constant.
 	 */
-	public function __construct( $version = SIMPLE_CALENDAR_VERSION ) {
+	public function __construct($version = SIMPLE_CALENDAR_VERSION) {
 		// Look for previous version in current or legacy option, null for fresh install.
-		$installed = get_option( 'simple-calendar_version', null );
-		$this->installed_ver = is_null( $installed ) ? get_option( 'gce_version', null ) : $installed;
+		$installed = get_option('simple-calendar_version', null);
+		$this->installed_ver = is_null($installed) ? get_option('gce_version', null) : $installed;
 		$this->new_ver = $version;
 
-		if ( version_compare( $this->installed_ver, $this->new_ver, '<' ) ) {
+		if (version_compare($this->installed_ver, $this->new_ver, '<')) {
 			$this->run_updates();
 		}
 	}
@@ -83,18 +83,18 @@ 
 	 */
 	public function run_updates() {
 
-		do_action( 'simcal_before_update', $this->installed_ver );
+		do_action('simcal_before_update', $this->installed_ver);
 
-		if ( ! is_null( $this->installed_ver ) ) {
+		if ( ! is_null($this->installed_ver)) {
 
-			if ( version_compare( $this->installed_ver, $this->new_ver ) === -1 ) {
+			if (version_compare($this->installed_ver, $this->new_ver) === -1) {
 
-				$post_type = version_compare( $this->installed_ver, '3.0.0' ) === -1 ? 'gce_feed' : 'calendar';
-				$this->posts = $this->get_posts( $post_type );
+				$post_type = version_compare($this->installed_ver, '3.0.0') === -1 ? 'gce_feed' : 'calendar';
+				$this->posts = $this->get_posts($post_type);
 
-				foreach ( $this->update_path as $update_to ) {
-					if ( version_compare( $this->installed_ver, $update_to, '<' ) ) {
-						$this->update( $update_to );
+				foreach ($this->update_path as $update_to) {
+					if (version_compare($this->installed_ver, $update_to, '<')) {
+						$this->update($update_to);
 					}
 				}
 
@@ -109,28 +109,28 @@ 
 
 		}
 
-		do_action( 'simcal_updated', $this->new_ver );
+		do_action('simcal_updated', $this->new_ver);
 
 		// Redirect to a welcome page if new install or major update.
-		if ( is_null( $this->installed_ver ) ) {
-			set_transient( '_simple-calendar_activation_redirect', 'fresh', 60 );
+		if (is_null($this->installed_ver)) {
+			set_transient('_simple-calendar_activation_redirect', 'fresh', 60);
 		} else {
-			$major_new = substr( $this->new_ver, 0, strrpos( $this->new_ver, '.' ) );
-			$major_old = substr( $this->installed_ver, 0, strrpos( $this->installed_ver, '.' ) );
-			if ( version_compare( $major_new, $major_old, '>' ) ) {
-				set_transient( '_simple-calendar_activation_redirect', 'update', 60 );
-			} elseif ( $major_old == $major_new ) {
-				$version = explode( '.', $this->new_ver );
-				end( $version );
-				if ( 0 === intval( current( $version ) ) ) {
-					set_transient( '_simple-calendar_activation_redirect', 'update', 60 );
+			$major_new = substr($this->new_ver, 0, strrpos($this->new_ver, '.'));
+			$major_old = substr($this->installed_ver, 0, strrpos($this->installed_ver, '.'));
+			if (version_compare($major_new, $major_old, '>')) {
+				set_transient('_simple-calendar_activation_redirect', 'update', 60);
+			} elseif ($major_old == $major_new) {
+				$version = explode('.', $this->new_ver);
+				end($version);
+				if (0 === intval(current($version))) {
+					set_transient('_simple-calendar_activation_redirect', 'update', 60);
 				}
 			}
 		}
 
 		$this->admin_redirects();
 
-		update_option( 'simple-calendar_version', $this->new_ver );
+		update_option('simple-calendar_version', $this->new_ver);
 	}
 
 	/**
@@ -142,25 +142,25 @@ 
 	 */
 	public function admin_redirects() {
 
-		$transient = get_transient( '_simple-calendar_activation_redirect' );
+		$transient = get_transient('_simple-calendar_activation_redirect');
 
-		if ( ! $transient || is_network_admin() || isset( $_GET['activate-multi'] ) || ! current_user_can( 'manage_options' ) ) {
+		if ( ! $transient || is_network_admin() || isset($_GET['activate-multi']) || ! current_user_can('manage_options')) {
 			return;
 		}
 
-		delete_transient( '_simple-calendar_activation_redirect' );
+		delete_transient('_simple-calendar_activation_redirect');
 
 		// Do not redirect if already on welcome page screen.
-		if ( ! empty( $_GET['page'] ) && in_array( $_GET['page'], array( 'simple-calendar_about' ) ) ) {
+		if ( ! empty($_GET['page']) && in_array($_GET['page'], array('simple-calendar_about'))) {
 			return;
 		}
 
 		$url = add_query_arg(
 				'simcal_install',
-				esc_attr( $transient ),
-				admin_url( 'index.php?page=simple-calendar_about' )
+				esc_attr($transient),
+				admin_url('index.php?page=simple-calendar_about')
 		);
-		wp_safe_redirect( $url );
+		wp_safe_redirect($url);
 		exit;
 	}
 
@@ -173,14 +173,14 @@ 
 	 *
 	 * @return array
 	 */
-	private function get_posts( $post_type ) {
+	private function get_posts($post_type) {
 
 		$posts = array();
 
-		if ( ! empty( $post_type ) ) {
+		if ( ! empty($post_type)) {
 
 			// https://core.trac.wordpress.org/ticket/18408
-			$posts = get_posts( array(
+			$posts = get_posts(array(
 				'post_type'   => $post_type,
 				'post_status' => array(
 					'draft',
@@ -191,7 +191,7 @@ 
 					'trash',
 				),
 				'nopaging'    => true,
-			) );
+			));
 
 			wp_reset_postdata();
 		}
@@ -208,12 +208,12 @@ 
 	 *
 	 * @param string $version
 	 */
-	private function update( $version ) {
+	private function update($version) {
 
-		$update_v = '\\' . __NAMESPACE__ . '\Updates\\Update_V' . str_replace( '.', '', $version );
+		$update_v = '\\'.__NAMESPACE__.'\Updates\\Update_V'.str_replace('.', '', $version);
 
-		if ( class_exists( $update_v ) ) {
-			new $update_v( $this->posts );
+		if (class_exists($update_v)) {
+			new $update_v($this->posts);
 		}
 	}
 

includes/calendars/default-calendar.php

Spacing +48 added lines, -48 removed lines

@@ -13,7 +13,7 @@ 
 use SimpleCalendar\Calendars\Views;
 use SimpleCalendar\Events\Event;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -105,35 +105,35 @@ 
 	 *
 	 * @param int|object|\WP_Post|Calendar $calendar
 	 */
-	public function __construct( $calendar ) {
+	public function __construct($calendar) {
 
 		$this->type = 'default-calendar';
-		$this->name = __( 'Default', 'google-calendar-events' );
-		$this->views = apply_filters( 'simcal_default_calendar_views', array(
-			'grid' => __( 'Grid', 'google-calendar-events' ),
-			'list' => __( 'List', 'google-calendar-events' ),
-		) );
+		$this->name = __('Default', 'google-calendar-events');
+		$this->views = apply_filters('simcal_default_calendar_views', array(
+			'grid' => __('Grid', 'google-calendar-events'),
+			'list' => __('List', 'google-calendar-events'),
+		));
 
-		parent::__construct( $calendar );
+		parent::__construct($calendar);
 
-		if ( ! is_null( $this->post ) ) {
+		if ( ! is_null($this->post)) {
 
-			$this->set_properties( $this->view->get_type() );
+			$this->set_properties($this->view->get_type());
 
 			$id = $this->id;
 			$theme = $this->theme;
 
-			add_filter( 'simcal_calendar_class', function( $class, $post_id ) use ( $theme, $id ) {
-				if ( in_array( 'default-calendar', $class ) && $post_id === $id ) {
-					array_push( $class, 'default-calendar-' . $theme );
+			add_filter('simcal_calendar_class', function($class, $post_id) use ($theme, $id) {
+				if (in_array('default-calendar', $class) && $post_id === $id) {
+					array_push($class, 'default-calendar-'.$theme);
 				}
 				return $class;
-			}, 10, 2 );
+			}, 10, 2);
 
 		}
 
 		// Calendar settings handling.
-		if ( is_admin() && ! defined( 'DOING_AJAX' ) ) {
+		if (is_admin() && ! defined('DOING_AJAX')) {
 			$admin = new Default_Calendar_Admin();
 			$this->settings = $admin->settings_fields();
 		}
@@ -147,49 +147,49 @@ 
 	 *
 	 * @param  $view
 	 */
-	private function set_properties( $view ) {
+	private function set_properties($view) {
 
 		// Set styles.
-		if ( 'dark' == get_post_meta( $this->id, '_default_calendar_style_theme', true ) ) {
+		if ('dark' == get_post_meta($this->id, '_default_calendar_style_theme', true)) {
 			$this->theme = 'dark';
 		}
-		if ( $today_color = get_post_meta( $this->id, '_default_calendar_style_today', true ) ) {
-			$this->today_color = esc_attr( $today_color );
+		if ($today_color = get_post_meta($this->id, '_default_calendar_style_today', true)) {
+			$this->today_color = esc_attr($today_color);
 		}
-		if ( $day_events_color = get_post_meta( $this->id, '_default_calendar_style_days_events', true ) ) {
-			$this->days_events_color = esc_attr( $day_events_color );
+		if ($day_events_color = get_post_meta($this->id, '_default_calendar_style_days_events', true)) {
+			$this->days_events_color = esc_attr($day_events_color);
 		}
 
 		// Hide too many events.
-		if ( 'yes' == get_post_meta( $this->id, '_default_calendar_limit_visible_events', true ) ) {
-			$this->events_limit = absint( get_post_meta( $this->id, '_default_calendar_visible_events', true ) );
+		if ('yes' == get_post_meta($this->id, '_default_calendar_limit_visible_events', true)) {
+			$this->events_limit = absint(get_post_meta($this->id, '_default_calendar_visible_events', true));
 		}
 
 		// Expand multiple day events.
-		if ( 'yes' == get_post_meta( $this->id, '_default_calendar_expand_multi_day_events', true ) || ( 'list' == $view && 'current_day_only' == get_post_meta( $this->id, '_default_calendar_expand_multi_day_events', true ) ) ) {
+		if ('yes' == get_post_meta($this->id, '_default_calendar_expand_multi_day_events', true) || ('list' == $view && 'current_day_only' == get_post_meta($this->id, '_default_calendar_expand_multi_day_events', true))) {
 			$this->events = $this->expand_multiple_days_events();
 		}
 
-		if ( 'grid' == $view ) {
+		if ('grid' == $view) {
 
 			// Use hover to open event bubbles.
-			if ( 'hover' == get_post_meta( $this->id, '_default_calendar_event_bubble_trigger', true ) ) {
+			if ('hover' == get_post_meta($this->id, '_default_calendar_event_bubble_trigger', true)) {
 				$this->event_bubble_trigger = 'hover';
 			}
 
 			// Trim long event titles.
-			if ( 'yes' == get_post_meta( $this->id, '_default_calendar_trim_titles', true ) ) {
-				$this->trim_titles = max( absint( get_post_meta( $this->id, '_default_calendar_trim_titles_chars', true ) ), 1 );
+			if ('yes' == get_post_meta($this->id, '_default_calendar_trim_titles', true)) {
+				$this->trim_titles = max(absint(get_post_meta($this->id, '_default_calendar_trim_titles_chars', true)), 1);
 			}
 
 		} else {
 
 			// List range.
-			$this->group_type = esc_attr( get_post_meta( $this->id, '_default_calendar_list_range_type', true ) );
-			$this->group_span = max( absint( get_post_meta( $this->id, '_default_calendar_list_range_span', true ) ), 1 );
+			$this->group_type = esc_attr(get_post_meta($this->id, '_default_calendar_list_range_type', true));
+			$this->group_span = max(absint(get_post_meta($this->id, '_default_calendar_list_range_span', true)), 1);
 
 			// Make the list look more compact.
-			if ( 'yes' == get_post_meta( $this->id, '_default_calendar_compact_list', true ) ) {
+			if ('yes' == get_post_meta($this->id, '_default_calendar_compact_list', true)) {
 				$this->compact_list = true;
 			}
 
@@ -210,24 +210,24 @@ 
 		$old_events = $this->events;
 		$new_events = array();
 
-		if ( ! empty( $old_events ) ) {
+		if ( ! empty($old_events)) {
 
-			foreach ( $old_events as $events ) {
-				foreach ( $events as $event ) {
-					if ( $event instanceof Event ) {
-						if ( false !== $event->multiple_days ) {
+			foreach ($old_events as $events) {
+				foreach ($events as $event) {
+					if ($event instanceof Event) {
+						if (false !== $event->multiple_days) {
 							$days = $event->multiple_days;
 
-							if ( $days == 1 ) {
-								$new_events[ intval( $event->start + ( DAY_IN_SECONDS ) - 1 ) ][] = $event;
+							if ($days == 1) {
+								$new_events[intval($event->start + (DAY_IN_SECONDS) - 1)][] = $event;
 							} else {
 
 								/*if ( ! empty( $event->whole_day ) ) {
 									$days--;
 								}*/
 
-								for ( $d = 1; $d <= $days; $d++ ) {
-									$new_events[ intval( $event->start + ( $d * DAY_IN_SECONDS ) - 1 ) ][] = $event;
+								for ($d = 1; $d <= $days; $d++) {
+									$new_events[intval($event->start + ($d * DAY_IN_SECONDS) - 1)][] = $event;
 								}
 							}
 						}
@@ -239,7 +239,7 @@ 
 		}
 
 		$events = $old_events + $new_events;
-		ksort( $events, SORT_NUMERIC );
+		ksort($events, SORT_NUMERIC);
 		return $events;
 	}
 
@@ -254,16 +254,16 @@ 
 	 *
 	 * @return null|Calendar_View
 	 */
-	public function get_view( $view = '' ) {
+	public function get_view($view = '') {
 
-		$view = ! empty( $view ) ? $view : 'grid';
+		$view = ! empty($view) ? $view : 'grid';
 
-		do_action( 'simcal_calendar_get_view', $this->type, $view );
+		do_action('simcal_calendar_get_view', $this->type, $view);
 
-		if ( 'grid' == $view ) {
-			return new Views\Default_Calendar_Grid( $this );
-		} elseif ( 'list' == $view ) {
-			return new Views\Default_Calendar_List( $this );
+		if ('grid' == $view) {
+			return new Views\Default_Calendar_Grid($this);
+		} elseif ('list' == $view) {
+			return new Views\Default_Calendar_List($this);
 		}
 
 		return null;

includes/wp-requirements.php

Spacing +45 added lines, -45 removed lines

@@ -11,7 +11,7 @@ 
  * @license GPL2+
  */
 
-if ( ! class_exists( 'SimCal_WP_Requirements' ) ) {
+if ( ! class_exists('SimCal_WP_Requirements')) {
 
 	class SimCal_WP_Requirements {
 
@@ -90,13 +90,13 @@ 
 		 * @param string $plugin       Output of `plugin_basename( __FILE__ )`.
 		 * @param array  $requirements Associative array with requirements.
 		 */
-		public function __construct( $name, $plugin, $requirements ) {
+		public function __construct($name, $plugin, $requirements) {
 
-			$this->name = htmlspecialchars( strip_tags( $name ) );
+			$this->name = htmlspecialchars(strip_tags($name));
 			$this->plugin = $plugin;
 			$this->requirements = $requirements;
 
-			if ( ! empty( $requirements ) && is_array( $requirements ) ) {
+			if ( ! empty($requirements) && is_array($requirements)) {
 
 				$failures = $extensions = array();
 
@@ -109,10 +109,10 @@ 
 				);
 
 				// Check for WordPress version.
-				if ( $requirements['WordPress'] && is_string( $requirements['WordPress'] ) ) {
-					if ( function_exists( 'get_bloginfo' ) ) {
-						$wp_version = get_bloginfo( 'version' );
-						if ( version_compare( $wp_version, $requirements['WordPress'] ) === - 1 ) {
+				if ($requirements['WordPress'] && is_string($requirements['WordPress'])) {
+					if (function_exists('get_bloginfo')) {
+						$wp_version = get_bloginfo('version');
+						if (version_compare($wp_version, $requirements['WordPress']) === - 1) {
 							$failures['WordPress'] = $wp_version;
 							$this->wp = false;
 						}
@@ -120,24 +120,24 @@ 
 				}
 
 				// Check fo PHP version.
-				if ( $requirements['PHP'] && is_string( $requirements['PHP'] ) ) {
-					if ( version_compare( PHP_VERSION, $requirements['PHP'] ) === -1 ) {
+				if ($requirements['PHP'] && is_string($requirements['PHP'])) {
+					if (version_compare(PHP_VERSION, $requirements['PHP']) === -1) {
 						$failures['PHP'] = PHP_VERSION;
 						$this->php = false;
 					}
 				}
 
 				// Check fo PHP Extensions.
-				if ( $requirements['Extensions'] && is_array( $requirements['Extensions'] ) ) {
-					foreach ( $requirements['Extensions'] as $extension ) {
-						if ( $extension && is_string( $extension ) ) {
-							$extensions[ $extension ] = extension_loaded( $extension );
+				if ($requirements['Extensions'] && is_array($requirements['Extensions'])) {
+					foreach ($requirements['Extensions'] as $extension) {
+						if ($extension && is_string($extension)) {
+							$extensions[$extension] = extension_loaded($extension);
 						}
 					}
-					if ( in_array( false, $extensions ) ) {
-						foreach ( $extensions as $extension_name => $found  ) {
-							if ( $found === false ) {
-								$failures['Extensions'][ $extension_name ] = $extension_name;
+					if (in_array(false, $extensions)) {
+						foreach ($extensions as $extension_name => $found) {
+							if ($found === false) {
+								$failures['Extensions'][$extension_name] = $extension_name;
 							}
 						}
 						$this->extensions = false;
@@ -148,7 +148,7 @@ 
 
 			} else {
 
-				trigger_error( 'WP Requirements: the requirements are invalid.', E_USER_ERROR );
+				trigger_error('WP Requirements: the requirements are invalid.', E_USER_ERROR);
 
 			}
 		}
@@ -168,11 +168,11 @@ 
 		 * @return bool
 		 */
 		public function pass() {
-			if ( in_array( false, array(
+			if (in_array(false, array(
 				$this->wp,
 				$this->php,
 				$this->extensions,
-			) ) ) {
+			))) {
 				return false;
 			}
 			return true;
@@ -185,28 +185,28 @@ 
 		 *
 		 * @return string
 		 */
-		public function get_notice( $message = '' ) {
+		public function get_notice($message = '') {
 
 			$notice   = '';
 			$name     = $this->name;
 			$failures = $this->failures;
 
-			if ( ! empty( $failures ) && is_array( $failures ) ) {
+			if ( ! empty($failures) && is_array($failures)) {
 
-				$notice  = '<div class="error">' . "\n";
-				$notice .= "\t" . '<p>' . "\n";
-				$notice .= '<strong>' . sprintf( '%s could not be activated.', $name ) . '</strong><br>';
+				$notice  = '<div class="error">'."\n";
+				$notice .= "\t".'<p>'."\n";
+				$notice .= '<strong>'.sprintf('%s could not be activated.', $name).'</strong><br>';
 
-				foreach ( $failures as $requirement => $found ) {
+				foreach ($failures as $requirement => $found) {
 
-					$required = $this->requirements[ $requirement ];
+					$required = $this->requirements[$requirement];
 
-					if ( 'Extensions' == $requirement ) {
-						if ( is_array( $found ) ) {
+					if ('Extensions' == $requirement) {
+						if (is_array($found)) {
 							$notice .= sprintf( 
 									'Required PHP Extension(s) not found: %s.', 
-									join( ', ', $found ) 
-								) . '<br>';
+									join(', ', $found) 
+								).'<br>';
 						}
 					} else {
 						$notice .= sprintf( 
@@ -214,14 +214,14 @@ 
 								$requirement, 
 								$required, 
 								$found 
-							) . '<br>';
+							).'<br>';
 					}
 
 				}
 
-				$notice .= '<em>' . sprintf( 'Please update to meet %s requirements.', $name ) . '</em>' . "\n";
-				$notice .= "\t" . '</p>' . "\n";
-				if ( $message ) {
+				$notice .= '<em>'.sprintf('Please update to meet %s requirements.', $name).'</em>'."\n";
+				$notice .= "\t".'</p>'."\n";
+				if ($message) {
 					$notice .= $message;
 				}
 				$notice .= '</div>';
@@ -241,8 +241,8 @@ 
 		 * Deactivate plugin.
 		 */
 		public function deactivate_plugin() {
-			if ( function_exists( 'deactivate_plugins' ) && function_exists( 'plugin_basename' ) ) {
-				deactivate_plugins( $this->plugin );
+			if (function_exists('deactivate_plugins') && function_exists('plugin_basename')) {
+				deactivate_plugins($this->plugin);
 			}
 		}
 
@@ -251,17 +251,17 @@ 
 		 *
 		 * @param string $message An additional message in notice.
 		 */
-		public function halt( $message = '' ) {
+		public function halt($message = '') {
 
-			$this->notice = $this->get_notice( $message );
+			$this->notice = $this->get_notice($message);
 
-			if ( $this->notice && function_exists( 'add_action' ) ) {
+			if ($this->notice && function_exists('add_action')) {
 
-				add_action( 'admin_notices', array( $this, 'print_notice' ) );
-				add_action( 'admin_init', array( $this, 'deactivate_plugin' ) );
+				add_action('admin_notices', array($this, 'print_notice'));
+				add_action('admin_init', array($this, 'deactivate_plugin'));
 
-				if ( isset( $_GET['activate'] ) ) {
-					unset( $_GET['activate'] );
+				if (isset($_GET['activate'])) {
+					unset($_GET['activate']);
 				}
 			}
 		}