moonstonemedia / Simple-Calendar

includes/admin/pages/add-ons.php

Spacing +5 added lines, -5 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Abstracts\Admin_Page;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -28,16 +28,16 @@ 
 
 		$this->id           = $tab = 'add-ons';
 		$this->option_group = $page = 'add-ons';
-		$this->label        = __( 'Add-ons', 'google-calendar-events' );
+		$this->label        = __('Add-ons', 'google-calendar-events');
 		$this->description  = '';
 		$this->sections     = $this->add_sections();
 		$this->fields       = $this->add_fields();
 
 		// Disable the submit button for this page.
-		add_filter( 'simcal_admin_page_' . $page . '_' . $tab . '_submit', function() { return false; } );
+		add_filter('simcal_admin_page_'.$page.'_'.$tab.'_submit', function() { return false; } );
 
 		// Add html.
-		add_action( 'simcal_admin_page_' . $page . '_' . $tab . '_end', array( $this, 'html' ) );
+		add_action('simcal_admin_page_'.$page.'_'.$tab.'_end', array($this, 'html'));
 
 	}
 
@@ -50,7 +50,7 @@ 
 
 		// @todo pull data from simplecalendar.io to showcase add-ons
 		$js_redirect = '<script type="text/javascript">';
-		$js_redirect .= 'window.location = "' . simcal_ga_campaign_url( simcal_get_url( 'addons' ), 'core-plugin', 'plugin-submenu-link', true ) . '"';
+		$js_redirect .= 'window.location = "'.simcal_ga_campaign_url(simcal_get_url('addons'), 'core-plugin', 'plugin-submenu-link', true).'"';
 		$js_redirect .= '</script>';
 
 		echo $js_redirect;

includes/admin/metaboxes/attach-calendar.php

Spacing +17 added lines, -17 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Abstracts\Meta_Box;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -28,38 +28,38 @@ 
 	 *
 	 * @param \WP_Post $post
 	 */
-	public static function html( $post ) {
+	public static function html($post) {
 
 		// @see Meta_Boxes::save_meta_boxes()
-		wp_nonce_field( 'simcal_save_data', 'simcal_meta_nonce' );
+		wp_nonce_field('simcal_save_data', 'simcal_meta_nonce');
 
 		$calendars = simcal_get_calendars();
 
-		simcal_print_field( array(
+		simcal_print_field(array(
 			'type'       => 'select',
 			'id'         => '_simcal_attach_calendar_id',
 			'name'       => '_simcal_attach_calendar_id',
-			'enhanced'   => count( $calendars ) > 15 ? 'enhanced' : '',
+			'enhanced'   => count($calendars) > 15 ? 'enhanced' : '',
 			'allow_void' => 'allow_void',
-			'value'      => absint( get_post_meta( $post->ID, '_simcal_attach_calendar_id', true ) ),
+			'value'      => absint(get_post_meta($post->ID, '_simcal_attach_calendar_id', true)),
 			'options'    => $calendars,
 			'attributes' => array(
 				'data-allowclear' => 'true',
 			)
-		) );
+		));
 
-		$position = get_post_meta( $post->ID, '_simcal_attach_calendar_position', true );
+		$position = get_post_meta($post->ID, '_simcal_attach_calendar_position', true);
 
-		simcal_print_field( array(
+		simcal_print_field(array(
 			'type'      => 'radio',
 			'id'        => '_simcal_attach_calendar_position',
 			'name'      => '_simcal_attach_calendar_position',
 			'value'     => $position ? $position : 'after',
 			'options'   => array(
-				'after'  => __( 'After Content', 'google-calendar-events' ),
-				'before' => __( 'Before Content', 'google-calendar-events' ),
+				'after'  => __('After Content', 'google-calendar-events'),
+				'before' => __('Before Content', 'google-calendar-events'),
 			),
-		) );
+		));
 
 	}
 
@@ -71,13 +71,13 @@ 
 	 * @param int      $post_id
 	 * @param \WP_Post $post
 	 */
-	public static function save( $post_id, $post ) {
+	public static function save($post_id, $post) {
 
-		$id = isset( $_POST['_simcal_attach_calendar_id'] ) ? absint( $_POST['_simcal_attach_calendar_id'] ) : '';
-		update_post_meta( $post_id, '_simcal_attach_calendar_id', $id );
+		$id = isset($_POST['_simcal_attach_calendar_id']) ? absint($_POST['_simcal_attach_calendar_id']) : '';
+		update_post_meta($post_id, '_simcal_attach_calendar_id', $id);
 
-		$position = isset( $_POST['_simcal_attach_calendar_position'] ) ? sanitize_title( $_POST['_simcal_attach_calendar_position'] ) : 'after';
-		update_post_meta( $post_id, '_simcal_attach_calendar_position', $position );
+		$position = isset($_POST['_simcal_attach_calendar_position']) ? sanitize_title($_POST['_simcal_attach_calendar_position']) : 'after';
+		update_post_meta($post_id, '_simcal_attach_calendar_position', $position);
 
 	}
 

includes/abstracts/field.php

Spacing +61 added lines, -61 removed lines

@@ -6,7 +6,7 @@ 
  */
 namespace SimpleCalendar\Abstracts;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -150,71 +150,71 @@ 
 	 *
 	 * @param array $field Field data.
 	 */
-	public function __construct( $field ) {
+	public function __construct($field) {
 
 		// Field properties.
-		if ( isset( $field['title'] ) ) {
-			$this->title = esc_attr( $field['title'] );
+		if (isset($field['title'])) {
+			$this->title = esc_attr($field['title']);
 		}
-		if ( isset( $field['description'] ) ) {
-			$this->description = wp_kses_post( $field['description'] );
+		if (isset($field['description'])) {
+			$this->description = wp_kses_post($field['description']);
 		}
-		if ( isset( $field['type'] ) ) {
-			$this->type = esc_attr( $field['type'] );
+		if (isset($field['type'])) {
+			$this->type = esc_attr($field['type']);
 		}
-		if ( isset( $field['name'] ) ) {
-			$this->name = esc_attr( $field['name'] );
+		if (isset($field['name'])) {
+			$this->name = esc_attr($field['name']);
 		}
-		if ( isset( $field['id'] ) ) {
-			$this->id = esc_attr( $field['id'] );
+		if (isset($field['id'])) {
+			$this->id = esc_attr($field['id']);
 		}
-		if ( isset( $field['placeholder'] ) ) {
-			$this->placeholder = esc_attr( $field['placeholder'] );
+		if (isset($field['placeholder'])) {
+			$this->placeholder = esc_attr($field['placeholder']);
 		}
-		if ( isset( $field['options'] ) && is_array( $field['options'] ) ) {
-			$this->options = array_map( 'esc_attr', $field['options'] );
+		if (isset($field['options']) && is_array($field['options'])) {
+			$this->options = array_map('esc_attr', $field['options']);
 		}
-		if ( isset( $field['text'] ) ) {
+		if (isset($field['text'])) {
 			$this->text = $field['text'];
 		}
 
 		// Escaping.
-		if ( ! empty( $field['escaping'] ) && ( is_string( $field['escaping'] ) || is_array( $field['escaping'] ) ) ) {
-			if ( isset( $field['default'] ) ) {
-				$this->default = $this->escape_callback( $field['escaping'], $field['default'] );
+		if ( ! empty($field['escaping']) && (is_string($field['escaping']) || is_array($field['escaping']))) {
+			if (isset($field['default'])) {
+				$this->default = $this->escape_callback($field['escaping'], $field['default']);
 			}
-			if ( isset( $field['value'] ) ) {
-				$this->value = $this->escape_callback( $field['escaping'], $field['value'] );
+			if (isset($field['value'])) {
+				$this->value = $this->escape_callback($field['escaping'], $field['value']);
 			}
 		} else {
-			if ( isset( $field['default'] ) ) {
-				$this->default = $this->escape( $field['default'] );
+			if (isset($field['default'])) {
+				$this->default = $this->escape($field['default']);
 			}
-			if ( isset( $field['value'] ) ) {
-				$this->value = $this->escape( $field['value'] );
+			if (isset($field['value'])) {
+				$this->value = $this->escape($field['value']);
 			}
 		}
 
 		// Validation.
-		if ( ! empty( $field['validation'] ) ) {
-			$this->validation = $this->validate( $field['validation'], $this->value );
+		if ( ! empty($field['validation'])) {
+			$this->validation = $this->validate($field['validation'], $this->value);
 		}
 
 		// CSS classes and styles.
-		$classes = isset( $field['class'] ) ? $field['class'] : '';
-		$this->set_class( $classes );
-		if ( isset( $field['style'] ) ) {
-			$this->set_style( $field['style'] );
+		$classes = isset($field['class']) ? $field['class'] : '';
+		$this->set_class($classes);
+		if (isset($field['style'])) {
+			$this->set_style($field['style']);
 		}
 
 		// Custom attributes.
-		if ( isset( $field['attributes'] ) ) {
-			$this->set_attributes( $field['attributes'] );
+		if (isset($field['attributes'])) {
+			$this->set_attributes($field['attributes']);
 		}
 
 		// Tooltip markup.
-		if ( isset( $field['tooltip'] ) ) {
-			$this->tooltip = ' <i class="simcal-icon-help simcal-help-tip" data-tip="' . esc_attr( $field['tooltip'] ) . '"></i> ' ;
+		if (isset($field['tooltip'])) {
+			$this->tooltip = ' <i class="simcal-icon-help simcal-help-tip" data-tip="'.esc_attr($field['tooltip']).'"></i> ';
 		}
 	}
 
@@ -227,13 +227,13 @@ 
 	 *
 	 * @return void
 	 */
-	public function set_attributes( $attributes ) {
+	public function set_attributes($attributes) {
 
 		$attr = '';
 
-		if ( ! empty( $attributes ) && is_array( $attributes ) ) {
-			foreach ( $attributes as $k => $v ) {
-				$attr .= esc_attr( $k ) . '="' . esc_attr( $v ) . '" ';
+		if ( ! empty($attributes) && is_array($attributes)) {
+			foreach ($attributes as $k => $v) {
+				$attr .= esc_attr($k).'="'.esc_attr($v).'" ';
 			}
 		}
 
@@ -249,13 +249,13 @@ 
 	 *
 	 * @return void
 	 */
-	public function set_style( $css ) {
+	public function set_style($css) {
 
 		$styles = '';
 
-		if ( ! empty( $css ) && is_array( $css ) ) {
-			foreach ( $css as $k => $v ) {
-				$styles .= esc_attr( $k ) . ': ' . esc_attr( $v ) . '; ';
+		if ( ! empty($css) && is_array($css)) {
+			foreach ($css as $k => $v) {
+				$styles .= esc_attr($k).': '.esc_attr($v).'; ';
 			}
 		}
 
@@ -271,23 +271,23 @@ 
 	 *
 	 * @return void
 	 */
-	public function set_class( $class ) {
+	public function set_class($class) {
 
 		$classes = '';
 		$type_class = '';
 		$error = '';
 
-		if ( ! empty( $class ) && is_array( $class ) ) {
-			$classes = implode( ' ', array_map( 'esc_attr', $class ) );
+		if ( ! empty($class) && is_array($class)) {
+			$classes = implode(' ', array_map('esc_attr', $class));
 		}
-		if ( ! empty( $this->type_class ) ) {
-			$type_class = esc_attr( $this->type_class );
+		if ( ! empty($this->type_class)) {
+			$type_class = esc_attr($this->type_class);
 		}
-		if ( true !== $this->validation && ! empty( $this->validation ) ) {
+		if (true !== $this->validation && ! empty($this->validation)) {
 			$error = 'simcal-field-error ';
 		}
 
-		$this->class = trim( $error . 'simcal-field ' . $type_class . ' ' . $classes );
+		$this->class = trim($error.'simcal-field '.$type_class.' '.$classes);
 	}
 
 	/**
@@ -302,8 +302,8 @@ 
 	 *
 	 * @return array|string
 	 */
-	protected function escape( $value )  {
-		return ! empty( $value ) ? ( is_array( $value ) ? array_map( 'esc_attr', $value ) : esc_attr( $value ) ) : '';
+	protected function escape($value) {
+		return ! empty($value) ? (is_array($value) ? array_map('esc_attr', $value) : esc_attr($value)) : '';
 	}
 
 	/**
@@ -319,11 +319,11 @@ 
 	 *
 	 * @return mixed
 	 */
-	protected function escape_callback( $callback, $value ) {
-		if ( $callback && ( is_string( $callback ) || is_array( $callback ) ) ) {
-			return call_user_func( $callback, $value );
+	protected function escape_callback($callback, $value) {
+		if ($callback && (is_string($callback) || is_array($callback))) {
+			return call_user_func($callback, $value);
 		}
-		return esc_attr( $value );
+		return esc_attr($value);
 	}
 
 	/**
@@ -339,10 +339,10 @@ 
 	 *
 	 * @return true|string Expected to return bool (true) if passes, message string if not.
 	 */
-	protected function validate( $callback, $value ) {
-		if ( $callback && ( is_string( $callback ) || is_array( $callback ) ) ) {
-			$screen = function_exists( 'get_current_screen' ) ? get_current_screen() : '';
-			return call_user_func( $callback, $value, $screen );
+	protected function validate($callback, $value) {
+		if ($callback && (is_string($callback) || is_array($callback))) {
+			$screen = function_exists('get_current_screen') ? get_current_screen() : '';
+			return call_user_func($callback, $value, $screen);
 		}
 		return true;
 	}

includes/admin/pages/calendars.php

Spacing +37 added lines, -37 removed lines

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

includes/feeds/google.php

Spacing +100 added lines, -100 removed lines

@@ -12,7 +12,7 @@ 
 use SimpleCalendar\Abstracts\Feed;
 use SimpleCalendar\Feeds\Admin\Google_Admin as Admin;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -90,35 +90,35 @@ 
 	 * @param string|Calendar $calendar
 	 * @param bool $load_admin
 	 */
-	public function __construct( $calendar = '', $load_admin = true ) {
+	public function __construct($calendar = '', $load_admin = true) {
 
-		parent::__construct( $calendar );
+		parent::__construct($calendar);
 
 		$this->type = 'google';
-		$this->name = __( 'Google Calendar', 'google-calendar-events' );
+		$this->name = __('Google Calendar', 'google-calendar-events');
 
 		// Google client config.
-		$settings = get_option( 'simple-calendar_settings_feeds' );
-		$this->google_api_key = isset( $settings['google']['api_key'] ) ? esc_attr( $settings['google']['api_key'] ) : '';
-		$this->google_client_scopes = array( \Google_Service_Calendar::CALENDAR_READONLY );
+		$settings = get_option('simple-calendar_settings_feeds');
+		$this->google_api_key = isset($settings['google']['api_key']) ? esc_attr($settings['google']['api_key']) : '';
+		$this->google_client_scopes = array(\Google_Service_Calendar::CALENDAR_READONLY);
 		$this->google_client = $this->get_client();
 
-		if ( $this->post_id > 0 ) {
+		if ($this->post_id > 0) {
 
 			// Google query args.
-			$this->google_calendar_id       = $this->esc_google_calendar_id( get_post_meta( $this->post_id, '_google_calendar_id', true ) );
-			$this->google_events_recurring  = esc_attr( get_post_meta( $this->post_id, '_google_events_recurring', true ) );
+			$this->google_calendar_id       = $this->esc_google_calendar_id(get_post_meta($this->post_id, '_google_calendar_id', true));
+			$this->google_events_recurring  = esc_attr(get_post_meta($this->post_id, '_google_events_recurring', true));
             // note that google_search_query is used in a URL param and not as HTML output, so don't use esc_attr() on it
-			$this->google_search_query      = get_post_meta( $this->post_id, '_google_events_search_query', true );
-			$this->google_max_results       = max( absint( get_post_meta( $this->post_id, '_google_events_max_results', true ) ), 1 );
+			$this->google_search_query      = get_post_meta($this->post_id, '_google_events_search_query', true);
+			$this->google_max_results       = max(absint(get_post_meta($this->post_id, '_google_events_max_results', true)), 1);
 
-			if ( ! is_admin() || defined( 'DOING_AJAX' ) ) {
-				$this->events = ! empty( $this->google_api_key ) ? $this->get_events() : array();
+			if ( ! is_admin() || defined('DOING_AJAX')) {
+				$this->events = ! empty($this->google_api_key) ? $this->get_events() : array();
 			}
 		}
 
-		if ( is_admin() && $load_admin ) {
-			$admin = new Admin( $this, $this->google_api_key, $this->google_calendar_id );
+		if (is_admin() && $load_admin) {
+			$admin = new Admin($this, $this->google_api_key, $this->google_calendar_id);
 			$this->settings = $admin->settings_fields();
 		}
 	}
@@ -132,8 +132,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function esc_google_calendar_id( $id ) {
-		return base64_decode( $id );
+	public function esc_google_calendar_id($id) {
+		return base64_decode($id);
 	}
 
 	/**
@@ -147,85 +147,85 @@ 
 	 */
 	public function get_events() {
 
-		$calendar = get_transient( '_simple-calendar_feed_id_' . strval( $this->post_id ) . '_' . $this->type );
+		$calendar = get_transient('_simple-calendar_feed_id_'.strval($this->post_id).'_'.$this->type);
 
-		if ( empty( $calendar ) && ! empty( $this->google_calendar_id ) ) {
+		if (empty($calendar) && ! empty($this->google_calendar_id)) {
 
 			$error = '';
 
 			try {
-				$response = $this->make_request( $this->google_calendar_id );
-			} catch ( \Exception $e ) {
+				$response = $this->make_request($this->google_calendar_id);
+			} catch (\Exception $e) {
 				$error .= $e->getMessage();
 			}
 
-			if ( empty( $error ) && isset( $response['events'] ) && isset( $response['timezone'] ) ) {
+			if (empty($error) && isset($response['events']) && isset($response['timezone'])) {
 
-				$calendar = array_merge( $response, array( 'events' => array() ) );
+				$calendar = array_merge($response, array('events' => array()));
 
 				// If no timezone has been set, use calendar feed.
-				if ( 'use_calendar' == $this->timezone_setting ) {
+				if ('use_calendar' == $this->timezone_setting) {
 					$this->timezone = $calendar['timezone'];
 				}
 
-				$source = isset( $response['title'] ) ? sanitize_text_field( $response['title'] ) : '';
+				$source = isset($response['title']) ? sanitize_text_field($response['title']) : '';
 
-				if ( ! empty( $response['events'] ) && is_array( $response['events'] ) ) {
-					foreach ( $response['events'] as $event ) {
-						if ( $event instanceof \Google_Service_Calendar_Event ) {
+				if ( ! empty($response['events']) && is_array($response['events'])) {
+					foreach ($response['events'] as $event) {
+						if ($event instanceof \Google_Service_Calendar_Event) {
 
 							// Visibility and status.
 							// Public calendars may have private events which can't be properly accessed by simple api key method.
 							// Also want to skip cancelled events (single occurences deleted from repeating events)
 							$visibility = $event->getVisibility();
 							$status = $event->getStatus();
-							if ( $this->type == 'google' && ( $visibility == 'private' || $visibility == 'confidential' || $status == 'cancelled' ) ) {
+							if ($this->type == 'google' && ($visibility == 'private' || $visibility == 'confidential' || $status == 'cancelled')) {
 								continue;
 							}
 
 							// Event title & description.
-							$title = strip_tags( $event->getSummary() );
-							$title = sanitize_text_field( iconv( mb_detect_encoding( $title, mb_detect_order(), true ), 'UTF-8', $title ) );
-							$description = wp_kses_post( iconv( mb_detect_encoding( $event->getDescription(), mb_detect_order(), true ), 'UTF-8', $event->getDescription() ) );
+							$title = strip_tags($event->getSummary());
+							$title = sanitize_text_field(iconv(mb_detect_encoding($title, mb_detect_order(), true), 'UTF-8', $title));
+							$description = wp_kses_post(iconv(mb_detect_encoding($event->getDescription(), mb_detect_order(), true), 'UTF-8', $event->getDescription()));
 
 							$whole_day = false;
 
 							// Event start properties.
-							if( 'use_calendar' == $this->timezone_setting ) {
+							if ('use_calendar' == $this->timezone_setting) {
 								$start_timezone = ! $event->getStart()->timeZone ? $calendar['timezone'] : $event->getStart()->timeZone;
 							} else {
 								$start_timezone = $this->timezone;
 							}
 
-							if ( is_null( $event->getStart()->dateTime ) ) {
+							if (is_null($event->getStart()->dateTime)) {
 								// Whole day event.
-								$date = Carbon::parse( $event->getStart()->date );
-								$google_start = Carbon::createFromDate( $date->year, $date->month, $date->day, $start_timezone )->startOfDay()->addSeconds( 59 );
-								$google_start_utc = Carbon::createFromDate( $date->year, $date->month, $date->day, 'UTC' )->startOfDay()->addSeconds( 59 );
+								$date = Carbon::parse($event->getStart()->date);
+								$google_start = Carbon::createFromDate($date->year, $date->month, $date->day, $start_timezone)->startOfDay()->addSeconds(59);
+								$google_start_utc = Carbon::createFromDate($date->year, $date->month, $date->day, 'UTC')->startOfDay()->addSeconds(59);
 								$whole_day = true;
 							} else {
-								$date = Carbon::parse( $event->getStart()->dateTime );
+								$date = Carbon::parse($event->getStart()->dateTime);
 
 								// Check if there is an event level timezone
-								if( $event->getStart()->timeZone && 'use_calendar' == $this->timezone_setting ) {
+								if ($event->getStart()->timeZone && 'use_calendar' == $this->timezone_setting) {
 
 									// Get the two different times with the separate timezones so we can check the offsets next
-									$google_start1 = Carbon::create( $date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $date->timezone );
-									$google_start2 = Carbon::create( $date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $event->getStart()->timeZone );
+									$google_start1 = Carbon::create($date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $date->timezone);
+									$google_start2 = Carbon::create($date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $event->getStart()->timeZone);
 
 									// Get the offset in hours
 									$offset1 = $google_start1->offsetHours;
 									$offset2 = $google_start2->offsetHours;
 
 									// Get the difference between the two timezones
-									$total_offset = ( $offset2 - $offset1 );
+									$total_offset = ($offset2 - $offset1);
 
 									// Add the hours offset to the date hour
 									$date->hour += $total_offset;
 								}
 
-								$google_start = Carbon::create( $date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $start_timezone );
-								$google_start_utc = Carbon::create( $date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, 'UTC' );
+								$google_start = Carbon::create($date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $start_timezone);
+								$google_start_utc = Carbon::create($date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, 'UTC');
 
 								$this->timezone = $start_timezone;
 							}
@@ -236,43 +236,43 @@ 
 
 							$end = $end_utc = $end_timezone = '';
 							$span = 0;
-							if ( false == $event->getEndTimeUnspecified() ) {
+							if (false == $event->getEndTimeUnspecified()) {
 
 								// Event end properties.
-								if( 'use_calendar' == $this->timezone_setting ) {
+								if ('use_calendar' == $this->timezone_setting) {
 									$end_timezone = ! $event->getEnd()->timeZone ? $calendar['timezone'] : $event->getEnd()->timeZone;
 								} else {
 									$end_timezone = $this->timezone;
 								}
 
-								if ( is_null( $event->getEnd()->dateTime ) ) {
+								if (is_null($event->getEnd()->dateTime)) {
 									// Whole day event.
-									$date           = Carbon::parse( $event->getEnd()->date );
-									$google_end     = Carbon::createFromDate( $date->year, $date->month, $date->day, $end_timezone )->startOfDay()->subSeconds( 59 );
-									$google_end_utc = Carbon::createFromDate( $date->year, $date->month, $date->day, 'UTC' )->startOfDay()->subSeconds( 59 );
+									$date           = Carbon::parse($event->getEnd()->date);
+									$google_end     = Carbon::createFromDate($date->year, $date->month, $date->day, $end_timezone)->startOfDay()->subSeconds(59);
+									$google_end_utc = Carbon::createFromDate($date->year, $date->month, $date->day, 'UTC')->startOfDay()->subSeconds(59);
 								} else {
-									$date = Carbon::parse( $event->getEnd()->dateTime );
+									$date = Carbon::parse($event->getEnd()->dateTime);
 
 									// Check if there is an event level timezone
-									if( $event->getEnd()->timeZone && 'use_calendar' == $this->timezone_setting ) {
+									if ($event->getEnd()->timeZone && 'use_calendar' == $this->timezone_setting) {
 
 										// Get the two different times with the separate timezones so we can check the offsets next
-										$google_start1 = Carbon::create( $date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $date->timezone );
-										$google_start2 = Carbon::create( $date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $event->getEnd()->timeZone );
+										$google_start1 = Carbon::create($date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $date->timezone);
+										$google_start2 = Carbon::create($date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $event->getEnd()->timeZone);
 
 										// Get the offset in hours
 										$offset1 = $google_start1->offsetHours;
 										$offset2 = $google_start2->offsetHours;
 
 										// Get the difference between the two timezones
-										$total_offset = ( $offset2 - $offset1 );
+										$total_offset = ($offset2 - $offset1);
 
 										// Add the hours offset to the date hour
 										$date->hour += $total_offset;
 									}
 
-									$google_end     = Carbon::create( $date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $end_timezone );
-									$google_end_utc = Carbon::create( $date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, 'UTC' );
+									$google_end     = Carbon::create($date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $end_timezone);
+									$google_end_utc = Carbon::create($date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, 'UTC');
 								}
 								// End.
 								$end = $google_end->getTimestamp();
@@ -280,10 +280,10 @@ 
 								$end_utc = $google_end_utc->getTimestamp();
 
 								// Count multiple days.
-								$span = $google_start->diffInDays( $google_end );
+								$span = $google_start->diffInDays($google_end);
 
-								if ( $span == 0 ) {
-									if ( ( $google_start->toDateString() !== $google_end->toDateString() ) && $google_end->toTimeString() != '00:00:00' ) {
+								if ($span == 0) {
+									if (($google_start->toDateString() !== $google_end->toDateString()) && $google_end->toTimeString() != '00:00:00') {
 										$span = 1;
 									}
 								}
@@ -298,19 +298,19 @@ 
 							// Recurring event.
 							$recurrence = $event->getRecurrence();
 							$recurring_id = $event->getRecurringEventId();
-							if ( ! $recurrence && $recurring_id ) {
+							if ( ! $recurrence && $recurring_id) {
 								$recurrence = true;
 							}
 
 							// Event link.
-							if ( 'use_calendar' == $this->timezone_setting ) {
-								$link = add_query_arg( array( 'ctz' => $this->timezone ), $event->getHtmlLink() );
+							if ('use_calendar' == $this->timezone_setting) {
+								$link = add_query_arg(array('ctz' => $this->timezone), $event->getHtmlLink());
 							} else {
 								$link = $event->getHtmlLink();
 							}
 
 							// Build the event.
-							$calendar['events'][ intval( $start ) ][] = array(
+							$calendar['events'][intval($start)][] = array(
 								'type'           => 'google-calendar',
 								'source'         => $source,
 								'title'          => $title,
@@ -338,24 +338,24 @@ 
 						}
 					}
 
-					if ( ! empty( $calendar['events'] ) ) {
+					if ( ! empty($calendar['events'])) {
 
-						ksort( $calendar['events'], SORT_NUMERIC );
+						ksort($calendar['events'], SORT_NUMERIC);
 
 						set_transient(
-							'_simple-calendar_feed_id_' . strval( $this->post_id ) . '_' . $this->type,
+							'_simple-calendar_feed_id_'.strval($this->post_id).'_'.$this->type,
 							$calendar,
-							max( absint( $this->cache ), 1 ) // Since a value of 0 means forever we set the minimum here to 1 if the user has set it to be 0
+							max(absint($this->cache), 1) // Since a value of 0 means forever we set the minimum here to 1 if the user has set it to be 0
 						);
 					}
 				}
 
 			} else {
 
-				$message  = __( 'While trying to retrieve events, Google returned an error:', 'google-calendar-events' );
-				$message .= '<br><br>' . $error . '<br><br>';
-				$message .= __( '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' ) . '<br><br>';
-				$message .= __( 'Only you can see this notice.', 'google-calendar-events' );
+				$message  = __('While trying to retrieve events, Google returned an error:', 'google-calendar-events');
+				$message .= '<br><br>'.$error.'<br><br>';
+				$message .= __('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').'<br><br>';
+				$message .= __('Only you can see this notice.', 'google-calendar-events');
 
 				return $message;
 			}
@@ -363,11 +363,11 @@ 
 		}
 
 		// If no timezone has been set, use calendar feed.
-		if ( 'use_calendar' == $this->timezone_setting && isset( $calendar['timezone'] ) ) {
+		if ('use_calendar' == $this->timezone_setting && isset($calendar['timezone'])) {
 			$this->timezone = $calendar['timezone'];
 		}
 
-		return isset( $calendar['events'] ) ? $calendar['events'] : array();
+		return isset($calendar['events']) ? $calendar['events'] : array();
 	}
 
 	/**
@@ -383,67 +383,67 @@ 
 	 *
 	 * @throws \Exception On request failure will throw an exception from Google.
 	 */
-	public function make_request( $id = '', $time_min = 0, $time_max = 0 ) {
+	public function make_request($id = '', $time_min = 0, $time_max = 0) {
 
 		$calendar = array();
 		$google = $this->get_service();
 
-		if ( ! is_null( $google ) && ! empty( $id ) ) {
+		if ( ! is_null($google) && ! empty($id)) {
 
 			// Build the request args.
 			$args = array();
 
 			// Expand recurring events.
-			if ( $this->google_events_recurring == 'show' ) {
+			if ($this->google_events_recurring == 'show') {
 				$args['singleEvents'] = true;
 			}
 
 			// Query events using search terms.
-			if ( ! empty( $this->google_search_query ) ) {
-				$args['q'] = rawurlencode( $this->google_search_query );
+			if ( ! empty($this->google_search_query)) {
+				$args['q'] = rawurlencode($this->google_search_query);
 			}
 
 			// Max results to query.
-			$args['maxResults'] = strval( min( absint( $this->google_max_results ), 2500 ) );
+			$args['maxResults'] = strval(min(absint($this->google_max_results), 2500));
 
 			// Specify a timezone.
 			$timezone = '';
-			if ( 'use_calendar' != get_post_meta( $this->post_id, '_feed_timezone_setting', true ) ) {
+			if ('use_calendar' != get_post_meta($this->post_id, '_feed_timezone_setting', true)) {
 				$args['timeZone'] = $timezone = $this->timezone;
 			}
 
 			// Lower bound (inclusive) for an event's end time to filter by.
-			$earliest_event = intval( $this->time_min );
-			if ( $earliest_event > 0 ) {
+			$earliest_event = intval($this->time_min);
+			if ($earliest_event > 0) {
 				$timeMin = Carbon::now();
-				if ( ! empty( $timezone ) ) {
-					$timeMin->setTimezone( $timezone );
+				if ( ! empty($timezone)) {
+					$timeMin->setTimezone($timezone);
 				}
-				$timeMin->setTimestamp( $earliest_event );
+				$timeMin->setTimestamp($earliest_event);
 				$args['timeMin'] = $timeMin->toRfc3339String();
 			}
 
 			// Upper bound (exclusive) for an event's start time to filter by.
-			$latest_event = intval( $this->time_max );
-			if ( $latest_event > 0 ) {
+			$latest_event = intval($this->time_max);
+			if ($latest_event > 0) {
 				$timeMax = Carbon::now();
-				if ( ! empty( $timezone ) ) {
-					$timeMax->setTimezone( $timezone );
+				if ( ! empty($timezone)) {
+					$timeMax->setTimezone($timezone);
 				}
-				$timeMax->setTimestamp( $latest_event );
+				$timeMax->setTimestamp($latest_event);
 				$args['timeMax'] = $timeMax->toRfc3339String();
 			}
 
 			// Query events in calendar.
-			$response = $google->events->listEvents( $id, $args );
+			$response = $google->events->listEvents($id, $args);
 
-			if ( $response instanceof \Google_Service_Calendar_Events ) {
+			if ($response instanceof \Google_Service_Calendar_Events) {
 				$calendar = array(
 					'id'            => $id,
 					'title'         => $response->getSummary(),
 					'description'   => $response->getDescription(),
 					'timezone'      => $response->getTimeZone(),
-					'url'           => esc_url( '//www.google.com/calendar/embed?src=' . $id ),
+					'url'           => esc_url('//www.google.com/calendar/embed?src='.$id),
 					'events'        => $response->getItems(),
 				);
 			}
@@ -463,10 +463,10 @@ 
 	private function get_client() {
 
 		$client = new \Google_Client();
-		$client->setApplicationName( 'Simple Calendar' );
-		$client->setScopes( $this->google_client_scopes );
-		$client->setDeveloperKey( $this->google_api_key );
-		$client->setAccessType( 'online' );
+		$client->setApplicationName('Simple Calendar');
+		$client->setScopes($this->google_client_scopes);
+		$client->setDeveloperKey($this->google_api_key);
+		$client->setAccessType('online');
 
 		return $client;
 	}
@@ -480,7 +480,7 @@ 
 	 * @return null|\Google_Service_Calendar
 	 */
 	protected function get_service() {
-		return $this->google_client instanceof \Google_Client ? new \Google_Service_Calendar( $this->google_client ) : null;
+		return $this->google_client instanceof \Google_Client ? new \Google_Service_Calendar($this->google_client) : null;
 	}
 
 }

includes/assets.php

Spacing +65 added lines, -65 removed lines

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

includes/admin/welcome.php

Spacing +72 added lines, -72 removed lines

@@ -8,7 +8,7 @@ 
  */
 namespace SimpleCalendar\Admin;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -36,10 +36,10 @@ 
 	 */
 	public function __construct() {
 
-		$this->install = isset( $_GET['simcal_install'] ) ? esc_attr( $_GET['simcal_install'] ) : '';
+		$this->install = isset($_GET['simcal_install']) ? esc_attr($_GET['simcal_install']) : '';
 
-		add_action( 'admin_menu', array( $this, 'welcome_page_tabs' ) );
-		add_action( 'admin_head', array( $this, 'remove_submenu_pages' ) );
+		add_action('admin_menu', array($this, 'welcome_page_tabs'));
+		add_action('admin_head', array($this, 'remove_submenu_pages'));
 	}
 
 	/**
@@ -49,32 +49,32 @@ 
 	 */
 	public function welcome_page_tabs() {
 
-		$welcome_page_name  = __( 'About Simple Calendar', 'google-calendar-events' );
-		$welcome_page_title = __( 'Welcome to Simple Calendar', 'google-calendar-events' );
+		$welcome_page_name  = __('About Simple Calendar', 'google-calendar-events');
+		$welcome_page_title = __('Welcome to Simple Calendar', 'google-calendar-events');
 
-		$page = isset( $_GET['page'] ) ? $_GET['page'] : 'simple-calendar_about';
+		$page = isset($_GET['page']) ? $_GET['page'] : 'simple-calendar_about';
 
-		switch ( $page ) {
+		switch ($page) {
 
 			case 'simple-calendar_about' :
-				$page = add_dashboard_page( $welcome_page_title, $welcome_page_name, 'manage_options', 'simple-calendar_about', array(
+				$page = add_dashboard_page($welcome_page_title, $welcome_page_name, 'manage_options', 'simple-calendar_about', array(
 					$this,
 					'about_screen',
-				) );
+				));
 				break;
 
 			case 'simple-calendar_credits' :
-				$page = add_dashboard_page( $welcome_page_title, $welcome_page_name, 'manage_options', 'simple-calendar_credits', array(
+				$page = add_dashboard_page($welcome_page_title, $welcome_page_name, 'manage_options', 'simple-calendar_credits', array(
 					$this,
 					'credits_screen',
-				) );
+				));
 				break;
 
 			case 'simple-calendar_translators' :
-				$page = add_dashboard_page( $welcome_page_title, $welcome_page_name, 'manage_options', 'simple-calendar_translators', array(
+				$page = add_dashboard_page($welcome_page_title, $welcome_page_name, 'manage_options', 'simple-calendar_translators', array(
 					$this,
 					'translators_screen',
-				) );
+				));
 				break;
 		}
 	}
@@ -85,9 +85,9 @@ 
 	 * @since 3.0.0
 	 */
 	public function remove_submenu_pages() {
-		remove_submenu_page( 'index.php', 'simple-calendar_about' );
-		remove_submenu_page( 'index.php', 'simple-calendar_credits' );
-		remove_submenu_page( 'index.php', 'simple-calendar_translators' );
+		remove_submenu_page('index.php', 'simple-calendar_about');
+		remove_submenu_page('index.php', 'simple-calendar_credits');
+		remove_submenu_page('index.php', 'simple-calendar_translators');
 	}
 
 	/**
@@ -99,18 +99,18 @@ 
 
 		?>
 		<p>
-			<a href="<?php echo admin_url( 'edit.php?post_type=calendar' ); ?>"
+			<a href="<?php echo admin_url('edit.php?post_type=calendar'); ?>"
 			   class="button button-primary"
-				><?php _e( 'Calendars', 'google-calendar-events' ); ?></a>
-			<a href="<?php echo esc_url( add_query_arg( 'page', 'simple-calendar_settings', admin_url( 'admin.php' ) ) ); ?>"
+				><?php _e('Calendars', 'google-calendar-events'); ?></a>
+			<a href="<?php echo esc_url(add_query_arg('page', 'simple-calendar_settings', admin_url('admin.php'))); ?>"
 			   class="button button-primary"
-				><?php _e( 'Settings', 'google-calendar-events' ); ?></a>
-			<a href="<?php echo simcal_ga_campaign_url( simcal_get_url( 'addons' ), 'core-plugin', 'welcome-page' ); ?>"
+				><?php _e('Settings', 'google-calendar-events'); ?></a>
+			<a href="<?php echo simcal_ga_campaign_url(simcal_get_url('addons'), 'core-plugin', 'welcome-page'); ?>"
 			   class="docs button button-primary" target="_blank"
-				><?php _e( 'Add-ons', 'google-calendar-events' ); ?></a>
-			<a href="<?php echo simcal_ga_campaign_url( simcal_get_url( 'docs' ), 'core-plugin', 'welcome-page' ); ?>"
+				><?php _e('Add-ons', 'google-calendar-events'); ?></a>
+			<a href="<?php echo simcal_ga_campaign_url(simcal_get_url('docs'), 'core-plugin', 'welcome-page'); ?>"
 			   class="docs button button-primary" target="_blank"
-				><?php _e( 'Documentation', 'google-calendar-events' ); ?></a>
+				><?php _e('Documentation', 'google-calendar-events'); ?></a>
 		</p>
 		<?php
 
@@ -127,7 +127,7 @@ 
 		<h1>
 			<?php
 			/* translators: %s prints the current version of the plugin. */
-			printf( __( 'Welcome to Simple Calendar %s', 'google-calendar-events' ), SIMPLE_CALENDAR_VERSION );
+			printf(__('Welcome to Simple Calendar %s', 'google-calendar-events'), SIMPLE_CALENDAR_VERSION);
 			?>
 		</h1>
 
@@ -135,21 +135,21 @@ 
 			<?php
 
 			// Difference message if updating vs fresh install.
-			if ( 'update' == $this->install ) {
-				$message = __( 'Thanks for updating to the latest version!', 'google-calendar-events' );
+			if ('update' == $this->install) {
+				$message = __('Thanks for updating to the latest version!', 'google-calendar-events');
 			} else {
-				$message = __( 'Thanks for installing!', 'google-calendar-events' );
+				$message = __('Thanks for installing!', 'google-calendar-events');
 			}
 
 			echo $message;
 
 			/* translators: %s prints the current version of the plugin. */
-			printf( ' ' . __( "Simple Calendar %s has a few display options to configure. ", 'google-calendar-events' ), SIMPLE_CALENDAR_VERSION );
+			printf(' '.__("Simple Calendar %s has a few display options to configure. ", 'google-calendar-events'), SIMPLE_CALENDAR_VERSION);
 			?>
-			<a href="<?php echo simcal_ga_campaign_url( simcal_get_url( 'docs' ), 'core-plugin', 'welcome-page' ); ?>"
+			<a href="<?php echo simcal_ga_campaign_url(simcal_get_url('docs'), 'core-plugin', 'welcome-page'); ?>"
 			   target="_blank"
-			><?php _e( 'Check out our documentation', 'google-calendar-events' ); ?></a>
-			<?php _e( 'to get started now.', 'google-calendar-events' ); ?>
+			><?php _e('Check out our documentation', 'google-calendar-events'); ?></a>
+			<?php _e('to get started now.', 'google-calendar-events'); ?>
 		</div>
 
 		<div class="simcal-badge">&nbsp;</div>
@@ -157,21 +157,21 @@ 
 		<?php $this->main_nav_links(); ?>
 
 		<h2 class="nav-tab-wrapper">
-			<a class="nav-tab <?php if ( $_GET['page'] == 'simple-calendar_about' ) {
+			<a class="nav-tab <?php if ($_GET['page'] == 'simple-calendar_about') {
 				echo 'nav-tab-active';
 			} ?>"
-			   href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'simple-calendar_about' ), 'index.php' ) ) ); ?>"
-				><?php _e( "What's New", 'google-calendar-events' ); ?></a>
-			<a class="nav-tab <?php if ( $_GET['page'] == 'simple-calendar_credits' ) {
+			   href="<?php echo esc_url(admin_url(add_query_arg(array('page' => 'simple-calendar_about'), 'index.php'))); ?>"
+				><?php _e("What's New", 'google-calendar-events'); ?></a>
+			<a class="nav-tab <?php if ($_GET['page'] == 'simple-calendar_credits') {
 				echo 'nav-tab-active';
 			} ?>"
-			   href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'simple-calendar_credits' ), 'index.php' ) ) ); ?>"
-				><?php _e( 'Credits', 'google-calendar-events' ); ?></a>
-			<a class="nav-tab <?php if ( $_GET['page'] == 'simple-calendar_translators' ) {
+			   href="<?php echo esc_url(admin_url(add_query_arg(array('page' => 'simple-calendar_credits'), 'index.php'))); ?>"
+				><?php _e('Credits', 'google-calendar-events'); ?></a>
+			<a class="nav-tab <?php if ($_GET['page'] == 'simple-calendar_translators') {
 				echo 'nav-tab-active';
 			} ?>"
-			   href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'simple-calendar_translators' ), 'index.php' ) ) ); ?>"
-				><?php _e( 'Translators', 'google-calendar-events' ); ?></a>
+			   href="<?php echo esc_url(admin_url(add_query_arg(array('page' => 'simple-calendar_translators'), 'index.php'))); ?>"
+				><?php _e('Translators', 'google-calendar-events'); ?></a>
 		</h2>
 		<?php
 
@@ -183,8 +183,8 @@ 
 	 * @since 3.0.0
 	 */
 	public function about_screen() {
-		$welcome_image_about_path = SIMPLE_CALENDAR_ASSETS . '/images/welcome';
-		$welcome_addons_link = simcal_ga_campaign_url( simcal_get_url( 'addons' ), 'core-plugin', 'welcome-page' );
+		$welcome_image_about_path = SIMPLE_CALENDAR_ASSETS.'/images/welcome';
+		$welcome_addons_link = simcal_ga_campaign_url(simcal_get_url('addons'), 'core-plugin', 'welcome-page');
 
 		?>
 		<div id="simcal-welcome">
@@ -192,20 +192,20 @@ 
 
 				<?php $this->intro(); ?>
 
-				<h3><?php _e( 'Configure event colors, number of events to display, grid or list style and more.', 'google-calendar-events' ); ?></h3>
-				<img src="<?php echo $welcome_image_about_path . '/grid-view-basic.png'; ?>" />
+				<h3><?php _e('Configure event colors, number of events to display, grid or list style and more.', 'google-calendar-events'); ?></h3>
+				<img src="<?php echo $welcome_image_about_path.'/grid-view-basic.png'; ?>" />
 
-				<h3><?php _e( 'Mobile responsive and widget ready.', 'google-calendar-events' ); ?></h3>
-				<img src="<?php echo $welcome_image_about_path . '/list-view-widget.png'; ?>" />
-				<img src="<?php echo $welcome_image_about_path . '/grid-view-widget-dark-theme.png'; ?>" />
+				<h3><?php _e('Mobile responsive and widget ready.', 'google-calendar-events'); ?></h3>
+				<img src="<?php echo $welcome_image_about_path.'/list-view-widget.png'; ?>" />
+				<img src="<?php echo $welcome_image_about_path.'/grid-view-widget-dark-theme.png'; ?>" />
 
 				<h3>
-					<?php _e( 'Add even more display options with add-ons like', 'google-calendar-events' ); ?>
-					<a href="<?php echo $welcome_addons_link; ?>" target="_blank"><?php _e( 'FullCalendar and Google Calendar Pro', 'google-calendar-events' ); ?></a>.
+					<?php _e('Add even more display options with add-ons like', 'google-calendar-events'); ?>
+					<a href="<?php echo $welcome_addons_link; ?>" target="_blank"><?php _e('FullCalendar and Google Calendar Pro', 'google-calendar-events'); ?></a>.
 				</h3>
-				<a href="<?php echo $welcome_addons_link; ?>" target="_blank"><img src="<?php echo $welcome_image_about_path . '/fullcalendar-google-calendar-pro-grid-view.png'; ?>" /></a>
+				<a href="<?php echo $welcome_addons_link; ?>" target="_blank"><img src="<?php echo $welcome_image_about_path.'/fullcalendar-google-calendar-pro-grid-view.png'; ?>" /></a>
 
-				<h3><a href="<?php echo $welcome_addons_link; ?>" target="_blank"><?php _e( 'View Pricing and Try a Demo of our Simple Calendar Pro Add-ons.', 'google-calendar-events' ); ?></a></h3>
+				<h3><a href="<?php echo $welcome_addons_link; ?>" target="_blank"><?php _e('View Pricing and Try a Demo of our Simple Calendar Pro Add-ons.', 'google-calendar-events'); ?></a></h3>
 
 				<hr/>
 
@@ -232,8 +232,8 @@ 
 					<?php
 
 					printf(
-						__( "Simple Calendar is created by a worldwide team of developers. If you'd like to contribute please visit our <a href='%s' target='_blank'>GitHub repo</a>.", 'google-calendar-events' ),
-						simcal_get_url( 'github' )
+						__("Simple Calendar is created by a worldwide team of developers. If you'd like to contribute please visit our <a href='%s' target='_blank'>GitHub repo</a>.", 'google-calendar-events'),
+						simcal_get_url('github')
 					);
 
 					?>
@@ -257,10 +257,10 @@ 
 			<div class="wrap about-wrap translators-wrap">
 				<?php $this->intro(); ?>
 				<p class="about-description">
-					<?php _e( 'Simple Calendar has been kindly translated into several other languages by contributors from all over the world.', 'google-calendar-events' ); ?>
+					<?php _e('Simple Calendar has been kindly translated into several other languages by contributors from all over the world.', 'google-calendar-events'); ?>
 				</p>
 				<p class="about-description">
-					<a href="https://translate.wordpress.org/projects/wp-plugins/google-calendar-events" target="_blank"><?php _e( 'Click here to help translate', 'google-calendar-events' ); ?></a>
+					<a href="https://translate.wordpress.org/projects/wp-plugins/google-calendar-events" target="_blank"><?php _e('Click here to help translate', 'google-calendar-events'); ?></a>
 				</p>
 				<?php
 
@@ -289,31 +289,31 @@ 
 
 		$contributors = $this->get_contributors();
 
-		if ( empty( $contributors ) ) {
+		if (empty($contributors)) {
 			return '';
 		}
 
 		$contributor_list = '<ul class="wp-people-group">';
 
-		foreach ( $contributors as $contributor ) {
+		foreach ($contributors as $contributor) {
 
 			// Skip contributor bots
-			$contributor_bots = array( 'gitter-badger' );
-			if ( in_array( $contributor->login, $contributor_bots ) ) {
+			$contributor_bots = array('gitter-badger');
+			if (in_array($contributor->login, $contributor_bots)) {
 				continue;
 			}
 
 			$contributor_list .= '<li class="wp-person">';
 			$contributor_list .= sprintf(
 				'<a href="%s" title="%s" target="_blank">%s</a>',
-				esc_url( 'https://github.com/' . $contributor->login ),
-				esc_html( sprintf( __( 'View %s', 'google-calendar-events' ), $contributor->login ) ),
-				sprintf( '<img src="%s" width="64" height="64" class="gravatar" alt="%s" />', esc_url( $contributor->avatar_url ), esc_html( $contributor->login ) )
+				esc_url('https://github.com/'.$contributor->login),
+				esc_html(sprintf(__('View %s', 'google-calendar-events'), $contributor->login)),
+				sprintf('<img src="%s" width="64" height="64" class="gravatar" alt="%s" />', esc_url($contributor->avatar_url), esc_html($contributor->login))
 			);
 			$contributor_list .= sprintf(
 				'<a class="web" href="%s" target="_blank">%s</a>',
-				esc_url( 'https://github.com/' . $contributor->login ),
-				esc_html( $contributor->login )
+				esc_url('https://github.com/'.$contributor->login),
+				esc_html($contributor->login)
 			);
 			$contributor_list .= '</li>';
 
@@ -333,24 +333,24 @@ 
 	 */
 	public function get_contributors() {
 
-		$contributors = get_transient( '_simple-calendar_contributors' );
-		if ( false !== $contributors ) {
+		$contributors = get_transient('_simple-calendar_contributors');
+		if (false !== $contributors) {
 			return $contributors;
 		}
 
 		$response = wp_safe_remote_get(
 			'https://api.github.com/repos/moonstonemedia/Simple-Calendar/contributors'
 		);
-		if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) {
+		if (is_wp_error($response) || 200 != wp_remote_retrieve_response_code($response)) {
 			return array();
 		}
 
-		$contributors = json_decode( wp_remote_retrieve_body( $response ) );
-		if ( ! is_array( $contributors ) ) {
+		$contributors = json_decode(wp_remote_retrieve_body($response));
+		if ( ! is_array($contributors)) {
 			return array();
 		}
 
-		set_transient( '_simple-calendar_contributors', $contributors, HOUR_IN_SECONDS );
+		set_transient('_simple-calendar_contributors', $contributors, HOUR_IN_SECONDS);
 
 		return $contributors;
 	}

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

includes/main.php

Spacing +26 added lines, -26 removed lines

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