moonstonemedia / Simple-Calendar

includes/ajax.php

Spacing +7 added lines, -7 removed lines

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

includes/autoload.php

Spacing +10 added lines, -10 removed lines

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

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

Braces +3 added lines, -1 removed lines

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

Spacing +147 added lines, -147 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,28 +113,28 @@ 
 	 *
 	 * @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-fullcal-moment' => array(
-				'src'       => SIMPLE_CALENDAR_ASSETS . 'js/vendor/moment' . $min . '.js',
-				'deps'      => array( 'jquery' ),
+				'src'       => SIMPLE_CALENDAR_ASSETS.'js/vendor/moment'.$min.'.js',
+				'deps'      => array('jquery'),
 				'ver'       => '',
 				'in_footer' => true,
 			),
 			'simcal-moment-timezone' => array(
-				'src'       => SIMPLE_CALENDAR_ASSETS . 'js/vendor/moment-timezone-with-data' . $min . '.js',
-				'deps'      => array( 'jquery' ),
+				'src'       => SIMPLE_CALENDAR_ASSETS.'js/vendor/moment-timezone-with-data'.$min.'.js',
+				'deps'      => array('jquery'),
 				'ver'       => '',
 				'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',
@@ -161,15 +161,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',
 				),
@@ -177,7 +177,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',
 				),
@@ -196,22 +196,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="<?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="<?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
@@ -220,26 +220,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>
@@ -249,28 +249,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;
@@ -280,7 +280,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>
 
@@ -306,85 +306,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++;
@@ -394,103 +394,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;
 
@@ -502,49 +502,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;
@@ -553,27 +553,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();
 	}
@@ -585,17 +585,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.');
 
 		}
 
@@ -611,8 +611,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);
 	}
 
 	/**
@@ -625,8 +625,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);
 	}
 
 }

Doc Comments +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
 	 *
 	 * @since 3.0.0
 	 *
-	 * @param string|Calendar $calendar
+	 * @param Default_Calendar $calendar
 	 */
 	public function __construct( $calendar = '' ) {
 		$this->calendar = $calendar;

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

Braces +3 added lines, -1 removed lines

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

Doc Comments +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
 	 *
 	 * @since 3.0.0
 	 *
-	 * @param string|Calendar $calendar
+	 * @param Default_Calendar $calendar
 	 */
 	public function __construct( $calendar = '' ) {
 		$this->calendar = $calendar;

Spacing +211 added lines, -211 removed lines

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

includes/events/events.php

Spacing +123 added lines, -123 removed lines

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

Doc Comments +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
 	 * @since 3.0.0
 	 *
 	 * @param array $e Events.
-	 * @param string|\DateTimeZone $tz Timezone.
+	 * @param string $tz Timezone.
 	 */
 	public function __construct( $e = array(), $tz = 'UTC' ) {
 		$this->set_events( $e );
@@ -269,7 +269,7 @@ 
 	 *
 	 * @since  3.0.0
 	 *
-	 * @param  int|string $present
+	 * @param  integer $present
 	 *
 	 * @return Events
 	 */
@@ -290,7 +290,7 @@ 
 	 *
 	 * @since  3.0.0
 	 *
-	 * @param  int|string $present
+	 * @param  integer $present
 	 *
 	 * @return Events
 	 */

includes/functions/deprecated.php

Spacing +14 added lines, -14 removed lines

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

includes/installation.php

Spacing +26 added lines, -26 removed lines

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

includes/post-types.php

Spacing +112 added lines, -112 removed lines

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

includes/shortcodes.php

Spacing +12 added lines, -12 removed lines

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