moonstonemedia / Simple-Calendar

includes/events/event-builder.php

Spacing +241 added lines, -241 removed lines

@@ -9,7 +9,7 @@ 
 use Carbon\Carbon;
 use SimpleCalendar\Abstracts\Calendar;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -54,7 +54,7 @@ 
 	 * @param Event    $event
 	 * @param Calendar $calendar
 	 */
-	public function __construct( Event $event, Calendar $calendar ) {
+	public function __construct(Event $event, Calendar $calendar) {
 		$this->event    = $event;
 		$this->calendar = $calendar;
 		$this->tags     = $this->get_content_tags();
@@ -68,7 +68,7 @@ 
 	 * @return array
 	 */
 	public function get_content_tags() {
-		return array_merge( array(
+		return array_merge(array(
 
 			/* ============ *
 			 * Content Tags *
@@ -219,7 +219,7 @@ 
 			'if-not-end-location',
 			// Does the event has NOT an end location?
 
-		), (array) $this->add_custom_event_tags() );
+		), (array) $this->add_custom_event_tags());
 	}
 
 	/**
@@ -231,16 +231,16 @@ 
 	 *
 	 * @return string
 	 */
-	public function parse_event_template_tags( $template_tags = '' ) {
+	public function parse_event_template_tags($template_tags = '') {
 
 		// Process tags.
-		$result = preg_replace_callback( $this->get_regex(), array( $this, 'process_event_content' ), $template_tags );
+		$result = preg_replace_callback($this->get_regex(), array($this, 'process_event_content'), $template_tags);
 
 		// Removes extra consecutive <br> tags.
 		// TODO: Doesn't seem to work but going to remove it to allow multiple <br> tags in the editor
 		/*return preg_replace( '#(<br *//*?>\s*)+#i', '<br />', trim( $result ) );*/
 
-		return do_shortcode( trim( $result ) );
+		return do_shortcode(trim($result));
 	}
 
 	/**
@@ -252,10 +252,10 @@ 
 	 *
 	 * @return string
 	 */
-	public function process_event_content( $match ) {
+	public function process_event_content($match) {
 
-		if ( $match[1] == '[' && $match[6] == ']' ) {
-			return substr( $match[0], 1, -1 );
+		if ($match[1] == '[' && $match[6] == ']') {
+			return substr($match[0], 1, -1);
 		}
 
 		$tag     = $match[2]; // Tag name without square brackets.
@@ -267,9 +267,9 @@ 
 		$calendar = $this->calendar;
 		$event    = $this->event;
 
-		if ( ( $calendar instanceof Calendar ) && ( $event instanceof Event ) ) {
+		if (($calendar instanceof Calendar) && ($event instanceof Event)) {
 
-			switch ( $tag ) {
+			switch ($tag) {
 
 				/* ============ *
 				 * Content Tags *
@@ -277,13 +277,13 @@ 
 
 				case 'title' :
 				case 'event-title' :
-					return $this->get_title( $event->title, $attr );
+					return $this->get_title($event->title, $attr);
 
 				case 'description' :
-					return $this->get_description( $event->description, $attr );
+					return $this->get_description($event->description, $attr);
 
 				case 'when' :
-					return $this->get_when( $event );
+					return $this->get_when($event);
 
 				case 'end-date' :
 				case 'end-custom' :
@@ -293,58 +293,58 @@ 
 				case 'start-date' :
 				case 'start-human' :
 				case 'start-time' :
-					return $this->get_dt( $tag, $event, $attr );
+					return $this->get_dt($tag, $event, $attr);
 
 				case 'length' :
 				case 'duration' :
-					if ( false !== $event->end ) {
+					if (false !== $event->end) {
 						$duration = $event->start - $event->end;
-						$value    = human_time_diff( $event->start, $event->end );
+						$value    = human_time_diff($event->start, $event->end);
 					} else {
 						$duration = '-1';
-						$value    = __( 'No end time', 'google-calendar-events' );
+						$value    = __('No end time', 'google-calendar-events');
 					}
 
-					return ' <span class="simcal-event-duration" data-event-duration="' . $duration . '">' . $value . '</span>';
+					return ' <span class="simcal-event-duration" data-event-duration="'.$duration.'">'.$value.'</span>';
 
 				case 'location' :
 				case 'start-location' :
 				case 'end-location' :
-					$location       = ( 'end-location' == $tag ) ? $event->end_location['address'] : $event->start_location['address'];
-					$location_class = ( 'end-location' == $tag ) ? 'end' : 'start';
+					$location       = ('end-location' == $tag) ? $event->end_location['address'] : $event->start_location['address'];
+					$location_class = ('end-location' == $tag) ? 'end' : 'start';
 
 					// location, location.name, location.address (type PostalAddress) all required for schema data.
 					// Need to use event name where location data doesn't exist.
 					// Since we have 1 location field, use it as the name and address.
 					// If the location is blank, use the event title as the name and address.
 					// Wrap with wp_strip_all_tags().
-					$meta_location_name_and_address = empty( $location ) ? wp_strip_all_tags( $event->title ) : wp_strip_all_tags( $location );
+					$meta_location_name_and_address = empty($location) ? wp_strip_all_tags($event->title) : wp_strip_all_tags($location);
 
-					return ' <span class="simcal-event-address simcal-event-' . $location_class . '-location" itemprop="location" itemscope itemtype="http://schema.org/Place">' . '<meta itemprop="name" content="' . $meta_location_name_and_address . '" />' . '<meta itemprop="address" content="' . $meta_location_name_and_address . '" />' . wp_strip_all_tags( $location ) . '</span>';
+					return ' <span class="simcal-event-address simcal-event-'.$location_class.'-location" itemprop="location" itemscope itemtype="http://schema.org/Place">'.'<meta itemprop="name" content="'.$meta_location_name_and_address.'" />'.'<meta itemprop="address" content="'.$meta_location_name_and_address.'" />'.wp_strip_all_tags($location).'</span>';
 
 				case 'start-location-link':
 				case 'end-location-link' :
 				case 'maps-link' :
-					$location = ( 'end-location-link' == $tag ) ? $event->end_location['address'] : $event->start_location['address'];
-					if ( ! empty( $location ) ) {
-						$url = '//maps.google.com?q=' . urlencode( $location );
+					$location = ('end-location-link' == $tag) ? $event->end_location['address'] : $event->start_location['address'];
+					if ( ! empty($location)) {
+						$url = '//maps.google.com?q='.urlencode($location);
 
-						return $this->make_link( $tag, $url, $calendar->get_event_html( $event, $partial ), $attr );
+						return $this->make_link($tag, $url, $calendar->get_event_html($event, $partial), $attr);
 					}
 					break;
 
 				case 'link' :
 				case 'url' :
-					$content = ( 'link' == $tag ) ? $calendar->get_event_html( $event, $partial ) : '';
+					$content = ('link' == $tag) ? $calendar->get_event_html($event, $partial) : '';
 
-					return $this->make_link( $tag, $event->link, $content, $attr );
+					return $this->make_link($tag, $event->link, $content, $attr);
 
 				case 'add-to-gcal-link';
-					$content = ( 'add-to-gcal-link' == $tag ) ? $calendar->get_event_html( $event, $partial ) : '';
-					if ( ! empty( $content ) ) {
-						$url = $calendar->get_add_to_gcal_url( $event );
+					$content = ('add-to-gcal-link' == $tag) ? $calendar->get_event_html($event, $partial) : '';
+					if ( ! empty($content)) {
+						$url = $calendar->get_add_to_gcal_url($event);
 
-						return $this->make_link( $tag, $url, $content, $attr );
+						return $this->make_link($tag, $url, $content, $attr);
 					}
 					break;
 
@@ -371,22 +371,22 @@ 
 
 				case 'attachments' :
 					$attachments = $event->get_attachments();
-					if ( ! empty( $attachments ) ) {
-						return $this->get_attachments( $attachments );
+					if ( ! empty($attachments)) {
+						return $this->get_attachments($attachments);
 					}
 					break;
 
 				case 'attendees' :
 					$attendees = $event->get_attendees();
-					if ( ! empty( $attendees ) ) {
-						return $this->get_attendees( $attendees, $attr );
+					if ( ! empty($attendees)) {
+						return $this->get_attendees($attendees, $attr);
 					}
 					break;
 
 				case 'organizer' :
 					$organizer = $event->get_organizer();
-					if ( ! empty( $organizer ) ) {
-						return $this->get_organizer( $organizer, $attr );
+					if ( ! empty($organizer)) {
+						return $this->get_organizer($organizer, $attr);
 					}
 					break;
 
@@ -395,35 +395,35 @@ 
 				 * ================ */
 
 				case 'if-title':
-					if ( ! empty( $event->title ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if ( ! empty($event->title)) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-description':
-					if ( ! empty( $event->description ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if ( ! empty($event->description)) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-now' :
 				case 'if-not-now' :
 
-					$start_dt = $event->start_dt->setTimezone( $calendar->timezone );
+					$start_dt = $event->start_dt->setTimezone($calendar->timezone);
 					$start    = $start_dt->getTimestamp();
 
-					if ( $event->end_dt instanceof Carbon ) {
-						$end = $event->end_dt->setTimezone( $calendar->timezone )->getTimestamp();
+					if ($event->end_dt instanceof Carbon) {
+						$end = $event->end_dt->setTimezone($calendar->timezone)->getTimestamp();
 					} else {
 						return '';
 					}
 
-					$now = ( $start <= $calendar->now ) && ( $end >= $calendar->now );
+					$now = ($start <= $calendar->now) && ($end >= $calendar->now);
 
-					if ( ( 'if-now' == $tag ) && $now ) {
-						return $calendar->get_event_html( $event, $partial );
-					} elseif ( ( 'if-not-now' == $tag ) && ( false == $now ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (('if-now' == $tag) && $now) {
+						return $calendar->get_event_html($event, $partial);
+					} elseif (('if-not-now' == $tag) && (false == $now)) {
+						return $calendar->get_event_html($event, $partial);
 					}
 
 					break;
@@ -431,15 +431,15 @@ 
 				case 'if-started' :
 				case 'if-not-started' :
 
-					$start = $event->start_dt->setTimezone( $calendar->timezone )->getTimestamp();
+					$start = $event->start_dt->setTimezone($calendar->timezone)->getTimestamp();
 
-					if ( 'if-started' == $tag ) {
-						if ( $start < $calendar->now ) {
-							return $calendar->get_event_html( $event, $partial );
+					if ('if-started' == $tag) {
+						if ($start < $calendar->now) {
+							return $calendar->get_event_html($event, $partial);
 						}
-					} elseif ( 'if-not-started' == $tag ) {
-						if ( $start > $calendar->now ) {
-							return $calendar->get_event_html( $event, $partial );
+					} elseif ('if-not-started' == $tag) {
+						if ($start > $calendar->now) {
+							return $calendar->get_event_html($event, $partial);
 						}
 					}
 
@@ -448,17 +448,17 @@ 
 				case 'if-ended' :
 				case 'if-not-ended' :
 
-					if ( false !== $event->end ) {
+					if (false !== $event->end) {
 
-						$end = $event->end_dt->setTimezone( $calendar->timezone )->getTimestamp();
+						$end = $event->end_dt->setTimezone($calendar->timezone)->getTimestamp();
 
-						if ( 'if-ended' == $tag ) {
-							if ( $end < $calendar->now ) {
-								return $calendar->get_event_html( $event, $partial );
+						if ('if-ended' == $tag) {
+							if ($end < $calendar->now) {
+								return $calendar->get_event_html($event, $partial);
 							}
-						} elseif ( 'if-not-ended' == $tag ) {
-							if ( $end > $calendar->now ) {
-								return $calendar->get_event_html( $event, $partial );
+						} elseif ('if-not-ended' == $tag) {
+							if ($end > $calendar->now) {
+								return $calendar->get_event_html($event, $partial);
 							}
 						}
 
@@ -468,29 +468,29 @@ 
 
 				case 'if-today' :
 				case 'if-not-today' :
-					$start_dt   = $event->start_dt->setTimezone( $calendar->timezone );
+					$start_dt   = $event->start_dt->setTimezone($calendar->timezone);
 					$startOfDay = $start_dt->startOfDay()->getTimestamp();
 					$endOfDay   = $start_dt->endOfDay()->getTimestamp();
 
-					$today = ( $startOfDay <= $calendar->now ) && ( $calendar->now <= $endOfDay );
+					$today = ($startOfDay <= $calendar->now) && ($calendar->now <= $endOfDay);
 
-					if ( ( 'if-today' == $tag ) && $today ) {
-						return $calendar->get_event_html( $event, $partial );
-					} elseif ( ( 'if-not-today' == $tag ) && ( false == $today ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (('if-today' == $tag) && $today) {
+						return $calendar->get_event_html($event, $partial);
+					} elseif (('if-not-today' == $tag) && (false == $today)) {
+						return $calendar->get_event_html($event, $partial);
 					}
 
 					break;
 
 				case 'if-end-time' :
-					if ( false !== $event->end ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (false !== $event->end) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-no-end-time' :
-					if ( false === $event->end ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (false === $event->end) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
@@ -498,62 +498,62 @@ 
 				case 'if-whole-day' :
 				case 'if-not-all-day' :
 				case 'if-not-whole-day' :
-					$bool = strstr( $tag, 'not' ) ? false : true;
-					if ( $bool === $event->whole_day ) {
-						return $calendar->get_event_html( $event, $partial );
+					$bool = strstr($tag, 'not') ? false : true;
+					if ($bool === $event->whole_day) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-recurring' :
-					if ( ! empty( $event->recurrence ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if ( ! empty($event->recurrence)) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-not-recurring' :
-					if ( false === $event->recurrence ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (false === $event->recurrence) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-multi-day' :
-					if ( false !== $event->multiple_days ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (false !== $event->multiple_days) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-single-day' :
-					if ( false === $event->multiple_days ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (false === $event->multiple_days) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-location' :
 				case 'if-start-location' :
-					if ( ! empty( $event->start_location['address'] ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if ( ! empty($event->start_location['address'])) {
+						return $calendar->get_event_html($event, $partial);
 					}
 
 					return false;
 
 				case 'if-not-location' :
 				case 'if-not-start-location' :
-					if ( empty( $event->start_location['address'] ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (empty($event->start_location['address'])) {
+						return $calendar->get_event_html($event, $partial);
 					}
 
 					return '';
 
 				case 'if-not-end-location' :
-					if ( empty( $event->end_location['address'] ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (empty($event->end_location['address'])) {
+						return $calendar->get_event_html($event, $partial);
 					}
 
 					return '';
 
 				case 'if-end-location' :
-					if ( ! empty( $event->end_location['address'] ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if ( ! empty($event->end_location['address'])) {
+						return $calendar->get_event_html($event, $partial);
 					}
 
 					return '';
@@ -563,12 +563,12 @@ 
 				 * ======= */
 
 				default :
-					$resultCustom = $this->do_custom_event_tag( $tag, $partial, $attr, $event );
-					if ( $resultCustom != "" ) {
+					$resultCustom = $this->do_custom_event_tag($tag, $partial, $attr, $event);
+					if ($resultCustom != "") {
 						return $resultCustom;
 					}
 
-					return wp_kses_post( $before . $partial . $after );
+					return wp_kses_post($before.$partial.$after);
 			}
 		}
 
@@ -586,14 +586,14 @@ 
 	 *
 	 * @return string
 	 */
-	private function limit_words( $text, $limit ) {
+	private function limit_words($text, $limit) {
 
-		$limit = max( absint( $limit ), 0 );
+		$limit = max(absint($limit), 0);
 
-		if ( $limit > 0 && ( str_word_count( $text, 0 ) > $limit ) ) {
-			$words = str_word_count( $text, 2 );
-			$pos   = array_keys( $words );
-			$text  = trim( substr( $text, 0, $pos[ $limit ] ) ) . '&hellip;';
+		if ($limit > 0 && (str_word_count($text, 0) > $limit)) {
+			$words = str_word_count($text, 2);
+			$pos   = array_keys($words);
+			$text  = trim(substr($text, 0, $pos[$limit])).'&hellip;';
 		}
 
 		return $text;
@@ -610,26 +610,26 @@ 
 	 *
 	 * @return string
 	 */
-	private function get_title( $title, $attr ) {
+	private function get_title($title, $attr) {
 
-		if ( empty( $title ) ) {
+		if (empty($title)) {
 			return '';
 		}
 
-		$attr = array_merge( array(
-			'html'  => '',  // Parse HTML
-			'limit' => 0,   // Trim length to amount of words
-		), (array) shortcode_parse_atts( $attr ) );
+		$attr = array_merge(array(
+			'html'  => '', // Parse HTML
+			'limit' => 0, // Trim length to amount of words
+		), (array) shortcode_parse_atts($attr));
 
-		if ( ! empty( $attr['html'] ) ) {
-			$title = wp_kses_post( $title );
+		if ( ! empty($attr['html'])) {
+			$title = wp_kses_post($title);
 			$tag   = 'div';
 		} else {
-			$title = $this->limit_words( $title, $attr['limit'] );
+			$title = $this->limit_words($title, $attr['limit']);
 			$tag   = 'span';
 		}
 
-		return '<' . $tag . ' class="simcal-event-title" itemprop="name">' . $title . '</' . $tag . '>';
+		return '<'.$tag.' class="simcal-event-title" itemprop="name">'.$title.'</'.$tag.'>';
 	}
 
 	/**
@@ -643,18 +643,18 @@ 
 	 *
 	 * @return string
 	 */
-	private function get_description( $description, $attr ) {
+	private function get_description($description, $attr) {
 
-		if ( empty( $description ) ) {
+		if (empty($description)) {
 			return '';
 		}
 
-		$attr = array_merge( array(
-			'limit'    => 0,       // Trim length to number of words
-			'html'     => 'no',    // Parse HTML content
-			'markdown' => 'no',    // Parse Markdown content
-			'autolink' => 'no',    // Automatically convert plaintext URIs to anchors
-		), (array) shortcode_parse_atts( $attr ) );
+		$attr = array_merge(array(
+			'limit'    => 0, // Trim length to number of words
+			'html'     => 'no', // Parse HTML content
+			'markdown' => 'no', // Parse Markdown content
+			'autolink' => 'no', // Automatically convert plaintext URIs to anchors
+		), (array) shortcode_parse_atts($attr));
 
 		$allow_html = 'no' != $attr['html'] ? true : false;
 		$allow_md   = 'no' != $attr['markdown'] ? true : false;
@@ -662,23 +662,23 @@ 
 		$html = '<div class="simcal-event-description" itemprop="description">';
 
 		// Markdown and HTML don't play well together, use one or the other in the same tag.
-		if ( $allow_html || $allow_md ) {
-			if ( $allow_html ) {
-				$description = wp_kses_post( $description );
-			} elseif ( $allow_md ) {
+		if ($allow_html || $allow_md) {
+			if ($allow_html) {
+				$description = wp_kses_post($description);
+			} elseif ($allow_md) {
 				$markdown    = new \Parsedown();
-				$description = $markdown->text( wp_strip_all_tags( $description ) );
+				$description = $markdown->text(wp_strip_all_tags($description));
 			}
 		} else {
-			$description = wpautop( $description );
+			$description = wpautop($description);
 		}
 
-		$description = $this->limit_words( $description, $attr['limit'] );
+		$description = $this->limit_words($description, $attr['limit']);
 
-		$html .= $description . '</div>';
+		$html .= $description.'</div>';
 
-		if ( 'no' != $attr['autolink'] ) {
-			$html = ' ' . make_clickable( $html );
+		if ('no' != $attr['autolink']) {
+			$html = ' '.make_clickable($html);
 		}
 
 		return $html;
@@ -694,7 +694,7 @@ 
 	 *
 	 * @return string
 	 */
-	private function get_when( Event $event ) {
+	private function get_when(Event $event) {
 
 		$start = $event->start_dt;
 		$end   = $event->end_dt;
@@ -702,41 +702,41 @@ 
 		$time_start = '';
 		$time_end   = '';
 		$start_ts   = $start->timestamp;
-		$end_ts     = ! is_null( $end ) ? $end->timestamp : null;
+		$end_ts     = ! is_null($end) ? $end->timestamp : null;
 		$start_iso  = $start->toIso8601String();
-		$end_iso    = ! is_null( $end ) ? $end->toIso8601String() : null;;
+		$end_iso    = ! is_null($end) ? $end->toIso8601String() : null; ;
 
-		if ( ! $event->whole_day ) {
+		if ( ! $event->whole_day) {
 
-			$time_start = $this->calendar->datetime_separator . ' <span class="simcal-event-start simcal-event-start-time" ' . 'data-event-start="' . $start_ts . '" ' . 'data-event-format="' . $this->calendar->time_format . '" ' . 'itemprop="startDate" content="' . $start_iso . '">' . date_i18n( $this->calendar->time_format, strtotime( $start->toDateTimeString() ) ) . '</span> ';
+			$time_start = $this->calendar->datetime_separator.' <span class="simcal-event-start simcal-event-start-time" '.'data-event-start="'.$start_ts.'" '.'data-event-format="'.$this->calendar->time_format.'" '.'itemprop="startDate" content="'.$start_iso.'">'.date_i18n($this->calendar->time_format, strtotime($start->toDateTimeString())).'</span> ';
 
-			if ( $end instanceof Carbon ) {
+			if ($end instanceof Carbon) {
 
-				$time_end = ' <span class="simcal-event-end simcal-event-end-time" ' . 'data-event-end="' . $end_ts . '" ' . 'data-event-format="' . $this->calendar->time_format . '" ' . 'itemprop="endDate" content="' . $end_iso . '">' . date_i18n( $this->calendar->time_format, strtotime( $end->toDateTimeString() ) ) . '</span> ';
+				$time_end = ' <span class="simcal-event-end simcal-event-end-time" '.'data-event-end="'.$end_ts.'" '.'data-event-format="'.$this->calendar->time_format.'" '.'itemprop="endDate" content="'.$end_iso.'">'.date_i18n($this->calendar->time_format, strtotime($end->toDateTimeString())).'</span> ';
 
 			}
 
 		}
 
-		if ( $event->multiple_days ) {
+		if ($event->multiple_days) {
 
-			$output = ' <span class="simcal-event-start simcal-event-start-date" ' . 'data-event-start="' . $start_ts . '" ' . 'data-event-format="' . $this->calendar->date_format . '" ' . 'itemprop="startDate" content="' . $start_iso . '">' . date_i18n( $this->calendar->date_format, strtotime( $start->toDateTimeString() ) ) . '</span> ' . $time_start;
+			$output = ' <span class="simcal-event-start simcal-event-start-date" '.'data-event-start="'.$start_ts.'" '.'data-event-format="'.$this->calendar->date_format.'" '.'itemprop="startDate" content="'.$start_iso.'">'.date_i18n($this->calendar->date_format, strtotime($start->toDateTimeString())).'</span> '.$time_start;
 
-			if ( $end instanceof Carbon ) {
+			if ($end instanceof Carbon) {
 
-				$output .= '-' . ' <span class="simcal-event-start simcal-event-end-date" ' . 'data-event-start="' . $end_ts . '" ' . 'data-event-format="' . $this->calendar->date_format . '" ' . 'itemprop="endDate" content="' . $end_iso . '">' . date_i18n( $this->calendar->date_format, strtotime( $end->toDateTimeString() ) ) . '</span> ' . $time_end;
+				$output .= '-'.' <span class="simcal-event-start simcal-event-end-date" '.'data-event-start="'.$end_ts.'" '.'data-event-format="'.$this->calendar->date_format.'" '.'itemprop="endDate" content="'.$end_iso.'">'.date_i18n($this->calendar->date_format, strtotime($end->toDateTimeString())).'</span> '.$time_end;
 			}
 
 		} else {
 
-			$time_end = ! empty( $time_start ) && ! empty( $time_end ) ? ' - ' . $time_end : '';
+			$time_end = ! empty($time_start) && ! empty($time_end) ? ' - '.$time_end : '';
 
 			// All-day events also need startDate for schema data.
-			$output = ' <span class="simcal-event-start simcal-event-start-date" ' . 'data-event-start="' . $start_ts . '" ' . 'data-event-format="' . $this->calendar->date_format . '" ' . 'itemprop="startDate" content="' . $start_iso . '">' . date_i18n( $this->calendar->date_format, strtotime( $start->toDateTimeString() ) ) . '</span> ' . $time_start . $time_end;
+			$output = ' <span class="simcal-event-start simcal-event-start-date" '.'data-event-start="'.$start_ts.'" '.'data-event-format="'.$this->calendar->date_format.'" '.'itemprop="startDate" content="'.$start_iso.'">'.date_i18n($this->calendar->date_format, strtotime($start->toDateTimeString())).'</span> '.$time_start.$time_end;
 
 		}
 
-		return trim( $output );
+		return trim($output);
 	}
 
 	/**
@@ -751,52 +751,52 @@ 
 	 *
 	 * @return string
 	 */
-	private function get_dt( $tag, Event $event, $attr ) {
+	private function get_dt($tag, Event $event, $attr) {
 
-		$bound = 0 === strpos( $tag, 'end' ) ? 'end' : 'start';
+		$bound = 0 === strpos($tag, 'end') ? 'end' : 'start';
 
-		if ( ( 'end' == $bound ) && ( false === $event->end ) ) {
+		if (('end' == $bound) && (false === $event->end)) {
 			return '';
 		}
 
-		$dt = $bound . '_dt';
+		$dt = $bound.'_dt';
 
-		if ( ! $event->$dt instanceof Carbon ) {
+		if ( ! $event->$dt instanceof Carbon) {
 			return '';
 		}
 
 		$event_dt = $event->$dt;
 
-		$attr = array_merge( array(
+		$attr = array_merge(array(
 			'format' => '',
-		), (array) shortcode_parse_atts( $attr ) );
+		), (array) shortcode_parse_atts($attr));
 
-		$format    = ltrim( strstr( $tag, '-' ), '-' );
+		$format    = ltrim(strstr($tag, '-'), '-');
 		$dt_format = '';
 
-		if ( ! empty( $attr['format'] ) ) {
-			$dt_format = esc_attr( wp_strip_all_tags( $attr['format'] ) );
-		} elseif ( 'date' == $format ) {
+		if ( ! empty($attr['format'])) {
+			$dt_format = esc_attr(wp_strip_all_tags($attr['format']));
+		} elseif ('date' == $format) {
 			$dt_format = $this->calendar->date_format;
-		} elseif ( 'time' == $format ) {
+		} elseif ('time' == $format) {
 			$dt_format = $this->calendar->time_format;
 		}
 
 		$dt_ts = $event_dt->timestamp;
 
-		if ( 'human' == $format ) {
-			$value = human_time_diff( $dt_ts, Carbon::now( $event->timezone )->getTimestamp() );
+		if ('human' == $format) {
+			$value = human_time_diff($dt_ts, Carbon::now($event->timezone)->getTimestamp());
 
-			if ( $dt_ts < Carbon::now( $event->timezone )->getTimestamp() ) {
-				$value .= ' ' . _x( 'ago', 'human date event builder code modifier', 'google-calendar-events' );
+			if ($dt_ts < Carbon::now($event->timezone)->getTimestamp()) {
+				$value .= ' '._x('ago', 'human date event builder code modifier', 'google-calendar-events');
 			} else {
-				$value .= ' ' . _x( 'from now', 'human date event builder code modifier', 'google-calendar-events' );
+				$value .= ' '._x('from now', 'human date event builder code modifier', 'google-calendar-events');
 			}
 		} else {
-			$value = date_i18n( $dt_format, strtotime( $event_dt->toDateTimeString() ) );
+			$value = date_i18n($dt_format, strtotime($event_dt->toDateTimeString()));
 		}
 
-		return '<span class="simcal-event-' . $bound . ' ' . 'simcal-event-' . $bound . '-' . $format . '" ' . 'data-event-' . $bound . '="' . $dt_ts . '" ' . 'data-event-format="' . $dt_format . '" ' . 'itemprop="' . $bound . 'Date" content="' . $event_dt->toIso8601String() . '">' . $value . '</span>';
+		return '<span class="simcal-event-'.$bound.' '.'simcal-event-'.$bound.'-'.$format.'" '.'data-event-'.$bound.'="'.$dt_ts.'" '.'data-event-format="'.$dt_format.'" '.'itemprop="'.$bound.'Date" content="'.$event_dt->toIso8601String().'">'.$value.'</span>';
 	}
 
 	/**
@@ -812,23 +812,23 @@ 
 	 *
 	 * @return string
 	 */
-	private function make_link( $tag, $url, $content, $attr ) {
+	private function make_link($tag, $url, $content, $attr) {
 
-		if ( empty( $url ) ) {
+		if (empty($url)) {
 			return '';
 		}
 
-		$text = empty( $content ) ? $url : $content;
+		$text = empty($content) ? $url : $content;
 
-		$attr = array_merge( array(
-			'autolink'  => false,   // Convert url to link anchor
-			'newwindow' => false,   // If autolink attribute is true, open link in new window
-		), (array) shortcode_parse_atts( $attr ) );
+		$attr = array_merge(array(
+			'autolink'  => false, // Convert url to link anchor
+			'newwindow' => false, // If autolink attribute is true, open link in new window
+		), (array) shortcode_parse_atts($attr));
 
 		$anchor = $tag != 'url' ? 'yes' : $attr['autolink'];
 		$target = $attr['newwindow'] !== false ? 'target="_blank"' : '';
 
-		return $anchor !== false ? ' <a href="' . esc_url( $url ) . '" ' . $target . '>' . $text . '</a>' : ' ' . $text;
+		return $anchor !== false ? ' <a href="'.esc_url($url).'" '.$target.'>'.$text.'</a>' : ' '.$text;
 	}
 
 	/**
@@ -841,20 +841,20 @@ 
 	 *
 	 * @return string
 	 */
-	private function get_attachments( $attachments ) {
+	private function get_attachments($attachments) {
 
-		$html = '<ul class="simcal-attachments">' . "\n\t";
+		$html = '<ul class="simcal-attachments">'."\n\t";
 
-		foreach ( $attachments as $attachment ) {
+		foreach ($attachments as $attachment) {
 			$html .= '<li class="simcal-attachment">';
-			$html .= '<a href="' . $attachment['url'] . '" target="_blank">';
-			$html .= ! empty( $attachment['icon'] ) ? '<img src="' . $attachment['icon'] . '" />' : '';
-			$html .= '<span>' . $attachment['name'] . '</span>';
+			$html .= '<a href="'.$attachment['url'].'" target="_blank">';
+			$html .= ! empty($attachment['icon']) ? '<img src="'.$attachment['icon'].'" />' : '';
+			$html .= '<span>'.$attachment['name'].'</span>';
 			$html .= '</a>';
-			$html .= '</li>' . "\n";
+			$html .= '</li>'."\n";
 		}
 
-		$html .= '</ul>' . "\n";
+		$html .= '</ul>'."\n";
 
 		return $html;
 	}
@@ -870,41 +870,41 @@ 
 	 *
 	 * @return string
 	 */
-	private function get_attendees( $attendees, $attr ) {
+	private function get_attendees($attendees, $attr) {
 
-		$attr = array_merge( array(
-			'photo'    => 'show',  // show/hide attendee photo
-			'email'    => 'hide',  // show/hide attendee email address
-			'rsvp'     => 'hide',  // show/hide rsvp response status
-			'response' => '',      // filter attendees by rsvp response (yes/no/maybe)
-		), (array) shortcode_parse_atts( $attr ) );
+		$attr = array_merge(array(
+			'photo'    => 'show', // show/hide attendee photo
+			'email'    => 'hide', // show/hide attendee email address
+			'rsvp'     => 'hide', // show/hide rsvp response status
+			'response' => '', // filter attendees by rsvp response (yes/no/maybe)
+		), (array) shortcode_parse_atts($attr));
 
-		$html = '<ul class="simcal-attendees" itemprop="attendees">' . "\n\t";
+		$html = '<ul class="simcal-attendees" itemprop="attendees">'."\n\t";
 
 		$known   = 0;
 		$unknown = 0;
 
-		foreach ( $attendees as $attendee ) {
+		foreach ($attendees as $attendee) {
 
-			if ( 'yes' == $attr['response'] && 'yes' != $attendee['response'] ) {
+			if ('yes' == $attr['response'] && 'yes' != $attendee['response']) {
 				continue;
-			} elseif ( 'no' == $attr['response'] && 'no' != $attendee['response'] ) {
+			} elseif ('no' == $attr['response'] && 'no' != $attendee['response']) {
 				continue;
-			} elseif ( 'maybe' == $attr['response'] && ! in_array( $attendee['response'], array( 'yes', 'maybe' ) ) ) {
+			} elseif ('maybe' == $attr['response'] && ! in_array($attendee['response'], array('yes', 'maybe'))) {
 				continue;
 			}
 
-			if ( ! empty( $attendee['name'] ) ) {
+			if ( ! empty($attendee['name'])) {
 
-				$photo    = 'hide' != $attr['photo'] ? '<img class="avatar avatar-128 photo" src="' . $attendee['photo'] . '" itemprop="image" />' : '';
-				$response = 'hide' != $attr['rsvp'] ? $this->get_rsvp_response( $attendee['response'] ) : '';
-				$guest    = $photo . '<span itemprop="name">' . $attendee['name'] . $response . '</span>';
+				$photo    = 'hide' != $attr['photo'] ? '<img class="avatar avatar-128 photo" src="'.$attendee['photo'].'" itemprop="image" />' : '';
+				$response = 'hide' != $attr['rsvp'] ? $this->get_rsvp_response($attendee['response']) : '';
+				$guest    = $photo.'<span itemprop="name">'.$attendee['name'].$response.'</span>';
 
-				if ( ! empty( $attendee['email'] ) && ( 'show' == $attr['email'] ) ) {
-					$guest = sprintf( '<a href="mailto:' . $attendee['email'] . '" itemprop="email">%s</a>', $guest );
+				if ( ! empty($attendee['email']) && ('show' == $attr['email'])) {
+					$guest = sprintf('<a href="mailto:'.$attendee['email'].'" itemprop="email">%s</a>', $guest);
 				}
 
-				$html .= '<li class="simcal-attendee" itemprop="attendee" itemscope itemtype="http://schema.org/Person">' . $guest . '</li>' . "\n";
+				$html .= '<li class="simcal-attendee" itemprop="attendee" itemscope itemtype="http://schema.org/Person">'.$guest.'</li>'."\n";
 
 				$known++;
 
@@ -915,21 +915,21 @@ 
 			}
 		}
 
-		if ( $unknown > 0 ) {
-			if ( $known > 0 ) {
+		if ($unknown > 0) {
+			if ($known > 0) {
 				/* translators: One more person attending the event. */
-				$others = sprintf( _n( '1 more attendee', '%s more attendees', $unknown, 'google-calendar-events' ), $unknown );
+				$others = sprintf(_n('1 more attendee', '%s more attendees', $unknown, 'google-calendar-events'), $unknown);
 			} else {
 				/* translators: One or more persons attending the event whose name is unknown. */
-				$others = sprintf( _n( '1 anonymous attendee', '%s anonymous attendees', $unknown, 'google-calendar-events' ), $unknown );
+				$others = sprintf(_n('1 anonymous attendee', '%s anonymous attendees', $unknown, 'google-calendar-events'), $unknown);
 			}
-			$photo = $attr['photo'] !== 'hide' ? get_avatar( '', 128 ) : '';
-			$html .= '<li class="simcal-attendee simcal-attendee-anonymous">' . $photo . '<span>' . $others . '</span></li>' . "\n";
-		} elseif ( $known === 0 ) {
-			$html .= '<li class="simcal-attendee">' . _x( 'No one yet', 'No one yet rsvp to attend the event.', 'google-calendar-events' ) . '</li>' . "\n";
+			$photo = $attr['photo'] !== 'hide' ? get_avatar('', 128) : '';
+			$html .= '<li class="simcal-attendee simcal-attendee-anonymous">'.$photo.'<span>'.$others.'</span></li>'."\n";
+		} elseif ($known === 0) {
+			$html .= '<li class="simcal-attendee">'._x('No one yet', 'No one yet rsvp to attend the event.', 'google-calendar-events').'</li>'."\n";
 		}
 
-		$html .= '</ul>' . "\n";
+		$html .= '</ul>'."\n";
 
 		return $html;
 	}
@@ -943,23 +943,23 @@ 
 	 *
 	 * @return string
 	 */
-	private function get_rsvp_response( $response ) {
+	private function get_rsvp_response($response) {
 
-		if ( 'yes' == $response ) {
+		if ('yes' == $response) {
 			/* translators: Someone replied with 'yes' to a rsvp request. */
-			$rsvp = __( 'Attending', 'google-calendar-events' );
-		} elseif ( 'no' == $response ) {
+			$rsvp = __('Attending', 'google-calendar-events');
+		} elseif ('no' == $response) {
 			/* translators: Someone replied with 'no' to a rsvp request. */
-			$rsvp = __( 'Not attending', 'google-calendar-events' );
-		} elseif ( 'maybe' == $response ) {
+			$rsvp = __('Not attending', 'google-calendar-events');
+		} elseif ('maybe' == $response) {
 			/* translators: Someone replied with 'maybe' to a rsvp request. */
-			$rsvp = __( 'Maybe attending', 'google-calendar-events' );
+			$rsvp = __('Maybe attending', 'google-calendar-events');
 		} else {
 			/* translators: Someone did not send yet a rsvp confirmation to join an event. */
-			$rsvp = __( 'Response pending', 'google-calendar-events' );
+			$rsvp = __('Response pending', 'google-calendar-events');
 		}
 
-		return ' <small>(' . $rsvp . ')</small>';
+		return ' <small>('.$rsvp.')</small>';
 	}
 
 	/**
@@ -973,21 +973,21 @@ 
 	 *
 	 * @return string
 	 */
-	private function get_organizer( $organizer, $attr ) {
+	private function get_organizer($organizer, $attr) {
 
-		$attr = array_merge( array(
-			'photo' => 'show',  // show/hide attendee photo
-			'email' => 'hide',  // show/hide attendee email address
-		), (array) shortcode_parse_atts( $attr ) );
+		$attr = array_merge(array(
+			'photo' => 'show', // show/hide attendee photo
+			'email' => 'hide', // show/hide attendee email address
+		), (array) shortcode_parse_atts($attr));
 
-		$photo          = 'hide' != $attr['photo'] ? '<img class="avatar avatar-128 photo" src="' . $organizer['photo'] . '" itemprop="image"  />' : '';
-		$organizer_html = $photo . '<span itemprop="name">' . $organizer['name'] . '</span>';
+		$photo          = 'hide' != $attr['photo'] ? '<img class="avatar avatar-128 photo" src="'.$organizer['photo'].'" itemprop="image"  />' : '';
+		$organizer_html = $photo.'<span itemprop="name">'.$organizer['name'].'</span>';
 
-		if ( ! empty( $organizer['email'] ) && ( 'show' == $attr['email'] ) ) {
-			$organizer_html = sprintf( '<a href="mailto:' . $organizer['email'] . '" itemprop="email">%s</a>', $organizer_html );
+		if ( ! empty($organizer['email']) && ('show' == $attr['email'])) {
+			$organizer_html = sprintf('<a href="mailto:'.$organizer['email'].'" itemprop="email">%s</a>', $organizer_html);
 		}
 
-		return '<div class="simcal-organizer" itemprop="organizer" itemscope itemtype="https://schema.org/Person">' . $organizer_html . '</div>';
+		return '<div class="simcal-organizer" itemprop="organizer" itemscope itemtype="https://schema.org/Person">'.$organizer_html.'</div>';
 	}
 
 	/**
@@ -1012,38 +1012,38 @@ 
 		// This is largely borrowed on get_shortcode_regex() from WordPress Core.
 		// @see /wp-includes/shortcodes.php (with some modification)
 
-		$tagregexp = implode( '|', array_values( $this->tags ) );
+		$tagregexp = implode('|', array_values($this->tags));
 
-		return '/' . '\\['                              // Opening bracket
+		return '/'.'\\['                              // Opening bracket
 		       . '(\\[?)'                           // 1: Optional second opening bracket for escaping tags: [[tag]]
 		       . "($tagregexp)"                     // 2: Tag name
 		       . '(?![\\w-])'                       // Not followed by word character or hyphen
 		       . '('                                // 3: Unroll the loop: Inside the opening tag
 		       . '[^\\]\\/]*'                   // Not a closing bracket or forward slash
-		       . '(?:' . '\\/(?!\\])'               // A forward slash not followed by a closing bracket
+		       . '(?:'.'\\/(?!\\])'               // A forward slash not followed by a closing bracket
 		       . '[^\\]\\/]*'               // Not a closing bracket or forward slash
-		       . ')*?' . ')' . '(?:' . '(\\/)'                        // 4: Self closing tag ...
+		       . ')*?'.')'.'(?:'.'(\\/)'                        // 4: Self closing tag ...
 		       . '\\]'                          // ... and closing bracket
-		       . '|' . '\\]'                          // Closing bracket
-		       . '(?:' . '('                        // 5: Unroll the loop: Optionally, anything between the opening and closing tags
+		       . '|'.'\\]'                          // Closing bracket
+		       . '(?:'.'('                        // 5: Unroll the loop: Optionally, anything between the opening and closing tags
 		       . '[^\\[]*+'             // Not an opening bracket
-		       . '(?:' . '\\[(?!\\/\\2\\])' // An opening bracket not followed by the closing tag
+		       . '(?:'.'\\[(?!\\/\\2\\])' // An opening bracket not followed by the closing tag
 		       . '[^\\[]*+'         // Not an opening bracket
-		       . ')*+' . ')' . '\\[\\/\\2\\]'             // Closing tag
-		       . ')?' . ')' . '(\\]?)'                           // 6: Optional second closing bracket for escaping tags: [[tag]]
+		       . ')*+'.')'.'\\[\\/\\2\\]'             // Closing tag
+		       . ')?'.')'.'(\\]?)'                           // 6: Optional second closing bracket for escaping tags: [[tag]]
 		       . '/s';
 	}
 
 	//allow other plugins to register own event tags
 	private function add_custom_event_tags() {
-		$array = apply_filters( 'simcal_event_tags_add_custom', array() );
+		$array = apply_filters('simcal_event_tags_add_custom', array());
 
 		return $array;
 	}
 
 	//allow other plugins to replace own (registered) event tags with their value
-	private function do_custom_event_tag( $tag, $partial, $attr, $event ) {
-		$returnvalue = apply_filters( 'simcal_event_tags_do_custom', "", $tag, $partial, $attr, $event );
+	private function do_custom_event_tag($tag, $partial, $attr, $event) {
+		$returnvalue = apply_filters('simcal_event_tags_do_custom', "", $tag, $partial, $attr, $event);
 
 		return $returnvalue;
 	}

includes/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;
 		}
 
-		$start_dt = Carbon::now( $this->timezone );
+		$start_dt = Carbon::now($this->timezone);
 
-		$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 ) {
-			$start_dt = Carbon::today( $this->timezone );
-		} elseif ( 'days_before' == $calendar_begins ) {
-			$start_dt = Carbon::today( $this->timezone )->subDays( $nth );
-		} elseif ( 'days_after' == $calendar_begins ) {
-			$start_dt = Carbon::today( $this->timezone )->addDays( $nth );
-		} elseif ( 'this_week' == $calendar_begins ) {
-			$week = new Carbon( 'now', $this->timezone );
-			$week->setWeekStartsAt( $this->week_starts );
+		if ('today' == $calendar_begins) {
+			$start_dt = Carbon::today($this->timezone);
+		} elseif ('days_before' == $calendar_begins) {
+			$start_dt = Carbon::today($this->timezone)->subDays($nth);
+		} elseif ('days_after' == $calendar_begins) {
+			$start_dt = Carbon::today($this->timezone)->addDays($nth);
+		} elseif ('this_week' == $calendar_begins) {
+			$week = new Carbon('now', $this->timezone);
+			$week->setWeekStartsAt($this->week_starts);
 			$start_dt = $week->startOfWeek();
-		} elseif ( 'weeks_before' == $calendar_begins ) {
-			$week = new Carbon( 'now', $this->timezone );
-			$week->setWeekStartsAt( $this->week_starts );
-			$start_dt = $week->startOfWeek()->subWeeks( $nth );
-		} elseif ( 'weeks_after' == $calendar_begins ) {
-			$week = new Carbon( 'now', $this->timezone );
-			$week->setWeekStartsAt( $this->week_starts );
-			$start_dt = $week->startOfWeek()->addWeeks( $nth );
-		} elseif ( 'this_month' == $calendar_begins ) {
-			$start_dt = Carbon::today( $this->timezone )->startOfMonth();
-		} elseif ( 'months_before' == $calendar_begins ) {
-			$start_dt = Carbon::today( $this->timezone )->subMonths( $nth )->startOfMonth();
-		} elseif ( 'months_after' == $calendar_begins ) {
-			$start_dt = Carbon::today( $this->timezone )->addMonths( $nth )->startOfMonth();
-		} elseif ( 'this_year' == $calendar_begins ) {
-			$start_dt = Carbon::today( $this->timezone )->startOfYear()->addHour();
-		} elseif ( 'years_before' == $calendar_begins ) {
-			$start_dt = Carbon::today( $this->timezone )->subYears( $nth )->startOfYear();
-		} elseif ( 'years_after' == $calendar_begins ) {
-			$start_dt = Carbon::today( $this->timezone )->addYears( $nth )->startOfYear();
-		} elseif ( 'custom_date' == $calendar_begins ) {
-			if ( $date = get_post_meta( $this->id, '_calendar_begins_custom_date', true ) ) {
-				$start_dt = Carbon::createFromFormat( 'Y-m-d', esc_attr( $date ), $this->timezone )->setTimezone( $this->timezone )->startOfDay();
+		} elseif ('weeks_before' == $calendar_begins) {
+			$week = new Carbon('now', $this->timezone);
+			$week->setWeekStartsAt($this->week_starts);
+			$start_dt = $week->startOfWeek()->subWeeks($nth);
+		} elseif ('weeks_after' == $calendar_begins) {
+			$week = new Carbon('now', $this->timezone);
+			$week->setWeekStartsAt($this->week_starts);
+			$start_dt = $week->startOfWeek()->addWeeks($nth);
+		} elseif ('this_month' == $calendar_begins) {
+			$start_dt = Carbon::today($this->timezone)->startOfMonth();
+		} elseif ('months_before' == $calendar_begins) {
+			$start_dt = Carbon::today($this->timezone)->subMonths($nth)->startOfMonth();
+		} elseif ('months_after' == $calendar_begins) {
+			$start_dt = Carbon::today($this->timezone)->addMonths($nth)->startOfMonth();
+		} elseif ('this_year' == $calendar_begins) {
+			$start_dt = Carbon::today($this->timezone)->startOfYear()->addHour();
+		} elseif ('years_before' == $calendar_begins) {
+			$start_dt = Carbon::today($this->timezone)->subYears($nth)->startOfYear();
+		} elseif ('years_after' == $calendar_begins) {
+			$start_dt = Carbon::today($this->timezone)->addYears($nth)->startOfYear();
+		} elseif ('custom_date' == $calendar_begins) {
+			if ($date = get_post_meta($this->id, '_calendar_begins_custom_date', true)) {
+				$start_dt = Carbon::createFromFormat('Y-m-d', esc_attr($date), $this->timezone)->setTimezone($this->timezone)->startOfDay();
 			}
 		}
 
@@ -667,8 +667,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;
 	}
 
@@ -679,14 +679,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;
 		}
@@ -714,7 +714,7 @@ 
 	 *
 	 * @return Calendar_View
 	 */
-	abstract public function get_view( $view = '' );
+	abstract public function get_view($view = '');
 
 	/**
 	 * Get event HTML parsed by template.
@@ -726,11 +726,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);
 	}
 
 	/**
@@ -742,7 +742,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
 
@@ -750,30 +750,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;
 	}
@@ -785,56 +785,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/admin/pages/system-status.php

Indentation +3 added lines, -3 removed lines

@@ -337,9 +337,9 @@
 
 		if ( version_compare( PHP_VERSION, '7.0', '<' ) ) {
 			$php = '<mark>' . PHP_VERSION . ' - ' .
-			       __( 'WordPress.org recommends upgrading to PHP 7 or higher for better security.', 'google-calendar-events' ) .
-			       ' <a href="https://wordpress.org/about/requirements/" target="_blank">' . __( 'Read more.', 'google-calendar-events' ) . '</a>' .
-		           '</mark>';
+				   __( 'WordPress.org recommends upgrading to PHP 7 or higher for better security.', 'google-calendar-events' ) .
+				   ' <a href="https://wordpress.org/about/requirements/" target="_blank">' . __( 'Read more.', 'google-calendar-events' ) . '</a>' .
+				   '</mark>';
 		} else {
 			$php = '<mark class="ok">' . PHP_VERSION . '</mark>';
 		}

Spacing +169 added lines, -169 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Abstracts\Admin_Page;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -30,16 +30,16 @@ 
 
 		$this->id           = $tab = 'system-status';
 		$this->option_group = $page = 'tools';
-		$this->label        = __( 'System Report', 'google-calendar-events' );
+		$this->label        = __('System Report', 'google-calendar-events');
 		$this->description  = '';
 		$this->sections     = $this->add_sections();
 		$this->fields       = $this->add_fields();
 
 		// Disable the submit button for this page.
-		add_filter( 'simcal_admin_page_' . $page . '_' . $tab . '_submit', function() { return false; } );
+		add_filter('simcal_admin_page_'.$page.'_'.$tab.'_submit', function() { return false; } );
 
 		// Add html.
-		add_action( 'simcal_admin_page_' . $page . '_' . $tab . '_end', array( $this, 'html' ) );
+		add_action('simcal_admin_page_'.$page.'_'.$tab.'_end', array($this, 'html'));
 	}
 
 	/**
@@ -51,37 +51,37 @@ 
 
 		?>
 		<div id="simcal-system-status-report">
-			<p><?php _e( 'Please copy and paste this information when contacting support:', 'google-calendar-events' ); ?> </p>
+			<p><?php _e('Please copy and paste this information when contacting support:', 'google-calendar-events'); ?> </p>
 			<textarea readonly="readonly" onclick="this.select();"></textarea>
-			<p><?php _e( 'You can also download your information as a text file to attach, or simply view it below.', 'google-calendar-events' ); ?></p>
-			<p><a href="#" id="simcal-system-status-report-download" class="button button-primary"><?php _e( 'Download System Report', 'google-calendar-events' ); ?></a></p>
+			<p><?php _e('You can also download your information as a text file to attach, or simply view it below.', 'google-calendar-events'); ?></p>
+			<p><a href="#" id="simcal-system-status-report-download" class="button button-primary"><?php _e('Download System Report', 'google-calendar-events'); ?></a></p>
 		</div>
 		<hr>
 		<?php
 
 		global $wpdb;
-		$wp_version = get_bloginfo( 'version' );
+		$wp_version = get_bloginfo('version');
 
 		$sections = array();
 		$panels   = array(
 			'wordpress' => array(
-				'label'  => __( 'WordPress Installation', 'google-calendar-events' ),
+				'label'  => __('WordPress Installation', 'google-calendar-events'),
 				'export' => 'WordPress Installation',
 			),
 			'theme'     => array(
-				'label'  => __( 'Active Theme', 'google-calendar-events' ),
+				'label'  => __('Active Theme', 'google-calendar-events'),
 				'export' => 'Active Theme',
 			),
 			'plugins'   => array(
-				'label'  => __( 'Active Plugins', 'google-calendar-events' ),
+				'label'  => __('Active Plugins', 'google-calendar-events'),
 				'export' => 'Active Plugins',
 			),
 			'server'    => array(
-				'label'  => __( 'Server Environment', 'google-calendar-events' ),
+				'label'  => __('Server Environment', 'google-calendar-events'),
 				'export' => 'Server Environment',
 			),
 			'client'    => array(
-				'label'  => __( 'Client Information', 'google-calendar-events' ),
+				'label'  => __('Client Information', 'google-calendar-events'),
 				'export' => 'Client Information',
 			)
 		);
@@ -98,68 +98,68 @@ 
 		 * ======================
 		 */
 
-		$debug_mode = $script_debug = __( 'No', 'google-calendar-events' );
-		if ( defined( 'WP_DEBUG' ) ) {
-			$debug_mode = true === WP_DEBUG ? __( 'Yes', 'google-calendar-events' ) : $debug_mode;
+		$debug_mode = $script_debug = __('No', 'google-calendar-events');
+		if (defined('WP_DEBUG')) {
+			$debug_mode = true === WP_DEBUG ? __('Yes', 'google-calendar-events') : $debug_mode;
 		}
-		if ( defined( 'SCRIPT_DEBUG' ) ) {
-			$script_debug = true === SCRIPT_DEBUG ? __( 'Yes', 'google-calendar-events' ) : $script_debug;
+		if (defined('SCRIPT_DEBUG')) {
+			$script_debug = true === SCRIPT_DEBUG ? __('Yes', 'google-calendar-events') : $script_debug;
 		}
 
-		$memory = $this->let_to_num( WP_MEMORY_LIMIT );
-		$memory_export = size_format( $memory );
-		if ( $memory < 67108864 ) {
-			$memory = '<mark class="error">' . sprintf( __( '%1$s - It is recomendend to set memory to at least 64MB. See: <a href="%2$s" target="_blank">Increasing memory allocated to PHP</a>', 'google-calendar-events' ), $memory_export, 'http://codex.wordpress.org/Editing_wp-config.php#Increasing_memory_allocated_to_PHP' ) . '</mark>';
+		$memory = $this->let_to_num(WP_MEMORY_LIMIT);
+		$memory_export = size_format($memory);
+		if ($memory < 67108864) {
+			$memory = '<mark class="error">'.sprintf(__('%1$s - It is recomendend to set memory to at least 64MB. See: <a href="%2$s" target="_blank">Increasing memory allocated to PHP</a>', 'google-calendar-events'), $memory_export, 'http://codex.wordpress.org/Editing_wp-config.php#Increasing_memory_allocated_to_PHP').'</mark>';
 		} else {
-			$memory = '<mark class="ok">' . $memory_export . '</mark>';
+			$memory = '<mark class="ok">'.$memory_export.'</mark>';
 		}
 
-		$permalinks = get_option( 'permalink_structure' );
-		$permalinks = empty( $permalinks ) ? '/?' : $permalinks;
+		$permalinks = get_option('permalink_structure');
+		$permalinks = empty($permalinks) ? '/?' : $permalinks;
 
 		$is_multisite = is_multisite();
 
 		$sections['wordpress'] = array(
 			'name'          => array(
-				'label'  => __( 'Site Name', 'google-calendar-events' ),
+				'label'  => __('Site Name', 'google-calendar-events'),
 				'label_export' => 'Site Name',
-				'result' => get_bloginfo( 'name' ),
+				'result' => get_bloginfo('name'),
 			),
 			'home_url'      => array(
-				'label'  => __( 'Home URL', 'google-calendar-events' ),
+				'label'  => __('Home URL', 'google-calendar-events'),
 				'label_export' => 'Home URL',
 				'result' => home_url(),
 			),
 			'site_url'      => array(
-				'label'  => __( 'Site URL', 'google-calendar-events' ),
+				'label'  => __('Site URL', 'google-calendar-events'),
 				'label_export' => 'Site URL',
 				'result' => site_url(),
 			),
 			'version'       => array(
-				'label'  => __( 'Version', 'google-calendar-events' ),
+				'label'  => __('Version', 'google-calendar-events'),
 				'label_export' => 'Version',
 				'result' => $wp_version,
 			),
 			'locale'        => array(
-				'label'  => __( 'Locale', 'google-calendar-events' ),
+				'label'  => __('Locale', 'google-calendar-events'),
 				'label_export' => 'Locale',
 				'result' => get_locale(),
 			),
 			'wp_timezone'   => array(
-				'label'  => __( 'Timezone', 'google-calendar-events' ),
+				'label'  => __('Timezone', 'google-calendar-events'),
 				'label_export' => 'Timezone',
 				'result' => simcal_get_wp_timezone(),
 			),
 			'multisite'     => array(
-				'label'  => __( 'Multisite', 'google-calendar-events' ),
+				'label'  => __('Multisite', 'google-calendar-events'),
 				'label_export' => 'Multisite',
-				'result' => $is_multisite ? __( 'Yes', 'google-calendar-events' ) : __( 'No', 'google-calendar-events' ),
+				'result' => $is_multisite ? __('Yes', 'google-calendar-events') : __('No', 'google-calendar-events'),
 				'result_export' => $is_multisite ? 'Yes' : 'No'
 			),
 			'permalink'     => array(
-				'label'  => __( 'Permalinks', 'google-calendar-events' ),
+				'label'  => __('Permalinks', 'google-calendar-events'),
 				'label_export' => 'Permalinks',
-				'result' => '<code>' . $permalinks . '</code>',
+				'result' => '<code>'.$permalinks.'</code>',
 				'result_export' => $permalinks,
 			),
 			'memory_limit'  => array(
@@ -182,86 +182,86 @@ 
 		 * ============
 		 */
 
-		include_once ABSPATH . 'wp-admin/includes/theme-install.php';
+		include_once ABSPATH.'wp-admin/includes/theme-install.php';
 
-		if ( version_compare( $wp_version, '3.4', '<' ) ) {
-			$active_theme  = get_theme_data( get_stylesheet_directory() . '/style.css' );
-			$theme_name    = '<a href="' . $active_theme['URI'] . '" target="_blank">' . $active_theme['Name'] . '</a>';
+		if (version_compare($wp_version, '3.4', '<')) {
+			$active_theme  = get_theme_data(get_stylesheet_directory().'/style.css');
+			$theme_name    = '<a href="'.$active_theme['URI'].'" target="_blank">'.$active_theme['Name'].'</a>';
 			$theme_version = $active_theme['Version'];
-			$theme_author  = '<a href="' . $active_theme['AuthorURI'] . '" target="_blank">' . $active_theme['Author'] . '</a>';
-			$theme_export  = $active_theme['Name'] . ' - ' . $theme_version;
+			$theme_author  = '<a href="'.$active_theme['AuthorURI'].'" target="_blank">'.$active_theme['Author'].'</a>';
+			$theme_export  = $active_theme['Name'].' - '.$theme_version;
 		} else {
 			$active_theme  = wp_get_theme();
-			$theme_name    = '<a href="' . $active_theme->ThemeURI . '" target="_blank">' . $active_theme->Name . '</a>';
+			$theme_name    = '<a href="'.$active_theme->ThemeURI.'" target="_blank">'.$active_theme->Name.'</a>';
 			$theme_version = $active_theme->Version;
 			$theme_author  = $active_theme->Author;
-			$theme_export  = $active_theme->Name . ' - ' . $theme_version;
+			$theme_export  = $active_theme->Name.' - '.$theme_version;
 		}
 
 		$theme_update_version = $theme_version;
 
-		$api = themes_api( 'theme_information', array(
+		$api = themes_api('theme_information', array(
 			'slug'   => get_template(),
-			'fields' => array( 'sections' => false, 'tags' => false ),
-		) );
-		if ( $api && ! is_wp_error( $api ) ) {
+			'fields' => array('sections' => false, 'tags' => false),
+		));
+		if ($api && ! is_wp_error($api)) {
 			$theme_update_version = $api->version;
 		}
 
-		if ( version_compare( $theme_version, $theme_update_version, '<' ) ) {
-			$theme_version = '<mark class="error">' . $theme_version . ' (' . sprintf( __( '%s is available', 'google-calendar-events' ), esc_html( $theme_update_version ) ) . ')</mark>';
+		if (version_compare($theme_version, $theme_update_version, '<')) {
+			$theme_version = '<mark class="error">'.$theme_version.' ('.sprintf(__('%s is available', 'google-calendar-events'), esc_html($theme_update_version)).')</mark>';
 		} else {
-			$theme_version = '<mark class="ok">' . $theme_version . '</mark>';
+			$theme_version = '<mark class="ok">'.$theme_version.'</mark>';
 		}
 
 		$theme  = '<dl>';
-		$theme .= '<dt>' . __( 'Name', 'google-calendar-events' ) . '</dt>';
-		$theme .= '<dd>' . $theme_name . '</dd>';
-		$theme .= '<dt>' . __( 'Author', 'google-calendar-events' ) . '</dt>';
-		$theme .= '<dd>' . $theme_author . '</dd>';
-		$theme .= '<dt>' . __( 'Version', 'google-calendar-events' ) . '</dt>';
-		$theme .= '<dd>' . $theme_version . '</dd>';
+		$theme .= '<dt>'.__('Name', 'google-calendar-events').'</dt>';
+		$theme .= '<dd>'.$theme_name.'</dd>';
+		$theme .= '<dt>'.__('Author', 'google-calendar-events').'</dt>';
+		$theme .= '<dd>'.$theme_author.'</dd>';
+		$theme .= '<dt>'.__('Version', 'google-calendar-events').'</dt>';
+		$theme .= '<dd>'.$theme_version.'</dd>';
 		$theme .= '</dl>';
 
 		$is_child_theme = is_child_theme();
 		$parent_theme = $parent_theme_export = '-';
 
-		if ( $is_child_theme ) {
-			if ( version_compare( $wp_version, '3.4', '<' ) ) {
+		if ($is_child_theme) {
+			if (version_compare($wp_version, '3.4', '<')) {
 
 				$parent_theme = $parent_theme_export = $active_theme['Template'];
 
 			} else {
 
-				$parent = wp_get_theme( $active_theme->Template );
+				$parent = wp_get_theme($active_theme->Template);
 				$parent_theme  = '<dl>';
-				$parent_theme .= '<dt>' . __( 'Name', 'google-calendar-events' ) .    '</dt>';
-				$parent_theme .= '<dd>' . $parent->Name .          '</dd>';
-				$parent_theme .= '<dt>' . __( 'Author', 'google-calendar-events' ) .  '</dt>';
-				$parent_theme .= '<dd>' . $parent->Author .        '</dd>';
-				$parent_theme .= '<dt>' . __( 'Version', 'google-calendar-events' ) . '</dt>';
-				$parent_theme .= '<dd>' . $parent->Version .       '</dd>';
+				$parent_theme .= '<dt>'.__('Name', 'google-calendar-events').'</dt>';
+				$parent_theme .= '<dd>'.$parent->Name.'</dd>';
+				$parent_theme .= '<dt>'.__('Author', 'google-calendar-events').'</dt>';
+				$parent_theme .= '<dd>'.$parent->Author.'</dd>';
+				$parent_theme .= '<dt>'.__('Version', 'google-calendar-events').'</dt>';
+				$parent_theme .= '<dd>'.$parent->Version.'</dd>';
 				$parent_theme .= '</dl>';
 
-				$parent_theme_export = strip_tags( $parent->Name ) . ' - ' .  $parent->Version;
+				$parent_theme_export = strip_tags($parent->Name).' - '.$parent->Version;
 			}
 		}
 
 		$sections['theme'] = array(
 			'theme'    => array(
-				'label'  => __( 'Theme Information', 'google-calendar-events' ),
+				'label'  => __('Theme Information', 'google-calendar-events'),
 				'label_export' => 'Theme',
 				'result' => $theme,
 				'result_export' => $theme_export,
 			),
 			'theme_child'   => array(
-				'label'  => __( 'Child Theme', 'google-calendar-events' ),
+				'label'  => __('Child Theme', 'google-calendar-events'),
 				'label_export' => 'Child Theme',
-				'result' => $is_child_theme ? __( 'Yes', 'google-calendar-events' ) : __( 'No', 'google-calendar-events' ),
+				'result' => $is_child_theme ? __('Yes', 'google-calendar-events') : __('No', 'google-calendar-events'),
 				'result_export' => $is_child_theme ? 'Yes' : 'No',
 			),
 			'theme_parent'   => array(
-				'label'  => __( 'Parent Theme', 'google-calendar-events' ),
+				'label'  => __('Parent Theme', 'google-calendar-events'),
 				'label_export' => 'Parent Theme',
 				'result' => $parent_theme,
 				'result_export' => $parent_theme_export,
@@ -273,61 +273,61 @@ 
 		 * ==============
 		 */
 
-		include_once ABSPATH . 'wp-admin/includes/plugin-install.php';
+		include_once ABSPATH.'wp-admin/includes/plugin-install.php';
 
-		$active_plugins = (array) get_option( 'active_plugins', array() );
-		if ( is_multisite() ) {
-			$active_plugins = array_merge( $active_plugins, get_site_option( 'active_sitewide_plugins', array() ) );
+		$active_plugins = (array) get_option('active_plugins', array());
+		if (is_multisite()) {
+			$active_plugins = array_merge($active_plugins, get_site_option('active_sitewide_plugins', array()));
 		}
 
-		foreach ( $active_plugins as $plugin ) {
+		foreach ($active_plugins as $plugin) {
 
-			$plugin_data = @get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin );
+			$plugin_data = @get_plugin_data(WP_PLUGIN_DIR.'/'.$plugin);
 
-			if ( ! empty( $plugin_data['Name'] ) ) {
+			if ( ! empty($plugin_data['Name'])) {
 
 				$plugin_name    = $plugin_data['Title'];
 				$plugin_author  = $plugin_data['Author'];
 				$plugin_version = $plugin_update_version = $plugin_data['Version'];
 
 				// Afraid that querying many plugins may risk a timeout.
-				if ( count( $active_plugins ) <= 10 ) {
-					$api = plugins_api( 'plugin_information', array(
+				if (count($active_plugins) <= 10) {
+					$api = plugins_api('plugin_information', array(
 						'slug'   => $plugin_data['Name'],
 						'fields' => array(
 							'version' => true,
 						),
-					) );
-					if ( $api && ! is_wp_error( $api ) ) {
-						if ( ! empty( $api->version ) ) {
+					));
+					if ($api && ! is_wp_error($api)) {
+						if ( ! empty($api->version)) {
 							$plugin_update_version = $api->version;
-							if ( version_compare( $plugin_version, $plugin_update_version, '<' ) ) {
-								$plugin_version = '<mark class="error">' . $plugin_version . ' (' . sprintf( __( '%s is available', 'google-calendar-events' ), esc_html( $plugin_update_version ) ) . ')</mark>';
+							if (version_compare($plugin_version, $plugin_update_version, '<')) {
+								$plugin_version = '<mark class="error">'.$plugin_version.' ('.sprintf(__('%s is available', 'google-calendar-events'), esc_html($plugin_update_version)).')</mark>';
 							} else {
-								$plugin_version = '<mark class="ok">' . $plugin_version . '</mark>';
+								$plugin_version = '<mark class="ok">'.$plugin_version.'</mark>';
 							}
 						}
 					}
 				}
 
 				$plugin  = '<dl>';
-				$plugin .= '<dt>' . __( 'Author', 'google-calendar-events' ) .  '</dt>';
-				$plugin .= '<dd>' . $plugin_author .         '</dd>';
-				$plugin .= '<dt>' . __( 'Version', 'google-calendar-events' ) . '</dt>';
-				$plugin .= '<dd>' . $plugin_version .        '</dd>';
+				$plugin .= '<dt>'.__('Author', 'google-calendar-events').'</dt>';
+				$plugin .= '<dd>'.$plugin_author.'</dd>';
+				$plugin .= '<dt>'.__('Version', 'google-calendar-events').'</dt>';
+				$plugin .= '<dd>'.$plugin_version.'</dd>';
 				$plugin .= '</dl>';
 
-				$sections['plugins'][ sanitize_key( strip_tags( $plugin_name ) ) ] = array(
+				$sections['plugins'][sanitize_key(strip_tags($plugin_name))] = array(
 					'label'  => $plugin_name,
-					'label_export' => strip_tags( $plugin_data['Title'] ),
+					'label_export' => strip_tags($plugin_data['Title']),
 					'result' => $plugin,
 					'result_export' => $plugin_data['Version'],
 				);
 			}
 		}
 
-		if ( isset( $sections['plugins'] ) ) {
-			rsort( $sections['plugins'] );
+		if (isset($sections['plugins'])) {
+			rsort($sections['plugins']);
 		}
 
 		/**
@@ -335,54 +335,54 @@ 
 		 * ==================
 		 */
 
-		if ( version_compare( PHP_VERSION, '7.0', '<' ) ) {
-			$php = '<mark>' . PHP_VERSION . ' - ' .
-			       __( 'WordPress.org recommends upgrading to PHP 7 or higher for better security.', 'google-calendar-events' ) .
-			       ' <a href="https://wordpress.org/about/requirements/" target="_blank">' . __( 'Read more.', 'google-calendar-events' ) . '</a>' .
+		if (version_compare(PHP_VERSION, '7.0', '<')) {
+			$php = '<mark>'.PHP_VERSION.' - '.
+			       __('WordPress.org recommends upgrading to PHP 7 or higher for better security.', 'google-calendar-events').
+			       ' <a href="https://wordpress.org/about/requirements/" target="_blank">'.__('Read more.', 'google-calendar-events').'</a>'.
 		           '</mark>';
 		} else {
-			$php = '<mark class="ok">' . PHP_VERSION . '</mark>';
+			$php = '<mark class="ok">'.PHP_VERSION.'</mark>';
 		}
 
-		if ( $wpdb->use_mysqli ) {
-			$mysql = @mysqli_get_server_info( $wpdb->dbh );
+		if ($wpdb->use_mysqli) {
+			$mysql = @mysqli_get_server_info($wpdb->dbh);
 		} else {
-			$mysql = '<mark class="error">' . __( 'Cannot connect to MySQL database.', 'google-calendar-events' ) . '</mark>';
+			$mysql = '<mark class="error">'.__('Cannot connect to MySQL database.', 'google-calendar-events').'</mark>';
 		}
 
 		$host = $_SERVER['SERVER_SOFTWARE'];
-		if ( defined( 'WPE_APIKEY' ) ) {
+		if (defined('WPE_APIKEY')) {
 			$host .= ' (WP Engine)';
-		} elseif ( defined( 'PAGELYBIN' ) ) {
+		} elseif (defined('PAGELYBIN')) {
 			$host .= ' (Pagely)';
 		}
 
 		$default_timezone = $server_timezone_export = date_default_timezone_get();
-		if ( 'UTC' !== $default_timezone ) {
-			$server_timezone = '<mark class="error">' . sprintf( __( 'Server default timezone is %s - it should be UTC', 'google-calendar-events' ), $default_timezone ) . '</mark>';
+		if ('UTC' !== $default_timezone) {
+			$server_timezone = '<mark class="error">'.sprintf(__('Server default timezone is %s - it should be UTC', 'google-calendar-events'), $default_timezone).'</mark>';
 		} else {
 			$server_timezone = '<mark class="ok">UTC</mark>';
 		}
 
 		// WP Remote POST test.
-		$response = wp_safe_remote_post( 'https://www.paypal.com/cgi-bin/webscr', array(
+		$response = wp_safe_remote_post('https://www.paypal.com/cgi-bin/webscr', array(
 			'timeout'    => 60,
 			'body'       => array(
 				'cmd'    => '_notify-validate',
 			),
-		) );
-		if ( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
+		));
+		if ( ! is_wp_error($response) && $response['response']['code'] >= 200 && $response['response']['code'] < 300) {
 			$wp_post_export = 'Yes';
-			$wp_post = '<mark class="ok">' . __( 'Yes', 'google-calendar-events' ) . '</mark>';
+			$wp_post = '<mark class="ok">'.__('Yes', 'google-calendar-events').'</mark>';
 		} else {
 			$wp_post_export = 'No';
-			$wp_post = '<mark class="error">' . __( 'No', 'google-calendar-events' );
-			if ( is_wp_error( $response ) ) {
-				$error = ' (' . $response->get_error_message() . ')';
+			$wp_post = '<mark class="error">'.__('No', 'google-calendar-events');
+			if (is_wp_error($response)) {
+				$error = ' ('.$response->get_error_message().')';
 				$wp_post .= $error;
 				$wp_post_export .= $error;
 			} else {
-				$error = ' (' . $response['response']['code'] . ')';
+				$error = ' ('.$response['response']['code'].')';
 				$wp_post .= $error;
 				$wp_post_export .= $error;
 			}
@@ -390,65 +390,65 @@ 
 		}
 
 		// WP Remote GET test.
-		$response = wp_safe_remote_get( get_home_url( '/?p=1' ) );
-		if ( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
+		$response = wp_safe_remote_get(get_home_url('/?p=1'));
+		if ( ! is_wp_error($response) && $response['response']['code'] >= 200 && $response['response']['code'] < 300) {
 			$wp_get_export = 'Yes';
-			$wp_get = '<mark class="ok">' . __( 'Yes', 'google-calendar-events' ) . '</mark>';
+			$wp_get = '<mark class="ok">'.__('Yes', 'google-calendar-events').'</mark>';
 		} else {
 			$wp_get_export = 'No';
-			$wp_get = '<mark class="error">' . __( 'No', 'google-calendar-events' );
-			if ( is_wp_error( $response ) ) {
-				$error = ' (' . $response->get_error_message() . ')';
+			$wp_get = '<mark class="error">'.__('No', 'google-calendar-events');
+			if (is_wp_error($response)) {
+				$error = ' ('.$response->get_error_message().')';
 				$wp_get .= $error;
 				$wp_get_export .= $error;
 			} else {
-				$error = ' (' . $response['response']['code'] . ')';
+				$error = ' ('.$response['response']['code'].')';
 				$wp_get .= $error;
 				$wp_get_export .= $error;
 			}
 			$wp_get .= '</mark>';
 		}
 
-		$php_memory_limit        = ini_get( 'memory_limit' );
-		$php_max_upload_filesize = ini_get( 'upload_max_filesize' );
-		$php_post_max_size       = ini_get( 'post_max_size' );
-		$php_max_execution_time  = ini_get( 'max_execution_time' );
-		$php_max_input_vars      = ini_get( 'max_input_vars' );
+		$php_memory_limit        = ini_get('memory_limit');
+		$php_max_upload_filesize = ini_get('upload_max_filesize');
+		$php_post_max_size       = ini_get('post_max_size');
+		$php_max_execution_time  = ini_get('max_execution_time');
+		$php_max_input_vars      = ini_get('max_input_vars');
 
 		$curl_info = '';
 
-		if ( function_exists( 'curl_version' ) ) {
+		if (function_exists('curl_version')) {
 			$curl_info = curl_version();
 		}
 
 		$sections['server'] = array(
 			'host'                => array(
-				'label'  => __( 'Web Server', 'google-calendar-events' ),
+				'label'  => __('Web Server', 'google-calendar-events'),
 				'label_export' => 'Web Server',
 				'result' => $host,
 			),
 			'php_version'         => array(
-				'label'  => __( 'PHP Version', 'google-calendar-events' ),
+				'label'  => __('PHP Version', 'google-calendar-events'),
 				'label_export' => 'PHP Version',
 				'result' => $php,
 				'result_export' => PHP_VERSION,
 			),
 			'mysql_version'       => array(
-				'label'  => __( 'MySQL Version', 'google-calendar-events' ),
+				'label'  => __('MySQL Version', 'google-calendar-events'),
 				'label_export' => 'MySQL Version',
-				'result' => version_compare( $mysql, '5.5', '>' ) ? '<mark class="ok">' . $mysql . '</mark>' : $mysql,
+				'result' => version_compare($mysql, '5.5', '>') ? '<mark class="ok">'.$mysql.'</mark>' : $mysql,
 				'result_export' => $mysql,
 			),
 			'server_timezone'     => array(
-				'label'  => __( 'Server Timezone', 'google-calendar-events' ),
+				'label'  => __('Server Timezone', 'google-calendar-events'),
 				'label_export' => 'Server Timezone',
 				'result' => $server_timezone,
 				'result_export' => $server_timezone_export,
 			),
 			'display_errors'      => array(
 				'label'  => 'Display Errors',
-				'result' => ( ini_get( 'display_errors' ) ) ? __( 'Yes', 'google-calendar-events' ) . ' (' . ini_get( 'display_errors' ) . ')' : '-',
-				'result_export' => ( ini_get( 'display_errors' ) ) ? 'Yes' : 'No',
+				'result' => (ini_get('display_errors')) ? __('Yes', 'google-calendar-events').' ('.ini_get('display_errors').')' : '-',
+				'result_export' => (ini_get('display_errors')) ? 'Yes' : 'No',
 			),
 			'php_memory_limit'    => array(
 				'label'  => 'Memory Limit',
@@ -472,23 +472,23 @@ 
 			),
 			'fsockopen'           => array(
 				'label'  => 'fsockopen',
-				'result' => function_exists( 'fsockopen' ) ? __( 'Yes', 'google-calendar-events' ) : __( 'No', 'google-calendar-events' ),
-				'result_export' => function_exists( 'fsockopen' ) ? 'Yes' : 'No',
+				'result' => function_exists('fsockopen') ? __('Yes', 'google-calendar-events') : __('No', 'google-calendar-events'),
+				'result_export' => function_exists('fsockopen') ? 'Yes' : 'No',
 			),
 			'curl_init'           => array(
 				'label'         => 'cURL',
-				'result'        => ! empty( $curl_info ) ? $curl_info['version'] . ', ' . $curl_info['ssl_version'] : __( 'No version found.', 'google-calendar-events' ),
-				'result_export' => ! empty( $curl_info ) ? $curl_info['version'] . ', ' . $curl_info['ssl_version'] : 'No version found.',
+				'result'        => ! empty($curl_info) ? $curl_info['version'].', '.$curl_info['ssl_version'] : __('No version found.', 'google-calendar-events'),
+				'result_export' => ! empty($curl_info) ? $curl_info['version'].', '.$curl_info['ssl_version'] : 'No version found.',
 			),
 			'soap'                => array(
 				'label'  => 'SOAP',
-				'result' => class_exists( 'SoapClient' ) ? __( 'Yes', 'google-calendar-events' ) : __( 'No', 'google-calendar-events' ),
-				'result_export' => class_exists( 'SoapClient' ) ? 'Yes' : 'No',
+				'result' => class_exists('SoapClient') ? __('Yes', 'google-calendar-events') : __('No', 'google-calendar-events'),
+				'result_export' => class_exists('SoapClient') ? 'Yes' : 'No',
 			),
 			'suhosin'             => array(
 				'label'  => 'SUHOSIN',
-				'result' => extension_loaded( 'suhosin' ) ? __( 'Yes', 'google-calendar-events' ) : __( 'No', 'google-calendar-events' ),
-				'result_export' => extension_loaded( 'suhosin' ) ? 'Yes' : 'No',
+				'result' => extension_loaded('suhosin') ? __('Yes', 'google-calendar-events') : __('No', 'google-calendar-events'),
+				'result_export' => extension_loaded('suhosin') ? 'Yes' : 'No',
 			),
 			'wp_remote_post'      => array(
 				'label'  => 'WP Remote POST',
@@ -510,26 +510,26 @@ 
 		$user_client = new \SimpleCalendar\Browser();
 
 		$browser  = '<dl>';
-		$browser .= '<dt>' . __( 'Name:', 'google-calendar-events' ) .         '</dt>';
-		$browser .= '<dd>' . $user_client->getBrowser() .   '</dd>';
-		$browser .= '<dt>' . __( 'Version:', 'google-calendar-events' ) .      '</dt>';
-		$browser .= '<dd>' . $user_client->getVersion() .   '</dd>';
-		$browser .= '<dt>' . __( 'User Agent:', 'google-calendar-events' ) .   '</dt>';
-		$browser .= '<dd>' . $user_client->getUserAgent() . '</dd>';
-		$browser .= '<dt>' . __( 'Platform:', 'google-calendar-events' ) .     '</dt>';
-		$browser .= '<dd>' . $user_client->getPlatform() .  '</dd>';
+		$browser .= '<dt>'.__('Name:', 'google-calendar-events').'</dt>';
+		$browser .= '<dd>'.$user_client->getBrowser().'</dd>';
+		$browser .= '<dt>'.__('Version:', 'google-calendar-events').'</dt>';
+		$browser .= '<dd>'.$user_client->getVersion().'</dd>';
+		$browser .= '<dt>'.__('User Agent:', 'google-calendar-events').'</dt>';
+		$browser .= '<dd>'.$user_client->getUserAgent().'</dd>';
+		$browser .= '<dt>'.__('Platform:', 'google-calendar-events').'</dt>';
+		$browser .= '<dd>'.$user_client->getPlatform().'</dd>';
 		$browser .= '</dl>';
 
-		$browser_export = $user_client->getBrowser() . ' ' . $user_client->getVersion() . ' (' . $user_client->getPlatform() . ')';
+		$browser_export = $user_client->getBrowser().' '.$user_client->getVersion().' ('.$user_client->getPlatform().')';
 
 		$sections['client'] = array(
 			'user_ip' => array(
-				'label'  => __( 'IP Address', 'google-calendar-events' ),
+				'label'  => __('IP Address', 'google-calendar-events'),
 				'label_export' => 'IP Address',
 				'result' => $_SERVER['SERVER_ADDR'],
 			),
 			'browser' => array(
-				'label'  => __( 'Browser', 'google-calendar-events' ),
+				'label'  => __('Browser', 'google-calendar-events'),
 				'result' => $browser,
 				'result_export' => $browser_export,
 			)
@@ -540,12 +540,12 @@ 
 		 * ============
 		 */
 
-		$panels   = apply_filters( 'simcal_system_status_report_panels', $panels );
-		$sections = apply_filters( 'simcal_system_status_report_sections', $sections );
+		$panels   = apply_filters('simcal_system_status_report_panels', $panels);
+		$sections = apply_filters('simcal_system_status_report_sections', $sections);
 
-		foreach ( $panels as $panel => $v ) :
+		foreach ($panels as $panel => $v) :
 
-			if ( isset( $sections[ $panel ] ) ) :
+			if (isset($sections[$panel])) :
 
 				?>
 				<table class="widefat simcal-system-status-report-panel">
@@ -555,15 +555,15 @@ 
 						</tr>
 					</thead>
 					<tbody>
-						<?php foreach ( $sections[ $panel ] as $row => $cell ) : ?>
+						<?php foreach ($sections[$panel] as $row => $cell) : ?>
 							<tr>
 								<?php
-								$label_export  = isset( $cell['label_export']  ) ? $cell['label_export']  : $cell['label'];
-								$result_export = isset( $cell['result_export'] ) ? $cell['result_export'] : $cell['result'];
+								$label_export  = isset($cell['label_export']) ? $cell['label_export'] : $cell['label'];
+								$result_export = isset($cell['result_export']) ? $cell['result_export'] : $cell['result'];
 								?>
-								<td class="tooltip"><?php echo isset( $cell['tooltip'] ) ? ' <i class="simcal-icon-help simcal-help-tip" data-tip="' . $cell['tooltip'] . '"></i> ' : ''; ?></td>
-								<td class="label" data-export="<?php echo trim( $label_export ); ?>"><?php echo $cell['label']; ?></td>
-								<td class="result" data-export="<?php echo trim( $result_export ); ?>"><?php echo $cell['result']; ?></td>
+								<td class="tooltip"><?php echo isset($cell['tooltip']) ? ' <i class="simcal-icon-help simcal-help-tip" data-tip="'.$cell['tooltip'].'"></i> ' : ''; ?></td>
+								<td class="label" data-export="<?php echo trim($label_export); ?>"><?php echo $cell['label']; ?></td>
+								<td class="result" data-export="<?php echo trim($result_export); ?>"><?php echo $cell['result']; ?></td>
 							</tr>
 						<?php endforeach; ?>
 					</tbody>
@@ -641,7 +641,7 @@ 
 			jQuery( '#simcal-system-status-report-download' ).on( 'click', function() {
 				var file = new Blob( [ report ], { type: 'text/plain' } );
 				jQuery( this ).attr( 'href', URL.createObjectURL( file ) );
-				jQuery( this ).attr( 'download', '<?php echo sanitize_title( str_replace( array( 'http://', 'https://' ), '', get_bloginfo( 'url' ) ) . '-system-report-' . date( 'Y-m-d', time() ) ); ?>' );
+				jQuery( this ).attr( 'download', '<?php echo sanitize_title(str_replace(array('http://', 'https://'), '', get_bloginfo('url')).'-system-report-'.date('Y-m-d', time())); ?>' );
 			} );
 
 		</script>
@@ -661,13 +661,13 @@ 
 	 *
 	 * @return int|double|string
 	 */
-	private function let_to_num( $size ) {
+	private function let_to_num($size) {
 
-		$l   = substr( $size, -1 );
-		$ret = substr( $size, 0, -1 );
+		$l   = substr($size, -1);
+		$ret = substr($size, 0, -1);
 
 		// Note: do not insert break or default in this switch loop.
-		switch ( strtoupper( $l ) ) {
+		switch (strtoupper($l)) {
 			case 'P':
 				$ret *= 1024;
 				// no break
@@ -681,7 +681,7 @@ 
 				$ret *= 1024;
 				// no break
 			case 'K':
-				$ret *= 1024;;
+				$ret *= 1024; ;
 				// no break
 		}