moonstonemedia / Simple-Calendar

includes/events/event-builder.php

Doc Comments +9 added lines, -2 removed lines

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

Indentation +17 added lines, -17 removed lines

@@ -996,23 +996,23 @@
 		$tagregexp = implode( '|', array_values( $this->tags ) );
 
 		return '/' . '\\['                              // Opening bracket
-		       . '(\\[?)'                           // 1: Optional second opening bracket for escaping tags: [[tag]]
-		       . "($tagregexp)"                     // 2: Tag name
-		       . '(?![\\w-])'                       // Not followed by word character or hyphen
-		       . '('                                // 3: Unroll the loop: Inside the opening tag
-		       . '[^\\]\\/]*'                   // Not a closing bracket or forward slash
-		       . '(?:' . '\\/(?!\\])'               // A forward slash not followed by a closing bracket
-		       . '[^\\]\\/]*'               // Not a closing bracket or forward slash
-		       . ')*?' . ')' . '(?:' . '(\\/)'                        // 4: Self closing tag ...
-		       . '\\]'                          // ... and closing bracket
-		       . '|' . '\\]'                          // Closing bracket
-		       . '(?:' . '('                        // 5: Unroll the loop: Optionally, anything between the opening and closing tags
-		       . '[^\\[]*+'             // Not an opening bracket
-		       . '(?:' . '\\[(?!\\/\\2\\])' // An opening bracket not followed by the closing tag
-		       . '[^\\[]*+'         // Not an opening bracket
-		       . ')*+' . ')' . '\\[\\/\\2\\]'             // Closing tag
-		       . ')?' . ')' . '(\\]?)'                           // 6: Optional second closing bracket for escaping tags: [[tag]]
-		       . '/s';
+			   . '(\\[?)'                           // 1: Optional second opening bracket for escaping tags: [[tag]]
+			   . "($tagregexp)"                     // 2: Tag name
+			   . '(?![\\w-])'                       // Not followed by word character or hyphen
+			   . '('                                // 3: Unroll the loop: Inside the opening tag
+			   . '[^\\]\\/]*'                   // Not a closing bracket or forward slash
+			   . '(?:' . '\\/(?!\\])'               // A forward slash not followed by a closing bracket
+			   . '[^\\]\\/]*'               // Not a closing bracket or forward slash
+			   . ')*?' . ')' . '(?:' . '(\\/)'                        // 4: Self closing tag ...
+			   . '\\]'                          // ... and closing bracket
+			   . '|' . '\\]'                          // Closing bracket
+			   . '(?:' . '('                        // 5: Unroll the loop: Optionally, anything between the opening and closing tags
+			   . '[^\\[]*+'             // Not an opening bracket
+			   . '(?:' . '\\[(?!\\/\\2\\])' // An opening bracket not followed by the closing tag
+			   . '[^\\[]*+'         // Not an opening bracket
+			   . ')*+' . ')' . '\\[\\/\\2\\]'             // Closing tag
+			   . ')?' . ')' . '(\\]?)'                           // 6: Optional second closing bracket for escaping tags: [[tag]]
+			   . '/s';
 	}
 
 	//allow other plugins to register own event tags

Spacing +233 added lines, -233 removed lines

@@ -9,7 +9,7 @@ 
 use Carbon\Carbon;
 use SimpleCalendar\Abstracts\Calendar;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -54,7 +54,7 @@ 
 	 * @param Event    $event
 	 * @param Calendar $calendar
 	 */
-	public function __construct( Event $event, Calendar $calendar ) {
+	public function __construct(Event $event, Calendar $calendar) {
 		$this->event    = $event;
 		$this->calendar = $calendar;
 		$this->tags     = $this->get_content_tags();
@@ -68,7 +68,7 @@ 
 	 * @return array
 	 */
 	public function get_content_tags() {
-		return array_merge( array(
+		return array_merge(array(
 
 			/* ============ *
 			 * Content Tags *
@@ -214,7 +214,7 @@ 
 			'if-not-end-location',
 			// Does the event has NOT an end location?
 
-		), (array) $this->add_custom_event_tags() );
+		), (array) $this->add_custom_event_tags());
 	}
 
 	/**
@@ -226,16 +226,16 @@ 
 	 *
 	 * @return string
 	 */
-	public function parse_event_template_tags( $template_tags = '' ) {
+	public function parse_event_template_tags($template_tags = '') {
 
 		// Process tags.
-		$result = preg_replace_callback( $this->get_regex(), array( $this, 'process_event_content' ), $template_tags );
+		$result = preg_replace_callback($this->get_regex(), array($this, 'process_event_content'), $template_tags);
 
 		// Removes extra consecutive <br> tags.
 		// TODO: Doesn't seem to work but going to remove it to allow multiple <br> tags in the editor
 		/*return preg_replace( '#(<br *//*?>\s*)+#i', '<br />', trim( $result ) );*/
 
-		return do_shortcode( trim( $result ) );
+		return do_shortcode(trim($result));
 	}
 
 	/**
@@ -247,10 +247,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.
@@ -262,9 +262,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 *
@@ -272,13 +272,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' :
@@ -288,58 +288,58 @@ 
 				case 'start-date' :
 				case 'start-human' :
 				case 'start-time' :
-					return $this->get_dt( $tag, $event, $attr );
+					return $this->get_dt($tag, $event, $attr);
 
 				case 'length' :
 				case 'duration' :
-					if ( false !== $event->end ) {
+					if (false !== $event->end) {
 						$duration = $event->start - $event->end;
-						$value    = human_time_diff( $event->start, $event->end );
+						$value    = human_time_diff($event->start, $event->end);
 					} else {
 						$duration = '-1';
-						$value    = __( 'No end time', 'google-calendar-events' );
+						$value    = __('No end time', 'google-calendar-events');
 					}
 
-					return ' <span class="simcal-event-duration" data-event-duration="' . $duration . '">' . $value . '</span>';
+					return ' <span class="simcal-event-duration" data-event-duration="'.$duration.'">'.$value.'</span>';
 
 				case 'location' :
 				case 'start-location' :
 				case 'end-location' :
-					$location       = ( 'end-location' == $tag ) ? $event->end_location['address'] : $event->start_location['address'];
-					$location_class = ( 'end-location' == $tag ) ? 'end' : 'start';
+					$location       = ('end-location' == $tag) ? $event->end_location['address'] : $event->start_location['address'];
+					$location_class = ('end-location' == $tag) ? 'end' : 'start';
 
 					// location, location.name, location.address (type PostalAddress) all required for schema data.
 					// Need to use event name where location data doesn't exist.
 					// Since we have 1 location field, use it as the name and address.
 					// If the location is blank, use the event title as the name and address.
 					// Wrap with wp_strip_all_tags().
-					$meta_location_name_and_address = empty( $location ) ? wp_strip_all_tags( $event->title ) : wp_strip_all_tags( $location );
+					$meta_location_name_and_address = empty($location) ? wp_strip_all_tags($event->title) : wp_strip_all_tags($location);
 
-					return ' <span class="simcal-event-address simcal-event-' . $location_class . '-location" itemprop="location" itemscope itemtype="http://schema.org/Place">' . '<meta itemprop="name" content="' . $meta_location_name_and_address . '" />' . '<meta itemprop="address" content="' . $meta_location_name_and_address . '" />' . wp_strip_all_tags( $location ) . '</span>';
+					return ' <span class="simcal-event-address simcal-event-'.$location_class.'-location" itemprop="location" itemscope itemtype="http://schema.org/Place">'.'<meta itemprop="name" content="'.$meta_location_name_and_address.'" />'.'<meta itemprop="address" content="'.$meta_location_name_and_address.'" />'.wp_strip_all_tags($location).'</span>';
 
 				case 'start-location-link':
 				case 'end-location-link' :
 				case 'maps-link' :
-					$location = ( 'end-location-link' == $tag ) ? $event->end_location['address'] : $event->start_location['address'];
-					if ( ! empty( $location ) ) {
-						$url = '//maps.google.com?q=' . urlencode( $location );
+					$location = ('end-location-link' == $tag) ? $event->end_location['address'] : $event->start_location['address'];
+					if ( ! empty($location)) {
+						$url = '//maps.google.com?q='.urlencode($location);
 
-						return $this->make_link( $tag, $url, $calendar->get_event_html( $event, $partial ), $attr );
+						return $this->make_link($tag, $url, $calendar->get_event_html($event, $partial), $attr);
 					}
 					break;
 
 				case 'link' :
 				case 'url' :
-					$content = ( 'link' == $tag ) ? $calendar->get_event_html( $event, $partial ) : '';
+					$content = ('link' == $tag) ? $calendar->get_event_html($event, $partial) : '';
 
-					return $this->make_link( $tag, $event->link, $content, $attr );
+					return $this->make_link($tag, $event->link, $content, $attr);
 
 				case 'add-to-gcal-link';
-					$content = ( 'add-to-gcal-link' == $tag ) ? $calendar->get_event_html( $event, $partial ) : '';
-					if ( ! empty( $content ) ) {
-						$url = $calendar->get_add_to_gcal_url( $event );
+					$content = ('add-to-gcal-link' == $tag) ? $calendar->get_event_html($event, $partial) : '';
+					if ( ! empty($content)) {
+						$url = $calendar->get_add_to_gcal_url($event);
 
-						return $this->make_link( $tag, $url, $content, $attr );
+						return $this->make_link($tag, $url, $content, $attr);
 					}
 					break;
 
@@ -366,22 +366,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;
 
@@ -390,35 +390,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;
@@ -426,15 +426,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);
 						}
 					}
 
@@ -443,17 +443,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);
 							}
 						}
 
@@ -462,14 +462,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;
 
@@ -477,62 +477,62 @@ 
 				case 'if-whole-day' :
 				case 'if-not-all-day' :
 				case 'if-not-whole-day' :
-					$bool = strstr( $tag, 'not' ) ? false : true;
-					if ( $bool === $event->whole_day ) {
-						return $calendar->get_event_html( $event, $partial );
+					$bool = strstr($tag, 'not') ? false : true;
+					if ($bool === $event->whole_day) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-recurring' :
-					if ( ! empty( $event->recurrence ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if ( ! empty($event->recurrence)) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-not-recurring' :
-					if ( false === $event->recurrence ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (false === $event->recurrence) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-multi-day' :
-					if ( false !== $event->multiple_days ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (false !== $event->multiple_days) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-single-day' :
-					if ( false === $event->multiple_days ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (false === $event->multiple_days) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-location' :
 				case 'if-start-location' :
-					if ( ! empty( $event->start_location['address'] ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if ( ! empty($event->start_location['address'])) {
+						return $calendar->get_event_html($event, $partial);
 					}
 
 					return false;
 
 				case 'if-not-location' :
 				case 'if-not-start-location' :
-					if ( empty( $event->start_location['address'] ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (empty($event->start_location['address'])) {
+						return $calendar->get_event_html($event, $partial);
 					}
 
 					return '';
 
 				case 'if-not-end-location' :
-					if ( empty( $event->end_location['address'] ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (empty($event->end_location['address'])) {
+						return $calendar->get_event_html($event, $partial);
 					}
 
 					return '';
 
 				case 'if-end-location' :
-					if ( ! empty( $event->end_location['address'] ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if ( ! empty($event->end_location['address'])) {
+						return $calendar->get_event_html($event, $partial);
 					}
 
 					return '';
@@ -542,12 +542,12 @@ 
 				 * ======= */
 
 				default :
-					$resultCustom = $this->do_custom_event_tag( $tag, $partial, $attr, $event );
-					if ( $resultCustom != "" ) {
+					$resultCustom = $this->do_custom_event_tag($tag, $partial, $attr, $event);
+					if ($resultCustom != "") {
 						return $resultCustom;
 					}
 
-					return wp_kses_post( $before . $partial . $after );
+					return wp_kses_post($before.$partial.$after);
 			}
 		}
 
@@ -565,14 +565,14 @@ 
 	 *
 	 * @return string
 	 */
-	private function limit_words( $text, $limit ) {
+	private function limit_words($text, $limit) {
 
-		$limit = max( absint( $limit ), 0 );
+		$limit = max(absint($limit), 0);
 
-		if ( $limit > 0 && ( str_word_count( $text, 0 ) > $limit ) ) {
-			$words = str_word_count( $text, 2 );
-			$pos   = array_keys( $words );
-			$text  = trim( substr( $text, 0, $pos[ $limit ] ) ) . '&hellip;';
+		if ($limit > 0 && (str_word_count($text, 0) > $limit)) {
+			$words = str_word_count($text, 2);
+			$pos   = array_keys($words);
+			$text  = trim(substr($text, 0, $pos[$limit])).'&hellip;';
 		}
 
 		return $text;
@@ -589,26 +589,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.'>';
 	}
 
 	/**
@@ -622,18 +622,18 @@ 
 	 *
 	 * @return string
 	 */
-	private function get_description( $description, $attr ) {
+	private function get_description($description, $attr) {
 
-		if ( empty( $description ) ) {
+		if (empty($description)) {
 			return '';
 		}
 
-		$attr = array_merge( array(
-			'limit'    => 0,       // Trim length to number of words
-			'html'     => 'no',    // Parse HTML content
-			'markdown' => 'no',    // Parse Markdown content
-			'autolink' => 'no',    // Automatically convert plaintext URIs to anchors
-		), (array) shortcode_parse_atts( $attr ) );
+		$attr = array_merge(array(
+			'limit'    => 0, // Trim length to number of words
+			'html'     => 'no', // Parse HTML content
+			'markdown' => 'no', // Parse Markdown content
+			'autolink' => 'no', // Automatically convert plaintext URIs to anchors
+		), (array) shortcode_parse_atts($attr));
 
 		$allow_html = 'no' != $attr['html'] ? true : false;
 		$allow_md   = 'no' != $attr['markdown'] ? true : false;
@@ -641,23 +641,23 @@ 
 		$html = '<div class="simcal-event-description" itemprop="description">';
 
 		// Markdown and HTML don't play well together, use one or the other in the same tag.
-		if ( $allow_html || $allow_md ) {
-			if ( $allow_html ) {
-				$description = wp_kses_post( $description );
-			} elseif ( $allow_md ) {
+		if ($allow_html || $allow_md) {
+			if ($allow_html) {
+				$description = wp_kses_post($description);
+			} elseif ($allow_md) {
 				$markdown    = new \Parsedown();
-				$description = $markdown->text( wp_strip_all_tags( $description ) );
+				$description = $markdown->text(wp_strip_all_tags($description));
 			}
 		} else {
-			$description = wpautop( $description );
+			$description = wpautop($description);
 		}
 
-		$description = $this->limit_words( $description, $attr['limit'] );
+		$description = $this->limit_words($description, $attr['limit']);
 
-		$html .= $description . '</div>';
+		$html .= $description.'</div>';
 
-		if ( 'no' != $attr['autolink'] ) {
-			$html = ' ' . make_clickable( $html );
+		if ('no' != $attr['autolink']) {
+			$html = ' '.make_clickable($html);
 		}
 
 		return $html;
@@ -673,7 +673,7 @@ 
 	 *
 	 * @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;
@@ -687,37 +687,37 @@ 
 		$start_iso  = $start->toIso8601String();
 		$end_iso    = $end->toIso8601String();
 
-		if ( ! $event->whole_day ) {
+		if ( ! $event->whole_day) {
 
-			$time_start = $this->calendar->datetime_separator . ' <span class="simcal-event-start simcal-event-start-time" ' . 'data-event-start="' . $start_ts . '" ' . 'data-event-format="' . $this->calendar->time_format . '" ' . 'itemprop="startDate" content="' . $start_iso . '">' . $start->format( $this->calendar->time_format ) . '</span> ';
+			$time_start = $this->calendar->datetime_separator.' <span class="simcal-event-start simcal-event-start-time" '.'data-event-start="'.$start_ts.'" '.'data-event-format="'.$this->calendar->time_format.'" '.'itemprop="startDate" content="'.$start_iso.'">'.$start->format($this->calendar->time_format).'</span> ';
 
-			if ( $end instanceof Carbon ) {
+			if ($end instanceof Carbon) {
 
-				$time_end = ' <span class="simcal-event-end simcal-event-end-time" ' . 'data-event-end="' . $end_ts . '" ' . 'data-event-format="' . $this->calendar->time_format . '" ' . 'itemprop="endDate" content="' . $end_iso . '">' . $end->format( $this->calendar->time_format ) . '</span> ';
+				$time_end = ' <span class="simcal-event-end simcal-event-end-time" '.'data-event-end="'.$end_ts.'" '.'data-event-format="'.$this->calendar->time_format.'" '.'itemprop="endDate" content="'.$end_iso.'">'.$end->format($this->calendar->time_format).'</span> ';
 
 			}
 
 		}
 
-		if ( $event->multiple_days ) {
+		if ($event->multiple_days) {
 
-			$output = ' <span class="simcal-event-start simcal-event-start-date" ' . 'data-event-start="' . $start_ts . '" ' . 'data-event-format="' . $this->calendar->date_format . '" ' . 'itemprop="startDate" content="' . $start_iso . '">' . $start->format( $this->calendar->date_format ) . '</span> ' . $time_start;
+			$output = ' <span class="simcal-event-start simcal-event-start-date" '.'data-event-start="'.$start_ts.'" '.'data-event-format="'.$this->calendar->date_format.'" '.'itemprop="startDate" content="'.$start_iso.'">'.$start->format($this->calendar->date_format).'</span> '.$time_start;
 
-			if ( $end instanceof Carbon ) {
+			if ($end instanceof Carbon) {
 
-				$output .= '-' . ' <span class="simcal-event-start simcal-event-end-date" ' . 'data-event-start="' . $end_ts . '" ' . 'data-event-format="' . $this->calendar->date_format . '" ' . 'itemprop="endDate" content="' . $end_iso . '">' . $end->format( $this->calendar->date_format ) . '</span> ' . $time_end;
+				$output .= '-'.' <span class="simcal-event-start simcal-event-end-date" '.'data-event-start="'.$end_ts.'" '.'data-event-format="'.$this->calendar->date_format.'" '.'itemprop="endDate" content="'.$end_iso.'">'.$end->format($this->calendar->date_format).'</span> '.$time_end;
 			}
 
 		} else {
 
-			$time_end = ! empty( $time_start ) && ! empty( $time_end ) ? ' - ' . $time_end : '';
+			$time_end = ! empty($time_start) && ! empty($time_end) ? ' - '.$time_end : '';
 
 			// All-day events also need startDate for schema data.
-			$output = ' <span class="simcal-event-start simcal-event-start-date" ' . 'data-event-start="' . $start_ts . '" ' . 'data-event-format="' . $this->calendar->date_format . '" ' . 'itemprop="startDate" content="' . $start_iso . '">' . $start->format( $this->calendar->date_format ) . '</span> ' . $time_start . $time_end;
+			$output = ' <span class="simcal-event-start simcal-event-start-date" '.'data-event-start="'.$start_ts.'" '.'data-event-format="'.$this->calendar->date_format.'" '.'itemprop="startDate" content="'.$start_iso.'">'.$start->format($this->calendar->date_format).'</span> '.$time_start.$time_end;
 
 		}
 
-		return trim( $output );
+		return trim($output);
 	}
 
 	/**
@@ -732,52 +732,52 @@ 
 	 *
 	 * @return string
 	 */
-	private function get_dt( $tag, Event $event, $attr ) {
+	private function get_dt($tag, Event $event, $attr) {
 
-		$bound = 0 === strpos( $tag, 'end' ) ? 'end' : 'start';
+		$bound = 0 === strpos($tag, 'end') ? 'end' : 'start';
 
-		if ( ( 'end' == $bound ) && ( false === $event->end ) ) {
+		if (('end' == $bound) && (false === $event->end)) {
 			return '';
 		}
 
-		$dt = $bound . '_dt';
+		$dt = $bound.'_dt';
 
-		if ( ! $event->$dt instanceof Carbon ) {
+		if ( ! $event->$dt instanceof Carbon) {
 			return '';
 		}
 
 		$event_dt = $event->$dt;
 
-		$attr = array_merge( array(
+		$attr = array_merge(array(
 			'format' => '',
-		), (array) shortcode_parse_atts( $attr ) );
+		), (array) shortcode_parse_atts($attr));
 
-		$format    = ltrim( strstr( $tag, '-' ), '-' );
+		$format    = ltrim(strstr($tag, '-'), '-');
 		$dt_format = '';
 
-		if ( ! empty( $attr['format'] ) ) {
-			$dt_format = esc_attr( wp_strip_all_tags( $attr['format'] ) );
-		} elseif ( 'date' == $format ) {
+		if ( ! empty($attr['format'])) {
+			$dt_format = esc_attr(wp_strip_all_tags($attr['format']));
+		} elseif ('date' == $format) {
 			$dt_format = $this->calendar->date_format;
-		} elseif ( 'time' == $format ) {
+		} elseif ('time' == $format) {
 			$dt_format = $this->calendar->time_format;
 		}
 
 		$dt_ts = $event_dt->timestamp;
 
-		if ( 'human' == $format ) {
-			$value = human_time_diff( $dt_ts, Carbon::now( $event->timezone )->getTimestamp() );
+		if ('human' == $format) {
+			$value = human_time_diff($dt_ts, Carbon::now($event->timezone)->getTimestamp());
 
-			if ( $dt_ts < Carbon::now( $event->timezone )->getTimestamp() ) {
-				$value .= ' ' . _x( 'ago', 'human date event builder code modifier', 'google-calendar-events' );
+			if ($dt_ts < Carbon::now($event->timezone)->getTimestamp()) {
+				$value .= ' '._x('ago', 'human date event builder code modifier', 'google-calendar-events');
 			} else {
-				$value .= ' ' . _x( 'from now', 'human date event builder code modifier', 'google-calendar-events' );
+				$value .= ' '._x('from now', 'human date event builder code modifier', 'google-calendar-events');
 			}
 		} else {
-			$value = $event->$dt->format( $dt_format );
+			$value = $event->$dt->format($dt_format);
 		}
 
-		return '<span class="simcal-event-' . $bound . ' ' . 'simcal-event-' . $bound . '-' . $format . '" ' . 'data-event-' . $bound . '="' . $dt_ts . '" ' . 'data-event-format="' . $dt_format . '" ' . 'itemprop="' . $bound . 'Date" content="' . $event_dt->toIso8601String() . '">' . $value . '</span>';
+		return '<span class="simcal-event-'.$bound.' '.'simcal-event-'.$bound.'-'.$format.'" '.'data-event-'.$bound.'="'.$dt_ts.'" '.'data-event-format="'.$dt_format.'" '.'itemprop="'.$bound.'Date" content="'.$event_dt->toIso8601String().'">'.$value.'</span>';
 	}
 
 	/**
@@ -793,23 +793,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;
 	}
 
 	/**
@@ -822,20 +822,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;
 	}
@@ -851,41 +851,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++;
 
@@ -896,21 +896,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;
 	}
@@ -924,23 +924,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>';
 	}
 
 	/**
@@ -954,21 +954,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>';
 	}
 
 	/**
@@ -993,38 +993,38 @@ 
 		// This is largely borrowed on get_shortcode_regex() from WordPress Core.
 		// @see /wp-includes/shortcodes.php (with some modification)
 
-		$tagregexp = implode( '|', array_values( $this->tags ) );
+		$tagregexp = implode('|', array_values($this->tags));
 
-		return '/' . '\\['                              // Opening bracket
+		return '/'.'\\['                              // Opening bracket
 		       . '(\\[?)'                           // 1: Optional second opening bracket for escaping tags: [[tag]]
 		       . "($tagregexp)"                     // 2: Tag name
 		       . '(?![\\w-])'                       // Not followed by word character or hyphen
 		       . '('                                // 3: Unroll the loop: Inside the opening tag
 		       . '[^\\]\\/]*'                   // Not a closing bracket or forward slash
-		       . '(?:' . '\\/(?!\\])'               // A forward slash not followed by a closing bracket
+		       . '(?:'.'\\/(?!\\])'               // A forward slash not followed by a closing bracket
 		       . '[^\\]\\/]*'               // Not a closing bracket or forward slash
-		       . ')*?' . ')' . '(?:' . '(\\/)'                        // 4: Self closing tag ...
+		       . ')*?'.')'.'(?:'.'(\\/)'                        // 4: Self closing tag ...
 		       . '\\]'                          // ... and closing bracket
-		       . '|' . '\\]'                          // Closing bracket
-		       . '(?:' . '('                        // 5: Unroll the loop: Optionally, anything between the opening and closing tags
+		       . '|'.'\\]'                          // Closing bracket
+		       . '(?:'.'('                        // 5: Unroll the loop: Optionally, anything between the opening and closing tags
 		       . '[^\\[]*+'             // Not an opening bracket
-		       . '(?:' . '\\[(?!\\/\\2\\])' // An opening bracket not followed by the closing tag
+		       . '(?:'.'\\[(?!\\/\\2\\])' // An opening bracket not followed by the closing tag
 		       . '[^\\[]*+'         // Not an opening bracket
-		       . ')*+' . ')' . '\\[\\/\\2\\]'             // Closing tag
-		       . ')?' . ')' . '(\\]?)'                           // 6: Optional second closing bracket for escaping tags: [[tag]]
+		       . ')*+'.')'.'\\[\\/\\2\\]'             // Closing tag
+		       . ')?'.')'.'(\\]?)'                           // 6: Optional second closing bracket for escaping tags: [[tag]]
 		       . '/s';
 	}
 
 	//allow other plugins to register own event tags
 	private function add_custom_event_tags() {
-		$array = apply_filters( 'simcal_event_tags_add_custom', array() );
+		$array = apply_filters('simcal_event_tags_add_custom', array());
 
 		return $array;
 	}
 
 	//allow other plugins to replace own (registered) event tags with their value
-	private function do_custom_event_tag( $tag, $partial, $attr, $event ) {
-		$returnvalue = apply_filters( 'simcal_event_tags_do_custom', "", $tag, $partial, $attr, $event );
+	private function do_custom_event_tag($tag, $partial, $attr, $event) {
+		$returnvalue = apply_filters('simcal_event_tags_do_custom', "", $tag, $partial, $attr, $event);
 
 		return $returnvalue;
 	}

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

Spacing +207 added lines, -207 removed lines

@@ -13,7 +13,7 @@ 
 use SimpleCalendar\Calendars\Default_Calendar;
 use SimpleCalendar\Events\Event;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -75,7 +75,7 @@ 
 	 *
 	 * @param string|Calendar $calendar
 	 */
-	public function __construct( $calendar = '' ) {
+	public function __construct($calendar = '') {
 		$this->calendar = $calendar;
 	}
 
@@ -109,7 +109,7 @@ 
 	 * @return string
 	 */
 	public function get_name() {
-		return __( 'List', 'google-calendar-events' );
+		return __('List', 'google-calendar-events');
 	}
 
 	/**
@@ -118,8 +118,8 @@ 
 	 * @since 3.0.0
 	 */
 	public function add_ajax_actions() {
-		add_action( 'wp_ajax_simcal_default_calendar_draw_list', array( $this, 'draw_list_ajax' ) );
-		add_action( 'wp_ajax_nopriv_simcal_default_calendar_draw_list', array( $this, 'draw_list_ajax' ) );
+		add_action('wp_ajax_simcal_default_calendar_draw_list', array($this, 'draw_list_ajax'));
+		add_action('wp_ajax_nopriv_simcal_default_calendar_draw_list', array($this, 'draw_list_ajax'));
 	}
 
 	/**
@@ -133,15 +133,15 @@ 
 	 *
 	 * @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'),
 				'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',
@@ -165,10 +165,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',
 				'media' => 'all',
 			),
 		);
@@ -183,49 +183,49 @@ 
 
 		$calendar = $this->calendar;
 
-		if ( $calendar instanceof Default_Calendar ) {
+		if ($calendar instanceof Default_Calendar) {
 
-			$disabled = $calendar->static === true || empty( $calendar->events ) ? ' disabled="disabled"' : '';
+			$disabled = $calendar->static === true || empty($calendar->events) ? ' disabled="disabled"' : '';
 
 
-			$hide_header = get_post_meta( $this->calendar->id, '_default_calendar_list_header', true ) == 'yes' ? true : false;
-			$static_calendar = get_post_meta( $this->calendar->id, '_calendar_is_static', true ) == 'yes' ? true : false;
+			$hide_header = get_post_meta($this->calendar->id, '_default_calendar_list_header', true) == 'yes' ? true : false;
+			$static_calendar = get_post_meta($this->calendar->id, '_calendar_is_static', true) == 'yes' ? true : false;
 
 			$header_class = '';
 			$compact_list_class = $calendar->compact_list ? 'simcal-calendar-list-compact' : '';
 
-			edit_post_link( __( 'Edit Calendar', 'google-calendar-events' ), '<p class="simcal-align-right"><small>', '</small></p>', $calendar->id );
+			edit_post_link(__('Edit Calendar', 'google-calendar-events'), '<p class="simcal-align-right"><small>', '</small></p>', $calendar->id);
 
-			echo '<div class="simcal-calendar-list ' . $compact_list_class . '">';
+			echo '<div class="simcal-calendar-list '.$compact_list_class.'">';
 
-			if ( ! $hide_header && ! $static_calendar ) {
-				echo '<nav class="simcal-calendar-head">' . "\n";
+			if ( ! $hide_header && ! $static_calendar) {
+				echo '<nav class="simcal-calendar-head">'."\n";
 
-				echo "\t" . '<div class="simcal-nav">' . "\n";
-				echo "\t\t" . '<button class="simcal-nav-button simcal-prev" title="' . __('Previous', 'google-calendar-events') . '"' . $disabled . '>' . "\n";
-				echo "\t\t\t" . '<i class="simcal-icon-left"></i>' . "\n";
-				echo "\t\t" . '</button>' . "\n";
-				echo "\t" . '</div>' . "\n";
+				echo "\t".'<div class="simcal-nav">'."\n";
+				echo "\t\t".'<button class="simcal-nav-button simcal-prev" title="'.__('Previous', 'google-calendar-events').'"'.$disabled.'>'."\n";
+				echo "\t\t\t".'<i class="simcal-icon-left"></i>'."\n";
+				echo "\t\t".'</button>'."\n";
+				echo "\t".'</div>'."\n";
 
-				if ( $hide_header ) {
+				if ($hide_header) {
 					$header_class = 'simcal-hide-header';
 				}
 
 
-				echo "\t" . '<div class="simcal-nav simcal-current ' . $header_class . '" data-calendar-current="' . $calendar->start . '">' . "\n";
-				echo "\t\t" . '<h3 class="simcal-current-label"> </h3>' . "\n";
-				echo "\t" . '</div>' . "\n";
+				echo "\t".'<div class="simcal-nav simcal-current '.$header_class.'" data-calendar-current="'.$calendar->start.'">'."\n";
+				echo "\t\t".'<h3 class="simcal-current-label"> </h3>'."\n";
+				echo "\t".'</div>'."\n";
 
-				echo "\t" . '<div class="simcal-nav">';
-				echo "\t\t" . '<button class="simcal-nav-button simcal-next" title="' . __('Next', 'google-calendar-events') . '"' . $disabled . '>';
-				echo "\t\t\t" . '<i class="simcal-icon-right"></i>' . "\n";
-				echo "\t\t" . '</button>' . "\n";
-				echo "\t" . '</div>' . "\n";
+				echo "\t".'<div class="simcal-nav">';
+				echo "\t\t".'<button class="simcal-nav-button simcal-next" title="'.__('Next', 'google-calendar-events').'"'.$disabled.'>';
+				echo "\t\t\t".'<i class="simcal-icon-right"></i>'."\n";
+				echo "\t\t".'</button>'."\n";
+				echo "\t".'</div>'."\n";
 
-				echo '</nav>' . "\n";
+				echo '</nav>'."\n";
 			}
 
-			echo $this->draw_list( $calendar->start );
+			echo $this->draw_list($calendar->start);
 
 			echo '<div class="simcal-ajax-loader simcal-spinner-top" style="display: none;"><i class="simcal-icon-spinner simcal-icon-spin"></i></div>';
 
@@ -245,99 +245,99 @@ 
 	 *
 	 * @return array
 	 */
-	private function get_events( $timestamp ) {
+	private function get_events($timestamp) {
 
 		$calendar = $this->calendar;
 		$timezone = $calendar->timezone;
 
-		if ( ! $calendar->group_type || ! $calendar->group_span ) {
+		if ( ! $calendar->group_type || ! $calendar->group_span) {
 			return array();
 		}
 
-		$current = Carbon::createFromTimestamp( $timestamp, $timezone );
+		$current = Carbon::createFromTimestamp($timestamp, $timezone);
 		$prev = clone $current;
 		$next = clone $current;
 
 		$this->start = $current->getTimestamp();
 
-		$interval = $span = max( absint( $calendar->group_span ), 1 );
-
-		if ( 'monthly' == $calendar->group_type ) {
-			$this->prev = $prev->subMonths( $span )->getTimestamp();
-			$this->next = $next->addMonths( $span )->getTimestamp();
-		} elseif ( 'weekly' == $calendar->group_type ) {
-			$week = new Carbon( $calendar->timezone );
-			$week->setTimestamp( $timestamp );
-			$week->setWeekStartsAt( $calendar->week_starts );
-			$this->prev = $prev->subWeeks( $span )->getTimestamp();
-			$this->next = $next->addWeeks( $span )->getTimestamp();
-		} elseif ( 'daily' == $calendar->group_type ) {
-			$this->prev = $prev->subDays( $span )->getTimestamp();
-			$this->next = $next->addDays( $span )->getTimestamp();
+		$interval = $span = max(absint($calendar->group_span), 1);
+
+		if ('monthly' == $calendar->group_type) {
+			$this->prev = $prev->subMonths($span)->getTimestamp();
+			$this->next = $next->addMonths($span)->getTimestamp();
+		} elseif ('weekly' == $calendar->group_type) {
+			$week = new Carbon($calendar->timezone);
+			$week->setTimestamp($timestamp);
+			$week->setWeekStartsAt($calendar->week_starts);
+			$this->prev = $prev->subWeeks($span)->getTimestamp();
+			$this->next = $next->addWeeks($span)->getTimestamp();
+		} elseif ('daily' == $calendar->group_type) {
+			$this->prev = $prev->subDays($span)->getTimestamp();
+			$this->next = $next->addDays($span)->getTimestamp();
 		}
 
 		$events = $calendar->events;
 		$daily_events = $paged_events = $flattened_events = array();
 
-		if ( 'events' != $calendar->group_type ) {
+		if ('events' != $calendar->group_type) {
 
-			$this->end   = $this->next - 1;
+			$this->end = $this->next - 1;
 
-			$timestamps   = array_keys( $events );
-			$lower_bound  = array_filter( $timestamps,  array( $this, 'filter_events_before' ) );
-			$higher_bound = array_filter( $lower_bound, array( $this, 'filter_events_after'  ) );
+			$timestamps   = array_keys($events);
+			$lower_bound  = array_filter($timestamps, array($this, 'filter_events_before'));
+			$higher_bound = array_filter($lower_bound, array($this, 'filter_events_after'));
 
-			if ( is_array( $higher_bound ) && !empty( $higher_bound ) ) {
-				$filtered = array_intersect_key( $events, array_combine( $higher_bound, $higher_bound ) );
-				foreach ( $filtered as $timestamp => $events ) {
-					$paged_events[ intval( $timestamp ) ] = $events;
+			if (is_array($higher_bound) && ! empty($higher_bound)) {
+				$filtered = array_intersect_key($events, array_combine($higher_bound, $higher_bound));
+				foreach ($filtered as $timestamp => $events) {
+					$paged_events[intval($timestamp)] = $events;
 				}
 			}
 
 		} else {
 
-			foreach ( $events as $timestamp => $e ) {
+			foreach ($events as $timestamp => $e) {
 				$second = 0;
-				foreach ( $e as $event ) {
-					$flattened_events[ intval( $timestamp + $second ) ][] = $event;
+				foreach ($e as $event) {
+					$flattened_events[intval($timestamp + $second)][] = $event;
 					$second++;
 				}
 			}
-			ksort( $flattened_events, SORT_NUMERIC );
+			ksort($flattened_events, SORT_NUMERIC);
 
-			$keys  = array_keys( $flattened_events );
+			$keys = array_keys($flattened_events);
 			$current = 0;
-			foreach ( $keys as $timestamp ) {
-				if ( $timestamp < $this->start ) {
+			foreach ($keys as $timestamp) {
+				if ($timestamp < $this->start) {
 					$current++;
 				}
 			}
 
-			$paged_events = array_slice( $flattened_events, $current, $interval, true );
+			$paged_events = array_slice($flattened_events, $current, $interval, true);
 
-			$events_end = isset( $keys[ $current + $interval ] ) ? $keys[ $current + $interval ] : $calendar->end;
+			$events_end = isset($keys[$current + $interval]) ? $keys[$current + $interval] : $calendar->end;
 			$this->end  = $events_end > $calendar->end ? $calendar->end : $events_end;
 
-			$this->prev = isset( $keys[ $current - $interval ] ) ? $keys[ $current - $interval ] : $calendar->earliest_event;
-			$this->next = isset( $keys[ $current + $interval ] ) ? $keys[ $current + $interval ] : $this->end;
+			$this->prev = isset($keys[$current - $interval]) ? $keys[$current - $interval] : $calendar->earliest_event;
+			$this->next = isset($keys[$current + $interval]) ? $keys[$current + $interval] : $this->end;
 
 		}
 
 		// Put resulting events in an associative array, with Ymd date as key for easy retrieval in calendar days loop.
-		foreach ( $paged_events as $timestamp => $events ) {
-			if ( $timestamp <= $this->end ) {
-				$date = Carbon::createFromTimestamp( $timestamp, $calendar->timezone )->endOfDay()->format( 'Ymd' );
-				$daily_events[ intval( $date ) ][] = $events;
+		foreach ($paged_events as $timestamp => $events) {
+			if ($timestamp <= $this->end) {
+				$date = Carbon::createFromTimestamp($timestamp, $calendar->timezone)->endOfDay()->format('Ymd');
+				$daily_events[intval($date)][] = $events;
 			}
 		}
-		ksort( $daily_events, SORT_NUMERIC );
+		ksort($daily_events, SORT_NUMERIC);
 
-		if ( ! empty( $paged_events ) ) {
-			$first_event       = array_slice( $paged_events, 0, 1, true );
-			$first_event       = array_pop( $first_event );
+		if ( ! empty($paged_events)) {
+			$first_event       = array_slice($paged_events, 0, 1, true);
+			$first_event       = array_pop($first_event);
 			$this->first_event = $first_event[0]->start;
 
-			$last_event       = array_pop( $paged_events );
+			$last_event       = array_pop($paged_events);
 			$this->last_event = $last_event[0]->start;
 		}
 
@@ -357,84 +357,84 @@ 
 	private function get_heading() {
 
 		$calendar = $this->calendar;
-		$start = Carbon::createFromTimestamp( $calendar->start, $calendar->timezone );
-		$end = Carbon::createFromTimestamp( $this->end, $calendar->timezone );
+		$start = Carbon::createFromTimestamp($calendar->start, $calendar->timezone);
+		$end = Carbon::createFromTimestamp($this->end, $calendar->timezone);
 		$date_format = $this->calendar->date_format;
-		$date_order  = simcal_get_date_format_order( $date_format );
+		$date_order  = simcal_get_date_format_order($date_format);
 
 		$st = $this->start;
 		$et = $this->end;
 
-		if ( $this->first_event !== 0 ) {
-			$start = Carbon::createFromTimestamp( $this->first_event, $calendar->timezone );
+		if ($this->first_event !== 0) {
+			$start = Carbon::createFromTimestamp($this->first_event, $calendar->timezone);
 			$st = $this->first_event;
 		}
 
-		if ( $this->last_event !== 0 ) {
-			$end = Carbon::createFromTimestamp( $this->last_event, $calendar->timezone );
+		if ($this->last_event !== 0) {
+			$end = Carbon::createFromTimestamp($this->last_event, $calendar->timezone);
 			$et = $this->last_event;
 		}
 
-		if ( ( $start->day == $end->day ) && ( $start->month == $end->month ) && ( $start->year == $end->year ) ) {
+		if (($start->day == $end->day) && ($start->month == $end->month) && ($start->year == $end->year)) {
 			// Start and end on the same day.
 			// e.g. 1 February 2020
-			$large = $small = date_i18n( $calendar->date_format , $st );
-			if ( ( $date_order['d'] !== false ) && ( $date_order['m'] !== false ) ) {
-				if ( $date_order['m'] > $date_order['d'] ) {
-					if ( $date_order['y'] !== false && $date_order['y'] > $date_order['m'] ) {
-						$small = date_i18n( 'Y, d M', $st );
+			$large = $small = date_i18n($calendar->date_format, $st);
+			if (($date_order['d'] !== false) && ($date_order['m'] !== false)) {
+				if ($date_order['m'] > $date_order['d']) {
+					if ($date_order['y'] !== false && $date_order['y'] > $date_order['m']) {
+						$small = date_i18n('Y, d M', $st);
 					} else {
-						$small = date_i18n( 'd M Y', $st );
+						$small = date_i18n('d M Y', $st);
 					}
 				} else {
-					if ( $date_order['y'] !== false && $date_order['y'] > $date_order['m'] ) {
-						$small = date_i18n( 'Y, M d', $st );
+					if ($date_order['y'] !== false && $date_order['y'] > $date_order['m']) {
+						$small = date_i18n('Y, M d', $st);
 					} else {
-						$small = date_i18n( 'M d Y', $st );
+						$small = date_i18n('M d Y', $st);
 					}
 				}
 			}
-		} elseif ( ( $start->month == $end->month ) && ( $start->year == $end->year ) ) {
+		} elseif (($start->month == $end->month) && ($start->year == $end->year)) {
 			// Start and end days on the same month.
 			// e.g. August 2020
-			if ( $date_order['y'] === false ) {
+			if ($date_order['y'] === false) {
 				// August.
-				$large = $small = date_i18n( 'F', $st );
+				$large = $small = date_i18n('F', $st);
 			} else {
-				if ( $date_order['y'] < $date_order['m'] ) {
+				if ($date_order['y'] < $date_order['m']) {
 					// 2020 August.
-					$large = date_i18n( 'Y F', $st );
-					$small = date_i18n( 'Y M', $st );
+					$large = date_i18n('Y F', $st);
+					$small = date_i18n('Y M', $st);
 				} else {
 					// August 2020.
-					$large = date_i18n( 'F Y', $st );
-					$small = date_i18n( 'M Y', $st );
+					$large = date_i18n('F Y', $st);
+					$small = date_i18n('M Y', $st);
 				}
 			}
-		} elseif ( $start->year == $end->year ) {
+		} elseif ($start->year == $end->year) {
 			// Start and end days on months of the same year.
 			// e.g. August - September 2020
-			if ( $date_order['y'] === false ) {
+			if ($date_order['y'] === false) {
 				// August - September.
-				$large = date_i18n( 'F', $st ) . ' - ' . date_i18n( 'F', $et );
-				$small = date_i18n( 'M', $st ) . ' - ' . date_i18n( 'M', $et );
+				$large = date_i18n('F', $st).' - '.date_i18n('F', $et);
+				$small = date_i18n('M', $st).' - '.date_i18n('M', $et);
 			} else {
-				if ( $date_order['y'] < $date_order['m'] ) {
+				if ($date_order['y'] < $date_order['m']) {
 					// 2020, August - September.
-					$large  = $small = date( 'Y', $st ) . ', ';
-					$large .= date_i18n( 'F', $st ) . ' - ' . date_i18n( 'F', $et );
-					$small .= date_i18n( 'M', $st ) . ' - ' . date_i18n( 'M', $et );
+					$large  = $small = date('Y', $st).', ';
+					$large .= date_i18n('F', $st).' - '.date_i18n('F', $et);
+					$small .= date_i18n('M', $st).' - '.date_i18n('M', $et);
 				} else {
 					// August - September, 2020.
-					$large  = date_i18n( 'F', $st ) . ' - ' . date_i18n( 'F', $et ) . ', ';
-					$small  = date_i18n( 'M', $st ) . ' - ' . date_i18n( 'M', $et ) . ' ';
-					$year   = date( 'Y', $st );
+					$large  = date_i18n('F', $st).' - '.date_i18n('F', $et).', ';
+					$small  = date_i18n('M', $st).' - '.date_i18n('M', $et).' ';
+					$year   = date('Y', $st);
 					$large .= $year;
 					$small .= $year;
 				}
 			}
 		} else {
-			$large = $small = date( 'Y', $st ) . ' - ' . date( 'Y', $et );
+			$large = $small = date('Y', $st).' - '.date('Y', $et);
 		}
 
 		return array(
@@ -456,65 +456,65 @@ 
 	 *
 	 * @return string
 	 */
-	private function draw_list( $timestamp, $id = 0 ) {
+	private function draw_list($timestamp, $id = 0) {
 
 		$calendar = $this->calendar;
 
-		if ( empty( $calendar ) ) {
-			$calendar = $this->calendar = simcal_get_calendar( intval( $id ) );
-			if ( ! $calendar instanceof Default_Calendar ) {
+		if (empty($calendar)) {
+			$calendar = $this->calendar = simcal_get_calendar(intval($id));
+			if ( ! $calendar instanceof Default_Calendar) {
 				return '';
 			}
 		}
 
-		$feed          = simcal_get_feed( $calendar );
+		$feed          = simcal_get_feed($calendar);
 
 		// TODO Need $feed_timezone?
-		$feed_timezone = get_post_meta( $feed->post_id, '_feed_timezone', true );
+		$feed_timezone = get_post_meta($feed->post_id, '_feed_timezone', true);
 
 		$now = $calendar->now;
-		$current_events = $this->get_events( $timestamp );
+		$current_events = $this->get_events($timestamp);
 		$format = $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)) :
 
 			$last_event = null;
 
-			foreach ( $current_events as $ymd => $events ) :
+			foreach ($current_events as $ymd => $events) :
 
 				// This is where we can find out if an event is a multi-day event and if it needs to be shown.
 				// Since this is for list view we are showing the event on the day viewed if it is part of that day even when
 				// expand multi-day events are turned off.
-				if ( isset( $events[0][0]->multiple_days ) && $events[0][0]->multiple_days > 0 ) {
-					if ( 'current_day_only' == get_post_meta( $calendar->id, '_default_calendar_expand_multi_day_events', true ) ) {
+				if (isset($events[0][0]->multiple_days) && $events[0][0]->multiple_days > 0) {
+					if ('current_day_only' == get_post_meta($calendar->id, '_default_calendar_expand_multi_day_events', true)) {
 
-						$year  = substr( $ymd, 0, 4 );
-						$month = substr( $ymd, 4, 2 );
-						$day   = substr( $ymd, 6, 2 );
+						$year  = substr($ymd, 0, 4);
+						$month = substr($ymd, 4, 2);
+						$day   = substr($ymd, 6, 2);
 
-						$temp_date = Carbon::createFromDate( $year, $month, $day );
+						$temp_date = Carbon::createFromDate($year, $month, $day);
 
-						if ( ! ( $temp_date < Carbon::now()->endOfDay() ) ) {
+						if ( ! ($temp_date < Carbon::now()->endOfDay())) {
 
 							// Break here only if event already shown once.
-							if ( $last_event == $events[0][0] ) {
+							if ($last_event == $events[0][0]) {
 								continue;
 							} else {
 								// Save event as "last" for next time through, then break.
@@ -525,139 +525,139 @@ 
 				}
 
 				// Calculate timestamp offset for list view day headings.
-				$day_date = Carbon::createFromFormat( 'Ymd', $ymd, $calendar->timezone );
-				$day_ts_offset = $day_date->addSeconds( $day_date->offset )->timestamp;
+				$day_date = Carbon::createFromFormat('Ymd', $ymd, $calendar->timezone);
+				$day_ts_offset = $day_date->addSeconds($day_date->offset)->timestamp;
 
-				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_offset );
+					$date = new Carbon('now', $calendar->timezone);
+					$date->setLocale(substr(get_locale(), 0, 2));
+					$date->setTimestamp($day_ts_offset);
 
-					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 .'>';
-					echo $format ? '<span class="simcal-date-format" data-date-format="' . $format . '">' . date_i18n( $format, $day_ts_offset ) . '</span> ' : ' ';
+					echo "\t".'<dt class="simcal-day-label"'.$border_style.'>';
+					echo '<span'.$bg_style.'>';
+					echo $format ? '<span class="simcal-date-format" data-date-format="'.$format.'">'.date_i18n($format, $day_ts_offset).'</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_offset );
+				$day_classes = 'simcal-weekday-'.date('w', $day_ts_offset);
 
 				// Is this the present, the past or the future, Doc?
-				if ( $timestamp <= $now && $timestamp >= $now ) {
+				if ($timestamp <= $now && $timestamp >= $now) {
 					$day_classes .= ' simcal-today simcal-present simcal-day';
-				} elseif ( $timestamp < $now ) {
+				} elseif ($timestamp < $now) {
 					$day_classes .= ' simcal-past simcal-day';
-				} elseif ( $this->end > $now ) {
+				} elseif ($this->end > $now) {
 					$day_classes .= ' simcal-future simcal-day';
 				}
 
 				$count = 0;
 
-				foreach ( $events as $day_events ) :
-					foreach ( $day_events as $event ) :
+				foreach ($events as $day_events) :
+					foreach ($day_events as $event) :
 
-						if ( $event instanceof Event ) :
+						if ($event instanceof Event) :
 
 							$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;
 
 							$event_color = $event->get_color();
-							if ( ! empty( $event_color ) ) {
+							if ( ! empty($event_color)) {
 								$side = is_rtl() ? 'right' : 'left';
-								$event_color = ' style="border-' . $side . ': 4px solid ' . $event_color . '; padding-' . $side . ': 8px;"';
+								$event_color = ' style="border-'.$side.': 4px solid '.$event_color.'; padding-'.$side.': 8px;"';
 							}
 
-							$list_events .= "\t" . '<li class="' . $event_classes . '"' . $event_visibility . $event_color . ' itemscope itemtype="http://schema.org/Event" data-start="' . esc_attr( $event->start ) . '">' . "\n";
-							$list_events .= "\t\t" . '<div class="simcal-event-details">' . $calendar->get_event_html( $event ) . '</div>' . "\n";
-							$list_events .= "\t" . '</li>' . "\n";
+							$list_events .= "\t".'<li class="'.$event_classes.'"'.$event_visibility.$event_color.' itemscope itemtype="http://schema.org/Event" data-start="'.esc_attr($event->start).'">'."\n";
+							$list_events .= "\t\t".'<div class="simcal-event-details">'.$calendar->get_event_html($event).'</div>'."\n";
+							$list_events .= "\t".'</li>'."\n";
 
-							$count ++;
+							$count++;
 
 							// Event falls within today.
-							if ( ( $this->end <= $now ) && ( $this->start >= $now ) ) :
+							if (($this->end <= $now) && ($this->start >= $now)) :
 								$day_classes .= ' simcal-today-has-events';
 							endif;
-							$day_classes .= ' simcal-day-has-events simcal-day-has-' . strval( $count ) . '-events';
+							$day_classes .= ' simcal-day-has-events simcal-day-has-'.strval($count).'-events';
 
-							if ( $calendar_classes ) :
-								$day_classes .= ' ' . trim( implode( ' ', array_unique( $calendar_classes ) ) );
+							if ($calendar_classes) :
+								$day_classes .= ' '.trim(implode(' ', array_unique($calendar_classes)));
 							endif;
 
 						endif;
 					endforeach;
 				endforeach;
 
-				$list_events .= '</ul>' . "\n";
+				$list_events .= '</ul>'."\n";
 
 				// If events visibility is limited, print the button toggle.
-				if ( ( $calendar->events_limit > -1 ) && ( $count > $calendar->events_limit ) ) :
+				if (($calendar->events_limit > -1) && ($count > $calendar->events_limit)) :
 					$list_events .= '<button class="simcal-events-toggle"><i class="simcal-icon-down simcal-icon-animate"></i></button>';
 				endif;
 
 				// Print final list of events for the current day.
 				$tag = $calendar->compact_list ? 'div' : 'dd';
-				echo '<'  . $tag . ' class="' . $day_classes . '" data-events-count="' . strval( $count ) . '">' . "\n";
-				echo "\t" . $list_events . "\n";
-				echo '</' . $tag . '>' . "\n";
+				echo '<'.$tag.' class="'.$day_classes.'" data-events-count="'.strval($count).'">'."\n";
+				echo "\t".$list_events."\n";
+				echo '</'.$tag.'>'."\n";
 
 			endforeach;
 
 		else :
 
-			echo "\t" . '<p>';
+			echo "\t".'<p>';
 
-			$message = get_post_meta( $calendar->id, '_no_events_message', true );
+			$message = get_post_meta($calendar->id, '_no_events_message', true);
 
-			if ( 'events' == $calendar->group_type ) {
-				echo ! empty( $message ) ? $message : __( 'There are no upcoming events.', 'google-calendar-events' );
+			if ('events' == $calendar->group_type) {
+				echo ! empty($message) ? $message : __('There are no upcoming events.', 'google-calendar-events');
 			} else {
-				if ( ! empty( $message ) ) {
+				if ( ! empty($message)) {
 					echo $message;
 				} else {
-					$from = Carbon::createFromTimestamp( $this->start, $calendar->timezone )->getTimestamp();
-					$to = Carbon::createFromTimestamp( $this->end, $calendar->timezone )->getTimestamp();
-					echo apply_filters( 'simcal_no_events_message', sprintf(
-						__( 'Nothing from %1$s to %2$s.', 'google-calendar-events' ),
-						date_i18n( $calendar->date_format, $from ),
-						date_i18n( $calendar->date_format, $to )
-					), $calendar->id, $from, $to );
+					$from = Carbon::createFromTimestamp($this->start, $calendar->timezone)->getTimestamp();
+					$to = Carbon::createFromTimestamp($this->end, $calendar->timezone)->getTimestamp();
+					echo apply_filters('simcal_no_events_message', sprintf(
+						__('Nothing from %1$s to %2$s.', 'google-calendar-events'),
+						date_i18n($calendar->date_format, $from),
+						date_i18n($calendar->date_format, $to)
+					), $calendar->id, $from, $to);
 				}
 			}
 
-			echo "\t" . '</p>' . "\n";
+			echo "\t".'</p>'."\n";
 
 		endif;
 
-		echo '</' . $block_tag . '>';
+		echo '</'.$block_tag.'>';
 
 		return ob_get_clean();
 	}
@@ -669,16 +669,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.');
 
 		}
 	}
@@ -693,8 +693,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);
 	}
 
 	/**
@@ -707,8 +707,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/calendars/views/default-calendar-grid.php

Spacing +143 added lines, -143 removed lines

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

Spacing +297 added lines, -297 removed lines

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

includes/abstracts/calendar.php

Spacing +181 added lines, -181 removed lines

@@ -11,7 +11,7 @@ 
 use SimpleCalendar\Events\Event_Builder;
 use SimpleCalendar\Events\Events;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -234,12 +234,12 @@ 
 	 * @param int|object|\WP_Post|Calendar $calendar
 	 * @param string $view
 	 */
-	public function __construct( $calendar, $view = '' ) {
+	public function __construct($calendar, $view = '') {
 
 		// Set the post object.
-		$this->set_post_object( $calendar );
+		$this->set_post_object($calendar);
 
-		if ( ! is_null( $this->post ) ) {
+		if ( ! is_null($this->post)) {
 
 			// Set calendar type and events source.
 			$this->set_taxonomies();
@@ -256,23 +256,23 @@ 
 			$this->set_events_template();
 
 			// Get events source data.
-			$feed = simcal_get_feed( $this );
-			if ( $feed instanceof Feed ) {
-				if ( ! empty( $feed->events ) ) {
-					if ( is_array( $feed->events ) ) {
-						$this->set_events( $feed->events );
-						if ( 'use_calendar' == get_post_meta( $this->id, '_feed_timezone_setting', true ) ) {
+			$feed = simcal_get_feed($this);
+			if ($feed instanceof Feed) {
+				if ( ! empty($feed->events)) {
+					if (is_array($feed->events)) {
+						$this->set_events($feed->events);
+						if ('use_calendar' == get_post_meta($this->id, '_feed_timezone_setting', true)) {
 							$this->timezone = $feed->timezone;
 							$this->set_start();
 						}
-					} elseif ( is_string( $feed->events ) ) {
+					} elseif (is_string($feed->events)) {
 						$this->errors[] = $feed->events;
 					}
 				}
 			}
 
 			// Set general purpose timestamps.
-			$now = Carbon::now( $this->timezone );
+			$now = Carbon::now($this->timezone);
 			$this->now    = $now->getTimestamp();
 			$this->today  = $now->startOfDay()->getTimestamp();
 			$this->offset = $now->getOffset();
@@ -283,26 +283,26 @@ 
 			$this->set_datetime_separator();
 
 			// Set earliest and latest event timestamps.
-			if ( $this->events && is_array( $this->events ) ) {
-				$this->earliest_event = intval( current( array_keys( $this->events ) ) );
-				$this->latest_event   = intval( key( array_slice( $this->events, -1, 1, true ) ) );
+			if ($this->events && is_array($this->events)) {
+				$this->earliest_event = intval(current(array_keys($this->events)));
+				$this->latest_event   = intval(key(array_slice($this->events, -1, 1, true)));
 			}
 
 			// Set calendar end.
 			$this->set_end();
 
 			// Set view.
-			if ( ! $view ) {
+			if ( ! $view) {
 
-				$calendar_view = get_post_meta( $this->id, '_calendar_view', true );
-				$calendar_view = isset( $calendar_view[ $this->type ] ) ? $calendar_view[ $this->type ] : '';
+				$calendar_view = get_post_meta($this->id, '_calendar_view', true);
+				$calendar_view = isset($calendar_view[$this->type]) ? $calendar_view[$this->type] : '';
 
-				$view = esc_attr( $calendar_view );
+				$view = esc_attr($calendar_view);
 			}
 		}
 
 		// Get view.
-		$this->view = $this->get_view( $view );
+		$this->view = $this->get_view($view);
 	}
 
 	/**
@@ -314,8 +314,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function __isset( $key ) {
-		return metadata_exists( 'post', $this->id, '_' . $key );
+	public function __isset($key) {
+		return metadata_exists('post', $this->id, '_'.$key);
 	}
 
 	/**
@@ -327,9 +327,9 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function __get( $key ) {
-		$value = get_post_meta( $this->id, '_' . $key, true );
-		if ( ! empty( $value ) ) {
+	public function __get($key) {
+		$value = get_post_meta($this->id, '_'.$key, true);
+		if ( ! empty($value)) {
 			$this->$key = $value;
 		}
 		return $value;
@@ -342,17 +342,17 @@ 
 	 *
 	 * @param int|object|\WP_Post|Calendar $calendar
 	 */
-	public function set_post_object( $calendar ) {
-		if ( is_numeric( $calendar ) ) {
-			$this->id   = absint( $calendar );
-			$this->post = get_post( $this->id );
-		} elseif ( $calendar instanceof Calendar ) {
-			$this->id   = absint( $calendar->id );
+	public function set_post_object($calendar) {
+		if (is_numeric($calendar)) {
+			$this->id   = absint($calendar);
+			$this->post = get_post($this->id);
+		} elseif ($calendar instanceof Calendar) {
+			$this->id   = absint($calendar->id);
 			$this->post = $calendar->post;
-		} elseif ( $calendar instanceof \WP_Post ) {
-			$this->id   = absint( $calendar->ID );
+		} elseif ($calendar instanceof \WP_Post) {
+			$this->id   = absint($calendar->ID);
 			$this->post = $calendar;
-		} elseif ( isset( $calendar->id ) && isset( $calendar->post ) ) {
+		} elseif (isset($calendar->id) && isset($calendar->post)) {
 			$this->id   = $calendar->id;
 			$this->post = $calendar->post;
 		}
@@ -366,8 +366,8 @@ 
 	 * @return string
 	 */
 	public function get_title() {
-		$title = isset( $this->post->post_title ) ? $this->post->post_title : '';
-		return apply_filters( 'simcal_calendar_title', $title );
+		$title = isset($this->post->post_title) ? $this->post->post_title : '';
+		return apply_filters('simcal_calendar_title', $title);
 	}
 
 	/**
@@ -389,16 +389,16 @@ 
 	 */
 	protected function set_taxonomies() {
 		// Set calendar type.
-		if ( $type = wp_get_object_terms( $this->id, 'calendar_type' ) ) {
-			$this->type = sanitize_title( current( $type )->name );
+		if ($type = wp_get_object_terms($this->id, 'calendar_type')) {
+			$this->type = sanitize_title(current($type)->name);
 		} else {
-			$this->type = apply_filters( 'simcal_calendar_default_type', 'default-calendar' );
+			$this->type = apply_filters('simcal_calendar_default_type', 'default-calendar');
 		}
 		// Set feed type.
-		if ( $feed_type = wp_get_object_terms( $this->id, 'calendar_feed' ) ) {
-			$this->feed = sanitize_title( current( $feed_type )->name );
+		if ($feed_type = wp_get_object_terms($this->id, 'calendar_feed')) {
+			$this->feed = sanitize_title(current($feed_type)->name);
 		} else {
-			$this->feed = apply_filters( 'simcal_calendar_default_feed', 'google' );
+			$this->feed = apply_filters('simcal_calendar_default_feed', 'google');
 		}
 	}
 
@@ -410,7 +410,7 @@ 
 	 * @return Events
 	 */
 	public function get_events() {
-		return new Events( $this->events, $this->timezone );
+		return new Events($this->events, $this->timezone);
 	}
 
 	/**
@@ -420,14 +420,14 @@ 
 	 *
 	 * @param array $array
 	 */
-	public function set_events( array $array ) {
+	public function set_events(array $array) {
 
 		$events = array();
 
-		if ( ! empty( $array ) ) {
-			foreach ( $array as $tz => $e ) {
-				foreach ( $e as $event ) {
-					$events[ $tz ][] = $event instanceof Event ? $event : new Event( $event );
+		if ( ! empty($array)) {
+			foreach ($array as $tz => $e) {
+				foreach ($e as $event) {
+					$events[$tz][] = $event instanceof Event ? $event : new Event($event);
 				}
 			}
 		}
@@ -444,24 +444,24 @@ 
 	 *
 	 * @return string
 	 */
-	public function set_events_template( $template = '' ) {
-		if ( empty( $template ) ) {
-			$template = isset( $this->post->post_content ) ? $this->post->post_content : '';
+	public function set_events_template($template = '') {
+		if (empty($template)) {
+			$template = isset($this->post->post_content) ? $this->post->post_content : '';
 		}
 
 		// TODO: Removed wpautop() call.
 
-		$event_formatting = get_post_meta( $this->id, '_event_formatting', true );
+		$event_formatting = get_post_meta($this->id, '_event_formatting', true);
 
-		switch( $event_formatting ) {
+		switch ($event_formatting) {
 			case 'none':
-				$this->events_template =  wp_kses_post( trim( $template ) );
+				$this->events_template = wp_kses_post(trim($template));
 				break;
 			case 'no_linebreaks':
-				$this->events_template =  wpautop( wp_kses_post( trim( $template ) ), false );
+				$this->events_template = wpautop(wp_kses_post(trim($template)), false);
 				break;
 			default:
-				$this->events_template =  wpautop( wp_kses_post( trim( $template ) ), true );
+				$this->events_template = wpautop(wp_kses_post(trim($template)), true);
 		}
 
 		//$this->events_template =  wpautop( wp_kses_post( trim( $template ) ), true );
@@ -474,37 +474,37 @@ 
 	 *
 	 * @param string $tz Timezone.
 	 */
-	public function set_timezone( $tz = '' ) {
+	public function set_timezone($tz = '') {
 
-		$site_tz = esc_attr( simcal_get_wp_timezone() );
+		$site_tz = esc_attr(simcal_get_wp_timezone());
 
-		if ( $this->feed === 'grouped-calendars' ) {
+		if ($this->feed === 'grouped-calendars') {
 			$this->timezone = $site_tz;
 			return;
 		}
 
-		if ( empty( $tz ) ) {
+		if (empty($tz)) {
 
-			$timezone_setting = get_post_meta( $this->id, '_feed_timezone_setting', true );
+			$timezone_setting = get_post_meta($this->id, '_feed_timezone_setting', true);
 
-			if ( 'use_site' == $timezone_setting ) {
+			if ('use_site' == $timezone_setting) {
 				$tz = $site_tz;
-			} elseif ( 'use_custom' == $timezone_setting ) {
-				$custom_timezone = esc_attr( get_post_meta( $this->id, '_feed_timezone', true ) );
+			} elseif ('use_custom' == $timezone_setting) {
+				$custom_timezone = esc_attr(get_post_meta($this->id, '_feed_timezone', true));
 				// One may be using a non standard timezone in GMT (UTC) offset format.
-				if ( ( strpos( $custom_timezone, 'UTC+' ) === 0 ) || ( strpos( $custom_timezone, 'UTC-' ) === 0 ) ) {
-					$tz = simcal_get_timezone_from_gmt_offset( substr( $custom_timezone, 3 ) );
+				if ((strpos($custom_timezone, 'UTC+') === 0) || (strpos($custom_timezone, 'UTC-') === 0)) {
+					$tz = simcal_get_timezone_from_gmt_offset(substr($custom_timezone, 3));
 				} else {
-					$tz = ! empty( $custom_timezone ) ? $custom_timezone : 'UTC';
+					$tz = ! empty($custom_timezone) ? $custom_timezone : 'UTC';
 				}
 			}
 
-			$this->timezone = empty( $tz ) ? 'UTC' : $tz;
+			$this->timezone = empty($tz) ? 'UTC' : $tz;
 			return;
 		}
 
 		$this->site_timezone = $site_tz;
-		$this->timezone = simcal_esc_timezone( $tz, $this->timezone );
+		$this->timezone = simcal_esc_timezone($tz, $this->timezone);
 	}
 
 	/**
@@ -514,20 +514,20 @@ 
 	 *
 	 * @param string $format PHP datetime format.
 	 */
-	public function set_date_format( $format = '' ) {
+	public function set_date_format($format = '') {
 
 		$date_format_custom = $date_format_default = $format;
 
-		if ( empty( $date_format_custom ) ) {
+		if (empty($date_format_custom)) {
 
-			$date_format_option  = esc_attr( get_post_meta( $this->id, '_calendar_date_format_setting', true ) );
-			$date_format_default = esc_attr( get_option( 'date_format' ) );
+			$date_format_option  = esc_attr(get_post_meta($this->id, '_calendar_date_format_setting', true));
+			$date_format_default = esc_attr(get_option('date_format'));
 			$date_format_custom  = '';
 
-			if ( 'use_custom' == $date_format_option ) {
-				$date_format_custom = esc_attr( get_post_meta( $this->id, '_calendar_date_format', true ) );
-			} elseif ( 'use_custom_php' == $date_format_option ) {
-				$date_format_custom = esc_attr( get_post_meta( $this->id, '_calendar_date_format_php', true ) );
+			if ('use_custom' == $date_format_option) {
+				$date_format_custom = esc_attr(get_post_meta($this->id, '_calendar_date_format', true));
+			} elseif ('use_custom_php' == $date_format_option) {
+				$date_format_custom = esc_attr(get_post_meta($this->id, '_calendar_date_format_php', true));
 			}
 		}
 
@@ -541,20 +541,20 @@ 
 	 *
 	 * @param string $format PHP datetime format.
 	 */
-	public function set_time_format( $format = '' ) {
+	public function set_time_format($format = '') {
 
 		$time_format_custom = $time_format_default = $format;
 
-		if ( empty( $time_format_custom ) ) {
+		if (empty($time_format_custom)) {
 
-			$time_format_option  = esc_attr( get_post_meta( $this->id, '_calendar_time_format_setting', true ) );
-			$time_format_default = esc_attr( get_option( 'time_format' ) );
+			$time_format_option  = esc_attr(get_post_meta($this->id, '_calendar_time_format_setting', true));
+			$time_format_default = esc_attr(get_option('time_format'));
 			$time_format_custom  = '';
 
-			if ( 'use_custom' == $time_format_option ) {
-				$time_format_custom = esc_attr( get_post_meta( $this->id, '_calendar_time_format', true ) );
-			} elseif ( 'use_custom_php' == $time_format_option ) {
-				$time_format_custom = esc_attr( get_post_meta( $this->id, '_calendar_time_format_php', true ) );
+			if ('use_custom' == $time_format_option) {
+				$time_format_custom = esc_attr(get_post_meta($this->id, '_calendar_time_format', true));
+			} elseif ('use_custom_php' == $time_format_option) {
+				$time_format_custom = esc_attr(get_post_meta($this->id, '_calendar_time_format_php', true));
 			}
 		}
 
@@ -568,13 +568,13 @@ 
 	 *
 	 * @param string $separator A UTF8 character used as separator.
 	 */
-	public function set_datetime_separator( $separator = '' ) {
+	public function set_datetime_separator($separator = '') {
 
-		if ( empty( $separator ) ) {
-			$separator = get_post_meta( $this->id, '_calendar_datetime_separator', true );
+		if (empty($separator)) {
+			$separator = get_post_meta($this->id, '_calendar_datetime_separator', true);
 		}
 
-		$this->datetime_separator = esc_attr( $separator );
+		$this->datetime_separator = esc_attr($separator);
 	}
 
 	/**
@@ -584,18 +584,18 @@ 
 	 *
 	 * @param int $weekday From 0 (Sunday) to 6 (Friday).
 	 */
-	public function set_start_of_week( $weekday = -1 ) {
+	public function set_start_of_week($weekday = -1) {
 
-		$week_starts = is_int( $weekday ) ? $weekday : -1;
+		$week_starts = is_int($weekday) ? $weekday : -1;
 
-		if ( $week_starts < 0 || $week_starts > 6 ) {
+		if ($week_starts < 0 || $week_starts > 6) {
 
-			$week_starts_setting = get_post_meta( $this->id, '_calendar_week_starts_on_setting', true );
-			$week_starts         = intval( get_option( 'start_of_week' ) );
+			$week_starts_setting = get_post_meta($this->id, '_calendar_week_starts_on_setting', true);
+			$week_starts         = intval(get_option('start_of_week'));
 
-			if ( 'use_custom' == $week_starts_setting ) {
-				$week_starts_on = get_post_meta( $this->id, '_calendar_week_starts_on', true );
-				$week_starts    = is_numeric( $week_starts_on ) ? intval( $week_starts_on ) : $week_starts;
+			if ('use_custom' == $week_starts_setting) {
+				$week_starts_on = get_post_meta($this->id, '_calendar_week_starts_on', true);
+				$week_starts    = is_numeric($week_starts_on) ? intval($week_starts_on) : $week_starts;
 			}
 		}
 
@@ -609,51 +609,51 @@ 
 	 *
 	 * @param int $timestamp
 	 */
-	public function set_start( $timestamp = 0 ) {
+	public function set_start($timestamp = 0) {
 
-		if ( is_int( $timestamp ) && $timestamp !== 0 ) {
+		if (is_int($timestamp) && $timestamp !== 0) {
 			$this->start = $timestamp;
 			return;
 		}
 
-		$this->start = Carbon::now( $this->timezone )->getTimestamp();
+		$this->start = Carbon::now($this->timezone)->getTimestamp();
 
-		$calendar_begins = esc_attr( get_post_meta( $this->id, '_calendar_begins', true ) );
-		$nth = max( absint( get_post_meta( $this->id, '_calendar_begins_nth', true ) ), 1 );
+		$calendar_begins = esc_attr(get_post_meta($this->id, '_calendar_begins', true));
+		$nth = max(absint(get_post_meta($this->id, '_calendar_begins_nth', true)), 1);
 
-		if ( 'today' == $calendar_begins ) {
-			$this->start = Carbon::today( $this->timezone )->getTimestamp();
-		} elseif ( 'days_before' == $calendar_begins ) {
-			$this->start = Carbon::today( $this->timezone )->subDays( $nth )->getTimestamp();
-		} elseif ( 'days_after' == $calendar_begins ) {
-			$this->start = Carbon::today( $this->timezone )->addDays( $nth )->getTimestamp();
-		} elseif ( 'this_week' == $calendar_begins ) {
-			$week = new Carbon( 'now', $this->timezone );
-			$week->setWeekStartsAt( $this->week_starts );
+		if ('today' == $calendar_begins) {
+			$this->start = Carbon::today($this->timezone)->getTimestamp();
+		} elseif ('days_before' == $calendar_begins) {
+			$this->start = Carbon::today($this->timezone)->subDays($nth)->getTimestamp();
+		} elseif ('days_after' == $calendar_begins) {
+			$this->start = Carbon::today($this->timezone)->addDays($nth)->getTimestamp();
+		} elseif ('this_week' == $calendar_begins) {
+			$week = new Carbon('now', $this->timezone);
+			$week->setWeekStartsAt($this->week_starts);
 			$this->start = $week->startOfWeek()->getTimestamp();
-		} elseif ( 'weeks_before' == $calendar_begins ) {
-			$week = new Carbon( 'now', $this->timezone );
-			$week->setWeekStartsAt( $this->week_starts );
-			$this->start = $week->startOfWeek()->subWeeks( $nth )->getTimestamp();
-		} elseif ( 'weeks_after' == $calendar_begins ) {
-			$week = new Carbon( 'now', $this->timezone );
-			$week->setWeekStartsAt( $this->week_starts );
-			$this->start = $week->startOfWeek()->addWeeks( $nth )->getTimestamp();
-		} elseif ( 'this_month' == $calendar_begins ) {
-			$this->start = Carbon::today( $this->timezone )->startOfMonth()->getTimeStamp();
-		} elseif ( 'months_before' == $calendar_begins ) {
-			$this->start = Carbon::today( $this->timezone )->subMonths( $nth )->startOfMonth()->getTimeStamp();
-		} elseif ( 'months_after' == $calendar_begins ) {
-			$this->start = Carbon::today( $this->timezone )->addMonths( $nth )->startOfMonth()->getTimeStamp();
-		} elseif ( 'this_year' == $calendar_begins ) {
-			$this->start = Carbon::today( $this->timezone )->startOfYear()->getTimestamp();
-		} elseif ( 'years_before' == $calendar_begins ) {
-			$this->start = Carbon::today( $this->timezone )->subYears( $nth )->startOfYear()->getTimeStamp();
-		} elseif ( 'years_after' == $calendar_begins ) {
-			$this->start = Carbon::today( $this->timezone )->addYears( $nth )->startOfYear()->getTimeStamp();
-		} elseif ( 'custom_date' == $calendar_begins ) {
-			if ( $date = get_post_meta( $this->id, '_calendar_begins_custom_date', true ) ) {
-				$this->start = Carbon::createFromFormat( 'Y-m-d', esc_attr( $date ), $this->timezone )->setTimezone( $this->timezone )->startOfDay()->getTimestamp();
+		} elseif ('weeks_before' == $calendar_begins) {
+			$week = new Carbon('now', $this->timezone);
+			$week->setWeekStartsAt($this->week_starts);
+			$this->start = $week->startOfWeek()->subWeeks($nth)->getTimestamp();
+		} elseif ('weeks_after' == $calendar_begins) {
+			$week = new Carbon('now', $this->timezone);
+			$week->setWeekStartsAt($this->week_starts);
+			$this->start = $week->startOfWeek()->addWeeks($nth)->getTimestamp();
+		} elseif ('this_month' == $calendar_begins) {
+			$this->start = Carbon::today($this->timezone)->startOfMonth()->getTimeStamp();
+		} elseif ('months_before' == $calendar_begins) {
+			$this->start = Carbon::today($this->timezone)->subMonths($nth)->startOfMonth()->getTimeStamp();
+		} elseif ('months_after' == $calendar_begins) {
+			$this->start = Carbon::today($this->timezone)->addMonths($nth)->startOfMonth()->getTimeStamp();
+		} elseif ('this_year' == $calendar_begins) {
+			$this->start = Carbon::today($this->timezone)->startOfYear()->getTimestamp();
+		} elseif ('years_before' == $calendar_begins) {
+			$this->start = Carbon::today($this->timezone)->subYears($nth)->startOfYear()->getTimeStamp();
+		} elseif ('years_after' == $calendar_begins) {
+			$this->start = Carbon::today($this->timezone)->addYears($nth)->startOfYear()->getTimeStamp();
+		} elseif ('custom_date' == $calendar_begins) {
+			if ($date = get_post_meta($this->id, '_calendar_begins_custom_date', true)) {
+				$this->start = Carbon::createFromFormat('Y-m-d', esc_attr($date), $this->timezone)->setTimezone($this->timezone)->startOfDay()->getTimestamp();
 			}
 		}
 	}
@@ -665,8 +665,8 @@ 
 	 *
 	 * @param int $timestamp
 	 */
-	public function set_end( $timestamp = 0 ) {
-		$latest = is_int( $timestamp ) && $timestamp !== 0 ? $timestamp : $this->latest_event;
+	public function set_end($timestamp = 0) {
+		$latest = is_int($timestamp) && $timestamp !== 0 ? $timestamp : $this->latest_event;
 		$this->end = $latest > $this->start ? $latest : $this->start;
 	}
 
@@ -677,14 +677,14 @@ 
 	 *
 	 * @param string|bool $static
 	 */
-	public function set_static( $static = '' ) {
+	public function set_static($static = '') {
 
-		if ( ! empty( $static ) && is_bool( $static ) ) {
+		if ( ! empty($static) && is_bool($static)) {
 			$this->static = $static;
 			return;
 		}
 
-		if ( 'yes' == get_post_meta( $this->id, '_calendar_is_static', true ) ) {
+		if ('yes' == get_post_meta($this->id, '_calendar_is_static', true)) {
 			$this->static = true;
 			return;
 		}
@@ -712,7 +712,7 @@ 
 	 *
 	 * @return Calendar_View
 	 */
-	abstract public function get_view( $view = '' );
+	abstract public function get_view($view = '');
 
 	/**
 	 * Get event HTML parsed by template.
@@ -724,11 +724,11 @@ 
 	 *
 	 * @return string
 	 */
-	public function get_event_html( Event $event, $template = '' ) {
-		$event_builder = new Event_Builder( $event, $this );
+	public function get_event_html(Event $event, $template = '') {
+		$event_builder = new Event_Builder($event, $this);
 		// Use the event template to parse tags; if empty, fallback to calendar post content.
-		$template = empty( $template ) ? ( empty( $event->template ) ? $this->events_template : $event->template ) : $template;
-		return $event_builder->parse_event_template_tags( $template );
+		$template = empty($template) ? (empty($event->template) ? $this->events_template : $event->template) : $template;
+		return $event_builder->parse_event_template_tags($template);
 	}
 
 	/**
@@ -740,7 +740,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function get_add_to_gcal_url( Event $event ) {
+	public function get_add_to_gcal_url(Event $event) {
 		$base_url = 'https://calendar.google.com/calendar/render';
 		// Was https://www.google.com/calendar/render
 
@@ -748,30 +748,30 @@ 
 		// &dates=20160504T110000/20160504T170000
 		// No "Z"s tacked on to preserve source timezone.
 		// All day events remove time component, but need to add a full day to show up correctly.
-		$is_all_day     = ( true == $event->whole_day );
+		$is_all_day     = (true == $event->whole_day);
 		$gcal_dt_format = $is_all_day ? 'Ymd' : 'Ymd\THi00';
-		$gcal_begin_dt  = $event->start_dt->format( $gcal_dt_format );
+		$gcal_begin_dt  = $event->start_dt->format($gcal_dt_format);
 		$end_dt_raw     = $is_all_day ? $event->end_dt->addDay() : $event->end_dt;
-		$gcal_end_dt    = $end_dt_raw->format( $gcal_dt_format );
-		$gcal_dt_string = $gcal_begin_dt . '/' . $gcal_end_dt;
+		$gcal_end_dt    = $end_dt_raw->format($gcal_dt_format);
+		$gcal_dt_string = $gcal_begin_dt.'/'.$gcal_end_dt;
 
 		// "details" (description) should work even when blank.
 		// "location" (address) should work with an address, just a name or blank.
 		$params = array(
 			'action'   => 'TEMPLATE',
-			'text'     => urlencode( strip_tags( $event->title ) ),
+			'text'     => urlencode(strip_tags($event->title)),
 			'dates'    => $gcal_dt_string,
-			'details'  => urlencode( $event->description ),
-			'location' => urlencode( $event->start_location['address'] ),
+			'details'  => urlencode($event->description),
+			'location' => urlencode($event->start_location['address']),
 			'trp'      => 'false',
 		);
 
 		// "ctz" (timezone) arg should be included unless all-day OR 'UTC'.
-		if ( ! $is_all_day && ( 'UTC' !== $event->timezone ) ) {
-			$params['ctz'] = urlencode( $event->timezone );
+		if ( ! $is_all_day && ('UTC' !== $event->timezone)) {
+			$params['ctz'] = urlencode($event->timezone);
 		}
 
-		$url = add_query_arg( $params, $base_url );
+		$url = add_query_arg($params, $base_url);
 
 		return $url;
 	}
@@ -783,56 +783,56 @@ 
 	 *
 	 * @param string $view The calendar view to display.
 	 */
-	public function html( $view = '' ) {
+	public function html($view = '') {
 
-		$view = empty( $view ) ? $this->view : $this->get_view( $view );
+		$view = empty($view) ? $this->view : $this->get_view($view);
 
-		if ( $view instanceof Calendar_View ) {
+		if ($view instanceof Calendar_View) {
 
-			if ( ! empty( $this->errors ) ) {
+			if ( ! empty($this->errors)) {
 
-				if ( current_user_can( 'manage_options' )  ) {
+				if (current_user_can('manage_options')) {
 					echo '<pre><code>';
-					foreach ( $this->errors as $error ) { echo $error; }
+					foreach ($this->errors as $error) { echo $error; }
 					echo '</code></pre>';
 				}
 
 			} else {
 
 				// Get a CSS class from the class name of the calendar view (minus namespace part).
-				$view_name  = implode( '-', array_map( 'lcfirst', explode( '_', strtolower( get_class( $view ) ) ) ) );
-				$view_class = substr( $view_name, strrpos( $view_name, '\\' ) + 1 );
+				$view_name  = implode('-', array_map('lcfirst', explode('_', strtolower(get_class($view)))));
+				$view_class = substr($view_name, strrpos($view_name, '\\') + 1);
 
-				$calendar_class = trim( implode( ' simcal-', apply_filters( 'simcal_calendar_class', array(
+				$calendar_class = trim(implode(' simcal-', apply_filters('simcal_calendar_class', array(
 					'simcal-calendar',
 					$this->type,
 					$view_class,
-				), $this->id ) ) );
-
-				echo '<div class="' . $calendar_class . '" '
-									. 'data-calendar-id="'    . $this->id . '" '
-									. 'data-timezone="'       . $this->timezone . '" '
-									. 'data-offset="'         . $this->offset . '" '
-									. 'data-week-start="'     . $this->week_starts . '" '
-									. 'data-calendar-start="' . $this->start .'" '
-									. 'data-calendar-end="'   . $this->end . '" '
-									. 'data-events-first="'   . $this->earliest_event .'" '
-									. 'data-events-last="'    . $this->latest_event . '"'
+				), $this->id)));
+
+				echo '<div class="'.$calendar_class.'" '
+									. 'data-calendar-id="'.$this->id.'" '
+									. 'data-timezone="'.$this->timezone.'" '
+									. 'data-offset="'.$this->offset.'" '
+									. 'data-week-start="'.$this->week_starts.'" '
+									. 'data-calendar-start="'.$this->start.'" '
+									. 'data-calendar-end="'.$this->end.'" '
+									. 'data-events-first="'.$this->earliest_event.'" '
+									. 'data-events-last="'.$this->latest_event.'"'
 									. '>';
 
-				do_action( 'simcal_calendar_html_before', $this->id );
+				do_action('simcal_calendar_html_before', $this->id);
 
 				$view->html();
 
-				do_action( 'simcal_calendar_html_after', $this->id );
+				do_action('simcal_calendar_html_after', $this->id);
 
 				//$settings = get_option( 'simple-calendar_settings_calendars' );
-				$poweredby = get_post_meta( $this->id, '_poweredby', true );
+				$poweredby = get_post_meta($this->id, '_poweredby', true);
 
-				if ( 'yes' == $poweredby ) {
+				if ('yes' == $poweredby) {
 					$align = is_rtl() ? 'left' : 'right';
-					echo '<small class="simcal-powered simcal-align-' . $align .'">' .
-					     sprintf( __( 'Powered by <a href="%s" target="_blank">Simple Calendar</a>', 'google-calendar-events' ), simcal_get_url( 'home' ) ) .
+					echo '<small class="simcal-powered simcal-align-'.$align.'">'.
+					     sprintf(__('Powered by <a href="%s" target="_blank">Simple Calendar</a>', 'google-calendar-events'), simcal_get_url('home')).
 					     '</small>';
 				}
 

includes/events/event.php

Spacing +77 added lines, -77 removed lines

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