moonstonemedia / Simple-Calendar

google-calendar-events.php

Spacing +11 added lines, -11 removed lines

@@ -14,24 +14,24 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
 // Plugin constants.
-$this_plugin_path      = trailingslashit( dirname( __FILE__ ) );
-$this_plugin_dir       = plugin_dir_url( __FILE__ );
+$this_plugin_path      = trailingslashit(dirname(__FILE__));
+$this_plugin_dir       = plugin_dir_url(__FILE__);
 $this_plugin_constants = array(
 	'SIMPLE_CALENDAR_VERSION'   => '3.0.15',
 	'SIMPLE_CALENDAR_MAIN_FILE' => __FILE__,
 	'SIMPLE_CALENDAR_URL'       => $this_plugin_dir,
-	'SIMPLE_CALENDAR_ASSETS'    => $this_plugin_dir . 'assets/',
+	'SIMPLE_CALENDAR_ASSETS'    => $this_plugin_dir.'assets/',
 	'SIMPLE_CALENDAR_PATH'      => $this_plugin_path,
-	'SIMPLE_CALENDAR_INC'       => $this_plugin_path . 'includes/',
+	'SIMPLE_CALENDAR_INC'       => $this_plugin_path.'includes/',
 );
-foreach ( $this_plugin_constants as $constant => $value ) {
-	if ( ! defined( $constant ) ) {
-		define( $constant, $value );
+foreach ($this_plugin_constants as $constant => $value) {
+	if ( ! defined($constant)) {
+		define($constant, $value);
 	}
 }
 
@@ -40,7 +40,7 @@ 
 include_once 'includes/wp-requirements.php';
 
 // Check plugin requirements before loading plugin.
-$this_plugin_checks = new SimCal_WP_Requirements( 'Simple Calendar', plugin_basename( __FILE__ ), array(
+$this_plugin_checks = new SimCal_WP_Requirements('Simple Calendar', plugin_basename(__FILE__), array(
 		'PHP'        => '5.3.3',
 		'WordPress'  => '4.1',
 		'Extensions' => array(
@@ -49,8 +49,8 @@ 
 			'json',
 			'mbstring',
 		),
-	) );
-if ( $this_plugin_checks->pass() === false ) {
+	));
+if ($this_plugin_checks->pass() === false) {
 	$this_plugin_checks->halt();
 
 	return;

includes/browser.php

Spacing +3 added lines, -3 removed lines

@@ -353,9 +353,9 @@
          */
         public function __toString()
         {
-            return "<strong>Browser Name:</strong> {$this->getBrowser()}<br/>\n" .
-            "<strong>Browser Version:</strong> {$this->getVersion()}<br/>\n" .
-            "<strong>Browser User Agent String:</strong> {$this->getUserAgent()}<br/>\n" .
+            return "<strong>Browser Name:</strong> {$this->getBrowser()}<br/>\n".
+            "<strong>Browser Version:</strong> {$this->getVersion()}<br/>\n".
+            "<strong>Browser User Agent String:</strong> {$this->getUserAgent()}<br/>\n".
             "<strong>Platform:</strong> {$this->getPlatform()}<br/>";
         }
 

includes/feeds/grouped-calendars.php

Spacing +56 added lines, -56 removed lines

@@ -10,7 +10,7 @@ 
 use SimpleCalendar\Abstracts\Feed;
 use SimpleCalendar\Feeds\Admin\Grouped_Calendars_Admin;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -38,22 +38,22 @@ 
 	 *
 	 * @param string|Calendar $calendar
 	 */
-	public function __construct( $calendar = '' ) {
+	public function __construct($calendar = '') {
 
-		parent::__construct( $calendar );
+		parent::__construct($calendar);
 
 		$this->type = 'grouped-calendars';
-		$this->name = __( 'Grouped Calendar', 'google-calendar-events' );
+		$this->name = __('Grouped Calendar', 'google-calendar-events');
 
-		if ( $this->post_id > 0 ) {
+		if ($this->post_id > 0) {
 			$this->set_source();
-			if ( ! is_admin() || defined( 'DOING_AJAX' ) ) {
+			if ( ! is_admin() || defined('DOING_AJAX')) {
 				$this->events = $this->get_events();
 			}
 		}
 
-		if ( is_admin() && ! defined( 'DOING_AJAX' ) ) {
-			new Grouped_Calendars_Admin( $this );
+		if (is_admin() && ! defined('DOING_AJAX')) {
+			new Grouped_Calendars_Admin($this);
 		}
 	}
 
@@ -64,38 +64,38 @@ 
 	 *
 	 * @param array $ids Array of calendar ids.
 	 */
-	public function set_source( $ids = array() ) {
+	public function set_source($ids = array()) {
 
-		$source = get_post_meta( $this->post_id, '_grouped_calendars_source', true );
+		$source = get_post_meta($this->post_id, '_grouped_calendars_source', true);
 
-		if ( 'ids' == $source ) {
+		if ('ids' == $source) {
 
-			if ( empty( $ids ) ) {
-				$ids = get_post_meta( $this->post_id, '_grouped_calendars_ids', true );
+			if (empty($ids)) {
+				$ids = get_post_meta($this->post_id, '_grouped_calendars_ids', true);
 			}
 
-			$this->calendars_ids = ! empty( $ids ) && is_array( $ids ) ? array_map( 'absint', $ids ) : array();
+			$this->calendars_ids = ! empty($ids) && is_array($ids) ? array_map('absint', $ids) : array();
 
-		} elseif ( 'category' == $source ) {
+		} elseif ('category' == $source) {
 
-			$categories = get_post_meta( $this->post_id, '_grouped_calendars_category', true );
+			$categories = get_post_meta($this->post_id, '_grouped_calendars_category', true);
 
-			if ( $categories && is_array( $categories ) ) {
+			if ($categories && is_array($categories)) {
 
 				$tax_query = array(
 					'taxonomy' => 'calendar_category',
 					'field'    => 'term_id',
-					'terms'    => array_map( 'absint', $categories ),
+					'terms'    => array_map('absint', $categories),
 				);
 
-				$calendars = get_posts( array(
+				$calendars = get_posts(array(
 					'post_type' => 'calendar',
-					'tax_query' => array( $tax_query ),
+					'tax_query' => array($tax_query),
 					'nopaging'  => true,
 					'fields'    => 'ids',
-				) );
+				));
 
-				$this->calendars_ids = ! empty( $calendars ) && is_array( $calendars ) ? $calendars : array();
+				$this->calendars_ids = ! empty($calendars) && is_array($calendars) ? $calendars : array();
 			}
 
 		}
@@ -111,57 +111,57 @@ 
 	public function get_events() {
 
 		$ids    = $this->calendars_ids;
-		$events = get_transient( '_simple-calendar_feed_id_' . strval( $this->post_id ) . '_' . $this->type );
+		$events = get_transient('_simple-calendar_feed_id_'.strval($this->post_id).'_'.$this->type);
 
-		if ( empty( $events ) && ! empty( $ids ) && is_array( $ids ) ) {
+		if (empty($events) && ! empty($ids) && is_array($ids)) {
 
 			$events = array();
 
-			foreach ( $ids as $cal_id ) {
+			foreach ($ids as $cal_id) {
 
-				$calendar = simcal_get_calendar( intval( $cal_id ) );
+				$calendar = simcal_get_calendar(intval($cal_id));
 
-				simcal_delete_feed_transients( $cal_id );
+				simcal_delete_feed_transients($cal_id);
 
-				if ( $calendar instanceof Calendar ) {
+				if ($calendar instanceof Calendar) {
 
 					// Sometimes the calendars might have events at the same time from different calendars
 					// When merging the arrays together some of the events will be lost because the keys are the same and one will overwrite the other
 					// This snippet checks if the key already exists in the master events array and if it does it subtracts 1 from it to make the key unique and then unsets the original key.
-					foreach( $calendar->events as $k => $v ) {
-						$calendar->events[ $this->update_array_timestamp( $events, $k ) ] = $v;
+					foreach ($calendar->events as $k => $v) {
+						$calendar->events[$this->update_array_timestamp($events, $k)] = $v;
 					}
 
-					$events = is_array( $calendar->events ) ? $events + $calendar->events : $events;
+					$events = is_array($calendar->events) ? $events + $calendar->events : $events;
 				}
 
 			}
 
-			if ( ! empty( $events ) ) {
+			if ( ! empty($events)) {
 
 				// Trim events to set the earliest one as specified in feed settings.
-				$earliest_event = intval( $this->time_min );
-				if ( $earliest_event > 0 ) {
-					$events = $this->array_filter_key( $events, array( $this, 'filter_events_before' ) );
+				$earliest_event = intval($this->time_min);
+				if ($earliest_event > 0) {
+					$events = $this->array_filter_key($events, array($this, 'filter_events_before'));
 				}
 
 				// Trim events to set the latest one as specified in feed settings.
-				$latest_event = intval( $this->time_max );
-				if ( $latest_event > 0 ) {
-					$events = $this->array_filter_key( $events, array( $this, 'filter_events_after' ) );
+				$latest_event = intval($this->time_max);
+				if ($latest_event > 0) {
+					$events = $this->array_filter_key($events, array($this, 'filter_events_after'));
 				}
 
 				set_transient(
-					'_simple-calendar_feed_id_' . strval( $this->post_id ) . '_' . $this->type,
+					'_simple-calendar_feed_id_'.strval($this->post_id).'_'.$this->type,
 					$events,
-					absint( $this->cache )
+					absint($this->cache)
 				);
 			}
 
 		}
 	
 		// Sort events by start time before returning
-		uasort( $events, array( $this, 'sort_by_start_time' ) );
+		uasort($events, array($this, 'sort_by_start_time'));
 
 		return $events;
 	}
@@ -169,10 +169,10 @@ 
 	/*
 	 * Recursive function to adjust the timestamp array indices that are the same.
 	 */
-	public function update_array_timestamp( $arr, $i ) {
+	public function update_array_timestamp($arr, $i) {
 
-		if ( array_key_exists( $i, $arr ) ) {
-			$i = $this->update_array_timestamp( $arr, $i - 1 );
+		if (array_key_exists($i, $arr)) {
+			$i = $this->update_array_timestamp($arr, $i - 1);
 		}
 
 		return $i;
@@ -184,12 +184,12 @@ 
 	 * @since  3.0.13
 	 * @access private
 	 */
-	private function sort_by_start_time( $a, $b ) {
-		if ( $a == $b ) {
+	private function sort_by_start_time($a, $b) {
+		if ($a == $b) {
 			return 0;
 		}
 
-		return ( $a[0]->start < $b[0]->start ) ? -1 : 1;
+		return ($a[0]->start < $b[0]->start) ? -1 : 1;
 	}
 
 
@@ -207,9 +207,9 @@ 
 	 *
 	 * @return array
 	 */
-	private function array_filter_key( array $array, $callback ) {
-		$matched_keys = array_filter( array_keys( $array ), $callback );
-		return array_intersect_key( $array, array_flip( $matched_keys ) );
+	private function array_filter_key(array $array, $callback) {
+		$matched_keys = array_filter(array_keys($array), $callback);
+		return array_intersect_key($array, array_flip($matched_keys));
 	}
 
 	/**
@@ -222,9 +222,9 @@ 
 	 *
 	 * @return bool
 	 */
-	private function filter_events_before( $event ) {
-		if ( $this->time_min !== 0 ) {
-			return intval( $event ) > intval( $this->time_min );
+	private function filter_events_before($event) {
+		if ($this->time_min !== 0) {
+			return intval($event) > intval($this->time_min);
 		}
 		return true;
 	}
@@ -239,9 +239,9 @@ 
 	 *
 	 * @return bool
 	 */
-	private function filter_events_after( $event ) {
-		if ( $this->time_max !== 0 ) {
-			return intval( $event ) < intval( $this->time_max );
+	private function filter_events_after($event) {
+		if ($this->time_max !== 0) {
+			return intval($event) < intval($this->time_max);
 		}
 		return true;
 	}

includes/objects.php

Spacing +87 added lines, -87 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,41 +185,41 @@ 
 	 *
 	 * @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($feed_name, 'feed', $object);
+			} elseif ($object instanceof \WP_Post) {
+				$calendar = $this->get_calendar($object);
 
-				if ( isset( $calendar->feed ) ) {
-					return $this->get_object( $calendar->feed, 'feed', $calendar );
+				if (isset($calendar->feed)) {
+					return $this->get_object($calendar->feed, 'feed', $calendar);
 				} else {
 					return null;
 				}
 
 
-			} elseif ( isset( $object->feed ) && isset( $object->id ) ) {
-				return $this->get_object( $object->feed, 'feed', $object );
+			} 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;
@@ -235,13 +235,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;
 	}
 
 	/**
@@ -253,8 +253,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;
 	}
 
 	/**
@@ -269,7 +269,7 @@ 
 	 *
 	 * @return null|Object
 	 */
-	private function get_object( $name, $type, $args = '' ) {
+	private function get_object($name, $type, $args = '') {
 
 		$types = array(
 			'admin-page',
@@ -279,11 +279,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;
 		}
@@ -305,25 +305,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/feeds/admin/google-admin.php

Spacing +90 added lines, -90 removed lines

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

includes/feeds/admin/grouped-calendars-admin.php

Spacing +40 added lines, -40 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Feeds\Grouped_Calendars;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -34,15 +34,15 @@ 
 	 *
 	 * @param Grouped_Calendars $feed
 	 */
-	public function __construct( Grouped_Calendars $feed ) {
+	public function __construct(Grouped_Calendars $feed) {
 
 		$this->feed = $feed;
 
-		if ( 'calendar' == simcal_is_admin_screen() ) {
-			add_filter( 'simcal_settings_meta_tabs_li', array( $this, 'add_settings_meta_tab_li' ), 10, 1 );
-			add_action( 'simcal_settings_meta_panels', array( $this, 'add_settings_meta_panel' ), 10, 1 );
+		if ('calendar' == simcal_is_admin_screen()) {
+			add_filter('simcal_settings_meta_tabs_li', array($this, 'add_settings_meta_tab_li'), 10, 1);
+			add_action('simcal_settings_meta_panels', array($this, 'add_settings_meta_panel'), 10, 1);
 		}
-		add_action( 'simcal_process_settings_meta', array( $this, 'process_meta' ), 10, 1 );
+		add_action('simcal_process_settings_meta', array($this, 'process_meta'), 10, 1);
 	}
 
 	/**
@@ -54,8 +54,8 @@ 
 	 *
 	 * @return array
 	 */
-	public function add_settings_meta_tab_li( $tabs ) {
-		return array_merge( $tabs, array(
+	public function add_settings_meta_tab_li($tabs) {
+		return array_merge($tabs, array(
 			'grouped-calendars' => array(
 				'label'   => $this->feed->name,
 				'target'  => 'grouped-calendars-settings-panel',
@@ -75,40 +75,40 @@ 
 	 *
 	 * @param int $post_id
 	 */
-	public function add_settings_meta_panel( $post_id ) {
+	public function add_settings_meta_panel($post_id) {
 
 		?>
 		<div id="grouped-calendars-settings-panel" class="simcal-panel">
 			<table>
 				<thead>
-				<tr><th colspan="2"><?php _e( 'Grouped Calendar Settings', 'google-calendar-events' ); ?></th></tr>
+				<tr><th colspan="2"><?php _e('Grouped Calendar Settings', 'google-calendar-events'); ?></th></tr>
 				</thead>
 				<tbody class="simcal-panel-section">
 				<tr class="simcal-panel-field">
-					<th><label for="_grouped_calendars_source"><?php _e( 'Get Calendars From', 'google-calendar-events' ); ?></label></th>
+					<th><label for="_grouped_calendars_source"><?php _e('Get Calendars From', 'google-calendar-events'); ?></label></th>
 					<td>
 						<?php
 
-						$source = esc_attr( get_post_meta( $post_id, '_grouped_calendars_source', true ) );
-						$source = empty( $source ) ? 'ids' : $source;
+						$source = esc_attr(get_post_meta($post_id, '_grouped_calendars_source', true));
+						$source = empty($source) ? 'ids' : $source;
 
 						?>
 						<select name="_grouped_calendars_source"
 						        id="_grouped_calendars_source"
 						        class="simcal-field simcal-field-select simcal-field-inline simcal-field-show-other"
 						        data-show-field-on-choice="true">
-							<option value="ids" data-show-field="_grouped_calendars_ids" <?php selected( 'ids', $source, true ); ?>><?php _e( 'Manual selection', 'google-calendar-events' ); ?></option>
-							<option value="category" data-show-field="_grouped_calendars_category" <?php selected( 'category', $source, true ); ?>><?php _e( 'Category', 'google-calendar-events' ); ?></option>
+							<option value="ids" data-show-field="_grouped_calendars_ids" <?php selected('ids', $source, true); ?>><?php _e('Manual selection', 'google-calendar-events'); ?></option>
+							<option value="category" data-show-field="_grouped_calendars_category" <?php selected('category', $source, true); ?>><?php _e('Category', 'google-calendar-events'); ?></option>
 						</select>
-						<i class="simcal-icon-help simcal-help-tip" data-tip="<?php _e( 'Choose from which calendar feeds you want to get events from. Choose them individually or select all those belonging to calendar feed categories.', 'google-calendar-events' ); ?>"></i>
+						<i class="simcal-icon-help simcal-help-tip" data-tip="<?php _e('Choose from which calendar feeds you want to get events from. Choose them individually or select all those belonging to calendar feed categories.', 'google-calendar-events'); ?>"></i>
 						<br><br>
 						<?php
 
-						$cals = simcal_get_calendars( $post_id );
-						$meta = get_post_meta( $post_id, '_grouped_calendars_ids', true );
-						$ids  = $meta && is_array( $meta ) ? implode( ',', array_map( 'absint', $meta ) ) : absint( $meta );
+						$cals = simcal_get_calendars($post_id);
+						$meta = get_post_meta($post_id, '_grouped_calendars_ids', true);
+						$ids  = $meta && is_array($meta) ? implode(',', array_map('absint', $meta)) : absint($meta);
 
-						simcal_print_field( array(
+						simcal_print_field(array(
 							'type'        => 'select',
 							'multiselect' => 'multiselect',
 							'name'        => '_grouped_calendars_ids',
@@ -116,25 +116,25 @@ 
 							'value'       => $ids !== 0 ? $ids : '',
 							'options'     => $cals,
 							'enhanced'    => 'enhanced',
-							'style'       => 'ids' == $source ? '' : array( 'display' => 'none' ),
+							'style'       => 'ids' == $source ? '' : array('display' => 'none'),
 							'attributes'  => array(
-								'data-noresults' => __( 'No results found.', 'google-calendar-events' ),
+								'data-noresults' => __('No results found.', 'google-calendar-events'),
 							),
 						));
 
-						$meta = get_post_meta( $post_id, '_grouped_calendars_category', true );
-						$category = $meta && is_array( $meta ) ? implode( ',', array_map( 'absint', $meta ) ): '';
+						$meta = get_post_meta($post_id, '_grouped_calendars_category', true);
+						$category = $meta && is_array($meta) ? implode(',', array_map('absint', $meta)) : '';
 
-						$terms = get_terms( 'calendar_category' );
+						$terms = get_terms('calendar_category');
 
-						if ( ! empty( $terms ) ) {
+						if ( ! empty($terms)) {
 
 							$categories = array();
-							foreach ( $terms as $term ) {
-								$categories[ $term->term_id ] = $term->name;
+							foreach ($terms as $term) {
+								$categories[$term->term_id] = $term->name;
 							}
 
-							simcal_print_field( array(
+							simcal_print_field(array(
 								'type'        => 'select',
 								'multiselect' => 'multiselect',
 								'name'        => '_grouped_calendars_category',
@@ -142,17 +142,17 @@ 
 								'value'       => $category,
 								'options'     => $categories,
 								'enhanced'    => 'enhanced',
-								'style'       => 'category' == $source ? '' : array( 'display' => 'none' ),
+								'style'       => 'category' == $source ? '' : array('display' => 'none'),
 								'attributes'  => array(
-									'data-noresults' => __( 'No results found.', 'google-calendar-events' ),
+									'data-noresults' => __('No results found.', 'google-calendar-events'),
 								),
-							) );
+							));
 
 						} else {
 
 							$style = 'category' == $source ? '' : 'display: none;';
 							$style .= ' width: 100%; max-width: 500px';
-							echo '<input type="text" disabled="disabled" name="_grouped_calendars_category" id="_grouped_calendars_category" style="' . $style . '" placeholder="' . __( 'There are no calendar categories yet.', 'google-calendar-events' ) . '" />';
+							echo '<input type="text" disabled="disabled" name="_grouped_calendars_category" id="_grouped_calendars_category" style="'.$style.'" placeholder="'.__('There are no calendar categories yet.', 'google-calendar-events').'" />';
 
 						}
 
@@ -173,16 +173,16 @@ 
 	 *
 	 * @param int $post_id
 	 */
-	public function process_meta( $post_id ) {
+	public function process_meta($post_id) {
 
-		$source = isset( $_POST['_grouped_calendars_source'] ) ? sanitize_key( $_POST['_grouped_calendars_source'] ) : 'ids';
-		update_post_meta( $post_id, '_grouped_calendars_source', $source );
+		$source = isset($_POST['_grouped_calendars_source']) ? sanitize_key($_POST['_grouped_calendars_source']) : 'ids';
+		update_post_meta($post_id, '_grouped_calendars_source', $source);
 
-		$ids = isset( $_POST['_grouped_calendars_ids'] ) ? array_map( 'absint', $_POST['_grouped_calendars_ids'] ) : '';
-		update_post_meta( $post_id, '_grouped_calendars_ids', $ids );
+		$ids = isset($_POST['_grouped_calendars_ids']) ? array_map('absint', $_POST['_grouped_calendars_ids']) : '';
+		update_post_meta($post_id, '_grouped_calendars_ids', $ids);
 
-		$category = isset( $_POST['_grouped_calendars_category'] ) ? array_map( 'absint', $_POST['_grouped_calendars_category'] ) : '';
-		update_post_meta( $post_id, '_grouped_calendars_category', $category );
+		$category = isset($_POST['_grouped_calendars_category']) ? array_map('absint', $_POST['_grouped_calendars_category']) : '';
+		update_post_meta($post_id, '_grouped_calendars_category', $category);
 
 	}
 

includes/admin/meta-boxes.php

Spacing +28 added lines, -28 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Admin\Metaboxes as Metabox;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -44,8 +44,8 @@ 
 	 */
 	public function __construct() {
 
-		$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'])) {
 			$this->post_types = $settings['general']['attach_calendars_posts'];
 		}
 
@@ -53,17 +53,17 @@ 
 		new Metabox\Settings();
 		new Metabox\Attach_Calendar();
 		new Metabox\Newsletter();
-		do_action( 'simcal_load_meta_boxes' );
+		do_action('simcal_load_meta_boxes');
 
 		// Add meta boxes.
-		add_action( 'add_meta_boxes', array( $this, 'add_meta_boxes' ), 30 );
+		add_action('add_meta_boxes', array($this, 'add_meta_boxes'), 30);
 
 		// Process meta boxes.
-		add_action( 'simcal_save_settings_meta','\SimpleCalendar\Admin\Metaboxes\Settings::save', 10, 2 );
-		add_action( 'simcal_save_attach_calendar_meta','\SimpleCalendar\Admin\Metaboxes\Attach_Calendar::save', 10, 2 );
+		add_action('simcal_save_settings_meta', '\SimpleCalendar\Admin\Metaboxes\Settings::save', 10, 2);
+		add_action('simcal_save_attach_calendar_meta', '\SimpleCalendar\Admin\Metaboxes\Attach_Calendar::save', 10, 2);
 
 		// Save meta boxes data.
-		add_action( 'save_post', array( $this, 'save_meta_boxes' ), 1, 2 );
+		add_action('save_post', array($this, 'save_meta_boxes'), 1, 2);
 
 		// Uncomment this for debugging $_POST while saving a meta box.
 		// add_action( 'save_post', function() { echo '<pre>'; print_r( $_POST ); echo '</pre>'; die(); } );
@@ -78,19 +78,19 @@ 
 
 		add_meta_box(
 			'simcal-calendar-settings',
-			__( 'Calendar Settings', 'google-calendar-events' ),
+			__('Calendar Settings', 'google-calendar-events'),
 			'\SimpleCalendar\Admin\Metaboxes\Settings::html',
 			'calendar',
 			'normal',
 			'core'
 		);
 
-		$addons = apply_filters( 'simcal_installed_addons', array() );
-		if ( empty( $addons ) ) {
+		$addons = apply_filters('simcal_installed_addons', array());
+		if (empty($addons)) {
 
 			add_meta_box(
 				'simcal-newsletter',
-				__( 'Get 20% off all Pro Add-ons', 'google-calendar-events' ),
+				__('Get 20% off all Pro Add-ons', 'google-calendar-events'),
 				'\SimpleCalendar\Admin\Metaboxes\Newsletter::html',
 				'calendar',
 				'side',
@@ -101,7 +101,7 @@ 
 
 		add_meta_box(
 			'simcal-get-shortcode',
-			__( 'Calendar Shortcode', 'google-calendar-events' ),
+			__('Calendar Shortcode', 'google-calendar-events'),
 			'\SimpleCalendar\Admin\Metaboxes\Get_Shortcode::html',
 			'calendar',
 			'side',
@@ -109,11 +109,11 @@ 
 		);
 
 		// Add meta box if there are calendars.
-		if ( ( true == simcal_get_calendars() ) && ! empty( $this->post_types ) ) {
-			foreach ( $this->post_types as $post_type ) {
+		if ((true == simcal_get_calendars()) && ! empty($this->post_types)) {
+			foreach ($this->post_types as $post_type) {
 				add_meta_box(
 					'simcal-attach-calendar',
-					__( 'Attach Calendar', 'google-calendar-events' ),
+					__('Attach Calendar', 'google-calendar-events'),
 					'\SimpleCalendar\Admin\Metaboxes\Attach_Calendar::html',
 					$post_type,
 					'side',
@@ -122,7 +122,7 @@ 
 			}
 		}
 
-		do_action( 'simcal_add_meta_boxes' );
+		do_action('simcal_add_meta_boxes');
 	}
 
 	/**
@@ -135,30 +135,30 @@ 
 	 *
 	 * @return void
 	 */
-	public function save_meta_boxes( $post_id, $post ) {
+	public function save_meta_boxes($post_id, $post) {
 
 		// $post_id and $post are required.
-		if ( empty( $post_id ) || empty( $post ) || self::$saved_meta_boxes ) {
+		if (empty($post_id) || empty($post) || self::$saved_meta_boxes) {
 			return;
 		}
 
 		// Don't save meta boxes for revisions or autosaves.
-		if ( defined( 'DOING_AUTOSAVE' ) || is_int( wp_is_post_revision( $post ) ) || is_int( wp_is_post_autosave( $post ) ) ) {
+		if (defined('DOING_AUTOSAVE') || is_int(wp_is_post_revision($post)) || is_int(wp_is_post_autosave($post))) {
 			return;
 		}
 
 		// Check the nonce.
-		if ( empty( $_POST['simcal_meta_nonce'] ) || ! wp_verify_nonce( $_POST['simcal_meta_nonce'], 'simcal_save_data' ) ) {
+		if (empty($_POST['simcal_meta_nonce']) || ! wp_verify_nonce($_POST['simcal_meta_nonce'], 'simcal_save_data')) {
 			return;
 		}
 
 		// Check the post being saved == the $post_id to prevent triggering this call for other save_post events.
-		if ( empty( $_POST['post_ID'] ) || $_POST['post_ID'] != $post_id ) {
+		if (empty($_POST['post_ID']) || $_POST['post_ID'] != $post_id) {
 			return;
 		}
 
 		// Check user has permission to edit
-		if ( ! current_user_can( 'edit_post', $post_id ) ) {
+		if ( ! current_user_can('edit_post', $post_id)) {
 			return;
 		}
 
@@ -171,13 +171,13 @@ 
 		self::$saved_meta_boxes = true;
 
 		// Check the post type.
-		if ( 'calendar' == $post->post_type ) {
-			do_action( 'simcal_save_settings_meta', $post_id, $post );
-		} elseif ( in_array( $post->post_type, $this->post_types ) ) {
-			do_action( 'simcal_save_attach_calendar_meta', $post_id, $post );
+		if ('calendar' == $post->post_type) {
+			do_action('simcal_save_settings_meta', $post_id, $post);
+		} elseif (in_array($post->post_type, $this->post_types)) {
+			do_action('simcal_save_attach_calendar_meta', $post_id, $post);
 		}
 
-		do_action( 'simcal_save_meta_boxes', $post_id, $post );
+		do_action('simcal_save_meta_boxes', $post_id, $post);
 	}
 
 }

includes/admin/fields/license.php

Spacing +11 added lines, -11 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Abstracts\Field;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -34,10 +34,10 @@ 
 	 *
 	 * @param array $field
 	 */
-	public function __construct( $field ) {
-		$this->addon      = isset( $field['addon'] ) ? esc_attr( $field['addon'] ) : '';
+	public function __construct($field) {
+		$this->addon      = isset($field['addon']) ? esc_attr($field['addon']) : '';
 		$this->type_class = 'simcal-field-license';
-		parent::__construct( $field );
+		parent::__construct($field);
 	}
 
 	/**
@@ -47,11 +47,11 @@ 
 	 */
 	public function html() {
 
-		if ( ! empty( $this->addon ) ) {
+		if ( ! empty($this->addon)) {
 
-			$status = apply_filters( 'simcal_addon_status_' . $this->addon, simcal_get_license_status( $this->addon ) );
+			$status = apply_filters('simcal_addon_status_'.$this->addon, simcal_get_license_status($this->addon));
 
-			if ( $status !== 'valid' ) {
+			if ($status !== 'valid') {
 				$display_activate   = 'display: inline-block';
 				$display_deactivate = 'display: none';
 				$active             = 'valid' == $status ? 'display: block' : 'display: none';
@@ -59,7 +59,7 @@ 
 			} else {
 				$display_activate   = $active = 'display: none';
 				$display_deactivate = 'display: inline-block';
-				$disabled           = empty( $this->value ) ? '' : 'disabled="disabled"';
+				$disabled           = empty($this->value) ? '' : 'disabled="disabled"';
 			}
 
 			?>
@@ -74,16 +74,16 @@ 
 				<span class="simcal-addon-manage-license-buttons">
 
 					<button class="button-secondary simcal-addon-manage-license deactivate" data-add-on="<?php echo $this->addon; ?>" style="<?php echo $display_deactivate; ?>">
-				        <i class="simcal-icon-spinner simcal-icon-spin" style="display: none;"></i><?php _e( 'Deactivate', 'google-calendar-events' ); ?>
+				        <i class="simcal-icon-spinner simcal-icon-spin" style="display: none;"></i><?php _e('Deactivate', 'google-calendar-events'); ?>
 					</button>
 
 					<button class="button-secondary simcal-addon-manage-license activate" data-add-on="<?php echo $this->addon; ?>" style="<?php echo $display_activate; ?>">
-						<i class="simcal-icon-spinner simcal-icon-spin" style="display: none;"></i><?php _e( 'Activate', 'google-calendar-events' ); ?>
+						<i class="simcal-icon-spinner simcal-icon-spin" style="display: none;"></i><?php _e('Activate', 'google-calendar-events'); ?>
 					</button>
 
 					<span class="error" style="color: red; display: none"> </span>
 
-					<strong class="label" style="color:green; <?php echo $active; ?>"> <?php _e( '(active)', 'google-calendar-events' ); ?></strong>
+					<strong class="label" style="color:green; <?php echo $active; ?>"> <?php _e('(active)', 'google-calendar-events'); ?></strong>
 
 				</span>
 

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 echo ( ! empty( $this->text ) ? $this->text : __( 'Yes', 'google-calendar-events' ) ); ?>
+					<?php checked($this->value, 'yes', true); ?>
+					<?php echo $this->attributes; ?>/><?php echo ( ! empty($this->text) ? $this->text : __('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>';
 			}
 
 		}