moonstonemedia / Simple-Calendar

includes/events/events.php

Spacing +123 added lines, -123 removed lines

@@ -8,7 +8,7 @@ 
 
 use Carbon\Carbon;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -45,9 +45,9 @@ 
 	 * @param array $e Events.
 	 * @param string|\DateTimeZone $tz Timezone.
 	 */
-	public function __construct( $e = array(), $tz = 'UTC' ) {
-		$this->set_events( $e );
-		$this->set_timezone( $tz );
+	public function __construct($e = array(), $tz = 'UTC') {
+		$this->set_events($e);
+		$this->set_timezone($tz);
 	}
 
 	/**
@@ -59,10 +59,10 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_events( $n = '' ) {
-		if ( ! empty( $n ) && ! empty( $this->events ) ) {
-			$length = absint( $n );
-			return array_slice( $this->events, 0, $length, true );
+	public function get_events($n = '') {
+		if ( ! empty($n) && ! empty($this->events)) {
+			$length = absint($n);
+			return array_slice($this->events, 0, $length, true);
 		}
 		return $this->events;
 	}
@@ -74,7 +74,7 @@ 
 	 *
 	 * @param array $ev Events.
 	 */
-	public function set_events( array $ev ) {
+	public function set_events(array $ev) {
 		$this->events = $ev;
 	}
 
@@ -87,11 +87,11 @@ 
 	 *
 	 * @return Events
 	 */
-	public function set_timezone( $tz ) {
-		if ( $tz instanceof \DateTimeZone ) {
+	public function set_timezone($tz) {
+		if ($tz instanceof \DateTimeZone) {
 			$tz = $tz->getName();
 		}
-		$this->timezone = simcal_esc_timezone( $tz, $this->timezone );
+		$this->timezone = simcal_esc_timezone($tz, $this->timezone);
 		return $this;
 	}
 
@@ -104,11 +104,11 @@ 
 	 *
 	 * @return Events
 	 */
-	public function shift( $n ) {
-		if ( ! empty( $this->events ) ) {
-			$offset = intval( $n );
-			$length = count( $this->events );
-			$this->set_events( array_slice( $this->events, $offset, $length, true ) );
+	public function shift($n) {
+		if ( ! empty($this->events)) {
+			$offset = intval($n);
+			$length = count($this->events);
+			$this->set_events(array_slice($this->events, $offset, $length, true));
 		}
 		return $this;
 	}
@@ -121,7 +121,7 @@ 
 	 * @return Events
 	 */
 	public function private_only() {
-		$this->set_events( $this->filter_property( 'public', 'hide' ) );
+		$this->set_events($this->filter_property('public', 'hide'));
 		return $this;
 	}
 
@@ -133,7 +133,7 @@ 
 	 * @return Events
 	 */
 	public function public_only() {
-		$this->set_events( $this->filter_property( 'public', 'show' ) );
+		$this->set_events($this->filter_property('public', 'show'));
 		return $this;
 	}
 
@@ -145,7 +145,7 @@ 
 	 * @return Events
 	 */
 	public function recurring() {
-		$this->set_events( $this->filter_property( 'recurrence', 'show' ) );
+		$this->set_events($this->filter_property('recurrence', 'show'));
 		return $this;
 	}
 
@@ -157,7 +157,7 @@ 
 	 * @return Events
 	 */
 	public function not_recurring() {
-		$this->set_events( $this->filter_property( 'recurrence', 'hide' ) );
+		$this->set_events($this->filter_property('recurrence', 'hide'));
 		return $this;
 	}
 
@@ -169,7 +169,7 @@ 
 	 * @return Events
 	 */
 	public function whole_day() {
-		$this->set_events( $this->filter_property( 'whole_day', 'show' ) );
+		$this->set_events($this->filter_property('whole_day', 'show'));
 		return $this;
 	}
 
@@ -181,7 +181,7 @@ 
 	 * @return Events
 	 */
 	public function not_whole_day() {
-		$this->set_events( $this->filter_property( 'whole_day', 'hide' ) );
+		$this->set_events($this->filter_property('whole_day', 'hide'));
 		return $this;
 	}
 
@@ -193,7 +193,7 @@ 
 	 * @return Events
 	 */
 	public function multi_day() {
-		$this->set_events( $this->filter_property( 'multiple_days', 'show' ) );
+		$this->set_events($this->filter_property('multiple_days', 'show'));
 		return $this;
 	}
 
@@ -205,7 +205,7 @@ 
 	 * @return Events
 	 */
 	public function single_day() {
-		$this->set_events( $this->filter_property( 'multiple_days', 'hide' ) );
+		$this->set_events($this->filter_property('multiple_days', 'hide'));
 		return $this;
 	}
 
@@ -217,7 +217,7 @@ 
 	 * @return Events
 	 */
 	public function with_location() {
-		$this->set_events( $this->filter_property( 'venue', 'show' ) );
+		$this->set_events($this->filter_property('venue', 'show'));
 		return $this;
 	}
 
@@ -229,7 +229,7 @@ 
 	 * @return Events
 	 */
 	public function without_location() {
-		$this->set_events( $this->filter_property( 'venue', 'hide' ) );
+		$this->set_events($this->filter_property('venue', 'hide'));
 		return $this;
 	}
 
@@ -244,18 +244,18 @@ 
 	 *
 	 * @return array
 	 */
-	private function filter_property( $property, $toggle ) {
+	private function filter_property($property, $toggle) {
 		$filtered = array();
-		if ( ! empty( $this->events ) ) {
-			foreach ( $this->events as $ts => $events ) {
-				foreach ( $events as $event ) {
-					if ( 'hide' == $toggle ) {
-						if ( ! $event->$property ) {
-							$filtered[ $ts ][] = $event;
+		if ( ! empty($this->events)) {
+			foreach ($this->events as $ts => $events) {
+				foreach ($events as $event) {
+					if ('hide' == $toggle) {
+						if ( ! $event->$property) {
+							$filtered[$ts][] = $event;
 						}
-					} elseif ( 'show' == $toggle ) {
-						if ( $event->$property ) {
-							$filtered[ $ts ][] = $event;
+					} elseif ('show' == $toggle) {
+						if ($event->$property) {
+							$filtered[$ts][] = $event;
 						}
 					}
 				}
@@ -273,14 +273,14 @@ 
 	 *
 	 * @return Events
 	 */
-	public function future( $present = '' ) {
+	public function future($present = '') {
 		$last = $this->get_last();
 		$to = $last instanceof Event ? $last->start_utc : false;
-		if ( $to ) {
-			if ( empty( $present ) ) {
-				$present = Carbon::now( $this->timezone )->getTimestamp();
+		if ($to) {
+			if (empty($present)) {
+				$present = Carbon::now($this->timezone)->getTimestamp();
 			}
-			$this->set_events( $this->filter_events( intval( $present ), $to ) );
+			$this->set_events($this->filter_events(intval($present), $to));
 		}
 		return $this;
 	}
@@ -294,14 +294,14 @@ 
 	 *
 	 * @return Events
 	 */
-	public function past( $present = '' ) {
+	public function past($present = '') {
 		$first = $this->get_last();
 		$from  = $first instanceof Event ? $first->start_utc : false;
-		if ( $from ) {
-			if ( empty( $present ) ) {
-				$present = Carbon::now( $this->timezone )->getTimestamp();
+		if ($from) {
+			if (empty($present)) {
+				$present = Carbon::now($this->timezone)->getTimestamp();
 			}
-			$this->set_events( $this->filter_events( $from, intval( $present ) ) );
+			$this->set_events($this->filter_events($from, intval($present)));
 		}
 		return $this;
 	}
@@ -315,9 +315,9 @@ 
 	 *
 	 * @return Events
 	 */
-	public function after( $time ) {
-		$dt = $this->parse( $time );
-		return ! is_null( $dt ) ? $this->future( $dt->getTimestamp() ) : $this;
+	public function after($time) {
+		$dt = $this->parse($time);
+		return ! is_null($dt) ? $this->future($dt->getTimestamp()) : $this;
 	}
 
 	/**
@@ -329,9 +329,9 @@ 
 	 *
 	 * @return Events
 	 */
-	public function before( $time ) {
-		$dt = $this->parse( $time );
-		return ! is_null( $dt ) ? $this->past( $dt->getTimestamp() ) : $this;
+	public function before($time) {
+		$dt = $this->parse($time);
+		return ! is_null($dt) ? $this->past($dt->getTimestamp()) : $this;
 	}
 
 	/**
@@ -343,10 +343,10 @@ 
 	 *
 	 * @return Events
 	 */
-	public function from( $time ) {
-		$last = $this->parse( $time );
-		if ( ! is_null( $last ) ) {
-			$this->set_events( $this->filter_events( $time, $last->getTimestamp() ) );
+	public function from($time) {
+		$last = $this->parse($time);
+		if ( ! is_null($last)) {
+			$this->set_events($this->filter_events($time, $last->getTimestamp()));
 		}
 		return $this;
 	}
@@ -360,10 +360,10 @@ 
 	 *
 	 * @return Events
 	 */
-	public function to( $time ) {
-		$first = $this->parse( $time );
-		if ( ! is_null( $first ) ) {
-			$this->set_events( $this->filter_events( $first->getTimestamp(), $time ) );
+	public function to($time) {
+		$first = $this->parse($time);
+		if ( ! is_null($first)) {
+			$this->set_events($this->filter_events($first->getTimestamp(), $time));
 		}
 		return $this;
 	}
@@ -377,15 +377,15 @@ 
 	 *
 	 * @return null|Carbon
 	 */
-	private function parse( $time ) {
-		if ( is_int( $time ) ) {
-			return Carbon::createFromTimestamp( $time, $this->timezone );
-		} elseif ( is_string( $time ) && ! empty( $time ) ) {
-			return Carbon::parse( $time, $this->timezone );
-		} elseif ( $time instanceof Carbon ) {
-			return $time->setTimezone( $this->timezone );
-		} elseif ( $time instanceof \DateTime ) {
-			return Carbon::instance( $time )->setTimezone( $this->timezone );
+	private function parse($time) {
+		if (is_int($time)) {
+			return Carbon::createFromTimestamp($time, $this->timezone);
+		} elseif (is_string($time) && ! empty($time)) {
+			return Carbon::parse($time, $this->timezone);
+		} elseif ($time instanceof Carbon) {
+			return $time->setTimezone($this->timezone);
+		} elseif ($time instanceof \DateTime) {
+			return Carbon::instance($time)->setTimezone($this->timezone);
 		}
 		return null;
 	}
@@ -398,7 +398,7 @@ 
 	 * @return null|Event
 	 */
 	public function get_first() {
-		return array_shift( $this->events );
+		return array_shift($this->events);
 	}
 
 	/**
@@ -409,7 +409,7 @@ 
 	 * @return null|Event
 	 */
 	public function get_last() {
-		return array_pop( $this->events );
+		return array_pop($this->events);
 	}
 
 	/**
@@ -420,7 +420,7 @@ 
 	 * @return null|Event
 	 */
 	public function get_upcoming() {
-		return $this->get_closest( 'future' );
+		return $this->get_closest('future');
 	}
 
 	/**
@@ -431,7 +431,7 @@ 
 	 * @return null|Event
 	 */
 	public function get_latest() {
-		return $this->get_closest( 'past' );
+		return $this->get_closest('past');
 	}
 
 	/**
@@ -444,11 +444,11 @@ 
 	 *
 	 * @return null|Event
 	 */
-	private function get_closest( $dir ) {
-		if ( 'future' == $dir ) {
-			return array_shift( $this->future()->get_events() );
-		} elseif ( 'past' == $dir ) {
-			return array_shift( $this->past()->get_events() );
+	private function get_closest($dir) {
+		if ('future' == $dir) {
+			return array_shift($this->future()->get_events());
+		} elseif ('past' == $dir) {
+			return array_shift($this->past()->get_events());
 		}
 		return null;
 	}
@@ -462,11 +462,11 @@ 
 	 *
 	 * @return array Multidimensional array with month number, week number and Event objects for each weekday.
 	 */
-	public function get_year( $year ) {
-		$y = intval( $year );
+	public function get_year($year) {
+		$y = intval($year);
 		$months = array();
-		for ( $m = 1; $m <= 12; $m++ ) {
-			$months[ strval( $m ) ] = $this->get_month( $y, $m );
+		for ($m = 1; $m <= 12; $m++) {
+			$months[strval($m)] = $this->get_month($y, $m);
 		}
 		return $months;
 	}
@@ -481,16 +481,16 @@ 
 	 *
 	 * @return array Multidimensional array with week number, day of the week and array of Event objects for each week day.
 	 */
-	public function get_month( $year, $month ) {
-		$y = intval( $year );
-		$m = min( max( 1, absint( $month ) ), 12 );
-		$days  = Carbon::createFromDate( $y, $m, 2, $this->timezone )->startOfMonth()->daysInMonth;
+	public function get_month($year, $month) {
+		$y = intval($year);
+		$m = min(max(1, absint($month)), 12);
+		$days  = Carbon::createFromDate($y, $m, 2, $this->timezone)->startOfMonth()->daysInMonth;
 		$weeks = array();
-		for ( $d = 1; $d < $days; $d++ ) {
-			$current = Carbon::createFromDate( $y, $m, $d );
+		for ($d = 1; $d < $days; $d++) {
+			$current = Carbon::createFromDate($y, $m, $d);
 			$week = $current->weekOfYear;
 			$day  = $current->dayOfWeek;
-			$weeks[ strval( $week ) ][ strval( $day ) ] = $this->get_day( $y, $m, $d );
+			$weeks[strval($week)][strval($day)] = $this->get_day($y, $m, $d);
 		}
 		return $weeks;
 	}
@@ -505,16 +505,16 @@ 
 	 *
 	 * @return array Associative array with day of the week for key and array of Event objects for value.
 	 */
-	public function get_week( $year, $week ) {
-		$y = intval( $year );
-		$w = absint( $week );
-		$m = date( 'n', strtotime( strval( $y ) . '-W' . strval( $w ) ) );
-		$month_dt = Carbon::createFromDate( $y, $m, 2, $this->timezone );
+	public function get_week($year, $week) {
+		$y = intval($year);
+		$w = absint($week);
+		$m = date('n', strtotime(strval($y).'-W'.strval($w)));
+		$month_dt = Carbon::createFromDate($y, $m, 2, $this->timezone);
 		$days = array();
-		for ( $d = 1; $d < $month_dt->daysInMonth; $d++ ) {
-			$current = Carbon::createFromDate( $y, $m, $d );
-			if ( $w == $current->weekOfYear ) {
-				$days[ strval( $current->dayOfWeek ) ] = $this->get_day( $y, $m, $d );
+		for ($d = 1; $d < $month_dt->daysInMonth; $d++) {
+			$current = Carbon::createFromDate($y, $m, $d);
+			if ($w == $current->weekOfYear) {
+				$days[strval($current->dayOfWeek)] = $this->get_day($y, $m, $d);
 			}
 		}
 		return $days;
@@ -531,13 +531,13 @@ 
 	 *
 	 * @return array Event objects for the day.
 	 */
-	public function get_day( $year, $month, $day ) {
-		$y = intval( $year );
-		$m = min( max( 1, absint( $month ) ), 12 );
-		$d = min( absint( $day ), 31 );
-		$from = Carbon::createFromDate( $y, $m, $d, $this->timezone )->startOfDay()->getTimestamp();
-		$to   = Carbon::createFromDate( $y, $m, $d, $this->timezone )->endOfDay()->getTimestamp();
-		return $this->filter_events( $from, $to );
+	public function get_day($year, $month, $day) {
+		$y = intval($year);
+		$m = min(max(1, absint($month)), 12);
+		$d = min(absint($day), 31);
+		$from = Carbon::createFromDate($y, $m, $d, $this->timezone)->startOfDay()->getTimestamp();
+		$to   = Carbon::createFromDate($y, $m, $d, $this->timezone)->endOfDay()->getTimestamp();
+		return $this->filter_events($from, $to);
 	}
 
 	/**
@@ -548,9 +548,9 @@ 
 	 * @return array Event objects for today.
 	 */
 	public function get_today() {
-		$start = Carbon::today( $this->timezone )->startOfDay()->getTimestamp();
-		$end   = Carbon::today( $this->timezone )->endOfDay()->getTimestamp();
-		return $this->filter_events( $start, $end );
+		$start = Carbon::today($this->timezone)->startOfDay()->getTimestamp();
+		$end   = Carbon::today($this->timezone)->endOfDay()->getTimestamp();
+		return $this->filter_events($start, $end);
 	}
 
 	/**
@@ -561,9 +561,9 @@ 
 	 * @return array Event objects for tomorrow.
 	 */
 	public function get_tomorrow() {
-		$start = Carbon::tomorrow( $this->timezone )->startOfDay()->getTimestamp();
-		$end   = Carbon::tomorrow( $this->timezone )->endOfDay()->getTimestamp();
-		return $this->filter_events( $start, $end );
+		$start = Carbon::tomorrow($this->timezone)->startOfDay()->getTimestamp();
+		$end   = Carbon::tomorrow($this->timezone)->endOfDay()->getTimestamp();
+		return $this->filter_events($start, $end);
 	}
 
 	/**
@@ -574,9 +574,9 @@ 
 	 * @return array Event objects for yesterday.
 	 */
 	public function get_yesterday() {
-		$start = Carbon::yesterday( $this->timezone )->startOfDay()->getTimestamp();
-		$end   = Carbon::yesterday( $this->timezone )->endOfDay()->getTimestamp();
-		return $this->filter_events( $start, $end );
+		$start = Carbon::yesterday($this->timezone)->startOfDay()->getTimestamp();
+		$end   = Carbon::yesterday($this->timezone)->endOfDay()->getTimestamp();
+		return $this->filter_events($start, $end);
 	}
 
 	/**
@@ -590,16 +590,16 @@ 
 	 *
 	 * @return array Filtered array of Event objects.
 	 */
-	private function filter_events( $from, $to ) {
-		$timestamps   = array_keys( $this->events );
-		$lower_bound  = array_filter( $timestamps,  function( $ts ) use( $from ) {
-			return intval( $ts ) > intval( $from );
+	private function filter_events($from, $to) {
+		$timestamps   = array_keys($this->events);
+		$lower_bound  = array_filter($timestamps, function($ts) use($from) {
+			return intval($ts) > intval($from);
 		} );
-		$higher_bound = array_filter( $lower_bound, function( $ts ) use( $to ) {
-			return intval( $ts ) > intval( $to );
+		$higher_bound = array_filter($lower_bound, function($ts) use($to) {
+			return intval($ts) > intval($to);
 		} );
-		$filtered = array_combine( $higher_bound, $higher_bound );
-		return array_intersect_key( $this->events, $filtered );
+		$filtered = array_combine($higher_bound, $higher_bound);
+		return array_intersect_key($this->events, $filtered);
 	}
 
 }

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> A Google API key is not needed for calendars configured to use the <strong><a href="%s" target="_blank">Google Calendar Pro add-on</a></strong>.', '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> A Google API key is not needed for calendars configured to use the <strong><a href="%s" target="_blank">Google Calendar Pro add-on</a></strong>.', '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/functions/admin.php

Spacing +81 added lines, -81 removed lines

@@ -7,7 +7,7 @@ 
  * @package SimpleCalendar/Admin/Functions
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -32,9 +32,9 @@ 
  *
  * @return null|\SimpleCalendar\Abstracts\Admin_Page
  */
-function simcal_get_admin_page( $page ) {
+function simcal_get_admin_page($page) {
 	$objects = \SimpleCalendar\plugin()->objects;
-	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_admin_page( $page ) : null;
+	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_admin_page($page) : null;
 }
 
 /**
@@ -47,9 +47,9 @@ 
  *
  * @return null|\SimpleCalendar\Abstracts\Field
  */
-function simcal_get_field( $args, $name = '' ) {
+function simcal_get_field($args, $name = '') {
 	$objects = \SimpleCalendar\plugin()->objects;
-	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_field( $args, $name ) : null;
+	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_field($args, $name) : null;
 }
 
 /**
@@ -62,11 +62,11 @@ 
  *
  * @return void
  */
-function simcal_print_field( $args, $name = '' ) {
+function simcal_print_field($args, $name = '') {
 
-	$field = simcal_get_field( $args, $name );
+	$field = simcal_get_field($args, $name);
 
-	if ( $field instanceof \SimpleCalendar\Abstracts\Field ) {
+	if ($field instanceof \SimpleCalendar\Abstracts\Field) {
 		$field->html();
 	}
 }
@@ -80,50 +80,50 @@ 
  *
  * @return bool
  */
-function simcal_delete_feed_transients( $id = '' ) {
+function simcal_delete_feed_transients($id = '') {
 
-	if ( is_numeric( $id ) ) {
-		$id = intval( $id ) > 0 ? absint( $id ) : simcal_get_calendars();
-	} elseif ( $id instanceof WP_Post ) {
+	if (is_numeric($id)) {
+		$id = intval($id) > 0 ? absint($id) : simcal_get_calendars();
+	} elseif ($id instanceof WP_Post) {
 		$id = $id->ID;
-	} elseif ( is_array( $id ) ) {
-		$id = array_map( 'absint', $id );
+	} elseif (is_array($id)) {
+		$id = array_map('absint', $id);
 	} else {
-		$id = simcal_get_calendars( '', true );
+		$id = simcal_get_calendars('', true);
 	}
 
 	$feed_types = simcal_get_feed_types();
 
-	if ( is_array( $id ) ) {
+	if (is_array($id)) {
 
-		$posts = get_posts( array(
+		$posts = get_posts(array(
 			'post_type' => 'calendar',
 			'fields'    => 'ids',
 			'post__in'  => $id,
 			'nopaging'  => true,
-		) );
+		));
 
-		foreach ( $posts as $post ) {
-			$calendar = simcal_get_calendar( $post );
-			if ( $calendar instanceof \SimpleCalendar\Abstracts\Calendar ) {
-				foreach ( $feed_types as $feed_type ) {
-					delete_transient( '_simple-calendar_feed_id_' . strval( $calendar->id ) . '_' . $feed_type );
+		foreach ($posts as $post) {
+			$calendar = simcal_get_calendar($post);
+			if ($calendar instanceof \SimpleCalendar\Abstracts\Calendar) {
+				foreach ($feed_types as $feed_type) {
+					delete_transient('_simple-calendar_feed_id_'.strval($calendar->id).'_'.$feed_type);
 				}
 			}
 		}
 
 	} else {
 
-		$post = get_post( $id );
-		$calendar = simcal_get_calendar( $post );
-		if ( $calendar instanceof \SimpleCalendar\Abstracts\Calendar ) {
-			foreach ( $feed_types as $feed_type ) {
-				delete_transient( '_simple-calendar_feed_id_' . strval( $calendar->id ) . '_' . $feed_type );
+		$post = get_post($id);
+		$calendar = simcal_get_calendar($post);
+		if ($calendar instanceof \SimpleCalendar\Abstracts\Calendar) {
+			foreach ($feed_types as $feed_type) {
+				delete_transient('_simple-calendar_feed_id_'.strval($calendar->id).'_'.$feed_type);
 			}
 		}
 	}
 
-	return delete_transient( '_simple-calendar_feed_ids' );
+	return delete_transient('_simple-calendar_feed_ids');
 }
 
 /**
@@ -139,33 +139,33 @@ 
  *
  * @return array|string Sanitized variable
  */
-function simcal_sanitize_input( $var, $func = 'sanitize_text_field'  ) {
+function simcal_sanitize_input($var, $func = 'sanitize_text_field') {
 
-	if ( is_null( $var ) ) {
+	if (is_null($var)) {
 		return '';
 	}
 
-	if ( is_bool( $var ) ) {
-		if ( $var === true ) {
+	if (is_bool($var)) {
+		if ($var === true) {
 			return 'yes';
 		} else {
 			return 'no';
 		}
 	}
 
-	if ( is_string( $var ) || is_numeric( $var ) ) {
-		$func = is_string( $func ) && function_exists( $func ) ? $func : 'sanitize_text_field';
-		return call_user_func( $func, trim( strval( $var ) ) );
+	if (is_string($var) || is_numeric($var)) {
+		$func = is_string($func) && function_exists($func) ? $func : 'sanitize_text_field';
+		return call_user_func($func, trim(strval($var)));
 	}
 
-	if ( is_object( $var ) ) {
+	if (is_object($var)) {
 		$var = (array) $var;
 	}
 
-	if ( is_array( $var ) ) {
+	if (is_array($var)) {
 		$array = array();
-		foreach ( $var as $k => $v ) {
-			$array[ $k ] = simcal_sanitize_input( $v );
+		foreach ($var as $k => $v) {
+			$array[$k] = simcal_sanitize_input($v);
 		}
 		return $array;
 	}
@@ -183,9 +183,9 @@ 
  */
 function simcal_is_admin_screen() {
 
-	$view = function_exists( 'get_current_screen' ) ? get_current_screen() : false;
+	$view = function_exists('get_current_screen') ? get_current_screen() : false;
 
-	if ( $view instanceof WP_Screen ) {
+	if ($view instanceof WP_Screen) {
 
 		// Screens used by this plugin.
 		$screens = array(
@@ -200,7 +200,7 @@ 
 			'dashboard_page_simple-calendar_credits',
 			'dashboard_page_simple-calendar_translators',
 		);
-		if ( in_array( $view->id, $screens ) ) {
+		if (in_array($view->id, $screens)) {
 			return $view->id;
 		}
 	}
@@ -219,8 +219,8 @@ 
  *
  * @return \SimpleCalendar\Admin\Updater
  */
-function simcal_addon_updater( $_api_url, $_plugin_file, $_api_data = null ) {
-	return new \SimpleCalendar\Admin\Updater( $_api_url, $_plugin_file, $_api_data );
+function simcal_addon_updater($_api_url, $_plugin_file, $_api_data = null) {
+	return new \SimpleCalendar\Admin\Updater($_api_url, $_plugin_file, $_api_data);
 }
 
 /**
@@ -232,10 +232,10 @@ 
  *
  * @return null|string
  */
-function simcal_get_license_key( $addon ) {
-	$licenses = get_option( 'simple-calendar_settings_licenses', array() );
-	if ( isset( $licenses['keys'][ $addon ] ) ) {
-		return empty( $licenses['keys'][ $addon ] ) ? null : $licenses['keys'][ $addon ];
+function simcal_get_license_key($addon) {
+	$licenses = get_option('simple-calendar_settings_licenses', array());
+	if (isset($licenses['keys'][$addon])) {
+		return empty($licenses['keys'][$addon]) ? null : $licenses['keys'][$addon];
 	}
 	return null;
 }
@@ -251,9 +251,9 @@ 
  *
  * @return array|string
  */
-function simcal_get_license_status( $addon = null ) {
-	$licenses = get_option( 'simple-calendar_licenses_status', array() );
-	return isset( $licenses[ $addon ] ) ? $licenses[ $addon ] : $licenses;
+function simcal_get_license_status($addon = null) {
+	$licenses = get_option('simple-calendar_licenses_status', array());
+	return isset($licenses[$addon]) ? $licenses[$addon] : $licenses;
 }
 
 /**
@@ -274,7 +274,7 @@ 
  * @since 3.0.0
  */
 function simcal_delete_admin_notices() {
-	delete_option( 'simple-calendar_admin_notices' );
+	delete_option('simple-calendar_admin_notices');
 }
 
 /**
@@ -286,22 +286,22 @@ 
  *
  * @return void
  */
-function simcal_print_shortcode_tip( $post_id ) {
+function simcal_print_shortcode_tip($post_id) {
 
 	$browser = new \Browser();
-	if ( $browser::PLATFORM_APPLE == $browser->getPlatform() ) {
+	if ($browser::PLATFORM_APPLE == $browser->getPlatform()) {
 		$cmd = '⌘+C';
 	} else {
 		$cmd = 'Ctrl+C';
 	}
 
-	$shortcut  = sprintf( __( 'Press %s to copy.', 'google-calendar-events' ), $cmd );
-	$shortcode = sprintf( '[calendar id="%s"]', $post_id );
+	$shortcut  = sprintf(__('Press %s to copy.', 'google-calendar-events'), $cmd);
+	$shortcode = sprintf('[calendar id="%s"]', $post_id);
 
-	echo "<input readonly='readonly' " .
-				"class='simcal-shortcode simcal-calendar-shortcode simcal-shortcode-tip' " .
-				"title='" . $shortcut . "' " .
-				"onclick='this.select();' value='" . $shortcode . "' />";
+	echo "<input readonly='readonly' ".
+				"class='simcal-shortcode simcal-calendar-shortcode simcal-shortcode-tip' ".
+				"title='".$shortcut."' ".
+				"onclick='this.select();' value='".$shortcode."' />";
 }
 
 /**
@@ -316,20 +316,20 @@ 
  *
  * @return  string  $url        Full Google Analytics campaign URL
  */
-function simcal_ga_campaign_url( $base_url, $campaign, $content, $raw = false ) {
+function simcal_ga_campaign_url($base_url, $campaign, $content, $raw = false) {
 
-	$url = add_query_arg( array(
+	$url = add_query_arg(array(
 		'utm_source'   => 'inside-plugin',
 		'utm_medium'   => 'link',
 		'utm_campaign' => $campaign, // i.e. 'core-plugin', 'gcal-pro'
 		'utm_content'  => $content // i.e. 'sidebar-link', 'settings-link'
-	), $base_url );
+	), $base_url);
 
-	if ( $raw ) {
-		return esc_url_raw( $url );
+	if ($raw) {
+		return esc_url_raw($url);
 	}
 
-	return esc_url( $url );
+	return esc_url($url);
 }
 
 /**
@@ -341,7 +341,7 @@ 
  */
 function simcal_newsletter_signup() {
 
-	if ( $screen = simcal_is_admin_screen() ) {
+	if ($screen = simcal_is_admin_screen()) {
 
 		global $current_user;
 		get_currentuserinfo();
@@ -352,11 +352,11 @@ 
 		<div id="simcal-drip" class="<?php echo $screen; ?>">
 			<div class="signup">
 				<p>
-					<?php _e( "Enter your name and email and we'll send you a coupon code for 20% off our Google Calendar Pro add-on.", 'google-calendar-events' ); ?>
+					<?php _e("Enter your name and email and we'll send you a coupon code for 20% off our Google Calendar Pro add-on.", 'google-calendar-events'); ?>
 				</p>
 
 				<p>
-					<label for="simcal-drip-field-email"><?php _e( 'Your Email', 'google-calendar-events' ); ?></label><br />
+					<label for="simcal-drip-field-email"><?php _e('Your Email', 'google-calendar-events'); ?></label><br />
 					<input type="email"
 					       id="simcal-drip-field-email"
 					       name="fields[email]"
@@ -364,7 +364,7 @@ 
 				</p>
 
 				<p>
-					<label for="simcal-drip-field-first_name"><?php _e( 'First Name', 'google-calendar-events' ); ?></label><br />
+					<label for="simcal-drip-field-first_name"><?php _e('First Name', 'google-calendar-events'); ?></label><br />
 					<input type="text"
 					       id="simcal-drip-field-first_name"
 					       name="fields[first_name]"
@@ -373,15 +373,15 @@ 
 				<p class="textright">
 					<a href="#"
 					   id="simcal-drip-signup"
-					   class="button button-primary"><?php _e( 'Send me the coupon', 'google-calendar-events' ); ?></a>
+					   class="button button-primary"><?php _e('Send me the coupon', 'google-calendar-events'); ?></a>
 				</p>
 				<div class="textright">
-					<a href="<?php echo simcal_ga_campaign_url( simcal_get_url( 'gcal-pro' ), 'core-plugin', 'sidebar-link' ); ?>"
-					   target="_blank"><?php _e( 'Just take me to GCal Pro', 'google-calendar-events' ); ?></a>
+					<a href="<?php echo simcal_ga_campaign_url(simcal_get_url('gcal-pro'), 'core-plugin', 'sidebar-link'); ?>"
+					   target="_blank"><?php _e('Just take me to GCal Pro', 'google-calendar-events'); ?></a>
 				</div>
 			</div>
 			<div class="thank-you" style="display: none;">
-				<?php _e( 'Thank you!', 'google-calendar-events' ); ?>
+				<?php _e('Thank you!', 'google-calendar-events'); ?>
 			</div>
 			<div class="clear">
 			</div>
@@ -392,7 +392,7 @@ 
 
 }
 
-if ( ! function_exists( 'mb_detect_encoding' ) ) {
+if ( ! function_exists('mb_detect_encoding')) {
 
 	/**
 	 * Fallback function for `mb_detect_encoding()`,
@@ -406,7 +406,7 @@ 
 	 *
 	 * @return bool
 	 */
-	function mb_detect_encoding( $string, $enc = null, $ret = null ) {
+	function mb_detect_encoding($string, $enc = null, $ret = null) {
 
 		static $enclist = array(
 			'UTF-8',
@@ -432,10 +432,10 @@ 
 
 		$result = false;
 
-		foreach ( $enclist as $item ) {
-			$sample = iconv( $item, $item, $string );
-			if ( md5( $sample ) == md5( $string ) ) {
-				if ( $ret === null ) {
+		foreach ($enclist as $item) {
+			$sample = iconv($item, $item, $string);
+			if (md5($sample) == md5($string)) {
+				if ($ret === null) {
 					$result = $item;
 				} else {
 					$result = true;

includes/functions/deprecated.php

Spacing +14 added lines, -14 removed lines

@@ -8,7 +8,7 @@ 
  * @deprecated
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -16,18 +16,18 @@ 
  * Print a calendar.
  * @deprecated Use simcal_print_calendar()
  */
-function gce_print_calendar( $feed_ids, $display, $args  ) {
+function gce_print_calendar($feed_ids, $display, $args) {
 
 	$id = 0;
 
-	if ( is_numeric( $feed_ids ) ) {
-		$id = intval( $feed_ids );
-	} elseif ( is_array( $feed_ids ) ) {
-		$id = isset( $feed_ids[0] ) ? intval( $feed_ids[0] ) : '';
+	if (is_numeric($feed_ids)) {
+		$id = intval($feed_ids);
+	} elseif (is_array($feed_ids)) {
+		$id = isset($feed_ids[0]) ? intval($feed_ids[0]) : '';
 	}
 
-	if ( $id > 0 ) {
-		simcal_print_calendar( $id );
+	if ($id > 0) {
+		simcal_print_calendar($id);
 	}
 }
 
@@ -35,16 +35,16 @@ 
  * Convert date from mm/dd/yyyy to unix timestamp.
  * @deprecated Assumes a US-only time format.
  */
-function gce_date_unix( $date = '' ) {
-	if ( empty( $date ) ) {
-		$current_time = current_time( 'timestamp' );
-		$timestamp = mktime( 0, 0, 0, date( 'm', $current_time ), date( 'd', $current_time ), date( 'Y', $current_time ) );
+function gce_date_unix($date = '') {
+	if (empty($date)) {
+		$current_time = current_time('timestamp');
+		$timestamp = mktime(0, 0, 0, date('m', $current_time), date('d', $current_time), date('Y', $current_time));
 	} else {
-		$date = explode( '/', $date );
+		$date = explode('/', $date);
 		$month = $date[0];
 		$day   = $date[1];
 		$year  = $date[2];
-		$timestamp = mktime( 0, 0, 0, $month, $day, $year );
+		$timestamp = mktime(0, 0, 0, $month, $day, $year);
 	}
 	return $timestamp;
 }

includes/functions/shared.php

Spacing +84 added lines, -84 removed lines

@@ -7,7 +7,7 @@ 
  * @package SimpleCalendar/Functions
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -20,17 +20,17 @@ 
  */
 function is_simple_calendar() {
 
-	if ( is_singular() ) {
+	if (is_singular()) {
 
 		global $post, $post_type;
 
-		if ( 'calendar' == $post_type ) {
+		if ('calendar' == $post_type) {
 			return true;
 		} else {
-			if ( false !== get_post_meta( $post->ID, '_simcal_attach_calendar_id', true ) ) {
+			if (false !== get_post_meta($post->ID, '_simcal_attach_calendar_id', true)) {
 				return true;
 			}
-			if ( has_shortcode( $post->post_content, 'calendar' ) ) {
+			if (has_shortcode($post->post_content, 'calendar')) {
 				return true;
 			}
 		}
@@ -46,8 +46,8 @@ 
  *
  * @return string
  */
-function simcal_get_url( $url ) {
-	return \SimpleCalendar\plugin()->get_url( $url );
+function simcal_get_url($url) {
+	return \SimpleCalendar\plugin()->get_url($url);
 }
 
 /**
@@ -71,9 +71,9 @@ 
  *
  * @return null|\SimpleCalendar\Abstracts\Feed
  */
-function simcal_get_feed( $object ) {
+function simcal_get_feed($object) {
 	$objects = \SimpleCalendar\plugin()->objects;
-	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_feed( $object ) : null;
+	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_feed($object) : null;
 }
 
 /**
@@ -97,9 +97,9 @@ 
  *
  * @return null|\SimpleCalendar\Abstracts\Calendar
  */
-function simcal_get_calendar( $object ) {
+function simcal_get_calendar($object) {
 	$objects = \SimpleCalendar\plugin()->objects;
-	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_calendar( $object ) : null;
+	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_calendar($object) : null;
 }
 
 /**
@@ -112,9 +112,9 @@ 
  *
  * @return mixed
  */
-function simcal_get_calendar_view( $id = 0, $name = '' ) {
+function simcal_get_calendar_view($id = 0, $name = '') {
 	$objects = \SimpleCalendar\plugin()->objects;
-	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_calendar_view( $id, $name ) : false;
+	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_calendar_view($id, $name) : false;
 }
 
 /**
@@ -126,11 +126,11 @@ 
  *
  * @return void
  */
-function simcal_print_calendar( $object ) {
+function simcal_print_calendar($object) {
 
-	$calendar = simcal_get_calendar( $object );
+	$calendar = simcal_get_calendar($object);
 
-	if ( $calendar instanceof \SimpleCalendar\Abstracts\Calendar ) {
+	if ($calendar instanceof \SimpleCalendar\Abstracts\Calendar) {
 		$calendar->html();
 	}
 }
@@ -148,21 +148,21 @@ 
 
 	$vars = array(
 		'ajax_url'  => \SimpleCalendar\plugin()->ajax_url(),
-		'nonce'     => wp_create_nonce( 'simcal' ),
+		'nonce'     => wp_create_nonce('simcal'),
 		'locale'    => \SimpleCalendar\plugin()->locale,
 		'text_dir'  => is_rtl() ? 'rtl' : 'ltr',
 		'months'    => array(
-			'full'  => simcal_get_calendar_names_i18n( 'month', 'full' ),
-			'short' => simcal_get_calendar_names_i18n( 'month', 'short' ),
+			'full'  => simcal_get_calendar_names_i18n('month', 'full'),
+			'short' => simcal_get_calendar_names_i18n('month', 'short'),
 		),
 		'days'      => array(
-			'full'  => simcal_get_calendar_names_i18n( 'day', 'full' ),
-			'short' => simcal_get_calendar_names_i18n( 'day', 'short' ),
+			'full'  => simcal_get_calendar_names_i18n('day', 'full'),
+			'short' => simcal_get_calendar_names_i18n('day', 'short'),
 		),
-		'meridiem' => simcal_get_calendar_names_i18n( 'meridiem' ),
+		'meridiem' => simcal_get_calendar_names_i18n('meridiem'),
 	);
 
-	return array_merge( $vars, apply_filters( 'simcal_common_scripts_variables', array() ) );
+	return array_merge($vars, apply_filters('simcal_common_scripts_variables', array()));
 }
 
 /**
@@ -175,31 +175,31 @@ 
  *
  * @return array Associative array with ids as keys and feed titles as values.
  */
-function simcal_get_calendars( $exclude = '', $cached = true ) {
+function simcal_get_calendars($exclude = '', $cached = true) {
 
-	$calendars = get_transient( '_simple-calendar_feed_ids' );
+	$calendars = get_transient('_simple-calendar_feed_ids');
 
-	if ( ! $calendars || $cached === false ) {
+	if ( ! $calendars || $cached === false) {
 
-		$posts = get_posts( array(
+		$posts = get_posts(array(
 			'post_type' => 'calendar',
 			'nopaging'  => true,
-		) );
+		));
 
 		$calendars = array();
-		foreach ( $posts as $post ) {
-			$calendars[ $post->ID ] = $post->post_title;
+		foreach ($posts as $post) {
+			$calendars[$post->ID] = $post->post_title;
 		}
-		asort( $calendars );
+		asort($calendars);
 
-		set_transient( '_simple-calendar_feed_ids', $calendars, 604800 );
+		set_transient('_simple-calendar_feed_ids', $calendars, 604800);
 	}
 
-	if ( ! empty( $exclude ) ) {
-		if ( is_numeric( $exclude ) ) {
-			unset( $calendars[ intval( $exclude ) ] );
-		} elseif ( is_array( $exclude ) ) {
-			array_diff_key( $calendars, array_map( 'intval', array_keys( $exclude ) ) );
+	if ( ! empty($exclude)) {
+		if (is_numeric($exclude)) {
+			unset($calendars[intval($exclude)]);
+		} elseif (is_array($exclude)) {
+			array_diff_key($calendars, array_map('intval', array_keys($exclude)));
 		}
 	}
 
@@ -218,45 +218,45 @@ 
  *
  * @return array
  */
-function simcal_get_calendar_names_i18n( $group, $style = 'full' ) {
+function simcal_get_calendar_names_i18n($group, $style = 'full') {
 
 	$names = array();
 
-	if ( in_array( $group, array( 'month', 'day', 'meridiem' ) ) ) {
+	if (in_array($group, array('month', 'day', 'meridiem'))) {
 
 		$format = '';
 		$length = 0;
 
 		$date = Carbon\Carbon::now();
 
-		if ( 'month' == $group ) {
-			$date->month( 0 )->startOfMonth();
+		if ('month' == $group) {
+			$date->month(0)->startOfMonth();
 			$format = 'short' == $style ? 'M' : 'F';
 			$length = 11;
-		} elseif ( 'day' == $group ) {
-			$date->next( 6 );
+		} elseif ('day' == $group) {
+			$date->next(6);
 			$format = 'short' == $style ? 'D' : 'l';
 			$length = 6;
-		} elseif ( 'meridiem' == $group ) {
+		} elseif ('meridiem' == $group) {
 			$date->startOfDay();
-			$am = $date->addHour( 1 )->getTimestamp();
-			$pm = $date->addHours( 13 )->getTimestamp();
+			$am = $date->addHour(1)->getTimestamp();
+			$pm = $date->addHours(13)->getTimestamp();
 			return array(
-				'AM' => date_i18n( 'A', $am ),
-				'am' => date_i18n( 'a', $am ),
-				'PM' => date_i18n( 'A', $pm ),
-				'pm' => date_i18n( 'a', $pm ),
+				'AM' => date_i18n('A', $am),
+				'am' => date_i18n('a', $am),
+				'PM' => date_i18n('A', $pm),
+				'pm' => date_i18n('a', $pm),
 			);
 		}
 
 		$i = 0;
-		while ( $i <= $length ) {
-			if ( 'month' == $group ) {
-				$date->addMonths( 1 );
+		while ($i <= $length) {
+			if ('month' == $group) {
+				$date->addMonths(1);
 			} else {
-				$date->addDays( 1 );
+				$date->addDays(1);
 			}
-			$names[ strval( $i ) ] = date_i18n( $format, $date->getTimestamp() );
+			$names[strval($i)] = date_i18n($format, $date->getTimestamp());
 			$i++;
 		}
 
@@ -274,15 +274,15 @@ 
  */
 function simcal_default_event_template() {
 
-	$content  = '<strong>' . '[title]' . '</strong>';
+	$content  = '<strong>'.'[title]'.'</strong>';
 	$content .= '<p>';
-	$content .= '[when]' . "\n";
+	$content .= '[when]'."\n";
 	$content .= '[location]';
 	$content .= '</p>';
-	$content .= '<div>' . '[description]' . '</div>';
-	$content .= '<p>' . '[link newwindow="yes"]' . __( 'See more details', 'google-calendar-events' ) . '[/link]' . '</p>';
+	$content .= '<div>'.'[description]'.'</div>';
+	$content .= '<p>'.'[link newwindow="yes"]'.__('See more details', 'google-calendar-events').'[/link]'.'</p>';
 
-	return apply_filters( 'simcal_default_event_template', $content );
+	return apply_filters('simcal_default_event_template', $content);
 }
 
 /**
@@ -297,21 +297,21 @@ 
  *
  * @return array
  */
-function simcal_get_date_format_order( $date_format ) {
+function simcal_get_date_format_order($date_format) {
 
 	$pos = array(
-		'd' => strpos( $date_format, strpbrk( $date_format, 'Dj' ) ),
-		'm' => strpos( $date_format, strpbrk( $date_format, 'FMmn' ) ),
-		'y' => strpos( $date_format, strpbrk( $date_format, 'Yy' ) ),
+		'd' => strpos($date_format, strpbrk($date_format, 'Dj')),
+		'm' => strpos($date_format, strpbrk($date_format, 'FMmn')),
+		'y' => strpos($date_format, strpbrk($date_format, 'Yy')),
 	);
 
 	// @TODO When one date piece is not found, perhaps fallback to ISO standard position.
 
 	$order = array();
-	foreach ( $pos as $k => $v ) {
-		$order[ $k ] = $v;
+	foreach ($pos as $k => $v) {
+		$order[$k] = $v;
 	}
-	ksort( $order );
+	ksort($order);
 
 	return $order;
 }
@@ -327,11 +327,11 @@ 
  */
 function simcal_get_wp_timezone() {
 
-	$timezone = get_option( 'timezone_string' );
+	$timezone = get_option('timezone_string');
 
-	if ( empty( $timezone ) ) {
-		$gmt = get_option( 'gmt_offset' );
-		$timezone = simcal_get_timezone_from_gmt_offset( $gmt );
+	if (empty($timezone)) {
+		$gmt = get_option('gmt_offset');
+		$timezone = simcal_get_timezone_from_gmt_offset($gmt);
 	}
 
 	return $timezone;
@@ -348,26 +348,26 @@ 
  *
  * @return null|string
  */
-function simcal_get_timezone_from_gmt_offset( $offset ) {
+function simcal_get_timezone_from_gmt_offset($offset) {
 
-	if ( is_numeric( $offset ) ) {
+	if (is_numeric($offset)) {
 
-		if ( 0 === intval( $offset ) ) {
+		if (0 === intval($offset)) {
 			return 'UTC';
 		} else {
-			$offset = floatval( $offset ) * 3600;
+			$offset = floatval($offset) * 3600;
 		}
 
-		$timezone = timezone_name_from_abbr( null, $offset, true );
+		$timezone = timezone_name_from_abbr(null, $offset, true);
 		// This is buggy and might return false:
 		// @see http://php.net/manual/en/function.timezone-name-from-abbr.php#86928
 		// Therefore:
-		if ( false == $timezone ) {
+		if (false == $timezone) {
 
 			$list = timezone_abbreviations_list();
-			foreach ( $list as $abbr ) {
-				foreach ( $abbr as $city ) {
-					if ( $offset == $city['offset'] ) {
+			foreach ($list as $abbr) {
+				foreach ($abbr as $city) {
+					if ($offset == $city['offset']) {
 						return $city['timezone_id'];
 					}
 				}
@@ -390,8 +390,8 @@ 
  *
  * @return int Unix time offset
  */
-function simcal_get_timezone_offset( $timezone ) {
-	return \Carbon\Carbon::now( $timezone )->offset;
+function simcal_get_timezone_offset($timezone) {
+	return \Carbon\Carbon::now($timezone)->offset;
 }
 
 /**
@@ -404,6 +404,6 @@ 
  *
  * @return mixed|string
  */
-function simcal_esc_timezone( $tz, $default = 'UTC' ) {
-	return in_array( $tz, timezone_identifiers_list() ) ? $tz : $default;
+function simcal_esc_timezone($tz, $default = 'UTC') {
+	return in_array($tz, timezone_identifiers_list()) ? $tz : $default;
 }

includes/installation.php

Spacing +26 added lines, -26 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Admin\Pages;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -34,7 +34,7 @@ 
 		self::create_terms();
 		self::create_options();
 
-		do_action( 'simcal_activated' );
+		do_action('simcal_activated');
 	}
 
 	/**
@@ -46,7 +46,7 @@ 
 
 		flush_rewrite_rules();
 
-		do_action( 'simcal_deactivated' );
+		do_action('simcal_deactivated');
 	}
 
 	/**
@@ -66,10 +66,10 @@ 
 			)
 		);
 
-		foreach ( $taxonomies as $taxonomy => $terms ) {
-			foreach ( $terms as $term ) {
-				if ( ! get_term_by( 'slug', sanitize_title( $term ), $taxonomy ) ) {
-					wp_insert_term( $term, $taxonomy );
+		foreach ($taxonomies as $taxonomy => $terms) {
+			foreach ($terms as $term) {
+				if ( ! get_term_by('slug', sanitize_title($term), $taxonomy)) {
+					wp_insert_term($term, $taxonomy);
 				}
 			}
 		}
@@ -85,33 +85,33 @@ 
 
 		$default = '';
 		$page    = 'settings';
-		$settings_pages  = new Pages( $page );
+		$settings_pages  = new Pages($page);
 		$plugin_settings = $settings_pages->get_settings();
 
-		if ( $plugin_settings && is_array( $plugin_settings ) ) {
+		if ($plugin_settings && is_array($plugin_settings)) {
 
-			foreach ( $plugin_settings as $id => $settings ) {
+			foreach ($plugin_settings as $id => $settings) {
 
-				$group = 'simple-calendar_' . $page . '_' . $id;
+				$group = 'simple-calendar_'.$page.'_'.$id;
 
-				if ( isset( $settings['sections'] ) ) {
+				if (isset($settings['sections'])) {
 
-					if ( $settings['sections'] && is_array( $settings['sections'] ) ) {
+					if ($settings['sections'] && is_array($settings['sections'])) {
 
-						foreach ( $settings['sections'] as $section_id => $section ) {
+						foreach ($settings['sections'] as $section_id => $section) {
 
-							if ( isset( $section['fields'] ) ) {
+							if (isset($section['fields'])) {
 
-								if ( $section['fields'] && is_array( $section['fields'] ) ) {
+								if ($section['fields'] && is_array($section['fields'])) {
 
-									foreach ( $section['fields'] as $key => $field ) {
+									foreach ($section['fields'] as $key => $field) {
 
-										if ( isset ( $field['type'] ) ) {
+										if (isset ($field['type'])) {
 											// Maybe an associative array.
-											if ( is_int( $key ) ) {
-												$default[ $section_id ] = self::get_field_default_value( $field );
+											if (is_int($key)) {
+												$default[$section_id] = self::get_field_default_value($field);
 											} else {
-												$default[ $section_id ][ $key ] = self::get_field_default_value( $field );
+												$default[$section_id][$key] = self::get_field_default_value($field);
 											}
 										}
 
@@ -127,7 +127,7 @@ 
 
 				} // Are there sections?
 
-				add_option( $group, $default, '', true );
+				add_option($group, $default, '', true);
 
 				// Reset before looping next settings page.
 				$default = '';
@@ -147,12 +147,12 @@ 
 	 *
 	 * @return mixed
 	 */
-	private static function get_field_default_value( $field ) {
+	private static function get_field_default_value($field) {
 
-		$saved_value   = isset( $field['value'] )   ? $field['value']   : '';
-		$default_value = isset( $field['default'] ) ? $field['default'] : '';
+		$saved_value   = isset($field['value']) ? $field['value'] : '';
+		$default_value = isset($field['default']) ? $field['default'] : '';
 
-		return ! empty( $saved_value ) ? $saved_value : $default_value;
+		return ! empty($saved_value) ? $saved_value : $default_value;
 	}
 
 }

includes/main.php

Spacing +24 added lines, -24 removed lines

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

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