moonstonemedia / Simple-Calendar

includes/admin/fields/checkbox.php

Spacing +21 added lines, -21 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Abstracts\Field;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit; // Exit if accessed directly.
 }
 
@@ -28,9 +28,9 @@ 
 	 *
 	 * @param array $field
 	 */
-	public function __construct( $field ) {
+	public function __construct($field) {
 		$this->type_class = 'simcal-field-checkboxes';
-		parent::__construct( $field );
+		parent::__construct($field);
 	}
 
 	/**
@@ -40,33 +40,33 @@ 
 	 */
 	public function html() {
 
-		if ( ! empty( $this->options ) && count( (array) $this->options ) > 1 ) {
+		if ( ! empty($this->options) && count((array) $this->options) > 1) {
 
-			if ( ! empty( $this->description ) ) {
-				echo '<p class="description">' . wp_kses_post( $this->description ) . ' ' . $this->tooltip . '</p>';
+			if ( ! empty($this->description)) {
+				echo '<p class="description">'.wp_kses_post($this->description).' '.$this->tooltip.'</p>';
 			}
 
 			?>
-			<fieldset class="<?php echo $this->class; ?>" <?php echo ! empty( $this->style ) ? 'style="' . $this->style . '"' : ''; ?>>
+			<fieldset class="<?php echo $this->class; ?>" <?php echo ! empty($this->style) ? 'style="'.$this->style.'"' : ''; ?>>
 				<?php
 
-				if ( ! empty( $this->title ) ) {
-					echo '<legend class="screen-reader-text"><span>' . $this->title . '</span></legend>';
+				if ( ! empty($this->title)) {
+					echo '<legend class="screen-reader-text"><span>'.$this->title.'</span></legend>';
 				}
 
 				?>
 				<ul>
-					<?php foreach ( $this->options as $option => $name ) : ?>
+					<?php foreach ($this->options as $option => $name) : ?>
 						<li>
-							<label for="<?php echo $this->id . '-' . trim( strval( $option ) ); ?>">
+							<label for="<?php echo $this->id.'-'.trim(strval($option)); ?>">
 								<input name="<?php echo $this->name; ?>"
-								       id="<?php echo $this->id . '-' . trim( strval( $option ) ); ?>"
+								       id="<?php echo $this->id.'-'.trim(strval($option)); ?>"
 								       class="simcal-field simcal-field-checkbox"
 								       type="checkbox"
-								       value="<?php echo trim( strval( $option ) ); ?>"
-										<?php checked( $this->value, 'yes', true ); ?>
+								       value="<?php echo trim(strval($option)); ?>"
+										<?php checked($this->value, 'yes', true); ?>
 									<?php echo $this->attributes; ?>
-									/><?php echo esc_attr( $name ); ?>
+									/><?php echo esc_attr($name); ?>
 							</label>
 						</li>
 					<?php endforeach; ?>
@@ -77,8 +77,8 @@ 
 		} else {
 
 			?>
-			<span class="simcal-field-bool" <?php echo $this->style ? 'style="' . $this->style . '"' : ''; ?>>
-				<?php if ( ! empty( $this->title ) ) : ?>
+			<span class="simcal-field-bool" <?php echo $this->style ? 'style="'.$this->style.'"' : ''; ?>>
+				<?php if ( ! empty($this->title)) : ?>
 					<span class="screen-reader-text"><?php echo $this->title; ?></span>
 				<?php endif; ?>
 				<input name="<?php echo $this->name; ?>"
@@ -86,15 +86,15 @@ 
 				       id="<?php echo $this->id; ?>"
 				       class="simcal-field simcal-field-checkbox <?php echo $this->class; ?>"
 				       value="yes"
-					<?php checked( $this->value, 'yes', true ); ?>
-					<?php echo $this->attributes; ?>/><?php _e( 'Yes', 'google-calendar-events' ); ?>
+					<?php checked($this->value, 'yes', true); ?>
+					<?php echo $this->attributes; ?>/><?php _e('Yes', 'google-calendar-events'); ?>
 			</span>
 			<?php
 
 			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/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/functions/shared.php

Spacing +107 added lines, -107 removed lines

@@ -7,7 +7,7 @@ 
  * @package SimpleCalendar/Functions
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -20,17 +20,17 @@ 
  */
 function is_simple_calendar() {
 
-	if ( is_singular() ) {
+	if (is_singular()) {
 
 		global $post, $post_type;
 
-		if ( 'calendar' == $post_type ) {
+		if ('calendar' == $post_type) {
 			return true;
 		} else {
-			if ( false !== get_post_meta( $post->ID, '_simcal_attach_calendar_id', true ) ) {
+			if (false !== get_post_meta($post->ID, '_simcal_attach_calendar_id', true)) {
 				return true;
 			}
-			if ( has_shortcode( $post->post_content, 'calendar' ) ) {
+			if (has_shortcode($post->post_content, 'calendar')) {
 				return true;
 			}
 		}
@@ -46,8 +46,8 @@ 
  *
  * @return string
  */
-function simcal_get_url( $url ) {
-	return \SimpleCalendar\plugin()->get_url( $url );
+function simcal_get_url($url) {
+	return \SimpleCalendar\plugin()->get_url($url);
 }
 
 /**
@@ -71,9 +71,9 @@ 
  *
  * @return null|\SimpleCalendar\Abstracts\Feed
  */
-function simcal_get_feed( $object ) {
+function simcal_get_feed($object) {
 	$objects = \SimpleCalendar\plugin()->objects;
-	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_feed( $object ) : null;
+	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_feed($object) : null;
 }
 
 /**
@@ -97,9 +97,9 @@ 
  *
  * @return null|\SimpleCalendar\Abstracts\Calendar
  */
-function simcal_get_calendar( $object ) {
+function simcal_get_calendar($object) {
 	$objects = \SimpleCalendar\plugin()->objects;
-	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_calendar( $object ) : null;
+	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_calendar($object) : null;
 }
 
 /**
@@ -112,9 +112,9 @@ 
  *
  * @return mixed
  */
-function simcal_get_calendar_view( $id = 0, $name = '' ) {
+function simcal_get_calendar_view($id = 0, $name = '') {
 	$objects = \SimpleCalendar\plugin()->objects;
-	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_calendar_view( $id, $name ) : false;
+	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_calendar_view($id, $name) : false;
 }
 
 /**
@@ -126,11 +126,11 @@ 
  *
  * @return void
  */
-function simcal_print_calendar( $object ) {
+function simcal_print_calendar($object) {
 
-	$calendar = simcal_get_calendar( $object );
+	$calendar = simcal_get_calendar($object);
 
-	if ( $calendar instanceof \SimpleCalendar\Abstracts\Calendar ) {
+	if ($calendar instanceof \SimpleCalendar\Abstracts\Calendar) {
 		$calendar->html();
 	}
 }
@@ -148,21 +148,21 @@ 
 
 	$vars = array(
 		'ajax_url'  => \SimpleCalendar\plugin()->ajax_url(),
-		'nonce'     => wp_create_nonce( 'simcal' ),
+		'nonce'     => wp_create_nonce('simcal'),
 		'locale'    => \SimpleCalendar\plugin()->locale,
 		'text_dir'  => is_rtl() ? 'rtl' : 'ltr',
 		'months'    => array(
-			'full'  => simcal_get_calendar_names_i18n( 'month', 'full' ),
-			'short' => simcal_get_calendar_names_i18n( 'month', 'short' ),
+			'full'  => simcal_get_calendar_names_i18n('month', 'full'),
+			'short' => simcal_get_calendar_names_i18n('month', 'short'),
 		),
 		'days'      => array(
-			'full'  => simcal_get_calendar_names_i18n( 'day', 'full' ),
-			'short' => simcal_get_calendar_names_i18n( 'day', 'short' ),
+			'full'  => simcal_get_calendar_names_i18n('day', 'full'),
+			'short' => simcal_get_calendar_names_i18n('day', 'short'),
 		),
-		'meridiem' => simcal_get_calendar_names_i18n( 'meridiem' ),
+		'meridiem' => simcal_get_calendar_names_i18n('meridiem'),
 	);
 
-	return array_merge( $vars, apply_filters( 'simcal_common_scripts_variables', array() ) );
+	return array_merge($vars, apply_filters('simcal_common_scripts_variables', array()));
 }
 
 /**
@@ -175,31 +175,31 @@ 
  *
  * @return array Associative array with ids as keys and feed titles as values.
  */
-function simcal_get_calendars( $exclude = '', $cached = true ) {
+function simcal_get_calendars($exclude = '', $cached = true) {
 
-	$calendars = get_transient( '_simple-calendar_feed_ids' );
+	$calendars = get_transient('_simple-calendar_feed_ids');
 
-	if ( ! $calendars || $cached === false ) {
+	if ( ! $calendars || $cached === false) {
 
-		$posts = get_posts( array(
+		$posts = get_posts(array(
 			'post_type' => 'calendar',
 			'nopaging'  => true,
-		) );
+		));
 
 		$calendars = array();
-		foreach ( $posts as $post ) {
-			$calendars[ $post->ID ] = $post->post_title;
+		foreach ($posts as $post) {
+			$calendars[$post->ID] = $post->post_title;
 		}
-		asort( $calendars );
+		asort($calendars);
 
-		set_transient( '_simple-calendar_feed_ids', $calendars, 604800 );
+		set_transient('_simple-calendar_feed_ids', $calendars, 604800);
 	}
 
-	if ( ! empty( $exclude ) ) {
-		if ( is_numeric( $exclude ) ) {
-			unset( $calendars[ intval( $exclude ) ] );
-		} elseif ( is_array( $exclude ) ) {
-			array_diff_key( $calendars, array_map( 'intval', array_keys( $exclude ) ) );
+	if ( ! empty($exclude)) {
+		if (is_numeric($exclude)) {
+			unset($calendars[intval($exclude)]);
+		} elseif (is_array($exclude)) {
+			array_diff_key($calendars, array_map('intval', array_keys($exclude)));
 		}
 	}
 
@@ -218,45 +218,45 @@ 
  *
  * @return array
  */
-function simcal_get_calendar_names_i18n( $group, $style = 'full' ) {
+function simcal_get_calendar_names_i18n($group, $style = 'full') {
 
 	$names = array();
 
-	if ( in_array( $group, array( 'month', 'day', 'meridiem' ) ) ) {
+	if (in_array($group, array('month', 'day', 'meridiem'))) {
 
 		$format = '';
 		$length = 0;
 
 		$date = Carbon\Carbon::now();
 
-		if ( 'month' == $group ) {
-			$date->month( 0 )->startOfMonth();
+		if ('month' == $group) {
+			$date->month(0)->startOfMonth();
 			$format = 'short' == $style ? 'M' : 'F';
 			$length = 11;
-		} elseif ( 'day' == $group ) {
-			$date->next( 6 );
+		} elseif ('day' == $group) {
+			$date->next(6);
 			$format = 'short' == $style ? 'D' : 'l';
 			$length = 6;
-		} elseif ( 'meridiem' == $group ) {
+		} elseif ('meridiem' == $group) {
 			$date->startOfDay();
-			$am = $date->addHour( 1 )->getTimestamp();
-			$pm = $date->addHours( 13 )->getTimestamp();
+			$am = $date->addHour(1)->getTimestamp();
+			$pm = $date->addHours(13)->getTimestamp();
 			return array(
-				'AM' => date_i18n( 'A', $am ),
-				'am' => date_i18n( 'a', $am ),
-				'PM' => date_i18n( 'A', $pm ),
-				'pm' => date_i18n( 'a', $pm ),
+				'AM' => date_i18n('A', $am),
+				'am' => date_i18n('a', $am),
+				'PM' => date_i18n('A', $pm),
+				'pm' => date_i18n('a', $pm),
 			);
 		}
 
 		$i = 0;
-		while ( $i <= $length ) {
-			if ( 'month' == $group ) {
-				$date->addMonths( 1 );
+		while ($i <= $length) {
+			if ('month' == $group) {
+				$date->addMonths(1);
 			} else {
-				$date->addDays( 1 );
+				$date->addDays(1);
 			}
-			$names[ strval( $i ) ] = date_i18n( $format, $date->getTimestamp() );
+			$names[strval($i)] = date_i18n($format, $date->getTimestamp());
 			$i++;
 		}
 
@@ -274,15 +274,15 @@ 
  */
 function simcal_default_event_template() {
 
-	$content  = '<strong>' . '[title]' . '</strong>';
+	$content  = '<strong>'.'[title]'.'</strong>';
 	$content .= '<p>';
-	$content .= '[when]' . "\n";
+	$content .= '[when]'."\n";
 	$content .= '[location]';
 	$content .= '</p>';
-	$content .= '<div>' . '[description]' . '</div>';
-	$content .= '<p>' . '[link newwindow="yes"]' . __( 'See more details', 'google-calendar-events' ) . '[/link]' . '</p>';
+	$content .= '<div>'.'[description]'.'</div>';
+	$content .= '<p>'.'[link newwindow="yes"]'.__('See more details', 'google-calendar-events').'[/link]'.'</p>';
 
-	return apply_filters( 'simcal_default_event_template', $content );
+	return apply_filters('simcal_default_event_template', $content);
 }
 
 /**
@@ -297,21 +297,21 @@ 
  *
  * @return array
  */
-function simcal_get_date_format_order( $date_format ) {
+function simcal_get_date_format_order($date_format) {
 
 	$pos = array(
-		'd' => strpos( $date_format, strpbrk( $date_format, 'Dj' ) ),
-		'm' => strpos( $date_format, strpbrk( $date_format, 'FMmn' ) ),
-		'y' => strpos( $date_format, strpbrk( $date_format, 'Yy' ) ),
+		'd' => strpos($date_format, strpbrk($date_format, 'Dj')),
+		'm' => strpos($date_format, strpbrk($date_format, 'FMmn')),
+		'y' => strpos($date_format, strpbrk($date_format, 'Yy')),
 	);
 
 	// @TODO When one date piece is not found, perhaps fallback to ISO standard position.
 
 	$order = array();
-	foreach ( $pos as $k => $v ) {
-		$order[ $k ] = $v;
+	foreach ($pos as $k => $v) {
+		$order[$k] = $v;
 	}
-	ksort( $order );
+	ksort($order);
 
 	return $order;
 }
@@ -327,11 +327,11 @@ 
  */
 function simcal_get_wp_timezone() {
 
-	$timezone = get_option( 'timezone_string' );
+	$timezone = get_option('timezone_string');
 
-	if ( empty( $timezone ) ) {
-		$gmt = get_option( 'gmt_offset' );
-		$timezone = simcal_get_timezone_from_gmt_offset( $gmt );
+	if (empty($timezone)) {
+		$gmt = get_option('gmt_offset');
+		$timezone = simcal_get_timezone_from_gmt_offset($gmt);
 	}
 
 	return $timezone;
@@ -348,26 +348,26 @@ 
  *
  * @return null|string
  */
-function simcal_get_timezone_from_gmt_offset( $offset ) {
+function simcal_get_timezone_from_gmt_offset($offset) {
 
-	if ( is_numeric( $offset ) ) {
+	if (is_numeric($offset)) {
 
-		if ( 0 === intval( $offset ) ) {
+		if (0 === intval($offset)) {
 			return 'UTC';
 		} else {
-			$offset = floatval( $offset ) * 3600;
+			$offset = floatval($offset) * 3600;
 		}
 
-		$timezone = timezone_name_from_abbr( null, $offset, false );
+		$timezone = timezone_name_from_abbr(null, $offset, false);
 		// This is buggy and might return false:
 		// @see http://php.net/manual/en/function.timezone-name-from-abbr.php#86928
 		// Therefore:
-		if ( false == $timezone ) {
+		if (false == $timezone) {
 
 			$list = timezone_abbreviations_list();
-			foreach ( $list as $abbr ) {
-				foreach ( $abbr as $city ) {
-					if ( $offset == $city['offset'] ) {
+			foreach ($list as $abbr) {
+				foreach ($abbr as $city) {
+					if ($offset == $city['offset']) {
 						return $city['timezone_id'];
 					}
 				}
@@ -390,8 +390,8 @@ 
  *
  * @return int Unix time offset
  */
-function simcal_get_timezone_offset( $timezone ) {
-	return \Carbon\Carbon::now( $timezone )->offset;
+function simcal_get_timezone_offset($timezone) {
+	return \Carbon\Carbon::now($timezone)->offset;
 }
 
 /**
@@ -404,8 +404,8 @@ 
  *
  * @return mixed|string
  */
-function simcal_esc_timezone( $tz, $default = 'UTC' ) {
-	return in_array( $tz, timezone_identifiers_list() ) ? $tz : $default;
+function simcal_esc_timezone($tz, $default = 'UTC') {
+	return in_array($tz, timezone_identifiers_list()) ? $tz : $default;
 }
 
 /**
@@ -417,57 +417,57 @@ 
  *
  * @return bool
  */
-function simcal_delete_feed_transients( $id = '' ) {
+function simcal_delete_feed_transients($id = '') {
 
-	$grouped_ids = get_post_meta( $id, '_grouped_calendars_ids', true );
+	$grouped_ids = get_post_meta($id, '_grouped_calendars_ids', true);
 
 	// If there are group IDs we need to construct an array to pass along with the grouped IDs + the original $post_id
-	if ( is_array( $grouped_ids ) ) {
+	if (is_array($grouped_ids)) {
 		$temp_id = $id;
 		$id = $grouped_ids;
 		$id[] = $temp_id;
 	}
 
-	if ( is_numeric( $id ) ) {
-		$id = intval( $id ) > 0 ? absint( $id ) : simcal_get_calendars();
-	} elseif ( $id instanceof WP_Post ) {
+	if (is_numeric($id)) {
+		$id = intval($id) > 0 ? absint($id) : simcal_get_calendars();
+	} elseif ($id instanceof WP_Post) {
 		$id = $id->ID;
-	} elseif ( is_array( $id ) ) {
-		$id = array_map( 'absint', $id );
+	} elseif (is_array($id)) {
+		$id = array_map('absint', $id);
 	} else {
-		$id = simcal_get_calendars( '', true );
+		$id = simcal_get_calendars('', true);
 	}
 
 	$feed_types = simcal_get_feed_types();
 
-	if ( is_array( $id ) ) {
+	if (is_array($id)) {
 
-		$posts = get_posts( array(
+		$posts = get_posts(array(
 				'post_type' => 'calendar',
 				'fields'    => 'ids',
 				'post__in'  => $id,
 				'nopaging'  => true,
-		) );
+		));
 
-		foreach ( $posts as $post ) {
-			$calendar = simcal_get_calendar( $post );
-			if ( $calendar instanceof \SimpleCalendar\Abstracts\Calendar ) {
-				foreach ( $feed_types as $feed_type ) {
-					delete_transient( '_simple-calendar_feed_id_' . strval( $calendar->id ) . '_' . $feed_type );
+		foreach ($posts as $post) {
+			$calendar = simcal_get_calendar($post);
+			if ($calendar instanceof \SimpleCalendar\Abstracts\Calendar) {
+				foreach ($feed_types as $feed_type) {
+					delete_transient('_simple-calendar_feed_id_'.strval($calendar->id).'_'.$feed_type);
 				}
 			}
 		}
 
 	} else {
 
-		$post = get_post( $id );
-		$calendar = simcal_get_calendar( $post );
-		if ( $calendar instanceof \SimpleCalendar\Abstracts\Calendar ) {
-			foreach ( $feed_types as $feed_type ) {
-				delete_transient( '_simple-calendar_feed_id_' . strval( $calendar->id ) . '_' . $feed_type );
+		$post = get_post($id);
+		$calendar = simcal_get_calendar($post);
+		if ($calendar instanceof \SimpleCalendar\Abstracts\Calendar) {
+			foreach ($feed_types as $feed_type) {
+				delete_transient('_simple-calendar_feed_id_'.strval($calendar->id).'_'.$feed_type);
 			}
 		}
 	}
 
-	return delete_transient( '_simple-calendar_feed_ids' );
+	return delete_transient('_simple-calendar_feed_ids');
 }
\ No newline at end of file

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

Spacing +46 added lines, -46 removed lines

@@ -6,7 +6,7 @@ 
  */
 namespace SimpleCalendar\Admin;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,19 +25,19 @@ 
 	public function __construct() {
 
 		// Set an option if the user rated the plugin.
-		add_action( 'wp_ajax_simcal_rated', array( $this, 'rate_plugin' ) );
+		add_action('wp_ajax_simcal_rated', array($this, 'rate_plugin'));
 
 		// Set an option if the user rated the plugin.
-		add_action( 'wp_ajax_simcal_clear_cache', array( $this, 'clear_cache' ) );
+		add_action('wp_ajax_simcal_clear_cache', array($this, 'clear_cache'));
 
 		// Convert a datetime format.
-		add_action( 'wp_ajax_simcal_date_i18n_input_preview', array( $this, 'date_i18n' ) );
+		add_action('wp_ajax_simcal_date_i18n_input_preview', array($this, 'date_i18n'));
 
 		// Manage an add-on license activation or deactivation.
-		add_action( 'wp_ajax_simcal_manage_add_on_license', array( $this, 'manage_add_on_license' ) );
+		add_action('wp_ajax_simcal_manage_add_on_license', array($this, 'manage_add_on_license'));
 
 		// Reset add-ons licenses.
-		add_action( 'wp_ajax_simcal_reset_add_ons_licenses', array( $this, 'reset_licenses' ) );
+		add_action('wp_ajax_simcal_reset_add_ons_licenses', array($this, 'reset_licenses'));
 
 	}
 
@@ -48,10 +48,10 @@ 
 	 */
 	public function clear_cache() {
 
-		$id = isset( $_POST['id'] ) ? ( is_array( $_POST['id'] ) ? array_map( 'intval', $_POST['id'] ) : intval( $_POST['id'] ) ) : '';
+		$id = isset($_POST['id']) ? (is_array($_POST['id']) ? array_map('intval', $_POST['id']) : intval($_POST['id'])) : '';
 
-		if ( ! empty( $id ) ) {
-			simcal_delete_feed_transients( $id );
+		if ( ! empty($id)) {
+			simcal_delete_feed_transients($id);
 		}
 	}
 
@@ -61,7 +61,7 @@ 
 	 * @since 3.0.0
 	 */
 	public function rate_plugin() {
-		update_option( 'simple-calendar_admin_footer_text_rated', date( 'Y-m-d', time() ) );
+		update_option('simple-calendar_admin_footer_text_rated', date('Y-m-d', time()));
 	}
 
 	/**
@@ -71,10 +71,10 @@ 
 	 */
 	public function date_i18n() {
 
-		$value     = isset( $_POST['value'] ) ? esc_attr( $_POST['value'] ) : ' ';
-		$timestamp = isset( $_POST['timestamp'] ) ? absint( $_POST['timestamp'] ) : time();
+		$value     = isset($_POST['value']) ? esc_attr($_POST['value']) : ' ';
+		$timestamp = isset($_POST['timestamp']) ? absint($_POST['timestamp']) : time();
 
-		wp_send_json_success( date_i18n( $value, $timestamp ) );
+		wp_send_json_success(date_i18n($value, $timestamp));
 	}
 
 	/**
@@ -86,35 +86,35 @@ 
 	 */
 	public function manage_add_on_license() {
 
-		$addon  = isset( $_POST['add_on'] )         ? sanitize_key( $_POST['add_on'] ) : false;
-		$action = isset( $_POST['license_action'] ) ? esc_attr( $_POST['license_action'] ) : false;
-		$key    = isset( $_POST['license_key'] )    ? esc_attr( $_POST['license_key'] ) : '';
-		$nonce  = isset( $_POST['nonce'] )          ? esc_attr( $_POST['nonce'] ) : '';
+		$addon  = isset($_POST['add_on']) ? sanitize_key($_POST['add_on']) : false;
+		$action = isset($_POST['license_action']) ? esc_attr($_POST['license_action']) : false;
+		$key    = isset($_POST['license_key']) ? esc_attr($_POST['license_key']) : '';
+		$nonce  = isset($_POST['nonce']) ? esc_attr($_POST['nonce']) : '';
 
 		// Verify that there are valid variables to process.
-		if ( false === $addon || ! in_array( $action, array( 'activate_license', 'deactivate_license' ) ) ) {
-			wp_send_json_error( __( 'Add-on unspecified or invalid action.', 'google-calendar-events' ) );
+		if (false === $addon || ! in_array($action, array('activate_license', 'deactivate_license'))) {
+			wp_send_json_error(__('Add-on unspecified or invalid action.', 'google-calendar-events'));
 		}
 
 		// Verify this request comes from the add-ons licenses activation settings page.
-		if ( ! wp_verify_nonce( $nonce, 'simcal_license_manager' ) ) {
-			wp_send_json_error( sprintf( __( 'An error occurred: %s', 'google-calendar-events' ), 'Nonce verification failed.' ) );
+		if ( ! wp_verify_nonce($nonce, 'simcal_license_manager')) {
+			wp_send_json_error(sprintf(__('An error occurred: %s', 'google-calendar-events'), 'Nonce verification failed.'));
 		}
 
 		// Removes the prefix and converts simcal_{id_no} to {id_no}.
-		$id = intval( substr( $addon, 7 ) );
+		$id = intval(substr($addon, 7));
 
 		// Data to send in API request.
 		$api_request = array(
 			'edd_action' => $action,
 			'license'    => $key,
-			'item_id'    => urlencode( $id ),
+			'item_id'    => urlencode($id),
 			'url'        => home_url()
 		);
 
 		// Call the custom API.
 		$response = wp_remote_post(
-			defined( 'SIMPLE_CALENDAR_STORE_URL' ) ? SIMPLE_CALENDAR_STORE_URL : simcal_get_url( 'home' ),
+			defined('SIMPLE_CALENDAR_STORE_URL') ? SIMPLE_CALENDAR_STORE_URL : simcal_get_url('home'),
 			array(
 				'timeout' => 15,
 				'sslverify' => false,
@@ -123,29 +123,29 @@ 
 		);
 
 		// Update license in db.
-		$keys = get_option( 'simple-calendar_settings_licenses', array() );
-		$new_keys = array_merge( (array) $keys, array( 'keys' => array( $addon => $key ) ) );
-		update_option( 'simple-calendar_settings_licenses', $new_keys );
+		$keys = get_option('simple-calendar_settings_licenses', array());
+		$new_keys = array_merge((array) $keys, array('keys' => array($addon => $key)));
+		update_option('simple-calendar_settings_licenses', $new_keys);
 
 		// Make sure there is a response.
-		if ( is_wp_error( $response ) ) {
-			wp_send_json_error( sprintf( __( 'There was an error processing your request: %s', 'google-calendar-events' ), $response->get_error_message() ) );
+		if (is_wp_error($response)) {
+			wp_send_json_error(sprintf(__('There was an error processing your request: %s', 'google-calendar-events'), $response->get_error_message()));
 		}
 
 		// Decode the license data and save.
-		$license_data = json_decode( wp_remote_retrieve_body( $response ) );
+		$license_data = json_decode(wp_remote_retrieve_body($response));
 		$status = simcal_get_license_status();
-		if ( 'deactivated' == $license_data->license  ) {
-			unset( $status[ $addon ] );
-			update_option( 'simple-calendar_licenses_status', $status );
-			wp_send_json_success( $license_data->license );
- 		} elseif ( in_array( $license_data->license, array( 'valid', 'invalid' ) ) ) {
-			$status[ $addon ] = $license_data->license;
-			update_option( 'simple-calendar_licenses_status', $status );
-			$message = 'valid' == $license_data->license ? 'valid' : __( 'License key is invalid.', 'google-calendar-events' );
-			wp_send_json_success( $message );
+		if ('deactivated' == $license_data->license) {
+			unset($status[$addon]);
+			update_option('simple-calendar_licenses_status', $status);
+			wp_send_json_success($license_data->license);
+ 		} elseif (in_array($license_data->license, array('valid', 'invalid'))) {
+			$status[$addon] = $license_data->license;
+			update_option('simple-calendar_licenses_status', $status);
+			$message = 'valid' == $license_data->license ? 'valid' : __('License key is invalid.', 'google-calendar-events');
+			wp_send_json_success($message);
 		} else {
-			wp_send_json_error( '' );
+			wp_send_json_error('');
 		}
 	}
 
@@ -156,17 +156,17 @@ 
 	 */
 	public function reset_licenses() {
 
-		$nonce  = isset( $_POST['nonce'] ) ? esc_attr( $_POST['nonce'] ) : '';
+		$nonce = isset($_POST['nonce']) ? esc_attr($_POST['nonce']) : '';
 
 		// Verify this request comes from the add-ons licenses activation settings page.
-		if ( empty ( $nonce ) || ! wp_verify_nonce( $nonce, 'simcal_license_manager' ) ) {
-			wp_send_json_error( sprintf( __( 'An error occurred: %s', 'google-calendar-events' ), 'Nonce verification failed.' ) );
+		if (empty ($nonce) || ! wp_verify_nonce($nonce, 'simcal_license_manager')) {
+			wp_send_json_error(sprintf(__('An error occurred: %s', 'google-calendar-events'), 'Nonce verification failed.'));
 		}
 
-		delete_option( 'simple-calendar_settings_licenses' );
-		delete_option( 'simple-calendar_licenses_status' );
+		delete_option('simple-calendar_settings_licenses');
+		delete_option('simple-calendar_licenses_status');
 
-		wp_send_json_success( 'success' );
+		wp_send_json_success('success');
 	}
 
 }

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

google-calendar-events.php

Spacing +12 added lines, -12 removed lines

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

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 +112 added lines, -112 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,12 +76,12 @@ 
 	 *
 	 * @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">
 
@@ -89,46 +89,46 @@ 
 				<th></th>
 				<td>
 					<p class="description">
-						<?php _e( "Tip: If calendar styles appear to be missing and/or navigation isn't working, try going to", 'google-calendar-events' ); ?>
-						<a href="<?php echo esc_url( add_query_arg( array ( 'page' => 'simple-calendar_settings', 'tab' => 'advanced' ), admin_url( 'admin.php' ) ) ); ?>">
-							<?php _e( 'Calendars &rarr; Settings &rarr; Advanced', 'google-calendar-events' ); ?></a>
-						<?php _e( 'and enable', 'google-calendar-events' ); ?> <strong><?php _e( 'Always Enqueue', 'google-calendar-events' ); ?></strong>.
+						<?php _e("Tip: If calendar styles appear to be missing and/or navigation isn't working, try going to", 'google-calendar-events'); ?>
+						<a href="<?php echo esc_url(add_query_arg(array('page' => 'simple-calendar_settings', 'tab' => 'advanced'), admin_url('admin.php'))); ?>">
+							<?php _e('Calendars &rarr; Settings &rarr; Advanced', 'google-calendar-events'); ?></a>
+						<?php _e('and enable', 'google-calendar-events'); ?> <strong><?php _e('Always Enqueue', 'google-calendar-events'); ?></strong>.
 					</p>
 				</td>
 			</tr>
 			
 			<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',
@@ -139,34 +139,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',
@@ -175,78 +175,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',
@@ -257,17 +257,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',
 						),
@@ -275,39 +275,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>
@@ -315,70 +315,70 @@ 
 			</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,
-					) );
+					));
 
 					?>
 				</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,
-					) );
+					));
 
 					?>
 				</td>
@@ -400,55 +400,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);
 
 	}