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 admin_url( 'admin.php?page=simple-calendar_settings' ); ?>"
+				><?php _e('Calendars', 'google-calendar-events'); ?></a>
+			<a href="<?php echo admin_url('admin.php?page=simple-calendar_settings'); ?>"
 			   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/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/assets.php

Spacing +106 added lines, -106 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Abstracts\Calendar_View;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -76,24 +76,24 @@ 
 	 */
 	public function __construct() {
 
-		$this->min = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG == true ) ? '' : '.min';
+		$this->min = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG == true) ? '' : '.min';
 
-		$settings = get_option( 'simple-calendar_settings_advanced' );
-		if ( isset( $settings['assets']['disable_js'] ) ) {
+		$settings = get_option('simple-calendar_settings_advanced');
+		if (isset($settings['assets']['disable_js'])) {
 			$this->disable_scripts = 'yes' == $settings['assets']['disable_js'] ? true : false;
 		}
 
-		if ( isset( $settings['assets']['disable_css'] ) ) {
+		if (isset($settings['assets']['disable_css'])) {
 			$this->disable_styles = 'yes' == $settings['assets']['disable_css'] ? true : false;
 		}
 
-		if ( isset( $settings['assets']['always_enqueue'] ) ) {
+		if (isset($settings['assets']['always_enqueue'])) {
 			$this->always_enqueue = 'yes' == $settings['assets']['always_enqueue'] ? true : false;
 		}
 
-		add_action( 'init', array( $this, 'register' ), 20 );
-		add_action( 'init', array( $this, 'enqueue' ), 40 );
-		add_action( 'wp_print_styles', array( $this, 'disable' ), 100 );
+		add_action('init', array($this, 'register'), 20);
+		add_action('init', array($this, 'enqueue'), 40);
+		add_action('wp_print_styles', array($this, 'disable'), 100);
 	}
 
 	/**
@@ -102,7 +102,7 @@ 
 	 * @since 3.0.0
 	 */
 	public function register() {
-		do_action( 'simcal_register_assets', $this->min );
+		do_action('simcal_register_assets', $this->min);
 	}
 
 	/**
@@ -112,25 +112,25 @@ 
 	 */
 	public function enqueue() {
 
-		add_action( 'wp_enqueue_scripts', array( $this, 'load' ), 10 );
+		add_action('wp_enqueue_scripts', array($this, 'load'), 10);
 
-		do_action( 'simcal_enqueue_assets', $this->min );
+		do_action('simcal_enqueue_assets', $this->min);
 
-		if ( false === $this->disable_scripts ) {
+		if (false === $this->disable_scripts) {
 			$min = $this->min;
 			// Improves compatibility with themes and plugins using Isotope and Masonry.
-			add_action( 'wp_enqueue_scripts',
-				function () use ( $min ) {
-					if ( wp_script_is( 'simcal-qtip', 'enqueued' ) ) {
+			add_action('wp_enqueue_scripts',
+				function() use ($min) {
+					if (wp_script_is('simcal-qtip', 'enqueued')) {
 						wp_enqueue_script(
 							'simplecalendar-imagesloaded',
-							SIMPLE_CALENDAR_ASSETS . 'js/vendor/imagesloaded' . $min . '.js',
-							array( 'simcal-qtip' ),
+							SIMPLE_CALENDAR_ASSETS.'js/vendor/imagesloaded'.$min.'.js',
+							array('simcal-qtip'),
 							'3.1.8',
 							true
 						);
 					}
-				}, 1000 );
+				}, 1000);
 		}
 	}
 
@@ -141,15 +141,15 @@ 
 	 */
 	public function load() {
 
-		if ( $this->always_enqueue ) {
+		if ($this->always_enqueue) {
 			$scripts = $this->get_default_scripts();
 			$styles  = $this->get_default_styles();
 
-			$this->scripts = apply_filters( 'simcal_front_end_scripts', $scripts, $this->min );
-			$this->styles  = apply_filters( 'simcal_front_end_styles', $styles, $this->min );
+			$this->scripts = apply_filters('simcal_front_end_scripts', $scripts, $this->min);
+			$this->styles  = apply_filters('simcal_front_end_styles', $styles, $this->min);
 
-			$this->load_scripts( $this->scripts );
-			$this->load_styles( $this->styles );
+			$this->load_scripts($this->scripts);
+			$this->load_styles($this->styles);
 
 			return;
 		}
@@ -158,33 +158,33 @@ 
 		$cal_id = array();
 		$scripts = $styles = array();
 
-		if ( is_singular() ) {
+		if (is_singular()) {
 
 			global $post, $post_type;
 
-			if ( 'calendar' == $post_type ) {
+			if ('calendar' == $post_type) {
 
 				$id = get_queried_object_id();
 
-				$view = simcal_get_calendar_view( $id );
-				if ( $view instanceof Calendar_View ) {
-					$scripts[] = $view->scripts( $this->min );
-					$styles[]  = $view->styles( $this->min );
+				$view = simcal_get_calendar_view($id);
+				if ($view instanceof Calendar_View) {
+					$scripts[] = $view->scripts($this->min);
+					$styles[]  = $view->styles($this->min);
 				}
 
 			} else {
 
-				$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) {
 
-					preg_match_all( '/' . get_shortcode_regex() . '/s', $post->post_content, $matches, PREG_SET_ORDER );
+					preg_match_all('/'.get_shortcode_regex().'/s', $post->post_content, $matches, PREG_SET_ORDER);
 
-					if ( ! empty( $matches ) && is_array( $matches ) ) {
-						foreach ( $matches as $shortcode ) {
-							if ( 'calendar' === $shortcode[2] || 'gcal' === $shortcode[2] ) {
-								$atts = shortcode_parse_atts( $shortcode[3] );
-								$cal_id[]   = isset( $atts['id'] ) ? intval( $atts['id'] ) : 0;
+					if ( ! empty($matches) && is_array($matches)) {
+						foreach ($matches as $shortcode) {
+							if ('calendar' === $shortcode[2] || 'gcal' === $shortcode[2]) {
+								$atts = shortcode_parse_atts($shortcode[3]);
+								$cal_id[] = isset($atts['id']) ? intval($atts['id']) : 0;
 							}
 						}
 					}
@@ -192,41 +192,41 @@ 
 			}
 		}
 
-		foreach( $cal_id as $i ) {
+		foreach ($cal_id as $i) {
 
-			if ( $i > 0 ) {
+			if ($i > 0) {
 
-				$view = simcal_get_calendar_view( $i );
+				$view = simcal_get_calendar_view($i);
 
-				if ( $view instanceof Calendar_View ) {
-					$scripts[] = $view->scripts( $this->min );
-					$styles[] = $view->styles( $this->min );
+				if ($view instanceof Calendar_View) {
+					$scripts[] = $view->scripts($this->min);
+					$styles[] = $view->styles($this->min);
 				}
 			}
 		}
 
 		$this->get_widgets_assets();
 
-		$this->scripts = apply_filters( 'simcal_front_end_scripts', $scripts, $this->min );
+		$this->scripts = apply_filters('simcal_front_end_scripts', $scripts, $this->min);
 
 		// First check if there is a multi-dimensional array of scripts
-		if ( isset( $this->scripts[0] ) ) {
-			foreach ( $this->scripts as $script ) {
-				$this->load_scripts ( $script );
+		if (isset($this->scripts[0])) {
+			foreach ($this->scripts as $script) {
+				$this->load_scripts($script);
 			}
 		} else {
-			$this->load_scripts( $this->scripts );
+			$this->load_scripts($this->scripts);
 		}
 
-		$this->styles = apply_filters( 'simcal_front_end_styles', $styles, $this->min );
+		$this->styles = apply_filters('simcal_front_end_styles', $styles, $this->min);
 
 		// First check if there is a multi-dimensional array of styles
-		if ( isset( $this->styles[0] ) ) {
-			foreach( $this->styles as $style ) {
-				$this->load_styles( $style );
+		if (isset($this->styles[0])) {
+			foreach ($this->styles as $style) {
+				$this->load_styles($style);
 			}
 		} else {
-			$this->load_styles( $this->styles );
+			$this->load_styles($this->styles);
 		}
 	}
 
@@ -237,25 +237,25 @@ 
 	 */
 	public function get_widgets_assets() {
 
-		$widgets = get_option( 'widget_gce_widget' );
+		$widgets = get_option('widget_gce_widget');
 
-		if ( ! empty( $widgets ) && is_array( $widgets ) ) {
+		if ( ! empty($widgets) && is_array($widgets)) {
 
-			foreach ( $widgets as $settings ) {
+			foreach ($widgets as $settings) {
 
-				if ( ! empty( $settings ) && is_array( $settings ) ) {
+				if ( ! empty($settings) && is_array($settings)) {
 
-					if ( isset( $settings['calendar_id'] ) ) {
+					if (isset($settings['calendar_id'])) {
 
-						$view = simcal_get_calendar_view( absint( $settings['calendar_id'] ) );
+						$view = simcal_get_calendar_view(absint($settings['calendar_id']));
 
-						if ( $view instanceof Calendar_View ) {
-							add_filter( 'simcal_front_end_scripts', function ( $scripts, $min ) use ( $view ) {
-								return array_merge( $scripts, $view->scripts( $min ) );
-							}, 100, 2 );
-							add_filter( 'simcal_front_end_styles', function ( $styles, $min ) use ( $view ) {
-								return array_merge( $styles, $view->styles( $min ) );
-							}, 100, 2 );
+						if ($view instanceof Calendar_View) {
+							add_filter('simcal_front_end_scripts', function($scripts, $min) use ($view) {
+								return array_merge($scripts, $view->scripts($min));
+							}, 100, 2);
+							add_filter('simcal_front_end_styles', function($styles, $min) use ($view) {
+								return array_merge($styles, $view->styles($min));
+							}, 100, 2);
 						}
 
 					}
@@ -272,16 +272,16 @@ 
 	 * @since 3.0.0
 	 */
 	public function disable() {
-		if ( true === $this->disable_scripts ) {
-			$scripts = apply_filters( 'simcal_front_end_scripts', $this->scripts, $this->min );
-			foreach ( $scripts as $script => $v ) {
-				wp_dequeue_script( $script );
+		if (true === $this->disable_scripts) {
+			$scripts = apply_filters('simcal_front_end_scripts', $this->scripts, $this->min);
+			foreach ($scripts as $script => $v) {
+				wp_dequeue_script($script);
 			}
 		}
-		if ( true === $this->disable_styles ) {
-			$styles = apply_filters( 'simcal_front_end_styles', $this->styles, $this->min );
-			foreach ( $styles as $style => $v ) {
-				wp_dequeue_style( $style );
+		if (true === $this->disable_styles) {
+			$styles = apply_filters('simcal_front_end_styles', $this->styles, $this->min);
+			foreach ($styles as $style => $v) {
+				wp_dequeue_style($style);
 			}
 		}
 	}
@@ -293,30 +293,30 @@ 
 	 *
 	 * @param array $scripts
 	 */
-	public function load_scripts( $scripts ) {
+	public function load_scripts($scripts) {
 
-		if ( ! empty( $scripts ) && is_array( $scripts ) ) {
+		if ( ! empty($scripts) && is_array($scripts)) {
 
-			foreach ( $scripts as $script => $v ) {
+			foreach ($scripts as $script => $v) {
 
-				if ( ! empty( $v['src'] ) ) {
+				if ( ! empty($v['src'])) {
 
-					$src        = esc_url( $v['src'] );
-					$deps       = isset( $v['deps'] )        ? $v['deps']       : array();
-					$ver        = isset( $v['ver'] )         ? $v['ver']        : SIMPLE_CALENDAR_VERSION;
-					$in_footer  = isset( $v['in_footer'] )   ? $v['in_footer']  : false;
+					$src        = esc_url($v['src']);
+					$deps       = isset($v['deps']) ? $v['deps'] : array();
+					$ver        = isset($v['ver']) ? $v['ver'] : SIMPLE_CALENDAR_VERSION;
+					$in_footer  = isset($v['in_footer']) ? $v['in_footer'] : false;
 
-					wp_enqueue_script( $script, $src, $deps, $ver, $in_footer );
+					wp_enqueue_script($script, $src, $deps, $ver, $in_footer);
 
-					if ( ! empty( $v['localize'] ) && is_array( $v['localize'] ) ) {
-						foreach ( $v['localize'] as $object => $l10n ) {
-							wp_localize_script( $script, $object, $l10n );
+					if ( ! empty($v['localize']) && is_array($v['localize'])) {
+						foreach ($v['localize'] as $object => $l10n) {
+							wp_localize_script($script, $object, $l10n);
 						}
 					}
 
-				} elseif ( is_string( $v ) && ! empty( $v ) ) {
+				} elseif (is_string($v) && ! empty($v)) {
 
-					wp_enqueue_script( $v );
+					wp_enqueue_script($v);
 				}
 			}
 
@@ -330,24 +330,24 @@ 
 	 *
 	 * @param array $styles
 	 */
-	public function load_styles( $styles ) {
+	public function load_styles($styles) {
 
-		if ( ! empty( $styles ) && is_array( $styles ) ) {
+		if ( ! empty($styles) && is_array($styles)) {
 
-			foreach ( $styles as $style => $v ) {
+			foreach ($styles as $style => $v) {
 
-				if ( ! empty( $v['src'] ) ) {
+				if ( ! empty($v['src'])) {
 
-					$src    = esc_url( $v['src'] );
-					$deps   = isset( $v['deps'] )   ? $v['deps']    : array();
-					$ver    = isset( $v['ver'] )    ? $v['ver']     : SIMPLE_CALENDAR_VERSION;
-					$media  = isset( $v['media'] )  ? $v['media']   : 'all';
+					$src    = esc_url($v['src']);
+					$deps   = isset($v['deps']) ? $v['deps'] : array();
+					$ver    = isset($v['ver']) ? $v['ver'] : SIMPLE_CALENDAR_VERSION;
+					$media  = isset($v['media']) ? $v['media'] : 'all';
 
-					wp_enqueue_style( $style, $src, $deps, $ver, $media );
+					wp_enqueue_style($style, $src, $deps, $ver, $media);
 
-				} elseif ( is_string( $v ) && ! empty( $v ) ) {
+				} elseif (is_string($v) && ! empty($v)) {
 
-					wp_enqueue_style( $v );
+					wp_enqueue_style($v);
 				}
 
 			}
@@ -363,13 +363,13 @@ 
 	public function get_default_scripts() {
 		return array(
 			'simcal-qtip' => array(
-				'src'       => SIMPLE_CALENDAR_ASSETS . 'js/vendor/qtip' . $this->min . '.js',
-				'deps'      => array( 'jquery' ),
+				'src'       => SIMPLE_CALENDAR_ASSETS.'js/vendor/qtip'.$this->min.'.js',
+				'deps'      => array('jquery'),
 				'ver'       => '2.2.1',
 				'in_footer' => true,
 			),
 			'simcal-default-calendar' => array(
-				'src'       => SIMPLE_CALENDAR_ASSETS . 'js/default-calendar' . $this->min . '.js',
+				'src'       => SIMPLE_CALENDAR_ASSETS.'js/default-calendar'.$this->min.'.js',
 				'deps'      => array(
 					'jquery',
 					'simcal-qtip',
@@ -391,12 +391,12 @@ 
 	public function get_default_styles() {
 		return array(
 			'simcal-qtip' => array(
-				'src'   => SIMPLE_CALENDAR_ASSETS . 'css/vendor/qtip' . $this->min . '.css',
+				'src'   => SIMPLE_CALENDAR_ASSETS.'css/vendor/qtip'.$this->min.'.css',
 				'ver'   => '2.2.1',
 				'media' => 'all',
 			),
 			'simcal-default-calendar-grid' => array(
-				'src'   => SIMPLE_CALENDAR_ASSETS . 'css/default-calendar-grid' . $this->min . '.css',
+				'src'   => SIMPLE_CALENDAR_ASSETS.'css/default-calendar-grid'.$this->min.'.css',
 				'deps'  => array(
 					'simcal-qtip',
 				),
@@ -404,7 +404,7 @@ 
 				'media' => 'all',
 			),
 			'simcal-default-calendar-list' => array(
-				'src'   => SIMPLE_CALENDAR_ASSETS . 'css/default-calendar-list' . $this->min . '.css',
+				'src'   => SIMPLE_CALENDAR_ASSETS.'css/default-calendar-list'.$this->min.'.css',
 				'deps'  => array(
 					'simcal-qtip',
 				),

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

Spacing +101 added lines, -101 removed lines

@@ -6,7 +6,7 @@ 
  */
 namespace SimpleCalendar\Calendars\Admin;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -24,10 +24,10 @@ 
 	 */
 	public function __construct() {
 
-		if ( simcal_is_admin_screen() !== false ) {
-			add_action( 'simcal_settings_meta_calendar_panel', array( $this, 'add_settings_meta_calendar_panel' ), 10, 1 );
+		if (simcal_is_admin_screen() !== false) {
+			add_action('simcal_settings_meta_calendar_panel', array($this, 'add_settings_meta_calendar_panel'), 10, 1);
 		}
-		add_action( 'simcal_process_settings_meta', array( $this, 'process_meta' ), 10, 1 );
+		add_action('simcal_process_settings_meta', array($this, 'process_meta'), 10, 1);
 	}
 
 	/**
@@ -76,46 +76,46 @@ 
 	 *
 	 * @param int $post_id
 	 */
-	public function add_settings_meta_calendar_panel( $post_id ) {
+	public function add_settings_meta_calendar_panel($post_id) {
 
 		?>
 		<table id="default-calendar-settings">
 			<thead>
-			<tr><th colspan="2"><?php _e( 'Default calendar', 'google-calendar-events' ); ?></th></tr>
+			<tr><th colspan="2"><?php _e('Default calendar', 'google-calendar-events'); ?></th></tr>
 			</thead>
 			<tbody class="simcal-panel-section">
 			<tr class="simcal-panel-field simcal-default-calendar-grid" style="display: none;">
-				<th><label for="_default_calendar_event_bubbles_action"><?php _e( 'Event bubbles', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_event_bubbles_action"><?php _e('Event bubbles', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$bubbles = get_post_meta( $post_id, '_default_calendar_event_bubble_trigger', true );
+					$bubbles = get_post_meta($post_id, '_default_calendar_event_bubble_trigger', true);
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'radio',
 						'inline'  => 'inline',
 						'name'    => '_default_calendar_event_bubble_trigger',
 						'id'      => '_default_calendar_event_bubble_trigger',
-						'tooltip' => __( 'Open event bubbles in calendar grid by clicking or hovering on event titles. On mobile devices it will always default to tapping.', 'google-calendar-events' ),
+						'tooltip' => __('Open event bubbles in calendar grid by clicking or hovering on event titles. On mobile devices it will always default to tapping.', 'google-calendar-events'),
 						'value'   => $bubbles ? $bubbles : 'hover',
 						'default' => 'hover',
 						'options' => array(
-							'click' => __( 'Click', 'google-calendar-events' ),
-							'hover' => __( 'Hover', 'google-calendar-events' ),
+							'click' => __('Click', 'google-calendar-events'),
+							'hover' => __('Hover', 'google-calendar-events'),
 						),
-					) );
+					));
 
 					?>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field simcal-default-calendar-grid" style="display: none;">
-				<th><label for="_default_calendar_trim_titles"><?php _e( 'Trim event titles', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_trim_titles"><?php _e('Trim event titles', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$trim = get_post_meta( $post_id, '_default_calendar_trim_titles', true );
+					$trim = get_post_meta($post_id, '_default_calendar_trim_titles', true);
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'        => 'checkbox',
 						'name'        => '_default_calendar_trim_titles',
 						'id'          => '_default_calendar_trim_titles',
@@ -126,34 +126,34 @@ 
 						'attributes'  => array(
 							'data-show-next-if-value' => 'yes',
 						),
-					) );
+					));
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'       => 'standard',
 						'subtype'    => 'number',
 						'name'       => '_default_calendar_trim_titles_chars',
 						'id'         => '_default_calendar_trim_titles_chars',
-						'tooltip'    => __( 'Shorten event titles in calendar grid to a specified length in characters.', 'google-calendar-events' ),
+						'tooltip'    => __('Shorten event titles in calendar grid to a specified length in characters.', 'google-calendar-events'),
 						'class'      => array(
 							'simcal-field-tiny',
 						),
-						'value'      => 'yes' == $trim ? strval( max( absint( get_post_meta( $post_id, '_default_calendar_trim_titles_chars', true ) ), 1 ) ) : '20',
+						'value'      => 'yes' == $trim ? strval(max(absint(get_post_meta($post_id, '_default_calendar_trim_titles_chars', true)), 1)) : '20',
 						'attributes' => array(
 							'min'     => '1',
 						),
-					) );
+					));
 
 					?>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field simcal-default-calendar-list" style="display: none;">
-				<th><label for="_default_calendar_list_grouped_span"><?php _e( 'Span', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_list_grouped_span"><?php _e('Span', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$list_span = max( absint( get_post_meta( $post_id, '_default_calendar_list_range_span', true ) ), 1 );
+					$list_span = max(absint(get_post_meta($post_id, '_default_calendar_list_range_span', true)), 1);
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'standard',
 						'subtype' => 'number',
 						'name'    => '_default_calendar_list_range_span',
@@ -162,78 +162,78 @@ 
 							'simcal-field-tiny',
 							'simcal-field-inline',
 						),
-						'value'   => strval( $list_span ),
+						'value'   => strval($list_span),
 						'attributes'  => array(
 							'min' => '1',
 						),
-					) );
+					));
 
-					$list_type = get_post_meta( $post_id, '_default_calendar_list_range_type', true );
+					$list_type = get_post_meta($post_id, '_default_calendar_list_range_type', true);
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'select',
 						'name'    => '_default_calendar_list_range_type',
 						'id'      => '_default_calendar_list_range_type',
-						'tooltip' => __( 'Range of events to show on each calendar page.', 'google-calendar-events' ),
+						'tooltip' => __('Range of events to show on each calendar page.', 'google-calendar-events'),
 						'class'   => array(
 							'simcal-field-inline',
 						),
 						'value'   => $list_type,
 						'options' => array(
-							'monthly' => __( 'Month(s)', 'google-calendar-events' ),
-							'weekly'  => __( 'Week(s)', 'google-calendar-events' ),
-							'daily'   => __( 'Day(s)', 'google-calendar-events' ),
-							'events'  => __( 'Event(s)', 'google-calendar-events' ),
+							'monthly' => __('Month(s)', 'google-calendar-events'),
+							'weekly'  => __('Week(s)', 'google-calendar-events'),
+							'daily'   => __('Day(s)', 'google-calendar-events'),
+							'events'  => __('Event(s)', 'google-calendar-events'),
 						),
-					) );
+					));
 
 					?>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field simcal-default-calendar-list" style="display: none;">
-				<th><label for="_default_calendar_list_header"><?php _e( 'Hide header', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_list_header"><?php _e('Hide header', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$header = get_post_meta( $post_id, '_default_calendar_list_header', true );
+					$header = get_post_meta($post_id, '_default_calendar_list_header', true);
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'checkbox',
 						'name'    => '_default_calendar_list_header',
 						'id'      => '_default_calendar_list_header',
-						'tooltip' => __( 'You can use this to hide the month header for this calendar.', 'google-calendar-events' ),
+						'tooltip' => __('You can use this to hide the month header for this calendar.', 'google-calendar-events'),
 						'value'   => 'yes' == $header ? 'yes' : 'no',
-					) );
+					));
 
 					?>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field simcal-default-calendar-list" style="display: none;">
-				<th><label for="_default_calendar_compact_list"><?php _e( 'Compact list', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_compact_list"><?php _e('Compact list', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$compact = get_post_meta( $post_id, '_default_calendar_compact_list', true );
+					$compact = get_post_meta($post_id, '_default_calendar_compact_list', true);
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'checkbox',
 						'name'    => '_default_calendar_compact_list',
 						'id'      => '_default_calendar_compact_list',
-						'tooltip' => __( 'Make an events list more compact by grouping together events from different days in a single list.', 'google-calendar-events' ),
+						'tooltip' => __('Make an events list more compact by grouping together events from different days in a single list.', 'google-calendar-events'),
 						'value'   => 'yes' == $compact ? 'yes' : 'no',
-					) );
+					));
 
 					?>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field simcal-default-calendar-grid simcal-default-calendar-list"  style="display: none;">
-				<th><label for="_default_calendar_limit_visible_events"><?php _e( 'Limit visible events', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_limit_visible_events"><?php _e('Limit visible events', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$limit = get_post_meta( $post_id, '_default_calendar_limit_visible_events', true );
+					$limit = get_post_meta($post_id, '_default_calendar_limit_visible_events', true);
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'        => 'checkbox',
 						'name'        => '_default_calendar_limit_visible_events',
 						'id'          => '_default_calendar_limit_visible_events',
@@ -244,17 +244,17 @@ 
 						'attributes'  => array(
 							'data-show-next-if-value' => 'yes',
 						)
-					) );
+					));
 
-					$visible_events = absint( get_post_meta( $post_id, '_default_calendar_visible_events', true ) );
+					$visible_events = absint(get_post_meta($post_id, '_default_calendar_visible_events', true));
 					$visible_events = $visible_events > 0 ? $visible_events : 3;
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'       => 'standard',
 						'subtype'    => 'number',
 						'name'       => '_default_calendar_visible_events',
 						'id'         => '_default_calendar_visible_events',
-						'tooltip'    => __( 'Limit the number of initial visible events on each day to a set maximum.', 'google-calendar-events' ),
+						'tooltip'    => __('Limit the number of initial visible events on each day to a set maximum.', 'google-calendar-events'),
 						'class'      => array(
 							'simcal-field-tiny',
 						),
@@ -262,23 +262,23 @@ 
 						'attributes' => array(
 							'min'     => '1',
 						)
-					) );
+					));
 
 					?>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field simcal-default-calendar-grid simcal-default-calendar-list" style="display: none;">
-				<th><label for="_default_calendar_event_bubbles_action"><?php _e( 'Expand multi day events', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_event_bubbles_action"><?php _e('Expand multi day events', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'checkbox',
 						'name'    => '_default_calendar_expand_multi_day_events',
 						'id'      => '_default_calendar_expand_multi_day_events',
-						'tooltip' => __( 'Show events spanning multiple days on each day.', 'google-calendar-events' ),
-						'value'   => get_post_meta( $post_id, '_default_calendar_expand_multi_day_events', true ),
-					) );
+						'tooltip' => __('Show events spanning multiple days on each day.', 'google-calendar-events'),
+						'value'   => get_post_meta($post_id, '_default_calendar_expand_multi_day_events', true),
+					));
 
 					?>
 				</td>
@@ -286,70 +286,70 @@ 
 			</tbody>
 			<?php
 
-			$settings                   = get_option( 'simple-calendar_settings_calendars' );
-			$default_theme              = isset( $settings['default-calendar']['theme'] ) ? $settings['default-calendar']['theme'] : 'light';
+			$settings                   = get_option('simple-calendar_settings_calendars');
+			$default_theme              = isset($settings['default-calendar']['theme']) ? $settings['default-calendar']['theme'] : 'light';
 			$default_today_color        = /*isset( $settings['default-calendar']['today_color'] ) ? $settings['default-calendar']['today_color'] :*/ '#1e73be';
 			$default_days_events_color  = /*isset( $settings['default-calendar']['days_events_color'] ) ? $settings['default-calendar']['days_events_color'] :*/ '#000000';
 
 			?>
 			<tbody class="simcal-panel-section">
 			<tr class="simcal-panel-field simcal-default-calendar-grid simcal-default-calendar-list" style="display: none;">
-				<th><label for="_default_calendar_style_theme"><?php _e( 'Theme', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_style_theme"><?php _e('Theme', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$saved = get_post_meta( $post_id, '_default_calendar_style_theme', true );
+					$saved = get_post_meta($post_id, '_default_calendar_style_theme', true);
 					$value = ! $saved ? $default_theme : $saved;
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'select',
 						'name'    => '_default_calendar_style_theme',
 						'id'      => '_default_calendar_style_theme',
 						'value'   => $value,
-						'tooltip' => __( 'Choose a calendar theme to match your site theme.', 'google-calendar-events' ),
+						'tooltip' => __('Choose a calendar theme to match your site theme.', 'google-calendar-events'),
 						'options' => array(
-							'light' => __( 'Light', 'google-calendar-events' ),
-							'dark' => __( 'Dark', 'google-calendar-events' ),
+							'light' => __('Light', 'google-calendar-events'),
+							'dark' => __('Dark', 'google-calendar-events'),
 						),
-					) );
+					));
 
 					?>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field simcal-default-calendar-grid simcal-default-calendar-list" style="display: none;">
-				<th><label for="_default_calendar_style_today"><?php _e( 'Today', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_style_today"><?php _e('Today', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$saved = get_post_meta( $post_id, '_default_calendar_style_today', true );
+					$saved = get_post_meta($post_id, '_default_calendar_style_today', true);
 					$value = ! $saved ? $default_today_color : $saved;
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'standard',
 						'subtype' => 'color-picker',
 						'name'    => '_default_calendar_style_today',
 						'id'      => '_default_calendar_style_today',
 						'value'   => $value,
-					) );
+					));
 
 					?>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field simcal-default-calendar-grid simcal-default-calendar-list" style="display: none;">
-				<th><label for="_default_calendar_style_days_events"><?php _e( 'Days with events', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_style_days_events"><?php _e('Days with events', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$saved = get_post_meta( $post_id, '_default_calendar_style_days_events', true );
+					$saved = get_post_meta($post_id, '_default_calendar_style_days_events', true);
 					$value = ! $saved ? $default_days_events_color : $saved;
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'standard',
 						'subtype' => 'color-picker',
 						'name'    => '_default_calendar_style_days_events',
 						'id'      => '_default_calendar_style_days_events',
 						'value'   => $value,
-					) );
+					));
 
 					?>
 				</td>
@@ -370,55 +370,55 @@ 
 	 *
 	 * @param int $post_id
 	 */
-	public function process_meta( $post_id ) {
+	public function process_meta($post_id) {
 
 		// Theme.
-		$theme = isset( $_POST['_default_calendar_style_theme'] ) ? sanitize_key( $_POST['_default_calendar_style_theme'] ) : 'light';
-		update_post_meta( $post_id, '_default_calendar_style_theme', $theme );
+		$theme = isset($_POST['_default_calendar_style_theme']) ? sanitize_key($_POST['_default_calendar_style_theme']) : 'light';
+		update_post_meta($post_id, '_default_calendar_style_theme', $theme);
 
 		// Today color.
-		$today_color = isset( $_POST['_default_calendar_style_today'] ) ? sanitize_text_field( $_POST['_default_calendar_style_today'] ) : '#FF000';
-		update_post_meta( $post_id, '_default_calendar_style_today', $today_color );
+		$today_color = isset($_POST['_default_calendar_style_today']) ? sanitize_text_field($_POST['_default_calendar_style_today']) : '#FF000';
+		update_post_meta($post_id, '_default_calendar_style_today', $today_color);
 
 		// Days with events color.
-		$days_events_color = isset( $_POST['_default_calendar_style_days_events'] ) ? sanitize_text_field( $_POST['_default_calendar_style_days_events'] ) : '#000000';
-		update_post_meta( $post_id, '_default_calendar_style_days_events', $days_events_color );
+		$days_events_color = isset($_POST['_default_calendar_style_days_events']) ? sanitize_text_field($_POST['_default_calendar_style_days_events']) : '#000000';
+		update_post_meta($post_id, '_default_calendar_style_days_events', $days_events_color);
 
 		// List range span.
-		$span = isset( $_POST['_default_calendar_list_range_span'] ) ? max( absint( $_POST['_default_calendar_list_range_span'] ), 1 ) : 1;
-		update_post_meta( $post_id, '_default_calendar_list_range_span', $span );
+		$span = isset($_POST['_default_calendar_list_range_span']) ? max(absint($_POST['_default_calendar_list_range_span']), 1) : 1;
+		update_post_meta($post_id, '_default_calendar_list_range_span', $span);
 
 		// List range type.
-		$group = isset( $_POST['_default_calendar_list_range_type'] ) ? sanitize_key( $_POST['_default_calendar_list_range_type'] ) : 'monthly';
-		update_post_meta( $post_id, '_default_calendar_list_range_type', $group );
+		$group = isset($_POST['_default_calendar_list_range_type']) ? sanitize_key($_POST['_default_calendar_list_range_type']) : 'monthly';
+		update_post_meta($post_id, '_default_calendar_list_range_type', $group);
 
 		// Hide header.
-		$header = isset( $_POST['_default_calendar_list_header'] ) ? 'yes' : 'no';
-		update_post_meta( $post_id, '_default_calendar_list_header', $header );
+		$header = isset($_POST['_default_calendar_list_header']) ? 'yes' : 'no';
+		update_post_meta($post_id, '_default_calendar_list_header', $header);
 
 		// Compact list.
-		$compact = isset( $_POST['_default_calendar_compact_list'] ) ? 'yes' : 'no';
-		update_post_meta( $post_id, '_default_calendar_compact_list', $compact );
+		$compact = isset($_POST['_default_calendar_compact_list']) ? 'yes' : 'no';
+		update_post_meta($post_id, '_default_calendar_compact_list', $compact);
 
 		// Limit number of initially visible daily events.
-		$limit = isset( $_POST['_default_calendar_limit_visible_events'] ) ? 'yes' : 'no';
-		update_post_meta( $post_id, '_default_calendar_limit_visible_events', $limit );
-		$number = isset( $_POST['_default_calendar_visible_events'] ) ? absint( $_POST['_default_calendar_visible_events'] ) : 3;
-		update_post_meta( $post_id, '_default_calendar_visible_events', $number );
+		$limit = isset($_POST['_default_calendar_limit_visible_events']) ? 'yes' : 'no';
+		update_post_meta($post_id, '_default_calendar_limit_visible_events', $limit);
+		$number = isset($_POST['_default_calendar_visible_events']) ? absint($_POST['_default_calendar_visible_events']) : 3;
+		update_post_meta($post_id, '_default_calendar_visible_events', $number);
 
 		// Grid event bubbles action.
-		$bubbles = isset( $_POST['_default_calendar_event_bubble_trigger'] ) ? esc_attr( $_POST['_default_calendar_event_bubble_trigger'] ) : 'hover';
-		update_post_meta( $post_id, '_default_calendar_event_bubble_trigger', $bubbles );
+		$bubbles = isset($_POST['_default_calendar_event_bubble_trigger']) ? esc_attr($_POST['_default_calendar_event_bubble_trigger']) : 'hover';
+		update_post_meta($post_id, '_default_calendar_event_bubble_trigger', $bubbles);
 
 		// Trim event titles characters length.
-		$trim = isset( $_POST['_default_calendar_trim_titles'] ) ? 'yes' : 'no';
-		update_post_meta( $post_id, '_default_calendar_trim_titles', $trim );
-		$chars = isset( $_POST['_default_calendar_trim_titles_chars'] ) ? max( absint( $_POST['_default_calendar_trim_titles_chars'] ), 1 ) : 20;
-		update_post_meta( $post_id, '_default_calendar_trim_titles_chars', $chars );
+		$trim = isset($_POST['_default_calendar_trim_titles']) ? 'yes' : 'no';
+		update_post_meta($post_id, '_default_calendar_trim_titles', $trim);
+		$chars = isset($_POST['_default_calendar_trim_titles_chars']) ? max(absint($_POST['_default_calendar_trim_titles_chars']), 1) : 20;
+		update_post_meta($post_id, '_default_calendar_trim_titles_chars', $chars);
 
 		// Expand multiple day events on each day.
-		$multi_day = isset( $_POST['_default_calendar_expand_multi_day_events'] ) ? 'yes' : 'no';
-		update_post_meta( $post_id, '_default_calendar_expand_multi_day_events', $multi_day );
+		$multi_day = isset($_POST['_default_calendar_expand_multi_day_events']) ? 'yes' : 'no';
+		update_post_meta($post_id, '_default_calendar_expand_multi_day_events', $multi_day);
 
 	}
 

includes/calendars/views/default-calendar-grid.php

Spacing +133 added lines, -133 removed lines

@@ -13,7 +13,7 @@ 
 use SimpleCalendar\Events\Event;
 use SimpleCalendar\Calendars\Default_Calendar;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -55,7 +55,7 @@ 
 	 *
 	 * @param string|Calendar $calendar
 	 */
-	public function __construct( $calendar = '' ) {
+	public function __construct($calendar = '') {
 		$this->calendar = $calendar;
 	}
 
@@ -89,7 +89,7 @@ 
 	 * @return string
 	 */
 	public function get_name() {
-		return __( 'Grid', 'google-calendar-events' );
+		return __('Grid', 'google-calendar-events');
 	}
 
 	/**
@@ -98,8 +98,8 @@ 
 	 * @since 3.0.0
 	 */
 	public function add_ajax_actions() {
-		add_action( 'wp_ajax_simcal_default_calendar_draw_grid', array( $this, 'draw_grid_ajax' ) );
-		add_action( 'wp_ajax_nopriv_simcal_default_calendar_draw_grid', array( $this, 'draw_grid_ajax' ) );
+		add_action('wp_ajax_simcal_default_calendar_draw_grid', array($this, 'draw_grid_ajax'));
+		add_action('wp_ajax_nopriv_simcal_default_calendar_draw_grid', array($this, 'draw_grid_ajax'));
 	}
 
 	/**
@@ -113,16 +113,16 @@ 
 	 *
 	 * @return array
 	 */
-	public function scripts( $min = '' ) {
+	public function scripts($min = '') {
 		return array(
 			'simcal-qtip' => array(
-				'src'       => SIMPLE_CALENDAR_ASSETS . 'js/vendor/qtip' . $min . '.js',
-				'deps'      => array( 'jquery' ),
+				'src'       => SIMPLE_CALENDAR_ASSETS.'js/vendor/qtip'.$min.'.js',
+				'deps'      => array('jquery'),
 				'ver'       => '2.2.1',
 				'in_footer' => true,
 			),
 			'simcal-default-calendar' => array(
-				'src'       => SIMPLE_CALENDAR_ASSETS . 'js/default-calendar' . $min . '.js',
+				'src'       => SIMPLE_CALENDAR_ASSETS.'js/default-calendar'.$min.'.js',
 				'deps'      => array(
 					'jquery',
 					'simcal-qtip',
@@ -147,15 +147,15 @@ 
 	 *
 	 * @return array
 	 */
-	public function styles( $min = '' ) {
+	public function styles($min = '') {
 		return array(
 			'simcal-qtip' => array(
-				'src'   => SIMPLE_CALENDAR_ASSETS . 'css/vendor/qtip' . $min . '.css',
+				'src'   => SIMPLE_CALENDAR_ASSETS.'css/vendor/qtip'.$min.'.css',
 				'ver'   => '2.2.1',
 				'media' => 'all',
 			),
 			'simcal-default-calendar-grid' => array(
-				'src'   => SIMPLE_CALENDAR_ASSETS . 'css/default-calendar-grid' . $min . '.css',
+				'src'   => SIMPLE_CALENDAR_ASSETS.'css/default-calendar-grid'.$min.'.css',
 				'deps'  => array(
 					'simcal-qtip',
 				),
@@ -174,16 +174,16 @@ 
 
 		$calendar = $this->calendar;
 
-		if ( $calendar instanceof Default_Calendar ) {
+		if ($calendar instanceof Default_Calendar) {
 
 			?>
 			<table class="simcal-calendar-grid"
 			       data-event-bubble-trigger="<?php echo $calendar->event_bubble_trigger; ?>">
 				<thead class="simcal-calendar-head">
 					<tr>
-						<?php if ( ! $calendar->static ) { ?>
+						<?php if ( ! $calendar->static) { ?>
 							<th class="simcal-nav simcal-prev-wrapper" colspan="1">
-								<button class="simcal-nav-button simcal-month-nav simcal-prev" title="<?php _e( 'Previous Month', 'google-calendar-events' ); ?>"><i class="simcal-icon-left"></i></button>
+								<button class="simcal-nav-button simcal-month-nav simcal-prev" title="<?php _e('Previous Month', 'google-calendar-events'); ?>"><i class="simcal-icon-left"></i></button>
 							</th>
 						<?php } ?>
 						<th colspan="<?php echo $calendar->static ? '7' : '5'; ?>"
@@ -195,26 +195,26 @@ 
 
 							// Display month and year according to user date format preference.
 
-							$year_pos  = strcspn( $calendar->date_format, 'Y y' );
-							$month_pos = strcspn( $calendar->date_format, 'F M m n' );
+							$year_pos  = strcspn($calendar->date_format, 'Y y');
+							$month_pos = strcspn($calendar->date_format, 'F M m n');
 
-							$current = array( 'month' => 'F', 'year' => 'Y' );
+							$current = array('month' => 'F', 'year' => 'Y');
 
-							if ( $year_pos < $month_pos ) {
-								$current = array_reverse( $current );
+							if ($year_pos < $month_pos) {
+								$current = array_reverse($current);
 							}
 
-							foreach ( $current as $k => $v ) {
-								echo ' <span class="simcal-current-' . $k , '">' . date_i18n( $v, $calendar->start ) . '</span> ';
+							foreach ($current as $k => $v) {
+								echo ' <span class="simcal-current-'.$k, '">'.date_i18n($v, $calendar->start).'</span> ';
 							}
 
 							echo '</h3>';
 
 							?>
 						</th>
-						<?php if ( ! $calendar->static ) { ?>
+						<?php if ( ! $calendar->static) { ?>
 							<th class="simcal-nav simcal-next-wrapper" colspan="1">
-								<button class="simcal-nav-button simcal-month-nav simcal-next" title="<?php _e( 'Next Month', 'google-calendar-events' ); ?>"><i class="simcal-icon-right"></i></button>
+								<button class="simcal-nav-button simcal-month-nav simcal-next" title="<?php _e('Next Month', 'google-calendar-events'); ?>"><i class="simcal-icon-right"></i></button>
 							</th>
 						<?php } ?>
 					</tr>
@@ -224,28 +224,28 @@ 
 						// Print day names in short or long form for different viewport sizes.
 
 						$week_starts     = $calendar->week_starts;
-						$week_days_short = simcal_get_calendar_names_i18n( 'day', 'short' );
-						$week_days_full  = simcal_get_calendar_names_i18n( 'day', 'full' );
+						$week_days_short = simcal_get_calendar_names_i18n('day', 'short');
+						$week_days_full  = simcal_get_calendar_names_i18n('day', 'full');
 
-						for ( $i = $week_starts; $i <= 6; $i ++ ) :
+						for ($i = $week_starts; $i <= 6; $i++) :
 
 							?>
 							<th class="simcal-week-day simcal-week-day-<?php echo $i ?>"
-							    data-screen-small="<?php echo substr( $week_days_short[ $i ], 0, 1 ); ?>"
-							    data-screen-medium="<?php echo $week_days_short[ $i ]; ?>"
-							    data-screen-large="<?php echo $week_days_full[ $i ]; ?>"><?php echo $week_days_short[ $i ]; ?></th>
+							    data-screen-small="<?php echo substr($week_days_short[$i], 0, 1); ?>"
+							    data-screen-medium="<?php echo $week_days_short[$i]; ?>"
+							    data-screen-large="<?php echo $week_days_full[$i]; ?>"><?php echo $week_days_short[$i]; ?></th>
 							<?php
 
 						endfor;
 
-						if ( $week_starts !== 0 ) :
-							for ( $i = 0; $i < $week_starts; $i ++ ) :
+						if ($week_starts !== 0) :
+							for ($i = 0; $i < $week_starts; $i++) :
 
 								?>
 								<th class="simcal-week-day simcal-week-day-<?php echo $i ?>"
-								    data-screen-small="<?php echo substr( $week_days_short[ $i ], 0, 1 ); ?>"
-								    data-screen-medium="<?php echo $week_days_short[ $i ]; ?>"
-								    data-screen-large="<?php echo $week_days_full[ $i ]; ?>"><?php echo $week_days_short[ $i ]; ?></th>
+								    data-screen-small="<?php echo substr($week_days_short[$i], 0, 1); ?>"
+								    data-screen-medium="<?php echo $week_days_short[$i]; ?>"
+								    data-screen-large="<?php echo $week_days_full[$i]; ?>"><?php echo $week_days_short[$i]; ?></th>
 								<?php
 
 							endfor;
@@ -255,7 +255,7 @@ 
 					</tr>
 				</thead>
 
-				<?php echo $this->draw_month( date( 'n', $calendar->start ), date( 'Y', $calendar->start ) ); ?>
+				<?php echo $this->draw_month(date('n', $calendar->start), date('Y', $calendar->start)); ?>
 
 			</table>
 			<?php
@@ -280,82 +280,82 @@ 
 	 *
 	 * @return string
 	 */
-	private function draw_month( $month, $year, $id = 0 ) {
+	private function draw_month($month, $year, $id = 0) {
 
 		$calendar = $this->calendar;
-		if ( empty( $calendar ) ) {
-			$calendar = simcal_get_calendar( intval( $id ) );
-			if ( ! $calendar ) {
+		if (empty($calendar)) {
+			$calendar = simcal_get_calendar(intval($id));
+			if ( ! $calendar) {
 				return '';
 			}
 		}
-		date_default_timezone_set( $calendar->timezone );
+		date_default_timezone_set($calendar->timezone);
 		$events = $calendar->events;
 
 		// Variables to cycle days in current month and find today in calendar.
 		$now         = $calendar->now;
-		$current     = Carbon::create( $year, $month, 1, 0, 0, 59, $calendar->timezone );
+		$current     = Carbon::create($year, $month, 1, 0, 0, 59, $calendar->timezone);
 		$current_min = $current->getTimestamp();
 		$current_max = $current->endOfDay()->getTimestamp();
 
 		// Calendar grid variables.
 		$week_starts   = $calendar->week_starts;
-		$week_of_year  = $current->weekOfYear;   // Relative count of the week number of the year.
-		$month_starts  = $current->dayOfWeek;    // Day upon which the month starts.
-		$days_in_month = $current->daysInMonth;  // Number of days in the given month.
+		$week_of_year  = $current->weekOfYear; // Relative count of the week number of the year.
+		$month_starts  = $current->dayOfWeek; // Day upon which the month starts.
+		$days_in_month = $current->daysInMonth; // Number of days in the given month.
 
 		// Set current month events timestamp boundaries.
 		$this->start = $current_min;
 		$this->end   = $current->endOfMonth()->timestamp;
 
 		// Get daily events for this month.
-		if ( $events && is_array( $events ) ) {
+		if ($events && is_array($events)) {
 
 			// Filter events within the boundaries previously set above.
-			$timestamps   = array_keys( $events );
-			$lower_bound  = array_filter( $timestamps, array( $this, 'filter_events_before' ) );
-			$higher_bound = array_filter( $lower_bound, array( $this, 'filter_events_after' ) );
-			$filtered     = array_intersect_key( $events, array_combine( $higher_bound, $higher_bound ) );
+			$timestamps   = array_keys($events);
+			$lower_bound  = array_filter($timestamps, array($this, 'filter_events_before'));
+			$higher_bound = array_filter($lower_bound, array($this, 'filter_events_after'));
+			$filtered     = array_intersect_key($events, array_combine($higher_bound, $higher_bound));
 
 			// Put resulting events in an associative array, with day of the month as key for easy retrieval in calendar days loop.
 			$day_events = array();
-			foreach ( $filtered as $timestamp => $events_in_day ) {
-				foreach ( $events_in_day as $event ) {
-					if ( $event instanceof Event ){
-						$day = intval( Carbon::createFromTimestamp( $timestamp, $event->timezone )->endOfDay()->day );
-						$day_events[ $day ][] = $event;
+			foreach ($filtered as $timestamp => $events_in_day) {
+				foreach ($events_in_day as $event) {
+					if ($event instanceof Event) {
+						$day = intval(Carbon::createFromTimestamp($timestamp, $event->timezone)->endOfDay()->day);
+						$day_events[$day][] = $event;
 					}
 				}
 			}
 
-			ksort( $day_events, SORT_NUMERIC );
+			ksort($day_events, SORT_NUMERIC);
 		}
 
 		ob_start();
 
-		echo '<tbody class="simcal-month simcal-month-' . $month . '">' . "\n";
-		echo "\t" . '<tr class="simcal-week simcal-week-' . $week_of_year . '">';
+		echo '<tbody class="simcal-month simcal-month-'.$month.'">'."\n";
+		echo "\t".'<tr class="simcal-week simcal-week-'.$week_of_year.'">';
 
 		$days_in_row = 0;
 		// Week may start on an arbitrary day (sun, 0 - sat, 6).
 		$week_day = $week_starts;
 
 		// This fixes a possible bug when a month starts by Sunday (0).
-		if ( 0 !== $week_starts ) {
+		if (0 !== $week_starts) {
 			$b = $month_starts === 0 ? 7 : $month_starts;
 		} else {
 			$b = $month_starts;
 		}
 
 		// Void days in first week.
-		for ( $a = $week_starts; $a < $b; $a++ ) :
+		for ($a = $week_starts; $a < $b; $a++) :
 
-			$last_void_day_class = ( $a === ( $b - 1 ) ) ? 'simcal-day-void-last' : '';
+			$last_void_day_class = ($a === ($b - 1)) ? 'simcal-day-void-last' : '';
 
-			echo '<td class="simcal-day simcal-day-void ' . $last_void_day_class . '"></td>' . "\n";
+			echo '<td class="simcal-day simcal-day-void '.$last_void_day_class.'"></td>'."\n";
 
 			// Reset day of the week count (sun, 0 - sat, 6).
-			if ( $week_day === 6 ) {
+			if ($week_day === 6) {
 				$week_day = -1;
 			}
 			$week_day++;
@@ -365,91 +365,91 @@ 
 		endfor;
 
 		// Actual days of the month.
-		for ( $day = 1; $day <= $days_in_month; $day++ ) :
+		for ($day = 1; $day <= $days_in_month; $day++) :
 
 			$count = 0;
 			$calendar_classes = array();
-			$day_classes = 'simcal-day-' . $day . ' simcal-weekday-' . $week_day;
+			$day_classes = 'simcal-day-'.$day.' simcal-weekday-'.$week_day;
 
 			$border_style = $bg_color = $color = '';
 
 			// Is this the present, the past or the future, Doc?
-			if ( $current_min <= $now && $current_max >= $now ) {
+			if ($current_min <= $now && $current_max >= $now) {
 				$day_classes .= ' simcal-today simcal-present simcal-day';
-				$the_color = new Color( $calendar->today_color );
-				$bg_color = '#' . $the_color->getHex();
+				$the_color = new Color($calendar->today_color);
+				$bg_color = '#'.$the_color->getHex();
 				$color = $the_color->isDark() ? '#ffffff' : '#000000';
-				$border_style = ' style="border: 1px solid ' . $bg_color . ';"';
-			} elseif ( $current_max < $now ) {
+				$border_style = ' style="border: 1px solid '.$bg_color.';"';
+			} elseif ($current_max < $now) {
 				$day_classes .= ' simcal-past simcal-day';
-			} elseif ( $current_min > $now ) {
+			} elseif ($current_min > $now) {
 				$day_classes .= ' simcal-future simcal-day';
 			}
 
 			// Print events for the current day in loop, if found any.
-			if ( isset( $day_events[ $day ] ) ) :
+			if (isset($day_events[$day])) :
 
 				$list_events = '<ul class="simcal-events">';
 
-				foreach ( $day_events[ $day ] as $event ) :
+				foreach ($day_events[$day] as $event) :
 
 					$event_classes = $event_visibility = '';
 
-					if ( $event instanceof Event ) :
+					if ($event instanceof Event) :
 
 						// Store the calendar id where the event belongs (useful in grouped calendar feeds)
-						$calendar_class  = 'simcal-events-calendar-' . strval( $event->calendar );
-						$calendar_classes[] = $calendar_class ;
+						$calendar_class = 'simcal-events-calendar-'.strval($event->calendar);
+						$calendar_classes[] = $calendar_class;
 
 						$recurring     = $event->recurrence ? 'simcal-event-recurring ' : '';
 						$has_location  = $event->venue ? 'simcal-event-has-location ' : '';
 
-						$event_classes  .= 'simcal-event ' . $recurring . $has_location . $calendar_class . ' simcal-tooltip';
+						$event_classes .= 'simcal-event '.$recurring.$has_location.$calendar_class.' simcal-tooltip';
 
 						// Toggle some events visibility if more than optional limit.
-						if ( ( $calendar->events_limit > -1 )  && ( $count >= $calendar->events_limit ) ) :
+						if (($calendar->events_limit > -1) && ($count >= $calendar->events_limit)) :
 							$event_classes    .= ' simcal-event-toggled';
 							$event_visibility  = ' style="display: none"';
 						endif;
 
 						// Event title in list.
-						$title = ! empty( $event->title ) ? trim( $event->title ) : __( 'Event', 'google-calendar-events' );
-						if ( $calendar->trim_titles >= 1 ) {
-							$title = strlen( $title ) > $calendar->trim_titles ? substr( $title, 0, $calendar->trim_titles ) . '&hellip;' : $title;
+						$title = ! empty($event->title) ? trim($event->title) : __('Event', 'google-calendar-events');
+						if ($calendar->trim_titles >= 1) {
+							$title = strlen($title) > $calendar->trim_titles ? substr($title, 0, $calendar->trim_titles).'&hellip;' : $title;
 						}
 
 						// Event color.
 						$bullet = '';
 						$event_color = $event->get_color();
-						if ( ! empty( $event_color ) ) {
-							$bullet = '<span style="color: ' . $event_color . ';">&#9632;</span> ';
+						if ( ! empty($event_color)) {
+							$bullet = '<span style="color: '.$event_color.';">&#9632;</span> ';
 						}
 
 						// Event contents.
-						$list_events .= "\t" . '<li class="' . $event_classes . '"' . $event_visibility . ' itemprop="event" itemscope itemtype="http://schema.org/Event">' . "\n";
-						$list_events .= "\t\t" . '<span class="simcal-event-title">' . $bullet . $title . '</span>' . "\n";
-						$list_events .= "\t\t" . '<div class="simcal-event-details simcal-tooltip-content" style="display: none;">' . $calendar->get_event_html( $event ) . '</div>' . "\n";
-						$list_events .= "\t" . '</li>' . "\n";
+						$list_events .= "\t".'<li class="'.$event_classes.'"'.$event_visibility.' itemprop="event" itemscope itemtype="http://schema.org/Event">'."\n";
+						$list_events .= "\t\t".'<span class="simcal-event-title">'.$bullet.$title.'</span>'."\n";
+						$list_events .= "\t\t".'<div class="simcal-event-details simcal-tooltip-content" style="display: none;">'.$calendar->get_event_html($event).'</div>'."\n";
+						$list_events .= "\t".'</li>'."\n";
 
-						$count ++;
+						$count++;
 
 					endif;
 
 				endforeach;
 
-				if ( ( $current_min <= $now ) && ( $current_max >= $now ) ) {
+				if (($current_min <= $now) && ($current_max >= $now)) {
 					$day_classes .= ' simcal-today-has-events';
 				}
-				$day_classes .= ' simcal-day-has-events simcal-day-has-' . strval( $count ) . '-events';
+				$day_classes .= ' simcal-day-has-events simcal-day-has-'.strval($count).'-events';
 
-				if ( $calendar_classes ) {
-					$day_classes .= ' ' . trim( implode( ' ', array_unique( $calendar_classes ) ) );
+				if ($calendar_classes) {
+					$day_classes .= ' '.trim(implode(' ', array_unique($calendar_classes)));
 				}
 
-				$list_events .= '</ul>' . "\n";
+				$list_events .= '</ul>'."\n";
 
 				// Optional button to toggle hidden events in list.
-				if ( ( $calendar->events_limit > -1 ) && ( $count > $calendar->events_limit ) ) :
+				if (($calendar->events_limit > -1) && ($count > $calendar->events_limit)) :
 					$list_events .= '<button class="simcal-events-toggle"><i class="simcal-icon-down simcal-icon-animate"></i></button>';
 				endif;
 
@@ -461,49 +461,49 @@ 
 			endif;
 
 			// The actual days with numbers and events in each row cell.
-			echo '<td class="' . $day_classes . '" data-events-count="' . strval( $count ) . '">' . "\n";
-
-			if ( $color ) {
-				$day_style = ' style="background-color: ' . $bg_color . '; color: ' . $color .'"';
-			} elseif ( $count > 0 ) {
-				$the_color = new Color( $calendar->days_events_color );
-				$color = ! $color ? ( $the_color->isDark() ? '#ffffff' : '#000000' ) : $color;
-				$bg_color = ! $bg_color ? '#' . $the_color->getHex() : $bg_color;
-				$day_style = ' style="background-color: ' . $bg_color . '; color: ' . $color .'"';
+			echo '<td class="'.$day_classes.'" data-events-count="'.strval($count).'">'."\n";
+
+			if ($color) {
+				$day_style = ' style="background-color: '.$bg_color.'; color: '.$color.'"';
+			} elseif ($count > 0) {
+				$the_color = new Color($calendar->days_events_color);
+				$color = ! $color ? ($the_color->isDark() ? '#ffffff' : '#000000') : $color;
+				$bg_color = ! $bg_color ? '#'.$the_color->getHex() : $bg_color;
+				$day_style = ' style="background-color: '.$bg_color.'; color: '.$color.'"';
 			} else {
 				$day_style = '';
 			}
 
-			echo "\t" . '<div' . $border_style . '>' . "\n";
-			echo "\t\t" . '<span class="simcal-day-label simcal-day-number"' . $day_style . '>' . $day . '</span>' . "\n";
-			echo "\t\t" . $list_events . "\n";
+			echo "\t".'<div'.$border_style.'>'."\n";
+			echo "\t\t".'<span class="simcal-day-label simcal-day-number"'.$day_style.'>'.$day.'</span>'."\n";
+			echo "\t\t".$list_events."\n";
 			echo "\t\t";
 			echo '<span class="simcal-events-dots" style="display: none;">';
 
 			// Event bullets for calendar mobile mode.
-			for( $i = 0; $i < $count; $i++ ) {
+			for ($i = 0; $i < $count; $i++) {
 				echo '<b> &bull; </b>';
 			}
 
-			echo '</span>' . "\n";
-			echo "\t" . '</div>' . "\n";
-			echo '</td>' . "\n";
+			echo '</span>'."\n";
+			echo "\t".'</div>'."\n";
+			echo '</td>'."\n";
 
 			// Reset day of the week count (sun, 0 - sat, 6).
-			if ( $week_day === 6 ) {
+			if ($week_day === 6) {
 				$week_day = - 1;
 			}
 			$week_day++;
 
 			// Reset count of days for this row (0-6).
-			if ( $days_in_row === 6 ) :
+			if ($days_in_row === 6) :
 
 				// Close the week row.
 				echo '</tr>';
 
 				// Open a new week row.
-				if ( $day < $days_in_month ) {
-					echo '<tr class="simcal-week simcal-week-' . $week_of_year++ . '">' . "\n";
+				if ($day < $days_in_month) {
+					echo '<tr class="simcal-week simcal-week-'.$week_of_year++.'">'."\n";
 				}
 
 				$days_in_row = -1;
@@ -512,27 +512,27 @@ 
 
 			$days_in_row++;
 
-			$current_min = Carbon::createFromTimestamp( $current_min, $calendar->timezone )->addDay()->getTimestamp();
-			$current_max = Carbon::createFromTimestamp( $current_max, $calendar->timezone )->addDay()->getTimestamp();
+			$current_min = Carbon::createFromTimestamp($current_min, $calendar->timezone)->addDay()->getTimestamp();
+			$current_max = Carbon::createFromTimestamp($current_max, $calendar->timezone)->addDay()->getTimestamp();
 
 		endfor;
 
 		// Void days at the end of the month.
-		$remainder_days = ( 6 - $days_in_row );
+		$remainder_days = (6 - $days_in_row);
 
-		for ( $i = 0; $i <= $remainder_days; $i ++ ) {
+		for ($i = 0; $i <= $remainder_days; $i++) {
 
-			$last_void_day_class = ( $i == $remainder_days ) ? 'simcal-day-void-last' : '';
+			$last_void_day_class = ($i == $remainder_days) ? 'simcal-day-void-last' : '';
 
-			echo '<td class="simcal-day simcal-day-void ' . $last_void_day_class . '"></td>' . "\n";
+			echo '<td class="simcal-day simcal-day-void '.$last_void_day_class.'"></td>'."\n";
 
 			$week_day++;
 		}
 
-		echo "\t" . '</tr>' . "\n";
-		echo '</tbody>' . "\n";
+		echo "\t".'</tr>'."\n";
+		echo '</tbody>'."\n";
 
-		date_default_timezone_set( $calendar->site_timezone );
+		date_default_timezone_set($calendar->site_timezone);
 
 		return ob_get_clean();
 	}
@@ -544,17 +544,17 @@ 
 	 */
 	public function draw_grid_ajax() {
 
-		if ( isset( $_POST['month'] ) && isset( $_POST['year'] ) && isset( $_POST['id'] ) ) {
+		if (isset($_POST['month']) && isset($_POST['year']) && isset($_POST['id'])) {
 
-			$month = absint( $_POST['month'] );
-			$year  = absint( $_POST['year'] );
-			$id    = absint( $_POST['id'] );
+			$month = absint($_POST['month']);
+			$year  = absint($_POST['year']);
+			$id    = absint($_POST['id']);
 
-			wp_send_json_success( $this->draw_month( $month, $year, $id ) );
+			wp_send_json_success($this->draw_month($month, $year, $id));
 
 		} else {
 
-			wp_send_json_error( 'Missing arguments in default calendar grid ajax request.' );
+			wp_send_json_error('Missing arguments in default calendar grid ajax request.');
 
 		}
 
@@ -570,8 +570,8 @@ 
 	 *
 	 * @return bool
 	 */
-	private function filter_events_before( $event ) {
-		return intval( $event ) > intval( $this->start );
+	private function filter_events_before($event) {
+		return intval($event) > intval($this->start);
 	}
 
 	/**
@@ -584,8 +584,8 @@ 
 	 *
 	 * @return bool
 	 */
-	private function filter_events_after( $event ) {
-		return intval( $event ) < intval( $this->end );
+	private function filter_events_after($event) {
+		return intval($event) < intval($this->end);
 	}
 
 }

Braces +3 added lines, -1 removed lines

@@ -453,10 +453,12 @@
 					$list_events .= '<button class="simcal-events-toggle"><i class="simcal-icon-down simcal-icon-animate"></i></button>';
 				endif;
 
-			else :
+			else {
+				:
 
 				// Empty cell for day with no events.
 				$list_events = '<span class="simcal-no-events"></span>';
+			}
 
 			endif;
 

includes/calendars/views/default-calendar-list.php

Braces +3 added lines, -1 removed lines

@@ -576,9 +576,11 @@
 
 			endforeach;
 
-		else :
+		else {
+			:
 
 			echo "\t" . '<p>';
+		}
 
 			$message = get_post_meta( $calendar->id, '_no_events_message', true );
 

Spacing +190 added lines, -190 removed lines

@@ -13,7 +13,7 @@ 
 use SimpleCalendar\Calendars\Default_Calendar;
 use SimpleCalendar\Events\Event;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -71,7 +71,7 @@ 
 	 *
 	 * @param string|Calendar $calendar
 	 */
-	public function __construct( $calendar = '' ) {
+	public function __construct($calendar = '') {
 		$this->calendar = $calendar;
 	}
 
@@ -105,7 +105,7 @@ 
 	 * @return string
 	 */
 	public function get_name() {
-		return __( 'List', 'google-calendar-events' );
+		return __('List', 'google-calendar-events');
 	}
 
 	/**
@@ -114,8 +114,8 @@ 
 	 * @since 3.0.0
 	 */
 	public function add_ajax_actions() {
-		add_action( 'wp_ajax_simcal_default_calendar_draw_list', array( $this, 'draw_list_ajax' ) );
-		add_action( 'wp_ajax_nopriv_simcal_default_calendar_draw_list', array( $this, 'draw_list_ajax' ) );
+		add_action('wp_ajax_simcal_default_calendar_draw_list', array($this, 'draw_list_ajax'));
+		add_action('wp_ajax_nopriv_simcal_default_calendar_draw_list', array($this, 'draw_list_ajax'));
 	}
 
 	/**
@@ -129,16 +129,16 @@ 
 	 *
 	 * @return array
 	 */
-	public function scripts( $min = '' ) {
+	public function scripts($min = '') {
 		return array(
 			'simcal-qtip' => array(
-				'src'       => SIMPLE_CALENDAR_ASSETS . 'js/vendor/qtip' . $min . '.js',
-				'deps'      => array( 'jquery' ),
+				'src'       => SIMPLE_CALENDAR_ASSETS.'js/vendor/qtip'.$min.'.js',
+				'deps'      => array('jquery'),
 				'ver'       => '2.2.1',
 				'in_footer' => true,
 			),
 			'simcal-default-calendar' => array(
-				'src'       => SIMPLE_CALENDAR_ASSETS . 'js/default-calendar' . $min . '.js',
+				'src'       => SIMPLE_CALENDAR_ASSETS.'js/default-calendar'.$min.'.js',
 				'deps'      => array(
 					'jquery',
 					'simcal-qtip',
@@ -163,10 +163,10 @@ 
 	 *
 	 * @return array
 	 */
-	public function styles( $min = '' ) {
+	public function styles($min = '') {
 		return array(
 			'simcal-default-calendar-list' => array(
-				'src'   => SIMPLE_CALENDAR_ASSETS . 'css/default-calendar-list' . $min . '.css',
+				'src'   => SIMPLE_CALENDAR_ASSETS.'css/default-calendar-list'.$min.'.css',
 				'ver'   => SIMPLE_CALENDAR_VERSION,
 				'media' => 'all',
 			),
@@ -182,47 +182,47 @@ 
 
 		$calendar = $this->calendar;
 
-		if ( $calendar instanceof Default_Calendar ) {
+		if ($calendar instanceof Default_Calendar) {
 
 			$disabled = $calendar->static === true ? ' disabled="disabled"' : '';
 
 
-			$hide_header = get_post_meta( $this->calendar->id, '_default_calendar_list_header', true ) == 'yes' ? true : false;
-			$static_calendar = get_post_meta( $this->calendar->id, '_calendar_is_static', true ) == 'yes' ? true : false;
+			$hide_header = get_post_meta($this->calendar->id, '_default_calendar_list_header', true) == 'yes' ? true : false;
+			$static_calendar = get_post_meta($this->calendar->id, '_calendar_is_static', true) == 'yes' ? true : false;
 
 			$header_class = '';
 			$compact_list_class = $calendar->compact_list ? 'simcal-calendar-list-compact' : '';
 
-			echo '<div class="simcal-calendar-list ' . $compact_list_class . '">';
+			echo '<div class="simcal-calendar-list '.$compact_list_class.'">';
 
-			if ( ! $hide_header && ! $static_calendar ) {
-				echo '<nav class="simcal-calendar-head">' . "\n";
+			if ( ! $hide_header && ! $static_calendar) {
+				echo '<nav class="simcal-calendar-head">'."\n";
 
-				echo "\t" . '<div class="simcal-nav">' . "\n";
-				echo "\t\t" . '<button class="simcal-nav-button simcal-prev" title="' . __('Previous', 'google-calendar-events') . '"' . $disabled . '>' . "\n";
-				echo "\t\t\t" . '<i class="simcal-icon-left"></i>' . "\n";
-				echo "\t\t" . '</button>' . "\n";
-				echo "\t" . '</div>' . "\n";
+				echo "\t".'<div class="simcal-nav">'."\n";
+				echo "\t\t".'<button class="simcal-nav-button simcal-prev" title="'.__('Previous', 'google-calendar-events').'"'.$disabled.'>'."\n";
+				echo "\t\t\t".'<i class="simcal-icon-left"></i>'."\n";
+				echo "\t\t".'</button>'."\n";
+				echo "\t".'</div>'."\n";
 
-				if ( $hide_header ) {
+				if ($hide_header) {
 					$header_class = 'simcal-hide-header';
 				}
 
 
-				echo "\t" . '<div class="simcal-nav simcal-current ' . $header_class . '" data-calendar-current="' . $calendar->start . '">' . "\n";
-				echo "\t\t" . '<h3 class="simcal-current-label"> </h3>' . "\n";
-				echo "\t" . '</div>' . "\n";
+				echo "\t".'<div class="simcal-nav simcal-current '.$header_class.'" data-calendar-current="'.$calendar->start.'">'."\n";
+				echo "\t\t".'<h3 class="simcal-current-label"> </h3>'."\n";
+				echo "\t".'</div>'."\n";
 
-				echo "\t" . '<div class="simcal-nav">';
-				echo "\t\t" . '<button class="simcal-nav-button simcal-next" title="' . __('Next', 'google-calendar-events') . '"' . $disabled . '>';
-				echo "\t\t\t" . '<i class="simcal-icon-right"></i>' . "\n";
-				echo "\t\t" . '</button>' . "\n";
-				echo "\t" . '</div>' . "\n";
+				echo "\t".'<div class="simcal-nav">';
+				echo "\t\t".'<button class="simcal-nav-button simcal-next" title="'.__('Next', 'google-calendar-events').'"'.$disabled.'>';
+				echo "\t\t\t".'<i class="simcal-icon-right"></i>'."\n";
+				echo "\t\t".'</button>'."\n";
+				echo "\t".'</div>'."\n";
 
-				echo '</nav>' . "\n";
+				echo '</nav>'."\n";
 			}
 
-			echo $this->draw_list( $calendar->start );
+			echo $this->draw_list($calendar->start);
 
 			echo '<div class="simcal-ajax-loader simcal-spinner-top" style="display: none;"><i class="simcal-icon-spinner simcal-icon-spin"></i></div>';
 
@@ -241,92 +241,92 @@ 
 	 *
 	 * @return array
 	 */
-	private function get_events( $timestamp ) {
+	private function get_events($timestamp) {
 
 		$calendar = $this->calendar;
 		$timezone = $calendar->timezone;
 
-		if ( ! $calendar->group_type || ! $calendar->group_span ) {
+		if ( ! $calendar->group_type || ! $calendar->group_span) {
 			return array();
 		}
 
-		$current = Carbon::createFromTimestamp( $timestamp, $timezone );
+		$current = Carbon::createFromTimestamp($timestamp, $timezone);
 		$prev = clone $current;
 		$next = clone $current;
 
 		$this->start = $current->getTimestamp();
 
-		$interval = $span = max( absint( $calendar->group_span ), 1 );
-
-		if ( 'monthly' == $calendar->group_type ) {
-			$this->prev = $prev->subMonths( $span )->getTimestamp();
-			$this->next = $next->addMonths( $span )->getTimestamp();
-		} elseif ( 'weekly' == $calendar->group_type ) {
-			$week = new Carbon( $calendar->timezone );
-			$week->setTimestamp( $timestamp );
-			$week->setWeekStartsAt( $calendar->week_starts );
-			$this->prev = $prev->subWeeks( $span )->getTimestamp();
-			$this->next = $next->addWeeks( $span )->getTimestamp();
-		} elseif ( 'daily' == $calendar->group_type ) {
-			$this->prev = $prev->subDays( $span )->getTimestamp();
-			$this->next = $next->addDays( $span )->getTimestamp();
+		$interval = $span = max(absint($calendar->group_span), 1);
+
+		if ('monthly' == $calendar->group_type) {
+			$this->prev = $prev->subMonths($span)->getTimestamp();
+			$this->next = $next->addMonths($span)->getTimestamp();
+		} elseif ('weekly' == $calendar->group_type) {
+			$week = new Carbon($calendar->timezone);
+			$week->setTimestamp($timestamp);
+			$week->setWeekStartsAt($calendar->week_starts);
+			$this->prev = $prev->subWeeks($span)->getTimestamp();
+			$this->next = $next->addWeeks($span)->getTimestamp();
+		} elseif ('daily' == $calendar->group_type) {
+			$this->prev = $prev->subDays($span)->getTimestamp();
+			$this->next = $next->addDays($span)->getTimestamp();
 		}
 
 		$events = $calendar->events;
 		$daily_events = $paged_events = $flattened_events = array();
 
-		if ( 'events' != $calendar->group_type ) {
+		if ('events' != $calendar->group_type) {
 
-			$this->end   = $this->next - 1;
+			$this->end = $this->next - 1;
 
-			$timestamps   = array_keys( $events );
-			$lower_bound  = array_filter( $timestamps,  array( $this, 'filter_events_before' ) );
-			$higher_bound = array_filter( $lower_bound, array( $this, 'filter_events_after'  ) );
+			$timestamps   = array_keys($events);
+			$lower_bound  = array_filter($timestamps, array($this, 'filter_events_before'));
+			$higher_bound = array_filter($lower_bound, array($this, 'filter_events_after'));
 
-			if ( is_array( $higher_bound ) && !empty( $higher_bound ) ) {
-				$filtered = array_intersect_key( $events, array_combine( $higher_bound, $higher_bound ) );
-				foreach ( $filtered as $timestamp => $events ) {
-					$paged_events[ intval( $timestamp ) ] = $events;
+			if (is_array($higher_bound) && ! empty($higher_bound)) {
+				$filtered = array_intersect_key($events, array_combine($higher_bound, $higher_bound));
+				foreach ($filtered as $timestamp => $events) {
+					$paged_events[intval($timestamp)] = $events;
 				}
 			}
 
 		} else {
 
-			foreach ( $events as $timestamp => $e ) {
+			foreach ($events as $timestamp => $e) {
 				$second = 0;
-				foreach ( $e as $event ) {
-					$flattened_events[ intval( $timestamp + $second ) ][] = $event;
+				foreach ($e as $event) {
+					$flattened_events[intval($timestamp + $second)][] = $event;
 					$second++;
 				}
 			}
-			ksort( $flattened_events, SORT_NUMERIC );
+			ksort($flattened_events, SORT_NUMERIC);
 
-			$keys  = array_keys( $flattened_events );
+			$keys = array_keys($flattened_events);
 			$current = 0;
-			foreach ( $keys as $timestamp ) {
-				if ( $timestamp <= $this->start ) {
+			foreach ($keys as $timestamp) {
+				if ($timestamp <= $this->start) {
 					$current++;
 				}
 			}
 
-			$paged_events = array_slice( $flattened_events, $current, $interval, true );
+			$paged_events = array_slice($flattened_events, $current, $interval, true);
 
-			$events_end = isset( $keys[ $current + $interval ] ) ? $keys[ $current + $interval ] : $calendar->end;
+			$events_end = isset($keys[$current + $interval]) ? $keys[$current + $interval] : $calendar->end;
 			$this->end  = $events_end > $calendar->end ? $calendar->end : $events_end;
 			// -1 adjusts the interval count to index count, which starts at 0.
-			$this->prev = isset( $keys[ $current - $interval - 1 ] ) ? $keys[ $current - $interval - 1 ] : $calendar->earliest_event;
-			$this->next = isset( $keys[ $current + $interval - 1 ] ) ? $keys[ $current + $interval - 1 ] : $this->end;
+			$this->prev = isset($keys[$current - $interval - 1]) ? $keys[$current - $interval - 1] : $calendar->earliest_event;
+			$this->next = isset($keys[$current + $interval - 1]) ? $keys[$current + $interval - 1] : $this->end;
 
 		}
 
 		// Put resulting events in an associative array, with Ymd date as key for easy retrieval in calendar days loop.
-		foreach ( $paged_events as $timestamp => $events ) {
-			if ( $timestamp <= $this->end ) {
-				$date = Carbon::createFromTimestamp( $timestamp, $calendar->timezone )->endOfDay()->format( 'Ymd' );
-				$daily_events[ intval( $date ) ][] = $events;
+		foreach ($paged_events as $timestamp => $events) {
+			if ($timestamp <= $this->end) {
+				$date = Carbon::createFromTimestamp($timestamp, $calendar->timezone)->endOfDay()->format('Ymd');
+				$daily_events[intval($date)][] = $events;
 			}
 		}
-		ksort( $daily_events, SORT_NUMERIC );
+		ksort($daily_events, SORT_NUMERIC);
 
 		return $daily_events;
 	}
@@ -344,71 +344,71 @@ 
 	private function get_heading() {
 
 		$calendar = $this->calendar;
-		$start = Carbon::createFromTimestamp( $this->start, $calendar->timezone );
-		$end = Carbon::createFromTimestamp( $this->end, $calendar->timezone );
+		$start = Carbon::createFromTimestamp($this->start, $calendar->timezone);
+		$end = Carbon::createFromTimestamp($this->end, $calendar->timezone);
 		$date_format = $this->calendar->date_format;
-		$date_order  = simcal_get_date_format_order( $date_format );
+		$date_order  = simcal_get_date_format_order($date_format);
 
-		if ( ( $start->day == $end->day ) && ( $start->month == $end->month ) && ( $start->year == $end->year ) ) {
+		if (($start->day == $end->day) && ($start->month == $end->month) && ($start->year == $end->year)) {
 			// Start and end on the same day.
 			// e.g. 1 February 2020
-			$large = $small = date_i18n( $calendar->date_format , $this->start );
-			if ( ( $date_order['d'] !== false ) && ( $date_order['m'] !== false ) ) {
-				if ( $date_order['m'] > $date_order['d'] ) {
-					if ( $date_order['y'] !== false && $date_order['y'] > $date_order['m'] ) {
-						$small = date_i18n( 'Y, d M', $this->start );
+			$large = $small = date_i18n($calendar->date_format, $this->start);
+			if (($date_order['d'] !== false) && ($date_order['m'] !== false)) {
+				if ($date_order['m'] > $date_order['d']) {
+					if ($date_order['y'] !== false && $date_order['y'] > $date_order['m']) {
+						$small = date_i18n('Y, d M', $this->start);
 					} else {
-						$small = date_i18n( 'd M Y', $this->start );
+						$small = date_i18n('d M Y', $this->start);
 					}
 				} else {
-					if ( $date_order['y'] !== false && $date_order['y'] > $date_order['m'] ) {
-						$small = date_i18n( 'Y, M d', $this->start );
+					if ($date_order['y'] !== false && $date_order['y'] > $date_order['m']) {
+						$small = date_i18n('Y, M d', $this->start);
 					} else {
-						$small = date_i18n( 'M d Y', $this->start );
+						$small = date_i18n('M d Y', $this->start);
 					}
 				}
 			}
-		} elseif ( ( $start->month == $end->month ) && ( $start->year == $end->year ) ) {
+		} elseif (($start->month == $end->month) && ($start->year == $end->year)) {
 			// Start and end days on the same month.
 			// e.g. August 2020
-			if ( $date_order['y'] === false ) {
+			if ($date_order['y'] === false) {
 				// August.
-				$large = $small = date_i18n( 'F', $this->start );
+				$large = $small = date_i18n('F', $this->start);
 			} else {
-				if ( $date_order['y'] < $date_order['m'] ) {
+				if ($date_order['y'] < $date_order['m']) {
 					// 2020 August.
-					$large = date_i18n( 'Y F', $this->start );
-					$small = date_i18n( 'Y M', $this->start );
+					$large = date_i18n('Y F', $this->start);
+					$small = date_i18n('Y M', $this->start);
 				} else {
 					// August 2020.
-					$large = date_i18n( 'F Y', $this->start );
-					$small = date_i18n( 'M Y', $this->start );
+					$large = date_i18n('F Y', $this->start);
+					$small = date_i18n('M Y', $this->start);
 				}
 			}
-		} elseif ( $start->year == $end->year ) {
+		} elseif ($start->year == $end->year) {
 			// Start and end days on months of the same year.
 			// e.g. August - September 2020
-			if ( $date_order['y'] === false ) {
+			if ($date_order['y'] === false) {
 				// August - September.
-				$large = date_i18n( 'F', $this->start ) . ' - ' . date_i18n( 'F', $this->end );
-				$small = date_i18n( 'M', $this->start ) . ' - ' . date_i18n( 'M', $this->end );
+				$large = date_i18n('F', $this->start).' - '.date_i18n('F', $this->end);
+				$small = date_i18n('M', $this->start).' - '.date_i18n('M', $this->end);
 			} else {
-				if ( $date_order['y'] < $date_order['m'] ) {
+				if ($date_order['y'] < $date_order['m']) {
 					// 2020, August - September.
-					$large  = $small = date( 'Y', $this->start ) . ', ';
-					$large .= date_i18n( 'F', $this->start ) . ' - ' . date_i18n( 'F', $this->end );
-					$small .= date_i18n( 'M', $this->start ) . ' - ' . date_i18n( 'M', $this->end );
+					$large  = $small = date('Y', $this->start).', ';
+					$large .= date_i18n('F', $this->start).' - '.date_i18n('F', $this->end);
+					$small .= date_i18n('M', $this->start).' - '.date_i18n('M', $this->end);
 				} else {
 					// August - September, 2020.
-					$large  = date_i18n( 'F', $this->start ) . ' - ' . date_i18n( 'F', $this->end ) . ', ';
-					$small  = date_i18n( 'M', $this->start ) . ' - ' . date_i18n( 'M', $this->end ) . ' ';
-					$year   = date( 'Y', $this->start );
+					$large  = date_i18n('F', $this->start).' - '.date_i18n('F', $this->end).', ';
+					$small  = date_i18n('M', $this->start).' - '.date_i18n('M', $this->end).' ';
+					$year   = date('Y', $this->start);
 					$large .= $year;
 					$small .= $year;
 				}
 			}
 		} else {
-			$large = $small = date( 'Y', $this->start ) . ' - ' . date( 'Y', $this->end );
+			$large = $small = date('Y', $this->start).' - '.date('Y', $this->end);
 		}
 
 		return array(
@@ -430,105 +430,105 @@ 
 	 *
 	 * @return string
 	 */
-	private function draw_list( $timestamp, $id = 0 ) {
+	private function draw_list($timestamp, $id = 0) {
 
 		$calendar = $this->calendar;
 
-		if ( empty( $calendar ) ) {
-			$calendar = $this->calendar = simcal_get_calendar( intval( $id ) );
-			if ( ! $calendar instanceof Default_Calendar ) {
+		if (empty($calendar)) {
+			$calendar = $this->calendar = simcal_get_calendar(intval($id));
+			if ( ! $calendar instanceof Default_Calendar) {
 				return '';
 			}
 		}
 
-		date_default_timezone_set( $calendar->timezone );
+		date_default_timezone_set($calendar->timezone);
 
 		$now = $calendar->now;
-		$current_events = $this->get_events( $timestamp );
-		$day_format = explode( ' ', $calendar->date_format );
+		$current_events = $this->get_events($timestamp);
+		$day_format = explode(' ', $calendar->date_format);
 
 		ob_start();
 
 		// Draw the events.
 
-		$block_tag = $calendar->compact_list && ! empty( $current_events ) ? 'div' : 'dl';
+		$block_tag = $calendar->compact_list && ! empty($current_events) ? 'div' : 'dl';
 
 		$data_heading = '';
 		$heading = $this->get_heading();
-		foreach ( $heading as $k => $v ) {
-			$data_heading .= ' data-heading-' . $k . '="' . $v . '"';
+		foreach ($heading as $k => $v) {
+			$data_heading .= ' data-heading-'.$k.'="'.$v.'"';
 		}
 
-		echo '<' . $block_tag . ' class="simcal-events-list-container"' .
-			' data-prev="' . $this->prev . '"' .
-			' data-next="' . $this->next . '"' .
-			$data_heading . '>';
+		echo '<'.$block_tag.' class="simcal-events-list-container"'.
+			' data-prev="'.$this->prev.'"'.
+			' data-next="'.$this->next.'"'.
+			$data_heading.'>';
 
-		if ( ! empty( $current_events ) && is_array( $current_events ) ) :
+		if ( ! empty($current_events) && is_array($current_events)) :
 
-			foreach ( $current_events as $ymd => $events ) :
+			foreach ($current_events as $ymd => $events) :
 
-				$day_ts = Carbon::createFromFormat( 'Ymd', $ymd, $calendar->timezone )->getTimestamp();
+				$day_ts = Carbon::createFromFormat('Ymd', $ymd, $calendar->timezone)->getTimestamp();
 
-				if ( ! $calendar->compact_list ) :
+				if ( ! $calendar->compact_list) :
 
-					$date = new Carbon( 'now', $calendar->timezone );
-					$date->setLocale( substr( get_locale(), 0, 2 ) );
-					$date->setTimestamp( $day_ts );
+					$date = new Carbon('now', $calendar->timezone);
+					$date->setLocale(substr(get_locale(), 0, 2));
+					$date->setTimestamp($day_ts);
 
-					if ( $date->isToday() ) {
-						$the_color = new Color( $calendar->today_color );
+					if ($date->isToday()) {
+						$the_color = new Color($calendar->today_color);
 					} else {
-						$the_color = new Color( $calendar->days_events_color );
+						$the_color = new Color($calendar->days_events_color);
 					}
 
-					$bg_color = '#' . $the_color->getHex();
+					$bg_color = '#'.$the_color->getHex();
 					$color = $the_color->isDark() ? '#ffffff' : '#000000';
-					$border_style = ' style="border-bottom: 1px solid ' . $bg_color . ';" ';
-					$bg_style = ' style="background-color: ' . $bg_color . '; color: ' . $color . ';"';
+					$border_style = ' style="border-bottom: 1px solid '.$bg_color.';" ';
+					$bg_style = ' style="background-color: '.$bg_color.'; color: '.$color.';"';
 
-					echo "\t" . '<dt class="simcal-day-label"' . $border_style . '>';
-					echo '<span' . $bg_style .'>';
-					foreach ( $day_format as $format ) {
-						echo $format ? '<span class="simcal-date-format" data-date-format="' . $format . '">' . date_i18n( $format, $day_ts ) . '</span> ' : ' ';
+					echo "\t".'<dt class="simcal-day-label"'.$border_style.'>';
+					echo '<span'.$bg_style.'>';
+					foreach ($day_format as $format) {
+						echo $format ? '<span class="simcal-date-format" data-date-format="'.$format.'">'.date_i18n($format, $day_ts).'</span> ' : ' ';
 					}
 					echo '</span>';
-					echo '</dt>' . "\n";
+					echo '</dt>'."\n";
 
 				endif;
 
-				$list_events = '<ul class="simcal-events">' . "\n";
+				$list_events = '<ul class="simcal-events">'."\n";
 
 				$calendar_classes = array();
-				$day_classes = 'simcal-weekday-' . date( 'w', $day_ts );
+				$day_classes = 'simcal-weekday-'.date('w', $day_ts);
 
 				// Is this the present, the past or the future, Doc?
-				if ( $timestamp <= $now && $timestamp >= $now ) {
+				if ($timestamp <= $now && $timestamp >= $now) {
 					$day_classes .= ' simcal-today simcal-present simcal-day';
-				} elseif ( $timestamp < $now ) {
+				} elseif ($timestamp < $now) {
 					$day_classes .= ' simcal-past simcal-day';
-				} elseif ( $this->end > $now ) {
+				} elseif ($this->end > $now) {
 					$day_classes .= ' simcal-future simcal-day';
 				}
 
 				$count = 0;
 
-				foreach ( $events as $day_events ) :
-					foreach ( $day_events as $event ) :
-						if ( $event instanceof Event ) :
+				foreach ($events as $day_events) :
+					foreach ($day_events as $event) :
+						if ($event instanceof Event) :
 
 							$event_classes = $event_visibility = '';
 
-							$calendar_class     = 'simcal-events-calendar-' . strval( $event->calendar );
+							$calendar_class     = 'simcal-events-calendar-'.strval($event->calendar);
 							$calendar_classes[] = $calendar_class;
 
 							$recurring     = $event->recurrence ? 'simcal-event-recurring ' : '';
 							$has_location  = $event->venue ? 'simcal-event-has-location ' : '';
 
-							$event_classes .= 'simcal-event ' . $recurring . $has_location . $calendar_class;
+							$event_classes .= 'simcal-event '.$recurring.$has_location.$calendar_class;
 
 							// Toggle some events visibility if more than optional limit.
-							if ( ( $calendar->events_limit > - 1 ) && ( $count >= $calendar->events_limit ) ) :
+							if (($calendar->events_limit > - 1) && ($count >= $calendar->events_limit)) :
 								$event_classes .= ' simcal-event-toggled';
 								$event_visibility = ' style="display: none"';
 							endif;
@@ -536,75 +536,75 @@ 
 							$event_color = '';
 							$bullet = '';
 							$event_color = $event->get_color();
-							if ( ! empty( $event_color ) ) {
+							if ( ! empty($event_color)) {
 								$side = is_rtl() ? 'right' : 'left';
-								$event_color = ' style="border-' . $side . ': 4px solid ' . $event_color . '; padding-' . $side . ': 8px;"';
+								$event_color = ' style="border-'.$side.': 4px solid '.$event_color.'; padding-'.$side.': 8px;"';
 							}
 
-							$list_events .= "\t" . '<li class="' . $event_classes . '"' . $event_visibility . $event_color . ' itemprop="event" itemscope itemtype="http://schema.org/Event">' . "\n";
-							$list_events .= "\t\t" . '<div class="simcal-event-details">' . $calendar->get_event_html( $event ) . '</div>' . "\n";
-							$list_events .= "\t" . '</li>' . "\n";
+							$list_events .= "\t".'<li class="'.$event_classes.'"'.$event_visibility.$event_color.' itemprop="event" itemscope itemtype="http://schema.org/Event">'."\n";
+							$list_events .= "\t\t".'<div class="simcal-event-details">'.$calendar->get_event_html($event).'</div>'."\n";
+							$list_events .= "\t".'</li>'."\n";
 
-							$count ++;
+							$count++;
 
 							// Event falls within today.
-							if ( ( $this->end <= $now ) && ( $this->start >= $now ) ) :
+							if (($this->end <= $now) && ($this->start >= $now)) :
 								$day_classes .= ' simcal-today-has-events';
 							endif;
-							$day_classes .= ' simcal-day-has-events simcal-day-has-' . strval( $count ) . '-events';
+							$day_classes .= ' simcal-day-has-events simcal-day-has-'.strval($count).'-events';
 
-							if ( $calendar_classes ) :
-								$day_classes .= ' ' . trim( implode( ' ', array_unique( $calendar_classes ) ) );
+							if ($calendar_classes) :
+								$day_classes .= ' '.trim(implode(' ', array_unique($calendar_classes)));
 							endif;
 
 						endif;
 					endforeach;
 				endforeach;
 
-				$list_events .= '</ul>' . "\n";
+				$list_events .= '</ul>'."\n";
 
 				// If events visibility is limited, print the button toggle.
-				if ( ( $calendar->events_limit > -1 ) && ( $count > $calendar->events_limit ) ) :
+				if (($calendar->events_limit > -1) && ($count > $calendar->events_limit)) :
 					$list_events .= '<button class="simcal-events-toggle"><i class="simcal-icon-down simcal-icon-animate"></i></button>';
 				endif;
 
 				// Print final list of events for the current day.
 				$tag = $calendar->compact_list ? 'div' : 'dd';
-				echo '<'  . $tag . ' class="' . $day_classes . '" data-events-count="' . strval( $count ) . '">' . "\n";
-				echo "\t" . $list_events . "\n";
-				echo '</' . $tag . '>' . "\n";
+				echo '<'.$tag.' class="'.$day_classes.'" data-events-count="'.strval($count).'">'."\n";
+				echo "\t".$list_events."\n";
+				echo '</'.$tag.'>'."\n";
 
 			endforeach;
 
 		else :
 
-			echo "\t" . '<p>';
+			echo "\t".'<p>';
 
-			$message = get_post_meta( $calendar->id, '_no_events_message', true );
+			$message = get_post_meta($calendar->id, '_no_events_message', true);
 
-			if ( 'events' == $calendar->group_type ) {
-				echo ! empty( $message ) ? $message : __( 'Nothing to show.', 'google-calendar-events' );
+			if ('events' == $calendar->group_type) {
+				echo ! empty($message) ? $message : __('Nothing to show.', 'google-calendar-events');
 			} else {
-				if ( ! empty( $message ) ) {
+				if ( ! empty($message)) {
 					echo $message;
 				} else {
-					$from = Carbon::createFromTimestamp( $this->start, $calendar->timezone )->getTimestamp();
-					$to = Carbon::createFromTimestamp( $this->end, $calendar->timezone )->getTimestamp();
-					echo apply_filters( 'simcal_no_events_message', sprintf(
-						__( 'Nothing from %1$s to %2$s.', 'google-calendar-events' ),
-						date_i18n( $calendar->date_format, $from ),
-						date_i18n( $calendar->date_format, $to )
-					), $calendar->id, $from, $to );
+					$from = Carbon::createFromTimestamp($this->start, $calendar->timezone)->getTimestamp();
+					$to = Carbon::createFromTimestamp($this->end, $calendar->timezone)->getTimestamp();
+					echo apply_filters('simcal_no_events_message', sprintf(
+						__('Nothing from %1$s to %2$s.', 'google-calendar-events'),
+						date_i18n($calendar->date_format, $from),
+						date_i18n($calendar->date_format, $to)
+					), $calendar->id, $from, $to);
 				}
 			}
 
-			echo "\t" . '</p>' . "\n";
+			echo "\t".'</p>'."\n";
 
 		endif;
 
-		echo '</' . $block_tag . '>';
+		echo '</'.$block_tag.'>';
 
-		date_default_timezone_set( $calendar->site_timezone );
+		date_default_timezone_set($calendar->site_timezone);
 
 		return ob_get_clean();
 	}
@@ -616,16 +616,16 @@ 
 	 */
 	public function draw_list_ajax() {
 
-		if ( isset( $_POST['ts'] ) && isset( $_POST['id'] ) ) {
+		if (isset($_POST['ts']) && isset($_POST['id'])) {
 
-			$ts = absint( $_POST['ts'] );
-			$id = absint( $_POST['id'] );
+			$ts = absint($_POST['ts']);
+			$id = absint($_POST['id']);
 
-			wp_send_json_success( $this->draw_list( $ts, $id ) );
+			wp_send_json_success($this->draw_list($ts, $id));
 
 		} else {
 
-			wp_send_json_error( 'Missing arguments in default calendar list ajax request.' );
+			wp_send_json_error('Missing arguments in default calendar list ajax request.');
 
 		}
 	}
@@ -640,8 +640,8 @@ 
 	 *
 	 * @return bool
 	 */
-	private function filter_events_before( $event ) {
-		return intval( $event ) > intval( $this->start );
+	private function filter_events_before($event) {
+		return intval($event) > intval($this->start);
 	}
 
 	/**
@@ -654,8 +654,8 @@ 
 	 *
 	 * @return bool
 	 */
-	private function filter_events_after( $event ) {
-		return intval( $event ) < intval( $this->end );
+	private function filter_events_after($event) {
+		return intval($event) < intval($this->end);
 	}
 
 }

includes/events/event-builder.php

Indentation +64 added lines, -64 removed lines

@@ -590,21 +590,21 @@ 
 		if ( ! $event->whole_day ) {
 
 			$time_start = $this->calendar->datetime_separator .
-			              ' <span class="simcal-event-start simcal-event-start-time" ' .
-			              'data-event-start="' . $start->getTimestamp() . '" ' .
-			              'data-event-format="' . $this->calendar->time_format . '" ' .
-			              'itemprop="startDate" content="' . $start->toIso8601String() . '">' .
-			              date_i18n( $this->calendar->time_format, $start->getTimestamp() ) .
-			              '</span> ';
+						  ' <span class="simcal-event-start simcal-event-start-time" ' .
+						  'data-event-start="' . $start->getTimestamp() . '" ' .
+						  'data-event-format="' . $this->calendar->time_format . '" ' .
+						  'itemprop="startDate" content="' . $start->toIso8601String() . '">' .
+						  date_i18n( $this->calendar->time_format, $start->getTimestamp() ) .
+						  '</span> ';
 
 			if ( $end instanceof Carbon ) {
 
 				$time_end = ' <span class="simcal-event-end simcal-event-end-time" ' .
-				            'data-event-end="' . $end->getTimestamp() . '" ' .
-				            'data-event-format="' . $this->calendar->time_format . '" ' .
-				            'itemprop="endDate" content="' . $end->toIso8601String() . '">' .
-				            date_i18n( $this->calendar->time_format, $end->getTimestamp() ) .
-				            '</span> ';
+							'data-event-end="' . $end->getTimestamp() . '" ' .
+							'data-event-format="' . $this->calendar->time_format . '" ' .
+							'itemprop="endDate" content="' . $end->toIso8601String() . '">' .
+							date_i18n( $this->calendar->time_format, $end->getTimestamp() ) .
+							'</span> ';
 
 			}
 
@@ -613,23 +613,23 @@ 
 		if ( $event->multiple_days ) {
 
 			$output = ' <span class="simcal-event-start simcal-event-start-date" ' .
-			          'data-event-start="' . $start->getTimestamp() . '" ' .
-			          'data-event-format="' . $this->calendar->date_format . '" ' .
-			          'itemprop="startDate" content="' . $start->toIso8601String() . '">' .
-			          date_i18n( $this->calendar->date_format, $start->getTimestamp() ) .
-			          '</span> ' .
-			          $time_start;
+					  'data-event-start="' . $start->getTimestamp() . '" ' .
+					  'data-event-format="' . $this->calendar->date_format . '" ' .
+					  'itemprop="startDate" content="' . $start->toIso8601String() . '">' .
+					  date_i18n( $this->calendar->date_format, $start->getTimestamp() ) .
+					  '</span> ' .
+					  $time_start;
 
 			if ( $end instanceof Carbon ) {
 
 				$output .= '-' .
-				           ' <span class="simcal-event-start simcal-event-end-date" ' .
-				           'data-event-start="' . $end->getTimestamp() . '" ' .
-				           'data-event-format="' . $this->calendar->date_format . '" ' .
-				           'itemprop="endDate" content="' . $end->toIso8601String() . '">' .
-				           date_i18n( $this->calendar->date_format, $end->getTimestamp() ) .
-				           '</span> ' .
-				           $time_end;
+						   ' <span class="simcal-event-start simcal-event-end-date" ' .
+						   'data-event-start="' . $end->getTimestamp() . '" ' .
+						   'data-event-format="' . $this->calendar->date_format . '" ' .
+						   'itemprop="endDate" content="' . $end->toIso8601String() . '">' .
+						   date_i18n( $this->calendar->date_format, $end->getTimestamp() ) .
+						   '</span> ' .
+						   $time_end;
 			}
 
 		} else {
@@ -637,12 +637,12 @@ 
 			$time_end = ! empty( $time_start ) && ! empty( $time_end ) ? ' - ' . $time_end : '';
 
 			$output = ' <span class="simcal-event-start simcal-event-start-date" ' .
-			          'data-event-start="' . $start->getTimestamp() . '" ' .
-			          'data-event-format="' . $this->calendar->date_format . '">' .
-			          date_i18n( $this->calendar->date_format, $start->getTimestamp() ) .
-			          '</span> ' .
-			          $time_start .
-			          $time_end;
+					  'data-event-start="' . $start->getTimestamp() . '" ' .
+					  'data-event-format="' . $this->calendar->date_format . '">' .
+					  date_i18n( $this->calendar->date_format, $start->getTimestamp() ) .
+					  '</span> ' .
+					  $time_start .
+					  $time_end;
 
 		}
 
@@ -695,11 +695,11 @@ 
 		}
 
 		return '<span class="simcal-event-' . $bound . ' ' . 'simcal-event-' . $bound . '-' . $format . '"' .
-		       'data-event-' . $bound . '="' . $event_dt->getTimestamp() . '"' .
-		       'data-event-format="' . $dt_format . '"' .
-		       'itemprop="' . $bound . 'Date" content="' . $event_dt->toIso8601String() . '">' .
-		       $value .
-		       '</span>';
+			   'data-event-' . $bound . '="' . $event_dt->getTimestamp() . '"' .
+			   'data-event-format="' . $dt_format . '"' .
+			   'itemprop="' . $bound . 'Date" content="' . $event_dt->toIso8601String() . '">' .
+			   $value .
+			   '</span>';
 	}
 
 	/**
@@ -918,35 +918,35 @@ 
 		$tagregexp = implode( '|', array_values( $this->tags ) );
 
 		return '/'
-		       . '\\['                              // Opening bracket
-		       . '(\\[?)'                           // 1: Optional second opening bracket for escaping tags: [[tag]]
-		       . "($tagregexp)"                     // 2: Tag name
-		       . '(?![\\w-])'                       // Not followed by word character or hyphen
-		       . '('                                // 3: Unroll the loop: Inside the opening tag
-		       .     '[^\\]\\/]*'                   // Not a closing bracket or forward slash
-		       .     '(?:'
-		       .         '\\/(?!\\])'               // A forward slash not followed by a closing bracket
-		       .         '[^\\]\\/]*'               // Not a closing bracket or forward slash
-		       .     ')*?'
-		       . ')'
-		       . '(?:'
-		       .     '(\\/)'                        // 4: Self closing tag ...
-		       .     '\\]'                          // ... and closing bracket
-		       . '|'
-		       .     '\\]'                          // Closing bracket
-		       .     '(?:'
-		       .         '('                        // 5: Unroll the loop: Optionally, anything between the opening and closing tags
-		       .             '[^\\[]*+'             // Not an opening bracket
-		       .             '(?:'
-		       .                 '\\[(?!\\/\\2\\])' // An opening bracket not followed by the closing tag
-		       .                 '[^\\[]*+'         // Not an opening bracket
-		       .             ')*+'
-		       .         ')'
-		       .         '\\[\\/\\2\\]'             // Closing tag
-		       .     ')?'
-		       . ')'
-		       . '(\\]?)'                           // 6: Optional second closing bracket for escaping tags: [[tag]]
-		       . '/s';
+			   . '\\['                              // Opening bracket
+			   . '(\\[?)'                           // 1: Optional second opening bracket for escaping tags: [[tag]]
+			   . "($tagregexp)"                     // 2: Tag name
+			   . '(?![\\w-])'                       // Not followed by word character or hyphen
+			   . '('                                // 3: Unroll the loop: Inside the opening tag
+			   .     '[^\\]\\/]*'                   // Not a closing bracket or forward slash
+			   .     '(?:'
+			   .         '\\/(?!\\])'               // A forward slash not followed by a closing bracket
+			   .         '[^\\]\\/]*'               // Not a closing bracket or forward slash
+			   .     ')*?'
+			   . ')'
+			   . '(?:'
+			   .     '(\\/)'                        // 4: Self closing tag ...
+			   .     '\\]'                          // ... and closing bracket
+			   . '|'
+			   .     '\\]'                          // Closing bracket
+			   .     '(?:'
+			   .         '('                        // 5: Unroll the loop: Optionally, anything between the opening and closing tags
+			   .             '[^\\[]*+'             // Not an opening bracket
+			   .             '(?:'
+			   .                 '\\[(?!\\/\\2\\])' // An opening bracket not followed by the closing tag
+			   .                 '[^\\[]*+'         // Not an opening bracket
+			   .             ')*+'
+			   .         ')'
+			   .         '\\[\\/\\2\\]'             // Closing tag
+			   .     ')?'
+			   . ')'
+			   . '(\\]?)'                           // 6: Optional second closing bracket for escaping tags: [[tag]]
+			   . '/s';
 	}
 
 }

Spacing +306 added lines, -306 removed lines

@@ -9,7 +9,7 @@ 
 use Carbon\Carbon;
 use SimpleCalendar\Abstracts\Calendar;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -54,7 +54,7 @@ 
 	 * @param Event    $event
 	 * @param Calendar $calendar
 	 */
-	public function __construct( Event $event, Calendar $calendar ) {
+	public function __construct(Event $event, Calendar $calendar) {
 		$this->event    = $event;
 		$this->calendar = $calendar;
 		$this->tags     = $this->get_content_tags();
@@ -74,84 +74,84 @@ 
 			 * Content Tags *
 			 * ============ */
 
-			'title',                 // The event title.
-			'event-title',           // @deprecated An alias for 'title' tag.
-			'description',           // The event description.
-
-			'when',                  // Date and time of the event.
-			'start-time',            // Start time of the event.
-			'start-date',            // Start date of the event.
-			'start-custom',          // @deprecated Start time in a user defined format (set by tag 'format' attribute).
-			'start-human',           // Start time in a human friendly format.
-			'end-time',              // End time of the event.
-			'end-date',              // End date of the event.
-			'end-custom',            // @deprecated End date-time in a user defined format (set by tag 'format' attribute).
-			'end-human',             // End date-time in a human friendly format.
-
-			'duration',              // How long the events lasts, in a human-readable format.
-			'length',                // @deprecated An alias of 'duration' tag.
-
-			'location',              // Alias of start-location.
-			'start-location',        // Location name where the event starts.
-			'maps-link',             // @deprecated An alias for 'start-location-link' tag.
-			'start-location-link',   // Link to Google Maps querying the event start location address.
-			'end-location',          // Location name where the event ends.
-			'end-location-link',     // Link to Google Maps querying the event end location address.
-
-			'link',                  // An HTML link to the event URL.
-			'url',                   // A string with the raw event link URL.
-
-			'calendar',              // The title of the source calendar.
-			'feed-title',            // @deprecated An alias of 'calendar'.
-
-			'id',                    // The event unique ID.
-			'uid',                   // An alias of ID.
-			'event-id',              // @deprecated An alias for 'id' tag.
-			'calendar-id',           // The calendar ID.
-			'feed-id',               // @deprecated An alias for 'calendar-id' tag.
-			'cal-id',                // @deprecated An alias for 'calendar-id' tag.
+			'title', // The event title.
+			'event-title', // @deprecated An alias for 'title' tag.
+			'description', // The event description.
+
+			'when', // Date and time of the event.
+			'start-time', // Start time of the event.
+			'start-date', // Start date of the event.
+			'start-custom', // @deprecated Start time in a user defined format (set by tag 'format' attribute).
+			'start-human', // Start time in a human friendly format.
+			'end-time', // End time of the event.
+			'end-date', // End date of the event.
+			'end-custom', // @deprecated End date-time in a user defined format (set by tag 'format' attribute).
+			'end-human', // End date-time in a human friendly format.
+
+			'duration', // How long the events lasts, in a human-readable format.
+			'length', // @deprecated An alias of 'duration' tag.
+
+			'location', // Alias of start-location.
+			'start-location', // Location name where the event starts.
+			'maps-link', // @deprecated An alias for 'start-location-link' tag.
+			'start-location-link', // Link to Google Maps querying the event start location address.
+			'end-location', // Location name where the event ends.
+			'end-location-link', // Link to Google Maps querying the event end location address.
+
+			'link', // An HTML link to the event URL.
+			'url', // A string with the raw event link URL.
+
+			'calendar', // The title of the source calendar.
+			'feed-title', // @deprecated An alias of 'calendar'.
+
+			'id', // The event unique ID.
+			'uid', // An alias of ID.
+			'event-id', // @deprecated An alias for 'id' tag.
+			'calendar-id', // The calendar ID.
+			'feed-id', // @deprecated An alias for 'calendar-id' tag.
+			'cal-id', // @deprecated An alias for 'calendar-id' tag.
 
 			/* ========= *
 			 * Meta Tags *
 			 * ========= */
 
-			'attachments',          // List of attachments.
-			'attendees',            // List of attendees.
-			'organizer',            // Creator info.
+			'attachments', // List of attachments.
+			'attendees', // List of attendees.
+			'organizer', // Creator info.
 
 			/* ================ *
 			 * Conditional Tags *
 			 * ================ */
 
-			'if-title',              // If the event has a title.
-			'if-description',        // If the event has a description.
-
-			'if-now',                // If the event is taking place now.
-			'if-not-now',            // If the event is not taking place now (may have ended or just not started yet).
-			'if-started',            // If the event has started (and may as well as ended).
-			'if-not-started',        // If the event has NOT started yet (event could be any time in the future).
-			'if-ended',              // If the event has ended (event could be any time in the past).
-			'if-not-ended',          // If the event has NOT ended (may as well as not started yet).
-
-			'if-whole-day',          // If the event lasts the whole day.
-			'if-all-day',            // @deprecated Alias for 'if-whole-day'.
-			'if-not-whole-day',      // If the event does NOT last the whole day.
-			'if-not-all-day',        // @deprecated Alias for 'if-not-whole-day'.
-			'if-end-time',           // If the event has a set end time.
-			'if-no-end-time',        // If the event has NOT a set end time.
-
-			'if-multi-day',          // If the event spans multiple days.
-			'if-single-day',         // If the event does not span multiple days.
-
-			'if-recurring',          // If the event is a recurring event.
-			'if-not-recurring',      // If the event is NOT a recurring event.
-
-			'if-location',           // @deprecated Alias for 'if-start-location'.
-			'if-start-location',     // Does the event has a start location?
-			'if-end-location',       // Does the event has an end location?
-			'if-not-location',       // @deprecated Alias for 'if-not-start-location'.
+			'if-title', // If the event has a title.
+			'if-description', // If the event has a description.
+
+			'if-now', // If the event is taking place now.
+			'if-not-now', // If the event is not taking place now (may have ended or just not started yet).
+			'if-started', // If the event has started (and may as well as ended).
+			'if-not-started', // If the event has NOT started yet (event could be any time in the future).
+			'if-ended', // If the event has ended (event could be any time in the past).
+			'if-not-ended', // If the event has NOT ended (may as well as not started yet).
+
+			'if-whole-day', // If the event lasts the whole day.
+			'if-all-day', // @deprecated Alias for 'if-whole-day'.
+			'if-not-whole-day', // If the event does NOT last the whole day.
+			'if-not-all-day', // @deprecated Alias for 'if-not-whole-day'.
+			'if-end-time', // If the event has a set end time.
+			'if-no-end-time', // If the event has NOT a set end time.
+
+			'if-multi-day', // If the event spans multiple days.
+			'if-single-day', // If the event does not span multiple days.
+
+			'if-recurring', // If the event is a recurring event.
+			'if-not-recurring', // If the event is NOT a recurring event.
+
+			'if-location', // @deprecated Alias for 'if-start-location'.
+			'if-start-location', // Does the event has a start location?
+			'if-end-location', // Does the event has an end location?
+			'if-not-location', // @deprecated Alias for 'if-not-start-location'.
 			'if-not-start-location', // Does the event has NOT a start location?
-			'if-not-end-location',   // Does the event has NOT an end location?
+			'if-not-end-location', // Does the event has NOT an end location?
 
 		);
 	}
@@ -165,17 +165,17 @@ 
 	 *
 	 * @return string
 	 */
-	public function parse_event_template_tags( $template_tags = '' ) {
+	public function parse_event_template_tags($template_tags = '') {
 
 		// Process tags.
 		$result = preg_replace_callback(
 			$this->get_regex(),
-			array( $this, 'process_event_content' ),
+			array($this, 'process_event_content'),
 			$template_tags
 		);
 
 		// Removes extra consecutive <br> tags.
-		return preg_replace( '#(<br */?>\s*)+#i', '<br />', trim( $result ) );
+		return preg_replace('#(<br */?>\s*)+#i', '<br />', trim($result));
 	}
 
 	/**
@@ -187,10 +187,10 @@ 
 	 *
 	 * @return string
 	 */
-	public function process_event_content( $match ) {
+	public function process_event_content($match) {
 
-		if ( $match[1] == '[' && $match[6] == ']' ) {
-			return substr( $match[0], 1, - 1 );
+		if ($match[1] == '[' && $match[6] == ']') {
+			return substr($match[0], 1, - 1);
 		}
 
 		$tag     = $match[2]; // Tag name without square brackets.
@@ -202,9 +202,9 @@ 
 		$calendar = $this->calendar;
 		$event    = $this->event;
 
-		if ( ( $calendar instanceof Calendar ) && ( $event instanceof Event ) ) {
+		if (($calendar instanceof Calendar) && ($event instanceof Event)) {
 
-			switch ( $tag ) {
+			switch ($tag) {
 
 				/* ============ *
 				 * Content Tags *
@@ -212,13 +212,13 @@ 
 
 				case 'title' :
 				case 'event-title' :
-					return $this->get_title( $event->title, $attr );
+					return $this->get_title($event->title, $attr);
 
 				case 'description' :
-					return $this->get_description( $event->description, $attr );
+					return $this->get_description($event->description, $attr);
 
 				case 'when' :
-					return $this->get_when( $event );
+					return $this->get_when($event);
 
 				case 'end-date' :
 				case 'end-custom' :
@@ -228,39 +228,39 @@ 
 				case 'start-date' :
 				case 'start-human' :
 				case 'start-time' :
-					return $this->get_dt( $tag, $event, $attr );
+					return $this->get_dt($tag, $event, $attr);
 
 				case 'length' :
 				case 'duration' :
-					if ( false !== $event->end ) {
+					if (false !== $event->end) {
 						$duration = $event->start - $event->end;
-						$value    = human_time_diff( $event->start, $event->end );
+						$value    = human_time_diff($event->start, $event->end);
 					} else {
 						$duration = '-1';
-						$value    = __( 'No end time', 'google-calendar-events' );
+						$value    = __('No end time', 'google-calendar-events');
 					}
-					return ' <span class="simcal-event-duration" data-event-duration="' . $duration . '">' . $value . '</span>';
+					return ' <span class="simcal-event-duration" data-event-duration="'.$duration.'">'.$value.'</span>';
 
 				case 'location' :
 				case 'start-location' :
 				case 'end-location' :
 					$location = $tag == 'end-location' ? $event->end_location['address'] : $event->start_location['address'];
-					return ' <span class="simcal-event-address simcal-event-start-location" itemprop="location" itemscope itemtype="http://schema.org/Place">' . wp_strip_all_tags( $location ) . '</span>';
+					return ' <span class="simcal-event-address simcal-event-start-location" itemprop="location" itemscope itemtype="http://schema.org/Place">'.wp_strip_all_tags($location).'</span>';
 
 				case 'start-location-link':
 				case 'end-location-link' :
 				case 'maps-link' :
 					$location = $tag == 'end-location-link' ? $event->end_location['address'] : $event->start_location['address'];
-					if ( ! empty( $location ) ) {
-						$url = '//maps.google.com?q=' . urlencode( $location );
-						return $this->make_link( $tag, $url, $calendar->get_event_html( $event, $partial ), $attr );
+					if ( ! empty($location)) {
+						$url = '//maps.google.com?q='.urlencode($location);
+						return $this->make_link($tag, $url, $calendar->get_event_html($event, $partial), $attr);
 					}
 					break;
 
 				case 'link' :
 				case 'url' :
-					$content = 'link' == $tag ? $calendar->get_event_html( $event, $partial ) : '';
-					return $this->make_link( $tag, $event->link, $content , $attr );
+					$content = 'link' == $tag ? $calendar->get_event_html($event, $partial) : '';
+					return $this->make_link($tag, $event->link, $content, $attr);
 
 				case 'calendar' :
 				case 'feed-title' :
@@ -282,22 +282,22 @@ 
 
 				case 'attachments' :
 					$attachments = $event->get_attachments();
-					if ( ! empty( $attachments ) ) {
-						return $this->get_attachments( $attachments );
+					if ( ! empty($attachments)) {
+						return $this->get_attachments($attachments);
 					}
 					break;
 
 				case 'attendees' :
 					$attendees = $event->get_attendees();
-					if ( ! empty( $attendees ) ) {
-						return $this->get_attendees( $attendees, $attr );
+					if ( ! empty($attendees)) {
+						return $this->get_attendees($attendees, $attr);
 					}
 					break;
 
 				case 'organizer' :
 					$organizer = $event->get_organizer();
-					if ( ! empty( $organizer ) ) {
-						return $this->get_organizer( $organizer, $attr );
+					if ( ! empty($organizer)) {
+						return $this->get_organizer($organizer, $attr);
 					}
 					break;
 
@@ -306,35 +306,35 @@ 
 				 * ================ */
 
 				case 'if-title':
-					if ( ! empty( $event->title ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if ( ! empty($event->title)) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-description':
-					if ( ! empty( $event->description ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if ( ! empty($event->description)) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-now' :
 				case 'if-not-now' :
 
-					$start_dt = $event->start_dt->setTimezone( $calendar->timezone );
+					$start_dt = $event->start_dt->setTimezone($calendar->timezone);
 					$start = $start_dt->getTimestamp();
 
-					if ( $event->end_dt instanceof Carbon ) {
-						$end = $event->end_dt->setTimezone( $calendar->timezone )->getTimestamp();
+					if ($event->end_dt instanceof Carbon) {
+						$end = $event->end_dt->setTimezone($calendar->timezone)->getTimestamp();
 					} else {
 						return '';
 					}
 
-					$now = ( $start <= $calendar->now ) && ( $end >= $calendar->now );
+					$now = ($start <= $calendar->now) && ($end >= $calendar->now);
 
-					if ( ( 'if-now' == $tag ) && $now ) {
-						return $calendar->get_event_html( $event, $partial );
-					} elseif ( ( 'if-not-now' == $tag ) && ( false == $now ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (('if-now' == $tag) && $now) {
+						return $calendar->get_event_html($event, $partial);
+					} elseif (('if-not-now' == $tag) && (false == $now)) {
+						return $calendar->get_event_html($event, $partial);
 					}
 
 					break;
@@ -342,15 +342,15 @@ 
 				case 'if-started' :
 				case 'if-not-started' :
 
-					$start = $event->start_dt->setTimezone( $calendar->timezone )->getTimestamp();
+					$start = $event->start_dt->setTimezone($calendar->timezone)->getTimestamp();
 
-					if ( 'if-started' == $tag ) {
-						if ( $start < $calendar->now ) {
-							return $calendar->get_event_html( $event, $partial );
+					if ('if-started' == $tag) {
+						if ($start < $calendar->now) {
+							return $calendar->get_event_html($event, $partial);
 						}
-					} elseif ( 'if-not-started' == $tag ) {
-						if ( $start > $calendar->now ) {
-							return $calendar->get_event_html( $event, $partial );
+					} elseif ('if-not-started' == $tag) {
+						if ($start > $calendar->now) {
+							return $calendar->get_event_html($event, $partial);
 						}
 					}
 
@@ -359,17 +359,17 @@ 
 				case 'if-ended' :
 				case 'if-not-ended' :
 
-					if ( false !== $event->end ) {
+					if (false !== $event->end) {
 
-						$end = $event->end_dt->setTimezone( $calendar->timezone )->getTimestamp();
+						$end = $event->end_dt->setTimezone($calendar->timezone)->getTimestamp();
 
-						if ( 'if-ended' == $tag ) {
-							if ( $end < $calendar->now ) {
-								return $calendar->get_event_html( $event, $partial );
+						if ('if-ended' == $tag) {
+							if ($end < $calendar->now) {
+								return $calendar->get_event_html($event, $partial);
 							}
-						} elseif ( 'if-not-ended' == $tag ) {
-							if ( $end > $calendar->now ) {
-								return $calendar->get_event_html( $event, $partial );
+						} elseif ('if-not-ended' == $tag) {
+							if ($end > $calendar->now) {
+								return $calendar->get_event_html($event, $partial);
 							}
 						}
 
@@ -378,14 +378,14 @@ 
 					break;
 
 				case 'if-end-time' :
-					if ( false !== $event->end ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (false !== $event->end) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-no-end-time' :
-					if ( false === $event->end ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (false === $event->end) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
@@ -393,59 +393,59 @@ 
 				case 'if-whole-day' :
 				case 'if-not-all-day' :
 				case 'if-not-whole-day' :
-					$bool = strstr( $tag, 'not' ) ? false : true;
-					if ( $bool === $event->whole_day ) {
-						return $calendar->get_event_html( $event, $partial );
+					$bool = strstr($tag, 'not') ? false : true;
+					if ($bool === $event->whole_day) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-recurring' :
-					if ( ! empty( $event->recurrence ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if ( ! empty($event->recurrence)) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-not-recurring' :
-					if ( false === $event->recurrence ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (false === $event->recurrence) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-multi-day' :
-					if ( false !== $event->multiple_days ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (false !== $event->multiple_days) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-single-day' :
-					if ( false === $event->multiple_days ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (false === $event->multiple_days) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-location' :
 				case 'if-start-location' :
-					if ( ! empty( $event->start_location['address'] ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if ( ! empty($event->start_location['address'])) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					return false;
 
 				case 'if-not-location' :
 				case 'if-not-start-location' :
-					if ( empty( $event->start_location['address'] ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (empty($event->start_location['address'])) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					return '';
 
 				case 'if-not-end-location' :
-					if ( empty( $event->end_location['address'] ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (empty($event->end_location['address'])) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					return '';
 
 				case 'if-end-location' :
-					if ( ! empty( $event->end_location['address'] ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if ( ! empty($event->end_location['address'])) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					return '';
 
@@ -454,7 +454,7 @@ 
 				 * ======= */
 
 				default :
-					return wp_kses_post( $before . $partial . $after );
+					return wp_kses_post($before.$partial.$after);
 			}
 		}
 
@@ -472,15 +472,15 @@ 
 	 *
 	 * @return string
 	 */
-	private function limit_words( $text, $limit ) {
+	private function limit_words($text, $limit) {
 
-		$text = wp_strip_all_tags( $text );
-		$limit = max( absint( $limit ), 0 );
+		$text = wp_strip_all_tags($text);
+		$limit = max(absint($limit), 0);
 
-		if ( $limit > 0 && ( str_word_count( $text, 0 ) > $limit ) ) {
-			$words  = str_word_count( $text, 2 );
-			$pos    = array_keys( $words );
-			$text   = trim( substr( $text, 0, $pos[ $limit ] ) ) . '&hellip;';
+		if ($limit > 0 && (str_word_count($text, 0) > $limit)) {
+			$words  = str_word_count($text, 2);
+			$pos    = array_keys($words);
+			$text   = trim(substr($text, 0, $pos[$limit])).'&hellip;';
 		}
 
 		return $text;
@@ -497,26 +497,26 @@ 
 	 *
 	 * @return string
 	 */
-	private function get_title( $title, $attr ) {
+	private function get_title($title, $attr) {
 
-		if ( empty( $title ) ) {
+		if (empty($title)) {
 			return '';
 		}
 
-		$attr = array_merge( array(
-			'html'  => '',  // Parse HTML
-			'limit' => 0,   // Trim length to amount of words
-		), (array) shortcode_parse_atts( $attr ) );
+		$attr = array_merge(array(
+			'html'  => '', // Parse HTML
+			'limit' => 0, // Trim length to amount of words
+		), (array) shortcode_parse_atts($attr));
 
-		if ( ! empty( $attr['html'] ) ) {
-			$title = wp_kses_post( $title );
+		if ( ! empty($attr['html'])) {
+			$title = wp_kses_post($title);
 			$tag = 'div';
 		} else {
-			$title = $this->limit_words( $title, $attr['limit'] );
+			$title = $this->limit_words($title, $attr['limit']);
 			$tag = 'span';
 		}
 
-		return '<' . $tag . ' class="simcal-event-title" itemprop="name">' . $title . '</' . $tag . '>';
+		return '<'.$tag.' class="simcal-event-title" itemprop="name">'.$title.'</'.$tag.'>';
 	}
 
 	/**
@@ -530,40 +530,40 @@ 
 	 *
 	 * @return string
 	 */
-	private function get_description( $description, $attr ) {
+	private function get_description($description, $attr) {
 
-		if ( empty( $description ) ) {
+		if (empty($description)) {
 			return '';
 		}
 
-		$attr = array_merge( array(
-			'limit'     => 0,       // Trim length to number of words
-			'html'      => 'no',    // Parse HTML content
-			'markdown'  => 'no',    // Parse Markdown content
-			'autolink'  => 'no',    // Automatically convert plaintext URIs to anchors
-		), (array) shortcode_parse_atts( $attr ) );
+		$attr = array_merge(array(
+			'limit'     => 0, // Trim length to number of words
+			'html'      => 'no', // Parse HTML content
+			'markdown'  => 'no', // Parse Markdown content
+			'autolink'  => 'no', // Automatically convert plaintext URIs to anchors
+		), (array) shortcode_parse_atts($attr));
 
-		$allow_html = 'no' != $attr['html']     ? true : false;
+		$allow_html = 'no' != $attr['html'] ? true : false;
 		$allow_md   = 'no' != $attr['markdown'] ? true : false;
 
 		$html = '<div class="simcal-event-description" itemprop="description">';
 
 		// Markdown and HTML don't play well together, use one or the other in the same tag.
-		if ( $allow_html || $allow_md ) {
-			if ( $allow_html ) {
-				$html .= wp_kses_post( $description );
-			} elseif ( $allow_md ) {
+		if ($allow_html || $allow_md) {
+			if ($allow_html) {
+				$html .= wp_kses_post($description);
+			} elseif ($allow_md) {
 				$markdown = new \Parsedown();
-				$html .= $markdown->text( wp_strip_all_tags( $description ) );
+				$html .= $markdown->text(wp_strip_all_tags($description));
 			}
 		} else {
-			$html .= $this->limit_words( $description, $attr['limit'] );
+			$html .= $this->limit_words($description, $attr['limit']);
 		}
 
 		$html .= '</div>';
 
-		if ( 'no' != $attr['autolink'] ) {
-			$html = ' ' . make_clickable( $html );
+		if ('no' != $attr['autolink']) {
+			$html = ' '.make_clickable($html);
 		}
 
 		return $html;
@@ -579,74 +579,74 @@ 
 	 *
 	 * @return string
 	 */
-	private function get_when( Event $event ) {
+	private function get_when(Event $event) {
 
-		$start = $event->start_dt->setTimezone( $event->timezone );
-		$end = ! is_null( $event->end_dt ) ? $event->end_dt->setTimezone( $event->timezone ) : null;
+		$start = $event->start_dt->setTimezone($event->timezone);
+		$end = ! is_null($event->end_dt) ? $event->end_dt->setTimezone($event->timezone) : null;
 
 		$time_start = '';
 		$time_end = '';
 
-		if ( ! $event->whole_day ) {
+		if ( ! $event->whole_day) {
 
-			$time_start = $this->calendar->datetime_separator .
-			              ' <span class="simcal-event-start simcal-event-start-time" ' .
-			              'data-event-start="' . $start->getTimestamp() . '" ' .
-			              'data-event-format="' . $this->calendar->time_format . '" ' .
-			              'itemprop="startDate" content="' . $start->toIso8601String() . '">' .
-			              date_i18n( $this->calendar->time_format, $start->getTimestamp() ) .
+			$time_start = $this->calendar->datetime_separator.
+			              ' <span class="simcal-event-start simcal-event-start-time" '.
+			              'data-event-start="'.$start->getTimestamp().'" '.
+			              'data-event-format="'.$this->calendar->time_format.'" '.
+			              'itemprop="startDate" content="'.$start->toIso8601String().'">'.
+			              date_i18n($this->calendar->time_format, $start->getTimestamp()).
 			              '</span> ';
 
-			if ( $end instanceof Carbon ) {
+			if ($end instanceof Carbon) {
 
-				$time_end = ' <span class="simcal-event-end simcal-event-end-time" ' .
-				            'data-event-end="' . $end->getTimestamp() . '" ' .
-				            'data-event-format="' . $this->calendar->time_format . '" ' .
-				            'itemprop="endDate" content="' . $end->toIso8601String() . '">' .
-				            date_i18n( $this->calendar->time_format, $end->getTimestamp() ) .
+				$time_end = ' <span class="simcal-event-end simcal-event-end-time" '.
+				            'data-event-end="'.$end->getTimestamp().'" '.
+				            'data-event-format="'.$this->calendar->time_format.'" '.
+				            'itemprop="endDate" content="'.$end->toIso8601String().'">'.
+				            date_i18n($this->calendar->time_format, $end->getTimestamp()).
 				            '</span> ';
 
 			}
 
 		}
 
-		if ( $event->multiple_days ) {
+		if ($event->multiple_days) {
 
-			$output = ' <span class="simcal-event-start simcal-event-start-date" ' .
-			          'data-event-start="' . $start->getTimestamp() . '" ' .
-			          'data-event-format="' . $this->calendar->date_format . '" ' .
-			          'itemprop="startDate" content="' . $start->toIso8601String() . '">' .
-			          date_i18n( $this->calendar->date_format, $start->getTimestamp() ) .
-			          '</span> ' .
+			$output = ' <span class="simcal-event-start simcal-event-start-date" '.
+			          'data-event-start="'.$start->getTimestamp().'" '.
+			          'data-event-format="'.$this->calendar->date_format.'" '.
+			          'itemprop="startDate" content="'.$start->toIso8601String().'">'.
+			          date_i18n($this->calendar->date_format, $start->getTimestamp()).
+			          '</span> '.
 			          $time_start;
 
-			if ( $end instanceof Carbon ) {
+			if ($end instanceof Carbon) {
 
-				$output .= '-' .
-				           ' <span class="simcal-event-start simcal-event-end-date" ' .
-				           'data-event-start="' . $end->getTimestamp() . '" ' .
-				           'data-event-format="' . $this->calendar->date_format . '" ' .
-				           'itemprop="endDate" content="' . $end->toIso8601String() . '">' .
-				           date_i18n( $this->calendar->date_format, $end->getTimestamp() ) .
-				           '</span> ' .
+				$output .= '-'.
+				           ' <span class="simcal-event-start simcal-event-end-date" '.
+				           'data-event-start="'.$end->getTimestamp().'" '.
+				           'data-event-format="'.$this->calendar->date_format.'" '.
+				           'itemprop="endDate" content="'.$end->toIso8601String().'">'.
+				           date_i18n($this->calendar->date_format, $end->getTimestamp()).
+				           '</span> '.
 				           $time_end;
 			}
 
 		} else {
 
-			$time_end = ! empty( $time_start ) && ! empty( $time_end ) ? ' - ' . $time_end : '';
+			$time_end = ! empty($time_start) && ! empty($time_end) ? ' - '.$time_end : '';
 
-			$output = ' <span class="simcal-event-start simcal-event-start-date" ' .
-			          'data-event-start="' . $start->getTimestamp() . '" ' .
-			          'data-event-format="' . $this->calendar->date_format . '">' .
-			          date_i18n( $this->calendar->date_format, $start->getTimestamp() ) .
-			          '</span> ' .
-			          $time_start .
+			$output = ' <span class="simcal-event-start simcal-event-start-date" '.
+			          'data-event-start="'.$start->getTimestamp().'" '.
+			          'data-event-format="'.$this->calendar->date_format.'">'.
+			          date_i18n($this->calendar->date_format, $start->getTimestamp()).
+			          '</span> '.
+			          $time_start.
 			          $time_end;
 
 		}
 
-		return trim( $output );
+		return trim($output);
 	}
 
 	/**
@@ -661,44 +661,44 @@ 
 	 *
 	 * @return string
 	 */
-	private function get_dt( $tag, Event $event, $attr ) {
+	private function get_dt($tag, Event $event, $attr) {
 
-		$bound = 0 === strpos( $tag, 'end' ) ? 'end' : 'start';
-		if ( ( 'end' == $bound ) && ( false === $event->end ) ) {
+		$bound = 0 === strpos($tag, 'end') ? 'end' : 'start';
+		if (('end' == $bound) && (false === $event->end)) {
 			return '';
 		}
 
-		$dt = $bound . '_dt';
-		if ( ! $event->$dt instanceof Carbon ) {
+		$dt = $bound.'_dt';
+		if ( ! $event->$dt instanceof Carbon) {
 			return '';
 		}
-		$event_dt = $event->$dt->setTimezone( $event->timezone );
+		$event_dt = $event->$dt->setTimezone($event->timezone);
 
-		$attr = array_merge( array(
+		$attr = array_merge(array(
 			'format'    => '',
-		), (array) shortcode_parse_atts( $attr ) );
+		), (array) shortcode_parse_atts($attr));
 
-		$format = ltrim( strstr( $tag, '-' ), '-' );
+		$format = ltrim(strstr($tag, '-'), '-');
 		$dt_format = '';
-		if ( ! empty( $attr['format'] ) ) {
-			$dt_format = esc_attr( wp_strip_all_tags( $attr['format'] ) );
-		} elseif ( 'date' == $format ) {
+		if ( ! empty($attr['format'])) {
+			$dt_format = esc_attr(wp_strip_all_tags($attr['format']));
+		} elseif ('date' == $format) {
 			$dt_format = $this->calendar->date_format;
-		} elseif ( 'time' == $format ) {
+		} elseif ('time' == $format) {
 			$dt_format = $this->calendar->time_format;
 		}
 
-		if ( 'human' == $format ) {
-			$value = human_time_diff( $event_dt->getTimestamp(), Carbon::now( $event->timezone )->getTimestamp() );
+		if ('human' == $format) {
+			$value = human_time_diff($event_dt->getTimestamp(), Carbon::now($event->timezone)->getTimestamp());
 		} else {
-			$value = date_i18n( $dt_format, $event_dt->getTimestamp() );
+			$value = date_i18n($dt_format, $event_dt->getTimestamp());
 		}
 
-		return '<span class="simcal-event-' . $bound . ' ' . 'simcal-event-' . $bound . '-' . $format . '"' .
-		       'data-event-' . $bound . '="' . $event_dt->getTimestamp() . '"' .
-		       'data-event-format="' . $dt_format . '"' .
-		       'itemprop="' . $bound . 'Date" content="' . $event_dt->toIso8601String() . '">' .
-		       $value .
+		return '<span class="simcal-event-'.$bound.' '.'simcal-event-'.$bound.'-'.$format.'"'.
+		       'data-event-'.$bound.'="'.$event_dt->getTimestamp().'"'.
+		       'data-event-format="'.$dt_format.'"'.
+		       'itemprop="'.$bound.'Date" content="'.$event_dt->toIso8601String().'">'.
+		       $value.
 		       '</span>';
 	}
 
@@ -715,23 +715,23 @@ 
 	 *
 	 * @return string
 	 */
-	private function make_link( $tag, $url, $content, $attr ) {
+	private function make_link($tag, $url, $content, $attr) {
 
-		if ( empty( $url ) ) {
+		if (empty($url)) {
 			return '';
 		}
 
-		$text = empty( $content ) ? $url : $content;
+		$text = empty($content) ? $url : $content;
 
-		$attr = array_merge( array(
-			'autolink'  => false,   // Convert url to link anchor
-			'newwindow' => false,   // If autolink attribute is true, open link in new window
-		), (array) shortcode_parse_atts( $attr ) );
+		$attr = array_merge(array(
+			'autolink'  => false, // Convert url to link anchor
+			'newwindow' => false, // If autolink attribute is true, open link in new window
+		), (array) shortcode_parse_atts($attr));
 
 		$anchor = $tag != 'url' ? 'yes' : $attr['autolink'];
 		$target = $attr['newwindow'] !== false ? 'target="_blank"' : '';
 
-		return $anchor !== false ? ' <a href="' . esc_url( $url ) . '" ' . $target . '>' . $text . '</a>' : ' ' . $text;
+		return $anchor !== false ? ' <a href="'.esc_url($url).'" '.$target.'>'.$text.'</a>' : ' '.$text;
 	}
 
 	/**
@@ -744,20 +744,20 @@ 
 	 *
 	 * @return string
 	 */
-	private function get_attachments( $attachments ) {
+	private function get_attachments($attachments) {
 
-		$html = '<ul class="simcal-attachments">' . "\n\t";
+		$html = '<ul class="simcal-attachments">'."\n\t";
 
-		foreach ( $attachments as $attachment ) {
+		foreach ($attachments as $attachment) {
 			$html .= '<li class="simcal-attachment">';
-			$html .= '<a href="' . $attachment['url'] . '" target="_blank">';
-			$html .= ! empty( $attachment['icon'] ) ? '<img src="' . $attachment['icon'] . '" />' : '';
-			$html .= '<span>' . $attachment['name'] . '</span>';
+			$html .= '<a href="'.$attachment['url'].'" target="_blank">';
+			$html .= ! empty($attachment['icon']) ? '<img src="'.$attachment['icon'].'" />' : '';
+			$html .= '<span>'.$attachment['name'].'</span>';
 			$html .= '</a>';
-			$html .= '</li>' . "\n";
+			$html .= '</li>'."\n";
 		}
 
-		$html .= '</ul>' . "\n";
+		$html .= '</ul>'."\n";
 
 		return $html;
 	}
@@ -773,41 +773,41 @@ 
 	 *
 	 * @return string
 	 */
-	private function get_attendees( $attendees, $attr ) {
+	private function get_attendees($attendees, $attr) {
 
-		$attr = array_merge( array(
-			'photo'     => 'show',  // show/hide attendee photo
-			'email'     => 'hide',  // show/hide attendee email address
-			'rsvp'      => 'hide',  // show/hide rsvp response status
-			'response'  => '',      // filter attendees by rsvp response (yes/no/maybe)
-		), (array) shortcode_parse_atts( $attr ) );
+		$attr = array_merge(array(
+			'photo'     => 'show', // show/hide attendee photo
+			'email'     => 'hide', // show/hide attendee email address
+			'rsvp'      => 'hide', // show/hide rsvp response status
+			'response'  => '', // filter attendees by rsvp response (yes/no/maybe)
+		), (array) shortcode_parse_atts($attr));
 
-		$html = '<ul class="simcal-attendees" itemprop="attendees">' . "\n\t";
+		$html = '<ul class="simcal-attendees" itemprop="attendees">'."\n\t";
 
 		$known = 0;
 		$unknown = 0;
 
-		foreach ( $attendees as $attendee ) {
+		foreach ($attendees as $attendee) {
 
-			if ( 'yes' == $attr['response'] && 'yes' != $attendee['response'] ) {
+			if ('yes' == $attr['response'] && 'yes' != $attendee['response']) {
 				continue;
-			} elseif ( 'no' == $attr['response'] && 'no' != $attendee['response'] ) {
+			} elseif ('no' == $attr['response'] && 'no' != $attendee['response']) {
 				continue;
-			} elseif ( 'maybe' == $attr['response'] && ! in_array( $attendee['response'], array( 'yes', 'maybe' ) ) ) {
+			} elseif ('maybe' == $attr['response'] && ! in_array($attendee['response'], array('yes', 'maybe'))) {
 				continue;
 			}
 
-			if ( ! empty( $attendee['name'] ) ) {
+			if ( ! empty($attendee['name'])) {
 
-				$photo      = 'hide' != $attr['photo'] ? '<img class="avatar avatar-128 photo" src="' . $attendee['photo'] . '" itemprop="image" />' : '';
-				$response   = 'hide' != $attr['rsvp'] ? $this->get_rsvp_response( $attendee['response'] ) : '';
-				$guest      = $photo . '<span itemprop="name">' . $attendee['name'] . $response . '</span>';
+				$photo      = 'hide' != $attr['photo'] ? '<img class="avatar avatar-128 photo" src="'.$attendee['photo'].'" itemprop="image" />' : '';
+				$response   = 'hide' != $attr['rsvp'] ? $this->get_rsvp_response($attendee['response']) : '';
+				$guest      = $photo.'<span itemprop="name">'.$attendee['name'].$response.'</span>';
 
-				if ( ! empty( $attendee['email'] ) && ( 'show' == $attr['email'] ) ) {
-					$guest = sprintf( '<a href="mailto:' . $attendee['email'] . '" itemprop="email">%s</a>', $guest );
+				if ( ! empty($attendee['email']) && ('show' == $attr['email'])) {
+					$guest = sprintf('<a href="mailto:'.$attendee['email'].'" itemprop="email">%s</a>', $guest);
 				}
 
-				$html .= '<li class="simcal-attendee" itemprop="attendee" itemscope itemtype="http://schema.org/Person">' . $guest . '</li>' . "\n";
+				$html .= '<li class="simcal-attendee" itemprop="attendee" itemscope itemtype="http://schema.org/Person">'.$guest.'</li>'."\n";
 
 				$known++;
 
@@ -818,21 +818,21 @@ 
 			}
 		}
 
-		if ( $unknown > 0 ) {
-			if ( $known > 0 ) {
+		if ($unknown > 0) {
+			if ($known > 0) {
 				/* translators: One more person attending the event. */
-				$others = sprintf( _n( '1 more attendee', '%s more attendees', $unknown, 'google-calendar-events' ), $unknown );
+				$others = sprintf(_n('1 more attendee', '%s more attendees', $unknown, 'google-calendar-events'), $unknown);
 			} else {
 				/* translators: One or more persons attending the event whose name is unknown. */
-				$others = sprintf( _n( '1 anonymous attendee', '%s anonymous attendees', $unknown, 'google-calendar-events' ), $unknown );
+				$others = sprintf(_n('1 anonymous attendee', '%s anonymous attendees', $unknown, 'google-calendar-events'), $unknown);
 			}
-			$photo = $attr['photo'] !== 'hide' ? get_avatar( '', 128 ) : '';
-			$html .= '<li class="simcal-attendee simcal-attendee-anonymous">' . $photo . '<span>' . $others . '</span></li>' . "\n";
-		} elseif ( $known === 0 ) {
-			$html .= '<li class="simcal-attendee">' . _x( 'No one yet', 'No one yet rsvp to attend the event.', 'google-calendar-events' ) . '</li>' . "\n";
+			$photo = $attr['photo'] !== 'hide' ? get_avatar('', 128) : '';
+			$html .= '<li class="simcal-attendee simcal-attendee-anonymous">'.$photo.'<span>'.$others.'</span></li>'."\n";
+		} elseif ($known === 0) {
+			$html .= '<li class="simcal-attendee">'._x('No one yet', 'No one yet rsvp to attend the event.', 'google-calendar-events').'</li>'."\n";
 		}
 
-		$html .= '</ul>' . "\n";
+		$html .= '</ul>'."\n";
 
 		return $html;
 	}
@@ -846,23 +846,23 @@ 
 	 *
 	 * @return string
 	 */
-	private function get_rsvp_response( $response ) {
+	private function get_rsvp_response($response) {
 
-		if ( 'yes' == $response ) {
+		if ('yes' == $response) {
 			/* translators: Someone replied with 'yes' to a rsvp request. */
-			$rsvp = __( 'Attending', 'google-calendar-events' );
-		} elseif ( 'no' == $response ) {
+			$rsvp = __('Attending', 'google-calendar-events');
+		} elseif ('no' == $response) {
 			/* translators: Someone replied with 'no' to a rsvp request. */
-			$rsvp = __( 'Not attending', 'google-calendar-events' );
-		} elseif ( 'maybe' == $response ) {
+			$rsvp = __('Not attending', 'google-calendar-events');
+		} elseif ('maybe' == $response) {
 			/* translators: Someone replied with 'maybe' to a rsvp request. */
-			$rsvp = __( 'Maybe attending', 'google-calendar-events' );
+			$rsvp = __('Maybe attending', 'google-calendar-events');
 		} else {
 			/* translators: Someone did not send yet a rsvp confirmation to join an event. */
-			$rsvp = __( 'Response pending', 'google-calendar-events' );
+			$rsvp = __('Response pending', 'google-calendar-events');
 		}
 
-		return ' <small>(' . $rsvp . ')</small>';
+		return ' <small>('.$rsvp.')</small>';
 	}
 
 	/**
@@ -876,21 +876,21 @@ 
 	 *
 	 * @return string
 	 */
-	private function get_organizer( $organizer, $attr ) {
+	private function get_organizer($organizer, $attr) {
 
-		$attr = array_merge( array(
-			'photo' => 'show',  // show/hide attendee photo
-			'email' => 'hide',  // show/hide attendee email address
-		), (array) shortcode_parse_atts( $attr ) );
+		$attr = array_merge(array(
+			'photo' => 'show', // show/hide attendee photo
+			'email' => 'hide', // show/hide attendee email address
+		), (array) shortcode_parse_atts($attr));
 
-		$photo      = 'hide' != $attr['photo'] ? '<img class="avatar avatar-128 photo" src="' . $organizer['photo'] . '" itemprop="image"  />' : '';
-		$organizer  = $photo . '<span itemprop="name">' . $organizer['name'] . '</span>';
+		$photo      = 'hide' != $attr['photo'] ? '<img class="avatar avatar-128 photo" src="'.$organizer['photo'].'" itemprop="image"  />' : '';
+		$organizer  = $photo.'<span itemprop="name">'.$organizer['name'].'</span>';
 
-		if ( ! empty( $organizer['email'] ) && ( 'show' == $attr['email'] ) ) {
-			$organizer = sprintf( '<a href="mailto:' . $organizer['email'] . '" itemprop="email">%s</a>', $organizer );
+		if ( ! empty($organizer['email']) && ('show' == $attr['email'])) {
+			$organizer = sprintf('<a href="mailto:'.$organizer['email'].'" itemprop="email">%s</a>', $organizer);
 		}
 
-		return '<div class="simcal-organizer" itemprop="organizer" itemscope itemtype="https://schema.org/Person">' . $organizer . '</div>';
+		return '<div class="simcal-organizer" itemprop="organizer" itemscope itemtype="https://schema.org/Person">'.$organizer.'</div>';
 	}
 
 	/**
@@ -915,7 +915,7 @@ 
 		// This is largely borrowed on get_shortcode_regex() from WordPress Core.
 		// @see /wp-includes/shortcodes.php (with some modification)
 
-		$tagregexp = implode( '|', array_values( $this->tags ) );
+		$tagregexp = implode('|', array_values($this->tags));
 
 		return '/'
 		       . '\\['                              // Opening bracket

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