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/feeds/admin/google-admin.php

Indentation +17 added lines, -17 removed lines

@@ -82,12 +82,12 @@ 
 		return array(
 			'name' => $this->feed->name,
 			'description' => __( "To read events from your public Google Calendars you'll need create a Google API key and save it here.", 'google-calendar-events' ) .
-			                 '<br/><br/>' .
-			                 '<em style="font-size: 14px;">' .
-			                 sprintf( __( '<strong>Note:</strong> Calendars configured to use the <strong><a href="%s" target="_blank">Google Calendar Pro add-on</a></strong> use a different method of authorization.', 'google-calendar-events' ),
-				                 simcal_ga_campaign_url( simcal_get_url( 'gcal-pro' ), 'core-plugin', 'settings-link' )
-			                 ) .
-			                 '</em>',
+							 '<br/><br/>' .
+							 '<em style="font-size: 14px;">' .
+							 sprintf( __( '<strong>Note:</strong> Calendars configured to use the <strong><a href="%s" target="_blank">Google Calendar Pro add-on</a></strong> use a different method of authorization.', 'google-calendar-events' ),
+								 simcal_ga_campaign_url( simcal_get_url( 'gcal-pro' ), 'core-plugin', 'settings-link' )
+							 ) .
+							 '</em>',
 			'fields' => array(
 				'api_key' => array(
 					'type'       => 'standard',
@@ -273,12 +273,12 @@ 
 					'post'        => $post_id,
 					'dismissable' => false,
 					'content'     => '<p>' .
-					                 '<i class="simcal-icon-warning"></i> ' .
-					                 sprintf(
-						                 __( 'Your Google Calendar events will not show up until you <a href="%s">create and save a Google API key</a>.', 'google-calendar-events' ),
-						                 admin_url( 'edit.php?post_type=calendar&page=simple-calendar_settings&tab=feeds' )
-					                 ) .
-					                 '</p>',
+									 '<i class="simcal-icon-warning"></i> ' .
+									 sprintf(
+										 __( 'Your Google Calendar events will not show up until you <a href="%s">create and save a Google API key</a>.', 'google-calendar-events' ),
+										 admin_url( 'edit.php?post_type=calendar&page=simple-calendar_settings&tab=feeds' )
+									 ) .
+									 '</p>',
 				)
 			);
 
@@ -305,11 +305,11 @@ 
 						'post'        => $post_id,
 						'dismissable' => false,
 						'content'     => '<p>' .
-						                 '<i class="simcal-icon-warning"></i> ' .
-						                 __( 'While trying to retrieve events, Google returned an error:', 'google-calendar-events' ) .
-						                 '<br>' . $message . '<br>' .
-						                 __( 'Please ensure that both your Google Calendar ID and API Key are valid and that the Google Calendar you want to display is public.', 'google-calendar-events' ) .
-						                 '</p>',
+										 '<i class="simcal-icon-warning"></i> ' .
+										 __( 'While trying to retrieve events, Google returned an error:', 'google-calendar-events' ) .
+										 '<br>' . $message . '<br>' .
+										 __( 'Please ensure that both your Google Calendar ID and API Key are valid and that the Google Calendar you want to display is public.', 'google-calendar-events' ) .
+										 '</p>',
 					)
 				);
 

Spacing +90 added lines, -90 removed lines

@@ -10,7 +10,7 @@ 
 use SimpleCalendar\Admin\Notice;
 use SimpleCalendar\Feeds\Google;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -54,7 +54,7 @@ 
 	 * @param string $google_api_key
 	 * @param string $google_calendar_id
 	 */
-	public function __construct( Google $feed, $google_api_key, $google_calendar_id ) {
+	public function __construct(Google $feed, $google_api_key, $google_calendar_id) {
 
 		$this->feed = $feed;
 		$this->google_api_key = $google_api_key;
@@ -62,13 +62,13 @@ 
 
 		$screen = simcal_is_admin_screen();
 
-		if ( 'calendar' == $screen ) {
-			$this->test_api_key_connection( $this->google_calendar_id );
-			add_filter( 'simcal_settings_meta_tabs_li', array( $this, 'add_settings_meta_tab_li' ), 10, 1 );
-			add_action( 'simcal_settings_meta_panels', array( $this, 'add_settings_meta_panel' ), 10, 1 );
+		if ('calendar' == $screen) {
+			$this->test_api_key_connection($this->google_calendar_id);
+			add_filter('simcal_settings_meta_tabs_li', array($this, 'add_settings_meta_tab_li'), 10, 1);
+			add_action('simcal_settings_meta_panels', array($this, 'add_settings_meta_panel'), 10, 1);
 		}
 
-		add_action( 'simcal_process_settings_meta', array( $this, 'process_meta' ), 10, 1 );
+		add_action('simcal_process_settings_meta', array($this, 'process_meta'), 10, 1);
 	}
 
 	/**
@@ -81,20 +81,20 @@ 
 	public function settings_fields() {
 		return array(
 			'name' => $this->feed->name,
-			'description' => __( "To read events from your public Google Calendars you'll need create a Google API key and save it here.", 'google-calendar-events' ) .
-			                 '<br/><br/>' .
-			                 '<em style="font-size: 14px;">' .
-			                 sprintf( __( '<strong>Note:</strong> Calendars configured to use the <strong><a href="%s" target="_blank">Google Calendar Pro add-on</a></strong> use a different method of authorization.', 'google-calendar-events' ),
-				                 simcal_ga_campaign_url( simcal_get_url( 'gcal-pro' ), 'core-plugin', 'settings-link' )
-			                 ) .
+			'description' => __("To read events from your public Google Calendars you'll need create a Google API key and save it here.", 'google-calendar-events').
+			                 '<br/><br/>'.
+			                 '<em style="font-size: 14px;">'.
+			                 sprintf(__('<strong>Note:</strong> Calendars configured to use the <strong><a href="%s" target="_blank">Google Calendar Pro add-on</a></strong> use a different method of authorization.', 'google-calendar-events'),
+				                 simcal_ga_campaign_url(simcal_get_url('gcal-pro'), 'core-plugin', 'settings-link')
+			                 ).
 			                 '</em>',
 			'fields' => array(
 				'api_key' => array(
 					'type'       => 'standard',
 					'subtype'    => 'text',
-					'class'      => array( 'simcal-wide-text regular-text', 'ltr' ),
-					'title'      => __( 'Google API Key', 'google-calendar-events' ),
-					'validation' => array( $this, 'check_google_api_key' ),
+					'class'      => array('simcal-wide-text regular-text', 'ltr'),
+					'title'      => __('Google API Key', 'google-calendar-events'),
+					'validation' => array($this, 'check_google_api_key'),
 				),
 			),
 		);
@@ -113,27 +113,27 @@ 
 	 *
 	 * @return true|string
 	 */
-	public function check_google_api_key( $api_key = '' ) {
+	public function check_google_api_key($api_key = '') {
 
 		$message    = '';
 		$has_errors = false;
 
-		if ( empty( $api_key ) ){
+		if (empty($api_key)) {
 			$api_key = $this->google_api_key;
-			if ( empty( $api_key ) ) {
-				$settings = get_option( 'simple-calendar_settings_feeds' );
-				$api_key = isset( $settings['google']['api_key'] ) ? esc_attr( $settings['google']['api_key'] ) : '';
+			if (empty($api_key)) {
+				$settings = get_option('simple-calendar_settings_feeds');
+				$api_key = isset($settings['google']['api_key']) ? esc_attr($settings['google']['api_key']) : '';
 			}
 		}
 
-		$message = '<p class="description">' .
-				   sprintf( __( '<a href="%s" target="_blank">Step-by-step instructions</a> ', 'google-calendar-events' ),
-					   simcal_ga_campaign_url( simcal_get_url( 'docs' ) . '/google-api-key/', 'core-plugin', 'settings-link' )
-				   ) .
-				   '<br/>' .
-				   sprintf( __( '<a href="%s" target="_blank">Google Developers Console</a> ', 'google-calendar-events' ),
-					   simcal_get_url( 'gdev-console' )
-				   ) .
+		$message = '<p class="description">'.
+				   sprintf(__('<a href="%s" target="_blank">Step-by-step instructions</a> ', 'google-calendar-events'),
+					   simcal_ga_campaign_url(simcal_get_url('docs').'/google-api-key/', 'core-plugin', 'settings-link')
+				   ).
+				   '<br/>'.
+				   sprintf(__('<a href="%s" target="_blank">Google Developers Console</a> ', 'google-calendar-events'),
+					   simcal_get_url('gdev-console')
+				   ).
 				   '</p>';
 
 		return $message;
@@ -148,15 +148,15 @@ 
 	 *
 	 * @return array
 	 */
-	public function add_settings_meta_tab_li( $tabs ) {
-		return array_merge( $tabs, array(
+	public function add_settings_meta_tab_li($tabs) {
+		return array_merge($tabs, array(
 			'google' => array(
 				'label'   => $this->feed->name,
 				'target'  => 'google-settings-panel',
-				'class'   => array( 'simcal-feed-type', 'simcal-feed-type-google' ),
+				'class'   => array('simcal-feed-type', 'simcal-feed-type-google'),
 				'icon'    => 'simcal-icon-google',
 			),
-		) );
+		));
 	}
 
 	/**
@@ -166,7 +166,7 @@ 
 	 *
 	 * @param int $post_id
 	 */
-	public function add_settings_meta_panel( $post_id ) {
+	public function add_settings_meta_panel($post_id) {
 
 		$inputs = array(
 			$this->feed->type => array(
@@ -175,30 +175,30 @@ 
 					'subtype'     => 'text',
 					'name'        => '_google_calendar_id',
 					'id'          => '_google_calendar_id',
-					'title'       => __( 'Calendar ID', 'google-calendar-events' ),
-					'tooltip'     => __( 'Visit your Google Calendar account, copy your public calendar ID, then paste it here.', 'google-calendar-events' ),
-					'placeholder' => __( 'Enter a valid Google Calendar ID from a public calendar', 'google-calendar-events' ),
-					'escaping'    => array( $this->feed, 'esc_google_calendar_id' ),
-					'validation'  => array( $this, 'test_api_key_connection' ),
+					'title'       => __('Calendar ID', 'google-calendar-events'),
+					'tooltip'     => __('Visit your Google Calendar account, copy your public calendar ID, then paste it here.', 'google-calendar-events'),
+					'placeholder' => __('Enter a valid Google Calendar ID from a public calendar', 'google-calendar-events'),
+					'escaping'    => array($this->feed, 'esc_google_calendar_id'),
+					'validation'  => array($this, 'test_api_key_connection'),
 				),
 				'_google_events_search_query' => array(
 					'type'        => 'standard',
 					'subtype'     => 'text',
 					'name'        => '_google_events_search_query',
 					'id'          => '_google_events_search_query',
-					'title'       => __( 'Search Query', 'google-calendar-events' ),
-					'tooltip'     => __( 'Type in keywords if you only want display events that match these terms. You can use basic boolean search operators too.', 'google-calendar-events' ),
-					'placeholder' => __( 'Filter events to display by search terms...', 'google-calendar-events' ),
+					'title'       => __('Search Query', 'google-calendar-events'),
+					'tooltip'     => __('Type in keywords if you only want display events that match these terms. You can use basic boolean search operators too.', 'google-calendar-events'),
+					'placeholder' => __('Filter events to display by search terms...', 'google-calendar-events'),
 				),
 				'_google_events_recurring' => array(
 					'type'    => 'select',
 					'name'    => '_google_events_recurring',
 					'id'      => '_google_events_recurring',
-					'title'   => __( 'Recurring Events', 'google-calendar-events' ),
-					'tooltip' => __( 'Events that are programmed to repeat themselves periodically.', 'google-calendar-events' ),
+					'title'   => __('Recurring Events', 'google-calendar-events'),
+					'tooltip' => __('Events that are programmed to repeat themselves periodically.', 'google-calendar-events'),
 					'options' => array(
-						'show' => __( 'Show all', 'google-calendar-events' ),
-						'first-only' => __( 'Only show first occurrence', 'google-calendar-events' ),
+						'show' => __('Show all', 'google-calendar-events'),
+						'first-only' => __('Only show first occurrence', 'google-calendar-events'),
 					),
 				),
 				'_google_events_max_results' => array(
@@ -206,8 +206,8 @@ 
 					'subtype'     => 'number',
 					'name'        => '_google_events_max_results',
 					'id'          => '_google_events_max_results',
-					'title'       => __( 'Maximum Events', 'google-calendar-events' ),
-					'tooltip'     => __( 'Google Calendar only allows to query for a maximum amount of 2500 events from a calendar each time.', 'google-calendar-events' ),
+					'title'       => __('Maximum Events', 'google-calendar-events'),
+					'tooltip'     => __('Google Calendar only allows to query for a maximum amount of 2500 events from a calendar each time.', 'google-calendar-events'),
 					'class'       => array(
 						'simcal-field-small',
 					),
@@ -224,9 +224,9 @@ 
 		<div id="google-settings-panel" class="simcal-panel">
 			<table>
 				<thead>
-					<tr><th colspan="2"><?php _e( 'Google Calendar Settings', 'google-calendar-events' ); ?></th></tr>
+					<tr><th colspan="2"><?php _e('Google Calendar Settings', 'google-calendar-events'); ?></th></tr>
 				</thead>
-				<?php Settings::print_panel_fields( $inputs, $post_id ); ?>
+				<?php Settings::print_panel_fields($inputs, $post_id); ?>
 			</table>
 		</div>
 		<?php
@@ -242,47 +242,47 @@ 
 	 *
 	 * @return true|string
 	 */
-	public function test_api_key_connection( $google_calendar_id ) {
+	public function test_api_key_connection($google_calendar_id) {
 
 		global $post;
 
-		$post_id = isset( $post->ID ) ? $post->ID : 0;
+		$post_id = isset($post->ID) ? $post->ID : 0;
 		$feed = null;
-		if ( $feed_type = wp_get_object_terms( $post_id, 'calendar_feed' ) ) {
-			$feed = sanitize_title( current( $feed_type )->name );
+		if ($feed_type = wp_get_object_terms($post_id, 'calendar_feed')) {
+			$feed = sanitize_title(current($feed_type)->name);
 		}
 
 		$message = '';
 		$error = '';
 		$has_errors = false;
 
-		$message .= '<p class="description">' .
+		$message .= '<p class="description">'.
 					sprintf(
-						__( 'Step 1: Set the Google Calendar you want to use as <strong>"public."</strong> <a href="%1s" target="_blank">Detailed instructions</a>', 'google-calendar-events' ) . '<br />' .
-						__( 'Step 2: Copy and paste your Google Calendar ID here. <a href="%2s" target="_blank">Detailed instructions</a>', 'google-calendar-events' ),
-						simcal_ga_campaign_url( simcal_get_url( 'docs' ) . '/make-google-calendar-public/', 'core-plugin', 'settings-link' ),
-						simcal_ga_campaign_url( simcal_get_url( 'docs' ) . '/find-google-calendar-id/', 'core-plugin', 'settings-link' )
-					) . '</p>';
+						__('Step 1: Set the Google Calendar you want to use as <strong>"public."</strong> <a href="%1s" target="_blank">Detailed instructions</a>', 'google-calendar-events').'<br />'.
+						__('Step 2: Copy and paste your Google Calendar ID here. <a href="%2s" target="_blank">Detailed instructions</a>', 'google-calendar-events'),
+						simcal_ga_campaign_url(simcal_get_url('docs').'/make-google-calendar-public/', 'core-plugin', 'settings-link'),
+						simcal_ga_campaign_url(simcal_get_url('docs').'/find-google-calendar-id/', 'core-plugin', 'settings-link')
+					).'</p>';
 
-		if ( $post_id > 0 && ! is_null( $feed ) && ! empty( $this->feed->type ) ) {
+		if ($post_id > 0 && ! is_null($feed) && ! empty($this->feed->type)) {
 
-			$no_key_notice = new Notice( array(
-					'id'          => array( 'calendar_' . $post_id => 'google-no-api-key' ),
+			$no_key_notice = new Notice(array(
+					'id'          => array('calendar_'.$post_id => 'google-no-api-key'),
 					'type'        => 'error',
 					'screen'      => 'calendar',
 					'post'        => $post_id,
 					'dismissable' => false,
-					'content'     => '<p>' .
-					                 '<i class="simcal-icon-warning"></i> ' .
+					'content'     => '<p>'.
+					                 '<i class="simcal-icon-warning"></i> '.
 					                 sprintf(
-						                 __( 'Your Google Calendar events will not show up until you <a href="%s">create and save a Google API key</a>.', 'google-calendar-events' ),
-						                 admin_url( 'edit.php?post_type=calendar&page=simple-calendar_settings&tab=feeds' )
-					                 ) .
+						                 __('Your Google Calendar events will not show up until you <a href="%s">create and save a Google API key</a>.', 'google-calendar-events'),
+						                 admin_url('edit.php?post_type=calendar&page=simple-calendar_settings&tab=feeds')
+					                 ).
 					                 '</p>',
 				)
 			);
 
-			if ( empty( $this->google_api_key ) && ( $feed == $this->feed->type ) ) {
+			if (empty($this->google_api_key) && ($feed == $this->feed->type)) {
 
 				$has_errors = true;
 				$no_key_notice->add();
@@ -292,28 +292,28 @@ 
 				$no_key_notice->remove();
 
 				try {
-					$this->feed->make_request( $google_calendar_id );
-				} catch ( \Exception $e ) {
+					$this->feed->make_request($google_calendar_id);
+				} catch (\Exception $e) {
 					$error   = $e->getMessage();
-					$message = ! empty( $error ) ? '<blockquote>' . $error . '</blockquote>' : '';
+					$message = ! empty($error) ? '<blockquote>'.$error.'</blockquote>' : '';
 				}
 
-				$error_notice = new Notice( array(
-						'id'          => array( 'calendar_' . $post_id => 'google-error-response' ),
+				$error_notice = new Notice(array(
+						'id'          => array('calendar_'.$post_id => 'google-error-response'),
 						'type'        => 'error',
 						'screen'      => 'calendar',
 						'post'        => $post_id,
 						'dismissable' => false,
-						'content'     => '<p>' .
-						                 '<i class="simcal-icon-warning"></i> ' .
-						                 __( 'While trying to retrieve events, Google returned an error:', 'google-calendar-events' ) .
-						                 '<br>' . $message . '<br>' .
-						                 __( 'Please ensure that both your Google Calendar ID and API Key are valid and that the Google Calendar you want to display is public.', 'google-calendar-events' ) .
+						'content'     => '<p>'.
+						                 '<i class="simcal-icon-warning"></i> '.
+						                 __('While trying to retrieve events, Google returned an error:', 'google-calendar-events').
+						                 '<br>'.$message.'<br>'.
+						                 __('Please ensure that both your Google Calendar ID and API Key are valid and that the Google Calendar you want to display is public.', 'google-calendar-events').
 						                 '</p>',
 					)
 				);
 
-				if ( ! empty( $error ) && ( $feed == $this->feed->type ) ) {
+				if ( ! empty($error) && ($feed == $this->feed->type)) {
 					$error_notice->add();
 					$has_errors = true;
 				} else {
@@ -335,21 +335,21 @@ 
 	 *
 	 * @param int $post_id
 	 */
-	public function process_meta( $post_id ) {
+	public function process_meta($post_id) {
 
-		$calendar_id = isset( $_POST['_google_calendar_id'] ) ? base64_encode( trim( $_POST['_google_calendar_id'] ) ): '';
-		update_post_meta( $post_id, '_google_calendar_id', $calendar_id );
+		$calendar_id = isset($_POST['_google_calendar_id']) ? base64_encode(trim($_POST['_google_calendar_id'])) : '';
+		update_post_meta($post_id, '_google_calendar_id', $calendar_id);
 
-		$search_query = isset( $_POST['_google_events_search_query'] ) ? sanitize_text_field( $_POST['_google_events_search_query'] ) : '';
-		update_post_meta( $post_id, '_google_events_search_query', $search_query );
+		$search_query = isset($_POST['_google_events_search_query']) ? sanitize_text_field($_POST['_google_events_search_query']) : '';
+		update_post_meta($post_id, '_google_events_search_query', $search_query);
 
-		$recurring = isset( $_POST['_google_events_recurring'] ) ? sanitize_key( $_POST['_google_events_recurring'] ) : 'show';
-		update_post_meta( $post_id, '_google_events_recurring', $recurring );
+		$recurring = isset($_POST['_google_events_recurring']) ? sanitize_key($_POST['_google_events_recurring']) : 'show';
+		update_post_meta($post_id, '_google_events_recurring', $recurring);
 
-		$max_results = isset( $_POST['_google_events_max_results'] ) ? absint( $_POST['_google_events_max_results'] ) : '2500';
-		update_post_meta( $post_id, '_google_events_max_results', $max_results );
+		$max_results = isset($_POST['_google_events_max_results']) ? absint($_POST['_google_events_max_results']) : '2500';
+		update_post_meta($post_id, '_google_events_max_results', $max_results);
 
-		$this->test_api_key_connection( $calendar_id );
+		$this->test_api_key_connection($calendar_id);
 	}
 
 }

Doc Comments +2 added lines, -2 removed lines

@@ -111,7 +111,7 @@ 
 	 *
 	 * @param  string $api_key Google API key.
 	 *
-	 * @return true|string
+	 * @return string
 	 */
 	public function check_google_api_key( $api_key = '' ) {
 
@@ -240,7 +240,7 @@ 
 	 *
 	 * @param  string $google_calendar_id
 	 *
-	 * @return true|string
+	 * @return string
 	 */
 	public function test_api_key_connection( $google_calendar_id ) {
 

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/admin/default-calendar-admin.php

Indentation +2 added lines, -2 removed lines

@@ -298,8 +298,8 @@
 						'name'    => '_default_calendar_expand_multi_day_events',
 						'id'      => '_default_calendar_expand_multi_day_events',
 						'tooltip' => __( 'For events spanning multiple days, you can display them on each day of the event, ' .
-						                 'only on the first day of the event, or on all days of the event, but only up to the current day. ' .
-						                 'Third option applies to list views only.', 'google-calendar-events' ),
+										 'only on the first day of the event, or on all days of the event, but only up to the current day. ' .
+										 'Third option applies to list views only.', 'google-calendar-events' ),
 						'value'   => $multi_day_value,
 						'options' => array(
 							'yes'              => __( 'Yes, display on all days of event', 'google-calendar-events' ),

Spacing +110 added lines, -110 removed lines

@@ -6,7 +6,7 @@ 
  */
 namespace SimpleCalendar\Calendars\Admin;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -24,10 +24,10 @@ 
 	 */
 	public function __construct() {
 
-		if ( simcal_is_admin_screen() !== false ) {
-			add_action( 'simcal_settings_meta_calendar_panel', array( $this, 'add_settings_meta_calendar_panel' ), 10, 1 );
+		if (simcal_is_admin_screen() !== false) {
+			add_action('simcal_settings_meta_calendar_panel', array($this, 'add_settings_meta_calendar_panel'), 10, 1);
 		}
-		add_action( 'simcal_process_settings_meta', array( $this, 'process_meta' ), 10, 1 );
+		add_action('simcal_process_settings_meta', array($this, 'process_meta'), 10, 1);
 	}
 
 	/**
@@ -76,47 +76,47 @@ 
 	 *
 	 * @param int $post_id
 	 */
-	public function add_settings_meta_calendar_panel( $post_id ) {
+	public function add_settings_meta_calendar_panel($post_id) {
 
 		?>
 		<table id="default-calendar-settings">
 			<thead>
-			<tr><th colspan="2"><?php _e( 'Default Calendar', 'google-calendar-events' ); ?></th></tr>
+			<tr><th colspan="2"><?php _e('Default Calendar', 'google-calendar-events'); ?></th></tr>
 			</thead>
 			<tbody class="simcal-panel-section">
 
 			<tr class="simcal-panel-field simcal-default-calendar-grid" style="display: none;">
-				<th><label for="_default_calendar_event_bubbles_action"><?php _e( 'Event Bubbles', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_event_bubbles_action"><?php _e('Event Bubbles', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$bubbles = get_post_meta( $post_id, '_default_calendar_event_bubble_trigger', true );
+					$bubbles = get_post_meta($post_id, '_default_calendar_event_bubble_trigger', true);
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'radio',
 						'inline'  => 'inline',
 						'name'    => '_default_calendar_event_bubble_trigger',
 						'id'      => '_default_calendar_event_bubble_trigger',
-						'tooltip' => __( 'Open event bubbles in calendar grid by clicking or hovering on event titles. On mobile devices it will always default to tapping.', 'google-calendar-events' ),
+						'tooltip' => __('Open event bubbles in calendar grid by clicking or hovering on event titles. On mobile devices it will always default to tapping.', 'google-calendar-events'),
 						'value'   => $bubbles ? $bubbles : 'hover',
 						'default' => 'hover',
 						'options' => array(
-							'click' => __( 'Click', 'google-calendar-events' ),
-							'hover' => __( 'Hover', 'google-calendar-events' ),
+							'click' => __('Click', 'google-calendar-events'),
+							'hover' => __('Hover', 'google-calendar-events'),
 						),
-					) );
+					));
 
 					?>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field simcal-default-calendar-grid" style="display: none;">
-				<th><label for="_default_calendar_trim_titles"><?php _e( 'Trim Event Titles', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_trim_titles"><?php _e('Trim Event Titles', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$trim = get_post_meta( $post_id, '_default_calendar_trim_titles', true );
+					$trim = get_post_meta($post_id, '_default_calendar_trim_titles', true);
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'        => 'checkbox',
 						'name'        => '_default_calendar_trim_titles',
 						'id'          => '_default_calendar_trim_titles',
@@ -127,34 +127,34 @@ 
 						'attributes'  => array(
 							'data-show-next-if-value' => 'yes',
 						),
-					) );
+					));
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'       => 'standard',
 						'subtype'    => 'number',
 						'name'       => '_default_calendar_trim_titles_chars',
 						'id'         => '_default_calendar_trim_titles_chars',
-						'tooltip'    => __( 'Shorten event titles in calendar grid to a specified length in characters.', 'google-calendar-events' ),
+						'tooltip'    => __('Shorten event titles in calendar grid to a specified length in characters.', 'google-calendar-events'),
 						'class'      => array(
 							'simcal-field-tiny',
 						),
-						'value'      => 'yes' == $trim ? strval( max( absint( get_post_meta( $post_id, '_default_calendar_trim_titles_chars', true ) ), 1 ) ) : '20',
+						'value'      => 'yes' == $trim ? strval(max(absint(get_post_meta($post_id, '_default_calendar_trim_titles_chars', true)), 1)) : '20',
 						'attributes' => array(
 							'min'     => '1',
 						),
-					) );
+					));
 
 					?>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field simcal-default-calendar-list" style="display: none;">
-				<th><label for="_default_calendar_list_grouped_span"><?php _e( 'Span', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_list_grouped_span"><?php _e('Span', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$list_span = max( absint( get_post_meta( $post_id, '_default_calendar_list_range_span', true ) ), 1 );
+					$list_span = max(absint(get_post_meta($post_id, '_default_calendar_list_range_span', true)), 1);
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'standard',
 						'subtype' => 'number',
 						'name'    => '_default_calendar_list_range_span',
@@ -163,78 +163,78 @@ 
 							'simcal-field-tiny',
 							'simcal-field-inline',
 						),
-						'value'   => strval( $list_span ),
+						'value'   => strval($list_span),
 						'attributes'  => array(
 							'min' => '1',
 						),
-					) );
+					));
 
-					$list_type = get_post_meta( $post_id, '_default_calendar_list_range_type', true );
+					$list_type = get_post_meta($post_id, '_default_calendar_list_range_type', true);
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'select',
 						'name'    => '_default_calendar_list_range_type',
 						'id'      => '_default_calendar_list_range_type',
-						'tooltip' => __( 'Range of events to show on each calendar page.', 'google-calendar-events' ),
+						'tooltip' => __('Range of events to show on each calendar page.', 'google-calendar-events'),
 						'class'   => array(
 							'simcal-field-inline',
 						),
 						'value'   => $list_type,
 						'options' => array(
-							'monthly' => __( 'Month(s)', 'google-calendar-events' ),
-							'weekly'  => __( 'Week(s)', 'google-calendar-events' ),
-							'daily'   => __( 'Day(s)', 'google-calendar-events' ),
-							'events'  => __( 'Event(s)', 'google-calendar-events' ),
+							'monthly' => __('Month(s)', 'google-calendar-events'),
+							'weekly'  => __('Week(s)', 'google-calendar-events'),
+							'daily'   => __('Day(s)', 'google-calendar-events'),
+							'events'  => __('Event(s)', 'google-calendar-events'),
 						),
-					) );
+					));
 
 					?>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field simcal-default-calendar-list" style="display: none;">
-				<th><label for="_default_calendar_list_header"><?php _e( 'Hide Header', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_list_header"><?php _e('Hide Header', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$header = get_post_meta( $post_id, '_default_calendar_list_header', true );
+					$header = get_post_meta($post_id, '_default_calendar_list_header', true);
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'checkbox',
 						'name'    => '_default_calendar_list_header',
 						'id'      => '_default_calendar_list_header',
-						'tooltip' => __( 'You can use this to hide the month header for this calendar.', 'google-calendar-events' ),
+						'tooltip' => __('You can use this to hide the month header for this calendar.', 'google-calendar-events'),
 						'value'   => 'yes' == $header ? 'yes' : 'no',
-					) );
+					));
 
 					?>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field simcal-default-calendar-list" style="display: none;">
-				<th><label for="_default_calendar_compact_list"><?php _e( 'Compact List', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_compact_list"><?php _e('Compact List', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$compact = get_post_meta( $post_id, '_default_calendar_compact_list', true );
+					$compact = get_post_meta($post_id, '_default_calendar_compact_list', true);
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'checkbox',
 						'name'    => '_default_calendar_compact_list',
 						'id'      => '_default_calendar_compact_list',
-						'tooltip' => __( 'Make an events list more compact by grouping together events from different days in a single list.', 'google-calendar-events' ),
+						'tooltip' => __('Make an events list more compact by grouping together events from different days in a single list.', 'google-calendar-events'),
 						'value'   => 'yes' == $compact ? 'yes' : 'no',
-					) );
+					));
 
 					?>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field simcal-default-calendar-grid simcal-default-calendar-list"  style="display: none;">
-				<th><label for="_default_calendar_limit_visible_events"><?php _e( 'Limit Visible Events', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_limit_visible_events"><?php _e('Limit Visible Events', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$limit = get_post_meta( $post_id, '_default_calendar_limit_visible_events', true );
+					$limit = get_post_meta($post_id, '_default_calendar_limit_visible_events', true);
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'        => 'checkbox',
 						'name'        => '_default_calendar_limit_visible_events',
 						'id'          => '_default_calendar_limit_visible_events',
@@ -245,17 +245,17 @@ 
 						'attributes'  => array(
 							'data-show-next-if-value' => 'yes',
 						)
-					) );
+					));
 
-					$visible_events = absint( get_post_meta( $post_id, '_default_calendar_visible_events', true ) );
+					$visible_events = absint(get_post_meta($post_id, '_default_calendar_visible_events', true));
 					$visible_events = $visible_events > 0 ? $visible_events : 3;
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'       => 'standard',
 						'subtype'    => 'number',
 						'name'       => '_default_calendar_visible_events',
 						'id'         => '_default_calendar_visible_events',
-						'tooltip'    => __( 'Limit the number of initial visible events on each day to a set maximum.', 'google-calendar-events' ),
+						'tooltip'    => __('Limit the number of initial visible events on each day to a set maximum.', 'google-calendar-events'),
 						'class'      => array(
 							'simcal-field-tiny',
 						),
@@ -263,39 +263,39 @@ 
 						'attributes' => array(
 							'min'     => '1',
 						)
-					) );
+					));
 
 					?>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field simcal-default-calendar-grid simcal-default-calendar-list" style="display: none;">
-				<th><label for="_default_calendar_event_bubbles_action"><?php _e( 'Expand Multi-day Events', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_event_bubbles_action"><?php _e('Expand Multi-day Events', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$post_meta = get_post_meta( $post_id );
+					$post_meta = get_post_meta($post_id);
 
-					if ( ! is_array( $post_meta ) && ! empty( $post_meta ) ) {
+					if ( ! is_array($post_meta) && ! empty($post_meta)) {
 						$multi_day_value = 'current_day_only';
 					} else {
-						$multi_day_value = get_post_meta( $post_id, '_default_calendar_expand_multi_day_events', true );
+						$multi_day_value = get_post_meta($post_id, '_default_calendar_expand_multi_day_events', true);
 					}
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'select',
 						'name'    => '_default_calendar_expand_multi_day_events',
 						'id'      => '_default_calendar_expand_multi_day_events',
-						'tooltip' => __( 'For events spanning multiple days, you can display them on each day of the event, ' .
-						                 'only on the first day of the event, or on all days of the event, but only up to the current day. ' .
-						                 'Third option applies to list views only.', 'google-calendar-events' ),
+						'tooltip' => __('For events spanning multiple days, you can display them on each day of the event, '.
+						                 'only on the first day of the event, or on all days of the event, but only up to the current day. '.
+						                 'Third option applies to list views only.', 'google-calendar-events'),
 						'value'   => $multi_day_value,
 						'options' => array(
-							'yes'              => __( 'Yes, display on all days of event', 'google-calendar-events' ),
-							'no'               => __( 'No, display only on first day of event', 'google-calendar-events' ),
-							'current_day_only' => __( 'No, display on all days of event up to current day (list view only)', 'google-calendar-events' ),
+							'yes'              => __('Yes, display on all days of event', 'google-calendar-events'),
+							'no'               => __('No, display only on first day of event', 'google-calendar-events'),
+							'current_day_only' => __('No, display on all days of event up to current day (list view only)', 'google-calendar-events'),
 						),
 						'default' => 'current_day_only',
-					) );
+					));
 
 					?>
 				</td>
@@ -303,72 +303,72 @@ 
 			</tbody>
 			<?php
 
-			$settings                   = get_option( 'simple-calendar_settings_calendars' );
-			$default_theme              = isset( $settings['default-calendar']['theme'] ) ? $settings['default-calendar']['theme'] : 'light';
+			$settings                   = get_option('simple-calendar_settings_calendars');
+			$default_theme              = isset($settings['default-calendar']['theme']) ? $settings['default-calendar']['theme'] : 'light';
 			$default_today_color        = /*isset( $settings['default-calendar']['today_color'] ) ? $settings['default-calendar']['today_color'] :*/ '#1e73be';
 			$default_days_events_color  = /*isset( $settings['default-calendar']['days_events_color'] ) ? $settings['default-calendar']['days_events_color'] :*/ '#000000';
 
 			?>
 			<tbody class="simcal-panel-section">
 			<tr class="simcal-panel-field simcal-default-calendar-grid simcal-default-calendar-list" style="display: none;">
-				<th><label for="_default_calendar_style_theme"><?php _e( 'Theme', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_style_theme"><?php _e('Theme', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$saved = get_post_meta( $post_id, '_default_calendar_style_theme', true );
+					$saved = get_post_meta($post_id, '_default_calendar_style_theme', true);
 					$value = ! $saved ? $default_theme : $saved;
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'select',
 						'name'    => '_default_calendar_style_theme',
 						'id'      => '_default_calendar_style_theme',
 						'value'   => $value,
-						'tooltip' => __( 'Choose a calendar theme to match your site theme.', 'google-calendar-events' ),
+						'tooltip' => __('Choose a calendar theme to match your site theme.', 'google-calendar-events'),
 						'options' => array(
-							'light' => __( 'Light', 'google-calendar-events' ),
-							'dark' => __( 'Dark', 'google-calendar-events' ),
+							'light' => __('Light', 'google-calendar-events'),
+							'dark' => __('Dark', 'google-calendar-events'),
 						),
-					) );
+					));
 
 					?>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field simcal-default-calendar-grid simcal-default-calendar-list" style="display: none;">
-				<th><label for="_default_calendar_style_today"><?php _e( 'Today', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_style_today"><?php _e('Today', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$saved = get_post_meta( $post_id, '_default_calendar_style_today', true );
+					$saved = get_post_meta($post_id, '_default_calendar_style_today', true);
 					$value = ! $saved ? $default_today_color : $saved;
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'standard',
 						'subtype' => 'color-picker',
 						'name'    => '_default_calendar_style_today',
 						'id'      => '_default_calendar_style_today',
 						'value'   => $value,
-						'tooltip' => __( "This option will set the background color for today's date. It will change the day number background and the border around the current day.", 'google-calendar-events' ),
-					) );
+						'tooltip' => __("This option will set the background color for today's date. It will change the day number background and the border around the current day.", 'google-calendar-events'),
+					));
 
 					?>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field simcal-default-calendar-grid simcal-default-calendar-list" style="display: none;">
-				<th><label for="_default_calendar_style_days_events"><?php _e( 'Days with Events', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_style_days_events"><?php _e('Days with Events', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$saved = get_post_meta( $post_id, '_default_calendar_style_days_events', true );
+					$saved = get_post_meta($post_id, '_default_calendar_style_days_events', true);
 					$value = ! $saved ? $default_days_events_color : $saved;
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'standard',
 						'subtype' => 'color-picker',
 						'name'    => '_default_calendar_style_days_events',
 						'id'      => '_default_calendar_style_days_events',
 						'value'   => $value,
-						'tooltip' => __( 'This setting will modify the day number background for any days that have events on them.', 'google-calendar-events' ),
-					) );
+						'tooltip' => __('This setting will modify the day number background for any days that have events on them.', 'google-calendar-events'),
+					));
 
 					?>
 				</td>
@@ -390,55 +390,55 @@ 
 	 *
 	 * @param int $post_id
 	 */
-	public function process_meta( $post_id ) {
+	public function process_meta($post_id) {
 
 		// Theme.
-		$theme = isset( $_POST['_default_calendar_style_theme'] ) ? sanitize_key( $_POST['_default_calendar_style_theme'] ) : 'light';
-		update_post_meta( $post_id, '_default_calendar_style_theme', $theme );
+		$theme = isset($_POST['_default_calendar_style_theme']) ? sanitize_key($_POST['_default_calendar_style_theme']) : 'light';
+		update_post_meta($post_id, '_default_calendar_style_theme', $theme);
 
 		// Today color.
-		$today_color = isset( $_POST['_default_calendar_style_today'] ) ? sanitize_text_field( $_POST['_default_calendar_style_today'] ) : '#FF000';
-		update_post_meta( $post_id, '_default_calendar_style_today', $today_color );
+		$today_color = isset($_POST['_default_calendar_style_today']) ? sanitize_text_field($_POST['_default_calendar_style_today']) : '#FF000';
+		update_post_meta($post_id, '_default_calendar_style_today', $today_color);
 
 		// Days with events color.
-		$days_events_color = isset( $_POST['_default_calendar_style_days_events'] ) ? sanitize_text_field( $_POST['_default_calendar_style_days_events'] ) : '#000000';
-		update_post_meta( $post_id, '_default_calendar_style_days_events', $days_events_color );
+		$days_events_color = isset($_POST['_default_calendar_style_days_events']) ? sanitize_text_field($_POST['_default_calendar_style_days_events']) : '#000000';
+		update_post_meta($post_id, '_default_calendar_style_days_events', $days_events_color);
 
 		// List range span.
-		$span = isset( $_POST['_default_calendar_list_range_span'] ) ? max( absint( $_POST['_default_calendar_list_range_span'] ), 1 ) : 1;
-		update_post_meta( $post_id, '_default_calendar_list_range_span', $span );
+		$span = isset($_POST['_default_calendar_list_range_span']) ? max(absint($_POST['_default_calendar_list_range_span']), 1) : 1;
+		update_post_meta($post_id, '_default_calendar_list_range_span', $span);
 
 		// List range type.
-		$group = isset( $_POST['_default_calendar_list_range_type'] ) ? sanitize_key( $_POST['_default_calendar_list_range_type'] ) : 'monthly';
-		update_post_meta( $post_id, '_default_calendar_list_range_type', $group );
+		$group = isset($_POST['_default_calendar_list_range_type']) ? sanitize_key($_POST['_default_calendar_list_range_type']) : 'monthly';
+		update_post_meta($post_id, '_default_calendar_list_range_type', $group);
 
 		// Hide header.
-		$header = isset( $_POST['_default_calendar_list_header'] ) ? 'yes' : 'no';
-		update_post_meta( $post_id, '_default_calendar_list_header', $header );
+		$header = isset($_POST['_default_calendar_list_header']) ? 'yes' : 'no';
+		update_post_meta($post_id, '_default_calendar_list_header', $header);
 
 		// Compact list.
-		$compact = isset( $_POST['_default_calendar_compact_list'] ) ? 'yes' : 'no';
-		update_post_meta( $post_id, '_default_calendar_compact_list', $compact );
+		$compact = isset($_POST['_default_calendar_compact_list']) ? 'yes' : 'no';
+		update_post_meta($post_id, '_default_calendar_compact_list', $compact);
 
 		// Limit number of initially visible daily events.
-		$limit = isset( $_POST['_default_calendar_limit_visible_events'] ) ? 'yes' : 'no';
-		update_post_meta( $post_id, '_default_calendar_limit_visible_events', $limit );
-		$number = isset( $_POST['_default_calendar_visible_events'] ) ? absint( $_POST['_default_calendar_visible_events'] ) : 3;
-		update_post_meta( $post_id, '_default_calendar_visible_events', $number );
+		$limit = isset($_POST['_default_calendar_limit_visible_events']) ? 'yes' : 'no';
+		update_post_meta($post_id, '_default_calendar_limit_visible_events', $limit);
+		$number = isset($_POST['_default_calendar_visible_events']) ? absint($_POST['_default_calendar_visible_events']) : 3;
+		update_post_meta($post_id, '_default_calendar_visible_events', $number);
 
 		// Grid event bubbles action.
-		$bubbles = isset( $_POST['_default_calendar_event_bubble_trigger'] ) ? esc_attr( $_POST['_default_calendar_event_bubble_trigger'] ) : 'hover';
-		update_post_meta( $post_id, '_default_calendar_event_bubble_trigger', $bubbles );
+		$bubbles = isset($_POST['_default_calendar_event_bubble_trigger']) ? esc_attr($_POST['_default_calendar_event_bubble_trigger']) : 'hover';
+		update_post_meta($post_id, '_default_calendar_event_bubble_trigger', $bubbles);
 
 		// Trim event titles characters length.
-		$trim = isset( $_POST['_default_calendar_trim_titles'] ) ? 'yes' : 'no';
-		update_post_meta( $post_id, '_default_calendar_trim_titles', $trim );
-		$chars = isset( $_POST['_default_calendar_trim_titles_chars'] ) ? max( absint( $_POST['_default_calendar_trim_titles_chars'] ), 1 ) : 20;
-		update_post_meta( $post_id, '_default_calendar_trim_titles_chars', $chars );
+		$trim = isset($_POST['_default_calendar_trim_titles']) ? 'yes' : 'no';
+		update_post_meta($post_id, '_default_calendar_trim_titles', $trim);
+		$chars = isset($_POST['_default_calendar_trim_titles_chars']) ? max(absint($_POST['_default_calendar_trim_titles_chars']), 1) : 20;
+		update_post_meta($post_id, '_default_calendar_trim_titles_chars', $chars);
 
 		// Expand multiple day events on each day.
-		$multi_day = isset( $_POST['_default_calendar_expand_multi_day_events'] ) && ! empty( $_POST['_default_calendar_expand_multi_day_events'] ) ? sanitize_key( $_POST['_default_calendar_expand_multi_day_events'] ) : 'current_day_only';
-		update_post_meta( $post_id, '_default_calendar_expand_multi_day_events', $multi_day );
+		$multi_day = isset($_POST['_default_calendar_expand_multi_day_events']) && ! empty($_POST['_default_calendar_expand_multi_day_events']) ? sanitize_key($_POST['_default_calendar_expand_multi_day_events']) : 'current_day_only';
+		update_post_meta($post_id, '_default_calendar_expand_multi_day_events', $multi_day);
 
 	}