moonstonemedia / Simple-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 );
 

Spacing +190 added lines, -190 removed lines

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

includes/events/event-builder.php

Indentation +64 added lines, -64 removed lines

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

Spacing +306 added lines, -306 removed lines

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

includes/events/events.php

Spacing +123 added lines, -123 removed lines

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

includes/feeds/admin/grouped-calendars-admin.php

Spacing +40 added lines, -40 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Feeds\Grouped_Calendars;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -34,15 +34,15 @@ 
 	 *
 	 * @param Grouped_Calendars $feed
 	 */
-	public function __construct( Grouped_Calendars $feed ) {
+	public function __construct(Grouped_Calendars $feed) {
 
 		$this->feed = $feed;
 
-		if ( 'calendar' == simcal_is_admin_screen() ) {
-			add_filter( 'simcal_settings_meta_tabs_li', array( $this, 'add_settings_meta_tab_li' ), 10, 1 );
-			add_action( 'simcal_settings_meta_panels', array( $this, 'add_settings_meta_panel' ), 10, 1 );
+		if ('calendar' == simcal_is_admin_screen()) {
+			add_filter('simcal_settings_meta_tabs_li', array($this, 'add_settings_meta_tab_li'), 10, 1);
+			add_action('simcal_settings_meta_panels', array($this, 'add_settings_meta_panel'), 10, 1);
 		}
-		add_action( 'simcal_process_settings_meta', array( $this, 'process_meta' ), 10, 1 );
+		add_action('simcal_process_settings_meta', array($this, 'process_meta'), 10, 1);
 	}
 
 	/**
@@ -54,8 +54,8 @@ 
 	 *
 	 * @return array
 	 */
-	public function add_settings_meta_tab_li( $tabs ) {
-		return array_merge( $tabs, array(
+	public function add_settings_meta_tab_li($tabs) {
+		return array_merge($tabs, array(
 			'grouped-calendars' => array(
 				'label'   => $this->feed->name,
 				'target'  => 'grouped-calendars-settings-panel',
@@ -75,40 +75,40 @@ 
 	 *
 	 * @param int $post_id
 	 */
-	public function add_settings_meta_panel( $post_id ) {
+	public function add_settings_meta_panel($post_id) {
 
 		?>
 		<div id="grouped-calendars-settings-panel" class="simcal-panel">
 			<table>
 				<thead>
-				<tr><th colspan="2"><?php _e( 'Grouped Calendar settings', 'google-calendar-events' ); ?></th></tr>
+				<tr><th colspan="2"><?php _e('Grouped Calendar settings', 'google-calendar-events'); ?></th></tr>
 				</thead>
 				<tbody class="simcal-panel-section">
 				<tr class="simcal-panel-field">
-					<th><label for="_grouped_calendars_source"><?php _e( 'Get calendars from', 'google-calendar-events' ); ?></label></th>
+					<th><label for="_grouped_calendars_source"><?php _e('Get calendars from', 'google-calendar-events'); ?></label></th>
 					<td>
 						<?php
 
-						$source = esc_attr( get_post_meta( $post_id, '_grouped_calendars_source', true ) );
-						$source = empty( $source ) ? 'ids' : $source;
+						$source = esc_attr(get_post_meta($post_id, '_grouped_calendars_source', true));
+						$source = empty($source) ? 'ids' : $source;
 
 						?>
 						<select name="_grouped_calendars_source"
 						        id="_grouped_calendars_source"
 						        class="simcal-field simcal-field-select simcal-field-inline simcal-field-show-other"
 						        data-show-field-on-choice="true">
-							<option value="ids" data-show-field="_grouped_calendars_ids" <?php selected( 'ids', $source, true ); ?>><?php _e( 'Manual selection', 'google-calendar-events' ); ?></option>
-							<option value="category" data-show-field="_grouped_calendars_category" <?php selected( 'category', $source, true ); ?>><?php _e( 'Category', 'google-calendar-events' ); ?></option>
+							<option value="ids" data-show-field="_grouped_calendars_ids" <?php selected('ids', $source, true); ?>><?php _e('Manual selection', 'google-calendar-events'); ?></option>
+							<option value="category" data-show-field="_grouped_calendars_category" <?php selected('category', $source, true); ?>><?php _e('Category', 'google-calendar-events'); ?></option>
 						</select>
-						<i class="simcal-icon-help simcal-help-tip" data-tip="<?php _e( 'Choose from which calendar feeds you want to get events from. Choose them individually or select all those belonging to calendar feed categories.', 'google-calendar-events' ); ?>"></i>
+						<i class="simcal-icon-help simcal-help-tip" data-tip="<?php _e('Choose from which calendar feeds you want to get events from. Choose them individually or select all those belonging to calendar feed categories.', 'google-calendar-events'); ?>"></i>
 						<br><br>
 						<?php
 
-						$cals = simcal_get_calendars( $post_id );
-						$meta = get_post_meta( $post_id, '_grouped_calendars_ids', true );
-						$ids  = $meta && is_array( $meta ) ? implode( ',', array_map( 'absint', $meta ) ) : absint( $meta );
+						$cals = simcal_get_calendars($post_id);
+						$meta = get_post_meta($post_id, '_grouped_calendars_ids', true);
+						$ids  = $meta && is_array($meta) ? implode(',', array_map('absint', $meta)) : absint($meta);
 
-						simcal_print_field( array(
+						simcal_print_field(array(
 							'type'        => 'select',
 							'multiselect' => 'multiselect',
 							'name'        => '_grouped_calendars_ids',
@@ -116,25 +116,25 @@ 
 							'value'       => $ids !== 0 ? $ids : '',
 							'options'     => $cals,
 							'enhanced'    => 'enhanced',
-							'style'       => 'ids' == $source ? '' : array( 'display' => 'none' ),
+							'style'       => 'ids' == $source ? '' : array('display' => 'none'),
 							'attributes'  => array(
-								'data-noresults' => __( 'No results found.', 'google-calendar-events' ),
+								'data-noresults' => __('No results found.', 'google-calendar-events'),
 							),
 						));
 
-						$meta = get_post_meta( $post_id, '_grouped_calendars_category', true );
-						$category = $meta && is_array( $meta ) ? implode( ',', array_map( 'absint', $meta ) ): '';
+						$meta = get_post_meta($post_id, '_grouped_calendars_category', true);
+						$category = $meta && is_array($meta) ? implode(',', array_map('absint', $meta)) : '';
 
-						$terms = get_terms( 'calendar_category' );
+						$terms = get_terms('calendar_category');
 
-						if ( ! empty( $terms ) ) {
+						if ( ! empty($terms)) {
 
 							$categories = array();
-							foreach ( $terms as $term ) {
-								$categories[ $term->term_id ] = $term->name;
+							foreach ($terms as $term) {
+								$categories[$term->term_id] = $term->name;
 							}
 
-							simcal_print_field( array(
+							simcal_print_field(array(
 								'type'        => 'select',
 								'multiselect' => 'multiselect',
 								'name'        => '_grouped_calendars_category',
@@ -142,17 +142,17 @@ 
 								'value'       => $category,
 								'options'     => $categories,
 								'enhanced'    => 'enhanced',
-								'style'       => 'category' == $source ? '' : array( 'display' => 'none' ),
+								'style'       => 'category' == $source ? '' : array('display' => 'none'),
 								'attributes'  => array(
-									'data-noresults' => __( 'No results found.', 'google-calendar-events' ),
+									'data-noresults' => __('No results found.', 'google-calendar-events'),
 								),
-							) );
+							));
 
 						} else {
 
 							$style = 'category' == $source ? '' : 'display: none;';
 							$style .= ' width: 100%; max-width: 500px';
-							echo '<input type="text" disabled="disabled" name="_grouped_calendars_category" id="_grouped_calendars_category" style="' . $style . '" placeholder="' . __( 'There are no calendar categories yet.', 'google-calendar-events' ) . '" />';
+							echo '<input type="text" disabled="disabled" name="_grouped_calendars_category" id="_grouped_calendars_category" style="'.$style.'" placeholder="'.__('There are no calendar categories yet.', 'google-calendar-events').'" />';
 
 						}
 
@@ -173,16 +173,16 @@ 
 	 *
 	 * @param int $post_id
 	 */
-	public function process_meta( $post_id ) {
+	public function process_meta($post_id) {
 
-		$source = isset( $_POST['_grouped_calendars_source'] ) ? sanitize_key( $_POST['_grouped_calendars_source'] ) : 'ids';
-		update_post_meta( $post_id, '_grouped_calendars_source', $source );
+		$source = isset($_POST['_grouped_calendars_source']) ? sanitize_key($_POST['_grouped_calendars_source']) : 'ids';
+		update_post_meta($post_id, '_grouped_calendars_source', $source);
 
-		$ids = isset( $_POST['_grouped_calendars_ids'] ) ? array_map( 'absint', $_POST['_grouped_calendars_ids'] ) : '';
-		update_post_meta( $post_id, '_grouped_calendars_ids', $ids );
+		$ids = isset($_POST['_grouped_calendars_ids']) ? array_map('absint', $_POST['_grouped_calendars_ids']) : '';
+		update_post_meta($post_id, '_grouped_calendars_ids', $ids);
 
-		$category = isset( $_POST['_grouped_calendars_category'] ) ? array_map( 'absint', $_POST['_grouped_calendars_category'] ) : '';
-		update_post_meta( $post_id, '_grouped_calendars_category', $category );
+		$category = isset($_POST['_grouped_calendars_category']) ? array_map('absint', $_POST['_grouped_calendars_category']) : '';
+		update_post_meta($post_id, '_grouped_calendars_category', $category);
 
 	}
 

includes/functions/admin.php

Spacing +81 added lines, -81 removed lines

@@ -7,7 +7,7 @@ 
  * @package SimpleCalendar/Admin/Functions
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -32,9 +32,9 @@ 
  *
  * @return null|\SimpleCalendar\Abstracts\Admin_Page
  */
-function simcal_get_admin_page( $page ) {
+function simcal_get_admin_page($page) {
 	$objects = \SimpleCalendar\plugin()->objects;
-	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_admin_page( $page ) : null;
+	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_admin_page($page) : null;
 }
 
 /**
@@ -47,9 +47,9 @@ 
  *
  * @return null|\SimpleCalendar\Abstracts\Field
  */
-function simcal_get_field( $args, $name = '' ) {
+function simcal_get_field($args, $name = '') {
 	$objects = \SimpleCalendar\plugin()->objects;
-	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_field( $args, $name ) : null;
+	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_field($args, $name) : null;
 }
 
 /**
@@ -62,11 +62,11 @@ 
  *
  * @return void
  */
-function simcal_print_field( $args, $name = '' ) {
+function simcal_print_field($args, $name = '') {
 
-	$field = simcal_get_field( $args, $name );
+	$field = simcal_get_field($args, $name);
 
-	if ( $field instanceof \SimpleCalendar\Abstracts\Field ) {
+	if ($field instanceof \SimpleCalendar\Abstracts\Field) {
 		$field->html();
 	}
 }
@@ -80,50 +80,50 @@ 
  *
  * @return bool
  */
-function simcal_delete_feed_transients( $id = '' ) {
+function simcal_delete_feed_transients($id = '') {
 
-	if ( is_numeric( $id ) ) {
-		$id = intval( $id ) > 0 ? absint( $id ) : simcal_get_calendars();
-	} elseif ( $id instanceof WP_Post ) {
+	if (is_numeric($id)) {
+		$id = intval($id) > 0 ? absint($id) : simcal_get_calendars();
+	} elseif ($id instanceof WP_Post) {
 		$id = $id->ID;
-	} elseif ( is_array( $id ) ) {
-		$id = array_map( 'absint', $id );
+	} elseif (is_array($id)) {
+		$id = array_map('absint', $id);
 	} else {
-		$id = simcal_get_calendars( '', true );
+		$id = simcal_get_calendars('', true);
 	}
 
 	$feed_types = simcal_get_feed_types();
 
-	if ( is_array( $id ) ) {
+	if (is_array($id)) {
 
-		$posts = get_posts( array(
+		$posts = get_posts(array(
 			'post_type' => 'calendar',
 			'fields'    => 'ids',
 			'post__in'  => $id,
 			'nopaging'  => true,
-		) );
+		));
 
-		foreach ( $posts as $post ) {
-			$calendar = simcal_get_calendar( $post );
-			if ( $calendar instanceof \SimpleCalendar\Abstracts\Calendar ) {
-				foreach ( $feed_types as $feed_type ) {
-					delete_transient( '_simple-calendar_feed_id_' . strval( $calendar->id ) . '_' . $feed_type );
+		foreach ($posts as $post) {
+			$calendar = simcal_get_calendar($post);
+			if ($calendar instanceof \SimpleCalendar\Abstracts\Calendar) {
+				foreach ($feed_types as $feed_type) {
+					delete_transient('_simple-calendar_feed_id_'.strval($calendar->id).'_'.$feed_type);
 				}
 			}
 		}
 
 	} else {
 
-		$post = get_post( $id );
-		$calendar = simcal_get_calendar( $post );
-		if ( $calendar instanceof \SimpleCalendar\Abstracts\Calendar ) {
-			foreach ( $feed_types as $feed_type ) {
-				delete_transient( '_simple-calendar_feed_id_' . strval( $calendar->id ) . '_' . $feed_type );
+		$post = get_post($id);
+		$calendar = simcal_get_calendar($post);
+		if ($calendar instanceof \SimpleCalendar\Abstracts\Calendar) {
+			foreach ($feed_types as $feed_type) {
+				delete_transient('_simple-calendar_feed_id_'.strval($calendar->id).'_'.$feed_type);
 			}
 		}
 	}
 
-	return delete_transient( '_simple-calendar_feed_ids' );
+	return delete_transient('_simple-calendar_feed_ids');
 }
 
 /**
@@ -139,33 +139,33 @@ 
  *
  * @return array|string Sanitized variable
  */
-function simcal_sanitize_input( $var, $func = 'sanitize_text_field'  ) {
+function simcal_sanitize_input($var, $func = 'sanitize_text_field') {
 
-	if ( is_null( $var ) ) {
+	if (is_null($var)) {
 		return '';
 	}
 
-	if ( is_bool( $var ) ) {
-		if ( $var === true ) {
+	if (is_bool($var)) {
+		if ($var === true) {
 			return 'yes';
 		} else {
 			return 'no';
 		}
 	}
 
-	if ( is_string( $var ) || is_numeric( $var ) ) {
-		$func = is_string( $func ) && function_exists( $func ) ? $func : 'sanitize_text_field';
-		return call_user_func( $func, trim( strval( $var ) ) );
+	if (is_string($var) || is_numeric($var)) {
+		$func = is_string($func) && function_exists($func) ? $func : 'sanitize_text_field';
+		return call_user_func($func, trim(strval($var)));
 	}
 
-	if ( is_object( $var ) ) {
+	if (is_object($var)) {
 		$var = (array) $var;
 	}
 
-	if ( is_array( $var ) ) {
+	if (is_array($var)) {
 		$array = array();
-		foreach ( $var as $k => $v ) {
-			$array[ $k ] = simcal_sanitize_input( $v );
+		foreach ($var as $k => $v) {
+			$array[$k] = simcal_sanitize_input($v);
 		}
 		return $array;
 	}
@@ -183,9 +183,9 @@ 
  */
 function simcal_is_admin_screen() {
 
-	$view = function_exists( 'get_current_screen' ) ? get_current_screen() : false;
+	$view = function_exists('get_current_screen') ? get_current_screen() : false;
 
-	if ( $view instanceof WP_Screen ) {
+	if ($view instanceof WP_Screen) {
 
 		// Screens used by this plugin.
 		$screens = array(
@@ -200,7 +200,7 @@ 
 			'dashboard_page_simple-calendar_credits',
 			'dashboard_page_simple-calendar_translators',
 		);
-		if ( in_array( $view->id, $screens ) ) {
+		if (in_array($view->id, $screens)) {
 			return $view->id;
 		}
 	}
@@ -219,8 +219,8 @@ 
  *
  * @return \SimpleCalendar\Admin\Updater
  */
-function simcal_addon_updater( $_api_url, $_plugin_file, $_api_data = null ) {
-	return new \SimpleCalendar\Admin\Updater( $_api_url, $_plugin_file, $_api_data );
+function simcal_addon_updater($_api_url, $_plugin_file, $_api_data = null) {
+	return new \SimpleCalendar\Admin\Updater($_api_url, $_plugin_file, $_api_data);
 }
 
 /**
@@ -232,10 +232,10 @@ 
  *
  * @return null|string
  */
-function simcal_get_license_key( $addon ) {
-	$licenses = get_option( 'simple-calendar_settings_licenses', array() );
-	if ( isset( $licenses['keys'][ $addon ] ) ) {
-		return empty( $licenses['keys'][ $addon ] ) ? null : $licenses['keys'][ $addon ];
+function simcal_get_license_key($addon) {
+	$licenses = get_option('simple-calendar_settings_licenses', array());
+	if (isset($licenses['keys'][$addon])) {
+		return empty($licenses['keys'][$addon]) ? null : $licenses['keys'][$addon];
 	}
 	return null;
 }
@@ -251,9 +251,9 @@ 
  *
  * @return array|string
  */
-function simcal_get_license_status( $addon = null ) {
-	$licenses = get_option( 'simple-calendar_licenses_status', array() );
-	return isset( $licenses[ $addon ] ) ? $licenses[ $addon ] : $licenses;
+function simcal_get_license_status($addon = null) {
+	$licenses = get_option('simple-calendar_licenses_status', array());
+	return isset($licenses[$addon]) ? $licenses[$addon] : $licenses;
 }
 
 /**
@@ -274,7 +274,7 @@ 
  * @since 3.0.0
  */
 function simcal_delete_admin_notices() {
-	delete_option( 'simple-calendar_admin_notices' );
+	delete_option('simple-calendar_admin_notices');
 }
 
 /**
@@ -286,22 +286,22 @@ 
  *
  * @return void
  */
-function simcal_print_shortcode_tip( $post_id ) {
+function simcal_print_shortcode_tip($post_id) {
 
 	$browser = new \Browser();
-	if ( $browser::PLATFORM_APPLE == $browser->getPlatform() ) {
+	if ($browser::PLATFORM_APPLE == $browser->getPlatform()) {
 		$cmd = '⌘+C';
 	} else {
 		$cmd = 'Ctrl+C';
 	}
 
-	$shortcut  = sprintf( __( 'Press %s to copy.', 'google-calendar-events' ), $cmd );
-	$shortcode = sprintf( '[calendar id="%s"]', $post_id );
+	$shortcut  = sprintf(__('Press %s to copy.', 'google-calendar-events'), $cmd);
+	$shortcode = sprintf('[calendar id="%s"]', $post_id);
 
-	echo "<input readonly='readonly' " .
-				"class='simcal-shortcode simcal-calendar-shortcode simcal-shortcode-tip' " .
-				"title='" . $shortcut . "' " .
-				"onclick='this.select();' value='" . $shortcode . "' />";
+	echo "<input readonly='readonly' ".
+				"class='simcal-shortcode simcal-calendar-shortcode simcal-shortcode-tip' ".
+				"title='".$shortcut."' ".
+				"onclick='this.select();' value='".$shortcode."' />";
 }
 
 /**
@@ -316,20 +316,20 @@ 
  *
  * @return  string  $url        Full Google Analytics campaign URL
  */
-function simcal_ga_campaign_url( $base_url, $campaign, $content, $raw = false ) {
+function simcal_ga_campaign_url($base_url, $campaign, $content, $raw = false) {
 
-	$url = add_query_arg( array(
+	$url = add_query_arg(array(
 		'utm_source'   => 'inside-plugin',
 		'utm_medium'   => 'link',
 		'utm_campaign' => $campaign, // i.e. 'core-plugin', 'gcal-pro'
 		'utm_content'  => $content // i.e. 'sidebar-link', 'settings-link'
-	), $base_url );
+	), $base_url);
 
-	if ( $raw ) {
-		return esc_url_raw( $url );
+	if ($raw) {
+		return esc_url_raw($url);
 	}
 
-	return esc_url( $url );
+	return esc_url($url);
 }
 
 /**
@@ -341,7 +341,7 @@ 
  */
 function simcal_newsletter_signup() {
 
-	if ( $screen = simcal_is_admin_screen() ) {
+	if ($screen = simcal_is_admin_screen()) {
 
 		global $current_user;
 		get_currentuserinfo();
@@ -352,11 +352,11 @@ 
 		<div id="simcal-drip" class="<?php echo $screen; ?>">
 			<div class="signup">
 				<p>
-					<?php _e( "Enter your name and email and we'll send you a coupon code for 20% off our Google Calendar Pro add-on.", 'google-calendar-events' ); ?>
+					<?php _e("Enter your name and email and we'll send you a coupon code for 20% off our Google Calendar Pro add-on.", 'google-calendar-events'); ?>
 				</p>
 
 				<p>
-					<label for="simcal-drip-field-email"><?php _e( 'Your Email', 'google-calendar-events' ); ?></label><br />
+					<label for="simcal-drip-field-email"><?php _e('Your Email', 'google-calendar-events'); ?></label><br />
 					<input type="email"
 					       id="simcal-drip-field-email"
 					       name="fields[email]"
@@ -364,7 +364,7 @@ 
 				</p>
 
 				<p>
-					<label for="simcal-drip-field-first_name"><?php _e( 'First Name', 'google-calendar-events' ); ?></label><br />
+					<label for="simcal-drip-field-first_name"><?php _e('First Name', 'google-calendar-events'); ?></label><br />
 					<input type="text"
 					       id="simcal-drip-field-first_name"
 					       name="fields[first_name]"
@@ -373,15 +373,15 @@ 
 				<p class="textright">
 					<a href="#"
 					   id="simcal-drip-signup"
-					   class="button button-primary"><?php _e( 'Send me the coupon', 'google-calendar-events' ); ?></a>
+					   class="button button-primary"><?php _e('Send me the coupon', 'google-calendar-events'); ?></a>
 				</p>
 				<div class="textright">
-					<a href="<?php echo simcal_ga_campaign_url( simcal_get_url( 'gcal-pro' ), 'core-plugin', 'sidebar-link' ); ?>"
-					   target="_blank"><?php _e( 'Just take me to GCal Pro', 'google-calendar-events' ); ?></a>
+					<a href="<?php echo simcal_ga_campaign_url(simcal_get_url('gcal-pro'), 'core-plugin', 'sidebar-link'); ?>"
+					   target="_blank"><?php _e('Just take me to GCal Pro', 'google-calendar-events'); ?></a>
 				</div>
 			</div>
 			<div class="thank-you" style="display: none;">
-				<?php _e( 'Thank you!', 'google-calendar-events' ); ?>
+				<?php _e('Thank you!', 'google-calendar-events'); ?>
 			</div>
 			<div class="clear">
 			</div>
@@ -392,7 +392,7 @@ 
 
 }
 
-if ( ! function_exists( 'mb_detect_encoding' ) ) {
+if ( ! function_exists('mb_detect_encoding')) {
 
 	/**
 	 * Fallback function for `mb_detect_encoding()`,
@@ -406,7 +406,7 @@ 
 	 *
 	 * @return bool
 	 */
-	function mb_detect_encoding( $string, $enc = null, $ret = null ) {
+	function mb_detect_encoding($string, $enc = null, $ret = null) {
 
 		static $enclist = array(
 			'UTF-8',
@@ -432,10 +432,10 @@ 
 
 		$result = false;
 
-		foreach ( $enclist as $item ) {
-			$sample = iconv( $item, $item, $string );
-			if ( md5( $sample ) == md5( $string ) ) {
-				if ( $ret === null ) {
+		foreach ($enclist as $item) {
+			$sample = iconv($item, $item, $string);
+			if (md5($sample) == md5($string)) {
+				if ($ret === null) {
 					$result = $item;
 				} else {
 					$result = true;

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/functions/shared.php

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Shared functions
- *
- * Functions shared by both back end and front end components.
- *
- * @package SimpleCalendar/Functions
- */
+	 * Shared functions
+	 *
+	 * Functions shared by both back end and front end components.
+	 *
+	 * @package SimpleCalendar/Functions
+	 */
 
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;

Spacing +84 added lines, -84 removed lines

@@ -7,7 +7,7 @@ 
  * @package SimpleCalendar/Functions
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -20,17 +20,17 @@ 
  */
 function is_simple_calendar() {
 
-	if ( is_singular() ) {
+	if (is_singular()) {
 
 		global $post, $post_type;
 
-		if ( 'calendar' == $post_type ) {
+		if ('calendar' == $post_type) {
 			return true;
 		} else {
-			if ( false !== get_post_meta( $post->ID, '_simcal_attach_calendar_id', true ) ) {
+			if (false !== get_post_meta($post->ID, '_simcal_attach_calendar_id', true)) {
 				return true;
 			}
-			if ( has_shortcode( $post->post_content, 'calendar' ) ) {
+			if (has_shortcode($post->post_content, 'calendar')) {
 				return true;
 			}
 		}
@@ -46,8 +46,8 @@ 
  *
  * @return string
  */
-function simcal_get_url( $url ) {
-	return \SimpleCalendar\plugin()->get_url( $url );
+function simcal_get_url($url) {
+	return \SimpleCalendar\plugin()->get_url($url);
 }
 
 /**
@@ -71,9 +71,9 @@ 
  *
  * @return null|\SimpleCalendar\Abstracts\Feed
  */
-function simcal_get_feed( $object ) {
+function simcal_get_feed($object) {
 	$objects = \SimpleCalendar\plugin()->objects;
-	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_feed( $object ) : null;
+	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_feed($object) : null;
 }
 
 /**
@@ -97,9 +97,9 @@ 
  *
  * @return null|\SimpleCalendar\Abstracts\Calendar
  */
-function simcal_get_calendar( $object ) {
+function simcal_get_calendar($object) {
 	$objects = \SimpleCalendar\plugin()->objects;
-	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_calendar( $object ) : null;
+	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_calendar($object) : null;
 }
 
 /**
@@ -112,9 +112,9 @@ 
  *
  * @return mixed
  */
-function simcal_get_calendar_view( $id = 0, $name = '' ) {
+function simcal_get_calendar_view($id = 0, $name = '') {
 	$objects = \SimpleCalendar\plugin()->objects;
-	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_calendar_view( $id, $name ) : false;
+	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_calendar_view($id, $name) : false;
 }
 
 /**
@@ -126,11 +126,11 @@ 
  *
  * @return void
  */
-function simcal_print_calendar( $object ) {
+function simcal_print_calendar($object) {
 
-	$calendar = simcal_get_calendar( $object );
+	$calendar = simcal_get_calendar($object);
 
-	if ( $calendar instanceof \SimpleCalendar\Abstracts\Calendar ) {
+	if ($calendar instanceof \SimpleCalendar\Abstracts\Calendar) {
 		$calendar->html();
 	}
 }
@@ -148,21 +148,21 @@ 
 
 	$vars = array(
 		'ajax_url'  => \SimpleCalendar\plugin()->ajax_url(),
-		'nonce'     => wp_create_nonce( 'simcal' ),
+		'nonce'     => wp_create_nonce('simcal'),
 		'locale'    => \SimpleCalendar\plugin()->locale,
 		'text_dir'  => is_rtl() ? 'rtl' : 'ltr',
 		'months'    => array(
-			'full'  => simcal_get_calendar_names_i18n( 'month', 'full' ),
-			'short' => simcal_get_calendar_names_i18n( 'month', 'short' ),
+			'full'  => simcal_get_calendar_names_i18n('month', 'full'),
+			'short' => simcal_get_calendar_names_i18n('month', 'short'),
 		),
 		'days'      => array(
-			'full'  => simcal_get_calendar_names_i18n( 'day', 'full' ),
-			'short' => simcal_get_calendar_names_i18n( 'day', 'short' ),
+			'full'  => simcal_get_calendar_names_i18n('day', 'full'),
+			'short' => simcal_get_calendar_names_i18n('day', 'short'),
 		),
-		'meridiem' => simcal_get_calendar_names_i18n( 'meridiem' ),
+		'meridiem' => simcal_get_calendar_names_i18n('meridiem'),
 	);
 
-	return array_merge( $vars, apply_filters( 'simcal_common_scripts_variables', array() ) );
+	return array_merge($vars, apply_filters('simcal_common_scripts_variables', array()));
 }
 
 /**
@@ -175,31 +175,31 @@ 
  *
  * @return array Associative array with ids as keys and feed titles as values.
  */
-function simcal_get_calendars( $exclude = '', $cached = true ) {
+function simcal_get_calendars($exclude = '', $cached = true) {
 
-	$calendars = get_transient( '_simple-calendar_feed_ids' );
+	$calendars = get_transient('_simple-calendar_feed_ids');
 
-	if ( ! $calendars || $cached === false ) {
+	if ( ! $calendars || $cached === false) {
 
-		$posts = get_posts( array(
+		$posts = get_posts(array(
 			'post_type' => 'calendar',
 			'nopaging'  => true,
-		) );
+		));
 
 		$calendars = array();
-		foreach ( $posts as $post ) {
-			$calendars[ $post->ID ] = $post->post_title;
+		foreach ($posts as $post) {
+			$calendars[$post->ID] = $post->post_title;
 		}
-		asort( $calendars );
+		asort($calendars);
 
-		set_transient( '_simple-calendar_feed_ids', $calendars, 604800 );
+		set_transient('_simple-calendar_feed_ids', $calendars, 604800);
 	}
 
-	if ( ! empty( $exclude ) ) {
-		if ( is_numeric( $exclude ) ) {
-			unset( $calendars[ intval( $exclude ) ] );
-		} elseif ( is_array( $exclude ) ) {
-			array_diff_key( $calendars, array_map( 'intval', array_keys( $exclude ) ) );
+	if ( ! empty($exclude)) {
+		if (is_numeric($exclude)) {
+			unset($calendars[intval($exclude)]);
+		} elseif (is_array($exclude)) {
+			array_diff_key($calendars, array_map('intval', array_keys($exclude)));
 		}
 	}
 
@@ -218,45 +218,45 @@ 
  *
  * @return array
  */
-function simcal_get_calendar_names_i18n( $group, $style = 'full' ) {
+function simcal_get_calendar_names_i18n($group, $style = 'full') {
 
 	$names = array();
 
-	if ( in_array( $group, array( 'month', 'day', 'meridiem' ) ) ) {
+	if (in_array($group, array('month', 'day', 'meridiem'))) {
 
 		$format = '';
 		$length = 0;
 
 		$date = Carbon\Carbon::now();
 
-		if ( 'month' == $group ) {
-			$date->month( 0 )->startOfMonth();
+		if ('month' == $group) {
+			$date->month(0)->startOfMonth();
 			$format = 'short' == $style ? 'M' : 'F';
 			$length = 11;
-		} elseif ( 'day' == $group ) {
-			$date->next( 6 );
+		} elseif ('day' == $group) {
+			$date->next(6);
 			$format = 'short' == $style ? 'D' : 'l';
 			$length = 6;
-		} elseif ( 'meridiem' == $group ) {
+		} elseif ('meridiem' == $group) {
 			$date->startOfDay();
-			$am = $date->addHour( 1 )->getTimestamp();
-			$pm = $date->addHours( 13 )->getTimestamp();
+			$am = $date->addHour(1)->getTimestamp();
+			$pm = $date->addHours(13)->getTimestamp();
 			return array(
-				'AM' => date_i18n( 'A', $am ),
-				'am' => date_i18n( 'a', $am ),
-				'PM' => date_i18n( 'A', $pm ),
-				'pm' => date_i18n( 'a', $pm ),
+				'AM' => date_i18n('A', $am),
+				'am' => date_i18n('a', $am),
+				'PM' => date_i18n('A', $pm),
+				'pm' => date_i18n('a', $pm),
 			);
 		}
 
 		$i = 0;
-		while ( $i <= $length ) {
-			if ( 'month' == $group ) {
-				$date->addMonths( 1 );
+		while ($i <= $length) {
+			if ('month' == $group) {
+				$date->addMonths(1);
 			} else {
-				$date->addDays( 1 );
+				$date->addDays(1);
 			}
-			$names[ strval( $i ) ] = date_i18n( $format, $date->getTimestamp() );
+			$names[strval($i)] = date_i18n($format, $date->getTimestamp());
 			$i++;
 		}
 
@@ -274,15 +274,15 @@ 
  */
 function simcal_default_event_template() {
 
-	$content  = '<strong>' . '[title]' . '</strong>';
+	$content  = '<strong>'.'[title]'.'</strong>';
 	$content .= '<p>';
-	$content .= '[when]' . "\n";
+	$content .= '[when]'."\n";
 	$content .= '[location]';
 	$content .= '</p>';
-	$content .= '<div>' . '[description]' . '</div>';
-	$content .= '<p>' . '[link newwindow="yes"]' . __( 'See more details', 'google-calendar-events' ) . '[/link]' . '</p>';
+	$content .= '<div>'.'[description]'.'</div>';
+	$content .= '<p>'.'[link newwindow="yes"]'.__('See more details', 'google-calendar-events').'[/link]'.'</p>';
 
-	return apply_filters( 'simcal_default_event_template', $content );
+	return apply_filters('simcal_default_event_template', $content);
 }
 
 /**
@@ -297,21 +297,21 @@ 
  *
  * @return array
  */
-function simcal_get_date_format_order( $date_format ) {
+function simcal_get_date_format_order($date_format) {
 
 	$pos = array(
-		'd' => strpos( $date_format, strpbrk( $date_format, 'Dj' ) ),
-		'm' => strpos( $date_format, strpbrk( $date_format, 'FMmn' ) ),
-		'y' => strpos( $date_format, strpbrk( $date_format, 'Yy' ) ),
+		'd' => strpos($date_format, strpbrk($date_format, 'Dj')),
+		'm' => strpos($date_format, strpbrk($date_format, 'FMmn')),
+		'y' => strpos($date_format, strpbrk($date_format, 'Yy')),
 	);
 
 	// @TODO When one date piece is not found, perhaps fallback to ISO standard position.
 
 	$order = array();
-	foreach ( $pos as $k => $v ) {
-		$order[ $k ] = $v;
+	foreach ($pos as $k => $v) {
+		$order[$k] = $v;
 	}
-	ksort( $order );
+	ksort($order);
 
 	return $order;
 }
@@ -327,11 +327,11 @@ 
  */
 function simcal_get_wp_timezone() {
 
-	$timezone = get_option( 'timezone_string' );
+	$timezone = get_option('timezone_string');
 
-	if ( empty( $timezone ) ) {
-		$gmt = get_option( 'gmt_offset' );
-		$timezone = simcal_get_timezone_from_gmt_offset( $gmt );
+	if (empty($timezone)) {
+		$gmt = get_option('gmt_offset');
+		$timezone = simcal_get_timezone_from_gmt_offset($gmt);
 	}
 
 	return $timezone;
@@ -348,26 +348,26 @@ 
  *
  * @return null|string
  */
-function simcal_get_timezone_from_gmt_offset( $offset ) {
+function simcal_get_timezone_from_gmt_offset($offset) {
 
-	if ( is_numeric( $offset ) ) {
+	if (is_numeric($offset)) {
 
-		if ( 0 === intval( $offset ) ) {
+		if (0 === intval($offset)) {
 			return 'UTC';
 		} else {
-			$offset = floatval( $offset ) * 3600;
+			$offset = floatval($offset) * 3600;
 		}
 
-		$timezone = timezone_name_from_abbr( null, $offset, false );
+		$timezone = timezone_name_from_abbr(null, $offset, false);
 		// This is buggy and might return false:
 		// @see http://php.net/manual/en/function.timezone-name-from-abbr.php#86928
 		// Therefore:
-		if ( false == $timezone ) {
+		if (false == $timezone) {
 
 			$list = timezone_abbreviations_list();
-			foreach ( $list as $abbr ) {
-				foreach ( $abbr as $city ) {
-					if ( $offset == $city['offset'] ) {
+			foreach ($list as $abbr) {
+				foreach ($abbr as $city) {
+					if ($offset == $city['offset']) {
 						return $city['timezone_id'];
 					}
 				}
@@ -390,8 +390,8 @@ 
  *
  * @return int Unix time offset
  */
-function simcal_get_timezone_offset( $timezone ) {
-	return \Carbon\Carbon::now( $timezone )->offset;
+function simcal_get_timezone_offset($timezone) {
+	return \Carbon\Carbon::now($timezone)->offset;
 }
 
 /**
@@ -404,6 +404,6 @@ 
  *
  * @return mixed|string
  */
-function simcal_esc_timezone( $tz, $default = 'UTC' ) {
-	return in_array( $tz, timezone_identifiers_list() ) ? $tz : $default;
+function simcal_esc_timezone($tz, $default = 'UTC') {
+	return in_array($tz, timezone_identifiers_list()) ? $tz : $default;
 }

includes/installation.php

Indentation +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@
 <?php
 /**
- * Installation
- *
- * @package SimpleCalendar
- */
+	 * Installation
+	 *
+	 * @package SimpleCalendar
+	 */
 namespace SimpleCalendar;
 
 use SimpleCalendar\Admin\Pages;

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/objects.php

Spacing +86 added lines, -86 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Abstracts as Object;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -31,27 +31,27 @@ 
 	public function __construct() {
 
 		// Add default feed type.
-		add_filter( 'simcal_get_feed_types', function( $feed_types ) {
-			return array_merge( $feed_types, array(
+		add_filter('simcal_get_feed_types', function($feed_types) {
+			return array_merge($feed_types, array(
 				'google',
 				'grouped-calendars',
-			) );
-		}, 10, 1 );
+			));
+		}, 10, 1);
 
 		// Add default calendar type.
-		add_filter( 'simcal_get_calendar_types', function( $calendar_types ) {
-			return array_merge( $calendar_types, array(
+		add_filter('simcal_get_calendar_types', function($calendar_types) {
+			return array_merge($calendar_types, array(
 				'default-calendar' => array(
 					'grid',
 					'list',
 				),
-			) );
-		}, 10, 1 );
+			));
+		}, 10, 1);
 
 		// Add default admin objects.
-		if ( $is_admin = is_admin() ) {
-			add_filter( 'simcal_get_admin_pages', function( $admin_pages ) {
-				return array_merge( $admin_pages, array(
+		if ($is_admin = is_admin()) {
+			add_filter('simcal_get_admin_pages', function($admin_pages) {
+				return array_merge($admin_pages, array(
 					'add-ons' => array(
 						'add-ons',
 					),
@@ -63,11 +63,11 @@ 
 					'tools' => array(
 						'system-status',
 					),
-				) );
-			}, 10, 1 );
+				));
+			}, 10, 1);
 		}
 
-		do_action( 'simcal_load_objects', $is_admin );
+		do_action('simcal_load_objects', $is_admin);
 	}
 
 	/**
@@ -78,8 +78,8 @@ 
 	 * @return array
 	 */
 	public function get_feed_types() {
-		$array = apply_filters( 'simcal_get_feed_types', array() );
-		ksort( $array );
+		$array = apply_filters('simcal_get_feed_types', array());
+		ksort($array);
 		return $array;
 	}
 
@@ -91,8 +91,8 @@ 
 	 * @return array
 	 */
 	public function get_calendar_types() {
-		$array = apply_filters( 'simcal_get_calendar_types', array() );
-		ksort( $array );
+		$array = apply_filters('simcal_get_calendar_types', array());
+		ksort($array);
 		return $array;
 	}
 
@@ -104,7 +104,7 @@ 
 	 * @return array
 	 */
 	public function get_admin_pages() {
-		return apply_filters( 'simcal_get_admin_pages', array() );
+		return apply_filters('simcal_get_admin_pages', array());
 	}
 
 	/**
@@ -118,30 +118,30 @@ 
 	 *
 	 * @return null|Object\Calendar
 	 */
-	public function get_calendar( $object ) {
+	public function get_calendar($object) {
 
-		if ( is_string( $object ) ) {
-			return ! empty( $object ) ? $this->get_object( $object, 'calendar', '' ) : null;
+		if (is_string($object)) {
+			return ! empty($object) ? $this->get_object($object, 'calendar', '') : null;
 		}
 
-		if ( is_object( $object ) ) {
-			if ( $object instanceof Object\Calendar ) {
-				return $this->get_object( $object->type, 'feed', $object );
-			} elseif ( $object instanceof \WP_Post ) {
-				if ( $type = wp_get_object_terms( $object->ID, 'calendar_type' ) ) {
-					$name = sanitize_title( current( $type )->name );
-					return $this->get_object( $name, 'calendar', $object );
+		if (is_object($object)) {
+			if ($object instanceof Object\Calendar) {
+				return $this->get_object($object->type, 'feed', $object);
+			} elseif ($object instanceof \WP_Post) {
+				if ($type = wp_get_object_terms($object->ID, 'calendar_type')) {
+					$name = sanitize_title(current($type)->name);
+					return $this->get_object($name, 'calendar', $object);
 				}
-			} elseif ( isset( $object->type ) && isset( $object->id ) ) {
-				return $this->get_object( $object->type, 'calendar', $object->id );
+			} elseif (isset($object->type) && isset($object->id)) {
+				return $this->get_object($object->type, 'calendar', $object->id);
 			}
 		}
 
-		if ( is_int( $object ) ) {
-			$post = get_post( $object );
-			if ( $post && ( $type = wp_get_object_terms( $post->ID, 'calendar_type' ) ) ) {
-				$name = sanitize_title( current( $type )->name );
-				return $this->get_object( $name, 'calendar', $post );
+		if (is_int($object)) {
+			$post = get_post($object);
+			if ($post && ($type = wp_get_object_terms($post->ID, 'calendar_type'))) {
+				$name = sanitize_title(current($type)->name);
+				return $this->get_object($name, 'calendar', $post);
 			}
 		}
 
@@ -158,20 +158,20 @@ 
 	 *
 	 * @return null|Object\Calendar_View
 	 */
-	public function get_calendar_view( $id = 0, $name = '' ) {
+	public function get_calendar_view($id = 0, $name = '') {
 
-		if ( ! $name && $id > 0 ) {
+		if ( ! $name && $id > 0) {
 
-			$calendar_view = get_post_meta( $id, '_calendar_view', true );
+			$calendar_view = get_post_meta($id, '_calendar_view', true);
 
-			if ( $terms = wp_get_object_terms( $id, 'calendar_type' ) ) {
-				$calendar_type = sanitize_title( current( $terms )->name );
-				$name = isset( $calendar_view[ $calendar_type ] ) ? $calendar_type . '-' . $calendar_view[ $calendar_type ] : '';
+			if ($terms = wp_get_object_terms($id, 'calendar_type')) {
+				$calendar_type = sanitize_title(current($terms)->name);
+				$name = isset($calendar_view[$calendar_type]) ? $calendar_type.'-'.$calendar_view[$calendar_type] : '';
 			}
 
 		}
 
-		return $name ? $this->get_object( $name, 'calendar-view', '' ) : null;
+		return $name ? $this->get_object($name, 'calendar-view', '') : null;
 	}
 
 	/**
@@ -185,34 +185,34 @@ 
 	 *
 	 * @return null|Object\Feed
 	 */
-	public function get_feed( $object ) {
+	public function get_feed($object) {
 
-		if ( is_string( $object ) ) {
-			return ! empty( $object ) ? $this->get_object( $object, 'feed', '' ) : null;
+		if (is_string($object)) {
+			return ! empty($object) ? $this->get_object($object, 'feed', '') : null;
 		}
 
-		if ( is_object( $object ) ) {
-			if ( $object instanceof Object\Calendar ) {
+		if (is_object($object)) {
+			if ($object instanceof Object\Calendar) {
 				$feed_name = '';
-				if ( empty( $object->feed ) ) {
-					if ( $feed_type = wp_get_object_terms( $object->id, 'feed_type' ) ) {
-						$feed_name = sanitize_title( current( $feed_type )->name );
+				if (empty($object->feed)) {
+					if ($feed_type = wp_get_object_terms($object->id, 'feed_type')) {
+						$feed_name = sanitize_title(current($feed_type)->name);
 					}
 				} else {
 					$feed_name = $object->feed;
 				}
-				return $this->get_object( $feed_name, 'feed', $object );
-			} elseif ( $object instanceof \WP_Post ) {
-				$calendar = $this->get_calendar( $object );
-				return $this->get_object( $calendar->feed, 'feed', $calendar );
-			} elseif ( isset( $object->feed ) && isset( $object->id ) ) {
-				return $this->get_object( $object->feed, 'feed', $object );
+				return $this->get_object($feed_name, 'feed', $object);
+			} elseif ($object instanceof \WP_Post) {
+				$calendar = $this->get_calendar($object);
+				return $this->get_object($calendar->feed, 'feed', $calendar);
+			} elseif (isset($object->feed) && isset($object->id)) {
+				return $this->get_object($object->feed, 'feed', $object);
 			}
 		}
 
-		if ( is_int( $object ) ) {
-			$calendar = $this->get_calendar( $object );
-			return isset( $calendar->feed ) ? $this->get_object( $calendar->feed, 'feed', $calendar ) : null;
+		if (is_int($object)) {
+			$calendar = $this->get_calendar($object);
+			return isset($calendar->feed) ? $this->get_object($calendar->feed, 'feed', $calendar) : null;
 		}
 
 		return null;
@@ -228,13 +228,13 @@ 
 	 *
 	 * @return null|Object\Field
 	 */
-	public function get_field( $args, $name = '' ) {
+	public function get_field($args, $name = '') {
 
-		if ( empty( $name ) ) {
-			$name = isset( $args['type'] ) ? $args['type'] : false;
+		if (empty($name)) {
+			$name = isset($args['type']) ? $args['type'] : false;
 		}
 
-		return $name ? $this->get_object( $name, 'field', $args ) : null;
+		return $name ? $this->get_object($name, 'field', $args) : null;
 	}
 
 	/**
@@ -246,8 +246,8 @@ 
 	 *
 	 * @return null|Object\Admin_Page
 	 */
-	public function get_admin_page( $name ) {
-		return $name ? $this->get_object( $name, 'admin-page' ) : null;
+	public function get_admin_page($name) {
+		return $name ? $this->get_object($name, 'admin-page') : null;
 	}
 
 	/**
@@ -262,7 +262,7 @@ 
 	 *
 	 * @return null|Object
 	 */
-	private function get_object( $name, $type, $args = '' ) {
+	private function get_object($name, $type, $args = '') {
 
 		$types = array(
 			'admin-page',
@@ -272,11 +272,11 @@ 
 			'field',
 		);
 
-		if ( in_array( $type, $types ) ) {
+		if (in_array($type, $types)) {
 
-			$class_name = $this->make_class_name( $name, $type );
-			$parent     = '\\' . __NAMESPACE__ . '\Abstracts\\' . implode( '_', array_map( 'ucfirst', explode( '-', $type ) ) );
-			$class      = class_exists( $class_name ) ? new $class_name( $args ) : false;
+			$class_name = $this->make_class_name($name, $type);
+			$parent     = '\\'.__NAMESPACE__.'\Abstracts\\'.implode('_', array_map('ucfirst', explode('-', $type)));
+			$class      = class_exists($class_name) ? new $class_name($args) : false;
 
 			return $class instanceof $parent ? $class : null;
 		}
@@ -298,25 +298,25 @@ 
 	 *
 	 * @return string The class name complete with its full namespace.
 	 */
-	private function make_class_name( $name, $type ) {
-
-		if ( 'calendar' == $type ) {
-			$namespace = '\\' . __NAMESPACE__ . '\Calendars\\';
-		} elseif ( 'calendar-view' == $type ) {
-			$namespace = '\\' . __NAMESPACE__ . '\Calendars\Views\\';
-		} elseif ( 'feed' == $type ) {
-			$namespace = '\\' . __NAMESPACE__ . '\Feeds\\';
-		} elseif ( 'field' == $type ) {
-			$namespace = '\\' . __NAMESPACE__ . '\Admin\Fields\\';
-		} elseif ( 'admin-page' == $type ) {
-			$namespace = '\\' . __NAMESPACE__ . '\Admin\Pages\\';
+	private function make_class_name($name, $type) {
+
+		if ('calendar' == $type) {
+			$namespace = '\\'.__NAMESPACE__.'\Calendars\\';
+		} elseif ('calendar-view' == $type) {
+			$namespace = '\\'.__NAMESPACE__.'\Calendars\Views\\';
+		} elseif ('feed' == $type) {
+			$namespace = '\\'.__NAMESPACE__.'\Feeds\\';
+		} elseif ('field' == $type) {
+			$namespace = '\\'.__NAMESPACE__.'\Admin\Fields\\';
+		} elseif ('admin-page' == $type) {
+			$namespace = '\\'.__NAMESPACE__.'\Admin\Pages\\';
 		} else {
 			return '';
 		}
 
-		$class_name = implode( '_', array_map( 'ucfirst', explode( '-', $name ) ) );
+		$class_name = implode('_', array_map('ucfirst', explode('-', $name)));
 
-		return $namespace . $class_name;
+		return $namespace.$class_name;
 	}
 
 }