moonstonemedia / Simple-Calendar

includes/admin/metaboxes/settings.php

Spacing +287 added lines, -287 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,69 +439,69 @@ 
 	 *
 	 * @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 ),
-					) );
+						'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),
+					));
 
 					?>
 				</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>
@@ -520,28 +520,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;
 					}
@@ -551,56 +551,56 @@ 
 							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( 'Events 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('Events 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. It is recommended to keep the calendar 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. It is recommended to keep the calendar default timezone.', 'google-calendar-events'); ?>"></i>
 					<p id="_use_calendar_warning" style="display: none;" class="simcal-field">
-						<?php printf( __( '<strong>Warning:</strong> Using this option can return unexpected results if you have specified <a href="%s" target="_blank">event level</a> timezones.', 'google-calendar-events' ), 'http://docs.simplecalendar.io/timezone-settings/' ); ?>
+						<?php printf(__('<strong>Warning:</strong> Using this option can return unexpected results if you have specified <a href="%s" target="_blank">event level</a> timezones.', 'google-calendar-events'), 'http://docs.simplecalendar.io/timezone-settings/'); ?>
 					</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">
@@ -609,70 +609,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">
@@ -681,24 +681,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
@@ -706,40 +706,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"
@@ -750,12 +750,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>
@@ -774,21 +774,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>
@@ -815,30 +815,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);
 		}
 
 		/* ===================== *
@@ -846,102 +846,102 @@ 
 		 * ===================== */
 
 		// 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);
 
 		/* ======================= *
 		 * 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/metaboxes/attach-calendar.php

Spacing +17 added lines, -17 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Abstracts\Meta_Box;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -28,38 +28,38 @@ 
 	 *
 	 * @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');
 
 		$calendars = simcal_get_calendars();
 
-		simcal_print_field( array(
+		simcal_print_field(array(
 			'type'       => 'select',
 			'id'         => '_simcal_attach_calendar_id',
 			'name'       => '_simcal_attach_calendar_id',
-			'enhanced'   => count( $calendars ) > 15 ? 'enhanced' : '',
+			'enhanced'   => count($calendars) > 15 ? 'enhanced' : '',
 			'allow_void' => 'allow_void',
-			'value'      => absint( get_post_meta( $post->ID, '_simcal_attach_calendar_id', true ) ),
+			'value'      => absint(get_post_meta($post->ID, '_simcal_attach_calendar_id', true)),
 			'options'    => $calendars,
 			'attributes' => array(
 				'data-allowclear' => 'true',
 			)
-		) );
+		));
 
-		$position = get_post_meta( $post->ID, '_simcal_attach_calendar_position', true );
+		$position = get_post_meta($post->ID, '_simcal_attach_calendar_position', true);
 
-		simcal_print_field( array(
+		simcal_print_field(array(
 			'type'      => 'radio',
 			'id'        => '_simcal_attach_calendar_position',
 			'name'      => '_simcal_attach_calendar_position',
 			'value'     => $position ? $position : 'after',
 			'options'   => array(
-				'after'  => __( 'After Content', 'google-calendar-events' ),
-				'before' => __( 'Before Content', 'google-calendar-events' ),
+				'after'  => __('After Content', 'google-calendar-events'),
+				'before' => __('Before Content', 'google-calendar-events'),
 			),
-		) );
+		));
 
 	}
 
@@ -71,13 +71,13 @@ 
 	 * @param int      $post_id
 	 * @param \WP_Post $post
 	 */
-	public static function save( $post_id, $post ) {
+	public static function save($post_id, $post) {
 
-		$id = isset( $_POST['_simcal_attach_calendar_id'] ) ? absint( $_POST['_simcal_attach_calendar_id'] ) : '';
-		update_post_meta( $post_id, '_simcal_attach_calendar_id', $id );
+		$id = isset($_POST['_simcal_attach_calendar_id']) ? absint($_POST['_simcal_attach_calendar_id']) : '';
+		update_post_meta($post_id, '_simcal_attach_calendar_id', $id);
 
-		$position = isset( $_POST['_simcal_attach_calendar_position'] ) ? sanitize_title( $_POST['_simcal_attach_calendar_position'] ) : 'after';
-		update_post_meta( $post_id, '_simcal_attach_calendar_position', $position );
+		$position = isset($_POST['_simcal_attach_calendar_position']) ? sanitize_title($_POST['_simcal_attach_calendar_position']) : 'after';
+		update_post_meta($post_id, '_simcal_attach_calendar_position', $position);
 
 	}
 

includes/assets.php

Spacing +68 added lines, -68 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'),
 						'3.1.8',
 						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,31 +192,31 @@ 
 	 *
 	 * @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) {
 
-				if ( ! empty( $v['src'] ) ) {
+				if ( ! empty($v['src'])) {
 
-					$src        = esc_url( $v['src'] );
-					$deps       = isset( $v['deps'] )        ? $v['deps']       : array();
-					$ver        = isset( $v['ver'] )         ? $v['ver']        : SIMPLE_CALENDAR_VERSION;
-					$in_footer  = isset( $v['in_footer'] )   ? $v['in_footer']  : false;
+					$src        = esc_url($v['src']);
+					$deps       = isset($v['deps']) ? $v['deps'] : array();
+					$ver        = isset($v['ver']) ? $v['ver'] : SIMPLE_CALENDAR_VERSION;
+					$in_footer  = isset($v['in_footer']) ? $v['in_footer'] : false;
 
-					wp_enqueue_script( $script, $src, $deps, $ver, $in_footer );
+					wp_enqueue_script($script, $src, $deps, $ver, $in_footer);
 
-					if ( ! empty( $v['localize'] ) && is_array( $v['localize'] ) ) {
-						foreach ( $v['localize'] as $object => $l10n ) {
-							wp_localize_script( $script, $object, $l10n );
+					if ( ! empty($v['localize']) && is_array($v['localize'])) {
+						foreach ($v['localize'] as $object => $l10n) {
+							wp_localize_script($script, $object, $l10n);
 						}
 					}
 
-				} elseif ( is_string( $v ) && ! empty( $v ) ) {
+				} elseif (is_string($v) && ! empty($v)) {
 
-					wp_enqueue_script( $v );
+					wp_enqueue_script($v);
 				}
 			}
 
@@ -230,25 +230,25 @@ 
 	 *
 	 * @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'])) {
 
-					$src    = esc_url( $v['src'] );
-					$deps   = isset( $v['deps'] )   ? $v['deps']    : array();
-					$ver    = isset( $v['ver'] )    ? $v['ver']     : SIMPLE_CALENDAR_VERSION;
-					$media  = isset( $v['media'] )  ? $v['media']   : 'all';
+					$src    = esc_url($v['src']);
+					$deps   = isset($v['deps']) ? $v['deps'] : array();
+					$ver    = isset($v['ver']) ? $v['ver'] : SIMPLE_CALENDAR_VERSION;
+					$media  = isset($v['media']) ? $v['media'] : 'all';
 
-					wp_enqueue_style( $style, $src, $deps, $ver, $media );
+					wp_enqueue_style($style, $src, $deps, $ver, $media);
 
-				} elseif ( is_string( $v ) && ! empty( $v ) ) {
+				} elseif (is_string($v) && ! empty($v)) {
 
-					wp_enqueue_style( $v );
+					wp_enqueue_style($v);
 				}
 
 			}

includes/events/event-builder.php

Spacing +311 added lines, -311 removed lines

@@ -9,7 +9,7 @@ 
 use Carbon\Carbon;
 use SimpleCalendar\Abstracts\Calendar;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -54,7 +54,7 @@ 
 	 * @param Event    $event
 	 * @param Calendar $calendar
 	 */
-	public function __construct( Event $event, Calendar $calendar ) {
+	public function __construct(Event $event, Calendar $calendar) {
 		$this->event    = $event;
 		$this->calendar = $calendar;
 		$this->tags     = $this->get_content_tags();
@@ -74,85 +74,85 @@ 
 			 * Content Tags *
 			 * ============ */
 
-			'title',                 // The event title.
-			'event-title',           // @deprecated An alias for 'title' tag.
-			'description',           // The event description.
-
-			'when',                  // Date and time of the event.
-			'start-time',            // Start time of the event.
-			'start-date',            // Start date of the event.
-			'start-custom',          // @deprecated Start time in a user defined format (set by tag 'format' attribute).
-			'start-human',           // Start time in a human friendly format.
-			'end-time',              // End time of the event.
-			'end-date',              // End date of the event.
-			'end-custom',            // @deprecated End date-time in a user defined format (set by tag 'format' attribute).
-			'end-human',             // End date-time in a human friendly format.
-
-			'duration',              // How long the events lasts, in a human-readable format.
-			'length',                // @deprecated An alias of 'duration' tag.
-
-			'location',              // Alias of start-location.
-			'start-location',        // Location name where the event starts.
-			'maps-link',             // @deprecated An alias for 'start-location-link' tag.
-			'start-location-link',   // Link to Google Maps querying the event start location address.
-			'end-location',          // Location name where the event ends.
-			'end-location-link',     // Link to Google Maps querying the event end location address.
-
-			'link',                  // An HTML link to the event URL.
-			'url',                   // A string with the raw event link URL.
-
-			'calendar',              // The title of the source calendar.
-			'feed-title',            // @deprecated An alias of 'calendar'.
-
-			'id',                    // The event unique ID.
-			'uid',                   // An alias of ID.
-			'ical-id',               // iCal ID.
-			'event-id',              // @deprecated An alias for 'id' tag.
-			'calendar-id',           // The calendar ID.
-			'feed-id',               // @deprecated An alias for 'calendar-id' tag.
-			'cal-id',                // @deprecated An alias for 'calendar-id' tag.
+			'title', // The event title.
+			'event-title', // @deprecated An alias for 'title' tag.
+			'description', // The event description.
+
+			'when', // Date and time of the event.
+			'start-time', // Start time of the event.
+			'start-date', // Start date of the event.
+			'start-custom', // @deprecated Start time in a user defined format (set by tag 'format' attribute).
+			'start-human', // Start time in a human friendly format.
+			'end-time', // End time of the event.
+			'end-date', // End date of the event.
+			'end-custom', // @deprecated End date-time in a user defined format (set by tag 'format' attribute).
+			'end-human', // End date-time in a human friendly format.
+
+			'duration', // How long the events lasts, in a human-readable format.
+			'length', // @deprecated An alias of 'duration' tag.
+
+			'location', // Alias of start-location.
+			'start-location', // Location name where the event starts.
+			'maps-link', // @deprecated An alias for 'start-location-link' tag.
+			'start-location-link', // Link to Google Maps querying the event start location address.
+			'end-location', // Location name where the event ends.
+			'end-location-link', // Link to Google Maps querying the event end location address.
+
+			'link', // An HTML link to the event URL.
+			'url', // A string with the raw event link URL.
+
+			'calendar', // The title of the source calendar.
+			'feed-title', // @deprecated An alias of 'calendar'.
+
+			'id', // The event unique ID.
+			'uid', // An alias of ID.
+			'ical-id', // iCal ID.
+			'event-id', // @deprecated An alias for 'id' tag.
+			'calendar-id', // The calendar ID.
+			'feed-id', // @deprecated An alias for 'calendar-id' tag.
+			'cal-id', // @deprecated An alias for 'calendar-id' tag.
 
 			/* ========= *
 			 * Meta Tags *
 			 * ========= */
 
-			'attachments',          // List of attachments.
-			'attendees',            // List of attendees.
-			'organizer',            // Creator info.
+			'attachments', // List of attachments.
+			'attendees', // List of attendees.
+			'organizer', // Creator info.
 
 			/* ================ *
 			 * Conditional Tags *
 			 * ================ */
 
-			'if-title',              // If the event has a title.
-			'if-description',        // If the event has a description.
-
-			'if-now',                // If the event is taking place now.
-			'if-not-now',            // If the event is not taking place now (may have ended or just not started yet).
-			'if-started',            // If the event has started (and may as well as ended).
-			'if-not-started',        // If the event has NOT started yet (event could be any time in the future).
-			'if-ended',              // If the event has ended (event could be any time in the past).
-			'if-not-ended',          // If the event has NOT ended (may as well as not started yet).
-
-			'if-whole-day',          // If the event lasts the whole day.
-			'if-all-day',            // @deprecated Alias for 'if-whole-day'.
-			'if-not-whole-day',      // If the event does NOT last the whole day.
-			'if-not-all-day',        // @deprecated Alias for 'if-not-whole-day'.
-			'if-end-time',           // If the event has a set end time.
-			'if-no-end-time',        // If the event has NOT a set end time.
-
-			'if-multi-day',          // If the event spans multiple days.
-			'if-single-day',         // If the event does not span multiple days.
-
-			'if-recurring',          // If the event is a recurring event.
-			'if-not-recurring',      // If the event is NOT a recurring event.
-
-			'if-location',           // @deprecated Alias for 'if-start-location'.
-			'if-start-location',     // Does the event has a start location?
-			'if-end-location',       // Does the event has an end location?
-			'if-not-location',       // @deprecated Alias for 'if-not-start-location'.
+			'if-title', // If the event has a title.
+			'if-description', // If the event has a description.
+
+			'if-now', // If the event is taking place now.
+			'if-not-now', // If the event is not taking place now (may have ended or just not started yet).
+			'if-started', // If the event has started (and may as well as ended).
+			'if-not-started', // If the event has NOT started yet (event could be any time in the future).
+			'if-ended', // If the event has ended (event could be any time in the past).
+			'if-not-ended', // If the event has NOT ended (may as well as not started yet).
+
+			'if-whole-day', // If the event lasts the whole day.
+			'if-all-day', // @deprecated Alias for 'if-whole-day'.
+			'if-not-whole-day', // If the event does NOT last the whole day.
+			'if-not-all-day', // @deprecated Alias for 'if-not-whole-day'.
+			'if-end-time', // If the event has a set end time.
+			'if-no-end-time', // If the event has NOT a set end time.
+
+			'if-multi-day', // If the event spans multiple days.
+			'if-single-day', // If the event does not span multiple days.
+
+			'if-recurring', // If the event is a recurring event.
+			'if-not-recurring', // If the event is NOT a recurring event.
+
+			'if-location', // @deprecated Alias for 'if-start-location'.
+			'if-start-location', // Does the event has a start location?
+			'if-end-location', // Does the event has an end location?
+			'if-not-location', // @deprecated Alias for 'if-not-start-location'.
 			'if-not-start-location', // Does the event has NOT a start location?
-			'if-not-end-location',   // Does the event has NOT an end location?
+			'if-not-end-location', // Does the event has NOT an end location?
 
 		);
 	}
@@ -166,19 +166,19 @@ 
 	 *
 	 * @return string
 	 */
-	public function parse_event_template_tags( $template_tags = '' ) {
+	public function parse_event_template_tags($template_tags = '') {
 
 		// Process tags.
 		$result = preg_replace_callback(
 			$this->get_regex(),
-			array( $this, 'process_event_content' ),
+			array($this, 'process_event_content'),
 			$template_tags
 		);
 
 		// Removes extra consecutive <br> tags.
 		// 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));
 	}
 
 	/**
@@ -190,10 +190,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.
@@ -205,9 +205,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 *
@@ -215,13 +215,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' :
@@ -231,40 +231,40 @@ 
 				case 'start-date' :
 				case 'start-human' :
 				case 'start-time' :
-					return $this->get_dt( $tag, $event, $attr );
+					return $this->get_dt($tag, $event, $attr);
 
 				case 'length' :
 				case 'duration' :
-					if ( false !== $event->end ) {
+					if (false !== $event->end) {
 						$duration = $event->start - $event->end;
-						$value    = human_time_diff( $event->start, $event->end );
+						$value    = human_time_diff($event->start, $event->end);
 					} else {
 						$duration = '-1';
-						$value    = __( 'No end time', 'google-calendar-events' );
+						$value    = __('No end time', 'google-calendar-events');
 					}
-					return ' <span class="simcal-event-duration" data-event-duration="' . $duration . '">' . $value . '</span>';
+					return ' <span class="simcal-event-duration" data-event-duration="'.$duration.'">'.$value.'</span>';
 
 				case 'location' :
 				case 'start-location' :
 				case 'end-location' :
 					$location = $tag == 'end-location' ? $event->end_location['address'] : $event->start_location['address'];
 					$location_class = $tag == 'end-location' ? 'end' : 'start';
-					return ' <span class="simcal-event-address simcal-event-' . $location_class . '-location" itemprop="location" itemscope itemtype="http://schema.org/Place">' . 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">'.wp_strip_all_tags($location).'</span>';
 
 				case 'start-location-link':
 				case 'end-location-link' :
 				case 'maps-link' :
 					$location = $tag == 'end-location-link' ? $event->end_location['address'] : $event->start_location['address'];
-					if ( ! empty( $location ) ) {
-						$url = '//maps.google.com?q=' . urlencode( $location );
-						return $this->make_link( $tag, $url, $calendar->get_event_html( $event, $partial ), $attr );
+					if ( ! empty($location)) {
+						$url = '//maps.google.com?q='.urlencode($location);
+						return $this->make_link($tag, $url, $calendar->get_event_html($event, $partial), $attr);
 					}
 					break;
 
 				case 'link' :
 				case 'url' :
-					$content = 'link' == $tag ? $calendar->get_event_html( $event, $partial ) : '';
-					return $this->make_link( $tag, $event->link, $content , $attr );
+					$content = 'link' == $tag ? $calendar->get_event_html($event, $partial) : '';
+					return $this->make_link($tag, $event->link, $content, $attr);
 
 				case 'calendar' :
 				case 'feed-title' :
@@ -289,22 +289,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;
 
@@ -313,35 +313,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;
@@ -349,15 +349,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);
 						}
 					}
 
@@ -366,17 +366,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);
 							}
 						}
 
@@ -385,14 +385,14 @@ 
 					break;
 
 				case 'if-end-time' :
-					if ( false !== $event->end ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (false !== $event->end) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-no-end-time' :
-					if ( false === $event->end ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (false === $event->end) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
@@ -400,59 +400,59 @@ 
 				case 'if-whole-day' :
 				case 'if-not-all-day' :
 				case 'if-not-whole-day' :
-					$bool = strstr( $tag, 'not' ) ? false : true;
-					if ( $bool === $event->whole_day ) {
-						return $calendar->get_event_html( $event, $partial );
+					$bool = strstr($tag, 'not') ? false : true;
+					if ($bool === $event->whole_day) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-recurring' :
-					if ( ! empty( $event->recurrence ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if ( ! empty($event->recurrence)) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-not-recurring' :
-					if ( false === $event->recurrence ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (false === $event->recurrence) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-multi-day' :
-					if ( false !== $event->multiple_days ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (false !== $event->multiple_days) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-single-day' :
-					if ( false === $event->multiple_days ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (false === $event->multiple_days) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-location' :
 				case 'if-start-location' :
-					if ( ! empty( $event->start_location['address'] ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if ( ! empty($event->start_location['address'])) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					return false;
 
 				case 'if-not-location' :
 				case 'if-not-start-location' :
-					if ( empty( $event->start_location['address'] ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (empty($event->start_location['address'])) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					return '';
 
 				case 'if-not-end-location' :
-					if ( empty( $event->end_location['address'] ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (empty($event->end_location['address'])) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					return '';
 
 				case 'if-end-location' :
-					if ( ! empty( $event->end_location['address'] ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if ( ! empty($event->end_location['address'])) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					return '';
 
@@ -461,7 +461,7 @@ 
 				 * ======= */
 
 				default :
-					return wp_kses_post( $before . $partial . $after );
+					return wp_kses_post($before.$partial.$after);
 			}
 		}
 
@@ -479,14 +479,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;
@@ -503,26 +503,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.'>';
 	}
 
 	/**
@@ -536,42 +536,42 @@ 
 	 *
 	 * @return string
 	 */
-	private function get_description( $description, $attr ) {
+	private function get_description($description, $attr) {
 
-		if ( empty( $description ) ) {
+		if (empty($description)) {
 			return '';
 		}
 
-		$attr = array_merge( array(
-			'limit'     => 0,       // Trim length to number of words
-			'html'      => 'no',    // Parse HTML content
-			'markdown'  => 'no',    // Parse Markdown content
-			'autolink'  => 'no',    // Automatically convert plaintext URIs to anchors
-		), (array) shortcode_parse_atts( $attr ) );
+		$attr = array_merge(array(
+			'limit'     => 0, // Trim length to number of words
+			'html'      => 'no', // Parse HTML content
+			'markdown'  => 'no', // Parse Markdown content
+			'autolink'  => 'no', // Automatically convert plaintext URIs to anchors
+		), (array) shortcode_parse_atts($attr));
 
-		$allow_html = 'no' != $attr['html']     ? true : false;
+		$allow_html = 'no' != $attr['html'] ? true : false;
 		$allow_md   = 'no' != $attr['markdown'] ? true : false;
 
 		$html = '<div class="simcal-event-description" itemprop="description">';
 
 		// Markdown and HTML don't play well together, use one or the other in the same tag.
-		if ( $allow_html || $allow_md ) {
-			if ( $allow_html ) {
-				$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;
@@ -587,74 +587,74 @@ 
 	 *
 	 * @return string
 	 */
-	private function get_when( Event $event ) {
+	private function get_when(Event $event) {
 
-		$start = $event->start_dt->setTimezone( $event->timezone );
-		$end = ! is_null( $event->end_dt ) ? $event->end_dt->setTimezone( $event->timezone ) : null;
+		$start = $event->start_dt->setTimezone($event->timezone);
+		$end = ! is_null($event->end_dt) ? $event->end_dt->setTimezone($event->timezone) : null;
 
 		$time_start = '';
 		$time_end = '';
 
-		if ( ! $event->whole_day ) {
+		if ( ! $event->whole_day) {
 
-			$time_start = $this->calendar->datetime_separator .
-			              ' <span class="simcal-event-start simcal-event-start-time" ' .
-			              'data-event-start="' . $start->getTimestamp() . '" ' .
-			              'data-event-format="' . $this->calendar->time_format . '" ' .
-			              'itemprop="startDate" data-content="' . $start->toIso8601String() . '">' .
-			              date_i18n( $this->calendar->time_format, $start->getTimestamp() ) .
+			$time_start = $this->calendar->datetime_separator.
+			              ' <span class="simcal-event-start simcal-event-start-time" '.
+			              'data-event-start="'.$start->getTimestamp().'" '.
+			              'data-event-format="'.$this->calendar->time_format.'" '.
+			              'itemprop="startDate" data-content="'.$start->toIso8601String().'">'.
+			              date_i18n($this->calendar->time_format, $start->getTimestamp()).
 			              '</span> ';
 
-			if ( $end instanceof Carbon ) {
+			if ($end instanceof Carbon) {
 
-				$time_end = ' <span class="simcal-event-end simcal-event-end-time" ' .
-				            'data-event-end="' . $end->getTimestamp() . '" ' .
-				            'data-event-format="' . $this->calendar->time_format . '" ' .
-				            'itemprop="endDate" data-content="' . $end->toIso8601String() . '">' .
-				            date_i18n( $this->calendar->time_format, $end->getTimestamp() ) .
+				$time_end = ' <span class="simcal-event-end simcal-event-end-time" '.
+				            'data-event-end="'.$end->getTimestamp().'" '.
+				            'data-event-format="'.$this->calendar->time_format.'" '.
+				            'itemprop="endDate" data-content="'.$end->toIso8601String().'">'.
+				            date_i18n($this->calendar->time_format, $end->getTimestamp()).
 				            '</span> ';
 
 			}
 
 		}
 
-		if ( $event->multiple_days ) {
+		if ($event->multiple_days) {
 
-			$output = ' <span class="simcal-event-start simcal-event-start-date" ' .
-			          'data-event-start="' . $start->getTimestamp() . '" ' .
-			          'data-event-format="' . $this->calendar->date_format . '" ' .
-			          'itemprop="startDate" data-content="' . $start->toIso8601String() . '">' .
-			          date_i18n( $this->calendar->date_format, $start->getTimestamp() ) .
-			          '</span> ' .
+			$output = ' <span class="simcal-event-start simcal-event-start-date" '.
+			          'data-event-start="'.$start->getTimestamp().'" '.
+			          'data-event-format="'.$this->calendar->date_format.'" '.
+			          'itemprop="startDate" data-content="'.$start->toIso8601String().'">'.
+			          date_i18n($this->calendar->date_format, $start->getTimestamp()).
+			          '</span> '.
 			          $time_start;
 
-			if ( $end instanceof Carbon ) {
+			if ($end instanceof Carbon) {
 
-				$output .= '-' .
-				           ' <span class="simcal-event-start simcal-event-end-date" ' .
-				           'data-event-start="' . $end->getTimestamp() . '" ' .
-				           'data-event-format="' . $this->calendar->date_format . '" ' .
-				           'itemprop="endDate" data-content="' . $end->toIso8601String() . '">' .
-				           date_i18n( $this->calendar->date_format, $end->getTimestamp() ) .
-				           '</span> ' .
+				$output .= '-'.
+				           ' <span class="simcal-event-start simcal-event-end-date" '.
+				           'data-event-start="'.$end->getTimestamp().'" '.
+				           'data-event-format="'.$this->calendar->date_format.'" '.
+				           'itemprop="endDate" data-content="'.$end->toIso8601String().'">'.
+				           date_i18n($this->calendar->date_format, $end->getTimestamp()).
+				           '</span> '.
 				           $time_end;
 			}
 
 		} else {
 
-			$time_end = ! empty( $time_start ) && ! empty( $time_end ) ? ' - ' . $time_end : '';
+			$time_end = ! empty($time_start) && ! empty($time_end) ? ' - '.$time_end : '';
 
-			$output = ' <span class="simcal-event-start simcal-event-start-date" ' .
-			          'data-event-start="' . $start->getTimestamp() . '" ' .
-			          'data-event-format="' . $this->calendar->date_format . '">' .
-			          date_i18n( $this->calendar->date_format, $start->getTimestamp() ) .
-			          '</span> ' .
-			          $time_start .
+			$output = ' <span class="simcal-event-start simcal-event-start-date" '.
+			          'data-event-start="'.$start->getTimestamp().'" '.
+			          'data-event-format="'.$this->calendar->date_format.'">'.
+			          date_i18n($this->calendar->date_format, $start->getTimestamp()).
+			          '</span> '.
+			          $time_start.
 			          $time_end;
 
 		}
 
-		return trim( $output );
+		return trim($output);
 	}
 
 	/**
@@ -669,50 +669,50 @@ 
 	 *
 	 * @return string
 	 */
-	private function get_dt( $tag, Event $event, $attr ) {
+	private function get_dt($tag, Event $event, $attr) {
 
-		$bound = 0 === strpos( $tag, 'end' ) ? 'end' : 'start';
-		if ( ( 'end' == $bound ) && ( false === $event->end ) ) {
+		$bound = 0 === strpos($tag, 'end') ? 'end' : 'start';
+		if (('end' == $bound) && (false === $event->end)) {
 			return '';
 		}
 
-		$dt = $bound . '_dt';
-		if ( ! $event->$dt instanceof Carbon ) {
+		$dt = $bound.'_dt';
+		if ( ! $event->$dt instanceof Carbon) {
 			return '';
 		}
-		$event_dt = $event->$dt->setTimezone( $event->timezone );
+		$event_dt = $event->$dt->setTimezone($event->timezone);
 
-		$attr = array_merge( array(
+		$attr = array_merge(array(
 			'format'    => '',
-		), (array) shortcode_parse_atts( $attr ) );
+		), (array) shortcode_parse_atts($attr));
 
-		$format = ltrim( strstr( $tag, '-' ), '-' );
+		$format = ltrim(strstr($tag, '-'), '-');
 		$dt_format = '';
-		if ( ! empty( $attr['format'] ) ) {
-			$dt_format = esc_attr( wp_strip_all_tags( $attr['format'] ) );
-		} elseif ( 'date' == $format ) {
+		if ( ! empty($attr['format'])) {
+			$dt_format = esc_attr(wp_strip_all_tags($attr['format']));
+		} elseif ('date' == $format) {
 			$dt_format = $this->calendar->date_format;
-		} elseif ( 'time' == $format ) {
+		} elseif ('time' == $format) {
 			$dt_format = $this->calendar->time_format;
 		}
 
-		if ( 'human' == $format ) {
-			$value = human_time_diff( $event_dt->getTimestamp(), Carbon::now( $event->timezone )->getTimestamp() );
+		if ('human' == $format) {
+			$value = human_time_diff($event_dt->getTimestamp(), Carbon::now($event->timezone)->getTimestamp());
 
-			if ( $event_dt->getTimestamp() < Carbon::now( $event->timezone )->getTimestamp() ) {
-				$value .= ' ' . _x( 'ago', 'human date event builder code modifier', 'google-calendar-events' );
+			if ($event_dt->getTimestamp() < 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, $event_dt->getTimestamp() );
+			$value = date_i18n($dt_format, $event_dt->getTimestamp());
 		}
 
-		return '<span class="simcal-event-' . $bound . ' ' . 'simcal-event-' . $bound . '-' . $format . '" ' .
-		       'data-event-' . $bound . '="' . $event_dt->getTimestamp() . '" ' .
-		       'data-event-format="' . $dt_format . '" ' .
-		       'itemprop="' . $bound . 'Date" data-content="' . $event_dt->toIso8601String() . '">' .
-		       $value .
+		return '<span class="simcal-event-'.$bound.' '.'simcal-event-'.$bound.'-'.$format.'" '.
+		       'data-event-'.$bound.'="'.$event_dt->getTimestamp().'" '.
+		       'data-event-format="'.$dt_format.'" '.
+		       'itemprop="'.$bound.'Date" data-content="'.$event_dt->toIso8601String().'">'.
+		       $value.
 		       '</span>';
 	}
 
@@ -729,23 +729,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;
 	}
 
 	/**
@@ -758,20 +758,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;
 	}
@@ -787,41 +787,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++;
 
@@ -832,21 +832,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;
 	}
@@ -860,23 +860,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>';
 	}
 
 	/**
@@ -890,21 +890,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>';
 	}
 
 	/**
@@ -929,7 +929,7 @@ 
 		// This is largely borrowed on get_shortcode_regex() from WordPress Core.
 		// @see /wp-includes/shortcodes.php (with some modification)
 
-		$tagregexp = implode( '|', array_values( $this->tags ) );
+		$tagregexp = implode('|', array_values($this->tags));
 
 		return '/'
 		       . '\\['                              // Opening bracket

includes/events/event.php

Spacing +77 added lines, -77 removed lines

@@ -8,7 +8,7 @@ 
 
 use Carbon\Carbon;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -239,35 +239,35 @@ 
 	 *
 	 * @param array $event
 	 */
-	public function __construct( array $event ) {
+	public function __construct(array $event) {
 
 		/* ================= *
 		 * Event Identifiers *
 		 * ================= */
 
 		// Event unique id.
-		if ( ! empty( $event['uid'] ) ) {
-			$this->uid = esc_attr( $event['uid'] );
+		if ( ! empty($event['uid'])) {
+			$this->uid = esc_attr($event['uid']);
 		}
 
 		// iCal ID
-		if ( ! empty( $event['ical_id'] ) ) {
-			$this->ical_id = esc_attr( $event['ical_id'] );
+		if ( ! empty($event['ical_id'])) {
+			$this->ical_id = esc_attr($event['ical_id']);
 		}
 
 		// Event source.
-		if ( ! empty( $event['source'] ) ) {
-			$this->source = esc_attr( $event['source'] );
+		if ( ! empty($event['source'])) {
+			$this->source = esc_attr($event['source']);
 		}
 
 		// Event parent calendar id.
-		if ( ! empty( $event['calendar'] ) ) {
-			$this->calendar = max( intval( $event['calendar'] ), 0 );
+		if ( ! empty($event['calendar'])) {
+			$this->calendar = max(intval($event['calendar']), 0);
 		}
 
 		// Event parent calendar timezone.
-		if ( ! empty( $event['timezone'] ) ) {
-			$this->timezone = esc_attr( $event['timezone'] );
+		if ( ! empty($event['timezone'])) {
+			$this->timezone = esc_attr($event['timezone']);
 		}
 
 		/* ============= *
@@ -275,23 +275,23 @@ 
 		 * ============= */
 
 		// Event title.
-		if ( ! empty( $event['title'] ) ) {
-			$this->title = esc_html( $event['title'] );
+		if ( ! empty($event['title'])) {
+			$this->title = esc_html($event['title']);
 		}
 
 		// Event description.
-		if ( ! empty( $event['description'] ) ) {
-			$this->description = wp_kses_post( $event['description'] );
+		if ( ! empty($event['description'])) {
+			$this->description = wp_kses_post($event['description']);
 		}
 
 		// Event link URL.
-		if ( ! empty( $event['link'] ) ) {
-			$this->link = esc_url_raw( $event['link'] );
+		if ( ! empty($event['link'])) {
+			$this->link = esc_url_raw($event['link']);
 		}
 
 		// Event visibility.
-		if ( ! empty( $event['visibility'] ) ) {
-			$this->visibility = esc_attr( $event['visibility'] );
+		if ( ! empty($event['visibility'])) {
+			$this->visibility = esc_attr($event['visibility']);
 			$this->public = $this->visibility == 'public' ? true : false;
 		}
 
@@ -299,34 +299,34 @@ 
 		 * Event Start *
 		 * =========== */
 
-		if ( ! empty( $event['start'] ) ) {
-			$this->start = is_numeric( $event['start'] ) ? intval( $event['start'] ) : 0;
-			if ( ! empty( $event['start_utc'] ) ) {
-				$this->start_utc = is_numeric( $event['start_utc'] ) ? intval( $event['start_utc'] ) : 0;
+		if ( ! empty($event['start'])) {
+			$this->start = is_numeric($event['start']) ? intval($event['start']) : 0;
+			if ( ! empty($event['start_utc'])) {
+				$this->start_utc = is_numeric($event['start_utc']) ? intval($event['start_utc']) : 0;
 			}
-			if ( ! empty( $event['start_timezone'] ) ) {
-				$this->start_timezone = esc_attr( $event['start_timezone'] );
+			if ( ! empty($event['start_timezone'])) {
+				$this->start_timezone = esc_attr($event['start_timezone']);
 			}
-			$this->start_dt = Carbon::createFromTimestamp( $this->start, $this->start_timezone );
-			$start_location = isset( $event['start_location'] ) ? $event['start_location'] : '';
-			$this->start_location = $this->esc_location( $start_location );
+			$this->start_dt = Carbon::createFromTimestamp($this->start, $this->start_timezone);
+			$start_location = isset($event['start_location']) ? $event['start_location'] : '';
+			$this->start_location = $this->esc_location($start_location);
 		}
 
 		/* ========= *
 		 * Event End *
 		 * ========= */
 
-		if ( ! empty( $event['end'] ) ) {
-			$this->end = is_numeric( $event['end'] ) ? intval( $event['end'] ): false;
-			if ( ! empty( $event['end_timezone'] ) ) {
-				$this->end_timezone = esc_attr( $event['end_timezone'] );
+		if ( ! empty($event['end'])) {
+			$this->end = is_numeric($event['end']) ? intval($event['end']) : false;
+			if ( ! empty($event['end_timezone'])) {
+				$this->end_timezone = esc_attr($event['end_timezone']);
 			}
-			if ( ! empty( $event['end_utc'] ) ) {
-				$this->end_utc = is_numeric( $event['end_utc'] ) ? intval( $event['end_utc'] ) : false;
-				$this->end_dt = Carbon::createFromTimestamp( $this->end, $this->end_timezone );
+			if ( ! empty($event['end_utc'])) {
+				$this->end_utc = is_numeric($event['end_utc']) ? intval($event['end_utc']) : false;
+				$this->end_dt = Carbon::createFromTimestamp($this->end, $this->end_timezone);
 			}
-			$end_location = isset( $event['end_location'] ) ? $event['end_location'] : '';
-			$this->end_location = $this->esc_location( $end_location );
+			$end_location = isset($event['end_location']) ? $event['end_location'] : '';
+			$this->end_location = $this->esc_location($end_location);
 		}
 
 		/* ================== *
@@ -334,18 +334,18 @@ 
 		 * ================== */
 
 		// Whole day event.
-		if ( ! empty( $event['whole_day'] ) ) {
-			$this->whole_day = true === $event['whole_day'] ? true: false;
+		if ( ! empty($event['whole_day'])) {
+			$this->whole_day = true === $event['whole_day'] ? true : false;
 		}
 
 		// Multi day event.
-		if ( ! empty( $event['multiple_days'] ) ) {
-			$this->multiple_days = max( absint( $event['multiple_days'] ), 1 );
+		if ( ! empty($event['multiple_days'])) {
+			$this->multiple_days = max(absint($event['multiple_days']), 1);
 		}
 
 		// Event recurrence.
-		if ( isset( $event['recurrence'] ) ) {
-			$this->recurrence = ! empty( $event['recurrence'] ) ? $event['recurrence'] : false;
+		if (isset($event['recurrence'])) {
+			$this->recurrence = ! empty($event['recurrence']) ? $event['recurrence'] : false;
 		}
 
 		/* ========== *
@@ -353,18 +353,18 @@ 
 		 * ========== */
 
 		// Event has venue(s).
-		if ( $this->start_location['venue'] || $this->end_location['venue'] ) {
+		if ($this->start_location['venue'] || $this->end_location['venue']) {
 			$this->venue = true;
 		}
 
 		// Event meta.
-		if ( ! empty( $event['meta'] ) ) {
-			$this->meta = is_array( $event['meta'] ) ? $event['meta'] : array();
+		if ( ! empty($event['meta'])) {
+			$this->meta = is_array($event['meta']) ? $event['meta'] : array();
 		}
 
 		// Event template.
-		if ( ! empty( $event['template'] ) ) {
-			$this->template = wp_kses_post( $event['template'] );
+		if ( ! empty($event['template'])) {
+			$this->template = wp_kses_post($event['template']);
 		}
 
 	}
@@ -379,27 +379,27 @@ 
 	 *
 	 * @return array
 	 */
-	private function esc_location( $var = '' ) {
+	private function esc_location($var = '') {
 
 		$location = array();
 
-		if ( is_string( $var ) ) {
+		if (is_string($var)) {
 			$var = array(
 				'name'    => $var,
 				'address' => $var,
 			);
-		} elseif ( is_bool( $var ) || is_null( $var ) ) {
+		} elseif (is_bool($var) || is_null($var)) {
 			$var = array();
 		} else {
 			$var = (array) $var;
 		}
 
-		$location['name']    = isset( $var['name'] )    ? esc_attr( strip_tags( $var['name'] ) ) : '';
-		$location['address'] = isset( $var['address'] ) ? esc_attr( strip_tags( $var['address'] ) ) : '';
-		$location['lat']     = isset( $var['lat'] )     ? $this->esc_coordinate( $var['lat'] ) : 0;
-		$location['lng']     = isset( $var['lng'] )     ? $this->esc_coordinate( $var['lng'] ) : 0;
+		$location['name']    = isset($var['name']) ? esc_attr(strip_tags($var['name'])) : '';
+		$location['address'] = isset($var['address']) ? esc_attr(strip_tags($var['address'])) : '';
+		$location['lat']     = isset($var['lat']) ? $this->esc_coordinate($var['lat']) : 0;
+		$location['lng']     = isset($var['lng']) ? $this->esc_coordinate($var['lng']) : 0;
 
-		if ( ! empty( $location['name'] ) || ! empty( $location['address'] ) ) {
+		if ( ! empty($location['name']) || ! empty($location['address'])) {
 			$location['venue'] = true;
 		} else {
 			$location['venue'] = false;
@@ -418,8 +418,8 @@ 
 	 *
 	 * @return int|float
 	 */
-	private function esc_coordinate( $latlng = 0 ) {
-		return is_numeric( $latlng ) ? floatval( $latlng ) : 0;
+	private function esc_coordinate($latlng = 0) {
+		return is_numeric($latlng) ? floatval($latlng) : 0;
 	}
 
 	/**
@@ -432,8 +432,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function set_timezone( $tz ) {
-		if ( in_array( $tz, timezone_identifiers_list() ) ) {
+	public function set_timezone($tz) {
+		if (in_array($tz, timezone_identifiers_list())) {
 			$this->timezone = $tz;
 			return true;
 		}
@@ -459,7 +459,7 @@ 
 	 * @return bool
 	 */
 	public function starts_today() {
-		return $this->start_dt->setTimezone( $this->timezone )->isToday();
+		return $this->start_dt->setTimezone($this->timezone)->isToday();
 	}
 
 	/**
@@ -470,7 +470,7 @@ 
 	 * @return bool
 	 */
 	public function ends_today() {
-		return ! is_null( $this->end_dt ) ? $this->end_dt->setTimezone( $this->timezone )->isToday() : true;
+		return ! is_null($this->end_dt) ? $this->end_dt->setTimezone($this->timezone)->isToday() : true;
 	}
 
 	/**
@@ -481,7 +481,7 @@ 
 	 * @return bool
 	 */
 	public function starts_tomorrow() {
-		return $this->start_dt->setTimezone( $this->timezone )->isTomorrow();
+		return $this->start_dt->setTimezone($this->timezone)->isTomorrow();
 	}
 
 	/**
@@ -492,7 +492,7 @@ 
 	 * @return bool
 	 */
 	public function ends_tomorrow() {
-		return ! is_null( $this->end_dt ) ? $this->end_dt->setTimezone( $this->timezone )->isTomorrow() : false;
+		return ! is_null($this->end_dt) ? $this->end_dt->setTimezone($this->timezone)->isTomorrow() : false;
 	}
 
 	/**
@@ -503,7 +503,7 @@ 
 	 * @return bool
 	 */
 	public function started_yesterday() {
-		return $this->start_dt->setTimezone( $this->timezone )->isYesterday();
+		return $this->start_dt->setTimezone($this->timezone)->isYesterday();
 	}
 
 	/**
@@ -514,7 +514,7 @@ 
 	 * @return bool
 	 */
 	public function ended_yesterday() {
-		return ! is_null( $this->end_dt ) ? $this->end_dt->setTimezone( $this->timezone )->isYesterday() : false;
+		return ! is_null($this->end_dt) ? $this->end_dt->setTimezone($this->timezone)->isYesterday() : false;
 	}
 
 	/**
@@ -525,7 +525,7 @@ 
 	 * @return bool
 	 */
 	public function starts_future() {
-		return $this->start_dt->setTimezone( $this->timezone )->isFuture();
+		return $this->start_dt->setTimezone($this->timezone)->isFuture();
 	}
 
 	/**
@@ -536,7 +536,7 @@ 
 	 * @return bool
 	 */
 	public function ends_future() {
-		return ! is_null( $this->end_dt ) ? $this->end_dt->setTimezone( $this->timezone )->isFuture() : false;
+		return ! is_null($this->end_dt) ? $this->end_dt->setTimezone($this->timezone)->isFuture() : false;
 	}
 
 	/**
@@ -547,7 +547,7 @@ 
 	 * @return bool
 	 */
 	public function started_past() {
-		return $this->start_dt->setTimezone( $this->timezone )->isPast();
+		return $this->start_dt->setTimezone($this->timezone)->isPast();
 	}
 
 	/**
@@ -558,7 +558,7 @@ 
 	 * @return bool
 	 */
 	public function ended_past() {
-		return ! is_null( $this->end_dt ) ? $this->end_dt->setTimezone( $this->timezone )->isPast() : false;
+		return ! is_null($this->end_dt) ? $this->end_dt->setTimezone($this->timezone)->isPast() : false;
 	}
 
 	/**
@@ -570,9 +570,9 @@ 
 	 *
 	 * @return string
 	 */
-	public function get_color( $default = '' ) {
-		if ( isset( $this->meta['color'] ) ) {
-			return ! empty( $this->meta['color'] ) ? esc_attr( $this->meta['color'] ) : $default;
+	public function get_color($default = '') {
+		if (isset($this->meta['color'])) {
+			return ! empty($this->meta['color']) ? esc_attr($this->meta['color']) : $default;
 		}
 		return $default;
 	}
@@ -585,7 +585,7 @@ 
 	 * @return array
 	 */
 	public function get_attachments() {
-		return isset( $this->meta['attachments'] ) ? $this->meta['attachments'] : array();
+		return isset($this->meta['attachments']) ? $this->meta['attachments'] : array();
 	}
 
 	/**
@@ -596,7 +596,7 @@ 
 	 * @return array
 	 */
 	public function get_attendees() {
-		return isset( $this->meta['attendees'] ) ? $this->meta['attendees'] : array();
+		return isset($this->meta['attendees']) ? $this->meta['attendees'] : array();
 	}
 
 	/**
@@ -607,7 +607,7 @@ 
 	 * @return array
 	 */
 	public function get_organizer() {
-		return isset( $this->meta['organizer'] ) ? $this->meta['organizer'] : array();
+		return isset($this->meta['organizer']) ? $this->meta['organizer'] : array();
 	}
 
 }

includes/functions/admin.php

Spacing +55 added lines, -55 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>

includes/calendars/admin/default-calendar-admin.php

Spacing +110 added lines, -110 removed lines

@@ -6,7 +6,7 @@ 
  */
 namespace SimpleCalendar\Calendars\Admin;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -24,10 +24,10 @@ 
 	 */
 	public function __construct() {
 
-		if ( simcal_is_admin_screen() !== false ) {
-			add_action( 'simcal_settings_meta_calendar_panel', array( $this, 'add_settings_meta_calendar_panel' ), 10, 1 );
+		if (simcal_is_admin_screen() !== false) {
+			add_action('simcal_settings_meta_calendar_panel', array($this, 'add_settings_meta_calendar_panel'), 10, 1);
 		}
-		add_action( 'simcal_process_settings_meta', array( $this, 'process_meta' ), 10, 1 );
+		add_action('simcal_process_settings_meta', array($this, 'process_meta'), 10, 1);
 	}
 
 	/**
@@ -76,47 +76,47 @@ 
 	 *
 	 * @param int $post_id
 	 */
-	public function add_settings_meta_calendar_panel( $post_id ) {
+	public function add_settings_meta_calendar_panel($post_id) {
 
 		?>
 		<table id="default-calendar-settings">
 			<thead>
-			<tr><th colspan="2"><?php _e( 'Default Calendar', 'google-calendar-events' ); ?></th></tr>
+			<tr><th colspan="2"><?php _e('Default Calendar', 'google-calendar-events'); ?></th></tr>
 			</thead>
 			<tbody class="simcal-panel-section">
 
 			<tr class="simcal-panel-field simcal-default-calendar-grid" style="display: none;">
-				<th><label for="_default_calendar_event_bubbles_action"><?php _e( 'Event Bubbles', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_event_bubbles_action"><?php _e('Event Bubbles', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$bubbles = get_post_meta( $post_id, '_default_calendar_event_bubble_trigger', true );
+					$bubbles = get_post_meta($post_id, '_default_calendar_event_bubble_trigger', true);
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'radio',
 						'inline'  => 'inline',
 						'name'    => '_default_calendar_event_bubble_trigger',
 						'id'      => '_default_calendar_event_bubble_trigger',
-						'tooltip' => __( 'Open event bubbles in calendar grid by clicking or hovering on event titles. On mobile devices it will always default to tapping.', 'google-calendar-events' ),
+						'tooltip' => __('Open event bubbles in calendar grid by clicking or hovering on event titles. On mobile devices it will always default to tapping.', 'google-calendar-events'),
 						'value'   => $bubbles ? $bubbles : 'hover',
 						'default' => 'hover',
 						'options' => array(
-							'click' => __( 'Click', 'google-calendar-events' ),
-							'hover' => __( 'Hover', 'google-calendar-events' ),
+							'click' => __('Click', 'google-calendar-events'),
+							'hover' => __('Hover', 'google-calendar-events'),
 						),
-					) );
+					));
 
 					?>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field simcal-default-calendar-grid" style="display: none;">
-				<th><label for="_default_calendar_trim_titles"><?php _e( 'Trim Event Titles', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_trim_titles"><?php _e('Trim Event Titles', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$trim = get_post_meta( $post_id, '_default_calendar_trim_titles', true );
+					$trim = get_post_meta($post_id, '_default_calendar_trim_titles', true);
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'        => 'checkbox',
 						'name'        => '_default_calendar_trim_titles',
 						'id'          => '_default_calendar_trim_titles',
@@ -127,34 +127,34 @@ 
 						'attributes'  => array(
 							'data-show-next-if-value' => 'yes',
 						),
-					) );
+					));
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'       => 'standard',
 						'subtype'    => 'number',
 						'name'       => '_default_calendar_trim_titles_chars',
 						'id'         => '_default_calendar_trim_titles_chars',
-						'tooltip'    => __( 'Shorten event titles in calendar grid to a specified length in characters.', 'google-calendar-events' ),
+						'tooltip'    => __('Shorten event titles in calendar grid to a specified length in characters.', 'google-calendar-events'),
 						'class'      => array(
 							'simcal-field-tiny',
 						),
-						'value'      => 'yes' == $trim ? strval( max( absint( get_post_meta( $post_id, '_default_calendar_trim_titles_chars', true ) ), 1 ) ) : '20',
+						'value'      => 'yes' == $trim ? strval(max(absint(get_post_meta($post_id, '_default_calendar_trim_titles_chars', true)), 1)) : '20',
 						'attributes' => array(
 							'min'     => '1',
 						),
-					) );
+					));
 
 					?>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field simcal-default-calendar-list" style="display: none;">
-				<th><label for="_default_calendar_list_grouped_span"><?php _e( 'Span', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_list_grouped_span"><?php _e('Span', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$list_span = max( absint( get_post_meta( $post_id, '_default_calendar_list_range_span', true ) ), 1 );
+					$list_span = max(absint(get_post_meta($post_id, '_default_calendar_list_range_span', true)), 1);
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'standard',
 						'subtype' => 'number',
 						'name'    => '_default_calendar_list_range_span',
@@ -163,78 +163,78 @@ 
 							'simcal-field-tiny',
 							'simcal-field-inline',
 						),
-						'value'   => strval( $list_span ),
+						'value'   => strval($list_span),
 						'attributes'  => array(
 							'min' => '1',
 						),
-					) );
+					));
 
-					$list_type = get_post_meta( $post_id, '_default_calendar_list_range_type', true );
+					$list_type = get_post_meta($post_id, '_default_calendar_list_range_type', true);
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'select',
 						'name'    => '_default_calendar_list_range_type',
 						'id'      => '_default_calendar_list_range_type',
-						'tooltip' => __( 'Range of events to show on each calendar page.', 'google-calendar-events' ),
+						'tooltip' => __('Range of events to show on each calendar page.', 'google-calendar-events'),
 						'class'   => array(
 							'simcal-field-inline',
 						),
 						'value'   => $list_type,
 						'options' => array(
-							'monthly' => __( 'Month(s)', 'google-calendar-events' ),
-							'weekly'  => __( 'Week(s)', 'google-calendar-events' ),
-							'daily'   => __( 'Day(s)', 'google-calendar-events' ),
-							'events'  => __( 'Event(s)', 'google-calendar-events' ),
+							'monthly' => __('Month(s)', 'google-calendar-events'),
+							'weekly'  => __('Week(s)', 'google-calendar-events'),
+							'daily'   => __('Day(s)', 'google-calendar-events'),
+							'events'  => __('Event(s)', 'google-calendar-events'),
 						),
-					) );
+					));
 
 					?>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field simcal-default-calendar-list" style="display: none;">
-				<th><label for="_default_calendar_list_header"><?php _e( 'Hide Header', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_list_header"><?php _e('Hide Header', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$header = get_post_meta( $post_id, '_default_calendar_list_header', true );
+					$header = get_post_meta($post_id, '_default_calendar_list_header', true);
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'checkbox',
 						'name'    => '_default_calendar_list_header',
 						'id'      => '_default_calendar_list_header',
-						'tooltip' => __( 'You can use this to hide the month header for this calendar.', 'google-calendar-events' ),
+						'tooltip' => __('You can use this to hide the month header for this calendar.', 'google-calendar-events'),
 						'value'   => 'yes' == $header ? 'yes' : 'no',
-					) );
+					));
 
 					?>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field simcal-default-calendar-list" style="display: none;">
-				<th><label for="_default_calendar_compact_list"><?php _e( 'Compact List', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_compact_list"><?php _e('Compact List', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$compact = get_post_meta( $post_id, '_default_calendar_compact_list', true );
+					$compact = get_post_meta($post_id, '_default_calendar_compact_list', true);
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'checkbox',
 						'name'    => '_default_calendar_compact_list',
 						'id'      => '_default_calendar_compact_list',
-						'tooltip' => __( 'Make an events list more compact by grouping together events from different days in a single list.', 'google-calendar-events' ),
+						'tooltip' => __('Make an events list more compact by grouping together events from different days in a single list.', 'google-calendar-events'),
 						'value'   => 'yes' == $compact ? 'yes' : 'no',
-					) );
+					));
 
 					?>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field simcal-default-calendar-grid simcal-default-calendar-list"  style="display: none;">
-				<th><label for="_default_calendar_limit_visible_events"><?php _e( 'Limit Visible Events', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_limit_visible_events"><?php _e('Limit Visible Events', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$limit = get_post_meta( $post_id, '_default_calendar_limit_visible_events', true );
+					$limit = get_post_meta($post_id, '_default_calendar_limit_visible_events', true);
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'        => 'checkbox',
 						'name'        => '_default_calendar_limit_visible_events',
 						'id'          => '_default_calendar_limit_visible_events',
@@ -245,17 +245,17 @@ 
 						'attributes'  => array(
 							'data-show-next-if-value' => 'yes',
 						)
-					) );
+					));
 
-					$visible_events = absint( get_post_meta( $post_id, '_default_calendar_visible_events', true ) );
+					$visible_events = absint(get_post_meta($post_id, '_default_calendar_visible_events', true));
 					$visible_events = $visible_events > 0 ? $visible_events : 3;
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'       => 'standard',
 						'subtype'    => 'number',
 						'name'       => '_default_calendar_visible_events',
 						'id'         => '_default_calendar_visible_events',
-						'tooltip'    => __( 'Limit the number of initial visible events on each day to a set maximum.', 'google-calendar-events' ),
+						'tooltip'    => __('Limit the number of initial visible events on each day to a set maximum.', 'google-calendar-events'),
 						'class'      => array(
 							'simcal-field-tiny',
 						),
@@ -263,39 +263,39 @@ 
 						'attributes' => array(
 							'min'     => '1',
 						)
-					) );
+					));
 
 					?>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field simcal-default-calendar-grid simcal-default-calendar-list" style="display: none;">
-				<th><label for="_default_calendar_event_bubbles_action"><?php _e( 'Expand Multi-day Events', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_event_bubbles_action"><?php _e('Expand Multi-day Events', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$post_meta = get_post_meta( $post_id );
+					$post_meta = get_post_meta($post_id);
 
-					if ( ! is_array( $post_meta ) && ! empty( $post_meta ) ) {
+					if ( ! is_array($post_meta) && ! empty($post_meta)) {
 						$multi_day_value = 'current_day_only';
 					} else {
-						$multi_day_value = get_post_meta( $post_id, '_default_calendar_expand_multi_day_events', true );
+						$multi_day_value = get_post_meta($post_id, '_default_calendar_expand_multi_day_events', true);
 					}
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'select',
 						'name'    => '_default_calendar_expand_multi_day_events',
 						'id'      => '_default_calendar_expand_multi_day_events',
-						'tooltip' => __( 'For events spanning multiple days, you can display them on each day of the event, ' .
-						                 'only on the first day of the event, or on all days of the event, but only up to the current day. ' .
-						                 'Third option applies to list views only.', 'google-calendar-events' ),
+						'tooltip' => __('For events spanning multiple days, you can display them on each day of the event, '.
+						                 'only on the first day of the event, or on all days of the event, but only up to the current day. '.
+						                 'Third option applies to list views only.', 'google-calendar-events'),
 						'value'   => $multi_day_value,
 						'options' => array(
-							'yes'              => __( 'Yes, display on all days of event', 'google-calendar-events' ),
-							'no'               => __( 'No, display only on first day of event', 'google-calendar-events' ),
-							'current_day_only' => __( 'No, display on all days of event up to current day (list view only)', 'google-calendar-events' ),
+							'yes'              => __('Yes, display on all days of event', 'google-calendar-events'),
+							'no'               => __('No, display only on first day of event', 'google-calendar-events'),
+							'current_day_only' => __('No, display on all days of event up to current day (list view only)', 'google-calendar-events'),
 						),
 						'default' => 'current_day_only',
-					) );
+					));
 
 					?>
 				</td>
@@ -303,72 +303,72 @@ 
 			</tbody>
 			<?php
 
-			$settings                   = get_option( 'simple-calendar_settings_calendars' );
-			$default_theme              = isset( $settings['default-calendar']['theme'] ) ? $settings['default-calendar']['theme'] : 'light';
+			$settings                   = get_option('simple-calendar_settings_calendars');
+			$default_theme              = isset($settings['default-calendar']['theme']) ? $settings['default-calendar']['theme'] : 'light';
 			$default_today_color        = /*isset( $settings['default-calendar']['today_color'] ) ? $settings['default-calendar']['today_color'] :*/ '#1e73be';
 			$default_days_events_color  = /*isset( $settings['default-calendar']['days_events_color'] ) ? $settings['default-calendar']['days_events_color'] :*/ '#000000';
 
 			?>
 			<tbody class="simcal-panel-section">
 			<tr class="simcal-panel-field simcal-default-calendar-grid simcal-default-calendar-list" style="display: none;">
-				<th><label for="_default_calendar_style_theme"><?php _e( 'Theme', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_style_theme"><?php _e('Theme', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$saved = get_post_meta( $post_id, '_default_calendar_style_theme', true );
+					$saved = get_post_meta($post_id, '_default_calendar_style_theme', true);
 					$value = ! $saved ? $default_theme : $saved;
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'select',
 						'name'    => '_default_calendar_style_theme',
 						'id'      => '_default_calendar_style_theme',
 						'value'   => $value,
-						'tooltip' => __( 'Choose a calendar theme to match your site theme.', 'google-calendar-events' ),
+						'tooltip' => __('Choose a calendar theme to match your site theme.', 'google-calendar-events'),
 						'options' => array(
-							'light' => __( 'Light', 'google-calendar-events' ),
-							'dark' => __( 'Dark', 'google-calendar-events' ),
+							'light' => __('Light', 'google-calendar-events'),
+							'dark' => __('Dark', 'google-calendar-events'),
 						),
-					) );
+					));
 
 					?>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field simcal-default-calendar-grid simcal-default-calendar-list" style="display: none;">
-				<th><label for="_default_calendar_style_today"><?php _e( 'Today', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_style_today"><?php _e('Today', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$saved = get_post_meta( $post_id, '_default_calendar_style_today', true );
+					$saved = get_post_meta($post_id, '_default_calendar_style_today', true);
 					$value = ! $saved ? $default_today_color : $saved;
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'standard',
 						'subtype' => 'color-picker',
 						'name'    => '_default_calendar_style_today',
 						'id'      => '_default_calendar_style_today',
 						'value'   => $value,
-						'tooltip' => __( "This option will set the background color for today's date. It will change the day number background and the border around the current day.", 'google-calendar-events' ),
-					) );
+						'tooltip' => __("This option will set the background color for today's date. It will change the day number background and the border around the current day.", 'google-calendar-events'),
+					));
 
 					?>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field simcal-default-calendar-grid simcal-default-calendar-list" style="display: none;">
-				<th><label for="_default_calendar_style_days_events"><?php _e( 'Days with Events', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_style_days_events"><?php _e('Days with Events', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$saved = get_post_meta( $post_id, '_default_calendar_style_days_events', true );
+					$saved = get_post_meta($post_id, '_default_calendar_style_days_events', true);
 					$value = ! $saved ? $default_days_events_color : $saved;
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'standard',
 						'subtype' => 'color-picker',
 						'name'    => '_default_calendar_style_days_events',
 						'id'      => '_default_calendar_style_days_events',
 						'value'   => $value,
-						'tooltip' => __( 'This setting will modify the day number background for any days that have events on them.', 'google-calendar-events' ),
-					) );
+						'tooltip' => __('This setting will modify the day number background for any days that have events on them.', 'google-calendar-events'),
+					));
 
 					?>
 				</td>
@@ -390,55 +390,55 @@ 
 	 *
 	 * @param int $post_id
 	 */
-	public function process_meta( $post_id ) {
+	public function process_meta($post_id) {
 
 		// Theme.
-		$theme = isset( $_POST['_default_calendar_style_theme'] ) ? sanitize_key( $_POST['_default_calendar_style_theme'] ) : 'light';
-		update_post_meta( $post_id, '_default_calendar_style_theme', $theme );
+		$theme = isset($_POST['_default_calendar_style_theme']) ? sanitize_key($_POST['_default_calendar_style_theme']) : 'light';
+		update_post_meta($post_id, '_default_calendar_style_theme', $theme);
 
 		// Today color.
-		$today_color = isset( $_POST['_default_calendar_style_today'] ) ? sanitize_text_field( $_POST['_default_calendar_style_today'] ) : '#FF000';
-		update_post_meta( $post_id, '_default_calendar_style_today', $today_color );
+		$today_color = isset($_POST['_default_calendar_style_today']) ? sanitize_text_field($_POST['_default_calendar_style_today']) : '#FF000';
+		update_post_meta($post_id, '_default_calendar_style_today', $today_color);
 
 		// Days with events color.
-		$days_events_color = isset( $_POST['_default_calendar_style_days_events'] ) ? sanitize_text_field( $_POST['_default_calendar_style_days_events'] ) : '#000000';
-		update_post_meta( $post_id, '_default_calendar_style_days_events', $days_events_color );
+		$days_events_color = isset($_POST['_default_calendar_style_days_events']) ? sanitize_text_field($_POST['_default_calendar_style_days_events']) : '#000000';
+		update_post_meta($post_id, '_default_calendar_style_days_events', $days_events_color);
 
 		// List range span.
-		$span = isset( $_POST['_default_calendar_list_range_span'] ) ? max( absint( $_POST['_default_calendar_list_range_span'] ), 1 ) : 1;
-		update_post_meta( $post_id, '_default_calendar_list_range_span', $span );
+		$span = isset($_POST['_default_calendar_list_range_span']) ? max(absint($_POST['_default_calendar_list_range_span']), 1) : 1;
+		update_post_meta($post_id, '_default_calendar_list_range_span', $span);
 
 		// List range type.
-		$group = isset( $_POST['_default_calendar_list_range_type'] ) ? sanitize_key( $_POST['_default_calendar_list_range_type'] ) : 'monthly';
-		update_post_meta( $post_id, '_default_calendar_list_range_type', $group );
+		$group = isset($_POST['_default_calendar_list_range_type']) ? sanitize_key($_POST['_default_calendar_list_range_type']) : 'monthly';
+		update_post_meta($post_id, '_default_calendar_list_range_type', $group);
 
 		// Hide header.
-		$header = isset( $_POST['_default_calendar_list_header'] ) ? 'yes' : 'no';
-		update_post_meta( $post_id, '_default_calendar_list_header', $header );
+		$header = isset($_POST['_default_calendar_list_header']) ? 'yes' : 'no';
+		update_post_meta($post_id, '_default_calendar_list_header', $header);
 
 		// Compact list.
-		$compact = isset( $_POST['_default_calendar_compact_list'] ) ? 'yes' : 'no';
-		update_post_meta( $post_id, '_default_calendar_compact_list', $compact );
+		$compact = isset($_POST['_default_calendar_compact_list']) ? 'yes' : 'no';
+		update_post_meta($post_id, '_default_calendar_compact_list', $compact);
 
 		// Limit number of initially visible daily events.
-		$limit = isset( $_POST['_default_calendar_limit_visible_events'] ) ? 'yes' : 'no';
-		update_post_meta( $post_id, '_default_calendar_limit_visible_events', $limit );
-		$number = isset( $_POST['_default_calendar_visible_events'] ) ? absint( $_POST['_default_calendar_visible_events'] ) : 3;
-		update_post_meta( $post_id, '_default_calendar_visible_events', $number );
+		$limit = isset($_POST['_default_calendar_limit_visible_events']) ? 'yes' : 'no';
+		update_post_meta($post_id, '_default_calendar_limit_visible_events', $limit);
+		$number = isset($_POST['_default_calendar_visible_events']) ? absint($_POST['_default_calendar_visible_events']) : 3;
+		update_post_meta($post_id, '_default_calendar_visible_events', $number);
 
 		// Grid event bubbles action.
-		$bubbles = isset( $_POST['_default_calendar_event_bubble_trigger'] ) ? esc_attr( $_POST['_default_calendar_event_bubble_trigger'] ) : 'hover';
-		update_post_meta( $post_id, '_default_calendar_event_bubble_trigger', $bubbles );
+		$bubbles = isset($_POST['_default_calendar_event_bubble_trigger']) ? esc_attr($_POST['_default_calendar_event_bubble_trigger']) : 'hover';
+		update_post_meta($post_id, '_default_calendar_event_bubble_trigger', $bubbles);
 
 		// Trim event titles characters length.
-		$trim = isset( $_POST['_default_calendar_trim_titles'] ) ? 'yes' : 'no';
-		update_post_meta( $post_id, '_default_calendar_trim_titles', $trim );
-		$chars = isset( $_POST['_default_calendar_trim_titles_chars'] ) ? max( absint( $_POST['_default_calendar_trim_titles_chars'] ), 1 ) : 20;
-		update_post_meta( $post_id, '_default_calendar_trim_titles_chars', $chars );
+		$trim = isset($_POST['_default_calendar_trim_titles']) ? 'yes' : 'no';
+		update_post_meta($post_id, '_default_calendar_trim_titles', $trim);
+		$chars = isset($_POST['_default_calendar_trim_titles_chars']) ? max(absint($_POST['_default_calendar_trim_titles_chars']), 1) : 20;
+		update_post_meta($post_id, '_default_calendar_trim_titles_chars', $chars);
 
 		// Expand multiple day events on each day.
-		$multi_day = isset( $_POST['_default_calendar_expand_multi_day_events'] ) && ! empty( $_POST['_default_calendar_expand_multi_day_events'] ) ? sanitize_key( $_POST['_default_calendar_expand_multi_day_events'] ) : 'current_day_only';
-		update_post_meta( $post_id, '_default_calendar_expand_multi_day_events', $multi_day );
+		$multi_day = isset($_POST['_default_calendar_expand_multi_day_events']) && ! empty($_POST['_default_calendar_expand_multi_day_events']) ? sanitize_key($_POST['_default_calendar_expand_multi_day_events']) : 'current_day_only';
+		update_post_meta($post_id, '_default_calendar_expand_multi_day_events', $multi_day);
 
 	}
 

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

Spacing +143 added lines, -143 removed lines

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

includes/abstracts/field.php

Spacing +61 added lines, -61 removed lines

@@ -6,7 +6,7 @@ 
  */
 namespace SimpleCalendar\Abstracts;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -150,71 +150,71 @@ 
 	 *
 	 * @param array $field Field data.
 	 */
-	public function __construct( $field ) {
+	public function __construct($field) {
 
 		// Field properties.
-		if ( isset( $field['title'] ) ) {
-			$this->title = esc_attr( $field['title'] );
+		if (isset($field['title'])) {
+			$this->title = esc_attr($field['title']);
 		}
-		if ( isset( $field['description'] ) ) {
-			$this->description = wp_kses_post( $field['description'] );
+		if (isset($field['description'])) {
+			$this->description = wp_kses_post($field['description']);
 		}
-		if ( isset( $field['type'] ) ) {
-			$this->type = esc_attr( $field['type'] );
+		if (isset($field['type'])) {
+			$this->type = esc_attr($field['type']);
 		}
-		if ( isset( $field['name'] ) ) {
-			$this->name = esc_attr( $field['name'] );
+		if (isset($field['name'])) {
+			$this->name = esc_attr($field['name']);
 		}
-		if ( isset( $field['id'] ) ) {
-			$this->id = esc_attr( $field['id'] );
+		if (isset($field['id'])) {
+			$this->id = esc_attr($field['id']);
 		}
-		if ( isset( $field['placeholder'] ) ) {
-			$this->placeholder = esc_attr( $field['placeholder'] );
+		if (isset($field['placeholder'])) {
+			$this->placeholder = esc_attr($field['placeholder']);
 		}
-		if ( isset( $field['options'] ) && is_array( $field['options'] ) ) {
-			$this->options = array_map( 'esc_attr', $field['options'] );
+		if (isset($field['options']) && is_array($field['options'])) {
+			$this->options = array_map('esc_attr', $field['options']);
 		}
-		if ( isset( $field['text'] ) ) {
+		if (isset($field['text'])) {
 			$this->text = $field['text'];
 		}
 
 		// Escaping.
-		if ( ! empty( $field['escaping'] ) && ( is_string( $field['escaping'] ) || is_array( $field['escaping'] ) ) ) {
-			if ( isset( $field['default'] ) ) {
-				$this->default = $this->escape_callback( $field['escaping'], $field['default'] );
+		if ( ! empty($field['escaping']) && (is_string($field['escaping']) || is_array($field['escaping']))) {
+			if (isset($field['default'])) {
+				$this->default = $this->escape_callback($field['escaping'], $field['default']);
 			}
-			if ( isset( $field['value'] ) ) {
-				$this->value = $this->escape_callback( $field['escaping'], $field['value'] );
+			if (isset($field['value'])) {
+				$this->value = $this->escape_callback($field['escaping'], $field['value']);
 			}
 		} else {
-			if ( isset( $field['default'] ) ) {
-				$this->default = $this->escape( $field['default'] );
+			if (isset($field['default'])) {
+				$this->default = $this->escape($field['default']);
 			}
-			if ( isset( $field['value'] ) ) {
-				$this->value = $this->escape( $field['value'] );
+			if (isset($field['value'])) {
+				$this->value = $this->escape($field['value']);
 			}
 		}
 
 		// Validation.
-		if ( ! empty( $field['validation'] ) ) {
-			$this->validation = $this->validate( $field['validation'], $this->value );
+		if ( ! empty($field['validation'])) {
+			$this->validation = $this->validate($field['validation'], $this->value);
 		}
 
 		// CSS classes and styles.
-		$classes = isset( $field['class'] ) ? $field['class'] : '';
-		$this->set_class( $classes );
-		if ( isset( $field['style'] ) ) {
-			$this->set_style( $field['style'] );
+		$classes = isset($field['class']) ? $field['class'] : '';
+		$this->set_class($classes);
+		if (isset($field['style'])) {
+			$this->set_style($field['style']);
 		}
 
 		// Custom attributes.
-		if ( isset( $field['attributes'] ) ) {
-			$this->set_attributes( $field['attributes'] );
+		if (isset($field['attributes'])) {
+			$this->set_attributes($field['attributes']);
 		}
 
 		// Tooltip markup.
-		if ( isset( $field['tooltip'] ) ) {
-			$this->tooltip = ' <i class="simcal-icon-help simcal-help-tip" data-tip="' . esc_attr( $field['tooltip'] ) . '"></i> ' ;
+		if (isset($field['tooltip'])) {
+			$this->tooltip = ' <i class="simcal-icon-help simcal-help-tip" data-tip="'.esc_attr($field['tooltip']).'"></i> ';
 		}
 	}
 
@@ -227,13 +227,13 @@ 
 	 *
 	 * @return void
 	 */
-	public function set_attributes( $attributes ) {
+	public function set_attributes($attributes) {
 
 		$attr = '';
 
-		if ( ! empty( $attributes ) && is_array( $attributes ) ) {
-			foreach ( $attributes as $k => $v ) {
-				$attr .= esc_attr( $k ) . '="' . esc_attr( $v ) . '" ';
+		if ( ! empty($attributes) && is_array($attributes)) {
+			foreach ($attributes as $k => $v) {
+				$attr .= esc_attr($k).'="'.esc_attr($v).'" ';
 			}
 		}
 
@@ -249,13 +249,13 @@ 
 	 *
 	 * @return void
 	 */
-	public function set_style( $css ) {
+	public function set_style($css) {
 
 		$styles = '';
 
-		if ( ! empty( $css ) && is_array( $css ) ) {
-			foreach ( $css as $k => $v ) {
-				$styles .= esc_attr( $k ) . ': ' . esc_attr( $v ) . '; ';
+		if ( ! empty($css) && is_array($css)) {
+			foreach ($css as $k => $v) {
+				$styles .= esc_attr($k).': '.esc_attr($v).'; ';
 			}
 		}
 
@@ -271,23 +271,23 @@ 
 	 *
 	 * @return void
 	 */
-	public function set_class( $class ) {
+	public function set_class($class) {
 
 		$classes = '';
 		$type_class = '';
 		$error = '';
 
-		if ( ! empty( $class ) && is_array( $class ) ) {
-			$classes = implode( ' ', array_map( 'esc_attr', $class ) );
+		if ( ! empty($class) && is_array($class)) {
+			$classes = implode(' ', array_map('esc_attr', $class));
 		}
-		if ( ! empty( $this->type_class ) ) {
-			$type_class = esc_attr( $this->type_class );
+		if ( ! empty($this->type_class)) {
+			$type_class = esc_attr($this->type_class);
 		}
-		if ( true !== $this->validation && ! empty( $this->validation ) ) {
+		if (true !== $this->validation && ! empty($this->validation)) {
 			$error = 'simcal-field-error ';
 		}
 
-		$this->class = trim( $error . 'simcal-field ' . $type_class . ' ' . $classes );
+		$this->class = trim($error.'simcal-field '.$type_class.' '.$classes);
 	}
 
 	/**
@@ -302,8 +302,8 @@ 
 	 *
 	 * @return array|string
 	 */
-	protected function escape( $value )  {
-		return ! empty( $value ) ? ( is_array( $value ) ? array_map( 'esc_attr', $value ) : esc_attr( $value ) ) : '';
+	protected function escape($value) {
+		return ! empty($value) ? (is_array($value) ? array_map('esc_attr', $value) : esc_attr($value)) : '';
 	}
 
 	/**
@@ -319,11 +319,11 @@ 
 	 *
 	 * @return mixed
 	 */
-	protected function escape_callback( $callback, $value ) {
-		if ( $callback && ( is_string( $callback ) || is_array( $callback ) ) ) {
-			return call_user_func( $callback, $value );
+	protected function escape_callback($callback, $value) {
+		if ($callback && (is_string($callback) || is_array($callback))) {
+			return call_user_func($callback, $value);
 		}
-		return esc_attr( $value );
+		return esc_attr($value);
 	}
 
 	/**
@@ -339,10 +339,10 @@ 
 	 *
 	 * @return true|string Expected to return bool (true) if passes, message string if not.
 	 */
-	protected function validate( $callback, $value ) {
-		if ( $callback && ( is_string( $callback ) || is_array( $callback ) ) ) {
-			$screen = function_exists( 'get_current_screen' ) ? get_current_screen() : '';
-			return call_user_func( $callback, $value, $screen );
+	protected function validate($callback, $value) {
+		if ($callback && (is_string($callback) || is_array($callback))) {
+			$screen = function_exists('get_current_screen') ? get_current_screen() : '';
+			return call_user_func($callback, $value, $screen);
 		}
 		return true;
 	}