moonstonemedia / Simple-Calendar

includes/admin/welcome.php

Spacing +69 added lines, -69 removed lines

@@ -8,7 +8,7 @@ 
  */
 namespace SimpleCalendar\Admin;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -36,10 +36,10 @@ 
 	 */
 	public function __construct() {
 
-		$this->install = isset( $_GET['simcal_install'] ) ? esc_attr( $_GET['simcal_install'] ) : '';
+		$this->install = isset($_GET['simcal_install']) ? esc_attr($_GET['simcal_install']) : '';
 
-		add_action( 'admin_menu', array( $this, 'welcome_page_tabs' ) );
-		add_action( 'admin_head', array( $this, 'remove_submenu_pages' ) );
+		add_action('admin_menu', array($this, 'welcome_page_tabs'));
+		add_action('admin_head', array($this, 'remove_submenu_pages'));
 	}
 
 	/**
@@ -49,12 +49,12 @@ 
 	 */
 	public function welcome_page_tabs() {
 
-		$welcome_page_name  = __( 'About Simple Calendar', 'google-calendar-events' );
-		$welcome_page_title = __( 'Welcome to Simple Calendar', 'google-calendar-events' );
+		$welcome_page_name  = __('About Simple Calendar', 'google-calendar-events');
+		$welcome_page_title = __('Welcome to Simple Calendar', 'google-calendar-events');
 
-		$page = isset( $_GET['page'] ) ? $_GET['page'] : 'simple-calendar_about';
+		$page = isset($_GET['page']) ? $_GET['page'] : 'simple-calendar_about';
 
-		switch ( $page ) {
+		switch ($page) {
 
 			case 'simple-calendar_about' :
 				$page = add_dashboard_page(
@@ -62,9 +62,9 @@ 
 					$welcome_page_name,
 					'manage_options',
 					'simple-calendar_about',
-					array( $this, 'about_screen' )
+					array($this, 'about_screen')
 				);
-				add_action( 'admin_print_styles-' . $page, array( $this, 'styles' ) );
+				add_action('admin_print_styles-'.$page, array($this, 'styles'));
 				break;
 
 			case 'simple-calendar_credits' :
@@ -73,9 +73,9 @@ 
 					$welcome_page_name,
 					'manage_options',
 					'simple-calendar_credits',
-					array( $this, 'credits_screen' )
+					array($this, 'credits_screen')
 				);
-				add_action( 'admin_print_styles-' . $page, array( $this, 'styles' ) );
+				add_action('admin_print_styles-'.$page, array($this, 'styles'));
 				break;
 
 			case 'simple-calendar_translators' :
@@ -84,9 +84,9 @@ 
 					$welcome_page_name,
 					'manage_options',
 					'simple-calendar_translators',
-					array( $this, 'translators_screen' )
+					array($this, 'translators_screen')
 				);
-				add_action( 'admin_print_styles-' . $page, array( $this, 'styles' ) );
+				add_action('admin_print_styles-'.$page, array($this, 'styles'));
 				break;
 		}
 
@@ -98,9 +98,9 @@ 
 	 * @since 3.0.0
 	 */
 	public function remove_submenu_pages() {
-		remove_submenu_page( 'index.php', 'simple-calendar_about' );
-		remove_submenu_page( 'index.php', 'simple-calendar_credits' );
-		remove_submenu_page( 'index.php', 'simple-calendar_translators' );
+		remove_submenu_page('index.php', 'simple-calendar_about');
+		remove_submenu_page('index.php', 'simple-calendar_credits');
+		remove_submenu_page('index.php', 'simple-calendar_translators');
 	}
 
 	/**
@@ -129,18 +129,18 @@ 
 
 		?>
 		<p>
-			<a href="<?php echo admin_url( 'edit.php?post_type=calendar' ); ?>"
+			<a href="<?php echo admin_url('edit.php?post_type=calendar'); ?>"
 			   class="button button-primary"
-				><?php _e( 'Calendars', 'google-calendar-events' ); ?></a>
-			<a href="<?php echo esc_url( add_query_arg( 'page', 'simple-calendar_settings', admin_url( 'admin.php' ) ) ); ?>"
+				><?php _e('Calendars', 'google-calendar-events'); ?></a>
+			<a href="<?php echo esc_url(add_query_arg('page', 'simple-calendar_settings', admin_url('admin.php'))); ?>"
 			   class="button button-primary"
-				><?php _e( 'Settings', 'google-calendar-events' ); ?></a>
-			<a href="<?php echo simcal_ga_campaign_url( simcal_get_url( 'add-ons' ), 'core-plugin', 'welcome-page' ); ?>"
+				><?php _e('Settings', 'google-calendar-events'); ?></a>
+			<a href="<?php echo simcal_ga_campaign_url(simcal_get_url('add-ons'), 'core-plugin', 'welcome-page'); ?>"
 			   class="docs button button-primary" target="_blank"
-				><?php _e( 'Add-ons', 'google-calendar-events' ); ?></a>
-			<a href="<?php echo simcal_ga_campaign_url( simcal_get_url( 'docs' ), 'core-plugin', 'welcome-page' ); ?>"
+				><?php _e('Add-ons', 'google-calendar-events'); ?></a>
+			<a href="<?php echo simcal_ga_campaign_url(simcal_get_url('docs'), 'core-plugin', 'welcome-page'); ?>"
 			   class="docs button button-primary" target="_blank"
-				><?php _e( 'Documentation', 'google-calendar-events' ); ?></a>
+				><?php _e('Documentation', 'google-calendar-events'); ?></a>
 		</p>
 		<?php
 
@@ -157,7 +157,7 @@ 
 		<h1>
 			<?php
 			/* translators: %s prints the current version of the plugin. */
-			printf( __( 'Welcome to Simple Calendar %s', 'google-calendar-events' ), SIMPLE_CALENDAR_VERSION );
+			printf(__('Welcome to Simple Calendar %s', 'google-calendar-events'), SIMPLE_CALENDAR_VERSION);
 			?>
 		</h1>
 
@@ -165,16 +165,16 @@ 
 			<?php
 
 			// Difference message if updating vs fresh install.
-			if ( 'update' == $this->install ) {
-				$message = __( 'Thanks for updating to the latest version!', 'google-calendar-events' );
+			if ('update' == $this->install) {
+				$message = __('Thanks for updating to the latest version!', 'google-calendar-events');
 			} else {
-				$message = __( 'Thanks for installing!', 'google-calendar-events' );
+				$message = __('Thanks for installing!', 'google-calendar-events');
 			}
 
 			echo $message;
 
 			/* translators: %s prints the current version of the plugin. */
-			printf( ' ' . __( "Simple Calendar %s has many new display options and is much easier to configure. We think you'll really enjoy using it.", 'google-calendar-events' ), SIMPLE_CALENDAR_VERSION );
+			printf(' '.__("Simple Calendar %s has many new display options and is much easier to configure. We think you'll really enjoy using it.", 'google-calendar-events'), SIMPLE_CALENDAR_VERSION);
 
 			?>
 		</div>
@@ -184,21 +184,21 @@ 
 		<?php $this->main_nav_links(); ?>
 
 		<h2 class="nav-tab-wrapper">
-			<a class="nav-tab <?php if ( $_GET['page'] == 'simple-calendar_about' ) {
+			<a class="nav-tab <?php if ($_GET['page'] == 'simple-calendar_about') {
 				echo 'nav-tab-active';
 			} ?>"
-			   href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'simple-calendar_about' ), 'index.php' ) ) ); ?>"
-				><?php _e( "What's New", 'google-calendar-events' ); ?></a>
-			<a class="nav-tab <?php if ( $_GET['page'] == 'simple-calendar_credits' ) {
+			   href="<?php echo esc_url(admin_url(add_query_arg(array('page' => 'simple-calendar_about'), 'index.php'))); ?>"
+				><?php _e("What's New", 'google-calendar-events'); ?></a>
+			<a class="nav-tab <?php if ($_GET['page'] == 'simple-calendar_credits') {
 				echo 'nav-tab-active';
 			} ?>"
-			   href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'simple-calendar_credits' ), 'index.php' ) ) ); ?>"
-				><?php _e( 'Credits', 'google-calendar-events' ); ?></a>
-			<a class="nav-tab <?php if ( $_GET['page'] == 'simple-calendar_translators' ) {
+			   href="<?php echo esc_url(admin_url(add_query_arg(array('page' => 'simple-calendar_credits'), 'index.php'))); ?>"
+				><?php _e('Credits', 'google-calendar-events'); ?></a>
+			<a class="nav-tab <?php if ($_GET['page'] == 'simple-calendar_translators') {
 				echo 'nav-tab-active';
 			} ?>"
-			   href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'simple-calendar_translators' ), 'index.php' ) ) ); ?>"
-				><?php _e( 'Translators', 'google-calendar-events' ); ?></a>
+			   href="<?php echo esc_url(admin_url(add_query_arg(array('page' => 'simple-calendar_translators'), 'index.php'))); ?>"
+				><?php _e('Translators', 'google-calendar-events'); ?></a>
 		</h2>
 		<?php
 
@@ -210,8 +210,8 @@ 
 	 * @since 3.0.0
 	 */
 	public function about_screen() {
-		$welcome_image_about_path = SIMPLE_CALENDAR_ASSETS . '/images/welcome';
-		$welcome_gcal_pro_link = simcal_ga_campaign_url( simcal_get_url( 'gcal-pro' ), 'core-plugin', 'welcome-page' );
+		$welcome_image_about_path = SIMPLE_CALENDAR_ASSETS.'/images/welcome';
+		$welcome_gcal_pro_link = simcal_ga_campaign_url(simcal_get_url('gcal-pro'), 'core-plugin', 'welcome-page');
 
 		?>
 		<div id="simcal-welcome">
@@ -219,18 +219,18 @@ 
 
 				<?php $this->intro(); ?>
 
-				<h3><?php _e( 'Modern calendar displays with easily updateable event text and color options.', 'google-calendar-events' ); ?></h3>
-				<img src="<?php echo $welcome_image_about_path . '/grid-view-custom-colors.png'; ?>" />
+				<h3><?php _e('Modern calendar displays with easily updateable event text and color options.', 'google-calendar-events'); ?></h3>
+				<img src="<?php echo $welcome_image_about_path.'/grid-view-custom-colors.png'; ?>" />
 
-				<h3><?php _e( 'Mobile responsive and widget ready.', 'google-calendar-events' ); ?></h3>
-				<img src="<?php echo $welcome_image_about_path . '/list-view-widget.png'; ?>" />
-				<img src="<?php echo $welcome_image_about_path . '/grid-view-widget-dark-theme.png'; ?>" />
+				<h3><?php _e('Mobile responsive and widget ready.', 'google-calendar-events'); ?></h3>
+				<img src="<?php echo $welcome_image_about_path.'/list-view-widget.png'; ?>" />
+				<img src="<?php echo $welcome_image_about_path.'/grid-view-widget-dark-theme.png'; ?>" />
 
-				<h3><?php _e( 'Simpler, more intuitive calendar settings.', 'google-calendar-events' ); ?></h3>
-				<img src="<?php echo $welcome_image_about_path . '/calendar-settings-appearance.png'; ?>" />
+				<h3><?php _e('Simpler, more intuitive calendar settings.', 'google-calendar-events'); ?></h3>
+				<img src="<?php echo $welcome_image_about_path.'/calendar-settings-appearance.png'; ?>" />
 
-				<h3><?php echo sprintf( __( 'Extendible with add-ons like <a href="%s" target="_blank">Google Calendar Pro</a>.', 'google-calendar-events' ), $welcome_gcal_pro_link ); ?></h3>
-				<a href="<?php echo $welcome_gcal_pro_link; ?>" target="_blank"><img src="<?php echo $welcome_image_about_path . '/google-calendar-pro-list-view-annotated.png'; ?>" /></a>
+				<h3><?php echo sprintf(__('Extendible with add-ons like <a href="%s" target="_blank">Google Calendar Pro</a>.', 'google-calendar-events'), $welcome_gcal_pro_link); ?></h3>
+				<a href="<?php echo $welcome_gcal_pro_link; ?>" target="_blank"><img src="<?php echo $welcome_image_about_path.'/google-calendar-pro-list-view-annotated.png'; ?>" /></a>
 
 				<hr/>
 
@@ -257,8 +257,8 @@ 
 					<?php
 
 					printf(
-						__( "Simple Calendar is created by a worldwide team of developers. If you'd like to contribute please visit our <a href='%s' target='_blank'>GitHub repo</a>.", 'google-calendar-events' ),
-						simcal_get_url( 'github' )
+						__("Simple Calendar is created by a worldwide team of developers. If you'd like to contribute please visit our <a href='%s' target='_blank'>GitHub repo</a>.", 'google-calendar-events'),
+						simcal_get_url('github')
 					);
 
 					?>
@@ -282,10 +282,10 @@ 
 			<div class="wrap about-wrap translators-wrap">
 				<?php $this->intro(); ?>
 				<p class="about-description">
-					<?php _e( 'Simple Calendar has been kindly translated into several other languages by contributors from all over the world.', 'google-calendar-events' ); ?>
+					<?php _e('Simple Calendar has been kindly translated into several other languages by contributors from all over the world.', 'google-calendar-events'); ?>
 				</p>
 				<p class="about-description">
-					<a href="https://translate.wordpress.org/projects/wp-plugins/google-calendar-events" target="_blank"><?php _e( 'Click here to help translate', 'google-calendar-events' ); ?></a>
+					<a href="https://translate.wordpress.org/projects/wp-plugins/google-calendar-events" target="_blank"><?php _e('Click here to help translate', 'google-calendar-events'); ?></a>
 				</p>
 				<?php
 
@@ -314,31 +314,31 @@ 
 
 		$contributors = $this->get_contributors();
 
-		if ( empty( $contributors ) ) {
+		if (empty($contributors)) {
 			return '';
 		}
 
 		$contributor_list = '<ul class="wp-people-group">';
 
-		foreach ( $contributors as $contributor ) {
+		foreach ($contributors as $contributor) {
 
 			// Skip contributor bots
-			$contributor_bots = array( 'gitter-badger' );
-			if ( in_array( $contributor->login, $contributor_bots ) ) {
+			$contributor_bots = array('gitter-badger');
+			if (in_array($contributor->login, $contributor_bots)) {
 				continue;
 			}
 
 			$contributor_list .= '<li class="wp-person">';
 			$contributor_list .= sprintf(
 				'<a href="%s" title="%s" target="_blank">%s</a>',
-				esc_url( 'https://github.com/' . $contributor->login ),
-				esc_html( sprintf( __( 'View %s', 'google-calendar-events' ), $contributor->login ) ),
-				sprintf( '<img src="%s" width="64" height="64" class="gravatar" alt="%s" />', esc_url( $contributor->avatar_url ), esc_html( $contributor->login ) )
+				esc_url('https://github.com/'.$contributor->login),
+				esc_html(sprintf(__('View %s', 'google-calendar-events'), $contributor->login)),
+				sprintf('<img src="%s" width="64" height="64" class="gravatar" alt="%s" />', esc_url($contributor->avatar_url), esc_html($contributor->login))
 			);
 			$contributor_list .= sprintf(
 				'<a class="web" href="%s" target="_blank">%s</a>',
-				esc_url( 'https://github.com/' . $contributor->login ),
-				esc_html( $contributor->login )
+				esc_url('https://github.com/'.$contributor->login),
+				esc_html($contributor->login)
 			);
 			$contributor_list .= '</li>';
 
@@ -358,24 +358,24 @@ 
 	 */
 	public function get_contributors() {
 
-		$contributors = get_transient( '_simple-calendar_contributors' );
-		if ( false !== $contributors ) {
+		$contributors = get_transient('_simple-calendar_contributors');
+		if (false !== $contributors) {
 			return $contributors;
 		}
 
 		$response = wp_safe_remote_get(
 			'https://api.github.com/repos/moonstonemedia/Simple-Calendar/contributors'
 		);
-		if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) {
+		if (is_wp_error($response) || 200 != wp_remote_retrieve_response_code($response)) {
 			return array();
 		}
 
-		$contributors = json_decode( wp_remote_retrieve_body( $response ) );
-		if ( ! is_array( $contributors ) ) {
+		$contributors = json_decode(wp_remote_retrieve_body($response));
+		if ( ! is_array($contributors)) {
 			return array();
 		}
 
-		set_transient( '_simple-calendar_contributors', $contributors, HOUR_IN_SECONDS );
+		set_transient('_simple-calendar_contributors', $contributors, HOUR_IN_SECONDS);
 
 		return $contributors;
 	}

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

Spacing +60 added lines, -60 removed lines

@@ -7,7 +7,7 @@ 
  * @package SimpleCalendar/Admin/Functions
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -32,9 +32,9 @@ 
  *
  * @return null|\SimpleCalendar\Abstracts\Admin_Page
  */
-function simcal_get_admin_page( $page ) {
+function simcal_get_admin_page($page) {
 	$objects = \SimpleCalendar\plugin()->objects;
-	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_admin_page( $page ) : null;
+	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_admin_page($page) : null;
 }
 
 /**
@@ -47,9 +47,9 @@ 
  *
  * @return null|\SimpleCalendar\Abstracts\Field
  */
-function simcal_get_field( $args, $name = '' ) {
+function simcal_get_field($args, $name = '') {
 	$objects = \SimpleCalendar\plugin()->objects;
-	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_field( $args, $name ) : null;
+	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_field($args, $name) : null;
 }
 
 /**
@@ -62,11 +62,11 @@ 
  *
  * @return void
  */
-function simcal_print_field( $args, $name = '' ) {
+function simcal_print_field($args, $name = '') {
 
-	$field = simcal_get_field( $args, $name );
+	$field = simcal_get_field($args, $name);
 
-	if ( $field instanceof \SimpleCalendar\Abstracts\Field ) {
+	if ($field instanceof \SimpleCalendar\Abstracts\Field) {
 		$field->html();
 	}
 }
@@ -84,33 +84,33 @@ 
  *
  * @return array|string Sanitized variable
  */
-function simcal_sanitize_input( $var, $func = 'sanitize_text_field'  ) {
+function simcal_sanitize_input($var, $func = 'sanitize_text_field') {
 
-	if ( is_null( $var ) ) {
+	if (is_null($var)) {
 		return '';
 	}
 
-	if ( is_bool( $var ) ) {
-		if ( $var === true ) {
+	if (is_bool($var)) {
+		if ($var === true) {
 			return 'yes';
 		} else {
 			return 'no';
 		}
 	}
 
-	if ( is_string( $var ) || is_numeric( $var ) ) {
-		$func = is_string( $func ) && function_exists( $func ) ? $func : 'sanitize_text_field';
-		return call_user_func( $func, trim( strval( $var ) ) );
+	if (is_string($var) || is_numeric($var)) {
+		$func = is_string($func) && function_exists($func) ? $func : 'sanitize_text_field';
+		return call_user_func($func, trim(strval($var)));
 	}
 
-	if ( is_object( $var ) ) {
+	if (is_object($var)) {
 		$var = (array) $var;
 	}
 
-	if ( is_array( $var ) ) {
+	if (is_array($var)) {
 		$array = array();
-		foreach ( $var as $k => $v ) {
-			$array[ $k ] = simcal_sanitize_input( $v );
+		foreach ($var as $k => $v) {
+			$array[$k] = simcal_sanitize_input($v);
 		}
 		return $array;
 	}
@@ -128,9 +128,9 @@ 
  */
 function simcal_is_admin_screen() {
 
-	$view = function_exists( 'get_current_screen' ) ? get_current_screen() : false;
+	$view = function_exists('get_current_screen') ? get_current_screen() : false;
 
-	if ( $view instanceof WP_Screen ) {
+	if ($view instanceof WP_Screen) {
 
 		// Screens used by this plugin.
 		$screens = array(
@@ -145,7 +145,7 @@ 
 			'dashboard_page_simple-calendar_credits',
 			'dashboard_page_simple-calendar_translators',
 		);
-		if ( in_array( $view->id, $screens ) ) {
+		if (in_array($view->id, $screens)) {
 			return $view->id;
 		}
 	}
@@ -164,8 +164,8 @@ 
  *
  * @return \SimpleCalendar\Admin\Updater
  */
-function simcal_addon_updater( $_api_url, $_plugin_file, $_api_data = null ) {
-	return new \SimpleCalendar\Admin\Updater( $_api_url, $_plugin_file, $_api_data );
+function simcal_addon_updater($_api_url, $_plugin_file, $_api_data = null) {
+	return new \SimpleCalendar\Admin\Updater($_api_url, $_plugin_file, $_api_data);
 }
 
 /**
@@ -177,10 +177,10 @@ 
  *
  * @return null|string
  */
-function simcal_get_license_key( $addon ) {
-	$licenses = get_option( 'simple-calendar_settings_licenses', array() );
-	if ( isset( $licenses['keys'][ $addon ] ) ) {
-		return empty( $licenses['keys'][ $addon ] ) ? null : $licenses['keys'][ $addon ];
+function simcal_get_license_key($addon) {
+	$licenses = get_option('simple-calendar_settings_licenses', array());
+	if (isset($licenses['keys'][$addon])) {
+		return empty($licenses['keys'][$addon]) ? null : $licenses['keys'][$addon];
 	}
 	return null;
 }
@@ -196,9 +196,9 @@ 
  *
  * @return array|string
  */
-function simcal_get_license_status( $addon = null ) {
-	$licenses = get_option( 'simple-calendar_licenses_status', array() );
-	return isset( $licenses[ $addon ] ) ? $licenses[ $addon ] : $licenses;
+function simcal_get_license_status($addon = null) {
+	$licenses = get_option('simple-calendar_licenses_status', array());
+	return isset($licenses[$addon]) ? $licenses[$addon] : $licenses;
 }
 
 /**
@@ -219,7 +219,7 @@ 
  * @since 3.0.0
  */
 function simcal_delete_admin_notices() {
-	delete_option( 'simple-calendar_admin_notices' );
+	delete_option('simple-calendar_admin_notices');
 }
 
 /**
@@ -231,22 +231,22 @@ 
  *
  * @return void
  */
-function simcal_print_shortcode_tip( $post_id ) {
+function simcal_print_shortcode_tip($post_id) {
 
 	$browser = new \Browser();
-	if ( $browser::PLATFORM_APPLE == $browser->getPlatform() ) {
+	if ($browser::PLATFORM_APPLE == $browser->getPlatform()) {
 		$cmd = '⌘+C';
 	} else {
 		$cmd = 'Ctrl+C';
 	}
 
-	$shortcut  = sprintf( __( 'Press %s to copy.', 'google-calendar-events' ), $cmd );
-	$shortcode = sprintf( '[calendar id="%s"]', $post_id );
+	$shortcut  = sprintf(__('Press %s to copy.', 'google-calendar-events'), $cmd);
+	$shortcode = sprintf('[calendar id="%s"]', $post_id);
 
-	echo "<input readonly='readonly' " .
-				"class='simcal-shortcode simcal-calendar-shortcode simcal-shortcode-tip' " .
-				"title='" . $shortcut . "' " .
-				"onclick='this.select();' value='" . $shortcode . "' />";
+	echo "<input readonly='readonly' ".
+				"class='simcal-shortcode simcal-calendar-shortcode simcal-shortcode-tip' ".
+				"title='".$shortcut."' ".
+				"onclick='this.select();' value='".$shortcode."' />";
 }
 
 /**
@@ -261,20 +261,20 @@ 
  *
  * @return  string  $url        Full Google Analytics campaign URL
  */
-function simcal_ga_campaign_url( $base_url, $campaign, $content, $raw = false ) {
+function simcal_ga_campaign_url($base_url, $campaign, $content, $raw = false) {
 
-	$url = add_query_arg( array(
+	$url = add_query_arg(array(
 		'utm_source'   => 'inside-plugin',
 		'utm_medium'   => 'link',
 		'utm_campaign' => $campaign, // i.e. 'core-plugin', 'gcal-pro'
 		'utm_content'  => $content // i.e. 'sidebar-link', 'settings-link'
-	), $base_url );
+	), $base_url);
 
-	if ( $raw ) {
-		return esc_url_raw( $url );
+	if ($raw) {
+		return esc_url_raw($url);
 	}
 
-	return esc_url( $url );
+	return esc_url($url);
 }
 
 /**
@@ -286,7 +286,7 @@ 
  */
 function simcal_newsletter_signup() {
 
-	if ( $screen = simcal_is_admin_screen() ) {
+	if ($screen = simcal_is_admin_screen()) {
 
 		global $current_user;
 		get_currentuserinfo();
@@ -297,11 +297,11 @@ 
 		<div id="simcal-drip" class="<?php echo $screen; ?>">
 			<div class="signup">
 				<p>
-					<?php _e( "Enter your name and email and we'll send you a coupon code for 20% off our Google Calendar Pro add-on.", 'google-calendar-events' ); ?>
+					<?php _e("Enter your name and email and we'll send you a coupon code for 20% off our Google Calendar Pro add-on.", 'google-calendar-events'); ?>
 				</p>
 
 				<p>
-					<label for="simcal-drip-field-email"><?php _e( 'Your Email', 'google-calendar-events' ); ?></label><br />
+					<label for="simcal-drip-field-email"><?php _e('Your Email', 'google-calendar-events'); ?></label><br />
 					<input type="email"
 					       id="simcal-drip-field-email"
 					       name="fields[email]"
@@ -309,7 +309,7 @@ 
 				</p>
 
 				<p>
-					<label for="simcal-drip-field-first_name"><?php _e( 'First Name', 'google-calendar-events' ); ?></label><br />
+					<label for="simcal-drip-field-first_name"><?php _e('First Name', 'google-calendar-events'); ?></label><br />
 					<input type="text"
 					       id="simcal-drip-field-first_name"
 					       name="fields[first_name]"
@@ -318,15 +318,15 @@ 
 				<p class="textright">
 					<a href="#"
 					   id="simcal-drip-signup"
-					   class="button button-primary"><?php _e( 'Send me the coupon', 'google-calendar-events' ); ?></a>
+					   class="button button-primary"><?php _e('Send me the coupon', 'google-calendar-events'); ?></a>
 				</p>
 				<div class="textright">
-					<a href="<?php echo simcal_ga_campaign_url( simcal_get_url( 'gcal-pro' ), 'core-plugin', 'sidebar-link' ); ?>"
-					   target="_blank"><?php _e( 'Just take me to GCal Pro', 'google-calendar-events' ); ?></a>
+					<a href="<?php echo simcal_ga_campaign_url(simcal_get_url('gcal-pro'), 'core-plugin', 'sidebar-link'); ?>"
+					   target="_blank"><?php _e('Just take me to GCal Pro', 'google-calendar-events'); ?></a>
 				</div>
 			</div>
 			<div class="thank-you" style="display: none;">
-				<?php _e( 'Thank you!', 'google-calendar-events' ); ?>
+				<?php _e('Thank you!', 'google-calendar-events'); ?>
 			</div>
 			<div class="clear">
 			</div>
@@ -337,7 +337,7 @@ 
 
 }
 
-if ( ! function_exists( 'mb_detect_encoding' ) ) {
+if ( ! function_exists('mb_detect_encoding')) {
 
 	/**
 	 * Fallback function for `mb_detect_encoding()`,
@@ -351,7 +351,7 @@ 
 	 *
 	 * @return bool
 	 */
-	function mb_detect_encoding( $string, $enc = null, $ret = null ) {
+	function mb_detect_encoding($string, $enc = null, $ret = null) {
 
 		static $enclist = array(
 			'UTF-8',
@@ -377,10 +377,10 @@ 
 
 		$result = false;
 
-		foreach ( $enclist as $item ) {
-			$sample = iconv( $item, $item, $string );
-			if ( md5( $sample ) == md5( $string ) ) {
-				if ( $ret === null ) {
+		foreach ($enclist as $item) {
+			$sample = iconv($item, $item, $string);
+			if (md5($sample) == md5($string)) {
+				if ($ret === null) {
 					$result = $item;
 				} else {
 					$result = true;

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;