moonstonemedia / Simple-Calendar

includes/assets.php

Spacing +65 added lines, -65 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Abstracts\Calendar_View;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -60,16 +60,16 @@ 
 	 */
 	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' );
+		$settings = get_option('simple-calendar_settings_advanced');
 
-		if ( isset( $settings['assets']['disable_css'] ) ) {
+		if (isset($settings['assets']['disable_css'])) {
 			$this->disable_styles = 'yes' == $settings['assets']['disable_css'] ? true : false;
 		}
 
-		add_action( 'init', array( $this, 'register' ), 20 );
-		add_action( 'init', array( $this, 'enqueue' ), 40 );
+		add_action('init', array($this, 'register'), 20);
+		add_action('init', array($this, 'enqueue'), 40);
 	}
 
 	/**
@@ -78,7 +78,7 @@ 
 	 * @since 3.0.0
 	 */
 	public function register() {
-		do_action( 'simcal_register_assets', $this->min );
+		do_action('simcal_register_assets', $this->min);
 	}
 
 	/**
@@ -88,25 +88,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);
 
 
 		$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.pkgd' . $min . '.js',
-						array( 'simcal-qtip' ),
+						SIMPLE_CALENDAR_ASSETS.'js/vendor/imagesloaded.pkgd'.$min.'.js',
+						array('simcal-qtip'),
 						SIMPLE_CALENDAR_VERSION,
 						true
 					);
 				}
-			}, 1000 );
+			}, 1000);
 	}
 
 	/**
@@ -118,34 +118,34 @@ 
 
 		$types = simcal_get_calendar_types();
 
-		foreach ( $types as $calendar => $views ) {
-			foreach( $views as $key => $view ) {
+		foreach ($types as $calendar => $views) {
+			foreach ($views as $key => $view) {
 
-				$view = simcal_get_calendar_view( 0, $calendar . '-' . $view );
+				$view = simcal_get_calendar_view(0, $calendar.'-'.$view);
 
-				$scripts[] = $view->scripts( $this->min );
-				$styles[] = $view->styles( $this->min );
+				$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);
 		}
 	}
 
@@ -156,25 +156,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);
 						}
 
 					}
@@ -192,39 +192,39 @@ 
 	 *
 	 * @param array $scripts
 	 */
-	public function load_scripts( $scripts ) {
+	public function load_scripts($scripts) {
 
 		// Only load if not disabled in the settings
-		if ( ! empty( $scripts ) && is_array( $scripts ) ) {
+		if ( ! empty($scripts) && is_array($scripts)) {
 
-			foreach ( $scripts as $script => $v ) {
+			foreach ($scripts as $script => $v) {
 
 				/** Plugin compatibility fixes */
 
 				// Dequeue moment.js if detected from WP Simple Pay Pro.
-				if ( ( wp_script_is( 'stripe-checkout-pro-moment', 'enqueued' ) ) && $script == 'simcal-fullcal-moment' ) {
+				if ((wp_script_is('stripe-checkout-pro-moment', 'enqueued')) && $script == 'simcal-fullcal-moment') {
 					continue;
 				}
 
-				if ( ! empty( $v['src'] ) ) {
+				if ( ! empty($v['src'])) {
 
 					// Enqueued individually so we can dequeue if already enqueued by another plugin.
 					// TODO Rework dependencies part (or remove completely).
 
-					$src        = esc_url( $v['src'] );
-					$in_footer  = isset( $v['in_footer'] )   ? $v['in_footer']  : false;
+					$src        = esc_url($v['src']);
+					$in_footer  = isset($v['in_footer']) ? $v['in_footer'] : false;
 
-					wp_enqueue_script( $script, $src, array(), SIMPLE_CALENDAR_VERSION, $in_footer );
+					wp_enqueue_script($script, $src, array(), SIMPLE_CALENDAR_VERSION, $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);
 				}
 			}
 
@@ -238,26 +238,26 @@ 
 	 *
 	 * @param array $styles
 	 */
-	public function load_styles( $styles ) {
+	public function load_styles($styles) {
 
 		// Only load if not disabled in the settings
-		if ( ! empty( $styles ) && is_array( $styles ) && false === $this->disable_styles ) {
+		if ( ! empty($styles) && is_array($styles) && false === $this->disable_styles) {
 
-			foreach ( $styles as $style => $v ) {
+			foreach ($styles as $style => $v) {
 
-				if ( ! empty( $v['src'] ) ) {
+				if ( ! empty($v['src'])) {
 
 					// Enqueued individually so we can dequeue if already enqueued by another plugin.
 					// TODO Rework dependencies part (or remove completely).
 
-					$src    = esc_url( $v['src'] );
-					$media  = isset( $v['media'] )  ? $v['media']   : 'all';
+					$src    = esc_url($v['src']);
+					$media  = isset($v['media']) ? $v['media'] : 'all';
 
-					wp_enqueue_style( $style, $src, array(), SIMPLE_CALENDAR_VERSION, $media );
+					wp_enqueue_style($style, $src, array(), SIMPLE_CALENDAR_VERSION, $media);
 
-				} elseif ( is_string( $v ) && ! empty( $v ) ) {
+				} elseif (is_string($v) && ! empty($v)) {
 
-					wp_enqueue_style( $v );
+					wp_enqueue_style($v);
 				}
 
 			}

includes/admin/welcome.php

Spacing +72 added lines, -72 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,32 +49,32 @@ 
 	 */
 	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( $welcome_page_title, $welcome_page_name, 'manage_options', 'simple-calendar_about', array(
+				$page = add_dashboard_page($welcome_page_title, $welcome_page_name, 'manage_options', 'simple-calendar_about', array(
 					$this,
 					'about_screen',
-				) );
+				));
 				break;
 
 			case 'simple-calendar_credits' :
-				$page = add_dashboard_page( $welcome_page_title, $welcome_page_name, 'manage_options', 'simple-calendar_credits', array(
+				$page = add_dashboard_page($welcome_page_title, $welcome_page_name, 'manage_options', 'simple-calendar_credits', array(
 					$this,
 					'credits_screen',
-				) );
+				));
 				break;
 
 			case 'simple-calendar_translators' :
-				$page = add_dashboard_page( $welcome_page_title, $welcome_page_name, 'manage_options', 'simple-calendar_translators', array(
+				$page = add_dashboard_page($welcome_page_title, $welcome_page_name, 'manage_options', 'simple-calendar_translators', array(
 					$this,
 					'translators_screen',
-				) );
+				));
 				break;
 		}
 	}
@@ -85,9 +85,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');
 	}
 
 	/**
@@ -99,18 +99,18 @@ 
 
 		?>
 		<p>
-			<a href="<?php echo admin_url( 'edit.php?post_type=calendar' ); ?>"
+			<a href="<?php echo admin_url('edit.php?post_type=calendar'); ?>"
 			   class="button button-primary"
-				><?php _e( 'Calendars', 'google-calendar-events' ); ?></a>
-			<a href="<?php echo esc_url( add_query_arg( 'page', 'simple-calendar_settings', admin_url( 'admin.php' ) ) ); ?>"
+				><?php _e('Calendars', 'google-calendar-events'); ?></a>
+			<a href="<?php echo esc_url(add_query_arg('page', 'simple-calendar_settings', admin_url('admin.php'))); ?>"
 			   class="button button-primary"
-				><?php _e( 'Settings', 'google-calendar-events' ); ?></a>
-			<a href="<?php echo simcal_ga_campaign_url( simcal_get_url( 'addons' ), 'core-plugin', 'welcome-page' ); ?>"
+				><?php _e('Settings', 'google-calendar-events'); ?></a>
+			<a href="<?php echo simcal_ga_campaign_url(simcal_get_url('addons'), '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
 
@@ -127,7 +127,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>
 
@@ -135,21 +135,21 @@ 
 			<?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 a few display options to configure. ", 'google-calendar-events' ), SIMPLE_CALENDAR_VERSION );
+			printf(' '.__("Simple Calendar %s has a few display options to configure. ", 'google-calendar-events'), SIMPLE_CALENDAR_VERSION);
 			?>
-			<a href="<?php echo simcal_ga_campaign_url( simcal_get_url( 'docs' ), 'core-plugin', 'welcome-page' ); ?>"
+			<a href="<?php echo simcal_ga_campaign_url(simcal_get_url('docs'), 'core-plugin', 'welcome-page'); ?>"
 			   target="_blank"
-			><?php _e( 'Check out our documentation', 'google-calendar-events' ); ?></a>
-			<?php _e( 'to get started now.', 'google-calendar-events' ); ?>
+			><?php _e('Check out our documentation', 'google-calendar-events'); ?></a>
+			<?php _e('to get started now.', 'google-calendar-events'); ?>
 		</div>
 
 		<div class="simcal-badge">&nbsp;</div>
@@ -157,21 +157,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
 
@@ -183,8 +183,8 @@ 
 	 * @since 3.0.0
 	 */
 	public function about_screen() {
-		$welcome_image_about_path = SIMPLE_CALENDAR_ASSETS . '/images/welcome';
-		$welcome_addons_link = simcal_ga_campaign_url( simcal_get_url( 'addons' ), 'core-plugin', 'welcome-page' );
+		$welcome_image_about_path = SIMPLE_CALENDAR_ASSETS.'/images/welcome';
+		$welcome_addons_link = simcal_ga_campaign_url(simcal_get_url('addons'), 'core-plugin', 'welcome-page');
 
 		?>
 		<div id="simcal-welcome">
@@ -192,20 +192,20 @@ 
 
 				<?php $this->intro(); ?>
 
-				<h3><?php _e( 'Configure event colors, number of events to display, grid or list style and more.', 'google-calendar-events' ); ?></h3>
-				<img src="<?php echo $welcome_image_about_path . '/grid-view-basic.png'; ?>" />
+				<h3><?php _e('Configure event colors, number of events to display, grid or list style and more.', 'google-calendar-events'); ?></h3>
+				<img src="<?php echo $welcome_image_about_path.'/grid-view-basic.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( 'Add even more display options with add-ons like', 'google-calendar-events' ); ?>
-					<a href="<?php echo $welcome_addons_link; ?>" target="_blank"><?php _e( 'FullCalendar and Google Calendar Pro', 'google-calendar-events' ); ?></a>.
+					<?php _e('Add even more display options with add-ons like', 'google-calendar-events'); ?>
+					<a href="<?php echo $welcome_addons_link; ?>" target="_blank"><?php _e('FullCalendar and Google Calendar Pro', 'google-calendar-events'); ?></a>.
 				</h3>
-				<a href="<?php echo $welcome_addons_link; ?>" target="_blank"><img src="<?php echo $welcome_image_about_path . '/fullcalendar-google-calendar-pro-grid-view.png'; ?>" /></a>
+				<a href="<?php echo $welcome_addons_link; ?>" target="_blank"><img src="<?php echo $welcome_image_about_path.'/fullcalendar-google-calendar-pro-grid-view.png'; ?>" /></a>
 
-				<h3><a href="<?php echo $welcome_addons_link; ?>" target="_blank"><?php _e( 'View Pricing and Try a Demo of our Simple Calendar Pro Add-ons.', 'google-calendar-events' ); ?></a></h3>
+				<h3><a href="<?php echo $welcome_addons_link; ?>" target="_blank"><?php _e('View Pricing and Try a Demo of our Simple Calendar Pro Add-ons.', 'google-calendar-events'); ?></a></h3>
 
 				<hr/>
 
@@ -232,8 +232,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')
 					);
 
 					?>
@@ -257,10 +257,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
 
@@ -289,31 +289,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>';
 
@@ -333,24 +333,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/feeds/admin/google-admin.php

Indentation +17 added lines, -17 removed lines

@@ -82,12 +82,12 @@ 
 		return array(
 			'name' => $this->feed->name,
 			'description' => __( "To read events from your public Google Calendars you'll need create a Google API key and save it here.", 'google-calendar-events' ) .
-			                 '<br/><br/>' .
-			                 '<em style="font-size: 14px;">' .
-			                 sprintf( __( '<strong>Note:</strong> Calendars configured to use the <strong><a href="%s" target="_blank">Google Calendar Pro add-on</a></strong> use a different method of authorization.', 'google-calendar-events' ),
-				                 simcal_ga_campaign_url( simcal_get_url( 'addons' ), 'core-plugin', 'settings-link' )
-			                 ) .
-			                 '</em>',
+							 '<br/><br/>' .
+							 '<em style="font-size: 14px;">' .
+							 sprintf( __( '<strong>Note:</strong> Calendars configured to use the <strong><a href="%s" target="_blank">Google Calendar Pro add-on</a></strong> use a different method of authorization.', 'google-calendar-events' ),
+								 simcal_ga_campaign_url( simcal_get_url( 'addons' ), 'core-plugin', 'settings-link' )
+							 ) .
+							 '</em>',
 			'fields' => array(
 				'api_key' => array(
 					'type'       => 'standard',
@@ -273,12 +273,12 @@ 
 					'post'        => $post_id,
 					'dismissable' => false,
 					'content'     => '<p>' .
-					                 '<i class="simcal-icon-warning"></i> ' .
-					                 sprintf(
-						                 __( 'Your Google Calendar events will not show up until you <a href="%s">create and save a Google API key</a>.', 'google-calendar-events' ),
-						                 admin_url( 'edit.php?post_type=calendar&page=simple-calendar_settings&tab=feeds' )
-					                 ) .
-					                 '</p>',
+									 '<i class="simcal-icon-warning"></i> ' .
+									 sprintf(
+										 __( 'Your Google Calendar events will not show up until you <a href="%s">create and save a Google API key</a>.', 'google-calendar-events' ),
+										 admin_url( 'edit.php?post_type=calendar&page=simple-calendar_settings&tab=feeds' )
+									 ) .
+									 '</p>',
 				)
 			);
 
@@ -305,11 +305,11 @@ 
 						'post'        => $post_id,
 						'dismissable' => false,
 						'content'     => '<p>' .
-						                 '<i class="simcal-icon-warning"></i> ' .
-						                 __( 'While trying to retrieve events, Google returned an error:', 'google-calendar-events' ) .
-						                 '<br>' . $message . '<br>' .
-						                 __( 'Please ensure that both your Google Calendar ID and API Key are valid and that the Google Calendar you want to display is public.', 'google-calendar-events' ) .
-						                 '</p>',
+										 '<i class="simcal-icon-warning"></i> ' .
+										 __( 'While trying to retrieve events, Google returned an error:', 'google-calendar-events' ) .
+										 '<br>' . $message . '<br>' .
+										 __( 'Please ensure that both your Google Calendar ID and API Key are valid and that the Google Calendar you want to display is public.', 'google-calendar-events' ) .
+										 '</p>',
 					)
 				);
 

Spacing +90 added lines, -90 removed lines

@@ -10,7 +10,7 @@ 
 use SimpleCalendar\Admin\Notice;
 use SimpleCalendar\Feeds\Google;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -54,7 +54,7 @@ 
 	 * @param string $google_api_key
 	 * @param string $google_calendar_id
 	 */
-	public function __construct( Google $feed, $google_api_key, $google_calendar_id ) {
+	public function __construct(Google $feed, $google_api_key, $google_calendar_id) {
 
 		$this->feed = $feed;
 		$this->google_api_key = $google_api_key;
@@ -62,13 +62,13 @@ 
 
 		$screen = simcal_is_admin_screen();
 
-		if ( 'calendar' == $screen ) {
-			$this->test_api_key_connection( $this->google_calendar_id );
-			add_filter( 'simcal_settings_meta_tabs_li', array( $this, 'add_settings_meta_tab_li' ), 10, 1 );
-			add_action( 'simcal_settings_meta_panels', array( $this, 'add_settings_meta_panel' ), 10, 1 );
+		if ('calendar' == $screen) {
+			$this->test_api_key_connection($this->google_calendar_id);
+			add_filter('simcal_settings_meta_tabs_li', array($this, 'add_settings_meta_tab_li'), 10, 1);
+			add_action('simcal_settings_meta_panels', array($this, 'add_settings_meta_panel'), 10, 1);
 		}
 
-		add_action( 'simcal_process_settings_meta', array( $this, 'process_meta' ), 10, 1 );
+		add_action('simcal_process_settings_meta', array($this, 'process_meta'), 10, 1);
 	}
 
 	/**
@@ -81,20 +81,20 @@ 
 	public function settings_fields() {
 		return array(
 			'name' => $this->feed->name,
-			'description' => __( "To read events from your public Google Calendars you'll need create a Google API key and save it here.", 'google-calendar-events' ) .
-			                 '<br/><br/>' .
-			                 '<em style="font-size: 14px;">' .
-			                 sprintf( __( '<strong>Note:</strong> Calendars configured to use the <strong><a href="%s" target="_blank">Google Calendar Pro add-on</a></strong> use a different method of authorization.', 'google-calendar-events' ),
-				                 simcal_ga_campaign_url( simcal_get_url( 'addons' ), 'core-plugin', 'settings-link' )
-			                 ) .
+			'description' => __("To read events from your public Google Calendars you'll need create a Google API key and save it here.", 'google-calendar-events').
+			                 '<br/><br/>'.
+			                 '<em style="font-size: 14px;">'.
+			                 sprintf(__('<strong>Note:</strong> Calendars configured to use the <strong><a href="%s" target="_blank">Google Calendar Pro add-on</a></strong> use a different method of authorization.', 'google-calendar-events'),
+				                 simcal_ga_campaign_url(simcal_get_url('addons'), 'core-plugin', 'settings-link')
+			                 ).
 			                 '</em>',
 			'fields' => array(
 				'api_key' => array(
 					'type'       => 'standard',
 					'subtype'    => 'text',
-					'class'      => array( 'simcal-wide-text regular-text', 'ltr' ),
-					'title'      => __( 'Google API Key', 'google-calendar-events' ),
-					'validation' => array( $this, 'check_google_api_key' ),
+					'class'      => array('simcal-wide-text regular-text', 'ltr'),
+					'title'      => __('Google API Key', 'google-calendar-events'),
+					'validation' => array($this, 'check_google_api_key'),
 				),
 			),
 		);
@@ -113,27 +113,27 @@ 
 	 *
 	 * @return true|string
 	 */
-	public function check_google_api_key( $api_key = '' ) {
+	public function check_google_api_key($api_key = '') {
 
 		$message    = '';
 		$has_errors = false;
 
-		if ( empty( $api_key ) ){
+		if (empty($api_key)) {
 			$api_key = $this->google_api_key;
-			if ( empty( $api_key ) ) {
-				$settings = get_option( 'simple-calendar_settings_feeds' );
-				$api_key = isset( $settings['google']['api_key'] ) ? esc_attr( $settings['google']['api_key'] ) : '';
+			if (empty($api_key)) {
+				$settings = get_option('simple-calendar_settings_feeds');
+				$api_key = isset($settings['google']['api_key']) ? esc_attr($settings['google']['api_key']) : '';
 			}
 		}
 
-		$message = '<p class="description">' .
-				   sprintf( __( '<a href="%s" target="_blank">Step-by-step instructions</a> ', 'google-calendar-events' ),
-					   simcal_ga_campaign_url( simcal_get_url( 'docs' ) . '/google-api-key/', 'core-plugin', 'settings-link' )
-				   ) .
-				   '<br/>' .
-				   sprintf( __( '<a href="%s" target="_blank">Google Developers Console</a> ', 'google-calendar-events' ),
-					   simcal_get_url( 'gdev-console' )
-				   ) .
+		$message = '<p class="description">'.
+				   sprintf(__('<a href="%s" target="_blank">Step-by-step instructions</a> ', 'google-calendar-events'),
+					   simcal_ga_campaign_url(simcal_get_url('docs').'/google-api-key/', 'core-plugin', 'settings-link')
+				   ).
+				   '<br/>'.
+				   sprintf(__('<a href="%s" target="_blank">Google Developers Console</a> ', 'google-calendar-events'),
+					   simcal_get_url('gdev-console')
+				   ).
 				   '</p>';
 
 		return $message;
@@ -148,15 +148,15 @@ 
 	 *
 	 * @return array
 	 */
-	public function add_settings_meta_tab_li( $tabs ) {
-		return array_merge( $tabs, array(
+	public function add_settings_meta_tab_li($tabs) {
+		return array_merge($tabs, array(
 			'google' => array(
 				'label'   => $this->feed->name,
 				'target'  => 'google-settings-panel',
-				'class'   => array( 'simcal-feed-type', 'simcal-feed-type-google' ),
+				'class'   => array('simcal-feed-type', 'simcal-feed-type-google'),
 				'icon'    => 'simcal-icon-google',
 			),
-		) );
+		));
 	}
 
 	/**
@@ -166,7 +166,7 @@ 
 	 *
 	 * @param int $post_id
 	 */
-	public function add_settings_meta_panel( $post_id ) {
+	public function add_settings_meta_panel($post_id) {
 
 		$inputs = array(
 			$this->feed->type => array(
@@ -175,30 +175,30 @@ 
 					'subtype'     => 'text',
 					'name'        => '_google_calendar_id',
 					'id'          => '_google_calendar_id',
-					'title'       => __( 'Calendar ID', 'google-calendar-events' ),
-					'tooltip'     => __( 'Visit your Google Calendar account, copy your public calendar ID, then paste it here.', 'google-calendar-events' ),
-					'placeholder' => __( 'Enter a valid Google Calendar ID from a public calendar', 'google-calendar-events' ),
-					'escaping'    => array( $this->feed, 'esc_google_calendar_id' ),
-					'validation'  => array( $this, 'test_api_key_connection' ),
+					'title'       => __('Calendar ID', 'google-calendar-events'),
+					'tooltip'     => __('Visit your Google Calendar account, copy your public calendar ID, then paste it here.', 'google-calendar-events'),
+					'placeholder' => __('Enter a valid Google Calendar ID from a public calendar', 'google-calendar-events'),
+					'escaping'    => array($this->feed, 'esc_google_calendar_id'),
+					'validation'  => array($this, 'test_api_key_connection'),
 				),
 				'_google_events_search_query' => array(
 					'type'        => 'standard',
 					'subtype'     => 'text',
 					'name'        => '_google_events_search_query',
 					'id'          => '_google_events_search_query',
-					'title'       => __( 'Search Query', 'google-calendar-events' ),
-					'tooltip'     => __( 'Type in keywords if you only want display events that match these terms. You can use basic boolean search operators too.', 'google-calendar-events' ),
-					'placeholder' => __( 'Filter events to display by search terms...', 'google-calendar-events' ),
+					'title'       => __('Search Query', 'google-calendar-events'),
+					'tooltip'     => __('Type in keywords if you only want display events that match these terms. You can use basic boolean search operators too.', 'google-calendar-events'),
+					'placeholder' => __('Filter events to display by search terms...', 'google-calendar-events'),
 				),
 				'_google_events_recurring' => array(
 					'type'    => 'select',
 					'name'    => '_google_events_recurring',
 					'id'      => '_google_events_recurring',
-					'title'   => __( 'Recurring Events', 'google-calendar-events' ),
-					'tooltip' => __( 'Events that are programmed to repeat themselves periodically.', 'google-calendar-events' ),
+					'title'   => __('Recurring Events', 'google-calendar-events'),
+					'tooltip' => __('Events that are programmed to repeat themselves periodically.', 'google-calendar-events'),
 					'options' => array(
-						'show' => __( 'Show all', 'google-calendar-events' ),
-						'first-only' => __( 'Only show first occurrence', 'google-calendar-events' ),
+						'show' => __('Show all', 'google-calendar-events'),
+						'first-only' => __('Only show first occurrence', 'google-calendar-events'),
 					),
 				),
 				'_google_events_max_results' => array(
@@ -206,8 +206,8 @@ 
 					'subtype'     => 'number',
 					'name'        => '_google_events_max_results',
 					'id'          => '_google_events_max_results',
-					'title'       => __( 'Maximum Events', 'google-calendar-events' ),
-					'tooltip'     => __( 'Google Calendar only allows to query for a maximum amount of 2500 events from a calendar each time.', 'google-calendar-events' ),
+					'title'       => __('Maximum Events', 'google-calendar-events'),
+					'tooltip'     => __('Google Calendar only allows to query for a maximum amount of 2500 events from a calendar each time.', 'google-calendar-events'),
 					'class'       => array(
 						'simcal-field-small',
 					),
@@ -224,9 +224,9 @@ 
 		<div id="google-settings-panel" class="simcal-panel">
 			<table>
 				<thead>
-					<tr><th colspan="2"><?php _e( 'Google Calendar Settings', 'google-calendar-events' ); ?></th></tr>
+					<tr><th colspan="2"><?php _e('Google Calendar Settings', 'google-calendar-events'); ?></th></tr>
 				</thead>
-				<?php Settings::print_panel_fields( $inputs, $post_id ); ?>
+				<?php Settings::print_panel_fields($inputs, $post_id); ?>
 			</table>
 		</div>
 		<?php
@@ -242,47 +242,47 @@ 
 	 *
 	 * @return true|string
 	 */
-	public function test_api_key_connection( $google_calendar_id ) {
+	public function test_api_key_connection($google_calendar_id) {
 
 		global $post;
 
-		$post_id = isset( $post->ID ) ? $post->ID : 0;
+		$post_id = isset($post->ID) ? $post->ID : 0;
 		$feed = null;
-		if ( $feed_type = wp_get_object_terms( $post_id, 'calendar_feed' ) ) {
-			$feed = sanitize_title( current( $feed_type )->name );
+		if ($feed_type = wp_get_object_terms($post_id, 'calendar_feed')) {
+			$feed = sanitize_title(current($feed_type)->name);
 		}
 
 		$message = '';
 		$error = '';
 		$has_errors = false;
 
-		$message .= '<p class="description">' .
+		$message .= '<p class="description">'.
 					sprintf(
-						__( 'Step 1: Set the Google Calendar you want to use as <strong>"public."</strong> <a href="%1s" target="_blank">Detailed instructions</a>', 'google-calendar-events' ) . '<br />' .
-						__( 'Step 2: Copy and paste your Google Calendar ID here. <a href="%2s" target="_blank">Detailed instructions</a>', 'google-calendar-events' ),
-						simcal_ga_campaign_url( simcal_get_url( 'docs' ) . '/make-google-calendar-public/', 'core-plugin', 'settings-link' ),
-						simcal_ga_campaign_url( simcal_get_url( 'docs' ) . '/find-google-calendar-id/', 'core-plugin', 'settings-link' )
-					) . '</p>';
+						__('Step 1: Set the Google Calendar you want to use as <strong>"public."</strong> <a href="%1s" target="_blank">Detailed instructions</a>', 'google-calendar-events').'<br />'.
+						__('Step 2: Copy and paste your Google Calendar ID here. <a href="%2s" target="_blank">Detailed instructions</a>', 'google-calendar-events'),
+						simcal_ga_campaign_url(simcal_get_url('docs').'/make-google-calendar-public/', 'core-plugin', 'settings-link'),
+						simcal_ga_campaign_url(simcal_get_url('docs').'/find-google-calendar-id/', 'core-plugin', 'settings-link')
+					).'</p>';
 
-		if ( $post_id > 0 && ! is_null( $feed ) && ! empty( $this->feed->type ) ) {
+		if ($post_id > 0 && ! is_null($feed) && ! empty($this->feed->type)) {
 
-			$no_key_notice = new Notice( array(
-					'id'          => array( 'calendar_' . $post_id => 'google-no-api-key' ),
+			$no_key_notice = new Notice(array(
+					'id'          => array('calendar_'.$post_id => 'google-no-api-key'),
 					'type'        => 'error',
 					'screen'      => 'calendar',
 					'post'        => $post_id,
 					'dismissable' => false,
-					'content'     => '<p>' .
-					                 '<i class="simcal-icon-warning"></i> ' .
+					'content'     => '<p>'.
+					                 '<i class="simcal-icon-warning"></i> '.
 					                 sprintf(
-						                 __( 'Your Google Calendar events will not show up until you <a href="%s">create and save a Google API key</a>.', 'google-calendar-events' ),
-						                 admin_url( 'edit.php?post_type=calendar&page=simple-calendar_settings&tab=feeds' )
-					                 ) .
+						                 __('Your Google Calendar events will not show up until you <a href="%s">create and save a Google API key</a>.', 'google-calendar-events'),
+						                 admin_url('edit.php?post_type=calendar&page=simple-calendar_settings&tab=feeds')
+					                 ).
 					                 '</p>',
 				)
 			);
 
-			if ( empty( $this->google_api_key ) && ( $feed == $this->feed->type ) ) {
+			if (empty($this->google_api_key) && ($feed == $this->feed->type)) {
 
 				$has_errors = true;
 				$no_key_notice->add();
@@ -292,28 +292,28 @@ 
 				$no_key_notice->remove();
 
 				try {
-					$this->feed->make_request( $google_calendar_id );
-				} catch ( \Exception $e ) {
+					$this->feed->make_request($google_calendar_id);
+				} catch (\Exception $e) {
 					$error   = $e->getMessage();
-					$message = ! empty( $error ) ? '<blockquote>' . $error . '</blockquote>' : '';
+					$message = ! empty($error) ? '<blockquote>'.$error.'</blockquote>' : '';
 				}
 
-				$error_notice = new Notice( array(
-						'id'          => array( 'calendar_' . $post_id => 'google-error-response' ),
+				$error_notice = new Notice(array(
+						'id'          => array('calendar_'.$post_id => 'google-error-response'),
 						'type'        => 'error',
 						'screen'      => 'calendar',
 						'post'        => $post_id,
 						'dismissable' => false,
-						'content'     => '<p>' .
-						                 '<i class="simcal-icon-warning"></i> ' .
-						                 __( 'While trying to retrieve events, Google returned an error:', 'google-calendar-events' ) .
-						                 '<br>' . $message . '<br>' .
-						                 __( 'Please ensure that both your Google Calendar ID and API Key are valid and that the Google Calendar you want to display is public.', 'google-calendar-events' ) .
+						'content'     => '<p>'.
+						                 '<i class="simcal-icon-warning"></i> '.
+						                 __('While trying to retrieve events, Google returned an error:', 'google-calendar-events').
+						                 '<br>'.$message.'<br>'.
+						                 __('Please ensure that both your Google Calendar ID and API Key are valid and that the Google Calendar you want to display is public.', 'google-calendar-events').
 						                 '</p>',
 					)
 				);
 
-				if ( ! empty( $error ) && ( $feed == $this->feed->type ) ) {
+				if ( ! empty($error) && ($feed == $this->feed->type)) {
 					$error_notice->add();
 					$has_errors = true;
 				} else {
@@ -335,21 +335,21 @@ 
 	 *
 	 * @param int $post_id
 	 */
-	public function process_meta( $post_id ) {
+	public function process_meta($post_id) {
 
-		$calendar_id = isset( $_POST['_google_calendar_id'] ) ? base64_encode( trim( $_POST['_google_calendar_id'] ) ): '';
-		update_post_meta( $post_id, '_google_calendar_id', $calendar_id );
+		$calendar_id = isset($_POST['_google_calendar_id']) ? base64_encode(trim($_POST['_google_calendar_id'])) : '';
+		update_post_meta($post_id, '_google_calendar_id', $calendar_id);
 
-		$search_query = isset( $_POST['_google_events_search_query'] ) ? sanitize_text_field( $_POST['_google_events_search_query'] ) : '';
-		update_post_meta( $post_id, '_google_events_search_query', $search_query );
+		$search_query = isset($_POST['_google_events_search_query']) ? sanitize_text_field($_POST['_google_events_search_query']) : '';
+		update_post_meta($post_id, '_google_events_search_query', $search_query);
 
-		$recurring = isset( $_POST['_google_events_recurring'] ) ? sanitize_key( $_POST['_google_events_recurring'] ) : 'show';
-		update_post_meta( $post_id, '_google_events_recurring', $recurring );
+		$recurring = isset($_POST['_google_events_recurring']) ? sanitize_key($_POST['_google_events_recurring']) : 'show';
+		update_post_meta($post_id, '_google_events_recurring', $recurring);
 
-		$max_results = isset( $_POST['_google_events_max_results'] ) ? absint( $_POST['_google_events_max_results'] ) : '2500';
-		update_post_meta( $post_id, '_google_events_max_results', $max_results );
+		$max_results = isset($_POST['_google_events_max_results']) ? absint($_POST['_google_events_max_results']) : '2500';
+		update_post_meta($post_id, '_google_events_max_results', $max_results);
 
-		$this->test_api_key_connection( $calendar_id );
+		$this->test_api_key_connection($calendar_id);
 	}
 
 }

includes/main.php

Spacing +26 added lines, -26 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Admin\License_Manager;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -71,7 +71,7 @@ 
 	 * @return Plugin
 	 */
 	public static function get_instance() {
-		if ( is_null( self::$_instance ) ) {
+		if (is_null(self::$_instance)) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -81,14 +81,14 @@ 
 	 * Cloning is forbidden.
 	 */
 	public function __clone() {
-		_doing_it_wrong( __FUNCTION__, 'Cloning the main instance of this plugin is forbidden.', '1.0.0' );
+		_doing_it_wrong(__FUNCTION__, 'Cloning the main instance of this plugin is forbidden.', '1.0.0');
 	}
 
 	/**
 	 * Unserializing instances of this class is forbidden.
 	 */
 	public function __wakeup() {
-		_doing_it_wrong( __FUNCTION__, 'Unserializing instances of this plugin is forbidden.', '1.0.0' );
+		_doing_it_wrong(__FUNCTION__, 'Unserializing instances of this plugin is forbidden.', '1.0.0');
 	}
 
 	/**
@@ -100,22 +100,22 @@ 
 
 		// Load plugin.
 		require_once 'autoload.php';
-		$this->locale = apply_filters( 'plugin_locale', get_locale(), 'google-calendar-events' );
+		$this->locale = apply_filters('plugin_locale', get_locale(), 'google-calendar-events');
 		$this->load();
 
 		// Installation hooks.
-		register_activation_hook( SIMPLE_CALENDAR_MAIN_FILE, array( 'SimpleCalendar\Installation', 'activate' ) );
-		register_deactivation_hook( SIMPLE_CALENDAR_MAIN_FILE, array( 'SimpleCalendar\Installation', 'deactivate' ) );
+		register_activation_hook(SIMPLE_CALENDAR_MAIN_FILE, array('SimpleCalendar\Installation', 'activate'));
+		register_deactivation_hook(SIMPLE_CALENDAR_MAIN_FILE, array('SimpleCalendar\Installation', 'deactivate'));
 
 		// Do update call here.
-		add_action( 'admin_init', array( $this, 'update' ), 999 );
+		add_action('admin_init', array($this, 'update'), 999);
 
 		// Init hooks.
-		add_action( 'init', array( $this, 'init' ), 5 );
-		add_action( 'admin_init', array( $this, 'register_settings' ), 5 );
+		add_action('init', array($this, 'init'), 5);
+		add_action('admin_init', array($this, 'register_settings'), 5);
 
 		// Upon plugin loaded action hook.
-		do_action( 'simcal_loaded' );
+		do_action('simcal_loaded');
 	}
 
 	/**
@@ -132,7 +132,7 @@ 
 		new Post_Types();
 
 		// Load back end.
-		if ( is_admin() ) {
+		if (is_admin()) {
 			$this->load_admin();
 		} else {
 			// Load front end scripts and styles.
@@ -174,7 +174,7 @@ 
 		// Init menus and settings.
 		new Admin\Menus();
 
-		if ( defined( 'DOING_AJAX' ) ) {
+		if (defined('DOING_AJAX')) {
 			// Admin ajax callbacks.
 			new Admin\Ajax();
 		}
@@ -188,16 +188,16 @@ 
 	public function init() {
 
 		// Before init action hook.
-		do_action( 'before_simcal_init' );
+		do_action('before_simcal_init');
 
 		// Set up localization.
-		add_action( 'plugins_loaded', array( $this, 'load_plugin_textdomain' ) );
+		add_action('plugins_loaded', array($this, 'load_plugin_textdomain'));
 
 		// Init objects factory.
 		$this->objects = new Objects();
 
 		// Upon init action hook.
-		do_action( 'simcal_init' );
+		do_action('simcal_init');
 	}
 
 	/**
@@ -207,7 +207,7 @@ 
 	 */
 	public function load_plugin_textdomain() {
 
-		load_plugin_textdomain( 'google-calendar-events', false, dirname( plugin_basename( SIMPLE_CALENDAR_MAIN_FILE ) ) . '/i18n/' );
+		load_plugin_textdomain('google-calendar-events', false, dirname(plugin_basename(SIMPLE_CALENDAR_MAIN_FILE)).'/i18n/');
 	}
 
 	/**
@@ -216,9 +216,9 @@ 
 	 * @since 3.0.0
 	 */
 	public function register_settings() {
-		if ( is_admin() && ! defined( 'DOING_AJAX' ) ) {
+		if (is_admin() && ! defined('DOING_AJAX')) {
 			$settings = new Admin\Pages();
-			$settings->register_settings( $settings->get_settings() );
+			$settings->register_settings($settings->get_settings());
 		}
 	}
 
@@ -230,7 +230,7 @@ 
 	 * @return string
 	 */
 	public function ajax_url() {
-		return admin_url( 'admin-ajax.php', 'relative' );
+		return admin_url('admin-ajax.php', 'relative');
 	}
 
 	/**
@@ -242,17 +242,17 @@ 
 	 *
 	 * @return string
 	 */
-	public function get_url( $case ) {
-		switch ( $case ) {
+	public function get_url($case) {
+		switch ($case) {
 			case 'codex' :
 			case 'apidocs' :
 				return 'http://codex.simplecalendar.io';
 			case 'addons' :
-				return self::$homepage . '/addons/';
+				return self::$homepage.'/addons/';
 			case 'gcal-pro' :
-				return self::$homepage . '/addons/google-calendar-pro/';
+				return self::$homepage.'/addons/google-calendar-pro/';
 			case 'fullcal' :
-				return self::$homepage . '/addons/full-calendar/';
+				return self::$homepage.'/addons/full-calendar/';
 			case 'docs' :
 				return 'http://docs.simplecalendar.io';
 			case 'github' :
@@ -273,7 +273,7 @@ 
 	 * @since 3.0.0
 	 */
 	public static function update() {
-		$update = new Update( SIMPLE_CALENDAR_VERSION );
+		$update = new Update(SIMPLE_CALENDAR_VERSION);
 	}
 
 }

includes/events/event-builder.php

Doc Comments +9 added lines, -2 removed lines

@@ -584,8 +584,8 @@ 
 	 * @since  3.0.0
 	 * @access private
 	 *
-	 * @param  $title
-	 * @param  $attr
+	 * @param  string $title
+	 * @param  string $attr
 	 *
 	 * @return string
 	 */
@@ -1023,6 +1023,13 @@ 
 	}
 
 	//allow other plugins to replace own (registered) event tags with their value
+
+	/**
+	 * @param string $tag
+	 * @param string $partial
+	 * @param string $attr
+	 * @param Event $event
+	 */
 	private function do_custom_event_tag( $tag, $partial, $attr, $event ) {
 		$returnvalue = apply_filters( 'simcal_event_tags_do_custom', "", $tag, $partial, $attr, $event );
 

Indentation +17 added lines, -17 removed lines

@@ -996,23 +996,23 @@
 		$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';
+			   . '(\\[?)'                           // 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';
 	}
 
 	//allow other plugins to register own event tags

Spacing +241 added lines, -241 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();
@@ -68,7 +68,7 @@ 
 	 * @return array
 	 */
 	public function get_content_tags() {
-		return array_merge( array(
+		return array_merge(array(
 
 			/* ============ *
 			 * Content Tags *
@@ -219,7 +219,7 @@ 
 			'if-not-end-location',
 			// Does the event has NOT an end location?
 
-		), (array) $this->add_custom_event_tags() );
+		), (array) $this->add_custom_event_tags());
 	}
 
 	/**
@@ -231,16 +231,16 @@ 
 	 *
 	 * @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' ), $template_tags );
+		$result = preg_replace_callback($this->get_regex(), array($this, 'process_event_content'), $template_tags);
 
 		// Removes extra consecutive <br> tags.
 		// TODO: Doesn't seem to work but going to remove it to allow multiple <br> tags in the editor
 		/*return preg_replace( '#(<br *//*?>\s*)+#i', '<br />', trim( $result ) );*/
 
-		return do_shortcode( trim( $result ) );
+		return do_shortcode(trim($result));
 	}
 
 	/**
@@ -252,10 +252,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.
@@ -267,9 +267,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 *
@@ -277,13 +277,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' :
@@ -293,58 +293,58 @@ 
 				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       = ( 'end-location' == $tag ) ? $event->end_location['address'] : $event->start_location['address'];
-					$location_class = ( 'end-location' == $tag ) ? 'end' : 'start';
+					$location       = ('end-location' == $tag) ? $event->end_location['address'] : $event->start_location['address'];
+					$location_class = ('end-location' == $tag) ? 'end' : 'start';
 
 					// location, location.name, location.address (type PostalAddress) all required for schema data.
 					// Need to use event name where location data doesn't exist.
 					// Since we have 1 location field, use it as the name and address.
 					// If the location is blank, use the event title as the name and address.
 					// Wrap with wp_strip_all_tags().
-					$meta_location_name_and_address = empty( $location ) ? wp_strip_all_tags( $event->title ) : wp_strip_all_tags( $location );
+					$meta_location_name_and_address = empty($location) ? wp_strip_all_tags($event->title) : wp_strip_all_tags($location);
 
-					return ' <span class="simcal-event-address simcal-event-' . $location_class . '-location" itemprop="location" itemscope itemtype="http://schema.org/Place">' . '<meta itemprop="name" content="' . $meta_location_name_and_address . '" />' . '<meta itemprop="address" content="' . $meta_location_name_and_address . '" />' . wp_strip_all_tags( $location ) . '</span>';
+					return ' <span class="simcal-event-address simcal-event-'.$location_class.'-location" itemprop="location" itemscope itemtype="http://schema.org/Place">'.'<meta itemprop="name" content="'.$meta_location_name_and_address.'" />'.'<meta itemprop="address" content="'.$meta_location_name_and_address.'" />'.wp_strip_all_tags($location).'</span>';
 
 				case 'start-location-link':
 				case 'end-location-link' :
 				case 'maps-link' :
-					$location = ( 'end-location-link' == $tag ) ? $event->end_location['address'] : $event->start_location['address'];
-					if ( ! empty( $location ) ) {
-						$url = '//maps.google.com?q=' . urlencode( $location );
+					$location = ('end-location-link' == $tag) ? $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 );
+						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 ) : '';
+					$content = ('link' == $tag) ? $calendar->get_event_html($event, $partial) : '';
 
-					return $this->make_link( $tag, $event->link, $content, $attr );
+					return $this->make_link($tag, $event->link, $content, $attr);
 
 				case 'add-to-gcal-link';
-					$content = ( 'add-to-gcal-link' == $tag ) ? $calendar->get_event_html( $event, $partial ) : '';
-					if ( ! empty( $content ) ) {
-						$url = $calendar->get_add_to_gcal_url( $event );
+					$content = ('add-to-gcal-link' == $tag) ? $calendar->get_event_html($event, $partial) : '';
+					if ( ! empty($content)) {
+						$url = $calendar->get_add_to_gcal_url($event);
 
-						return $this->make_link( $tag, $url, $content, $attr );
+						return $this->make_link($tag, $url, $content, $attr);
 					}
 					break;
 
@@ -371,22 +371,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;
 
@@ -395,35 +395,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;
@@ -431,15 +431,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);
 						}
 					}
 
@@ -448,17 +448,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);
 							}
 						}
 
@@ -468,29 +468,29 @@ 
 
 				case 'if-today' :
 				case 'if-not-today' :
-					$start_dt   = $event->start_dt->setTimezone( $calendar->timezone );
+					$start_dt   = $event->start_dt->setTimezone($calendar->timezone);
 					$startOfDay = $start_dt->startOfDay()->getTimestamp();
 					$endOfDay   = $start_dt->endOfDay()->getTimestamp();
 
-					$today = ( $startOfDay <= $calendar->now ) && ( $calendar->now <= $endOfDay );
+					$today = ($startOfDay <= $calendar->now) && ($calendar->now <= $endOfDay);
 
-					if ( ( 'if-today' == $tag ) && $today ) {
-						return $calendar->get_event_html( $event, $partial );
-					} elseif ( ( 'if-not-today' == $tag ) && ( false == $today ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (('if-today' == $tag) && $today) {
+						return $calendar->get_event_html($event, $partial);
+					} elseif (('if-not-today' == $tag) && (false == $today)) {
+						return $calendar->get_event_html($event, $partial);
 					}
 
 					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;
 
@@ -498,62 +498,62 @@ 
 				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 '';
@@ -563,12 +563,12 @@ 
 				 * ======= */
 
 				default :
-					$resultCustom = $this->do_custom_event_tag( $tag, $partial, $attr, $event );
-					if ( $resultCustom != "" ) {
+					$resultCustom = $this->do_custom_event_tag($tag, $partial, $attr, $event);
+					if ($resultCustom != "") {
 						return $resultCustom;
 					}
 
-					return wp_kses_post( $before . $partial . $after );
+					return wp_kses_post($before.$partial.$after);
 			}
 		}
 
@@ -586,14 +586,14 @@ 
 	 *
 	 * @return string
 	 */
-	private function limit_words( $text, $limit ) {
+	private function limit_words($text, $limit) {
 
-		$limit = max( absint( $limit ), 0 );
+		$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;
@@ -610,26 +610,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.'>';
 	}
 
 	/**
@@ -643,18 +643,18 @@ 
 	 *
 	 * @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_md   = 'no' != $attr['markdown'] ? true : false;
@@ -662,23 +662,23 @@ 
 		$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 ) {
-				$description = wp_kses_post( $description );
-			} elseif ( $allow_md ) {
+		if ($allow_html || $allow_md) {
+			if ($allow_html) {
+				$description = wp_kses_post($description);
+			} elseif ($allow_md) {
 				$markdown    = new \Parsedown();
-				$description = $markdown->text( wp_strip_all_tags( $description ) );
+				$description = $markdown->text(wp_strip_all_tags($description));
 			}
 		} else {
-			$description = wpautop( $description );
+			$description = wpautop($description);
 		}
 
-		$description = $this->limit_words( $description, $attr['limit'] );
+		$description = $this->limit_words($description, $attr['limit']);
 
-		$html .= $description . '</div>';
+		$html .= $description.'</div>';
 
-		if ( 'no' != $attr['autolink'] ) {
-			$html = ' ' . make_clickable( $html );
+		if ('no' != $attr['autolink']) {
+			$html = ' '.make_clickable($html);
 		}
 
 		return $html;
@@ -694,7 +694,7 @@ 
 	 *
 	 * @return string
 	 */
-	private function get_when( Event $event ) {
+	private function get_when(Event $event) {
 
 		$start = $event->start_dt;
 		$end   = $event->end_dt;
@@ -702,41 +702,41 @@ 
 		$time_start = '';
 		$time_end   = '';
 		$start_ts   = $start->timestamp;
-		$end_ts     = ! is_null( $end ) ? $end->timestamp : null;
+		$end_ts     = ! is_null($end) ? $end->timestamp : null;
 		$start_iso  = $start->toIso8601String();
-		$end_iso    = ! is_null( $end ) ? $end->toIso8601String() : null;;
+		$end_iso    = ! is_null($end) ? $end->toIso8601String() : null; ;
 
-		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_ts . '" ' . 'data-event-format="' . $this->calendar->time_format . '" ' . 'itemprop="startDate" content="' . $start_iso . '">' . date_i18n( $this->calendar->time_format, strtotime( $start->toDateTimeString() ) ) . '</span> ';
+			$time_start = $this->calendar->datetime_separator.' <span class="simcal-event-start simcal-event-start-time" '.'data-event-start="'.$start_ts.'" '.'data-event-format="'.$this->calendar->time_format.'" '.'itemprop="startDate" content="'.$start_iso.'">'.date_i18n($this->calendar->time_format, strtotime($start->toDateTimeString())).'</span> ';
 
-			if ( $end instanceof Carbon ) {
+			if ($end instanceof Carbon) {
 
-				$time_end = ' <span class="simcal-event-end simcal-event-end-time" ' . 'data-event-end="' . $end_ts . '" ' . 'data-event-format="' . $this->calendar->time_format . '" ' . 'itemprop="endDate" content="' . $end_iso . '">' . date_i18n( $this->calendar->time_format, strtotime( $end->toDateTimeString() ) ) . '</span> ';
+				$time_end = ' <span class="simcal-event-end simcal-event-end-time" '.'data-event-end="'.$end_ts.'" '.'data-event-format="'.$this->calendar->time_format.'" '.'itemprop="endDate" content="'.$end_iso.'">'.date_i18n($this->calendar->time_format, strtotime($end->toDateTimeString())).'</span> ';
 
 			}
 
 		}
 
-		if ( $event->multiple_days ) {
+		if ($event->multiple_days) {
 
-			$output = ' <span class="simcal-event-start simcal-event-start-date" ' . 'data-event-start="' . $start_ts . '" ' . 'data-event-format="' . $this->calendar->date_format . '" ' . 'itemprop="startDate" content="' . $start_iso . '">' . date_i18n( $this->calendar->date_format, strtotime( $start->toDateTimeString() ) ) . '</span> ' . $time_start;
+			$output = ' <span class="simcal-event-start simcal-event-start-date" '.'data-event-start="'.$start_ts.'" '.'data-event-format="'.$this->calendar->date_format.'" '.'itemprop="startDate" content="'.$start_iso.'">'.date_i18n($this->calendar->date_format, strtotime($start->toDateTimeString())).'</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_ts . '" ' . 'data-event-format="' . $this->calendar->date_format . '" ' . 'itemprop="endDate" content="' . $end_iso . '">' . date_i18n( $this->calendar->date_format, strtotime( $end->toDateTimeString() ) ) . '</span> ' . $time_end;
+				$output .= '-'.' <span class="simcal-event-start simcal-event-end-date" '.'data-event-start="'.$end_ts.'" '.'data-event-format="'.$this->calendar->date_format.'" '.'itemprop="endDate" content="'.$end_iso.'">'.date_i18n($this->calendar->date_format, strtotime($end->toDateTimeString())).'</span> '.$time_end;
 			}
 
 		} else {
 
-			$time_end = ! empty( $time_start ) && ! empty( $time_end ) ? ' - ' . $time_end : '';
+			$time_end = ! empty($time_start) && ! empty($time_end) ? ' - '.$time_end : '';
 
 			// All-day events also need startDate for schema data.
-			$output = ' <span class="simcal-event-start simcal-event-start-date" ' . 'data-event-start="' . $start_ts . '" ' . 'data-event-format="' . $this->calendar->date_format . '" ' . 'itemprop="startDate" content="' . $start_iso . '">' . date_i18n( $this->calendar->date_format, strtotime( $start->toDateTimeString() ) ) . '</span> ' . $time_start . $time_end;
+			$output = ' <span class="simcal-event-start simcal-event-start-date" '.'data-event-start="'.$start_ts.'" '.'data-event-format="'.$this->calendar->date_format.'" '.'itemprop="startDate" content="'.$start_iso.'">'.date_i18n($this->calendar->date_format, strtotime($start->toDateTimeString())).'</span> '.$time_start.$time_end;
 
 		}
 
-		return trim( $output );
+		return trim($output);
 	}
 
 	/**
@@ -751,52 +751,52 @@ 
 	 *
 	 * @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';
+		$bound = 0 === strpos($tag, 'end') ? 'end' : 'start';
 
-		if ( ( 'end' == $bound ) && ( false === $event->end ) ) {
+		if (('end' == $bound) && (false === $event->end)) {
 			return '';
 		}
 
-		$dt = $bound . '_dt';
+		$dt = $bound.'_dt';
 
-		if ( ! $event->$dt instanceof Carbon ) {
+		if ( ! $event->$dt instanceof Carbon) {
 			return '';
 		}
 
 		$event_dt = $event->$dt;
 
-		$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;
 		}
 
 		$dt_ts = $event_dt->timestamp;
 
-		if ( 'human' == $format ) {
-			$value = human_time_diff( $dt_ts, Carbon::now( $event->timezone )->getTimestamp() );
+		if ('human' == $format) {
+			$value = human_time_diff($dt_ts, Carbon::now($event->timezone)->getTimestamp());
 
-			if ( $dt_ts < Carbon::now( $event->timezone )->getTimestamp() ) {
-				$value .= ' ' . _x( 'ago', 'human date event builder code modifier', 'google-calendar-events' );
+			if ($dt_ts < Carbon::now($event->timezone)->getTimestamp()) {
+				$value .= ' '._x('ago', 'human date event builder code modifier', 'google-calendar-events');
 			} else {
-				$value .= ' ' . _x( 'from now', 'human date event builder code modifier', 'google-calendar-events' );
+				$value .= ' '._x('from now', 'human date event builder code modifier', 'google-calendar-events');
 			}
 		} else {
-			$value = date_i18n( $dt_format, strtotime( $event_dt->toDateTimeString() ) );
+			$value = date_i18n($dt_format, strtotime($event_dt->toDateTimeString()));
 		}
 
-		return '<span class="simcal-event-' . $bound . ' ' . 'simcal-event-' . $bound . '-' . $format . '" ' . 'data-event-' . $bound . '="' . $dt_ts . '" ' . 'data-event-format="' . $dt_format . '" ' . 'itemprop="' . $bound . 'Date" content="' . $event_dt->toIso8601String() . '">' . $value . '</span>';
+		return '<span class="simcal-event-'.$bound.' '.'simcal-event-'.$bound.'-'.$format.'" '.'data-event-'.$bound.'="'.$dt_ts.'" '.'data-event-format="'.$dt_format.'" '.'itemprop="'.$bound.'Date" content="'.$event_dt->toIso8601String().'">'.$value.'</span>';
 	}
 
 	/**
@@ -812,23 +812,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;
 	}
 
 	/**
@@ -841,20 +841,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;
 	}
@@ -870,41 +870,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++;
 
@@ -915,21 +915,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;
 	}
@@ -943,23 +943,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>';
 	}
 
 	/**
@@ -973,21 +973,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_html = $photo . '<span itemprop="name">' . $organizer['name'] . '</span>';
+		$photo          = 'hide' != $attr['photo'] ? '<img class="avatar avatar-128 photo" src="'.$organizer['photo'].'" itemprop="image"  />' : '';
+		$organizer_html = $photo.'<span itemprop="name">'.$organizer['name'].'</span>';
 
-		if ( ! empty( $organizer['email'] ) && ( 'show' == $attr['email'] ) ) {
-			$organizer_html = sprintf( '<a href="mailto:' . $organizer['email'] . '" itemprop="email">%s</a>', $organizer_html );
+		if ( ! empty($organizer['email']) && ('show' == $attr['email'])) {
+			$organizer_html = sprintf('<a href="mailto:'.$organizer['email'].'" itemprop="email">%s</a>', $organizer_html);
 		}
 
-		return '<div class="simcal-organizer" itemprop="organizer" itemscope itemtype="https://schema.org/Person">' . $organizer_html . '</div>';
+		return '<div class="simcal-organizer" itemprop="organizer" itemscope itemtype="https://schema.org/Person">'.$organizer_html.'</div>';
 	}
 
 	/**
@@ -1012,38 +1012,38 @@ 
 		// 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
+		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
+		       . '(?:'.'\\/(?!\\])'               // A forward slash not followed by a closing bracket
 		       . '[^\\]\\/]*'               // Not a closing bracket or forward slash
-		       . ')*?' . ')' . '(?:' . '(\\/)'                        // 4: Self closing tag ...
+		       . ')*?'.')'.'(?:'.'(\\/)'                        // 4: Self closing tag ...
 		       . '\\]'                          // ... and closing bracket
-		       . '|' . '\\]'                          // Closing bracket
-		       . '(?:' . '('                        // 5: Unroll the loop: Optionally, anything between the opening and closing tags
+		       . '|'.'\\]'                          // 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
+		       . '(?:'.'\\[(?!\\/\\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]]
+		       . ')*+'.')'.'\\[\\/\\2\\]'             // Closing tag
+		       . ')?'.')'.'(\\]?)'                           // 6: Optional second closing bracket for escaping tags: [[tag]]
 		       . '/s';
 	}
 
 	//allow other plugins to register own event tags
 	private function add_custom_event_tags() {
-		$array = apply_filters( 'simcal_event_tags_add_custom', array() );
+		$array = apply_filters('simcal_event_tags_add_custom', array());
 
 		return $array;
 	}
 
 	//allow other plugins to replace own (registered) event tags with their value
-	private function do_custom_event_tag( $tag, $partial, $attr, $event ) {
-		$returnvalue = apply_filters( 'simcal_event_tags_do_custom', "", $tag, $partial, $attr, $event );
+	private function do_custom_event_tag($tag, $partial, $attr, $event) {
+		$returnvalue = apply_filters('simcal_event_tags_do_custom', "", $tag, $partial, $attr, $event);
 
 		return $returnvalue;
 	}

includes/admin/metaboxes/settings.php

Spacing +297 added lines, -297 removed lines

@@ -11,7 +11,7 @@ 
 use SimpleCalendar\Abstracts\Feed;
 use SimpleCalendar\Abstracts\Field;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -31,40 +31,40 @@ 
 	 *
 	 * @param \WP_Post $post
 	 */
-	public static function html( $post ) {
+	public static function html($post) {
 
 		// @see Meta_Boxes::save_meta_boxes()
-		wp_nonce_field( 'simcal_save_data', 'simcal_meta_nonce' );
+		wp_nonce_field('simcal_save_data', 'simcal_meta_nonce');
 
 		?>
 		<div class="simcal-panels-wrap">
 
 			<span class="simcal-box-handle">
-				<?php self::settings_handle( $post ); ?>
+				<?php self::settings_handle($post); ?>
 			</span>
 
 			<ul class="simcal-tabs">
-				<?php self::settings_tabs( $post ); ?>
-				<?php do_action( 'simcal_settings_meta_tabs' ); ?>
+				<?php self::settings_tabs($post); ?>
+				<?php do_action('simcal_settings_meta_tabs'); ?>
 			</ul>
 
 			<div class="simcal-panels">
 				<div id="events-settings-panel" class="simcal-panel">
-					<?php self::events_settings_panel( $post ); ?>
-					<?php do_action( 'simcal_settings_meta_events_panel', $post->ID ); ?>
+					<?php self::events_settings_panel($post); ?>
+					<?php do_action('simcal_settings_meta_events_panel', $post->ID); ?>
 				</div>
 				<div id="calendar-settings-panel" class="simcal-panel">
-					<?php do_action( 'simcal_settings_meta_calendar_panel', $post->ID ); ?>
-					<?php self::calendar_settings_panel( $post ); ?>
+					<?php do_action('simcal_settings_meta_calendar_panel', $post->ID); ?>
+					<?php self::calendar_settings_panel($post); ?>
 				</div>
 				<?php
 				// Hook for additional settings panels.
-				do_action( 'simcal_settings_meta_panels', $post->ID );
+				do_action('simcal_settings_meta_panels', $post->ID);
 				// Thus advanced panel is always the last one:
 				?>
 				<div id="advanced-settings-panel" class="simcal-panel">
-					<?php self::advanced_settings_panel( $post ) ?>
-					<?php do_action( 'simcal_settings_meta_advanced_panel', $post->ID ); ?>
+					<?php self::advanced_settings_panel($post) ?>
+					<?php do_action('simcal_settings_meta_advanced_panel', $post->ID); ?>
 				</div>
 			</div>
 
@@ -84,45 +84,45 @@ 
 	 *
 	 * @param \WP_Post $post
 	 */
-	private static function settings_handle( $post ) {
+	private static function settings_handle($post) {
 
 		$feed_options = $calendar_options = $calendar_views = array();
 
 		$feed_types = simcal_get_feed_types();
-		foreach ( $feed_types as $feed_type ) {
+		foreach ($feed_types as $feed_type) {
 
-			$feed = simcal_get_feed( $feed_type );
+			$feed = simcal_get_feed($feed_type);
 
-			if ( $feed instanceof Feed ) {
-				$feed_options[ $feed_type ] = $feed->name;
+			if ($feed instanceof Feed) {
+				$feed_options[$feed_type] = $feed->name;
 			}
 		}
 
 		$calendar_types = simcal_get_calendar_types();
-		foreach ( $calendar_types as $calendar_type => $views ) {
+		foreach ($calendar_types as $calendar_type => $views) {
 
-			$calendar = simcal_get_calendar( $calendar_type );
+			$calendar = simcal_get_calendar($calendar_type);
 
-			if ( $calendar instanceof Calendar ) {
-				$calendar_options[ $calendar_type ] = $calendar->name;
-				$calendar_views[ $calendar_type ]   = $calendar->views;
+			if ($calendar instanceof Calendar) {
+				$calendar_options[$calendar_type] = $calendar->name;
+				$calendar_views[$calendar_type]   = $calendar->views;
 			}
 		}
 
-		if ( $feed_options ) {
+		if ($feed_options) {
 
-			if ( $feed_types = wp_get_object_terms( $post->ID, 'calendar_feed' ) ) {
-				$feed_type = sanitize_title( current( $feed_types )->name );
+			if ($feed_types = wp_get_object_terms($post->ID, 'calendar_feed')) {
+				$feed_type = sanitize_title(current($feed_types)->name);
 			} else {
-				$feed_type = apply_filters( 'simcal_default_feed_type', 'google' );
+				$feed_type = apply_filters('simcal_default_feed_type', 'google');
 			}
 
 			?>
-			<label for="_feed_type"><span><?php _e( 'Event Source', 'google-calendar-events' ); ?></span>
+			<label for="_feed_type"><span><?php _e('Event Source', 'google-calendar-events'); ?></span>
 				<select name="_feed_type" id="_feed_type">
-					<optgroup label="<?php _ex( 'Get events from', 'From which calendar source to load events from', 'google-calendar-events' ) ?>">
-						<?php foreach ( $feed_options as $feed => $name ) { ?>
-							<option value="<?php echo $feed; ?>" <?php selected( $feed, $feed_type, true ); ?>><?php echo $name; ?></option>
+					<optgroup label="<?php _ex('Get events from', 'From which calendar source to load events from', 'google-calendar-events') ?>">
+						<?php foreach ($feed_options as $feed => $name) { ?>
+							<option value="<?php echo $feed; ?>" <?php selected($feed, $feed_type, true); ?>><?php echo $name; ?></option>
 						<?php } ?>
 					</optgroup>
 				</select>
@@ -131,40 +131,40 @@ 
 
 		}
 
-		if ( $calendar_options ) {
+		if ($calendar_options) {
 
-			if ( $calendar_types = wp_get_object_terms( $post->ID, 'calendar_type' ) ) {
-				$calendar_type = sanitize_title( current( $calendar_types )->name );
+			if ($calendar_types = wp_get_object_terms($post->ID, 'calendar_type')) {
+				$calendar_type = sanitize_title(current($calendar_types)->name);
 			} else {
-				$calendar_type = apply_filters( 'simcal_default_calendar_type', 'default-calendar' );
+				$calendar_type = apply_filters('simcal_default_calendar_type', 'default-calendar');
 			}
 
 			?>
-			<label for="_calendar_type"><span><?php _e( 'Calendar Type', 'google-calendar-events' ); ?></span>
+			<label for="_calendar_type"><span><?php _e('Calendar Type', 'google-calendar-events'); ?></span>
 				<select name="_calendar_type" id="_calendar_type">
-					<optgroup label="<?php _e( 'Calendar to use', 'google-calendar-events' ); ?>">
-						<?php foreach ( $calendar_options as $calendar => $name ) { ?>
-							<option value="<?php echo $calendar; ?>" <?php selected( $calendar, $calendar_type, true ); ?>><?php echo $name; ?></option>
+					<optgroup label="<?php _e('Calendar to use', 'google-calendar-events'); ?>">
+						<?php foreach ($calendar_options as $calendar => $name) { ?>
+							<option value="<?php echo $calendar; ?>" <?php selected($calendar, $calendar_type, true); ?>><?php echo $name; ?></option>
 						<?php } ?>
 					</optgroup>
 				</select>
 			</label>
 			<?php
 
-			if ( $calendar_views ) {
+			if ($calendar_views) {
 
-				$calendar_view = get_post_meta( $post->ID, '_calendar_view', true );
+				$calendar_view = get_post_meta($post->ID, '_calendar_view', true);
 
-				foreach ( $calendar_views as $calendar => $views ) {
+				foreach ($calendar_views as $calendar => $views) {
 
-					$calendar_type_view = isset( $calendar_view[ $calendar ] ) ? $calendar_view[ $calendar ] : '';
+					$calendar_type_view = isset($calendar_view[$calendar]) ? $calendar_view[$calendar] : '';
 
 					?>
-					<label for="_calendar_view_<?php echo $calendar; ?>"><span><?php _e( 'View', 'google-calendar-events' ); ?></span>
+					<label for="_calendar_view_<?php echo $calendar; ?>"><span><?php _e('View', 'google-calendar-events'); ?></span>
 						<select name="_calendar_view[<?php echo $calendar; ?>]" id="_calendar_view_<?php echo $calendar; ?>">
-							<optgroup label="<?php _e( 'View to display', 'google-calendar-events' ); ?>">
-								<?php foreach ( $views as $view => $name ) { ?>
-									<option value="<?php echo $view; ?>" <?php selected( $view, $calendar_type_view, true ); ?>><?php echo $name; ?></option>
+							<optgroup label="<?php _e('View to display', 'google-calendar-events'); ?>">
+								<?php foreach ($views as $view => $name) { ?>
+									<option value="<?php echo $view; ?>" <?php selected($view, $calendar_type_view, true); ?>><?php echo $name; ?></option>
 								<?php } ?>
 							</optgroup>
 						</select>
@@ -184,42 +184,42 @@ 
 	 *
 	 * @param  \WP_Post $post
 	 */
-	private static function settings_tabs( $post ) {
+	private static function settings_tabs($post) {
 
 		// Hook to add more tabs.
-		$tabs = apply_filters( 'simcal_settings_meta_tabs_li', array(
+		$tabs = apply_filters('simcal_settings_meta_tabs_li', array(
 			'events' => array(
-				'label'   => __( 'Events', 'google-calendar-events' ),
+				'label'   => __('Events', 'google-calendar-events'),
 				'target'  => 'events-settings-panel',
-				'class'   => array( 'active' ),
+				'class'   => array('active'),
 				'icon'    => 'simcal-icon-event',
 			),
 			'calendar' => array(
-				'label'  => __( 'Appearance', 'google-calendar-events' ),
+				'label'  => __('Appearance', 'google-calendar-events'),
 				'target' => 'calendar-settings-panel',
 				'class'  => array(),
 				'icon'   => 'simcal-icon-calendar',
 			),
-		), $post->ID );
+		), $post->ID);
 
 		// Always keep advanced tab as the last one.
 		$tabs['advanced'] = array(
-			'label'   => __( 'Advanced', 'google-calendar-events' ),
+			'label'   => __('Advanced', 'google-calendar-events'),
 			'target'  => 'advanced-settings-panel',
 			'class'   => array(),
 			'icon'    => 'simcal-icon-settings',
 		);
 
 		// Output the tabs as list items.
-		foreach ( $tabs as $key => $tab ) {
+		foreach ($tabs as $key => $tab) {
 
-			if ( isset( $tab['target'] ) && isset( $tab['label'] ) ) {
+			if (isset($tab['target']) && isset($tab['label'])) {
 
 				$icon  = $tab['icon'] ? $tab['icon'] : 'simcal-icon-panel';
 				$class = $tab['class'] ? $tab['class'] : array();
 
-				echo '<li class="' . $key . '-settings ' . $key . '-tab ' . implode( ' ', $class ) . '" data-tab="' . $key . '">';
-				echo    '<a href="#' . $tab['target'] . '"><i class="' . $icon . '" ></i> <span>' . esc_html( $tab['label'] ) . '</span></a>';
+				echo '<li class="'.$key.'-settings '.$key.'-tab '.implode(' ', $class).'" data-tab="'.$key.'">';
+				echo    '<a href="#'.$tab['target'].'"><i class="'.$icon.'" ></i> <span>'.esc_html($tab['label']).'</span></a>';
 				echo '</li>';
 			}
 		}
@@ -233,22 +233,22 @@ 
 	 *
 	 * @param  \WP_Post $post
 	 */
-	private static function events_settings_panel( $post ) {
+	private static function events_settings_panel($post) {
 
 		?>
 		<table>
 			<thead>
-			<tr><th colspan="2"><?php _e( 'Event Settings', 'google-calendar-events' ); ?></th></tr>
+			<tr><th colspan="2"><?php _e('Event Settings', 'google-calendar-events'); ?></th></tr>
 			</thead>
 			<tbody class="simcal-panel-section simcal-panel-section-events-range">
 			<tr class="simcal-panel-field">
-				<th><label for="_calendar_begins"><?php _e( 'Calendar Start', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_calendar_begins"><?php _e('Calendar Start', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$calendar_begins = esc_attr( get_post_meta( $post->ID, '_calendar_begins', true ) );
-					$calendar_begins_nth = max( absint( get_post_meta( $post->ID, '_calendar_begins_nth', true ) ), 1 );
-					$calendar_begins_nth_show = in_array( $calendar_begins, array(
+					$calendar_begins = esc_attr(get_post_meta($post->ID, '_calendar_begins', true));
+					$calendar_begins_nth = max(absint(get_post_meta($post->ID, '_calendar_begins_nth', true)), 1);
+					$calendar_begins_nth_show = in_array($calendar_begins, array(
 						'days_before',
 						'days_after',
 						'weeks_before',
@@ -257,14 +257,14 @@ 
 						'months_after',
 						'years_before',
 						'years_after',
-					) );
+					));
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'       => 'standard',
 						'subtype'    => 'number',
 						'name'       => '_calendar_begins_nth',
 						'id'         => '_calendar_begins_nth',
-						'value'      => strval( $calendar_begins_nth ),
+						'value'      => strval($calendar_begins_nth),
 						'attributes' => array(
 							'min' => '1',
 						),
@@ -272,97 +272,97 @@ 
 							'simcal-field-inline',
 							'simcal-field-tiny',
 						),
-						'style'      => ! $calendar_begins_nth_show ? array( 'display' => 'none' ) : '',
-					) );
+						'style'      => ! $calendar_begins_nth_show ? array('display' => 'none') : '',
+					));
 
 					?>
 					<select name="_calendar_begins"
 							id="_calendar_begins"
 							class="simcal-field simcal-field-select simcal-field-inline simcal-field-switch-other">
-						<optgroup label="<?php _e( 'Days', 'google-calendar-events' ); ?>">
+						<optgroup label="<?php _e('Days', 'google-calendar-events'); ?>">
 							<option value="today"
 									data-hide-fields="_calendar_begins_custom_date,_calendar_begins_nth"
-								<?php selected( 'today', $calendar_begins, true ); ?>><?php _e( 'Today', 'google-calendar-events' ); ?></option>
+								<?php selected('today', $calendar_begins, true); ?>><?php _e('Today', 'google-calendar-events'); ?></option>
 							<option value="now"
 									data-hide-fields="_calendar_begins_custom_date,_calendar_begins_nth"
-								<?php selected( 'now', $calendar_begins, true ); ?>><?php _e( 'Now', 'google-calendar-events' ); ?></option>
+								<?php selected('now', $calendar_begins, true); ?>><?php _e('Now', 'google-calendar-events'); ?></option>
 							<option value="days_before"
 									data-hide-field="_calendar_begins_custom_date"
-									data-show-field="_calendar_begins_nth" <?php selected( 'days_before', $calendar_begins, true ); ?>><?php _e( 'Day(s) before today', 'google-calendar-events' ); ?></option>
+									data-show-field="_calendar_begins_nth" <?php selected('days_before', $calendar_begins, true); ?>><?php _e('Day(s) before today', 'google-calendar-events'); ?></option>
 							<option value="days_after"
 									data-hide-field="_calendar_begins_custom_date"
-									data-show-field="_calendar_begins_nth" <?php selected( 'days_after', $calendar_begins, true ); ?>><?php _e( 'Day(s) after today', 'google-calendar-events' ); ?></option>
+									data-show-field="_calendar_begins_nth" <?php selected('days_after', $calendar_begins, true); ?>><?php _e('Day(s) after today', 'google-calendar-events'); ?></option>
 						</optgroup>
-						<optgroup label="<?php _e( 'Weeks', 'google-calendar-events' ); ?>">
+						<optgroup label="<?php _e('Weeks', 'google-calendar-events'); ?>">
 							<option value="this_week"
 									data-hide-fields="_calendar_begins_custom_date,_calendar_begins_nth"
-								<?php selected( 'this_week', $calendar_begins, true ); ?>><?php _e( 'This week', 'google-calendar-events' ); ?></option>
+								<?php selected('this_week', $calendar_begins, true); ?>><?php _e('This week', 'google-calendar-events'); ?></option>
 							<option value="weeks_before"
 									data-hide-field="_calendar_begins_custom_date"
-									data-show-field="_calendar_begins_nth" <?php selected( 'weeks_before', $calendar_begins, true ); ?>><?php _e( 'Week(s) before current', 'google-calendar-events' ); ?></option>
+									data-show-field="_calendar_begins_nth" <?php selected('weeks_before', $calendar_begins, true); ?>><?php _e('Week(s) before current', 'google-calendar-events'); ?></option>
 							<option value="weeks_after"
 									data-hide-field="_calendar_begins_custom_date"
-									data-show-field="_calendar_begins_nth" <?php selected( 'weeks_after', $calendar_begins, true ); ?>><?php _e( 'Week(s) after current', 'google-calendar-events' ); ?></option>
+									data-show-field="_calendar_begins_nth" <?php selected('weeks_after', $calendar_begins, true); ?>><?php _e('Week(s) after current', 'google-calendar-events'); ?></option>
 						</optgroup>
-						<optgroup label="<?php _e( 'Months', 'google-calendar-events' ); ?>">
+						<optgroup label="<?php _e('Months', 'google-calendar-events'); ?>">
 							<option value="this_month"
 									data-hide-fields="_calendar_begins_custom_date,_calendar_begins_nth"
-								<?php selected( 'this_month', $calendar_begins, true ); ?>><?php _e( 'This month', 'google-calendar-events' ); ?></option>
+								<?php selected('this_month', $calendar_begins, true); ?>><?php _e('This month', 'google-calendar-events'); ?></option>
 							<option value="months_before"
 									data-hide-field="_calendar_begins_custom_date"
-									data-show-field="_calendar_begins_nth" <?php selected( 'months_before', $calendar_begins, true ); ?>><?php _e( 'Month(s) before current', 'google-calendar-events' ); ?></option>
+									data-show-field="_calendar_begins_nth" <?php selected('months_before', $calendar_begins, true); ?>><?php _e('Month(s) before current', 'google-calendar-events'); ?></option>
 							<option value="months_after"
 									data-hide-field="_calendar_begins_custom_date"
-									data-show-field="_calendar_begins_nth" <?php selected( 'months_after', $calendar_begins, true ); ?>><?php _e( 'Month(s) after current', 'google-calendar-events' ); ?></option>
+									data-show-field="_calendar_begins_nth" <?php selected('months_after', $calendar_begins, true); ?>><?php _e('Month(s) after current', 'google-calendar-events'); ?></option>
 						</optgroup>
-						<optgroup label="<?php _e( 'Years', 'google-calendar-events' ); ?>">
+						<optgroup label="<?php _e('Years', 'google-calendar-events'); ?>">
 							<option value="this_year"
 									data-hide-fields="_calendar_begins_custom_date,_calendar_begins_nth"
-								<?php selected( 'this_year', $calendar_begins, true ); ?>><?php _e( 'This year', 'google-calendar-events' ); ?></option>
+								<?php selected('this_year', $calendar_begins, true); ?>><?php _e('This year', 'google-calendar-events'); ?></option>
 							<option value="years_before"
-									data-show-field="_calendar_begins_nth" <?php selected( 'years_before', $calendar_begins, true ); ?>><?php _e( 'Year(s) before current', 'google-calendar-events' ); ?></option>
+									data-show-field="_calendar_begins_nth" <?php selected('years_before', $calendar_begins, true); ?>><?php _e('Year(s) before current', 'google-calendar-events'); ?></option>
 							<option value="years_after"
 									data-hide-field="_calendar_begins_custom_date"
-									data-show-field="_calendar_begins_nth" <?php selected( 'years_after', $calendar_begins, true ); ?>><?php _e( 'Year(s) after current', 'google-calendar-events' ); ?></option>
+									data-show-field="_calendar_begins_nth" <?php selected('years_after', $calendar_begins, true); ?>><?php _e('Year(s) after current', 'google-calendar-events'); ?></option>
 						</optgroup>
-						<optgroup label="<?php _e( 'Other', 'google-calendar-events' ); ?>">
+						<optgroup label="<?php _e('Other', 'google-calendar-events'); ?>">
 							<option value="custom_date"
 									data-hide-field="_calendar_begins_nth"
-									data-show-field="_calendar_begins_custom_date" <?php selected( 'custom_date', $calendar_begins, true ); ?>><?php _e( 'Specific date', 'google-calendar-events' ); ?></option>
+									data-show-field="_calendar_begins_custom_date" <?php selected('custom_date', $calendar_begins, true); ?>><?php _e('Specific date', 'google-calendar-events'); ?></option>
 						</optgroup>
 					</select>
 					<?php
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'date-picker',
 						'name'    => '_calendar_begins_custom_date',
 						'id'      => '_calendar_begins_custom_date',
-						'value'   => get_post_meta( $post->ID, '_calendar_begins_custom_date', true ),
+						'value'   => get_post_meta($post->ID, '_calendar_begins_custom_date', true),
 						'class' => array(
 							'simcal-field-inline',
 						),
-						'style'   => 'custom_date' != $calendar_begins ? array( 'display' => 'none' ) : '',
-					) );
+						'style'   => 'custom_date' != $calendar_begins ? array('display' => 'none') : '',
+					));
 
 					?>
 					<i class="simcal-icon-help simcal-help-tip"
-					   data-tip="<?php _e( 'The calendar default opening date. It will automatically adapt based on the chosen calendar type.', 'google-calendar-events' ); ?>"></i>
+					   data-tip="<?php _e('The calendar default opening date. It will automatically adapt based on the chosen calendar type.', 'google-calendar-events'); ?>"></i>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field">
-				<th><label for="_feed_earliest_event_date"><?php _e( 'Earliest Event', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_feed_earliest_event_date"><?php _e('Earliest Event', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$earliest_event_saved = get_post_meta( $post->ID, '_feed_earliest_event_date', true );
-					$earliest_event = false == $earliest_event_saved ? 'months_before' : esc_attr( $earliest_event_saved );
+					$earliest_event_saved = get_post_meta($post->ID, '_feed_earliest_event_date', true);
+					$earliest_event = false == $earliest_event_saved ? 'months_before' : esc_attr($earliest_event_saved);
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'       => 'standard',
 						'subtype'    => 'number',
 						'name'       => '_feed_earliest_event_date_range',
 						'id'         => '_feed_earliest_event_date_range',
-						'value'      => strval( max( absint( get_post_meta( $post->ID, '_feed_earliest_event_date_range', true ) ), 1 ) ),
+						'value'      => strval(max(absint(get_post_meta($post->ID, '_feed_earliest_event_date_range', true)), 1)),
 						'attributes' => array(
 							'min' => '1',
 						),
@@ -370,37 +370,37 @@ 
 							'simcal-field-inline',
 							'simcal-field-tiny',
 						),
-						'style'      => ( 'now' != $earliest_event ) && ( 'today' != $earliest_event ) ? array( 'display' => 'none' ) : '',
-					) );
+						'style'      => ('now' != $earliest_event) && ('today' != $earliest_event) ? array('display' => 'none') : '',
+					));
 
 					?>
 					<select name="_feed_earliest_event_date"
 							id="_feed_earliest_event_date"
 							class="simcal-field simcal-field-select simcal-field-inline simcal-field-switch-other">
-						<option value="calendar_start" data-hide-field="_feed_earliest_event_date_range" <?php selected( 'calendar_start', $earliest_event, true ); ?>><?php _e( 'Same as start date', 'google-calendar-events' ); ?></option>
-						<option value="days_before"    data-show-field="_feed_earliest_event_date_range" <?php selected( 'days_before', $earliest_event, true ); ?>><?php _e( 'Day(s) before start date', 'google-calendar-events' ); ?></option>
-						<option value="weeks_before"   data-show-field="_feed_earliest_event_date_range" <?php selected( 'weeks_before', $earliest_event, true ); ?>><?php _e( 'Week(s) before start date', 'google-calendar-events' ); ?></option>
-						<option value="months_before"  data-show-field="_feed_earliest_event_date_range" <?php selected( 'months_before', $earliest_event, true ); ?>><?php _e( 'Month(s) before start date', 'google-calendar-events' ); ?></option>
-						<option value="years_before"   data-show-field="_feed_earliest_event_date_range" <?php selected( 'years_before', $earliest_event, true ); ?>><?php _e( 'Year(s) before start date', 'google-calendar-events' ); ?></option>
+						<option value="calendar_start" data-hide-field="_feed_earliest_event_date_range" <?php selected('calendar_start', $earliest_event, true); ?>><?php _e('Same as start date', 'google-calendar-events'); ?></option>
+						<option value="days_before"    data-show-field="_feed_earliest_event_date_range" <?php selected('days_before', $earliest_event, true); ?>><?php _e('Day(s) before start date', 'google-calendar-events'); ?></option>
+						<option value="weeks_before"   data-show-field="_feed_earliest_event_date_range" <?php selected('weeks_before', $earliest_event, true); ?>><?php _e('Week(s) before start date', 'google-calendar-events'); ?></option>
+						<option value="months_before"  data-show-field="_feed_earliest_event_date_range" <?php selected('months_before', $earliest_event, true); ?>><?php _e('Month(s) before start date', 'google-calendar-events'); ?></option>
+						<option value="years_before"   data-show-field="_feed_earliest_event_date_range" <?php selected('years_before', $earliest_event, true); ?>><?php _e('Year(s) before start date', 'google-calendar-events'); ?></option>
 					</select>
 					<i class="simcal-icon-help simcal-help-tip"
-					   data-tip="<?php _e( 'Set the date for the earliest possible event to show in calendar. There will not be events before this date.', 'google-calendar-events' ); ?>"></i>
+					   data-tip="<?php _e('Set the date for the earliest possible event to show in calendar. There will not be events before this date.', 'google-calendar-events'); ?>"></i>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field">
-				<th><label for="_feed_latest_event_date"><?php _e( 'Latest Event', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_feed_latest_event_date"><?php _e('Latest Event', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$latest_event_saved = get_post_meta( $post->ID, '_feed_latest_event_date', true );
-					$latest_event = false == $latest_event_saved ? 'years_after' : esc_attr( $latest_event_saved );
+					$latest_event_saved = get_post_meta($post->ID, '_feed_latest_event_date', true);
+					$latest_event = false == $latest_event_saved ? 'years_after' : esc_attr($latest_event_saved);
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'       => 'standard',
 						'subtype'    => 'number',
 						'name'       => '_feed_latest_event_date_range',
 						'id'         => '_feed_latest_event_date_range',
-						'value'      => strval( max( absint( get_post_meta( $post->ID, '_feed_latest_event_date_range', true ) ), 1 ) ),
+						'value'      => strval(max(absint(get_post_meta($post->ID, '_feed_latest_event_date_range', true)), 1)),
 						'attributes' => array(
 							'min' => '1',
 						),
@@ -408,21 +408,21 @@ 
 							'simcal-field-inline',
 							'simcal-field-tiny',
 						),
-						'style'      => 'indefinite' != $latest_event ? array( 'display' => 'none' ) : '',
-					) );
+						'style'      => 'indefinite' != $latest_event ? array('display' => 'none') : '',
+					));
 
 					?>
 					<select name="_feed_latest_event_date"
 							id="_feed_latest_event_date"
 							class="simcal-field simcal-field-select simcal-field-inline simcal-field-switch-other">
-						<option value="calendar_start" data-hide-field="_feed_latest_event_date_range" <?php selected( 'calendar_start', $earliest_event, true ); ?>><?php _e( 'Day end of start date', 'google-calendar-events' ); ?></option>
-						<option value="days_after"     data-show-field="_feed_latest_event_date_range" <?php selected( 'days_after', $latest_event, true ); ?>><?php _e( 'Day(s) after start date', 'google-calendar-events' ); ?></option>
-						<option value="weeks_after"    data-show-field="_feed_latest_event_date_range" <?php selected( 'weeks_after', $latest_event, true ); ?>><?php _e( 'Weeks(s) after start date', 'google-calendar-events' ); ?></option>
-						<option value="months_after"   data-show-field="_feed_latest_event_date_range" <?php selected( 'months_after', $latest_event, true ); ?>><?php _e( 'Month(s) after start date', 'google-calendar-events' ); ?></option>
-						<option value="years_after"    data-show-field="_feed_latest_event_date_range" <?php selected( 'years_after', $latest_event, true ); ?>><?php _e( 'Year(s) after start date', 'google-calendar-events' ); ?></option>
+						<option value="calendar_start" data-hide-field="_feed_latest_event_date_range" <?php selected('calendar_start', $earliest_event, true); ?>><?php _e('Day end of start date', 'google-calendar-events'); ?></option>
+						<option value="days_after"     data-show-field="_feed_latest_event_date_range" <?php selected('days_after', $latest_event, true); ?>><?php _e('Day(s) after start date', 'google-calendar-events'); ?></option>
+						<option value="weeks_after"    data-show-field="_feed_latest_event_date_range" <?php selected('weeks_after', $latest_event, true); ?>><?php _e('Weeks(s) after start date', 'google-calendar-events'); ?></option>
+						<option value="months_after"   data-show-field="_feed_latest_event_date_range" <?php selected('months_after', $latest_event, true); ?>><?php _e('Month(s) after start date', 'google-calendar-events'); ?></option>
+						<option value="years_after"    data-show-field="_feed_latest_event_date_range" <?php selected('years_after', $latest_event, true); ?>><?php _e('Year(s) after start date', 'google-calendar-events'); ?></option>
 					</select>
 					<i class="simcal-icon-help simcal-help-tip"
-					   data-tip="<?php _e( 'Set the date for the latest possible event to show on calendar. There will not be events after this date.', 'google-calendar-events' ); ?>"></i>
+					   data-tip="<?php _e('Set the date for the latest possible event to show on calendar. There will not be events after this date.', 'google-calendar-events'); ?>"></i>
 				</td>
 			</tr>
 			</tbody>
@@ -439,88 +439,88 @@ 
 	 *
 	 * @param  \WP_Post $post
 	 */
-	private static function calendar_settings_panel( $post ) {
+	private static function calendar_settings_panel($post) {
 
 		?>
 		<table>
 			<thead>
-			<tr><th colspan="2"><?php _e( 'Miscellaneous', 'google-calendar-events' ); ?></th></tr>
+			<tr><th colspan="2"><?php _e('Miscellaneous', 'google-calendar-events'); ?></th></tr>
 			</thead>
 			<tbody class="simcal-panel-section">
 			<tr class="simcal-panel-field">
-				<th><label for="_calendar_is_static"><?php _e( 'Static Calendar', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_calendar_is_static"><?php _e('Static Calendar', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$fixed = get_post_meta( $post->ID, '_calendar_is_static', true );
+					$fixed = get_post_meta($post->ID, '_calendar_is_static', true);
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'checkbox',
 						'name'    => '_calendar_is_static',
 						'id'      => '_calendar_is_static',
-						'tooltip' => __( 'Remove the navigation arrows and fix the calendar view to its initial state.', 'google-calendar-events' ),
+						'tooltip' => __('Remove the navigation arrows and fix the calendar view to its initial state.', 'google-calendar-events'),
 						'value'   => 'yes' == $fixed ? 'yes' : 'no',
-						'text'    => __( 'Yes (hide navigation arrows)', 'google-calendar-events' ),
-					) );
+						'text'    => __('Yes (hide navigation arrows)', 'google-calendar-events'),
+					));
 
 					?>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field">
-				<th><label for="_no_events_message"><?php _e( 'No Events Message', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_no_events_message"><?php _e('No Events Message', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'textarea',
 						'name'    => '_no_events_message',
 						'id'      => '_no_events_message',
-						'tooltip' => __( 'Some calendars may display a message when no events are found. You can change the default message here.', 'google-calendar-events' ),
-						'value'   => get_post_meta( $post->ID, '_no_events_message', true ),
-						'placeholder' => __( 'There are no upcoming events.', 'google-calendar-events' ),
-					) );
+						'tooltip' => __('Some calendars may display a message when no events are found. You can change the default message here.', 'google-calendar-events'),
+						'value'   => get_post_meta($post->ID, '_no_events_message', true),
+						'placeholder' => __('There are no upcoming events.', 'google-calendar-events'),
+					));
 
 					?>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field">
-				<th><label for="_event_formatting"><?php _e( 'Event Formatting', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_event_formatting"><?php _e('Event Formatting', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$event_formatting = get_post_meta( $post->ID, '_event_formatting', true );
+					$event_formatting = get_post_meta($post->ID, '_event_formatting', true);
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'select',
 						'name'    => '_event_formatting',
 						'id'      => '_event_formatting',
-						'tooltip' => __( 'How to preserve line breaks and paragraphs in the event template builder.', 'google-calendar-events' ),
+						'tooltip' => __('How to preserve line breaks and paragraphs in the event template builder.', 'google-calendar-events'),
 						'value'   => $event_formatting,
 						'default' => 'preserve_linebreaks',
 						'options' => array(
-							'preserve_linebreaks' => __( 'Preserve line breaks, auto paragraphs (default)', 'google-calendar-events' ),
-							'no_linebreaks'       => __( 'No line breaks, auto paragraphs', 'google-calendar-events' ),
-							'none'                => __( 'No line breaks, no auto paragraphs', 'google-calendar-events' ),
+							'preserve_linebreaks' => __('Preserve line breaks, auto paragraphs (default)', 'google-calendar-events'),
+							'no_linebreaks'       => __('No line breaks, auto paragraphs', 'google-calendar-events'),
+							'none'                => __('No line breaks, no auto paragraphs', 'google-calendar-events'),
 						),
-					) );
+					));
 
 					?>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field">
-				<th><label for="_poweredby"><?php _e( 'Powered By', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_poweredby"><?php _e('Powered By', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$poweredby = get_post_meta( $post->ID, '_poweredby', true );
+					$poweredby = get_post_meta($post->ID, '_poweredby', true);
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'checkbox',
 						'name'    => '_poweredby',
 						'id'      => '_poweredby',
 						'value'   => 'yes' == $poweredby ? 'yes' : 'no',
-						'text'    => __( 'Yes, Simple Calendar rocks! Show some love with a little link below this calendar.', 'google-calendar-events' ),
-					) );
+						'text'    => __('Yes, Simple Calendar rocks! Show some love with a little link below this calendar.', 'google-calendar-events'),
+					));
 
 					?>
 				</td>
@@ -539,28 +539,28 @@ 
 	 *
 	 * @param  \WP_Post $post
 	 */
-	private static function advanced_settings_panel( $post ) {
+	private static function advanced_settings_panel($post) {
 
 		?>
 		<table>
 			<thead>
-			<tr><th colspan="2"><?php _e( 'Date and Time', 'google-calendar-events' ); ?></th></tr>
+			<tr><th colspan="2"><?php _e('Date and Time', 'google-calendar-events'); ?></th></tr>
 			</thead>
 			<tbody class="simcal-panel-section simcal-panel-datetime-formatting">
 			<tr class="simcal-panel-field">
-				<th><label for="_calendar_timezone_setting"><?php _e( 'Timezone', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_calendar_timezone_setting"><?php _e('Timezone', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
 					$timezone_wordpress = simcal_get_wp_timezone();
 					$timezone_default   = $timezone_wordpress ? $timezone_wordpress : 'UTC';
-					$timezone_setting   = esc_attr( get_post_meta( $post->ID, '_feed_timezone_setting', true ) );
-					$timezone           = esc_attr( get_post_meta( $post->ID, '_feed_timezone', true ) );
+					$timezone_setting   = esc_attr(get_post_meta($post->ID, '_feed_timezone_setting', true));
+					$timezone           = esc_attr(get_post_meta($post->ID, '_feed_timezone', true));
 					$timezone           = $timezone ? $timezone : $timezone_default;
-					$show_use_calendar  = isset( simcal_get_feed( $post )->type );
+					$show_use_calendar  = isset(simcal_get_feed($post)->type);
 
-					if ( $show_use_calendar ) {
-						$show_use_calendar = ( simcal_get_feed( $post )->type !== 'grouped-calendars' ? 1 : 0 );
+					if ($show_use_calendar) {
+						$show_use_calendar = (simcal_get_feed($post)->type !== 'grouped-calendars' ? 1 : 0);
 					} else {
 						$show_use_calendar = true;
 					}
@@ -570,58 +570,58 @@ 
 							id="_feed_timezone_setting"
 							class="simcal-field simcal-field-select simcal-field-inline simcal-field-show-other"
 							data-show-field-on-choice="true">
-						<option value="use_site" <?php selected( 'use_site', $timezone_setting, true ); ?>><?php printf( _x( 'Site default', 'Use this site default setting', 'google-calendar-events' ) . ' (%s)', $timezone_default ); ?></option>
-						<?php if ( $show_use_calendar ) { ?>
-							<option id="use_calendar" value="use_calendar" data-show-field="_use_calendar_warning" <?php selected( 'use_calendar', $timezone_setting, true ); ?>><?php _ex( 'Event source default', 'Use the calendar default setting', 'google-calendar-events' ); ?></option>
+						<option value="use_site" <?php selected('use_site', $timezone_setting, true); ?>><?php printf(_x('Site default', 'Use this site default setting', 'google-calendar-events').' (%s)', $timezone_default); ?></option>
+						<?php if ($show_use_calendar) { ?>
+							<option id="use_calendar" value="use_calendar" data-show-field="_use_calendar_warning" <?php selected('use_calendar', $timezone_setting, true); ?>><?php _ex('Event source default', 'Use the calendar default setting', 'google-calendar-events'); ?></option>
 						<?php } ?>
-						<option value="use_custom" data-show-field="_feed_timezone" <?php selected( 'use_custom', $timezone_setting, true ); ?>><?php _ex( 'Custom', 'Use a custom setting', 'google-calendar-events' ); ?></option>
+						<option value="use_custom" data-show-field="_feed_timezone" <?php selected('use_custom', $timezone_setting, true); ?>><?php _ex('Custom', 'Use a custom setting', 'google-calendar-events'); ?></option>
 					</select>
 					<select name="_feed_timezone"
 							id="_feed_timezone"
 							class="simcal-field simcal-field-select simcal-field-inline"
 						<?php echo 'use_custom' != $timezone_setting ? 'style="display: none;"' : ''; ?>>
-						<?php echo wp_timezone_choice( $timezone ); ?>
+						<?php echo wp_timezone_choice($timezone); ?>
 					</select>
-					<i class="simcal-icon-help simcal-help-tip" data-tip="<?php _e( 'Using a different timezone may alter the date and time display of your calendar events. We recommended using the site default timezone.', 'google-calendar-events' ); ?>"></i>
+					<i class="simcal-icon-help simcal-help-tip" data-tip="<?php _e('Using a different timezone may alter the date and time display of your calendar events. We recommended using the site default timezone.', 'google-calendar-events'); ?>"></i>
 					<p id="_use_calendar_warning" style="display: none;" class="simcal-field">
-						<span class="attention"><?php _e( 'Warning', 'google-calendar-events' ); ?>:</span>
-						<?php _e( 'Setting this to <code>Event source default</code> can at times cause unexpected results. Please test thoroughly.', 'google-calendar-events' ); ?>
-						<a href="http://docs.simplecalendar.io/timezone-settings/" target="_blank"><?php _e( 'See details.', 'google-calendar-events' ); ?></a>
+						<span class="attention"><?php _e('Warning', 'google-calendar-events'); ?>:</span>
+						<?php _e('Setting this to <code>Event source default</code> can at times cause unexpected results. Please test thoroughly.', 'google-calendar-events'); ?>
+						<a href="http://docs.simplecalendar.io/timezone-settings/" target="_blank"><?php _e('See details.', 'google-calendar-events'); ?></a>
 					</p>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field">
-				<th><label for="_calendar_date_format_setting"><?php _e( 'Date Format', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_calendar_date_format_setting"><?php _e('Date Format', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$date_format_setting = esc_attr( get_post_meta( $post->ID, '_calendar_date_format_setting', true ) );
-					$date_format_default = esc_attr( get_option( 'date_format' ) );
-					$date_format = esc_attr( get_post_meta( $post->ID, '_calendar_date_format', true ) );
-					$date_format_php = esc_attr( get_post_meta( $post->ID, '_calendar_date_format_php', true ) );
+					$date_format_setting = esc_attr(get_post_meta($post->ID, '_calendar_date_format_setting', true));
+					$date_format_default = esc_attr(get_option('date_format'));
+					$date_format = esc_attr(get_post_meta($post->ID, '_calendar_date_format', true));
+					$date_format_php = esc_attr(get_post_meta($post->ID, '_calendar_date_format_php', true));
 					$date_format_php = $date_format_php ? $date_format_php : $date_format_default;
 
 					?>
 					<select name="_calendar_date_format_setting"
 							id="_calendar_date_format_setting"
 							class="simcal-field simcal-field-select simcal-field-show-other">
-						<option value="use_site" data-show-field="_calendar_date_format_default" <?php selected( 'use_site', $date_format_setting, true ); ?>><?php  _ex( 'Site default', 'Use this site default setting', 'google-calendar-events' ); ?></option>
-						<option value="use_custom" data-show-field="_calendar_date_format" <?php selected( 'use_custom', $date_format_setting, true ); ?>><?php _ex( 'Custom', 'Use a custom setting', 'google-calendar-events' ); ?></option>
-						<option value="use_custom_php" data-show-field="_calendar_date_format_php_field" <?php selected( 'use_custom_php', $date_format_setting, true ); ?>><?php _e( 'Custom (PHP format)', 'google-calendar-events' ); ?></option>
+						<option value="use_site" data-show-field="_calendar_date_format_default" <?php selected('use_site', $date_format_setting, true); ?>><?php  _ex('Site default', 'Use this site default setting', 'google-calendar-events'); ?></option>
+						<option value="use_custom" data-show-field="_calendar_date_format" <?php selected('use_custom', $date_format_setting, true); ?>><?php _ex('Custom', 'Use a custom setting', 'google-calendar-events'); ?></option>
+						<option value="use_custom_php" data-show-field="_calendar_date_format_php_field" <?php selected('use_custom_php', $date_format_setting, true); ?>><?php _e('Custom (PHP format)', 'google-calendar-events'); ?></option>
 					</select>
-					<i class="simcal-icon-help simcal-help-tip" data-tip="<?php _e( 'This option sets how calendars display event dates. It is recommended to keep your site default setting.', 'google-calendar-events' ); ?>"></i>
+					<i class="simcal-icon-help simcal-help-tip" data-tip="<?php _e('This option sets how calendars display event dates. It is recommended to keep your site default setting.', 'google-calendar-events'); ?>"></i>
 					<p id="_calendar_date_format_default" style="<?php echo $date_format_setting != 'use_site' ? 'display: none;' : ''; ?>">
-						<em><?php _e( 'Preview', 'google-calendar-events' ) ?>:</em>&nbsp;&nbsp;
-						<code><?php echo date_i18n( $date_format_default, time() ); ?></code>
+						<em><?php _e('Preview', 'google-calendar-events') ?>:</em>&nbsp;&nbsp;
+						<code><?php echo date_i18n($date_format_default, time()); ?></code>
 					</p>
-					<?php simcal_print_field( array(
+					<?php simcal_print_field(array(
 						'type'    => 'datetime-format',
 						'subtype' => 'date',
 						'name'    => '_calendar_date_format',
 						'id'      => '_calendar_date_format',
 						'value'   => $date_format,
-						'style'   => $date_format_setting != 'use_custom' ? array( 'display' => 'none' ) : '',
-					) ); ?>
+						'style'   => $date_format_setting != 'use_custom' ? array('display' => 'none') : '',
+					)); ?>
 					<div class="simcal-field-datetime-format-php" id="_calendar_date_format_php_field" style="<?php echo $date_format_setting != 'use_custom_php' ? 'display: none;' : ''; ?>">
 						<br>
 						<label for="_calendar_date_format_php">
@@ -630,70 +630,70 @@ 
 								   id="_calendar_date_format_php"
 								   class="simcal-field simcal-field-text simcal-field-small"
 								   value="<?php echo $date_format_php; ?>" />
-							<?php printf( __( 'Enter a date format using %s values.', 'google-calendar-events' ), '<a href="//php.net/manual/en/function.date.php" target="_blank">PHP</a>' ); ?>
+							<?php printf(__('Enter a date format using %s values.', 'google-calendar-events'), '<a href="//php.net/manual/en/function.date.php" target="_blank">PHP</a>'); ?>
 						</label>
 						<p>
-							<em><?php _e( 'Preview', 'google-calendar-events' ) ?>:</em>&nbsp;&nbsp;
-							<code><?php echo date_i18n( $date_format_php, time() ); ?></code>
+							<em><?php _e('Preview', 'google-calendar-events') ?>:</em>&nbsp;&nbsp;
+							<code><?php echo date_i18n($date_format_php, time()); ?></code>
 						</p>
 					</div>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field">
-				<th><label for="_calendar_datetime_separator"><?php _e( 'Separator', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_calendar_datetime_separator"><?php _e('Separator', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$separator = get_post_meta( $post->ID, '_calendar_datetime_separator', true );
+					$separator = get_post_meta($post->ID, '_calendar_datetime_separator', true);
 					$separator = false == $separator ? '@' : $separator;
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'standard',
 						'subtype' => 'text',
 						'name'    => '_calendar_datetime_separator',
 						'id'      => '_calendar_datetime_separator',
 						'value'   => $separator,
-						'tooltip' => __( 'Used to divide date and time when both are shown.', 'google-calendar-events' ),
+						'tooltip' => __('Used to divide date and time when both are shown.', 'google-calendar-events'),
 						'class'   => array(
 							'simcal-field-tiny',
 						),
-					) );
+					));
 
 					?>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field">
-				<th><label for="_calendar_time_format_setting"><?php _e( 'Time Format', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_calendar_time_format_setting"><?php _e('Time Format', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$time_format_setting = esc_attr( get_post_meta( $post->ID, '_calendar_time_format_setting', true ) );
-					$time_format_default = esc_attr( get_option( 'time_format' ) );
-					$time_format = esc_attr( get_post_meta( $post->ID, '_calendar_time_format', true ) );
-					$time_format_php = esc_attr( get_post_meta( $post->ID, '_calendar_time_format_php', true ) );
+					$time_format_setting = esc_attr(get_post_meta($post->ID, '_calendar_time_format_setting', true));
+					$time_format_default = esc_attr(get_option('time_format'));
+					$time_format = esc_attr(get_post_meta($post->ID, '_calendar_time_format', true));
+					$time_format_php = esc_attr(get_post_meta($post->ID, '_calendar_time_format_php', true));
 					$time_format_php = $time_format_php ? $time_format_php : $time_format_default;
 
 					?>
 					<select name="_calendar_time_format_setting"
 							id="_calendar_time_format_setting"
 							class="simcal-field simcal-field-select simcal-field-show-other">
-						<option value="use_site" data-show-field="_calendar_time_format_default" <?php selected( 'use_site', $time_format_setting, true ); ?>><?php _ex( 'Site default', 'Use this site default setting', 'google-calendar-events' ); ?></option>
-						<option value="use_custom" data-show-field="_calendar_time_format" <?php selected( 'use_custom', $time_format_setting, true ); ?>><?php _ex( 'Custom', 'Use a custom setting', 'google-calendar-events' ); ?></option>
-						<option value="use_custom_php" data-show-field="_calendar_time_format_php_field" <?php selected( 'use_custom_php', $time_format_setting, true ); ?>><?php _e( 'Custom (PHP format)', 'google-calendar-events' ); ?></option>
+						<option value="use_site" data-show-field="_calendar_time_format_default" <?php selected('use_site', $time_format_setting, true); ?>><?php _ex('Site default', 'Use this site default setting', 'google-calendar-events'); ?></option>
+						<option value="use_custom" data-show-field="_calendar_time_format" <?php selected('use_custom', $time_format_setting, true); ?>><?php _ex('Custom', 'Use a custom setting', 'google-calendar-events'); ?></option>
+						<option value="use_custom_php" data-show-field="_calendar_time_format_php_field" <?php selected('use_custom_php', $time_format_setting, true); ?>><?php _e('Custom (PHP format)', 'google-calendar-events'); ?></option>
 					</select>
-					<i class="simcal-icon-help simcal-help-tip" data-tip="<?php _e( 'This option sets how calendars display event times. It is recommended to keep your site default setting.', 'google-calendar-events' ); ?>"></i>
+					<i class="simcal-icon-help simcal-help-tip" data-tip="<?php _e('This option sets how calendars display event times. It is recommended to keep your site default setting.', 'google-calendar-events'); ?>"></i>
 					<p id="_calendar_time_format_default" style="<?php echo $time_format_setting != 'use_site' ? 'display: none;' : ''; ?>">
-						<em><?php _e( 'Preview', 'google-calendar-events' ) ?>:</em>&nbsp;&nbsp;
-						<code><?php echo date_i18n( $time_format_default, time() ); ?></code>
+						<em><?php _e('Preview', 'google-calendar-events') ?>:</em>&nbsp;&nbsp;
+						<code><?php echo date_i18n($time_format_default, time()); ?></code>
 					</p>
-					<?php simcal_print_field( array(
+					<?php simcal_print_field(array(
 						'type'    => 'datetime-format',
 						'subtype' => 'time',
 						'name'    => '_calendar_time_format',
 						'id'      => '_calendar_time_format',
 						'value'   => $time_format,
-						'style'   => $time_format_setting != 'use_custom' ? array( 'display' => 'none' ) : '',
-					) ); ?>
+						'style'   => $time_format_setting != 'use_custom' ? array('display' => 'none') : '',
+					)); ?>
 					<div class="simcal-field-datetime-format-php" id="_calendar_time_format_php_field" style="<?php echo $time_format_setting != 'use_custom_php' ? 'display: none;' : ''; ?>">
 						<br>
 						<label for="_calendar_date_format_php">
@@ -702,24 +702,24 @@ 
 								   id="_calendar_time_format_php"
 								   class="simcal-field simcal-field-text simcal-field-small"
 								   value="<?php echo $time_format_php; ?>"/>
-							<?php printf( __( 'Enter a time format using %s values.', 'google-calendar-events' ), '<a href="//php.net/manual/en/function.date.php" target="_blank">PHP</a>' ); ?>
+							<?php printf(__('Enter a time format using %s values.', 'google-calendar-events'), '<a href="//php.net/manual/en/function.date.php" target="_blank">PHP</a>'); ?>
 						</label>
 						<p>
-							<em><?php _e( 'Preview', 'google-calendar-events' ) ?>:</em>&nbsp;&nbsp;
-							<code><?php echo date_i18n( $time_format_php, time() ); ?></code>
+							<em><?php _e('Preview', 'google-calendar-events') ?>:</em>&nbsp;&nbsp;
+							<code><?php echo date_i18n($time_format_php, time()); ?></code>
 						</p>
 					</div>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field">
-				<th><label for="_calendar_week_starts_on_setting"><?php _e( 'Week Starts On', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_calendar_week_starts_on_setting"><?php _e('Week Starts On', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$week_starts_setting = esc_attr( get_post_meta( $post->ID, '_calendar_week_starts_on_setting', true ) );
-					$week_starts_default = esc_attr( get_option( 'start_of_week' ) );
-					$week_starts = intval( get_post_meta( $post->ID, '_calendar_week_starts_on', true ) );
-					$week_starts = is_numeric( $week_starts ) ? strval( $week_starts ) : $week_starts_default;
+					$week_starts_setting = esc_attr(get_post_meta($post->ID, '_calendar_week_starts_on_setting', true));
+					$week_starts_default = esc_attr(get_option('start_of_week'));
+					$week_starts = intval(get_post_meta($post->ID, '_calendar_week_starts_on', true));
+					$week_starts = is_numeric($week_starts) ? strval($week_starts) : $week_starts_default;
 
 					?>
 					<select
@@ -727,40 +727,40 @@ 
 						id="_calendar_week_starts_on_setting"
 						class="simcal-field simcal-field-select simcal-field-inline simcal-field-show-next"
 						data-show-next-if-value="use_custom">
-						<option value="use_site" <?php selected( 'use_site', $week_starts_setting, true ); ?>><?php printf( _x( 'Site default', 'Use this site default setting', 'google-calendar-events' ) . ' (%s)', date_i18n( 'l', strtotime( "Sunday + $week_starts_default Days" ) ) ); ?></option>
-						<option value="use_custom" <?php selected( 'use_custom', $week_starts_setting, true ); ?>><?php _ex( 'Custom', 'Use a custom setting', 'google-calendar-events' ); ?></option>
+						<option value="use_site" <?php selected('use_site', $week_starts_setting, true); ?>><?php printf(_x('Site default', 'Use this site default setting', 'google-calendar-events').' (%s)', date_i18n('l', strtotime("Sunday + $week_starts_default Days"))); ?></option>
+						<option value="use_custom" <?php selected('use_custom', $week_starts_setting, true); ?>><?php _ex('Custom', 'Use a custom setting', 'google-calendar-events'); ?></option>
 					</select>
 					<select
 						name="_calendar_week_starts_on"
 						id="_calendar_week_starts_on"
 						class="simcal-field simcal-field-select simcal-field-inline"
 						<?php echo 'use_custom' != $week_starts_setting ? 'style="display: none;"' : ''; ?>>
-						<?php $day_names = simcal_get_calendar_names_i18n( 'day', 'full' ); ?>
-						<?php for ( $i = 0; $i <= 6; $i++ ) : ?>
-							<option value="<?php echo $i; ?>" <?php selected( $i, $week_starts, true ); ?>><?php echo $day_names[ $i ]; ?></option>
+						<?php $day_names = simcal_get_calendar_names_i18n('day', 'full'); ?>
+						<?php for ($i = 0; $i <= 6; $i++) : ?>
+							<option value="<?php echo $i; ?>" <?php selected($i, $week_starts, true); ?>><?php echo $day_names[$i]; ?></option>
 						<?php endfor; ?>
 					</select>
-					<i class="simcal-icon-help simcal-help-tip" data-tip="<?php _e( 'Some calendars may use this setting to display the start of the week. It is recommended to keep the site default setting.', 'google-calendar-events' ); ?>"></i>
+					<i class="simcal-icon-help simcal-help-tip" data-tip="<?php _e('Some calendars may use this setting to display the start of the week. It is recommended to keep the site default setting.', 'google-calendar-events'); ?>"></i>
 				</td>
 			</tr>
 			</tbody>
 		</table>
 		<table>
 			<thead>
-			<tr><th colspan="2"><?php _e( 'Cache', 'google-calendar-events' ); ?></th></tr>
+			<tr><th colspan="2"><?php _e('Cache', 'google-calendar-events'); ?></th></tr>
 			</thead>
 			<tbody class="simcal-panel-section simcal-panel-section-cache">
 			<?php
 
-			$cache_freq = esc_attr( get_post_meta( $post->ID, '_feed_cache_user_amount', true ) );
-			$cache_unit = esc_attr( get_post_meta( $post->ID, '_feed_cache_user_unit', true ) );
+			$cache_freq = esc_attr(get_post_meta($post->ID, '_feed_cache_user_amount', true));
+			$cache_unit = esc_attr(get_post_meta($post->ID, '_feed_cache_user_unit', true));
 
-			$cache_freq = intval( $cache_freq ) && $cache_freq >= 0 ? $cache_freq : 2;
+			$cache_freq = intval($cache_freq) && $cache_freq >= 0 ? $cache_freq : 2;
 			$cache_unit = $cache_unit ? $cache_unit : '3600';
 
 			?>
 			<tr class="simcal-panel-field">
-				<th><label for="_feed_cache_user_amount"><?php _ex( 'Refresh Interval', 'Cache maximum interval', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_feed_cache_user_amount"><?php _ex('Refresh Interval', 'Cache maximum interval', 'google-calendar-events'); ?></label></th>
 				<td>
 					<input type="number"
 						   name="_feed_cache_user_amount"
@@ -771,12 +771,12 @@ 
 					<select name="_feed_cache_user_unit"
 							id="_feed_cache_user_unit"
 							class="simcal-field simcalfield-select simcal-field-inline">
-						<option value="60" <?php selected( '60', $cache_unit, true ); ?>><?php _e( 'Minute(s)', 'google-calendar-events' ); ?></option>
-						<option value="3600" <?php selected( '3600', $cache_unit, true ); ?>><?php _e( 'Hour(s)', 'google-calendar-events' ); ?></option>
-						<option value="86400" <?php selected( '86400', $cache_unit, true ); ?>><?php _e( 'Day(s)', 'google-calendar-events' ); ?></option>
-						<option value="604800" <?php selected( '604800', $cache_unit, true ); ?>><?php _e( 'Week(s)', 'google-calendar-events' ); ?></option>
+						<option value="60" <?php selected('60', $cache_unit, true); ?>><?php _e('Minute(s)', 'google-calendar-events'); ?></option>
+						<option value="3600" <?php selected('3600', $cache_unit, true); ?>><?php _e('Hour(s)', 'google-calendar-events'); ?></option>
+						<option value="86400" <?php selected('86400', $cache_unit, true); ?>><?php _e('Day(s)', 'google-calendar-events'); ?></option>
+						<option value="604800" <?php selected('604800', $cache_unit, true); ?>><?php _e('Week(s)', 'google-calendar-events'); ?></option>
 					</select>
-					<i class="simcal-icon-help simcal-help-tip" data-tip="<?php _e( 'If you add, edit or remove events in your calendar very often, you can set a lower interval to refresh the events displayed. Set a higher interval for best performance.', 'google-calendar-events' ); ?>"></i>
+					<i class="simcal-icon-help simcal-help-tip" data-tip="<?php _e('If you add, edit or remove events in your calendar very often, you can set a lower interval to refresh the events displayed. Set a higher interval for best performance.', 'google-calendar-events'); ?>"></i>
 				</td>
 			</tr>
 			</tbody>
@@ -795,21 +795,21 @@ 
 	 *
 	 * @return void
 	 */
-	public static function print_panel_fields( $array, $post_id ) {
+	public static function print_panel_fields($array, $post_id) {
 
-		foreach ( $array as $section => $fields ) :
+		foreach ($array as $section => $fields) :
 
-			if ( $fields && is_array( $fields ) ) :
+			if ($fields && is_array($fields)) :
 
 				?>
-				<tbody class="simcal-panel-section simcal-panel-section-<?php echo esc_attr( $section ); ?>">
-				<?php foreach ( $fields as $key => $field ) :
+				<tbody class="simcal-panel-section simcal-panel-section-<?php echo esc_attr($section); ?>">
+				<?php foreach ($fields as $key => $field) :
 
-					$value            = get_post_meta( $post_id, $key, true );
-					$field['value']   = $value ? $value : ( isset( $field['default'] ) ? $field['default'] : '' );
-					$the_field = simcal_get_field( $field ); ?>
+					$value            = get_post_meta($post_id, $key, true);
+					$field['value']   = $value ? $value : (isset($field['default']) ? $field['default'] : '');
+					$the_field = simcal_get_field($field); ?>
 
-					<?php if ( $the_field instanceof Field ) : ?>
+					<?php if ($the_field instanceof Field) : ?>
 					<tr class="simcal-panel-field">
 						<th><label for="<?php echo $the_field->id ?>"><?php echo $the_field->title; ?></label></th>
 						<td><?php $the_field->html(); ?></td>
@@ -836,30 +836,30 @@ 
 	 *
 	 * @return void
 	 */
-	public static function save( $post_id, $post ) {
+	public static function save($post_id, $post) {
 
 		/* ====================== *
 		 * Calendar type and view *
 		 * ====================== */
 
 		// Unlink existing terms for feed type and calendar type.
-		wp_delete_object_term_relationships( $post_id, array(
+		wp_delete_object_term_relationships($post_id, array(
 			'calendar_feed',
 			'calendar_type',
-		) );
+		));
 
 		// Set the feed type as term.
-		$feed_type = isset( $_POST['_feed_type'] ) ? sanitize_title( stripslashes( $_POST['_feed_type'] ) ) : apply_filters( 'simcal_default_feed_type', 'google' );
-		wp_set_object_terms( $post_id, $feed_type, 'calendar_feed' );
+		$feed_type = isset($_POST['_feed_type']) ? sanitize_title(stripslashes($_POST['_feed_type'])) : apply_filters('simcal_default_feed_type', 'google');
+		wp_set_object_terms($post_id, $feed_type, 'calendar_feed');
 
 		// Set the calendar type as a term.
-		$calendar_type = isset( $_POST['_calendar_type'] ) ? sanitize_title( stripslashes( $_POST['_calendar_type'] ) ) : apply_filters( 'simcal_default_calendar_type', 'default-calendar' );
-		wp_set_object_terms( $post_id, $calendar_type, 'calendar_type' );
+		$calendar_type = isset($_POST['_calendar_type']) ? sanitize_title(stripslashes($_POST['_calendar_type'])) : apply_filters('simcal_default_calendar_type', 'default-calendar');
+		wp_set_object_terms($post_id, $calendar_type, 'calendar_type');
 		// Set the calendar type view as post meta.
-		$calendar_view = isset( $_POST['_calendar_view'] ) ? $_POST['_calendar_view'] : '';
-		if ( $calendar_view && is_array( $calendar_view ) ) {
-			$views = array_map( 'sanitize_title', $calendar_view );
-			update_post_meta( $post_id, '_calendar_view', $views );
+		$calendar_view = isset($_POST['_calendar_view']) ? $_POST['_calendar_view'] : '';
+		if ($calendar_view && is_array($calendar_view)) {
+			$views = array_map('sanitize_title', $calendar_view);
+			update_post_meta($post_id, '_calendar_view', $views);
 		}
 
 		/* ===================== *
@@ -867,106 +867,106 @@ 
 		 * ===================== */
 
 		// Calendar opening.
-		$calendar_begins = isset( $_POST['_calendar_begins'] ) ? sanitize_key( $_POST['_calendar_begins'] ) : 'this_month';
-		update_post_meta( $post_id, '_calendar_begins', $calendar_begins );
-		$calendar_begins_nth = isset( $_POST['_calendar_begins_nth'] ) ? absint( $_POST['_calendar_begins_nth'] ) : 2;
-		update_post_meta( $post_id, '_calendar_begins_nth', $calendar_begins_nth );
-		$calendar_begins_custom_date = isset( $_POST['_calendar_begins_custom_date'] ) ? sanitize_title( $_POST['_calendar_begins_custom_date'] ) : '';
-		update_post_meta( $post_id, '_calendar_begins_custom_date', $calendar_begins_custom_date );
+		$calendar_begins = isset($_POST['_calendar_begins']) ? sanitize_key($_POST['_calendar_begins']) : 'this_month';
+		update_post_meta($post_id, '_calendar_begins', $calendar_begins);
+		$calendar_begins_nth = isset($_POST['_calendar_begins_nth']) ? absint($_POST['_calendar_begins_nth']) : 2;
+		update_post_meta($post_id, '_calendar_begins_nth', $calendar_begins_nth);
+		$calendar_begins_custom_date = isset($_POST['_calendar_begins_custom_date']) ? sanitize_title($_POST['_calendar_begins_custom_date']) : '';
+		update_post_meta($post_id, '_calendar_begins_custom_date', $calendar_begins_custom_date);
 
 		// Feed earliest events date.
-		$earliest_events = isset( $_POST['_feed_earliest_event_date'] ) ? sanitize_key( $_POST['_feed_earliest_event_date'] ) : '';
-		update_post_meta( $post_id, '_feed_earliest_event_date', $earliest_events );
-		$earliest_events_range = isset( $_POST['_feed_earliest_event_date_range'] ) ? max( absint( $_POST['_feed_earliest_event_date_range'] ), 1 ) : 1;
-		update_post_meta( $post_id, '_feed_earliest_event_date_range', $earliest_events_range );
+		$earliest_events = isset($_POST['_feed_earliest_event_date']) ? sanitize_key($_POST['_feed_earliest_event_date']) : '';
+		update_post_meta($post_id, '_feed_earliest_event_date', $earliest_events);
+		$earliest_events_range = isset($_POST['_feed_earliest_event_date_range']) ? max(absint($_POST['_feed_earliest_event_date_range']), 1) : 1;
+		update_post_meta($post_id, '_feed_earliest_event_date_range', $earliest_events_range);
 
 		// Feed latest events date.
-		$latest_events = isset( $_POST['_feed_latest_event_date'] ) ? sanitize_key( $_POST['_feed_latest_event_date'] ) : '';
-		update_post_meta( $post_id, '_feed_latest_event_date', $latest_events );
-		$latest_events_range = isset( $_POST['_feed_latest_event_date_range'] ) ? max( absint( $_POST['_feed_latest_event_date_range'] ), 1 ) : 1;
-		update_post_meta( $post_id, '_feed_latest_event_date_range', $latest_events_range );
+		$latest_events = isset($_POST['_feed_latest_event_date']) ? sanitize_key($_POST['_feed_latest_event_date']) : '';
+		update_post_meta($post_id, '_feed_latest_event_date', $latest_events);
+		$latest_events_range = isset($_POST['_feed_latest_event_date_range']) ? max(absint($_POST['_feed_latest_event_date_range']), 1) : 1;
+		update_post_meta($post_id, '_feed_latest_event_date_range', $latest_events_range);
 
 		/* ======================= *
 		 * Calendar settings panel *
 		 * ======================= */
 
 		// Static calendar.
-		$static = isset( $_POST['_calendar_is_static'] ) ? 'yes' : 'no';
-		update_post_meta( $post_id, '_calendar_is_static', $static );
+		$static = isset($_POST['_calendar_is_static']) ? 'yes' : 'no';
+		update_post_meta($post_id, '_calendar_is_static', $static);
 
 		// No events message.
-		$message = isset( $_POST['_no_events_message'] ) ? wp_kses_post( $_POST['_no_events_message'] ) : '';
-		update_post_meta( $post_id, '_no_events_message', $message );
+		$message = isset($_POST['_no_events_message']) ? wp_kses_post($_POST['_no_events_message']) : '';
+		update_post_meta($post_id, '_no_events_message', $message);
 
 		// _event_formatting
-		$event_formatting = isset( $_POST['_event_formatting'] ) ? sanitize_key( $_POST['_event_formatting'] ) : 'preserve_linebreaks';
-		update_post_meta( $post_id, '_event_formatting', $event_formatting );
+		$event_formatting = isset($_POST['_event_formatting']) ? sanitize_key($_POST['_event_formatting']) : 'preserve_linebreaks';
+		update_post_meta($post_id, '_event_formatting', $event_formatting);
 
 		// Powered by option
-		$poweredby = isset( $_POST['_poweredby'] ) ? 'yes' : 'no';
-		update_post_meta( $post_id, '_poweredby', $poweredby );
+		$poweredby = isset($_POST['_poweredby']) ? 'yes' : 'no';
+		update_post_meta($post_id, '_poweredby', $poweredby);
 
 		/* ======================= *
 		 * Advanced settings panel *
 		 * ======================= */
 
 		// Timezone.
-		$feed_timezone_setting = isset( $_POST['_feed_timezone_setting'] ) ? sanitize_key( $_POST['_feed_timezone_setting'] ) : 'use_calendar';
-		update_post_meta( $post_id, '_feed_timezone_setting', $feed_timezone_setting );
+		$feed_timezone_setting = isset($_POST['_feed_timezone_setting']) ? sanitize_key($_POST['_feed_timezone_setting']) : 'use_calendar';
+		update_post_meta($post_id, '_feed_timezone_setting', $feed_timezone_setting);
 		$default_timezone = simcal_get_wp_timezone();
 		$feed_timezone = $default_timezone ? $default_timezone : 'UTC';
-		$feed_timezone = isset( $_POST['_feed_timezone'] ) ? sanitize_text_field( $_POST['_feed_timezone'] ) : $feed_timezone;
-		update_post_meta( $post_id, '_feed_timezone', $feed_timezone );
+		$feed_timezone = isset($_POST['_feed_timezone']) ? sanitize_text_field($_POST['_feed_timezone']) : $feed_timezone;
+		update_post_meta($post_id, '_feed_timezone', $feed_timezone);
 
 		// Date format.
-		$date_format_setting = isset( $_POST['_calendar_date_format_setting'] ) ? sanitize_key( $_POST['_calendar_date_format_setting'] ) : 'use_site';
-		update_post_meta( $post_id, '_calendar_date_format_setting', $date_format_setting );
-		$date_format = isset( $_POST['_calendar_date_format'] ) ? sanitize_text_field( trim( $_POST['_calendar_date_format'] ) ) : get_option( 'date_format' );
-		update_post_meta( $post_id, '_calendar_date_format', $date_format );
-		$date_format_php = isset( $_POST['_calendar_date_format_php'] ) ? sanitize_text_field( trim( $_POST['_calendar_date_format_php'] ) ) : get_option( 'date_format' );
-		update_post_meta( $post_id, '_calendar_date_format_php', $date_format_php );
+		$date_format_setting = isset($_POST['_calendar_date_format_setting']) ? sanitize_key($_POST['_calendar_date_format_setting']) : 'use_site';
+		update_post_meta($post_id, '_calendar_date_format_setting', $date_format_setting);
+		$date_format = isset($_POST['_calendar_date_format']) ? sanitize_text_field(trim($_POST['_calendar_date_format'])) : get_option('date_format');
+		update_post_meta($post_id, '_calendar_date_format', $date_format);
+		$date_format_php = isset($_POST['_calendar_date_format_php']) ? sanitize_text_field(trim($_POST['_calendar_date_format_php'])) : get_option('date_format');
+		update_post_meta($post_id, '_calendar_date_format_php', $date_format_php);
 
 		// Time format.
-		$time_format_setting = isset( $_POST['_calendar_time_format_setting'] ) ? sanitize_key( $_POST['_calendar_time_format_setting'] ) : 'use_site';
-		update_post_meta( $post_id, '_calendar_time_format_setting', $time_format_setting );
-		$time_format = isset( $_POST['_calendar_time_format'] ) ? sanitize_text_field( trim( $_POST['_calendar_time_format'] ) ) : get_option( 'time_format' );
-		update_post_meta( $post_id, '_calendar_time_format', $time_format );
-		$time_format_php = isset( $_POST['_calendar_time_format_php'] ) ? sanitize_text_field( trim( $_POST['_calendar_time_format_php'] ) ) : get_option( 'time_format' );
-		update_post_meta( $post_id, '_calendar_time_format_php', $time_format_php );
+		$time_format_setting = isset($_POST['_calendar_time_format_setting']) ? sanitize_key($_POST['_calendar_time_format_setting']) : 'use_site';
+		update_post_meta($post_id, '_calendar_time_format_setting', $time_format_setting);
+		$time_format = isset($_POST['_calendar_time_format']) ? sanitize_text_field(trim($_POST['_calendar_time_format'])) : get_option('time_format');
+		update_post_meta($post_id, '_calendar_time_format', $time_format);
+		$time_format_php = isset($_POST['_calendar_time_format_php']) ? sanitize_text_field(trim($_POST['_calendar_time_format_php'])) : get_option('time_format');
+		update_post_meta($post_id, '_calendar_time_format_php', $time_format_php);
 
 		// Date-time separator.
-		$datetime_separator = isset( $_POST['_calendar_datetime_separator'] ) ? sanitize_text_field( $_POST['_calendar_datetime_separator'] ) : ' ';
-		update_post_meta( $post_id, '_calendar_datetime_separator', $datetime_separator );
+		$datetime_separator = isset($_POST['_calendar_datetime_separator']) ? sanitize_text_field($_POST['_calendar_datetime_separator']) : ' ';
+		update_post_meta($post_id, '_calendar_datetime_separator', $datetime_separator);
 
 		// Week start.
-		$week_start_setting = isset( $_POST['_calendar_week_starts_on_setting'] ) ? sanitize_key( $_POST['_calendar_week_starts_on_setting'] ) : 'use_site';
-		update_post_meta( $post_id, '_calendar_week_starts_on_setting', $week_start_setting );
-		$week_start = isset( $_POST['_calendar_week_starts_on'] ) ? intval( $_POST['_calendar_week_starts_on'] ) : get_option( 'start_of_week' );
-		update_post_meta( $post_id, '_calendar_week_starts_on', $week_start );
+		$week_start_setting = isset($_POST['_calendar_week_starts_on_setting']) ? sanitize_key($_POST['_calendar_week_starts_on_setting']) : 'use_site';
+		update_post_meta($post_id, '_calendar_week_starts_on_setting', $week_start_setting);
+		$week_start = isset($_POST['_calendar_week_starts_on']) ? intval($_POST['_calendar_week_starts_on']) : get_option('start_of_week');
+		update_post_meta($post_id, '_calendar_week_starts_on', $week_start);
 
 		// Cache interval.
 		$cache = 7200;
-		if ( isset( $_POST['_feed_cache_user_amount'] ) && isset( $_POST['_feed_cache_user_unit'] ) ) {
-			$amount = is_numeric( $_POST['_feed_cache_user_amount'] ) || $_POST['_feed_cache_user_amount'] == 0 ? absint( $_POST['_feed_cache_user_amount'] ) : 1;
-			$unit   = is_numeric( $_POST['_feed_cache_user_unit'] ) ? absint( $_POST['_feed_cache_user_unit'] ) : 3600;
-			update_post_meta( $post_id, '_feed_cache_user_amount', $amount );
-			update_post_meta( $post_id, '_feed_cache_user_unit', $unit );
-			$cache  = ( ( $amount * $unit ) > 0 ) ? $amount * $unit : 1;
+		if (isset($_POST['_feed_cache_user_amount']) && isset($_POST['_feed_cache_user_unit'])) {
+			$amount = is_numeric($_POST['_feed_cache_user_amount']) || $_POST['_feed_cache_user_amount'] == 0 ? absint($_POST['_feed_cache_user_amount']) : 1;
+			$unit   = is_numeric($_POST['_feed_cache_user_unit']) ? absint($_POST['_feed_cache_user_unit']) : 3600;
+			update_post_meta($post_id, '_feed_cache_user_amount', $amount);
+			update_post_meta($post_id, '_feed_cache_user_unit', $unit);
+			$cache  = (($amount * $unit) > 0) ? $amount * $unit : 1;
 		}
-		update_post_meta( $post_id, '_feed_cache', $cache );
+		update_post_meta($post_id, '_feed_cache', $cache);
 
 		/* ============= *
 		 * Miscellaneous *
 		 * ============= */
 
 		// Update version.
-		update_post_meta( $post_id, '_calendar_version', SIMPLE_CALENDAR_VERSION );
+		update_post_meta($post_id, '_calendar_version', SIMPLE_CALENDAR_VERSION);
 
 		// Action hook.
-		do_action( 'simcal_process_settings_meta', $post_id );
+		do_action('simcal_process_settings_meta', $post_id);
 
 		// Clear cache.
-		simcal_delete_feed_transients( $post_id );
+		simcal_delete_feed_transients($post_id);
 	}
 
 }

includes/admin/meta-boxes.php

Spacing +28 added lines, -28 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Admin\Metaboxes as Metabox;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -44,8 +44,8 @@ 
 	 */
 	public function __construct() {
 
-		$settings = get_option( 'simple-calendar_settings_calendars' );
-		if ( isset( $settings['general']['attach_calendars_posts'] ) ) {
+		$settings = get_option('simple-calendar_settings_calendars');
+		if (isset($settings['general']['attach_calendars_posts'])) {
 			$this->post_types = $settings['general']['attach_calendars_posts'];
 		}
 
@@ -55,17 +55,17 @@ 
 		new Metabox\Upgrade_To_Premium();
 		//new Metabox\Newsletter();
 
-		do_action( 'simcal_load_meta_boxes' );
+		do_action('simcal_load_meta_boxes');
 
 		// Add meta boxes.
-		add_action( 'add_meta_boxes', array( $this, 'add_meta_boxes' ), 30 );
+		add_action('add_meta_boxes', array($this, 'add_meta_boxes'), 30);
 
 		// Process meta boxes.
-		add_action( 'simcal_save_settings_meta','\SimpleCalendar\Admin\Metaboxes\Settings::save', 10, 2 );
-		add_action( 'simcal_save_attach_calendar_meta','\SimpleCalendar\Admin\Metaboxes\Attach_Calendar::save', 10, 2 );
+		add_action('simcal_save_settings_meta', '\SimpleCalendar\Admin\Metaboxes\Settings::save', 10, 2);
+		add_action('simcal_save_attach_calendar_meta', '\SimpleCalendar\Admin\Metaboxes\Attach_Calendar::save', 10, 2);
 
 		// Save meta boxes data.
-		add_action( 'save_post', array( $this, 'save_meta_boxes' ), 1, 2 );
+		add_action('save_post', array($this, 'save_meta_boxes'), 1, 2);
 
 		// Uncomment this for debugging $_POST while saving a meta box.
 		// add_action( 'save_post', function() { echo '<pre>'; print_r( $_POST ); echo '</pre>'; die(); } );
@@ -80,20 +80,20 @@ 
 
 		add_meta_box(
 			'simcal-calendar-settings',
-			__( 'Calendar Settings', 'google-calendar-events' ),
+			__('Calendar Settings', 'google-calendar-events'),
 			'\SimpleCalendar\Admin\Metaboxes\Settings::html',
 			'calendar',
 			'normal',
 			'core'
 		);
 
-		$addons = apply_filters( 'simcal_installed_addons', array() );
-		if ( empty( $addons ) ) {
+		$addons = apply_filters('simcal_installed_addons', array());
+		if (empty($addons)) {
 
 			// Premium add-on feature list and upsell.
 			add_meta_box(
 				'simcal-upgrade',
-				__( 'Looking for more?', 'google-calendar-events' ),
+				__('Looking for more?', 'google-calendar-events'),
 				'\SimpleCalendar\Admin\Metaboxes\Upgrade_To_Premium::html',
 				'calendar',
 				'side',
@@ -115,7 +115,7 @@ 
 
 		add_meta_box(
 			'simcal-get-shortcode',
-			__( 'Calendar Shortcode', 'google-calendar-events' ),
+			__('Calendar Shortcode', 'google-calendar-events'),
 			'\SimpleCalendar\Admin\Metaboxes\Get_Shortcode::html',
 			'calendar',
 			'side',
@@ -123,11 +123,11 @@ 
 		);
 
 		// Add meta box if there are calendars.
-		if ( ( true == simcal_get_calendars() ) && ! empty( $this->post_types ) ) {
-			foreach ( $this->post_types as $post_type ) {
+		if ((true == simcal_get_calendars()) && ! empty($this->post_types)) {
+			foreach ($this->post_types as $post_type) {
 				add_meta_box(
 					'simcal-attach-calendar',
-					__( 'Attach Calendar', 'google-calendar-events' ),
+					__('Attach Calendar', 'google-calendar-events'),
 					'\SimpleCalendar\Admin\Metaboxes\Attach_Calendar::html',
 					$post_type,
 					'side',
@@ -136,7 +136,7 @@ 
 			}
 		}
 
-		do_action( 'simcal_add_meta_boxes' );
+		do_action('simcal_add_meta_boxes');
 	}
 
 	/**
@@ -149,30 +149,30 @@ 
 	 *
 	 * @return void
 	 */
-	public function save_meta_boxes( $post_id, $post ) {
+	public function save_meta_boxes($post_id, $post) {
 
 		// $post_id and $post are required.
-		if ( empty( $post_id ) || empty( $post ) || self::$saved_meta_boxes ) {
+		if (empty($post_id) || empty($post) || self::$saved_meta_boxes) {
 			return;
 		}
 
 		// Don't save meta boxes for revisions or autosaves.
-		if ( defined( 'DOING_AUTOSAVE' ) || is_int( wp_is_post_revision( $post ) ) || is_int( wp_is_post_autosave( $post ) ) ) {
+		if (defined('DOING_AUTOSAVE') || is_int(wp_is_post_revision($post)) || is_int(wp_is_post_autosave($post))) {
 			return;
 		}
 
 		// Check the nonce.
-		if ( empty( $_POST['simcal_meta_nonce'] ) || ! wp_verify_nonce( $_POST['simcal_meta_nonce'], 'simcal_save_data' ) ) {
+		if (empty($_POST['simcal_meta_nonce']) || ! wp_verify_nonce($_POST['simcal_meta_nonce'], 'simcal_save_data')) {
 			return;
 		}
 
 		// Check the post being saved == the $post_id to prevent triggering this call for other save_post events.
-		if ( empty( $_POST['post_ID'] ) || $_POST['post_ID'] != $post_id ) {
+		if (empty($_POST['post_ID']) || $_POST['post_ID'] != $post_id) {
 			return;
 		}
 
 		// Check user has permission to edit
-		if ( ! current_user_can( 'edit_post', $post_id ) ) {
+		if ( ! current_user_can('edit_post', $post_id)) {
 			return;
 		}
 
@@ -185,13 +185,13 @@ 
 		self::$saved_meta_boxes = true;
 
 		// Check the post type.
-		if ( 'calendar' == $post->post_type ) {
-			do_action( 'simcal_save_settings_meta', $post_id, $post );
-		} elseif ( in_array( $post->post_type, $this->post_types ) ) {
-			do_action( 'simcal_save_attach_calendar_meta', $post_id, $post );
+		if ('calendar' == $post->post_type) {
+			do_action('simcal_save_settings_meta', $post_id, $post);
+		} elseif (in_array($post->post_type, $this->post_types)) {
+			do_action('simcal_save_attach_calendar_meta', $post_id, $post);
 		}
 
-		do_action( 'simcal_save_meta_boxes', $post_id, $post );
+		do_action('simcal_save_meta_boxes', $post_id, $post);
 	}
 
 }

includes/admin/metaboxes/upgrade-to-premium.php

Spacing +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Abstracts\Meta_Box;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -26,7 +26,7 @@ 
 	 *
 	 * @param \WP_Post $post
 	 */
-	public static function html( $post ) {
+	public static function html($post) {
 		simcal_newsletter_signup();
 	}
 
@@ -38,7 +38,7 @@ 
 	 * @param int      $post_id
 	 * @param \WP_Post $post
 	 */
-	public static function save( $post_id, $post ) {
+	public static function save($post_id, $post) {
 		// This meta box has no persistent settings.
 	}
 

includes/functions/admin.php

Spacing +68 added lines, -68 removed lines

@@ -7,7 +7,7 @@ 
  * @package SimpleCalendar/Admin/Functions
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -32,9 +32,9 @@ 
  *
  * @return null|\SimpleCalendar\Abstracts\Admin_Page
  */
-function simcal_get_admin_page( $page ) {
+function simcal_get_admin_page($page) {
 	$objects = \SimpleCalendar\plugin()->objects;
-	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_admin_page( $page ) : null;
+	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_admin_page($page) : null;
 }
 
 /**
@@ -47,9 +47,9 @@ 
  *
  * @return null|\SimpleCalendar\Abstracts\Field
  */
-function simcal_get_field( $args, $name = '' ) {
+function simcal_get_field($args, $name = '') {
 	$objects = \SimpleCalendar\plugin()->objects;
-	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_field( $args, $name ) : null;
+	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_field($args, $name) : null;
 }
 
 /**
@@ -62,11 +62,11 @@ 
  *
  * @return void
  */
-function simcal_print_field( $args, $name = '' ) {
+function simcal_print_field($args, $name = '') {
 
-	$field = simcal_get_field( $args, $name );
+	$field = simcal_get_field($args, $name);
 
-	if ( $field instanceof \SimpleCalendar\Abstracts\Field ) {
+	if ($field instanceof \SimpleCalendar\Abstracts\Field) {
 		$field->html();
 	}
 }
@@ -84,33 +84,33 @@ 
  *
  * @return array|string Sanitized variable
  */
-function simcal_sanitize_input( $var, $func = 'sanitize_text_field'  ) {
+function simcal_sanitize_input($var, $func = 'sanitize_text_field') {
 
-	if ( is_null( $var ) ) {
+	if (is_null($var)) {
 		return '';
 	}
 
-	if ( is_bool( $var ) ) {
-		if ( $var === true ) {
+	if (is_bool($var)) {
+		if ($var === true) {
 			return 'yes';
 		} else {
 			return 'no';
 		}
 	}
 
-	if ( is_string( $var ) || is_numeric( $var ) ) {
-		$func = is_string( $func ) && function_exists( $func ) ? $func : 'sanitize_text_field';
-		return call_user_func( $func, trim( strval( $var ) ) );
+	if (is_string($var) || is_numeric($var)) {
+		$func = is_string($func) && function_exists($func) ? $func : 'sanitize_text_field';
+		return call_user_func($func, trim(strval($var)));
 	}
 
-	if ( is_object( $var ) ) {
+	if (is_object($var)) {
 		$var = (array) $var;
 	}
 
-	if ( is_array( $var ) ) {
+	if (is_array($var)) {
 		$array = array();
-		foreach ( $var as $k => $v ) {
-			$array[ $k ] = simcal_sanitize_input( $v );
+		foreach ($var as $k => $v) {
+			$array[$k] = simcal_sanitize_input($v);
 		}
 		return $array;
 	}
@@ -128,9 +128,9 @@ 
  */
 function simcal_is_admin_screen() {
 
-	$view = function_exists( 'get_current_screen' ) ? get_current_screen() : false;
+	$view = function_exists('get_current_screen') ? get_current_screen() : false;
 
-	if ( $view instanceof WP_Screen ) {
+	if ($view instanceof WP_Screen) {
 
 		// Screens used by this plugin.
 		$screens = array(
@@ -145,7 +145,7 @@ 
 			'dashboard_page_simple-calendar_credits',
 			'dashboard_page_simple-calendar_translators',
 		);
-		if ( in_array( $view->id, $screens ) ) {
+		if (in_array($view->id, $screens)) {
 			return $view->id;
 		}
 	}
@@ -164,8 +164,8 @@ 
  *
  * @return \SimpleCalendar\Admin\Updater
  */
-function simcal_addon_updater( $_api_url, $_plugin_file, $_api_data = null ) {
-	return new \SimpleCalendar\Admin\Updater( $_api_url, $_plugin_file, $_api_data );
+function simcal_addon_updater($_api_url, $_plugin_file, $_api_data = null) {
+	return new \SimpleCalendar\Admin\Updater($_api_url, $_plugin_file, $_api_data);
 }
 
 /**
@@ -177,10 +177,10 @@ 
  *
  * @return null|string
  */
-function simcal_get_license_key( $addon ) {
-	$licenses = get_option( 'simple-calendar_settings_licenses', array() );
-	if ( isset( $licenses['keys'][ $addon ] ) ) {
-		return empty( $licenses['keys'][ $addon ] ) ? null : $licenses['keys'][ $addon ];
+function simcal_get_license_key($addon) {
+	$licenses = get_option('simple-calendar_settings_licenses', array());
+	if (isset($licenses['keys'][$addon])) {
+		return empty($licenses['keys'][$addon]) ? null : $licenses['keys'][$addon];
 	}
 	return null;
 }
@@ -196,9 +196,9 @@ 
  *
  * @return array|string
  */
-function simcal_get_license_status( $addon = null ) {
-	$licenses = get_option( 'simple-calendar_licenses_status', array() );
-	return isset( $licenses[ $addon ] ) ? $licenses[ $addon ] : $licenses;
+function simcal_get_license_status($addon = null) {
+	$licenses = get_option('simple-calendar_licenses_status', array());
+	return isset($licenses[$addon]) ? $licenses[$addon] : $licenses;
 }
 
 /**
@@ -219,7 +219,7 @@ 
  * @since 3.0.0
  */
 function simcal_delete_admin_notices() {
-	delete_option( 'simple-calendar_admin_notices' );
+	delete_option('simple-calendar_admin_notices');
 }
 
 /**
@@ -231,22 +231,22 @@ 
  *
  * @return void
  */
-function simcal_print_shortcode_tip( $post_id ) {
+function simcal_print_shortcode_tip($post_id) {
 
 	$browser = new \SimpleCalendar\Browser();
-	if ( $browser::PLATFORM_APPLE == $browser->getPlatform() ) {
+	if ($browser::PLATFORM_APPLE == $browser->getPlatform()) {
 		$cmd = '⌘+C';
 	} else {
 		$cmd = 'Ctrl+C';
 	}
 
-	$shortcut  = sprintf( __( 'Press %s to copy.', 'google-calendar-events' ), $cmd );
-	$shortcode = sprintf( '[calendar id="%s"]', $post_id );
+	$shortcut  = sprintf(__('Press %s to copy.', 'google-calendar-events'), $cmd);
+	$shortcode = sprintf('[calendar id="%s"]', $post_id);
 
-	echo "<input readonly='readonly' " .
-				"class='simcal-shortcode simcal-calendar-shortcode simcal-shortcode-tip' " .
-				"title='" . $shortcut . "' " .
-				"onclick='this.select();' value='" . $shortcode . "' />";
+	echo "<input readonly='readonly' ".
+				"class='simcal-shortcode simcal-calendar-shortcode simcal-shortcode-tip' ".
+				"title='".$shortcut."' ".
+				"onclick='this.select();' value='".$shortcode."' />";
 }
 
 /**
@@ -261,20 +261,20 @@ 
  *
  * @return  string  $url        Full Google Analytics campaign URL
  */
-function simcal_ga_campaign_url( $base_url, $campaign, $content, $raw = false ) {
+function simcal_ga_campaign_url($base_url, $campaign, $content, $raw = false) {
 
-	$url = add_query_arg( array(
+	$url = add_query_arg(array(
 		'utm_source'   => 'inside-plugin',
 		'utm_medium'   => 'link',
 		'utm_campaign' => $campaign, // i.e. 'core-plugin', 'gcal-pro'
 		'utm_content'  => $content // i.e. 'sidebar-link', 'settings-link'
-	), $base_url );
+	), $base_url);
 
-	if ( $raw ) {
-		return esc_url_raw( $url );
+	if ($raw) {
+		return esc_url_raw($url);
 	}
 
-	return esc_url( $url );
+	return esc_url($url);
 }
 
 /**
@@ -286,7 +286,7 @@ 
  */
 function simcal_newsletter_signup() {
 
-	if ( $screen = simcal_is_admin_screen() ) {
+	if ($screen = simcal_is_admin_screen()) {
 
 		global $current_user;
 		wp_get_current_user();
@@ -297,11 +297,11 @@ 
 		<div id="simcal-drip" class="<?php echo $screen; ?>">
 			<div class="signup">
 				<p>
-					<?php _e( "Enter your name and email and we'll send you a coupon code for <strong>20% off</strong> all Pro Add-on purchases.", 'google-calendar-events' ); ?>
+					<?php _e("Enter your name and email and we'll send you a coupon code for <strong>20% off</strong> all Pro Add-on purchases.", 'google-calendar-events'); ?>
 				</p>
 
 				<p>
-					<label for="simcal-drip-field-email"><?php _e( 'Your Email', 'google-calendar-events' ); ?></label><br />
+					<label for="simcal-drip-field-email"><?php _e('Your Email', 'google-calendar-events'); ?></label><br />
 					<input type="email"
 					       id="simcal-drip-field-email"
 					       name="fields[email]"
@@ -309,7 +309,7 @@ 
 				</p>
 
 				<p>
-					<label for="simcal-drip-field-first_name"><?php _e( 'First Name', 'google-calendar-events' ); ?></label><br />
+					<label for="simcal-drip-field-first_name"><?php _e('First Name', 'google-calendar-events'); ?></label><br />
 					<input type="text"
 					       id="simcal-drip-field-first_name"
 					       name="fields[first_name]"
@@ -318,17 +318,17 @@ 
 				<p class="textright">
 					<a href="#"
 					   id="simcal-drip-signup"
-					   class="button button-primary"><?php _e( 'Send me the coupon', 'google-calendar-events' ); ?></a>
+					   class="button button-primary"><?php _e('Send me the coupon', 'google-calendar-events'); ?></a>
 				</p>
 				<div class="textright">
-					<em><?php _e( 'No spam. Unsubscribe anytime.', 'google-calendar-events' ); ?></em>
+					<em><?php _e('No spam. Unsubscribe anytime.', 'google-calendar-events'); ?></em>
 					<br/>
-					<a href="<?php echo simcal_ga_campaign_url( simcal_get_url( 'addons' ), 'core-plugin', 'sidebar-link' ); ?>"
-					   target="_blank"><?php _e( 'Just take me the add-ons', 'google-calendar-events' ); ?></a>
+					<a href="<?php echo simcal_ga_campaign_url(simcal_get_url('addons'), 'core-plugin', 'sidebar-link'); ?>"
+					   target="_blank"><?php _e('Just take me the add-ons', 'google-calendar-events'); ?></a>
 				</div>
 			</div>
 			<div class="thank-you" style="display: none;">
-				<?php _e( 'Thank you!', 'google-calendar-events' ); ?>
+				<?php _e('Thank you!', 'google-calendar-events'); ?>
 			</div>
 			<div class="clear">
 			</div>
@@ -347,29 +347,29 @@ 
  */
 function simcal_upgrade_to_premium() {
 
-	if ( $screen = simcal_is_admin_screen() ) {
+	if ($screen = simcal_is_admin_screen()) {
 		?>
 		<div class="main">
 			<p class="heading centered">
-				<?php _e( 'Some of the features included with our premium add-ons', 'google-calendar-events' ); ?>
+				<?php _e('Some of the features included with our premium add-ons', 'google-calendar-events'); ?>
 			</p>
 
 			<ul>
-				<li><div class="dashicons dashicons-yes"></div> <?php _e( 'Display color coded events', 'google-calendar-events' ); ?></li>
-				<li><div class="dashicons dashicons-yes"></div> <?php _e( 'Show week & day views', 'google-calendar-events' ); ?></li>
-				<li><div class="dashicons dashicons-yes"></div> <?php _e( 'Fast view switching', 'google-calendar-events' ); ?></li>
-				<li><div class="dashicons dashicons-yes"></div> <?php _e( 'Event titles & start times in grid', 'google-calendar-events' ); ?></li>
-				<li><div class="dashicons dashicons-yes"></div> <?php _e( 'Limit event display times', 'google-calendar-events' ); ?></li>
-				<li><div class="dashicons dashicons-yes"></div> <?php _e( 'Display private calendar events', 'google-calendar-events' ); ?></li>
-				<li><div class="dashicons dashicons-yes"></div> <?php _e( 'Show attendees & RSVP status', 'google-calendar-events' ); ?></li>
-				<li><div class="dashicons dashicons-yes"></div> <?php _e( 'Display attachments', 'google-calendar-events' ); ?></li>
-				<li><div class="dashicons dashicons-yes"></div> <?php _e( 'Priority email support', 'google-calendar-events' ); ?></li>
+				<li><div class="dashicons dashicons-yes"></div> <?php _e('Display color coded events', 'google-calendar-events'); ?></li>
+				<li><div class="dashicons dashicons-yes"></div> <?php _e('Show week & day views', 'google-calendar-events'); ?></li>
+				<li><div class="dashicons dashicons-yes"></div> <?php _e('Fast view switching', 'google-calendar-events'); ?></li>
+				<li><div class="dashicons dashicons-yes"></div> <?php _e('Event titles & start times in grid', 'google-calendar-events'); ?></li>
+				<li><div class="dashicons dashicons-yes"></div> <?php _e('Limit event display times', 'google-calendar-events'); ?></li>
+				<li><div class="dashicons dashicons-yes"></div> <?php _e('Display private calendar events', 'google-calendar-events'); ?></li>
+				<li><div class="dashicons dashicons-yes"></div> <?php _e('Show attendees & RSVP status', 'google-calendar-events'); ?></li>
+				<li><div class="dashicons dashicons-yes"></div> <?php _e('Display attachments', 'google-calendar-events'); ?></li>
+				<li><div class="dashicons dashicons-yes"></div> <?php _e('Priority email support', 'google-calendar-events'); ?></li>
 			</ul>
 
 			<div class="centered">
-				<a href="<?php echo simcal_ga_campaign_url( simcal_get_url( 'addons' ), 'core-plugin', 'sidebar-link' ); ?>"
+				<a href="<?php echo simcal_ga_campaign_url(simcal_get_url('addons'), 'core-plugin', 'sidebar-link'); ?>"
 				   class="button-primary button-large" target="_blank">
-					<?php _e( 'Upgrade to Premium Now', 'google-calendar-events' ); ?></a>
+					<?php _e('Upgrade to Premium Now', 'google-calendar-events'); ?></a>
 			</div>
 		</div>
 		<?php