moonstonemedia / Simple-Calendar

includes/widgets.php

Spacing +8 added lines, -8 removed lines

@@ -6,7 +6,7 @@ 
  */
 namespace SimpleCalendar;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -34,11 +34,11 @@ 
 	 */
 	public function __construct() {
 
-		$this->widgets = apply_filters( 'simcal_get_widgets', array(
+		$this->widgets = apply_filters('simcal_get_widgets', array(
 			'SimpleCalendar\Widgets\Calendar'
-		), array() );
+		), array());
 
-		add_action( 'widgets_init', array( $this, 'register' ) );
+		add_action('widgets_init', array($this, 'register'));
 	}
 
 	/**
@@ -50,13 +50,13 @@ 
 
 		$widgets = $this->widgets;
 
-		if ( ! empty( $widgets ) && is_array( $widgets ) ) {
-			foreach ( $widgets as $widget ) {
-				register_widget( $widget );
+		if ( ! empty($widgets) && is_array($widgets)) {
+			foreach ($widgets as $widget) {
+				register_widget($widget);
 			}
 		}
 
-		do_action( 'simcal_register_widgets' );
+		do_action('simcal_register_widgets');
 	}
 
 }

includes/widgets/calendar.php

Spacing +29 added lines, -29 removed lines

@@ -9,7 +9,7 @@ 
 use SimpleCalendar\Abstracts\Calendar_View;
 use SimpleCalendar\Abstracts\Widget;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -46,18 +46,18 @@ 
 	public function __construct() {
 
 		$id_base        = 'gce_widget'; // old id kept for legacy reasons
-		$name           = __( 'Simple Calendar', 'google-calendar-events' );
+		$name           = __('Simple Calendar', 'google-calendar-events');
 		$widget_options = array(
-			'description' => __( 'Display a calendar of events from one of your calendar feeds.', 'google-calendar-events' )
+			'description' => __('Display a calendar of events from one of your calendar feeds.', 'google-calendar-events')
 		);
 
-		parent::__construct( $id_base, $name, $widget_options );
+		parent::__construct($id_base, $name, $widget_options);
 
-		if ( is_admin() ) {
-			if ( ! defined( 'DOING_AJAX' ) ) {
+		if (is_admin()) {
+			if ( ! defined('DOING_AJAX')) {
 				$this->calendars = simcal_get_calendars();
 			} else {
-				$this->calendars = get_transient( '_simple-calendar_feed_ids' );
+				$this->calendars = get_transient('_simple-calendar_feed_ids');
 			}
 		}
 	}
@@ -70,18 +70,18 @@ 
 	 * @param array $args     Display arguments.
 	 * @param array $instance The settings for the particular instance of the widget.
 	 */
-	public function widget( $args, $instance ) {
+	public function widget($args, $instance) {
 
 		echo $args['before_widget'];
 
-		if ( ! empty( $instance['title'] ) ) {
+		if ( ! empty($instance['title'])) {
 
-			echo $args['before_title']  . apply_filters( 'widget_title', $instance['title'] ) . $args['after_title'];
+			echo $args['before_title'].apply_filters('widget_title', $instance['title']).$args['after_title'];
 		}
 
-		$id = isset( $instance['calendar_id'] ) ? absint( $instance['calendar_id'] ) : 0;
-		if ( $id > 0 ) {
-			simcal_print_calendar( $id );
+		$id = isset($instance['calendar_id']) ? absint($instance['calendar_id']) : 0;
+		if ($id > 0) {
+			simcal_print_calendar($id);
 		}
 
 		echo $args['after_widget'];
@@ -101,12 +101,12 @@ 
 	 *
 	 * @return array Settings to save or bool false to cancel saving.
 	 */
-	public function update( $new_instance, $old_instance ) {
+	public function update($new_instance, $old_instance) {
 
 		$instance = array();
 
-		$instance['title']          = ( ! empty( $new_instance['title'] ) )        ? sanitize_text_field( $new_instance['title'] ) : '';
-		$instance['calendar_id']    = ( ! empty( $new_instance['calendar_id'] ) )  ? absint( $new_instance['calendar_id'] ) : '';
+		$instance['title']          = ( ! empty($new_instance['title'])) ? sanitize_text_field($new_instance['title']) : '';
+		$instance['calendar_id']    = ( ! empty($new_instance['calendar_id'])) ? absint($new_instance['calendar_id']) : '';
 
 		return $instance;
 	}
@@ -120,34 +120,34 @@ 
 	 *
 	 * @return string
 	 */
-	public function form( $instance ) {
+	public function form($instance) {
 
-		$title          = isset( $instance['title'] )       ? esc_attr( $instance['title'] ) : __( 'Calendar', 'google-calendar-events' );
-		$calendar_id    = isset( $instance['calendar_id'] ) ? esc_attr( $instance['calendar_id'] ) : '';
+		$title          = isset($instance['title']) ? esc_attr($instance['title']) : __('Calendar', 'google-calendar-events');
+		$calendar_id    = isset($instance['calendar_id']) ? esc_attr($instance['calendar_id']) : '';
 
 		?>
 		<div class="simcal-calendar-widget-settings">
 
 			<p>
-				<label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:', 'google-calendar-events' ); ?></label>
+				<label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'google-calendar-events'); ?></label>
 				<br>
 				<input type="text"
-				       name="<?php echo $this->get_field_name( 'title' ); ?>"
-				       id="<?php echo $this->get_field_id( 'title' ); ?>"
+				       name="<?php echo $this->get_field_name('title'); ?>"
+				       id="<?php echo $this->get_field_id('title'); ?>"
 				       class="widefat simcal-field simcal-field-standard simcal-field-text"
 				       value="<?php echo $title; ?>">
 			</p>
 
 			<p>
-				<label for="<?php echo $this->get_field_id( 'calendar_id' ); ?>"><?php _e( 'Calendar:', 'google-calendar-events' ); ?></label>
+				<label for="<?php echo $this->get_field_id('calendar_id'); ?>"><?php _e('Calendar:', 'google-calendar-events'); ?></label>
 				<br>
-				<?php $multiselect = count( $this->calendars ) > 15 ? ' simcal-field-select-enhanced' : ''; ?>
-				<select name="<?php echo $this->get_field_name( 'calendar_id' ) ?>"
-				        id="<?php echo $this->get_field_id( 'calendar_id' ) ?>"
+				<?php $multiselect = count($this->calendars) > 15 ? ' simcal-field-select-enhanced' : ''; ?>
+				<select name="<?php echo $this->get_field_name('calendar_id') ?>"
+				        id="<?php echo $this->get_field_id('calendar_id') ?>"
 						class="simcal-field simcal-field-select<?php echo $multiselect; ?>"
-						data-noresults="<?php __( 'No calendars found.', 'google-calendar-events' ); ?>">
-						<?php foreach ( $this->calendars as $id => $name ) : ?>
-							<option value="<?php echo $id; ?>" <?php selected( $id, $calendar_id, true ); ?>><?php echo $name; ?></option>
+						data-noresults="<?php __('No calendars found.', 'google-calendar-events'); ?>">
+						<?php foreach ($this->calendars as $id => $name) : ?>
+							<option value="<?php echo $id; ?>" <?php selected($id, $calendar_id, true); ?>><?php echo $name; ?></option>
 						<?php endforeach; ?>
 				</select>
 			</p>

uninstall.php

Spacing +12 added lines, -12 removed lines

@@ -6,20 +6,20 @@ 
  */
 
 // Exit if not uninstalling from WordPress.
-if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
+if ( ! defined('WP_UNINSTALL_PLUGIN')) {
 	exit;
 }
 
 // Get user options whether to delete settings and/or data.
-$settings = get_option( 'simple-calendar_settings_advanced' );
+$settings = get_option('simple-calendar_settings_advanced');
 
-if ( isset( $settings['installation']['delete_settings'] ) ) {
+if (isset($settings['installation']['delete_settings'])) {
 	$delete_settings = 'yes' == $settings['installation']['delete_settings'] ? true : false;
 } else {
 	$delete_settings = false;
 }
 
-if ( isset( $settings['installation']['erase_data'] ) ) {
+if (isset($settings['installation']['erase_data'])) {
 	$erase_data = 'yes' == $settings['installation']['erase_data'] ? true : false;
 } else {
 	$erase_data = false;
@@ -28,7 +28,7 @@ 
 global $wpdb;
 
 // Delete settings.
-if ( ( $delete_settings === true ) || ( $erase_data === true ) ) {
+if (($delete_settings === true) || ($erase_data === true)) {
 	$wpdb->query(
 		"
 DELETE FROM $wpdb->options WHERE option_name LIKE '%simple-calendar%';
@@ -37,7 +37,7 @@ 
 }
 
 // Delete calendar data.
-if ( $erase_data === true ) {
+if ($erase_data === true) {
 
 	// Delete calendar posts.
 	$wpdb->query(
@@ -47,20 +47,20 @@ 
 	);
 
 	// Delete calendar postmeta.
-	$wpdb->query( "
+	$wpdb->query("
 DELETE meta FROM {$wpdb->postmeta} meta LEFT JOIN {$wpdb->posts} posts ON posts.ID = meta.post_id WHERE posts.ID IS NULL;
 "
 	);
 
 	// Delete calendar terms.
-	$terms = get_terms( array(
+	$terms = get_terms(array(
 		'calendar_category',
 		'calendar_feed',
 		'calendar_type',
-	) );
-	if ( ! empty( $terms ) && is_array( $terms ) ) {
-		foreach ( $terms as $term ) {
-			wp_delete_term( $term->term_id, $term->taxonomy );
+	));
+	if ( ! empty($terms) && is_array($terms)) {
+		foreach ($terms as $term) {
+			wp_delete_term($term->term_id, $term->taxonomy);
 		}
 	}
 

includes/events/event.php

Spacing +75 added lines, -75 removed lines

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

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

Spacing +105 added lines, -105 removed lines

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

includes/admin/welcome.php

Spacing +69 added lines, -69 removed lines

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

includes/admin/fields/checkbox.php

Spacing +21 added lines, -21 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Abstracts\Field;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit; // Exit if accessed directly.
 }
 
@@ -28,9 +28,9 @@ 
 	 *
 	 * @param array $field
 	 */
-	public function __construct( $field ) {
+	public function __construct($field) {
 		$this->type_class = 'simcal-field-checkboxes';
-		parent::__construct( $field );
+		parent::__construct($field);
 	}
 
 	/**
@@ -40,33 +40,33 @@ 
 	 */
 	public function html() {
 
-		if ( ! empty( $this->options ) && count( (array) $this->options ) > 1 ) {
+		if ( ! empty($this->options) && count((array) $this->options) > 1) {
 
-			if ( ! empty( $this->description ) ) {
-				echo '<p class="description">' . wp_kses_post( $this->description ) . ' ' . $this->tooltip . '</p>';
+			if ( ! empty($this->description)) {
+				echo '<p class="description">'.wp_kses_post($this->description).' '.$this->tooltip.'</p>';
 			}
 
 			?>
-			<fieldset class="<?php echo $this->class; ?>" <?php echo ! empty( $this->style ) ? 'style="' . $this->style . '"' : ''; ?>>
+			<fieldset class="<?php echo $this->class; ?>" <?php echo ! empty($this->style) ? 'style="'.$this->style.'"' : ''; ?>>
 				<?php
 
-				if ( ! empty( $this->title ) ) {
-					echo '<legend class="screen-reader-text"><span>' . $this->title . '</span></legend>';
+				if ( ! empty($this->title)) {
+					echo '<legend class="screen-reader-text"><span>'.$this->title.'</span></legend>';
 				}
 
 				?>
 				<ul>
-					<?php foreach ( $this->options as $option => $name ) : ?>
+					<?php foreach ($this->options as $option => $name) : ?>
 						<li>
-							<label for="<?php echo $this->id . '-' . trim( strval( $option ) ); ?>">
+							<label for="<?php echo $this->id.'-'.trim(strval($option)); ?>">
 								<input name="<?php echo $this->name; ?>"
-								       id="<?php echo $this->id . '-' . trim( strval( $option ) ); ?>"
+								       id="<?php echo $this->id.'-'.trim(strval($option)); ?>"
 								       class="simcal-field simcal-field-checkbox"
 								       type="checkbox"
-								       value="<?php echo trim( strval( $option ) ); ?>"
-										<?php checked( $this->value, 'yes', true ); ?>
+								       value="<?php echo trim(strval($option)); ?>"
+										<?php checked($this->value, 'yes', true); ?>
 									<?php echo $this->attributes; ?>
-									/><?php echo esc_attr( $name ); ?>
+									/><?php echo esc_attr($name); ?>
 							</label>
 						</li>
 					<?php endforeach; ?>
@@ -77,8 +77,8 @@ 
 		} else {
 
 			?>
-			<span class="simcal-field-bool" <?php echo $this->style ? 'style="' . $this->style . '"' : ''; ?>>
-				<?php if ( ! empty( $this->title ) ) : ?>
+			<span class="simcal-field-bool" <?php echo $this->style ? 'style="'.$this->style.'"' : ''; ?>>
+				<?php if ( ! empty($this->title)) : ?>
 					<span class="screen-reader-text"><?php echo $this->title; ?></span>
 				<?php endif; ?>
 				<input name="<?php echo $this->name; ?>"
@@ -86,15 +86,15 @@ 
 				       id="<?php echo $this->id; ?>"
 				       class="simcal-field simcal-field-checkbox <?php echo $this->class; ?>"
 				       value="yes"
-					<?php checked( $this->value, 'yes', true ); ?>
-					<?php echo $this->attributes; ?>/><?php _e( 'Yes', 'google-calendar-events' ); ?>
+					<?php checked($this->value, 'yes', true); ?>
+					<?php echo $this->attributes; ?>/><?php _e('Yes', 'google-calendar-events'); ?>
 			</span>
 			<?php
 
 			echo $this->tooltip;
 
-			if ( ! empty( $this->description ) ) {
-				echo '<p class="description">' . wp_kses_post( $this->description ) . '</p>';
+			if ( ! empty($this->description)) {
+				echo '<p class="description">'.wp_kses_post($this->description).'</p>';
 			}
 
 		}

includes/admin/pages.php

Spacing +61 added lines, -61 removed lines

@@ -9,7 +9,7 @@ 
 use SimpleCalendar\Abstracts\Field;
 use SimpleCalendar\Abstracts\Admin_Page;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -53,20 +53,20 @@ 
 	 *
 	 * @param string $page
 	 */
-	public function __construct( $page = 'settings' ) {
+	public function __construct($page = 'settings') {
 
 		$this->page = $page;
-		$settings_pages = ! is_null( \SimpleCalendar\plugin()->objects ) ? simcal_get_admin_pages() : '';
+		$settings_pages = ! is_null(\SimpleCalendar\plugin()->objects) ? simcal_get_admin_pages() : '';
 		$settings_page_tabs = array();
-		$tabs = isset( $settings_pages[ $page ] ) ? $settings_pages[ $page ] : false;
+		$tabs = isset($settings_pages[$page]) ? $settings_pages[$page] : false;
 
-		if ( $tabs && is_array( $tabs ) ) {
-			foreach ( $tabs as $tab ) {
+		if ($tabs && is_array($tabs)) {
+			foreach ($tabs as $tab) {
 
-				$settings_page = simcal_get_admin_page( $tab );
+				$settings_page = simcal_get_admin_page($tab);
 
-				if ( $settings_page instanceof Admin_Page ) {
-					$settings_page_tabs[ $settings_page->id ] = $settings_page;
+				if ($settings_page instanceof Admin_Page) {
+					$settings_page_tabs[$settings_page->id] = $settings_page;
 				}
 			}
 
@@ -74,9 +74,9 @@ 
 		}
 
 		// The first tab is the default tab when opening a page.
-		$this->tab = isset( $tabs[0] ) ? $tabs[0] : '';
+		$this->tab = isset($tabs[0]) ? $tabs[0] : '';
 
-		do_action( 'simcal_admin_pages', $page );
+		do_action('simcal_admin_pages', $page);
 	}
 
 	/**
@@ -91,15 +91,15 @@ 
 
 		$settings = array();
 
-		if ( ! empty( $this->settings ) && is_array( $this->settings ) ) {
-			foreach ( $this->settings as $id => $object ) {
+		if ( ! empty($this->settings) && is_array($this->settings)) {
+			foreach ($this->settings as $id => $object) {
 
-				if ( $object instanceof Admin_Page ) {
+				if ($object instanceof Admin_Page) {
 
 					$settings_page = $object->get_settings();
 
-					if ( isset( $settings_page[ $id ] ) ) {
-						$settings[ $id ] = $settings_page[ $id ];
+					if (isset($settings_page[$id])) {
+						$settings[$id] = $settings_page[$id];
 					}
 				}
 
@@ -118,48 +118,48 @@ 
 	 *
 	 * @param array $settings
 	 */
-	public function register_settings( $settings = array() ) {
+	public function register_settings($settings = array()) {
 
 		$settings = $settings ? $settings : $this->get_settings();
 
-		if ( ! empty( $settings ) && is_array( $settings ) ) {
+		if ( ! empty($settings) && is_array($settings)) {
 
-			foreach ( $settings as $tab_id => $settings_page ) {
+			foreach ($settings as $tab_id => $settings_page) {
 
-				if ( isset( $settings_page['sections'] ) ) {
+				if (isset($settings_page['sections'])) {
 
 					$sections = $settings_page['sections'];
 
-					if ( ! empty( $sections ) && is_array( $sections ) ) {
+					if ( ! empty($sections) && is_array($sections)) {
 
-						foreach ( $sections as $section_id => $section ) {
+						foreach ($sections as $section_id => $section) {
 
 							add_settings_section(
 								$section_id,
-								isset( $section['title'] ) ? $section['title'] : '',
-								isset( $section['callback'] ) ? $section['callback'] : '',
-								'simple-calendar_' . $this->page . '_' . $tab_id
+								isset($section['title']) ? $section['title'] : '',
+								isset($section['callback']) ? $section['callback'] : '',
+								'simple-calendar_'.$this->page.'_'.$tab_id
 							);
 
-							if ( isset( $section['fields'] ) ) {
+							if (isset($section['fields'])) {
 
 								$fields = $section['fields'];
 
-								if ( ! empty( $fields ) && is_array( $fields ) ) {
+								if ( ! empty($fields) && is_array($fields)) {
 
-									foreach ( $fields as $field ) {
+									foreach ($fields as $field) {
 
-										if ( isset( $field['id'] ) && isset( $field['type'] ) ) {
+										if (isset($field['id']) && isset($field['type'])) {
 
-											$field_object = simcal_get_field( $field, $field['type'] );
+											$field_object = simcal_get_field($field, $field['type']);
 
-											if ( $field_object instanceof Field ) {
+											if ($field_object instanceof Field) {
 
 												add_settings_field(
 													$field['id'],
-													isset( $field['title'] ) ? $field['title'] : '',
-													array( $field_object, 'html' ),
-													'simple-calendar_' . $this->page . '_' . $tab_id,
+													isset($field['title']) ? $field['title'] : '',
+													array($field_object, 'html'),
+													'simple-calendar_'.$this->page.'_'.$tab_id,
 													$section_id
 												);
 
@@ -173,12 +173,12 @@ 
 
 							} // are there fields?
 
-							$page = simcal_get_admin_page( $tab_id );
+							$page = simcal_get_admin_page($tab_id);
 
 							register_setting(
-								'simple-calendar_' . $this->page . '_' . $tab_id,
-								'simple-calendar_' . $this->page . '_' . $tab_id,
-								$page instanceof Admin_Page ? array( $page, 'validate' ) : ''
+								'simple-calendar_'.$this->page.'_'.$tab_id,
+								'simple-calendar_'.$this->page.'_'.$tab_id,
+								$page instanceof Admin_Page ? array($page, 'validate') : ''
 							);
 
 						} // loop sections
@@ -203,7 +203,7 @@ 
 		global $current_tab;
 
 		// Get current tab/section
-		$current_tab = empty( $_GET['tab'] ) ? $this->tab : sanitize_title( $_GET['tab'] );
+		$current_tab = empty($_GET['tab']) ? $this->tab : sanitize_title($_GET['tab']);
 		$this->tab = $current_tab;
 
 		?>
@@ -215,45 +215,45 @@ 
 
 				// Include settings pages
 				$settings_pages = self::get_settings();
-				if ( ! empty( $settings_pages ) && is_array( $settings_pages ) ) {
+				if ( ! empty($settings_pages) && is_array($settings_pages)) {
 
 					echo '<h2 class="nav-tab-wrapper simcal-nav-tab-wrapper">';
 
 					// Get tabs for the settings page
-					if ( ! empty( $settings_pages ) && is_array( $settings_pages ) ) {
+					if ( ! empty($settings_pages) && is_array($settings_pages)) {
 
-						foreach ( $settings_pages as $id => $settings ) {
+						foreach ($settings_pages as $id => $settings) {
 
-							$tab_id    = isset( $id ) ? $id : '';
-							$tab_label = isset( $settings['label'] ) ? $settings['label'] : '';
-							$tab_link  = admin_url( 'edit.php?post_type=calendar&page=simple-calendar_' . $this->page . '&tab=' . $tab_id );
+							$tab_id    = isset($id) ? $id : '';
+							$tab_label = isset($settings['label']) ? $settings['label'] : '';
+							$tab_link  = admin_url('edit.php?post_type=calendar&page=simple-calendar_'.$this->page.'&tab='.$tab_id);
 
-							echo '<a href="' . $tab_link . '" class="nav-tab ' . ( $current_tab == $tab_id ? 'nav-tab-active' : '' ) . '">' . $tab_label . '</a>';
+							echo '<a href="'.$tab_link.'" class="nav-tab '.($current_tab == $tab_id ? 'nav-tab-active' : '').'">'.$tab_label.'</a>';
 						}
 
 					}
 
-					do_action( 'simcal_admin_page_' . $this->page . '_tabs' );
+					do_action('simcal_admin_page_'.$this->page.'_tabs');
 
 					echo '</h2>';
 
 					settings_errors();
 
-					foreach ( $settings_pages as $tab_id => $contents ) {
+					foreach ($settings_pages as $tab_id => $contents) {
 
-						if ( $tab_id === $current_tab ) {
+						if ($tab_id === $current_tab) {
 
-							echo isset( $contents['description'] ) ? '<p>' . $contents['description'] . '</p>' : '';
+							echo isset($contents['description']) ? '<p>'.$contents['description'].'</p>' : '';
 
-							do_action( 'simcal_admin_page_' .  $this->page . '_' . $current_tab . '_start' );
+							do_action('simcal_admin_page_'.$this->page.'_'.$current_tab.'_start');
 
-							settings_fields( 'simple-calendar_' . $this->page . '_' . $tab_id );
-							do_settings_sections( 'simple-calendar_' . $this->page . '_' . $tab_id );
+							settings_fields('simple-calendar_'.$this->page.'_'.$tab_id);
+							do_settings_sections('simple-calendar_'.$this->page.'_'.$tab_id);
 
-							do_action( 'simcal_admin_page_' .  $this->page . '_' . $current_tab . '_end' );
+							do_action('simcal_admin_page_'.$this->page.'_'.$current_tab.'_end');
 
-							$submit = apply_filters( 'simcal_admin_page_' . $this->page . '_' . $current_tab . '_submit', true );
-							if ( true === $submit ) {
+							$submit = apply_filters('simcal_admin_page_'.$this->page.'_'.$current_tab.'_submit', true);
+							if (true === $submit) {
 								submit_button();
 							}
 						}
@@ -263,17 +263,17 @@ 
 				// Add option to show we ran through default settings
 				// We also run a check here for the main settings page option. This is to determine if this is a fresh install or if they already had
 				// the plugin installed. The main feed settings page would give the best idea of that since user's have to enter an API key on this page to get it working.
-				if ( false === get_option( 'simple-calendar_defaults' ) && false === get_option( 'simple-calendar_settings_feeds' ) ) {
+				if (false === get_option('simple-calendar_defaults') && false === get_option('simple-calendar_settings_feeds')) {
 
-					$default_advanced = array (
-										'assets' => array (
+					$default_advanced = array(
+										'assets' => array(
 												'always_enqueue' => 'yes',
 										),
 									);
 
-					update_option( 'simple-calendar_settings_advanced', $default_advanced );
+					update_option('simple-calendar_settings_advanced', $default_advanced);
 
-					add_option( 'simple-calendar_defaults', 1 );
+					add_option('simple-calendar_defaults', 1);
 				}
 
 

includes/admin/pages/advanced.php

Spacing +40 added lines, -40 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Abstracts\Admin_Page;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -29,7 +29,7 @@ 
 	public function __construct() {
 		$this->id           = 'advanced';
 		$this->option_group = 'settings';
-		$this->label        = __( 'Advanced', 'google-calendar-events' );
+		$this->label        = __('Advanced', 'google-calendar-events');
 		//$this->description  = __( 'Advanced settings.', 'google-calendar-events' );
 		$this->sections     = $this->add_sections();
 		$this->fields       = $this->add_fields();
@@ -43,16 +43,16 @@ 
 	 * @return array
 	 */
 	public function add_sections() {
-		return apply_filters( 'simcal_add_' . $this->option_group . '_' . $this->id .'_sections', array(
+		return apply_filters('simcal_add_'.$this->option_group.'_'.$this->id.'_sections', array(
 			'assets' => array(
-				'title'       => __( 'Scripts and Styles', 'google-calendar-events' ),
-				'description' => __( 'Manage front end assets that handle the calendars appearance and user interface.', 'google-calendar-events' )
+				'title'       => __('Scripts and Styles', 'google-calendar-events'),
+				'description' => __('Manage front end assets that handle the calendars appearance and user interface.', 'google-calendar-events')
 			),
 			'installation' => array(
-				'title'       => __( 'Installation', 'google-calendar-events' ),
-				'description' => __( 'Manage your data (plugin settings and saved calendars).', 'google-calendar-events' )
+				'title'       => __('Installation', 'google-calendar-events'),
+				'description' => __('Manage your data (plugin settings and saved calendars).', 'google-calendar-events')
 			)
-		) );
+		));
 	}
 
 	/**
@@ -65,57 +65,57 @@ 
 	public function add_fields() {
 
 		$fields       = array();
-		$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 => $a ) :
+		foreach ($this->sections  as $section => $a) :
 
-			if ( 'assets' == $section ) {
+			if ('assets' == $section) {
 
-				$fields[ $section ] = array(
+				$fields[$section] = array(
 					'always_enqueue' => array(
-						'title'   => __( 'Always Enqueue', 'google-calendar-events' ),
-						'tooltip' => __( 'If ticked, this option will load all scripts on every page load.', 'google-calendar-events' ),
+						'title'   => __('Always Enqueue', 'google-calendar-events'),
+						'tooltip' => __('If ticked, this option will load all scripts on every page load.', 'google-calendar-events'),
 						'type'    => 'checkbox',
-						'name'    => 'simple-calendar_' . $this->option_group . '_' . $this->id . '[' . $section . '][always_enqueue]',
-						'id'      => 'simple-calendar-' . $this->option_group . '-' . $this->id . '-' . $section . '-always-enqueue',
-						'value'   => $this->get_option_value( $section, 'always_enqueue' ),
+						'name'    => 'simple-calendar_'.$this->option_group.'_'.$this->id.'['.$section.'][always_enqueue]',
+						'id'      => 'simple-calendar-'.$this->option_group.'-'.$this->id.'-'.$section.'-always-enqueue',
+						'value'   => $this->get_option_value($section, 'always_enqueue'),
 					),
 					'disable_css' => array(
-						'title'   => __( 'Disable Styles', 'google-calendar-events' ),
-						'tooltip' => __( 'If ticked, this option will prevent front end stylesheet to load.', 'google-calendar-events' ),
+						'title'   => __('Disable Styles', 'google-calendar-events'),
+						'tooltip' => __('If ticked, this option will prevent front end stylesheet to load.', 'google-calendar-events'),
 						'type'    => 'checkbox',
-						'name'    => 'simple-calendar_' . $this->option_group . '_' . $this->id . '[' . $section . '][disable_css]',
-						'id'      => 'simple-calendar-' . $this->option_group . '-' . $this->id . '-' . $section . '-disable-css',
-						'value'   => $this->get_option_value( $section, 'disable_css' )
+						'name'    => 'simple-calendar_'.$this->option_group.'_'.$this->id.'['.$section.'][disable_css]',
+						'id'      => 'simple-calendar-'.$this->option_group.'-'.$this->id.'-'.$section.'-disable-css',
+						'value'   => $this->get_option_value($section, 'disable_css')
 					),
 					'disable_js' => array(
-						'title'   => __( 'Disable Scripts', 'google-calendar-events' ),
-						'tooltip' => __( 'If ticked, this option will prevent front end JavaScript to load.', 'google-calendar-events' ),
+						'title'   => __('Disable Scripts', 'google-calendar-events'),
+						'tooltip' => __('If ticked, this option will prevent front end JavaScript to load.', 'google-calendar-events'),
 						'type'    => 'checkbox',
-						'name'    => 'simple-calendar_' . $this->option_group . '_' . $this->id . '[' . $section . '][disable_js]',
-						'id'      => 'simple-calendar-' . $this->option_group . '-' . $this->id . '-' . $section . '-disable-js',
-						'value'   => $this->get_option_value( $section, 'disable_js' )
+						'name'    => 'simple-calendar_'.$this->option_group.'_'.$this->id.'['.$section.'][disable_js]',
+						'id'      => 'simple-calendar-'.$this->option_group.'-'.$this->id.'-'.$section.'-disable-js',
+						'value'   => $this->get_option_value($section, 'disable_js')
 					)
 				);
 
-			} elseif ( 'installation' == $section ) {
+			} elseif ('installation' == $section) {
 
-				$fields[ $section ] = array(
+				$fields[$section] = array(
 					'delete_settings' => array(
-						'title'   => __( 'Delete settings', 'google-calendar-events' ),
-						'tooltip' => __( 'Tick this option if you want to wipe this plugin settings from database when uninstalling.', 'google-calendar-events' ),
+						'title'   => __('Delete settings', 'google-calendar-events'),
+						'tooltip' => __('Tick this option if you want to wipe this plugin settings from database when uninstalling.', 'google-calendar-events'),
 						'type'    => 'checkbox',
-						'name'    => 'simple-calendar_' . $this->option_group . '_' . $this->id . '[' . $section . '][delete_settings]',
-						'id'      => 'simple-calendar-' . $this->option_group . '-' . $this->id . '-' . $section . '-delete-settings',
-						'value'   => $this->get_option_value( $section, 'delete_settings' ),
+						'name'    => 'simple-calendar_'.$this->option_group.'_'.$this->id.'['.$section.'][delete_settings]',
+						'id'      => 'simple-calendar-'.$this->option_group.'-'.$this->id.'-'.$section.'-delete-settings',
+						'value'   => $this->get_option_value($section, 'delete_settings'),
 					),
 					'erase_data' => array(
-						'title'   => __( 'Erase calendar data', 'google-calendar-events' ),
-						'tooltip' => __( 'By default your data will be retained in database even after uninstall. Tick this option if you want to delete all your calendar data when uninstalling.', 'google-calendar-events' ),
+						'title'   => __('Erase calendar data', 'google-calendar-events'),
+						'tooltip' => __('By default your data will be retained in database even after uninstall. Tick this option if you want to delete all your calendar data when uninstalling.', 'google-calendar-events'),
 						'type'    => 'checkbox',
-						'name'    => 'simple-calendar_' . $this->option_group . '_' . $this->id . '[' . $section . '][erase_data]',
-						'id'      => 'simple-calendar_' . $this->option_group . '_' . $this->id . '-delete-data',
-						'value'   => $this->get_option_value( $section, 'erase_data' ),
+						'name'    => 'simple-calendar_'.$this->option_group.'_'.$this->id.'['.$section.'][erase_data]',
+						'id'      => 'simple-calendar_'.$this->option_group.'_'.$this->id.'-delete-data',
+						'value'   => $this->get_option_value($section, 'erase_data'),
 					)
 				);
 
@@ -123,7 +123,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);
 	}
 
 }