moonstonemedia / Simple-Calendar

includes/calendars/default-calendar.php

Unused Use Statements -1 removed lines

@@ -6,7 +6,6 @@
  */
 namespace SimpleCalendar\Calendars;
 
-use Carbon\Carbon;
 use SimpleCalendar\Abstracts\Calendar;
 use SimpleCalendar\Abstracts\Calendar_View;
 use SimpleCalendar\Calendars\Admin\Default_Calendar_Admin;

Spacing +49 added lines, -49 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 ) ) {
+		if ('yes' == 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 ) ) {
+								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/feeds/google.php

Unused Use Statements -1 removed lines

@@ -7,7 +7,6 @@
 namespace SimpleCalendar\Feeds;
 
 use Carbon\Carbon;
-use Carbon\CarbonInterval;
 use SimpleCalendar\Abstracts\Calendar;
 use SimpleCalendar\Abstracts\Feed;
 use SimpleCalendar\Feeds\Admin\Google_Admin as Admin;

Spacing +90 added lines, -90 removed lines

@@ -12,7 +12,7 @@ 
 use SimpleCalendar\Abstracts\Feed;
 use SimpleCalendar\Feeds\Admin\Google_Admin as Admin;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -90,34 +90,34 @@ 
 	 * @param string|Calendar $calendar
 	 * @param bool $load_admin
 	 */
-	public function __construct( $calendar = '', $load_admin = true ) {
+	public function __construct($calendar = '', $load_admin = true) {
 
-		parent::__construct( $calendar );
+		parent::__construct($calendar);
 
 		$this->type = 'google';
-		$this->name = __( 'Google Calendar', 'google-calendar-events' );
+		$this->name = __('Google Calendar', 'google-calendar-events');
 
 		// Google client config.
-		$settings = get_option( 'simple-calendar_settings_feeds' );
-		$this->google_api_key = isset( $settings['google']['api_key'] ) ? esc_attr( $settings['google']['api_key'] ) : '';
-		$this->google_client_scopes = array( \Google_Service_Calendar::CALENDAR_READONLY );
+		$settings = get_option('simple-calendar_settings_feeds');
+		$this->google_api_key = isset($settings['google']['api_key']) ? esc_attr($settings['google']['api_key']) : '';
+		$this->google_client_scopes = array(\Google_Service_Calendar::CALENDAR_READONLY);
 		$this->google_client = $this->get_client();
 
-		if ( $this->post_id > 0 ) {
+		if ($this->post_id > 0) {
 
 			// Google query args.
-			$this->google_calendar_id       = $this->esc_google_calendar_id( get_post_meta( $this->post_id, '_google_calendar_id', true ) );
-			$this->google_events_recurring  = esc_attr( get_post_meta( $this->post_id, '_google_events_recurring', true ) );
-			$this->google_search_query      = esc_attr( get_post_meta( $this->post_id, '_google_events_search_query', true ) );
-			$this->google_max_results       = max( absint( get_post_meta( $this->post_id, '_google_events_max_results', true ) ), 1 );
+			$this->google_calendar_id       = $this->esc_google_calendar_id(get_post_meta($this->post_id, '_google_calendar_id', true));
+			$this->google_events_recurring  = esc_attr(get_post_meta($this->post_id, '_google_events_recurring', true));
+			$this->google_search_query      = esc_attr(get_post_meta($this->post_id, '_google_events_search_query', true));
+			$this->google_max_results       = max(absint(get_post_meta($this->post_id, '_google_events_max_results', true)), 1);
 
-			if ( ! is_admin() || defined( 'DOING_AJAX' ) ) {
-				$this->events = ! empty( $this->google_api_key ) ? $this->get_events() : array();
+			if ( ! is_admin() || defined('DOING_AJAX')) {
+				$this->events = ! empty($this->google_api_key) ? $this->get_events() : array();
 			}
 		}
 
-		if ( is_admin() && $load_admin ) {
-			$admin = new Admin( $this, $this->google_api_key, $this->google_calendar_id );
+		if (is_admin() && $load_admin) {
+			$admin = new Admin($this, $this->google_api_key, $this->google_calendar_id);
 			$this->settings = $admin->settings_fields();
 		}
 	}
@@ -131,8 +131,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function esc_google_calendar_id( $id ) {
-		return base64_decode( $id );
+	public function esc_google_calendar_id($id) {
+		return base64_decode($id);
 	}
 
 	/**
@@ -146,59 +146,59 @@ 
 	 */
 	public function get_events() {
 
-		$calendar = get_transient( '_simple-calendar_feed_id_' . strval( $this->post_id ) . '_' . $this->type );
+		$calendar = get_transient('_simple-calendar_feed_id_'.strval($this->post_id).'_'.$this->type);
 
-		if ( empty( $calendar ) && ! empty( $this->google_calendar_id ) ) {
+		if (empty($calendar) && ! empty($this->google_calendar_id)) {
 
 			$error = '';
 
 			try {
-				$response = $this->make_request( $this->google_calendar_id );
-			} catch ( \Exception $e ) {
+				$response = $this->make_request($this->google_calendar_id);
+			} catch (\Exception $e) {
 				$error .= $e->getMessage();
 			}
 
-			if ( empty( $error ) && isset( $response['events'] ) && isset( $response['timezone'] ) ) {
+			if (empty($error) && isset($response['events']) && isset($response['timezone'])) {
 
-				$calendar = array_merge( $response, array( 'events' => array() ) );
+				$calendar = array_merge($response, array('events' => array()));
 
 				// If no timezone has been set, use calendar feed.
-				if ( 'use_calendar' == $this->timezone_setting ) {
+				if ('use_calendar' == $this->timezone_setting) {
 					$this->timezone = $calendar['timezone'];
 				}
 
-				$source = isset( $response['title'] ) ? sanitize_text_field( $response['title'] ) : '';
+				$source = isset($response['title']) ? sanitize_text_field($response['title']) : '';
 
-				if ( ! empty( $response['events'] ) && is_array( $response['events'] ) ) {
-					foreach ( $response['events'] as $event ) {
-						if ( $event instanceof \Google_Service_Calendar_Event ) {
+				if ( ! empty($response['events']) && is_array($response['events'])) {
+					foreach ($response['events'] as $event) {
+						if ($event instanceof \Google_Service_Calendar_Event) {
 
 							// Visibility.
 							$visibility = $event->getVisibility();
 							// Public calendars may have private events which can't be properly accessed by simple api key method.
-							if ( $this->type == 'google' && ( $visibility == 'private' || $visibility == 'confidential' ) ) {
+							if ($this->type == 'google' && ($visibility == 'private' || $visibility == 'confidential')) {
 								continue;
 							}
 
 							// Event title & description.
-							$title = strip_tags( $event->getSummary() );
-							$title = sanitize_text_field( iconv( mb_detect_encoding( $title, mb_detect_order(), true ), 'UTF-8', $title ) );
-							$description = wp_kses_post( iconv( mb_detect_encoding( $event->getDescription(), mb_detect_order(), true ), 'UTF-8', $event->getDescription() ) );
+							$title = strip_tags($event->getSummary());
+							$title = sanitize_text_field(iconv(mb_detect_encoding($title, mb_detect_order(), true), 'UTF-8', $title));
+							$description = wp_kses_post(iconv(mb_detect_encoding($event->getDescription(), mb_detect_order(), true), 'UTF-8', $event->getDescription()));
 
 							$whole_day = false;
 
 							// Event start properties.
 							$start_timezone = ! $event->getStart()->timeZone ? $calendar['timezone'] : $event->getStart()->timeZone;
-							if ( is_null( $event->getStart()->dateTime ) ) {
+							if (is_null($event->getStart()->dateTime)) {
 								// Whole day event.
-								$date = Carbon::parse( $event->getStart()->date );
-								$google_start = Carbon::createFromDate( $date->year, $date->month, $date->day, $start_timezone )->startOfDay()->addSeconds( 59 );
-								$google_start_utc = Carbon::createFromDate( $date->year, $date->month, $date->day, 'UTC' )->startOfDay()->addSeconds( 59 );
+								$date = Carbon::parse($event->getStart()->date);
+								$google_start = Carbon::createFromDate($date->year, $date->month, $date->day, $start_timezone)->startOfDay()->addSeconds(59);
+								$google_start_utc = Carbon::createFromDate($date->year, $date->month, $date->day, 'UTC')->startOfDay()->addSeconds(59);
 								$whole_day = true;
 							} else {
-								$date = Carbon::parse( $event->getStart()->dateTime );
-								$google_start     = Carbon::create( $date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $start_timezone );
-								$google_start_utc = Carbon::create( $date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, 'UTC' );
+								$date = Carbon::parse($event->getStart()->dateTime);
+								$google_start     = Carbon::create($date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $start_timezone);
+								$google_start_utc = Carbon::create($date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, 'UTC');
 							}
 							// Start.
 							$start = $google_start->getTimestamp();
@@ -207,19 +207,19 @@ 
 
 							$end = $end_utc = $end_timezone = '';
 							$span = 0;
-							if ( false == $event->getEndTimeUnspecified() ) {
+							if (false == $event->getEndTimeUnspecified()) {
 
 								// Event end properties.
 								$end_timezone = ! $event->getEnd()->timeZone ? $calendar['timezone'] : $event->getEnd()->timeZone;
-								if ( is_null( $event->getEnd()->dateTime ) ) {
+								if (is_null($event->getEnd()->dateTime)) {
 									// Whole day event.
-									$date           = Carbon::parse( $event->getEnd()->date );
-									$google_end     = Carbon::createFromDate( $date->year, $date->month, $date->day, $end_timezone )->endOfDay()->subSeconds( 59 );
-									$google_end_utc = Carbon::createFromDate( $date->year, $date->month, $date->day, 'UTC' )->endOfDay()->subSeconds( 59 );
+									$date           = Carbon::parse($event->getEnd()->date);
+									$google_end     = Carbon::createFromDate($date->year, $date->month, $date->day, $end_timezone)->endOfDay()->subSeconds(59);
+									$google_end_utc = Carbon::createFromDate($date->year, $date->month, $date->day, 'UTC')->endOfDay()->subSeconds(59);
 								} else {
-									$date           = Carbon::parse( $event->getEnd()->dateTime );
-									$google_end     = Carbon::create( $date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $end_timezone );
-									$google_end_utc = Carbon::create( $date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, 'UTC' );
+									$date           = Carbon::parse($event->getEnd()->dateTime);
+									$google_end     = Carbon::create($date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $end_timezone);
+									$google_end_utc = Carbon::create($date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, 'UTC');
 								}
 								// End.
 								$end = $google_end->getTimestamp();
@@ -227,10 +227,10 @@ 
 								$end_utc = $google_end_utc->getTimestamp();
 
 								// Count multiple days.
-								$span = $google_start->setTimezone( $calendar['timezone'] )->diffInDays( $google_end->setTimezone( $calendar['timezone'] ) );
+								$span = $google_start->setTimezone($calendar['timezone'])->diffInDays($google_end->setTimezone($calendar['timezone']));
 
-								if ( $span == 0 ) {
-									if ( $google_start->toDateString() !== $google_end->toDateString() ) {
+								if ($span == 0) {
+									if ($google_start->toDateString() !== $google_end->toDateString()) {
 										$span = 1;
 									}
 								}
@@ -245,19 +245,19 @@ 
 							// Recurring event.
 							$recurrence = $event->getRecurrence();
 							$recurring_id = $event->getRecurringEventId();
-							if ( ! $recurrence && $recurring_id ) {
+							if ( ! $recurrence && $recurring_id) {
 								$recurrence = true;
 							}
 
 							// Event link.
-							if ( 'use_calendar' == $this->timezone_setting ) {
-								$link = add_query_arg( array( 'ctz' => $this->timezone ), $event->getHtmlLink() );
+							if ('use_calendar' == $this->timezone_setting) {
+								$link = add_query_arg(array('ctz' => $this->timezone), $event->getHtmlLink());
 							} else {
 								$link = $event->getHtmlLink();
 							}
 
 							// Build the event.
-							$calendar['events'][ intval( $start ) ][] = array(
+							$calendar['events'][intval($start)][] = array(
 								'type'           => 'google-calendar',
 								'source'         => $source,
 								'title'          => $title,
@@ -284,24 +284,24 @@ 
 						}
 					}
 
-					if ( ! empty( $calendar['events'] ) ) {
+					if ( ! empty($calendar['events'])) {
 
-						ksort( $calendar['events'], SORT_NUMERIC );
+						ksort($calendar['events'], SORT_NUMERIC);
 
 						set_transient(
-							'_simple-calendar_feed_id_' . strval( $this->post_id ) . '_' . $this->type,
+							'_simple-calendar_feed_id_'.strval($this->post_id).'_'.$this->type,
 							$calendar,
-							max( absint( $this->cache ), 60 )
+							max(absint($this->cache), 60)
 						);
 					}
 				}
 
 			} else {
 
-				$message  = __( 'While trying to retrieve events, Google returned an error:', 'google-calendar-events' );
-				$message .= '<br><br>' . $error . '<br><br>';
-				$message .= __( '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' ) . '<br><br>';
-				$message .= __( 'Only you can see this notice.', 'google-calendar-events' );
+				$message  = __('While trying to retrieve events, Google returned an error:', 'google-calendar-events');
+				$message .= '<br><br>'.$error.'<br><br>';
+				$message .= __('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').'<br><br>';
+				$message .= __('Only you can see this notice.', 'google-calendar-events');
 
 				return $message;
 			}
@@ -309,11 +309,11 @@ 
 		}
 
 		// If no timezone has been set, use calendar feed.
-		if ( 'use_calendar' == $this->timezone_setting && isset( $calendar['timezone'] ) ) {
+		if ('use_calendar' == $this->timezone_setting && isset($calendar['timezone'])) {
 			$this->timezone = $calendar['timezone'];
 		}
 
-		return isset( $calendar['events'] ) ? $calendar['events'] : array();
+		return isset($calendar['events']) ? $calendar['events'] : array();
 	}
 
 	/**
@@ -329,67 +329,67 @@ 
 	 *
 	 * @throws \Exception On request failure will throw an exception from Google.
 	 */
-	public function make_request( $id = '', $time_min = 0, $time_max = 0 ) {
+	public function make_request($id = '', $time_min = 0, $time_max = 0) {
 
 		$calendar = array();
 		$google = $this->get_service();
 
-		if ( ! is_null( $google ) && ! empty( $id ) ) {
+		if ( ! is_null($google) && ! empty($id)) {
 
 			// Build the request args.
 			$args = array();
 
 			// Expand recurring events.
-			if ( $this->google_events_recurring == 'show' ) {
+			if ($this->google_events_recurring == 'show') {
 				$args['singleEvents'] = true;
 			}
 
 			// Query events using search terms.
-			if ( ! empty( $this->google_search_query ) ) {
-				$args['q'] = rawurlencode( $this->google_search_query );
+			if ( ! empty($this->google_search_query)) {
+				$args['q'] = rawurlencode($this->google_search_query);
 			}
 
 			// Max results to query.
-			$args['maxResults'] = strval( min( absint( $this->google_max_results ), 2500 ) );
+			$args['maxResults'] = strval(min(absint($this->google_max_results), 2500));
 
 			// Specify a timezone.
 			$timezone = '';
-			if ( 'use_calendar' != get_post_meta( $this->post_id, '_feed_timezone_setting', true ) ) {
+			if ('use_calendar' != get_post_meta($this->post_id, '_feed_timezone_setting', true)) {
 				$args['timeZone'] = $timezone = $this->timezone;
 			}
 
 			// Lower bound (inclusive) for an event's end time to filter by.
-			$earliest_event = intval( $this->time_min );
-			if ( $earliest_event > 0 ) {
+			$earliest_event = intval($this->time_min);
+			if ($earliest_event > 0) {
 				$timeMin = Carbon::now();
-				if ( ! empty( $timezone ) ) {
-					$timeMin->setTimezone( $timezone );
+				if ( ! empty($timezone)) {
+					$timeMin->setTimezone($timezone);
 				}
-				$timeMin->setTimestamp( $earliest_event );
+				$timeMin->setTimestamp($earliest_event);
 				$args['timeMin'] = $timeMin->toRfc3339String();
 			}
 
 			// Upper bound (exclusive) for an event's start time to filter by.
-			$latest_event = intval( $this->time_max );
-			if ( $latest_event > 0 ) {
+			$latest_event = intval($this->time_max);
+			if ($latest_event > 0) {
 				$timeMax = Carbon::now();
-				if ( ! empty( $timezone ) ) {
-					$timeMax->setTimezone( $timezone );
+				if ( ! empty($timezone)) {
+					$timeMax->setTimezone($timezone);
 				}
-				$timeMax->setTimestamp( $latest_event );
+				$timeMax->setTimestamp($latest_event);
 				$args['timeMax'] = $timeMax->toRfc3339String();
 			}
 
 			// Query events in calendar.
-			$response = $google->events->listEvents( $id, $args );
+			$response = $google->events->listEvents($id, $args);
 
-			if ( $response instanceof \Google_Service_Calendar_Events ) {
+			if ($response instanceof \Google_Service_Calendar_Events) {
 				$calendar = array(
 					'id'            => $id,
 					'title'         => $response->getSummary(),
 					'description'   => $response->getDescription(),
 					'timezone'      => $response->getTimeZone(),
-					'url'           => esc_url( '//www.google.com/calendar/embed?src=' . $id ),
+					'url'           => esc_url('//www.google.com/calendar/embed?src='.$id),
 					'events'        => $response->getItems(),
 				);
 			}
@@ -409,10 +409,10 @@ 
 	private function get_client() {
 
 		$client = new \Google_Client();
-		$client->setApplicationName( 'Simple Calendar' );
-		$client->setScopes( $this->google_client_scopes );
-		$client->setDeveloperKey( $this->google_api_key );
-		$client->setAccessType( 'online' );
+		$client->setApplicationName('Simple Calendar');
+		$client->setScopes($this->google_client_scopes);
+		$client->setDeveloperKey($this->google_api_key);
+		$client->setAccessType('online');
 
 		return $client;
 	}
@@ -426,7 +426,7 @@ 
 	 * @return null|\Google_Service_Calendar
 	 */
 	protected function get_service() {
-		return $this->google_client instanceof \Google_Client ? new \Google_Service_Calendar( $this->google_client ) : null;
+		return $this->google_client instanceof \Google_Client ? new \Google_Service_Calendar($this->google_client) : null;
 	}
 
 }

includes/main.php

Unused Use Statements -2 removed lines

@@ -6,8 +6,6 @@
  */
 namespace SimpleCalendar;
 
-use SimpleCalendar\Admin\License_Manager;
-
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

Spacing +24 added lines, -24 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Admin\License_Manager;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -71,7 +71,7 @@ 
 	 * @return Plugin
 	 */
 	public static function get_instance() {
-		if ( is_null( self::$_instance ) ) {
+		if (is_null(self::$_instance)) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -81,14 +81,14 @@ 
 	 * Cloning is forbidden.
 	 */
 	public function __clone() {
-		_doing_it_wrong( __FUNCTION__, 'Cloning the main instance of this plugin is forbidden.', '1.0.0' );
+		_doing_it_wrong(__FUNCTION__, 'Cloning the main instance of this plugin is forbidden.', '1.0.0');
 	}
 
 	/**
 	 * Unserializing instances of this class is forbidden.
 	 */
 	public function __wakeup() {
-		_doing_it_wrong( __FUNCTION__, 'Unserializing instances of this plugin is forbidden.', '1.0.0' );
+		_doing_it_wrong(__FUNCTION__, 'Unserializing instances of this plugin is forbidden.', '1.0.0');
 	}
 
 	/**
@@ -100,22 +100,22 @@ 
 
 		// Load plugin.
 		require_once 'autoload.php';
-		$this->locale = apply_filters( 'plugin_locale', get_locale(), 'google-calendar-events' );
+		$this->locale = apply_filters('plugin_locale', get_locale(), 'google-calendar-events');
 		$this->load();
 
 		// Installation hooks.
-		register_activation_hook( SIMPLE_CALENDAR_MAIN_FILE, array( 'SimpleCalendar\Installation', 'activate' ) );
-		register_deactivation_hook( SIMPLE_CALENDAR_MAIN_FILE, array( 'SimpleCalendar\Installation', 'deactivate' ) );
+		register_activation_hook(SIMPLE_CALENDAR_MAIN_FILE, array('SimpleCalendar\Installation', 'activate'));
+		register_deactivation_hook(SIMPLE_CALENDAR_MAIN_FILE, array('SimpleCalendar\Installation', 'deactivate'));
 
 		// Do update call here.
-		add_action( 'admin_init', array( $this, 'update' ), 999 );
+		add_action('admin_init', array($this, 'update'), 999);
 
 		// Init hooks.
-		add_action( 'init', array( $this, 'init' ), 5 );
-		add_action( 'admin_init', array( $this, 'register_settings' ), 5 );
+		add_action('init', array($this, 'init'), 5);
+		add_action('admin_init', array($this, 'register_settings'), 5);
 
 		// Upon plugin loaded action hook.
-		do_action( 'simcal_loaded' );
+		do_action('simcal_loaded');
 	}
 
 	/**
@@ -132,7 +132,7 @@ 
 		new Post_Types();
 
 		// Load back end.
-		if ( is_admin() ) {
+		if (is_admin()) {
 			$this->load_admin();
 		} else {
 			// Load front end scripts and styles.
@@ -174,7 +174,7 @@ 
 		// Init menus and settings.
 		new Admin\Menus();
 
-		if ( defined( 'DOING_AJAX' ) ) {
+		if (defined('DOING_AJAX')) {
 			// Admin ajax callbacks.
 			new Admin\Ajax();
 		}
@@ -188,16 +188,16 @@ 
 	public function init() {
 
 		// Before init action hook.
-		do_action( 'before_simcal_init' );
+		do_action('before_simcal_init');
 
 		// Set up localization.
-		load_plugin_textdomain( 'google-calendar-events', false, dirname( plugin_basename( SIMPLE_CALENDAR_MAIN_FILE ) ) . '/languages/' );
+		load_plugin_textdomain('google-calendar-events', false, dirname(plugin_basename(SIMPLE_CALENDAR_MAIN_FILE)).'/languages/');
 
 		// Init objects factory.
 		$this->objects = new Objects();
 
 		// Upon init action hook.
-		do_action( 'simcal_init' );
+		do_action('simcal_init');
 	}
 
 	/**
@@ -206,9 +206,9 @@ 
 	 * @since 3.0.0
 	 */
 	public function register_settings() {
-		if ( is_admin() && ! defined( 'DOING_AJAX' ) ) {
+		if (is_admin() && ! defined('DOING_AJAX')) {
 			$settings = new Admin\Pages();
-			$settings->register_settings( $settings->get_settings() );
+			$settings->register_settings($settings->get_settings());
 		}
 	}
 
@@ -220,7 +220,7 @@ 
 	 * @return string
 	 */
 	public function ajax_url() {
-		return admin_url( 'admin-ajax.php', 'relative' );
+		return admin_url('admin-ajax.php', 'relative');
 	}
 
 	/**
@@ -232,15 +232,15 @@ 
 	 *
 	 * @return string
 	 */
-	public function get_url( $case ) {
-		switch ( $case ) {
+	public function get_url($case) {
+		switch ($case) {
 			case 'codex' :
 			case 'apidocs' :
 				return 'http://codex.simplecalendar.io';
 			case 'add-ons' :
-				return self::$homepage . '/addons/';
+				return self::$homepage.'/addons/';
 			case 'gcal-pro' :
-				return self::$homepage . '/addons/google-calendar-pro/';
+				return self::$homepage.'/addons/google-calendar-pro/';
 			case 'docs' :
 				return 'http://docs.simplecalendar.io';
 			case 'github' :
@@ -260,7 +260,7 @@ 
 	 * @since 3.0.0
 	 */
 	public static function update() {
-		$update = new Update( SIMPLE_CALENDAR_VERSION );
+		$update = new Update(SIMPLE_CALENDAR_VERSION);
 	}
 
 }

google-calendar-events.php

Spacing +11 added lines, -11 removed lines

@@ -14,38 +14,38 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
 // Composer fallback for PHP < 5.3.0.
-if ( version_compare( PHP_VERSION, '5.3.0' ) === -1 ) {
+if (version_compare(PHP_VERSION, '5.3.0') === -1) {
 	include_once 'vendor/autoload_52.php';
 } else {
 	include_once 'vendor/autoload.php';
 }
 
 // Plugin constants.
-$this_plugin_path = trailingslashit( dirname( __FILE__ ) );
-$this_plugin_dir  = plugin_dir_url( __FILE__ );
+$this_plugin_path = trailingslashit(dirname(__FILE__));
+$this_plugin_dir  = plugin_dir_url(__FILE__);
 $this_plugin_constants = array(
 	'SIMPLE_CALENDAR_VERSION'   => '3.0.6',
 	'SIMPLE_CALENDAR_MAIN_FILE' => __FILE__,
 	'SIMPLE_CALENDAR_URL'       => $this_plugin_dir,
-	'SIMPLE_CALENDAR_ASSETS'    => $this_plugin_dir  . 'assets/',
+	'SIMPLE_CALENDAR_ASSETS'    => $this_plugin_dir.'assets/',
 	'SIMPLE_CALENDAR_PATH'      => $this_plugin_path,
-	'SIMPLE_CALENDAR_INC'       => $this_plugin_path . 'includes/',
+	'SIMPLE_CALENDAR_INC'       => $this_plugin_path.'includes/',
 );
-foreach ( $this_plugin_constants as $constant => $value ) {
-	if ( ! defined( $constant ) ) {
-		define( $constant, $value );
+foreach ($this_plugin_constants as $constant => $value) {
+	if ( ! defined($constant)) {
+		define($constant, $value);
 	}
 }
 
 // Check plugin requirements before loading plugin.
 $this_plugin_checks = new WP_Requirements(
 	'Simple Calendar',
-	plugin_basename( __FILE__ ),
+	plugin_basename(__FILE__),
 	array(
 		'PHP'       => '5.3.0',
 		'WordPress' => '4.0.0',
@@ -55,7 +55,7 @@ 
 		)
 	)
 );
-if ( $this_plugin_checks->pass() === false ) {
+if ($this_plugin_checks->pass() === false) {
 	$this_plugin_checks->halt();
 	return;
 }

includes/abstracts/admin-page.php

Spacing +24 added lines, -24 removed lines

@@ -6,7 +6,7 @@ 
  */
 namespace SimpleCalendar\Abstracts;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -84,27 +84,27 @@ 
 
 		$settings = array();
 
-		$settings[ $this->id ] = array(
+		$settings[$this->id] = array(
 			'label'         => $this->label,
 			'description'   => $this->description,
 		);
 
-		if ( ! empty( $this->sections ) && is_array( $this->sections ) ) {
+		if ( ! empty($this->sections) && is_array($this->sections)) {
 
-			foreach ( $this->sections as $section => $content ) {
+			foreach ($this->sections as $section => $content) {
 
-				$settings[ $this->id ]['sections'][ $section ] = array(
-					'title'         => isset( $content['title'] ) ? $content['title'] : '',
-					'description'   => isset( $content['description'] ) ? $content['description'] : '',
-					'callback'      => array( $this, 'add_settings_section_callback' ),
-					'fields'        => isset( $this->fields[ $section ] ) ? $this->fields[ $section ] : '',
+				$settings[$this->id]['sections'][$section] = array(
+					'title'         => isset($content['title']) ? $content['title'] : '',
+					'description'   => isset($content['description']) ? $content['description'] : '',
+					'callback'      => array($this, 'add_settings_section_callback'),
+					'fields'        => isset($this->fields[$section]) ? $this->fields[$section] : '',
 				);
 
 			}
 
 		}
 
-		return apply_filters( 'simcal_get_' . $this->option_group . '_' . $this->id , $settings );
+		return apply_filters('simcal_get_'.$this->option_group.'_'.$this->id, $settings);
 	}
 
 	/**
@@ -118,12 +118,12 @@ 
 	 *
 	 * @return string
 	 */
-	protected function get_option_value( $section, $setting ) {
+	protected function get_option_value($section, $setting) {
 
 		$option = $this->values;
 
-		if ( ! empty( $option ) && is_array( $option ) ) {
-			return isset( $option[ $section ][ $setting ] ) ? $option[ $section ][ $setting ] : '';
+		if ( ! empty($option) && is_array($option)) {
+			return isset($option[$section][$setting]) ? $option[$section][$setting] : '';
 		}
 
 		return '';
@@ -156,14 +156,14 @@ 
 	 *
 	 * @return string
 	 */
-	public function add_settings_section_callback( $section ) {
+	public function add_settings_section_callback($section) {
 
-		$callback    = isset( $section['callback'][0] ) ? $section['callback'][0] : '';
-		$sections    = isset( $callback->sections ) ? $callback->sections : '';
-		$description = isset( $sections[ $section['id'] ]['description'] ) ? $sections[ $section['id'] ]['description'] : '';
-		$default     = $description ? '<p>' . $description . '</p>' : '';
+		$callback    = isset($section['callback'][0]) ? $section['callback'][0] : '';
+		$sections    = isset($callback->sections) ? $callback->sections : '';
+		$description = isset($sections[$section['id']]['description']) ? $sections[$section['id']]['description'] : '';
+		$default     = $description ? '<p>'.$description.'</p>' : '';
 
-		echo apply_filters( 'simcal_' . $this->option_group . '_' . $this->id . '_sections_callback', $default );
+		echo apply_filters('simcal_'.$this->option_group.'_'.$this->id.'_sections_callback', $default);
 	}
 
 	/**
@@ -177,16 +177,16 @@ 
 	 *
 	 * @return array Sanitized settings.
 	 */
-	public function validate( $settings ) {
+	public function validate($settings) {
 
 		$sanitized = '';
 
-		if ( is_array( $settings ) ) {
-			foreach ( $settings as $k => $v ) {
-				$sanitized[ $k ] = simcal_sanitize_input( $v );
+		if (is_array($settings)) {
+			foreach ($settings as $k => $v) {
+				$sanitized[$k] = simcal_sanitize_input($v);
 			}
 		} else {
-			$sanitized = simcal_sanitize_input( $settings );
+			$sanitized = simcal_sanitize_input($settings);
 		}
 
 		return $sanitized;

includes/abstracts/calendar-view.php

Spacing +4 added lines, -4 removed lines

@@ -6,7 +6,7 @@ 
  */
 namespace SimpleCalendar\Abstracts;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -26,7 +26,7 @@ 
 	 *
 	 * @param mixed $args
 	 */
-	public function __construct( $args = '' );
+	public function __construct($args = '');
 
 	/**
 	 * Return the parent calendar type.
@@ -75,7 +75,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function scripts( $min = '' );
+	public function scripts($min = '');
 
 	/**
 	 * Styles.
@@ -88,7 +88,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function styles( $min = '' );
+	public function styles($min = '');
 
 	/**
 	 * Print HTML.

includes/abstracts/calendar.php

Spacing +168 added lines, -168 removed lines

@@ -11,7 +11,7 @@ 
 use SimpleCalendar\Events\Event_Builder;
 use SimpleCalendar\Events\Events;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -234,12 +234,12 @@ 
 	 * @param int|object|\WP_Post|Calendar $calendar
 	 * @param string $view
 	 */
-	public function __construct( $calendar, $view = '' ) {
+	public function __construct($calendar, $view = '') {
 
 		// Set the post object.
-		$this->set_post_object( $calendar );
+		$this->set_post_object($calendar);
 
-		if ( ! is_null( $this->post ) ) {
+		if ( ! is_null($this->post)) {
 
 			// Set calendar type and events source.
 			$this->set_taxonomies();
@@ -256,23 +256,23 @@ 
 			$this->set_events_template();
 
 			// Get events source data.
-			$feed = simcal_get_feed( $this );
-			if ( $feed instanceof Feed ) {
-				if ( ! empty( $feed->events ) ) {
-					if ( is_array( $feed->events ) ) {
-						$this->set_events( $feed->events );
-						if ( 'use_calendar' == get_post_meta( $this->id, '_feed_timezone_setting', true ) ) {
+			$feed = simcal_get_feed($this);
+			if ($feed instanceof Feed) {
+				if ( ! empty($feed->events)) {
+					if (is_array($feed->events)) {
+						$this->set_events($feed->events);
+						if ('use_calendar' == get_post_meta($this->id, '_feed_timezone_setting', true)) {
 							$this->timezone = $feed->timezone;
-							$this->set_start( $feed->timezone );
+							$this->set_start($feed->timezone);
 						}
-					} elseif ( is_string( $feed->events ) ) {
+					} elseif (is_string($feed->events)) {
 						$this->errors[] = $feed->events;
 					}
 				}
 			}
 
 			// Set general purpose timestamps.
-			$now = Carbon::now( $this->timezone );
+			$now = Carbon::now($this->timezone);
 			$this->now    = $now->getTimestamp();
 			$this->today  = $now->startOfDay()->getTimestamp();
 			$this->offset = $now->getOffset();
@@ -283,26 +283,26 @@ 
 			$this->set_datetime_separator();
 
 			// Set earliest and latest event timestamps.
-			if ( $this->events && is_array( $this->events ) ) {
-				$this->earliest_event = intval( current( array_keys( $this->events ) ) );
-				$this->latest_event   = intval( key( array_slice( $this->events, -1, 1, true ) ) );
+			if ($this->events && is_array($this->events)) {
+				$this->earliest_event = intval(current(array_keys($this->events)));
+				$this->latest_event   = intval(key(array_slice($this->events, -1, 1, true)));
 			}
 
 			// Set calendar end.
 			$this->set_end();
 
 			// Set view.
-			if ( ! $view ) {
+			if ( ! $view) {
 
-				$calendar_view = get_post_meta( $this->id, '_calendar_view', true );
-				$calendar_view = isset( $calendar_view[ $this->type ] ) ? $calendar_view[ $this->type ] : '';
+				$calendar_view = get_post_meta($this->id, '_calendar_view', true);
+				$calendar_view = isset($calendar_view[$this->type]) ? $calendar_view[$this->type] : '';
 
-				$view = esc_attr( $calendar_view );
+				$view = esc_attr($calendar_view);
 			}
 		}
 
 		// Get view.
-		$this->view = $this->get_view( $view );
+		$this->view = $this->get_view($view);
 	}
 
 	/**
@@ -314,8 +314,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function __isset( $key ) {
-		return metadata_exists( 'post', $this->id, '_' . $key );
+	public function __isset($key) {
+		return metadata_exists('post', $this->id, '_'.$key);
 	}
 
 	/**
@@ -327,9 +327,9 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function __get( $key ) {
-		$value = get_post_meta( $this->id, '_' . $key, true );
-		if ( ! empty( $value ) ) {
+	public function __get($key) {
+		$value = get_post_meta($this->id, '_'.$key, true);
+		if ( ! empty($value)) {
 			$this->$key = $value;
 		}
 		return $value;
@@ -342,17 +342,17 @@ 
 	 *
 	 * @param int|object|\WP_Post|Calendar $calendar
 	 */
-	public function set_post_object( $calendar ) {
-		if ( is_numeric( $calendar ) ) {
-			$this->id   = absint( $calendar );
-			$this->post = get_post( $this->id );
-		} elseif ( $calendar instanceof Calendar ) {
-			$this->id   = absint( $calendar->id );
+	public function set_post_object($calendar) {
+		if (is_numeric($calendar)) {
+			$this->id   = absint($calendar);
+			$this->post = get_post($this->id);
+		} elseif ($calendar instanceof Calendar) {
+			$this->id   = absint($calendar->id);
 			$this->post = $calendar->post;
-		} elseif ( $calendar instanceof \WP_Post ) {
-			$this->id   = absint( $calendar->ID );
+		} elseif ($calendar instanceof \WP_Post) {
+			$this->id   = absint($calendar->ID);
 			$this->post = $calendar;
-		} elseif ( isset( $calendar->id ) && isset( $calendar->post ) ) {
+		} elseif (isset($calendar->id) && isset($calendar->post)) {
 			$this->id   = $calendar->id;
 			$this->post = $calendar->post;
 		}
@@ -366,8 +366,8 @@ 
 	 * @return string
 	 */
 	public function get_title() {
-		$title = isset( $this->post->post_title ) ? $this->post->post_title : '';
-		return apply_filters( 'simcal_calendar_title', $title );
+		$title = isset($this->post->post_title) ? $this->post->post_title : '';
+		return apply_filters('simcal_calendar_title', $title);
 	}
 
 	/**
@@ -389,16 +389,16 @@ 
 	 */
 	protected function set_taxonomies() {
 		// Set calendar type.
-		if ( $type = wp_get_object_terms( $this->id, 'calendar_type' ) ) {
-			$this->type = sanitize_title( current( $type )->name );
+		if ($type = wp_get_object_terms($this->id, 'calendar_type')) {
+			$this->type = sanitize_title(current($type)->name);
 		} else {
-			$this->type = apply_filters( 'simcal_calendar_default_type', 'default-calendar' );
+			$this->type = apply_filters('simcal_calendar_default_type', 'default-calendar');
 		}
 		// Set feed type.
-		if ( $feed_type = wp_get_object_terms( $this->id, 'calendar_feed' ) ) {
-			$this->feed = sanitize_title( current( $feed_type )->name );
+		if ($feed_type = wp_get_object_terms($this->id, 'calendar_feed')) {
+			$this->feed = sanitize_title(current($feed_type)->name);
 		} else {
-			$this->feed = apply_filters( 'simcal_calendar_default_feed', 'google' );
+			$this->feed = apply_filters('simcal_calendar_default_feed', 'google');
 		}
 	}
 
@@ -410,7 +410,7 @@ 
 	 * @return Events
 	 */
 	public function get_events() {
-		return new Events( $this->events, $this->timezone );
+		return new Events($this->events, $this->timezone);
 	}
 
 	/**
@@ -420,14 +420,14 @@ 
 	 *
 	 * @param array $array
 	 */
-	public function set_events( array $array ) {
+	public function set_events(array $array) {
 
 		$events = array();
 
-		if ( ! empty( $array ) ) {
-			foreach ( $array as $tz => $e ) {
-				foreach ( $e as $event ) {
-					$events[ $tz ][] = $event instanceof Event ? $event : new Event( $event );
+		if ( ! empty($array)) {
+			foreach ($array as $tz => $e) {
+				foreach ($e as $event) {
+					$events[$tz][] = $event instanceof Event ? $event : new Event($event);
 				}
 			}
 		}
@@ -444,11 +444,11 @@ 
 	 *
 	 * @return string
 	 */
-	public function set_events_template( $template = '' ) {
-		if ( empty( $template ) ) {
-			$template = isset( $this->post->post_content ) ? $this->post->post_content : '';
+	public function set_events_template($template = '') {
+		if (empty($template)) {
+			$template = isset($this->post->post_content) ? $this->post->post_content : '';
 		}
-		$this->events_template = wpautop( wp_kses_post( trim( $template ) ) );
+		$this->events_template = wpautop(wp_kses_post(trim($template)));
 	}
 
 	/**
@@ -458,32 +458,32 @@ 
 	 *
 	 * @param string $tz Timezone.
 	 */
-	public function set_timezone( $tz = '' ) {
+	public function set_timezone($tz = '') {
 
-		$site_tz = esc_attr( simcal_get_wp_timezone() );
+		$site_tz = esc_attr(simcal_get_wp_timezone());
 
-		if ( empty( $tz ) ) {
+		if (empty($tz)) {
 
-			$timezone_setting = get_post_meta( $this->id, '_feed_timezone_setting', true );
+			$timezone_setting = get_post_meta($this->id, '_feed_timezone_setting', true);
 
-			if ( 'use_site' == $timezone_setting ) {
+			if ('use_site' == $timezone_setting) {
 				$tz = $site_tz;
-			} elseif ( 'use_custom' == $timezone_setting ) {
-				$custom_timezone = esc_attr( get_post_meta( $this->id, '_feed_timezone', true ) );
+			} elseif ('use_custom' == $timezone_setting) {
+				$custom_timezone = esc_attr(get_post_meta($this->id, '_feed_timezone', true));
 				// One may be using a non standard timezone in GMT (UTC) offset format.
-				if ( ( strpos( $custom_timezone, 'UTC+' ) === 0 ) || ( strpos( $custom_timezone, 'UTC-' ) === 0 ) ) {
-					$tz = simcal_get_timezone_from_gmt_offset( substr( $custom_timezone, 3 ) );
+				if ((strpos($custom_timezone, 'UTC+') === 0) || (strpos($custom_timezone, 'UTC-') === 0)) {
+					$tz = simcal_get_timezone_from_gmt_offset(substr($custom_timezone, 3));
 				} else {
-					$tz = ! empty( $custom_timezone ) ? $custom_timezone : 'UTC';
+					$tz = ! empty($custom_timezone) ? $custom_timezone : 'UTC';
 				}
 			}
 
-			$this->timezone = empty( $tz ) ? 'UTC' : $tz;
+			$this->timezone = empty($tz) ? 'UTC' : $tz;
 			return;
 		}
 
 		$this->site_timezone = $site_tz;
-		$this->timezone = simcal_esc_timezone( $tz, $this->timezone );
+		$this->timezone = simcal_esc_timezone($tz, $this->timezone);
 	}
 
 	/**
@@ -493,20 +493,20 @@ 
 	 *
 	 * @param string $format PHP datetime format.
 	 */
-	public function set_date_format( $format = '' ) {
+	public function set_date_format($format = '') {
 
 		$date_format_custom = $date_format_default = $format;
 
-		if ( empty( $date_format_custom ) ) {
+		if (empty($date_format_custom)) {
 
-			$date_format_option  = esc_attr( get_post_meta( $this->id, '_calendar_date_format_setting', true ) );
-			$date_format_default = esc_attr( get_option( 'date_format' ) );
+			$date_format_option  = esc_attr(get_post_meta($this->id, '_calendar_date_format_setting', true));
+			$date_format_default = esc_attr(get_option('date_format'));
 			$date_format_custom  = '';
 
-			if ( 'use_custom' == $date_format_option ) {
-				$date_format_custom = esc_attr( get_post_meta( $this->id, '_calendar_date_format', true ) );
-			} elseif ( 'use_custom_php' ) {
-				$date_format_custom = esc_attr( get_post_meta( $this->id, '_calendar_date_format_php', true ) );
+			if ('use_custom' == $date_format_option) {
+				$date_format_custom = esc_attr(get_post_meta($this->id, '_calendar_date_format', true));
+			} elseif ('use_custom_php') {
+				$date_format_custom = esc_attr(get_post_meta($this->id, '_calendar_date_format_php', true));
 			}
 		}
 
@@ -520,20 +520,20 @@ 
 	 *
 	 * @param string $format PHP datetime format.
 	 */
-	public function set_time_format( $format = '' ) {
+	public function set_time_format($format = '') {
 
 		$time_format_custom = $time_format_default = $format;
 
-		if ( empty( $time_format_custom ) ) {
+		if (empty($time_format_custom)) {
 
-			$time_format_option  = esc_attr( get_post_meta( $this->id, '_calendar_time_format_setting', true ) );
-			$time_format_default = esc_attr( get_option( 'time_format' ) );
+			$time_format_option  = esc_attr(get_post_meta($this->id, '_calendar_time_format_setting', true));
+			$time_format_default = esc_attr(get_option('time_format'));
 			$time_format_custom  = '';
 
-			if ( 'use_custom' == $time_format_option ) {
-				$time_format_custom = esc_attr( get_post_meta( $this->id, '_calendar_time_format', true ) );
-			} elseif ( 'use_custom_php' ) {
-				$time_format_custom = esc_attr( get_post_meta( $this->id, '_calendar_time_format_php', true ) );
+			if ('use_custom' == $time_format_option) {
+				$time_format_custom = esc_attr(get_post_meta($this->id, '_calendar_time_format', true));
+			} elseif ('use_custom_php') {
+				$time_format_custom = esc_attr(get_post_meta($this->id, '_calendar_time_format_php', true));
 			}
 		}
 
@@ -547,13 +547,13 @@ 
 	 *
 	 * @param string $separator A UTF8 character used as separator.
 	 */
-	public function set_datetime_separator( $separator = '' ) {
+	public function set_datetime_separator($separator = '') {
 
-		if ( empty( $separator ) ) {
-			$separator = get_post_meta( $this->id, '_calendar_datetime_separator', true );
+		if (empty($separator)) {
+			$separator = get_post_meta($this->id, '_calendar_datetime_separator', true);
 		}
 
-		$this->datetime_separator = esc_attr( $separator );
+		$this->datetime_separator = esc_attr($separator);
 	}
 
 	/**
@@ -563,18 +563,18 @@ 
 	 *
 	 * @param int $weekday From 0 (Sunday) to 6 (Friday).
 	 */
-	public function set_start_of_week( $weekday = -1 ) {
+	public function set_start_of_week($weekday = -1) {
 
-		$week_starts = is_int( $weekday ) ? $weekday : -1;
+		$week_starts = is_int($weekday) ? $weekday : -1;
 
-		if ( $week_starts < 0 || $week_starts > 6 ) {
+		if ($week_starts < 0 || $week_starts > 6) {
 
-			$week_starts_setting = get_post_meta( $this->id, '_calendar_week_starts_on_setting', true );
-			$week_starts         = intval( get_option( 'start_of_week' ) );
+			$week_starts_setting = get_post_meta($this->id, '_calendar_week_starts_on_setting', true);
+			$week_starts         = intval(get_option('start_of_week'));
 
-			if ( 'use_custom' == $week_starts_setting ) {
-				$week_starts_on = get_post_meta( $this->id, '_calendar_week_starts_on', true );
-				$week_starts    = is_numeric( $week_starts_on ) ? intval( $week_starts_on ) : $week_starts;
+			if ('use_custom' == $week_starts_setting) {
+				$week_starts_on = get_post_meta($this->id, '_calendar_week_starts_on', true);
+				$week_starts    = is_numeric($week_starts_on) ? intval($week_starts_on) : $week_starts;
 			}
 		}
 
@@ -588,51 +588,51 @@ 
 	 *
 	 * @param int $timestamp
 	 */
-	public function set_start( $timestamp = 0 ) {
+	public function set_start($timestamp = 0) {
 
-		if ( is_int( $timestamp ) && $timestamp !== 0 ) {
+		if (is_int($timestamp) && $timestamp !== 0) {
 			$this->start = $timestamp;
 			return;
 		}
 
-		$this->start = Carbon::now( $this->timezone )->getTimestamp();
+		$this->start = Carbon::now($this->timezone)->getTimestamp();
 
-		$calendar_begins = esc_attr( get_post_meta( $this->id, '_calendar_begins', true ) );
-		$nth = max( absint( get_post_meta( $this->id, '_calendar_begins_nth' ) ), 1 );
+		$calendar_begins = esc_attr(get_post_meta($this->id, '_calendar_begins', true));
+		$nth = max(absint(get_post_meta($this->id, '_calendar_begins_nth')), 1);
 
-		if ( 'today' == $calendar_begins ) {
-			$this->start = Carbon::today( $this->timezone )->getTimestamp();
-		} elseif ( 'days_before' == $calendar_begins ) {
-			$this->start = Carbon::today( $this->timezone )->subDays( $nth )->getTimestamp();
-		} elseif ( 'days_after' == $calendar_begins ) {
-			$this->start = Carbon::today( $this->timezone )->addDays( $nth )->getTimestamp();
-		} elseif ( 'this_week' == $calendar_begins ) {
-			$week = new Carbon( 'now', $this->timezone );
-			$week->setWeekStartsAt( $this->week_starts );
+		if ('today' == $calendar_begins) {
+			$this->start = Carbon::today($this->timezone)->getTimestamp();
+		} elseif ('days_before' == $calendar_begins) {
+			$this->start = Carbon::today($this->timezone)->subDays($nth)->getTimestamp();
+		} elseif ('days_after' == $calendar_begins) {
+			$this->start = Carbon::today($this->timezone)->addDays($nth)->getTimestamp();
+		} elseif ('this_week' == $calendar_begins) {
+			$week = new Carbon('now', $this->timezone);
+			$week->setWeekStartsAt($this->week_starts);
 			$this->start = $week->startOfWeek()->getTimestamp();
-		} elseif ( 'weeks_before' == $calendar_begins ) {
-			$week = new Carbon( 'now', $this->timezone );
-			$week->setWeekStartsAt( $this->week_starts );
-			$this->start = $week->startOfWeek()->subWeeks( $nth )->getTimestamp();
-		} elseif ( 'weeks_after' == $calendar_begins ) {
-			$week = new Carbon( 'now', $this->timezone );
-			$week->setWeekStartsAt( $this->week_starts );
-			$this->start = $week->startOfWeek()->addWeeks( $nth )->getTimestamp();
-		} elseif ( 'this_month' == $calendar_begins ) {
-			$this->start = Carbon::today( $this->timezone )->startOfMonth()->getTimeStamp();
-		} elseif ( 'months_before' == $calendar_begins ) {
-			$this->start = Carbon::today( $this->timezone )->subMonths( $nth )->startOfMonth()->getTimeStamp();
-		} elseif ( 'months_after' == $calendar_begins ) {
-			$this->start = Carbon::today( $this->timezone )->addMonths( $nth )->startOfMonth()->getTimeStamp();
-		} elseif ( 'this_year' == $calendar_begins ) {
-			$this->start = Carbon::today( $this->timezone )->startOfYear()->getTimestamp();
-		} elseif ( 'years_before' == $calendar_begins ) {
-			$this->start = Carbon::today( $this->timezone )->subYears( $nth )->startOfYear()->getTimeStamp();
-		} elseif ( 'years_after' == $calendar_begins ) {
-			$this->start = Carbon::today( $this->timezone )->addYears( $nth )->startOfYear()->getTimeStamp();
-		} elseif ( 'custom_date' == $calendar_begins ) {
-			if ( $date = get_post_meta( $this->id, '_calendar_begins_custom_date', true ) ) {
-				$this->start = Carbon::createFromFormat( 'Y-m-d', esc_attr( $date ) )->setTimezone( $this->timezone )->getTimestamp();
+		} elseif ('weeks_before' == $calendar_begins) {
+			$week = new Carbon('now', $this->timezone);
+			$week->setWeekStartsAt($this->week_starts);
+			$this->start = $week->startOfWeek()->subWeeks($nth)->getTimestamp();
+		} elseif ('weeks_after' == $calendar_begins) {
+			$week = new Carbon('now', $this->timezone);
+			$week->setWeekStartsAt($this->week_starts);
+			$this->start = $week->startOfWeek()->addWeeks($nth)->getTimestamp();
+		} elseif ('this_month' == $calendar_begins) {
+			$this->start = Carbon::today($this->timezone)->startOfMonth()->getTimeStamp();
+		} elseif ('months_before' == $calendar_begins) {
+			$this->start = Carbon::today($this->timezone)->subMonths($nth)->startOfMonth()->getTimeStamp();
+		} elseif ('months_after' == $calendar_begins) {
+			$this->start = Carbon::today($this->timezone)->addMonths($nth)->startOfMonth()->getTimeStamp();
+		} elseif ('this_year' == $calendar_begins) {
+			$this->start = Carbon::today($this->timezone)->startOfYear()->getTimestamp();
+		} elseif ('years_before' == $calendar_begins) {
+			$this->start = Carbon::today($this->timezone)->subYears($nth)->startOfYear()->getTimeStamp();
+		} elseif ('years_after' == $calendar_begins) {
+			$this->start = Carbon::today($this->timezone)->addYears($nth)->startOfYear()->getTimeStamp();
+		} elseif ('custom_date' == $calendar_begins) {
+			if ($date = get_post_meta($this->id, '_calendar_begins_custom_date', true)) {
+				$this->start = Carbon::createFromFormat('Y-m-d', esc_attr($date))->setTimezone($this->timezone)->getTimestamp();
 			}
 		}
 	}
@@ -644,8 +644,8 @@ 
 	 *
 	 * @param int $timestamp
 	 */
-	public function set_end( $timestamp = 0 ) {
-		$latest = is_int( $timestamp ) && $timestamp !== 0 ? $timestamp : $this->latest_event;
+	public function set_end($timestamp = 0) {
+		$latest = is_int($timestamp) && $timestamp !== 0 ? $timestamp : $this->latest_event;
 		$this->end = $latest > $this->start ? $latest : $this->start;
 	}
 
@@ -656,14 +656,14 @@ 
 	 *
 	 * @param string|bool $static
 	 */
-	public function set_static( $static = '' ) {
+	public function set_static($static = '') {
 
-		if ( ! empty( $static ) && is_bool( $static ) ) {
+		if ( ! empty($static) && is_bool($static)) {
 			$this->static = $static;
 			return;
 		}
 
-		if ( 'yes' == get_post_meta( $this->id, '_calendar_is_static', true ) ) {
+		if ('yes' == get_post_meta($this->id, '_calendar_is_static', true)) {
 			$this->static = true;
 			return;
 		}
@@ -691,7 +691,7 @@ 
 	 *
 	 * @return Calendar_View
 	 */
-	abstract public function get_view( $view = '' );
+	abstract public function get_view($view = '');
 
 	/**
 	 * Get event HTML parsed by template.
@@ -703,11 +703,11 @@ 
 	 *
 	 * @return string
 	 */
-	public function get_event_html( Event $event, $template = '' ) {
-		$event_builder = new Event_Builder( $event, $this );
+	public function get_event_html(Event $event, $template = '') {
+		$event_builder = new Event_Builder($event, $this);
 		// Use the event template to parse tags; if empty, fallback to calendar post content.
-		$template = empty( $template ) ? ( empty( $event->template ) ? $this->events_template : $event->template ) : $template;
-		return $event_builder->parse_event_template_tags( $template );
+		$template = empty($template) ? (empty($event->template) ? $this->events_template : $event->template) : $template;
+		return $event_builder->parse_event_template_tags($template);
 	}
 
 	/**
@@ -717,57 +717,57 @@ 
 	 *
 	 * @param string $view The calendar view to display.
 	 */
-	public function html( $view = '' ) {
+	public function html($view = '') {
 
-		$view = empty( $view ) ? $this->view : $this->get_view( $view );
+		$view = empty($view) ? $this->view : $this->get_view($view);
 
-		if ( $view instanceof Calendar_View ) {
+		if ($view instanceof Calendar_View) {
 
-			if ( ! empty( $this->errors ) ) {
+			if ( ! empty($this->errors)) {
 
-				if ( current_user_can( 'manage_options' )  ) {
+				if (current_user_can('manage_options')) {
 					echo '<pre><code>';
-					foreach ( $this->errors as $error ) { echo $error; }
+					foreach ($this->errors as $error) { echo $error; }
 					echo '</code></pre>';
 				}
 
 			} else {
 
 				// Get a CSS class from the class name of the calendar view (minus namespace part).
-				$view_name  = implode( '-', array_map( 'lcfirst', explode( '_', strtolower( get_class( $view ) ) ) ) );
-				$view_class = substr( $view_name, strrpos( $view_name, '\\' ) + 1 );
+				$view_name  = implode('-', array_map('lcfirst', explode('_', strtolower(get_class($view)))));
+				$view_class = substr($view_name, strrpos($view_name, '\\') + 1);
 
-				$calendar_class = trim( implode( ' simcal-', apply_filters( 'simcal_calendar_class', array(
+				$calendar_class = trim(implode(' simcal-', apply_filters('simcal_calendar_class', array(
 					'simcal-calendar',
 					$this->type,
 					$view_class,
-				), $this->id ) ) );
-
-				echo '<div class="' . $calendar_class . '" '
-									. 'data-calendar-id="'    . $this->id . '" '
-									. 'data-timezone="'       . $this->timezone . '" '
-									. 'data-offset="'         . $this->offset . '" '
-									. 'data-week-start="'     . $this->week_starts . '" '
-									. 'data-calendar-start="' . $this->start .'" '
-									. 'data-calendar-end="'   . $this->end . '" '
-									. 'data-events-first="'   . $this->earliest_event .'" '
-									. 'data-events-last="'    . $this->latest_event . '"'
+				), $this->id)));
+
+				echo '<div class="'.$calendar_class.'" '
+									. 'data-calendar-id="'.$this->id.'" '
+									. 'data-timezone="'.$this->timezone.'" '
+									. 'data-offset="'.$this->offset.'" '
+									. 'data-week-start="'.$this->week_starts.'" '
+									. 'data-calendar-start="'.$this->start.'" '
+									. 'data-calendar-end="'.$this->end.'" '
+									. 'data-events-first="'.$this->earliest_event.'" '
+									. 'data-events-last="'.$this->latest_event.'"'
 									. '>';
 
-				date_default_timezone_set( $this->timezone );
-				do_action( 'simcal_calendar_html_before', $this->id );
+				date_default_timezone_set($this->timezone);
+				do_action('simcal_calendar_html_before', $this->id);
 
 				$view->html();
 
-				do_action( 'simcal_calendar_html_after', $this->id );
-				date_default_timezone_set( $this->site_timezone );
+				do_action('simcal_calendar_html_after', $this->id);
+				date_default_timezone_set($this->site_timezone);
 
-				$settings = get_option( 'simple-calendar_settings_calendars' );
-				$poweredby = isset( $settings['poweredby']['opt_in'] ) ? $settings['poweredby']['opt_in'] : '';
+				$settings = get_option('simple-calendar_settings_calendars');
+				$poweredby = isset($settings['poweredby']['opt_in']) ? $settings['poweredby']['opt_in'] : '';
 
-				if ( 'yes' == $poweredby ) {
+				if ('yes' == $poweredby) {
 					$align = is_rtl() ? 'left' : 'right';
-					echo '<small class="simcal-powered simcal-align-' . $align .'">Powered by <a href="https://simplecalendar.io" target="_blank">Simple Calendar</a></small>';
+					echo '<small class="simcal-powered simcal-align-'.$align.'">Powered by <a href="https://simplecalendar.io" target="_blank">Simple Calendar</a></small>';
 				}
 
 				echo '</div>';

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

Spacing +60 added lines, -60 removed lines

@@ -6,7 +6,7 @@ 
  */
 namespace SimpleCalendar\Abstracts;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -148,68 +148,68 @@ 
 	 *
 	 * @param array $field Field data.
 	 */
-	public function __construct( $field ) {
+	public function __construct($field) {
 
 		// Field properties.
-		if ( isset( $field['title'] ) ) {
-			$this->title = esc_attr( $field['title'] );
+		if (isset($field['title'])) {
+			$this->title = esc_attr($field['title']);
 		}
-		if ( isset( $field['description'] ) ) {
-			$this->description = wp_kses_post( $field['description'] );
+		if (isset($field['description'])) {
+			$this->description = wp_kses_post($field['description']);
 		}
-		if ( isset( $field['type'] ) ) {
-			$this->type = esc_attr( $field['type'] );
+		if (isset($field['type'])) {
+			$this->type = esc_attr($field['type']);
 		}
-		if ( isset( $field['name'] ) ) {
-			$this->name = esc_attr( $field['name'] );
+		if (isset($field['name'])) {
+			$this->name = esc_attr($field['name']);
 		}
-		if ( isset( $field['id'] ) ) {
-			$this->id = esc_attr( $field['id'] );
+		if (isset($field['id'])) {
+			$this->id = esc_attr($field['id']);
 		}
-		if ( isset( $field['placeholder'] ) ) {
-			$this->placeholder = esc_attr( $field['placeholder'] );
+		if (isset($field['placeholder'])) {
+			$this->placeholder = esc_attr($field['placeholder']);
 		}
-		if ( isset( $field['options'] ) && is_array( $field['options'] ) ) {
-			$this->options = array_map( 'esc_attr', $field['options'] );
+		if (isset($field['options']) && is_array($field['options'])) {
+			$this->options = array_map('esc_attr', $field['options']);
 		}
 
 		// Escaping.
-		if ( ! empty( $field['escaping'] ) && ( is_string( $field['escaping'] ) || is_array( $field['escaping'] ) ) ) {
-			if ( isset( $field['default'] ) ) {
-				$this->default = $this->escape_callback( $field['escaping'], $field['default'] );
+		if ( ! empty($field['escaping']) && (is_string($field['escaping']) || is_array($field['escaping']))) {
+			if (isset($field['default'])) {
+				$this->default = $this->escape_callback($field['escaping'], $field['default']);
 			}
-			if ( isset( $field['value'] ) ) {
-				$this->value = $this->escape_callback( $field['escaping'], $field['value'] );
+			if (isset($field['value'])) {
+				$this->value = $this->escape_callback($field['escaping'], $field['value']);
 			}
 		} else {
-			if ( isset( $field['default'] ) ) {
-				$this->default = $this->escape( $field['default'] );
+			if (isset($field['default'])) {
+				$this->default = $this->escape($field['default']);
 			}
-			if ( isset( $field['value'] ) ) {
-				$this->value = $this->escape( $field['value'] );
+			if (isset($field['value'])) {
+				$this->value = $this->escape($field['value']);
 			}
 		}
 
 		// Validation.
-		if ( ! empty( $field['validation'] ) ) {
-			$this->validation = $this->validate( $field['validation'], $this->value );
+		if ( ! empty($field['validation'])) {
+			$this->validation = $this->validate($field['validation'], $this->value);
 		}
 
 		// CSS classes and styles.
-		$classes = isset( $field['class'] ) ? $field['class'] : '';
-		$this->set_class( $classes );
-		if ( isset( $field['style'] ) ) {
-			$this->set_style( $field['style'] );
+		$classes = isset($field['class']) ? $field['class'] : '';
+		$this->set_class($classes);
+		if (isset($field['style'])) {
+			$this->set_style($field['style']);
 		}
 
 		// Custom attributes.
-		if ( isset( $field['attributes'] ) ) {
-			$this->set_attributes( $field['attributes'] );
+		if (isset($field['attributes'])) {
+			$this->set_attributes($field['attributes']);
 		}
 
 		// Tooltip markup.
-		if ( isset( $field['tooltip'] ) ) {
-			$this->tooltip = ' <i class="simcal-icon-help simcal-help-tip" data-tip="' . esc_attr( $field['tooltip'] ) . '"></i> ' ;
+		if (isset($field['tooltip'])) {
+			$this->tooltip = ' <i class="simcal-icon-help simcal-help-tip" data-tip="'.esc_attr($field['tooltip']).'"></i> ';
 		}
 	}
 
@@ -222,13 +222,13 @@ 
 	 *
 	 * @return void
 	 */
-	public function set_attributes( $attributes ) {
+	public function set_attributes($attributes) {
 
 		$attr = '';
 
-		if ( ! empty( $attributes ) && is_array( $attributes ) ) {
-			foreach ( $attributes as $k => $v ) {
-				$attr .= esc_attr( $k ) . '="' . esc_attr( $v ) . '" ';
+		if ( ! empty($attributes) && is_array($attributes)) {
+			foreach ($attributes as $k => $v) {
+				$attr .= esc_attr($k).'="'.esc_attr($v).'" ';
 			}
 		}
 
@@ -244,13 +244,13 @@ 
 	 *
 	 * @return void
 	 */
-	public function set_style( $css ) {
+	public function set_style($css) {
 
 		$styles = '';
 
-		if ( ! empty( $css ) && is_array( $css ) ) {
-			foreach ( $css as $k => $v ) {
-				$styles .= esc_attr( $k ) . ': ' . esc_attr( $v ) . '; ';
+		if ( ! empty($css) && is_array($css)) {
+			foreach ($css as $k => $v) {
+				$styles .= esc_attr($k).': '.esc_attr($v).'; ';
 			}
 		}
 
@@ -266,23 +266,23 @@ 
 	 *
 	 * @return void
 	 */
-	public function set_class( $class ) {
+	public function set_class($class) {
 
 		$classes = '';
 		$type_class = '';
 		$error = '';
 
-		if ( ! empty( $class ) && is_array( $class ) ) {
-			$classes = implode( ' ', array_map( 'esc_attr', $class ) );
+		if ( ! empty($class) && is_array($class)) {
+			$classes = implode(' ', array_map('esc_attr', $class));
 		}
-		if ( ! empty( $this->type_class ) ) {
-			$type_class = esc_attr( $this->type_class );
+		if ( ! empty($this->type_class)) {
+			$type_class = esc_attr($this->type_class);
 		}
-		if ( true !== $this->validation && ! empty( $this->validation ) ) {
+		if (true !== $this->validation && ! empty($this->validation)) {
 			$error = 'simcal-field-error ';
 		}
 
-		$this->class = trim( $error . 'simcal-field ' . $type_class . ' ' . $classes );
+		$this->class = trim($error.'simcal-field '.$type_class.' '.$classes);
 	}
 
 	/**
@@ -297,8 +297,8 @@ 
 	 *
 	 * @return array|string
 	 */
-	protected function escape( $value )  {
-		return ! empty( $value ) ? ( is_array( $value ) ? array_map( 'esc_attr', $value ) : esc_attr( $value ) ) : '';
+	protected function escape($value) {
+		return ! empty($value) ? (is_array($value) ? array_map('esc_attr', $value) : esc_attr($value)) : '';
 	}
 
 	/**
@@ -314,11 +314,11 @@ 
 	 *
 	 * @return mixed
 	 */
-	protected function escape_callback( $callback, $value ) {
-		if ( $callback && ( is_string( $callback ) || is_array( $callback ) ) ) {
-			return call_user_func( $callback, $value );
+	protected function escape_callback($callback, $value) {
+		if ($callback && (is_string($callback) || is_array($callback))) {
+			return call_user_func($callback, $value);
 		}
-		return esc_attr( $value );
+		return esc_attr($value);
 	}
 
 	/**
@@ -334,10 +334,10 @@ 
 	 *
 	 * @return true|string Expected to return bool (true) if passes, message string if not.
 	 */
-	protected function validate( $callback, $value ) {
-		if ( $callback && ( is_string( $callback ) || is_array( $callback ) ) ) {
-			$screen = function_exists( 'get_current_screen' ) ? get_current_screen() : '';
-			return call_user_func( $callback, $value, $screen );
+	protected function validate($callback, $value) {
+		if ($callback && (is_string($callback) || is_array($callback))) {
+			$screen = function_exists('get_current_screen') ? get_current_screen() : '';
+			return call_user_func($callback, $value, $screen);
 		}
 		return true;
 	}