moonstonemedia / Simple-Calendar

includes/events/event.php

Spacing +75 added lines, -75 removed lines

@@ -8,7 +8,7 @@ 
 
 use Carbon\Carbon;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -234,30 +234,30 @@ 
 	 *
 	 * @param array $event
 	 */
-	public function __construct( array $event ) {
+	public function __construct(array $event) {
 
 		/* ================= *
 		 * Event Identifiers *
 		 * ================= */
 
 		// Event unique id.
-		if ( ! empty( $event['uid'] ) ) {
-			$this->uid = esc_attr( $event['uid'] );
+		if ( ! empty($event['uid'])) {
+			$this->uid = esc_attr($event['uid']);
 		}
 
 		// Event source.
-		if ( ! empty( $event['source'] ) ) {
-			$this->source = esc_attr( $event['source'] );
+		if ( ! empty($event['source'])) {
+			$this->source = esc_attr($event['source']);
 		}
 
 		// Event parent calendar id.
-		if ( ! empty( $event['calendar'] ) ) {
-			$this->calendar = max( intval( $event['calendar'] ), 0 );
+		if ( ! empty($event['calendar'])) {
+			$this->calendar = max(intval($event['calendar']), 0);
 		}
 
 		// Event parent calendar timezone.
-		if ( ! empty( $event['timezone'] ) ) {
-			$this->timezone = esc_attr( $event['timezone'] );
+		if ( ! empty($event['timezone'])) {
+			$this->timezone = esc_attr($event['timezone']);
 		}
 
 		/* ============= *
@@ -265,23 +265,23 @@ 
 		 * ============= */
 
 		// Event title.
-		if ( ! empty( $event['title'] ) ) {
-			$this->title = esc_html( $event['title'] );
+		if ( ! empty($event['title'])) {
+			$this->title = esc_html($event['title']);
 		}
 
 		// Event description.
-		if ( ! empty( $event['description'] ) ) {
-			$this->description = wp_kses_post( $event['description'] );
+		if ( ! empty($event['description'])) {
+			$this->description = wp_kses_post($event['description']);
 		}
 
 		// Event link URL.
-		if ( ! empty( $event['link'] ) ) {
-			$this->link = esc_url_raw( $event['link'] );
+		if ( ! empty($event['link'])) {
+			$this->link = esc_url_raw($event['link']);
 		}
 
 		// Event visibility.
-		if ( ! empty( $event['visibility'] ) ) {
-			$this->visibility = esc_attr( $event['visibility'] );
+		if ( ! empty($event['visibility'])) {
+			$this->visibility = esc_attr($event['visibility']);
 			$this->public = $this->visibility == 'public' ? true : false;
 		}
 
@@ -289,34 +289,34 @@ 
 		 * Event Start *
 		 * =========== */
 
-		if ( ! empty( $event['start'] ) ) {
-			$this->start = is_numeric( $event['start'] ) ? intval( $event['start'] ) : 0;
-			if ( ! empty( $event['start_utc'] ) ) {
-				$this->start_utc = is_numeric( $event['start_utc'] ) ? intval( $event['start_utc'] ) : 0;
+		if ( ! empty($event['start'])) {
+			$this->start = is_numeric($event['start']) ? intval($event['start']) : 0;
+			if ( ! empty($event['start_utc'])) {
+				$this->start_utc = is_numeric($event['start_utc']) ? intval($event['start_utc']) : 0;
 			}
-			if ( ! empty( $event['start_timezone'] ) ) {
-				$this->start_timezone = esc_attr( $event['start_timezone'] );
+			if ( ! empty($event['start_timezone'])) {
+				$this->start_timezone = esc_attr($event['start_timezone']);
 			}
-			$this->start_dt = Carbon::createFromTimestamp( $this->start, $this->start_timezone );
-			$start_location = isset( $event['start_location'] ) ? $event['start_location'] : '';
-			$this->start_location = $this->esc_location( $start_location );
+			$this->start_dt = Carbon::createFromTimestamp($this->start, $this->start_timezone);
+			$start_location = isset($event['start_location']) ? $event['start_location'] : '';
+			$this->start_location = $this->esc_location($start_location);
 		}
 
 		/* ========= *
 		 * Event End *
 		 * ========= */
 
-		if ( ! empty( $event['end'] ) ) {
-			$this->end = is_numeric( $event['end'] ) ? intval( $event['end'] ): false;
-			if ( ! empty( $event['end_timezone'] ) ) {
-				$this->end_timezone = esc_attr( $event['end_timezone'] );
+		if ( ! empty($event['end'])) {
+			$this->end = is_numeric($event['end']) ? intval($event['end']) : false;
+			if ( ! empty($event['end_timezone'])) {
+				$this->end_timezone = esc_attr($event['end_timezone']);
 			}
-			if ( ! empty( $event['end_utc'] ) ) {
-				$this->end_utc = is_numeric( $event['end_utc'] ) ? intval( $event['end_utc'] ) : false;
-				$this->end_dt = Carbon::createFromTimestamp( $this->end, $this->end_timezone );
+			if ( ! empty($event['end_utc'])) {
+				$this->end_utc = is_numeric($event['end_utc']) ? intval($event['end_utc']) : false;
+				$this->end_dt = Carbon::createFromTimestamp($this->end, $this->end_timezone);
 			}
-			$end_location = isset( $event['end_location'] ) ? $event['end_location'] : '';
-			$this->end_location = $this->esc_location( $end_location );
+			$end_location = isset($event['end_location']) ? $event['end_location'] : '';
+			$this->end_location = $this->esc_location($end_location);
 		}
 
 		/* ================== *
@@ -324,18 +324,18 @@ 
 		 * ================== */
 
 		// Whole day event.
-		if ( ! empty( $event['whole_day'] ) ) {
-			$this->whole_day = true === $event['whole_day'] ? true: false;
+		if ( ! empty($event['whole_day'])) {
+			$this->whole_day = true === $event['whole_day'] ? true : false;
 		}
 
 		// Multi day event.
-		if ( ! empty( $event['multiple_days'] ) ) {
-			$this->multiple_days = max( absint( $event['multiple_days'] ), 1 );
+		if ( ! empty($event['multiple_days'])) {
+			$this->multiple_days = max(absint($event['multiple_days']), 1);
 		}
 
 		// Event recurrence.
-		if ( isset( $event['recurrence'] ) ) {
-			$this->recurrence = ! empty( $event['recurrence'] ) ? $event['recurrence'] : false;
+		if (isset($event['recurrence'])) {
+			$this->recurrence = ! empty($event['recurrence']) ? $event['recurrence'] : false;
 		}
 
 		/* ========== *
@@ -343,18 +343,18 @@ 
 		 * ========== */
 
 		// Event has venue(s).
-		if ( $this->start_location['venue'] || $this->end_location['venue'] ) {
+		if ($this->start_location['venue'] || $this->end_location['venue']) {
 			$this->venue = true;
 		}
 
 		// Event meta.
-		if ( ! empty( $event['meta'] ) ) {
-			$this->meta = is_array( $event['meta'] ) ? $event['meta'] : array();
+		if ( ! empty($event['meta'])) {
+			$this->meta = is_array($event['meta']) ? $event['meta'] : array();
 		}
 
 		// Event template.
-		if ( ! empty( $event['template'] ) ) {
-			$this->template = wp_kses_post( $event['template'] );
+		if ( ! empty($event['template'])) {
+			$this->template = wp_kses_post($event['template']);
 		}
 
 	}
@@ -369,27 +369,27 @@ 
 	 *
 	 * @return array
 	 */
-	private function esc_location( $var = '' ) {
+	private function esc_location($var = '') {
 
 		$location = array();
 
-		if ( is_string( $var ) ) {
+		if (is_string($var)) {
 			$var = array(
 				'name'    => $var,
 				'address' => $var,
 			);
-		} elseif ( is_bool( $var ) || is_null( $var ) ) {
+		} elseif (is_bool($var) || is_null($var)) {
 			$var = array();
 		} else {
 			$var = (array) $var;
 		}
 
-		$location['name']    = isset( $var['name'] )    ? esc_attr( strip_tags( $var['name'] ) ) : '';
-		$location['address'] = isset( $var['address'] ) ? esc_attr( strip_tags( $var['address'] ) ) : '';
-		$location['lat']     = isset( $var['lat'] )     ? $this->esc_coordinate( $var['lat'] ) : 0;
-		$location['lng']     = isset( $var['lng'] )     ? $this->esc_coordinate( $var['lng'] ) : 0;
+		$location['name']    = isset($var['name']) ? esc_attr(strip_tags($var['name'])) : '';
+		$location['address'] = isset($var['address']) ? esc_attr(strip_tags($var['address'])) : '';
+		$location['lat']     = isset($var['lat']) ? $this->esc_coordinate($var['lat']) : 0;
+		$location['lng']     = isset($var['lng']) ? $this->esc_coordinate($var['lng']) : 0;
 
-		if ( ! empty( $location['name'] ) || ! empty( $location['address'] ) ) {
+		if ( ! empty($location['name']) || ! empty($location['address'])) {
 			$location['venue'] = true;
 		} else {
 			$location['venue'] = false;
@@ -408,8 +408,8 @@ 
 	 *
 	 * @return int|float
 	 */
-	private function esc_coordinate( $latlng = 0 ) {
-		return is_numeric( $latlng ) ? floatval( $latlng ) : 0;
+	private function esc_coordinate($latlng = 0) {
+		return is_numeric($latlng) ? floatval($latlng) : 0;
 	}
 
 	/**
@@ -422,8 +422,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function set_timezone( $tz ) {
-		if ( in_array( $tz, timezone_identifiers_list() ) ) {
+	public function set_timezone($tz) {
+		if (in_array($tz, timezone_identifiers_list())) {
 			$this->timezone = $tz;
 			return true;
 		}
@@ -449,7 +449,7 @@ 
 	 * @return bool
 	 */
 	public function starts_today() {
-		return $this->start_dt->setTimezone( $this->timezone )->isToday();
+		return $this->start_dt->setTimezone($this->timezone)->isToday();
 	}
 
 	/**
@@ -460,7 +460,7 @@ 
 	 * @return bool
 	 */
 	public function ends_today() {
-		return ! is_null( $this->end_dt ) ? $this->end_dt->setTimezone( $this->timezone )->isToday() : true;
+		return ! is_null($this->end_dt) ? $this->end_dt->setTimezone($this->timezone)->isToday() : true;
 	}
 
 	/**
@@ -471,7 +471,7 @@ 
 	 * @return bool
 	 */
 	public function starts_tomorrow() {
-		return $this->start_dt->setTimezone( $this->timezone )->isTomorrow();
+		return $this->start_dt->setTimezone($this->timezone)->isTomorrow();
 	}
 
 	/**
@@ -482,7 +482,7 @@ 
 	 * @return bool
 	 */
 	public function ends_tomorrow() {
-		return ! is_null( $this->end_dt ) ? $this->end_dt->setTimezone( $this->timezone )->isTomorrow() : false;
+		return ! is_null($this->end_dt) ? $this->end_dt->setTimezone($this->timezone)->isTomorrow() : false;
 	}
 
 	/**
@@ -493,7 +493,7 @@ 
 	 * @return bool
 	 */
 	public function started_yesterday() {
-		return $this->start_dt->setTimezone( $this->timezone )->isYesterday();
+		return $this->start_dt->setTimezone($this->timezone)->isYesterday();
 	}
 
 	/**
@@ -504,7 +504,7 @@ 
 	 * @return bool
 	 */
 	public function ended_yesterday() {
-		return ! is_null( $this->end_dt ) ? $this->end_dt->setTimezone( $this->timezone )->isYesterday() : false;
+		return ! is_null($this->end_dt) ? $this->end_dt->setTimezone($this->timezone)->isYesterday() : false;
 	}
 
 	/**
@@ -515,7 +515,7 @@ 
 	 * @return bool
 	 */
 	public function starts_future() {
-		return $this->start_dt->setTimezone( $this->timezone )->isFuture();
+		return $this->start_dt->setTimezone($this->timezone)->isFuture();
 	}
 
 	/**
@@ -526,7 +526,7 @@ 
 	 * @return bool
 	 */
 	public function ends_future() {
-		return ! is_null( $this->end_dt ) ? $this->end_dt->setTimezone( $this->timezone )->isFuture() : false;
+		return ! is_null($this->end_dt) ? $this->end_dt->setTimezone($this->timezone)->isFuture() : false;
 	}
 
 	/**
@@ -537,7 +537,7 @@ 
 	 * @return bool
 	 */
 	public function started_past() {
-		return $this->start_dt->setTimezone( $this->timezone )->isPast();
+		return $this->start_dt->setTimezone($this->timezone)->isPast();
 	}
 
 	/**
@@ -548,7 +548,7 @@ 
 	 * @return bool
 	 */
 	public function ended_past() {
-		return ! is_null( $this->end_dt ) ? $this->end_dt->setTimezone( $this->timezone )->isPast() : false;
+		return ! is_null($this->end_dt) ? $this->end_dt->setTimezone($this->timezone)->isPast() : false;
 	}
 
 	/**
@@ -560,9 +560,9 @@ 
 	 *
 	 * @return string
 	 */
-	public function get_color( $default = '' ) {
-		if ( isset( $this->meta['color'] ) ) {
-			return ! empty( $this->meta['color'] ) ? esc_attr( $this->meta['color'] ) : $default;
+	public function get_color($default = '') {
+		if (isset($this->meta['color'])) {
+			return ! empty($this->meta['color']) ? esc_attr($this->meta['color']) : $default;
 		}
 		return $default;
 	}
@@ -575,7 +575,7 @@ 
 	 * @return array
 	 */
 	public function get_attachments() {
-		return isset( $this->meta['attachments'] ) ? $this->meta['attachments'] : array();
+		return isset($this->meta['attachments']) ? $this->meta['attachments'] : array();
 	}
 
 	/**
@@ -586,7 +586,7 @@ 
 	 * @return array
 	 */
 	public function get_attendees() {
-		return isset( $this->meta['attendees'] ) ? $this->meta['attendees'] : array();
+		return isset($this->meta['attendees']) ? $this->meta['attendees'] : array();
 	}
 
 	/**
@@ -597,7 +597,7 @@ 
 	 * @return array
 	 */
 	public function get_organizer() {
-		return isset( $this->meta['organizer'] ) ? $this->meta['organizer'] : array();
+		return isset($this->meta['organizer']) ? $this->meta['organizer'] : array();
 	}
 
 }

includes/feeds/google.php

Spacing +90 added lines, -90 removed lines

@@ -12,7 +12,7 @@ 
 use SimpleCalendar\Abstracts\Feed;
 use SimpleCalendar\Feeds\Admin\Google_Admin as Admin;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -90,34 +90,34 @@ 
 	 * @param string|Calendar $calendar
 	 * @param bool $load_admin
 	 */
-	public function __construct( $calendar = '', $load_admin = true ) {
+	public function __construct($calendar = '', $load_admin = true) {
 
-		parent::__construct( $calendar );
+		parent::__construct($calendar);
 
 		$this->type = 'google';
-		$this->name = __( 'Google Calendar', 'google-calendar-events' );
+		$this->name = __('Google Calendar', 'google-calendar-events');
 
 		// Google client config.
-		$settings = get_option( 'simple-calendar_settings_feeds' );
-		$this->google_api_key = isset( $settings['google']['api_key'] ) ? esc_attr( $settings['google']['api_key'] ) : '';
-		$this->google_client_scopes = array( \Google_Service_Calendar::CALENDAR_READONLY );
+		$settings = get_option('simple-calendar_settings_feeds');
+		$this->google_api_key = isset($settings['google']['api_key']) ? esc_attr($settings['google']['api_key']) : '';
+		$this->google_client_scopes = array(\Google_Service_Calendar::CALENDAR_READONLY);
 		$this->google_client = $this->get_client();
 
-		if ( $this->post_id > 0 ) {
+		if ($this->post_id > 0) {
 
 			// Google query args.
-			$this->google_calendar_id       = $this->esc_google_calendar_id( get_post_meta( $this->post_id, '_google_calendar_id', true ) );
-			$this->google_events_recurring  = esc_attr( get_post_meta( $this->post_id, '_google_events_recurring', true ) );
-			$this->google_search_query      = esc_attr( get_post_meta( $this->post_id, '_google_events_search_query', true ) );
-			$this->google_max_results       = max( absint( get_post_meta( $this->post_id, '_google_events_max_results', true ) ), 1 );
+			$this->google_calendar_id       = $this->esc_google_calendar_id(get_post_meta($this->post_id, '_google_calendar_id', true));
+			$this->google_events_recurring  = esc_attr(get_post_meta($this->post_id, '_google_events_recurring', true));
+			$this->google_search_query      = esc_attr(get_post_meta($this->post_id, '_google_events_search_query', true));
+			$this->google_max_results       = max(absint(get_post_meta($this->post_id, '_google_events_max_results', true)), 1);
 
-			if ( ! is_admin() || defined( 'DOING_AJAX' ) ) {
-				$this->events = ! empty( $this->google_api_key ) ? $this->get_events() : array();
+			if ( ! is_admin() || defined('DOING_AJAX')) {
+				$this->events = ! empty($this->google_api_key) ? $this->get_events() : array();
 			}
 		}
 
-		if ( is_admin() && $load_admin ) {
-			$admin = new Admin( $this, $this->google_api_key, $this->google_calendar_id );
+		if (is_admin() && $load_admin) {
+			$admin = new Admin($this, $this->google_api_key, $this->google_calendar_id);
 			$this->settings = $admin->settings_fields();
 		}
 	}
@@ -131,8 +131,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function esc_google_calendar_id( $id ) {
-		return base64_decode( $id );
+	public function esc_google_calendar_id($id) {
+		return base64_decode($id);
 	}
 
 	/**
@@ -146,59 +146,59 @@ 
 	 */
 	public function get_events() {
 
-		$calendar = get_transient( '_simple-calendar_feed_id_' . strval( $this->post_id ) . '_' . $this->type );
+		$calendar = get_transient('_simple-calendar_feed_id_'.strval($this->post_id).'_'.$this->type);
 
-		if ( empty( $calendar ) && ! empty( $this->google_calendar_id ) ) {
+		if (empty($calendar) && ! empty($this->google_calendar_id)) {
 
 			$error = '';
 
 			try {
-				$response = $this->make_request( $this->google_calendar_id );
-			} catch ( \Exception $e ) {
+				$response = $this->make_request($this->google_calendar_id);
+			} catch (\Exception $e) {
 				$error .= $e->getMessage();
 			}
 
-			if ( empty( $error ) && isset( $response['events'] ) && isset( $response['timezone'] ) ) {
+			if (empty($error) && isset($response['events']) && isset($response['timezone'])) {
 
-				$calendar = array_merge( $response, array( 'events' => array() ) );
+				$calendar = array_merge($response, array('events' => array()));
 
 				// If no timezone has been set, use calendar feed.
-				if ( 'use_calendar' == $this->timezone_setting ) {
+				if ('use_calendar' == $this->timezone_setting) {
 					$this->timezone = $calendar['timezone'];
 				}
 
-				$source = isset( $response['title'] ) ? sanitize_text_field( $response['title'] ) : '';
+				$source = isset($response['title']) ? sanitize_text_field($response['title']) : '';
 
-				if ( ! empty( $response['events'] ) && is_array( $response['events'] ) ) {
-					foreach ( $response['events'] as $event ) {
-						if ( $event instanceof \Google_Service_Calendar_Event ) {
+				if ( ! empty($response['events']) && is_array($response['events'])) {
+					foreach ($response['events'] as $event) {
+						if ($event instanceof \Google_Service_Calendar_Event) {
 
 							// Visibility.
 							$visibility = $event->getVisibility();
 							// Public calendars may have private events which can't be properly accessed by simple api key method.
-							if ( $this->type == 'google' && ( $visibility == 'private' || $visibility == 'confidential' ) ) {
+							if ($this->type == 'google' && ($visibility == 'private' || $visibility == 'confidential')) {
 								continue;
 							}
 
 							// Event title & description.
-							$title = strip_tags( $event->getSummary() );
-							$title = sanitize_text_field( iconv( mb_detect_encoding( $title, mb_detect_order(), true ), 'UTF-8', $title ) );
-							$description = wp_kses_post( iconv( mb_detect_encoding( $event->getDescription(), mb_detect_order(), true ), 'UTF-8', $event->getDescription() ) );
+							$title = strip_tags($event->getSummary());
+							$title = sanitize_text_field(iconv(mb_detect_encoding($title, mb_detect_order(), true), 'UTF-8', $title));
+							$description = wp_kses_post(iconv(mb_detect_encoding($event->getDescription(), mb_detect_order(), true), 'UTF-8', $event->getDescription()));
 
 							$whole_day = false;
 
 							// Event start properties.
 							$start_timezone = ! $event->getStart()->timeZone ? $calendar['timezone'] : $event->getStart()->timeZone;
-							if ( is_null( $event->getStart()->dateTime ) ) {
+							if (is_null($event->getStart()->dateTime)) {
 								// Whole day event.
-								$date = Carbon::parse( $event->getStart()->date );
-								$google_start = Carbon::createFromDate( $date->year, $date->month, $date->day, $start_timezone )->startOfDay()->addSeconds( 59 );
-								$google_start_utc = Carbon::createFromDate( $date->year, $date->month, $date->day, 'UTC' )->startOfDay()->addSeconds( 59 );
+								$date = Carbon::parse($event->getStart()->date);
+								$google_start = Carbon::createFromDate($date->year, $date->month, $date->day, $start_timezone)->startOfDay()->addSeconds(59);
+								$google_start_utc = Carbon::createFromDate($date->year, $date->month, $date->day, 'UTC')->startOfDay()->addSeconds(59);
 								$whole_day = true;
 							} else {
-								$date = Carbon::parse( $event->getStart()->dateTime );
-								$google_start     = Carbon::create( $date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $start_timezone );
-								$google_start_utc = Carbon::create( $date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, 'UTC' );
+								$date = Carbon::parse($event->getStart()->dateTime);
+								$google_start     = Carbon::create($date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $start_timezone);
+								$google_start_utc = Carbon::create($date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, 'UTC');
 							}
 							// Start.
 							$start = $google_start->getTimestamp();
@@ -207,19 +207,19 @@ 
 
 							$end = $end_utc = $end_timezone = '';
 							$span = 0;
-							if ( false == $event->getEndTimeUnspecified() ) {
+							if (false == $event->getEndTimeUnspecified()) {
 
 								// Event end properties.
 								$end_timezone = ! $event->getEnd()->timeZone ? $calendar['timezone'] : $event->getEnd()->timeZone;
-								if ( is_null( $event->getEnd()->dateTime ) ) {
+								if (is_null($event->getEnd()->dateTime)) {
 									// Whole day event.
-									$date           = Carbon::parse( $event->getEnd()->date );
-									$google_end     = Carbon::createFromDate( $date->year, $date->month, $date->day, $end_timezone )->endOfDay()->subSeconds( 59 );
-									$google_end_utc = Carbon::createFromDate( $date->year, $date->month, $date->day, 'UTC' )->endOfDay()->subSeconds( 59 );
+									$date           = Carbon::parse($event->getEnd()->date);
+									$google_end     = Carbon::createFromDate($date->year, $date->month, $date->day, $end_timezone)->endOfDay()->subSeconds(59);
+									$google_end_utc = Carbon::createFromDate($date->year, $date->month, $date->day, 'UTC')->endOfDay()->subSeconds(59);
 								} else {
-									$date           = Carbon::parse( $event->getEnd()->dateTime );
-									$google_end     = Carbon::create( $date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $end_timezone );
-									$google_end_utc = Carbon::create( $date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, 'UTC' );
+									$date           = Carbon::parse($event->getEnd()->dateTime);
+									$google_end     = Carbon::create($date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $end_timezone);
+									$google_end_utc = Carbon::create($date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, 'UTC');
 								}
 								// End.
 								$end = $google_end->getTimestamp();
@@ -227,10 +227,10 @@ 
 								$end_utc = $google_end_utc->getTimestamp();
 
 								// Count multiple days.
-								$span = $google_start->setTimezone( $calendar['timezone'] )->diffInDays( $google_end->setTimezone( $calendar['timezone'] ) );
+								$span = $google_start->setTimezone($calendar['timezone'])->diffInDays($google_end->setTimezone($calendar['timezone']));
 
-								if ( $span == 0 ) {
-									if ( $google_start->toDateString() !== $google_end->toDateString() ) {
+								if ($span == 0) {
+									if ($google_start->toDateString() !== $google_end->toDateString()) {
 										$span = 1;
 									}
 								}
@@ -245,19 +245,19 @@ 
 							// Recurring event.
 							$recurrence = $event->getRecurrence();
 							$recurring_id = $event->getRecurringEventId();
-							if ( ! $recurrence && $recurring_id ) {
+							if ( ! $recurrence && $recurring_id) {
 								$recurrence = true;
 							}
 
 							// Event link.
-							if ( 'use_calendar' == $this->timezone_setting ) {
-								$link = add_query_arg( array( 'ctz' => $this->timezone ), $event->getHtmlLink() );
+							if ('use_calendar' == $this->timezone_setting) {
+								$link = add_query_arg(array('ctz' => $this->timezone), $event->getHtmlLink());
 							} else {
 								$link = $event->getHtmlLink();
 							}
 
 							// Build the event.
-							$calendar['events'][ intval( $start ) ][] = array(
+							$calendar['events'][intval($start)][] = array(
 								'type'           => 'google-calendar',
 								'source'         => $source,
 								'title'          => $title,
@@ -284,24 +284,24 @@ 
 						}
 					}
 
-					if ( ! empty( $calendar['events'] ) ) {
+					if ( ! empty($calendar['events'])) {
 
-						ksort( $calendar['events'], SORT_NUMERIC );
+						ksort($calendar['events'], SORT_NUMERIC);
 
 						set_transient(
-							'_simple-calendar_feed_id_' . strval( $this->post_id ) . '_' . $this->type,
+							'_simple-calendar_feed_id_'.strval($this->post_id).'_'.$this->type,
 							$calendar,
-							max( absint( $this->cache ), 60 )
+							max(absint($this->cache), 60)
 						);
 					}
 				}
 
 			} else {
 
-				$message  = __( 'While trying to retrieve events, Google returned an error:', 'google-calendar-events' );
-				$message .= '<br><br>' . $error . '<br><br>';
-				$message .= __( 'Please ensure that both your Google Calendar ID and API Key are valid and that the Google Calendar you want to display is public.', 'google-calendar-events' ) . '<br><br>';
-				$message .= __( 'Only you can see this notice.', 'google-calendar-events' );
+				$message  = __('While trying to retrieve events, Google returned an error:', 'google-calendar-events');
+				$message .= '<br><br>'.$error.'<br><br>';
+				$message .= __('Please ensure that both your Google Calendar ID and API Key are valid and that the Google Calendar you want to display is public.', 'google-calendar-events').'<br><br>';
+				$message .= __('Only you can see this notice.', 'google-calendar-events');
 
 				return $message;
 			}
@@ -309,11 +309,11 @@ 
 		}
 
 		// If no timezone has been set, use calendar feed.
-		if ( 'use_calendar' == $this->timezone_setting && isset( $calendar['timezone'] ) ) {
+		if ('use_calendar' == $this->timezone_setting && isset($calendar['timezone'])) {
 			$this->timezone = $calendar['timezone'];
 		}
 
-		return isset( $calendar['events'] ) ? $calendar['events'] : array();
+		return isset($calendar['events']) ? $calendar['events'] : array();
 	}
 
 	/**
@@ -329,67 +329,67 @@ 
 	 *
 	 * @throws \Exception On request failure will throw an exception from Google.
 	 */
-	public function make_request( $id = '', $time_min = 0, $time_max = 0 ) {
+	public function make_request($id = '', $time_min = 0, $time_max = 0) {
 
 		$calendar = array();
 		$google = $this->get_service();
 
-		if ( ! is_null( $google ) && ! empty( $id ) ) {
+		if ( ! is_null($google) && ! empty($id)) {
 
 			// Build the request args.
 			$args = array();
 
 			// Expand recurring events.
-			if ( $this->google_events_recurring == 'show' ) {
+			if ($this->google_events_recurring == 'show') {
 				$args['singleEvents'] = true;
 			}
 
 			// Query events using search terms.
-			if ( ! empty( $this->google_search_query ) ) {
-				$args['q'] = rawurlencode( $this->google_search_query );
+			if ( ! empty($this->google_search_query)) {
+				$args['q'] = rawurlencode($this->google_search_query);
 			}
 
 			// Max results to query.
-			$args['maxResults'] = strval( min( absint( $this->google_max_results ), 2500 ) );
+			$args['maxResults'] = strval(min(absint($this->google_max_results), 2500));
 
 			// Specify a timezone.
 			$timezone = '';
-			if ( 'use_calendar' != get_post_meta( $this->post_id, '_feed_timezone_setting', true ) ) {
+			if ('use_calendar' != get_post_meta($this->post_id, '_feed_timezone_setting', true)) {
 				$args['timeZone'] = $timezone = $this->timezone;
 			}
 
 			// Lower bound (inclusive) for an event's end time to filter by.
-			$earliest_event = intval( $this->time_min );
-			if ( $earliest_event > 0 ) {
+			$earliest_event = intval($this->time_min);
+			if ($earliest_event > 0) {
 				$timeMin = Carbon::now();
-				if ( ! empty( $timezone ) ) {
-					$timeMin->setTimezone( $timezone );
+				if ( ! empty($timezone)) {
+					$timeMin->setTimezone($timezone);
 				}
-				$timeMin->setTimestamp( $earliest_event );
+				$timeMin->setTimestamp($earliest_event);
 				$args['timeMin'] = $timeMin->toRfc3339String();
 			}
 
 			// Upper bound (exclusive) for an event's start time to filter by.
-			$latest_event = intval( $this->time_max );
-			if ( $latest_event > 0 ) {
+			$latest_event = intval($this->time_max);
+			if ($latest_event > 0) {
 				$timeMax = Carbon::now();
-				if ( ! empty( $timezone ) ) {
-					$timeMax->setTimezone( $timezone );
+				if ( ! empty($timezone)) {
+					$timeMax->setTimezone($timezone);
 				}
-				$timeMax->setTimestamp( $latest_event );
+				$timeMax->setTimestamp($latest_event);
 				$args['timeMax'] = $timeMax->toRfc3339String();
 			}
 
 			// Query events in calendar.
-			$response = $google->events->listEvents( $id, $args );
+			$response = $google->events->listEvents($id, $args);
 
-			if ( $response instanceof \Google_Service_Calendar_Events ) {
+			if ($response instanceof \Google_Service_Calendar_Events) {
 				$calendar = array(
 					'id'            => $id,
 					'title'         => $response->getSummary(),
 					'description'   => $response->getDescription(),
 					'timezone'      => $response->getTimeZone(),
-					'url'           => esc_url( '//www.google.com/calendar/embed?src=' . $id ),
+					'url'           => esc_url('//www.google.com/calendar/embed?src='.$id),
 					'events'        => $response->getItems(),
 				);
 			}
@@ -409,10 +409,10 @@ 
 	private function get_client() {
 
 		$client = new \Google_Client();
-		$client->setApplicationName( 'Simple Calendar' );
-		$client->setScopes( $this->google_client_scopes );
-		$client->setDeveloperKey( $this->google_api_key );
-		$client->setAccessType( 'online' );
+		$client->setApplicationName('Simple Calendar');
+		$client->setScopes($this->google_client_scopes);
+		$client->setDeveloperKey($this->google_api_key);
+		$client->setAccessType('online');
 
 		return $client;
 	}
@@ -426,7 +426,7 @@ 
 	 * @return null|\Google_Service_Calendar
 	 */
 	protected function get_service() {
-		return $this->google_client instanceof \Google_Client ? new \Google_Service_Calendar( $this->google_client ) : null;
+		return $this->google_client instanceof \Google_Client ? new \Google_Service_Calendar($this->google_client) : null;
 	}
 
 }

includes/feeds/grouped-calendars.php

Spacing +46 added lines, -46 removed lines

@@ -10,7 +10,7 @@ 
 use SimpleCalendar\Abstracts\Feed;
 use SimpleCalendar\Feeds\Admin\Grouped_Calendars_Admin;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -38,22 +38,22 @@ 
 	 *
 	 * @param string|Calendar $calendar
 	 */
-	public function __construct( $calendar = '' ) {
+	public function __construct($calendar = '') {
 
-		parent::__construct( $calendar );
+		parent::__construct($calendar);
 
 		$this->type = 'grouped-calendars';
-		$this->name = __( 'Grouped Calendar', 'google-calendar-events' );
+		$this->name = __('Grouped Calendar', 'google-calendar-events');
 
-		if ( $this->post_id > 0 ) {
+		if ($this->post_id > 0) {
 			$this->set_source();
-			if ( ! is_admin() || defined( 'DOING_AJAX' ) ) {
+			if ( ! is_admin() || defined('DOING_AJAX')) {
 				$this->events = $this->get_events();
 			}
 		}
 
-		if ( is_admin() && ! defined( 'DOING_AJAX' ) ) {
-			new Grouped_Calendars_Admin( $this );
+		if (is_admin() && ! defined('DOING_AJAX')) {
+			new Grouped_Calendars_Admin($this);
 		}
 	}
 
@@ -64,38 +64,38 @@ 
 	 *
 	 * @param array $ids Array of calendar ids.
 	 */
-	public function set_source( $ids = array() ) {
+	public function set_source($ids = array()) {
 
-		$source = get_post_meta( $this->post_id, '_grouped_calendars_source', true );
+		$source = get_post_meta($this->post_id, '_grouped_calendars_source', true);
 
-		if ( 'ids' == $source ) {
+		if ('ids' == $source) {
 
-			if ( empty( $ids ) ) {
-				$ids = get_post_meta( $this->post_id, '_grouped_calendars_ids', true );
+			if (empty($ids)) {
+				$ids = get_post_meta($this->post_id, '_grouped_calendars_ids', true);
 			}
 
-			$this->calendars_ids = ! empty( $ids ) && is_array( $ids ) ? array_map( 'absint', $ids ) : array();
+			$this->calendars_ids = ! empty($ids) && is_array($ids) ? array_map('absint', $ids) : array();
 
-		} elseif ( 'category' == $source ) {
+		} elseif ('category' == $source) {
 
-			$categories = get_post_meta( $this->post_id, '_grouped_calendars_category', true );
+			$categories = get_post_meta($this->post_id, '_grouped_calendars_category', true);
 
-			if ( $categories && is_array( $categories ) ) {
+			if ($categories && is_array($categories)) {
 
 				$tax_query = array(
 					'taxonomy' => 'calendar_category',
 					'field'    => 'term_id',
-					'terms'    => array_map( 'absint', $categories ),
+					'terms'    => array_map('absint', $categories),
 				);
 
-				$calendars = get_posts( array(
+				$calendars = get_posts(array(
 					'post_type' => 'calendar',
-					'tax_query' => array( $tax_query ),
+					'tax_query' => array($tax_query),
 					'nopaging'  => true,
 					'fields'    => 'ids',
-				) );
+				));
 
-				$this->calendars_ids = ! empty( $calendars ) && is_array( $calendars ) ? $calendars : array();
+				$this->calendars_ids = ! empty($calendars) && is_array($calendars) ? $calendars : array();
 			}
 
 		}
@@ -111,40 +111,40 @@ 
 	public function get_events() {
 
 		$ids    = $this->calendars_ids;
-		$events = get_transient( '_simple-calendar_feed_id_' . strval( $this->post_id ) . '_' . $this->type );
+		$events = get_transient('_simple-calendar_feed_id_'.strval($this->post_id).'_'.$this->type);
 
-		if ( empty( $events ) && ! empty( $ids ) && is_array( $ids ) ) {
+		if (empty($events) && ! empty($ids) && is_array($ids)) {
 
 			$events = array();
 
-			foreach ( $ids as $cal_id ) {
+			foreach ($ids as $cal_id) {
 
-				$calendar = simcal_get_calendar( intval( $cal_id ) );
+				$calendar = simcal_get_calendar(intval($cal_id));
 
-				if ( $calendar instanceof Calendar ) {
-					$events = is_array( $calendar->events ) ? $events + $calendar->events : $events;
+				if ($calendar instanceof Calendar) {
+					$events = is_array($calendar->events) ? $events + $calendar->events : $events;
 				}
 
 			}
 
-			if ( ! empty( $events ) ) {
+			if ( ! empty($events)) {
 
 				// Trim events to set the earliest one as specified in feed settings.
-				$earliest_event = intval( $this->time_min );
-				if ( $earliest_event > 0 ) {
-					$events = $this->array_filter_key( $events, array( $this, 'filter_events_before' ) );
+				$earliest_event = intval($this->time_min);
+				if ($earliest_event > 0) {
+					$events = $this->array_filter_key($events, array($this, 'filter_events_before'));
 				}
 
 				// Trim events to set the latest one as specified in feed settings.
-				$latest_event = intval( $this->time_max );
-				if ( $latest_event > 0 ) {
-					$events = $this->array_filter_key( $events, array( $this, 'filter_events_after' ) );
+				$latest_event = intval($this->time_max);
+				if ($latest_event > 0) {
+					$events = $this->array_filter_key($events, array($this, 'filter_events_after'));
 				}
 
 				set_transient(
-					'_simple-calendar_feed_id_' . strval( $this->post_id ) . '_' . $this->type,
+					'_simple-calendar_feed_id_'.strval($this->post_id).'_'.$this->type,
 					$events,
-					absint( $this->cache )
+					absint($this->cache)
 				);
 			}
 
@@ -166,9 +166,9 @@ 
 	 *
 	 * @return array
 	 */
-	private function array_filter_key( array $array, $callback ) {
-		$matched_keys = array_filter( array_keys( $array ), $callback );
-		return array_intersect_key( $array, array_flip( $matched_keys ) );
+	private function array_filter_key(array $array, $callback) {
+		$matched_keys = array_filter(array_keys($array), $callback);
+		return array_intersect_key($array, array_flip($matched_keys));
 	}
 
 	/**
@@ -181,9 +181,9 @@ 
 	 *
 	 * @return bool
 	 */
-	private function filter_events_before( $event ) {
-		if ( $this->time_min !== 0 ) {
-			return intval( $event ) > intval( $this->time_min );
+	private function filter_events_before($event) {
+		if ($this->time_min !== 0) {
+			return intval($event) > intval($this->time_min);
 		}
 		return true;
 	}
@@ -198,9 +198,9 @@ 
 	 *
 	 * @return bool
 	 */
-	private function filter_events_after( $event ) {
-		if ( $this->time_max !== 0 ) {
-			return intval( $event ) < intval( $this->time_max );
+	private function filter_events_after($event) {
+		if ($this->time_max !== 0) {
+			return intval($event) < intval($this->time_max);
 		}
 		return true;
 	}

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

Spacing +105 added lines, -105 removed lines

@@ -6,7 +6,7 @@ 
  */
 namespace SimpleCalendar\Calendars\Admin;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -24,10 +24,10 @@ 
 	 */
 	public function __construct() {
 
-		if ( simcal_is_admin_screen() !== false ) {
-			add_action( 'simcal_settings_meta_calendar_panel', array( $this, 'add_settings_meta_calendar_panel' ), 10, 1 );
+		if (simcal_is_admin_screen() !== false) {
+			add_action('simcal_settings_meta_calendar_panel', array($this, 'add_settings_meta_calendar_panel'), 10, 1);
 		}
-		add_action( 'simcal_process_settings_meta', array( $this, 'process_meta' ), 10, 1 );
+		add_action('simcal_process_settings_meta', array($this, 'process_meta'), 10, 1);
 	}
 
 	/**
@@ -76,12 +76,12 @@ 
 	 *
 	 * @param int $post_id
 	 */
-	public function add_settings_meta_calendar_panel( $post_id ) {
+	public function add_settings_meta_calendar_panel($post_id) {
 
 		?>
 		<table id="default-calendar-settings">
 			<thead>
-			<tr><th colspan="2"><?php _e( 'Default calendar', 'google-calendar-events' ); ?></th></tr>
+			<tr><th colspan="2"><?php _e('Default calendar', 'google-calendar-events'); ?></th></tr>
 			</thead>
 			<tbody class="simcal-panel-section">
 
@@ -89,46 +89,46 @@ 
 				<th></th>
 				<td>
 					<p class="description">
-						<?php _e( "Tip: If calendar styles appear to be missing and/or navigation isn't working, try going to", 'google-calendar-events' ); ?>
-						<a href="<?php echo esc_url( add_query_arg( array ( 'page' => 'simple-calendar_settings', 'tab' => 'advanced' ), admin_url( 'admin.php' ) ) ); ?>">
-							<?php _e( 'Calendars &rarr; Settings &rarr; Advanced', 'google-calendar-events' ); ?></a>
-						<?php _e( 'and enable', 'google-calendar-events' ); ?> <strong><?php _e( 'Always Enqueue', 'google-calendar-events' ); ?></strong>.
+						<?php _e("Tip: If calendar styles appear to be missing and/or navigation isn't working, try going to", 'google-calendar-events'); ?>
+						<a href="<?php echo esc_url(add_query_arg(array('page' => 'simple-calendar_settings', 'tab' => 'advanced'), admin_url('admin.php'))); ?>">
+							<?php _e('Calendars &rarr; Settings &rarr; Advanced', 'google-calendar-events'); ?></a>
+						<?php _e('and enable', 'google-calendar-events'); ?> <strong><?php _e('Always Enqueue', 'google-calendar-events'); ?></strong>.
 					</p>
 				</td>
 			</tr>
 			
 			<tr class="simcal-panel-field simcal-default-calendar-grid" style="display: none;">
-				<th><label for="_default_calendar_event_bubbles_action"><?php _e( 'Event bubbles', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_event_bubbles_action"><?php _e('Event bubbles', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$bubbles = get_post_meta( $post_id, '_default_calendar_event_bubble_trigger', true );
+					$bubbles = get_post_meta($post_id, '_default_calendar_event_bubble_trigger', true);
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'radio',
 						'inline'  => 'inline',
 						'name'    => '_default_calendar_event_bubble_trigger',
 						'id'      => '_default_calendar_event_bubble_trigger',
-						'tooltip' => __( 'Open event bubbles in calendar grid by clicking or hovering on event titles. On mobile devices it will always default to tapping.', 'google-calendar-events' ),
+						'tooltip' => __('Open event bubbles in calendar grid by clicking or hovering on event titles. On mobile devices it will always default to tapping.', 'google-calendar-events'),
 						'value'   => $bubbles ? $bubbles : 'hover',
 						'default' => 'hover',
 						'options' => array(
-							'click' => __( 'Click', 'google-calendar-events' ),
-							'hover' => __( 'Hover', 'google-calendar-events' ),
+							'click' => __('Click', 'google-calendar-events'),
+							'hover' => __('Hover', 'google-calendar-events'),
 						),
-					) );
+					));
 
 					?>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field simcal-default-calendar-grid" style="display: none;">
-				<th><label for="_default_calendar_trim_titles"><?php _e( 'Trim event titles', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_trim_titles"><?php _e('Trim event titles', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$trim = get_post_meta( $post_id, '_default_calendar_trim_titles', true );
+					$trim = get_post_meta($post_id, '_default_calendar_trim_titles', true);
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'        => 'checkbox',
 						'name'        => '_default_calendar_trim_titles',
 						'id'          => '_default_calendar_trim_titles',
@@ -139,34 +139,34 @@ 
 						'attributes'  => array(
 							'data-show-next-if-value' => 'yes',
 						),
-					) );
+					));
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'       => 'standard',
 						'subtype'    => 'number',
 						'name'       => '_default_calendar_trim_titles_chars',
 						'id'         => '_default_calendar_trim_titles_chars',
-						'tooltip'    => __( 'Shorten event titles in calendar grid to a specified length in characters.', 'google-calendar-events' ),
+						'tooltip'    => __('Shorten event titles in calendar grid to a specified length in characters.', 'google-calendar-events'),
 						'class'      => array(
 							'simcal-field-tiny',
 						),
-						'value'      => 'yes' == $trim ? strval( max( absint( get_post_meta( $post_id, '_default_calendar_trim_titles_chars', true ) ), 1 ) ) : '20',
+						'value'      => 'yes' == $trim ? strval(max(absint(get_post_meta($post_id, '_default_calendar_trim_titles_chars', true)), 1)) : '20',
 						'attributes' => array(
 							'min'     => '1',
 						),
-					) );
+					));
 
 					?>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field simcal-default-calendar-list" style="display: none;">
-				<th><label for="_default_calendar_list_grouped_span"><?php _e( 'Span', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_list_grouped_span"><?php _e('Span', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$list_span = max( absint( get_post_meta( $post_id, '_default_calendar_list_range_span', true ) ), 1 );
+					$list_span = max(absint(get_post_meta($post_id, '_default_calendar_list_range_span', true)), 1);
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'standard',
 						'subtype' => 'number',
 						'name'    => '_default_calendar_list_range_span',
@@ -175,78 +175,78 @@ 
 							'simcal-field-tiny',
 							'simcal-field-inline',
 						),
-						'value'   => strval( $list_span ),
+						'value'   => strval($list_span),
 						'attributes'  => array(
 							'min' => '1',
 						),
-					) );
+					));
 
-					$list_type = get_post_meta( $post_id, '_default_calendar_list_range_type', true );
+					$list_type = get_post_meta($post_id, '_default_calendar_list_range_type', true);
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'select',
 						'name'    => '_default_calendar_list_range_type',
 						'id'      => '_default_calendar_list_range_type',
-						'tooltip' => __( 'Range of events to show on each calendar page.', 'google-calendar-events' ),
+						'tooltip' => __('Range of events to show on each calendar page.', 'google-calendar-events'),
 						'class'   => array(
 							'simcal-field-inline',
 						),
 						'value'   => $list_type,
 						'options' => array(
-							'monthly' => __( 'Month(s)', 'google-calendar-events' ),
-							'weekly'  => __( 'Week(s)', 'google-calendar-events' ),
-							'daily'   => __( 'Day(s)', 'google-calendar-events' ),
-							'events'  => __( 'Event(s)', 'google-calendar-events' ),
+							'monthly' => __('Month(s)', 'google-calendar-events'),
+							'weekly'  => __('Week(s)', 'google-calendar-events'),
+							'daily'   => __('Day(s)', 'google-calendar-events'),
+							'events'  => __('Event(s)', 'google-calendar-events'),
 						),
-					) );
+					));
 
 					?>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field simcal-default-calendar-list" style="display: none;">
-				<th><label for="_default_calendar_list_header"><?php _e( 'Hide header', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_list_header"><?php _e('Hide header', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$header = get_post_meta( $post_id, '_default_calendar_list_header', true );
+					$header = get_post_meta($post_id, '_default_calendar_list_header', true);
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'checkbox',
 						'name'    => '_default_calendar_list_header',
 						'id'      => '_default_calendar_list_header',
-						'tooltip' => __( 'You can use this to hide the month header for this calendar.', 'google-calendar-events' ),
+						'tooltip' => __('You can use this to hide the month header for this calendar.', 'google-calendar-events'),
 						'value'   => 'yes' == $header ? 'yes' : 'no',
-					) );
+					));
 
 					?>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field simcal-default-calendar-list" style="display: none;">
-				<th><label for="_default_calendar_compact_list"><?php _e( 'Compact list', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_compact_list"><?php _e('Compact list', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$compact = get_post_meta( $post_id, '_default_calendar_compact_list', true );
+					$compact = get_post_meta($post_id, '_default_calendar_compact_list', true);
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'checkbox',
 						'name'    => '_default_calendar_compact_list',
 						'id'      => '_default_calendar_compact_list',
-						'tooltip' => __( 'Make an events list more compact by grouping together events from different days in a single list.', 'google-calendar-events' ),
+						'tooltip' => __('Make an events list more compact by grouping together events from different days in a single list.', 'google-calendar-events'),
 						'value'   => 'yes' == $compact ? 'yes' : 'no',
-					) );
+					));
 
 					?>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field simcal-default-calendar-grid simcal-default-calendar-list"  style="display: none;">
-				<th><label for="_default_calendar_limit_visible_events"><?php _e( 'Limit visible events', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_limit_visible_events"><?php _e('Limit visible events', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$limit = get_post_meta( $post_id, '_default_calendar_limit_visible_events', true );
+					$limit = get_post_meta($post_id, '_default_calendar_limit_visible_events', true);
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'        => 'checkbox',
 						'name'        => '_default_calendar_limit_visible_events',
 						'id'          => '_default_calendar_limit_visible_events',
@@ -257,17 +257,17 @@ 
 						'attributes'  => array(
 							'data-show-next-if-value' => 'yes',
 						)
-					) );
+					));
 
-					$visible_events = absint( get_post_meta( $post_id, '_default_calendar_visible_events', true ) );
+					$visible_events = absint(get_post_meta($post_id, '_default_calendar_visible_events', true));
 					$visible_events = $visible_events > 0 ? $visible_events : 3;
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'       => 'standard',
 						'subtype'    => 'number',
 						'name'       => '_default_calendar_visible_events',
 						'id'         => '_default_calendar_visible_events',
-						'tooltip'    => __( 'Limit the number of initial visible events on each day to a set maximum.', 'google-calendar-events' ),
+						'tooltip'    => __('Limit the number of initial visible events on each day to a set maximum.', 'google-calendar-events'),
 						'class'      => array(
 							'simcal-field-tiny',
 						),
@@ -275,23 +275,23 @@ 
 						'attributes' => array(
 							'min'     => '1',
 						)
-					) );
+					));
 
 					?>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field simcal-default-calendar-grid simcal-default-calendar-list" style="display: none;">
-				<th><label for="_default_calendar_event_bubbles_action"><?php _e( 'Expand multi day events', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_event_bubbles_action"><?php _e('Expand multi day events', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'checkbox',
 						'name'    => '_default_calendar_expand_multi_day_events',
 						'id'      => '_default_calendar_expand_multi_day_events',
-						'tooltip' => __( 'Show events spanning multiple days on each day.', 'google-calendar-events' ),
-						'value'   => get_post_meta( $post_id, '_default_calendar_expand_multi_day_events', true ),
-					) );
+						'tooltip' => __('Show events spanning multiple days on each day.', 'google-calendar-events'),
+						'value'   => get_post_meta($post_id, '_default_calendar_expand_multi_day_events', true),
+					));
 
 					?>
 				</td>
@@ -299,70 +299,70 @@ 
 			</tbody>
 			<?php
 
-			$settings                   = get_option( 'simple-calendar_settings_calendars' );
-			$default_theme              = isset( $settings['default-calendar']['theme'] ) ? $settings['default-calendar']['theme'] : 'light';
+			$settings                   = get_option('simple-calendar_settings_calendars');
+			$default_theme              = isset($settings['default-calendar']['theme']) ? $settings['default-calendar']['theme'] : 'light';
 			$default_today_color        = /*isset( $settings['default-calendar']['today_color'] ) ? $settings['default-calendar']['today_color'] :*/ '#1e73be';
 			$default_days_events_color  = /*isset( $settings['default-calendar']['days_events_color'] ) ? $settings['default-calendar']['days_events_color'] :*/ '#000000';
 
 			?>
 			<tbody class="simcal-panel-section">
 			<tr class="simcal-panel-field simcal-default-calendar-grid simcal-default-calendar-list" style="display: none;">
-				<th><label for="_default_calendar_style_theme"><?php _e( 'Theme', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_style_theme"><?php _e('Theme', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$saved = get_post_meta( $post_id, '_default_calendar_style_theme', true );
+					$saved = get_post_meta($post_id, '_default_calendar_style_theme', true);
 					$value = ! $saved ? $default_theme : $saved;
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'select',
 						'name'    => '_default_calendar_style_theme',
 						'id'      => '_default_calendar_style_theme',
 						'value'   => $value,
-						'tooltip' => __( 'Choose a calendar theme to match your site theme.', 'google-calendar-events' ),
+						'tooltip' => __('Choose a calendar theme to match your site theme.', 'google-calendar-events'),
 						'options' => array(
-							'light' => __( 'Light', 'google-calendar-events' ),
-							'dark' => __( 'Dark', 'google-calendar-events' ),
+							'light' => __('Light', 'google-calendar-events'),
+							'dark' => __('Dark', 'google-calendar-events'),
 						),
-					) );
+					));
 
 					?>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field simcal-default-calendar-grid simcal-default-calendar-list" style="display: none;">
-				<th><label for="_default_calendar_style_today"><?php _e( 'Today', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_style_today"><?php _e('Today', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$saved = get_post_meta( $post_id, '_default_calendar_style_today', true );
+					$saved = get_post_meta($post_id, '_default_calendar_style_today', true);
 					$value = ! $saved ? $default_today_color : $saved;
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'standard',
 						'subtype' => 'color-picker',
 						'name'    => '_default_calendar_style_today',
 						'id'      => '_default_calendar_style_today',
 						'value'   => $value,
-					) );
+					));
 
 					?>
 				</td>
 			</tr>
 			<tr class="simcal-panel-field simcal-default-calendar-grid simcal-default-calendar-list" style="display: none;">
-				<th><label for="_default_calendar_style_days_events"><?php _e( 'Days with events', 'google-calendar-events' ); ?></label></th>
+				<th><label for="_default_calendar_style_days_events"><?php _e('Days with events', 'google-calendar-events'); ?></label></th>
 				<td>
 					<?php
 
-					$saved = get_post_meta( $post_id, '_default_calendar_style_days_events', true );
+					$saved = get_post_meta($post_id, '_default_calendar_style_days_events', true);
 					$value = ! $saved ? $default_days_events_color : $saved;
 
-					simcal_print_field( array(
+					simcal_print_field(array(
 						'type'    => 'standard',
 						'subtype' => 'color-picker',
 						'name'    => '_default_calendar_style_days_events',
 						'id'      => '_default_calendar_style_days_events',
 						'value'   => $value,
-					) );
+					));
 
 					?>
 				</td>
@@ -384,55 +384,55 @@ 
 	 *
 	 * @param int $post_id
 	 */
-	public function process_meta( $post_id ) {
+	public function process_meta($post_id) {
 
 		// Theme.
-		$theme = isset( $_POST['_default_calendar_style_theme'] ) ? sanitize_key( $_POST['_default_calendar_style_theme'] ) : 'light';
-		update_post_meta( $post_id, '_default_calendar_style_theme', $theme );
+		$theme = isset($_POST['_default_calendar_style_theme']) ? sanitize_key($_POST['_default_calendar_style_theme']) : 'light';
+		update_post_meta($post_id, '_default_calendar_style_theme', $theme);
 
 		// Today color.
-		$today_color = isset( $_POST['_default_calendar_style_today'] ) ? sanitize_text_field( $_POST['_default_calendar_style_today'] ) : '#FF000';
-		update_post_meta( $post_id, '_default_calendar_style_today', $today_color );
+		$today_color = isset($_POST['_default_calendar_style_today']) ? sanitize_text_field($_POST['_default_calendar_style_today']) : '#FF000';
+		update_post_meta($post_id, '_default_calendar_style_today', $today_color);
 
 		// Days with events color.
-		$days_events_color = isset( $_POST['_default_calendar_style_days_events'] ) ? sanitize_text_field( $_POST['_default_calendar_style_days_events'] ) : '#000000';
-		update_post_meta( $post_id, '_default_calendar_style_days_events', $days_events_color );
+		$days_events_color = isset($_POST['_default_calendar_style_days_events']) ? sanitize_text_field($_POST['_default_calendar_style_days_events']) : '#000000';
+		update_post_meta($post_id, '_default_calendar_style_days_events', $days_events_color);
 
 		// List range span.
-		$span = isset( $_POST['_default_calendar_list_range_span'] ) ? max( absint( $_POST['_default_calendar_list_range_span'] ), 1 ) : 1;
-		update_post_meta( $post_id, '_default_calendar_list_range_span', $span );
+		$span = isset($_POST['_default_calendar_list_range_span']) ? max(absint($_POST['_default_calendar_list_range_span']), 1) : 1;
+		update_post_meta($post_id, '_default_calendar_list_range_span', $span);
 
 		// List range type.
-		$group = isset( $_POST['_default_calendar_list_range_type'] ) ? sanitize_key( $_POST['_default_calendar_list_range_type'] ) : 'monthly';
-		update_post_meta( $post_id, '_default_calendar_list_range_type', $group );
+		$group = isset($_POST['_default_calendar_list_range_type']) ? sanitize_key($_POST['_default_calendar_list_range_type']) : 'monthly';
+		update_post_meta($post_id, '_default_calendar_list_range_type', $group);
 
 		// Hide header.
-		$header = isset( $_POST['_default_calendar_list_header'] ) ? 'yes' : 'no';
-		update_post_meta( $post_id, '_default_calendar_list_header', $header );
+		$header = isset($_POST['_default_calendar_list_header']) ? 'yes' : 'no';
+		update_post_meta($post_id, '_default_calendar_list_header', $header);
 
 		// Compact list.
-		$compact = isset( $_POST['_default_calendar_compact_list'] ) ? 'yes' : 'no';
-		update_post_meta( $post_id, '_default_calendar_compact_list', $compact );
+		$compact = isset($_POST['_default_calendar_compact_list']) ? 'yes' : 'no';
+		update_post_meta($post_id, '_default_calendar_compact_list', $compact);
 
 		// Limit number of initially visible daily events.
-		$limit = isset( $_POST['_default_calendar_limit_visible_events'] ) ? 'yes' : 'no';
-		update_post_meta( $post_id, '_default_calendar_limit_visible_events', $limit );
-		$number = isset( $_POST['_default_calendar_visible_events'] ) ? absint( $_POST['_default_calendar_visible_events'] ) : 3;
-		update_post_meta( $post_id, '_default_calendar_visible_events', $number );
+		$limit = isset($_POST['_default_calendar_limit_visible_events']) ? 'yes' : 'no';
+		update_post_meta($post_id, '_default_calendar_limit_visible_events', $limit);
+		$number = isset($_POST['_default_calendar_visible_events']) ? absint($_POST['_default_calendar_visible_events']) : 3;
+		update_post_meta($post_id, '_default_calendar_visible_events', $number);
 
 		// Grid event bubbles action.
-		$bubbles = isset( $_POST['_default_calendar_event_bubble_trigger'] ) ? esc_attr( $_POST['_default_calendar_event_bubble_trigger'] ) : 'hover';
-		update_post_meta( $post_id, '_default_calendar_event_bubble_trigger', $bubbles );
+		$bubbles = isset($_POST['_default_calendar_event_bubble_trigger']) ? esc_attr($_POST['_default_calendar_event_bubble_trigger']) : 'hover';
+		update_post_meta($post_id, '_default_calendar_event_bubble_trigger', $bubbles);
 
 		// Trim event titles characters length.
-		$trim = isset( $_POST['_default_calendar_trim_titles'] ) ? 'yes' : 'no';
-		update_post_meta( $post_id, '_default_calendar_trim_titles', $trim );
-		$chars = isset( $_POST['_default_calendar_trim_titles_chars'] ) ? max( absint( $_POST['_default_calendar_trim_titles_chars'] ), 1 ) : 20;
-		update_post_meta( $post_id, '_default_calendar_trim_titles_chars', $chars );
+		$trim = isset($_POST['_default_calendar_trim_titles']) ? 'yes' : 'no';
+		update_post_meta($post_id, '_default_calendar_trim_titles', $trim);
+		$chars = isset($_POST['_default_calendar_trim_titles_chars']) ? max(absint($_POST['_default_calendar_trim_titles_chars']), 1) : 20;
+		update_post_meta($post_id, '_default_calendar_trim_titles_chars', $chars);
 
 		// Expand multiple day events on each day.
-		$multi_day = isset( $_POST['_default_calendar_expand_multi_day_events'] ) ? 'yes' : 'no';
-		update_post_meta( $post_id, '_default_calendar_expand_multi_day_events', $multi_day );
+		$multi_day = isset($_POST['_default_calendar_expand_multi_day_events']) ? 'yes' : 'no';
+		update_post_meta($post_id, '_default_calendar_expand_multi_day_events', $multi_day);
 
 	}
 

includes/admin/welcome.php

Spacing +69 added lines, -69 removed lines

@@ -8,7 +8,7 @@ 
  */
 namespace SimpleCalendar\Admin;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -36,10 +36,10 @@ 
 	 */
 	public function __construct() {
 
-		$this->install = isset( $_GET['simcal_install'] ) ? esc_attr( $_GET['simcal_install'] ) : '';
+		$this->install = isset($_GET['simcal_install']) ? esc_attr($_GET['simcal_install']) : '';
 
-		add_action( 'admin_menu', array( $this, 'welcome_page_tabs' ) );
-		add_action( 'admin_head', array( $this, 'remove_submenu_pages' ) );
+		add_action('admin_menu', array($this, 'welcome_page_tabs'));
+		add_action('admin_head', array($this, 'remove_submenu_pages'));
 	}
 
 	/**
@@ -49,12 +49,12 @@ 
 	 */
 	public function welcome_page_tabs() {
 
-		$welcome_page_name  = __( 'About Simple Calendar', 'google-calendar-events' );
-		$welcome_page_title = __( 'Welcome to Simple Calendar', 'google-calendar-events' );
+		$welcome_page_name  = __('About Simple Calendar', 'google-calendar-events');
+		$welcome_page_title = __('Welcome to Simple Calendar', 'google-calendar-events');
 
-		$page = isset( $_GET['page'] ) ? $_GET['page'] : 'simple-calendar_about';
+		$page = isset($_GET['page']) ? $_GET['page'] : 'simple-calendar_about';
 
-		switch ( $page ) {
+		switch ($page) {
 
 			case 'simple-calendar_about' :
 				$page = add_dashboard_page(
@@ -62,9 +62,9 @@ 
 					$welcome_page_name,
 					'manage_options',
 					'simple-calendar_about',
-					array( $this, 'about_screen' )
+					array($this, 'about_screen')
 				);
-				add_action( 'admin_print_styles-' . $page, array( $this, 'styles' ) );
+				add_action('admin_print_styles-'.$page, array($this, 'styles'));
 				break;
 
 			case 'simple-calendar_credits' :
@@ -73,9 +73,9 @@ 
 					$welcome_page_name,
 					'manage_options',
 					'simple-calendar_credits',
-					array( $this, 'credits_screen' )
+					array($this, 'credits_screen')
 				);
-				add_action( 'admin_print_styles-' . $page, array( $this, 'styles' ) );
+				add_action('admin_print_styles-'.$page, array($this, 'styles'));
 				break;
 
 			case 'simple-calendar_translators' :
@@ -84,9 +84,9 @@ 
 					$welcome_page_name,
 					'manage_options',
 					'simple-calendar_translators',
-					array( $this, 'translators_screen' )
+					array($this, 'translators_screen')
 				);
-				add_action( 'admin_print_styles-' . $page, array( $this, 'styles' ) );
+				add_action('admin_print_styles-'.$page, array($this, 'styles'));
 				break;
 		}
 
@@ -98,9 +98,9 @@ 
 	 * @since 3.0.0
 	 */
 	public function remove_submenu_pages() {
-		remove_submenu_page( 'index.php', 'simple-calendar_about' );
-		remove_submenu_page( 'index.php', 'simple-calendar_credits' );
-		remove_submenu_page( 'index.php', 'simple-calendar_translators' );
+		remove_submenu_page('index.php', 'simple-calendar_about');
+		remove_submenu_page('index.php', 'simple-calendar_credits');
+		remove_submenu_page('index.php', 'simple-calendar_translators');
 	}
 
 	/**
@@ -129,18 +129,18 @@ 
 
 		?>
 		<p>
-			<a href="<?php echo admin_url( 'edit.php?post_type=calendar' ); ?>"
+			<a href="<?php echo admin_url('edit.php?post_type=calendar'); ?>"
 			   class="button button-primary"
-				><?php _e( 'Calendars', 'google-calendar-events' ); ?></a>
-			<a href="<?php echo esc_url( add_query_arg( 'page', 'simple-calendar_settings', admin_url( 'admin.php' ) ) ); ?>"
+				><?php _e('Calendars', 'google-calendar-events'); ?></a>
+			<a href="<?php echo esc_url(add_query_arg('page', 'simple-calendar_settings', admin_url('admin.php'))); ?>"
 			   class="button button-primary"
-				><?php _e( 'Settings', 'google-calendar-events' ); ?></a>
-			<a href="<?php echo simcal_ga_campaign_url( simcal_get_url( 'add-ons' ), 'core-plugin', 'welcome-page' ); ?>"
+				><?php _e('Settings', 'google-calendar-events'); ?></a>
+			<a href="<?php echo simcal_ga_campaign_url(simcal_get_url('add-ons'), 'core-plugin', 'welcome-page'); ?>"
 			   class="docs button button-primary" target="_blank"
-				><?php _e( 'Add-ons', 'google-calendar-events' ); ?></a>
-			<a href="<?php echo simcal_ga_campaign_url( simcal_get_url( 'docs' ), 'core-plugin', 'welcome-page' ); ?>"
+				><?php _e('Add-ons', 'google-calendar-events'); ?></a>
+			<a href="<?php echo simcal_ga_campaign_url(simcal_get_url('docs'), 'core-plugin', 'welcome-page'); ?>"
 			   class="docs button button-primary" target="_blank"
-				><?php _e( 'Documentation', 'google-calendar-events' ); ?></a>
+				><?php _e('Documentation', 'google-calendar-events'); ?></a>
 		</p>
 		<?php
 
@@ -157,7 +157,7 @@ 
 		<h1>
 			<?php
 			/* translators: %s prints the current version of the plugin. */
-			printf( __( 'Welcome to Simple Calendar %s', 'google-calendar-events' ), SIMPLE_CALENDAR_VERSION );
+			printf(__('Welcome to Simple Calendar %s', 'google-calendar-events'), SIMPLE_CALENDAR_VERSION);
 			?>
 		</h1>
 
@@ -165,16 +165,16 @@ 
 			<?php
 
 			// Difference message if updating vs fresh install.
-			if ( 'update' == $this->install ) {
-				$message = __( 'Thanks for updating to the latest version!', 'google-calendar-events' );
+			if ('update' == $this->install) {
+				$message = __('Thanks for updating to the latest version!', 'google-calendar-events');
 			} else {
-				$message = __( 'Thanks for installing!', 'google-calendar-events' );
+				$message = __('Thanks for installing!', 'google-calendar-events');
 			}
 
 			echo $message;
 
 			/* translators: %s prints the current version of the plugin. */
-			printf( ' ' . __( "Simple Calendar %s has many new display options and is much easier to configure. We think you'll really enjoy using it.", 'google-calendar-events' ), SIMPLE_CALENDAR_VERSION );
+			printf(' '.__("Simple Calendar %s has many new display options and is much easier to configure. We think you'll really enjoy using it.", 'google-calendar-events'), SIMPLE_CALENDAR_VERSION);
 
 			?>
 		</div>
@@ -184,21 +184,21 @@ 
 		<?php $this->main_nav_links(); ?>
 
 		<h2 class="nav-tab-wrapper">
-			<a class="nav-tab <?php if ( $_GET['page'] == 'simple-calendar_about' ) {
+			<a class="nav-tab <?php if ($_GET['page'] == 'simple-calendar_about') {
 				echo 'nav-tab-active';
 			} ?>"
-			   href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'simple-calendar_about' ), 'index.php' ) ) ); ?>"
-				><?php _e( "What's New", 'google-calendar-events' ); ?></a>
-			<a class="nav-tab <?php if ( $_GET['page'] == 'simple-calendar_credits' ) {
+			   href="<?php echo esc_url(admin_url(add_query_arg(array('page' => 'simple-calendar_about'), 'index.php'))); ?>"
+				><?php _e("What's New", 'google-calendar-events'); ?></a>
+			<a class="nav-tab <?php if ($_GET['page'] == 'simple-calendar_credits') {
 				echo 'nav-tab-active';
 			} ?>"
-			   href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'simple-calendar_credits' ), 'index.php' ) ) ); ?>"
-				><?php _e( 'Credits', 'google-calendar-events' ); ?></a>
-			<a class="nav-tab <?php if ( $_GET['page'] == 'simple-calendar_translators' ) {
+			   href="<?php echo esc_url(admin_url(add_query_arg(array('page' => 'simple-calendar_credits'), 'index.php'))); ?>"
+				><?php _e('Credits', 'google-calendar-events'); ?></a>
+			<a class="nav-tab <?php if ($_GET['page'] == 'simple-calendar_translators') {
 				echo 'nav-tab-active';
 			} ?>"
-			   href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'simple-calendar_translators' ), 'index.php' ) ) ); ?>"
-				><?php _e( 'Translators', 'google-calendar-events' ); ?></a>
+			   href="<?php echo esc_url(admin_url(add_query_arg(array('page' => 'simple-calendar_translators'), 'index.php'))); ?>"
+				><?php _e('Translators', 'google-calendar-events'); ?></a>
 		</h2>
 		<?php
 
@@ -210,8 +210,8 @@ 
 	 * @since 3.0.0
 	 */
 	public function about_screen() {
-		$welcome_image_about_path = SIMPLE_CALENDAR_ASSETS . '/images/welcome';
-		$welcome_gcal_pro_link = simcal_ga_campaign_url( simcal_get_url( 'gcal-pro' ), 'core-plugin', 'welcome-page' );
+		$welcome_image_about_path = SIMPLE_CALENDAR_ASSETS.'/images/welcome';
+		$welcome_gcal_pro_link = simcal_ga_campaign_url(simcal_get_url('gcal-pro'), 'core-plugin', 'welcome-page');
 
 		?>
 		<div id="simcal-welcome">
@@ -219,18 +219,18 @@ 
 
 				<?php $this->intro(); ?>
 
-				<h3><?php _e( 'Modern calendar displays with easily updateable event text and color options.', 'google-calendar-events' ); ?></h3>
-				<img src="<?php echo $welcome_image_about_path . '/grid-view-custom-colors.png'; ?>" />
+				<h3><?php _e('Modern calendar displays with easily updateable event text and color options.', 'google-calendar-events'); ?></h3>
+				<img src="<?php echo $welcome_image_about_path.'/grid-view-custom-colors.png'; ?>" />
 
-				<h3><?php _e( 'Mobile responsive and widget ready.', 'google-calendar-events' ); ?></h3>
-				<img src="<?php echo $welcome_image_about_path . '/list-view-widget.png'; ?>" />
-				<img src="<?php echo $welcome_image_about_path . '/grid-view-widget-dark-theme.png'; ?>" />
+				<h3><?php _e('Mobile responsive and widget ready.', 'google-calendar-events'); ?></h3>
+				<img src="<?php echo $welcome_image_about_path.'/list-view-widget.png'; ?>" />
+				<img src="<?php echo $welcome_image_about_path.'/grid-view-widget-dark-theme.png'; ?>" />
 
-				<h3><?php _e( 'Simpler, more intuitive calendar settings.', 'google-calendar-events' ); ?></h3>
-				<img src="<?php echo $welcome_image_about_path . '/calendar-settings-appearance.png'; ?>" />
+				<h3><?php _e('Simpler, more intuitive calendar settings.', 'google-calendar-events'); ?></h3>
+				<img src="<?php echo $welcome_image_about_path.'/calendar-settings-appearance.png'; ?>" />
 
-				<h3><?php echo sprintf( __( 'Extendible with add-ons like <a href="%s" target="_blank">Google Calendar Pro</a>.', 'google-calendar-events' ), $welcome_gcal_pro_link ); ?></h3>
-				<a href="<?php echo $welcome_gcal_pro_link; ?>" target="_blank"><img src="<?php echo $welcome_image_about_path . '/google-calendar-pro-list-view-annotated.png'; ?>" /></a>
+				<h3><?php echo sprintf(__('Extendible with add-ons like <a href="%s" target="_blank">Google Calendar Pro</a>.', 'google-calendar-events'), $welcome_gcal_pro_link); ?></h3>
+				<a href="<?php echo $welcome_gcal_pro_link; ?>" target="_blank"><img src="<?php echo $welcome_image_about_path.'/google-calendar-pro-list-view-annotated.png'; ?>" /></a>
 
 				<hr/>
 
@@ -257,8 +257,8 @@ 
 					<?php
 
 					printf(
-						__( "Simple Calendar is created by a worldwide team of developers. If you'd like to contribute please visit our <a href='%s' target='_blank'>GitHub repo</a>.", 'google-calendar-events' ),
-						simcal_get_url( 'github' )
+						__("Simple Calendar is created by a worldwide team of developers. If you'd like to contribute please visit our <a href='%s' target='_blank'>GitHub repo</a>.", 'google-calendar-events'),
+						simcal_get_url('github')
 					);
 
 					?>
@@ -282,10 +282,10 @@ 
 			<div class="wrap about-wrap translators-wrap">
 				<?php $this->intro(); ?>
 				<p class="about-description">
-					<?php _e( 'Simple Calendar has been kindly translated into several other languages by contributors from all over the world.', 'google-calendar-events' ); ?>
+					<?php _e('Simple Calendar has been kindly translated into several other languages by contributors from all over the world.', 'google-calendar-events'); ?>
 				</p>
 				<p class="about-description">
-					<a href="https://translate.wordpress.org/projects/wp-plugins/google-calendar-events" target="_blank"><?php _e( 'Click here to help translate', 'google-calendar-events' ); ?></a>
+					<a href="https://translate.wordpress.org/projects/wp-plugins/google-calendar-events" target="_blank"><?php _e('Click here to help translate', 'google-calendar-events'); ?></a>
 				</p>
 				<?php
 
@@ -314,31 +314,31 @@ 
 
 		$contributors = $this->get_contributors();
 
-		if ( empty( $contributors ) ) {
+		if (empty($contributors)) {
 			return '';
 		}
 
 		$contributor_list = '<ul class="wp-people-group">';
 
-		foreach ( $contributors as $contributor ) {
+		foreach ($contributors as $contributor) {
 
 			// Skip contributor bots
-			$contributor_bots = array( 'gitter-badger' );
-			if ( in_array( $contributor->login, $contributor_bots ) ) {
+			$contributor_bots = array('gitter-badger');
+			if (in_array($contributor->login, $contributor_bots)) {
 				continue;
 			}
 
 			$contributor_list .= '<li class="wp-person">';
 			$contributor_list .= sprintf(
 				'<a href="%s" title="%s" target="_blank">%s</a>',
-				esc_url( 'https://github.com/' . $contributor->login ),
-				esc_html( sprintf( __( 'View %s', 'google-calendar-events' ), $contributor->login ) ),
-				sprintf( '<img src="%s" width="64" height="64" class="gravatar" alt="%s" />', esc_url( $contributor->avatar_url ), esc_html( $contributor->login ) )
+				esc_url('https://github.com/'.$contributor->login),
+				esc_html(sprintf(__('View %s', 'google-calendar-events'), $contributor->login)),
+				sprintf('<img src="%s" width="64" height="64" class="gravatar" alt="%s" />', esc_url($contributor->avatar_url), esc_html($contributor->login))
 			);
 			$contributor_list .= sprintf(
 				'<a class="web" href="%s" target="_blank">%s</a>',
-				esc_url( 'https://github.com/' . $contributor->login ),
-				esc_html( $contributor->login )
+				esc_url('https://github.com/'.$contributor->login),
+				esc_html($contributor->login)
 			);
 			$contributor_list .= '</li>';
 
@@ -358,24 +358,24 @@ 
 	 */
 	public function get_contributors() {
 
-		$contributors = get_transient( '_simple-calendar_contributors' );
-		if ( false !== $contributors ) {
+		$contributors = get_transient('_simple-calendar_contributors');
+		if (false !== $contributors) {
 			return $contributors;
 		}
 
 		$response = wp_safe_remote_get(
 			'https://api.github.com/repos/moonstonemedia/Simple-Calendar/contributors'
 		);
-		if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) {
+		if (is_wp_error($response) || 200 != wp_remote_retrieve_response_code($response)) {
 			return array();
 		}
 
-		$contributors = json_decode( wp_remote_retrieve_body( $response ) );
-		if ( ! is_array( $contributors ) ) {
+		$contributors = json_decode(wp_remote_retrieve_body($response));
+		if ( ! is_array($contributors)) {
 			return array();
 		}
 
-		set_transient( '_simple-calendar_contributors', $contributors, HOUR_IN_SECONDS );
+		set_transient('_simple-calendar_contributors', $contributors, HOUR_IN_SECONDS);
 
 		return $contributors;
 	}

includes/events/event-builder.php

Spacing +311 added lines, -311 removed lines

@@ -9,7 +9,7 @@ 
 use Carbon\Carbon;
 use SimpleCalendar\Abstracts\Calendar;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -54,7 +54,7 @@ 
 	 * @param Event    $event
 	 * @param Calendar $calendar
 	 */
-	public function __construct( Event $event, Calendar $calendar ) {
+	public function __construct(Event $event, Calendar $calendar) {
 		$this->event    = $event;
 		$this->calendar = $calendar;
 		$this->tags     = $this->get_content_tags();
@@ -74,84 +74,84 @@ 
 			 * Content Tags *
 			 * ============ */
 
-			'title',                 // The event title.
-			'event-title',           // @deprecated An alias for 'title' tag.
-			'description',           // The event description.
-
-			'when',                  // Date and time of the event.
-			'start-time',            // Start time of the event.
-			'start-date',            // Start date of the event.
-			'start-custom',          // @deprecated Start time in a user defined format (set by tag 'format' attribute).
-			'start-human',           // Start time in a human friendly format.
-			'end-time',              // End time of the event.
-			'end-date',              // End date of the event.
-			'end-custom',            // @deprecated End date-time in a user defined format (set by tag 'format' attribute).
-			'end-human',             // End date-time in a human friendly format.
-
-			'duration',              // How long the events lasts, in a human-readable format.
-			'length',                // @deprecated An alias of 'duration' tag.
-
-			'location',              // Alias of start-location.
-			'start-location',        // Location name where the event starts.
-			'maps-link',             // @deprecated An alias for 'start-location-link' tag.
-			'start-location-link',   // Link to Google Maps querying the event start location address.
-			'end-location',          // Location name where the event ends.
-			'end-location-link',     // Link to Google Maps querying the event end location address.
-
-			'link',                  // An HTML link to the event URL.
-			'url',                   // A string with the raw event link URL.
-
-			'calendar',              // The title of the source calendar.
-			'feed-title',            // @deprecated An alias of 'calendar'.
-
-			'id',                    // The event unique ID.
-			'uid',                   // An alias of ID.
-			'event-id',              // @deprecated An alias for 'id' tag.
-			'calendar-id',           // The calendar ID.
-			'feed-id',               // @deprecated An alias for 'calendar-id' tag.
-			'cal-id',                // @deprecated An alias for 'calendar-id' tag.
+			'title', // The event title.
+			'event-title', // @deprecated An alias for 'title' tag.
+			'description', // The event description.
+
+			'when', // Date and time of the event.
+			'start-time', // Start time of the event.
+			'start-date', // Start date of the event.
+			'start-custom', // @deprecated Start time in a user defined format (set by tag 'format' attribute).
+			'start-human', // Start time in a human friendly format.
+			'end-time', // End time of the event.
+			'end-date', // End date of the event.
+			'end-custom', // @deprecated End date-time in a user defined format (set by tag 'format' attribute).
+			'end-human', // End date-time in a human friendly format.
+
+			'duration', // How long the events lasts, in a human-readable format.
+			'length', // @deprecated An alias of 'duration' tag.
+
+			'location', // Alias of start-location.
+			'start-location', // Location name where the event starts.
+			'maps-link', // @deprecated An alias for 'start-location-link' tag.
+			'start-location-link', // Link to Google Maps querying the event start location address.
+			'end-location', // Location name where the event ends.
+			'end-location-link', // Link to Google Maps querying the event end location address.
+
+			'link', // An HTML link to the event URL.
+			'url', // A string with the raw event link URL.
+
+			'calendar', // The title of the source calendar.
+			'feed-title', // @deprecated An alias of 'calendar'.
+
+			'id', // The event unique ID.
+			'uid', // An alias of ID.
+			'event-id', // @deprecated An alias for 'id' tag.
+			'calendar-id', // The calendar ID.
+			'feed-id', // @deprecated An alias for 'calendar-id' tag.
+			'cal-id', // @deprecated An alias for 'calendar-id' tag.
 
 			/* ========= *
 			 * Meta Tags *
 			 * ========= */
 
-			'attachments',          // List of attachments.
-			'attendees',            // List of attendees.
-			'organizer',            // Creator info.
+			'attachments', // List of attachments.
+			'attendees', // List of attendees.
+			'organizer', // Creator info.
 
 			/* ================ *
 			 * Conditional Tags *
 			 * ================ */
 
-			'if-title',              // If the event has a title.
-			'if-description',        // If the event has a description.
-
-			'if-now',                // If the event is taking place now.
-			'if-not-now',            // If the event is not taking place now (may have ended or just not started yet).
-			'if-started',            // If the event has started (and may as well as ended).
-			'if-not-started',        // If the event has NOT started yet (event could be any time in the future).
-			'if-ended',              // If the event has ended (event could be any time in the past).
-			'if-not-ended',          // If the event has NOT ended (may as well as not started yet).
-
-			'if-whole-day',          // If the event lasts the whole day.
-			'if-all-day',            // @deprecated Alias for 'if-whole-day'.
-			'if-not-whole-day',      // If the event does NOT last the whole day.
-			'if-not-all-day',        // @deprecated Alias for 'if-not-whole-day'.
-			'if-end-time',           // If the event has a set end time.
-			'if-no-end-time',        // If the event has NOT a set end time.
-
-			'if-multi-day',          // If the event spans multiple days.
-			'if-single-day',         // If the event does not span multiple days.
-
-			'if-recurring',          // If the event is a recurring event.
-			'if-not-recurring',      // If the event is NOT a recurring event.
-
-			'if-location',           // @deprecated Alias for 'if-start-location'.
-			'if-start-location',     // Does the event has a start location?
-			'if-end-location',       // Does the event has an end location?
-			'if-not-location',       // @deprecated Alias for 'if-not-start-location'.
+			'if-title', // If the event has a title.
+			'if-description', // If the event has a description.
+
+			'if-now', // If the event is taking place now.
+			'if-not-now', // If the event is not taking place now (may have ended or just not started yet).
+			'if-started', // If the event has started (and may as well as ended).
+			'if-not-started', // If the event has NOT started yet (event could be any time in the future).
+			'if-ended', // If the event has ended (event could be any time in the past).
+			'if-not-ended', // If the event has NOT ended (may as well as not started yet).
+
+			'if-whole-day', // If the event lasts the whole day.
+			'if-all-day', // @deprecated Alias for 'if-whole-day'.
+			'if-not-whole-day', // If the event does NOT last the whole day.
+			'if-not-all-day', // @deprecated Alias for 'if-not-whole-day'.
+			'if-end-time', // If the event has a set end time.
+			'if-no-end-time', // If the event has NOT a set end time.
+
+			'if-multi-day', // If the event spans multiple days.
+			'if-single-day', // If the event does not span multiple days.
+
+			'if-recurring', // If the event is a recurring event.
+			'if-not-recurring', // If the event is NOT a recurring event.
+
+			'if-location', // @deprecated Alias for 'if-start-location'.
+			'if-start-location', // Does the event has a start location?
+			'if-end-location', // Does the event has an end location?
+			'if-not-location', // @deprecated Alias for 'if-not-start-location'.
 			'if-not-start-location', // Does the event has NOT a start location?
-			'if-not-end-location',   // Does the event has NOT an end location?
+			'if-not-end-location', // Does the event has NOT an end location?
 
 		);
 	}
@@ -165,17 +165,17 @@ 
 	 *
 	 * @return string
 	 */
-	public function parse_event_template_tags( $template_tags = '' ) {
+	public function parse_event_template_tags($template_tags = '') {
 
 		// Process tags.
 		$result = preg_replace_callback(
 			$this->get_regex(),
-			array( $this, 'process_event_content' ),
+			array($this, 'process_event_content'),
 			$template_tags
 		);
 
 		// Removes extra consecutive <br> tags.
-		return preg_replace( '#(<br */?>\s*)+#i', '<br />', trim( $result ) );
+		return preg_replace('#(<br */?>\s*)+#i', '<br />', trim($result));
 	}
 
 	/**
@@ -187,10 +187,10 @@ 
 	 *
 	 * @return string
 	 */
-	public function process_event_content( $match ) {
+	public function process_event_content($match) {
 
-		if ( $match[1] == '[' && $match[6] == ']' ) {
-			return substr( $match[0], 1, - 1 );
+		if ($match[1] == '[' && $match[6] == ']') {
+			return substr($match[0], 1, - 1);
 		}
 
 		$tag     = $match[2]; // Tag name without square brackets.
@@ -202,9 +202,9 @@ 
 		$calendar = $this->calendar;
 		$event    = $this->event;
 
-		if ( ( $calendar instanceof Calendar ) && ( $event instanceof Event ) ) {
+		if (($calendar instanceof Calendar) && ($event instanceof Event)) {
 
-			switch ( $tag ) {
+			switch ($tag) {
 
 				/* ============ *
 				 * Content Tags *
@@ -212,13 +212,13 @@ 
 
 				case 'title' :
 				case 'event-title' :
-					return $this->get_title( $event->title, $attr );
+					return $this->get_title($event->title, $attr);
 
 				case 'description' :
-					return $this->get_description( $event->description, $attr );
+					return $this->get_description($event->description, $attr);
 
 				case 'when' :
-					return $this->get_when( $event );
+					return $this->get_when($event);
 
 				case 'end-date' :
 				case 'end-custom' :
@@ -228,44 +228,44 @@ 
 				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 - 1000;
 
-						if ( $event->whole_day ) {
-							$value = human_time_diff( $event->start, ( $event->end - 86500 ) );
+						if ($event->whole_day) {
+							$value = human_time_diff($event->start, ($event->end - 86500));
 						} else {
-							$value = human_time_diff( $event->start, $event->end );
+							$value = human_time_diff($event->start, $event->end);
 						}
 					} else {
 						$duration = '-1';
-						$value    = __( 'No end time', 'google-calendar-events' );
+						$value    = __('No end time', 'google-calendar-events');
 					}
-					return ' <span class="simcal-event-duration" data-event-duration="' . $duration . '">' . $value . '</span>';
+					return ' <span class="simcal-event-duration" data-event-duration="'.$duration.'">'.$value.'</span>';
 
 				case 'location' :
 				case 'start-location' :
 				case 'end-location' :
 					$location = $tag == 'end-location' ? $event->end_location['address'] : $event->start_location['address'];
-					return ' <span class="simcal-event-address simcal-event-start-location" itemprop="location" itemscope itemtype="http://schema.org/Place">' . wp_strip_all_tags( $location ) . '</span>';
+					return ' <span class="simcal-event-address simcal-event-start-location" itemprop="location" itemscope itemtype="http://schema.org/Place">'.wp_strip_all_tags($location).'</span>';
 
 				case 'start-location-link':
 				case 'end-location-link' :
 				case 'maps-link' :
 					$location = $tag == 'end-location-link' ? $event->end_location['address'] : $event->start_location['address'];
-					if ( ! empty( $location ) ) {
-						$url = '//maps.google.com?q=' . urlencode( $location );
-						return $this->make_link( $tag, $url, $calendar->get_event_html( $event, $partial ), $attr );
+					if ( ! empty($location)) {
+						$url = '//maps.google.com?q='.urlencode($location);
+						return $this->make_link($tag, $url, $calendar->get_event_html($event, $partial), $attr);
 					}
 					break;
 
 				case 'link' :
 				case 'url' :
-					$content = 'link' == $tag ? $calendar->get_event_html( $event, $partial ) : '';
-					return $this->make_link( $tag, $event->link, $content , $attr );
+					$content = 'link' == $tag ? $calendar->get_event_html($event, $partial) : '';
+					return $this->make_link($tag, $event->link, $content, $attr);
 
 				case 'calendar' :
 				case 'feed-title' :
@@ -287,22 +287,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;
 
@@ -311,35 +311,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;
@@ -347,15 +347,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);
 						}
 					}
 
@@ -364,17 +364,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);
 							}
 						}
 
@@ -383,14 +383,14 @@ 
 					break;
 
 				case 'if-end-time' :
-					if ( false !== $event->end ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (false !== $event->end) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-no-end-time' :
-					if ( false === $event->end ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (false === $event->end) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
@@ -398,59 +398,59 @@ 
 				case 'if-whole-day' :
 				case 'if-not-all-day' :
 				case 'if-not-whole-day' :
-					$bool = strstr( $tag, 'not' ) ? false : true;
-					if ( $bool === $event->whole_day ) {
-						return $calendar->get_event_html( $event, $partial );
+					$bool = strstr($tag, 'not') ? false : true;
+					if ($bool === $event->whole_day) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-recurring' :
-					if ( ! empty( $event->recurrence ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if ( ! empty($event->recurrence)) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-not-recurring' :
-					if ( false === $event->recurrence ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (false === $event->recurrence) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-multi-day' :
-					if ( false !== $event->multiple_days ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (false !== $event->multiple_days) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-single-day' :
-					if ( false === $event->multiple_days ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (false === $event->multiple_days) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-location' :
 				case 'if-start-location' :
-					if ( ! empty( $event->start_location['address'] ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if ( ! empty($event->start_location['address'])) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					return false;
 
 				case 'if-not-location' :
 				case 'if-not-start-location' :
-					if ( empty( $event->start_location['address'] ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (empty($event->start_location['address'])) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					return '';
 
 				case 'if-not-end-location' :
-					if ( empty( $event->end_location['address'] ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (empty($event->end_location['address'])) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					return '';
 
 				case 'if-end-location' :
-					if ( ! empty( $event->end_location['address'] ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if ( ! empty($event->end_location['address'])) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					return '';
 
@@ -459,7 +459,7 @@ 
 				 * ======= */
 
 				default :
-					return wp_kses_post( $before . $partial . $after );
+					return wp_kses_post($before.$partial.$after);
 			}
 		}
 
@@ -477,15 +477,15 @@ 
 	 *
 	 * @return string
 	 */
-	private function limit_words( $text, $limit ) {
+	private function limit_words($text, $limit) {
 
-		$text = wp_strip_all_tags( $text );
-		$limit = max( absint( $limit ), 0 );
+		$text = wp_strip_all_tags($text);
+		$limit = max(absint($limit), 0);
 
-		if ( $limit > 0 && ( str_word_count( $text, 0 ) > $limit ) ) {
-			$words  = str_word_count( $text, 2 );
-			$pos    = array_keys( $words );
-			$text   = trim( substr( $text, 0, $pos[ $limit ] ) ) . '&hellip;';
+		if ($limit > 0 && (str_word_count($text, 0) > $limit)) {
+			$words  = str_word_count($text, 2);
+			$pos    = array_keys($words);
+			$text   = trim(substr($text, 0, $pos[$limit])).'&hellip;';
 		}
 
 		return $text;
@@ -502,26 +502,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.'>';
 	}
 
 	/**
@@ -535,40 +535,40 @@ 
 	 *
 	 * @return string
 	 */
-	private function get_description( $description, $attr ) {
+	private function get_description($description, $attr) {
 
-		if ( empty( $description ) ) {
+		if (empty($description)) {
 			return '';
 		}
 
-		$attr = array_merge( array(
-			'limit'     => 0,       // Trim length to number of words
-			'html'      => 'no',    // Parse HTML content
-			'markdown'  => 'no',    // Parse Markdown content
-			'autolink'  => 'no',    // Automatically convert plaintext URIs to anchors
-		), (array) shortcode_parse_atts( $attr ) );
+		$attr = array_merge(array(
+			'limit'     => 0, // Trim length to number of words
+			'html'      => 'no', // Parse HTML content
+			'markdown'  => 'no', // Parse Markdown content
+			'autolink'  => 'no', // Automatically convert plaintext URIs to anchors
+		), (array) shortcode_parse_atts($attr));
 
-		$allow_html = 'no' != $attr['html']     ? true : false;
+		$allow_html = 'no' != $attr['html'] ? true : false;
 		$allow_md   = 'no' != $attr['markdown'] ? true : false;
 
 		$html = '<div class="simcal-event-description" itemprop="description">';
 
 		// Markdown and HTML don't play well together, use one or the other in the same tag.
-		if ( $allow_html || $allow_md ) {
-			if ( $allow_html ) {
-				$html .= wp_kses_post( $description );
-			} elseif ( $allow_md ) {
+		if ($allow_html || $allow_md) {
+			if ($allow_html) {
+				$html .= wp_kses_post($description);
+			} elseif ($allow_md) {
 				$markdown = new \Parsedown();
-				$html .= $markdown->text( wp_strip_all_tags( $description ) );
+				$html .= $markdown->text(wp_strip_all_tags($description));
 			}
 		} else {
-			$html .= $this->limit_words( $description, $attr['limit'] );
+			$html .= $this->limit_words($description, $attr['limit']);
 		}
 
 		$html .= '</div>';
 
-		if ( 'no' != $attr['autolink'] ) {
-			$html = ' ' . make_clickable( $html );
+		if ('no' != $attr['autolink']) {
+			$html = ' '.make_clickable($html);
 		}
 
 		return $html;
@@ -584,76 +584,76 @@ 
 	 *
 	 * @return string
 	 */
-	private function get_when( Event $event ) {
+	private function get_when(Event $event) {
 
-		$start = $event->start_dt->setTimezone( $event->timezone );
-		$end = ! is_null( $event->end_dt ) ? $event->end_dt->setTimezone( $event->timezone ) : null;
+		$start = $event->start_dt->setTimezone($event->timezone);
+		$end = ! is_null($event->end_dt) ? $event->end_dt->setTimezone($event->timezone) : null;
 
 		$time_start = '';
 		$time_end = '';
 
-		if ( ! $event->whole_day ) {
+		if ( ! $event->whole_day) {
 
-			$time_start = $this->calendar->datetime_separator .
-			              ' <span class="simcal-event-start simcal-event-start-time" ' .
-			              'data-event-start="' . $start->getTimestamp() . '" ' .
-			              'data-event-format="' . $this->calendar->time_format . '" ' .
-			              'itemprop="startDate" content="' . $start->toIso8601String() . '">' .
-			              date_i18n( $this->calendar->time_format, $start->getTimestamp() ) .
+			$time_start = $this->calendar->datetime_separator.
+			              ' <span class="simcal-event-start simcal-event-start-time" '.
+			              'data-event-start="'.$start->getTimestamp().'" '.
+			              'data-event-format="'.$this->calendar->time_format.'" '.
+			              'itemprop="startDate" content="'.$start->toIso8601String().'">'.
+			              date_i18n($this->calendar->time_format, $start->getTimestamp()).
 			              '</span> ';
 
-			if ( $end instanceof Carbon ) {
+			if ($end instanceof Carbon) {
 
-				$time_end = ' <span class="simcal-event-end simcal-event-end-time" ' .
-				            'data-event-end="' . $end->getTimestamp() . '" ' .
-				            'data-event-format="' . $this->calendar->time_format . '" ' .
-				            'itemprop="endDate" content="' . $end->toIso8601String() . '">' .
-				            date_i18n( $this->calendar->time_format, $end->getTimestamp() ) .
+				$time_end = ' <span class="simcal-event-end simcal-event-end-time" '.
+				            'data-event-end="'.$end->getTimestamp().'" '.
+				            'data-event-format="'.$this->calendar->time_format.'" '.
+				            'itemprop="endDate" content="'.$end->toIso8601String().'">'.
+				            date_i18n($this->calendar->time_format, $end->getTimestamp()).
 				            '</span> ';
 
 			}
 
 		}
 
-		if ( $event->multiple_days ) {
+		if ($event->multiple_days) {
 
-			$output = ' <span class="simcal-event-start simcal-event-start-date" ' .
-			          'data-event-start="' . $start->getTimestamp() . '" ' .
-			          'data-event-format="' . $this->calendar->date_format . '" ' .
-			          'itemprop="startDate" content="' . $start->toIso8601String() . '">' .
-			          date_i18n( $this->calendar->date_format, $start->getTimestamp() ) .
-			          '</span> ' .
+			$output = ' <span class="simcal-event-start simcal-event-start-date" '.
+			          'data-event-start="'.$start->getTimestamp().'" '.
+			          'data-event-format="'.$this->calendar->date_format.'" '.
+			          'itemprop="startDate" content="'.$start->toIso8601String().'">'.
+			          date_i18n($this->calendar->date_format, $start->getTimestamp()).
+			          '</span> '.
 			          $time_start;
 
-			if ( $end instanceof Carbon ) {
+			if ($end instanceof Carbon) {
 
-				$end = ( $event->whole_day ? Carbon::createFromTimestamp( $end->getTimestamp() )->startOfDay()->subSeconds( 1 ) : $end );
+				$end = ($event->whole_day ? Carbon::createFromTimestamp($end->getTimestamp())->startOfDay()->subSeconds(1) : $end);
 
-				$output .= '-' .
-				           ' <span class="simcal-event-start simcal-event-end-date" ' .
-				           'data-event-start="' . $end->getTimestamp() . '" ' .
-				           'data-event-format="' . $this->calendar->date_format . '" ' .
-				           'itemprop="endDate" content="' . $end->toIso8601String() . '">' .
-				           date_i18n( $this->calendar->date_format, $end->getTimestamp() ) .
-				           '</span> ' .
+				$output .= '-'.
+				           ' <span class="simcal-event-start simcal-event-end-date" '.
+				           'data-event-start="'.$end->getTimestamp().'" '.
+				           'data-event-format="'.$this->calendar->date_format.'" '.
+				           'itemprop="endDate" content="'.$end->toIso8601String().'">'.
+				           date_i18n($this->calendar->date_format, $end->getTimestamp()).
+				           '</span> '.
 				           $time_end;
 			}
 
 		} else {
 
-			$time_end = ! empty( $time_start ) && ! empty( $time_end ) ? ' - ' . $time_end : '';
+			$time_end = ! empty($time_start) && ! empty($time_end) ? ' - '.$time_end : '';
 
-			$output = ' <span class="simcal-event-start simcal-event-start-date" ' .
-			          'data-event-start="' . $start->getTimestamp() . '" ' .
-			          'data-event-format="' . $this->calendar->date_format . '">' .
-			          date_i18n( $this->calendar->date_format, $start->getTimestamp() ) .
-			          '</span> ' .
-			          $time_start .
+			$output = ' <span class="simcal-event-start simcal-event-start-date" '.
+			          'data-event-start="'.$start->getTimestamp().'" '.
+			          'data-event-format="'.$this->calendar->date_format.'">'.
+			          date_i18n($this->calendar->date_format, $start->getTimestamp()).
+			          '</span> '.
+			          $time_start.
 			          $time_end;
 
 		}
 
-		return trim( $output );
+		return trim($output);
 	}
 
 	/**
@@ -668,49 +668,49 @@ 
 	 *
 	 * @return string
 	 */
-	private function get_dt( $tag, Event $event, $attr ) {
+	private function get_dt($tag, Event $event, $attr) {
 
-		$bound = 0 === strpos( $tag, 'end' ) ? 'end' : 'start';
-		if ( ( 'end' == $bound ) && ( false === $event->end ) ) {
+		$bound = 0 === strpos($tag, 'end') ? 'end' : 'start';
+		if (('end' == $bound) && (false === $event->end)) {
 			return '';
 		}
 
-		$dt = $bound . '_dt';
-		if ( ! $event->$dt instanceof Carbon ) {
+		$dt = $bound.'_dt';
+		if ( ! $event->$dt instanceof Carbon) {
 			return '';
 		}
-		$event_dt = $event->$dt->setTimezone( $event->timezone );
+		$event_dt = $event->$dt->setTimezone($event->timezone);
 
-		$attr = array_merge( array(
+		$attr = array_merge(array(
 			'format'    => '',
-		), (array) shortcode_parse_atts( $attr ) );
+		), (array) shortcode_parse_atts($attr));
 
-		$format = ltrim( strstr( $tag, '-' ), '-' );
+		$format = ltrim(strstr($tag, '-'), '-');
 		$dt_format = '';
-		if ( ! empty( $attr['format'] ) ) {
-			$dt_format = esc_attr( wp_strip_all_tags( $attr['format'] ) );
-		} elseif ( 'date' == $format ) {
+		if ( ! empty($attr['format'])) {
+			$dt_format = esc_attr(wp_strip_all_tags($attr['format']));
+		} elseif ('date' == $format) {
 			$dt_format = $this->calendar->date_format;
-		} elseif ( 'time' == $format ) {
+		} elseif ('time' == $format) {
 			$dt_format = $this->calendar->time_format;
 		}
 
-		if ( 'human' == $format ) {
-			$value = human_time_diff( $event_dt->getTimestamp(), Carbon::now( $event->timezone )->getTimestamp() );
+		if ('human' == $format) {
+			$value = human_time_diff($event_dt->getTimestamp(), Carbon::now($event->timezone)->getTimestamp());
 		} else {
 
-			if ( $event->whole_day ) {
-				$value = date_i18n( $dt_format, $event_dt->getTimestamp() - 86400 );
+			if ($event->whole_day) {
+				$value = date_i18n($dt_format, $event_dt->getTimestamp() - 86400);
 			} else {
-				$value = date_i18n( $dt_format, $event_dt->getTimestamp() );
+				$value = date_i18n($dt_format, $event_dt->getTimestamp());
 			}
 		}
 
-		return '<span class="simcal-event-' . $bound . ' ' . 'simcal-event-' . $bound . '-' . $format . '"' .
-		       'data-event-' . $bound . '="' . $event_dt->getTimestamp() . '"' .
-		       'data-event-format="' . $dt_format . '"' .
-		       'itemprop="' . $bound . 'Date" content="' . $event_dt->toIso8601String() . '">' .
-		       $value .
+		return '<span class="simcal-event-'.$bound.' '.'simcal-event-'.$bound.'-'.$format.'"'.
+		       'data-event-'.$bound.'="'.$event_dt->getTimestamp().'"'.
+		       'data-event-format="'.$dt_format.'"'.
+		       'itemprop="'.$bound.'Date" content="'.$event_dt->toIso8601String().'">'.
+		       $value.
 		       '</span>';
 	}
 
@@ -727,23 +727,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;
 	}
 
 	/**
@@ -756,20 +756,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;
 	}
@@ -785,41 +785,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++;
 
@@ -830,21 +830,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;
 	}
@@ -858,23 +858,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>';
 	}
 
 	/**
@@ -888,21 +888,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>';
 	}
 
 	/**
@@ -927,7 +927,7 @@ 
 		// This is largely borrowed on get_shortcode_regex() from WordPress Core.
 		// @see /wp-includes/shortcodes.php (with some modification)
 
-		$tagregexp = implode( '|', array_values( $this->tags ) );
+		$tagregexp = implode('|', array_values($this->tags));
 
 		return '/'
 		       . '\\['                              // Opening bracket

includes/admin/metaboxes/settings.php

Spacing +269 added lines, -269 removed lines

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