moonstonemedia / Simple-Calendar

includes/objects.php

Spacing +86 added lines, -86 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Abstracts as Object;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -31,27 +31,27 @@ 
 	public function __construct() {
 
 		// Add default feed type.
-		add_filter( 'simcal_get_feed_types', function( $feed_types ) {
-			return array_merge( $feed_types, array(
+		add_filter('simcal_get_feed_types', function($feed_types) {
+			return array_merge($feed_types, array(
 				'google',
 				'grouped-calendars',
-			) );
-		}, 10, 1 );
+			));
+		}, 10, 1);
 
 		// Add default calendar type.
-		add_filter( 'simcal_get_calendar_types', function( $calendar_types ) {
-			return array_merge( $calendar_types, array(
+		add_filter('simcal_get_calendar_types', function($calendar_types) {
+			return array_merge($calendar_types, array(
 				'default-calendar' => array(
 					'grid',
 					'list',
 				),
-			) );
-		}, 10, 1 );
+			));
+		}, 10, 1);
 
 		// Add default admin objects.
-		if ( $is_admin = is_admin() ) {
-			add_filter( 'simcal_get_admin_pages', function( $admin_pages ) {
-				return array_merge( $admin_pages, array(
+		if ($is_admin = is_admin()) {
+			add_filter('simcal_get_admin_pages', function($admin_pages) {
+				return array_merge($admin_pages, array(
 					'add-ons' => array(
 						'add-ons',
 					),
@@ -63,11 +63,11 @@ 
 					'tools' => array(
 						'system-status',
 					),
-				) );
-			}, 10, 1 );
+				));
+			}, 10, 1);
 		}
 
-		do_action( 'simcal_load_objects', $is_admin );
+		do_action('simcal_load_objects', $is_admin);
 	}
 
 	/**
@@ -78,8 +78,8 @@ 
 	 * @return array
 	 */
 	public function get_feed_types() {
-		$array = apply_filters( 'simcal_get_feed_types', array() );
-		ksort( $array );
+		$array = apply_filters('simcal_get_feed_types', array());
+		ksort($array);
 		return $array;
 	}
 
@@ -91,8 +91,8 @@ 
 	 * @return array
 	 */
 	public function get_calendar_types() {
-		$array = apply_filters( 'simcal_get_calendar_types', array() );
-		ksort( $array );
+		$array = apply_filters('simcal_get_calendar_types', array());
+		ksort($array);
 		return $array;
 	}
 
@@ -104,7 +104,7 @@ 
 	 * @return array
 	 */
 	public function get_admin_pages() {
-		return apply_filters( 'simcal_get_admin_pages', array() );
+		return apply_filters('simcal_get_admin_pages', array());
 	}
 
 	/**
@@ -118,30 +118,30 @@ 
 	 *
 	 * @return null|Object\Calendar
 	 */
-	public function get_calendar( $object ) {
+	public function get_calendar($object) {
 
-		if ( is_string( $object ) ) {
-			return ! empty( $object ) ? $this->get_object( $object, 'calendar', '' ) : null;
+		if (is_string($object)) {
+			return ! empty($object) ? $this->get_object($object, 'calendar', '') : null;
 		}
 
-		if ( is_object( $object ) ) {
-			if ( $object instanceof Object\Calendar ) {
-				return $this->get_object( $object->type, 'feed', $object );
-			} elseif ( $object instanceof \WP_Post ) {
-				if ( $type = wp_get_object_terms( $object->ID, 'calendar_type' ) ) {
-					$name = sanitize_title( current( $type )->name );
-					return $this->get_object( $name, 'calendar', $object );
+		if (is_object($object)) {
+			if ($object instanceof Object\Calendar) {
+				return $this->get_object($object->type, 'feed', $object);
+			} elseif ($object instanceof \WP_Post) {
+				if ($type = wp_get_object_terms($object->ID, 'calendar_type')) {
+					$name = sanitize_title(current($type)->name);
+					return $this->get_object($name, 'calendar', $object);
 				}
-			} elseif ( isset( $object->type ) && isset( $object->id ) ) {
-				return $this->get_object( $object->type, 'calendar', $object->id );
+			} elseif (isset($object->type) && isset($object->id)) {
+				return $this->get_object($object->type, 'calendar', $object->id);
 			}
 		}
 
-		if ( is_int( $object ) ) {
-			$post = get_post( $object );
-			if ( $post && ( $type = wp_get_object_terms( $post->ID, 'calendar_type' ) ) ) {
-				$name = sanitize_title( current( $type )->name );
-				return $this->get_object( $name, 'calendar', $post );
+		if (is_int($object)) {
+			$post = get_post($object);
+			if ($post && ($type = wp_get_object_terms($post->ID, 'calendar_type'))) {
+				$name = sanitize_title(current($type)->name);
+				return $this->get_object($name, 'calendar', $post);
 			}
 		}
 
@@ -158,20 +158,20 @@ 
 	 *
 	 * @return null|Object\Calendar_View
 	 */
-	public function get_calendar_view( $id = 0, $name = '' ) {
+	public function get_calendar_view($id = 0, $name = '') {
 
-		if ( ! $name && $id > 0 ) {
+		if ( ! $name && $id > 0) {
 
-			$calendar_view = get_post_meta( $id, '_calendar_view', true );
+			$calendar_view = get_post_meta($id, '_calendar_view', true);
 
-			if ( $terms = wp_get_object_terms( $id, 'calendar_type' ) ) {
-				$calendar_type = sanitize_title( current( $terms )->name );
-				$name = isset( $calendar_view[ $calendar_type ] ) ? $calendar_type . '-' . $calendar_view[ $calendar_type ] : '';
+			if ($terms = wp_get_object_terms($id, 'calendar_type')) {
+				$calendar_type = sanitize_title(current($terms)->name);
+				$name = isset($calendar_view[$calendar_type]) ? $calendar_type.'-'.$calendar_view[$calendar_type] : '';
 			}
 
 		}
 
-		return $name ? $this->get_object( $name, 'calendar-view', '' ) : null;
+		return $name ? $this->get_object($name, 'calendar-view', '') : null;
 	}
 
 	/**
@@ -185,34 +185,34 @@ 
 	 *
 	 * @return null|Object\Feed
 	 */
-	public function get_feed( $object ) {
+	public function get_feed($object) {
 
-		if ( is_string( $object ) ) {
-			return ! empty( $object ) ? $this->get_object( $object, 'feed', '' ) : null;
+		if (is_string($object)) {
+			return ! empty($object) ? $this->get_object($object, 'feed', '') : null;
 		}
 
-		if ( is_object( $object ) ) {
-			if ( $object instanceof Object\Calendar ) {
+		if (is_object($object)) {
+			if ($object instanceof Object\Calendar) {
 				$feed_name = '';
-				if ( empty( $object->feed ) ) {
-					if ( $feed_type = wp_get_object_terms( $object->id, 'feed_type' ) ) {
-						$feed_name = sanitize_title( current( $feed_type )->name );
+				if (empty($object->feed)) {
+					if ($feed_type = wp_get_object_terms($object->id, 'feed_type')) {
+						$feed_name = sanitize_title(current($feed_type)->name);
 					}
 				} else {
 					$feed_name = $object->feed;
 				}
-				return $this->get_object( $feed_name, 'feed', $object );
-			} elseif ( $object instanceof \WP_Post ) {
-				$calendar = $this->get_calendar( $object );
-				return $this->get_object( $calendar->feed, 'feed', $calendar );
-			} elseif ( isset( $object->feed ) && isset( $object->id ) ) {
-				return $this->get_object( $object->feed, 'feed', $object );
+				return $this->get_object($feed_name, 'feed', $object);
+			} elseif ($object instanceof \WP_Post) {
+				$calendar = $this->get_calendar($object);
+				return $this->get_object($calendar->feed, 'feed', $calendar);
+			} elseif (isset($object->feed) && isset($object->id)) {
+				return $this->get_object($object->feed, 'feed', $object);
 			}
 		}
 
-		if ( is_int( $object ) ) {
-			$calendar = $this->get_calendar( $object );
-			return isset( $calendar->feed ) ? $this->get_object( $calendar->feed, 'feed', $calendar ) : null;
+		if (is_int($object)) {
+			$calendar = $this->get_calendar($object);
+			return isset($calendar->feed) ? $this->get_object($calendar->feed, 'feed', $calendar) : null;
 		}
 
 		return null;
@@ -228,13 +228,13 @@ 
 	 *
 	 * @return null|Object\Field
 	 */
-	public function get_field( $args, $name = '' ) {
+	public function get_field($args, $name = '') {
 
-		if ( empty( $name ) ) {
-			$name = isset( $args['type'] ) ? $args['type'] : false;
+		if (empty($name)) {
+			$name = isset($args['type']) ? $args['type'] : false;
 		}
 
-		return $name ? $this->get_object( $name, 'field', $args ) : null;
+		return $name ? $this->get_object($name, 'field', $args) : null;
 	}
 
 	/**
@@ -246,8 +246,8 @@ 
 	 *
 	 * @return null|Object\Admin_Page
 	 */
-	public function get_admin_page( $name ) {
-		return $name ? $this->get_object( $name, 'admin-page' ) : null;
+	public function get_admin_page($name) {
+		return $name ? $this->get_object($name, 'admin-page') : null;
 	}
 
 	/**
@@ -262,7 +262,7 @@ 
 	 *
 	 * @return null|Object
 	 */
-	private function get_object( $name, $type, $args = '' ) {
+	private function get_object($name, $type, $args = '') {
 
 		$types = array(
 			'admin-page',
@@ -272,11 +272,11 @@ 
 			'field',
 		);
 
-		if ( in_array( $type, $types ) ) {
+		if (in_array($type, $types)) {
 
-			$class_name = $this->make_class_name( $name, $type );
-			$parent     = '\\' . __NAMESPACE__ . '\Abstracts\\' . implode( '_', array_map( 'ucfirst', explode( '-', $type ) ) );
-			$class      = class_exists( $class_name ) ? new $class_name( $args ) : false;
+			$class_name = $this->make_class_name($name, $type);
+			$parent     = '\\'.__NAMESPACE__.'\Abstracts\\'.implode('_', array_map('ucfirst', explode('-', $type)));
+			$class      = class_exists($class_name) ? new $class_name($args) : false;
 
 			return $class instanceof $parent ? $class : null;
 		}
@@ -298,25 +298,25 @@ 
 	 *
 	 * @return string The class name complete with its full namespace.
 	 */
-	private function make_class_name( $name, $type ) {
-
-		if ( 'calendar' == $type ) {
-			$namespace = '\\' . __NAMESPACE__ . '\Calendars\\';
-		} elseif ( 'calendar-view' == $type ) {
-			$namespace = '\\' . __NAMESPACE__ . '\Calendars\Views\\';
-		} elseif ( 'feed' == $type ) {
-			$namespace = '\\' . __NAMESPACE__ . '\Feeds\\';
-		} elseif ( 'field' == $type ) {
-			$namespace = '\\' . __NAMESPACE__ . '\Admin\Fields\\';
-		} elseif ( 'admin-page' == $type ) {
-			$namespace = '\\' . __NAMESPACE__ . '\Admin\Pages\\';
+	private function make_class_name($name, $type) {
+
+		if ('calendar' == $type) {
+			$namespace = '\\'.__NAMESPACE__.'\Calendars\\';
+		} elseif ('calendar-view' == $type) {
+			$namespace = '\\'.__NAMESPACE__.'\Calendars\Views\\';
+		} elseif ('feed' == $type) {
+			$namespace = '\\'.__NAMESPACE__.'\Feeds\\';
+		} elseif ('field' == $type) {
+			$namespace = '\\'.__NAMESPACE__.'\Admin\Fields\\';
+		} elseif ('admin-page' == $type) {
+			$namespace = '\\'.__NAMESPACE__.'\Admin\Pages\\';
 		} else {
 			return '';
 		}
 
-		$class_name = implode( '_', array_map( 'ucfirst', explode( '-', $name ) ) );
+		$class_name = implode('_', array_map('ucfirst', explode('-', $name)));
 
-		return $namespace . $class_name;
+		return $namespace.$class_name;
 	}
 
 }

includes/post-types.php

Spacing +112 added lines, -112 removed lines

@@ -6,7 +6,7 @@ 
  */
 namespace SimpleCalendar;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -26,13 +26,13 @@ 
 	 */
 	public function __construct() {
 		// Register custom taxonomies.
-		add_action( 'init', array( __CLASS__, 'register_taxonomies' ), 5 );
+		add_action('init', array(__CLASS__, 'register_taxonomies'), 5);
 		// Register custom post types.
-		add_action( 'init', array( __CLASS__, 'register_post_types' ), 5 );
+		add_action('init', array(__CLASS__, 'register_post_types'), 5);
 		// Filter the calendar feed post content to display a calendar view.
-		add_filter( 'the_content', array( $this, 'filter_post_content' ), 100 );
+		add_filter('the_content', array($this, 'filter_post_content'), 100);
 		// Delete calendar transients and notices upon post deletion.
-		add_action( 'before_delete_post', array( $this, 'upon_deletion' ), 10, 1 );
+		add_action('before_delete_post', array($this, 'upon_deletion'), 10, 1);
 	}
 
 	/**
@@ -42,32 +42,32 @@ 
 	 */
 	public static function register_taxonomies() {
 
-		do_action( 'simcal_register_taxonomies' );
+		do_action('simcal_register_taxonomies');
 
-		if ( ! taxonomy_exists( 'calendar_feed' ) ) {
+		if ( ! taxonomy_exists('calendar_feed')) {
 
 			// Feed Type.
 			$labels = array(
-				'name'                       => __( 'Events Source Types', 'google-calendar-events' ),
-				'singular_name'              => __( 'Events Source Type', 'google-calendar-events' ),
-				'menu_name'                  => __( 'Events Source Type', 'google-calendar-events' ),
-				'all_items'                  => __( 'All Events Source Types', 'google-calendar-events' ),
-				'parent_item'                => __( 'Parent Events Source Type', 'google-calendar-events' ),
-				'parent_item_colon'          => __( 'Parent Events Source Type:', 'google-calendar-events' ),
-				'new_item_name'              => __( 'New Events Source Type', 'google-calendar-events' ),
-				'add_new_item'               => __( 'Add New Events Source Type', 'google-calendar-events' ),
-				'edit_item'                  => __( 'Edit Events Source Type', 'google-calendar-events' ),
-				'update_item'                => __( 'Update Events Source Type', 'google-calendar-events' ),
-				'view_item'                  => __( 'View Events Source Type', 'google-calendar-events' ),
-				'separate_items_with_commas' => __( 'Separate events source types with commas', 'google-calendar-events' ),
-				'add_or_remove_items'        => __( 'Add or remove events source types', 'google-calendar-events' ),
-				'choose_from_most_used'      => __( 'Choose from the most used', 'google-calendar-events' ),
-				'popular_items'              => __( 'Popular events source types', 'google-calendar-events' ),
-				'search_items'               => __( 'Search Events Source Types', 'google-calendar-events' ),
-				'not_found'                  => __( 'Not Found', 'google-calendar-events' ),
+				'name'                       => __('Events Source Types', 'google-calendar-events'),
+				'singular_name'              => __('Events Source Type', 'google-calendar-events'),
+				'menu_name'                  => __('Events Source Type', 'google-calendar-events'),
+				'all_items'                  => __('All Events Source Types', 'google-calendar-events'),
+				'parent_item'                => __('Parent Events Source Type', 'google-calendar-events'),
+				'parent_item_colon'          => __('Parent Events Source Type:', 'google-calendar-events'),
+				'new_item_name'              => __('New Events Source Type', 'google-calendar-events'),
+				'add_new_item'               => __('Add New Events Source Type', 'google-calendar-events'),
+				'edit_item'                  => __('Edit Events Source Type', 'google-calendar-events'),
+				'update_item'                => __('Update Events Source Type', 'google-calendar-events'),
+				'view_item'                  => __('View Events Source Type', 'google-calendar-events'),
+				'separate_items_with_commas' => __('Separate events source types with commas', 'google-calendar-events'),
+				'add_or_remove_items'        => __('Add or remove events source types', 'google-calendar-events'),
+				'choose_from_most_used'      => __('Choose from the most used', 'google-calendar-events'),
+				'popular_items'              => __('Popular events source types', 'google-calendar-events'),
+				'search_items'               => __('Search Events Source Types', 'google-calendar-events'),
+				'not_found'                  => __('Not Found', 'google-calendar-events'),
 			);
 
-			$args   = array(
+			$args = array(
 				'hierarchical'      => true,
 				'labels'            => $labels,
 				'public'            => false,
@@ -76,34 +76,34 @@ 
 				'show_tagcloud'     => false,
 				'show_ui'           => false,
 			);
-			register_taxonomy( 'calendar_feed', array( 'calendar' ), $args );
+			register_taxonomy('calendar_feed', array('calendar'), $args);
 
 		}
 
-		if ( ! taxonomy_exists( 'calendar_type' ) ) {
+		if ( ! taxonomy_exists('calendar_type')) {
 
 			// Calendar Type.
 			$labels = array(
-				'name'                       => __( 'Calendar Types', 'google-calendar-events' ),
-				'singular_name'              => __( 'Calendar Type', 'google-calendar-events' ),
-				'menu_name'                  => __( 'Calendar Type', 'google-calendar-events' ),
-				'all_items'                  => __( 'All Calendar Types', 'google-calendar-events' ),
-				'parent_item'                => __( 'Parent Calendar Type', 'google-calendar-events' ),
-				'parent_item_colon'          => __( 'Parent Calendar Type:', 'google-calendar-events' ),
-				'new_item_name'              => __( 'New Calendar Type', 'google-calendar-events' ),
-				'add_new_item'               => __( 'Add New Calendar Type', 'google-calendar-events' ),
-				'edit_item'                  => __( 'Edit Calendar Type', 'google-calendar-events' ),
-				'update_item'                => __( 'Update Calendar Type', 'google-calendar-events' ),
-				'view_item'                  => __( 'View Calendar Type', 'google-calendar-events' ),
-				'separate_items_with_commas' => __( 'Separate calendar types with commas', 'google-calendar-events' ),
-				'add_or_remove_items'        => __( 'Add or remove calendar types', 'google-calendar-events' ),
-				'choose_from_most_used'      => __( 'Choose from the most used', 'google-calendar-events' ),
-				'popular_items'              => __( 'Popular calendar types', 'google-calendar-events' ),
-				'search_items'               => __( 'Search Calendar Types', 'google-calendar-events' ),
-				'not_found'                  => __( 'Not Found', 'google-calendar-events' ),
+				'name'                       => __('Calendar Types', 'google-calendar-events'),
+				'singular_name'              => __('Calendar Type', 'google-calendar-events'),
+				'menu_name'                  => __('Calendar Type', 'google-calendar-events'),
+				'all_items'                  => __('All Calendar Types', 'google-calendar-events'),
+				'parent_item'                => __('Parent Calendar Type', 'google-calendar-events'),
+				'parent_item_colon'          => __('Parent Calendar Type:', 'google-calendar-events'),
+				'new_item_name'              => __('New Calendar Type', 'google-calendar-events'),
+				'add_new_item'               => __('Add New Calendar Type', 'google-calendar-events'),
+				'edit_item'                  => __('Edit Calendar Type', 'google-calendar-events'),
+				'update_item'                => __('Update Calendar Type', 'google-calendar-events'),
+				'view_item'                  => __('View Calendar Type', 'google-calendar-events'),
+				'separate_items_with_commas' => __('Separate calendar types with commas', 'google-calendar-events'),
+				'add_or_remove_items'        => __('Add or remove calendar types', 'google-calendar-events'),
+				'choose_from_most_used'      => __('Choose from the most used', 'google-calendar-events'),
+				'popular_items'              => __('Popular calendar types', 'google-calendar-events'),
+				'search_items'               => __('Search Calendar Types', 'google-calendar-events'),
+				'not_found'                  => __('Not Found', 'google-calendar-events'),
 			);
 
-			$args   = array(
+			$args = array(
 				'hierarchical'      => true,
 				'labels'            => $labels,
 				'public'            => false,
@@ -112,34 +112,34 @@ 
 				'show_tagcloud'     => false,
 				'show_ui'           => false,
 			);
-			register_taxonomy( 'calendar_type', array( 'calendar' ), $args );
+			register_taxonomy('calendar_type', array('calendar'), $args);
 
 		}
 
-		if ( ! taxonomy_exists( 'calendar_category' ) ) {
+		if ( ! taxonomy_exists('calendar_category')) {
 
 			// Feed Category.
 			$labels = array(
-				'name'                       => __( 'Categories', 'google-calendar-events' ),
-				'singular_name'              => __( 'Category', 'google-calendar-events' ),
-				'menu_name'                  => __( 'Categories', 'google-calendar-events' ),
-				'all_items'                  => __( 'All Categories', 'google-calendar-events' ),
-				'parent_item'                => __( 'Parent Category', 'google-calendar-events' ),
-				'parent_item_colon'          => __( 'Parent Category:', 'google-calendar-events' ),
-				'new_item_name'              => __( 'New Category', 'google-calendar-events' ),
-				'add_new_item'               => __( 'Add New Category', 'google-calendar-events' ),
-				'edit_item'                  => __( 'Edit Category', 'google-calendar-events' ),
-				'update_item'                => __( 'Update Category', 'google-calendar-events' ),
-				'view_item'                  => __( 'View Category', 'google-calendar-events' ),
-				'separate_items_with_commas' => __( 'Separate categories with commas', 'google-calendar-events' ),
-				'add_or_remove_items'        => __( 'Add or remove categories', 'google-calendar-events' ),
-				'choose_from_most_used'      => __( 'Choose from the most used', 'google-calendar-events' ),
-				'popular_items'              => __( 'Popular Categories', 'google-calendar-events' ),
-				'search_items'               => __( 'Search Categories', 'google-calendar-events' ),
-				'not_found'                  => __( 'Not Found', 'google-calendar-events' ),
+				'name'                       => __('Categories', 'google-calendar-events'),
+				'singular_name'              => __('Category', 'google-calendar-events'),
+				'menu_name'                  => __('Categories', 'google-calendar-events'),
+				'all_items'                  => __('All Categories', 'google-calendar-events'),
+				'parent_item'                => __('Parent Category', 'google-calendar-events'),
+				'parent_item_colon'          => __('Parent Category:', 'google-calendar-events'),
+				'new_item_name'              => __('New Category', 'google-calendar-events'),
+				'add_new_item'               => __('Add New Category', 'google-calendar-events'),
+				'edit_item'                  => __('Edit Category', 'google-calendar-events'),
+				'update_item'                => __('Update Category', 'google-calendar-events'),
+				'view_item'                  => __('View Category', 'google-calendar-events'),
+				'separate_items_with_commas' => __('Separate categories with commas', 'google-calendar-events'),
+				'add_or_remove_items'        => __('Add or remove categories', 'google-calendar-events'),
+				'choose_from_most_used'      => __('Choose from the most used', 'google-calendar-events'),
+				'popular_items'              => __('Popular Categories', 'google-calendar-events'),
+				'search_items'               => __('Search Categories', 'google-calendar-events'),
+				'not_found'                  => __('Not Found', 'google-calendar-events'),
 			);
 
-			$args   = array(
+			$args = array(
 				'hierarchical'      => true,
 				'labels'            => $labels,
 				'public'            => true,
@@ -149,7 +149,7 @@ 
 				'show_ui'           => true,
 			);
 
-			register_taxonomy( 'calendar_category', array( 'calendar' ), $args );
+			register_taxonomy('calendar_category', array('calendar'), $args);
 		}
 
 	}
@@ -161,27 +161,27 @@ 
 	 */
 	public static function register_post_types() {
 
-		do_action( 'simcal_register_post_types' );
+		do_action('simcal_register_post_types');
 
-		if ( ! post_type_exists( 'calendar' ) ) {
+		if ( ! post_type_exists('calendar')) {
 
 			// Calendar feed post type.
-			$labels        = array(
-				'name'               => _x( 'Calendars', 'Post Type General Name', 'google-calendar-events' ),
-				'singular_name'      => _x( 'Calendar', 'Post Type Singular Name', 'google-calendar-events' ),
-				'menu_name'          => __( 'Calendars', 'google-calendar-events' ),
-				'name_admin_bar'     => __( 'Calendar', 'google-calendar-events' ),
-				'parent_item_colon'  => __( 'Parent Calendar:', 'google-calendar-events' ),
-				'all_items'          => __( 'All Calendars', 'google-calendar-events' ),
-				'add_new_item'       => __( 'Add New Calendar', 'google-calendar-events' ),
-				'add_new'            => __( 'Add New', 'google-calendar-events' ),
-				'new_item'           => __( 'New Calendar', 'google-calendar-events' ),
-				'edit_item'          => __( 'Edit Calendar', 'google-calendar-events' ),
-				'update_item'        => __( 'Update Calendar', 'google-calendar-events' ),
-				'view_item'          => __( 'View Calendar', 'google-calendar-events' ),
-				'search_items'       => __( 'Search Calendar', 'google-calendar-events' ),
-				'not_found'          => __( 'Calendars not found', 'google-calendar-events' ),
-				'not_found_in_trash' => __( 'Calendars not found in Trash', 'google-calendar-events' ),
+			$labels = array(
+				'name'               => _x('Calendars', 'Post Type General Name', 'google-calendar-events'),
+				'singular_name'      => _x('Calendar', 'Post Type Singular Name', 'google-calendar-events'),
+				'menu_name'          => __('Calendars', 'google-calendar-events'),
+				'name_admin_bar'     => __('Calendar', 'google-calendar-events'),
+				'parent_item_colon'  => __('Parent Calendar:', 'google-calendar-events'),
+				'all_items'          => __('All Calendars', 'google-calendar-events'),
+				'add_new_item'       => __('Add New Calendar', 'google-calendar-events'),
+				'add_new'            => __('Add New', 'google-calendar-events'),
+				'new_item'           => __('New Calendar', 'google-calendar-events'),
+				'edit_item'          => __('Edit Calendar', 'google-calendar-events'),
+				'update_item'        => __('Update Calendar', 'google-calendar-events'),
+				'view_item'          => __('View Calendar', 'google-calendar-events'),
+				'search_items'       => __('Search Calendar', 'google-calendar-events'),
+				'not_found'          => __('Calendars not found', 'google-calendar-events'),
+				'not_found_in_trash' => __('Calendars not found in Trash', 'google-calendar-events'),
 			);
 
 			$rewrite_rules = array(
@@ -193,12 +193,12 @@ 
 
 			$svg_icon = 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9HcmFwaGljcy9TVkcvMS4xL0RURC9zdmcxMS5kdGQiPjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iU2hhcGVzX3hBMF9JbWFnZV8xXyIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeD0iMHB4IiB5PSIwcHgiIHZpZXdCb3g9IjAgMCAxMDI0IDEwMjQiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDEwMjQgMTAyNCIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+PHBhdGggZmlsbD0ibm9uZSIgc3Ryb2tlPSIjMDAwMDAwIiBzdHJva2UtbWl0ZXJsaW1pdD0iMTAiIGQ9Ik01MTMuNCwxMDEzLjNjLTE2My44LDAtMzI3LjcsMC00OTEuNSwwYy05LjcsMC04LjgsMC45LTguOC04LjljMC0yNDMuNywwLjItNDg3LjMtMC4zLTczMWMtMC4xLTM5LjYsMjcuNy03Ni40LDY5LjYtODIuM2MzLTAuNCw2LTAuNSw5LTAuNWMzNSwwLDcwLDAuMSwxMDUtMC4xYzUuMSwwLDYuNSwxLjQsNi41LDYuNWMtMC4yLDI2LjgsMC4xLDUzLjctMC4yLDgwLjVjLTAuMiwxNS4yLDMuOSwyOC4yLDE1LjksMzguMmMyLjcsMi4yLDUsNC44LDcuNCw3LjRjOCw4LjYsMTguMSwxMi40LDI5LjYsMTIuNGMzMC43LDAuMiw2MS4zLDAuMiw5MiwwYzExLjItMC4xLDIxLjItMy45LDI5LjEtMTIuMmMzLjQtMy42LDctNy4yLDEwLjYtMTAuNmM5LTguNCwxMi43LTE4LjksMTIuNy0zMWMwLjEtMjguMiwwLTU2LjMsMC04NC41YzAtNi42LDAtNi42LDYuNi02LjZjNzEuNSwwLDE0MywwLDIxNC41LDBjNi42LDAsNi42LDAsNi42LDYuN2MwLDI2LjgsMC4yLDUzLjctMC4xLDgwLjVjLTAuMiwxNSw1LjEsMjYuOCwxNS40LDM4YzEzLjYsMTQuNywyOC45LDIwLjgsNDguNywyMC4xYzI1LjYtMSw1MS4zLTAuNCw3Ny0wLjJjMTMuOSwwLjEsMjQuOC01LjEsMzUuNC0xNC40YzE1LjktMTQsMjIuMS0zMC40LDIxLjEtNTEuM2MtMS4xLTI0LjMtMC4xLTQ4LjctMC40LTczYzAtNS4xLDEuNC02LjUsNi41LTYuNWMzNC43LDAuMiw2OS4zLDAsMTA0LDAuMWM0Mi4zLDAuMiw3OC4zLDM2LDc4LjMsNzguM2MwLjEsMjQ2LDAsNDkyLDAsNzM4YzAsNi40LDAsNi40LTcuMyw2LjRDODQyLDEwMTMuMyw2NzcuNywxMDEzLjMsNTEzLjQsMTAxMy4zeiBNNDM5LjUsNjc4LjljMS42LTEsMi4yLTEuNSwzLTEuOGMxMS44LTUuOCwyMS41LTE0LjIsMjktMjQuOGMyNC4zLTM0LjEsMjQuMy03MC45LDguNi0xMDcuOGMtMTMuMy0zMS4zLTM5LjMtNDkuMy03MS01OS40Yy0yNy42LTguOC01Ni05LjQtODQuNS01LjZjLTIwLjMsMi43LTM5LjIsOS42LTU1LjUsMjIuMmMtMzUuNSwyNy4yLTQ4LjQsNjUuMS01MC40LDEwOGMtMC4yLDMuNywyLjEsMy45LDQuOCwzLjljMjIuMiwwLDQ0LjMtMC4xLDY2LjUsMGMzLjgsMCw1LjQtMS4xLDUuMy01LjFjLTAuMS03LjcsMS0xNS4zLDMtMjIuN2M1LjQtMjAsMTYuNS0zNC43LDM3LjgtMzkuN2M4LjEtMS45LDE2LjMtMi4xLDI0LjQtMS4zYzIxLjQsMi4xLDM2LjMsMTMuMSw0My41LDMzLjdjMy41LDEwLjEsMy45LDIwLjQsMi45LDMxYy0yLjIsMjMuNC0xNi4yLDM5LjctMzkuMSw0NC42Yy0xMy4yLDIuOC0yNi42LDQuMS00MC4yLDRjLTMuNywwLTUsMS4yLTQuOSw0LjljMC4xLDE2LjUsMC4yLDMzLDAsNDkuNWMwLDQsMS41LDUuMiw1LjMsNS4xYzEyLjktMC4zLDI1LjYsMC45LDM4LjMsM2MyNi4zLDQuMiw0My41LDE4LjgsNDkuMiw0MmMzLjMsMTMuNSwzLDI3LjEtMC4yLDQwLjZjLTIuMyw5LjctNi44LDE4LjQtMTMuOCwyNS43Yy0xNS40LDE2LjEtMzQuNSwyMS42LTU2LDE4LjljLTI3LjUtMy40LTQzLjUtMTgtNTAuNS00NC44Yy0xLjktNy4zLTMuMS0xNC43LTIuOC0yMi4yYzAuMi00LTEuMS01LjYtNS40LTUuNmMtMjMuNywwLjItNDcuMywwLjItNzEsMGMtNCwwLTUuNCwxLjItNC45LDUuMmMxLjQsMTMuMiwyLjcsMjYuNSw1LjksMzkuNWMxMS4xLDQ1LjIsMzguMiw3NS42LDgzLjQsODguMmMzNi43LDEwLjMsNzMuOCwxMC4xLDExMC41LDAuMWMyNC41LTYuNiw0NC43LTIwLjEsNjEtMzkuOGMyNC41LTI5LjcsMzQuNC02My45LDMxLjQtMTAxLjljLTIuMi0yNy40LTEyLjUtNTEuMy0zMy42LTY5LjhDNDYwLjcsNjg5LjMsNDUxLjksNjgyLDQzOS41LDY3OC45eiBNNzU1LDY5Mi41YzAtNjguNi0wLjEtMTM3LjMsMC4xLTIwNS45YzAtNS4xLTEuNC02LjUtNi41LTYuNGMtMTguMywwLjMtMzYuNywwLjQtNTUsMGMtNS43LTAuMS03LjIsMS45LTguMiw3Yy01LjksMzIuMS0yNC40LDUzLTU2LjMsNjEuMWMtMTcuNSw0LjUtMzUuNiw1LTUzLjUsNS44Yy0zLjksMC4yLTUuMiwxLjQtNS4yLDUuM2MwLjIsMTUuMywwLjIsMzAuNywwLDQ2Yy0wLjEsNC4zLDEuNiw1LjQsNS42LDUuM2MxNC4yLTAuMiwyOC4zLTAuMSw0Mi41LTAuMWMxNS41LDAsMzEsMC4xLDQ2LjUtMC4xYzQuMSwwLDUuOSwxLjMsNS41LDUuNGMtMC4xLDEuNywwLDMuMywwLDVjMCw5Mi4xLDAsMTg0LjMsMCwyNzYuNGMwLDcuMiwwLDcuMiw3LDcuMmMyMy41LDAsNDcsMCw3MC41LDBjNywwLDcsMCw3LTcuMkM3NTUsODI5LjEsNzU1LDc2MC44LDc1NSw2OTIuNXoiLz48cGF0aCBmaWxsPSJub25lIiBzdHJva2U9IiMwMDAwMDAiIHN0cm9rZS1taXRlcmxpbWl0PSIxMCIgZD0iTTM3Ni43LDE5OS4yYzAsMjQuMiwwLDQ4LjMsMCw3Mi41Yy0wLjEsMjMuMS0xNy40LDQwLjUtNDAuNCw0MC42Yy0yMy4zLDAuMS00Ni42LDAuMS03MCwwYy0yMi44LTAuMS00MC4zLTE3LjQtNDAuMy00MC4xYy0wLjEtNDguNS0wLjEtOTYuOSwwLTE0NS40YzAtMjIuNCwxNy41LTQwLDM5LjktNDAuMWMyMy43LTAuMSw0Ny4zLTAuMSw3MSwwYzIyLjQsMC4xLDM5LjgsMTcuNywzOS44LDQwLjFDMzc2LjgsMTUwLjksMzc2LjcsMTc1LjEsMzc2LjcsMTk5LjJ6Ii8+PHBhdGggZmlsbD0ibm9uZSIgc3Ryb2tlPSIjMDAwMDAwIiBzdHJva2UtbWl0ZXJsaW1pdD0iMTAiIGQ9Ik04MDEuNywxOTkuNmMwLDI0LDAsNDgsMCw3MmMwLDIzLjQtMTcuMyw0MC43LTQwLjcsNDAuOGMtMjMuMiwwLjEtNDYuMywwLjEtNjkuNSwwYy0yMy4xLTAuMS00MC41LTE3LjQtNDAuNS00MC41Yy0wLjEtNDguMy0wLjEtOTYuNiwwLTE0NC45YzAtMjIuNywxNy41LTQwLjIsNDAuMi00MC4zYzIzLjMtMC4xLDQ2LjYtMC4xLDcwLDBjMjMuMSwwLjEsNDAuNCwxNy40LDQwLjUsNDAuNUM4MDEuOCwxNTEuMyw4MDEuNywxNzUuNCw4MDEuNywxOTkuNnoiLz48L3N2Zz4=';
 
-			$args          = array(
+			$args = array(
 				'capability_type'     => 'post',
 				'exclude_from_search' => false,
 				'has_archive'         => false,
 				'hierarchical'        => false,
-				'label'               => __( 'Calendar', 'google-calendar-events' ),
+				'label'               => __('Calendar', 'google-calendar-events'),
 				'labels'              => $labels,
 				'query_var'           => true,
 				'public'              => true,
@@ -210,7 +210,7 @@ 
 				'show_in_menu'        => true,
 				'show_in_nav_menus'   => true,
 				'show_ui'             => true,
-				'supports'            => array( 'title', 'editor' ),
+				'supports'            => array('title', 'editor'),
 				'taxonomies'          => array(
 					'calendar_category',
 					'calendar_feed',
@@ -218,7 +218,7 @@ 
 				),
 			);
 
-			register_post_type( 'calendar', $args );
+			register_post_type('calendar', $args);
 		}
 
 	}
@@ -232,49 +232,49 @@ 
 	 *
 	 * @return string
 	 */
-	public function filter_post_content( $the_content ) {
+	public function filter_post_content($the_content) {
 
-		if ( is_singular() ) {
+		if (is_singular()) {
 
 			global $post;
 
-			if ( 'calendar' == $post->post_type ) {
+			if ('calendar' == $post->post_type) {
 
-				if ( is_admin() && ! defined( 'DOING_AJAX' ) ) {
+				if (is_admin() && ! defined('DOING_AJAX')) {
 					return '';
 				} else {
 					ob_start();
-					simcal_print_calendar( $post );
+					simcal_print_calendar($post);
 					return ob_get_clean();
 				}
 
 			} else {
 
 				$post_types = array();
-				$settings   = get_option( 'simple-calendar_settings_calendars' );
-				if ( isset( $settings['general']['attach_calendars_posts'] ) ) {
+				$settings   = get_option('simple-calendar_settings_calendars');
+				if (isset($settings['general']['attach_calendars_posts'])) {
 					$post_types = $settings['general']['attach_calendars_posts'];
 				}
 
-				if ( empty( $post_types ) ) {
+				if (empty($post_types)) {
 					return $the_content;
 				}
 
-				if ( in_array( $post->post_type, (array) $post_types ) ) {
+				if (in_array($post->post_type, (array) $post_types)) {
 
-					$id = absint( get_post_meta( $post->ID, '_simcal_attach_calendar_id', true ) );
+					$id = absint(get_post_meta($post->ID, '_simcal_attach_calendar_id', true));
 
-					if ( $id > 0 ) {
+					if ($id > 0) {
 
-						$pos = esc_attr( get_post_meta( $post->ID, '_simcal_attach_calendar_position', true ) );
+						$pos = esc_attr(get_post_meta($post->ID, '_simcal_attach_calendar_position', true));
 
 						ob_start();
 
-						if ( 'after' == $pos ) {
+						if ('after' == $pos) {
 							echo $the_content;
-							simcal_print_calendar( $id );
-						} elseif ( 'before' == $pos ) {
-							simcal_print_calendar( $id );
+							simcal_print_calendar($id);
+						} elseif ('before' == $pos) {
+							simcal_print_calendar($id);
 							echo $the_content;
 						} else {
 							echo $the_content;
@@ -300,20 +300,20 @@ 
 	 *
 	 * @param $post_id
 	 */
-	public function upon_deletion( $post_id ) {
+	public function upon_deletion($post_id) {
 
-		$post_type = get_post_type( $post_id );
+		$post_type = get_post_type($post_id);
 
-		if ( 'calendar' == $post_type ) {
+		if ('calendar' == $post_type) {
 
-			$notices = get_option( 'simple-calendar_admin_notices', array() );
+			$notices = get_option('simple-calendar_admin_notices', array());
 
-			if ( ! empty( $notices ) && isset( $notices[ 'calendar_' . strval( $post_id ) ] ) ) {
-				unset( $notices[ 'calendar_' . strval( $post_id ) ] );
-				update_option( 'simple-calendar_admin_notices', $notices );
+			if ( ! empty($notices) && isset($notices['calendar_'.strval($post_id)])) {
+				unset($notices['calendar_'.strval($post_id)]);
+				update_option('simple-calendar_admin_notices', $notices);
 			}
 
-			simcal_delete_feed_transients( $post_id );
+			simcal_delete_feed_transients($post_id);
 		}
 	}
 

includes/shortcodes.php

Spacing +12 added lines, -12 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Abstracts\Calendar;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -29,7 +29,7 @@ 
 	public function __construct() {
 
 		// Add shortcodes.
-		add_action( 'init', array( $this, 'register' ) );
+		add_action('init', array($this, 'register'));
 	}
 
 	/**
@@ -39,11 +39,11 @@ 
 	 */
 	public function register() {
 
-		add_shortcode( 'calendar', array( $this, 'print_calendar' ) );
+		add_shortcode('calendar', array($this, 'print_calendar'));
 		// @deprecated legacy shortcode
-		add_shortcode( 'gcal', array( $this, 'print_calendar' ) );
+		add_shortcode('gcal', array($this, 'print_calendar'));
 
-		do_action( 'simcal_add_shortcodes' );
+		do_action('simcal_add_shortcodes');
 	}
 
 	/**
@@ -55,19 +55,19 @@ 
 	 *
 	 * @return string
 	 */
-	public function print_calendar( $attributes ) {
+	public function print_calendar($attributes) {
 
-		$args = shortcode_atts( array(
+		$args = shortcode_atts(array(
 			'id' => null,
-		), $attributes );
+		), $attributes);
 
-		$id = absint( $args['id'] );
+		$id = absint($args['id']);
 
-		if ( $id > 0 ) {
+		if ($id > 0) {
 
-			$calendar = simcal_get_calendar( $id );
+			$calendar = simcal_get_calendar($id);
 
-			if ( $calendar instanceof Calendar ) {
+			if ($calendar instanceof Calendar) {
 				ob_start();
 				$calendar->html();
 				return ob_get_clean();

includes/updates/update-v210.php

Spacing +10 added lines, -10 removed lines

@@ -6,7 +6,7 @@ 
  */
 namespace SimpleCalendar\Updates;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -20,21 +20,21 @@ 
 	 *
 	 * @param array $posts
 	 */
-	public function __construct( $posts ) {
+	public function __construct($posts) {
 
-		if ( ! empty( $posts ) && is_array( $posts ) ) {
+		if ( ! empty($posts) && is_array($posts)) {
 
-			foreach ( $posts as $post ) {
+			foreach ($posts as $post) {
 
-				$url = get_post_meta( $post->ID, 'gce_feed_url', true );
+				$url = get_post_meta($post->ID, 'gce_feed_url', true);
 
-				if ( $url ) {
+				if ($url) {
 
-					$url = str_replace( 'https://www.google.com/calendar/feeds/', '', $url );
-					$url = str_replace( '/public/basic', '', $url );
-					$url = str_replace( '%40', '@', $url );
+					$url = str_replace('https://www.google.com/calendar/feeds/', '', $url);
+					$url = str_replace('/public/basic', '', $url);
+					$url = str_replace('%40', '@', $url);
 
-					update_post_meta( $post->ID, 'gce_feed_url', $url );
+					update_post_meta($post->ID, 'gce_feed_url', $url);
 				}
 
 			}

includes/updates/update-v220.php

Spacing +17 added lines, -17 removed lines

@@ -6,7 +6,7 @@ 
  */
 namespace SimpleCalendar\Updates;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -20,28 +20,28 @@ 
 	 *
 	 * @param array $posts
 	 */
-	public function __construct( $posts ) {
+	public function __construct($posts) {
 
-		if ( ! empty( $posts ) && is_array( $posts ) ) {
+		if ( ! empty($posts) && is_array($posts)) {
 
-			foreach ( $posts as $post ) {
+			foreach ($posts as $post) {
 
-				$gce_list_max_num        = get_post_meta( $post->ID, 'gce_list_max_num', true );
-				$gce_list_max_length     = get_post_meta( $post->ID, 'gce_list_max_length', true );
-				$gce_feed_start_interval = get_post_meta( $post->ID, 'gce_feed_start_interval', true );
-				$gce_feed_start          = get_post_meta( $post->ID, 'gce_feed_start', true );
-				$gce_feed_end_interval   = get_post_meta( $post->ID, 'gce_feed_end_interval', true );
-				$gce_feed_end            = get_post_meta( $post->ID, 'gce_feed_end', true );
+				$gce_list_max_num        = get_post_meta($post->ID, 'gce_list_max_num', true);
+				$gce_list_max_length     = get_post_meta($post->ID, 'gce_list_max_length', true);
+				$gce_feed_start_interval = get_post_meta($post->ID, 'gce_feed_start_interval', true);
+				$gce_feed_start          = get_post_meta($post->ID, 'gce_feed_start', true);
+				$gce_feed_end_interval   = get_post_meta($post->ID, 'gce_feed_end_interval', true);
+				$gce_feed_end            = get_post_meta($post->ID, 'gce_feed_end', true);
 
-				update_post_meta( $post->ID, 'gce_per_page_num', $gce_list_max_num );
-				update_post_meta( $post->ID, 'gce_events_per_page', $gce_list_max_length );
-				update_post_meta( $post->ID, 'gce_feed_start', $gce_feed_start_interval );
-				update_post_meta( $post->ID, 'gce_feed_start_num', $gce_feed_start );
-				update_post_meta( $post->ID, 'gce_feed_end', $gce_feed_end_interval );
-				update_post_meta( $post->ID, 'gce_feed_end_num', $gce_feed_end );
+				update_post_meta($post->ID, 'gce_per_page_num', $gce_list_max_num);
+				update_post_meta($post->ID, 'gce_events_per_page', $gce_list_max_length);
+				update_post_meta($post->ID, 'gce_feed_start', $gce_feed_start_interval);
+				update_post_meta($post->ID, 'gce_feed_start_num', $gce_feed_start);
+				update_post_meta($post->ID, 'gce_feed_end', $gce_feed_end_interval);
+				update_post_meta($post->ID, 'gce_feed_end_num', $gce_feed_end);
 
 				// Add new show tooltips option checked as default.
-				update_post_meta( $post->ID, 'gce_show_tooltips', 1 );
+				update_post_meta($post->ID, 'gce_show_tooltips', 1);
 			}
 
 		}

includes/updates/update-v300.php

Spacing +123 added lines, -123 removed lines

@@ -9,7 +9,7 @@ 
 use Carbon\Carbon;
 use SimpleCalendar\Post_Types;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -23,13 +23,13 @@ 
 	 *
 	 * @param array $posts
 	 */
-	public function __construct( $posts ) {
+	public function __construct($posts) {
 
 		Post_Types::register_taxonomies();
 		Post_Types::register_post_types();
 
-		if ( ! empty( $posts ) && is_array( $posts ) ) {
-			$this->update_posts( $posts );
+		if ( ! empty($posts) && is_array($posts)) {
+			$this->update_posts($posts);
 			$this->update_post_type();
 			$this->update_widgets();
 		}
@@ -43,201 +43,201 @@ 
 	 *
 	 * @param $posts
 	 */
-	public function update_posts( $posts ) {
+	public function update_posts($posts) {
 
-		foreach ( $posts as $post ) {
+		foreach ($posts as $post) {
 
 			$post_id = $post->ID;
 
 			// Assign a feed taxonomy term (feed type) to legacy posts.
-			wp_set_object_terms( $post_id, 'google', 'calendar_feed' );
+			wp_set_object_terms($post_id, 'google', 'calendar_feed');
 
 			// Assign a calendar taxonomy term (calendar type) to legacy posts.
-			wp_set_object_terms( $post_id, 'default-calendar', 'calendar_type' );
+			wp_set_object_terms($post_id, 'default-calendar', 'calendar_type');
 
 			// Convert legacy list/grid view to default calendar view.
-			$display = get_post_meta( $post_id, 'gce_display_mode', true );
+			$display = get_post_meta($post_id, 'gce_display_mode', true);
 			$views = array();
 			$range = false;
-			if ( 'list' == $display ) {
+			if ('list' == $display) {
 				$views['default-calendar'] = 'list';
-			} elseif ( 'list-grouped' == $display ) {
+			} elseif ('list-grouped' == $display) {
 				$views['default-calendar'] = 'list';
-			} elseif ( 'date-range-list' == $display ) {
+			} elseif ('date-range-list' == $display) {
 				$views['default-calendar'] = 'list';
 				$range                     = true;
-			} elseif ( 'date-range-grid' == $display ) {
+			} elseif ('date-range-grid' == $display) {
 				$views['default-calendar'] = 'grid';
 				$range                     = true;
 			} else {
 				$views['default-calendar'] = 'grid';
 			}
-			update_post_meta( $post_id, '_calendar_view', $views );
+			update_post_meta($post_id, '_calendar_view', $views);
 
 			// List calendar settings.
-			$list_span  = get_post_meta( $post_id, 'gce_events_per_page', true );
-			$list_range = max( absint( get_post_meta( $post_id, 'gce_per_page_num', true ) ), 1 );
-			if ( 'days' == $list_span ) {
+			$list_span  = get_post_meta($post_id, 'gce_events_per_page', true);
+			$list_range = max(absint(get_post_meta($post_id, 'gce_per_page_num', true)), 1);
+			if ('days' == $list_span) {
 				$list_type = 'daily';
-			} elseif ( 'week' == $list_span ) {
+			} elseif ('week' == $list_span) {
 				$list_type = 'weekly';
 				$list_range = 1;
-			} elseif ( 'month' == $list_span ) {
+			} elseif ('month' == $list_span) {
 				$list_type = 'monthly';
 				$list_range = 1;
 			} else {
 				$list_type = 'events';
 			}
-			update_post_meta( $post_id, '_default_calendar_list_range_type', $list_type );
-			update_post_meta( $post_id, '_default_calendar_list_range_span', $list_range );
+			update_post_meta($post_id, '_default_calendar_list_range_type', $list_type);
+			update_post_meta($post_id, '_default_calendar_list_range_span', $list_range);
 
 			$calendar_begins = 'today';
 
 			// Custom calendar range.
-			if ( $range === true ) {
+			if ($range === true) {
 
-				$begins = get_post_meta( $post_id, 'gce_feed_range_start', true );
-				$ends   = get_post_meta( $post_id, 'gce_feed_range_end', true );
+				$begins = get_post_meta($post_id, 'gce_feed_range_start', true);
+				$ends   = get_post_meta($post_id, 'gce_feed_range_end', true);
 
-				if ( $begins && $ends ) {
-					update_post_meta( $post_id, '_calendar_begins', 'custom_date' );
-					update_post_meta( $post_id, '_calendar_begins_custom_date', $this->convert_legacy_range( $begins ) );
+				if ($begins && $ends) {
+					update_post_meta($post_id, '_calendar_begins', 'custom_date');
+					update_post_meta($post_id, '_calendar_begins_custom_date', $this->convert_legacy_range($begins));
 				} else {
-					update_post_meta( $post_id, '_calendar_begins', $calendar_begins );
+					update_post_meta($post_id, '_calendar_begins', $calendar_begins);
 				}
 
 			} else {
 
 				// Legacy list calendars may have a start offset.
-				$offset = absint( get_post_meta( $post_id, 'gce_list_start_offset_num', true ) );
-				if ( 'list' == $display && $offset > 0 ) {
-					$calendar_begins = 'back' == get_post_meta( $post_id, 'gce_list_start_offset_direction', true ) ? 'days_before' : 'days_after';
-					update_post_meta( $post_id, '_calendar_begins_nth', $offset );
+				$offset = absint(get_post_meta($post_id, 'gce_list_start_offset_num', true));
+				if ('list' == $display && $offset > 0) {
+					$calendar_begins = 'back' == get_post_meta($post_id, 'gce_list_start_offset_direction', true) ? 'days_before' : 'days_after';
+					update_post_meta($post_id, '_calendar_begins_nth', $offset);
 				}
 
-				update_post_meta( $post_id, '_calendar_begins', $calendar_begins );
+				update_post_meta($post_id, '_calendar_begins', $calendar_begins);
 			}
 
 			// Earliest event.
-			$start_before = get_post_meta( $post_id, 'gce_feed_start', true );
-			$start_amt = absint( get_post_meta( $post_id, 'gce_feed_start_num', true ) );
-			if ( $start_amt > 0 ) {
-				if ( 'years' == $start_before ) {
+			$start_before = get_post_meta($post_id, 'gce_feed_start', true);
+			$start_amt = absint(get_post_meta($post_id, 'gce_feed_start_num', true));
+			if ($start_amt > 0) {
+				if ('years' == $start_before) {
 					$earliest = 'years_before';
-				} elseif ( 'months' == $start_before ) {
+				} elseif ('months' == $start_before) {
 					$earliest = 'months_before';
 				} else {
 					$earliest = 'days_before';
 				}
-				update_post_meta( $post_id, '_feed_earliest_event_date', $earliest );
-				update_post_meta( $post_id, '_feed_earliest_event_date_range', $start_amt );
+				update_post_meta($post_id, '_feed_earliest_event_date', $earliest);
+				update_post_meta($post_id, '_feed_earliest_event_date_range', $start_amt);
 			} else {
-				update_post_meta( $post_id, '_feed_earliest_event_date', 'calendar_start' );
-				update_post_meta( $post_id, '_feed_earliest_event_date_range', 1 );
+				update_post_meta($post_id, '_feed_earliest_event_date', 'calendar_start');
+				update_post_meta($post_id, '_feed_earliest_event_date_range', 1);
 			}
 
 			// Latest event.
-			$end_after = get_post_meta( $post_id, 'gce_feed_end', true );
-			$end_amt   = absint( get_post_meta( $post_id, 'gce_feed_end_num', true ) );
-			if ( $end_amt > 0 ) {
-				if ( 'years' == $end_after ) {
+			$end_after = get_post_meta($post_id, 'gce_feed_end', true);
+			$end_amt   = absint(get_post_meta($post_id, 'gce_feed_end_num', true));
+			if ($end_amt > 0) {
+				if ('years' == $end_after) {
 					$latest = 'years_after';
-				} elseif ( 'months' == $end_after ) {
+				} elseif ('months' == $end_after) {
 					$latest = 'months_after';
 				} else {
 					$latest = 'days_after';
 				}
-				update_post_meta( $post_id, '_feed_latest_event_date', $latest );
-				update_post_meta( $post_id, '_feed_latest_event_date_range', $end_amt );
+				update_post_meta($post_id, '_feed_latest_event_date', $latest);
+				update_post_meta($post_id, '_feed_latest_event_date_range', $end_amt);
 			} else {
-				update_post_meta( $post_id, '_feed_latest_event_date', 'calendar_start' );
-				update_post_meta( $post_id, '_feed_latest_event_date_range', 1 );
+				update_post_meta($post_id, '_feed_latest_event_date', 'calendar_start');
+				update_post_meta($post_id, '_feed_latest_event_date_range', 1);
 			}
 
 			// Static calendar.
-			if ( false === get_post_meta( $post_id, 'gce_paging', true ) ) {
-				update_post_meta( $post_id, '_calendar_is_static', 'yes' );
+			if (false === get_post_meta($post_id, 'gce_paging', true)) {
+				update_post_meta($post_id, '_calendar_is_static', 'yes');
 			}
 
 			// Default calendar bubble trigger (click was unavailable before 3.0.0).
-			update_post_meta( $post_id, '_default_calendar_event_bubble_trigger', 'hover' );
+			update_post_meta($post_id, '_default_calendar_event_bubble_trigger', 'hover');
 
 			// Default calendar multiple day events.
-			if ( get_post_meta( $post_id, 'gce_multi_day_events', true ) ) {
-				update_post_meta( $post_id, '_default_calendar_expand_multi_day_events', 'yes' );
+			if (get_post_meta($post_id, 'gce_multi_day_events', true)) {
+				update_post_meta($post_id, '_default_calendar_expand_multi_day_events', 'yes');
 			} else {
-				update_post_meta( $post_id, '_default_calendar_expand_multi_day_events', 'no' );
+				update_post_meta($post_id, '_default_calendar_expand_multi_day_events', 'no');
 			}
 
 			// Google Calendar ID.
-			$google_id = get_post_meta( $post_id, 'gce_feed_url', true );
-			update_post_meta( $post_id, '_google_calendar_id', base64_encode( trim( $google_id ) ) );
+			$google_id = get_post_meta($post_id, 'gce_feed_url', true);
+			update_post_meta($post_id, '_google_calendar_id', base64_encode(trim($google_id)));
 
 			// Google max results.
-			update_post_meta( $post_id, '_google_events_max_results', 2500 );
+			update_post_meta($post_id, '_google_events_max_results', 2500);
 
 			// Google calendar feed search terms.
-			$google_search = get_post_meta( $post_id, 'gce_search_query', true );
-			if ( ! empty( $google_search ) ) {
-				update_post_meta( $post_id, '_google_events_search_query', trim( $google_search ) );
+			$google_search = get_post_meta($post_id, 'gce_search_query', true);
+			if ( ! empty($google_search)) {
+				update_post_meta($post_id, '_google_events_search_query', trim($google_search));
 			}
 
 			// Google recurring events.
-			if ( get_post_meta( $post_id, 'gce_expand_recurring', true ) ) {
-				update_post_meta( $post_id, '_google_events_recurring', 'show' );
+			if (get_post_meta($post_id, 'gce_expand_recurring', true)) {
+				update_post_meta($post_id, '_google_events_recurring', 'show');
 			} else {
-				update_post_meta( $post_id, '_google_events_recurring', 'first-only' );
+				update_post_meta($post_id, '_google_events_recurring', 'first-only');
 			}
 
 			// Date and time format.
-			$date_format = get_post_meta( $post_id, 'gce_date_format', true );
-			if ( ! empty( $date_format ) ) {
-				update_post_meta( $post_id, '_calendar_date_format_setting', 'use_custom_php' );
-				update_post_meta( $post_id, '_calendar_date_format_php', $date_format );
+			$date_format = get_post_meta($post_id, 'gce_date_format', true);
+			if ( ! empty($date_format)) {
+				update_post_meta($post_id, '_calendar_date_format_setting', 'use_custom_php');
+				update_post_meta($post_id, '_calendar_date_format_php', $date_format);
 			} else {
-				update_post_meta( $post_id, '_calendar_date_format_setting', 'use_site' );
+				update_post_meta($post_id, '_calendar_date_format_setting', 'use_site');
 			}
-			$time_format = get_post_meta( $post_id, 'gce_time_format', true );
-			if ( ! empty( $time_format ) ) {
-				update_post_meta( $post_id, '_calendar_time_format_setting', 'use_custom_php' );
-				update_post_meta( $post_id, '_calendar_time_format_php', $time_format );
+			$time_format = get_post_meta($post_id, 'gce_time_format', true);
+			if ( ! empty($time_format)) {
+				update_post_meta($post_id, '_calendar_time_format_setting', 'use_custom_php');
+				update_post_meta($post_id, '_calendar_time_format_php', $time_format);
 			} else {
-				update_post_meta( $post_id, '_calendar_time_format_setting', 'use_site' );
+				update_post_meta($post_id, '_calendar_time_format_setting', 'use_site');
 			}
-			update_post_meta( $post_id, '_calendar_datetime_separator', '@' );
-			update_post_meta( $post_id, '_calendar_week_starts_on_setting', 'use_site' );
+			update_post_meta($post_id, '_calendar_datetime_separator', '@');
+			update_post_meta($post_id, '_calendar_week_starts_on_setting', 'use_site');
 
 			// Feed transient cache duration.
-			$cache = get_post_meta( $post_id, 'gce_cache', true );
-			if ( is_numeric( $cache ) ) {
-				$seconds = absint( $cache );
-				if ( $seconds < 3600 ) {
+			$cache = get_post_meta($post_id, 'gce_cache', true);
+			if (is_numeric($cache)) {
+				$seconds = absint($cache);
+				if ($seconds < 3600) {
 					$amount = $seconds / 60;
 					$unit   = 60;
-				} elseif ( $seconds < 86400 ) {
+				} elseif ($seconds < 86400) {
 					$amount = $seconds / 3600;
 					$unit   = 3600;
-				} elseif ( $seconds < 604800 ) {
+				} elseif ($seconds < 604800) {
 					$amount = $seconds / 86400;
 					$unit   = 86400;
 				} else {
 					$amount = $seconds / 604800;
 					$unit   = 604800;
 				}
-				$amount = max( ceil( $amount ), 1 );
-				update_post_meta( $post_id, '_feed_cache_user_unit', $unit );
-				update_post_meta( $post_id, '_feed_cache_user_amount', $amount );
-				update_post_meta( $post_id, '_feed_cache', $unit * $amount );
+				$amount = max(ceil($amount), 1);
+				update_post_meta($post_id, '_feed_cache_user_unit', $unit);
+				update_post_meta($post_id, '_feed_cache_user_amount', $amount);
+				update_post_meta($post_id, '_feed_cache', $unit * $amount);
 			} else {
-				update_post_meta( $post_id, '_feed_cache_user_unit', 2 );
-				update_post_meta( $post_id, '_feed_cache_user_amount', 3600 );
-				update_post_meta( $post_id, '_feed_cache', 7200 );
+				update_post_meta($post_id, '_feed_cache_user_unit', 2);
+				update_post_meta($post_id, '_feed_cache_user_amount', 3600);
+				update_post_meta($post_id, '_feed_cache', 7200);
 			}
 
-			$this->delete_post_meta( $post_id );
+			$this->delete_post_meta($post_id);
 
 			// Post updated.
-			update_post_meta( $post_id, '_calendar_version', '3.0.0' );
+			update_post_meta($post_id, '_calendar_version', '3.0.0');
 		}
 
 	}
@@ -247,7 +247,7 @@ 
 	 *
 	 * @param int $post_id
 	 */
-	public function delete_post_meta( $post_id ) {
+	public function delete_post_meta($post_id) {
 
 		$post_meta = array(
 			'gce_cache',
@@ -295,8 +295,8 @@ 
 			'gce_time_format',
 		);
 
-		foreach ( $post_meta as $meta_key ) {
-			delete_post_meta( $post_id, $meta_key );
+		foreach ($post_meta as $meta_key) {
+			delete_post_meta($post_id, $meta_key);
 		}
 	}
 
@@ -306,7 +306,7 @@ 
 	public function update_post_type() {
 
 		global $wpdb;
-		$table = $wpdb->prefix . 'posts';
+		$table = $wpdb->prefix.'posts';
 
 		$wpdb->query(
 			"
@@ -320,23 +320,23 @@ 
 	 */
 	public function update_options() {
 
-		$old_settings          = get_option( 'gce_settings_general' );
-		$new_settings_feeds    = get_option( 'simple-calendar_settings_feeds' );
-		$new_settings_advanced = get_option( 'simple-calendar_settings_advanced' );
+		$old_settings          = get_option('gce_settings_general');
+		$new_settings_feeds    = get_option('simple-calendar_settings_feeds');
+		$new_settings_advanced = get_option('simple-calendar_settings_advanced');
 
 		// If empty probably using a legacy hardcoded key (no longer recommended).
-		$new_settings_feeds['google']['api_key'] = ! empty( $old_settings['api_key'] ) ? $old_settings['api_key'] : '';
-		update_option( 'simple-calendar_settings_feeds', $new_settings_feeds );
+		$new_settings_feeds['google']['api_key'] = ! empty($old_settings['api_key']) ? $old_settings['api_key'] : '';
+		update_option('simple-calendar_settings_feeds', $new_settings_feeds);
 
-		$new_settings_advanced['assets']['disable_css'] = ! empty( $old_settings['disable_css'] ) ? 'yes' : '';
-		update_option( 'simple-calendar_settings_advanced', $new_settings_advanced );
+		$new_settings_advanced['assets']['disable_css'] = ! empty($old_settings['disable_css']) ? 'yes' : '';
+		update_option('simple-calendar_settings_advanced', $new_settings_advanced);
 
 		// Delete legacy options.
-		delete_option( 'gce_version' );
-		delete_option( 'gce_options' );
-		delete_option( 'gce_upgrade_has_run' );
-		delete_option( 'gce_v240_update_notices' );
-		delete_option( 'gce_show_admin_install_notice' );
+		delete_option('gce_version');
+		delete_option('gce_options');
+		delete_option('gce_upgrade_has_run');
+		delete_option('gce_v240_update_notices');
+		delete_option('gce_show_admin_install_notice');
 	}
 
 	/**
@@ -344,26 +344,26 @@ 
 	 */
 	public function update_widgets() {
 
-		$old_widgets = get_option( 'widget_gce_widget' );
+		$old_widgets = get_option('widget_gce_widget');
 
-		if ( ! empty( $old_widgets ) && is_array( $old_widgets ) ) {
+		if ( ! empty($old_widgets) && is_array($old_widgets)) {
 
 			$new_widgets = array();
 
-			foreach ( $old_widgets as $i => $old_widget ) {
-				if ( isset( $old_widget['id'] ) ) {
+			foreach ($old_widgets as $i => $old_widget) {
+				if (isset($old_widget['id'])) {
 
-					$id = absint( substr( $old_widget['id'], 0, strspn( $old_widget['id'], '0123456789' ) ) );
+					$id = absint(substr($old_widget['id'], 0, strspn($old_widget['id'], '0123456789')));
 
-					if ( $id > 0 ) {
-						$new_widgets[ $i ]['title']       = isset( $old_widget['name'] ) ? $old_widget['name'] : 'Simple Calendar';
-						$new_widgets[ $i ]['calendar_id'] = $id;
+					if ($id > 0) {
+						$new_widgets[$i]['title']       = isset($old_widget['name']) ? $old_widget['name'] : 'Simple Calendar';
+						$new_widgets[$i]['calendar_id'] = $id;
 					}
 				}
 			}
 
-			if ( ! empty( $new_widgets ) ) {
-				update_option( 'widget_gce_widget', $new_widgets );
+			if ( ! empty($new_widgets)) {
+				update_option('widget_gce_widget', $new_widgets);
 			}
 		}
 	}
@@ -377,10 +377,10 @@ 
 	 *
 	 * @return string
 	 */
-	private function convert_legacy_range( $date ) {
-		$date = empty( $date ) ? date( 'm/d/Y', time() ) : $date;
-		$timestamp = Carbon::createFromFormat( 'm/d/Y', $date )->getTimestamp();
-		return date( 'Y-m-d', $timestamp );
+	private function convert_legacy_range($date) {
+		$date = empty($date) ? date('m/d/Y', time()) : $date;
+		$timestamp = Carbon::createFromFormat('m/d/Y', $date)->getTimestamp();
+		return date('Y-m-d', $timestamp);
 	}
 
 }

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);
 		}
 	}