moonstonemedia / Simple-Calendar

includes/admin/pages/licenses.php

Indentation +2 added lines, -2 removed lines

@@ -75,8 +75,8 @@
 			'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>',
+								 '<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 );

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

Indentation +3 added lines, -3 removed lines

@@ -272,9 +272,9 @@
 
 		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>';
+				 '<i class="simcal-icon-spinner simcal-icon-spin" style="display: none;"></i> ' .
+				 __( 'Clear cache', 'google-calendar-events' ) .
+				 '</a>';
 		}
 	}
 

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>

Braces +5 added lines, -2 removed lines

@@ -341,8 +341,11 @@
 						</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>
-				<?php else : ?>
-					<p><em><?php _e( 'Could not find any calendars to add to this post.', 'google-calendar-events' ); ?></em></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>
 				<?php endif; ?>
 			</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;

includes/ajax.php

Spacing +7 added lines, -7 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Abstracts\Calendar_View;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,7 +25,7 @@ 
 	 * @since 3.0.0
 	 */
 	public function __construct() {
-		add_action( 'init', array( $this, 'add_callbacks' ), 100 );
+		add_action('init', array($this, 'add_callbacks'), 100);
 	}
 
 	/**
@@ -37,19 +37,19 @@ 
 
 		$calendars = simcal_get_calendar_types();
 
-		foreach ( $calendars as $calendar => $views ) {
+		foreach ($calendars as $calendar => $views) {
 
-			foreach ( $views as $view ) {
+			foreach ($views as $view) {
 
-				$the_view = simcal_get_calendar_view( 0, $calendar . '-' . $view );
+				$the_view = simcal_get_calendar_view(0, $calendar.'-'.$view);
 
-				if ( $the_view instanceof Calendar_View ) {
+				if ($the_view instanceof Calendar_View) {
 					$the_view->add_ajax_actions();
 				}
 			}
 		}
 
-		do_action( 'simcal_add_ajax_callbacks' );
+		do_action('simcal_add_ajax_callbacks');
 	}
 
 }

includes/autoload.php

Spacing +10 added lines, -10 removed lines

@@ -5,11 +5,11 @@ 
  * @package SimpleCalendar
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
-if ( ! function_exists( 'SimpleCalendar_Autoload' ) ) {
+if ( ! function_exists('SimpleCalendar_Autoload')) {
 
 	/**
 	 * Plugin autoloader.
@@ -22,31 +22,31 @@ 
 	 *
 	 * @param $class
 	 */
-	function SimpleCalendar_Autoload( $class ) {
+	function SimpleCalendar_Autoload($class) {
 
 		// Do not load unless in plugin domain.
 		$namespace = 'SimpleCalendar';
-		if ( strpos( $class, $namespace ) !== 0 ) {
+		if (strpos($class, $namespace) !== 0) {
 			return;
 		}
 
 		// Converts Class_Name (class convention) to class-name (file convention).
-		$class_name = implode( '-', array_map( 'lcfirst', explode( '_', strtolower( $class ) ) ) );
+		$class_name = implode('-', array_map('lcfirst', explode('_', strtolower($class))));
 
 		// Remove the root namespace.
-		$unprefixed = substr( $class_name, strlen( $namespace ) );
+		$unprefixed = substr($class_name, strlen($namespace));
 
 		// Build the file path.
-		$file_path = str_replace( '\\', DIRECTORY_SEPARATOR, $unprefixed );
-		$file      = dirname( __FILE__ ) . '/' . $file_path . '.php';
+		$file_path = str_replace('\\', DIRECTORY_SEPARATOR, $unprefixed);
+		$file      = dirname(__FILE__).'/'.$file_path.'.php';
 
-		if ( file_exists( $file ) ) {
+		if (file_exists($file)) {
 			require $file;
 		}
 
 	}
 
 	// Register the autoloader.
-	spl_autoload_register( 'SimpleCalendar_Autoload' );
+	spl_autoload_register('SimpleCalendar_Autoload');
 
 }

includes/calendars/views/default-calendar-grid.php

Braces +3 added lines, -1 removed lines

@@ -453,10 +453,12 @@
 					$list_events .= '<button class="simcal-events-toggle"><i class="simcal-icon-down simcal-icon-animate"></i></button>';
 				endif;
 
-			else :
+			else {
+				:
 
 				// Empty cell for day with no events.
 				$list_events = '<span class="simcal-no-events"></span>';
+			}
 
 			endif;
 

Spacing +147 added lines, -147 removed lines

@@ -13,7 +13,7 @@ 
 use SimpleCalendar\Events\Event;
 use SimpleCalendar\Calendars\Default_Calendar;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -55,7 +55,7 @@ 
 	 *
 	 * @param string|Calendar $calendar
 	 */
-	public function __construct( $calendar = '' ) {
+	public function __construct($calendar = '') {
 		$this->calendar = $calendar;
 	}
 
@@ -89,7 +89,7 @@ 
 	 * @return string
 	 */
 	public function get_name() {
-		return __( 'Grid', 'google-calendar-events' );
+		return __('Grid', 'google-calendar-events');
 	}
 
 	/**
@@ -98,8 +98,8 @@ 
 	 * @since 3.0.0
 	 */
 	public function add_ajax_actions() {
-		add_action( 'wp_ajax_simcal_default_calendar_draw_grid', array( $this, 'draw_grid_ajax' ) );
-		add_action( 'wp_ajax_nopriv_simcal_default_calendar_draw_grid', array( $this, 'draw_grid_ajax' ) );
+		add_action('wp_ajax_simcal_default_calendar_draw_grid', array($this, 'draw_grid_ajax'));
+		add_action('wp_ajax_nopriv_simcal_default_calendar_draw_grid', array($this, 'draw_grid_ajax'));
 	}
 
 	/**
@@ -113,28 +113,28 @@ 
 	 *
 	 * @return array
 	 */
-	public function scripts( $min = '' ) {
+	public function scripts($min = '') {
 		return array(
 			'simcal-qtip' => array(
-				'src'       => SIMPLE_CALENDAR_ASSETS . 'js/vendor/jquery.qtip' . $min . '.js',
-				'deps'      => array( 'jquery' ),
+				'src'       => SIMPLE_CALENDAR_ASSETS.'js/vendor/jquery.qtip'.$min.'.js',
+				'deps'      => array('jquery'),
 				'ver'       => '2.2.1',
 				'in_footer' => true,
 			),
 			'simcal-fullcal-moment' => array(
-				'src'       => SIMPLE_CALENDAR_ASSETS . 'js/vendor/moment' . $min . '.js',
-				'deps'      => array( 'jquery' ),
+				'src'       => SIMPLE_CALENDAR_ASSETS.'js/vendor/moment'.$min.'.js',
+				'deps'      => array('jquery'),
 				'ver'       => '',
 				'in_footer' => true,
 			),
 			'simcal-moment-timezone' => array(
-				'src'       => SIMPLE_CALENDAR_ASSETS . 'js/vendor/moment-timezone-with-data' . $min . '.js',
-				'deps'      => array( 'jquery' ),
+				'src'       => SIMPLE_CALENDAR_ASSETS.'js/vendor/moment-timezone-with-data'.$min.'.js',
+				'deps'      => array('jquery'),
 				'ver'       => '',
 				'in_footer' => true,
 			),
 			'simcal-default-calendar' => array(
-				'src'       => SIMPLE_CALENDAR_ASSETS . 'js/default-calendar' . $min . '.js',
+				'src'       => SIMPLE_CALENDAR_ASSETS.'js/default-calendar'.$min.'.js',
 				'deps'      => array(
 					'jquery',
 					'simcal-qtip',
@@ -161,15 +161,15 @@ 
 	 *
 	 * @return array
 	 */
-	public function styles( $min = '' ) {
+	public function styles($min = '') {
 		return array(
 			'simcal-qtip' => array(
-				'src'   => SIMPLE_CALENDAR_ASSETS . 'css/vendor/jquery.qtip' . $min . '.css',
+				'src'   => SIMPLE_CALENDAR_ASSETS.'css/vendor/jquery.qtip'.$min.'.css',
 				'ver'   => '2.2.1',
 				'media' => 'all',
 			),
 			'simcal-default-calendar-grid' => array(
-				'src'   => SIMPLE_CALENDAR_ASSETS . 'css/default-calendar-grid' . $min . '.css',
+				'src'   => SIMPLE_CALENDAR_ASSETS.'css/default-calendar-grid'.$min.'.css',
 				'deps'  => array(
 					'simcal-qtip',
 				),
@@ -177,7 +177,7 @@ 
 				'media' => 'all',
 			),
 			'simcal-default-calendar-list' => array(
-				'src'   => SIMPLE_CALENDAR_ASSETS . 'css/default-calendar-list' . $min . '.css',
+				'src'   => SIMPLE_CALENDAR_ASSETS.'css/default-calendar-list'.$min.'.css',
 				'deps'  => array(
 					'simcal-qtip',
 				),
@@ -196,22 +196,22 @@ 
 
 		$calendar = $this->calendar;
 
-		if ( $calendar instanceof Default_Calendar ) {
+		if ($calendar instanceof Default_Calendar) {
 
 			?>
 
-			<?php edit_post_link( __( 'Edit Calendar', 'google-calendar-events' ), '<p class="simcal-align-right"><small>', '</small></p>', $calendar->id ); ?>
+			<?php edit_post_link(__('Edit Calendar', 'google-calendar-events'), '<p class="simcal-align-right"><small>', '</small></p>', $calendar->id); ?>
 
 			<table class="simcal-calendar-grid"
 			       data-event-bubble-trigger="<?php echo $calendar->event_bubble_trigger; ?>">
 				<thead class="simcal-calendar-head">
 					<tr>
-						<?php if ( ! $calendar->static ) { ?>
-							<th class="simcal-nav simcal-prev-wrapper" colspan="<?php echo apply_filters( 'simcal_prev_cols', '1' ); ?>">
-								<button class="simcal-nav-button simcal-month-nav simcal-prev" title="<?php _e( 'Previous Month', 'google-calendar-events' ); ?>"><i class="simcal-icon-left"></i></button>
+						<?php if ( ! $calendar->static) { ?>
+							<th class="simcal-nav simcal-prev-wrapper" colspan="<?php echo apply_filters('simcal_prev_cols', '1'); ?>">
+								<button class="simcal-nav-button simcal-month-nav simcal-prev" title="<?php _e('Previous Month', 'google-calendar-events'); ?>"><i class="simcal-icon-left"></i></button>
 							</th>
 						<?php } ?>
-						<th colspan="<?php echo apply_filters( 'simcal_current_cols', $calendar->static ? '7' : '5' ); ?>"
+						<th colspan="<?php echo apply_filters('simcal_current_cols', $calendar->static ? '7' : '5'); ?>"
 						    class="simcal-nav simcal-current"
 						    data-calendar-current="<?php echo $calendar->start; ?>">
 							<?php
@@ -220,26 +220,26 @@ 
 
 							// Display month and year according to user date format preference.
 
-							$year_pos  = strcspn( $calendar->date_format, 'Y y' );
-							$month_pos = strcspn( $calendar->date_format, 'F M m n' );
+							$year_pos  = strcspn($calendar->date_format, 'Y y');
+							$month_pos = strcspn($calendar->date_format, 'F M m n');
 
-							$current = array( 'month' => 'F', 'year' => 'Y' );
+							$current = array('month' => 'F', 'year' => 'Y');
 
-							if ( $year_pos < $month_pos ) {
-								$current = array_reverse( $current );
+							if ($year_pos < $month_pos) {
+								$current = array_reverse($current);
 							}
 
-							foreach ( $current as $k => $v ) {
-								echo ' <span class="simcal-current-' . $k , '">' . date_i18n( $v, $calendar->start ) . '</span> ';
+							foreach ($current as $k => $v) {
+								echo ' <span class="simcal-current-'.$k, '">'.date_i18n($v, $calendar->start).'</span> ';
 							}
 
 							echo '</h3>';
 
 							?>
 						</th>
-						<?php if ( ! $calendar->static ) { ?>
-							<th class="simcal-nav simcal-next-wrapper" colspan="<?php echo apply_filters( 'simcal_next_cols', '1' ); ?>">
-								<button class="simcal-nav-button simcal-month-nav simcal-next" title="<?php _e( 'Next Month', 'google-calendar-events' ); ?>"><i class="simcal-icon-right"></i></button>
+						<?php if ( ! $calendar->static) { ?>
+							<th class="simcal-nav simcal-next-wrapper" colspan="<?php echo apply_filters('simcal_next_cols', '1'); ?>">
+								<button class="simcal-nav-button simcal-month-nav simcal-next" title="<?php _e('Next Month', 'google-calendar-events'); ?>"><i class="simcal-icon-right"></i></button>
 							</th>
 						<?php } ?>
 					</tr>
@@ -249,28 +249,28 @@ 
 						// Print day names in short or long form for different viewport sizes.
 
 						$week_starts     = $calendar->week_starts;
-						$week_days_short = simcal_get_calendar_names_i18n( 'day', 'short' );
-						$week_days_full  = simcal_get_calendar_names_i18n( 'day', 'full' );
+						$week_days_short = simcal_get_calendar_names_i18n('day', 'short');
+						$week_days_full  = simcal_get_calendar_names_i18n('day', 'full');
 
-						for ( $i = $week_starts; $i <= 6; $i ++ ) :
+						for ($i = $week_starts; $i <= 6; $i++) :
 
 							?>
 							<th class="simcal-week-day simcal-week-day-<?php echo $i ?>"
-								data-screen-small="<?php echo mb_substr( $week_days_short[ $i ], 0, 1, 'UTF-8' ); ?>"
-							    data-screen-medium="<?php echo $week_days_short[ $i ]; ?>"
-							    data-screen-large="<?php echo $week_days_full[ $i ]; ?>"><?php echo $week_days_short[ $i ]; ?></th>
+								data-screen-small="<?php echo mb_substr($week_days_short[$i], 0, 1, 'UTF-8'); ?>"
+							    data-screen-medium="<?php echo $week_days_short[$i]; ?>"
+							    data-screen-large="<?php echo $week_days_full[$i]; ?>"><?php echo $week_days_short[$i]; ?></th>
 							<?php
 
 						endfor;
 
-						if ( $week_starts !== 0 ) :
-							for ( $i = 0; $i < $week_starts; $i ++ ) :
+						if ($week_starts !== 0) :
+							for ($i = 0; $i < $week_starts; $i++) :
 
 								?>
 								<th class="simcal-week-day simcal-week-day-<?php echo $i ?>"
-								    data-screen-small="<?php echo mb_substr( $week_days_short[ $i ], 0, 1, 'UTF-8' ); ?>"
-								    data-screen-medium="<?php echo $week_days_short[ $i ]; ?>"
-								    data-screen-large="<?php echo $week_days_full[ $i ]; ?>"><?php echo $week_days_short[ $i ]; ?></th>
+								    data-screen-small="<?php echo mb_substr($week_days_short[$i], 0, 1, 'UTF-8'); ?>"
+								    data-screen-medium="<?php echo $week_days_short[$i]; ?>"
+								    data-screen-large="<?php echo $week_days_full[$i]; ?>"><?php echo $week_days_short[$i]; ?></th>
 								<?php
 
 							endfor;
@@ -280,7 +280,7 @@ 
 					</tr>
 				</thead>
 
-				<?php echo $this->draw_month( date( 'n', $calendar->start ), date( 'Y', $calendar->start ) ); ?>
+				<?php echo $this->draw_month(date('n', $calendar->start), date('Y', $calendar->start)); ?>
 
 			</table>
 
@@ -306,85 +306,85 @@ 
 	 *
 	 * @return string
 	 */
-	private function draw_month( $month, $year, $id = 0 ) {
+	private function draw_month($month, $year, $id = 0) {
 
 		$calendar = $this->calendar;
-		if ( empty( $calendar ) ) {
-			$calendar = simcal_get_calendar( intval( $id ) );
-			if ( ! $calendar ) {
+		if (empty($calendar)) {
+			$calendar = simcal_get_calendar(intval($id));
+			if ( ! $calendar) {
 				return '';
 			}
 		}
 
 		$events = $calendar->events;
 
-		$feed          = simcal_get_feed( $calendar );
-		$feed_timezone = get_post_meta( $feed->post_id, '_feed_timezone', true );
+		$feed          = simcal_get_feed($calendar);
+		$feed_timezone = get_post_meta($feed->post_id, '_feed_timezone', true);
 
 		// Variables to cycle days in current month and find today in calendar.
 		$now         = $calendar->now;
-		$current     = Carbon::create( $year, $month, 1, 0, 0, 0, $calendar->timezone );
+		$current     = Carbon::create($year, $month, 1, 0, 0, 0, $calendar->timezone);
 		$current_min = $current->getTimestamp();
 		$current_max = $current->endOfDay()->getTimestamp();
 
 		// Calendar grid variables.
 		$week_starts   = $calendar->week_starts;
-		$week_of_year  = $current->weekOfYear;   // Relative count of the week number of the year.
-		$month_starts  = $current->dayOfWeek;    // Day upon which the month starts.
-		$days_in_month = $current->daysInMonth;  // Number of days in the given month.
+		$week_of_year  = $current->weekOfYear; // Relative count of the week number of the year.
+		$month_starts  = $current->dayOfWeek; // Day upon which the month starts.
+		$days_in_month = $current->daysInMonth; // Number of days in the given month.
 
 		// Set current month events timestamp boundaries.
 		$this->start = $current_min;
 		$this->end   = $current->endOfMonth()->timestamp;
 
 		// Get daily events for this month.
-		if ( $events && is_array( $events ) ) {
+		if ($events && is_array($events)) {
 
 			// Filter events within the boundaries previously set above.
-			$timestamps   = array_keys( $events );
-			$lower_bound  = array_filter( $timestamps, array( $this, 'filter_events_before' ) );
-			$higher_bound = array_filter( $lower_bound, array( $this, 'filter_events_after' ) );
-			$filtered     = ( is_array( $events ) && is_array( $higher_bound) ) && ! empty( $events ) && ! empty( $higher_bound ) ? array_intersect_key( $events, array_combine( $higher_bound, $higher_bound ) ) : array();
+			$timestamps   = array_keys($events);
+			$lower_bound  = array_filter($timestamps, array($this, 'filter_events_before'));
+			$higher_bound = array_filter($lower_bound, array($this, 'filter_events_after'));
+			$filtered     = (is_array($events) && is_array($higher_bound)) && ! empty($events) && ! empty($higher_bound) ? array_intersect_key($events, array_combine($higher_bound, $higher_bound)) : array();
 
 			// Put resulting events in an associative array, with day of the month as key for easy retrieval in calendar days loop.
 			$day_events = array();
-			foreach ( $filtered as $timestamp => $events_in_day ) {
-				foreach ( $events_in_day as $event ) {
-					if ( $event instanceof Event ){
-						$day = intval( Carbon::createFromTimestamp( $timestamp, $event->timezone )->endOfDay()->day );
-						$day_events[ $day ][] = $event;
+			foreach ($filtered as $timestamp => $events_in_day) {
+				foreach ($events_in_day as $event) {
+					if ($event instanceof Event) {
+						$day = intval(Carbon::createFromTimestamp($timestamp, $event->timezone)->endOfDay()->day);
+						$day_events[$day][] = $event;
 					}
 				}
 			}
 
-			ksort( $day_events, SORT_NUMERIC );
+			ksort($day_events, SORT_NUMERIC);
 		}
 
 		ob_start();
 
-		echo '<tbody class="simcal-month simcal-month-' . $month . '">' . "\n";
-		echo "\t" . '<tr class="simcal-week simcal-week-' . $week_of_year . '">';
+		echo '<tbody class="simcal-month simcal-month-'.$month.'">'."\n";
+		echo "\t".'<tr class="simcal-week simcal-week-'.$week_of_year.'">';
 
 		$days_in_row = 0;
 		// Week may start on an arbitrary day (sun, 0 - sat, 6).
 		$week_day = $week_starts;
 
 		// This fixes a possible bug when a month starts by Sunday (0).
-		if ( 0 !== $week_starts ) {
+		if (0 !== $week_starts) {
 			$b = $month_starts === 0 ? 7 : $month_starts;
 		} else {
 			$b = $month_starts;
 		}
 
 		// Void days in first week.
-		for ( $a = $week_starts; $a < $b; $a++ ) :
+		for ($a = $week_starts; $a < $b; $a++) :
 
-			$last_void_day_class = ( $a === ( $b - 1 ) ) ? 'simcal-day-void-last' : '';
+			$last_void_day_class = ($a === ($b - 1)) ? 'simcal-day-void-last' : '';
 
-			echo '<td class="simcal-day simcal-day-void ' . $last_void_day_class . '"></td>' . "\n";
+			echo '<td class="simcal-day simcal-day-void '.$last_void_day_class.'"></td>'."\n";
 
 			// Reset day of the week count (sun, 0 - sat, 6).
-			if ( $week_day === 6 ) {
+			if ($week_day === 6) {
 				$week_day = -1;
 			}
 			$week_day++;
@@ -394,103 +394,103 @@ 
 		endfor;
 
 		// Actual days of the month.
-		for ( $day = 1; $day <= $days_in_month; $day++ ) :
+		for ($day = 1; $day <= $days_in_month; $day++) :
 
 			$count = 0;
 			$calendar_classes = array();
-			$day_classes = 'simcal-day-' . $day . ' simcal-weekday-' . $week_day;
+			$day_classes = 'simcal-day-'.$day.' simcal-weekday-'.$week_day;
 
 			$border_style = $bg_color = $color = '';
 
 			// Is this the present, the past or the future, Doc?
-			if ( $current_min <= $now && $current_max >= $now ) {
+			if ($current_min <= $now && $current_max >= $now) {
 				$day_classes .= ' simcal-today simcal-present simcal-day';
-				$the_color = new Color( $calendar->today_color );
-				$bg_color = '#' . $the_color->getHex();
+				$the_color = new Color($calendar->today_color);
+				$bg_color = '#'.$the_color->getHex();
 				$color = $the_color->isDark() ? '#ffffff' : '#000000';
-				$border_style = ' style="border: 1px solid ' . $bg_color . ';"';
-			} elseif ( $current_max < $now ) {
+				$border_style = ' style="border: 1px solid '.$bg_color.';"';
+			} elseif ($current_max < $now) {
 				$day_classes .= ' simcal-past simcal-day';
-			} elseif ( $current_min > $now ) {
+			} elseif ($current_min > $now) {
 				$day_classes .= ' simcal-future simcal-day';
 			}
 
 			// Print events for the current day in loop, if found any.
-			if ( isset( $day_events[ $day ] ) ) :
+			if (isset($day_events[$day])) :
 
 				$bullet_colors = array();
 
 				$list_events = '<ul class="simcal-events">';
 
-				foreach ( $day_events[ $day ] as $event ) :
+				foreach ($day_events[$day] as $event) :
 
 					$event_classes = $event_visibility = '';
 
-					if ( $event instanceof Event ) :
+					if ($event instanceof Event) :
 
-						if ( $feed->type == 'grouped-calendars' ) {
-							date_default_timezone_set( $feed_timezone );
+						if ($feed->type == 'grouped-calendars') {
+							date_default_timezone_set($feed_timezone);
 						} else {
-							date_default_timezone_set( $event->timezone );
+							date_default_timezone_set($event->timezone);
 						}
 
 						// Store the calendar id where the event belongs (useful in grouped calendar feeds)
-						$calendar_class  = 'simcal-events-calendar-' . strval( $event->calendar );
-						$calendar_classes[] = $calendar_class ;
+						$calendar_class = 'simcal-events-calendar-'.strval($event->calendar);
+						$calendar_classes[] = $calendar_class;
 
 						$recurring     = $event->recurrence ? 'simcal-event-recurring ' : '';
 						$has_location  = $event->venue ? 'simcal-event-has-location ' : '';
 
-						$event_classes  .= 'simcal-event ' . $recurring . $has_location . $calendar_class . ' simcal-tooltip';
+						$event_classes .= 'simcal-event '.$recurring.$has_location.$calendar_class.' simcal-tooltip';
 
 						// Toggle some events visibility if more than optional limit.
-						if ( ( $calendar->events_limit > -1 )  && ( $count >= $calendar->events_limit ) ) :
+						if (($calendar->events_limit > -1) && ($count >= $calendar->events_limit)) :
 							$event_classes    .= ' simcal-event-toggled';
 							$event_visibility  = ' style="display: none"';
 						endif;
 
 						// Event title in list.
-						$title = ! empty( $event->title ) ? trim( $event->title ) : __( 'Event', 'google-calendar-events' );
-						if ( $calendar->trim_titles >= 1 ) {
-							$title = strlen( $title ) > $calendar->trim_titles ? mb_substr( $title, 0, $calendar->trim_titles ) . '&hellip;' : $title;
+						$title = ! empty($event->title) ? trim($event->title) : __('Event', 'google-calendar-events');
+						if ($calendar->trim_titles >= 1) {
+							$title = strlen($title) > $calendar->trim_titles ? mb_substr($title, 0, $calendar->trim_titles).'&hellip;' : $title;
 						}
 
 						// Event color.
 						$bullet = '';
 						//$bullet_color = '#000';
 						$event_color = $event->get_color();
-						if ( ! empty( $event_color ) ) {
-							$bullet = '<span style="color: ' . $event_color . ';">&#9632;</span> ';
+						if ( ! empty($event_color)) {
+							$bullet = '<span style="color: '.$event_color.';">&#9632;</span> ';
 							$bullet_colors[] = $event_color;
 						} else {
 							$bullet_colors[] = '#000';
 						}
 
 						// Event contents.
-						$list_events .= "\t" . '<li class="' . $event_classes . '"' . $event_visibility . ' itemscope itemtype="http://schema.org/Event">' . "\n";
-						$list_events .= "\t\t" . '<span class="simcal-event-title">' . $bullet . $title . '</span>' . "\n";
-						$list_events .= "\t\t" . '<div class="simcal-event-details simcal-tooltip-content" style="display: none;">' . $calendar->get_event_html( $event ) . '</div>' . "\n";
-						$list_events .= "\t" . '</li>' . "\n";
+						$list_events .= "\t".'<li class="'.$event_classes.'"'.$event_visibility.' itemscope itemtype="http://schema.org/Event">'."\n";
+						$list_events .= "\t\t".'<span class="simcal-event-title">'.$bullet.$title.'</span>'."\n";
+						$list_events .= "\t\t".'<div class="simcal-event-details simcal-tooltip-content" style="display: none;">'.$calendar->get_event_html($event).'</div>'."\n";
+						$list_events .= "\t".'</li>'."\n";
 
-						$count ++;
+						$count++;
 
 					endif;
 
 				endforeach;
 
-				if ( ( $current_min <= $now ) && ( $current_max >= $now ) ) {
+				if (($current_min <= $now) && ($current_max >= $now)) {
 					$day_classes .= ' simcal-today-has-events';
 				}
-				$day_classes .= ' simcal-day-has-events simcal-day-has-' . strval( $count ) . '-events';
+				$day_classes .= ' simcal-day-has-events simcal-day-has-'.strval($count).'-events';
 
-				if ( $calendar_classes ) {
-					$day_classes .= ' ' . trim( implode( ' ', array_unique( $calendar_classes ) ) );
+				if ($calendar_classes) {
+					$day_classes .= ' '.trim(implode(' ', array_unique($calendar_classes)));
 				}
 
-				$list_events .= '</ul>' . "\n";
+				$list_events .= '</ul>'."\n";
 
 				// Optional button to toggle hidden events in list.
-				if ( ( $calendar->events_limit > -1 ) && ( $count > $calendar->events_limit ) ) :
+				if (($calendar->events_limit > -1) && ($count > $calendar->events_limit)) :
 					$list_events .= '<button class="simcal-events-toggle"><i class="simcal-icon-down simcal-icon-animate"></i></button>';
 				endif;
 
@@ -502,49 +502,49 @@ 
 			endif;
 
 			// The actual days with numbers and events in each row cell.
-			echo '<td class="' . $day_classes . '" data-events-count="' . strval( $count ) . '">' . "\n";
-
-			if ( $color ) {
-				$day_style = ' style="background-color: ' . $bg_color . '; color: ' . $color .'"';
-			} elseif ( $count > 0 ) {
-				$the_color = new Color( $calendar->days_events_color );
-				$color = ! $color ? ( $the_color->isDark() ? '#ffffff' : '#000000' ) : $color;
-				$bg_color = ! $bg_color ? '#' . $the_color->getHex() : $bg_color;
-				$day_style = ' style="background-color: ' . $bg_color . '; color: ' . $color .'"';
+			echo '<td class="'.$day_classes.'" data-events-count="'.strval($count).'">'."\n";
+
+			if ($color) {
+				$day_style = ' style="background-color: '.$bg_color.'; color: '.$color.'"';
+			} elseif ($count > 0) {
+				$the_color = new Color($calendar->days_events_color);
+				$color = ! $color ? ($the_color->isDark() ? '#ffffff' : '#000000') : $color;
+				$bg_color = ! $bg_color ? '#'.$the_color->getHex() : $bg_color;
+				$day_style = ' style="background-color: '.$bg_color.'; color: '.$color.'"';
 			} else {
 				$day_style = '';
 			}
 
-			echo "\t" . '<div' . $border_style . '>' . "\n";
-			echo "\t\t" . '<span class="simcal-day-label simcal-day-number"' . $day_style . '>' . $day . '</span>' . "\n";
-			echo "\t\t" . $list_events . "\n";
+			echo "\t".'<div'.$border_style.'>'."\n";
+			echo "\t\t".'<span class="simcal-day-label simcal-day-number"'.$day_style.'>'.$day.'</span>'."\n";
+			echo "\t\t".$list_events."\n";
 			echo "\t\t";
 			echo '<span class="simcal-events-dots" style="display: none;">';
 
 			// Event bullets for calendar mobile mode.
-			for( $i = 0; $i < $count; $i++ ) {
-				echo '<b style="color: ' . $bullet_colors[ $i ] . ';"> &bull; </b>';
+			for ($i = 0; $i < $count; $i++) {
+				echo '<b style="color: '.$bullet_colors[$i].';"> &bull; </b>';
 			}
 
-			echo '</span>' . "\n";
-			echo "\t" . '</div>' . "\n";
-			echo '</td>' . "\n";
+			echo '</span>'."\n";
+			echo "\t".'</div>'."\n";
+			echo '</td>'."\n";
 
 			// Reset day of the week count (sun, 0 - sat, 6).
-			if ( $week_day === 6 ) {
+			if ($week_day === 6) {
 				$week_day = - 1;
 			}
 			$week_day++;
 
 			// Reset count of days for this row (0-6).
-			if ( $days_in_row === 6 ) :
+			if ($days_in_row === 6) :
 
 				// Close the week row.
 				echo '</tr>';
 
 				// Open a new week row.
-				if ( $day < $days_in_month ) {
-					echo '<tr class="simcal-week simcal-week-' . $week_of_year++ . '">' . "\n";
+				if ($day < $days_in_month) {
+					echo '<tr class="simcal-week simcal-week-'.$week_of_year++.'">'."\n";
 				}
 
 				$days_in_row = -1;
@@ -553,27 +553,27 @@ 
 
 			$days_in_row++;
 
-			$current_min = Carbon::createFromTimestamp( $current_min, $calendar->timezone )->addDay()->getTimestamp();
-			$current_max = Carbon::createFromTimestamp( $current_max, $calendar->timezone )->addDay()->getTimestamp();
+			$current_min = Carbon::createFromTimestamp($current_min, $calendar->timezone)->addDay()->getTimestamp();
+			$current_max = Carbon::createFromTimestamp($current_max, $calendar->timezone)->addDay()->getTimestamp();
 
 		endfor;
 
 		// Void days at the end of the month.
-		$remainder_days = ( 6 - $days_in_row );
+		$remainder_days = (6 - $days_in_row);
 
-		for ( $i = 0; $i <= $remainder_days; $i ++ ) {
+		for ($i = 0; $i <= $remainder_days; $i++) {
 
-			$last_void_day_class = ( $i == $remainder_days ) ? 'simcal-day-void-last' : '';
+			$last_void_day_class = ($i == $remainder_days) ? 'simcal-day-void-last' : '';
 
-			echo '<td class="simcal-day simcal-day-void ' . $last_void_day_class . '"></td>' . "\n";
+			echo '<td class="simcal-day simcal-day-void '.$last_void_day_class.'"></td>'."\n";
 
 			$week_day++;
 		}
 
-		echo "\t" . '</tr>' . "\n";
-		echo '</tbody>' . "\n";
+		echo "\t".'</tr>'."\n";
+		echo '</tbody>'."\n";
 
-		date_default_timezone_set( $calendar->site_timezone );
+		date_default_timezone_set($calendar->site_timezone);
 
 		return ob_get_clean();
 	}
@@ -585,17 +585,17 @@ 
 	 */
 	public function draw_grid_ajax() {
 
-		if ( isset( $_POST['month'] ) && isset( $_POST['year'] ) && isset( $_POST['id'] ) ) {
+		if (isset($_POST['month']) && isset($_POST['year']) && isset($_POST['id'])) {
 
-			$month = absint( $_POST['month'] );
-			$year  = absint( $_POST['year'] );
-			$id    = absint( $_POST['id'] );
+			$month = absint($_POST['month']);
+			$year  = absint($_POST['year']);
+			$id    = absint($_POST['id']);
 
-			wp_send_json_success( $this->draw_month( $month, $year, $id ) );
+			wp_send_json_success($this->draw_month($month, $year, $id));
 
 		} else {
 
-			wp_send_json_error( 'Missing arguments in default calendar grid ajax request.' );
+			wp_send_json_error('Missing arguments in default calendar grid ajax request.');
 
 		}
 
@@ -611,8 +611,8 @@ 
 	 *
 	 * @return bool
 	 */
-	private function filter_events_before( $event ) {
-		return intval( $event ) >= intval( $this->start );
+	private function filter_events_before($event) {
+		return intval($event) >= intval($this->start);
 	}
 
 	/**
@@ -625,8 +625,8 @@ 
 	 *
 	 * @return bool
 	 */
-	private function filter_events_after( $event ) {
-		return intval( $event ) < intval( $this->end );
+	private function filter_events_after($event) {
+		return intval($event) < intval($this->end);
 	}
 
 }

includes/calendars/views/default-calendar-list.php

Braces +3 added lines, -1 removed lines

@@ -576,9 +576,11 @@
 
 			endforeach;
 
-		else :
+		else {
+			:
 
 			echo "\t" . '<p>';
+		}
 
 			$message = get_post_meta( $calendar->id, '_no_events_message', true );
 

Spacing +209 added lines, -209 removed lines

@@ -13,7 +13,7 @@ 
 use SimpleCalendar\Calendars\Default_Calendar;
 use SimpleCalendar\Events\Event;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -75,7 +75,7 @@ 
 	 *
 	 * @param string|Calendar $calendar
 	 */
-	public function __construct( $calendar = '' ) {
+	public function __construct($calendar = '') {
 		$this->calendar = $calendar;
 	}
 
@@ -109,7 +109,7 @@ 
 	 * @return string
 	 */
 	public function get_name() {
-		return __( 'List', 'google-calendar-events' );
+		return __('List', 'google-calendar-events');
 	}
 
 	/**
@@ -118,8 +118,8 @@ 
 	 * @since 3.0.0
 	 */
 	public function add_ajax_actions() {
-		add_action( 'wp_ajax_simcal_default_calendar_draw_list', array( $this, 'draw_list_ajax' ) );
-		add_action( 'wp_ajax_nopriv_simcal_default_calendar_draw_list', array( $this, 'draw_list_ajax' ) );
+		add_action('wp_ajax_simcal_default_calendar_draw_list', array($this, 'draw_list_ajax'));
+		add_action('wp_ajax_nopriv_simcal_default_calendar_draw_list', array($this, 'draw_list_ajax'));
 	}
 
 	/**
@@ -133,16 +133,16 @@ 
 	 *
 	 * @return array
 	 */
-	public function scripts( $min = '' ) {
+	public function scripts($min = '') {
 		return array(
 			'simcal-qtip' => array(
-				'src'       => SIMPLE_CALENDAR_ASSETS . 'js/vendor/qtip' . $min . '.js',
-				'deps'      => array( 'jquery' ),
+				'src'       => SIMPLE_CALENDAR_ASSETS.'js/vendor/qtip'.$min.'.js',
+				'deps'      => array('jquery'),
 				'ver'       => '2.2.1',
 				'in_footer' => true,
 			),
 			'simcal-default-calendar' => array(
-				'src'       => SIMPLE_CALENDAR_ASSETS . 'js/default-calendar' . $min . '.js',
+				'src'       => SIMPLE_CALENDAR_ASSETS.'js/default-calendar'.$min.'.js',
 				'deps'      => array(
 					'jquery',
 					'simcal-qtip',
@@ -167,10 +167,10 @@ 
 	 *
 	 * @return array
 	 */
-	public function styles( $min = '' ) {
+	public function styles($min = '') {
 		return array(
 			'simcal-default-calendar-list' => array(
-				'src'   => SIMPLE_CALENDAR_ASSETS . 'css/default-calendar-list' . $min . '.css',
+				'src'   => SIMPLE_CALENDAR_ASSETS.'css/default-calendar-list'.$min.'.css',
 				'ver'   => SIMPLE_CALENDAR_VERSION,
 				'media' => 'all',
 			),
@@ -186,49 +186,49 @@ 
 
 		$calendar = $this->calendar;
 
-		if ( $calendar instanceof Default_Calendar ) {
+		if ($calendar instanceof Default_Calendar) {
 
 			$disabled = $calendar->static === true ? ' disabled="disabled"' : '';
 
 
-			$hide_header = get_post_meta( $this->calendar->id, '_default_calendar_list_header', true ) == 'yes' ? true : false;
-			$static_calendar = get_post_meta( $this->calendar->id, '_calendar_is_static', true ) == 'yes' ? true : false;
+			$hide_header = get_post_meta($this->calendar->id, '_default_calendar_list_header', true) == 'yes' ? true : false;
+			$static_calendar = get_post_meta($this->calendar->id, '_calendar_is_static', true) == 'yes' ? true : false;
 
 			$header_class = '';
 			$compact_list_class = $calendar->compact_list ? 'simcal-calendar-list-compact' : '';
 
-			edit_post_link( __( 'Edit Calendar', 'google-calendar-events' ), '<p class="simcal-align-right"><small>', '</small></p>', $calendar->id );
+			edit_post_link(__('Edit Calendar', 'google-calendar-events'), '<p class="simcal-align-right"><small>', '</small></p>', $calendar->id);
 
-			echo '<div class="simcal-calendar-list ' . $compact_list_class . '">';
+			echo '<div class="simcal-calendar-list '.$compact_list_class.'">';
 
-			if ( ! $hide_header && ! $static_calendar ) {
-				echo '<nav class="simcal-calendar-head">' . "\n";
+			if ( ! $hide_header && ! $static_calendar) {
+				echo '<nav class="simcal-calendar-head">'."\n";
 
-				echo "\t" . '<div class="simcal-nav">' . "\n";
-				echo "\t\t" . '<button class="simcal-nav-button simcal-prev" title="' . __('Previous', 'google-calendar-events') . '"' . $disabled . '>' . "\n";
-				echo "\t\t\t" . '<i class="simcal-icon-left"></i>' . "\n";
-				echo "\t\t" . '</button>' . "\n";
-				echo "\t" . '</div>' . "\n";
+				echo "\t".'<div class="simcal-nav">'."\n";
+				echo "\t\t".'<button class="simcal-nav-button simcal-prev" title="'.__('Previous', 'google-calendar-events').'"'.$disabled.'>'."\n";
+				echo "\t\t\t".'<i class="simcal-icon-left"></i>'."\n";
+				echo "\t\t".'</button>'."\n";
+				echo "\t".'</div>'."\n";
 
-				if ( $hide_header ) {
+				if ($hide_header) {
 					$header_class = 'simcal-hide-header';
 				}
 
 
-				echo "\t" . '<div class="simcal-nav simcal-current ' . $header_class . '" data-calendar-current="' . $calendar->start . '">' . "\n";
-				echo "\t\t" . '<h3 class="simcal-current-label"> </h3>' . "\n";
-				echo "\t" . '</div>' . "\n";
+				echo "\t".'<div class="simcal-nav simcal-current '.$header_class.'" data-calendar-current="'.$calendar->start.'">'."\n";
+				echo "\t\t".'<h3 class="simcal-current-label"> </h3>'."\n";
+				echo "\t".'</div>'."\n";
 
-				echo "\t" . '<div class="simcal-nav">';
-				echo "\t\t" . '<button class="simcal-nav-button simcal-next" title="' . __('Next', 'google-calendar-events') . '"' . $disabled . '>';
-				echo "\t\t\t" . '<i class="simcal-icon-right"></i>' . "\n";
-				echo "\t\t" . '</button>' . "\n";
-				echo "\t" . '</div>' . "\n";
+				echo "\t".'<div class="simcal-nav">';
+				echo "\t\t".'<button class="simcal-nav-button simcal-next" title="'.__('Next', 'google-calendar-events').'"'.$disabled.'>';
+				echo "\t\t\t".'<i class="simcal-icon-right"></i>'."\n";
+				echo "\t\t".'</button>'."\n";
+				echo "\t".'</div>'."\n";
 
-				echo '</nav>' . "\n";
+				echo '</nav>'."\n";
 			}
 
-			echo $this->draw_list( $calendar->start );
+			echo $this->draw_list($calendar->start);
 
 			echo '<div class="simcal-ajax-loader simcal-spinner-top" style="display: none;"><i class="simcal-icon-spinner simcal-icon-spin"></i></div>';
 
@@ -248,98 +248,98 @@ 
 	 *
 	 * @return array
 	 */
-	private function get_events( $timestamp ) {
+	private function get_events($timestamp) {
 
 		$calendar = $this->calendar;
 		$timezone = $calendar->timezone;
 
-		if ( ! $calendar->group_type || ! $calendar->group_span ) {
+		if ( ! $calendar->group_type || ! $calendar->group_span) {
 			return array();
 		}
 
-		$current = Carbon::createFromTimestamp( $timestamp, $timezone );
+		$current = Carbon::createFromTimestamp($timestamp, $timezone);
 		$prev = clone $current;
 		$next = clone $current;
 
 		$this->start = $current->getTimestamp();
 
-		$interval = $span = max( absint( $calendar->group_span ), 1 );
-
-		if ( 'monthly' == $calendar->group_type ) {
-			$this->prev = $prev->subMonths( $span )->getTimestamp();
-			$this->next = $next->addMonths( $span )->getTimestamp();
-		} elseif ( 'weekly' == $calendar->group_type ) {
-			$week = new Carbon( $calendar->timezone );
-			$week->setTimestamp( $timestamp );
-			$week->setWeekStartsAt( $calendar->week_starts );
-			$this->prev = $prev->subWeeks( $span )->getTimestamp();
-			$this->next = $next->addWeeks( $span )->getTimestamp();
-		} elseif ( 'daily' == $calendar->group_type ) {
-			$this->prev = $prev->subDays( $span )->getTimestamp();
-			$this->next = $next->addDays( $span )->getTimestamp();
+		$interval = $span = max(absint($calendar->group_span), 1);
+
+		if ('monthly' == $calendar->group_type) {
+			$this->prev = $prev->subMonths($span)->getTimestamp();
+			$this->next = $next->addMonths($span)->getTimestamp();
+		} elseif ('weekly' == $calendar->group_type) {
+			$week = new Carbon($calendar->timezone);
+			$week->setTimestamp($timestamp);
+			$week->setWeekStartsAt($calendar->week_starts);
+			$this->prev = $prev->subWeeks($span)->getTimestamp();
+			$this->next = $next->addWeeks($span)->getTimestamp();
+		} elseif ('daily' == $calendar->group_type) {
+			$this->prev = $prev->subDays($span)->getTimestamp();
+			$this->next = $next->addDays($span)->getTimestamp();
 		}
 
 		$events = $calendar->events;
 		$daily_events = $paged_events = $flattened_events = array();
 
-		if ( 'events' != $calendar->group_type ) {
+		if ('events' != $calendar->group_type) {
 
-			$this->end   = $this->next - 1;
+			$this->end = $this->next - 1;
 
-			$timestamps   = array_keys( $events );
-			$lower_bound  = array_filter( $timestamps,  array( $this, 'filter_events_before' ) );
-			$higher_bound = array_filter( $lower_bound, array( $this, 'filter_events_after'  ) );
+			$timestamps   = array_keys($events);
+			$lower_bound  = array_filter($timestamps, array($this, 'filter_events_before'));
+			$higher_bound = array_filter($lower_bound, array($this, 'filter_events_after'));
 
-			if ( is_array( $higher_bound ) && !empty( $higher_bound ) ) {
-				$filtered = array_intersect_key( $events, array_combine( $higher_bound, $higher_bound ) );
-				foreach ( $filtered as $timestamp => $events ) {
-					$paged_events[ intval( $timestamp ) ] = $events;
+			if (is_array($higher_bound) && ! empty($higher_bound)) {
+				$filtered = array_intersect_key($events, array_combine($higher_bound, $higher_bound));
+				foreach ($filtered as $timestamp => $events) {
+					$paged_events[intval($timestamp)] = $events;
 				}
 			}
 
 		} else {
 
-			foreach ( $events as $timestamp => $e ) {
+			foreach ($events as $timestamp => $e) {
 				$second = 0;
-				foreach ( $e as $event ) {
-					$flattened_events[ intval( $timestamp + $second ) ][] = $event;
+				foreach ($e as $event) {
+					$flattened_events[intval($timestamp + $second)][] = $event;
 					$second++;
 				}
 			}
-			ksort( $flattened_events, SORT_NUMERIC );
+			ksort($flattened_events, SORT_NUMERIC);
 
-			$keys  = array_keys( $flattened_events );
+			$keys = array_keys($flattened_events);
 			$current = 0;
-			foreach ( $keys as $timestamp ) {
-				if ( $timestamp < $this->start ) {
+			foreach ($keys as $timestamp) {
+				if ($timestamp < $this->start) {
 					$current++;
 				}
 			}
 
-			$paged_events = array_slice( $flattened_events, $current, $interval, true );
+			$paged_events = array_slice($flattened_events, $current, $interval, true);
 
-			$events_end = isset( $keys[ $current + $interval ] ) ? $keys[ $current + $interval ] : $calendar->end;
+			$events_end = isset($keys[$current + $interval]) ? $keys[$current + $interval] : $calendar->end;
 			$this->end  = $events_end > $calendar->end ? $calendar->end : $events_end;
 
-			$this->prev = isset( $keys[ $current - $interval ] ) ? $keys[ $current - $interval ] : $calendar->earliest_event;
-			$this->next = isset( $keys[ $current + $interval ] ) ? $keys[ $current + $interval ] : $this->end;
+			$this->prev = isset($keys[$current - $interval]) ? $keys[$current - $interval] : $calendar->earliest_event;
+			$this->next = isset($keys[$current + $interval]) ? $keys[$current + $interval] : $this->end;
 
 		}
 
 		// Put resulting events in an associative array, with Ymd date as key for easy retrieval in calendar days loop.
-		foreach ( $paged_events as $timestamp => $events ) {
-			if ( $timestamp <= $this->end ) {
-				$date = Carbon::createFromTimestamp( $timestamp, $calendar->timezone )->endOfDay()->format( 'Ymd' );
-				$daily_events[ intval( $date ) ][] = $events;
+		foreach ($paged_events as $timestamp => $events) {
+			if ($timestamp <= $this->end) {
+				$date = Carbon::createFromTimestamp($timestamp, $calendar->timezone)->endOfDay()->format('Ymd');
+				$daily_events[intval($date)][] = $events;
 			}
 		}
-		ksort( $daily_events, SORT_NUMERIC );
+		ksort($daily_events, SORT_NUMERIC);
 
-		$first_event = array_slice( $paged_events, 0, 1, true );
-		$first_event = array_pop( $first_event );
+		$first_event = array_slice($paged_events, 0, 1, true);
+		$first_event = array_pop($first_event);
 		$this->first_event = $first_event[0]->start;
 
-		$last_event = array_pop( $paged_events );
+		$last_event = array_pop($paged_events);
 		$this->last_event = $last_event[0]->start;
 
 		return $daily_events;
@@ -358,84 +358,84 @@ 
 	private function get_heading() {
 
 		$calendar = $this->calendar;
-		$start = Carbon::createFromTimestamp( $calendar->start, $calendar->timezone );
-		$end = Carbon::createFromTimestamp( $this->end, $calendar->timezone );
+		$start = Carbon::createFromTimestamp($calendar->start, $calendar->timezone);
+		$end = Carbon::createFromTimestamp($this->end, $calendar->timezone);
 		$date_format = $this->calendar->date_format;
-		$date_order  = simcal_get_date_format_order( $date_format );
+		$date_order  = simcal_get_date_format_order($date_format);
 
 		$st = $this->start;
 		$et = $this->end;
 
-		if ( $this->first_event !== 0 ) {
-			$start = Carbon::createFromTimestamp( $this->first_event, $calendar->timezone );
+		if ($this->first_event !== 0) {
+			$start = Carbon::createFromTimestamp($this->first_event, $calendar->timezone);
 			$st = $this->first_event;
 		}
 
-		if ( $this->last_event !== 0 ) {
-			$end = Carbon::createFromTimestamp( $this->last_event, $calendar->timezone );
+		if ($this->last_event !== 0) {
+			$end = Carbon::createFromTimestamp($this->last_event, $calendar->timezone);
 			$et = $this->last_event;
 		}
 
-		if ( ( $start->day == $end->day ) && ( $start->month == $end->month ) && ( $start->year == $end->year ) ) {
+		if (($start->day == $end->day) && ($start->month == $end->month) && ($start->year == $end->year)) {
 			// Start and end on the same day.
 			// e.g. 1 February 2020
-			$large = $small = date_i18n( $calendar->date_format , $st );
-			if ( ( $date_order['d'] !== false ) && ( $date_order['m'] !== false ) ) {
-				if ( $date_order['m'] > $date_order['d'] ) {
-					if ( $date_order['y'] !== false && $date_order['y'] > $date_order['m'] ) {
-						$small = date_i18n( 'Y, d M', $st );
+			$large = $small = date_i18n($calendar->date_format, $st);
+			if (($date_order['d'] !== false) && ($date_order['m'] !== false)) {
+				if ($date_order['m'] > $date_order['d']) {
+					if ($date_order['y'] !== false && $date_order['y'] > $date_order['m']) {
+						$small = date_i18n('Y, d M', $st);
 					} else {
-						$small = date_i18n( 'd M Y', $st );
+						$small = date_i18n('d M Y', $st);
 					}
 				} else {
-					if ( $date_order['y'] !== false && $date_order['y'] > $date_order['m'] ) {
-						$small = date_i18n( 'Y, M d', $st );
+					if ($date_order['y'] !== false && $date_order['y'] > $date_order['m']) {
+						$small = date_i18n('Y, M d', $st);
 					} else {
-						$small = date_i18n( 'M d Y', $st );
+						$small = date_i18n('M d Y', $st);
 					}
 				}
 			}
-		} elseif ( ( $start->month == $end->month ) && ( $start->year == $end->year ) ) {
+		} elseif (($start->month == $end->month) && ($start->year == $end->year)) {
 			// Start and end days on the same month.
 			// e.g. August 2020
-			if ( $date_order['y'] === false ) {
+			if ($date_order['y'] === false) {
 				// August.
-				$large = $small = date_i18n( 'F', $st );
+				$large = $small = date_i18n('F', $st);
 			} else {
-				if ( $date_order['y'] < $date_order['m'] ) {
+				if ($date_order['y'] < $date_order['m']) {
 					// 2020 August.
-					$large = date_i18n( 'Y F', $st );
-					$small = date_i18n( 'Y M', $st );
+					$large = date_i18n('Y F', $st);
+					$small = date_i18n('Y M', $st);
 				} else {
 					// August 2020.
-					$large = date_i18n( 'F Y', $st );
-					$small = date_i18n( 'M Y', $st );
+					$large = date_i18n('F Y', $st);
+					$small = date_i18n('M Y', $st);
 				}
 			}
-		} elseif ( $start->year == $end->year ) {
+		} elseif ($start->year == $end->year) {
 			// Start and end days on months of the same year.
 			// e.g. August - September 2020
-			if ( $date_order['y'] === false ) {
+			if ($date_order['y'] === false) {
 				// August - September.
-				$large = date_i18n( 'F', $st ) . ' - ' . date_i18n( 'F', $et );
-				$small = date_i18n( 'M', $st ) . ' - ' . date_i18n( 'M', $et );
+				$large = date_i18n('F', $st).' - '.date_i18n('F', $et);
+				$small = date_i18n('M', $st).' - '.date_i18n('M', $et);
 			} else {
-				if ( $date_order['y'] < $date_order['m'] ) {
+				if ($date_order['y'] < $date_order['m']) {
 					// 2020, August - September.
-					$large  = $small = date( 'Y', $st ) . ', ';
-					$large .= date_i18n( 'F', $st ) . ' - ' . date_i18n( 'F', $et );
-					$small .= date_i18n( 'M', $st ) . ' - ' . date_i18n( 'M', $et );
+					$large  = $small = date('Y', $st).', ';
+					$large .= date_i18n('F', $st).' - '.date_i18n('F', $et);
+					$small .= date_i18n('M', $st).' - '.date_i18n('M', $et);
 				} else {
 					// August - September, 2020.
-					$large  = date_i18n( 'F', $st ) . ' - ' . date_i18n( 'F', $et ) . ', ';
-					$small  = date_i18n( 'M', $st ) . ' - ' . date_i18n( 'M', $et ) . ' ';
-					$year   = date( 'Y', $st );
+					$large  = date_i18n('F', $st).' - '.date_i18n('F', $et).', ';
+					$small  = date_i18n('M', $st).' - '.date_i18n('M', $et).' ';
+					$year   = date('Y', $st);
 					$large .= $year;
 					$small .= $year;
 				}
 			}
 		} else {
-			$large = $small = date( 'Y', $st ) . ' - ' . date( 'Y', $et );
+			$large = $small = date('Y', $st).' - '.date('Y', $et);
 		}
 
 		return array(
@@ -457,133 +457,133 @@ 
 	 *
 	 * @return string
 	 */
-	private function draw_list( $timestamp, $id = 0 ) {
+	private function draw_list($timestamp, $id = 0) {
 
 		$calendar = $this->calendar;
 
-		if ( empty( $calendar ) ) {
-			$calendar = $this->calendar = simcal_get_calendar( intval( $id ) );
-			if ( ! $calendar instanceof Default_Calendar ) {
+		if (empty($calendar)) {
+			$calendar = $this->calendar = simcal_get_calendar(intval($id));
+			if ( ! $calendar instanceof Default_Calendar) {
 				return '';
 			}
 		}
 
-		$feed          = simcal_get_feed( $calendar );
-		$feed_timezone = get_post_meta( $feed->post_id, '_feed_timezone', true );
+		$feed          = simcal_get_feed($calendar);
+		$feed_timezone = get_post_meta($feed->post_id, '_feed_timezone', true);
 
 		$now = $calendar->now;
-		$current_events = $this->get_events( $timestamp );
-		$day_format = explode( ' ', $calendar->date_format );
+		$current_events = $this->get_events($timestamp);
+		$day_format = explode(' ', $calendar->date_format);
 
 		ob_start();
 
 		// Draw the events.
 
-		$block_tag = $calendar->compact_list && ! empty( $current_events ) ? 'div' : 'dl';
+		$block_tag = $calendar->compact_list && ! empty($current_events) ? 'div' : 'dl';
 
 		$data_heading = '';
 		$heading = $this->get_heading();
-		foreach ( $heading as $k => $v ) {
-			$data_heading .= ' data-heading-' . $k . '="' . $v . '"';
+		foreach ($heading as $k => $v) {
+			$data_heading .= ' data-heading-'.$k.'="'.$v.'"';
 		}
 
-		echo '<' . $block_tag . ' class="simcal-events-list-container"' .
-			' data-prev="' . $this->prev . '"' .
-			' data-next="' . $this->next . '"' .
-			$data_heading . '>';
+		echo '<'.$block_tag.' class="simcal-events-list-container"'.
+			' data-prev="'.$this->prev.'"'.
+			' data-next="'.$this->next.'"'.
+			$data_heading.'>';
 
-		if ( ! empty( $current_events ) && is_array( $current_events ) ) :
+		if ( ! empty($current_events) && is_array($current_events)) :
 
-			foreach ( $current_events as $ymd => $events ) :
+			foreach ($current_events as $ymd => $events) :
 
 
 
 				// This is where we can find out if an event is a multi-day event and if it needs to be shown.
 				// Since this is for list view we are showing the event on the day viewed if it is part of that day even when
 				// expand multi-day events are turned off.
-				if ( isset( $events[0][0]->multiple_days ) && $events[0][0]->multiple_days > 0 ) {
-					if ( 'current_day_only' == get_post_meta($calendar->id, '_default_calendar_expand_multi_day_events', true ) ) {
+				if (isset($events[0][0]->multiple_days) && $events[0][0]->multiple_days > 0) {
+					if ('current_day_only' == get_post_meta($calendar->id, '_default_calendar_expand_multi_day_events', true)) {
 
-						$year  = substr( $ymd, 0, 4 );
-						$month = substr( $ymd, 4, 2 );
-						$day   = substr( $ymd, 6, 2 );
+						$year  = substr($ymd, 0, 4);
+						$month = substr($ymd, 4, 2);
+						$day   = substr($ymd, 6, 2);
 
-						$temp_date = Carbon::createFromDate( $year, $month, $day );
+						$temp_date = Carbon::createFromDate($year, $month, $day);
 
-						if( ! ( $temp_date < Carbon::now()->endOfDay() ) ) {
+						if ( ! ($temp_date < Carbon::now()->endOfDay())) {
 							continue;
 						}
 					}
 				}
 
-				$day_ts = Carbon::createFromFormat( 'Ymd', $ymd, $calendar->timezone )->startOfDay()->getTimestamp();
+				$day_ts = Carbon::createFromFormat('Ymd', $ymd, $calendar->timezone)->startOfDay()->getTimestamp();
 
-				if ( ! $calendar->compact_list ) :
+				if ( ! $calendar->compact_list) :
 
-					$date = new Carbon( 'now', $calendar->timezone );
-					$date->setLocale( substr( get_locale(), 0, 2 ) );
-					$date->setTimestamp( $day_ts );
+					$date = new Carbon('now', $calendar->timezone);
+					$date->setLocale(substr(get_locale(), 0, 2));
+					$date->setTimestamp($day_ts);
 
-					if ( $date->isToday() ) {
-						$the_color = new Color( $calendar->today_color );
+					if ($date->isToday()) {
+						$the_color = new Color($calendar->today_color);
 					} else {
-						$the_color = new Color( $calendar->days_events_color );
+						$the_color = new Color($calendar->days_events_color);
 					}
 
-					$bg_color = '#' . $the_color->getHex();
+					$bg_color = '#'.$the_color->getHex();
 					$color = $the_color->isDark() ? '#ffffff' : '#000000';
-					$border_style = ' style="border-bottom: 1px solid ' . $bg_color . ';" ';
-					$bg_style = ' style="background-color: ' . $bg_color . '; color: ' . $color . ';"';
+					$border_style = ' style="border-bottom: 1px solid '.$bg_color.';" ';
+					$bg_style = ' style="background-color: '.$bg_color.'; color: '.$color.';"';
 
-					echo "\t" . '<dt class="simcal-day-label"' . $border_style . '>';
-					echo '<span' . $bg_style .'>';
-					foreach ( $day_format as $format ) {
-						echo $format ? '<span class="simcal-date-format" data-date-format="' . $format . '">' . date_i18n( $format, $day_ts ) . '</span> ' : ' ';
+					echo "\t".'<dt class="simcal-day-label"'.$border_style.'>';
+					echo '<span'.$bg_style.'>';
+					foreach ($day_format as $format) {
+						echo $format ? '<span class="simcal-date-format" data-date-format="'.$format.'">'.date_i18n($format, $day_ts).'</span> ' : ' ';
 					}
 					echo '</span>';
-					echo '</dt>' . "\n";
+					echo '</dt>'."\n";
 
 				endif;
 
-				$list_events = '<ul class="simcal-events">' . "\n";
+				$list_events = '<ul class="simcal-events">'."\n";
 
 				$calendar_classes = array();
-				$day_classes = 'simcal-weekday-' . date( 'w', $day_ts );
+				$day_classes = 'simcal-weekday-'.date('w', $day_ts);
 
 				// Is this the present, the past or the future, Doc?
-				if ( $timestamp <= $now && $timestamp >= $now ) {
+				if ($timestamp <= $now && $timestamp >= $now) {
 					$day_classes .= ' simcal-today simcal-present simcal-day';
-				} elseif ( $timestamp < $now ) {
+				} elseif ($timestamp < $now) {
 					$day_classes .= ' simcal-past simcal-day';
-				} elseif ( $this->end > $now ) {
+				} elseif ($this->end > $now) {
 					$day_classes .= ' simcal-future simcal-day';
 				}
 
 				$count = 0;
 
-				foreach ( $events as $day_events ) :
-					foreach ( $day_events as $event ) :
+				foreach ($events as $day_events) :
+					foreach ($day_events as $event) :
 
-						if ( $event instanceof Event ) :
+						if ($event instanceof Event) :
 
-							if ( $feed->type == 'grouped-calendars' ) {
-								date_default_timezone_set( $feed_timezone );
+							if ($feed->type == 'grouped-calendars') {
+								date_default_timezone_set($feed_timezone);
 							} else {
-								date_default_timezone_set( $event->timezone );
+								date_default_timezone_set($event->timezone);
 							}
 
 							$event_classes = $event_visibility = '';
 
-							$calendar_class     = 'simcal-events-calendar-' . strval( $event->calendar );
+							$calendar_class     = 'simcal-events-calendar-'.strval($event->calendar);
 							$calendar_classes[] = $calendar_class;
 
 							$recurring     = $event->recurrence ? 'simcal-event-recurring ' : '';
 							$has_location  = $event->venue ? 'simcal-event-has-location ' : '';
 
-							$event_classes .= 'simcal-event ' . $recurring . $has_location . $calendar_class;
+							$event_classes .= 'simcal-event '.$recurring.$has_location.$calendar_class;
 
 							// Toggle some events visibility if more than optional limit.
-							if ( ( $calendar->events_limit > - 1 ) && ( $count >= $calendar->events_limit ) ) :
+							if (($calendar->events_limit > - 1) && ($count >= $calendar->events_limit)) :
 								$event_classes .= ' simcal-event-toggled';
 								$event_visibility = ' style="display: none"';
 							endif;
@@ -591,75 +591,75 @@ 
 							$event_color = '';
 							$bullet = '';
 							$event_color = $event->get_color();
-							if ( ! empty( $event_color ) ) {
+							if ( ! empty($event_color)) {
 								$side = is_rtl() ? 'right' : 'left';
-								$event_color = ' style="border-' . $side . ': 4px solid ' . $event_color . '; padding-' . $side . ': 8px;"';
+								$event_color = ' style="border-'.$side.': 4px solid '.$event_color.'; padding-'.$side.': 8px;"';
 							}
 
-							$list_events .= "\t" . '<li class="' . $event_classes . '"' . $event_visibility . $event_color . ' itemscope itemtype="http://schema.org/Event" data-start="' . esc_attr( $event->start ) . '">' . "\n";
-							$list_events .= "\t\t" . '<div class="simcal-event-details">' . $calendar->get_event_html( $event ) . '</div>' . "\n";
-							$list_events .= "\t" . '</li>' . "\n";
+							$list_events .= "\t".'<li class="'.$event_classes.'"'.$event_visibility.$event_color.' itemscope itemtype="http://schema.org/Event" data-start="'.esc_attr($event->start).'">'."\n";
+							$list_events .= "\t\t".'<div class="simcal-event-details">'.$calendar->get_event_html($event).'</div>'."\n";
+							$list_events .= "\t".'</li>'."\n";
 
-							$count ++;
+							$count++;
 
 							// Event falls within today.
-							if ( ( $this->end <= $now ) && ( $this->start >= $now ) ) :
+							if (($this->end <= $now) && ($this->start >= $now)) :
 								$day_classes .= ' simcal-today-has-events';
 							endif;
-							$day_classes .= ' simcal-day-has-events simcal-day-has-' . strval( $count ) . '-events';
+							$day_classes .= ' simcal-day-has-events simcal-day-has-'.strval($count).'-events';
 
-							if ( $calendar_classes ) :
-								$day_classes .= ' ' . trim( implode( ' ', array_unique( $calendar_classes ) ) );
+							if ($calendar_classes) :
+								$day_classes .= ' '.trim(implode(' ', array_unique($calendar_classes)));
 							endif;
 
 						endif;
 					endforeach;
 				endforeach;
 
-				$list_events .= '</ul>' . "\n";
+				$list_events .= '</ul>'."\n";
 
 				// If events visibility is limited, print the button toggle.
-				if ( ( $calendar->events_limit > -1 ) && ( $count > $calendar->events_limit ) ) :
+				if (($calendar->events_limit > -1) && ($count > $calendar->events_limit)) :
 					$list_events .= '<button class="simcal-events-toggle"><i class="simcal-icon-down simcal-icon-animate"></i></button>';
 				endif;
 
 				// Print final list of events for the current day.
 				$tag = $calendar->compact_list ? 'div' : 'dd';
-				echo '<'  . $tag . ' class="' . $day_classes . '" data-events-count="' . strval( $count ) . '">' . "\n";
-				echo "\t" . $list_events . "\n";
-				echo '</' . $tag . '>' . "\n";
+				echo '<'.$tag.' class="'.$day_classes.'" data-events-count="'.strval($count).'">'."\n";
+				echo "\t".$list_events."\n";
+				echo '</'.$tag.'>'."\n";
 
 			endforeach;
 
 		else :
 
-			echo "\t" . '<p>';
+			echo "\t".'<p>';
 
-			$message = get_post_meta( $calendar->id, '_no_events_message', true );
+			$message = get_post_meta($calendar->id, '_no_events_message', true);
 
-			if ( 'events' == $calendar->group_type ) {
-				echo ! empty( $message ) ? $message : __( 'Nothing to show.', 'google-calendar-events' );
+			if ('events' == $calendar->group_type) {
+				echo ! empty($message) ? $message : __('Nothing to show.', 'google-calendar-events');
 			} else {
-				if ( ! empty( $message ) ) {
+				if ( ! empty($message)) {
 					echo $message;
 				} else {
-					$from = Carbon::createFromTimestamp( $this->start, $calendar->timezone )->getTimestamp();
-					$to = Carbon::createFromTimestamp( $this->end, $calendar->timezone )->getTimestamp();
-					echo apply_filters( 'simcal_no_events_message', sprintf(
-						__( 'Nothing from %1$s to %2$s.', 'google-calendar-events' ),
-						date_i18n( $calendar->date_format, $from ),
-						date_i18n( $calendar->date_format, $to )
-					), $calendar->id, $from, $to );
+					$from = Carbon::createFromTimestamp($this->start, $calendar->timezone)->getTimestamp();
+					$to = Carbon::createFromTimestamp($this->end, $calendar->timezone)->getTimestamp();
+					echo apply_filters('simcal_no_events_message', sprintf(
+						__('Nothing from %1$s to %2$s.', 'google-calendar-events'),
+						date_i18n($calendar->date_format, $from),
+						date_i18n($calendar->date_format, $to)
+					), $calendar->id, $from, $to);
 				}
 			}
 
-			echo "\t" . '</p>' . "\n";
+			echo "\t".'</p>'."\n";
 
 		endif;
 
-		echo '</' . $block_tag . '>';
+		echo '</'.$block_tag.'>';
 
-		date_default_timezone_set( $calendar->site_timezone );
+		date_default_timezone_set($calendar->site_timezone);
 
 		return ob_get_clean();
 	}
@@ -671,16 +671,16 @@ 
 	 */
 	public function draw_list_ajax() {
 
-		if ( isset( $_POST['ts'] ) && isset( $_POST['id'] ) ) {
+		if (isset($_POST['ts']) && isset($_POST['id'])) {
 
-			$ts = absint( $_POST['ts'] );
-			$id = absint( $_POST['id'] );
+			$ts = absint($_POST['ts']);
+			$id = absint($_POST['id']);
 
-			wp_send_json_success( $this->draw_list( $ts, $id ) );
+			wp_send_json_success($this->draw_list($ts, $id));
 
 		} else {
 
-			wp_send_json_error( 'Missing arguments in default calendar list ajax request.' );
+			wp_send_json_error('Missing arguments in default calendar list ajax request.');
 
 		}
 	}
@@ -695,8 +695,8 @@ 
 	 *
 	 * @return bool
 	 */
-	private function filter_events_before( $event ) {
-		return intval( $event ) >= intval( $this->start );
+	private function filter_events_before($event) {
+		return intval($event) >= intval($this->start);
 	}
 
 	/**
@@ -709,8 +709,8 @@ 
 	 *
 	 * @return bool
 	 */
-	private function filter_events_after( $event ) {
-		return intval( $event ) < intval( $this->end );
+	private function filter_events_after($event) {
+		return intval($event) < intval($this->end);
 	}
 
 }

includes/events/events.php

Spacing +123 added lines, -123 removed lines

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