noplanman / wp-to-diaspora

lib/class-api.php

Spacing +13 added lines, -13 removed lines

@@ -102,14 +102,14 @@ 
 	 *
 	 * @var array
 	 */
-	private $_aspects = [];
+	private $_aspects = [ ];
 
 	/**
 	 * The list of user's connected services, which get set after ever http request.
 	 *
 	 * @var array
 	 */
-	private $_services = [];
+	private $_services = [ ];
 
 	/**
 	 * List of regex expressions used to filter out details from http request responses.
@@ -372,8 +372,8 @@ 
 		$this->_is_logged_in = false;
 		$this->_username     = null;
 		$this->_password     = null;
-		$this->_aspects      = [];
-		$this->_services     = [];
+		$this->_aspects      = [ ];
+		$this->_services     = [ ];
 	}
 
 	/**
@@ -385,7 +385,7 @@ 
 		$this->logout();
 		$this->_last_error   = null;
 		$this->_token        = null;
-		$this->_cookies      = [];
+		$this->_cookies      = [ ];
 		$this->_last_request = null;
 	}
 
@@ -398,7 +398,7 @@ 
 	 *
 	 * @return bool|object Return the response data of the new diaspora* post if successfully posted, else false.
 	 */
-	public function post( $text, $aspects = 'public', array $extra_data = [] ) {
+	public function post( $text, $aspects = 'public', array $extra_data = [ ] ) {
 		// Are we logged in?
 		if ( ! $this->_check_login() ) {
 			return false;
@@ -594,11 +594,11 @@ 
 				/** @var array $raw_list */
 
 				// In case this fetch is forced, empty the list.
-				$list = [];
+				$list = [ ];
 
 				if ( 'aspects' === $type ) {
 					// Add the 'public' aspect, as it's global and not user specific.
-					$list['public'] = __( 'Public', 'wp-to-diaspora' );
+					$list[ 'public' ] = __( 'Public', 'wp-to-diaspora' );
 
 					// Add all user specific aspects.
 					foreach ( $raw_list as $aspect ) {
@@ -625,7 +625,7 @@ 
 	 *
 	 * @return object An object containing details about this request.
 	 */
-	private function _request( $url, array $args = [] ) {
+	private function _request( $url, array $args = [ ] ) {
 		// Prefix the full pod URL if necessary.
 		if ( 0 === strpos( $url, '/' ) ) {
 			$url = $this->get_pod_url( $url );
@@ -642,12 +642,12 @@ 
 		// If the certificate bundle has been downloaded manually, use that instead.
 		// NOTE: This should actually never be necessary, it's a fallback!
 		if ( file_exists( WP2D_DIR . '/cacert.pem' ) ) {
-			$defaults['sslcertificates'] = WP2D_DIR . '/cacert.pem';
+			$defaults[ 'sslcertificates' ] = WP2D_DIR . '/cacert.pem';
 		}
 
 		// Set the correct cookie.
 		if ( ! empty( $this->_cookies ) ) {
-			$defaults['cookies'] = $this->_cookies;
+			$defaults[ 'cookies' ] = $this->_cookies;
 		}
 
 		$args = wp_parse_args( $args, $defaults );
@@ -679,8 +679,8 @@ 
 		}
 
 		// Save the latest cookies.
-		if ( isset( $response['cookies'] ) ) {
-			$this->_cookies = $response['cookies'];
+		if ( isset( $response[ 'cookies' ] ) ) {
+			$this->_cookies = $response[ 'cookies' ];
 		}
 
 		// Return the last request details.

lib/class-options.php

Spacing +30 added lines, -30 removed lines

@@ -27,8 +27,8 @@ 
 	 * @var array
 	 */
 	private static $_default_options = [
-		'aspects_list'       => [],
-		'services_list'      => [],
+		'aspects_list'       => [ ],
+		'services_list'      => [ ],
 		'post_to_diaspora'   => true,
 		'enabled_post_types' => [ 'post' ],
 		'fullentrylink'      => true,
@@ -36,7 +36,7 @@ 
 		'tags_to_post'       => [ 'global', 'custom', 'post' ],
 		'global_tags'        => '',
 		'aspects'            => [ 'public' ],
-		'services'           => [],
+		'services'           => [ ],
 		'version'            => WP2D_VERSION,
 	];
 
@@ -105,7 +105,7 @@ 
 	 * @return string Return the currently selected tab.
 	 */
 	private function _current_tab( $default = 'defaults' ) {
-		$tab = ( isset ( $_GET['tab'] ) ? $_GET['tab'] : $default );
+		$tab = ( isset ( $_GET[ 'tab' ] ) ? $_GET[ 'tab' ] : $default );
 
 		// If the pod settings aren't configured yet, open the 'Setup' tab.
 		if ( ! $this->is_pod_set_up() ) {
@@ -124,13 +124,13 @@ 
 	 */
 	private function _options_page_tabs( $return = false ) {
 		// The array defining all options sections to be shown as tabs.
-		$tabs = [];
+		$tabs = [ ];
 		if ( $this->is_pod_set_up() ) {
-			$tabs['defaults'] = __( 'Defaults', 'wp-to-diaspora' );
+			$tabs[ 'defaults' ] = __( 'Defaults', 'wp-to-diaspora' );
 		}
 
 		// Add the 'Setup' tab to the end of the list.
-		$tabs['setup'] = __( 'Setup', 'wp-to-diaspora' ) . '<span id="pod-connection-status" class="dashicons-before hidden"></span><span class="spinner"></span>';
+		$tabs[ 'setup' ] = __( 'Setup', 'wp-to-diaspora' ) . '<span id="pod-connection-status" class="dashicons-before hidden"></span><span class="spinner"></span>';
 
 		// Container for all options tabs.
 		$out = '<h2 id="options-tabs" class="nav-tab-wrapper">';
@@ -148,7 +148,7 @@ 
 			return $tabs;
 		}
 
-		return [];
+		return [ ];
 	}
 
 
@@ -224,7 +224,7 @@ 
 				do_settings_sections( 'wp_to_diaspora_settings' );
 
 				// Get the name of the current tab, if set, else take the first one from the list.
-				$tab = $this->_current_tab( $page_tabs[0] );
+				$tab = $this->_current_tab( $page_tabs[ 0 ] );
 
 				// Add Save and Reset buttons.
 				echo '<input id="submit-' . esc_attr( $tab ) . '" name="wp_to_diaspora_settings[submit_' . esc_attr( $tab ) . ']" type="submit" class="button-primary" value="' . esc_attr__( 'Save Changes' ) . '" />&nbsp;';
@@ -665,14 +665,14 @@ 
 					esc_url( 'https://' . $this->get_option( 'pod' ) . '/services' ),
 					esc_html__( 'Show available services on my pod.', 'wp-to-diaspora' )
 				);
-				$empty_label    = esc_html__( 'No services connected yet.', 'wp-to-diaspora' );
+				$empty_label = esc_html__( 'No services connected yet.', 'wp-to-diaspora' );
 				break;
 
 			default:
 				return;
 		}
 
-		$items = array_filter( (array) $items ) ?: [];
+		$items = array_filter( (array) $items ) ? : [ ];
 
 		// Special case for this field if it's displayed on the settings page.
 		$on_settings_page = ( 'settings_page_wp_to_diaspora' === get_current_screen()->id );
@@ -805,30 +805,30 @@ 
 		/* Validate all settings before saving to the database. */
 
 		// Saving the pod setup details.
-		if ( isset( $input['submit_setup'] ) ) {
-			$input['pod']      = trim( sanitize_text_field( $input['pod'] ), ' /' );
-			$input['username'] = sanitize_text_field( $input['username'] );
-			$input['password'] = sanitize_text_field( $input['password'] );
+		if ( isset( $input[ 'submit_setup' ] ) ) {
+			$input[ 'pod' ]      = trim( sanitize_text_field( $input[ 'pod' ] ), ' /' );
+			$input[ 'username' ] = sanitize_text_field( $input[ 'username' ] );
+			$input[ 'password' ] = sanitize_text_field( $input[ 'password' ] );
 
 			// If password is blank, it hasn't been changed.
 			// If new password is equal to the encrypted password already saved, it was just passed again. It happens everytime update_option('wp_to_diaspora_settings') is called.
-			if ( '' === $input['password'] || $this->get_option( 'password' ) === $input['password'] ) {
-				$input['password'] = $this->get_option( 'password' );
+			if ( '' === $input[ 'password' ] || $this->get_option( 'password' ) === $input[ 'password' ] ) {
+				$input[ 'password' ] = $this->get_option( 'password' );
 			} else {
-				$input['password'] = WP2D_Helpers::encrypt( $input['password'] );
+				$input[ 'password' ] = WP2D_Helpers::encrypt( $input[ 'password' ] );
 			}
 
 			// This is for when JS in not enabled, to make sure that the aspects and services
 			// are refetched when displaying the options page after saving.
-			if ( isset( $input['no_js'] ) ) {
+			if ( isset( $input[ 'no_js' ] ) ) {
 				set_transient( 'wp2d_no_js_force_refetch', true );
 			}
 		}
 
 		// Saving the default options.
-		if ( isset( $input['submit_defaults'] ) ) {
-			if ( ! isset( $input['enabled_post_types'] ) ) {
-				$input['enabled_post_types'] = [];
+		if ( isset( $input[ 'submit_defaults' ] ) ) {
+			if ( ! isset( $input[ 'enabled_post_types' ] ) ) {
+				$input[ 'enabled_post_types' ] = [ ];
 			}
 
 			// Checkboxes.
@@ -841,26 +841,26 @@ 
 			$this->validate_multi_selects( 'tags_to_post', $input );
 
 			// Get unique, non-empty, trimmed tags and clean them up.
-			$this->validate_tags( $input['global_tags'] );
+			$this->validate_tags( $input[ 'global_tags' ] );
 
 			// Clean up the list of aspects. If the list is empty, only use the 'Public' aspect.
-			$this->validate_aspects_services( $input['aspects'], [ 'public' ] );
+			$this->validate_aspects_services( $input[ 'aspects' ], [ 'public' ] );
 
 			// Clean up the list of services.
-			$this->validate_aspects_services( $input['services'] );
+			$this->validate_aspects_services( $input[ 'services' ] );
 		}
 
 		// Reset to defaults.
-		if ( isset( $input['reset_defaults'] ) ) {
+		if ( isset( $input[ 'reset_defaults' ] ) ) {
 			// Set the input to the default options.
 			$input = self::$_default_options;
 
 			// Don't reset the fetched lists of aspects and services.
-			unset( $input['pod_list'], $input['aspects_list'], $input['services_list'] );
+			unset( $input[ 'pod_list' ], $input[ 'aspects_list' ], $input[ 'services_list' ] );
 		}
 
 		// Unset all unused input fields.
-		unset( $input['submit_defaults'], $input['reset_defaults'], $input['submit_setup'] );
+		unset( $input[ 'submit_defaults' ], $input[ 'reset_defaults' ], $input[ 'submit_setup' ] );
 
 		// Parse inputs with default options and return.
 		return wp_parse_args( $input, array_merge( self::$_default_options, self::$_options ) );
@@ -918,7 +918,7 @@ 
 					}
 				}
 			} else {
-				$options[ $select ] = [];
+				$options[ $select ] = [ ];
 			}
 		}
 
@@ -967,7 +967,7 @@ 
 	 *
 	 * @return array The validated list of aspects or services.
 	 */
-	public function validate_aspects_services( &$aspects_services, array $default = [] ) {
+	public function validate_aspects_services( &$aspects_services, array $default = [ ] ) {
 		if ( empty( $aspects_services ) || ! is_array( $aspects_services ) ) {
 			$aspects_services = $default;
 		} else {

lib/class-contextual-help.php

Spacing +1 added lines, -1 removed lines

@@ -255,7 +255,7 @@
 	public static function get_help_tab_quick_link( $error ) {
 		$help_tab = '';
 		if ( is_wp_error( $error ) && ( $error_data = $error->get_error_data() ) && array_key_exists( 'help_tab', $error_data ) ) {
-			$help_tab = $error_data['help_tab'];
+			$help_tab = $error_data[ 'help_tab' ];
 		} elseif ( is_string( $error ) ) {
 			$help_tab = $error;
 		}

wp-to-diaspora.php

Spacing +8 added lines, -8 removed lines

@@ -99,7 +99,7 @@ 
 	 */
 	private function _constants() {
 		// Are we in debugging mode?
-		if ( isset( $_GET['debugging'] ) ) {
+		if ( isset( $_GET[ 'debugging' ] ) ) {
 			define( 'WP2D_DEBUGGING', true );
 		}
 
@@ -117,7 +117,7 @@ 
 	 */
 	private function _version_check() {
 		// Check for version requirements.
-		if ( version_compare( PHP_VERSION, $this->_min_php, '<' ) || version_compare( $GLOBALS['wp_version'], $this->_min_wp, '<' ) ) {
+		if ( version_compare( PHP_VERSION, $this->_min_php, '<' ) || version_compare( $GLOBALS[ 'wp_version' ], $this->_min_wp, '<' ) ) {
 			add_action( 'admin_notices', [ $this, 'deactivate' ] );
 
 			return false;
@@ -136,12 +136,12 @@ 
 		deactivate_plugins( plugin_basename( __FILE__ ) );
 
 		// Get rid of the "Plugin activated" message.
-		unset( $_GET['activate'] );
+		unset( $_GET[ 'activate' ] );
 
 		// Then display the admin notice.
 		?>
 		<div class="error">
-			<p><?php echo esc_html( sprintf( 'WP to diaspora* requires at least WordPress %1$s (you have %2$s) and PHP %3$s (you have %4$s)!', $this->_min_wp, $GLOBALS['wp_version'], $this->_min_php, PHP_VERSION ) ); ?></p>
+			<p><?php echo esc_html( sprintf( 'WP to diaspora* requires at least WordPress %1$s (you have %2$s) and PHP %3$s (you have %4$s)!', $this->_min_wp, $GLOBALS[ 'wp_version' ], $this->_min_php, PHP_VERSION ) ); ?></p>
 		</div>
 		<?php
 	}
@@ -260,7 +260,7 @@ 
 	 */
 	public function admin_load_scripts() {
 		// Get the enabled post types to load the script for.
-		$enabled_post_types = WP2D_Options::instance()->get_option( 'enabled_post_types', [] );
+		$enabled_post_types = WP2D_Options::instance()->get_option( 'enabled_post_types', [ ] );
 
 		// Get the screen to find out where we are.
 		$screen = get_current_screen();
@@ -292,7 +292,7 @@ 
 	 * @return array Links to display for plugin on plugins page.
 	 */
 	public function settings_link( $links ) {
-		$links[] = '<a href="' . admin_url( 'options-general.php?page=wp_to_diaspora' ) . '">' . __( 'Settings' ) . '</a>';
+		$links[ ] = '<a href="' . admin_url( 'options-general.php?page=wp_to_diaspora' ) . '">' . __( 'Settings' ) . '</a>';
 
 		return $links;
 	}
@@ -384,7 +384,7 @@ 
 	 * @todo esc_html
 	 */
 	public function check_pod_connection_status_callback() {
-		if ( ! defined( 'WP2D_DEBUGGING' ) && isset( $_REQUEST['debugging'] ) ) {
+		if ( ! defined( 'WP2D_DEBUGGING' ) && isset( $_REQUEST[ 'debugging' ] ) ) {
 			define( 'WP2D_DEBUGGING', true );
 		}
 
@@ -398,7 +398,7 @@ 
 		if ( true === $status ) {
 			wp_send_json_success( $data );
 		} elseif ( false === $status && $this->_load_api()->has_last_error() ) {
-			$data['message'] = $this->_load_api()->get_last_error() . ' ' . WP2D_Contextual_Help::get_help_tab_quick_link( $this->_load_api()->get_last_error_object() );
+			$data[ 'message' ] = $this->_load_api()->get_last_error() . ' ' . WP2D_Contextual_Help::get_help_tab_quick_link( $this->_load_api()->get_last_error_object() );
 			wp_send_json_error( $data );
 		}
 		// If $status === null, do nothing.

lib/class-post.php

Spacing +27 added lines, -27 removed lines

@@ -258,7 +258,7 @@ 
 
 		// Unset post_to_diaspora meta field to prevent mistakenly republishing to diaspora*.
 		$meta                     = get_post_meta( $post_id, '_wp_to_diaspora', true );
-		$meta['post_to_diaspora'] = false;
+		$meta[ 'post_to_diaspora' ] = false;
 		update_post_meta( $post_id, '_wp_to_diaspora', $meta );
 
 		return true;
@@ -297,7 +297,7 @@ 
 	private function _get_full_content() {
 		// Only allow certain shortcodes.
 		global $shortcode_tags;
-		$shortcode_tags_bkp = [];
+		$shortcode_tags_bkp = [ ];
 
 		foreach ( $shortcode_tags as $shortcode_tag => $shortcode_function ) {
 			if ( ! in_array( $shortcode_tag, apply_filters( 'wp2d_shortcodes_filter', [ 'wp_caption', 'caption', 'gallery' ] ), true ) ) {
@@ -385,12 +385,12 @@ 
 		$options       = WP2D_Options::instance();
 		$tags_to_post  = $this->tags_to_post;
 		$tags_to_add   = '';
-		$diaspora_tags = [];
+		$diaspora_tags = [ ];
 
 		// Add any diaspora* tags?
 		if ( ! empty( $tags_to_post ) ) {
 			// The diaspora* tags to add to the post.
-			$diaspora_tags_tmp = [];
+			$diaspora_tags_tmp = [ ];
 
 			// Add global tags?
 			$global_tags = $options->get_option( 'global_tags' );
@@ -416,7 +416,7 @@ 
 
 			// Get all the tags and list them all nicely in a row.
 			foreach ( $diaspora_tags_tmp as $tag ) {
-				$diaspora_tags[] = '#' . $tag;
+				$diaspora_tags[ ] = '#' . $tag;
 			}
 
 			// Add all the found tags.
@@ -476,11 +476,11 @@ 
 	private function _save_to_history( $response ) {
 		// Make sure the post history is an array.
 		if ( empty( $this->post_history ) ) {
-			$this->post_history = [];
+			$this->post_history = [ ];
 		}
 
 		// Add a new entry to the history.
-		$this->post_history[] = [
+		$this->post_history[ ] = [
 			'id'         => $response->id,
 			'guid'       => $response->guid,
 			'created_at' => $this->post->post_modified,
@@ -564,8 +564,8 @@ 
 		$content = do_shortcode( $content );
 
 		// If a caption attribute is defined, we'll add it after the image.
-		if ( isset( $attr['caption'] ) && '' !== $attr['caption'] ) {
-			$content .= "\n" . $this->get_img_caption( $attr['caption'] );
+		if ( isset( $attr[ 'caption' ] ) && '' !== $attr[ 'caption' ] ) {
+			$content .= "\n" . $this->get_img_caption( $attr[ 'caption' ] );
 		}
 
 		return $content;
@@ -585,8 +585,8 @@ 
 		$captiontag = current_theme_supports( 'html5', 'gallery' ) ? 'figcaption' : 'dd';
 
 		// User value.
-		if ( isset( $attr['captiontag'] ) ) {
-			$captiontag = $attr['captiontag'];
+		if ( isset( $attr[ 'captiontag' ] ) ) {
+			$captiontag = $attr[ 'captiontag' ];
 		}
 
 		// Let WordPress create the regular gallery.
@@ -610,7 +610,7 @@ 
 	 * @return string Prettified gallery image caption.
 	 */
 	public function custom_gallery_regex_callback( $m ) {
-		return $this->get_img_caption( $m[2] );
+		return $this->get_img_caption( $m[ 2 ] );
 	}
 
 	/*
@@ -653,18 +653,18 @@ 
 		$options = WP2D_Options::instance();
 
 		// Make sure we have some value for post meta fields.
-		$this->custom_tags = $this->custom_tags ?: [];
+		$this->custom_tags = $this->custom_tags ? : [ ];
 
 		// If this post is already published, don't post again to diaspora* by default.
 		$this->post_to_diaspora = ( $this->post_to_diaspora && 'publish' !== get_post_status( $this->ID ) );
-		$this->aspects          = $this->aspects ?: [];
-		$this->services         = $this->services ?: [];
+		$this->aspects          = $this->aspects ? : [ ];
+		$this->services         = $this->services ? : [ ];
 
 		// Have we already posted on diaspora*?
 		if ( is_array( $this->post_history ) ) {
 			$latest_post = end( $this->post_history );
 			?>
-			<p><a href="<?php echo esc_attr( $latest_post['post_url'] ); ?>" target="_blank"><?php esc_html_e( 'Already posted to diaspora*.', 'wp-to-diaspora' ); ?></a></p>
+			<p><a href="<?php echo esc_attr( $latest_post[ 'post_url' ] ); ?>" target="_blank"><?php esc_html_e( 'Already posted to diaspora*.', 'wp-to-diaspora' ); ?></a></p>
 			<?php
 		}
 		?>
@@ -699,7 +699,7 @@ 
 		/* OK, it's safe for us to save the data now. */
 
 		// Meta data to save.
-		$meta_to_save = $_POST['wp_to_diaspora_settings'];
+		$meta_to_save = $_POST[ 'wp_to_diaspora_settings' ];
 		$options      = WP2D_Options::instance();
 
 		// Checkboxes.
@@ -712,13 +712,13 @@ 
 		$options->validate_multi_selects( 'tags_to_post', $meta_to_save );
 
 		// Save custom tags as array.
-		$options->validate_tags( $meta_to_save['custom_tags'] );
+		$options->validate_tags( $meta_to_save[ 'custom_tags' ] );
 
 		// Clean up the list of aspects. If the list is empty, only use the 'Public' aspect.
-		$options->validate_aspects_services( $meta_to_save['aspects'], [ 'public' ] );
+		$options->validate_aspects_services( $meta_to_save[ 'aspects' ], [ 'public' ] );
 
 		// Clean up the list of services.
-		$options->validate_aspects_services( $meta_to_save['services'] );
+		$options->validate_aspects_services( $meta_to_save[ 'services' ] );
 
 		// Update the meta data for this post.
 		update_post_meta( $post_id, '_wp_to_diaspora', $meta_to_save );
@@ -733,7 +733,7 @@ 
 	 */
 	private function _is_safe_to_save() {
 		// Verify that our nonce is set and  valid.
-		if ( ! ( isset( $_POST['wp_to_diaspora_meta_box_nonce'] ) && wp_verify_nonce( $_POST['wp_to_diaspora_meta_box_nonce'], 'wp_to_diaspora_meta_box' ) ) ) {
+		if ( ! ( isset( $_POST[ 'wp_to_diaspora_meta_box_nonce' ] ) && wp_verify_nonce( $_POST[ 'wp_to_diaspora_meta_box_nonce' ], 'wp_to_diaspora_meta_box' ) ) ) {
 			return false;
 		}
 
@@ -743,13 +743,13 @@ 
 		}
 
 		// Check the user's permissions.
-		$permission = ( isset( $_POST['post_type'] ) && 'page' === $_POST['post_type'] ) ? 'edit_pages' : 'edit_posts';
+		$permission = ( isset( $_POST[ 'post_type' ] ) && 'page' === $_POST[ 'post_type' ] ) ? 'edit_pages' : 'edit_posts';
 		if ( ! current_user_can( $permission, $this->ID ) ) {
 			return false;
 		}
 
 		// Make real sure that we have some meta data to save.
-		if ( ! isset( $_POST['wp_to_diaspora_settings'] ) ) {
+		if ( ! isset( $_POST[ 'wp_to_diaspora_settings' ] ) ) {
 			return false;
 		}
 
@@ -786,10 +786,10 @@ 
 			$latest_post = end( $diaspora_post_history );
 
 			// Only show if this post is showing a message and the post is a fresh share.
-			if ( isset( $_GET['message'] ) && $post->post_modified === $latest_post['created_at'] ) {
+			if ( isset( $_GET[ 'message' ] ) && $post->post_modified === $latest_post[ 'created_at' ] ) {
 				printf( '<div class="updated notice is-dismissible"><p>%1$s <a href="%2$s" target="_blank">%3$s</a></p></div>',
 					esc_html__( 'Successfully posted to diaspora*.', 'wp-to-diaspora' ),
-					esc_url( $latest_post['post_url'] ),
+					esc_url( $latest_post[ 'post_url' ] ),
 					esc_html__( 'View Post' )
 				);
 			}
@@ -803,8 +803,8 @@ 
 	 */
 	public function ignore_post_error() {
 		// If "Ignore" link has been clicked, delete the post error meta data.
-		if ( isset( $_GET['wp2d_ignore_post_error'], $_GET['post'] ) ) {
-			delete_post_meta( $_GET['post'], '_wp_to_diaspora_post_error' );
+		if ( isset( $_GET[ 'wp2d_ignore_post_error' ], $_GET[ 'post' ] ) ) {
+			delete_post_meta( $_GET[ 'post' ], '_wp_to_diaspora_post_error' );
 		}
 	}
 }