moonstonemedia / Simple-Calendar

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);
 	}
 
 }

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/updates/update-v3013.php

Unused Use Statements -3 removed lines

@@ -6,9 +6,6 @@
  */
 namespace SimpleCalendar\Updates;
 
-use Carbon\Carbon;
-use SimpleCalendar\Post_Types;
-
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

Spacing +9 added lines, -9 removed lines

@@ -9,7 +9,7 @@ 
 use Carbon\Carbon;
 use SimpleCalendar\Post_Types;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -23,7 +23,7 @@ 
 	 *
 	 * @param array $posts
 	 */
-	public function __construct( $posts ) {
+	public function __construct($posts) {
 
 		$this->update_options();
 	}
@@ -34,22 +34,22 @@ 
 	 */
 	public function update_options() {
 
-		$settings_advanced = get_option( 'simple-calendar_settings_advanced' );
+		$settings_advanced = get_option('simple-calendar_settings_advanced');
 		
 		// Remove stored always_enqueue value
-		if ( isset( $settings_advanced['assets']['always_enqueue'] ) ) {
-			unset( $settings_advanced['assets']['always_enqueue'] );
+		if (isset($settings_advanced['assets']['always_enqueue'])) {
+			unset($settings_advanced['assets']['always_enqueue']);
 		}
 
 		// Remove stored disable_js value
-		if ( isset( $settings_advanced['assets']['disable_js'] ) ) {
-			unset( $settings_advanced['assets']['disable_js'] );
+		if (isset($settings_advanced['assets']['disable_js'])) {
+			unset($settings_advanced['assets']['disable_js']);
 		}
 
-		update_option( 'simple-calendar_settings_advanced', $settings_advanced );
+		update_option('simple-calendar_settings_advanced', $settings_advanced);
 
 		// Delete legacy options.
-		delete_option( 'simple-calendar_defaults' );
+		delete_option('simple-calendar_defaults');
 	}
 
 }

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);
 
 	}
 

includes/wp-requirements.php

Spacing +45 added lines, -45 removed lines

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

includes/admin/assets.php

Spacing +28 added lines, -28 removed lines

@@ -6,7 +6,7 @@ 
  */
 namespace SimpleCalendar\Admin;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -34,9 +34,9 @@ 
 	 */
 	public function __construct() {
 
-		$this->min = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG == true ) ? '' : '.min';
+		$this->min = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG == true) ? '' : '.min';
 
-		add_action( 'admin_enqueue_scripts', array( $this, 'load' ) );
+		add_action('admin_enqueue_scripts', array($this, 'load'));
 	}
 
 	/**
@@ -46,10 +46,10 @@ 
 	 */
 	public function load() {
 
-		$css_path        = SIMPLE_CALENDAR_ASSETS . 'css/';
-		$css_path_vendor = $css_path . 'vendor/';
-		$js_path         = SIMPLE_CALENDAR_ASSETS . 'js/';
-		$js_path_vendor  = $js_path . 'vendor/';
+		$css_path        = SIMPLE_CALENDAR_ASSETS.'css/';
+		$css_path_vendor = $css_path.'vendor/';
+		$js_path         = SIMPLE_CALENDAR_ASSETS.'js/';
+		$js_path_vendor  = $js_path.'vendor/';
 
 		/* ====================== *
 		 * Register Admin Scripts *
@@ -58,21 +58,21 @@ 
 		// TipTip uses ".minified.js" filename ending.
 		wp_register_script(
 			'simcal-tiptip',
-			$js_path_vendor . 'jquery.tipTip' . ( ( $this->min !== '' ) ? '.minified' : '' ) . '.js',
-			array( 'jquery' ),
+			$js_path_vendor.'jquery.tipTip'.(($this->min !== '') ? '.minified' : '').'.js',
+			array('jquery'),
 			'1.3',
 			true
 		);
 		wp_register_script(
 			'simcal-select2',
-			$js_path_vendor . 'select2' . $this->min . '.js',
+			$js_path_vendor.'select2'.$this->min.'.js',
 			array(),
 			'4.0',
 			true
 		);
 		wp_register_script(
 			'simcal-admin',
-			$js_path . 'admin' . $this->min . '.js',
+			$js_path.'admin'.$this->min.'.js',
 			array(
 				'jquery',
 				'jquery-ui-sortable',
@@ -86,8 +86,8 @@ 
 		);
 		wp_register_script(
 			'simcal-admin-add-calendar',
-			$js_path . 'admin-add-calendar' . $this->min . '.js',
-			array( 'simcal-select2' ),
+			$js_path.'admin-add-calendar'.$this->min.'.js',
+			array('simcal-select2'),
 			SIMPLE_CALENDAR_VERSION,
 			true
 		);
@@ -98,13 +98,13 @@ 
 
 		wp_register_style(
 			'simcal-select2',
-			$css_path_vendor . 'select2' . $this->min . '.css',
+			$css_path_vendor.'select2'.$this->min.'.css',
 			array(),
 			'4.0.0'
 		);
 		wp_register_style(
 			'simcal-admin',
-			$css_path . 'admin' . $this->min . '.css',
+			$css_path.'admin'.$this->min.'.css',
 			array(
 				'wp-color-picker',
 				'simcal-select2',
@@ -113,21 +113,21 @@ 
 		);
 		wp_register_style(
 			'simcal-admin-add-calendar',
-			$css_path . 'admin-add-calendar' . $this->min . '.css',
-			array( 'simcal-select2' ),
+			$css_path.'admin-add-calendar'.$this->min.'.css',
+			array('simcal-select2'),
 			SIMPLE_CALENDAR_VERSION
 		);
 
-		if ( simcal_is_admin_screen() !== false ) {
+		if (simcal_is_admin_screen() !== false) {
 
-			wp_enqueue_script( 'simcal-admin' );
+			wp_enqueue_script('simcal-admin');
 			wp_localize_script(
 				'simcal-admin',
 				'simcal_admin',
 				simcal_common_scripts_variables()
 			);
 
-			wp_enqueue_style( 'simcal-admin' );
+			wp_enqueue_style('simcal-admin');
 
 		} else {
 
@@ -135,25 +135,25 @@ 
 			$screen = get_current_screen();
 
 			$post_types = array();
-			$settings = get_option( 'simple-calendar_settings_calendars' );
-			if ( isset( $settings['general']['attach_calendars_posts'] ) ) {
+			$settings = get_option('simple-calendar_settings_calendars');
+			if (isset($settings['general']['attach_calendars_posts'])) {
 				$post_types = $settings['general']['attach_calendars_posts'];
 			}
 
 			$conditions = array(
-				in_array( $post_type, (array) $post_types ),
+				in_array($post_type, (array) $post_types),
 				$screen->id == 'widgets',
 			);
 
-			if ( in_array( true, $conditions ) ) {
+			if (in_array(true, $conditions)) {
 
-				wp_enqueue_script( 'simcal-admin-add-calendar' );
-				wp_localize_script( 'simcal-admin-add-calendar', 'simcal_admin', array(
+				wp_enqueue_script('simcal-admin-add-calendar');
+				wp_localize_script('simcal-admin-add-calendar', 'simcal_admin', array(
 					'locale'   => get_locale(),
 					'text_dir' => is_rtl() ? 'rtl' : 'ltr',
-				) );
+				));
 
-				wp_enqueue_style( 'simcal-admin-add-calendar' );
+				wp_enqueue_style('simcal-admin-add-calendar');
 			}
 
 		}

includes/admin/fields/select.php

Spacing +24 added lines, -24 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Abstracts\Field;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -51,32 +51,32 @@ 
 	 *
 	 * @param array $field
 	 */
-	public function __construct( $field ) {
+	public function __construct($field) {
 
 		$class = 'simcal-field-select';
 
-		$enhanced = isset( $field['enhanced'] ) ? $field['enhanced'] : '';
-		if ( 'enhanced' == $enhanced )  {
+		$enhanced = isset($field['enhanced']) ? $field['enhanced'] : '';
+		if ('enhanced' == $enhanced) {
 			$this->enhanced = true;
 			$class .= ' simcal-field-select-enhanced';
 		}
 
-		$multiselect = isset( $field['multiselect'] ) ? $field['multiselect'] : '';
-		if ( 'multiselect' == $multiselect ) {
+		$multiselect = isset($field['multiselect']) ? $field['multiselect'] : '';
+		if ('multiselect' == $multiselect) {
 			$this->multiselect = true;
 			$class .= ' simcal-field-multiselect';
 		}
 
-		if ( isset( $field['default'] ) ) {
+		if (isset($field['default'])) {
 			$this->default = $field['default'];
 		}
 
 		$this->type_class = $class;
 
-		$allow_void = isset( $field['allow_void'] ) ? $field['allow_void'] : '';
+		$allow_void = isset($field['allow_void']) ? $field['allow_void'] : '';
 		$this->allow_void = 'allow_void' == $allow_void ? true : false;
 
-		parent::__construct( $field );
+		parent::__construct($field);
 	}
 
 	/**
@@ -86,36 +86,36 @@ 
 	 */
 	public function html() {
 
-		if ( $this->multiselect === true && ! is_array( $this->value ) ) {
-			$this->value = explode( ',', $this->value );
+		if ($this->multiselect === true && ! is_array($this->value)) {
+			$this->value = explode(',', $this->value);
 		}
 
-		if ( $this->default ) {
-			if ( empty( $this->value ) || $this->value == '' ) {
+		if ($this->default) {
+			if (empty($this->value) || $this->value == '') {
 				$this->value = $this->default;
 			}
 		}
 
 		?>
-		<select name="<?php echo $this->name; ?><?php if ( $this->multiselect === true ) { echo '[]'; } ?>"
+		<select name="<?php echo $this->name; ?><?php if ($this->multiselect === true) { echo '[]'; } ?>"
 		        id="<?php echo $this->id; ?>"
 		        style="<?php echo $this->style; ?>"
 		        class="<?php echo $this->class; ?>"
 				<?php echo $this->attributes; ?>
-				<?php echo ( $this->multiselect === true ) ? ' multiple="multiple"' : ''; ?>>
+				<?php echo ($this->multiselect === true) ? ' multiple="multiple"' : ''; ?>>
 			<?php
 
-			if ( $this->allow_void === true ) {
-				echo '<option value=""' . selected( '', $this->value, false ) . '></option>';
+			if ($this->allow_void === true) {
+				echo '<option value=""'.selected('', $this->value, false).'></option>';
 			}
 
-			foreach ( $this->options as $option => $name ) {
-				if ( is_array( $this->value ) ) {
-					$selected =	selected( in_array( $option, $this->value ), true, false );
+			foreach ($this->options as $option => $name) {
+				if (is_array($this->value)) {
+					$selected = selected(in_array($option, $this->value), true, false);
 				} else {
-					$selected = selected( $this->value, trim( strval( $option ) ), false );
+					$selected = selected($this->value, trim(strval($option)), false);
 				}
-				echo '<option value="' . $option . '" ' . $selected . '>' . esc_attr( $name ) . '</option>';
+				echo '<option value="'.$option.'" '.$selected.'>'.esc_attr($name).'</option>';
 			}
 
 			?>
@@ -124,8 +124,8 @@ 
 
 		echo $this->tooltip;
 
-		if ( ! empty( $this->description ) ) {
-			echo '<p class="description">' . wp_kses_post( $this->description ) . '</p>';
+		if ( ! empty($this->description)) {
+			echo '<p class="description">'.wp_kses_post($this->description).'</p>';
 		}
 
 	}

includes/abstracts/calendar.php

Indentation +2 added lines, -2 removed lines

@@ -784,8 +784,8 @@
 				if ( 'yes' == $poweredby ) {
 					$align = is_rtl() ? 'left' : 'right';
 					echo '<small class="simcal-powered simcal-align-' . $align .'">' .
-					     sprintf( __( 'Powered by <a href="%s" target="_blank">Simple Calendar</a>', 'google-calendar-events' ), simcal_get_url( 'home' ) ) .
-					     '</small>';
+						 sprintf( __( 'Powered by <a href="%s" target="_blank">Simple Calendar</a>', 'google-calendar-events' ), simcal_get_url( 'home' ) ) .
+						 '</small>';
 				}
 
 				echo '</div>';

Spacing +173 added lines, -173 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();
 						}
-					} 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,24 +444,24 @@ 
 	 *
 	 * @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 : '';
 		}
 
 		// TODO: Removed wpautop() call.
 
-		$event_formatting = get_post_meta( $this->id, '_event_formatting', true );
+		$event_formatting = get_post_meta($this->id, '_event_formatting', true);
 
-		switch( $event_formatting ) {
+		switch ($event_formatting) {
 			case 'none':
-				$this->events_template =  wp_kses_post( trim( $template ) );
+				$this->events_template = wp_kses_post(trim($template));
 				break;
 			case 'no_linebreaks':
-				$this->events_template =  wpautop( wp_kses_post( trim( $template ) ), false );
+				$this->events_template = wpautop(wp_kses_post(trim($template)), false);
 				break;
 			default:
-				$this->events_template =  wpautop( wp_kses_post( trim( $template ) ), true );
+				$this->events_template = wpautop(wp_kses_post(trim($template)), true);
 		}
 
 		//$this->events_template =  wpautop( wp_kses_post( trim( $template ) ), true );
@@ -474,37 +474,37 @@ 
 	 *
 	 * @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 ( $this->feed === 'grouped-calendars' ) {
+		if ($this->feed === 'grouped-calendars') {
 			$this->timezone = $site_tz;
 			return;
 		}
 
-		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);
 	}
 
 	/**
@@ -514,20 +514,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_option ) {
-				$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_option) {
+				$date_format_custom = esc_attr(get_post_meta($this->id, '_calendar_date_format_php', true));
 			}
 		}
 
@@ -541,20 +541,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_option ) {
-				$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_option) {
+				$time_format_custom = esc_attr(get_post_meta($this->id, '_calendar_time_format_php', true));
 			}
 		}
 
@@ -568,13 +568,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);
 	}
 
 	/**
@@ -584,18 +584,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;
 			}
 		}
 
@@ -609,51 +609,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', true ) ), 1 );
+		$calendar_begins = esc_attr(get_post_meta($this->id, '_calendar_begins', true));
+		$nth = max(absint(get_post_meta($this->id, '_calendar_begins_nth', true)), 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 ), $this->timezone )->setTimezone( $this->timezone )->startOfDay()->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), $this->timezone)->setTimezone($this->timezone)->startOfDay()->getTimestamp();
 			}
 		}
 	}
@@ -665,8 +665,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;
 	}
 
@@ -677,14 +677,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;
 		}
@@ -712,7 +712,7 @@ 
 	 *
 	 * @return Calendar_View
 	 */
-	abstract public function get_view( $view = '' );
+	abstract public function get_view($view = '');
 
 	/**
 	 * Get event HTML parsed by template.
@@ -724,11 +724,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);
 	}
 
 	/**
@@ -738,58 +738,58 @@ 
 	 *
 	 * @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 .'">' .
-					     sprintf( __( 'Powered by <a href="%s" target="_blank">Simple Calendar</a>', 'google-calendar-events' ), simcal_get_url( 'home' ) ) .
+					echo '<small class="simcal-powered simcal-align-'.$align.'">'.
+					     sprintf(__('Powered by <a href="%s" target="_blank">Simple Calendar</a>', 'google-calendar-events'), simcal_get_url('home')).
 					     '</small>';
 				}