moonstonemedia / Simple-Calendar

includes/admin/pages/calendars.php

Spacing +37 added lines, -37 removed lines

@@ -9,7 +9,7 @@ 
 use SimpleCalendar\Abstracts\Calendar;
 use SimpleCalendar\Abstracts\Admin_Page;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -39,20 +39,20 @@ 
 
 		$this->id               = 'calendars';
 		$this->option_group     = 'settings';
-		$this->label            = __( 'Calendars', 'google-calendar-events' );
+		$this->label            = __('Calendars', 'google-calendar-events');
 		//$this->description      = __( 'Manage calendar preferences and calendar types settings and options.', 'google-calendar-events' );
 
 		$calendars = simcal_get_calendar_types();
 		$calendar_settings = array();
-		if ( ! empty( $calendars ) && is_array( $calendars ) ) {
-			foreach ( $calendars as $calendar => $views ) {
+		if ( ! empty($calendars) && is_array($calendars)) {
+			foreach ($calendars as $calendar => $views) {
 
-				$calendar_type = simcal_get_calendar( $calendar );
+				$calendar_type = simcal_get_calendar($calendar);
 
-				if ( $calendar_type instanceof Calendar ) {
+				if ($calendar_type instanceof Calendar) {
 					$settings = $calendar_type->settings_fields();
-					if ( ! empty( $settings ) ) {
-						$calendar_settings[ $calendar ] = $settings;
+					if ( ! empty($settings)) {
+						$calendar_settings[$calendar] = $settings;
 					}
 				}
 			}
@@ -74,17 +74,17 @@ 
 
 		$sections = array(
 			'general' => array(
-				'title'       => __( 'General', 'google-calendar-events' ),
+				'title'       => __('General', 'google-calendar-events'),
 				'description' => '',
 			),
 		);
 
 		$calendar_types = $this->calendar_types;
 
-		if ( ! empty( $calendar_types ) && is_array( $calendar_types ) ) {
-			foreach ( $calendar_types as $calendar_type => $type ) {
+		if ( ! empty($calendar_types) && is_array($calendar_types)) {
+			foreach ($calendar_types as $calendar_type => $type) {
 
-				$sections[ $calendar_type ] = array(
+				$sections[$calendar_type] = array(
 					'title' => $type['name'],
 					'description' => $type['description'],
 				);
@@ -92,9 +92,9 @@ 
 			}
 		}
 
-		arsort( $calendar_types );
+		arsort($calendar_types);
 
-		return apply_filters( 'simcal_add_' . $this->option_group . '_' . $this->id .'_sections', $sections );
+		return apply_filters('simcal_add_'.$this->option_group.'_'.$this->id.'_sections', $sections);
 	}
 
 	/**
@@ -108,11 +108,11 @@ 
 
 		$fields       = array();
 		$feed_types   = $this->calendar_types;
-		$this->values = get_option( 'simple-calendar_' . $this->option_group . '_' . $this->id );
+		$this->values = get_option('simple-calendar_'.$this->option_group.'_'.$this->id);
 
-		foreach ( $this->sections as $section => $contents ) :
+		foreach ($this->sections as $section => $contents) :
 
-			if ( 'general' == $section ) {
+			if ('general' == $section) {
 
 				$options    = array();
 				$post_types = get_post_types(
@@ -124,36 +124,36 @@ 
 					'objects',
 					'not'
 				);
-				unset( $post_types['attachment'] );
-				unset( $post_types['calendar'] );
-				unset( $post_types['gce_feed'] );
-				foreach ( $post_types as $slug => $post_type ) {
-					$options[ $slug ] = $post_type->label;
+				unset($post_types['attachment']);
+				unset($post_types['calendar']);
+				unset($post_types['gce_feed']);
+				foreach ($post_types as $slug => $post_type) {
+					$options[$slug] = $post_type->label;
 				}
-				asort( $options );
+				asort($options);
 
-				$fields[ $section ][] = array(
+				$fields[$section][] = array(
 					'type'        => 'select',
 					'multiselect' => 'multiselect',
 					'enhanced'    => 'enhanced',
-					'title'       => __( 'Attach Calendars', 'google-calendar-events' ),
-					'tooltip'     => __( 'You can choose on which content types to add the ability to attach calendars.', 'google-calendar-events' ),
-					'name'        => 'simple-calendar_' . $this->option_group . '_' . $this->id . '[' . $section . '][attach_calendars_posts]',
-					'id'          => 'simple-calendar-' . $this->option_group . '-' . $this->id . '-attach-calendars-posts',
-					'value'       => $this->get_option_value( $section, 'attach_calendars_posts' ),
+					'title'       => __('Attach Calendars', 'google-calendar-events'),
+					'tooltip'     => __('You can choose on which content types to add the ability to attach calendars.', 'google-calendar-events'),
+					'name'        => 'simple-calendar_'.$this->option_group.'_'.$this->id.'['.$section.'][attach_calendars_posts]',
+					'id'          => 'simple-calendar-'.$this->option_group.'-'.$this->id.'-attach-calendars-posts',
+					'value'       => $this->get_option_value($section, 'attach_calendars_posts'),
 					'default'     => 'post,page',
 					'options'     => $options,
 				);
 
-			} elseif ( isset( $feed_types[ $section ]['fields'] ) ) {
+			} elseif (isset($feed_types[$section]['fields'])) {
 
-				foreach ( $feed_types[ $section ]['fields'] as $key => $args ) {
+				foreach ($feed_types[$section]['fields'] as $key => $args) {
 
-					$fields[ $section ][] = array_merge( $args, array(
-						'name'  => 'simple-calendar_' . $this->option_group . '_' . $this->id . '[' . $section . '][' . $key . ']',
-						'id'    => 'simple-calendar-' . $this->option_group . '-' . $this->id . '-' . $key,
-						'value' => $this->get_option_value( $section, $key )
-					) );
+					$fields[$section][] = array_merge($args, array(
+						'name'  => 'simple-calendar_'.$this->option_group.'_'.$this->id.'['.$section.']['.$key.']',
+						'id'    => 'simple-calendar-'.$this->option_group.'-'.$this->id.'-'.$key,
+						'value' => $this->get_option_value($section, $key)
+					));
 
 				}
 
@@ -161,7 +161,7 @@ 
 
 		endforeach;
 
-		return apply_filters( 'simcal_add_' . $this->option_group . '_' . $this->id . '_fields', $fields );
+		return apply_filters('simcal_add_'.$this->option_group.'_'.$this->id.'_fields', $fields);
 	}
 
 }

includes/events/event.php

Doc Comments +1 added lines, -1 removed lines

@@ -414,7 +414,7 @@
 	 * @since  3.0.0
 	 * @access private
 	 *
-	 * @param  int|float $latlng
+	 * @param  integer $latlng
 	 *
 	 * @return int|float
 	 */

Spacing +77 added lines, -77 removed lines

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

includes/calendars/default-calendar.php

Spacing +47 added lines, -47 removed lines

@@ -13,7 +13,7 @@ 
 use SimpleCalendar\Calendars\Views;
 use SimpleCalendar\Events\Event;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -105,36 +105,36 @@ 
 	 *
 	 * @param int|object|\WP_Post|Calendar $calendar
 	 */
-	public function __construct( $calendar ) {
+	public function __construct($calendar) {
 
 		$this->type  = 'default-calendar';
-		$this->name  = __( 'Default', 'google-calendar-events' );
-		$this->views = apply_filters( 'simcal_default_calendar_views', array(
-			'grid' => __( 'Grid', 'google-calendar-events' ),
-			'list' => __( 'List', 'google-calendar-events' ),
-		) );
+		$this->name  = __('Default', 'google-calendar-events');
+		$this->views = apply_filters('simcal_default_calendar_views', array(
+			'grid' => __('Grid', 'google-calendar-events'),
+			'list' => __('List', 'google-calendar-events'),
+		));
 
-		parent::__construct( $calendar );
+		parent::__construct($calendar);
 
-		if ( ! is_null( $this->post ) ) {
+		if ( ! is_null($this->post)) {
 
-			$this->set_properties( $this->view->get_type() );
+			$this->set_properties($this->view->get_type());
 
 			$id    = $this->id;
 			$theme = $this->theme;
 
-			add_filter( 'simcal_calendar_class', function ( $class, $post_id ) use ( $theme, $id ) {
-				if ( in_array( 'default-calendar', $class ) && $post_id === $id ) {
-					array_push( $class, 'default-calendar-' . $theme );
+			add_filter('simcal_calendar_class', function($class, $post_id) use ($theme, $id) {
+				if (in_array('default-calendar', $class) && $post_id === $id) {
+					array_push($class, 'default-calendar-'.$theme);
 				}
 
 				return $class;
-			}, 10, 2 );
+			}, 10, 2);
 
 		}
 
 		// Calendar settings handling.
-		if ( is_admin() && ! defined( 'DOING_AJAX' ) ) {
+		if (is_admin() && ! defined('DOING_AJAX')) {
 			$admin          = new Default_Calendar_Admin();
 			$this->settings = $admin->settings_fields();
 		}
@@ -148,49 +148,49 @@ 
 	 *
 	 * @param  $view
 	 */
-	private function set_properties( $view ) {
+	private function set_properties($view) {
 
 		// Set styles.
-		if ( 'dark' == get_post_meta( $this->id, '_default_calendar_style_theme', true ) ) {
+		if ('dark' == get_post_meta($this->id, '_default_calendar_style_theme', true)) {
 			$this->theme = 'dark';
 		}
-		if ( $today_color = get_post_meta( $this->id, '_default_calendar_style_today', true ) ) {
-			$this->today_color = esc_attr( $today_color );
+		if ($today_color = get_post_meta($this->id, '_default_calendar_style_today', true)) {
+			$this->today_color = esc_attr($today_color);
 		}
-		if ( $day_events_color = get_post_meta( $this->id, '_default_calendar_style_days_events', true ) ) {
-			$this->days_events_color = esc_attr( $day_events_color );
+		if ($day_events_color = get_post_meta($this->id, '_default_calendar_style_days_events', true)) {
+			$this->days_events_color = esc_attr($day_events_color);
 		}
 
 		// Hide too many events.
-		if ( 'yes' == get_post_meta( $this->id, '_default_calendar_limit_visible_events', true ) ) {
-			$this->events_limit = absint( get_post_meta( $this->id, '_default_calendar_visible_events', true ) );
+		if ('yes' == get_post_meta($this->id, '_default_calendar_limit_visible_events', true)) {
+			$this->events_limit = absint(get_post_meta($this->id, '_default_calendar_visible_events', true));
 		}
 
 		// Expand multiple day events.
-		if ( 'yes' == get_post_meta( $this->id, '_default_calendar_expand_multi_day_events', true ) || ( 'list' == $view && 'current_day_only' == get_post_meta( $this->id, '_default_calendar_expand_multi_day_events', true ) ) ) {
+		if ('yes' == get_post_meta($this->id, '_default_calendar_expand_multi_day_events', true) || ('list' == $view && 'current_day_only' == get_post_meta($this->id, '_default_calendar_expand_multi_day_events', true))) {
 			$this->events = $this->expand_multiple_days_events();
 		}
 
-		if ( 'grid' == $view ) {
+		if ('grid' == $view) {
 
 			// Use hover to open event bubbles.
-			if ( 'hover' == get_post_meta( $this->id, '_default_calendar_event_bubble_trigger', true ) ) {
+			if ('hover' == get_post_meta($this->id, '_default_calendar_event_bubble_trigger', true)) {
 				$this->event_bubble_trigger = 'hover';
 			}
 
 			// Trim long event titles.
-			if ( 'yes' == get_post_meta( $this->id, '_default_calendar_trim_titles', true ) ) {
-				$this->trim_titles = max( absint( get_post_meta( $this->id, '_default_calendar_trim_titles_chars', true ) ), 1 );
+			if ('yes' == get_post_meta($this->id, '_default_calendar_trim_titles', true)) {
+				$this->trim_titles = max(absint(get_post_meta($this->id, '_default_calendar_trim_titles_chars', true)), 1);
 			}
 
 		} else {
 
 			// List range.
-			$this->group_type = esc_attr( get_post_meta( $this->id, '_default_calendar_list_range_type', true ) );
-			$this->group_span = max( absint( get_post_meta( $this->id, '_default_calendar_list_range_span', true ) ), 1 );
+			$this->group_type = esc_attr(get_post_meta($this->id, '_default_calendar_list_range_type', true));
+			$this->group_span = max(absint(get_post_meta($this->id, '_default_calendar_list_range_span', true)), 1);
 
 			// Make the list look more compact.
-			if ( 'yes' == get_post_meta( $this->id, '_default_calendar_compact_list', true ) ) {
+			if ('yes' == get_post_meta($this->id, '_default_calendar_compact_list', true)) {
 				$this->compact_list = true;
 			}
 
@@ -211,18 +211,18 @@ 
 		$old_events = $this->events;
 		$new_events = array();
 
-		if ( ! empty( $old_events ) ) {
+		if ( ! empty($old_events)) {
 
-			foreach ( $old_events as $events ) {
-				foreach ( $events as $event ) {
-					if ( $event instanceof Event ) {
-						if ( false !== $event->multiple_days ) {
+			foreach ($old_events as $events) {
+				foreach ($events as $event) {
+					if ($event instanceof Event) {
+						if (false !== $event->multiple_days) {
 							$days = $event->multiple_days;
 
-							if ( $days > 0 ) {
+							if ($days > 0) {
 
-								for ( $d = 1; $d <= $days; $d++ ) {
-									$new_events[ intval( $event->start + ( $d * DAY_IN_SECONDS ) - 1 ) ][] = $event;
+								for ($d = 1; $d <= $days; $d++) {
+									$new_events[intval($event->start + ($d * DAY_IN_SECONDS) - 1)][] = $event;
 								}
 							}
 						}
@@ -234,7 +234,7 @@ 
 		}
 
 		$events = $old_events + $new_events;
-		ksort( $events, SORT_NUMERIC );
+		ksort($events, SORT_NUMERIC);
 
 		return $events;
 	}
@@ -250,16 +250,16 @@ 
 	 *
 	 * @return null|Calendar_View
 	 */
-	public function get_view( $view = '' ) {
+	public function get_view($view = '') {
 
-		$view = ! empty( $view ) ? $view : 'grid';
+		$view = ! empty($view) ? $view : 'grid';
 
-		do_action( 'simcal_calendar_get_view', $this->type, $view );
+		do_action('simcal_calendar_get_view', $this->type, $view);
 
-		if ( 'grid' == $view ) {
-			return new Views\Default_Calendar_Grid( $this );
-		} elseif ( 'list' == $view ) {
-			return new Views\Default_Calendar_List( $this );
+		if ('grid' == $view) {
+			return new Views\Default_Calendar_Grid($this);
+		} elseif ('list' == $view) {
+			return new Views\Default_Calendar_List($this);
 		}
 
 		return null;

includes/assets.php

Spacing +65 added lines, -65 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Abstracts\Calendar_View;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -60,16 +60,16 @@ 
 	 */
 	public function __construct() {
 
-		$this->min = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG == true ) ? '' : '.min';
+		$this->min = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG == true) ? '' : '.min';
 
-		$settings = get_option( 'simple-calendar_settings_advanced' );
+		$settings = get_option('simple-calendar_settings_advanced');
 
-		if ( isset( $settings['assets']['disable_css'] ) ) {
+		if (isset($settings['assets']['disable_css'])) {
 			$this->disable_styles = 'yes' == $settings['assets']['disable_css'] ? true : false;
 		}
 
-		add_action( 'init', array( $this, 'register' ), 20 );
-		add_action( 'init', array( $this, 'enqueue' ), 40 );
+		add_action('init', array($this, 'register'), 20);
+		add_action('init', array($this, 'enqueue'), 40);
 	}
 
 	/**
@@ -78,7 +78,7 @@ 
 	 * @since 3.0.0
 	 */
 	public function register() {
-		do_action( 'simcal_register_assets', $this->min );
+		do_action('simcal_register_assets', $this->min);
 	}
 
 	/**
@@ -88,25 +88,25 @@ 
 	 */
 	public function enqueue() {
 
-		add_action( 'wp_enqueue_scripts', array( $this, 'load' ), 10 );
+		add_action('wp_enqueue_scripts', array($this, 'load'), 10);
 
-		do_action( 'simcal_enqueue_assets', $this->min );
+		do_action('simcal_enqueue_assets', $this->min);
 
 
 		$min = $this->min;
 		// Improves compatibility with themes and plugins using Isotope and Masonry.
-		add_action( 'wp_enqueue_scripts',
-			function () use ( $min ) {
-				if ( wp_script_is( 'simcal-qtip', 'enqueued' ) ) {
+		add_action('wp_enqueue_scripts',
+			function() use ($min) {
+				if (wp_script_is('simcal-qtip', 'enqueued')) {
 					wp_enqueue_script(
 						'simplecalendar-imagesloaded',
-						SIMPLE_CALENDAR_ASSETS . 'js/vendor/imagesloaded.pkgd' . $min . '.js',
-						array( 'simcal-qtip' ),
+						SIMPLE_CALENDAR_ASSETS.'js/vendor/imagesloaded.pkgd'.$min.'.js',
+						array('simcal-qtip'),
 						SIMPLE_CALENDAR_VERSION,
 						true
 					);
 				}
-			}, 1000 );
+			}, 1000);
 	}
 
 	/**
@@ -118,34 +118,34 @@ 
 
 		$types = simcal_get_calendar_types();
 
-		foreach ( $types as $calendar => $views ) {
-			foreach( $views as $key => $view ) {
+		foreach ($types as $calendar => $views) {
+			foreach ($views as $key => $view) {
 
-				$view = simcal_get_calendar_view( 0, $calendar . '-' . $view );
+				$view = simcal_get_calendar_view(0, $calendar.'-'.$view);
 
-				$scripts[] = $view->scripts( $this->min );
-				$styles[] = $view->styles( $this->min );
+				$scripts[] = $view->scripts($this->min);
+				$styles[] = $view->styles($this->min);
 			}
 		}
 
 		$this->get_widgets_assets();
-		$this->scripts = apply_filters( 'simcal_front_end_scripts', $scripts, $this->min );
+		$this->scripts = apply_filters('simcal_front_end_scripts', $scripts, $this->min);
 		// First check if there is a multi-dimensional array of scripts
-		if ( isset( $this->scripts[0] ) ) {
-			foreach ( $this->scripts as $script ) {
-				$this->load_scripts ( $script );
+		if (isset($this->scripts[0])) {
+			foreach ($this->scripts as $script) {
+				$this->load_scripts($script);
 			}
 		} else {
-			$this->load_scripts( $this->scripts );
+			$this->load_scripts($this->scripts);
 		}
-		$this->styles = apply_filters( 'simcal_front_end_styles', $styles, $this->min );
+		$this->styles = apply_filters('simcal_front_end_styles', $styles, $this->min);
 		// First check if there is a multi-dimensional array of styles
-		if ( isset( $this->styles[0] ) ) {
-			foreach( $this->styles as $style ) {
-				$this->load_styles( $style );
+		if (isset($this->styles[0])) {
+			foreach ($this->styles as $style) {
+				$this->load_styles($style);
 			}
 		} else {
-			$this->load_styles( $this->styles );
+			$this->load_styles($this->styles);
 		}
 	}
 
@@ -156,25 +156,25 @@ 
 	 */
 	public function get_widgets_assets() {
 
-		$widgets = get_option( 'widget_gce_widget' );
+		$widgets = get_option('widget_gce_widget');
 
-		if ( ! empty( $widgets ) && is_array( $widgets ) ) {
+		if ( ! empty($widgets) && is_array($widgets)) {
 
-			foreach ( $widgets as $settings ) {
+			foreach ($widgets as $settings) {
 
-				if ( ! empty( $settings ) && is_array( $settings ) ) {
+				if ( ! empty($settings) && is_array($settings)) {
 
-					if ( isset( $settings['calendar_id'] ) ) {
+					if (isset($settings['calendar_id'])) {
 
-						$view = simcal_get_calendar_view( absint( $settings['calendar_id'] ) );
+						$view = simcal_get_calendar_view(absint($settings['calendar_id']));
 
-						if ( $view instanceof Calendar_View ) {
-							add_filter( 'simcal_front_end_scripts', function ( $scripts, $min ) use ( $view ) {
-								return array_merge( $scripts, $view->scripts( $min ) );
-							}, 100, 2 );
-							add_filter( 'simcal_front_end_styles', function ( $styles, $min ) use ( $view ) {
-								return array_merge( $styles, $view->styles( $min ) );
-							}, 100, 2 );
+						if ($view instanceof Calendar_View) {
+							add_filter('simcal_front_end_scripts', function($scripts, $min) use ($view) {
+								return array_merge($scripts, $view->scripts($min));
+							}, 100, 2);
+							add_filter('simcal_front_end_styles', function($styles, $min) use ($view) {
+								return array_merge($styles, $view->styles($min));
+							}, 100, 2);
 						}
 
 					}
@@ -192,39 +192,39 @@ 
 	 *
 	 * @param array $scripts
 	 */
-	public function load_scripts( $scripts ) {
+	public function load_scripts($scripts) {
 
 		// Only load if not disabled in the settings
-		if ( ! empty( $scripts ) && is_array( $scripts ) ) {
+		if ( ! empty($scripts) && is_array($scripts)) {
 
-			foreach ( $scripts as $script => $v ) {
+			foreach ($scripts as $script => $v) {
 
 				/** Plugin compatibility fixes */
 
 				// Dequeue moment.js if detected from WP Simple Pay Pro.
-				if ( ( wp_script_is( 'stripe-checkout-pro-moment', 'enqueued' ) ) && $script == 'simcal-fullcal-moment' ) {
+				if ((wp_script_is('stripe-checkout-pro-moment', 'enqueued')) && $script == 'simcal-fullcal-moment') {
 					continue;
 				}
 
-				if ( ! empty( $v['src'] ) ) {
+				if ( ! empty($v['src'])) {
 
 					// Enqueued individually so we can dequeue if already enqueued by another plugin.
 					// TODO Rework dependencies part (or remove completely).
 
-					$src        = esc_url( $v['src'] );
-					$in_footer  = isset( $v['in_footer'] )   ? $v['in_footer']  : false;
+					$src        = esc_url($v['src']);
+					$in_footer  = isset($v['in_footer']) ? $v['in_footer'] : false;
 
-					wp_enqueue_script( $script, $src, array(), SIMPLE_CALENDAR_VERSION, $in_footer );
+					wp_enqueue_script($script, $src, array(), SIMPLE_CALENDAR_VERSION, $in_footer);
 
-					if ( ! empty( $v['localize'] ) && is_array( $v['localize'] ) ) {
-						foreach ( $v['localize'] as $object => $l10n ) {
-							wp_localize_script( $script, $object, $l10n );
+					if ( ! empty($v['localize']) && is_array($v['localize'])) {
+						foreach ($v['localize'] as $object => $l10n) {
+							wp_localize_script($script, $object, $l10n);
 						}
 					}
 
-				} elseif ( is_string( $v ) && ! empty( $v ) ) {
+				} elseif (is_string($v) && ! empty($v)) {
 
-					wp_enqueue_script( $v );
+					wp_enqueue_script($v);
 				}
 			}
 
@@ -238,26 +238,26 @@ 
 	 *
 	 * @param array $styles
 	 */
-	public function load_styles( $styles ) {
+	public function load_styles($styles) {
 
 		// Only load if not disabled in the settings
-		if ( ! empty( $styles ) && is_array( $styles ) && false === $this->disable_styles ) {
+		if ( ! empty($styles) && is_array($styles) && false === $this->disable_styles) {
 
-			foreach ( $styles as $style => $v ) {
+			foreach ($styles as $style => $v) {
 
-				if ( ! empty( $v['src'] ) ) {
+				if ( ! empty($v['src'])) {
 
 					// Enqueued individually so we can dequeue if already enqueued by another plugin.
 					// TODO Rework dependencies part (or remove completely).
 
-					$src    = esc_url( $v['src'] );
-					$media  = isset( $v['media'] )  ? $v['media']   : 'all';
+					$src    = esc_url($v['src']);
+					$media  = isset($v['media']) ? $v['media'] : 'all';
 
-					wp_enqueue_style( $style, $src, array(), SIMPLE_CALENDAR_VERSION, $media );
+					wp_enqueue_style($style, $src, array(), SIMPLE_CALENDAR_VERSION, $media);
 
-				} elseif ( is_string( $v ) && ! empty( $v ) ) {
+				} elseif (is_string($v) && ! empty($v)) {
 
-					wp_enqueue_style( $v );
+					wp_enqueue_style($v);
 				}
 
 			}

includes/admin/welcome.php

Spacing +72 added lines, -72 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,32 +49,32 @@ 
 	 */
 	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( $welcome_page_title, $welcome_page_name, 'manage_options', 'simple-calendar_about', array(
+				$page = add_dashboard_page($welcome_page_title, $welcome_page_name, 'manage_options', 'simple-calendar_about', array(
 					$this,
 					'about_screen',
-				) );
+				));
 				break;
 
 			case 'simple-calendar_credits' :
-				$page = add_dashboard_page( $welcome_page_title, $welcome_page_name, 'manage_options', 'simple-calendar_credits', array(
+				$page = add_dashboard_page($welcome_page_title, $welcome_page_name, 'manage_options', 'simple-calendar_credits', array(
 					$this,
 					'credits_screen',
-				) );
+				));
 				break;
 
 			case 'simple-calendar_translators' :
-				$page = add_dashboard_page( $welcome_page_title, $welcome_page_name, 'manage_options', 'simple-calendar_translators', array(
+				$page = add_dashboard_page($welcome_page_title, $welcome_page_name, 'manage_options', 'simple-calendar_translators', array(
 					$this,
 					'translators_screen',
-				) );
+				));
 				break;
 		}
 	}
@@ -85,9 +85,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');
 	}
 
 	/**
@@ -99,18 +99,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( 'addons' ), 'core-plugin', 'welcome-page' ); ?>"
+				><?php _e('Settings', 'google-calendar-events'); ?></a>
+			<a href="<?php echo simcal_ga_campaign_url(simcal_get_url('addons'), '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
 
@@ -127,7 +127,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>
 
@@ -135,21 +135,21 @@ 
 			<?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 a few display options to configure. ", 'google-calendar-events' ), SIMPLE_CALENDAR_VERSION );
+			printf(' '.__("Simple Calendar %s has a few display options to configure. ", 'google-calendar-events'), SIMPLE_CALENDAR_VERSION);
 			?>
-			<a href="<?php echo simcal_ga_campaign_url( simcal_get_url( 'docs' ), 'core-plugin', 'welcome-page' ); ?>"
+			<a href="<?php echo simcal_ga_campaign_url(simcal_get_url('docs'), 'core-plugin', 'welcome-page'); ?>"
 			   target="_blank"
-			><?php _e( 'Check out our documentation', 'google-calendar-events' ); ?></a>
-			<?php _e( 'to get started now.', 'google-calendar-events' ); ?>
+			><?php _e('Check out our documentation', 'google-calendar-events'); ?></a>
+			<?php _e('to get started now.', 'google-calendar-events'); ?>
 		</div>
 
 		<div class="simcal-badge">&nbsp;</div>
@@ -157,21 +157,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
 
@@ -183,8 +183,8 @@ 
 	 * @since 3.0.0
 	 */
 	public function about_screen() {
-		$welcome_image_about_path = SIMPLE_CALENDAR_ASSETS . '/images/welcome';
-		$welcome_addons_link = simcal_ga_campaign_url( simcal_get_url( 'addons' ), 'core-plugin', 'welcome-page' );
+		$welcome_image_about_path = SIMPLE_CALENDAR_ASSETS.'/images/welcome';
+		$welcome_addons_link = simcal_ga_campaign_url(simcal_get_url('addons'), 'core-plugin', 'welcome-page');
 
 		?>
 		<div id="simcal-welcome">
@@ -192,20 +192,20 @@ 
 
 				<?php $this->intro(); ?>
 
-				<h3><?php _e( 'Configure event colors, number of events to display, grid or list style and more.', 'google-calendar-events' ); ?></h3>
-				<img src="<?php echo $welcome_image_about_path . '/grid-view-basic.png'; ?>" />
+				<h3><?php _e('Configure event colors, number of events to display, grid or list style and more.', 'google-calendar-events'); ?></h3>
+				<img src="<?php echo $welcome_image_about_path.'/grid-view-basic.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( 'Add even more display options with add-ons like', 'google-calendar-events' ); ?>
-					<a href="<?php echo $welcome_addons_link; ?>" target="_blank"><?php _e( 'FullCalendar and Google Calendar Pro', 'google-calendar-events' ); ?></a>.
+					<?php _e('Add even more display options with add-ons like', 'google-calendar-events'); ?>
+					<a href="<?php echo $welcome_addons_link; ?>" target="_blank"><?php _e('FullCalendar and Google Calendar Pro', 'google-calendar-events'); ?></a>.
 				</h3>
-				<a href="<?php echo $welcome_addons_link; ?>" target="_blank"><img src="<?php echo $welcome_image_about_path . '/fullcalendar-google-calendar-pro-grid-view.png'; ?>" /></a>
+				<a href="<?php echo $welcome_addons_link; ?>" target="_blank"><img src="<?php echo $welcome_image_about_path.'/fullcalendar-google-calendar-pro-grid-view.png'; ?>" /></a>
 
-				<h3><a href="<?php echo $welcome_addons_link; ?>" target="_blank"><?php _e( 'View Pricing and Try a Demo of our Simple Calendar Pro Add-ons.', 'google-calendar-events' ); ?></a></h3>
+				<h3><a href="<?php echo $welcome_addons_link; ?>" target="_blank"><?php _e('View Pricing and Try a Demo of our Simple Calendar Pro Add-ons.', 'google-calendar-events'); ?></a></h3>
 
 				<hr/>
 
@@ -232,8 +232,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')
 					);
 
 					?>
@@ -257,10 +257,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
 
@@ -289,31 +289,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>';
 
@@ -333,24 +333,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/admin/pages/system-status.php

Indentation +3 added lines, -3 removed lines

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

Spacing +168 added lines, -168 removed lines

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

includes/feeds/admin/google-admin.php

Indentation +17 added lines, -17 removed lines

@@ -82,12 +82,12 @@ 
 		return array(
 			'name' => $this->feed->name,
 			'description' => __( "To read events from your public Google Calendars you'll need create a Google API key and save it here.", 'google-calendar-events' ) .
-			                 '<br/><br/>' .
-			                 '<em style="font-size: 14px;">' .
-			                 sprintf( __( '<strong>Note:</strong> Calendars configured to use the <strong><a href="%s" target="_blank">Google Calendar Pro add-on</a></strong> use a different method of authorization.', 'google-calendar-events' ),
-				                 simcal_ga_campaign_url( simcal_get_url( 'addons' ), 'core-plugin', 'settings-link' )
-			                 ) .
-			                 '</em>',
+							 '<br/><br/>' .
+							 '<em style="font-size: 14px;">' .
+							 sprintf( __( '<strong>Note:</strong> Calendars configured to use the <strong><a href="%s" target="_blank">Google Calendar Pro add-on</a></strong> use a different method of authorization.', 'google-calendar-events' ),
+								 simcal_ga_campaign_url( simcal_get_url( 'addons' ), 'core-plugin', 'settings-link' )
+							 ) .
+							 '</em>',
 			'fields' => array(
 				'api_key' => array(
 					'type'       => 'standard',
@@ -273,12 +273,12 @@ 
 					'post'        => $post_id,
 					'dismissable' => false,
 					'content'     => '<p>' .
-					                 '<i class="simcal-icon-warning"></i> ' .
-					                 sprintf(
-						                 __( 'Your Google Calendar events will not show up until you <a href="%s">create and save a Google API key</a>.', 'google-calendar-events' ),
-						                 admin_url( 'edit.php?post_type=calendar&page=simple-calendar_settings&tab=feeds' )
-					                 ) .
-					                 '</p>',
+									 '<i class="simcal-icon-warning"></i> ' .
+									 sprintf(
+										 __( 'Your Google Calendar events will not show up until you <a href="%s">create and save a Google API key</a>.', 'google-calendar-events' ),
+										 admin_url( 'edit.php?post_type=calendar&page=simple-calendar_settings&tab=feeds' )
+									 ) .
+									 '</p>',
 				)
 			);
 
@@ -305,11 +305,11 @@ 
 						'post'        => $post_id,
 						'dismissable' => false,
 						'content'     => '<p>' .
-						                 '<i class="simcal-icon-warning"></i> ' .
-						                 __( 'While trying to retrieve events, Google returned an error:', 'google-calendar-events' ) .
-						                 '<br>' . $message . '<br>' .
-						                 __( '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' ) .
-						                 '</p>',
+										 '<i class="simcal-icon-warning"></i> ' .
+										 __( 'While trying to retrieve events, Google returned an error:', 'google-calendar-events' ) .
+										 '<br>' . $message . '<br>' .
+										 __( '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' ) .
+										 '</p>',
 					)
 				);
 

Spacing +90 added lines, -90 removed lines

@@ -10,7 +10,7 @@ 
 use SimpleCalendar\Admin\Notice;
 use SimpleCalendar\Feeds\Google;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -54,7 +54,7 @@ 
 	 * @param string $google_api_key
 	 * @param string $google_calendar_id
 	 */
-	public function __construct( Google $feed, $google_api_key, $google_calendar_id ) {
+	public function __construct(Google $feed, $google_api_key, $google_calendar_id) {
 
 		$this->feed = $feed;
 		$this->google_api_key = $google_api_key;
@@ -62,13 +62,13 @@ 
 
 		$screen = simcal_is_admin_screen();
 
-		if ( 'calendar' == $screen ) {
-			$this->test_api_key_connection( $this->google_calendar_id );
-			add_filter( 'simcal_settings_meta_tabs_li', array( $this, 'add_settings_meta_tab_li' ), 10, 1 );
-			add_action( 'simcal_settings_meta_panels', array( $this, 'add_settings_meta_panel' ), 10, 1 );
+		if ('calendar' == $screen) {
+			$this->test_api_key_connection($this->google_calendar_id);
+			add_filter('simcal_settings_meta_tabs_li', array($this, 'add_settings_meta_tab_li'), 10, 1);
+			add_action('simcal_settings_meta_panels', array($this, 'add_settings_meta_panel'), 10, 1);
 		}
 
-		add_action( 'simcal_process_settings_meta', array( $this, 'process_meta' ), 10, 1 );
+		add_action('simcal_process_settings_meta', array($this, 'process_meta'), 10, 1);
 	}
 
 	/**
@@ -81,20 +81,20 @@ 
 	public function settings_fields() {
 		return array(
 			'name' => $this->feed->name,
-			'description' => __( "To read events from your public Google Calendars you'll need create a Google API key and save it here.", 'google-calendar-events' ) .
-			                 '<br/><br/>' .
-			                 '<em style="font-size: 14px;">' .
-			                 sprintf( __( '<strong>Note:</strong> Calendars configured to use the <strong><a href="%s" target="_blank">Google Calendar Pro add-on</a></strong> use a different method of authorization.', 'google-calendar-events' ),
-				                 simcal_ga_campaign_url( simcal_get_url( 'addons' ), 'core-plugin', 'settings-link' )
-			                 ) .
+			'description' => __("To read events from your public Google Calendars you'll need create a Google API key and save it here.", 'google-calendar-events').
+			                 '<br/><br/>'.
+			                 '<em style="font-size: 14px;">'.
+			                 sprintf(__('<strong>Note:</strong> Calendars configured to use the <strong><a href="%s" target="_blank">Google Calendar Pro add-on</a></strong> use a different method of authorization.', 'google-calendar-events'),
+				                 simcal_ga_campaign_url(simcal_get_url('addons'), 'core-plugin', 'settings-link')
+			                 ).
 			                 '</em>',
 			'fields' => array(
 				'api_key' => array(
 					'type'       => 'standard',
 					'subtype'    => 'text',
-					'class'      => array( 'simcal-wide-text regular-text', 'ltr' ),
-					'title'      => __( 'Google API Key', 'google-calendar-events' ),
-					'validation' => array( $this, 'check_google_api_key' ),
+					'class'      => array('simcal-wide-text regular-text', 'ltr'),
+					'title'      => __('Google API Key', 'google-calendar-events'),
+					'validation' => array($this, 'check_google_api_key'),
 				),
 			),
 		);
@@ -113,27 +113,27 @@ 
 	 *
 	 * @return true|string
 	 */
-	public function check_google_api_key( $api_key = '' ) {
+	public function check_google_api_key($api_key = '') {
 
 		$message    = '';
 		$has_errors = false;
 
-		if ( empty( $api_key ) ){
+		if (empty($api_key)) {
 			$api_key = $this->google_api_key;
-			if ( empty( $api_key ) ) {
-				$settings = get_option( 'simple-calendar_settings_feeds' );
-				$api_key = isset( $settings['google']['api_key'] ) ? esc_attr( $settings['google']['api_key'] ) : '';
+			if (empty($api_key)) {
+				$settings = get_option('simple-calendar_settings_feeds');
+				$api_key = isset($settings['google']['api_key']) ? esc_attr($settings['google']['api_key']) : '';
 			}
 		}
 
-		$message = '<p class="description">' .
-				   sprintf( __( '<a href="%s" target="_blank">Step-by-step instructions</a> ', 'google-calendar-events' ),
-					   simcal_ga_campaign_url( simcal_get_url( 'docs' ) . '/google-api-key/', 'core-plugin', 'settings-link' )
-				   ) .
-				   '<br/>' .
-				   sprintf( __( '<a href="%s" target="_blank">Google Developers Console</a> ', 'google-calendar-events' ),
-					   simcal_get_url( 'gdev-console' )
-				   ) .
+		$message = '<p class="description">'.
+				   sprintf(__('<a href="%s" target="_blank">Step-by-step instructions</a> ', 'google-calendar-events'),
+					   simcal_ga_campaign_url(simcal_get_url('docs').'/google-api-key/', 'core-plugin', 'settings-link')
+				   ).
+				   '<br/>'.
+				   sprintf(__('<a href="%s" target="_blank">Google Developers Console</a> ', 'google-calendar-events'),
+					   simcal_get_url('gdev-console')
+				   ).
 				   '</p>';
 
 		return $message;
@@ -148,15 +148,15 @@ 
 	 *
 	 * @return array
 	 */
-	public function add_settings_meta_tab_li( $tabs ) {
-		return array_merge( $tabs, array(
+	public function add_settings_meta_tab_li($tabs) {
+		return array_merge($tabs, array(
 			'google' => array(
 				'label'   => $this->feed->name,
 				'target'  => 'google-settings-panel',
-				'class'   => array( 'simcal-feed-type', 'simcal-feed-type-google' ),
+				'class'   => array('simcal-feed-type', 'simcal-feed-type-google'),
 				'icon'    => 'simcal-icon-google',
 			),
-		) );
+		));
 	}
 
 	/**
@@ -166,7 +166,7 @@ 
 	 *
 	 * @param int $post_id
 	 */
-	public function add_settings_meta_panel( $post_id ) {
+	public function add_settings_meta_panel($post_id) {
 
 		$inputs = array(
 			$this->feed->type => array(
@@ -175,30 +175,30 @@ 
 					'subtype'     => 'text',
 					'name'        => '_google_calendar_id',
 					'id'          => '_google_calendar_id',
-					'title'       => __( 'Calendar ID', 'google-calendar-events' ),
-					'tooltip'     => __( 'Visit your Google Calendar account, copy your public calendar ID, then paste it here.', 'google-calendar-events' ),
-					'placeholder' => __( 'Enter a valid Google Calendar ID from a public calendar', 'google-calendar-events' ),
-					'escaping'    => array( $this->feed, 'esc_google_calendar_id' ),
-					'validation'  => array( $this, 'test_api_key_connection' ),
+					'title'       => __('Calendar ID', 'google-calendar-events'),
+					'tooltip'     => __('Visit your Google Calendar account, copy your public calendar ID, then paste it here.', 'google-calendar-events'),
+					'placeholder' => __('Enter a valid Google Calendar ID from a public calendar', 'google-calendar-events'),
+					'escaping'    => array($this->feed, 'esc_google_calendar_id'),
+					'validation'  => array($this, 'test_api_key_connection'),
 				),
 				'_google_events_search_query' => array(
 					'type'        => 'standard',
 					'subtype'     => 'text',
 					'name'        => '_google_events_search_query',
 					'id'          => '_google_events_search_query',
-					'title'       => __( 'Search Query', 'google-calendar-events' ),
-					'tooltip'     => __( 'Type in keywords if you only want display events that match these terms. You can use basic boolean search operators too.', 'google-calendar-events' ),
-					'placeholder' => __( 'Filter events to display by search terms...', 'google-calendar-events' ),
+					'title'       => __('Search Query', 'google-calendar-events'),
+					'tooltip'     => __('Type in keywords if you only want display events that match these terms. You can use basic boolean search operators too.', 'google-calendar-events'),
+					'placeholder' => __('Filter events to display by search terms...', 'google-calendar-events'),
 				),
 				'_google_events_recurring' => array(
 					'type'    => 'select',
 					'name'    => '_google_events_recurring',
 					'id'      => '_google_events_recurring',
-					'title'   => __( 'Recurring Events', 'google-calendar-events' ),
-					'tooltip' => __( 'Events that are programmed to repeat themselves periodically.', 'google-calendar-events' ),
+					'title'   => __('Recurring Events', 'google-calendar-events'),
+					'tooltip' => __('Events that are programmed to repeat themselves periodically.', 'google-calendar-events'),
 					'options' => array(
-						'show' => __( 'Show all', 'google-calendar-events' ),
-						'first-only' => __( 'Only show first occurrence', 'google-calendar-events' ),
+						'show' => __('Show all', 'google-calendar-events'),
+						'first-only' => __('Only show first occurrence', 'google-calendar-events'),
 					),
 				),
 				'_google_events_max_results' => array(
@@ -206,8 +206,8 @@ 
 					'subtype'     => 'number',
 					'name'        => '_google_events_max_results',
 					'id'          => '_google_events_max_results',
-					'title'       => __( 'Maximum Events', 'google-calendar-events' ),
-					'tooltip'     => __( 'Google Calendar only allows to query for a maximum amount of 2500 events from a calendar each time.', 'google-calendar-events' ),
+					'title'       => __('Maximum Events', 'google-calendar-events'),
+					'tooltip'     => __('Google Calendar only allows to query for a maximum amount of 2500 events from a calendar each time.', 'google-calendar-events'),
 					'class'       => array(
 						'simcal-field-small',
 					),
@@ -224,9 +224,9 @@ 
 		<div id="google-settings-panel" class="simcal-panel">
 			<table>
 				<thead>
-					<tr><th colspan="2"><?php _e( 'Google Calendar Settings', 'google-calendar-events' ); ?></th></tr>
+					<tr><th colspan="2"><?php _e('Google Calendar Settings', 'google-calendar-events'); ?></th></tr>
 				</thead>
-				<?php Settings::print_panel_fields( $inputs, $post_id ); ?>
+				<?php Settings::print_panel_fields($inputs, $post_id); ?>
 			</table>
 		</div>
 		<?php
@@ -242,47 +242,47 @@ 
 	 *
 	 * @return true|string
 	 */
-	public function test_api_key_connection( $google_calendar_id ) {
+	public function test_api_key_connection($google_calendar_id) {
 
 		global $post;
 
-		$post_id = isset( $post->ID ) ? $post->ID : 0;
+		$post_id = isset($post->ID) ? $post->ID : 0;
 		$feed = null;
-		if ( $feed_type = wp_get_object_terms( $post_id, 'calendar_feed' ) ) {
-			$feed = sanitize_title( current( $feed_type )->name );
+		if ($feed_type = wp_get_object_terms($post_id, 'calendar_feed')) {
+			$feed = sanitize_title(current($feed_type)->name);
 		}
 
 		$message = '';
 		$error = '';
 		$has_errors = false;
 
-		$message .= '<p class="description">' .
+		$message .= '<p class="description">'.
 					sprintf(
-						__( 'Step 1: Set the Google Calendar you want to use as <strong>"public."</strong> <a href="%1s" target="_blank">Detailed instructions</a>', 'google-calendar-events' ) . '<br />' .
-						__( 'Step 2: Copy and paste your Google Calendar ID here. <a href="%2s" target="_blank">Detailed instructions</a>', 'google-calendar-events' ),
-						simcal_ga_campaign_url( simcal_get_url( 'docs' ) . '/make-google-calendar-public/', 'core-plugin', 'settings-link' ),
-						simcal_ga_campaign_url( simcal_get_url( 'docs' ) . '/find-google-calendar-id/', 'core-plugin', 'settings-link' )
-					) . '</p>';
+						__('Step 1: Set the Google Calendar you want to use as <strong>"public."</strong> <a href="%1s" target="_blank">Detailed instructions</a>', 'google-calendar-events').'<br />'.
+						__('Step 2: Copy and paste your Google Calendar ID here. <a href="%2s" target="_blank">Detailed instructions</a>', 'google-calendar-events'),
+						simcal_ga_campaign_url(simcal_get_url('docs').'/make-google-calendar-public/', 'core-plugin', 'settings-link'),
+						simcal_ga_campaign_url(simcal_get_url('docs').'/find-google-calendar-id/', 'core-plugin', 'settings-link')
+					).'</p>';
 
-		if ( $post_id > 0 && ! is_null( $feed ) && ! empty( $this->feed->type ) ) {
+		if ($post_id > 0 && ! is_null($feed) && ! empty($this->feed->type)) {
 
-			$no_key_notice = new Notice( array(
-					'id'          => array( 'calendar_' . $post_id => 'google-no-api-key' ),
+			$no_key_notice = new Notice(array(
+					'id'          => array('calendar_'.$post_id => 'google-no-api-key'),
 					'type'        => 'error',
 					'screen'      => 'calendar',
 					'post'        => $post_id,
 					'dismissable' => false,
-					'content'     => '<p>' .
-					                 '<i class="simcal-icon-warning"></i> ' .
+					'content'     => '<p>'.
+					                 '<i class="simcal-icon-warning"></i> '.
 					                 sprintf(
-						                 __( 'Your Google Calendar events will not show up until you <a href="%s">create and save a Google API key</a>.', 'google-calendar-events' ),
-						                 admin_url( 'edit.php?post_type=calendar&page=simple-calendar_settings&tab=feeds' )
-					                 ) .
+						                 __('Your Google Calendar events will not show up until you <a href="%s">create and save a Google API key</a>.', 'google-calendar-events'),
+						                 admin_url('edit.php?post_type=calendar&page=simple-calendar_settings&tab=feeds')
+					                 ).
 					                 '</p>',
 				)
 			);
 
-			if ( empty( $this->google_api_key ) && ( $feed == $this->feed->type ) ) {
+			if (empty($this->google_api_key) && ($feed == $this->feed->type)) {
 
 				$has_errors = true;
 				$no_key_notice->add();
@@ -292,28 +292,28 @@ 
 				$no_key_notice->remove();
 
 				try {
-					$this->feed->make_request( $google_calendar_id );
-				} catch ( \Exception $e ) {
+					$this->feed->make_request($google_calendar_id);
+				} catch (\Exception $e) {
 					$error   = $e->getMessage();
-					$message = ! empty( $error ) ? '<blockquote>' . $error . '</blockquote>' : '';
+					$message = ! empty($error) ? '<blockquote>'.$error.'</blockquote>' : '';
 				}
 
-				$error_notice = new Notice( array(
-						'id'          => array( 'calendar_' . $post_id => 'google-error-response' ),
+				$error_notice = new Notice(array(
+						'id'          => array('calendar_'.$post_id => 'google-error-response'),
 						'type'        => 'error',
 						'screen'      => 'calendar',
 						'post'        => $post_id,
 						'dismissable' => false,
-						'content'     => '<p>' .
-						                 '<i class="simcal-icon-warning"></i> ' .
-						                 __( 'While trying to retrieve events, Google returned an error:', 'google-calendar-events' ) .
-						                 '<br>' . $message . '<br>' .
-						                 __( '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' ) .
+						'content'     => '<p>'.
+						                 '<i class="simcal-icon-warning"></i> '.
+						                 __('While trying to retrieve events, Google returned an error:', 'google-calendar-events').
+						                 '<br>'.$message.'<br>'.
+						                 __('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').
 						                 '</p>',
 					)
 				);
 
-				if ( ! empty( $error ) && ( $feed == $this->feed->type ) ) {
+				if ( ! empty($error) && ($feed == $this->feed->type)) {
 					$error_notice->add();
 					$has_errors = true;
 				} else {
@@ -335,21 +335,21 @@ 
 	 *
 	 * @param int $post_id
 	 */
-	public function process_meta( $post_id ) {
+	public function process_meta($post_id) {
 
-		$calendar_id = isset( $_POST['_google_calendar_id'] ) ? base64_encode( trim( $_POST['_google_calendar_id'] ) ): '';
-		update_post_meta( $post_id, '_google_calendar_id', $calendar_id );
+		$calendar_id = isset($_POST['_google_calendar_id']) ? base64_encode(trim($_POST['_google_calendar_id'])) : '';
+		update_post_meta($post_id, '_google_calendar_id', $calendar_id);
 
-		$search_query = isset( $_POST['_google_events_search_query'] ) ? sanitize_text_field( $_POST['_google_events_search_query'] ) : '';
-		update_post_meta( $post_id, '_google_events_search_query', $search_query );
+		$search_query = isset($_POST['_google_events_search_query']) ? sanitize_text_field($_POST['_google_events_search_query']) : '';
+		update_post_meta($post_id, '_google_events_search_query', $search_query);
 
-		$recurring = isset( $_POST['_google_events_recurring'] ) ? sanitize_key( $_POST['_google_events_recurring'] ) : 'show';
-		update_post_meta( $post_id, '_google_events_recurring', $recurring );
+		$recurring = isset($_POST['_google_events_recurring']) ? sanitize_key($_POST['_google_events_recurring']) : 'show';
+		update_post_meta($post_id, '_google_events_recurring', $recurring);
 
-		$max_results = isset( $_POST['_google_events_max_results'] ) ? absint( $_POST['_google_events_max_results'] ) : '2500';
-		update_post_meta( $post_id, '_google_events_max_results', $max_results );
+		$max_results = isset($_POST['_google_events_max_results']) ? absint($_POST['_google_events_max_results']) : '2500';
+		update_post_meta($post_id, '_google_events_max_results', $max_results);
 
-		$this->test_api_key_connection( $calendar_id );
+		$this->test_api_key_connection($calendar_id);
 	}
 
 }

includes/main.php

Spacing +26 added lines, -26 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Admin\License_Manager;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -71,7 +71,7 @@ 
 	 * @return Plugin
 	 */
 	public static function get_instance() {
-		if ( is_null( self::$_instance ) ) {
+		if (is_null(self::$_instance)) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -81,14 +81,14 @@ 
 	 * Cloning is forbidden.
 	 */
 	public function __clone() {
-		_doing_it_wrong( __FUNCTION__, 'Cloning the main instance of this plugin is forbidden.', '1.0.0' );
+		_doing_it_wrong(__FUNCTION__, 'Cloning the main instance of this plugin is forbidden.', '1.0.0');
 	}
 
 	/**
 	 * Unserializing instances of this class is forbidden.
 	 */
 	public function __wakeup() {
-		_doing_it_wrong( __FUNCTION__, 'Unserializing instances of this plugin is forbidden.', '1.0.0' );
+		_doing_it_wrong(__FUNCTION__, 'Unserializing instances of this plugin is forbidden.', '1.0.0');
 	}
 
 	/**
@@ -100,22 +100,22 @@ 
 
 		// Load plugin.
 		require_once 'autoload.php';
-		$this->locale = apply_filters( 'plugin_locale', get_locale(), 'google-calendar-events' );
+		$this->locale = apply_filters('plugin_locale', get_locale(), 'google-calendar-events');
 		$this->load();
 
 		// Installation hooks.
-		register_activation_hook( SIMPLE_CALENDAR_MAIN_FILE, array( 'SimpleCalendar\Installation', 'activate' ) );
-		register_deactivation_hook( SIMPLE_CALENDAR_MAIN_FILE, array( 'SimpleCalendar\Installation', 'deactivate' ) );
+		register_activation_hook(SIMPLE_CALENDAR_MAIN_FILE, array('SimpleCalendar\Installation', 'activate'));
+		register_deactivation_hook(SIMPLE_CALENDAR_MAIN_FILE, array('SimpleCalendar\Installation', 'deactivate'));
 
 		// Do update call here.
-		add_action( 'admin_init', array( $this, 'update' ), 999 );
+		add_action('admin_init', array($this, 'update'), 999);
 
 		// Init hooks.
-		add_action( 'init', array( $this, 'init' ), 5 );
-		add_action( 'admin_init', array( $this, 'register_settings' ), 5 );
+		add_action('init', array($this, 'init'), 5);
+		add_action('admin_init', array($this, 'register_settings'), 5);
 
 		// Upon plugin loaded action hook.
-		do_action( 'simcal_loaded' );
+		do_action('simcal_loaded');
 	}
 
 	/**
@@ -132,7 +132,7 @@ 
 		new Post_Types();
 
 		// Load back end.
-		if ( is_admin() ) {
+		if (is_admin()) {
 			$this->load_admin();
 		} else {
 			// Load front end scripts and styles.
@@ -174,7 +174,7 @@ 
 		// Init menus and settings.
 		new Admin\Menus();
 
-		if ( defined( 'DOING_AJAX' ) ) {
+		if (defined('DOING_AJAX')) {
 			// Admin ajax callbacks.
 			new Admin\Ajax();
 		}
@@ -188,16 +188,16 @@ 
 	public function init() {
 
 		// Before init action hook.
-		do_action( 'before_simcal_init' );
+		do_action('before_simcal_init');
 
 		// Set up localization.
-		add_action( 'plugins_loaded', array( $this, 'load_plugin_textdomain' ) );
+		add_action('plugins_loaded', array($this, 'load_plugin_textdomain'));
 
 		// Init objects factory.
 		$this->objects = new Objects();
 
 		// Upon init action hook.
-		do_action( 'simcal_init' );
+		do_action('simcal_init');
 	}
 
 	/**
@@ -207,7 +207,7 @@ 
 	 */
 	public function load_plugin_textdomain() {
 
-		load_plugin_textdomain( 'google-calendar-events', false, dirname( plugin_basename( SIMPLE_CALENDAR_MAIN_FILE ) ) . '/i18n/' );
+		load_plugin_textdomain('google-calendar-events', false, dirname(plugin_basename(SIMPLE_CALENDAR_MAIN_FILE)).'/i18n/');
 	}
 
 	/**
@@ -216,9 +216,9 @@ 
 	 * @since 3.0.0
 	 */
 	public function register_settings() {
-		if ( is_admin() && ! defined( 'DOING_AJAX' ) ) {
+		if (is_admin() && ! defined('DOING_AJAX')) {
 			$settings = new Admin\Pages();
-			$settings->register_settings( $settings->get_settings() );
+			$settings->register_settings($settings->get_settings());
 		}
 	}
 
@@ -230,7 +230,7 @@ 
 	 * @return string
 	 */
 	public function ajax_url() {
-		return admin_url( 'admin-ajax.php', 'relative' );
+		return admin_url('admin-ajax.php', 'relative');
 	}
 
 	/**
@@ -242,17 +242,17 @@ 
 	 *
 	 * @return string
 	 */
-	public function get_url( $case ) {
-		switch ( $case ) {
+	public function get_url($case) {
+		switch ($case) {
 			case 'codex' :
 			case 'apidocs' :
 				return 'http://codex.simplecalendar.io';
 			case 'addons' :
-				return self::$homepage . '/addons/';
+				return self::$homepage.'/addons/';
 			case 'gcal-pro' :
-				return self::$homepage . '/addons/google-calendar-pro/';
+				return self::$homepage.'/addons/google-calendar-pro/';
 			case 'fullcal' :
-				return self::$homepage . '/addons/full-calendar/';
+				return self::$homepage.'/addons/full-calendar/';
 			case 'docs' :
 				return 'http://docs.simplecalendar.io';
 			case 'github' :
@@ -273,7 +273,7 @@ 
 	 * @since 3.0.0
 	 */
 	public static function update() {
-		$update = new Update( SIMPLE_CALENDAR_VERSION );
+		$update = new Update(SIMPLE_CALENDAR_VERSION);
 	}
 
 }

includes/events/event-builder.php

Doc Comments +9 added lines, -2 removed lines

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

Indentation +17 added lines, -17 removed lines

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

Spacing +233 added lines, -233 removed lines

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