moonstonemedia / Simple-Calendar

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

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( 'add-ons' ), 'core-plugin', 'plugin-submenu-link', true ) . '"';
+		$js_redirect .= 'window.location = "'.simcal_ga_campaign_url(simcal_get_url('add-ons'), 'core-plugin', 'plugin-submenu-link', true).'"';
 		$js_redirect .= '</script>';
 
 		echo $js_redirect;

includes/admin/pages/calendars.php

Spacing +45 added lines, -45 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,14 +92,14 @@ 
 			}
 		}
 
-		arsort( $calendar_types );
+		arsort($calendar_types);
 
 		$sections['poweredby'] = array(
-			'title' => __( 'Show Some Love', 'google-calendar-events' ),
+			'title' => __('Show Some Love', 'google-calendar-events'),
 			'description' => '',
 		);
 
-		return apply_filters( 'simcal_add_' . $this->option_group . '_' . $this->id .'_sections', $sections );
+		return apply_filters('simcal_add_'.$this->option_group.'_'.$this->id.'_sections', $sections);
 	}
 
 	/**
@@ -113,11 +113,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(
@@ -129,54 +129,54 @@ 
 					'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)
+					));
 
 				}
 
-			} elseif ( 'poweredby' == $section ) {
+			} elseif ('poweredby' == $section) {
 
-				$fields[ $section ][] = array(
+				$fields[$section][] = array(
 					'type'      => 'checkbox',
-					'title'     => __( 'Powered by Simple Calendar', 'google-calendar-events' ),
-					'tooltip'   => __( 'Help our plugin get noticed and display a small link to our plugin below your calendars. Thanks!', 'google-calendar-events' ),
-					'name'      => 'simple-calendar_' . $this->option_group . '_' . $this->id . '[' . $section . '][opt_in]',
-					'id'        => 'simple-calendar-' . $this->option_group . '-' . $this->id . '-poweredby-optin',
-					'value'     => $this->get_option_value( $section, 'opt_in' ),
+					'title'     => __('Powered by Simple Calendar', 'google-calendar-events'),
+					'tooltip'   => __('Help our plugin get noticed and display a small link to our plugin below your calendars. Thanks!', 'google-calendar-events'),
+					'name'      => 'simple-calendar_'.$this->option_group.'_'.$this->id.'['.$section.'][opt_in]',
+					'id'        => 'simple-calendar-'.$this->option_group.'-'.$this->id.'-poweredby-optin',
+					'value'     => $this->get_option_value($section, 'opt_in'),
 				);
 			}
 
 		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/admin/pages/feeds.php

Spacing +22 added lines, -22 removed lines

@@ -9,7 +9,7 @@ 
 use SimpleCalendar\Abstracts\Feed;
 use SimpleCalendar\Abstracts\Admin_Page;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -39,20 +39,20 @@ 
 
 		$this->id           = 'feeds';
 		$this->option_group = 'settings';
-		$this->label        = __( 'Event Sources', 'google-calendar-events' );
+		$this->label        = __('Event Sources', 'google-calendar-events');
 		//$this->description  = __( 'Manage calendar event sources settings.', 'google-calendar-events' );
 
 		$feeds_settings = array();
 		$feeds = simcal_get_feed_types();
-		if ( ! empty( $feeds ) && is_array( $feeds ) ) {
-			foreach ( $feeds as $feed ) {
+		if ( ! empty($feeds) && is_array($feeds)) {
+			foreach ($feeds as $feed) {
 
-				$feed_type = simcal_get_feed( $feed );
+				$feed_type = simcal_get_feed($feed);
 
-				if ( $feed_type instanceof Feed ) {
+				if ($feed_type instanceof Feed) {
 					$settings = $feed_type->settings_fields();
-					if ( ! empty( $settings ) ) {
-						$feeds_settings[ $feed ] = $settings;
+					if ( ! empty($settings)) {
+						$feeds_settings[$feed] = $settings;
 					}
 				}
 			}
@@ -74,18 +74,18 @@ 
 
 		$sections = array();
 
-		foreach ( $this->feed_types as $feed_type => $type ) {
+		foreach ($this->feed_types as $feed_type => $type) {
 
-			$sections[ $feed_type ] = array(
+			$sections[$feed_type] = array(
 				'title'       => $type['name'],
 				'description' => $type['description'],
 			);
 
 		}
 
-		arsort( $sections );
+		arsort($sections);
 
-		return apply_filters( 'simcal_add_' . $this->option_group . '_' . $this->id .'_sections', $sections );
+		return apply_filters('simcal_add_'.$this->option_group.'_'.$this->id.'_sections', $sections);
 	}
 
 	/**
@@ -99,25 +99,25 @@ 
 
 		$fields       = array();
 		$feed_types   = $this->feed_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 $type => $contents ) :
+		foreach ($this->sections as $type => $contents) :
 
-			if ( isset( $feed_types[ $type ]['fields'] ) ) {
-				foreach ( $feed_types[ $type ]['fields'] as $key => $args ) {
+			if (isset($feed_types[$type]['fields'])) {
+				foreach ($feed_types[$type]['fields'] as $key => $args) {
 
-					$fields[ $type ][] = array_merge( $args, array(
-						'name'  => 'simple-calendar_' . $this->option_group . '_' . $this->id . '[' . $type . '][' . $key . ']',
-						'id'    => 'simple-calendar-' . $this->option_group . '-' . $this->id . '-' . $type . '-' . $key,
-						'value' => $this->get_option_value( $type, $key )
-					) );
+					$fields[$type][] = array_merge($args, array(
+						'name'  => 'simple-calendar_'.$this->option_group.'_'.$this->id.'['.$type.']['.$key.']',
+						'id'    => 'simple-calendar-'.$this->option_group.'-'.$this->id.'-'.$type.'-'.$key,
+						'value' => $this->get_option_value($type, $key)
+					));
 
 				}
 			}
 
 		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/admin/pages/licenses.php

Spacing +25 added lines, -25 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Abstracts\Admin_Page;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -30,16 +30,16 @@ 
 
 		$this->id           = $tab = 'licenses';
 		$this->option_group = $page = 'settings';
-		$this->label        = __( 'Add-on Licenses', 'google-calendar-events' );
+		$this->label        = __('Add-on Licenses', 'google-calendar-events');
 		//$this->description  = __( 'Manage your premium add-on license keys.', 'google-calendar-events' );
 		$this->sections     = $this->add_sections();
 		$this->fields       = $this->add_fields();
 
 		// Disabled the 'save changes' 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 to page.
-		add_action( 'simcal_admin_page_' . $page . '_' . $tab . '_end', array( __CLASS__, 'html' ) );
+		add_action('simcal_admin_page_'.$page.'_'.$tab.'_end', array(__CLASS__, 'html'));
 	}
 
 	/**
@@ -49,14 +49,14 @@ 
 	 *
 	 * @return void
 	 */
-	public static function html()  {
+	public static function html() {
 		// Add a nonce field used in ajax.
-		wp_nonce_field( 'simcal_license_manager', 'simcal_license_manager' );
+		wp_nonce_field('simcal_license_manager', 'simcal_license_manager');
 		// Add a license 'reset' button.
 		?>
 		<br><br>
-		<a href="#" id="simcal-reset-licenses" data-dialog="<?php _e( 'WARNING: Are you sure you want to start over and delete all license keys from the settings?', 'google-calendar-events' ) ?>">
-			<?php _e( 'Delete your license keys', 'google-calendar-events' ) ?>
+		<a href="#" id="simcal-reset-licenses" data-dialog="<?php _e('WARNING: Are you sure you want to start over and delete all license keys from the settings?', 'google-calendar-events') ?>">
+			<?php _e('Delete your license keys', 'google-calendar-events') ?>
 			<i class="simcal-icon-spinner simcal-icon-spin" style="display: none;"></i>
 		</a>
 		<?php
@@ -73,13 +73,13 @@ 
 	public function add_sections() {
 		$sections = array(
 			'keys' => array(
-				'title' => __( 'Premium Add-on License Keys', 'google-calendar-events' ),
-				'description' => __( 'Enter your add-on license keys below, making sure to activate each one to ensure they are valid.', 'google-calendar-events' ) .
-				                 '<br/><br/>' .
-				                 '<em>' . __( 'Your license keys are used for access to automatic upgrades and premium support.', 'google-calendar-events' ) . '</em>',
+				'title' => __('Premium Add-on License Keys', 'google-calendar-events'),
+				'description' => __('Enter your add-on license keys below, making sure to activate each one to ensure they are valid.', 'google-calendar-events').
+				                 '<br/><br/>'.
+				                 '<em>'.__('Your license keys are used for access to automatic upgrades and premium support.', 'google-calendar-events').'</em>',
 			),
 		);
-		return apply_filters( 'simcal_add_' . $this->option_group . '_' . $this->id .'_sections', $sections );
+		return apply_filters('simcal_add_'.$this->option_group.'_'.$this->id.'_sections', $sections);
 	}
 
 	/**
@@ -92,25 +92,25 @@ 
 	public function add_fields() {
 
 		$fields = array();
-		$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 ( 'keys' == $section ) {
+			if ('keys' == $section) {
 
-				$addons = apply_filters( 'simcal_installed_addons', array() );
+				$addons = apply_filters('simcal_installed_addons', array());
 
-				if ( ! empty( $addons ) && is_array( $addons ) ) {
+				if ( ! empty($addons) && is_array($addons)) {
 
-					foreach ( $addons as $addon_id => $addon_name ) {
+					foreach ($addons as $addon_id => $addon_name) {
 
-						$fields[ $section ][ $addon_id ] = array(
+						$fields[$section][$addon_id] = array(
 							'type'      => 'license',
 							'addon'     => $addon_id,
-							'title'     => esc_attr( $addon_name ),
-							'name'      => 'simple-calendar_' . $this->option_group . '_' . $this->id . '[' . $section . '][' . $addon_id . ']',
-							'id'        => 'simple-calendar-' . $this->option_group . '-' . $this->id . '-' . $section . '-' . sanitize_key( $addon_id ),
-							'value'     => $this->get_option_value( $section, $addon_id ),
+							'title'     => esc_attr($addon_name),
+							'name'      => 'simple-calendar_'.$this->option_group.'_'.$this->id.'['.$section.']['.$addon_id.']',
+							'id'        => 'simple-calendar-'.$this->option_group.'-'.$this->id.'-'.$section.'-'.sanitize_key($addon_id),
+							'value'     => $this->get_option_value($section, $addon_id),
 							'class'     => array(
 								'regular-text',
 								'ltr',
@@ -125,7 +125,7 @@ 
 
 		}
 
-		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/admin/pages/system-status.php

Spacing +167 added lines, -167 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Abstracts\Admin_Page;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -30,16 +30,16 @@ 
 
 		$this->id           = $tab = 'system-status';
 		$this->option_group = $page = 'tools';
-		$this->label        = __( 'System Report', 'google-calendar-events' );
+		$this->label        = __('System Report', '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'));
 	}
 
 	/**
@@ -51,37 +51,37 @@ 
 
 		?>
 		<div id="simcal-system-status-report">
-			<p><?php _e( 'Please copy and paste this information when contacting support:', 'google-calendar-events' ); ?> </p>
+			<p><?php _e('Please copy and paste this information when contacting support:', 'google-calendar-events'); ?> </p>
 			<textarea readonly="readonly" onclick="this.select();"></textarea>
-			<p><?php _e( 'You can also download your information as a text file to attach, or simply view it below.', 'google-calendar-events' ); ?></p>
-			<p><a href="#" id="simcal-system-status-report-download" class="button button-primary"><?php _e( 'Download System Report', 'google-calendar-events' ); ?></a></p>
+			<p><?php _e('You can also download your information as a text file to attach, or simply view it below.', 'google-calendar-events'); ?></p>
+			<p><a href="#" id="simcal-system-status-report-download" class="button button-primary"><?php _e('Download System Report', 'google-calendar-events'); ?></a></p>
 		</div>
 		<hr>
 		<?php
 
 		global $wpdb;
-		$wp_version = get_bloginfo( 'version' );
+		$wp_version = get_bloginfo('version');
 
 		$sections = array();
 		$panels   = array(
 			'wordpress' => array(
-				'label'  => __( 'WordPress Installation', 'google-calendar-events' ),
+				'label'  => __('WordPress Installation', 'google-calendar-events'),
 				'export' => 'WordPress Installation',
 			),
 			'theme'     => array(
-				'label'  => __( 'Active Theme', 'google-calendar-events' ),
+				'label'  => __('Active Theme', 'google-calendar-events'),
 				'export' => 'Active Theme',
 			),
 			'plugins'   => array(
-				'label'  => __( 'Active Plugins', 'google-calendar-events' ),
+				'label'  => __('Active Plugins', 'google-calendar-events'),
 				'export' => 'Active Plugins',
 			),
 			'server'    => array(
-				'label'  => __( 'Server Environment', 'google-calendar-events' ),
+				'label'  => __('Server Environment', 'google-calendar-events'),
 				'export' => 'Server Environment',
 			),
 			'client'    => array(
-				'label'  => __( 'Client Information', 'google-calendar-events' ),
+				'label'  => __('Client Information', 'google-calendar-events'),
 				'export' => 'Client Information',
 			)
 		);
@@ -98,68 +98,68 @@ 
 		 * ======================
 		 */
 
-		$debug_mode = $script_debug = __( 'No', 'google-calendar-events' );
-		if ( defined( 'WP_DEBUG' ) ) {
-			$debug_mode = true === WP_DEBUG ? __( 'Yes', 'google-calendar-events' ) : $debug_mode;
+		$debug_mode = $script_debug = __('No', 'google-calendar-events');
+		if (defined('WP_DEBUG')) {
+			$debug_mode = true === WP_DEBUG ? __('Yes', 'google-calendar-events') : $debug_mode;
 		}
-		if ( defined( 'SCRIPT_DEBUG' ) ) {
-			$script_debug = true === SCRIPT_DEBUG ? __( 'Yes', 'google-calendar-events' ) : $script_debug;
+		if (defined('SCRIPT_DEBUG')) {
+			$script_debug = true === SCRIPT_DEBUG ? __('Yes', 'google-calendar-events') : $script_debug;
 		}
 
-		$memory = $this->let_to_num( WP_MEMORY_LIMIT );
-		$memory_export = size_format( $memory );
-		if ( $memory < 67108864 ) {
-			$memory = '<mark class="error">' . sprintf( __( '%1$s - It is recomendend to set memory to at least 64MB. See: <a href="%2$s" target="_blank">Increasing memory allocated to PHP</a>', 'google-calendar-events' ), $memory_export, 'http://codex.wordpress.org/Editing_wp-config.php#Increasing_memory_allocated_to_PHP' ) . '</mark>';
+		$memory = $this->let_to_num(WP_MEMORY_LIMIT);
+		$memory_export = size_format($memory);
+		if ($memory < 67108864) {
+			$memory = '<mark class="error">'.sprintf(__('%1$s - It is recomendend to set memory to at least 64MB. See: <a href="%2$s" target="_blank">Increasing memory allocated to PHP</a>', 'google-calendar-events'), $memory_export, 'http://codex.wordpress.org/Editing_wp-config.php#Increasing_memory_allocated_to_PHP').'</mark>';
 		} else {
-			$memory = '<mark class="ok">' . $memory_export . '</mark>';
+			$memory = '<mark class="ok">'.$memory_export.'</mark>';
 		}
 
-		$permalinks = get_option( 'permalink_structure' );
-		$permalinks = empty( $permalinks ) ? '/?' : $permalinks;
+		$permalinks = get_option('permalink_structure');
+		$permalinks = empty($permalinks) ? '/?' : $permalinks;
 
 		$is_multisite = is_multisite();
 
 		$sections['wordpress'] = array(
 			'name'          => array(
-				'label'  => __( 'Site Name', 'google-calendar-events' ),
+				'label'  => __('Site Name', 'google-calendar-events'),
 				'label_export' => 'Site Name',
-				'result' => get_bloginfo( 'name' ),
+				'result' => get_bloginfo('name'),
 			),
 			'home_url'      => array(
-				'label'  => __( 'Home URL', 'google-calendar-events' ),
+				'label'  => __('Home URL', 'google-calendar-events'),
 				'label_export' => 'Home URL',
 				'result' => home_url(),
 			),
 			'site_url'      => array(
-				'label'  => __( 'Site URL', 'google-calendar-events' ),
+				'label'  => __('Site URL', 'google-calendar-events'),
 				'label_export' => 'Site URL',
 				'result' => site_url(),
 			),
 			'version'       => array(
-				'label'  => __( 'Version', 'google-calendar-events' ),
+				'label'  => __('Version', 'google-calendar-events'),
 				'label_export' => 'Version',
 				'result' => $wp_version,
 			),
 			'locale'        => array(
-				'label'  => __( 'Locale', 'google-calendar-events' ),
+				'label'  => __('Locale', 'google-calendar-events'),
 				'label_export' => 'Locale',
 				'result' => get_locale(),
 			),
 			'wp_timezone'   => array(
-				'label'  => __( 'Timezone', 'google-calendar-events' ),
+				'label'  => __('Timezone', 'google-calendar-events'),
 				'label_export' => 'Timezone',
 				'result' => simcal_get_wp_timezone(),
 			),
 			'multisite'     => array(
-				'label'  => __( 'Multisite', 'google-calendar-events' ),
+				'label'  => __('Multisite', 'google-calendar-events'),
 				'label_export' => 'Multisite',
-				'result' => $is_multisite ? __( 'Yes', 'google-calendar-events' ) : __( 'No', 'google-calendar-events' ),
+				'result' => $is_multisite ? __('Yes', 'google-calendar-events') : __('No', 'google-calendar-events'),
 				'result_export' => $is_multisite ? 'Yes' : 'No'
 			),
 			'permalink'     => array(
-				'label'  => __( 'Permalinks', 'google-calendar-events' ),
+				'label'  => __('Permalinks', 'google-calendar-events'),
 				'label_export' => 'Permalinks',
-				'result' => '<code>' . $permalinks . '</code>',
+				'result' => '<code>'.$permalinks.'</code>',
 				'result_export' => $permalinks,
 			),
 			'memory_limit'  => array(
@@ -182,86 +182,86 @@ 
 		 * ============
 		 */
 
-		include_once ABSPATH . 'wp-admin/includes/theme-install.php';
+		include_once ABSPATH.'wp-admin/includes/theme-install.php';
 
-		if ( version_compare( $wp_version, '3.4', '<' ) ) {
-			$active_theme  = get_theme_data( get_stylesheet_directory() . '/style.css' );
-			$theme_name    = '<a href="' . $active_theme['URI'] . '" target="_blank">' . $active_theme['Name'] . '</a>';
+		if (version_compare($wp_version, '3.4', '<')) {
+			$active_theme  = get_theme_data(get_stylesheet_directory().'/style.css');
+			$theme_name    = '<a href="'.$active_theme['URI'].'" target="_blank">'.$active_theme['Name'].'</a>';
 			$theme_version = $active_theme['Version'];
-			$theme_author  = '<a href="' . $active_theme['AuthorURI'] . '" target="_blank">' . $active_theme['Author'] . '</a>';
-			$theme_export  = $active_theme['Name'] . ' - ' . $theme_version;
+			$theme_author  = '<a href="'.$active_theme['AuthorURI'].'" target="_blank">'.$active_theme['Author'].'</a>';
+			$theme_export  = $active_theme['Name'].' - '.$theme_version;
 		} else {
 			$active_theme  = wp_get_theme();
-			$theme_name    = '<a href="' . $active_theme->ThemeURI . '" target="_blank">' . $active_theme->Name . '</a>';
+			$theme_name    = '<a href="'.$active_theme->ThemeURI.'" target="_blank">'.$active_theme->Name.'</a>';
 			$theme_version = $active_theme->Version;
 			$theme_author  = $active_theme->Author;
-			$theme_export  = $active_theme->Name . ' - ' . $theme_version;
+			$theme_export  = $active_theme->Name.' - '.$theme_version;
 		}
 
 		$theme_update_version = $theme_version;
 
-		$api = themes_api( 'theme_information', array(
+		$api = themes_api('theme_information', array(
 			'slug'   => get_template(),
-			'fields' => array( 'sections' => false, 'tags' => false ),
-		) );
-		if ( $api && ! is_wp_error( $api ) ) {
+			'fields' => array('sections' => false, 'tags' => false),
+		));
+		if ($api && ! is_wp_error($api)) {
 			$theme_update_version = $api->version;
 		}
 
-		if ( version_compare( $theme_version, $theme_update_version, '<' ) ) {
-			$theme_version = '<mark class="error">' . $theme_version . ' (' . sprintf( __( '%s is available', 'google-calendar-events' ), esc_html( $theme_update_version ) ) . ')</mark>';
+		if (version_compare($theme_version, $theme_update_version, '<')) {
+			$theme_version = '<mark class="error">'.$theme_version.' ('.sprintf(__('%s is available', 'google-calendar-events'), esc_html($theme_update_version)).')</mark>';
 		} else {
-			$theme_version = '<mark class="ok">' . $theme_version . '</mark>';
+			$theme_version = '<mark class="ok">'.$theme_version.'</mark>';
 		}
 
 		$theme  = '<dl>';
-		$theme .= '<dt>' . __( 'Name', 'google-calendar-events' ) . '</dt>';
-		$theme .= '<dd>' . $theme_name . '</dd>';
-		$theme .= '<dt>' . __( 'Author', 'google-calendar-events' ) . '</dt>';
-		$theme .= '<dd>' . $theme_author . '</dd>';
-		$theme .= '<dt>' . __( 'Version', 'google-calendar-events' ) . '</dt>';
-		$theme .= '<dd>' . $theme_version . '</dd>';
+		$theme .= '<dt>'.__('Name', 'google-calendar-events').'</dt>';
+		$theme .= '<dd>'.$theme_name.'</dd>';
+		$theme .= '<dt>'.__('Author', 'google-calendar-events').'</dt>';
+		$theme .= '<dd>'.$theme_author.'</dd>';
+		$theme .= '<dt>'.__('Version', 'google-calendar-events').'</dt>';
+		$theme .= '<dd>'.$theme_version.'</dd>';
 		$theme .= '</dl>';
 
 		$is_child_theme = is_child_theme();
 		$parent_theme = $parent_theme_export = '-';
 
-		if ( $is_child_theme ) {
-			if ( version_compare( $wp_version, '3.4', '<' ) ) {
+		if ($is_child_theme) {
+			if (version_compare($wp_version, '3.4', '<')) {
 
 				$parent_theme = $parent_theme_export = $active_theme['Template'];
 
 			} else {
 
-				$parent = wp_get_theme( $active_theme->Template );
+				$parent = wp_get_theme($active_theme->Template);
 				$parent_theme  = '<dl>';
-				$parent_theme .= '<dt>' . __( 'Name', 'google-calendar-events' ) .    '</dt>';
-				$parent_theme .= '<dd>' . $parent->Name .          '</dd>';
-				$parent_theme .= '<dt>' . __( 'Author', 'google-calendar-events' ) .  '</dt>';
-				$parent_theme .= '<dd>' . $parent->Author .        '</dd>';
-				$parent_theme .= '<dt>' . __( 'Version', 'google-calendar-events' ) . '</dt>';
-				$parent_theme .= '<dd>' . $parent->Version .       '</dd>';
+				$parent_theme .= '<dt>'.__('Name', 'google-calendar-events').'</dt>';
+				$parent_theme .= '<dd>'.$parent->Name.'</dd>';
+				$parent_theme .= '<dt>'.__('Author', 'google-calendar-events').'</dt>';
+				$parent_theme .= '<dd>'.$parent->Author.'</dd>';
+				$parent_theme .= '<dt>'.__('Version', 'google-calendar-events').'</dt>';
+				$parent_theme .= '<dd>'.$parent->Version.'</dd>';
 				$parent_theme .= '</dl>';
 
-				$parent_theme_export = strip_tags( $parent->Name ) . ' - ' .  $parent->Version;
+				$parent_theme_export = strip_tags($parent->Name).' - '.$parent->Version;
 			}
 		}
 
 		$sections['theme'] = array(
 			'theme'    => array(
-				'label'  => __( 'Theme Information', 'google-calendar-events' ),
+				'label'  => __('Theme Information', 'google-calendar-events'),
 				'label_export' => 'Theme',
 				'result' => $theme,
 				'result_export' => $theme_export,
 			),
 			'theme_child'   => array(
-				'label'  => __( 'Child Theme', 'google-calendar-events' ),
+				'label'  => __('Child Theme', 'google-calendar-events'),
 				'label_export' => 'Child Theme',
-				'result' => $is_child_theme ? __( 'Yes', 'google-calendar-events' ) : __( 'No', 'google-calendar-events' ),
+				'result' => $is_child_theme ? __('Yes', 'google-calendar-events') : __('No', 'google-calendar-events'),
 				'result_export' => $is_child_theme ? 'Yes' : 'No',
 			),
 			'theme_parent'   => array(
-				'label'  => __( 'Parent Theme', 'google-calendar-events' ),
+				'label'  => __('Parent Theme', 'google-calendar-events'),
 				'label_export' => 'Parent Theme',
 				'result' => $parent_theme,
 				'result_export' => $parent_theme_export,
@@ -273,61 +273,61 @@ 
 		 * ==============
 		 */
 
-		include_once ABSPATH . 'wp-admin/includes/plugin-install.php';
+		include_once ABSPATH.'wp-admin/includes/plugin-install.php';
 
-		$active_plugins = (array) get_option( 'active_plugins', array() );
-		if ( is_multisite() ) {
-			$active_plugins = array_merge( $active_plugins, get_site_option( 'active_sitewide_plugins', array() ) );
+		$active_plugins = (array) get_option('active_plugins', array());
+		if (is_multisite()) {
+			$active_plugins = array_merge($active_plugins, get_site_option('active_sitewide_plugins', array()));
 		}
 
-		foreach ( $active_plugins as $plugin ) {
+		foreach ($active_plugins as $plugin) {
 
-			$plugin_data = @get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin );
+			$plugin_data = @get_plugin_data(WP_PLUGIN_DIR.'/'.$plugin);
 
-			if ( ! empty( $plugin_data['Name'] ) ) {
+			if ( ! empty($plugin_data['Name'])) {
 
 				$plugin_name    = $plugin_data['Title'];
 				$plugin_author  = $plugin_data['Author'];
 				$plugin_version = $plugin_update_version = $plugin_data['Version'];
 
 				// Afraid that querying many plugins may risk a timeout.
-				if ( count( $active_plugins ) <= 10 ) {
-					$api = plugins_api( 'plugin_information', array(
+				if (count($active_plugins) <= 10) {
+					$api = plugins_api('plugin_information', array(
 						'slug'   => $plugin_data['Name'],
 						'fields' => array(
 							'version' => true,
 						),
-					) );
-					if ( $api && ! is_wp_error( $api ) ) {
-						if ( ! empty( $api->version ) ) {
+					));
+					if ($api && ! is_wp_error($api)) {
+						if ( ! empty($api->version)) {
 							$plugin_update_version = $api->version;
-							if ( version_compare( $plugin_version, $plugin_update_version, '<' ) ) {
-								$plugin_version = '<mark class="error">' . $plugin_version . ' (' . sprintf( __( '%s is available', 'google-calendar-events' ), esc_html( $plugin_update_version ) ) . ')</mark>';
+							if (version_compare($plugin_version, $plugin_update_version, '<')) {
+								$plugin_version = '<mark class="error">'.$plugin_version.' ('.sprintf(__('%s is available', 'google-calendar-events'), esc_html($plugin_update_version)).')</mark>';
 							} else {
-								$plugin_version = '<mark class="ok">' . $plugin_version . '</mark>';
+								$plugin_version = '<mark class="ok">'.$plugin_version.'</mark>';
 							}
 						}
 					}
 				}
 
 				$plugin  = '<dl>';
-				$plugin .= '<dt>' . __( 'Author', 'google-calendar-events' ) .  '</dt>';
-				$plugin .= '<dd>' . $plugin_author .         '</dd>';
-				$plugin .= '<dt>' . __( 'Version', 'google-calendar-events' ) . '</dt>';
-				$plugin .= '<dd>' . $plugin_version .        '</dd>';
+				$plugin .= '<dt>'.__('Author', 'google-calendar-events').'</dt>';
+				$plugin .= '<dd>'.$plugin_author.'</dd>';
+				$plugin .= '<dt>'.__('Version', 'google-calendar-events').'</dt>';
+				$plugin .= '<dd>'.$plugin_version.'</dd>';
 				$plugin .= '</dl>';
 
-				$sections['plugins'][ sanitize_key( strip_tags( $plugin_name ) ) ] = array(
+				$sections['plugins'][sanitize_key(strip_tags($plugin_name))] = array(
 					'label'  => $plugin_name,
-					'label_export' => strip_tags( $plugin_data['Title'] ),
+					'label_export' => strip_tags($plugin_data['Title']),
 					'result' => $plugin,
 					'result_export' => $plugin_data['Version'],
 				);
 			}
 		}
 
-		if ( isset( $sections['plugins'] ) ) {
-			rsort( $sections['plugins'] );
+		if (isset($sections['plugins'])) {
+			rsort($sections['plugins']);
 		}
 
 		/**
@@ -335,51 +335,51 @@ 
 		 * ==================
 		 */
 
-		if ( version_compare( PHP_VERSION, '5.4', '<' ) ) {
-			$php = '<mark class="error">' . sprintf( __( '%1$s - It is recomendend to upgrade at least to PHP version 5.4 for security reasons. <a href="%2$s" target="_blank">Read more.</a>', 'google-calendar-events' ), PHP_VERSION, 'http://www.wpupdatephp.com/update/' ) . '</mark>';
+		if (version_compare(PHP_VERSION, '5.4', '<')) {
+			$php = '<mark class="error">'.sprintf(__('%1$s - It is recomendend to upgrade at least to PHP version 5.4 for security reasons. <a href="%2$s" target="_blank">Read more.</a>', 'google-calendar-events'), PHP_VERSION, 'http://www.wpupdatephp.com/update/').'</mark>';
 		} else {
-			$php = '<mark class="ok">' . PHP_VERSION . '</mark>';
+			$php = '<mark class="ok">'.PHP_VERSION.'</mark>';
 		}
 
-		if ( $wpdb->use_mysqli ) {
-			$mysql = @mysqli_get_server_info( $wpdb->dbh );
+		if ($wpdb->use_mysqli) {
+			$mysql = @mysqli_get_server_info($wpdb->dbh);
 		} else {
 			$mysql = @mysql_get_server_info();
 		}
 
 		$host = $_SERVER['SERVER_SOFTWARE'];
-		if ( defined( 'WPE_APIKEY' ) ) {
+		if (defined('WPE_APIKEY')) {
 			$host .= ' (WP Engine)';
-		} elseif ( defined( 'PAGELYBIN' ) ) {
+		} elseif (defined('PAGELYBIN')) {
 			$host .= ' (Pagely)';
 		}
 
 		$default_timezone = $server_timezone_export = date_default_timezone_get();
-		if ( 'UTC' !== $default_timezone ) {
-			$server_timezone = '<mark class="error">' . sprintf( __( 'Server default timezone is %s - it should be UTC', 'google-calendar-events' ), $default_timezone ) . '</mark>';
+		if ('UTC' !== $default_timezone) {
+			$server_timezone = '<mark class="error">'.sprintf(__('Server default timezone is %s - it should be UTC', 'google-calendar-events'), $default_timezone).'</mark>';
 		} else {
 			$server_timezone = '<mark class="ok">UTC</mark>';
 		}
 
 		// WP Remote POST test.
-		$response = wp_safe_remote_post( 'https://www.paypal.com/cgi-bin/webscr', array(
+		$response = wp_safe_remote_post('https://www.paypal.com/cgi-bin/webscr', array(
 			'timeout'    => 60,
 			'body'       => array(
 				'cmd'    => '_notify-validate',
 			),
-		) );
-		if ( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
+		));
+		if ( ! is_wp_error($response) && $response['response']['code'] >= 200 && $response['response']['code'] < 300) {
 			$wp_post_export = 'Yes';
-			$wp_post = '<mark class="ok">' . __( 'Yes', 'google-calendar-events' ) . '</mark>';
+			$wp_post = '<mark class="ok">'.__('Yes', 'google-calendar-events').'</mark>';
 		} else {
 			$wp_post_export = 'No';
-			$wp_post = '<mark class="error">' . __( 'No', 'google-calendar-events' );
-			if ( is_wp_error( $response ) ) {
-				$error = ' (' . $response->get_error_message() . ')';
+			$wp_post = '<mark class="error">'.__('No', 'google-calendar-events');
+			if (is_wp_error($response)) {
+				$error = ' ('.$response->get_error_message().')';
 				$wp_post .= $error;
 				$wp_post_export .= $error;
 			} else {
-				$error = ' (' . $response['response']['code'] . ')';
+				$error = ' ('.$response['response']['code'].')';
 				$wp_post .= $error;
 				$wp_post_export .= $error;
 			}
@@ -387,64 +387,64 @@ 
 		}
 
 		// WP Remote GET test.
-		$response = wp_safe_remote_get( get_home_url( '/?p=1' ) );
-		if ( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
+		$response = wp_safe_remote_get(get_home_url('/?p=1'));
+		if ( ! is_wp_error($response) && $response['response']['code'] >= 200 && $response['response']['code'] < 300) {
 			$wp_get_export = 'Yes';
-			$wp_get = '<mark class="ok">' . __( 'Yes', 'google-calendar-events' ) . '</mark>';
+			$wp_get = '<mark class="ok">'.__('Yes', 'google-calendar-events').'</mark>';
 		} else {
 			$wp_get_export = 'No';
-			$wp_get = '<mark class="error">' . __( 'No', 'google-calendar-events' );
-			if ( is_wp_error( $response ) ) {
-				$error = ' (' . $response->get_error_message() . ')';
+			$wp_get = '<mark class="error">'.__('No', 'google-calendar-events');
+			if (is_wp_error($response)) {
+				$error = ' ('.$response->get_error_message().')';
 				$wp_get .= $error;
 				$wp_get_export .= $error;
 			} else {
-				$error = ' (' . $response['response']['code'] . ')';
+				$error = ' ('.$response['response']['code'].')';
 				$wp_get .= $error;
 				$wp_get_export .= $error;
 			}
 			$wp_get .= '</mark>';
 		}
 
-		$php_memory_limit        = ini_get( 'memory_limit' );
-		$php_max_upload_filesize = ini_get( 'upload_max_filesize' );
-		$php_post_max_size       = ini_get( 'post_max_size' );
-		$php_max_execution_time  = ini_get( 'max_execution_time' );
-		$php_max_input_vars      = ini_get( 'max_input_vars' );
+		$php_memory_limit        = ini_get('memory_limit');
+		$php_max_upload_filesize = ini_get('upload_max_filesize');
+		$php_post_max_size       = ini_get('post_max_size');
+		$php_max_execution_time  = ini_get('max_execution_time');
+		$php_max_input_vars      = ini_get('max_input_vars');
 
 		$sections['server'] = array(
 			'host'                => array(
-				'label'  => __( 'Web Server', 'google-calendar-events' ),
+				'label'  => __('Web Server', 'google-calendar-events'),
 				'label_export' => 'Web Server',
 				'result' => $host,
 			),
 			'php_version'         => array(
-				'label'  => __( 'PHP Version', 'google-calendar-events' ),
+				'label'  => __('PHP Version', 'google-calendar-events'),
 				'label_export' => 'PHP Version',
 				'result' => $php,
 				'result_export' => PHP_VERSION,
 			),
 			'mysql_version'       => array(
-				'label'  => __( 'MySQL Version', 'google-calendar-events' ),
+				'label'  => __('MySQL Version', 'google-calendar-events'),
 				'label_export' => 'MySQL Version',
-				'result' => version_compare( $mysql, '5.5', '>' ) ? '<mark class="ok">' . $mysql . '</mark>' : $mysql,
+				'result' => version_compare($mysql, '5.5', '>') ? '<mark class="ok">'.$mysql.'</mark>' : $mysql,
 				'result_export' => $mysql,
 			),
 			'server_timezone'     => array(
-				'label'  => __( 'Server Timezone', 'google-calendar-events' ),
+				'label'  => __('Server Timezone', 'google-calendar-events'),
 				'label_export' => 'Server Timezone',
 				'result' => $server_timezone,
 				'result_export' => $server_timezone_export,
 			),
 			'display_errors'      => array(
 				'label'  => 'Display Errors',
-				'result' => ( ini_get( 'display_errors' ) ) ? __( 'Yes', 'google-calendar-events' ) . ' (' . ini_get( 'display_errors' ) . ')' : '-',
-				'result_export' => ( ini_get( 'display_errors' ) ) ? 'Yes' : 'No',
+				'result' => (ini_get('display_errors')) ? __('Yes', 'google-calendar-events').' ('.ini_get('display_errors').')' : '-',
+				'result_export' => (ini_get('display_errors')) ? 'Yes' : 'No',
 			),
 			'php_safe_mode'       => array(
 				'label'  => 'Safe Mode',
-				'result' => ( ini_get( 'safe_mode' ) ) ? __( 'Yes', 'google-calendar-events' ) : __( 'No', 'google-calendar-events' ),
-				'result_export' => ( ini_get( 'safe_mode' ) ) ? 'Yes' : 'No',
+				'result' => (ini_get('safe_mode')) ? __('Yes', 'google-calendar-events') : __('No', 'google-calendar-events'),
+				'result_export' => (ini_get('safe_mode')) ? 'Yes' : 'No',
 			),
 			'php_memory_limit'    => array(
 				'label'  => 'Memory Limit',
@@ -468,23 +468,23 @@ 
 			),
 			'fsockopen'           => array(
 				'label'  => 'fsockopen',
-				'result' => function_exists( 'fsockopen' ) ? __( 'Yes', 'google-calendar-events' ) : __( 'No', 'google-calendar-events' ),
-				'result_export' => function_exists( 'fsockopen' ) ? 'Yes' : 'No',
+				'result' => function_exists('fsockopen') ? __('Yes', 'google-calendar-events') : __('No', 'google-calendar-events'),
+				'result_export' => function_exists('fsockopen') ? 'Yes' : 'No',
 			),
 			'curl_init'           => array(
 				'label'  => 'cURL',
-				'result' => function_exists( 'curl_init' ) ? __( 'Yes', 'google-calendar-events' ) : __( 'No', 'google-calendar-events' ),
-				'result_export' => function_exists( 'curl_init' ) ? 'Yes' : 'No',
+				'result' => function_exists('curl_init') ? __('Yes', 'google-calendar-events') : __('No', 'google-calendar-events'),
+				'result_export' => function_exists('curl_init') ? 'Yes' : 'No',
 			),
 			'soap'                => array(
 				'label'  => 'SOAP',
-				'result' => class_exists( 'SoapClient' ) ? __( 'Yes', 'google-calendar-events' ) : __( 'No', 'google-calendar-events' ),
-				'result_export' => class_exists( 'SoapClient' ) ? 'Yes' : 'No',
+				'result' => class_exists('SoapClient') ? __('Yes', 'google-calendar-events') : __('No', 'google-calendar-events'),
+				'result_export' => class_exists('SoapClient') ? 'Yes' : 'No',
 			),
 			'suhosin'             => array(
 				'label'  => 'SUHOSIN',
-				'result' => extension_loaded( 'suhosin' ) ? __( 'Yes', 'google-calendar-events' ) : __( 'No', 'google-calendar-events' ),
-				'result_export' => extension_loaded( 'suhosin' ) ? 'Yes' : 'No',
+				'result' => extension_loaded('suhosin') ? __('Yes', 'google-calendar-events') : __('No', 'google-calendar-events'),
+				'result_export' => extension_loaded('suhosin') ? 'Yes' : 'No',
 			),
 			'wp_remote_post'      => array(
 				'label'  => 'WP Remote POST',
@@ -506,26 +506,26 @@ 
 		$user_client = new \Browser();
 
 		$browser  = '<dl>';
-		$browser .= '<dt>' . __( 'Name:', 'google-calendar-events' ) .         '</dt>';
-		$browser .= '<dd>' . $user_client->getBrowser() .   '</dd>';
-		$browser .= '<dt>' . __( 'Version:', 'google-calendar-events' ) .      '</dt>';
-		$browser .= '<dd>' . $user_client->getVersion() .   '</dd>';
-		$browser .= '<dt>' . __( 'User Agent:', 'google-calendar-events' ) .   '</dt>';
-		$browser .= '<dd>' . $user_client->getUserAgent() . '</dd>';
-		$browser .= '<dt>' . __( 'Platform:', 'google-calendar-events' ) .     '</dt>';
-		$browser .= '<dd>' . $user_client->getPlatform() .  '</dd>';
+		$browser .= '<dt>'.__('Name:', 'google-calendar-events').'</dt>';
+		$browser .= '<dd>'.$user_client->getBrowser().'</dd>';
+		$browser .= '<dt>'.__('Version:', 'google-calendar-events').'</dt>';
+		$browser .= '<dd>'.$user_client->getVersion().'</dd>';
+		$browser .= '<dt>'.__('User Agent:', 'google-calendar-events').'</dt>';
+		$browser .= '<dd>'.$user_client->getUserAgent().'</dd>';
+		$browser .= '<dt>'.__('Platform:', 'google-calendar-events').'</dt>';
+		$browser .= '<dd>'.$user_client->getPlatform().'</dd>';
 		$browser .= '</dl>';
 
-		$browser_export = $user_client->getBrowser() . ' ' . $user_client->getVersion() . ' (' . $user_client->getPlatform() . ')';
+		$browser_export = $user_client->getBrowser().' '.$user_client->getVersion().' ('.$user_client->getPlatform().')';
 
 		$sections['client'] = array(
 			'user_ip' => array(
-				'label'  => __( 'IP Address', 'google-calendar-events' ),
+				'label'  => __('IP Address', 'google-calendar-events'),
 				'label_export' => 'IP Address',
 				'result' => $_SERVER['SERVER_ADDR'],
 			),
 			'browser' => array(
-				'label'  => __( 'Browser', 'google-calendar-events' ),
+				'label'  => __('Browser', 'google-calendar-events'),
 				'result' => $browser,
 				'result_export' => $browser_export,
 			)
@@ -536,12 +536,12 @@ 
 		 * ============
 		 */
 
-		$panels   = apply_filters( 'simcal_system_status_report_panels', $panels );
-		$sections = apply_filters( 'simcal_system_status_report_sections', $sections );
+		$panels   = apply_filters('simcal_system_status_report_panels', $panels);
+		$sections = apply_filters('simcal_system_status_report_sections', $sections);
 
-		foreach ( $panels as $panel => $v ) :
+		foreach ($panels as $panel => $v) :
 
-			if ( isset( $sections[ $panel ] ) ) :
+			if (isset($sections[$panel])) :
 
 				?>
 				<table class="widefat simcal-system-status-report-panel">
@@ -551,15 +551,15 @@ 
 						</tr>
 					</thead>
 					<tbody>
-						<?php foreach ( $sections[ $panel ] as $row => $cell ) : ?>
+						<?php foreach ($sections[$panel] as $row => $cell) : ?>
 							<tr>
 								<?php
-								$label_export  = isset( $cell['label_export']  ) ? $cell['label_export']  : $cell['label'];
-								$result_export = isset( $cell['result_export'] ) ? $cell['result_export'] : $cell['result'];
+								$label_export  = isset($cell['label_export']) ? $cell['label_export'] : $cell['label'];
+								$result_export = isset($cell['result_export']) ? $cell['result_export'] : $cell['result'];
 								?>
-								<td class="tooltip"><?php echo isset( $cell['tooltip'] ) ? ' <i class="simcal-icon-help simcal-help-tip" data-tip="' . $cell['tooltip'] . '"></i> ' : ''; ?></td>
-								<td class="label" data-export="<?php echo trim( $label_export ); ?>"><?php echo $cell['label']; ?></td>
-								<td class="result" data-export="<?php echo trim( $result_export ); ?>"><?php echo $cell['result']; ?></td>
+								<td class="tooltip"><?php echo isset($cell['tooltip']) ? ' <i class="simcal-icon-help simcal-help-tip" data-tip="'.$cell['tooltip'].'"></i> ' : ''; ?></td>
+								<td class="label" data-export="<?php echo trim($label_export); ?>"><?php echo $cell['label']; ?></td>
+								<td class="result" data-export="<?php echo trim($result_export); ?>"><?php echo $cell['result']; ?></td>
 							</tr>
 						<?php endforeach; ?>
 					</tbody>
@@ -637,7 +637,7 @@ 
 			jQuery( '#simcal-system-status-report-download' ).on( 'click', function() {
 				var file = new Blob( [ report ], { type: 'text/plain' } );
 				jQuery( this ).attr( 'href', URL.createObjectURL( file ) );
-				jQuery( this ).attr( 'download', '<?php echo sanitize_title( str_replace( array( 'http://', 'https://' ), '', get_bloginfo( 'url' ) ) . '-system-report-' . date( 'Y-m-d', time() ) ); ?>' );
+				jQuery( this ).attr( 'download', '<?php echo sanitize_title(str_replace(array('http://', 'https://'), '', get_bloginfo('url')).'-system-report-'.date('Y-m-d', time())); ?>' );
 			} );
 
 		</script>
@@ -657,13 +657,13 @@ 
 	 *
 	 * @return int|double|string
 	 */
-	private function let_to_num( $size ) {
+	private function let_to_num($size) {
 
-		$l   = substr( $size, -1 );
-		$ret = substr( $size, 0, -1 );
+		$l   = substr($size, -1);
+		$ret = substr($size, 0, -1);
 
 		// Note: do not insert break or default in this switch loop.
-		switch ( strtoupper( $l ) ) {
+		switch (strtoupper($l)) {
 			case 'P':
 				$ret *= 1024;
 				// no break
@@ -677,7 +677,7 @@ 
 				$ret *= 1024;
 				// no break
 			case 'K':
-				$ret *= 1024;;
+				$ret *= 1024; ;
 				// no break
 		}
 

includes/admin/post-types.php

Spacing +82 added lines, -82 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Abstracts\Calendar;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -32,26 +32,26 @@ 
 		new Meta_Boxes();
 
 		// Add column headers in calendar feeds admin archives.
-		add_filter( 'manage_calendar_posts_columns', array( $this, 'add_calendar_feed_column_headers' ) );
+		add_filter('manage_calendar_posts_columns', array($this, 'add_calendar_feed_column_headers'));
 		// Process column contents for calendar feeds.
-		add_action( 'manage_calendar_posts_custom_column', array( $this, 'calendar_feed_column_content' ), 10, 2 );
+		add_action('manage_calendar_posts_custom_column', array($this, 'calendar_feed_column_content'), 10, 2);
 
 		// Add actions in calendar feed rows.
-		add_filter( 'post_row_actions', array( $this, 'row_actions' ), 10, 2 );
+		add_filter('post_row_actions', array($this, 'row_actions'), 10, 2);
 		// Add bulk actions.
-		add_action( 'admin_init', array( $this, 'bulk_actions' ) );
+		add_action('admin_init', array($this, 'bulk_actions'));
 		// Add content to edit calendars page.
-		add_action( 'load-edit.php', array( $this, 'edit_table_hooks' ) );
+		add_action('load-edit.php', array($this, 'edit_table_hooks'));
 
 		// Default calendar post type content (default event template).
-		add_filter( 'default_content', array( $this, 'default_event_template' ), 10, 2 );
+		add_filter('default_content', array($this, 'default_event_template'), 10, 2);
 
 		// Add a clear cache link in submit post box.
-		add_action( 'post_submitbox_misc_actions', array( $this, 'clear_cache_button' ) );
+		add_action('post_submitbox_misc_actions', array($this, 'clear_cache_button'));
 
 		// Add media button to post editor for adding a shortcode.
-		add_action( 'media_buttons', array( $this, 'add_shortcode_button' ), 100 );
-		add_action( 'edit_form_after_editor', array( $this, 'add_shortcode_panel' ), 100 );
+		add_action('media_buttons', array($this, 'add_shortcode_button'), 100);
+		add_action('edit_form_after_editor', array($this, 'add_shortcode_panel'), 100);
 	}
 
 	/**
@@ -63,15 +63,15 @@ 
 	 *
 	 * @return array Filtered output.
 	 */
-	public function add_calendar_feed_column_headers( $columns ) {
+	public function add_calendar_feed_column_headers($columns) {
 
 		// New columns.
-		$feed_info = array( 'feed' => __( 'Events Source', 'google-calendar-events' ) );
-		$calendar_info = array( 'calendar' => __( 'Calendar Type', 'google-calendar-events' ) );
-		$shortcode = array( 'shortcode' => __( 'Shortcode', 'google-calendar-events' ) );
+		$feed_info = array('feed' => __('Events Source', 'google-calendar-events'));
+		$calendar_info = array('calendar' => __('Calendar Type', 'google-calendar-events'));
+		$shortcode = array('shortcode' => __('Shortcode', 'google-calendar-events'));
 
 		// Merge with existing columns and rearrange.
-		$columns = array_slice( $columns, 0, 2, true ) + $feed_info + $calendar_info + $shortcode + array_slice( $columns, 2, null, true );
+		$columns = array_slice($columns, 0, 2, true) + $feed_info + $calendar_info + $shortcode + array_slice($columns, 2, null, true);
 
 		return $columns;
 	}
@@ -86,32 +86,32 @@ 
 	 *
 	 * @return void
 	 */
-	public function calendar_feed_column_content( $column_name, $post_id ) {
+	public function calendar_feed_column_content($column_name, $post_id) {
 
-		switch ( $column_name ) {
+		switch ($column_name) {
 
 			case 'feed':
 
-				$feed = simcal_get_feed( $post_id );
-				echo isset( $feed->name ) ? $feed->name : '—';
+				$feed = simcal_get_feed($post_id);
+				echo isset($feed->name) ? $feed->name : '—';
 				break;
 
 			case 'calendar':
 
 				$info = '—';
 
-				if ( $terms = wp_get_object_terms( $post_id, 'calendar_type' ) ) {
+				if ($terms = wp_get_object_terms($post_id, 'calendar_type')) {
 
-					$calendar_type  = sanitize_title( current( $terms )->name );
-					$calendar       = simcal_get_calendar( $calendar_type );
+					$calendar_type  = sanitize_title(current($terms)->name);
+					$calendar       = simcal_get_calendar($calendar_type);
 
-					if ( $calendar instanceof Calendar ) {
+					if ($calendar instanceof Calendar) {
 						$info = $calendar->name;
-						$views = get_post_meta( $post_id, '_calendar_view', true );;
-						$view = isset( $views[ $calendar->type ] ) ? $views[ $calendar->type ] : '';
+						$views = get_post_meta($post_id, '_calendar_view', true); ;
+						$view = isset($views[$calendar->type]) ? $views[$calendar->type] : '';
 
-						if ( isset( $calendar->views[ $view ] ) ) {
-							$info .= ' → ' . $calendar->views[ $view ];
+						if (isset($calendar->views[$view])) {
+							$info .= ' → '.$calendar->views[$view];
 						}
 					}
 				}
@@ -121,7 +121,7 @@ 
 
 			case 'shortcode' :
 
-				simcal_print_shortcode_tip( $post_id );
+				simcal_print_shortcode_tip($post_id);
 				break;
 		}
 	}
@@ -136,12 +136,12 @@ 
 	 *
 	 * @return array Filtered output.
 	 */
-	public function row_actions( $actions, $post ) {
+	public function row_actions($actions, $post) {
 
 		// Add a clear feed cache action link.
-		if ( $post->post_type == 'calendar' ) {
-			$actions['duplicate_feed'] = '<a href="' . esc_url( add_query_arg( array( 'duplicate_feed' => $post->ID ) ) ) . '">' . __( 'Clone', 'google-calendar-events' )       . '</a>';
-			$actions['clear_cache']    = '<a href="' . esc_url( add_query_arg( array( 'clear_cache' => $post->ID ) ) ) . '">'    . __( 'Clear Cache', 'google-calendar-events' ) . '</a>';
+		if ($post->post_type == 'calendar') {
+			$actions['duplicate_feed'] = '<a href="'.esc_url(add_query_arg(array('duplicate_feed' => $post->ID))).'">'.__('Clone', 'google-calendar-events').'</a>';
+			$actions['clear_cache']    = '<a href="'.esc_url(add_query_arg(array('clear_cache' => $post->ID))).'">'.__('Clear Cache', 'google-calendar-events').'</a>';
 		}
 
 		return $actions;
@@ -156,38 +156,38 @@ 
 
 		// Clear an individual feed cache.
 		// @todo Convert the clear cache request to ajax.
-		if ( isset( $_REQUEST['clear_cache'] ) ) {
+		if (isset($_REQUEST['clear_cache'])) {
 
-			$id = intval( $_REQUEST['clear_cache'] );
+			$id = intval($_REQUEST['clear_cache']);
 
-			if ( $id > 0 ) {
-				simcal_delete_feed_transients( $id );
+			if ($id > 0) {
+				simcal_delete_feed_transients($id);
 			}
 
-			wp_redirect( remove_query_arg( 'clear_cache' ) );
+			wp_redirect(remove_query_arg('clear_cache'));
 		}
 
 		// Duplicate a feed post type.
-		if ( isset( $_REQUEST['duplicate_feed'] ) ) {
+		if (isset($_REQUEST['duplicate_feed'])) {
 
-			$id = intval( $_REQUEST['duplicate_feed'] );
+			$id = intval($_REQUEST['duplicate_feed']);
 
-			if ( $id > 0 ) {
-				$this->duplicate_feed( $id );
+			if ($id > 0) {
+				$this->duplicate_feed($id);
 			}
 
-			wp_redirect( remove_query_arg( 'duplicate_feed' ) );
+			wp_redirect(remove_query_arg('duplicate_feed'));
 		}
 
-		$bulk_actions = new Bulk_Actions( 'calendar' );
+		$bulk_actions = new Bulk_Actions('calendar');
 
-		$bulk_actions->register_bulk_action( array(
-			'menu_text'     => __( 'Clear cache', 'google-calendar-events' ),
+		$bulk_actions->register_bulk_action(array(
+			'menu_text'     => __('Clear cache', 'google-calendar-events'),
 			'action_name'   => 'clear_calendars_cache',
-			'callback'      => function( $post_ids ) {
-				simcal_delete_feed_transients( $post_ids );
+			'callback'      => function($post_ids) {
+				simcal_delete_feed_transients($post_ids);
 			},
-			'admin_notice'  => __( 'Cache cleared.', 'google-calendar-events' ),
+			'admin_notice'  => __('Cache cleared.', 'google-calendar-events'),
 			)
 		);
 
@@ -204,8 +204,8 @@ 
 
 		$screen = simcal_is_admin_screen();
 
-		if ( 'edit-calendar' == $screen ) {
-			add_action( 'in_admin_footer', function() {
+		if ('edit-calendar' == $screen) {
+			add_action('in_admin_footer', function() {
 
 			} );
 		}
@@ -218,29 +218,29 @@ 
 	 *
 	 * @param int $post_id
 	 */
-	private function duplicate_feed( $post_id ) {
+	private function duplicate_feed($post_id) {
 
-		if ( $duplicate = get_post( intval( $post_id ), 'ARRAY_A' ) ) {
+		if ($duplicate = get_post(intval($post_id), 'ARRAY_A')) {
 
-			if ( 'calendar' == $duplicate['post_type'] ) {
+			if ('calendar' == $duplicate['post_type']) {
 
-				$duplicate['post_title'] = $duplicate['post_title'] . ' (' . __( 'Copy', 'google-calendar-events' ) . ')';
+				$duplicate['post_title'] = $duplicate['post_title'].' ('.__('Copy', 'google-calendar-events').')';
 
-				unset( $duplicate['ID'] );
-				unset( $duplicate['guid'] );
-				unset( $duplicate['comment_count'] );
+				unset($duplicate['ID']);
+				unset($duplicate['guid']);
+				unset($duplicate['comment_count']);
 
-				$duplicate_id = wp_insert_post( $duplicate );
+				$duplicate_id = wp_insert_post($duplicate);
 
-				$taxonomies = get_object_taxonomies( $duplicate['post_type'] );
-				foreach ( $taxonomies as $taxonomy ) {
-					$terms = wp_get_post_terms( $post_id, $taxonomy, array( 'fields' => 'names' ) );
-					wp_set_object_terms( $duplicate_id, $terms, $taxonomy );
+				$taxonomies = get_object_taxonomies($duplicate['post_type']);
+				foreach ($taxonomies as $taxonomy) {
+					$terms = wp_get_post_terms($post_id, $taxonomy, array('fields' => 'names'));
+					wp_set_object_terms($duplicate_id, $terms, $taxonomy);
 				}
 
-				$custom_fields = get_post_custom( $post_id );
-				foreach ( $custom_fields as $key => $value ) {
-					add_post_meta( $duplicate_id, $key, maybe_unserialize( $value[0] ) );
+				$custom_fields = get_post_custom($post_id);
+				foreach ($custom_fields as $key => $value) {
+					add_post_meta($duplicate_id, $key, maybe_unserialize($value[0]));
 				}
 			}
 
@@ -257,7 +257,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function default_event_template( $content, $post ) {
+	public function default_event_template($content, $post) {
 		return 'calendar' == $post->post_type ? simcal_default_event_template() : $content;
 	}
 
@@ -270,10 +270,10 @@ 
 
 		global $post, $post_type;
 
-		if ( $post_type == 'calendar' && isset( $post->ID ) ) {
-			echo '<a id="simcal-clear-cache" class="button" data-id="' . $post->ID . ' ">' .
-			     '<i class="simcal-icon-spinner simcal-icon-spin" style="display: none;"></i> ' .
-			     __( 'Clear cache', 'google-calendar-events' ) .
+		if ($post_type == 'calendar' && isset($post->ID)) {
+			echo '<a id="simcal-clear-cache" class="button" data-id="'.$post->ID.' ">'.
+			     '<i class="simcal-icon-spinner simcal-icon-spin" style="display: none;"></i> '.
+			     __('Clear cache', 'google-calendar-events').
 			     '</a>';
 		}
 	}
@@ -290,20 +290,20 @@ 
 
 		$post_types = array();
 
-		$settings = get_option( 'simple-calendar_settings_calendars' );
-		if ( isset( $settings['general']['attach_calendars_posts'] ) ) {
+		$settings = get_option('simple-calendar_settings_calendars');
+		if (isset($settings['general']['attach_calendars_posts'])) {
 			$post_types = $settings['general']['attach_calendars_posts'];
 		}
 
 		global $post_type;
 
-		if ( in_array( $post_type, $post_types ) ) {
+		if (in_array($post_type, $post_types)) {
 
 			// Thickbox will ignore height and width, will adjust these in js.
 			// @see https://core.trac.wordpress.org/ticket/17249
 			?>
 			<a href="#TB_inline?height=250&width=500&inlineId=simcal-insert-shortcode-panel" id="simcal-insert-shortcode-button" class="thickbox button insert-calendar add_calendar">
-				<span class="wp-media-buttons-icon dashicons-before dashicons-calendar-alt"></span> <?php _e( 'Add Calendar', 'google-calendar-events' ); ?>
+				<span class="wp-media-buttons-icon dashicons-before dashicons-calendar-alt"></span> <?php _e('Add Calendar', 'google-calendar-events'); ?>
 			</a>
 			<?php
 
@@ -325,25 +325,25 @@ 
 		?>
 		<div id="simcal-insert-shortcode-panel" style="display:none;">
 			<div class="simcal-insert-shortcode-panel">
-				<h1><?php _e( 'Add Calendar', 'google-calendar-events' ); ?></h1>
-				<?php _e( 'Add a calendar to your post.', 'google-calendar-events' ); ?>
-				<?php if ( ! empty( $calendars ) && is_array( $calendars ) ) : ?>
+				<h1><?php _e('Add Calendar', 'google-calendar-events'); ?></h1>
+				<?php _e('Add a calendar to your post.', 'google-calendar-events'); ?>
+				<?php if ( ! empty($calendars) && is_array($calendars)) : ?>
 					<p>
 						<label for="simcal-choose-calendar">
-							<?php $multiselect = count( $calendars ) > 15 ? ' simcal-field-select-enhanced' : ''; ?>
+							<?php $multiselect = count($calendars) > 15 ? ' simcal-field-select-enhanced' : ''; ?>
 							<select id="simcal-choose-calendar"
 							        class="simcal-field simcal-field-select<?php echo $multiselect; ?>"
 							        name="">
-								<?php foreach ( $calendars as $id => $title ) : ?>
+								<?php foreach ($calendars as $id => $title) : ?>
 									<option value="<?php echo $id ?>"><?php echo $title ?></option>
 								<?php endforeach; ?>
 							</select>
 						</label>
 					</p>
-					<p><input type="button" value="<?php _e( 'Insert Calendar', 'google-calendar-events' ); ?>" id="simcal-insert-shortcode" class="button button-primary button-large" name="" /></p>
+					<p><input type="button" value="<?php _e('Insert Calendar', 'google-calendar-events'); ?>" id="simcal-insert-shortcode" class="button button-primary button-large" name="" /></p>
 				<?php else : ?>
-					<p><em><?php _e( 'Could not find any calendars to add to this post.', 'google-calendar-events' ); ?></em></p>
-					<strong><a href="post-new.php?post_type=calendar"><?php _e( 'Please add and configure new calendar first.', 'google-calendar-events' ); ?></a></strong>
+					<p><em><?php _e('Could not find any calendars to add to this post.', 'google-calendar-events'); ?></em></p>
+					<strong><a href="post-new.php?post_type=calendar"><?php _e('Please add and configure new calendar first.', 'google-calendar-events'); ?></a></strong>
 				<?php endif; ?>
 			</div>
 		</div>

includes/admin/updater.php

Spacing +78 added lines, -78 removed lines

@@ -62,17 +62,17 @@ 
 	 * @param string $_plugin_file Path to the plugin file.
 	 * @param array  $_api_data    Optional data to send with API calls.
 	 */
-	public function __construct( $_api_url, $_plugin_file, $_api_data = null ) {
+	public function __construct($_api_url, $_plugin_file, $_api_data = null) {
 
-		$this->api_url  = trailingslashit( $_api_url );
+		$this->api_url  = trailingslashit($_api_url);
 		$this->api_data = $_api_data;
-		$this->name     = plugin_basename( $_plugin_file );
-		$this->slug     = basename( $_plugin_file, '.php' );
+		$this->name     = plugin_basename($_plugin_file);
+		$this->slug     = basename($_plugin_file, '.php');
 		$this->version  = $_api_data['version'];
 
 		// Set up hooks.
 		$this->init();
-		add_action( 'admin_init', array( $this, 'show_changelog' ) );
+		add_action('admin_init', array($this, 'show_changelog'));
 	}
 
 	/**
@@ -83,10 +83,10 @@ 
 	 * @return void
 	 */
 	public function init() {
-		add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) );
-		add_filter( 'plugins_api', array( $this, 'plugins_api_filter' ), 10, 3 );
-		remove_action( 'after_plugin_row_' . $this->name, 'wp_plugin_update_row', 10 );
-		add_action( 'after_plugin_row_' . $this->name, array( $this, 'show_update_notification' ), 10, 2 );
+		add_filter('pre_set_site_transient_update_plugins', array($this, 'check_update'));
+		add_filter('plugins_api', array($this, 'plugins_api_filter'), 10, 3);
+		remove_action('after_plugin_row_'.$this->name, 'wp_plugin_update_row', 10);
+		add_action('after_plugin_row_'.$this->name, array($this, 'show_update_notification'), 10, 2);
 	}
 
 	/**
@@ -103,30 +103,30 @@ 
 	 *
 	 * @return array|\stdClass Modified update array with custom plugin data.
 	 */
-	public function check_update( $_transient_data ) {
+	public function check_update($_transient_data) {
 
 		global $pagenow;
 
-		if ( ! is_object( $_transient_data ) ) {
+		if ( ! is_object($_transient_data)) {
 			$_transient_data = new \stdClass();
 		}
 
-		if ( 'plugins.php' == $pagenow && is_multisite() ) {
+		if ('plugins.php' == $pagenow && is_multisite()) {
 			return $_transient_data;
 		}
 
-		if ( empty( $_transient_data->response ) || empty( $_transient_data->response[ $this->name ] ) ) {
+		if (empty($_transient_data->response) || empty($_transient_data->response[$this->name])) {
 
-			$version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) );
+			$version_info = $this->api_request('plugin_latest_version', array('slug' => $this->slug));
 
-			if ( false !== $version_info && is_object( $version_info ) && isset( $version_info->new_version ) ) {
+			if (false !== $version_info && is_object($version_info) && isset($version_info->new_version)) {
 
-				if ( version_compare( $this->version, $version_info->new_version, '<' ) ) {
-					$_transient_data->response[ $this->name ] = $version_info;
+				if (version_compare($this->version, $version_info->new_version, '<')) {
+					$_transient_data->response[$this->name] = $version_info;
 				}
 
 				$_transient_data->last_checked = time();
-				$_transient_data->checked[ $this->name ] = $this->version;
+				$_transient_data->checked[$this->name] = $this->version;
 			}
 
 		}
@@ -144,81 +144,81 @@ 
 	 * @param string $file
 	 * @param array  $plugin
 	 */
-	public function show_update_notification( $file, $plugin ) {
+	public function show_update_notification($file, $plugin) {
 
-		if ( ! current_user_can( 'update_plugins' ) ) {
+		if ( ! current_user_can('update_plugins')) {
 			return;
 		}
 
-		if ( ! is_multisite() ) {
+		if ( ! is_multisite()) {
 			return;
 		}
 
-		if ( $this->name != $file ) {
+		if ($this->name != $file) {
 			return;
 		}
 
 		// Remove our filter on the site transient
-		remove_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ), 10 );
+		remove_filter('pre_set_site_transient_update_plugins', array($this, 'check_update'), 10);
 
-		$update_cache = get_site_transient( 'update_plugins' );
+		$update_cache = get_site_transient('update_plugins');
 
-		if ( ! is_object( $update_cache ) || empty( $update_cache->response ) || empty( $update_cache->response[ $this->name ] ) ) {
+		if ( ! is_object($update_cache) || empty($update_cache->response) || empty($update_cache->response[$this->name])) {
 
-			$cache_key    = md5( 'edd_plugin_' .sanitize_key( $this->name ) . '_version_info' );
-			$version_info = get_transient( $cache_key );
+			$cache_key    = md5('edd_plugin_'.sanitize_key($this->name).'_version_info');
+			$version_info = get_transient($cache_key);
 
-			if ( false === $version_info ) {
+			if (false === $version_info) {
 
-				$version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) );
+				$version_info = $this->api_request('plugin_latest_version', array('slug' => $this->slug));
 
-				set_transient( $cache_key, $version_info, 3600 );
+				set_transient($cache_key, $version_info, 3600);
 			}
 
-			if ( ! is_object( $version_info ) ) {
+			if ( ! is_object($version_info)) {
 				return;
 			}
 
-			if ( version_compare( $this->version, $version_info->new_version, '<' ) ) {
-				$update_cache->response[ $this->name ] = $version_info;
+			if (version_compare($this->version, $version_info->new_version, '<')) {
+				$update_cache->response[$this->name] = $version_info;
 			}
 
 			$update_cache->last_checked = time();
-			$update_cache->checked[ $this->name ] = $this->version;
+			$update_cache->checked[$this->name] = $this->version;
 
-			set_site_transient( 'update_plugins', $update_cache );
+			set_site_transient('update_plugins', $update_cache);
 
 		} else {
 
-			$version_info = $update_cache->response[ $this->name ];
+			$version_info = $update_cache->response[$this->name];
 
 		}
 
 		// Restore our filter
-		add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) );
+		add_filter('pre_set_site_transient_update_plugins', array($this, 'check_update'));
 
-		if ( ! empty( $update_cache->response[ $this->name ] ) && version_compare( $this->version, $version_info->new_version, '<' ) ) {
+		if ( ! empty($update_cache->response[$this->name]) && version_compare($this->version, $version_info->new_version, '<')) {
 
 			// build a plugin list row, with update notification
-			$wp_list_table = _get_list_table( 'WP_Plugins_List_Table' );
-			echo '<tr class="plugin-update-tr"><td colspan="' . $wp_list_table->get_column_count() . '" class="plugin-update colspanchange"><div class="update-message">';
+			$wp_list_table = _get_list_table('WP_Plugins_List_Table');
+			echo '<tr class="plugin-update-tr"><td colspan="'.$wp_list_table->get_column_count().'" class="plugin-update colspanchange"><div class="update-message">';
 
-			$changelog_link = self_admin_url( 'index.php?edd_sl_action=view_plugin_changelog&plugin=' . $this->name . '&slug=' . $this->slug . '&TB_iframe=true&width=772&height=911' );
+			$changelog_link = self_admin_url('index.php?edd_sl_action=view_plugin_changelog&plugin='.$this->name.'&slug='.$this->slug.'&TB_iframe=true&width=772&height=911');
 
-			if ( empty( $version_info->download_link ) ) {
+			if (empty($version_info->download_link)) {
 				printf(
-					__( 'There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a>.', 'google-calendar-events' ),
-					esc_html( $version_info->name ),
-					esc_url( $changelog_link ),
-					esc_html( $version_info->new_version )
+					__('There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a>.', 'google-calendar-events'),
+					esc_html($version_info->name),
+					esc_url($changelog_link),
+					esc_html($version_info->new_version)
 				);
 			} else {
 				printf(
-					__( 'There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a> or <a href="%4$s">update now</a>.', 'google-calendar-events' ),
-					esc_html( $version_info->name ),
-					esc_url( $changelog_link ),
-					esc_html( $version_info->new_version ),
-					esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) )
+					__('There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a> or <a href="%4$s">update now</a>.', 'google-calendar-events'),
+					esc_html($version_info->name),
+					esc_url($changelog_link),
+					esc_html($version_info->new_version),
+					esc_url(wp_nonce_url(self_admin_url('update.php?action=upgrade-plugin&plugin=').$this->name, 'upgrade-plugin_'.$this->name))
 				);
 			}
 
@@ -238,13 +238,13 @@ 
 	 *
 	 * @return object
 	 */
-	public function plugins_api_filter( $_data, $_action = '', $_args = null ) {
+	public function plugins_api_filter($_data, $_action = '', $_args = null) {
 
-		if ( 'plugin_information' != $_action ) {
+		if ('plugin_information' != $_action) {
 			return $_data;
 		}
 
-		if ( ! isset( $_args->slug ) || ( $_args->slug != $this->slug ) ) {
+		if ( ! isset($_args->slug) || ($_args->slug != $this->slug)) {
 			return $_data;
 		}
 
@@ -257,9 +257,9 @@ 
 			),
 		);
 
-		$api_response = $this->api_request( 'plugin_information', $to_send );
+		$api_response = $this->api_request('plugin_information', $to_send);
 
-		if ( false !== $api_response ) {
+		if (false !== $api_response) {
 			$_data = $api_response;
 		}
 
@@ -276,9 +276,9 @@ 
 	 * @param  string $url
 	 * @return object|array $array
 	 */
-	public function http_request_args( $args, $url ) {
+	public function http_request_args($args, $url) {
 		// If it is an https request and we are performing a package download, disable ssl verification
-		if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' ) ) {
+		if (strpos($url, 'https://') !== false && strpos($url, 'edd_action=package_download')) {
 			$args['sslverify'] = false;
 		}
 		return $args;
@@ -293,42 +293,42 @@ 
 	 * @param  array  $_data   Parameters for the API action.
 	 * @return false|object
 	 */
-	private function api_request( $_action, $_data ) {
+	private function api_request($_action, $_data) {
 
 		global $wp_version;
 
-		$data = array_merge( $this->api_data, $_data );
+		$data = array_merge($this->api_data, $_data);
 
-		if ( $data['slug'] != $this->slug ) {
+		if ($data['slug'] != $this->slug) {
 			return;
 		}
 
-		if ( empty( $data['license'] ) ) {
+		if (empty($data['license'])) {
 			return;
 		}
 
-		if ( $this->api_url == home_url() ) {
+		if ($this->api_url == home_url()) {
 			return false; // Don't allow a plugin to ping itself
 		}
 
 		$api_params = array(
 			'edd_action' => 'get_version',
 			'license'    => $data['license'],
-			'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
-			'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
+			'item_name'  => isset($data['item_name']) ? $data['item_name'] : false,
+			'item_id'    => isset($data['item_id']) ? $data['item_id'] : false,
 			'slug'       => $data['slug'],
 			'author'     => $data['author'],
 			'url'        => home_url()
 		);
 
-		$request = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => false, 'body' => $api_params ) );
+		$request = wp_remote_post($this->api_url, array('timeout' => 15, 'sslverify' => false, 'body' => $api_params));
 
-		if ( ! is_wp_error( $request ) ) {
-			$request = json_decode( wp_remote_retrieve_body( $request ) );
+		if ( ! is_wp_error($request)) {
+			$request = json_decode(wp_remote_retrieve_body($request));
 		}
 
-		if ( $request && isset( $request->sections ) ) {
-			$request->sections = maybe_unserialize( $request->sections );
+		if ($request && isset($request->sections)) {
+			$request->sections = maybe_unserialize($request->sections);
 		} else {
 			$request = false;
 		}
@@ -343,26 +343,26 @@ 
 	 */
 	public function show_changelog() {
 
-		if ( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action'] ) {
+		if (empty($_REQUEST['edd_sl_action']) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action']) {
 			return;
 		}
 
-		if ( empty( $_REQUEST['plugin'] ) ) {
+		if (empty($_REQUEST['plugin'])) {
 			return;
 		}
 
-		if ( empty( $_REQUEST['slug'] ) ) {
+		if (empty($_REQUEST['slug'])) {
 			return;
 		}
 
-		if ( ! current_user_can( 'update_plugins' ) ) {
-			wp_die( __( 'You do not have permission to install plugin updates', 'google-calendar-events' ), __( 'Error', 'google-calendar-events' ), array( 'response' => 403 ) );
+		if ( ! current_user_can('update_plugins')) {
+			wp_die(__('You do not have permission to install plugin updates', 'google-calendar-events'), __('Error', 'google-calendar-events'), array('response' => 403));
 		}
 
-		$response = $this->api_request( 'plugin_latest_version', array( 'slug' => $_REQUEST['slug'] ) );
+		$response = $this->api_request('plugin_latest_version', array('slug' => $_REQUEST['slug']));
 
-		if ( $response && isset( $response->sections['changelog'] ) ) {
-			echo '<div style="background:#fff;padding:10px;">' . $response->sections['changelog'] . '</div>';
+		if ($response && isset($response->sections['changelog'])) {
+			echo '<div style="background:#fff;padding:10px;">'.$response->sections['changelog'].'</div>';
 		}
 
 		exit;