noplanman / wp-to-diaspora

lib/class-wp2d-options.php

Braces +13 added lines, -5 removed lines

@@ -599,8 +599,11 @@ 
 		if ( 'settings_page_wp_to_diaspora' === get_current_screen()->id ) : ?>
 			<label><?php echo $checkbox; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?><?php esc_html_e( 'Yes', 'wp-to-diaspora' ); ?></label>
 			<p class="description"><?php echo esc_html( $description ); ?></p>
-		<?php else : ?>
-			<label title="<?php echo esc_attr( $description ); ?>"><?php echo $checkbox; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?><?php esc_html_e( 'Show "Posted at" link?', 'wp-to-diaspora' ); ?></label>
+		<?php else {
+	: ?>
+			<label title="<?php echo esc_attr( $description );
+}
+?>"><?php echo $checkbox; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?><?php esc_html_e( 'Show "Posted at" link?', 'wp-to-diaspora' ); ?></label>
 		<?php endif;
 	}
 
@@ -639,9 +642,11 @@ 
 
 		<?php if ( $on_settings_page ) : ?>
 			<p class="description"><?php echo esc_html( $description ); ?></p>
-		<?php else : ?>
+		<?php else {
+	: ?>
 			</label>
 		<?php endif;
+}
 	}
 
 	/**
@@ -720,8 +725,11 @@ 
 				<?php foreach ( $list as $id => $name ) : ?>
 					<label><input type="checkbox" name="wp_to_diaspora_settings[<?php echo esc_attr( $type ); ?>][]" value="<?php echo esc_attr( $id ); ?>" <?php checked( in_array( $id, $items, false ) ); // phpcs:ignore WordPress.PHP.StrictInArray.FoundNonStrictFalse ?>><?php echo esc_html( $name ); ?></label>
 				<?php endforeach; ?>
-			<?php else : ?>
-				<label><?php echo $empty_label; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?></label>
+			<?php else {
+	: ?>
+				<label><?php echo $empty_label;
+}
+// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?></label>
 			<?php endif; ?>
 		</div>
 		<p class="description">

lib/class-wp2d-post.php

Spacing +30 added lines, -30 removed lines

@@ -277,7 +277,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 );
 
 		// Prevent any duplicate hook firing.
@@ -319,7 +319,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 ) ) {
@@ -407,12 +407,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' );
@@ -438,7 +438,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.
@@ -498,11 +498,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,
@@ -588,8 +588,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;
@@ -606,7 +606,7 @@ 
 	 */
 	public function custom_gallery_shortcode( $attr ) {
 		// Try user value and fall back to default value in WordPress.
-		$captiontag = $attr['captiontag'] ?? ( current_theme_supports( 'html5', 'gallery' ) ? 'figcaption' : 'dd' );
+		$captiontag = $attr[ 'captiontag' ] ?? ( current_theme_supports( 'html5', 'gallery' ) ? 'figcaption' : 'dd' );
 
 		// Let WordPress create the regular gallery.
 		$gallery = gallery_shortcode( $attr );
@@ -629,7 +629,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 ] );
 	}
 
 	/*
@@ -672,18 +672,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*?
 		$diaspora_post_url = '#';
 		if ( is_array( $this->post_history ) ) {
 			$latest_post       = end( $this->post_history );
-			$diaspora_post_url = $latest_post['post_url'];
+			$diaspora_post_url = $latest_post[ 'post_url' ];
 		}
 		?>
 		<p<?php echo '#' === $diaspora_post_url ? ' style="display: none;"' : ''; ?>><a id="diaspora-post-url" href="<?php echo esc_attr( $diaspora_post_url ); ?>" target="_blank"><?php esc_html_e( 'Already posted to diaspora*.', 'wp-to-diaspora' ); ?></a></p>
@@ -718,7 +718,7 @@ 
 		/* OK, it's safe for us to save the data now. */
 
 		// Meta data to save.
-		$meta_to_save = $_POST['wp_to_diaspora_settings']; // phpcs:ignore
+		$meta_to_save = $_POST[ 'wp_to_diaspora_settings' ]; // phpcs:ignore
 		$options      = WP2D_Options::instance();
 
 		// Checkboxes.
@@ -731,13 +731,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 );
@@ -752,7 +752,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( sanitize_key( $_POST['wp_to_diaspora_meta_box_nonce'] ), 'wp_to_diaspora_meta_box' ) ) ) {
+		if ( ! ( isset( $_POST[ 'wp_to_diaspora_meta_box_nonce' ] ) && wp_verify_nonce( sanitize_key( $_POST[ 'wp_to_diaspora_meta_box_nonce' ] ), 'wp_to_diaspora_meta_box' ) ) ) {
 			return false;
 		}
 
@@ -762,13 +762,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;
 		}
 
@@ -797,7 +797,7 @@ 
 				'<div class="error notice is-dismissible"><p>%1$s %2$s %3$s <a href="%4$s">%5$s</a></p></div>',
 				esc_html__( 'Failed to post to diaspora*.', 'wp-to-diaspora' ),
 				esc_html( $error->get_error_message() ),
-				$help_link,  // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+				$help_link, // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 				esc_url( add_query_arg( 'wp2d_ignore_post_error', '' ) ),
 				esc_html__( 'Ignore', 'wp-to-diaspora' )
 			);
@@ -806,11 +806,11 @@ 
 			$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'] ) { // phpcs:ignore
+			if ( isset( $_GET[ 'message' ] ) && $post->post_modified === $latest_post[ 'created_at' ] ) { // phpcs:ignore
 				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', 'wp-to-diaspora' )
 				);
 			}
@@ -824,8 +824,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'] ) ) { // phpcs:ignore
-			delete_post_meta( absint( $_GET['post'] ), '_wp_to_diaspora_post_error' ); // phpcs:ignore
+		if ( isset( $_GET[ 'wp2d_ignore_post_error' ], $_GET[ 'post' ] ) ) { // phpcs:ignore
+			delete_post_meta( absint( $_GET[ 'post' ] ), '_wp_to_diaspora_post_error' ); // phpcs:ignore
 		}
 	}
 
@@ -841,7 +841,7 @@ 
 			] );
 		}
 
-		$post_id = sanitize_key( $_REQUEST['post_id'] ?? '' );
+		$post_id = sanitize_key( $_REQUEST[ 'post_id' ] ?? '' );
 		if ( ! is_numeric( $post_id ) ) {
 			return;
 		}
@@ -858,12 +858,12 @@ 
 			$latest_post = end( $diaspora_post_history );
 
 			// Only show if this post is a fresh share.
-			if ( get_post( $post_id )->post_modified === $latest_post['created_at'] ) { // phpcs:ignore
+			if ( get_post( $post_id )->post_modified === $latest_post[ 'created_at' ] ) { // phpcs:ignore
 				wp_send_json_success( [
 					'message' => esc_html__( 'Successfully posted to diaspora*.', 'wp-to-diaspora' ),
 					'action'  => [
 						'label' => esc_html__( 'View Post', 'wp-to-diaspora' ),
-						'url'   => esc_url( $latest_post['post_url'] ),
+						'url'   => esc_url( $latest_post[ 'post_url' ] ),
 					],
 				] );
 			}