moonstonemedia / Simple-Calendar

includes/admin/fields/radio.php

Spacing +13 added lines, -13 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Abstracts\Field;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -36,12 +36,12 @@ 
 	 *
 	 * @param array $field
 	 */
-	public function __construct( $field ) {
+	public function __construct($field) {
 
 		$this->type_class = 'simcal-field-radios';
-		$this->inline     = isset( $field['inline'] ) ? ( 'inline' == $field['inline'] ? true : false ) : false;
+		$this->inline     = isset($field['inline']) ? ('inline' == $field['inline'] ? true : false) : false;
 
-		parent::__construct( $field );
+		parent::__construct($field);
 	}
 
 	/**
@@ -54,12 +54,12 @@ 
 		?>
 		<fieldset id="<?php echo $this->id; ?>"
 		          class="<?php echo $this->class; ?>"
-			<?php echo $this->style ? 'style="' . $this->style .'"' : ''; ?>>
+			<?php echo $this->style ? 'style="'.$this->style.'"' : ''; ?>>
 			<?php
 
-			echo $this->description ? '<p class="description">' . wp_kses_post( $this->description ) . '</p>' : '';
+			echo $this->description ? '<p class="description">'.wp_kses_post($this->description).'</p>' : '';
 
-			if ( ! empty( $this->title ) ) :
+			if ( ! empty($this->title)) :
 
 				?>
 				<legend class="screen-reader-text">
@@ -71,18 +71,18 @@ 
 
 			?>
 			<ul <?php echo $this->inline === true ? 'class="simcal-field-radios-inline"' : ''; ?>>
-				<?php foreach ( $this->options as $option => $name ) : ?>
+				<?php foreach ($this->options as $option => $name) : ?>
 					<li>
-						<label for="<?php echo $this->id . '-' . trim( strval( $option ) ); ?>">
+						<label for="<?php echo $this->id.'-'.trim(strval($option)); ?>">
 							<input name="<?php echo $this->name; ?>"
-							       id="<?php echo $this->id . '-' . trim( strval( $option ) ); ?>"
+							       id="<?php echo $this->id.'-'.trim(strval($option)); ?>"
 							       class="simcal-field simcal-field-radio"
 							       type="radio"
-							       value="<?php echo trim( strval( $option ) ); ?>"
+							       value="<?php echo trim(strval($option)); ?>"
 								<?php echo $this->attributes; ?>
-								<?php checked( $option, $this->value, true ); ?>
+								<?php checked($option, $this->value, true); ?>
 								/>
-							<?php echo esc_attr( $name ); ?>
+							<?php echo esc_attr($name); ?>
 						</label>
 					</li>
 				<?php endforeach; ?>

includes/admin/fields/standard.php

Spacing +10 added lines, -10 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Abstracts\Field;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -35,12 +35,12 @@ 
 	 *
 	 * @param array $field
 	 */
-	public function __construct( $field ) {
+	public function __construct($field) {
 
-		$this->subtype = isset( $field['subtype'] ) ? esc_attr( $field['subtype'] ) : 'text';
-		$this->type_class = 'simcal-field-' . $this->subtype;
+		$this->subtype = isset($field['subtype']) ? esc_attr($field['subtype']) : 'text';
+		$this->type_class = 'simcal-field-'.$this->subtype;
 
-		parent::__construct( $field );
+		parent::__construct($field);
 	}
 
 	/**
@@ -56,18 +56,18 @@ 
 		       id="<?php echo $this->id; ?>"
 		       value="<?php echo $this->value; ?>"
 		       class="<?php echo $this->class; ?>"<?php
-				echo $this->style ? 'style="' . $this->style . '" ' : ' ';
-		        echo $this->placeholder ? 'placeholder="' . $this->placeholder . '"' : ' ';
+				echo $this->style ? 'style="'.$this->style.'" ' : ' ';
+		        echo $this->placeholder ? 'placeholder="'.$this->placeholder.'"' : ' ';
 				echo $this->attributes; ?>/>
 		<?php
 
 		echo $this->tooltip;
 
-		if ( ! empty( $this->description ) ) {
-			echo '<p class="description">' . wp_kses_post( $this->description ) . '</p>';
+		if ( ! empty($this->description)) {
+			echo '<p class="description">'.wp_kses_post($this->description).'</p>';
 		}
 
-		if ( is_string( $this->validation ) && ! empty ( $this->validation ) ) {
+		if (is_string($this->validation) && ! empty ($this->validation)) {
 			echo $this->validation;
 		}
 

includes/admin/fields/textarea.php

Spacing +13 added lines, -13 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Abstracts\Field;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -26,17 +26,17 @@ 
 	 *
 	 * @param array $field
 	 */
-	public function __construct( $field ) {
+	public function __construct($field) {
 
 		$this->type_class = 'simcal-field-textarea';
 
-		parent::__construct( $field );
+		parent::__construct($field);
 
-		if ( ! empty( $field['value'] ) ) {
-			$this->value = esc_textarea( $field['value'] );
+		if ( ! empty($field['value'])) {
+			$this->value = esc_textarea($field['value']);
 		}
-		if ( ! empty( $field['default'] ) ) {
-			$this->default = esc_textarea( $field['default'] );
+		if ( ! empty($field['default'])) {
+			$this->default = esc_textarea($field['default']);
 		}
 	}
 
@@ -52,17 +52,17 @@ 
 			name="<?php echo $this->name; ?>"
 			id="<?php echo $this->id; ?>"
 			<?php
-			echo $this->class ? 'class="'  . $this->class . '" ' : '';
-			echo $this->placeholder ? 'placeholder="'  . $this->placeholder . '" ' : '';
-			echo $this->style ? 'style="'  . $this->style . '" ' : '';
+			echo $this->class ? 'class="'.$this->class.'" ' : '';
+			echo $this->placeholder ? 'placeholder="'.$this->placeholder.'" ' : '';
+			echo $this->style ? 'style="'.$this->style.'" ' : '';
 			echo $this->attributes;
-			?>><?php echo $this->value;  ?></textarea>
+			?>><?php echo $this->value; ?></textarea>
 		<?php
 
 		echo $this->tooltip;
 
-		if ( ! empty( $this->description ) ) {
-			echo '<p class="description">' . wp_kses_post( $this->description ) . '</p>';
+		if ( ! empty($this->description)) {
+			echo '<p class="description">'.wp_kses_post($this->description).'</p>';
 		}
 
 	}

includes/admin/meta-boxes.php

Spacing +28 added lines, -28 removed lines

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

includes/admin/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/admin/metaboxes/get-shortcode.php

Spacing +4 added lines, -4 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Abstracts\Meta_Box;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -26,8 +26,8 @@ 
 	 *
 	 * @param \WP_Post $post
 	 */
-	public static function html( $post ) {
-		simcal_print_shortcode_tip( $post->ID );
+	public static function html($post) {
+		simcal_print_shortcode_tip($post->ID);
 	}
 
 	/**
@@ -38,7 +38,7 @@ 
 	 * @param int      $post_id
 	 * @param \WP_Post $post
 	 */
-	public static function save( $post_id, $post ) {
+	public static function save($post_id, $post) {
 		// This Meta Box does not have settings.
 	}
 

includes/admin/metaboxes/newsletter.php

Spacing +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Abstracts\Meta_Box;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -26,7 +26,7 @@ 
 	 *
 	 * @param \WP_Post $post
 	 */
-	public static function html( $post ) {
+	public static function html($post) {
 		simcal_newsletter_signup();
 	}
 
@@ -38,7 +38,7 @@ 
 	 * @param int      $post_id
 	 * @param \WP_Post $post
 	 */
-	public static function save( $post_id, $post ) {
+	public static function save($post_id, $post) {
 		// This meta box has no persistent settings.
 	}
 

includes/admin/notice.php

Spacing +33 added lines, -33 removed lines

@@ -6,7 +6,7 @@ 
  */
 namespace SimpleCalendar\Admin;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -106,43 +106,43 @@ 
 	 *
 	 * @param array $notice
 	 */
-	public function __construct( $notice ) {
+	public function __construct($notice) {
 
-		if ( ! empty( $notice['id'] ) && ! empty( $notice['content'] ) ) {
+		if ( ! empty($notice['id']) && ! empty($notice['content'])) {
 
 			// Content.
-			$this->id = is_array( $notice['id'] ) ? array_map( 'sanitize_key', $notice['id'] ) : sanitize_key( $notice['id'] );
-			$this->content = wp_kses_post( $notice['content'] );
-			if ( ! empty( $notice['class'] ) ) {
-				$this->class = is_array( $notice['class'] ) ? join( ' ', array_map( 'esc_attr', $notice['class'] ) ) : esc_attr( $notice['class'] );
+			$this->id = is_array($notice['id']) ? array_map('sanitize_key', $notice['id']) : sanitize_key($notice['id']);
+			$this->content = wp_kses_post($notice['content']);
+			if ( ! empty($notice['class'])) {
+				$this->class = is_array($notice['class']) ? join(' ', array_map('esc_attr', $notice['class'])) : esc_attr($notice['class']);
 			}
 
 			// Type.
 			$default = 'notice';
-			$type = isset( $notice['type'] ) ? esc_attr( $notice['type'] ) : $default;
+			$type = isset($notice['type']) ? esc_attr($notice['type']) : $default;
 			$types = array(
 				'error',
 				'notice',
 				'updated',
 				'update-nag',
 			);
-			$this->type = in_array( $type, $types ) ? $type : $default;
+			$this->type = in_array($type, $types) ? $type : $default;
 
 			// Visibility.
-			if ( ! empty( $notice['capability'] ) ) {
-				$this->capability = esc_attr( $notice['capability'] );
+			if ( ! empty($notice['capability'])) {
+				$this->capability = esc_attr($notice['capability']);
 			}
-			if ( ! empty( $notice['screen'] ) ) {
-				$this->screen = is_array( $notice['screen'] ) ? array_map( 'esc_attr', $notice['screens'] ) : array( esc_attr( $notice['screen'] ) );
+			if ( ! empty($notice['screen'])) {
+				$this->screen = is_array($notice['screen']) ? array_map('esc_attr', $notice['screens']) : array(esc_attr($notice['screen']));
 			}
-			if ( ! empty( $notice['post'] ) ) {
-				$this->post = is_array( $notice['post'] ) ? array_map( 'intval', $notice['post'] ) : array( intval( $notice['post'] ) );
+			if ( ! empty($notice['post'])) {
+				$this->post = is_array($notice['post']) ? array_map('intval', $notice['post']) : array(intval($notice['post']));
 			}
-			if ( ! empty( $notice['dismissible'] ) ) {
-				$this->dismissible = $notice['dismissible'] === false ? false: true;
+			if ( ! empty($notice['dismissible'])) {
+				$this->dismissible = $notice['dismissible'] === false ? false : true;
 			}
-			if ( ! empty( $notice['visible'] ) ) {
-				$this->visible = $notice['visible'] === false ? false: true;
+			if ( ! empty($notice['visible'])) {
+				$this->visible = $notice['visible'] === false ? false : true;
 			}
 		}
 
@@ -154,16 +154,16 @@ 
 	 * @since 3.0.0
 	 */
 	public function add() {
-		if ( ! empty( $this->id ) && ! empty( $this->content ) ) {
-			$notices = get_option( 'simple-calendar_admin_notices', array() );
-			if ( is_array( $this->id ) ) {
-				foreach ( $this->id as $k => $v ) {
-					$notices[ $k ][ $v ] = $this;
+		if ( ! empty($this->id) && ! empty($this->content)) {
+			$notices = get_option('simple-calendar_admin_notices', array());
+			if (is_array($this->id)) {
+				foreach ($this->id as $k => $v) {
+					$notices[$k][$v] = $this;
 				}
 			} else {
-				$notices[ $this->id ][] = $this;
+				$notices[$this->id][] = $this;
 			}
-			update_option( 'simple-calendar_admin_notices', $notices );
+			update_option('simple-calendar_admin_notices', $notices);
 		}
 	}
 
@@ -173,16 +173,16 @@ 
 	 * @since 3.0.0
 	 */
 	public function remove() {
-		if ( ! empty( $this->id ) && ! empty( $this->content ) ) {
-			$notices = get_option( 'simple-calendar_admin_notices', array() );
-			if ( is_array( $this->id ) ) {
-				foreach ( $this->id as $k => $v ) {
-					unset( $notices[ $k ] );
+		if ( ! empty($this->id) && ! empty($this->content)) {
+			$notices = get_option('simple-calendar_admin_notices', array());
+			if (is_array($this->id)) {
+				foreach ($this->id as $k => $v) {
+					unset($notices[$k]);
 				}
 			} else {
-				unset( $notices[ $this->id ] );
+				unset($notices[$this->id]);
 			}
-			update_option( 'simple-calendar_admin_notices', $notices );
+			update_option('simple-calendar_admin_notices', $notices);
 		}
 	}
 

includes/admin/notices.php

Spacing +42 added lines, -42 removed lines

@@ -6,7 +6,7 @@ 
  */
 namespace SimpleCalendar\Admin;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,8 +25,8 @@ 
 	 * @since 3.0.0
 	 */
 	public function __construct() {
-		add_action( 'admin_init', array( $this, 'remove_notice' ), 10 );
-		add_action( 'admin_init', array( $this, 'process_notices' ), 40 );
+		add_action('admin_init', array($this, 'remove_notice'), 10);
+		add_action('admin_init', array($this, 'process_notices'), 40);
 	}
 
 	/**
@@ -38,35 +38,35 @@ 
 
 		$notices = $this->get_notices();
 
-		if ( ! empty( $notices ) && is_array( $notices ) ) {
+		if ( ! empty($notices) && is_array($notices)) {
 
-			foreach ( $notices as $group ) {
-				foreach ( $group as $notice ) {
+			foreach ($notices as $group) {
+				foreach ($group as $notice) {
 
-					if ( $notice instanceof Notice ) {
+					if ($notice instanceof Notice) {
 
-						if ( $notice->visible === false ) {
+						if ($notice->visible === false) {
 							continue;
 						}
 
-						if ( ! empty( $notice->capability ) ) {
-							if ( ! current_user_can( $notice->capability ) ) {
+						if ( ! empty($notice->capability)) {
+							if ( ! current_user_can($notice->capability)) {
 								continue;
 							}
 						}
 
-						if ( ! empty( $notice->screen ) && is_array( $notice->screen ) && function_exists( 'get_current_screen' ) ) {
+						if ( ! empty($notice->screen) && is_array($notice->screen) && function_exists('get_current_screen')) {
 							$screen = get_current_screen();
-							if ( isset( $screen->id ) ) {
-								if ( ! in_array( $screen->id, $notice->screen ) ) {
+							if (isset($screen->id)) {
+								if ( ! in_array($screen->id, $notice->screen)) {
 									continue;
 								}
 							}
 						}
 
-						if ( ! empty( $notice->post ) && is_array( $notice->post ) ) {
-							if ( isset( $_GET['post'] ) ) {
-								if ( ! in_array( intval( $_GET['post'] ), $notice->post ) ) {
+						if ( ! empty($notice->post) && is_array($notice->post)) {
+							if (isset($_GET['post'])) {
+								if ( ! in_array(intval($_GET['post']), $notice->post)) {
 									continue;
 								}
 							} else {
@@ -74,7 +74,7 @@ 
 							}
 						}
 
-						$this->add_notice( $notice );
+						$this->add_notice($notice);
 					}
 				}
 			}
@@ -92,19 +92,19 @@ 
 	 *
 	 * @return void
 	 */
-	public function add_notice( $notice ) {
+	public function add_notice($notice) {
 
-		if ( $notice instanceof Notice ) {
+		if ($notice instanceof Notice) {
 
-			add_action( 'admin_notices', $print_notice = function() use ( $notice ) {
+			add_action('admin_notices', $print_notice = function() use ($notice) {
 
-				$name         = is_array( $notice->id ) ? key( $notice->id ) : $notice->id;
-				$url          = add_query_arg( array( 'dismiss_simcal_notice' => $name ) );
+				$name         = is_array($notice->id) ? key($notice->id) : $notice->id;
+				$url          = add_query_arg(array('dismiss_simcal_notice' => $name));
 				$dismiss_link = $notice->dismissible === true
-					? sprintf( '<a class="dashicons-before dashicons-dismiss simcal-dismiss-notice" href="%1$s"></a>', $url )
+					? sprintf('<a class="dashicons-before dashicons-dismiss simcal-dismiss-notice" href="%1$s"></a>', $url)
 					: '';
 
-				echo '<div class="' . $notice->type . ' ' . $notice->class . ' simcal-admin-notice" data-notice-id="' . $name . '">' . $dismiss_link . $notice->content . '</div>';
+				echo '<div class="'.$notice->type.' '.$notice->class.' simcal-admin-notice" data-notice-id="'.$name.'">'.$dismiss_link.$notice->content.'</div>';
 			} );
 
 		}
@@ -121,27 +121,27 @@ 
 	 *
 	 * @return void
 	 */
-	public function remove_notice( $notice = '' ) {
+	public function remove_notice($notice = '') {
 
 		$notices = $this->get_notices();
 		$update = false;
 
-		if ( ! empty( $notice ) ) {
-			if ( isset( $notices[ $notice ] ) ) {
-				unset( $notices[ $notice ] );
+		if ( ! empty($notice)) {
+			if (isset($notices[$notice])) {
+				unset($notices[$notice]);
 				$update = true;
 			}
 		}
 
-		if ( isset( $_GET['dismiss_simcal_notice'] ) ) {
-			if ( isset( $notices[ $_GET['dismiss_simcal_notice'] ] ) ) {
-				unset( $notices[ esc_attr( $_GET['dismiss_simcal_notice'] ) ] );
+		if (isset($_GET['dismiss_simcal_notice'])) {
+			if (isset($notices[$_GET['dismiss_simcal_notice']])) {
+				unset($notices[esc_attr($_GET['dismiss_simcal_notice'])]);
 				$update = true;
 			}
 		}
 
-		if ( $update === true ) {
-			update_option( 'simple-calendar_admin_notices', $notices );
+		if ($update === true) {
+			update_option('simple-calendar_admin_notices', $notices);
 		}
 	}
 
@@ -154,13 +154,13 @@ 
 	 *
 	 * @return void
 	 */
-	public function show_notice( $notice ) {
+	public function show_notice($notice) {
 
 		$notices = $this->get_notices();
 
-		if ( isset( $notices[ $notice ]->visible ) ) {
-			$notices[ $notice ]->visible = true;
-			update_option( 'simple-calendar_admin_notices', $notices );
+		if (isset($notices[$notice]->visible)) {
+			$notices[$notice]->visible = true;
+			update_option('simple-calendar_admin_notices', $notices);
 		}
 	}
 
@@ -173,13 +173,13 @@ 
 	 *
 	 * @return void
 	 */
-	public function hide_notice( $notice ) {
+	public function hide_notice($notice) {
 
 		$notices = $this->get_notices();
 
-		if ( isset( $notices[ $notice ]->visible ) ) {
-			$notices[ $notice ]->visible = false;
-			update_option( 'simple-calendar_admin_notices', $notices );
+		if (isset($notices[$notice]->visible)) {
+			$notices[$notice]->visible = false;
+			update_option('simple-calendar_admin_notices', $notices);
 		}
 	}
 
@@ -193,7 +193,7 @@ 
 	public function get_notices() {
 		return apply_filters(
 			'simcal_admin_notices',
-			get_option( 'simple-calendar_admin_notices', array() )
+			get_option('simple-calendar_admin_notices', array())
 		);
 	}