noplanman / wp-to-diaspora

lib/class-post.php

Indentation +740 added lines, -740 removed lines

@@ -18,625 +18,625 @@ 
  */
 class WP2D_Post {
 
-	/**
-	 * The original post object.
-	 *
-	 * @var WP_Posts
-	 * @since 1.5.0
-	 */
-	public $post = null;
-
-	/**
-	 * The original post ID.
-	 *
-	 * @var int
-	 * @since 1.5.0
-	 */
-	public $ID = null;
-
-	/**
-	 * If this post should be shared on diaspora*.
-	 *
-	 * @var bool
-	 * @since 1.5.0
-	 */
-	public $post_to_diaspora = null;
-
-	/**
-	 * If a link back to the original post should be added.
-	 *
-	 * @var bool
-	 * @since 1.5.0
-	 */
-	public $fullentrylink = null;
-
-	/**
-	 * What content gets posted.
-	 *
-	 * @var string
-	 * @since 1.5.0
-	 */
-	public $display = null;
-
-	/**
-	 * The types of tags to post. (global,custom,post)
-	 *
-	 * @var array
-	 * @since 1.5.0
-	 */
-	public $tags_to_post = null;
-
-	/**
-	 * The post's custom tags.
-	 *
-	 * @var array
-	 * @since 1.5.0
-	 */
-	public $custom_tags = null;
-
-	/**
-	 * Aspects this post gets posted to.
-	 *
-	 * @var array
-	 * @since 1.5.0
-	 */
-	public $aspects = null;
-
-	/**
-	 * Services this post gets posted to.
-	 *
-	 * @var array
-	 * @since 1.5.0
-	 */
-	public $services = null;
-
-
-	/**
-	 * The post's history of diaspora* posts.
-	 *
-	 * @var array
-	 * @since 1.5.0
-	 */
-	public $post_history = null;
-
-	/**
-	 * If the post actions have all been set up already.
-	 *
-	 * @var boolean
-	 * @since 1.5.0
-	 */
-	private static $_is_set_up = false;
-
-	/**
-	 * Setup all the necessary WP callbacks.
-	 *
-	 * @since 1.5.0
-	 */
-	public static function setup() {
-		if ( self::$_is_set_up ) {
-			return;
-		}
-
-		$instance = new WP2D_Post( null );
-
-		// Notices when a post has been shared or if it has failed.
-		add_action( 'admin_notices', array( $instance, 'admin_notices' ) );
-		add_action( 'admin_init', array( $instance, 'ignore_post_error' ) );
-
-		// Handle diaspora* posting when saving the post.
-		add_action( 'save_post', array( $instance, 'post' ), 11, 2 );
-		add_action( 'save_post', array( $instance, 'save_meta_box_data' ), 10 );
-
-		// Add meta boxes.
-		add_action( 'add_meta_boxes', array( $instance, 'add_meta_boxes' ) );
-
-		self::$_is_set_up = true;
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @since 1.5.0
-	 *
-	 * @param int|WP_Post $post Post ID or the post itself.
-	 */
-	public function __construct( $post ) {
-		$this->_assign_wp_post( $post );
-	}
-
-	/**
-	 * Assign the original WP_Post object and all the custom meta data.
-	 *
-	 * @since 1.5.0
-	 *
-	 * @param int|WP_Post $post Post ID or the post itself.
-	 */
-	private function _assign_wp_post( $post ) {
-		if ( $this->post = get_post( $post ) ) {
-			$this->ID = $this->post->ID;
-
-			$options = WP2D_Options::instance();
-
-			// Assign all meta values, expanding non-existent ones with the defaults.
-			$meta_current = get_post_meta( $this->ID, '_wp_to_diaspora', true );
-			$meta = wp_parse_args(
-				$meta_current,
-				$options->get_options()
-			);
-			if ( $meta ) {
-				foreach ( $meta as $key => $value ) {
-					$this->$key = $value;
-				}
-			}
-
-			// If no WP2D meta data has been saved yet, this post shouldn't be published.
-			// This can happen if existing posts (before WP2D) get updated externally, not through the post edit screen.
-			// Check gutobenn/wp-to-diaspora#91 for reference.
-			// Also, when we have a post scheduled for publishing, don't touch it.
-			// This is important when modifying scheduled posts using Quick Edit.
-			if ( ! in_array( $this->post->post_status, array( 'auto-draft', 'future' ) ) && ! $meta_current ) {
-				$this->post_to_diaspora = false;
-			}
-
-			$this->post_history = get_post_meta( $this->ID, '_wp_to_diaspora_post_history', true );
-		}
-	}
-
-	/**
-	 * Post to diaspora* when saving a post.
-	 *
-	 * @since 1.5.0
-	 *
-	 * @todo Maybe somebody wants to share a password protected post to a closed aspect.
-	 *
-	 * @param integer $post_id ID of the post being saved.
-	 * @param WP_Post $post    Post object being saved.
-	 * @return boolean If the post was posted successfully.
-	 */
-	public function post( $post_id, $post ) {
-		$this->_assign_wp_post( $post );
-
-		$options = WP2D_Options::instance();
-
-		// Is this post type enabled for posting?
-		if ( ! in_array( $post->post_type, $options->get_option( 'enabled_post_types' ) ) ) {
-			return false;
-		}
-
-		// Make sure we're posting to diaspora* and the post isn't password protected.
-		if ( ! ( $this->post_to_diaspora && 'publish' === $post->post_status && '' === $post->post_password ) ) {
-			return false;
-		}
-
-		$status_message = $this->_get_title_link();
-
-		// Post the full post text or just the excerpt?
-		if ( 'full' === $this->display ) {
-			$status_message .= $this->_get_full_content();
-		} else {
-			$status_message .= $this->_get_excerpt_content();
-		}
-
-		// Add the tags assigned to the post.
-		$status_message .= $this->_get_tags_to_add();
-
-		// Add the original entry link to the post?
-		$status_message .= $this->_get_posted_at_link();
-
-		$status_converter = new HtmlConverter( array( 'strip_tags' => true ) );
-		$status_message  = $status_converter->convert( $status_message );
-
-		// Set up the connection to diaspora*.
-		$api = WP2D_Helpers::api_quick_connect();
-		if ( ! empty( $status_message ) ) {
-			if ( $api->has_last_error() ) {
-				// Save the post error as post meta data, so we can display it to the user.
-				update_post_meta( $post_id, '_wp_to_diaspora_post_error', $api->get_last_error() );
-				return false;
-			}
-
-			// Add services to share to via diaspora*.
-			$extra_data = array(
-				'services' => $this->services,
-			);
-
-			// Try to post to diaspora*.
-			if ( $response = $api->post( $status_message, $this->aspects, $extra_data ) ) {
-				// Save certain diaspora* post data as meta data for future reference.
-				$this->_save_to_history( (object) $response );
-
-				// If there is still a previous post error around, remove it.
-				delete_post_meta( $post_id, '_wp_to_diaspora_post_error' );
-
-				// 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;
-				update_post_meta( $post_id, '_wp_to_diaspora', $meta );
-			}
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Get the title of the post linking to the post itself.
-	 *
-	 * @since 1.5.0
-	 *
-	 * @return string Post title as a link.
-	 */
-	private function _get_title_link() {
-		$title = esc_html( $this->post->post_title );
-		$permalink = get_permalink( $this->ID );
-		$default = sprintf( '<strong><a href="%2$s" title="%2$s">%1$s</a></strong>', $title, $permalink );
-
-		/**
-		 * Filter the title link at the top of the post.
-		 *
-		 * @since 1.5.4.1
-		 *
-		 * @param string $default   The whole HTML of the title link to be outputted.
-		 * @param string $title     The title of the original post.
-		 * @param string $permalink The permalink of the original post.
-		 */
-		$link = apply_filters( 'wp2d_title_filter', $default, $title, $permalink );
-
-		return '<p>' . $link . '</p>';
-	}
-
-	/**
-	 * Get the full post content with only default filters applied.
-	 *
-	 * @since 1.5.0
-	 *
-	 * @return string The full post content.
-	 */
-	private function _get_full_content() {
-		// Only allow certain shortcodes.
-		global $shortcode_tags;
-		$shortcode_tags_bkp = array();
-
-		foreach ( $shortcode_tags as $shortcode_tag => $shortcode_function ) {
-			if ( ! in_array( $shortcode_tag, apply_filters( 'wp2d_shortcodes_filter', array( 'wp_caption', 'caption', 'gallery' ) ) ) ) {
-				$shortcode_tags_bkp[ $shortcode_tag ] = $shortcode_function;
-				unset( $shortcode_tags[ $shortcode_tag ] );
-			}
-		}
-
-		// Disable all filters and then enable only defaults. This prevents additional filters from being posted to diaspora*.
-		remove_all_filters( 'the_content' );
-		foreach ( apply_filters( 'wp2d_content_filters_filter', array( 'do_shortcode', 'wptexturize', 'convert_smilies', 'convert_chars', 'wpautop', 'shortcode_unautop', 'prepend_attachment', array( $this, 'embed_remove' ) ) ) as $filter ) {
-			add_filter( 'the_content', $filter );
-		}
-
-		// Extract URLs from [embed] shortcodes.
-		add_filter( 'embed_oembed_html', array( $this, 'embed_url' ), 10, 2 );
-
-		// Add the pretty caption after the images.
-		add_filter( 'img_caption_shortcode', array( $this, 'custom_img_caption' ), 10, 3 );
-
-		// Overwrite the native shortcode handler to add pretty captions.
-		// http://wordpress.stackexchange.com/a/74675/54456 for explanation.
-		add_shortcode( 'gallery', array( $this, 'custom_gallery_shortcode' ) );
-
-		$full_content = apply_filters( 'the_content', $this->post->post_content );
-
-		// Put the removed shortcode tags back again.
-		$shortcode_tags += $shortcode_tags_bkp;
-
-		return $full_content;
-	}
-
-	/**
-	 * Get the post's excerpt in a nice format.
-	 *
-	 * @since 1.5.0
-	 *
-	 * @return string Post's excerpt.
-	 */
-	private function _get_excerpt_content() {
-		// Look for the excerpt in the following order:
-		// 1. Custom post excerpt.
-		// 2. Text up to the <!--more--> tag.
-		// 3. Manually trimmed content.
-		$content = $this->post->post_content;
-		$excerpt = $this->post->post_excerpt;
-		if ( '' === $excerpt ) {
-			if ( $more_pos = strpos( $content, '<!--more' ) ) {
-				$excerpt = substr( $content, 0, $more_pos );
-			} else {
-				$excerpt = wp_trim_words( $content, 42, '[...]' );
-			}
-		}
-		return '<p>' . $excerpt . '</p>';
-	}
-
-	/**
-	 * Get a string of tags that have been added to the post.
-	 *
-	 * @since 1.5.0
-	 *
-	 * @return string Tags added to the post.
-	 */
-	private function _get_tags_to_add() {
-		$options = WP2D_Options::instance();
-		$tags_to_post = $this->tags_to_post;
-		$tags_to_add  = '';
-
-		// Add any diaspora* tags?
-		if ( ! empty( $tags_to_post ) ) {
-			// The diaspora* tags to add to the post.
-			$diaspora_tags = array();
-
-			// Add global tags?
-			$global_tags = $options->get_option( 'global_tags' );
-			if ( in_array( 'global', $tags_to_post ) && is_array( $global_tags ) ) {
-				$diaspora_tags += array_flip( $global_tags );
-			}
-
-			// Add custom tags?
-			if ( in_array( 'custom', $tags_to_post ) && is_array( $this->custom_tags ) ) {
-				$diaspora_tags += array_flip( $this->custom_tags );
-			}
-
-			// Add post tags?
-			$post_tags = wp_get_post_tags( $this->ID, array( 'fields' => 'slugs' ) );
-			if ( in_array( 'post', $tags_to_post ) && is_array( $post_tags ) ) {
-				$diaspora_tags += array_flip( $post_tags );
-			}
-
-			// Get an array of cleaned up tags.
-			// NOTE: Validate method needs a variable, as it's passed by reference!
-			$diaspora_tags = array_keys( $diaspora_tags );
-			$options->validate_tags( $diaspora_tags );
-
-			// Get all the tags and list them all nicely in a row.
-			$diaspora_tags_clean = array();
-			foreach ( $diaspora_tags as $tag ) {
-				$diaspora_tags_clean[] = '#' . $tag;
-			}
-
-			// Add all the found tags.
-			if ( ! empty( $diaspora_tags_clean ) ) {
-				$tags_to_add = implode( ' ', $diaspora_tags_clean ) . '<br />';
-			}
-		}
-
-		return $tags_to_add;
-	}
-
-	/**
-	 * Get the link to the original post.
-	 *
-	 * @since 1.5.0
-	 *
-	 * @return string Original post link.
-	 */
-	private function _get_posted_at_link() {
-		$link = '';
-		if ( $this->fullentrylink ) {
-
-			$text = esc_html( 'Originally posted at:', 'wp-to-diaspora' );
-			$permalink = get_permalink( $this->ID );
-			$title = esc_html( 'Permalink', 'wp-to-diaspora' );
-			$default = sprintf( '%1$s <a href="%2$s" title="%3$s">%2$s</a>', $text, $permalink, $title );
-
-			/**
-			 * Filter the "Originally posted at" link at the bottom of the post.
-			 *
-			 * @since 1.5.4.1
-			 *
-			 * @param string $default   The whole HTML of the text and link to be outputted.
-			 * @param string $text      The "Originally posted at:" text before the link.
-			 * @param string $permalink The permalink of the original post.
-			 * @param string $title     The "Permalink" title of the link.
-			 */
-			$link = apply_filters( 'wp2d_posted_at_link_filter', $default, $text, $permalink, $title );
-
-			$link = '<p>' . $link . '</p>';
-		}
-
-		return $link;
-	}
-
-	/**
-	 * Save the details of the new diaspora* post to this post's history.
-	 *
-	 * @since 1.5.0
-	 *
-	 * @param object $response Response from the API containing the diaspora* post details.
-	 */
-	private function _save_to_history( $response ) {
-		// Make sure the post history is an array.
-		if ( empty( $this->post_history ) ) {
-			$this->post_history = array();
-		}
-
-		// Add a new entry to the history.
-		$this->post_history[] = array(
-			'id'         => $response->id,
-			'guid'       => $response->guid,
-			'created_at' => $this->post->post_modified,
-			'aspects'    => $this->aspects,
-			'nsfw'       => $response->nsfw,
-			'post_url'   => $response->permalink,
-		);
-
-		update_post_meta( $this->ID, '_wp_to_diaspora_post_history', $this->post_history );
-	}
-
-	/**
-	 * Return URL from [embed] shortcode instead of generated iframe.
-	 *
-	 * @since 1.5.0
-	 * @see WP_Embed::shortcode()
-	 *
-	 * @param mixed  $html The cached HTML result, stored in post meta.
-	 * @param string $url  The attempted embed URL.
-	 * @return string URL of the embed.
-	 */
-	public function embed_url( $html, $url ) {
-		return $url;
-	}
-
-	/**
-	 * Removes '[embed]' and '[/embed]' left by embed_url.
-	 *
-	 * @since 1.5.0
-	 * @todo It would be great to fix it using only one filter.
-	 *       It's happening because embed filter is being removed by remove_all_filters('the_content') on WP2D_Post::post().
-	 *
-	 * @param string $content Content of the post.
-	 * @return string The content with the embed tags removed.
-	 */
-	public function embed_remove( $content ) {
-		return str_replace( array( '[embed]', '[/embed]' ), array( '<p>', '</p>' ), $content );
-	}
-
-	/**
-	 * Prettify the image caption.
-	 *
-	 * @since 1.5.3
-	 *
-	 * @param string $caption Caption to be prettified.
-	 * @return string Prettified image caption.
-	 */
-	public function get_img_caption( $caption ) {
-		$caption = trim( $caption );
-		if ( '' === $caption ) {
-			return '';
-		}
-
-		$default = sprintf( '<blockquote>%s</blockquote>',  $caption );
-
-		/**
-		 * Filter the image caption to be displayed after images with captions.
-		 *
-		 * @since 1.5.3
-		 *
-		 * @param string $default The whole HTML of the caption.
-		 * @param string $caption The caption text.
-		 */
-		return apply_filters( 'wp2d_image_caption', $default, $caption );
-	}
-
-	/**
-	 * Filter the default caption shortcode output.
-	 *
-	 * @since 1.5.3
-	 * @see img_caption_shortcode()
-	 *
-	 * @param string $empty   The caption output. Default empty.
-	 * @param array  $attr    Attributes of the caption shortcode.
-	 * @param string $content The image element, possibly wrapped in a hyperlink.
-	 * @return string The caption shortcode output.
-	 */
-	public function custom_img_caption( $empty, $attr, $content ) {
-		$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'] );
-		}
-
-		return $content;
-	}
-
-	/**
-	 * Create a custom gallery caption output.
-	 *
-	 * @since 1.5.3
-	 *
-	 * @param   array $attr Gallery attributes.
-	 * @return  string
-	 */
-	public function custom_gallery_shortcode( $attr ) {
-		// Default value in WordPress.
-		$captiontag = ( current_theme_supports( 'html5', 'gallery' ) ) ? 'figcaption' : 'dd';
-
-		// User value.
-		if ( isset( $attr['captiontag'] ) ) {
-			$captiontag = $attr['captiontag'];
-		}
-
-		// Let WordPress create the regular gallery.
-		$gallery = gallery_shortcode( $attr );
-
-		// Change the content of the captions.
-		$gallery = preg_replace_callback(
-			'~(<' . $captiontag . '.*>)(.*)(</' . $captiontag . '>)~mUus',
-			array( $this, 'custom_gallery_regex_callback' ),
-			$gallery
-		);
-
-		return $gallery;
-	}
-
-	/**
-	 * Change the result of the regex match from custom_gallery_shortcode.
-	 *
-	 * @param array $m Regex matches.
-	 * @return string Prettified gallery image caption.
-	 */
-	public function custom_gallery_regex_callback( $m ) {
-		return $this->get_img_caption( $m[2] );
-	}
-
-	/*
+  /**
+   * The original post object.
+   *
+   * @var WP_Posts
+   * @since 1.5.0
+   */
+  public $post = null;
+
+  /**
+   * The original post ID.
+   *
+   * @var int
+   * @since 1.5.0
+   */
+  public $ID = null;
+
+  /**
+   * If this post should be shared on diaspora*.
+   *
+   * @var bool
+   * @since 1.5.0
+   */
+  public $post_to_diaspora = null;
+
+  /**
+   * If a link back to the original post should be added.
+   *
+   * @var bool
+   * @since 1.5.0
+   */
+  public $fullentrylink = null;
+
+  /**
+   * What content gets posted.
+   *
+   * @var string
+   * @since 1.5.0
+   */
+  public $display = null;
+
+  /**
+   * The types of tags to post. (global,custom,post)
+   *
+   * @var array
+   * @since 1.5.0
+   */
+  public $tags_to_post = null;
+
+  /**
+   * The post's custom tags.
+   *
+   * @var array
+   * @since 1.5.0
+   */
+  public $custom_tags = null;
+
+  /**
+   * Aspects this post gets posted to.
+   *
+   * @var array
+   * @since 1.5.0
+   */
+  public $aspects = null;
+
+  /**
+   * Services this post gets posted to.
+   *
+   * @var array
+   * @since 1.5.0
+   */
+  public $services = null;
+
+
+  /**
+   * The post's history of diaspora* posts.
+   *
+   * @var array
+   * @since 1.5.0
+   */
+  public $post_history = null;
+
+  /**
+   * If the post actions have all been set up already.
+   *
+   * @var boolean
+   * @since 1.5.0
+   */
+  private static $_is_set_up = false;
+
+  /**
+   * Setup all the necessary WP callbacks.
+   *
+   * @since 1.5.0
+   */
+  public static function setup() {
+    if ( self::$_is_set_up ) {
+      return;
+    }
+
+    $instance = new WP2D_Post( null );
+
+    // Notices when a post has been shared or if it has failed.
+    add_action( 'admin_notices', array( $instance, 'admin_notices' ) );
+    add_action( 'admin_init', array( $instance, 'ignore_post_error' ) );
+
+    // Handle diaspora* posting when saving the post.
+    add_action( 'save_post', array( $instance, 'post' ), 11, 2 );
+    add_action( 'save_post', array( $instance, 'save_meta_box_data' ), 10 );
+
+    // Add meta boxes.
+    add_action( 'add_meta_boxes', array( $instance, 'add_meta_boxes' ) );
+
+    self::$_is_set_up = true;
+  }
+
+  /**
+   * Constructor.
+   *
+   * @since 1.5.0
+   *
+   * @param int|WP_Post $post Post ID or the post itself.
+   */
+  public function __construct( $post ) {
+    $this->_assign_wp_post( $post );
+  }
+
+  /**
+   * Assign the original WP_Post object and all the custom meta data.
+   *
+   * @since 1.5.0
+   *
+   * @param int|WP_Post $post Post ID or the post itself.
+   */
+  private function _assign_wp_post( $post ) {
+    if ( $this->post = get_post( $post ) ) {
+      $this->ID = $this->post->ID;
+
+      $options = WP2D_Options::instance();
+
+      // Assign all meta values, expanding non-existent ones with the defaults.
+      $meta_current = get_post_meta( $this->ID, '_wp_to_diaspora', true );
+      $meta = wp_parse_args(
+        $meta_current,
+        $options->get_options()
+      );
+      if ( $meta ) {
+        foreach ( $meta as $key => $value ) {
+          $this->$key = $value;
+        }
+      }
+
+      // If no WP2D meta data has been saved yet, this post shouldn't be published.
+      // This can happen if existing posts (before WP2D) get updated externally, not through the post edit screen.
+      // Check gutobenn/wp-to-diaspora#91 for reference.
+      // Also, when we have a post scheduled for publishing, don't touch it.
+      // This is important when modifying scheduled posts using Quick Edit.
+      if ( ! in_array( $this->post->post_status, array( 'auto-draft', 'future' ) ) && ! $meta_current ) {
+        $this->post_to_diaspora = false;
+      }
+
+      $this->post_history = get_post_meta( $this->ID, '_wp_to_diaspora_post_history', true );
+    }
+  }
+
+  /**
+   * Post to diaspora* when saving a post.
+   *
+   * @since 1.5.0
+   *
+   * @todo Maybe somebody wants to share a password protected post to a closed aspect.
+   *
+   * @param integer $post_id ID of the post being saved.
+   * @param WP_Post $post    Post object being saved.
+   * @return boolean If the post was posted successfully.
+   */
+  public function post( $post_id, $post ) {
+    $this->_assign_wp_post( $post );
+
+    $options = WP2D_Options::instance();
+
+    // Is this post type enabled for posting?
+    if ( ! in_array( $post->post_type, $options->get_option( 'enabled_post_types' ) ) ) {
+      return false;
+    }
+
+    // Make sure we're posting to diaspora* and the post isn't password protected.
+    if ( ! ( $this->post_to_diaspora && 'publish' === $post->post_status && '' === $post->post_password ) ) {
+      return false;
+    }
+
+    $status_message = $this->_get_title_link();
+
+    // Post the full post text or just the excerpt?
+    if ( 'full' === $this->display ) {
+      $status_message .= $this->_get_full_content();
+    } else {
+      $status_message .= $this->_get_excerpt_content();
+    }
+
+    // Add the tags assigned to the post.
+    $status_message .= $this->_get_tags_to_add();
+
+    // Add the original entry link to the post?
+    $status_message .= $this->_get_posted_at_link();
+
+    $status_converter = new HtmlConverter( array( 'strip_tags' => true ) );
+    $status_message  = $status_converter->convert( $status_message );
+
+    // Set up the connection to diaspora*.
+    $api = WP2D_Helpers::api_quick_connect();
+    if ( ! empty( $status_message ) ) {
+      if ( $api->has_last_error() ) {
+        // Save the post error as post meta data, so we can display it to the user.
+        update_post_meta( $post_id, '_wp_to_diaspora_post_error', $api->get_last_error() );
+        return false;
+      }
+
+      // Add services to share to via diaspora*.
+      $extra_data = array(
+        'services' => $this->services,
+      );
+
+      // Try to post to diaspora*.
+      if ( $response = $api->post( $status_message, $this->aspects, $extra_data ) ) {
+        // Save certain diaspora* post data as meta data for future reference.
+        $this->_save_to_history( (object) $response );
+
+        // If there is still a previous post error around, remove it.
+        delete_post_meta( $post_id, '_wp_to_diaspora_post_error' );
+
+        // 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;
+        update_post_meta( $post_id, '_wp_to_diaspora', $meta );
+      }
+    } else {
+      return false;
+    }
+  }
+
+  /**
+   * Get the title of the post linking to the post itself.
+   *
+   * @since 1.5.0
+   *
+   * @return string Post title as a link.
+   */
+  private function _get_title_link() {
+    $title = esc_html( $this->post->post_title );
+    $permalink = get_permalink( $this->ID );
+    $default = sprintf( '<strong><a href="%2$s" title="%2$s">%1$s</a></strong>', $title, $permalink );
+
+    /**
+     * Filter the title link at the top of the post.
+     *
+     * @since 1.5.4.1
+     *
+     * @param string $default   The whole HTML of the title link to be outputted.
+     * @param string $title     The title of the original post.
+     * @param string $permalink The permalink of the original post.
+     */
+    $link = apply_filters( 'wp2d_title_filter', $default, $title, $permalink );
+
+    return '<p>' . $link . '</p>';
+  }
+
+  /**
+   * Get the full post content with only default filters applied.
+   *
+   * @since 1.5.0
+   *
+   * @return string The full post content.
+   */
+  private function _get_full_content() {
+    // Only allow certain shortcodes.
+    global $shortcode_tags;
+    $shortcode_tags_bkp = array();
+
+    foreach ( $shortcode_tags as $shortcode_tag => $shortcode_function ) {
+      if ( ! in_array( $shortcode_tag, apply_filters( 'wp2d_shortcodes_filter', array( 'wp_caption', 'caption', 'gallery' ) ) ) ) {
+        $shortcode_tags_bkp[ $shortcode_tag ] = $shortcode_function;
+        unset( $shortcode_tags[ $shortcode_tag ] );
+      }
+    }
+
+    // Disable all filters and then enable only defaults. This prevents additional filters from being posted to diaspora*.
+    remove_all_filters( 'the_content' );
+    foreach ( apply_filters( 'wp2d_content_filters_filter', array( 'do_shortcode', 'wptexturize', 'convert_smilies', 'convert_chars', 'wpautop', 'shortcode_unautop', 'prepend_attachment', array( $this, 'embed_remove' ) ) ) as $filter ) {
+      add_filter( 'the_content', $filter );
+    }
+
+    // Extract URLs from [embed] shortcodes.
+    add_filter( 'embed_oembed_html', array( $this, 'embed_url' ), 10, 2 );
+
+    // Add the pretty caption after the images.
+    add_filter( 'img_caption_shortcode', array( $this, 'custom_img_caption' ), 10, 3 );
+
+    // Overwrite the native shortcode handler to add pretty captions.
+    // http://wordpress.stackexchange.com/a/74675/54456 for explanation.
+    add_shortcode( 'gallery', array( $this, 'custom_gallery_shortcode' ) );
+
+    $full_content = apply_filters( 'the_content', $this->post->post_content );
+
+    // Put the removed shortcode tags back again.
+    $shortcode_tags += $shortcode_tags_bkp;
+
+    return $full_content;
+  }
+
+  /**
+   * Get the post's excerpt in a nice format.
+   *
+   * @since 1.5.0
+   *
+   * @return string Post's excerpt.
+   */
+  private function _get_excerpt_content() {
+    // Look for the excerpt in the following order:
+    // 1. Custom post excerpt.
+    // 2. Text up to the <!--more--> tag.
+    // 3. Manually trimmed content.
+    $content = $this->post->post_content;
+    $excerpt = $this->post->post_excerpt;
+    if ( '' === $excerpt ) {
+      if ( $more_pos = strpos( $content, '<!--more' ) ) {
+        $excerpt = substr( $content, 0, $more_pos );
+      } else {
+        $excerpt = wp_trim_words( $content, 42, '[...]' );
+      }
+    }
+    return '<p>' . $excerpt . '</p>';
+  }
+
+  /**
+   * Get a string of tags that have been added to the post.
+   *
+   * @since 1.5.0
+   *
+   * @return string Tags added to the post.
+   */
+  private function _get_tags_to_add() {
+    $options = WP2D_Options::instance();
+    $tags_to_post = $this->tags_to_post;
+    $tags_to_add  = '';
+
+    // Add any diaspora* tags?
+    if ( ! empty( $tags_to_post ) ) {
+      // The diaspora* tags to add to the post.
+      $diaspora_tags = array();
+
+      // Add global tags?
+      $global_tags = $options->get_option( 'global_tags' );
+      if ( in_array( 'global', $tags_to_post ) && is_array( $global_tags ) ) {
+        $diaspora_tags += array_flip( $global_tags );
+      }
+
+      // Add custom tags?
+      if ( in_array( 'custom', $tags_to_post ) && is_array( $this->custom_tags ) ) {
+        $diaspora_tags += array_flip( $this->custom_tags );
+      }
+
+      // Add post tags?
+      $post_tags = wp_get_post_tags( $this->ID, array( 'fields' => 'slugs' ) );
+      if ( in_array( 'post', $tags_to_post ) && is_array( $post_tags ) ) {
+        $diaspora_tags += array_flip( $post_tags );
+      }
+
+      // Get an array of cleaned up tags.
+      // NOTE: Validate method needs a variable, as it's passed by reference!
+      $diaspora_tags = array_keys( $diaspora_tags );
+      $options->validate_tags( $diaspora_tags );
+
+      // Get all the tags and list them all nicely in a row.
+      $diaspora_tags_clean = array();
+      foreach ( $diaspora_tags as $tag ) {
+        $diaspora_tags_clean[] = '#' . $tag;
+      }
+
+      // Add all the found tags.
+      if ( ! empty( $diaspora_tags_clean ) ) {
+        $tags_to_add = implode( ' ', $diaspora_tags_clean ) . '<br />';
+      }
+    }
+
+    return $tags_to_add;
+  }
+
+  /**
+   * Get the link to the original post.
+   *
+   * @since 1.5.0
+   *
+   * @return string Original post link.
+   */
+  private function _get_posted_at_link() {
+    $link = '';
+    if ( $this->fullentrylink ) {
+
+      $text = esc_html( 'Originally posted at:', 'wp-to-diaspora' );
+      $permalink = get_permalink( $this->ID );
+      $title = esc_html( 'Permalink', 'wp-to-diaspora' );
+      $default = sprintf( '%1$s <a href="%2$s" title="%3$s">%2$s</a>', $text, $permalink, $title );
+
+      /**
+       * Filter the "Originally posted at" link at the bottom of the post.
+       *
+       * @since 1.5.4.1
+       *
+       * @param string $default   The whole HTML of the text and link to be outputted.
+       * @param string $text      The "Originally posted at:" text before the link.
+       * @param string $permalink The permalink of the original post.
+       * @param string $title     The "Permalink" title of the link.
+       */
+      $link = apply_filters( 'wp2d_posted_at_link_filter', $default, $text, $permalink, $title );
+
+      $link = '<p>' . $link . '</p>';
+    }
+
+    return $link;
+  }
+
+  /**
+   * Save the details of the new diaspora* post to this post's history.
+   *
+   * @since 1.5.0
+   *
+   * @param object $response Response from the API containing the diaspora* post details.
+   */
+  private function _save_to_history( $response ) {
+    // Make sure the post history is an array.
+    if ( empty( $this->post_history ) ) {
+      $this->post_history = array();
+    }
+
+    // Add a new entry to the history.
+    $this->post_history[] = array(
+      'id'         => $response->id,
+      'guid'       => $response->guid,
+      'created_at' => $this->post->post_modified,
+      'aspects'    => $this->aspects,
+      'nsfw'       => $response->nsfw,
+      'post_url'   => $response->permalink,
+    );
+
+    update_post_meta( $this->ID, '_wp_to_diaspora_post_history', $this->post_history );
+  }
+
+  /**
+   * Return URL from [embed] shortcode instead of generated iframe.
+   *
+   * @since 1.5.0
+   * @see WP_Embed::shortcode()
+   *
+   * @param mixed  $html The cached HTML result, stored in post meta.
+   * @param string $url  The attempted embed URL.
+   * @return string URL of the embed.
+   */
+  public function embed_url( $html, $url ) {
+    return $url;
+  }
+
+  /**
+   * Removes '[embed]' and '[/embed]' left by embed_url.
+   *
+   * @since 1.5.0
+   * @todo It would be great to fix it using only one filter.
+   *       It's happening because embed filter is being removed by remove_all_filters('the_content') on WP2D_Post::post().
+   *
+   * @param string $content Content of the post.
+   * @return string The content with the embed tags removed.
+   */
+  public function embed_remove( $content ) {
+    return str_replace( array( '[embed]', '[/embed]' ), array( '<p>', '</p>' ), $content );
+  }
+
+  /**
+   * Prettify the image caption.
+   *
+   * @since 1.5.3
+   *
+   * @param string $caption Caption to be prettified.
+   * @return string Prettified image caption.
+   */
+  public function get_img_caption( $caption ) {
+    $caption = trim( $caption );
+    if ( '' === $caption ) {
+      return '';
+    }
+
+    $default = sprintf( '<blockquote>%s</blockquote>',  $caption );
+
+    /**
+     * Filter the image caption to be displayed after images with captions.
+     *
+     * @since 1.5.3
+     *
+     * @param string $default The whole HTML of the caption.
+     * @param string $caption The caption text.
+     */
+    return apply_filters( 'wp2d_image_caption', $default, $caption );
+  }
+
+  /**
+   * Filter the default caption shortcode output.
+   *
+   * @since 1.5.3
+   * @see img_caption_shortcode()
+   *
+   * @param string $empty   The caption output. Default empty.
+   * @param array  $attr    Attributes of the caption shortcode.
+   * @param string $content The image element, possibly wrapped in a hyperlink.
+   * @return string The caption shortcode output.
+   */
+  public function custom_img_caption( $empty, $attr, $content ) {
+    $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'] );
+    }
+
+    return $content;
+  }
+
+  /**
+   * Create a custom gallery caption output.
+   *
+   * @since 1.5.3
+   *
+   * @param   array $attr Gallery attributes.
+   * @return  string
+   */
+  public function custom_gallery_shortcode( $attr ) {
+    // Default value in WordPress.
+    $captiontag = ( current_theme_supports( 'html5', 'gallery' ) ) ? 'figcaption' : 'dd';
+
+    // User value.
+    if ( isset( $attr['captiontag'] ) ) {
+      $captiontag = $attr['captiontag'];
+    }
+
+    // Let WordPress create the regular gallery.
+    $gallery = gallery_shortcode( $attr );
+
+    // Change the content of the captions.
+    $gallery = preg_replace_callback(
+      '~(<' . $captiontag . '.*>)(.*)(</' . $captiontag . '>)~mUus',
+      array( $this, 'custom_gallery_regex_callback' ),
+      $gallery
+    );
+
+    return $gallery;
+  }
+
+  /**
+   * Change the result of the regex match from custom_gallery_shortcode.
+   *
+   * @param array $m Regex matches.
+   * @return string Prettified gallery image caption.
+   */
+  public function custom_gallery_regex_callback( $m ) {
+    return $this->get_img_caption( $m[2] );
+  }
+
+  /*
 	 * META BOX
 	 */
 
-	/**
-	 * Adds a meta box to the main column on the enabled Post Types' edit screens.
-	 *
-	 * @since 1.5.0
-	 */
-	public function add_meta_boxes() {
-		$options = WP2D_Options::instance();
-		foreach ( $options->get_option( 'enabled_post_types' ) as $post_type ) {
-			add_meta_box(
-				'wp_to_diaspora_meta_box',
-				'WP to diaspora*',
-				array( $this, 'meta_box_render' ),
-				$post_type,
-				'side',
-				'high'
-			);
-		}
-	}
-
-	/**
-	 * Prints the meta box content.
-	 *
-	 * @since 1.5.0
-	 *
-	 * @param WP_Post $post The object for the current post.
-	 */
-	public function meta_box_render( $post ) {
-		$this->_assign_wp_post( $post );
-
-		// Add an nonce field so we can check for it later.
-		wp_nonce_field( 'wp_to_diaspora_meta_box', 'wp_to_diaspora_meta_box_nonce' );
-
-		// Get the default values to use, but give priority to the meta data already set.
-		$options = WP2D_Options::instance();
-
-		// Make sure we have some value for post meta fields.
-		$this->custom_tags = $this->custom_tags ?: array();
-
-		// 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  ?: array();
-		$this->services         = $this->services ?: array();
-
-		// Have we already posted on diaspora*?
-		if ( is_array( $this->post_history ) ) {
-			$latest_post = end( $this->post_history );
-			?>
+  /**
+   * Adds a meta box to the main column on the enabled Post Types' edit screens.
+   *
+   * @since 1.5.0
+   */
+  public function add_meta_boxes() {
+    $options = WP2D_Options::instance();
+    foreach ( $options->get_option( 'enabled_post_types' ) as $post_type ) {
+      add_meta_box(
+        'wp_to_diaspora_meta_box',
+        'WP to diaspora*',
+        array( $this, 'meta_box_render' ),
+        $post_type,
+        'side',
+        'high'
+      );
+    }
+  }
+
+  /**
+   * Prints the meta box content.
+   *
+   * @since 1.5.0
+   *
+   * @param WP_Post $post The object for the current post.
+   */
+  public function meta_box_render( $post ) {
+    $this->_assign_wp_post( $post );
+
+    // Add an nonce field so we can check for it later.
+    wp_nonce_field( 'wp_to_diaspora_meta_box', 'wp_to_diaspora_meta_box_nonce' );
+
+    // Get the default values to use, but give priority to the meta data already set.
+    $options = WP2D_Options::instance();
+
+    // Make sure we have some value for post meta fields.
+    $this->custom_tags = $this->custom_tags ?: array();
+
+    // 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  ?: array();
+    $this->services         = $this->services ?: array();
+
+    // 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>
 			<?php
-		}
-		?>
+    }
+    ?>
 
 		<p><?php $options->post_to_diaspora_render( $this->post_to_diaspora ); ?></p>
 		<p><?php $options->fullentrylink_render( $this->fullentrylink ); ?></p>
@@ -647,133 +647,133 @@ 
 		<p><?php $options->aspects_services_render( array( 'services', $this->services ) ); ?></p>
 
 		<?php
-	}
-
-	/**
-	 * When the post is saved, save our meta data.
-	 *
-	 * @since 1.5.0
-	 *
-	 * @param integer $post_id The ID of the post being saved.
-	 */
-	public function save_meta_box_data( $post_id ) {
-		/*
+  }
+
+  /**
+   * When the post is saved, save our meta data.
+   *
+   * @since 1.5.0
+   *
+   * @param integer $post_id The ID of the post being saved.
+   */
+  public function save_meta_box_data( $post_id ) {
+    /*
 		 * We need to verify this came from our screen and with proper authorization,
 		 * because the save_post action can be triggered at other times.
 		 */
-		if ( ! $this->_is_safe_to_save() ) {
-			return;
-		}
-
-		/* OK, it's safe for us to save the data now. */
-
-		// Meta data to save.
-		$meta_to_save = $_POST['wp_to_diaspora_settings'];
-		$options = WP2D_Options::instance();
-
-		// Checkboxes.
-		$options->validate_checkboxes( array( 'post_to_diaspora', 'fullentrylink' ), $meta_to_save );
-
-		// Single Selects.
-		$options->validate_single_selects( 'display', $meta_to_save );
-
-		// Multiple Selects.
-		$options->validate_multi_selects( 'tags_to_post', $meta_to_save );
-
-		// Save custom tags as array.
-		$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'], array( 'public' ) );
-
-		// Clean up the list of 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 );
-	}
-
-	/**
-	 * Perform all checks to see if we are allowed to save the meta data.
-	 *
-	 * @since 1.5.0
-	 *
-	 * @return boolean If the verification checks have passed.
-	 */
-	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' ) ) ) {
-			return false;
-		}
-
-		// If this is an autosave, our form has not been submitted, so we don't want to do anything.
-		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
-			return false;
-		}
-
-		// Check the user's permissions.
-		$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'] ) ) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Add admin notices when a post gets displayed.
-	 *
-	 * @since 1.5.0
-	 *
-	 * @todo Ignore post error with AJAX.
-	 */
-	public function admin_notices() {
-		global $post, $pagenow;
-		if ( ! $post || 'post.php' !== $pagenow ) {
-			return;
-		}
-
-		if ( ( $error = get_post_meta( $post->ID, '_wp_to_diaspora_post_error', true ) ) && is_wp_error( $error ) ) {
-			// Are we adding a help tab link to this notice?
-			$help_link = WP2D_Contextual_Help::get_help_tab_quick_link( $error );
-
-			// This notice will only be shown if posting to diaspora* has failed.
-			printf( '<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,
-				esc_url( add_query_arg( 'wp2d_ignore_post_error', '' ) ),
-				esc_html__( 'Ignore', 'wp-to-diaspora' )
-			);
-		} elseif ( ( $diaspora_post_history = get_post_meta( $post->ID, '_wp_to_diaspora_post_history', true ) ) && is_array( $diaspora_post_history ) ) {
-			// Get the latest post from the history.
-			$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'] ) {
-				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_html__( 'View Post' )
-				);
-			}
-		}
-	}
-
-	/**
-	 * Delete the error post meta data if it gets ignored.
-	 *
-	 * @since 1.5.0
-	 */
-	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 ( ! $this->_is_safe_to_save() ) {
+      return;
+    }
+
+    /* OK, it's safe for us to save the data now. */
+
+    // Meta data to save.
+    $meta_to_save = $_POST['wp_to_diaspora_settings'];
+    $options = WP2D_Options::instance();
+
+    // Checkboxes.
+    $options->validate_checkboxes( array( 'post_to_diaspora', 'fullentrylink' ), $meta_to_save );
+
+    // Single Selects.
+    $options->validate_single_selects( 'display', $meta_to_save );
+
+    // Multiple Selects.
+    $options->validate_multi_selects( 'tags_to_post', $meta_to_save );
+
+    // Save custom tags as array.
+    $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'], array( 'public' ) );
+
+    // Clean up the list of 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 );
+  }
+
+  /**
+   * Perform all checks to see if we are allowed to save the meta data.
+   *
+   * @since 1.5.0
+   *
+   * @return boolean If the verification checks have passed.
+   */
+  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' ) ) ) {
+      return false;
+    }
+
+    // If this is an autosave, our form has not been submitted, so we don't want to do anything.
+    if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+      return false;
+    }
+
+    // Check the user's permissions.
+    $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'] ) ) {
+      return false;
+    }
+
+    return true;
+  }
+
+  /**
+   * Add admin notices when a post gets displayed.
+   *
+   * @since 1.5.0
+   *
+   * @todo Ignore post error with AJAX.
+   */
+  public function admin_notices() {
+    global $post, $pagenow;
+    if ( ! $post || 'post.php' !== $pagenow ) {
+      return;
+    }
+
+    if ( ( $error = get_post_meta( $post->ID, '_wp_to_diaspora_post_error', true ) ) && is_wp_error( $error ) ) {
+      // Are we adding a help tab link to this notice?
+      $help_link = WP2D_Contextual_Help::get_help_tab_quick_link( $error );
+
+      // This notice will only be shown if posting to diaspora* has failed.
+      printf( '<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,
+        esc_url( add_query_arg( 'wp2d_ignore_post_error', '' ) ),
+        esc_html__( 'Ignore', 'wp-to-diaspora' )
+      );
+    } elseif ( ( $diaspora_post_history = get_post_meta( $post->ID, '_wp_to_diaspora_post_history', true ) ) && is_array( $diaspora_post_history ) ) {
+      // Get the latest post from the history.
+      $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'] ) {
+        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_html__( 'View Post' )
+        );
+      }
+    }
+  }
+
+  /**
+   * Delete the error post meta data if it gets ignored.
+   *
+   * @since 1.5.0
+   */
+  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' );
+    }
+  }
 }

Spacing +146 added lines, -146 removed lines

@@ -7,7 +7,7 @@ 
  */
 
 // Exit if accessed directly.
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 use League\HTMLToMarkdown\HtmlConverter;
 
@@ -113,22 +113,22 @@ 
 	 * @since 1.5.0
 	 */
 	public static function setup() {
-		if ( self::$_is_set_up ) {
+		if (self::$_is_set_up) {
 			return;
 		}
 
-		$instance = new WP2D_Post( null );
+		$instance = new WP2D_Post(null);
 
 		// Notices when a post has been shared or if it has failed.
-		add_action( 'admin_notices', array( $instance, 'admin_notices' ) );
-		add_action( 'admin_init', array( $instance, 'ignore_post_error' ) );
+		add_action('admin_notices', array($instance, 'admin_notices'));
+		add_action('admin_init', array($instance, 'ignore_post_error'));
 
 		// Handle diaspora* posting when saving the post.
-		add_action( 'save_post', array( $instance, 'post' ), 11, 2 );
-		add_action( 'save_post', array( $instance, 'save_meta_box_data' ), 10 );
+		add_action('save_post', array($instance, 'post'), 11, 2);
+		add_action('save_post', array($instance, 'save_meta_box_data'), 10);
 
 		// Add meta boxes.
-		add_action( 'add_meta_boxes', array( $instance, 'add_meta_boxes' ) );
+		add_action('add_meta_boxes', array($instance, 'add_meta_boxes'));
 
 		self::$_is_set_up = true;
 	}
@@ -140,8 +140,8 @@ 
 	 *
 	 * @param int|WP_Post $post Post ID or the post itself.
 	 */
-	public function __construct( $post ) {
-		$this->_assign_wp_post( $post );
+	public function __construct($post) {
+		$this->_assign_wp_post($post);
 	}
 
 	/**
@@ -151,20 +151,20 @@ 
 	 *
 	 * @param int|WP_Post $post Post ID or the post itself.
 	 */
-	private function _assign_wp_post( $post ) {
-		if ( $this->post = get_post( $post ) ) {
+	private function _assign_wp_post($post) {
+		if ($this->post = get_post($post)) {
 			$this->ID = $this->post->ID;
 
 			$options = WP2D_Options::instance();
 
 			// Assign all meta values, expanding non-existent ones with the defaults.
-			$meta_current = get_post_meta( $this->ID, '_wp_to_diaspora', true );
+			$meta_current = get_post_meta($this->ID, '_wp_to_diaspora', true);
 			$meta = wp_parse_args(
 				$meta_current,
 				$options->get_options()
 			);
-			if ( $meta ) {
-				foreach ( $meta as $key => $value ) {
+			if ($meta) {
+				foreach ($meta as $key => $value) {
 					$this->$key = $value;
 				}
 			}
@@ -174,11 +174,11 @@ 
 			// Check gutobenn/wp-to-diaspora#91 for reference.
 			// Also, when we have a post scheduled for publishing, don't touch it.
 			// This is important when modifying scheduled posts using Quick Edit.
-			if ( ! in_array( $this->post->post_status, array( 'auto-draft', 'future' ) ) && ! $meta_current ) {
+			if ( ! in_array($this->post->post_status, array('auto-draft', 'future')) && ! $meta_current) {
 				$this->post_to_diaspora = false;
 			}
 
-			$this->post_history = get_post_meta( $this->ID, '_wp_to_diaspora_post_history', true );
+			$this->post_history = get_post_meta($this->ID, '_wp_to_diaspora_post_history', true);
 		}
 	}
 
@@ -193,25 +193,25 @@ 
 	 * @param WP_Post $post    Post object being saved.
 	 * @return boolean If the post was posted successfully.
 	 */
-	public function post( $post_id, $post ) {
-		$this->_assign_wp_post( $post );
+	public function post($post_id, $post) {
+		$this->_assign_wp_post($post);
 
 		$options = WP2D_Options::instance();
 
 		// Is this post type enabled for posting?
-		if ( ! in_array( $post->post_type, $options->get_option( 'enabled_post_types' ) ) ) {
+		if ( ! in_array($post->post_type, $options->get_option('enabled_post_types'))) {
 			return false;
 		}
 
 		// Make sure we're posting to diaspora* and the post isn't password protected.
-		if ( ! ( $this->post_to_diaspora && 'publish' === $post->post_status && '' === $post->post_password ) ) {
+		if ( ! ($this->post_to_diaspora && 'publish' === $post->post_status && '' === $post->post_password)) {
 			return false;
 		}
 
 		$status_message = $this->_get_title_link();
 
 		// Post the full post text or just the excerpt?
-		if ( 'full' === $this->display ) {
+		if ('full' === $this->display) {
 			$status_message .= $this->_get_full_content();
 		} else {
 			$status_message .= $this->_get_excerpt_content();
@@ -223,15 +223,15 @@ 
 		// Add the original entry link to the post?
 		$status_message .= $this->_get_posted_at_link();
 
-		$status_converter = new HtmlConverter( array( 'strip_tags' => true ) );
-		$status_message  = $status_converter->convert( $status_message );
+		$status_converter = new HtmlConverter(array('strip_tags' => true));
+		$status_message  = $status_converter->convert($status_message);
 
 		// Set up the connection to diaspora*.
 		$api = WP2D_Helpers::api_quick_connect();
-		if ( ! empty( $status_message ) ) {
-			if ( $api->has_last_error() ) {
+		if ( ! empty($status_message)) {
+			if ($api->has_last_error()) {
 				// Save the post error as post meta data, so we can display it to the user.
-				update_post_meta( $post_id, '_wp_to_diaspora_post_error', $api->get_last_error() );
+				update_post_meta($post_id, '_wp_to_diaspora_post_error', $api->get_last_error());
 				return false;
 			}
 
@@ -241,17 +241,17 @@ 
 			);
 
 			// Try to post to diaspora*.
-			if ( $response = $api->post( $status_message, $this->aspects, $extra_data ) ) {
+			if ($response = $api->post($status_message, $this->aspects, $extra_data)) {
 				// Save certain diaspora* post data as meta data for future reference.
-				$this->_save_to_history( (object) $response );
+				$this->_save_to_history((object) $response);
 
 				// If there is still a previous post error around, remove it.
-				delete_post_meta( $post_id, '_wp_to_diaspora_post_error' );
+				delete_post_meta($post_id, '_wp_to_diaspora_post_error');
 
 				// Unset post_to_diaspora meta field to prevent mistakenly republishing to diaspora*.
-				$meta = get_post_meta( $post_id, '_wp_to_diaspora', true );
+				$meta = get_post_meta($post_id, '_wp_to_diaspora', true);
 				$meta['post_to_diaspora'] = false;
-				update_post_meta( $post_id, '_wp_to_diaspora', $meta );
+				update_post_meta($post_id, '_wp_to_diaspora', $meta);
 			}
 		} else {
 			return false;
@@ -266,9 +266,9 @@ 
 	 * @return string Post title as a link.
 	 */
 	private function _get_title_link() {
-		$title = esc_html( $this->post->post_title );
-		$permalink = get_permalink( $this->ID );
-		$default = sprintf( '<strong><a href="%2$s" title="%2$s">%1$s</a></strong>', $title, $permalink );
+		$title = esc_html($this->post->post_title);
+		$permalink = get_permalink($this->ID);
+		$default = sprintf('<strong><a href="%2$s" title="%2$s">%1$s</a></strong>', $title, $permalink);
 
 		/**
 		 * Filter the title link at the top of the post.
@@ -279,9 +279,9 @@ 
 		 * @param string $title     The title of the original post.
 		 * @param string $permalink The permalink of the original post.
 		 */
-		$link = apply_filters( 'wp2d_title_filter', $default, $title, $permalink );
+		$link = apply_filters('wp2d_title_filter', $default, $title, $permalink);
 
-		return '<p>' . $link . '</p>';
+		return '<p>'.$link.'</p>';
 	}
 
 	/**
@@ -296,30 +296,30 @@ 
 		global $shortcode_tags;
 		$shortcode_tags_bkp = array();
 
-		foreach ( $shortcode_tags as $shortcode_tag => $shortcode_function ) {
-			if ( ! in_array( $shortcode_tag, apply_filters( 'wp2d_shortcodes_filter', array( 'wp_caption', 'caption', 'gallery' ) ) ) ) {
-				$shortcode_tags_bkp[ $shortcode_tag ] = $shortcode_function;
-				unset( $shortcode_tags[ $shortcode_tag ] );
+		foreach ($shortcode_tags as $shortcode_tag => $shortcode_function) {
+			if ( ! in_array($shortcode_tag, apply_filters('wp2d_shortcodes_filter', array('wp_caption', 'caption', 'gallery')))) {
+				$shortcode_tags_bkp[$shortcode_tag] = $shortcode_function;
+				unset($shortcode_tags[$shortcode_tag]);
 			}
 		}
 
 		// Disable all filters and then enable only defaults. This prevents additional filters from being posted to diaspora*.
-		remove_all_filters( 'the_content' );
-		foreach ( apply_filters( 'wp2d_content_filters_filter', array( 'do_shortcode', 'wptexturize', 'convert_smilies', 'convert_chars', 'wpautop', 'shortcode_unautop', 'prepend_attachment', array( $this, 'embed_remove' ) ) ) as $filter ) {
-			add_filter( 'the_content', $filter );
+		remove_all_filters('the_content');
+		foreach (apply_filters('wp2d_content_filters_filter', array('do_shortcode', 'wptexturize', 'convert_smilies', 'convert_chars', 'wpautop', 'shortcode_unautop', 'prepend_attachment', array($this, 'embed_remove'))) as $filter) {
+			add_filter('the_content', $filter);
 		}
 
 		// Extract URLs from [embed] shortcodes.
-		add_filter( 'embed_oembed_html', array( $this, 'embed_url' ), 10, 2 );
+		add_filter('embed_oembed_html', array($this, 'embed_url'), 10, 2);
 
 		// Add the pretty caption after the images.
-		add_filter( 'img_caption_shortcode', array( $this, 'custom_img_caption' ), 10, 3 );
+		add_filter('img_caption_shortcode', array($this, 'custom_img_caption'), 10, 3);
 
 		// Overwrite the native shortcode handler to add pretty captions.
 		// http://wordpress.stackexchange.com/a/74675/54456 for explanation.
-		add_shortcode( 'gallery', array( $this, 'custom_gallery_shortcode' ) );
+		add_shortcode('gallery', array($this, 'custom_gallery_shortcode'));
 
-		$full_content = apply_filters( 'the_content', $this->post->post_content );
+		$full_content = apply_filters('the_content', $this->post->post_content);
 
 		// Put the removed shortcode tags back again.
 		$shortcode_tags += $shortcode_tags_bkp;
@@ -341,14 +341,14 @@ 
 		// 3. Manually trimmed content.
 		$content = $this->post->post_content;
 		$excerpt = $this->post->post_excerpt;
-		if ( '' === $excerpt ) {
-			if ( $more_pos = strpos( $content, '<!--more' ) ) {
-				$excerpt = substr( $content, 0, $more_pos );
+		if ('' === $excerpt) {
+			if ($more_pos = strpos($content, '<!--more')) {
+				$excerpt = substr($content, 0, $more_pos);
 			} else {
-				$excerpt = wp_trim_words( $content, 42, '[...]' );
+				$excerpt = wp_trim_words($content, 42, '[...]');
 			}
 		}
-		return '<p>' . $excerpt . '</p>';
+		return '<p>'.$excerpt.'</p>';
 	}
 
 	/**
@@ -364,41 +364,41 @@ 
 		$tags_to_add  = '';
 
 		// Add any diaspora* tags?
-		if ( ! empty( $tags_to_post ) ) {
+		if ( ! empty($tags_to_post)) {
 			// The diaspora* tags to add to the post.
 			$diaspora_tags = array();
 
 			// Add global tags?
-			$global_tags = $options->get_option( 'global_tags' );
-			if ( in_array( 'global', $tags_to_post ) && is_array( $global_tags ) ) {
-				$diaspora_tags += array_flip( $global_tags );
+			$global_tags = $options->get_option('global_tags');
+			if (in_array('global', $tags_to_post) && is_array($global_tags)) {
+				$diaspora_tags += array_flip($global_tags);
 			}
 
 			// Add custom tags?
-			if ( in_array( 'custom', $tags_to_post ) && is_array( $this->custom_tags ) ) {
-				$diaspora_tags += array_flip( $this->custom_tags );
+			if (in_array('custom', $tags_to_post) && is_array($this->custom_tags)) {
+				$diaspora_tags += array_flip($this->custom_tags);
 			}
 
 			// Add post tags?
-			$post_tags = wp_get_post_tags( $this->ID, array( 'fields' => 'slugs' ) );
-			if ( in_array( 'post', $tags_to_post ) && is_array( $post_tags ) ) {
-				$diaspora_tags += array_flip( $post_tags );
+			$post_tags = wp_get_post_tags($this->ID, array('fields' => 'slugs'));
+			if (in_array('post', $tags_to_post) && is_array($post_tags)) {
+				$diaspora_tags += array_flip($post_tags);
 			}
 
 			// Get an array of cleaned up tags.
 			// NOTE: Validate method needs a variable, as it's passed by reference!
-			$diaspora_tags = array_keys( $diaspora_tags );
-			$options->validate_tags( $diaspora_tags );
+			$diaspora_tags = array_keys($diaspora_tags);
+			$options->validate_tags($diaspora_tags);
 
 			// Get all the tags and list them all nicely in a row.
 			$diaspora_tags_clean = array();
-			foreach ( $diaspora_tags as $tag ) {
-				$diaspora_tags_clean[] = '#' . $tag;
+			foreach ($diaspora_tags as $tag) {
+				$diaspora_tags_clean[] = '#'.$tag;
 			}
 
 			// Add all the found tags.
-			if ( ! empty( $diaspora_tags_clean ) ) {
-				$tags_to_add = implode( ' ', $diaspora_tags_clean ) . '<br />';
+			if ( ! empty($diaspora_tags_clean)) {
+				$tags_to_add = implode(' ', $diaspora_tags_clean).'<br />';
 			}
 		}
 
@@ -414,12 +414,12 @@ 
 	 */
 	private function _get_posted_at_link() {
 		$link = '';
-		if ( $this->fullentrylink ) {
+		if ($this->fullentrylink) {
 
-			$text = esc_html( 'Originally posted at:', 'wp-to-diaspora' );
-			$permalink = get_permalink( $this->ID );
-			$title = esc_html( 'Permalink', 'wp-to-diaspora' );
-			$default = sprintf( '%1$s <a href="%2$s" title="%3$s">%2$s</a>', $text, $permalink, $title );
+			$text = esc_html('Originally posted at:', 'wp-to-diaspora');
+			$permalink = get_permalink($this->ID);
+			$title = esc_html('Permalink', 'wp-to-diaspora');
+			$default = sprintf('%1$s <a href="%2$s" title="%3$s">%2$s</a>', $text, $permalink, $title);
 
 			/**
 			 * Filter the "Originally posted at" link at the bottom of the post.
@@ -431,9 +431,9 @@ 
 			 * @param string $permalink The permalink of the original post.
 			 * @param string $title     The "Permalink" title of the link.
 			 */
-			$link = apply_filters( 'wp2d_posted_at_link_filter', $default, $text, $permalink, $title );
+			$link = apply_filters('wp2d_posted_at_link_filter', $default, $text, $permalink, $title);
 
-			$link = '<p>' . $link . '</p>';
+			$link = '<p>'.$link.'</p>';
 		}
 
 		return $link;
@@ -446,9 +446,9 @@ 
 	 *
 	 * @param object $response Response from the API containing the diaspora* post details.
 	 */
-	private function _save_to_history( $response ) {
+	private function _save_to_history($response) {
 		// Make sure the post history is an array.
-		if ( empty( $this->post_history ) ) {
+		if (empty($this->post_history)) {
 			$this->post_history = array();
 		}
 
@@ -462,7 +462,7 @@ 
 			'post_url'   => $response->permalink,
 		);
 
-		update_post_meta( $this->ID, '_wp_to_diaspora_post_history', $this->post_history );
+		update_post_meta($this->ID, '_wp_to_diaspora_post_history', $this->post_history);
 	}
 
 	/**
@@ -475,7 +475,7 @@ 
 	 * @param string $url  The attempted embed URL.
 	 * @return string URL of the embed.
 	 */
-	public function embed_url( $html, $url ) {
+	public function embed_url($html, $url) {
 		return $url;
 	}
 
@@ -489,8 +489,8 @@ 
 	 * @param string $content Content of the post.
 	 * @return string The content with the embed tags removed.
 	 */
-	public function embed_remove( $content ) {
-		return str_replace( array( '[embed]', '[/embed]' ), array( '<p>', '</p>' ), $content );
+	public function embed_remove($content) {
+		return str_replace(array('[embed]', '[/embed]'), array('<p>', '</p>'), $content);
 	}
 
 	/**
@@ -501,13 +501,13 @@ 
 	 * @param string $caption Caption to be prettified.
 	 * @return string Prettified image caption.
 	 */
-	public function get_img_caption( $caption ) {
-		$caption = trim( $caption );
-		if ( '' === $caption ) {
+	public function get_img_caption($caption) {
+		$caption = trim($caption);
+		if ('' === $caption) {
 			return '';
 		}
 
-		$default = sprintf( '<blockquote>%s</blockquote>',  $caption );
+		$default = sprintf('<blockquote>%s</blockquote>', $caption);
 
 		/**
 		 * Filter the image caption to be displayed after images with captions.
@@ -517,7 +517,7 @@ 
 		 * @param string $default The whole HTML of the caption.
 		 * @param string $caption The caption text.
 		 */
-		return apply_filters( 'wp2d_image_caption', $default, $caption );
+		return apply_filters('wp2d_image_caption', $default, $caption);
 	}
 
 	/**
@@ -531,12 +531,12 @@ 
 	 * @param string $content The image element, possibly wrapped in a hyperlink.
 	 * @return string The caption shortcode output.
 	 */
-	public function custom_img_caption( $empty, $attr, $content ) {
-		$content = do_shortcode( $content );
+	public function custom_img_caption($empty, $attr, $content) {
+		$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;
@@ -550,22 +550,22 @@ 
 	 * @param   array $attr Gallery attributes.
 	 * @return  string
 	 */
-	public function custom_gallery_shortcode( $attr ) {
+	public function custom_gallery_shortcode($attr) {
 		// Default value in WordPress.
-		$captiontag = ( current_theme_supports( 'html5', 'gallery' ) ) ? 'figcaption' : 'dd';
+		$captiontag = (current_theme_supports('html5', 'gallery')) ? 'figcaption' : 'dd';
 
 		// User value.
-		if ( isset( $attr['captiontag'] ) ) {
+		if (isset($attr['captiontag'])) {
 			$captiontag = $attr['captiontag'];
 		}
 
 		// Let WordPress create the regular gallery.
-		$gallery = gallery_shortcode( $attr );
+		$gallery = gallery_shortcode($attr);
 
 		// Change the content of the captions.
 		$gallery = preg_replace_callback(
-			'~(<' . $captiontag . '.*>)(.*)(</' . $captiontag . '>)~mUus',
-			array( $this, 'custom_gallery_regex_callback' ),
+			'~(<'.$captiontag.'.*>)(.*)(</'.$captiontag.'>)~mUus',
+			array($this, 'custom_gallery_regex_callback'),
 			$gallery
 		);
 
@@ -578,8 +578,8 @@ 
 	 * @param array $m Regex matches.
 	 * @return string Prettified gallery image caption.
 	 */
-	public function custom_gallery_regex_callback( $m ) {
-		return $this->get_img_caption( $m[2] );
+	public function custom_gallery_regex_callback($m) {
+		return $this->get_img_caption($m[2]);
 	}
 
 	/*
@@ -593,11 +593,11 @@ 
 	 */
 	public function add_meta_boxes() {
 		$options = WP2D_Options::instance();
-		foreach ( $options->get_option( 'enabled_post_types' ) as $post_type ) {
+		foreach ($options->get_option('enabled_post_types') as $post_type) {
 			add_meta_box(
 				'wp_to_diaspora_meta_box',
 				'WP to diaspora*',
-				array( $this, 'meta_box_render' ),
+				array($this, 'meta_box_render'),
 				$post_type,
 				'side',
 				'high'
@@ -612,11 +612,11 @@ 
 	 *
 	 * @param WP_Post $post The object for the current post.
 	 */
-	public function meta_box_render( $post ) {
-		$this->_assign_wp_post( $post );
+	public function meta_box_render($post) {
+		$this->_assign_wp_post($post);
 
 		// Add an nonce field so we can check for it later.
-		wp_nonce_field( 'wp_to_diaspora_meta_box', 'wp_to_diaspora_meta_box_nonce' );
+		wp_nonce_field('wp_to_diaspora_meta_box', 'wp_to_diaspora_meta_box_nonce');
 
 		// Get the default values to use, but give priority to the meta data already set.
 		$options = WP2D_Options::instance();
@@ -625,26 +625,26 @@ 
 		$this->custom_tags = $this->custom_tags ?: array();
 
 		// 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  ?: array();
+		$this->post_to_diaspora = ($this->post_to_diaspora && 'publish' !== get_post_status($this->ID));
+		$this->aspects          = $this->aspects ?: array();
 		$this->services         = $this->services ?: array();
 
 		// Have we already posted on diaspora*?
-		if ( is_array( $this->post_history ) ) {
-			$latest_post = end( $this->post_history );
+		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
 		}
 		?>
 
-		<p><?php $options->post_to_diaspora_render( $this->post_to_diaspora ); ?></p>
-		<p><?php $options->fullentrylink_render( $this->fullentrylink ); ?></p>
-		<p><?php $options->display_render( $this->display ); ?></p>
-		<p><?php $options->tags_to_post_render( $this->tags_to_post ); ?></p>
-		<p><?php $options->custom_tags_render( $this->custom_tags ); ?></p>
-		<p><?php $options->aspects_services_render( array( 'aspects', $this->aspects ) ); ?></p>
-		<p><?php $options->aspects_services_render( array( 'services', $this->services ) ); ?></p>
+		<p><?php $options->post_to_diaspora_render($this->post_to_diaspora); ?></p>
+		<p><?php $options->fullentrylink_render($this->fullentrylink); ?></p>
+		<p><?php $options->display_render($this->display); ?></p>
+		<p><?php $options->tags_to_post_render($this->tags_to_post); ?></p>
+		<p><?php $options->custom_tags_render($this->custom_tags); ?></p>
+		<p><?php $options->aspects_services_render(array('aspects', $this->aspects)); ?></p>
+		<p><?php $options->aspects_services_render(array('services', $this->services)); ?></p>
 
 		<?php
 	}
@@ -656,12 +656,12 @@ 
 	 *
 	 * @param integer $post_id The ID of the post being saved.
 	 */
-	public function save_meta_box_data( $post_id ) {
+	public function save_meta_box_data($post_id) {
 		/*
 		 * We need to verify this came from our screen and with proper authorization,
 		 * because the save_post action can be triggered at other times.
 		 */
-		if ( ! $this->_is_safe_to_save() ) {
+		if ( ! $this->_is_safe_to_save()) {
 			return;
 		}
 
@@ -672,25 +672,25 @@ 
 		$options = WP2D_Options::instance();
 
 		// Checkboxes.
-		$options->validate_checkboxes( array( 'post_to_diaspora', 'fullentrylink' ), $meta_to_save );
+		$options->validate_checkboxes(array('post_to_diaspora', 'fullentrylink'), $meta_to_save);
 
 		// Single Selects.
-		$options->validate_single_selects( 'display', $meta_to_save );
+		$options->validate_single_selects('display', $meta_to_save);
 
 		// Multiple Selects.
-		$options->validate_multi_selects( 'tags_to_post', $meta_to_save );
+		$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'], array( 'public' ) );
+		$options->validate_aspects_services($meta_to_save['aspects'], array('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 );
+		update_post_meta($post_id, '_wp_to_diaspora', $meta_to_save);
 	}
 
 	/**
@@ -702,23 +702,23 @@ 
 	 */
 	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;
 		}
 
 		// If this is an autosave, our form has not been submitted, so we don't want to do anything.
-		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+		if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
 			return false;
 		}
 
 		// Check the user's permissions.
-		$permission = ( isset( $_POST['post_type'] ) && 'page' === $_POST['post_type'] ) ? 'edit_pages' : 'edit_posts';
-		if ( ! current_user_can( $permission, $this->ID ) ) {
+		$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;
 		}
 
@@ -734,32 +734,32 @@ 
 	 */
 	public function admin_notices() {
 		global $post, $pagenow;
-		if ( ! $post || 'post.php' !== $pagenow ) {
+		if ( ! $post || 'post.php' !== $pagenow) {
 			return;
 		}
 
-		if ( ( $error = get_post_meta( $post->ID, '_wp_to_diaspora_post_error', true ) ) && is_wp_error( $error ) ) {
+		if (($error = get_post_meta($post->ID, '_wp_to_diaspora_post_error', true)) && is_wp_error($error)) {
 			// Are we adding a help tab link to this notice?
-			$help_link = WP2D_Contextual_Help::get_help_tab_quick_link( $error );
+			$help_link = WP2D_Contextual_Help::get_help_tab_quick_link($error);
 
 			// This notice will only be shown if posting to diaspora* has failed.
-			printf( '<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() ),
+			printf('<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,
-				esc_url( add_query_arg( 'wp2d_ignore_post_error', '' ) ),
-				esc_html__( 'Ignore', 'wp-to-diaspora' )
+				esc_url(add_query_arg('wp2d_ignore_post_error', '')),
+				esc_html__('Ignore', 'wp-to-diaspora')
 			);
-		} elseif ( ( $diaspora_post_history = get_post_meta( $post->ID, '_wp_to_diaspora_post_history', true ) ) && is_array( $diaspora_post_history ) ) {
+		} elseif (($diaspora_post_history = get_post_meta($post->ID, '_wp_to_diaspora_post_history', true)) && is_array($diaspora_post_history)) {
 			// Get the latest post from the history.
-			$latest_post = end( $diaspora_post_history );
+			$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'] ) {
-				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_html__( 'View Post' )
+			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_html__('View Post')
 				);
 			}
 		}
@@ -772,8 +772,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');
 		}
 	}
 }

wp-to-diaspora.php

Spacing +100 added lines, -100 removed lines

@@ -30,10 +30,10 @@ 
  */
 
 // Exit if accessed directly.
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Set the current version.
-define( 'WP2D_VERSION', '1.7.1' );
+define('WP2D_VERSION', '1.7.1');
 
 /**
  * WP to diaspora* main plugin class.
@@ -78,10 +78,10 @@ 
 	 * @return WP_To_Diaspora Instance of this class.
 	 */
 	public static function instance() {
-		if ( ! isset( self::$_instance ) ) {
+		if ( ! isset(self::$_instance)) {
 			self::$_instance = new self();
 			self::$_instance->_constants();
-			if ( self::$_instance->_version_check() ) {
+			if (self::$_instance->_version_check()) {
 				self::$_instance->_includes();
 				self::$_instance->_setup();
 			} else {
@@ -98,13 +98,13 @@ 
 	 */
 	private function _constants() {
 		// Are we in debugging mode?
-		if ( isset( $_GET['debugging'] ) ) {
-			define( 'WP2D_DEBUGGING', true );
+		if (isset($_GET['debugging'])) {
+			define('WP2D_DEBUGGING', true);
 		}
 
-		define( 'WP2D_DIR', dirname( __FILE__ ) );
-		define( 'WP2D_LIB_DIR', WP2D_DIR . '/lib' );
-		define( 'WP2D_VENDOR_DIR', WP2D_DIR . '/vendor' );
+		define('WP2D_DIR', dirname(__FILE__));
+		define('WP2D_LIB_DIR', WP2D_DIR.'/lib');
+		define('WP2D_VENDOR_DIR', WP2D_DIR.'/vendor');
 	}
 
 	/**
@@ -116,9 +116,9 @@ 
 	 */
 	private function _version_check() {
 		// Check for version requirements.
-		if ( version_compare( $GLOBALS['wp_version'], $this->_min_wp, '<' )
-			|| version_compare( PHP_VERSION, $this->_min_php, '<' ) ) {
-			add_action( 'admin_notices', array( $this, 'deactivate' ) );
+		if (version_compare($GLOBALS['wp_version'], $this->_min_wp, '<')
+			|| version_compare(PHP_VERSION, $this->_min_php, '<')) {
+			add_action('admin_notices', array($this, 'deactivate'));
 			return false;
 		}
 
@@ -132,15 +132,15 @@ 
 	 */
 	public function deactivate() {
 		// First of all, deactivate the plugin.
-		deactivate_plugins( plugin_basename( __FILE__ ) );
+		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
 	}
@@ -151,12 +151,12 @@ 
 	 * @since 1.5.0
 	 */
 	private function _includes() {
-		require WP2D_VENDOR_DIR . '/autoload.php';
-		require_once WP2D_LIB_DIR . '/class-api.php';
-		require_once WP2D_LIB_DIR . '/class-contextual-help.php';
-		require_once WP2D_LIB_DIR . '/class-helpers.php';
-		require_once WP2D_LIB_DIR . '/class-options.php';
-		require_once WP2D_LIB_DIR . '/class-post.php';
+		require WP2D_VENDOR_DIR.'/autoload.php';
+		require_once WP2D_LIB_DIR.'/class-api.php';
+		require_once WP2D_LIB_DIR.'/class-contextual-help.php';
+		require_once WP2D_LIB_DIR.'/class-helpers.php';
+		require_once WP2D_LIB_DIR.'/class-options.php';
+		require_once WP2D_LIB_DIR.'/class-post.php';
 	}
 
 	/**
@@ -165,30 +165,30 @@ 
 	private function _setup() {
 
 		// Load languages.
-		add_action( 'plugins_loaded', array( $this, 'l10n' ) );
+		add_action('plugins_loaded', array($this, 'l10n'));
 
 		// Add "Settings" link to plugin page.
-		add_filter( 'plugin_action_links_' . plugin_basename( __FILE__ ), array( $this, 'settings_link' ) );
+		add_filter('plugin_action_links_'.plugin_basename(__FILE__), array($this, 'settings_link'));
 
 		// Perform any necessary data upgrades.
-		add_action( 'admin_init', array( $this, 'upgrade' ) );
+		add_action('admin_init', array($this, 'upgrade'));
 
 		// Enqueue CSS and JS scripts.
-		add_action( 'admin_enqueue_scripts', array( $this, 'admin_load_scripts' ) );
+		add_action('admin_enqueue_scripts', array($this, 'admin_load_scripts'));
 
 		// Set up the options.
-		add_action( 'init', array( 'WP2D_Options', 'instance' ) );
+		add_action('init', array('WP2D_Options', 'instance'));
 
 		// WP2D Post.
-		add_action( 'init', array( 'WP2D_Post', 'setup' ) );
+		add_action('init', array('WP2D_Post', 'setup'));
 
 		// AJAX actions for loading pods, aspects and services.
-		add_action( 'wp_ajax_wp_to_diaspora_update_pod_list', array( $this, 'update_pod_list_callback' ) );
-		add_action( 'wp_ajax_wp_to_diaspora_update_aspects_list', array( $this, 'update_aspects_list_callback' ) );
-		add_action( 'wp_ajax_wp_to_diaspora_update_services_list', array( $this, 'update_services_list_callback' ) );
+		add_action('wp_ajax_wp_to_diaspora_update_pod_list', array($this, 'update_pod_list_callback'));
+		add_action('wp_ajax_wp_to_diaspora_update_aspects_list', array($this, 'update_aspects_list_callback'));
+		add_action('wp_ajax_wp_to_diaspora_update_services_list', array($this, 'update_services_list_callback'));
 
 		// Check the pod connection status on the options page.
-		add_action( 'wp_ajax_wp_to_diaspora_check_pod_connection_status', array( $this, 'check_pod_connection_status_callback' ) );
+		add_action('wp_ajax_wp_to_diaspora_check_pod_connection_status', array($this, 'check_pod_connection_status_callback'));
 	}
 
 	/**
@@ -197,7 +197,7 @@ 
 	 * @return WP2D_API|boolean The API object, or false.
 	 */
 	private function _load_api() {
-		if ( ! isset( $this->_api ) ) {
+		if ( ! isset($this->_api)) {
 			$this->_api = WP2D_Helpers::api_quick_connect();
 		}
 		return $this->_api;
@@ -209,40 +209,40 @@ 
 	public function upgrade() {
 		// Get the current options, or assign defaults.
 		$options = WP2D_Options::instance();
-		$version = $options->get_option( 'version' );
+		$version = $options->get_option('version');
 
 		// If the versions differ, this is probably an update. Need to save updated options.
-		if ( WP2D_VERSION !== $version ) {
+		if (WP2D_VERSION !== $version) {
 
 			// Password is stored encrypted since version 1.2.7.
 			// When upgrading to it, the plain text password is encrypted and saved again.
-			if ( version_compare( $version, '1.2.7', '<' ) ) {
-				$options->set_option( 'password', WP2D_Helpers::encrypt( (string) $options->get_option( 'password' ) ) );
+			if (version_compare($version, '1.2.7', '<')) {
+				$options->set_option('password', WP2D_Helpers::encrypt((string) $options->get_option('password')));
 			}
 
-			if ( version_compare( $version, '1.3.0', '<' ) ) {
+			if (version_compare($version, '1.3.0', '<')) {
 				// The 'user' setting is renamed to 'username'.
-				$options->set_option( 'username', $options->get_option( 'user' ) );
-				$options->set_option( 'user', null );
+				$options->set_option('username', $options->get_option('user'));
+				$options->set_option('user', null);
 
 				// Save tags as arrays instead of comma seperated values.
-				$global_tags = $options->get_option( 'global_tags' );
-				$options->set_option( 'global_tags', $options->validate_tags( $global_tags ) );
+				$global_tags = $options->get_option('global_tags');
+				$options->set_option('global_tags', $options->validate_tags($global_tags));
 			}
 
-			if ( version_compare( $version, '1.4.0', '<' ) ) {
+			if (version_compare($version, '1.4.0', '<')) {
 				// Turn tags_to_post string into an array.
-				$tags_to_post_old = $options->get_option( 'tags_to_post' );
-				$tags_to_post = array_filter( array(
-					( ( false !== strpos( $tags_to_post_old, 'g' ) ) ? 'global' : null ),
-					( ( false !== strpos( $tags_to_post_old, 'c' ) ) ? 'custom' : null ),
-					( ( false !== strpos( $tags_to_post_old, 'p' ) ) ? 'post'   : null ),
-				) );
-				$options->set_option( 'tags_to_post', $tags_to_post );
+				$tags_to_post_old = $options->get_option('tags_to_post');
+				$tags_to_post = array_filter(array(
+					((false !== strpos($tags_to_post_old, 'g')) ? 'global' : null),
+					((false !== strpos($tags_to_post_old, 'c')) ? 'custom' : null),
+					((false !== strpos($tags_to_post_old, 'p')) ? 'post' : null),
+				));
+				$options->set_option('tags_to_post', $tags_to_post);
 			}
 
 			// Update version.
-			$options->set_option( 'version', WP2D_VERSION );
+			$options->set_option('version', WP2D_VERSION);
 			$options->save();
 		}
 	}
@@ -251,7 +251,7 @@ 
 	 * Set up i18n.
 	 */
 	public function l10n() {
-		load_plugin_textdomain( 'wp-to-diaspora', false, 'wp-to-diaspora/languages' );
+		load_plugin_textdomain('wp-to-diaspora', false, 'wp-to-diaspora/languages');
 	}
 
 	/**
@@ -259,27 +259,27 @@ 
 	 */
 	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', array() );
+		$enabled_post_types = WP2D_Options::instance()->get_option('enabled_post_types', array());
 
 		// Get the screen to find out where we are.
 		$screen = get_current_screen();
 
 		// Only load the styles and scripts on the settings page and the allowed post types.
-		if ( 'settings_page_wp_to_diaspora' === $screen->id || ( in_array( $screen->post_type, $enabled_post_types ) && 'post' === $screen->base ) ) {
-			wp_enqueue_style( 'tag-it', plugins_url( '/css/jquery.tagit.css', __FILE__ ) );
-			wp_enqueue_style( 'chosen', plugins_url( '/css/chosen.min.css', __FILE__ ) );
-			wp_enqueue_style( 'wp-to-diaspora-admin', plugins_url( '/css/wp-to-diaspora.css', __FILE__ ) );
-			wp_enqueue_script( 'chosen', plugins_url( '/js/chosen.jquery.min.js', __FILE__ ), array( 'jquery' ), false, true );
-			wp_enqueue_script( 'tag-it', plugins_url( '/js/tag-it.min.js', __FILE__ ), array( 'jquery', 'jquery-ui-autocomplete' ), false, true );
-			wp_enqueue_script( 'wp-to-diaspora-admin', plugins_url( '/js/wp-to-diaspora.js', __FILE__ ), array( 'jquery' ), false, true );
+		if ('settings_page_wp_to_diaspora' === $screen->id || (in_array($screen->post_type, $enabled_post_types) && 'post' === $screen->base)) {
+			wp_enqueue_style('tag-it', plugins_url('/css/jquery.tagit.css', __FILE__));
+			wp_enqueue_style('chosen', plugins_url('/css/chosen.min.css', __FILE__));
+			wp_enqueue_style('wp-to-diaspora-admin', plugins_url('/css/wp-to-diaspora.css', __FILE__));
+			wp_enqueue_script('chosen', plugins_url('/js/chosen.jquery.min.js', __FILE__), array('jquery'), false, true);
+			wp_enqueue_script('tag-it', plugins_url('/js/tag-it.min.js', __FILE__), array('jquery', 'jquery-ui-autocomplete'), false, true);
+			wp_enqueue_script('wp-to-diaspora-admin', plugins_url('/js/wp-to-diaspora.js', __FILE__), array('jquery'), false, true);
 			// Javascript-specific l10n.
-			wp_localize_script( 'wp-to-diaspora-admin', 'WP2DL10n', array(
-				'no_services_connected' => __( 'No services connected yet.', 'wp-to-diaspora' ),
-				'sure_reset_defaults'   => __( 'Are you sure you want to reset to default values?', 'wp-to-diaspora' ),
-				'conn_testing'          => __( 'Testing connection...', 'wp-to-diaspora' ),
-				'conn_successful'       => __( 'Connection successful.', 'wp-to-diaspora' ),
-				'conn_failed'           => __( 'Connection failed.', 'wp-to-diaspora' ),
-			) );
+			wp_localize_script('wp-to-diaspora-admin', 'WP2DL10n', array(
+				'no_services_connected' => __('No services connected yet.', 'wp-to-diaspora'),
+				'sure_reset_defaults'   => __('Are you sure you want to reset to default values?', 'wp-to-diaspora'),
+				'conn_testing'          => __('Testing connection...', 'wp-to-diaspora'),
+				'conn_successful'       => __('Connection successful.', 'wp-to-diaspora'),
+				'conn_failed'           => __('Connection failed.', 'wp-to-diaspora'),
+			));
 		}
 	}
 
@@ -289,8 +289,8 @@ 
 	 * @param array $links Links to display for plugin on plugins page.
 	 * @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>';
+	public function settings_link($links) {
+		$links[] = '<a href="'.admin_url('options-general.php?page=wp_to_diaspora').'">'.__('Settings').'</a>';
 		return $links;
 	}
 
@@ -305,14 +305,14 @@ 
 		$pods = array();
 
 		// Get the response from the WP_HTTP request.
-		$response = wp_safe_remote_get( $pod_list_url );
+		$response = wp_safe_remote_get($pod_list_url);
 
-		if ( $json = wp_remote_retrieve_body( $response ) ) {
-			$pod_list = json_decode( $json );
+		if ($json = wp_remote_retrieve_body($response)) {
+			$pod_list = json_decode($json);
 
-			if ( isset( $pod_list->pods ) ) {
-				foreach ( $pod_list->pods as $pod ) {
-					if ( 'no' === $pod->hidden ) {
+			if (isset($pod_list->pods)) {
+				foreach ($pod_list->pods as $pod) {
+					if ('no' === $pod->hidden) {
 						$pods[] = array(
 							'secure' => $pod->secure,
 							'domain' => $pod->domain,
@@ -321,7 +321,7 @@ 
 				}
 
 				$options = WP2D_Options::instance();
-				$options->set_option( 'pod_list', $pods );
+				$options->set_option('pod_list', $pods);
 				$options->save();
 			}
 		}
@@ -333,7 +333,7 @@ 
 	 * Update the list of pods and return them for use with AJAX.
 	 */
 	public function update_pod_list_callback() {
-		wp_send_json( $this->_update_pod_list() );
+		wp_send_json($this->_update_pod_list());
 	}
 
 	/**
@@ -344,40 +344,40 @@ 
 	 * @param string $type Type of list to update.
 	 * @return array|boolean The list of aspects or services, false if an illegal parameter is passed.
 	 */
-	private function _update_aspects_services_list( $type ) {
+	private function _update_aspects_services_list($type) {
 		// Check for correct argument value.
-		if ( ! in_array( $type, array( 'aspects', 'services' ) ) ) {
+		if ( ! in_array($type, array('aspects', 'services'))) {
 			return false;
 		}
 
 		$options = WP2D_Options::instance();
-		$list    = $options->get_option( $type . '_list' );
+		$list    = $options->get_option($type.'_list');
 
 		// Make sure that we have at least the 'Public' aspect.
-		if ( 'aspects' === $type && empty( $list ) ) {
-			$list = array( 'public' => __( 'Public' ) );
+		if ('aspects' === $type && empty($list)) {
+			$list = array('public' => __('Public'));
 		}
 
 		// Set up the connection to diaspora*.
 		$api = $this->_load_api();
 
 		// If there was a problem loading the API, return false.
-		if ( $api->has_last_error() ) {
+		if ($api->has_last_error()) {
 			return false;
 		}
 
-		if ( 'aspects' === $type ) {
-			$list_new = $api->get_aspects( true );
-		} elseif ( 'services' === $type ) {
-			$list_new = $api->get_services( true );
+		if ('aspects' === $type) {
+			$list_new = $api->get_aspects(true);
+		} elseif ('services' === $type) {
+			$list_new = $api->get_services(true);
 		}
 		// If the new list couldn't be fetched successfully, return false.
-		if ( $api->has_last_error() ) {
+		if ($api->has_last_error()) {
 			return false;
 		}
 
 		// We have a new list to save and return!
-		$options->set_option( $type . '_list', $list_new );
+		$options->set_option($type.'_list', $list_new);
 		$options->save();
 
 		return $list_new;
@@ -387,14 +387,14 @@ 
 	 * Update the list of aspects and return them for use with AJAX.
 	 */
 	public function update_aspects_list_callback() {
-		wp_send_json( $this->_update_aspects_services_list( 'aspects' ) );
+		wp_send_json($this->_update_aspects_services_list('aspects'));
 	}
 
 	/**
 	 * Update the list of services and return them for use with AJAX.
 	 */
 	public function update_services_list_callback() {
-		wp_send_json( $this->_update_aspects_services_list( 'services' ) );
+		wp_send_json($this->_update_aspects_services_list('services'));
 	}
 
 	/**
@@ -407,7 +407,7 @@ 
 
 		$status = null;
 
-		if ( $options->is_pod_set_up() ) {
+		if ($options->is_pod_set_up()) {
 			$status = ! $this->_load_api()->has_last_error();
 		}
 
@@ -420,22 +420,22 @@ 
 	 * @todo esc_html
 	 */
 	public function check_pod_connection_status_callback() {
-		if ( isset( $_REQUEST['debugging'] ) && ! defined( 'WP2D_DEBUGGING' ) ) {
-			define( 'WP2D_DEBUGGING', true );
+		if (isset($_REQUEST['debugging']) && ! defined('WP2D_DEBUGGING')) {
+			define('WP2D_DEBUGGING', true);
 		}
 
 		$status = $this->_check_pod_connection_status();
 
 		$data = array(
-			'debug'   => esc_textarea( WP2D_Helpers::get_debugging() ),
-			'message' => __( 'Connection successful.', 'wp-to-diaspora' ),
+			'debug'   => esc_textarea(WP2D_Helpers::get_debugging()),
+			'message' => __('Connection successful.', 'wp-to-diaspora'),
 		);
 
-		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() );
-			wp_send_json_error( $data );
+		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());
+			wp_send_json_error($data);
 		}
 		// If $status === null, do nothing.
 	}