moonstonemedia / Simple-Calendar

includes/admin/post-types.php

Spacing +82 added lines, -82 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Abstracts\Calendar;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -32,26 +32,26 @@ 
 		new Meta_Boxes();
 
 		// Add column headers in calendar feeds admin archives.
-		add_filter( 'manage_calendar_posts_columns', array( $this, 'add_calendar_feed_column_headers' ) );
+		add_filter('manage_calendar_posts_columns', array($this, 'add_calendar_feed_column_headers'));
 		// Process column contents for calendar feeds.
-		add_action( 'manage_calendar_posts_custom_column', array( $this, 'calendar_feed_column_content' ), 10, 2 );
+		add_action('manage_calendar_posts_custom_column', array($this, 'calendar_feed_column_content'), 10, 2);
 
 		// Add actions in calendar feed rows.
-		add_filter( 'post_row_actions', array( $this, 'row_actions' ), 10, 2 );
+		add_filter('post_row_actions', array($this, 'row_actions'), 10, 2);
 		// Add bulk actions.
-		add_action( 'admin_init', array( $this, 'bulk_actions' ) );
+		add_action('admin_init', array($this, 'bulk_actions'));
 		// Add content to edit calendars page.
-		add_action( 'load-edit.php', array( $this, 'edit_table_hooks' ) );
+		add_action('load-edit.php', array($this, 'edit_table_hooks'));
 
 		// Default calendar post type content (default event template).
-		add_filter( 'default_content', array( $this, 'default_event_template' ), 10, 2 );
+		add_filter('default_content', array($this, 'default_event_template'), 10, 2);
 
 		// Add a clear cache link in submit post box.
-		add_action( 'post_submitbox_misc_actions', array( $this, 'clear_cache_button' ) );
+		add_action('post_submitbox_misc_actions', array($this, 'clear_cache_button'));
 
 		// Add media button to post editor for adding a shortcode.
-		add_action( 'media_buttons', array( $this, 'add_shortcode_button' ), 100 );
-		add_action( 'edit_form_after_editor', array( $this, 'add_shortcode_panel' ), 100 );
+		add_action('media_buttons', array($this, 'add_shortcode_button'), 100);
+		add_action('edit_form_after_editor', array($this, 'add_shortcode_panel'), 100);
 	}
 
 	/**
@@ -63,15 +63,15 @@ 
 	 *
 	 * @return array Filtered output.
 	 */
-	public function add_calendar_feed_column_headers( $columns ) {
+	public function add_calendar_feed_column_headers($columns) {
 
 		// New columns.
-		$feed_info = array( 'feed' => __( 'Events Source', 'google-calendar-events' ) );
-		$calendar_info = array( 'calendar' => __( 'Calendar Type', 'google-calendar-events' ) );
-		$shortcode = array( 'shortcode' => __( 'Shortcode', 'google-calendar-events' ) );
+		$feed_info = array('feed' => __('Events Source', 'google-calendar-events'));
+		$calendar_info = array('calendar' => __('Calendar Type', 'google-calendar-events'));
+		$shortcode = array('shortcode' => __('Shortcode', 'google-calendar-events'));
 
 		// Merge with existing columns and rearrange.
-		$columns = array_slice( $columns, 0, 2, true ) + $feed_info + $calendar_info + $shortcode + array_slice( $columns, 2, null, true );
+		$columns = array_slice($columns, 0, 2, true) + $feed_info + $calendar_info + $shortcode + array_slice($columns, 2, null, true);
 
 		return $columns;
 	}
@@ -86,32 +86,32 @@ 
 	 *
 	 * @return void
 	 */
-	public function calendar_feed_column_content( $column_name, $post_id ) {
+	public function calendar_feed_column_content($column_name, $post_id) {
 
-		switch ( $column_name ) {
+		switch ($column_name) {
 
 			case 'feed':
 
-				$feed = simcal_get_feed( $post_id );
-				echo isset( $feed->name ) ? $feed->name : '—';
+				$feed = simcal_get_feed($post_id);
+				echo isset($feed->name) ? $feed->name : '—';
 				break;
 
 			case 'calendar':
 
 				$info = '—';
 
-				if ( $terms = wp_get_object_terms( $post_id, 'calendar_type' ) ) {
+				if ($terms = wp_get_object_terms($post_id, 'calendar_type')) {
 
-					$calendar_type  = sanitize_title( current( $terms )->name );
-					$calendar       = simcal_get_calendar( $calendar_type );
+					$calendar_type  = sanitize_title(current($terms)->name);
+					$calendar       = simcal_get_calendar($calendar_type);
 
-					if ( $calendar instanceof Calendar ) {
+					if ($calendar instanceof Calendar) {
 						$info = $calendar->name;
-						$views = get_post_meta( $post_id, '_calendar_view', true );;
-						$view = isset( $views[ $calendar->type ] ) ? $views[ $calendar->type ] : '';
+						$views = get_post_meta($post_id, '_calendar_view', true); ;
+						$view = isset($views[$calendar->type]) ? $views[$calendar->type] : '';
 
-						if ( isset( $calendar->views[ $view ] ) ) {
-							$info .= ' → ' . $calendar->views[ $view ];
+						if (isset($calendar->views[$view])) {
+							$info .= ' → '.$calendar->views[$view];
 						}
 					}
 				}
@@ -121,7 +121,7 @@ 
 
 			case 'shortcode' :
 
-				simcal_print_shortcode_tip( $post_id );
+				simcal_print_shortcode_tip($post_id);
 				break;
 		}
 	}
@@ -136,12 +136,12 @@ 
 	 *
 	 * @return array Filtered output.
 	 */
-	public function row_actions( $actions, $post ) {
+	public function row_actions($actions, $post) {
 
 		// Add a clear feed cache action link.
-		if ( $post->post_type == 'calendar' ) {
-			$actions['duplicate_feed'] = '<a href="' . esc_url( add_query_arg( array( 'duplicate_feed' => $post->ID ) ) ) . '">' . __( 'Clone', 'google-calendar-events' )       . '</a>';
-			$actions['clear_cache']    = '<a href="' . esc_url( add_query_arg( array( 'clear_cache' => $post->ID ) ) ) . '">'    . __( 'Clear Cache', 'google-calendar-events' ) . '</a>';
+		if ($post->post_type == 'calendar') {
+			$actions['duplicate_feed'] = '<a href="'.esc_url(add_query_arg(array('duplicate_feed' => $post->ID))).'">'.__('Clone', 'google-calendar-events').'</a>';
+			$actions['clear_cache']    = '<a href="'.esc_url(add_query_arg(array('clear_cache' => $post->ID))).'">'.__('Clear Cache', 'google-calendar-events').'</a>';
 		}
 
 		return $actions;
@@ -156,38 +156,38 @@ 
 
 		// Clear an individual feed cache.
 		// @todo Convert the clear cache request to ajax.
-		if ( isset( $_REQUEST['clear_cache'] ) ) {
+		if (isset($_REQUEST['clear_cache'])) {
 
-			$id = intval( $_REQUEST['clear_cache'] );
+			$id = intval($_REQUEST['clear_cache']);
 
-			if ( $id > 0 ) {
-				simcal_delete_feed_transients( $id );
+			if ($id > 0) {
+				simcal_delete_feed_transients($id);
 			}
 
-			wp_redirect( remove_query_arg( 'clear_cache' ) );
+			wp_redirect(remove_query_arg('clear_cache'));
 		}
 
 		// Duplicate a feed post type.
-		if ( isset( $_REQUEST['duplicate_feed'] ) ) {
+		if (isset($_REQUEST['duplicate_feed'])) {
 
-			$id = intval( $_REQUEST['duplicate_feed'] );
+			$id = intval($_REQUEST['duplicate_feed']);
 
-			if ( $id > 0 ) {
-				$this->duplicate_feed( $id );
+			if ($id > 0) {
+				$this->duplicate_feed($id);
 			}
 
-			wp_redirect( remove_query_arg( 'duplicate_feed' ) );
+			wp_redirect(remove_query_arg('duplicate_feed'));
 		}
 
-		$bulk_actions = new Bulk_Actions( 'calendar' );
+		$bulk_actions = new Bulk_Actions('calendar');
 
-		$bulk_actions->register_bulk_action( array(
-			'menu_text'     => __( 'Clear cache', 'google-calendar-events' ),
+		$bulk_actions->register_bulk_action(array(
+			'menu_text'     => __('Clear cache', 'google-calendar-events'),
 			'action_name'   => 'clear_calendars_cache',
-			'callback'      => function( $post_ids ) {
-				simcal_delete_feed_transients( $post_ids );
+			'callback'      => function($post_ids) {
+				simcal_delete_feed_transients($post_ids);
 			},
-			'admin_notice'  => __( 'Cache cleared.', 'google-calendar-events' ),
+			'admin_notice'  => __('Cache cleared.', 'google-calendar-events'),
 			)
 		);
 
@@ -204,8 +204,8 @@ 
 
 		$screen = simcal_is_admin_screen();
 
-		if ( 'edit-calendar' == $screen ) {
-			add_action( 'in_admin_footer', function() {
+		if ('edit-calendar' == $screen) {
+			add_action('in_admin_footer', function() {
 
 			} );
 		}
@@ -218,29 +218,29 @@ 
 	 *
 	 * @param int $post_id
 	 */
-	private function duplicate_feed( $post_id ) {
+	private function duplicate_feed($post_id) {
 
-		if ( $duplicate = get_post( intval( $post_id ), 'ARRAY_A' ) ) {
+		if ($duplicate = get_post(intval($post_id), 'ARRAY_A')) {
 
-			if ( 'calendar' == $duplicate['post_type'] ) {
+			if ('calendar' == $duplicate['post_type']) {
 
-				$duplicate['post_title'] = $duplicate['post_title'] . ' (' . __( 'Copy', 'google-calendar-events' ) . ')';
+				$duplicate['post_title'] = $duplicate['post_title'].' ('.__('Copy', 'google-calendar-events').')';
 
-				unset( $duplicate['ID'] );
-				unset( $duplicate['guid'] );
-				unset( $duplicate['comment_count'] );
+				unset($duplicate['ID']);
+				unset($duplicate['guid']);
+				unset($duplicate['comment_count']);
 
-				$duplicate_id = wp_insert_post( $duplicate );
+				$duplicate_id = wp_insert_post($duplicate);
 
-				$taxonomies = get_object_taxonomies( $duplicate['post_type'] );
-				foreach ( $taxonomies as $taxonomy ) {
-					$terms = wp_get_post_terms( $post_id, $taxonomy, array( 'fields' => 'names' ) );
-					wp_set_object_terms( $duplicate_id, $terms, $taxonomy );
+				$taxonomies = get_object_taxonomies($duplicate['post_type']);
+				foreach ($taxonomies as $taxonomy) {
+					$terms = wp_get_post_terms($post_id, $taxonomy, array('fields' => 'names'));
+					wp_set_object_terms($duplicate_id, $terms, $taxonomy);
 				}
 
-				$custom_fields = get_post_custom( $post_id );
-				foreach ( $custom_fields as $key => $value ) {
-					add_post_meta( $duplicate_id, $key, maybe_unserialize( $value[0] ) );
+				$custom_fields = get_post_custom($post_id);
+				foreach ($custom_fields as $key => $value) {
+					add_post_meta($duplicate_id, $key, maybe_unserialize($value[0]));
 				}
 			}
 
@@ -257,7 +257,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function default_event_template( $content, $post ) {
+	public function default_event_template($content, $post) {
 		return 'calendar' == $post->post_type ? simcal_default_event_template() : $content;
 	}
 
@@ -270,10 +270,10 @@ 
 
 		global $post, $post_type;
 
-		if ( $post_type == 'calendar' && isset( $post->ID ) ) {
-			echo '<a id="simcal-clear-cache" class="button" data-id="' . $post->ID . ' ">' .
-			     '<i class="simcal-icon-spinner simcal-icon-spin" style="display: none;"></i> ' .
-			     __( 'Clear cache', 'google-calendar-events' ) .
+		if ($post_type == 'calendar' && isset($post->ID)) {
+			echo '<a id="simcal-clear-cache" class="button" data-id="'.$post->ID.' ">'.
+			     '<i class="simcal-icon-spinner simcal-icon-spin" style="display: none;"></i> '.
+			     __('Clear cache', 'google-calendar-events').
 			     '</a>';
 		}
 	}
@@ -290,20 +290,20 @@ 
 
 		$post_types = array();
 
-		$settings = get_option( 'simple-calendar_settings_calendars' );
-		if ( isset( $settings['general']['attach_calendars_posts'] ) ) {
+		$settings = get_option('simple-calendar_settings_calendars');
+		if (isset($settings['general']['attach_calendars_posts'])) {
 			$post_types = $settings['general']['attach_calendars_posts'];
 		}
 
 		global $post_type;
 
-		if ( in_array( $post_type, $post_types ) ) {
+		if (in_array($post_type, $post_types)) {
 
 			// Thickbox will ignore height and width, will adjust these in js.
 			// @see https://core.trac.wordpress.org/ticket/17249
 			?>
 			<a href="#TB_inline?height=250&width=500&inlineId=simcal-insert-shortcode-panel" id="simcal-insert-shortcode-button" class="thickbox button insert-calendar add_calendar">
-				<span class="wp-media-buttons-icon dashicons-before dashicons-calendar-alt"></span> <?php _e( 'Add Calendar', 'google-calendar-events' ); ?>
+				<span class="wp-media-buttons-icon dashicons-before dashicons-calendar-alt"></span> <?php _e('Add Calendar', 'google-calendar-events'); ?>
 			</a>
 			<?php
 
@@ -325,25 +325,25 @@ 
 		?>
 		<div id="simcal-insert-shortcode-panel" style="display:none;">
 			<div class="simcal-insert-shortcode-panel">
-				<h1><?php _e( 'Add Calendar', 'google-calendar-events' ); ?></h1>
-				<?php _e( 'Add a calendar to your post.', 'google-calendar-events' ); ?>
-				<?php if ( ! empty( $calendars ) && is_array( $calendars ) ) : ?>
+				<h1><?php _e('Add Calendar', 'google-calendar-events'); ?></h1>
+				<?php _e('Add a calendar to your post.', 'google-calendar-events'); ?>
+				<?php if ( ! empty($calendars) && is_array($calendars)) : ?>
 					<p>
 						<label for="simcal-choose-calendar">
-							<?php $multiselect = count( $calendars ) > 15 ? ' simcal-field-select-enhanced' : ''; ?>
+							<?php $multiselect = count($calendars) > 15 ? ' simcal-field-select-enhanced' : ''; ?>
 							<select id="simcal-choose-calendar"
 							        class="simcal-field simcal-field-select<?php echo $multiselect; ?>"
 							        name="">
-								<?php foreach ( $calendars as $id => $title ) : ?>
+								<?php foreach ($calendars as $id => $title) : ?>
 									<option value="<?php echo $id ?>"><?php echo $title ?></option>
 								<?php endforeach; ?>
 							</select>
 						</label>
 					</p>
-					<p><input type="button" value="<?php _e( 'Insert Calendar', 'google-calendar-events' ); ?>" id="simcal-insert-shortcode" class="button button-primary button-large" name="" /></p>
+					<p><input type="button" value="<?php _e('Insert Calendar', 'google-calendar-events'); ?>" id="simcal-insert-shortcode" class="button button-primary button-large" name="" /></p>
 				<?php else : ?>
-					<p><em><?php _e( 'Could not find any calendars to add to this post.', 'google-calendar-events' ); ?></em></p>
-					<strong><a href="post-new.php?post_type=calendar"><?php _e( 'Please add and configure new calendar first.', 'google-calendar-events' ); ?></a></strong>
+					<p><em><?php _e('Could not find any calendars to add to this post.', 'google-calendar-events'); ?></em></p>
+					<strong><a href="post-new.php?post_type=calendar"><?php _e('Please add and configure new calendar first.', 'google-calendar-events'); ?></a></strong>
 				<?php endif; ?>
 			</div>
 		</div>

includes/admin/updater.php

Spacing +78 added lines, -78 removed lines

@@ -62,17 +62,17 @@ 
 	 * @param string $_plugin_file Path to the plugin file.
 	 * @param array  $_api_data    Optional data to send with API calls.
 	 */
-	public function __construct( $_api_url, $_plugin_file, $_api_data = null ) {
+	public function __construct($_api_url, $_plugin_file, $_api_data = null) {
 
-		$this->api_url  = trailingslashit( $_api_url );
+		$this->api_url  = trailingslashit($_api_url);
 		$this->api_data = $_api_data;
-		$this->name     = plugin_basename( $_plugin_file );
-		$this->slug     = basename( $_plugin_file, '.php' );
+		$this->name     = plugin_basename($_plugin_file);
+		$this->slug     = basename($_plugin_file, '.php');
 		$this->version  = $_api_data['version'];
 
 		// Set up hooks.
 		$this->init();
-		add_action( 'admin_init', array( $this, 'show_changelog' ) );
+		add_action('admin_init', array($this, 'show_changelog'));
 	}
 
 	/**
@@ -83,10 +83,10 @@ 
 	 * @return void
 	 */
 	public function init() {
-		add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) );
-		add_filter( 'plugins_api', array( $this, 'plugins_api_filter' ), 10, 3 );
-		remove_action( 'after_plugin_row_' . $this->name, 'wp_plugin_update_row', 10 );
-		add_action( 'after_plugin_row_' . $this->name, array( $this, 'show_update_notification' ), 10, 2 );
+		add_filter('pre_set_site_transient_update_plugins', array($this, 'check_update'));
+		add_filter('plugins_api', array($this, 'plugins_api_filter'), 10, 3);
+		remove_action('after_plugin_row_'.$this->name, 'wp_plugin_update_row', 10);
+		add_action('after_plugin_row_'.$this->name, array($this, 'show_update_notification'), 10, 2);
 	}
 
 	/**
@@ -103,30 +103,30 @@ 
 	 *
 	 * @return array|\stdClass Modified update array with custom plugin data.
 	 */
-	public function check_update( $_transient_data ) {
+	public function check_update($_transient_data) {
 
 		global $pagenow;
 
-		if ( ! is_object( $_transient_data ) ) {
+		if ( ! is_object($_transient_data)) {
 			$_transient_data = new \stdClass();
 		}
 
-		if ( 'plugins.php' == $pagenow && is_multisite() ) {
+		if ('plugins.php' == $pagenow && is_multisite()) {
 			return $_transient_data;
 		}
 
-		if ( empty( $_transient_data->response ) || empty( $_transient_data->response[ $this->name ] ) ) {
+		if (empty($_transient_data->response) || empty($_transient_data->response[$this->name])) {
 
-			$version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) );
+			$version_info = $this->api_request('plugin_latest_version', array('slug' => $this->slug));
 
-			if ( false !== $version_info && is_object( $version_info ) && isset( $version_info->new_version ) ) {
+			if (false !== $version_info && is_object($version_info) && isset($version_info->new_version)) {
 
-				if ( version_compare( $this->version, $version_info->new_version, '<' ) ) {
-					$_transient_data->response[ $this->name ] = $version_info;
+				if (version_compare($this->version, $version_info->new_version, '<')) {
+					$_transient_data->response[$this->name] = $version_info;
 				}
 
 				$_transient_data->last_checked = time();
-				$_transient_data->checked[ $this->name ] = $this->version;
+				$_transient_data->checked[$this->name] = $this->version;
 			}
 
 		}
@@ -144,81 +144,81 @@ 
 	 * @param string $file
 	 * @param array  $plugin
 	 */
-	public function show_update_notification( $file, $plugin ) {
+	public function show_update_notification($file, $plugin) {
 
-		if ( ! current_user_can( 'update_plugins' ) ) {
+		if ( ! current_user_can('update_plugins')) {
 			return;
 		}
 
-		if ( ! is_multisite() ) {
+		if ( ! is_multisite()) {
 			return;
 		}
 
-		if ( $this->name != $file ) {
+		if ($this->name != $file) {
 			return;
 		}
 
 		// Remove our filter on the site transient
-		remove_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ), 10 );
+		remove_filter('pre_set_site_transient_update_plugins', array($this, 'check_update'), 10);
 
-		$update_cache = get_site_transient( 'update_plugins' );
+		$update_cache = get_site_transient('update_plugins');
 
-		if ( ! is_object( $update_cache ) || empty( $update_cache->response ) || empty( $update_cache->response[ $this->name ] ) ) {
+		if ( ! is_object($update_cache) || empty($update_cache->response) || empty($update_cache->response[$this->name])) {
 
-			$cache_key    = md5( 'edd_plugin_' .sanitize_key( $this->name ) . '_version_info' );
-			$version_info = get_transient( $cache_key );
+			$cache_key    = md5('edd_plugin_'.sanitize_key($this->name).'_version_info');
+			$version_info = get_transient($cache_key);
 
-			if ( false === $version_info ) {
+			if (false === $version_info) {
 
-				$version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) );
+				$version_info = $this->api_request('plugin_latest_version', array('slug' => $this->slug));
 
-				set_transient( $cache_key, $version_info, 3600 );
+				set_transient($cache_key, $version_info, 3600);
 			}
 
-			if ( ! is_object( $version_info ) ) {
+			if ( ! is_object($version_info)) {
 				return;
 			}
 
-			if ( version_compare( $this->version, $version_info->new_version, '<' ) ) {
-				$update_cache->response[ $this->name ] = $version_info;
+			if (version_compare($this->version, $version_info->new_version, '<')) {
+				$update_cache->response[$this->name] = $version_info;
 			}
 
 			$update_cache->last_checked = time();
-			$update_cache->checked[ $this->name ] = $this->version;
+			$update_cache->checked[$this->name] = $this->version;
 
-			set_site_transient( 'update_plugins', $update_cache );
+			set_site_transient('update_plugins', $update_cache);
 
 		} else {
 
-			$version_info = $update_cache->response[ $this->name ];
+			$version_info = $update_cache->response[$this->name];
 
 		}
 
 		// Restore our filter
-		add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) );
+		add_filter('pre_set_site_transient_update_plugins', array($this, 'check_update'));
 
-		if ( ! empty( $update_cache->response[ $this->name ] ) && version_compare( $this->version, $version_info->new_version, '<' ) ) {
+		if ( ! empty($update_cache->response[$this->name]) && version_compare($this->version, $version_info->new_version, '<')) {
 
 			// build a plugin list row, with update notification
-			$wp_list_table = _get_list_table( 'WP_Plugins_List_Table' );
-			echo '<tr class="plugin-update-tr"><td colspan="' . $wp_list_table->get_column_count() . '" class="plugin-update colspanchange"><div class="update-message">';
+			$wp_list_table = _get_list_table('WP_Plugins_List_Table');
+			echo '<tr class="plugin-update-tr"><td colspan="'.$wp_list_table->get_column_count().'" class="plugin-update colspanchange"><div class="update-message">';
 
-			$changelog_link = self_admin_url( 'index.php?edd_sl_action=view_plugin_changelog&plugin=' . $this->name . '&slug=' . $this->slug . '&TB_iframe=true&width=772&height=911' );
+			$changelog_link = self_admin_url('index.php?edd_sl_action=view_plugin_changelog&plugin='.$this->name.'&slug='.$this->slug.'&TB_iframe=true&width=772&height=911');
 
-			if ( empty( $version_info->download_link ) ) {
+			if (empty($version_info->download_link)) {
 				printf(
-					__( 'There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a>.', 'google-calendar-events' ),
-					esc_html( $version_info->name ),
-					esc_url( $changelog_link ),
-					esc_html( $version_info->new_version )
+					__('There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a>.', 'google-calendar-events'),
+					esc_html($version_info->name),
+					esc_url($changelog_link),
+					esc_html($version_info->new_version)
 				);
 			} else {
 				printf(
-					__( 'There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a> or <a href="%4$s">update now</a>.', 'google-calendar-events' ),
-					esc_html( $version_info->name ),
-					esc_url( $changelog_link ),
-					esc_html( $version_info->new_version ),
-					esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) )
+					__('There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a> or <a href="%4$s">update now</a>.', 'google-calendar-events'),
+					esc_html($version_info->name),
+					esc_url($changelog_link),
+					esc_html($version_info->new_version),
+					esc_url(wp_nonce_url(self_admin_url('update.php?action=upgrade-plugin&plugin=').$this->name, 'upgrade-plugin_'.$this->name))
 				);
 			}
 
@@ -238,13 +238,13 @@ 
 	 *
 	 * @return object
 	 */
-	public function plugins_api_filter( $_data, $_action = '', $_args = null ) {
+	public function plugins_api_filter($_data, $_action = '', $_args = null) {
 
-		if ( 'plugin_information' != $_action ) {
+		if ('plugin_information' != $_action) {
 			return $_data;
 		}
 
-		if ( ! isset( $_args->slug ) || ( $_args->slug != $this->slug ) ) {
+		if ( ! isset($_args->slug) || ($_args->slug != $this->slug)) {
 			return $_data;
 		}
 
@@ -257,9 +257,9 @@ 
 			),
 		);
 
-		$api_response = $this->api_request( 'plugin_information', $to_send );
+		$api_response = $this->api_request('plugin_information', $to_send);
 
-		if ( false !== $api_response ) {
+		if (false !== $api_response) {
 			$_data = $api_response;
 		}
 
@@ -276,9 +276,9 @@ 
 	 * @param  string $url
 	 * @return object|array $array
 	 */
-	public function http_request_args( $args, $url ) {
+	public function http_request_args($args, $url) {
 		// If it is an https request and we are performing a package download, disable ssl verification
-		if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' ) ) {
+		if (strpos($url, 'https://') !== false && strpos($url, 'edd_action=package_download')) {
 			$args['sslverify'] = false;
 		}
 		return $args;
@@ -293,42 +293,42 @@ 
 	 * @param  array  $_data   Parameters for the API action.
 	 * @return false|object
 	 */
-	private function api_request( $_action, $_data ) {
+	private function api_request($_action, $_data) {
 
 		global $wp_version;
 
-		$data = array_merge( $this->api_data, $_data );
+		$data = array_merge($this->api_data, $_data);
 
-		if ( $data['slug'] != $this->slug ) {
+		if ($data['slug'] != $this->slug) {
 			return;
 		}
 
-		if ( empty( $data['license'] ) ) {
+		if (empty($data['license'])) {
 			return;
 		}
 
-		if ( $this->api_url == home_url() ) {
+		if ($this->api_url == home_url()) {
 			return false; // Don't allow a plugin to ping itself
 		}
 
 		$api_params = array(
 			'edd_action' => 'get_version',
 			'license'    => $data['license'],
-			'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
-			'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
+			'item_name'  => isset($data['item_name']) ? $data['item_name'] : false,
+			'item_id'    => isset($data['item_id']) ? $data['item_id'] : false,
 			'slug'       => $data['slug'],
 			'author'     => $data['author'],
 			'url'        => home_url()
 		);
 
-		$request = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => false, 'body' => $api_params ) );
+		$request = wp_remote_post($this->api_url, array('timeout' => 15, 'sslverify' => false, 'body' => $api_params));
 
-		if ( ! is_wp_error( $request ) ) {
-			$request = json_decode( wp_remote_retrieve_body( $request ) );
+		if ( ! is_wp_error($request)) {
+			$request = json_decode(wp_remote_retrieve_body($request));
 		}
 
-		if ( $request && isset( $request->sections ) ) {
-			$request->sections = maybe_unserialize( $request->sections );
+		if ($request && isset($request->sections)) {
+			$request->sections = maybe_unserialize($request->sections);
 		} else {
 			$request = false;
 		}
@@ -343,26 +343,26 @@ 
 	 */
 	public function show_changelog() {
 
-		if ( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action'] ) {
+		if (empty($_REQUEST['edd_sl_action']) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action']) {
 			return;
 		}
 
-		if ( empty( $_REQUEST['plugin'] ) ) {
+		if (empty($_REQUEST['plugin'])) {
 			return;
 		}
 
-		if ( empty( $_REQUEST['slug'] ) ) {
+		if (empty($_REQUEST['slug'])) {
 			return;
 		}
 
-		if ( ! current_user_can( 'update_plugins' ) ) {
-			wp_die( __( 'You do not have permission to install plugin updates', 'google-calendar-events' ), __( 'Error', 'google-calendar-events' ), array( 'response' => 403 ) );
+		if ( ! current_user_can('update_plugins')) {
+			wp_die(__('You do not have permission to install plugin updates', 'google-calendar-events'), __('Error', 'google-calendar-events'), array('response' => 403));
 		}
 
-		$response = $this->api_request( 'plugin_latest_version', array( 'slug' => $_REQUEST['slug'] ) );
+		$response = $this->api_request('plugin_latest_version', array('slug' => $_REQUEST['slug']));
 
-		if ( $response && isset( $response->sections['changelog'] ) ) {
-			echo '<div style="background:#fff;padding:10px;">' . $response->sections['changelog'] . '</div>';
+		if ($response && isset($response->sections['changelog'])) {
+			echo '<div style="background:#fff;padding:10px;">'.$response->sections['changelog'].'</div>';
 		}
 
 		exit;

includes/ajax.php

Spacing +7 added lines, -7 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Abstracts\Calendar_View;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,7 +25,7 @@ 
 	 * @since 3.0.0
 	 */
 	public function __construct() {
-		add_action( 'init', array( $this, 'add_callbacks' ), 100 );
+		add_action('init', array($this, 'add_callbacks'), 100);
 	}
 
 	/**
@@ -37,19 +37,19 @@ 
 
 		$calendars = simcal_get_calendar_types();
 
-		foreach ( $calendars as $calendar => $views ) {
+		foreach ($calendars as $calendar => $views) {
 
-			foreach ( $views as $view ) {
+			foreach ($views as $view) {
 
-				$the_view = simcal_get_calendar_view( 0, $calendar . '-' . $view );
+				$the_view = simcal_get_calendar_view(0, $calendar.'-'.$view);
 
-				if ( $the_view instanceof Calendar_View ) {
+				if ($the_view instanceof Calendar_View) {
 					$the_view->add_ajax_actions();
 				}
 			}
 		}
 
-		do_action( 'simcal_add_ajax_callbacks' );
+		do_action('simcal_add_ajax_callbacks');
 	}
 
 }

includes/autoload.php

Spacing +10 added lines, -10 removed lines

@@ -5,11 +5,11 @@ 
  * @package SimpleCalendar
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
-if ( ! function_exists( 'SimpleCalendar_Autoload' ) ) {
+if ( ! function_exists('SimpleCalendar_Autoload')) {
 
 	/**
 	 * Plugin autoloader.
@@ -22,31 +22,31 @@ 
 	 *
 	 * @param $class
 	 */
-	function SimpleCalendar_Autoload( $class ) {
+	function SimpleCalendar_Autoload($class) {
 
 		// Do not load unless in plugin domain.
 		$namespace = 'SimpleCalendar';
-		if ( strpos( $class, $namespace ) !== 0 ) {
+		if (strpos($class, $namespace) !== 0) {
 			return;
 		}
 
 		// Converts Class_Name (class convention) to class-name (file convention).
-		$class_name = implode( '-', array_map( 'lcfirst', explode( '_', strtolower( $class ) ) ) );
+		$class_name = implode('-', array_map('lcfirst', explode('_', strtolower($class))));
 
 		// Remove the root namespace.
-		$unprefixed = substr( $class_name, strlen( $namespace ) );
+		$unprefixed = substr($class_name, strlen($namespace));
 
 		// Build the file path.
-		$file_path = str_replace( '\\', DIRECTORY_SEPARATOR, $unprefixed );
-		$file      = dirname( __FILE__ ) . '/' . $file_path . '.php';
+		$file_path = str_replace('\\', DIRECTORY_SEPARATOR, $unprefixed);
+		$file      = dirname(__FILE__).'/'.$file_path.'.php';
 
-		if ( file_exists( $file ) ) {
+		if (file_exists($file)) {
 			require $file;
 		}
 
 	}
 
 	// Register the autoloader.
-	spl_autoload_register( 'SimpleCalendar_Autoload' );
+	spl_autoload_register('SimpleCalendar_Autoload');
 
 }

includes/events/events.php

Spacing +123 added lines, -123 removed lines

@@ -8,7 +8,7 @@ 
 
 use Carbon\Carbon;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -45,9 +45,9 @@ 
 	 * @param array $e Events.
 	 * @param string|\DateTimeZone $tz Timezone.
 	 */
-	public function __construct( $e = array(), $tz = 'UTC' ) {
-		$this->set_events( $e );
-		$this->set_timezone( $tz );
+	public function __construct($e = array(), $tz = 'UTC') {
+		$this->set_events($e);
+		$this->set_timezone($tz);
 	}
 
 	/**
@@ -59,10 +59,10 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_events( $n = '' ) {
-		if ( ! empty( $n ) && ! empty( $this->events ) ) {
-			$length = absint( $n );
-			return array_slice( $this->events, 0, $length, true );
+	public function get_events($n = '') {
+		if ( ! empty($n) && ! empty($this->events)) {
+			$length = absint($n);
+			return array_slice($this->events, 0, $length, true);
 		}
 		return $this->events;
 	}
@@ -74,7 +74,7 @@ 
 	 *
 	 * @param array $ev Events.
 	 */
-	public function set_events( array $ev ) {
+	public function set_events(array $ev) {
 		$this->events = $ev;
 	}
 
@@ -87,11 +87,11 @@ 
 	 *
 	 * @return Events
 	 */
-	public function set_timezone( $tz ) {
-		if ( $tz instanceof \DateTimeZone ) {
+	public function set_timezone($tz) {
+		if ($tz instanceof \DateTimeZone) {
 			$tz = $tz->getName();
 		}
-		$this->timezone = simcal_esc_timezone( $tz, $this->timezone );
+		$this->timezone = simcal_esc_timezone($tz, $this->timezone);
 		return $this;
 	}
 
@@ -104,11 +104,11 @@ 
 	 *
 	 * @return Events
 	 */
-	public function shift( $n ) {
-		if ( ! empty( $this->events ) ) {
-			$offset = intval( $n );
-			$length = count( $this->events );
-			$this->set_events( array_slice( $this->events, $offset, $length, true ) );
+	public function shift($n) {
+		if ( ! empty($this->events)) {
+			$offset = intval($n);
+			$length = count($this->events);
+			$this->set_events(array_slice($this->events, $offset, $length, true));
 		}
 		return $this;
 	}
@@ -121,7 +121,7 @@ 
 	 * @return Events
 	 */
 	public function private_only() {
-		$this->set_events( $this->filter_property( 'public', 'hide' ) );
+		$this->set_events($this->filter_property('public', 'hide'));
 		return $this;
 	}
 
@@ -133,7 +133,7 @@ 
 	 * @return Events
 	 */
 	public function public_only() {
-		$this->set_events( $this->filter_property( 'public', 'show' ) );
+		$this->set_events($this->filter_property('public', 'show'));
 		return $this;
 	}
 
@@ -145,7 +145,7 @@ 
 	 * @return Events
 	 */
 	public function recurring() {
-		$this->set_events( $this->filter_property( 'recurrence', 'show' ) );
+		$this->set_events($this->filter_property('recurrence', 'show'));
 		return $this;
 	}
 
@@ -157,7 +157,7 @@ 
 	 * @return Events
 	 */
 	public function not_recurring() {
-		$this->set_events( $this->filter_property( 'recurrence', 'hide' ) );
+		$this->set_events($this->filter_property('recurrence', 'hide'));
 		return $this;
 	}
 
@@ -169,7 +169,7 @@ 
 	 * @return Events
 	 */
 	public function whole_day() {
-		$this->set_events( $this->filter_property( 'whole_day', 'show' ) );
+		$this->set_events($this->filter_property('whole_day', 'show'));
 		return $this;
 	}
 
@@ -181,7 +181,7 @@ 
 	 * @return Events
 	 */
 	public function not_whole_day() {
-		$this->set_events( $this->filter_property( 'whole_day', 'hide' ) );
+		$this->set_events($this->filter_property('whole_day', 'hide'));
 		return $this;
 	}
 
@@ -193,7 +193,7 @@ 
 	 * @return Events
 	 */
 	public function multi_day() {
-		$this->set_events( $this->filter_property( 'multiple_days', 'show' ) );
+		$this->set_events($this->filter_property('multiple_days', 'show'));
 		return $this;
 	}
 
@@ -205,7 +205,7 @@ 
 	 * @return Events
 	 */
 	public function single_day() {
-		$this->set_events( $this->filter_property( 'multiple_days', 'hide' ) );
+		$this->set_events($this->filter_property('multiple_days', 'hide'));
 		return $this;
 	}
 
@@ -217,7 +217,7 @@ 
 	 * @return Events
 	 */
 	public function with_location() {
-		$this->set_events( $this->filter_property( 'venue', 'show' ) );
+		$this->set_events($this->filter_property('venue', 'show'));
 		return $this;
 	}
 
@@ -229,7 +229,7 @@ 
 	 * @return Events
 	 */
 	public function without_location() {
-		$this->set_events( $this->filter_property( 'venue', 'hide' ) );
+		$this->set_events($this->filter_property('venue', 'hide'));
 		return $this;
 	}
 
@@ -244,18 +244,18 @@ 
 	 *
 	 * @return array
 	 */
-	private function filter_property( $property, $toggle ) {
+	private function filter_property($property, $toggle) {
 		$filtered = array();
-		if ( ! empty( $this->events ) ) {
-			foreach ( $this->events as $ts => $events ) {
-				foreach ( $events as $event ) {
-					if ( 'hide' == $toggle ) {
-						if ( ! $event->$property ) {
-							$filtered[ $ts ][] = $event;
+		if ( ! empty($this->events)) {
+			foreach ($this->events as $ts => $events) {
+				foreach ($events as $event) {
+					if ('hide' == $toggle) {
+						if ( ! $event->$property) {
+							$filtered[$ts][] = $event;
 						}
-					} elseif ( 'show' == $toggle ) {
-						if ( $event->$property ) {
-							$filtered[ $ts ][] = $event;
+					} elseif ('show' == $toggle) {
+						if ($event->$property) {
+							$filtered[$ts][] = $event;
 						}
 					}
 				}
@@ -273,14 +273,14 @@ 
 	 *
 	 * @return Events
 	 */
-	public function future( $present = '' ) {
+	public function future($present = '') {
 		$last = $this->get_last();
 		$to = $last instanceof Event ? $last->start_utc : false;
-		if ( $to ) {
-			if ( empty( $present ) ) {
-				$present = Carbon::now( $this->timezone )->getTimestamp();
+		if ($to) {
+			if (empty($present)) {
+				$present = Carbon::now($this->timezone)->getTimestamp();
 			}
-			$this->set_events( $this->filter_events( intval( $present ), $to ) );
+			$this->set_events($this->filter_events(intval($present), $to));
 		}
 		return $this;
 	}
@@ -294,14 +294,14 @@ 
 	 *
 	 * @return Events
 	 */
-	public function past( $present = '' ) {
+	public function past($present = '') {
 		$first = $this->get_last();
 		$from  = $first instanceof Event ? $first->start_utc : false;
-		if ( $from ) {
-			if ( empty( $present ) ) {
-				$present = Carbon::now( $this->timezone )->getTimestamp();
+		if ($from) {
+			if (empty($present)) {
+				$present = Carbon::now($this->timezone)->getTimestamp();
 			}
-			$this->set_events( $this->filter_events( $from, intval( $present ) ) );
+			$this->set_events($this->filter_events($from, intval($present)));
 		}
 		return $this;
 	}
@@ -315,9 +315,9 @@ 
 	 *
 	 * @return Events
 	 */
-	public function after( $time ) {
-		$dt = $this->parse( $time );
-		return ! is_null( $dt ) ? $this->future( $dt->getTimestamp() ) : $this;
+	public function after($time) {
+		$dt = $this->parse($time);
+		return ! is_null($dt) ? $this->future($dt->getTimestamp()) : $this;
 	}
 
 	/**
@@ -329,9 +329,9 @@ 
 	 *
 	 * @return Events
 	 */
-	public function before( $time ) {
-		$dt = $this->parse( $time );
-		return ! is_null( $dt ) ? $this->past( $dt->getTimestamp() ) : $this;
+	public function before($time) {
+		$dt = $this->parse($time);
+		return ! is_null($dt) ? $this->past($dt->getTimestamp()) : $this;
 	}
 
 	/**
@@ -343,10 +343,10 @@ 
 	 *
 	 * @return Events
 	 */
-	public function from( $time ) {
-		$last = $this->parse( $time );
-		if ( ! is_null( $last ) ) {
-			$this->set_events( $this->filter_events( $time, $last->getTimestamp() ) );
+	public function from($time) {
+		$last = $this->parse($time);
+		if ( ! is_null($last)) {
+			$this->set_events($this->filter_events($time, $last->getTimestamp()));
 		}
 		return $this;
 	}
@@ -360,10 +360,10 @@ 
 	 *
 	 * @return Events
 	 */
-	public function to( $time ) {
-		$first = $this->parse( $time );
-		if ( ! is_null( $first ) ) {
-			$this->set_events( $this->filter_events( $first->getTimestamp(), $time ) );
+	public function to($time) {
+		$first = $this->parse($time);
+		if ( ! is_null($first)) {
+			$this->set_events($this->filter_events($first->getTimestamp(), $time));
 		}
 		return $this;
 	}
@@ -377,15 +377,15 @@ 
 	 *
 	 * @return null|Carbon
 	 */
-	private function parse( $time ) {
-		if ( is_int( $time ) ) {
-			return Carbon::createFromTimestamp( $time, $this->timezone );
-		} elseif ( is_string( $time ) && ! empty( $time ) ) {
-			return Carbon::parse( $time, $this->timezone );
-		} elseif ( $time instanceof Carbon ) {
-			return $time->setTimezone( $this->timezone );
-		} elseif ( $time instanceof \DateTime ) {
-			return Carbon::instance( $time )->setTimezone( $this->timezone );
+	private function parse($time) {
+		if (is_int($time)) {
+			return Carbon::createFromTimestamp($time, $this->timezone);
+		} elseif (is_string($time) && ! empty($time)) {
+			return Carbon::parse($time, $this->timezone);
+		} elseif ($time instanceof Carbon) {
+			return $time->setTimezone($this->timezone);
+		} elseif ($time instanceof \DateTime) {
+			return Carbon::instance($time)->setTimezone($this->timezone);
 		}
 		return null;
 	}
@@ -398,7 +398,7 @@ 
 	 * @return null|Event
 	 */
 	public function get_first() {
-		return array_shift( $this->events );
+		return array_shift($this->events);
 	}
 
 	/**
@@ -409,7 +409,7 @@ 
 	 * @return null|Event
 	 */
 	public function get_last() {
-		return array_pop( $this->events );
+		return array_pop($this->events);
 	}
 
 	/**
@@ -420,7 +420,7 @@ 
 	 * @return null|Event
 	 */
 	public function get_upcoming() {
-		return $this->get_closest( 'future' );
+		return $this->get_closest('future');
 	}
 
 	/**
@@ -431,7 +431,7 @@ 
 	 * @return null|Event
 	 */
 	public function get_latest() {
-		return $this->get_closest( 'past' );
+		return $this->get_closest('past');
 	}
 
 	/**
@@ -444,11 +444,11 @@ 
 	 *
 	 * @return null|Event
 	 */
-	private function get_closest( $dir ) {
-		if ( 'future' == $dir ) {
-			return array_shift( $this->future()->get_events() );
-		} elseif ( 'past' == $dir ) {
-			return array_shift( $this->past()->get_events() );
+	private function get_closest($dir) {
+		if ('future' == $dir) {
+			return array_shift($this->future()->get_events());
+		} elseif ('past' == $dir) {
+			return array_shift($this->past()->get_events());
 		}
 		return null;
 	}
@@ -462,11 +462,11 @@ 
 	 *
 	 * @return array Multidimensional array with month number, week number and Event objects for each weekday.
 	 */
-	public function get_year( $year ) {
-		$y = intval( $year );
+	public function get_year($year) {
+		$y = intval($year);
 		$months = array();
-		for ( $m = 1; $m <= 12; $m++ ) {
-			$months[ strval( $m ) ] = $this->get_month( $y, $m );
+		for ($m = 1; $m <= 12; $m++) {
+			$months[strval($m)] = $this->get_month($y, $m);
 		}
 		return $months;
 	}
@@ -481,16 +481,16 @@ 
 	 *
 	 * @return array Multidimensional array with week number, day of the week and array of Event objects for each week day.
 	 */
-	public function get_month( $year, $month ) {
-		$y = intval( $year );
-		$m = min( max( 1, absint( $month ) ), 12 );
-		$days  = Carbon::createFromDate( $y, $m, 2, $this->timezone )->startOfMonth()->daysInMonth;
+	public function get_month($year, $month) {
+		$y = intval($year);
+		$m = min(max(1, absint($month)), 12);
+		$days  = Carbon::createFromDate($y, $m, 2, $this->timezone)->startOfMonth()->daysInMonth;
 		$weeks = array();
-		for ( $d = 1; $d < $days; $d++ ) {
-			$current = Carbon::createFromDate( $y, $m, $d );
+		for ($d = 1; $d < $days; $d++) {
+			$current = Carbon::createFromDate($y, $m, $d);
 			$week = $current->weekOfYear;
 			$day  = $current->dayOfWeek;
-			$weeks[ strval( $week ) ][ strval( $day ) ] = $this->get_day( $y, $m, $d );
+			$weeks[strval($week)][strval($day)] = $this->get_day($y, $m, $d);
 		}
 		return $weeks;
 	}
@@ -505,16 +505,16 @@ 
 	 *
 	 * @return array Associative array with day of the week for key and array of Event objects for value.
 	 */
-	public function get_week( $year, $week ) {
-		$y = intval( $year );
-		$w = absint( $week );
-		$m = date( 'n', strtotime( strval( $y ) . '-W' . strval( $w ) ) );
-		$month_dt = Carbon::createFromDate( $y, $m, 2, $this->timezone );
+	public function get_week($year, $week) {
+		$y = intval($year);
+		$w = absint($week);
+		$m = date('n', strtotime(strval($y).'-W'.strval($w)));
+		$month_dt = Carbon::createFromDate($y, $m, 2, $this->timezone);
 		$days = array();
-		for ( $d = 1; $d < $month_dt->daysInMonth; $d++ ) {
-			$current = Carbon::createFromDate( $y, $m, $d );
-			if ( $w == $current->weekOfYear ) {
-				$days[ strval( $current->dayOfWeek ) ] = $this->get_day( $y, $m, $d );
+		for ($d = 1; $d < $month_dt->daysInMonth; $d++) {
+			$current = Carbon::createFromDate($y, $m, $d);
+			if ($w == $current->weekOfYear) {
+				$days[strval($current->dayOfWeek)] = $this->get_day($y, $m, $d);
 			}
 		}
 		return $days;
@@ -531,13 +531,13 @@ 
 	 *
 	 * @return array Event objects for the day.
 	 */
-	public function get_day( $year, $month, $day ) {
-		$y = intval( $year );
-		$m = min( max( 1, absint( $month ) ), 12 );
-		$d = min( absint( $day ), 31 );
-		$from = Carbon::createFromDate( $y, $m, $d, $this->timezone )->startOfDay()->getTimestamp();
-		$to   = Carbon::createFromDate( $y, $m, $d, $this->timezone )->endOfDay()->getTimestamp();
-		return $this->filter_events( $from, $to );
+	public function get_day($year, $month, $day) {
+		$y = intval($year);
+		$m = min(max(1, absint($month)), 12);
+		$d = min(absint($day), 31);
+		$from = Carbon::createFromDate($y, $m, $d, $this->timezone)->startOfDay()->getTimestamp();
+		$to   = Carbon::createFromDate($y, $m, $d, $this->timezone)->endOfDay()->getTimestamp();
+		return $this->filter_events($from, $to);
 	}
 
 	/**
@@ -548,9 +548,9 @@ 
 	 * @return array Event objects for today.
 	 */
 	public function get_today() {
-		$start = Carbon::today( $this->timezone )->startOfDay()->getTimestamp();
-		$end   = Carbon::today( $this->timezone )->endOfDay()->getTimestamp();
-		return $this->filter_events( $start, $end );
+		$start = Carbon::today($this->timezone)->startOfDay()->getTimestamp();
+		$end   = Carbon::today($this->timezone)->endOfDay()->getTimestamp();
+		return $this->filter_events($start, $end);
 	}
 
 	/**
@@ -561,9 +561,9 @@ 
 	 * @return array Event objects for tomorrow.
 	 */
 	public function get_tomorrow() {
-		$start = Carbon::tomorrow( $this->timezone )->startOfDay()->getTimestamp();
-		$end   = Carbon::tomorrow( $this->timezone )->endOfDay()->getTimestamp();
-		return $this->filter_events( $start, $end );
+		$start = Carbon::tomorrow($this->timezone)->startOfDay()->getTimestamp();
+		$end   = Carbon::tomorrow($this->timezone)->endOfDay()->getTimestamp();
+		return $this->filter_events($start, $end);
 	}
 
 	/**
@@ -574,9 +574,9 @@ 
 	 * @return array Event objects for yesterday.
 	 */
 	public function get_yesterday() {
-		$start = Carbon::yesterday( $this->timezone )->startOfDay()->getTimestamp();
-		$end   = Carbon::yesterday( $this->timezone )->endOfDay()->getTimestamp();
-		return $this->filter_events( $start, $end );
+		$start = Carbon::yesterday($this->timezone)->startOfDay()->getTimestamp();
+		$end   = Carbon::yesterday($this->timezone)->endOfDay()->getTimestamp();
+		return $this->filter_events($start, $end);
 	}
 
 	/**
@@ -590,16 +590,16 @@ 
 	 *
 	 * @return array Filtered array of Event objects.
 	 */
-	private function filter_events( $from, $to ) {
-		$timestamps   = array_keys( $this->events );
-		$lower_bound  = array_filter( $timestamps,  function( $ts ) use( $from ) {
-			return intval( $ts ) > intval( $from );
+	private function filter_events($from, $to) {
+		$timestamps   = array_keys($this->events);
+		$lower_bound  = array_filter($timestamps, function($ts) use($from) {
+			return intval($ts) > intval($from);
 		} );
-		$higher_bound = array_filter( $lower_bound, function( $ts ) use( $to ) {
-			return intval( $ts ) > intval( $to );
+		$higher_bound = array_filter($lower_bound, function($ts) use($to) {
+			return intval($ts) > intval($to);
 		} );
-		$filtered = array_combine( $higher_bound, $higher_bound );
-		return array_intersect_key( $this->events, $filtered );
+		$filtered = array_combine($higher_bound, $higher_bound);
+		return array_intersect_key($this->events, $filtered);
 	}
 
 }

includes/functions/deprecated.php

Spacing +14 added lines, -14 removed lines

@@ -8,7 +8,7 @@ 
  * @deprecated
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -16,18 +16,18 @@ 
  * Print a calendar.
  * @deprecated Use simcal_print_calendar()
  */
-function gce_print_calendar( $feed_ids, $display, $args  ) {
+function gce_print_calendar($feed_ids, $display, $args) {
 
 	$id = 0;
 
-	if ( is_numeric( $feed_ids ) ) {
-		$id = intval( $feed_ids );
-	} elseif ( is_array( $feed_ids ) ) {
-		$id = isset( $feed_ids[0] ) ? intval( $feed_ids[0] ) : '';
+	if (is_numeric($feed_ids)) {
+		$id = intval($feed_ids);
+	} elseif (is_array($feed_ids)) {
+		$id = isset($feed_ids[0]) ? intval($feed_ids[0]) : '';
 	}
 
-	if ( $id > 0 ) {
-		simcal_print_calendar( $id );
+	if ($id > 0) {
+		simcal_print_calendar($id);
 	}
 }
 
@@ -35,16 +35,16 @@ 
  * Convert date from mm/dd/yyyy to unix timestamp.
  * @deprecated Assumes a US-only time format.
  */
-function gce_date_unix( $date = '' ) {
-	if ( empty( $date ) ) {
-		$current_time = current_time( 'timestamp' );
-		$timestamp = mktime( 0, 0, 0, date( 'm', $current_time ), date( 'd', $current_time ), date( 'Y', $current_time ) );
+function gce_date_unix($date = '') {
+	if (empty($date)) {
+		$current_time = current_time('timestamp');
+		$timestamp = mktime(0, 0, 0, date('m', $current_time), date('d', $current_time), date('Y', $current_time));
 	} else {
-		$date = explode( '/', $date );
+		$date = explode('/', $date);
 		$month = $date[0];
 		$day   = $date[1];
 		$year  = $date[2];
-		$timestamp = mktime( 0, 0, 0, $month, $day, $year );
+		$timestamp = mktime(0, 0, 0, $month, $day, $year);
 	}
 	return $timestamp;
 }

includes/installation.php

Spacing +26 added lines, -26 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Admin\Pages;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -34,7 +34,7 @@ 
 		self::create_terms();
 		self::create_options();
 
-		do_action( 'simcal_activated' );
+		do_action('simcal_activated');
 	}
 
 	/**
@@ -46,7 +46,7 @@ 
 
 		flush_rewrite_rules();
 
-		do_action( 'simcal_deactivated' );
+		do_action('simcal_deactivated');
 	}
 
 	/**
@@ -66,10 +66,10 @@ 
 			)
 		);
 
-		foreach ( $taxonomies as $taxonomy => $terms ) {
-			foreach ( $terms as $term ) {
-				if ( ! get_term_by( 'slug', sanitize_title( $term ), $taxonomy ) ) {
-					wp_insert_term( $term, $taxonomy );
+		foreach ($taxonomies as $taxonomy => $terms) {
+			foreach ($terms as $term) {
+				if ( ! get_term_by('slug', sanitize_title($term), $taxonomy)) {
+					wp_insert_term($term, $taxonomy);
 				}
 			}
 		}
@@ -85,33 +85,33 @@ 
 
 		$default = '';
 		$page    = 'settings';
-		$settings_pages  = new Pages( $page );
+		$settings_pages  = new Pages($page);
 		$plugin_settings = $settings_pages->get_settings();
 
-		if ( $plugin_settings && is_array( $plugin_settings ) ) {
+		if ($plugin_settings && is_array($plugin_settings)) {
 
-			foreach ( $plugin_settings as $id => $settings ) {
+			foreach ($plugin_settings as $id => $settings) {
 
-				$group = 'simple-calendar_' . $page . '_' . $id;
+				$group = 'simple-calendar_'.$page.'_'.$id;
 
-				if ( isset( $settings['sections'] ) ) {
+				if (isset($settings['sections'])) {
 
-					if ( $settings['sections'] && is_array( $settings['sections'] ) ) {
+					if ($settings['sections'] && is_array($settings['sections'])) {
 
-						foreach ( $settings['sections'] as $section_id => $section ) {
+						foreach ($settings['sections'] as $section_id => $section) {
 
-							if ( isset( $section['fields'] ) ) {
+							if (isset($section['fields'])) {
 
-								if ( $section['fields'] && is_array( $section['fields'] ) ) {
+								if ($section['fields'] && is_array($section['fields'])) {
 
-									foreach ( $section['fields'] as $key => $field ) {
+									foreach ($section['fields'] as $key => $field) {
 
-										if ( isset ( $field['type'] ) ) {
+										if (isset ($field['type'])) {
 											// Maybe an associative array.
-											if ( is_int( $key ) ) {
-												$default[ $section_id ] = self::get_field_default_value( $field );
+											if (is_int($key)) {
+												$default[$section_id] = self::get_field_default_value($field);
 											} else {
-												$default[ $section_id ][ $key ] = self::get_field_default_value( $field );
+												$default[$section_id][$key] = self::get_field_default_value($field);
 											}
 										}
 
@@ -127,7 +127,7 @@ 
 
 				} // Are there sections?
 
-				add_option( $group, $default, '', true );
+				add_option($group, $default, '', true);
 
 				// Reset before looping next settings page.
 				$default = '';
@@ -147,12 +147,12 @@ 
 	 *
 	 * @return mixed
 	 */
-	private static function get_field_default_value( $field ) {
+	private static function get_field_default_value($field) {
 
-		$saved_value   = isset( $field['value'] )   ? $field['value']   : '';
-		$default_value = isset( $field['default'] ) ? $field['default'] : '';
+		$saved_value   = isset($field['value']) ? $field['value'] : '';
+		$default_value = isset($field['default']) ? $field['default'] : '';
 
-		return ! empty( $saved_value ) ? $saved_value : $default_value;
+		return ! empty($saved_value) ? $saved_value : $default_value;
 	}
 
 }

includes/post-types.php

Spacing +112 added lines, -112 removed lines

@@ -6,7 +6,7 @@ 
  */
 namespace SimpleCalendar;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -26,13 +26,13 @@ 
 	 */
 	public function __construct() {
 		// Register custom taxonomies.
-		add_action( 'init', array( __CLASS__, 'register_taxonomies' ), 5 );
+		add_action('init', array(__CLASS__, 'register_taxonomies'), 5);
 		// Register custom post types.
-		add_action( 'init', array( __CLASS__, 'register_post_types' ), 5 );
+		add_action('init', array(__CLASS__, 'register_post_types'), 5);
 		// Filter the calendar feed post content to display a calendar view.
-		add_filter( 'the_content', array( $this, 'filter_post_content' ), 100 );
+		add_filter('the_content', array($this, 'filter_post_content'), 100);
 		// Delete calendar transients and notices upon post deletion.
-		add_action( 'before_delete_post', array( $this, 'upon_deletion' ), 10, 1 );
+		add_action('before_delete_post', array($this, 'upon_deletion'), 10, 1);
 	}
 
 	/**
@@ -42,32 +42,32 @@ 
 	 */
 	public static function register_taxonomies() {
 
-		do_action( 'simcal_register_taxonomies' );
+		do_action('simcal_register_taxonomies');
 
-		if ( ! taxonomy_exists( 'calendar_feed' ) ) {
+		if ( ! taxonomy_exists('calendar_feed')) {
 
 			// Feed Type.
 			$labels = array(
-				'name'                       => __( 'Events Source Types', 'google-calendar-events' ),
-				'singular_name'              => __( 'Events Source Type', 'google-calendar-events' ),
-				'menu_name'                  => __( 'Events Source Type', 'google-calendar-events' ),
-				'all_items'                  => __( 'All Events Source Types', 'google-calendar-events' ),
-				'parent_item'                => __( 'Parent Events Source Type', 'google-calendar-events' ),
-				'parent_item_colon'          => __( 'Parent Events Source Type:', 'google-calendar-events' ),
-				'new_item_name'              => __( 'New Events Source Type', 'google-calendar-events' ),
-				'add_new_item'               => __( 'Add New Events Source Type', 'google-calendar-events' ),
-				'edit_item'                  => __( 'Edit Events Source Type', 'google-calendar-events' ),
-				'update_item'                => __( 'Update Events Source Type', 'google-calendar-events' ),
-				'view_item'                  => __( 'View Events Source Type', 'google-calendar-events' ),
-				'separate_items_with_commas' => __( 'Separate events source types with commas', 'google-calendar-events' ),
-				'add_or_remove_items'        => __( 'Add or remove events source types', 'google-calendar-events' ),
-				'choose_from_most_used'      => __( 'Choose from the most used', 'google-calendar-events' ),
-				'popular_items'              => __( 'Popular events source types', 'google-calendar-events' ),
-				'search_items'               => __( 'Search Events Source Types', 'google-calendar-events' ),
-				'not_found'                  => __( 'Not Found', 'google-calendar-events' ),
+				'name'                       => __('Events Source Types', 'google-calendar-events'),
+				'singular_name'              => __('Events Source Type', 'google-calendar-events'),
+				'menu_name'                  => __('Events Source Type', 'google-calendar-events'),
+				'all_items'                  => __('All Events Source Types', 'google-calendar-events'),
+				'parent_item'                => __('Parent Events Source Type', 'google-calendar-events'),
+				'parent_item_colon'          => __('Parent Events Source Type:', 'google-calendar-events'),
+				'new_item_name'              => __('New Events Source Type', 'google-calendar-events'),
+				'add_new_item'               => __('Add New Events Source Type', 'google-calendar-events'),
+				'edit_item'                  => __('Edit Events Source Type', 'google-calendar-events'),
+				'update_item'                => __('Update Events Source Type', 'google-calendar-events'),
+				'view_item'                  => __('View Events Source Type', 'google-calendar-events'),
+				'separate_items_with_commas' => __('Separate events source types with commas', 'google-calendar-events'),
+				'add_or_remove_items'        => __('Add or remove events source types', 'google-calendar-events'),
+				'choose_from_most_used'      => __('Choose from the most used', 'google-calendar-events'),
+				'popular_items'              => __('Popular events source types', 'google-calendar-events'),
+				'search_items'               => __('Search Events Source Types', 'google-calendar-events'),
+				'not_found'                  => __('Not Found', 'google-calendar-events'),
 			);
 
-			$args   = array(
+			$args = array(
 				'hierarchical'      => true,
 				'labels'            => $labels,
 				'public'            => false,
@@ -76,34 +76,34 @@ 
 				'show_tagcloud'     => false,
 				'show_ui'           => false,
 			);
-			register_taxonomy( 'calendar_feed', array( 'calendar' ), $args );
+			register_taxonomy('calendar_feed', array('calendar'), $args);
 
 		}
 
-		if ( ! taxonomy_exists( 'calendar_type' ) ) {
+		if ( ! taxonomy_exists('calendar_type')) {
 
 			// Calendar Type.
 			$labels = array(
-				'name'                       => __( 'Calendar Types', 'google-calendar-events' ),
-				'singular_name'              => __( 'Calendar Type', 'google-calendar-events' ),
-				'menu_name'                  => __( 'Calendar Type', 'google-calendar-events' ),
-				'all_items'                  => __( 'All Calendar Types', 'google-calendar-events' ),
-				'parent_item'                => __( 'Parent Calendar Type', 'google-calendar-events' ),
-				'parent_item_colon'          => __( 'Parent Calendar Type:', 'google-calendar-events' ),
-				'new_item_name'              => __( 'New Calendar Type', 'google-calendar-events' ),
-				'add_new_item'               => __( 'Add New Calendar Type', 'google-calendar-events' ),
-				'edit_item'                  => __( 'Edit Calendar Type', 'google-calendar-events' ),
-				'update_item'                => __( 'Update Calendar Type', 'google-calendar-events' ),
-				'view_item'                  => __( 'View Calendar Type', 'google-calendar-events' ),
-				'separate_items_with_commas' => __( 'Separate calendar types with commas', 'google-calendar-events' ),
-				'add_or_remove_items'        => __( 'Add or remove calendar types', 'google-calendar-events' ),
-				'choose_from_most_used'      => __( 'Choose from the most used', 'google-calendar-events' ),
-				'popular_items'              => __( 'Popular calendar types', 'google-calendar-events' ),
-				'search_items'               => __( 'Search Calendar Types', 'google-calendar-events' ),
-				'not_found'                  => __( 'Not Found', 'google-calendar-events' ),
+				'name'                       => __('Calendar Types', 'google-calendar-events'),
+				'singular_name'              => __('Calendar Type', 'google-calendar-events'),
+				'menu_name'                  => __('Calendar Type', 'google-calendar-events'),
+				'all_items'                  => __('All Calendar Types', 'google-calendar-events'),
+				'parent_item'                => __('Parent Calendar Type', 'google-calendar-events'),
+				'parent_item_colon'          => __('Parent Calendar Type:', 'google-calendar-events'),
+				'new_item_name'              => __('New Calendar Type', 'google-calendar-events'),
+				'add_new_item'               => __('Add New Calendar Type', 'google-calendar-events'),
+				'edit_item'                  => __('Edit Calendar Type', 'google-calendar-events'),
+				'update_item'                => __('Update Calendar Type', 'google-calendar-events'),
+				'view_item'                  => __('View Calendar Type', 'google-calendar-events'),
+				'separate_items_with_commas' => __('Separate calendar types with commas', 'google-calendar-events'),
+				'add_or_remove_items'        => __('Add or remove calendar types', 'google-calendar-events'),
+				'choose_from_most_used'      => __('Choose from the most used', 'google-calendar-events'),
+				'popular_items'              => __('Popular calendar types', 'google-calendar-events'),
+				'search_items'               => __('Search Calendar Types', 'google-calendar-events'),
+				'not_found'                  => __('Not Found', 'google-calendar-events'),
 			);
 
-			$args   = array(
+			$args = array(
 				'hierarchical'      => true,
 				'labels'            => $labels,
 				'public'            => false,
@@ -112,34 +112,34 @@ 
 				'show_tagcloud'     => false,
 				'show_ui'           => false,
 			);
-			register_taxonomy( 'calendar_type', array( 'calendar' ), $args );
+			register_taxonomy('calendar_type', array('calendar'), $args);
 
 		}
 
-		if ( ! taxonomy_exists( 'calendar_category' ) ) {
+		if ( ! taxonomy_exists('calendar_category')) {
 
 			// Feed Category.
 			$labels = array(
-				'name'                       => __( 'Categories', 'google-calendar-events' ),
-				'singular_name'              => __( 'Category', 'google-calendar-events' ),
-				'menu_name'                  => __( 'Categories', 'google-calendar-events' ),
-				'all_items'                  => __( 'All Categories', 'google-calendar-events' ),
-				'parent_item'                => __( 'Parent Category', 'google-calendar-events' ),
-				'parent_item_colon'          => __( 'Parent Category:', 'google-calendar-events' ),
-				'new_item_name'              => __( 'New Category', 'google-calendar-events' ),
-				'add_new_item'               => __( 'Add New Category', 'google-calendar-events' ),
-				'edit_item'                  => __( 'Edit Category', 'google-calendar-events' ),
-				'update_item'                => __( 'Update Category', 'google-calendar-events' ),
-				'view_item'                  => __( 'View Category', 'google-calendar-events' ),
-				'separate_items_with_commas' => __( 'Separate categories with commas', 'google-calendar-events' ),
-				'add_or_remove_items'        => __( 'Add or remove categories', 'google-calendar-events' ),
-				'choose_from_most_used'      => __( 'Choose from the most used', 'google-calendar-events' ),
-				'popular_items'              => __( 'Popular Categories', 'google-calendar-events' ),
-				'search_items'               => __( 'Search Categories', 'google-calendar-events' ),
-				'not_found'                  => __( 'Not Found', 'google-calendar-events' ),
+				'name'                       => __('Categories', 'google-calendar-events'),
+				'singular_name'              => __('Category', 'google-calendar-events'),
+				'menu_name'                  => __('Categories', 'google-calendar-events'),
+				'all_items'                  => __('All Categories', 'google-calendar-events'),
+				'parent_item'                => __('Parent Category', 'google-calendar-events'),
+				'parent_item_colon'          => __('Parent Category:', 'google-calendar-events'),
+				'new_item_name'              => __('New Category', 'google-calendar-events'),
+				'add_new_item'               => __('Add New Category', 'google-calendar-events'),
+				'edit_item'                  => __('Edit Category', 'google-calendar-events'),
+				'update_item'                => __('Update Category', 'google-calendar-events'),
+				'view_item'                  => __('View Category', 'google-calendar-events'),
+				'separate_items_with_commas' => __('Separate categories with commas', 'google-calendar-events'),
+				'add_or_remove_items'        => __('Add or remove categories', 'google-calendar-events'),
+				'choose_from_most_used'      => __('Choose from the most used', 'google-calendar-events'),
+				'popular_items'              => __('Popular Categories', 'google-calendar-events'),
+				'search_items'               => __('Search Categories', 'google-calendar-events'),
+				'not_found'                  => __('Not Found', 'google-calendar-events'),
 			);
 
-			$args   = array(
+			$args = array(
 				'hierarchical'      => true,
 				'labels'            => $labels,
 				'public'            => true,
@@ -149,7 +149,7 @@ 
 				'show_ui'           => true,
 			);
 
-			register_taxonomy( 'calendar_category', array( 'calendar' ), $args );
+			register_taxonomy('calendar_category', array('calendar'), $args);
 		}
 
 	}
@@ -161,27 +161,27 @@ 
 	 */
 	public static function register_post_types() {
 
-		do_action( 'simcal_register_post_types' );
+		do_action('simcal_register_post_types');
 
-		if ( ! post_type_exists( 'calendar' ) ) {
+		if ( ! post_type_exists('calendar')) {
 
 			// Calendar feed post type.
-			$labels        = array(
-				'name'               => _x( 'Calendars', 'Post Type General Name', 'google-calendar-events' ),
-				'singular_name'      => _x( 'Calendar', 'Post Type Singular Name', 'google-calendar-events' ),
-				'menu_name'          => __( 'Calendars', 'google-calendar-events' ),
-				'name_admin_bar'     => __( 'Calendar', 'google-calendar-events' ),
-				'parent_item_colon'  => __( 'Parent Calendar:', 'google-calendar-events' ),
-				'all_items'          => __( 'All Calendars', 'google-calendar-events' ),
-				'add_new_item'       => __( 'Add New Calendar', 'google-calendar-events' ),
-				'add_new'            => __( 'Add New', 'google-calendar-events' ),
-				'new_item'           => __( 'New Calendar', 'google-calendar-events' ),
-				'edit_item'          => __( 'Edit Calendar', 'google-calendar-events' ),
-				'update_item'        => __( 'Update Calendar', 'google-calendar-events' ),
-				'view_item'          => __( 'View Calendar', 'google-calendar-events' ),
-				'search_items'       => __( 'Search Calendar', 'google-calendar-events' ),
-				'not_found'          => __( 'Calendars not found', 'google-calendar-events' ),
-				'not_found_in_trash' => __( 'Calendars not found in Trash', 'google-calendar-events' ),
+			$labels = array(
+				'name'               => _x('Calendars', 'Post Type General Name', 'google-calendar-events'),
+				'singular_name'      => _x('Calendar', 'Post Type Singular Name', 'google-calendar-events'),
+				'menu_name'          => __('Calendars', 'google-calendar-events'),
+				'name_admin_bar'     => __('Calendar', 'google-calendar-events'),
+				'parent_item_colon'  => __('Parent Calendar:', 'google-calendar-events'),
+				'all_items'          => __('All Calendars', 'google-calendar-events'),
+				'add_new_item'       => __('Add New Calendar', 'google-calendar-events'),
+				'add_new'            => __('Add New', 'google-calendar-events'),
+				'new_item'           => __('New Calendar', 'google-calendar-events'),
+				'edit_item'          => __('Edit Calendar', 'google-calendar-events'),
+				'update_item'        => __('Update Calendar', 'google-calendar-events'),
+				'view_item'          => __('View Calendar', 'google-calendar-events'),
+				'search_items'       => __('Search Calendar', 'google-calendar-events'),
+				'not_found'          => __('Calendars not found', 'google-calendar-events'),
+				'not_found_in_trash' => __('Calendars not found in Trash', 'google-calendar-events'),
 			);
 
 			$rewrite_rules = array(
@@ -193,12 +193,12 @@ 
 
 			$svg_icon = 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9HcmFwaGljcy9TVkcvMS4xL0RURC9zdmcxMS5kdGQiPjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iU2hhcGVzX3hBMF9JbWFnZV8xXyIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeD0iMHB4IiB5PSIwcHgiIHZpZXdCb3g9IjAgMCAxMDI0IDEwMjQiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDEwMjQgMTAyNCIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+PHBhdGggZmlsbD0ibm9uZSIgc3Ryb2tlPSIjMDAwMDAwIiBzdHJva2UtbWl0ZXJsaW1pdD0iMTAiIGQ9Ik01MTMuNCwxMDEzLjNjLTE2My44LDAtMzI3LjcsMC00OTEuNSwwYy05LjcsMC04LjgsMC45LTguOC04LjljMC0yNDMuNywwLjItNDg3LjMtMC4zLTczMWMtMC4xLTM5LjYsMjcuNy03Ni40LDY5LjYtODIuM2MzLTAuNCw2LTAuNSw5LTAuNWMzNSwwLDcwLDAuMSwxMDUtMC4xYzUuMSwwLDYuNSwxLjQsNi41LDYuNWMtMC4yLDI2LjgsMC4xLDUzLjctMC4yLDgwLjVjLTAuMiwxNS4yLDMuOSwyOC4yLDE1LjksMzguMmMyLjcsMi4yLDUsNC44LDcuNCw3LjRjOCw4LjYsMTguMSwxMi40LDI5LjYsMTIuNGMzMC43LDAuMiw2MS4zLDAuMiw5MiwwYzExLjItMC4xLDIxLjItMy45LDI5LjEtMTIuMmMzLjQtMy42LDctNy4yLDEwLjYtMTAuNmM5LTguNCwxMi43LTE4LjksMTIuNy0zMWMwLjEtMjguMiwwLTU2LjMsMC04NC41YzAtNi42LDAtNi42LDYuNi02LjZjNzEuNSwwLDE0MywwLDIxNC41LDBjNi42LDAsNi42LDAsNi42LDYuN2MwLDI2LjgsMC4yLDUzLjctMC4xLDgwLjVjLTAuMiwxNSw1LjEsMjYuOCwxNS40LDM4YzEzLjYsMTQuNywyOC45LDIwLjgsNDguNywyMC4xYzI1LjYtMSw1MS4zLTAuNCw3Ny0wLjJjMTMuOSwwLjEsMjQuOC01LjEsMzUuNC0xNC40YzE1LjktMTQsMjIuMS0zMC40LDIxLjEtNTEuM2MtMS4xLTI0LjMtMC4xLTQ4LjctMC40LTczYzAtNS4xLDEuNC02LjUsNi41LTYuNWMzNC43LDAuMiw2OS4zLDAsMTA0LDAuMWM0Mi4zLDAuMiw3OC4zLDM2LDc4LjMsNzguM2MwLjEsMjQ2LDAsNDkyLDAsNzM4YzAsNi40LDAsNi40LTcuMyw2LjRDODQyLDEwMTMuMyw2NzcuNywxMDEzLjMsNTEzLjQsMTAxMy4zeiBNNDM5LjUsNjc4LjljMS42LTEsMi4yLTEuNSwzLTEuOGMxMS44LTUuOCwyMS41LTE0LjIsMjktMjQuOGMyNC4zLTM0LjEsMjQuMy03MC45LDguNi0xMDcuOGMtMTMuMy0zMS4zLTM5LjMtNDkuMy03MS01OS40Yy0yNy42LTguOC01Ni05LjQtODQuNS01LjZjLTIwLjMsMi43LTM5LjIsOS42LTU1LjUsMjIuMmMtMzUuNSwyNy4yLTQ4LjQsNjUuMS01MC40LDEwOGMtMC4yLDMuNywyLjEsMy45LDQuOCwzLjljMjIuMiwwLDQ0LjMtMC4xLDY2LjUsMGMzLjgsMCw1LjQtMS4xLDUuMy01LjFjLTAuMS03LjcsMS0xNS4zLDMtMjIuN2M1LjQtMjAsMTYuNS0zNC43LDM3LjgtMzkuN2M4LjEtMS45LDE2LjMtMi4xLDI0LjQtMS4zYzIxLjQsMi4xLDM2LjMsMTMuMSw0My41LDMzLjdjMy41LDEwLjEsMy45LDIwLjQsMi45LDMxYy0yLjIsMjMuNC0xNi4yLDM5LjctMzkuMSw0NC42Yy0xMy4yLDIuOC0yNi42LDQuMS00MC4yLDRjLTMuNywwLTUsMS4yLTQuOSw0LjljMC4xLDE2LjUsMC4yLDMzLDAsNDkuNWMwLDQsMS41LDUuMiw1LjMsNS4xYzEyLjktMC4zLDI1LjYsMC45LDM4LjMsM2MyNi4zLDQuMiw0My41LDE4LjgsNDkuMiw0MmMzLjMsMTMuNSwzLDI3LjEtMC4yLDQwLjZjLTIuMyw5LjctNi44LDE4LjQtMTMuOCwyNS43Yy0xNS40LDE2LjEtMzQuNSwyMS42LTU2LDE4LjljLTI3LjUtMy40LTQzLjUtMTgtNTAuNS00NC44Yy0xLjktNy4zLTMuMS0xNC43LTIuOC0yMi4yYzAuMi00LTEuMS01LjYtNS40LTUuNmMtMjMuNywwLjItNDcuMywwLjItNzEsMGMtNCwwLTUuNCwxLjItNC45LDUuMmMxLjQsMTMuMiwyLjcsMjYuNSw1LjksMzkuNWMxMS4xLDQ1LjIsMzguMiw3NS42LDgzLjQsODguMmMzNi43LDEwLjMsNzMuOCwxMC4xLDExMC41LDAuMWMyNC41LTYuNiw0NC43LTIwLjEsNjEtMzkuOGMyNC41LTI5LjcsMzQuNC02My45LDMxLjQtMTAxLjljLTIuMi0yNy40LTEyLjUtNTEuMy0zMy42LTY5LjhDNDYwLjcsNjg5LjMsNDUxLjksNjgyLDQzOS41LDY3OC45eiBNNzU1LDY5Mi41YzAtNjguNi0wLjEtMTM3LjMsMC4xLTIwNS45YzAtNS4xLTEuNC02LjUtNi41LTYuNGMtMTguMywwLjMtMzYuNywwLjQtNTUsMGMtNS43LTAuMS03LjIsMS45LTguMiw3Yy01LjksMzIuMS0yNC40LDUzLTU2LjMsNjEuMWMtMTcuNSw0LjUtMzUuNiw1LTUzLjUsNS44Yy0zLjksMC4yLTUuMiwxLjQtNS4yLDUuM2MwLjIsMTUuMywwLjIsMzAuNywwLDQ2Yy0wLjEsNC4zLDEuNiw1LjQsNS42LDUuM2MxNC4yLTAuMiwyOC4zLTAuMSw0Mi41LTAuMWMxNS41LDAsMzEsMC4xLDQ2LjUtMC4xYzQuMSwwLDUuOSwxLjMsNS41LDUuNGMtMC4xLDEuNywwLDMuMywwLDVjMCw5Mi4xLDAsMTg0LjMsMCwyNzYuNGMwLDcuMiwwLDcuMiw3LDcuMmMyMy41LDAsNDcsMCw3MC41LDBjNywwLDcsMCw3LTcuMkM3NTUsODI5LjEsNzU1LDc2MC44LDc1NSw2OTIuNXoiLz48cGF0aCBmaWxsPSJub25lIiBzdHJva2U9IiMwMDAwMDAiIHN0cm9rZS1taXRlcmxpbWl0PSIxMCIgZD0iTTM3Ni43LDE5OS4yYzAsMjQuMiwwLDQ4LjMsMCw3Mi41Yy0wLjEsMjMuMS0xNy40LDQwLjUtNDAuNCw0MC42Yy0yMy4zLDAuMS00Ni42LDAuMS03MCwwYy0yMi44LTAuMS00MC4zLTE3LjQtNDAuMy00MC4xYy0wLjEtNDguNS0wLjEtOTYuOSwwLTE0NS40YzAtMjIuNCwxNy41LTQwLDM5LjktNDAuMWMyMy43LTAuMSw0Ny4zLTAuMSw3MSwwYzIyLjQsMC4xLDM5LjgsMTcuNywzOS44LDQwLjFDMzc2LjgsMTUwLjksMzc2LjcsMTc1LjEsMzc2LjcsMTk5LjJ6Ii8+PHBhdGggZmlsbD0ibm9uZSIgc3Ryb2tlPSIjMDAwMDAwIiBzdHJva2UtbWl0ZXJsaW1pdD0iMTAiIGQ9Ik04MDEuNywxOTkuNmMwLDI0LDAsNDgsMCw3MmMwLDIzLjQtMTcuMyw0MC43LTQwLjcsNDAuOGMtMjMuMiwwLjEtNDYuMywwLjEtNjkuNSwwYy0yMy4xLTAuMS00MC41LTE3LjQtNDAuNS00MC41Yy0wLjEtNDguMy0wLjEtOTYuNiwwLTE0NC45YzAtMjIuNywxNy41LTQwLjIsNDAuMi00MC4zYzIzLjMtMC4xLDQ2LjYtMC4xLDcwLDBjMjMuMSwwLjEsNDAuNCwxNy40LDQwLjUsNDAuNUM4MDEuOCwxNTEuMyw4MDEuNywxNzUuNCw4MDEuNywxOTkuNnoiLz48L3N2Zz4=';
 
-			$args          = array(
+			$args = array(
 				'capability_type'     => 'post',
 				'exclude_from_search' => false,
 				'has_archive'         => false,
 				'hierarchical'        => false,
-				'label'               => __( 'Calendar', 'google-calendar-events' ),
+				'label'               => __('Calendar', 'google-calendar-events'),
 				'labels'              => $labels,
 				'query_var'           => true,
 				'public'              => true,
@@ -210,7 +210,7 @@ 
 				'show_in_menu'        => true,
 				'show_in_nav_menus'   => true,
 				'show_ui'             => true,
-				'supports'            => array( 'title', 'editor' ),
+				'supports'            => array('title', 'editor'),
 				'taxonomies'          => array(
 					'calendar_category',
 					'calendar_feed',
@@ -218,7 +218,7 @@ 
 				),
 			);
 
-			register_post_type( 'calendar', $args );
+			register_post_type('calendar', $args);
 		}
 
 	}
@@ -232,49 +232,49 @@ 
 	 *
 	 * @return string
 	 */
-	public function filter_post_content( $the_content ) {
+	public function filter_post_content($the_content) {
 
-		if ( is_singular() ) {
+		if (is_singular()) {
 
 			global $post;
 
-			if ( 'calendar' == $post->post_type ) {
+			if ('calendar' == $post->post_type) {
 
-				if ( is_admin() && ! defined( 'DOING_AJAX' ) ) {
+				if (is_admin() && ! defined('DOING_AJAX')) {
 					return '';
 				} else {
 					ob_start();
-					simcal_print_calendar( $post );
+					simcal_print_calendar($post);
 					return ob_get_clean();
 				}
 
 			} else {
 
 				$post_types = array();
-				$settings   = get_option( 'simple-calendar_settings_calendars' );
-				if ( isset( $settings['general']['attach_calendars_posts'] ) ) {
+				$settings   = get_option('simple-calendar_settings_calendars');
+				if (isset($settings['general']['attach_calendars_posts'])) {
 					$post_types = $settings['general']['attach_calendars_posts'];
 				}
 
-				if ( empty( $post_types ) ) {
+				if (empty($post_types)) {
 					return $the_content;
 				}
 
-				if ( in_array( $post->post_type, (array) $post_types ) ) {
+				if (in_array($post->post_type, (array) $post_types)) {
 
-					$id = absint( get_post_meta( $post->ID, '_simcal_attach_calendar_id', true ) );
+					$id = absint(get_post_meta($post->ID, '_simcal_attach_calendar_id', true));
 
-					if ( $id > 0 ) {
+					if ($id > 0) {
 
-						$pos = esc_attr( get_post_meta( $post->ID, '_simcal_attach_calendar_position', true ) );
+						$pos = esc_attr(get_post_meta($post->ID, '_simcal_attach_calendar_position', true));
 
 						ob_start();
 
-						if ( 'after' == $pos ) {
+						if ('after' == $pos) {
 							echo $the_content;
-							simcal_print_calendar( $id );
-						} elseif ( 'before' == $pos ) {
-							simcal_print_calendar( $id );
+							simcal_print_calendar($id);
+						} elseif ('before' == $pos) {
+							simcal_print_calendar($id);
 							echo $the_content;
 						} else {
 							echo $the_content;
@@ -300,20 +300,20 @@ 
 	 *
 	 * @param $post_id
 	 */
-	public function upon_deletion( $post_id ) {
+	public function upon_deletion($post_id) {
 
-		$post_type = get_post_type( $post_id );
+		$post_type = get_post_type($post_id);
 
-		if ( 'calendar' == $post_type ) {
+		if ('calendar' == $post_type) {
 
-			$notices = get_option( 'simple-calendar_admin_notices', array() );
+			$notices = get_option('simple-calendar_admin_notices', array());
 
-			if ( ! empty( $notices ) && isset( $notices[ 'calendar_' . strval( $post_id ) ] ) ) {
-				unset( $notices[ 'calendar_' . strval( $post_id ) ] );
-				update_option( 'simple-calendar_admin_notices', $notices );
+			if ( ! empty($notices) && isset($notices['calendar_'.strval($post_id)])) {
+				unset($notices['calendar_'.strval($post_id)]);
+				update_option('simple-calendar_admin_notices', $notices);
 			}
 
-			simcal_delete_feed_transients( $post_id );
+			simcal_delete_feed_transients($post_id);
 		}
 	}
 

includes/shortcodes.php

Spacing +12 added lines, -12 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Abstracts\Calendar;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -29,7 +29,7 @@ 
 	public function __construct() {
 
 		// Add shortcodes.
-		add_action( 'init', array( $this, 'register' ) );
+		add_action('init', array($this, 'register'));
 	}
 
 	/**
@@ -39,11 +39,11 @@ 
 	 */
 	public function register() {
 
-		add_shortcode( 'calendar', array( $this, 'print_calendar' ) );
+		add_shortcode('calendar', array($this, 'print_calendar'));
 		// @deprecated legacy shortcode
-		add_shortcode( 'gcal', array( $this, 'print_calendar' ) );
+		add_shortcode('gcal', array($this, 'print_calendar'));
 
-		do_action( 'simcal_add_shortcodes' );
+		do_action('simcal_add_shortcodes');
 	}
 
 	/**
@@ -55,19 +55,19 @@ 
 	 *
 	 * @return string
 	 */
-	public function print_calendar( $attributes ) {
+	public function print_calendar($attributes) {
 
-		$args = shortcode_atts( array(
+		$args = shortcode_atts(array(
 			'id' => null,
-		), $attributes );
+		), $attributes);
 
-		$id = absint( $args['id'] );
+		$id = absint($args['id']);
 
-		if ( $id > 0 ) {
+		if ($id > 0) {
 
-			$calendar = simcal_get_calendar( $id );
+			$calendar = simcal_get_calendar($id);
 
-			if ( $calendar instanceof Calendar ) {
+			if ($calendar instanceof Calendar) {
 				ob_start();
 				$calendar->html();
 				return ob_get_clean();