noplanman / wp-to-diaspora

wp-to-diaspora.php

Indentation +395 added lines, -395 removed lines

@@ -40,405 +40,405 @@
  */
 class WP_To_Diaspora {
 
-	/**
-	 * Only instance of this class.
-	 *
-	 * @var WP_To_Diaspora
-	 */
-	private static $_instance = null;
-
-	/**
-	 * The minimum required WordPress version.
-	 *
-	 * @since 1.5.4
-	 *
-	 * @var string
-	 */
-	private $_min_wp = '3.9.2';
-
-	/**
-	 * The minimum required PHP version.
-	 *
-	 * @since 1.5.4
-	 *
-	 * @var string
-	 */
-	private $_min_php = '5.3';
-
-	/**
-	 * Instance of the API class.
-	 *
-	 * @var WP2D_API
-	 */
-	private $_api = null;
-
-	/**
-	 * Create / Get the instance of this class.
-	 *
-	 * @return WP_To_Diaspora Instance of this class.
-	 */
-	public static function instance() {
-		if ( ! isset( self::$_instance ) ) {
-			self::$_instance = new self();
-			self::$_instance->_constants();
-			if ( self::$_instance->_version_check() ) {
-				self::$_instance->_includes();
-				self::$_instance->_setup();
-			} else {
-				self::$_instance = null;
-			}
-		}
-		return self::$_instance;
-	}
-
-	/**
-	 * Define all the required constants.
-	 *
-	 * @since 1.5.0
-	 */
-	private function _constants() {
-		// Are we in debugging mode?
-		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' );
-	}
-
-	/**
-	 * Check the minimum WordPress and PHP requirements.
-	 *
-	 * @since 1.5.4
-	 *
-	 * @return bool If version requirements are met.
-	 */
-	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' ) );
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Callback to deactivate plugin and display admin notice.
-	 *
-	 * @since 1.5.4
-	 */
-	public function deactivate() {
-		// First of all, deactivate the plugin.
-		deactivate_plugins( plugin_basename( __FILE__ ) );
-
-		// Get rid of the "Plugin activated" message.
-		unset( $_GET['activate'] );
-
-		// Then display the admin notice.
-		?>
+  /**
+   * Only instance of this class.
+   *
+   * @var WP_To_Diaspora
+   */
+  private static $_instance = null;
+
+  /**
+   * The minimum required WordPress version.
+   *
+   * @since 1.5.4
+   *
+   * @var string
+   */
+  private $_min_wp = '3.9.2';
+
+  /**
+   * The minimum required PHP version.
+   *
+   * @since 1.5.4
+   *
+   * @var string
+   */
+  private $_min_php = '5.3';
+
+  /**
+   * Instance of the API class.
+   *
+   * @var WP2D_API
+   */
+  private $_api = null;
+
+  /**
+   * Create / Get the instance of this class.
+   *
+   * @return WP_To_Diaspora Instance of this class.
+   */
+  public static function instance() {
+    if ( ! isset( self::$_instance ) ) {
+      self::$_instance = new self();
+      self::$_instance->_constants();
+      if ( self::$_instance->_version_check() ) {
+        self::$_instance->_includes();
+        self::$_instance->_setup();
+      } else {
+        self::$_instance = null;
+      }
+    }
+    return self::$_instance;
+  }
+
+  /**
+   * Define all the required constants.
+   *
+   * @since 1.5.0
+   */
+  private function _constants() {
+    // Are we in debugging mode?
+    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' );
+  }
+
+  /**
+   * Check the minimum WordPress and PHP requirements.
+   *
+   * @since 1.5.4
+   *
+   * @return bool If version requirements are met.
+   */
+  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' ) );
+      return false;
+    }
+
+    return true;
+  }
+
+  /**
+   * Callback to deactivate plugin and display admin notice.
+   *
+   * @since 1.5.4
+   */
+  public function deactivate() {
+    // First of all, deactivate the plugin.
+    deactivate_plugins( plugin_basename( __FILE__ ) );
+
+    // Get rid of the "Plugin activated" message.
+    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>
 		</div>
 		<?php
-	}
-
-	/**
-	 * Include all the required files.
-	 *
-	 * @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';
-	}
-
-	/**
-	 * Set up the plugin.
-	 */
-	private function _setup() {
-
-		// Load languages.
-		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' ) );
-
-		// Perform any necessary data upgrades.
-		add_action( 'admin_init', array( $this, 'upgrade' ) );
-
-		// Enqueue CSS and JS scripts.
-		add_action( 'admin_enqueue_scripts', array( $this, 'admin_load_scripts' ) );
-
-		// Set up the options.
-		add_action( 'init', array( 'WP2D_Options', 'instance' ) );
-
-		// WP2D Post.
-		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' ) );
-
-		// 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' ) );
-	}
-
-	/**
-	 * Load the diaspora* API for ease of use.
-	 *
-	 * @return WP2D_API|boolean The API object, or false.
-	 */
-	private function _load_api() {
-		if ( ! isset( $this->_api ) ) {
-			$this->_api = WP2D_Helpers::api_quick_connect();
-		}
-		return $this->_api;
-	}
-
-	/**
-	 * Initialise upgrade sequence.
-	 */
-	public function upgrade() {
-		// Get the current options, or assign defaults.
-		$options = WP2D_Options::instance();
-		$version = $options->get_option( 'version' );
-
-		// If the versions differ, this is probably an update. Need to save updated options.
-		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.3.0', '<' ) ) {
-				// The 'user' setting is renamed to 'username'.
-				$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 ) );
-			}
-
-			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 );
-			}
-
-			// Update version.
-			$options->set_option( 'version', WP2D_VERSION );
-			$options->save();
-		}
-	}
-
-	/**
-	 * Set up i18n.
-	 */
-	public function l10n() {
-		load_plugin_textdomain( 'wp-to-diaspora', false, 'wp-to-diaspora/languages' );
-	}
-
-	/**
-	 * Load scripts and styles for Settings and Post pages of allowed post types.
-	 */
-	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() );
-
-		// 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 );
-			// 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' ),
-			) );
-		}
-	}
-
-	/**
-	 * Add the "Settings" link to the plugins page.
-	 *
-	 * @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>';
-		return $links;
-	}
-
-	/**
-	 * Fetch the updated list of pods from podupti.me and save it to the settings.
-	 *
-	 * @return array The list of pods.
-	 */
-	private function _update_pod_list() {
-		// API url to fetch pods list from podupti.me.
-		$pod_list_url = 'http://podupti.me/api.php?format=json&key=4r45tg';
-		$pods = array();
-
-		// Get the response from the WP_HTTP request.
-		$response = wp_safe_remote_get( $pod_list_url );
-
-		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 ) {
-						$pods[] = array(
-							'secure' => $pod->secure,
-							'domain' => $pod->domain,
-						);
-					}
-				}
-
-				$options = WP2D_Options::instance();
-				$options->set_option( 'pod_list', $pods );
-				$options->save();
-			}
-		}
-
-		return $pods;
-	}
-
-	/**
-	 * 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() );
-	}
-
-	/**
-	 * Fetch the list of aspects or services and save them to the settings.
-	 *
-	 * NOTE: When updating the lists, always force a fresh fetch.
-	 *
-	 * @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 ) {
-		// Check for correct argument value.
-		if ( ! in_array( $type, array( 'aspects', 'services' ) ) ) {
-			return false;
-		}
-
-		$options = WP2D_Options::instance();
-		$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' ) );
-		}
-
-		// 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() ) {
-			return false;
-		}
-
-		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() ) {
-			return false;
-		}
-
-		// We have a new list to save and return!
-		$options->set_option( $type . '_list', $list_new );
-		$options->save();
-
-		return $list_new;
-	}
-
-	/**
-	 * 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' ) );
-	}
-
-	/**
-	 * 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' ) );
-	}
-
-	/**
-	 * Check the pod connection status.
-	 *
-	 * @return string The status of the connection.
-	 */
-	private function _check_pod_connection_status() {
-		$options = WP2D_Options::instance();
-
-		$status = null;
-
-		if ( $options->is_pod_set_up() ) {
-			$status = ! $this->_load_api()->has_last_error();
-		}
-
-		return $status;
-	}
-
-	/**
-	 * Check the connection to the pod and return the status for use with AJAX.
-	 *
-	 * @todo esc_html
-	 */
-	public function check_pod_connection_status_callback() {
-		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' ),
-		);
-
-		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.
-	}
+  }
+
+  /**
+   * Include all the required files.
+   *
+   * @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';
+  }
+
+  /**
+   * Set up the plugin.
+   */
+  private function _setup() {
+
+    // Load languages.
+    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' ) );
+
+    // Perform any necessary data upgrades.
+    add_action( 'admin_init', array( $this, 'upgrade' ) );
+
+    // Enqueue CSS and JS scripts.
+    add_action( 'admin_enqueue_scripts', array( $this, 'admin_load_scripts' ) );
+
+    // Set up the options.
+    add_action( 'init', array( 'WP2D_Options', 'instance' ) );
+
+    // WP2D Post.
+    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' ) );
+
+    // 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' ) );
+  }
+
+  /**
+   * Load the diaspora* API for ease of use.
+   *
+   * @return WP2D_API|boolean The API object, or false.
+   */
+  private function _load_api() {
+    if ( ! isset( $this->_api ) ) {
+      $this->_api = WP2D_Helpers::api_quick_connect();
+    }
+    return $this->_api;
+  }
+
+  /**
+   * Initialise upgrade sequence.
+   */
+  public function upgrade() {
+    // Get the current options, or assign defaults.
+    $options = WP2D_Options::instance();
+    $version = $options->get_option( 'version' );
+
+    // If the versions differ, this is probably an update. Need to save updated options.
+    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.3.0', '<' ) ) {
+        // The 'user' setting is renamed to 'username'.
+        $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 ) );
+      }
+
+      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 );
+      }
+
+      // Update version.
+      $options->set_option( 'version', WP2D_VERSION );
+      $options->save();
+    }
+  }
+
+  /**
+   * Set up i18n.
+   */
+  public function l10n() {
+    load_plugin_textdomain( 'wp-to-diaspora', false, 'wp-to-diaspora/languages' );
+  }
+
+  /**
+   * Load scripts and styles for Settings and Post pages of allowed post types.
+   */
+  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() );
+
+    // 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 );
+      // 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' ),
+      ) );
+    }
+  }
+
+  /**
+   * Add the "Settings" link to the plugins page.
+   *
+   * @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>';
+    return $links;
+  }
+
+  /**
+   * Fetch the updated list of pods from podupti.me and save it to the settings.
+   *
+   * @return array The list of pods.
+   */
+  private function _update_pod_list() {
+    // API url to fetch pods list from podupti.me.
+    $pod_list_url = 'http://podupti.me/api.php?format=json&key=4r45tg';
+    $pods = array();
+
+    // Get the response from the WP_HTTP request.
+    $response = wp_safe_remote_get( $pod_list_url );
+
+    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 ) {
+            $pods[] = array(
+              'secure' => $pod->secure,
+              'domain' => $pod->domain,
+            );
+          }
+        }
+
+        $options = WP2D_Options::instance();
+        $options->set_option( 'pod_list', $pods );
+        $options->save();
+      }
+    }
+
+    return $pods;
+  }
+
+  /**
+   * 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() );
+  }
+
+  /**
+   * Fetch the list of aspects or services and save them to the settings.
+   *
+   * NOTE: When updating the lists, always force a fresh fetch.
+   *
+   * @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 ) {
+    // Check for correct argument value.
+    if ( ! in_array( $type, array( 'aspects', 'services' ) ) ) {
+      return false;
+    }
+
+    $options = WP2D_Options::instance();
+    $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' ) );
+    }
+
+    // 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() ) {
+      return false;
+    }
+
+    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() ) {
+      return false;
+    }
+
+    // We have a new list to save and return!
+    $options->set_option( $type . '_list', $list_new );
+    $options->save();
+
+    return $list_new;
+  }
+
+  /**
+   * 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' ) );
+  }
+
+  /**
+   * 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' ) );
+  }
+
+  /**
+   * Check the pod connection status.
+   *
+   * @return string The status of the connection.
+   */
+  private function _check_pod_connection_status() {
+    $options = WP2D_Options::instance();
+
+    $status = null;
+
+    if ( $options->is_pod_set_up() ) {
+      $status = ! $this->_load_api()->has_last_error();
+    }
+
+    return $status;
+  }
+
+  /**
+   * Check the connection to the pod and return the status for use with AJAX.
+   *
+   * @todo esc_html
+   */
+  public function check_pod_connection_status_callback() {
+    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' ),
+    );
+
+    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.
+  }
 }
 
 // Get the party started!

lib/class-options.php

Indentation +717 added lines, -717 removed lines

@@ -14,314 +14,314 @@ 
  */
 class WP2D_Options {
 
-	/**
-	 * Only instance of this class.
-	 *
-	 * @var WP2D_Options
-	 */
-	private static $_instance = null;
-
-	/**
-	 * All default plugin options.
-	 *
-	 * @var array
-	 */
-	private static $_default_options = array(
-		'pod_list'           => array(),
-		'aspects_list'       => array(),
-		'services_list'      => array(),
-		'post_to_diaspora'   => true,
-		'enabled_post_types' => array( 'post' ),
-		'fullentrylink'      => true,
-		'display'            => 'full',
-		'tags_to_post'       => array( 'global', 'custom', 'post' ),
-		'global_tags'        => '',
-		'aspects'            => array( 'public' ),
-		'services'           => array(),
-		'version'            => WP2D_VERSION,
-	);
-
-	/**
-	 * Valid values for select fields.
-	 *
-	 * @var array
-	 */
-	private static $_valid_values = array(
-		'display'      => array( 'full', 'excerpt' ),
-		'tags_to_post' => array( 'global', 'custom', 'post' ),
-	);
-
-	/**
-	 * All plugin options.
-	 *
-	 * @var array
-	 */
-	private static $_options = null;
-
-	/** Singleton, keep private. */
-	final private function __clone() { }
-
-	/** Singleton, keep private. */
-	final private function __construct() { }
-
-	/** Singleton, keep private. */
-	final private function __wakeup() { }
-
-	/**
-	 * Create / Get the instance of this class.
-	 *
-	 * @return WP2D_Options Instance of this class.
-	 */
-	public static function instance() {
-		if ( ! isset( self::$_instance ) ) {
-			self::$_instance = new self();
-			self::$_instance->_setup();
-		}
-		return self::$_instance;
-	}
-
-	/**
-	 * Set up the options menu.
-	 */
-	private function _setup() {
-
-		// Populate options array.
-		$this->get_option();
-
-		// Setup Options page and Contextual Help.
-		add_action( 'admin_menu', array( $this, 'setup_wpadmin_pages' ) );
-
-		// Register all settings.
-		add_action( 'admin_init', array( $this, 'register_settings' ) );
-	}
-
-
-	/**
-	 * Get the currently selected tab.
-	 *
-	 * @todo Multi-level if statement to make it look prettier.
-	 *
-	 * @param string $default Tab to select if the current selection is invalid.
-	 * @return string Return the currently selected tab.
-	 */
-	private function _current_tab( $default = 'defaults' ) {
-		$tab = ( isset ( $_GET['tab'] ) ? $_GET['tab'] : $default );
-
-		// If the pod settings aren't configured yet, open the 'Setup' tab.
-		if ( ! $this->is_pod_set_up() ) {
-			$tab = 'setup';
-		}
-
-		return $tab;
-	}
-
-	/**
-	 * Output all options tabs and return an array of them all, if requested by $return.
-	 *
-	 * @param bool $return Define if the options tabs should be returned.
-	 * @return array (If requested) An array of the outputted options tabs.
-	 */
-	private function _options_page_tabs( $return = false ) {
-		// The array defining all options sections to be shown as tabs.
-		$tabs = array();
-		if ( $this->is_pod_set_up() ) {
-			$tabs['defaults'] = __( 'Defaults', 'wp-to-diaspora' );
-		}
-
-		// Add the 'Setup' tab to the end of the list.
-		$tabs['setup'] = __( 'Setup', 'wp-to-diaspora' ) . '<span id="pod-connection-status" class="dashicons-before hidden"></span><span class="spinner"></span>';
-
-		// Container for all options tabs.
-		$out = '<h2 id="options-tabs" class="nav-tab-wrapper">';
-		foreach ( $tabs as $tab => $name ) {
-			// The tab link.
-			$out .= '<a class="nav-tab' . ( ( $tab === $this->_current_tab() ) ? ' nav-tab-active' : '' ) . '" href="?page=wp_to_diaspora&tab=' . $tab . '">' . $name . '</a>';
-		}
-		$out .= '</h2>';
-
-		// Output the container with all tabs.
-		echo $out;
-
-		// Check if the tabs should be returned.
-		if ( $return ) {
-			return $tabs;
-		}
-	}
-
-
-	/**
-	 * Set up admin options page.
-	 */
-	public function admin_options_page() {
-		?>
+  /**
+   * Only instance of this class.
+   *
+   * @var WP2D_Options
+   */
+  private static $_instance = null;
+
+  /**
+   * All default plugin options.
+   *
+   * @var array
+   */
+  private static $_default_options = array(
+    'pod_list'           => array(),
+    'aspects_list'       => array(),
+    'services_list'      => array(),
+    'post_to_diaspora'   => true,
+    'enabled_post_types' => array( 'post' ),
+    'fullentrylink'      => true,
+    'display'            => 'full',
+    'tags_to_post'       => array( 'global', 'custom', 'post' ),
+    'global_tags'        => '',
+    'aspects'            => array( 'public' ),
+    'services'           => array(),
+    'version'            => WP2D_VERSION,
+  );
+
+  /**
+   * Valid values for select fields.
+   *
+   * @var array
+   */
+  private static $_valid_values = array(
+    'display'      => array( 'full', 'excerpt' ),
+    'tags_to_post' => array( 'global', 'custom', 'post' ),
+  );
+
+  /**
+   * All plugin options.
+   *
+   * @var array
+   */
+  private static $_options = null;
+
+  /** Singleton, keep private. */
+  final private function __clone() { }
+
+  /** Singleton, keep private. */
+  final private function __construct() { }
+
+  /** Singleton, keep private. */
+  final private function __wakeup() { }
+
+  /**
+   * Create / Get the instance of this class.
+   *
+   * @return WP2D_Options Instance of this class.
+   */
+  public static function instance() {
+    if ( ! isset( self::$_instance ) ) {
+      self::$_instance = new self();
+      self::$_instance->_setup();
+    }
+    return self::$_instance;
+  }
+
+  /**
+   * Set up the options menu.
+   */
+  private function _setup() {
+
+    // Populate options array.
+    $this->get_option();
+
+    // Setup Options page and Contextual Help.
+    add_action( 'admin_menu', array( $this, 'setup_wpadmin_pages' ) );
+
+    // Register all settings.
+    add_action( 'admin_init', array( $this, 'register_settings' ) );
+  }
+
+
+  /**
+   * Get the currently selected tab.
+   *
+   * @todo Multi-level if statement to make it look prettier.
+   *
+   * @param string $default Tab to select if the current selection is invalid.
+   * @return string Return the currently selected tab.
+   */
+  private function _current_tab( $default = 'defaults' ) {
+    $tab = ( isset ( $_GET['tab'] ) ? $_GET['tab'] : $default );
+
+    // If the pod settings aren't configured yet, open the 'Setup' tab.
+    if ( ! $this->is_pod_set_up() ) {
+      $tab = 'setup';
+    }
+
+    return $tab;
+  }
+
+  /**
+   * Output all options tabs and return an array of them all, if requested by $return.
+   *
+   * @param bool $return Define if the options tabs should be returned.
+   * @return array (If requested) An array of the outputted options tabs.
+   */
+  private function _options_page_tabs( $return = false ) {
+    // The array defining all options sections to be shown as tabs.
+    $tabs = array();
+    if ( $this->is_pod_set_up() ) {
+      $tabs['defaults'] = __( 'Defaults', 'wp-to-diaspora' );
+    }
+
+    // Add the 'Setup' tab to the end of the list.
+    $tabs['setup'] = __( 'Setup', 'wp-to-diaspora' ) . '<span id="pod-connection-status" class="dashicons-before hidden"></span><span class="spinner"></span>';
+
+    // Container for all options tabs.
+    $out = '<h2 id="options-tabs" class="nav-tab-wrapper">';
+    foreach ( $tabs as $tab => $name ) {
+      // The tab link.
+      $out .= '<a class="nav-tab' . ( ( $tab === $this->_current_tab() ) ? ' nav-tab-active' : '' ) . '" href="?page=wp_to_diaspora&tab=' . $tab . '">' . $name . '</a>';
+    }
+    $out .= '</h2>';
+
+    // Output the container with all tabs.
+    echo $out;
+
+    // Check if the tabs should be returned.
+    if ( $return ) {
+      return $tabs;
+    }
+  }
+
+
+  /**
+   * Set up admin options page.
+   */
+  public function admin_options_page() {
+    ?>
 		<div class="wrap">
 			<h2>WP to diaspora*</h2>
 
 			<div id="wp2d-message" class="notice hidden" <?php echo ( defined( 'WP2D_DEBUGGING' ) ) ? ' data-debugging' : ''; ?>></div>
 
 			<?php
-			// Check the connection status to diaspora.
-			if ( ! $this->is_pod_set_up() ) {
-				add_settings_error(
-					'wp_to_diaspora_settings',
-					'wp_to_diaspora_connected',
-					__( 'First of all, set up the connection to your pod below.', 'wp-to-diaspora' ),
-					'updated'
-				);
-			} else {
-				// Get initial aspects list and connected services.
-				// DON'T check for empty services list here!!
-				// It could always be empty, resulting in this code being run every time the page is loaded.
-				// The aspects will at least have a "Public" entry after the initial fetch.
-				$aspects_list = $this->get_option( 'aspects_list' );
-				if ( ( $force = get_transient( 'wp2d_no_js_force_refetch' ) ) || empty( $aspects_list ) ) {
-
-					// Set up the connection to diaspora*.
-					$api = WP2D_Helpers::api_quick_connect();
-					if ( ! $api->has_last_error() ) {
-						// Get the loaded aspects.
-						if ( is_array( $aspects = $api->get_aspects() ) ) {
-							// Save the new list of aspects.
-							$this->set_option( 'aspects_list', $aspects );
-						}
-
-						// Get the loaded services.
-						if ( is_array( $services = $api->get_services() ) ) {
-							// Save the new list of services.
-							$this->set_option( 'services_list', $services );
-						}
-
-						$this->save();
-					}
-
-					if ( $force ) {
-						delete_transient( 'wp2d_no_js_force_refetch' );
-						$message = ( ! $api->has_last_error() ) ? __( 'Connection successful.', 'wp-to-diaspora' ) : $api->get_last_error();
-						add_settings_error(
-							'wp_to_diaspora_settings',
-							'wp_to_diaspora_connected',
-							$message,
-							( ! $api->has_last_error() ) ? 'updated' : 'error'
-						);
-					}
-				}
-
-				// Attempt to get the cacert.pem file and save it to the plugin's root directory.
-				if ( isset( $_GET['wp2d_temp_ssl_fix'] ) ) {
-					$cacert_file = file_get_contents( 'http://curl.haxx.se/ca/cacert.pem' );
-					if ( $cacert_file && file_put_contents( WP2D_DIR . '/cacert.pem', $cacert_file ) ) {
-						add_settings_error(
-							'wp_to_diaspora_settings',
-							'wp_to_diaspora_temp_ssl_fix',
-							__( 'Successfully saved cacert.pem!', 'wp-to-diaspora' ),
-							'updated'
-						);
-					} else {
-						add_settings_error(
-							'wp_to_diaspora_settings',
-							'wp_to_diaspora_temp_ssl_fix',
-							__( 'Failed to save cacert.pem!', 'wp-to-diaspora' ),
-							'error'
-						);
-					}
-				}
-			}
-
-			// Output success or error message.
-			settings_errors( 'wp_to_diaspora_settings' );
-			?>
+      // Check the connection status to diaspora.
+      if ( ! $this->is_pod_set_up() ) {
+        add_settings_error(
+          'wp_to_diaspora_settings',
+          'wp_to_diaspora_connected',
+          __( 'First of all, set up the connection to your pod below.', 'wp-to-diaspora' ),
+          'updated'
+        );
+      } else {
+        // Get initial aspects list and connected services.
+        // DON'T check for empty services list here!!
+        // It could always be empty, resulting in this code being run every time the page is loaded.
+        // The aspects will at least have a "Public" entry after the initial fetch.
+        $aspects_list = $this->get_option( 'aspects_list' );
+        if ( ( $force = get_transient( 'wp2d_no_js_force_refetch' ) ) || empty( $aspects_list ) ) {
+
+          // Set up the connection to diaspora*.
+          $api = WP2D_Helpers::api_quick_connect();
+          if ( ! $api->has_last_error() ) {
+            // Get the loaded aspects.
+            if ( is_array( $aspects = $api->get_aspects() ) ) {
+              // Save the new list of aspects.
+              $this->set_option( 'aspects_list', $aspects );
+            }
+
+            // Get the loaded services.
+            if ( is_array( $services = $api->get_services() ) ) {
+              // Save the new list of services.
+              $this->set_option( 'services_list', $services );
+            }
+
+            $this->save();
+          }
+
+          if ( $force ) {
+            delete_transient( 'wp2d_no_js_force_refetch' );
+            $message = ( ! $api->has_last_error() ) ? __( 'Connection successful.', 'wp-to-diaspora' ) : $api->get_last_error();
+            add_settings_error(
+              'wp_to_diaspora_settings',
+              'wp_to_diaspora_connected',
+              $message,
+              ( ! $api->has_last_error() ) ? 'updated' : 'error'
+            );
+          }
+        }
+
+        // Attempt to get the cacert.pem file and save it to the plugin's root directory.
+        if ( isset( $_GET['wp2d_temp_ssl_fix'] ) ) {
+          $cacert_file = file_get_contents( 'http://curl.haxx.se/ca/cacert.pem' );
+          if ( $cacert_file && file_put_contents( WP2D_DIR . '/cacert.pem', $cacert_file ) ) {
+            add_settings_error(
+              'wp_to_diaspora_settings',
+              'wp_to_diaspora_temp_ssl_fix',
+              __( 'Successfully saved cacert.pem!', 'wp-to-diaspora' ),
+              'updated'
+            );
+          } else {
+            add_settings_error(
+              'wp_to_diaspora_settings',
+              'wp_to_diaspora_temp_ssl_fix',
+              __( 'Failed to save cacert.pem!', 'wp-to-diaspora' ),
+              'error'
+            );
+          }
+        }
+      }
+
+      // Output success or error message.
+      settings_errors( 'wp_to_diaspora_settings' );
+      ?>
 
 			<?php $page_tabs = array_keys( $this->_options_page_tabs( true ) ); ?>
 
 			<form action="options.php" method="post">
 				<input id="wp2d_no_js" type="hidden" name="wp_to_diaspora_settings[no_js]" value="1">
 				<?php
-				// Load the settings fields.
-				settings_fields( 'wp_to_diaspora_settings' );
-				do_settings_sections( 'wp_to_diaspora_settings' );
+        // Load the settings fields.
+        settings_fields( 'wp_to_diaspora_settings' );
+        do_settings_sections( 'wp_to_diaspora_settings' );
 
-				// Get the name of the current tab, if set, else take the first one from the list.
-				$tab = $this->_current_tab( $page_tabs[0] );
+        // Get the name of the current tab, if set, else take the first one from the list.
+        $tab = $this->_current_tab( $page_tabs[0] );
 
-				// Add Save and Reset buttons.
-				echo '<input id="submit-' . esc_attr( $tab ) . '" name="wp_to_diaspora_settings[submit_' . esc_attr( $tab ) . ']" type="submit" class="button-primary" value="' . esc_attr__( 'Save Changes' ) . '" />&nbsp;';
-				if ( 'setup' !== $tab ) {
-					echo '<input id="reset-' . esc_attr( $tab ) . '" name="wp_to_diaspora_settings[reset_' . esc_attr( $tab ) . ']" type="submit" class="button-secondary" value="' . esc_attr__( 'Reset Defaults', 'wp-to-diaspora' ) . '" />';
-				}
-				?>
+        // Add Save and Reset buttons.
+        echo '<input id="submit-' . esc_attr( $tab ) . '" name="wp_to_diaspora_settings[submit_' . esc_attr( $tab ) . ']" type="submit" class="button-primary" value="' . esc_attr__( 'Save Changes' ) . '" />&nbsp;';
+        if ( 'setup' !== $tab ) {
+          echo '<input id="reset-' . esc_attr( $tab ) . '" name="wp_to_diaspora_settings[reset_' . esc_attr( $tab ) . ']" type="submit" class="button-secondary" value="' . esc_attr__( 'Reset Defaults', 'wp-to-diaspora' ) . '" />';
+        }
+        ?>
 
 			</form>
 		</div>
 
 		<?php
-	}
-
-	/**
-	 * Return if the settings for the pod setup have been entered.
-	 *
-	 * @return boolean If the setup for the pod has been done.
-	 */
-	public function is_pod_set_up() {
-		return ( $this->get_option( 'pod' ) && $this->get_option( 'username' ) && $this->get_option( 'password' ) );
-	}
-
-	/**
-	 * Setup Contextual Help and Options pages.
-	 */
-	public function setup_wpadmin_pages() {
-		// Add options page.
-		$hook = add_options_page( 'WP to diaspora*', 'WP to diaspora*', 'manage_options', 'wp_to_diaspora', array( $this, 'admin_options_page' ) );
-
-		// Setup the contextual help menu after the options page has been loaded.
-		add_action( 'load-' . $hook, array( 'WP2D_Contextual_Help', 'instance' ) );
-
-		// Setup the contextual help menu tab for post types. Checks are made there!
-		add_action( 'load-post.php', array( 'WP2D_Contextual_Help', 'instance' ) );
-		add_action( 'load-post-new.php', array( 'WP2D_Contextual_Help', 'instance' ) );
-	}
-
-	/**
-	 * Initialise the settings sections and fields of the currently selected tab.
-	 */
-	public function register_settings() {
-		// Register the settings with validation callback.
-		register_setting( 'wp_to_diaspora_settings', 'wp_to_diaspora_settings', array( $this, 'validate_settings' ) );
-
-		// Load only the sections of the selected tab.
-		switch ( $this->_current_tab() ) {
-			case 'defaults' :
-				// Add a "Defaults" section that contains all posting settings to be used by default.
-				add_settings_section( 'wp_to_diaspora_defaults_section', __( 'Posting Defaults', 'wp-to-diaspora' ), array( $this, 'defaults_section' ), 'wp_to_diaspora_settings' );
-				break;
-			case 'setup' :
-				// Add a "Setup" section that contains the Pod domain, Username and Password.
-				add_settings_section( 'wp_to_diaspora_setup_section', __( 'diaspora* Setup', 'wp-to-diaspora' ), array( $this, 'setup_section' ), 'wp_to_diaspora_settings' );
-				break;
-		}
-	}
-
-
-	/**
-	 * Callback for the "Setup" section.
-	 */
-	public function setup_section() {
-		esc_html_e( 'Set up the connection to your diaspora* account.', 'wp-to-diaspora' );
-
-		// Pod entry field.
-		add_settings_field( 'pod', __( 'Diaspora* Pod', 'wp-to-diaspora' ), array( $this, 'pod_render' ), 'wp_to_diaspora_settings', 'wp_to_diaspora_setup_section' );
-
-		// Username entry field.
-		add_settings_field( 'username', __( 'Username' ), array( $this, 'username_render' ), 'wp_to_diaspora_settings', 'wp_to_diaspora_setup_section' );
-
-		// Password entry field.
-		add_settings_field( 'password', __( 'Password' ), array( $this, 'password_render' ), 'wp_to_diaspora_settings', 'wp_to_diaspora_setup_section' );
-	}
-
-	/**
-	 * Render the "Pod" field.
-	 */
-	public function pod_render() {
-		?>
+  }
+
+  /**
+   * Return if the settings for the pod setup have been entered.
+   *
+   * @return boolean If the setup for the pod has been done.
+   */
+  public function is_pod_set_up() {
+    return ( $this->get_option( 'pod' ) && $this->get_option( 'username' ) && $this->get_option( 'password' ) );
+  }
+
+  /**
+   * Setup Contextual Help and Options pages.
+   */
+  public function setup_wpadmin_pages() {
+    // Add options page.
+    $hook = add_options_page( 'WP to diaspora*', 'WP to diaspora*', 'manage_options', 'wp_to_diaspora', array( $this, 'admin_options_page' ) );
+
+    // Setup the contextual help menu after the options page has been loaded.
+    add_action( 'load-' . $hook, array( 'WP2D_Contextual_Help', 'instance' ) );
+
+    // Setup the contextual help menu tab for post types. Checks are made there!
+    add_action( 'load-post.php', array( 'WP2D_Contextual_Help', 'instance' ) );
+    add_action( 'load-post-new.php', array( 'WP2D_Contextual_Help', 'instance' ) );
+  }
+
+  /**
+   * Initialise the settings sections and fields of the currently selected tab.
+   */
+  public function register_settings() {
+    // Register the settings with validation callback.
+    register_setting( 'wp_to_diaspora_settings', 'wp_to_diaspora_settings', array( $this, 'validate_settings' ) );
+
+    // Load only the sections of the selected tab.
+    switch ( $this->_current_tab() ) {
+      case 'defaults' :
+        // Add a "Defaults" section that contains all posting settings to be used by default.
+        add_settings_section( 'wp_to_diaspora_defaults_section', __( 'Posting Defaults', 'wp-to-diaspora' ), array( $this, 'defaults_section' ), 'wp_to_diaspora_settings' );
+        break;
+      case 'setup' :
+        // Add a "Setup" section that contains the Pod domain, Username and Password.
+        add_settings_section( 'wp_to_diaspora_setup_section', __( 'diaspora* Setup', 'wp-to-diaspora' ), array( $this, 'setup_section' ), 'wp_to_diaspora_settings' );
+        break;
+    }
+  }
+
+
+  /**
+   * Callback for the "Setup" section.
+   */
+  public function setup_section() {
+    esc_html_e( 'Set up the connection to your diaspora* account.', 'wp-to-diaspora' );
+
+    // Pod entry field.
+    add_settings_field( 'pod', __( 'Diaspora* Pod', 'wp-to-diaspora' ), array( $this, 'pod_render' ), 'wp_to_diaspora_settings', 'wp_to_diaspora_setup_section' );
+
+    // Username entry field.
+    add_settings_field( 'username', __( 'Username' ), array( $this, 'username_render' ), 'wp_to_diaspora_settings', 'wp_to_diaspora_setup_section' );
+
+    // Password entry field.
+    add_settings_field( 'password', __( 'Password' ), array( $this, 'password_render' ), 'wp_to_diaspora_settings', 'wp_to_diaspora_setup_section' );
+  }
+
+  /**
+   * Render the "Pod" field.
+   */
+  public function pod_render() {
+    ?>
 		https://<input type="text" name="wp_to_diaspora_settings[pod]" value="<?php echo esc_attr( $this->get_option( 'pod' ) ); ?>" placeholder="e.g. joindiaspora.com" autocomplete="on" list="pod-list" required> <a id="refresh-pod-list" class="button hide-if-no-js"><?php esc_html_e( 'Refresh pod list', 'wp-to-diaspora' ); ?></a><span class="spinner"></span>
 		<datalist id="pod-list">
 		<?php foreach ( (array) $this->get_option( 'pod_list' ) as $pod ) : ?>
@@ -329,76 +329,76 @@ 
 		<?php endforeach; ?>
 		</datalist>
 		<?php
-	}
+  }
 
-	/**
-	 * Render the "Username" field.
-	 */
-	public function username_render() {
-		?>
+  /**
+   * Render the "Username" field.
+   */
+  public function username_render() {
+    ?>
 		<input type="text" name="wp_to_diaspora_settings[username]" value="<?php echo esc_attr( $this->get_option( 'username' ) ); ?>" placeholder="<?php esc_attr_e( 'Username' ); ?>" required>
 		<?php
-	}
-
-	/**
-	 * Render the "Password" field.
-	 */
-	public function password_render() {
-		// Special case if we already have a password.
-		$has_password = ( '' !== $this->get_option( 'password', '' ) );
-		$placeholder  = ( $has_password ) ? __( 'Password already set.', 'wp-to-diaspora' ) : __( 'Password' );
-		$required     = ( $has_password ) ? '' : ' required';
-		?>
+  }
+
+  /**
+   * Render the "Password" field.
+   */
+  public function password_render() {
+    // Special case if we already have a password.
+    $has_password = ( '' !== $this->get_option( 'password', '' ) );
+    $placeholder  = ( $has_password ) ? __( 'Password already set.', 'wp-to-diaspora' ) : __( 'Password' );
+    $required     = ( $has_password ) ? '' : ' required';
+    ?>
 		<input type="password" name="wp_to_diaspora_settings[password]" value="" placeholder="<?php echo esc_attr( $placeholder ); ?>"<?php echo esc_attr( $required ); ?>>
 		<?php if ( $has_password ) : ?>
 			<p class="description"><?php esc_html_e( 'If you would like to change the password type a new one. Otherwise leave this blank.', 'wp-to-diaspora' ); ?></p>
 		<?php endif;
-	}
+  }
 
 
-	/**
-	 * Callback for the "Defaults" section.
-	 */
-	public function defaults_section() {
-		esc_html_e( 'Define the default posting behaviour for all posts here. These settings can be modified for each post individually, by changing the values in the "WP to diaspora*" meta box, which gets displayed in your post edit screen.', 'wp-to-diaspora' );
+  /**
+   * Callback for the "Defaults" section.
+   */
+  public function defaults_section() {
+    esc_html_e( 'Define the default posting behaviour for all posts here. These settings can be modified for each post individually, by changing the values in the "WP to diaspora*" meta box, which gets displayed in your post edit screen.', 'wp-to-diaspora' );
 
-		// Post types field.
-		add_settings_field( 'enabled_post_types', __( 'Post types', 'wp-to-diaspora' ), array( $this, 'post_types_render' ), 'wp_to_diaspora_settings', 'wp_to_diaspora_defaults_section' );
+    // Post types field.
+    add_settings_field( 'enabled_post_types', __( 'Post types', 'wp-to-diaspora' ), array( $this, 'post_types_render' ), 'wp_to_diaspora_settings', 'wp_to_diaspora_defaults_section' );
 
-		 // Post to diaspora* checkbox.
-		add_settings_field( 'post_to_diaspora', __( 'Post to diaspora*', 'wp-to-diaspora' ), array( $this, 'post_to_diaspora_render' ), 'wp_to_diaspora_settings', 'wp_to_diaspora_defaults_section', $this->get_option( 'post_to_diaspora' ) );
+      // Post to diaspora* checkbox.
+    add_settings_field( 'post_to_diaspora', __( 'Post to diaspora*', 'wp-to-diaspora' ), array( $this, 'post_to_diaspora_render' ), 'wp_to_diaspora_settings', 'wp_to_diaspora_defaults_section', $this->get_option( 'post_to_diaspora' ) );
 
-		// Full entry link checkbox.
-		add_settings_field( 'fullentrylink', __( 'Show "Posted at" link?', 'wp-to-diaspora' ), array( $this, 'fullentrylink_render' ), 'wp_to_diaspora_settings', 'wp_to_diaspora_defaults_section', $this->get_option( 'fullentrylink' ) );
+    // Full entry link checkbox.
+    add_settings_field( 'fullentrylink', __( 'Show "Posted at" link?', 'wp-to-diaspora' ), array( $this, 'fullentrylink_render' ), 'wp_to_diaspora_settings', 'wp_to_diaspora_defaults_section', $this->get_option( 'fullentrylink' ) );
 
-		// Full text or excerpt radio buttons.
-		add_settings_field( 'display', __( 'Display', 'wp-to-diaspora' ), array( $this, 'display_render' ), 'wp_to_diaspora_settings', 'wp_to_diaspora_defaults_section', $this->get_option( 'display' ) );
+    // Full text or excerpt radio buttons.
+    add_settings_field( 'display', __( 'Display', 'wp-to-diaspora' ), array( $this, 'display_render' ), 'wp_to_diaspora_settings', 'wp_to_diaspora_defaults_section', $this->get_option( 'display' ) );
 
-		// Tags to post dropdown.
-		add_settings_field( 'tags_to_post', __( 'Tags to post', 'wp-to-diaspora' ), array( $this, 'tags_to_post_render' ), 'wp_to_diaspora_settings', 'wp_to_diaspora_defaults_section', $this->get_option( 'tags_to_post', 'gc' ) );
+    // Tags to post dropdown.
+    add_settings_field( 'tags_to_post', __( 'Tags to post', 'wp-to-diaspora' ), array( $this, 'tags_to_post_render' ), 'wp_to_diaspora_settings', 'wp_to_diaspora_defaults_section', $this->get_option( 'tags_to_post', 'gc' ) );
 
-		// Global tags field.
-		add_settings_field( 'global_tags', __( 'Global tags', 'wp-to-diaspora' ), array( $this, 'global_tags_render' ), 'wp_to_diaspora_settings', 'wp_to_diaspora_defaults_section', $this->get_option( 'global_tags' ) );
+    // Global tags field.
+    add_settings_field( 'global_tags', __( 'Global tags', 'wp-to-diaspora' ), array( $this, 'global_tags_render' ), 'wp_to_diaspora_settings', 'wp_to_diaspora_defaults_section', $this->get_option( 'global_tags' ) );
 
-		// Aspects checkboxes.
-		add_settings_field( 'aspects', __( 'Aspects', 'wp-to-diaspora' ), array( $this, 'aspects_services_render' ), 'wp_to_diaspora_settings', 'wp_to_diaspora_defaults_section', array( 'aspects', $this->get_option( 'aspects' ) ) );
+    // Aspects checkboxes.
+    add_settings_field( 'aspects', __( 'Aspects', 'wp-to-diaspora' ), array( $this, 'aspects_services_render' ), 'wp_to_diaspora_settings', 'wp_to_diaspora_defaults_section', array( 'aspects', $this->get_option( 'aspects' ) ) );
 
-		// Services checkboxes.
-		add_settings_field( 'services', __( 'Services', 'wp-to-diaspora' ), array( $this, 'aspects_services_render' ), 'wp_to_diaspora_settings', 'wp_to_diaspora_defaults_section', array( 'services', $this->get_option( 'services' ) ) );
-	}
+    // Services checkboxes.
+    add_settings_field( 'services', __( 'Services', 'wp-to-diaspora' ), array( $this, 'aspects_services_render' ), 'wp_to_diaspora_settings', 'wp_to_diaspora_defaults_section', array( 'services', $this->get_option( 'services' ) ) );
+  }
 
-	/**
-	 * Render the "Post types" checkboxes.
-	 */
-	public function post_types_render() {
-		$post_types = get_post_types( array( 'public' => true ), 'objects' );
+  /**
+   * Render the "Post types" checkboxes.
+   */
+  public function post_types_render() {
+    $post_types = get_post_types( array( 'public' => true ), 'objects' );
 
-		// Remove excluded post types from the list.
-		$excluded_post_types = array( 'attachment', 'nav_menu_item', 'revision' );
-		foreach ( $excluded_post_types as $excluded ) {
-			unset( $post_types[ $excluded ] );
-		}
-		?>
+    // Remove excluded post types from the list.
+    $excluded_post_types = array( 'attachment', 'nav_menu_item', 'revision' );
+    foreach ( $excluded_post_types as $excluded ) {
+      unset( $post_types[ $excluded ] );
+    }
+    ?>
 
 		<select id="enabled-post-types" multiple data-placeholder="<?php esc_attr_e( 'None', 'wp-to-diaspora' ); ?>" class="chosen" name="wp_to_diaspora_settings[enabled_post_types][]">
 		<?php foreach ( $post_types as $post_type ) : ?>
@@ -409,63 +409,63 @@ 
 		<p class="description"><?php esc_html_e( 'Choose which post types can be posted to diaspora*.', 'wp-to-diaspora' ); ?></p>
 
 		<?php
-	}
-
-	/**
-	 * Render the "Post to diaspora*" checkbox.
-	 *
-	 * @param bool $post_to_diaspora If this checkbox is checked or not.
-	 */
-	public function post_to_diaspora_render( $post_to_diaspora ) {
-		$label = ( 'settings_page_wp_to_diaspora' === get_current_screen()->id ) ? __( 'Yes' ) : __( 'Post to diaspora*', 'wp-to-diaspora' );
-		?>
+  }
+
+  /**
+   * Render the "Post to diaspora*" checkbox.
+   *
+   * @param bool $post_to_diaspora If this checkbox is checked or not.
+   */
+  public function post_to_diaspora_render( $post_to_diaspora ) {
+    $label = ( 'settings_page_wp_to_diaspora' === get_current_screen()->id ) ? __( 'Yes' ) : __( 'Post to diaspora*', 'wp-to-diaspora' );
+    ?>
 		<label><input type="checkbox" id="post-to-diaspora" name="wp_to_diaspora_settings[post_to_diaspora]" value="1" <?php checked( $post_to_diaspora ); ?>><?php echo esc_html( $label ); ?></label>
 		<?php
-	}
-
-	/**
-	 * Render the "Show 'Posted at' link" checkbox.
-	 *
-	 * @param bool $show_link If the checkbox is checked or not.
-	 */
-	public function fullentrylink_render( $show_link ) {
-		$description = __( 'Include a link back to your original post.', 'wp-to-diaspora' );
-		$checkbox = '<input type="checkbox" id="fullentrylink" name="wp_to_diaspora_settings[fullentrylink]" value="1"' . checked( $show_link, true, false ) . '>';
-
-		if ( 'settings_page_wp_to_diaspora' === get_current_screen()->id ) : ?>
+  }
+
+  /**
+   * Render the "Show 'Posted at' link" checkbox.
+   *
+   * @param bool $show_link If the checkbox is checked or not.
+   */
+  public function fullentrylink_render( $show_link ) {
+    $description = __( 'Include a link back to your original post.', 'wp-to-diaspora' );
+    $checkbox = '<input type="checkbox" id="fullentrylink" name="wp_to_diaspora_settings[fullentrylink]" value="1"' . checked( $show_link, true, false ) . '>';
+
+    if ( 'settings_page_wp_to_diaspora' === get_current_screen()->id ) : ?>
 			<label><?php echo $checkbox; ?><?php esc_html_e( 'Yes' ); ?></label>
 			<p class="description"><?php echo esc_html( $description ); ?></p>
 		<?php else : ?>
 			<label title="<?php echo esc_attr( $description ); ?>"><?php echo $checkbox; ?><?php esc_html_e( 'Show "Posted at" link?', 'wp-to-diaspora' ); ?></label>
 		<?php endif;
-	}
-
-	/**
-	 * Render the "Display" radio buttons.
-	 *
-	 * @param string $display The selected radio button.
-	 */
-	public function display_render( $display ) {
-		?>
+  }
+
+  /**
+   * Render the "Display" radio buttons.
+   *
+   * @param string $display The selected radio button.
+   */
+  public function display_render( $display ) {
+    ?>
 		<label><input type="radio" name="wp_to_diaspora_settings[display]" value="full" <?php checked( $display, 'full' ); ?>><?php esc_html_e( 'Full Post', 'wp-to-diaspora' ); ?></label><br />
 		<label><input type="radio" name="wp_to_diaspora_settings[display]" value="excerpt" <?php checked( $display, 'excerpt' ); ?>><?php esc_html_e( 'Excerpt' ); ?></label>
 		<?php
-	}
-
-	/**
-	 * Render the "Tags to post" field.
-	 *
-	 * @param array $tags_to_post The types of tags to be posted.
-	 */
-	public function tags_to_post_render( $tags_to_post ) {
-		$on_settings_page = ( 'settings_page_wp_to_diaspora' === get_current_screen()->id );
-		$description = esc_html__( 'Choose which tags should be posted to diaspora*.', 'wp-to-diaspora' );
-
-		if ( ! $on_settings_page ) {
-			echo '<label>' . esc_html( $description );
-		}
-
-		?>
+  }
+
+  /**
+   * Render the "Tags to post" field.
+   *
+   * @param array $tags_to_post The types of tags to be posted.
+   */
+  public function tags_to_post_render( $tags_to_post ) {
+    $on_settings_page = ( 'settings_page_wp_to_diaspora' === get_current_screen()->id );
+    $description = esc_html__( 'Choose which tags should be posted to diaspora*.', 'wp-to-diaspora' );
+
+    if ( ! $on_settings_page ) {
+      echo '<label>' . esc_html( $description );
+    }
+
+    ?>
 		<select id="tags-to-post" multiple data-placeholder="<?php esc_attr_e( 'No tags', 'wp-to-diaspora' ); ?>" class="chosen" name="wp_to_diaspora_settings[tags_to_post][]">
 			<option value="global" <?php selected( in_array( 'global', $tags_to_post ) ); ?>><?php esc_html_e( 'Global tags', 'wp-to-diaspora' ); ?></option>
 			<option value="custom" <?php selected( in_array( 'custom', $tags_to_post ) ); ?>><?php esc_html_e( 'Custom tags', 'wp-to-diaspora' ); ?></option>
@@ -477,82 +477,82 @@ 
 		<?php else : ?>
 			</label>
 		<?php endif;
-	}
-
-	/**
-	 * Render the "Global tags" field.
-	 *
-	 * @param array $tags The global tags to be posted.
-	 */
-	public function global_tags_render( $tags ) {
-		WP2D_Helpers::arr_to_str( $tags );
-		?>
+  }
+
+  /**
+   * Render the "Global tags" field.
+   *
+   * @param array $tags The global tags to be posted.
+   */
+  public function global_tags_render( $tags ) {
+    WP2D_Helpers::arr_to_str( $tags );
+    ?>
 		<input type="text" class="wp2dtags" name="wp_to_diaspora_settings[global_tags]" value="<?php echo esc_attr( $tags ); ?>" placeholder="<?php esc_attr_e( 'Global tags', 'wp-to-diaspora' ); ?>" class="regular-text">
 		<p class="description"><?php esc_html_e( 'Custom tags to add to all posts being posted to diaspora*.', 'wp-to-diaspora' ); ?></p>
 		<?php
-	}
-
-	/**
-	 * Render the "Custom tags" field.
-	 *
-	 * @param array $tags The custom tags to be posted.
-	 */
-	public function custom_tags_render( $tags ) {
-		WP2D_Helpers::arr_to_str( $tags );
-		?>
+  }
+
+  /**
+   * Render the "Custom tags" field.
+   *
+   * @param array $tags The custom tags to be posted.
+   */
+  public function custom_tags_render( $tags ) {
+    WP2D_Helpers::arr_to_str( $tags );
+    ?>
 		<label title="<?php esc_attr_e( 'Custom tags to add to this post when it\'s posted to diaspora*.', 'wp-to-diaspora' ); ?>">
 			<?php esc_html_e( 'Custom tags', 'wp-to-diaspora' ); ?>
 			<input type="text" class="wp2dtags" name="wp_to_diaspora_settings[custom_tags]" value="<?php echo esc_attr( $tags ); ?>" class="widefat">
 		</label>
 		<p class="description"><?php esc_html_e( 'Separate tags with commas' ); ?></p>
 		<?php
-	}
-
-	/**
-	 * Render the "Aspects" and "Services" checkboxes.
-	 *
-	 * @param array $args Array containing the type and items to output as checkboxes.
-	 */
-	public function aspects_services_render( $args ) {
-		list( $type, $items ) = $args;
-
-		$refresh_button = '';
-		$description    = '';
-		$empty_label    = '';
-
-		// This is where the 2 types show their differences.
-		switch ( $type ) {
-			case 'aspects':
-				$refresh_button = __( 'Refresh Aspects', 'wp-to-diaspora' );
-				$description    = esc_html__( 'Choose which aspects to share to.', 'wp-to-diaspora' );
-				$empty_label    = '<input type="checkbox" name="wp_to_diaspora_settings[aspects][]" value="public" checked="checked">' . esc_html__( 'Public' );
-				break;
-
-			case 'services':
-				$refresh_button = __( 'Refresh Services', 'wp-to-diaspora' );
-				$description    = sprintf( '%1$s<br><a href="%2$s" target="_blank">%3$s</a>',
-					esc_html__( 'Choose which services to share to.', 'wp-to-diaspora' ),
-					esc_url( 'https://' . $this->get_option( 'pod' ) . '/services' ),
-					esc_html__( 'Show available services on my pod.', 'wp-to-diaspora' )
-				);
-				$empty_label    = esc_html__( 'No services connected yet.', 'wp-to-diaspora' );
-				break;
-
-			default:
-				return;
-		}
-
-		$items = array_filter( (array) $items ) ?: array();
-
-		// Special case for this field if it's displayed on the settings page.
-		$on_settings_page = ( 'settings_page_wp_to_diaspora' === get_current_screen()->id );
-
-		if ( ! $on_settings_page ) {
-			echo $description;
-			$description = '';
-		}
-
-		?>
+  }
+
+  /**
+   * Render the "Aspects" and "Services" checkboxes.
+   *
+   * @param array $args Array containing the type and items to output as checkboxes.
+   */
+  public function aspects_services_render( $args ) {
+    list( $type, $items ) = $args;
+
+    $refresh_button = '';
+    $description    = '';
+    $empty_label    = '';
+
+    // This is where the 2 types show their differences.
+    switch ( $type ) {
+      case 'aspects':
+        $refresh_button = __( 'Refresh Aspects', 'wp-to-diaspora' );
+        $description    = esc_html__( 'Choose which aspects to share to.', 'wp-to-diaspora' );
+        $empty_label    = '<input type="checkbox" name="wp_to_diaspora_settings[aspects][]" value="public" checked="checked">' . esc_html__( 'Public' );
+        break;
+
+      case 'services':
+        $refresh_button = __( 'Refresh Services', 'wp-to-diaspora' );
+        $description    = sprintf( '%1$s<br><a href="%2$s" target="_blank">%3$s</a>',
+          esc_html__( 'Choose which services to share to.', 'wp-to-diaspora' ),
+          esc_url( 'https://' . $this->get_option( 'pod' ) . '/services' ),
+          esc_html__( 'Show available services on my pod.', 'wp-to-diaspora' )
+        );
+        $empty_label    = esc_html__( 'No services connected yet.', 'wp-to-diaspora' );
+        break;
+
+      default:
+        return;
+    }
+
+    $items = array_filter( (array) $items ) ?: array();
+
+    // Special case for this field if it's displayed on the settings page.
+    $on_settings_page = ( 'settings_page_wp_to_diaspora' === get_current_screen()->id );
+
+    if ( ! $on_settings_page ) {
+      echo $description;
+      $description = '';
+    }
+
+    ?>
 		<div id="<?php echo esc_attr( $type ); ?>-container" data-<?php echo esc_attr( $type ); ?>-selected="<?php echo esc_attr( implode( ',', $items ) ); ?>">
 			<?php if ( $list = (array) $this->get_option( $type . '_list' ) ) : ?>
 				<?php foreach ( $list as $id => $name ) : ?>
@@ -569,267 +569,267 @@ 
 			<span class="hide-if-js"><?php printf( esc_html_x( 'To update this list, %sre-save your login info%s.', 'placeholders are link tags to the settings page.', 'wp-to-diaspora' ), '<a href="' . admin_url( 'options-general.php?page=wp_to_diaspora' ) . '&amp;tab=setup" target="_blank">', '</a>' ); ?></span>
 		</p>
 		<?php
-	}
-
-
-	/**
-	 * Get a specific option.
-	 *
-	 * @param string       $option  ID of option to get.
-	 * @param array|string $default Override default value if option not found.
-	 * @return array|string Requested option value.
-	 */
-	public function get_option( $option = null, $default = null ) {
-		if ( ! isset( self::$_options ) ) {
-			self::$_options = get_option( 'wp_to_diaspora_settings', self::$_default_options );
-		}
-		if ( isset( $option ) ) {
-			if ( isset( self::$_options[ $option ] ) ) {
-				// Return found option value.
-				return self::$_options[ $option ];
-			} elseif ( isset( $default ) ) {
-				// Return overridden default value.
-				return $default;
-			} elseif ( isset( self::$_default_options[ $option ] ) ) {
-				// Return default option value.
-				return self::$_default_options[ $option ];
-			}
-		}
-	}
-
-	/**
-	 * Get all options.
-	 *
-	 * @return array All the options.
-	 */
-	public function get_options() {
-		return self::$_options;
-	}
-
-	/**
-	 * Set a certain option.
-	 *
-	 * @param string       $option ID of option to get.
-	 * @param array|string $value  Value to be set for the passed option.
-	 * @param boolean      $save   Save the options immediately after setting them.
-	 */
-	public function set_option( $option, $value, $save = false ) {
-		if ( isset( $option ) ) {
-			if ( isset( $value ) ) {
-				self::$_options[ $option ] = $value;
-			} else {
-				unset( self::$_options[ $option ] );
-			}
-		}
-		if ( $save ) {
-			self::save();
-		}
-	}
-
-	/**
-	 * Save the options.
-	 */
-	public function save() {
-		update_option( 'wp_to_diaspora_settings', self::$_options );
-	}
-
-	/**
-	 * Get all valid input values for the passed field.
-	 *
-	 * @param string $field Field to get the valid values for.
-	 * @return array List of valid values.
-	 */
-	public function get_valid_values( $field ) {
-		if ( array_key_exists( $field, self::$_valid_values ) ) {
-			return self::$_valid_values[ $field ];
-		}
-	}
-
-	/**
-	 * Check if a value is valid for the passed field.
-	 *
-	 * @param string $field Field to check the valid value for.
-	 * @param object $value Value to check validity.
-	 * @return boolean If the passed value is valid.
-	 */
-	public function is_valid_value( $field, $value ) {
-		if ( $valids = self::get_valid_values( $field ) ) {
-			return ( in_array( $value, $valids ) );
-		}
-		return false;
-	}
-
-	/**
-	 * Validate all settings.
-	 *
-	 * @param array $input RAW input values.
-	 * @return array Validated input values.
-	 */
-	public function validate_settings( $input ) {
-		/* Validate all settings before saving to the database. */
-
-		// Saving the pod setup details.
-		if ( isset( $input['submit_setup'] ) ) {
-			$input['pod']      = trim( sanitize_text_field( $input['pod'] ), ' /' );
-			$input['username'] = sanitize_text_field( $input['username'] );
-			$input['password'] = sanitize_text_field( $input['password'] );
-
-			// If password is blank, it hasn't been changed.
-			// If new password is equal to the encrypted password already saved, it was just passed again. It happens everytime update_option('wp_to_diaspora_settings') is called.
-			if ( '' === $input['password'] || $this->get_option( 'password' ) === $input['password'] ) {
-				$input['password'] = $this->get_option( 'password' );
-			} else {
-				$input['password'] = WP2D_Helpers::encrypt( $input['password'] );
-			}
-
-			// This is for when JS in not enabled, to make sure that the aspects and services
-			// are refetched when displaying the options page after saving.
-			if ( isset( $input['no_js'] ) ) {
-				set_transient( 'wp2d_no_js_force_refetch', true );
-			}
-		}
-
-		// Saving the default options.
-		if ( isset( $input['submit_defaults'] ) ) {
-			if ( ! isset( $input['enabled_post_types'] ) ) {
-				$input['enabled_post_types'] = array();
-			}
-
-			// Checkboxes.
-			$this->validate_checkboxes( array( 'post_to_diaspora', 'fullentrylink' ), $input );
-
-			// Single Selects.
-			$this->validate_single_selects( 'display', $input );
-
-			// Multiple Selects.
-			$this->validate_multi_selects( 'tags_to_post', $input );
-
-			// Get unique, non-empty, trimmed tags and clean them up.
-			$this->validate_tags( $input['global_tags'] );
-
-			// Clean up the list of aspects. If the list is empty, only use the 'Public' aspect.
-			$this->validate_aspects_services( $input['aspects'], array( 'public' ) );
-
-			// Clean up the list of services.
-			$this->validate_aspects_services( $input['services'] );
-		}
-
-		// Reset to defaults.
-		if ( isset( $input['reset_defaults'] ) ) {
-			// Set the input to the default options.
-			$input = self::$_default_options;
-
-			// Don't reset the fetched lists of pods, aspects and services.
-			unset( $input['pod_list'] );
-			unset( $input['aspects_list'] );
-			unset( $input['services_list'] );
-		}
-
-		// Unset all unused input fields.
-		unset( $input['submit_defaults'] );
-		unset( $input['reset_defaults'] );
-		unset( $input['submit_setup'] );
-
-		// Parse inputs with default options and return.
-		return wp_parse_args( $input, array_merge( self::$_default_options, self::$_options ) );
-	}
-
-	/**
-	 * Validate checkboxes, make them either true or false.
-	 *
-	 * @param string|array $checkboxes Checkboxes to validate.
-	 * @param array        $options    Options values themselves.
-	 * @return array The validated options.
-	 */
-	public function validate_checkboxes( $checkboxes, &$options ) {
-		foreach ( WP2D_Helpers::str_to_arr( $checkboxes ) as $checkbox ) {
-			$options[ $checkbox ] = isset( $options[ $checkbox ] );
-		}
-		return $options;
-	}
-
-	/**
-	 * Validate single-select fields and make sure their selected value are valid.
-	 *
-	 * @param string|array $selects Name(s) of the select fields.
-	 * @param array        $options Options values themselves.
-	 * @return array The validated options.
-	 */
-	public function validate_single_selects( $selects, &$options ) {
-		foreach ( WP2D_Helpers::str_to_arr( $selects ) as $select ) {
-			if ( isset( $options[ $select ] ) && ! $this->is_valid_value( $select, $options[ $select ] ) ) {
-				unset( $options[ $select ] );
-			}
-		}
-		return $options;
-	}
-
-	/**
-	 * Validate multi-select fields and make sure their selected values are valid.
-	 *
-	 * @param string|array $selects Name(s) of the select fields.
-	 * @param array        $options Options values themselves.
-	 * @return array The validated options.
-	 */
-	public function validate_multi_selects( $selects, &$options ) {
-		foreach ( WP2D_Helpers::str_to_arr( $selects ) as $select ) {
-			if ( isset( $options[ $select ] ) ) {
-				foreach ( (array) $options[ $select ] as $option_value ) {
-					if ( ! $this->is_valid_value( $select, $option_value ) ) {
-						unset( $options[ $select ] );
-						break;
-					}
-				}
-			} else {
-				$options[ $select ] = array();
-			}
-		}
-		return $options;
-	}
-
-	/**
-	 * Clean up the passed tags. Keep only alphanumeric, hyphen and underscore characters.
-	 *
-	 * @param array|string $tags Tags to be cleaned as array or comma seperated values.
-	 * @return array The cleaned tags.
-	 */
-	public function validate_tags( &$tags ) {
-		WP2D_Helpers::str_to_arr( $tags );
-
-		$tags = array_map( array( $this, 'validate_tag' ),
-			array_unique(
-				array_filter( $tags, 'trim' )
-			)
-		);
-		return $tags;
-	}
-
-	/**
-	 * Clean up the passed tag. Keep only alphanumeric, hyphen and underscore characters.
-	 *
-	 * @todo What about eastern characters? (chinese, indian, etc.)
-	 *
-	 * @param string $tag Tag to be cleaned.
-	 * @return string The clean tag.
-	 */
-	public function validate_tag( &$tag ) {
-		$tag = preg_replace( '/[^\w $\-]/u', '', str_replace( ' ', '-', trim( $tag ) ) );
-		return $tag;
-	}
-
-	/**
-	 * Validate the passed aspects or services.
-	 *
-	 * @param array $aspects_services List of aspects or services that need to be validated.
-	 * @param array $default          Default value if not valid.
-	 * @return array The validated list of aspects or services.
-	 */
-	public function validate_aspects_services( &$aspects_services, $default = array() ) {
-		if ( empty( $aspects_services ) || ! is_array( $aspects_services ) ) {
-			$aspects_services = $default;
-		} else {
-			array_walk( $aspects_services, 'sanitize_text_field' );
-		}
-		return $aspects_services;
-	}
+  }
+
+
+  /**
+   * Get a specific option.
+   *
+   * @param string       $option  ID of option to get.
+   * @param array|string $default Override default value if option not found.
+   * @return array|string Requested option value.
+   */
+  public function get_option( $option = null, $default = null ) {
+    if ( ! isset( self::$_options ) ) {
+      self::$_options = get_option( 'wp_to_diaspora_settings', self::$_default_options );
+    }
+    if ( isset( $option ) ) {
+      if ( isset( self::$_options[ $option ] ) ) {
+        // Return found option value.
+        return self::$_options[ $option ];
+      } elseif ( isset( $default ) ) {
+        // Return overridden default value.
+        return $default;
+      } elseif ( isset( self::$_default_options[ $option ] ) ) {
+        // Return default option value.
+        return self::$_default_options[ $option ];
+      }
+    }
+  }
+
+  /**
+   * Get all options.
+   *
+   * @return array All the options.
+   */
+  public function get_options() {
+    return self::$_options;
+  }
+
+  /**
+   * Set a certain option.
+   *
+   * @param string       $option ID of option to get.
+   * @param array|string $value  Value to be set for the passed option.
+   * @param boolean      $save   Save the options immediately after setting them.
+   */
+  public function set_option( $option, $value, $save = false ) {
+    if ( isset( $option ) ) {
+      if ( isset( $value ) ) {
+        self::$_options[ $option ] = $value;
+      } else {
+        unset( self::$_options[ $option ] );
+      }
+    }
+    if ( $save ) {
+      self::save();
+    }
+  }
+
+  /**
+   * Save the options.
+   */
+  public function save() {
+    update_option( 'wp_to_diaspora_settings', self::$_options );
+  }
+
+  /**
+   * Get all valid input values for the passed field.
+   *
+   * @param string $field Field to get the valid values for.
+   * @return array List of valid values.
+   */
+  public function get_valid_values( $field ) {
+    if ( array_key_exists( $field, self::$_valid_values ) ) {
+      return self::$_valid_values[ $field ];
+    }
+  }
+
+  /**
+   * Check if a value is valid for the passed field.
+   *
+   * @param string $field Field to check the valid value for.
+   * @param object $value Value to check validity.
+   * @return boolean If the passed value is valid.
+   */
+  public function is_valid_value( $field, $value ) {
+    if ( $valids = self::get_valid_values( $field ) ) {
+      return ( in_array( $value, $valids ) );
+    }
+    return false;
+  }
+
+  /**
+   * Validate all settings.
+   *
+   * @param array $input RAW input values.
+   * @return array Validated input values.
+   */
+  public function validate_settings( $input ) {
+    /* Validate all settings before saving to the database. */
+
+    // Saving the pod setup details.
+    if ( isset( $input['submit_setup'] ) ) {
+      $input['pod']      = trim( sanitize_text_field( $input['pod'] ), ' /' );
+      $input['username'] = sanitize_text_field( $input['username'] );
+      $input['password'] = sanitize_text_field( $input['password'] );
+
+      // If password is blank, it hasn't been changed.
+      // If new password is equal to the encrypted password already saved, it was just passed again. It happens everytime update_option('wp_to_diaspora_settings') is called.
+      if ( '' === $input['password'] || $this->get_option( 'password' ) === $input['password'] ) {
+        $input['password'] = $this->get_option( 'password' );
+      } else {
+        $input['password'] = WP2D_Helpers::encrypt( $input['password'] );
+      }
+
+      // This is for when JS in not enabled, to make sure that the aspects and services
+      // are refetched when displaying the options page after saving.
+      if ( isset( $input['no_js'] ) ) {
+        set_transient( 'wp2d_no_js_force_refetch', true );
+      }
+    }
+
+    // Saving the default options.
+    if ( isset( $input['submit_defaults'] ) ) {
+      if ( ! isset( $input['enabled_post_types'] ) ) {
+        $input['enabled_post_types'] = array();
+      }
+
+      // Checkboxes.
+      $this->validate_checkboxes( array( 'post_to_diaspora', 'fullentrylink' ), $input );
+
+      // Single Selects.
+      $this->validate_single_selects( 'display', $input );
+
+      // Multiple Selects.
+      $this->validate_multi_selects( 'tags_to_post', $input );
+
+      // Get unique, non-empty, trimmed tags and clean them up.
+      $this->validate_tags( $input['global_tags'] );
+
+      // Clean up the list of aspects. If the list is empty, only use the 'Public' aspect.
+      $this->validate_aspects_services( $input['aspects'], array( 'public' ) );
+
+      // Clean up the list of services.
+      $this->validate_aspects_services( $input['services'] );
+    }
+
+    // Reset to defaults.
+    if ( isset( $input['reset_defaults'] ) ) {
+      // Set the input to the default options.
+      $input = self::$_default_options;
+
+      // Don't reset the fetched lists of pods, aspects and services.
+      unset( $input['pod_list'] );
+      unset( $input['aspects_list'] );
+      unset( $input['services_list'] );
+    }
+
+    // Unset all unused input fields.
+    unset( $input['submit_defaults'] );
+    unset( $input['reset_defaults'] );
+    unset( $input['submit_setup'] );
+
+    // Parse inputs with default options and return.
+    return wp_parse_args( $input, array_merge( self::$_default_options, self::$_options ) );
+  }
+
+  /**
+   * Validate checkboxes, make them either true or false.
+   *
+   * @param string|array $checkboxes Checkboxes to validate.
+   * @param array        $options    Options values themselves.
+   * @return array The validated options.
+   */
+  public function validate_checkboxes( $checkboxes, &$options ) {
+    foreach ( WP2D_Helpers::str_to_arr( $checkboxes ) as $checkbox ) {
+      $options[ $checkbox ] = isset( $options[ $checkbox ] );
+    }
+    return $options;
+  }
+
+  /**
+   * Validate single-select fields and make sure their selected value are valid.
+   *
+   * @param string|array $selects Name(s) of the select fields.
+   * @param array        $options Options values themselves.
+   * @return array The validated options.
+   */
+  public function validate_single_selects( $selects, &$options ) {
+    foreach ( WP2D_Helpers::str_to_arr( $selects ) as $select ) {
+      if ( isset( $options[ $select ] ) && ! $this->is_valid_value( $select, $options[ $select ] ) ) {
+        unset( $options[ $select ] );
+      }
+    }
+    return $options;
+  }
+
+  /**
+   * Validate multi-select fields and make sure their selected values are valid.
+   *
+   * @param string|array $selects Name(s) of the select fields.
+   * @param array        $options Options values themselves.
+   * @return array The validated options.
+   */
+  public function validate_multi_selects( $selects, &$options ) {
+    foreach ( WP2D_Helpers::str_to_arr( $selects ) as $select ) {
+      if ( isset( $options[ $select ] ) ) {
+        foreach ( (array) $options[ $select ] as $option_value ) {
+          if ( ! $this->is_valid_value( $select, $option_value ) ) {
+            unset( $options[ $select ] );
+            break;
+          }
+        }
+      } else {
+        $options[ $select ] = array();
+      }
+    }
+    return $options;
+  }
+
+  /**
+   * Clean up the passed tags. Keep only alphanumeric, hyphen and underscore characters.
+   *
+   * @param array|string $tags Tags to be cleaned as array or comma seperated values.
+   * @return array The cleaned tags.
+   */
+  public function validate_tags( &$tags ) {
+    WP2D_Helpers::str_to_arr( $tags );
+
+    $tags = array_map( array( $this, 'validate_tag' ),
+      array_unique(
+        array_filter( $tags, 'trim' )
+      )
+    );
+    return $tags;
+  }
+
+  /**
+   * Clean up the passed tag. Keep only alphanumeric, hyphen and underscore characters.
+   *
+   * @todo What about eastern characters? (chinese, indian, etc.)
+   *
+   * @param string $tag Tag to be cleaned.
+   * @return string The clean tag.
+   */
+  public function validate_tag( &$tag ) {
+    $tag = preg_replace( '/[^\w $\-]/u', '', str_replace( ' ', '-', trim( $tag ) ) );
+    return $tag;
+  }
+
+  /**
+   * Validate the passed aspects or services.
+   *
+   * @param array $aspects_services List of aspects or services that need to be validated.
+   * @param array $default          Default value if not valid.
+   * @return array The validated list of aspects or services.
+   */
+  public function validate_aspects_services( &$aspects_services, $default = array() ) {
+    if ( empty( $aspects_services ) || ! is_array( $aspects_services ) ) {
+      $aspects_services = $default;
+    } else {
+      array_walk( $aspects_services, 'sanitize_text_field' );
+    }
+    return $aspects_services;
+  }
 }

lib/class-api.php

Indentation +668 added lines, -668 removed lines

@@ -26,672 +26,672 @@
  */
 class WP2D_API {
 
-	/**
-	 * The provider name to display when posting to diaspora*.
-	 *
-	 * @var string
-	 */
-	public $provider = 'WP to diaspora*';
-
-	/**
-	 * The last http request error that occurred.
-	 *
-	 * @var WP_Error
-	 */
-	private $_last_error;
-
-	/**
-	 * Security token to be used for making requests.
-	 *
-	 * @var string
-	 */
-	private $_token;
-
-	/**
-	 * Save the cookies for the requests.
-	 *
-	 * @var array
-	 */
-	private $_cookies;
-
-	/**
-	 * The last http request made to diaspora*.
-	 * Contains the response and request infos.
-	 *
-	 * @var object
-	 */
-	private $_last_request;
-
-	/**
-	 * Is this a secure server, use HTTPS instead of HTTP?
-	 *
-	 * @var boolean
-	 */
-	private $_is_secure;
-
-	/**
-	 * The pod domain to make the http requests to.
-	 *
-	 * @var string
-	 */
-	private $_pod;
-
-	/**
-	 * Username to use when logging in to diaspora*.
-	 *
-	 * @var string
-	 */
-	private $_username;
-
-	/**
-	 * Password to use when logging in to diaspora*.
-	 *
-	 * @var string
-	 */
-	private $_password;
-
-	/**
-	 * Remember the current login state.
-	 *
-	 * @var boolean
-	 */
-	private $_is_logged_in = false;
-
-	/**
-	 * The list of user's aspects, which get set after ever http request.
-	 *
-	 * @var array
-	 */
-	private $_aspects = array();
-
-	/**
-	 * The list of user's connected services, which get set after ever http request.
-	 *
-	 * @var array
-	 */
-	private $_services = array();
-
-	/**
-	 * List of regex expressions used to filter out details from http request responses.
-	 *
-	 * @var array
-	 */
-	private $_regexes = array(
-		'token'    => '/content="(.*?)" name="csrf-token"|name="csrf-token" content="(.*?)"/',
-		'aspects'  => '/"aspects"\:(\[.*?\])/',
-		'services' => '/"configured_services"\:(\[.*?\])/',
-	);
-
-	/**
-	 * The full pod url, with the used protocol.
-	 *
-	 * @param string $path Path to add to the pod url.
-	 * @return string Full pod url.
-	 */
-	public function get_pod_url( $path = '' ) {
-		$path = trim( $path, ' /' );
-
-		// Add a slash to the beginning?
-		if ( '' !== $path ) {
-			$path = '/' . $path;
-		}
-
-		return sprintf( 'http%s://%s%s', ( $this->_is_secure ) ? 's' : '', $this->_pod, $path );
-	}
-
-	/**
-	 * Constructor to initialise the connection to diaspora*.
-	 *
-	 * @param string  $pod       The pod domain to connect to.
-	 * @param boolean $is_secure Is this a secure server? (Default: true).
-	 */
-	public function __construct( $pod, $is_secure = true ) {
-		// Set class variables.
-		$this->_pod       = $pod;
-		$this->_is_secure = (bool) $is_secure;
-	}
-
-	/**
-	 * Initialise the connection to diaspora*. The pod and protocol can be changed by passing new parameters.
-	 * Check if we can connect to the pod to retrieve the token.
-	 *
-	 * @param string  $pod       Pod domain to connect to, if it should be changed.
-	 * @param boolean $is_secure Is this a secure server? (Default: true).
-	 * @return boolean True if we could get the token, else false.
-	 */
-	public function init( $pod = null, $is_secure = true ) {
-		// If we are changing pod, we need to fetch a new token.
-		$force_new_token = false;
-
-		// When initialising a connection, clear the last error.
-		// This is important when multiple init tries happen.
-		$this->_last_error = null;
-
-		// Change the pod we are connecting to?
-		if ( isset( $pod ) && ( $this->_pod !== $pod || $this->_is_secure !== $is_secure ) ) {
-			$this->_pod       = $pod;
-			$this->_is_secure = (bool) $is_secure;
-			$force_new_token  = true;
-		}
-
-		// Get and save the token.
-		if ( null === $this->_fetch_token( $force_new_token ) ) {
-			$error = ( $this->has_last_error() ) ? ' ' . $this->get_last_error() : '';
-			$this->_error( 'wp2d_api_init_failed',
-				sprintf(
-					_x( 'Failed to initialise connection to pod "%s".', 'Placeholder is the full pod URL.', 'wp-to-diaspora' ),
-					$this->get_pod_url()
-				) . $error,
-				array( 'help_tab' => 'troubleshooting' )
-			);
-
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Check if there is an API error around.
-	 *
-	 * @return boolean If there is an API error around.
-	 */
-	public function has_last_error() {
-		return is_wp_error( $this->_last_error );
-	}
-
-	/**
-	 * Get the last API error object.
-	 *
-	 * @param boolean $clear If the error should be cleared after returning it.
-	 * @return WP_Error|null The last API error object or null.
-	 */
-	public function get_last_error_object( $clear = true ) {
-		$last_error = $this->_last_error;
-		$clear && $this->_last_error = null;
-		return $last_error;
-	}
-
-	/**
-	 * Get the last API error message.
-	 *
-	 * @param boolean $clear If the error should be cleared after returning it.
-	 * @return string The last API error message.
-	 */
-	public function get_last_error( $clear = false ) {
-		$last_error = ( $this->has_last_error() ) ? $this->_last_error->get_error_message() : '';
-		$clear && $this->_last_error = null;
-		return $last_error;
-	}
-
-	/**
-	 * Fetch the secure token from Diaspora and save it for future use.
-	 *
-	 * @param boolean $force Force to fetch a new token.
-	 * @return string The fetched token.
-	 */
-	private function _fetch_token( $force = false ) {
-		if ( ! isset( $this->_token ) || (bool) $force ) {
-			// Go directly to the sign in page, as it would redirect to there anyway.
-			// Since _request function automatically saves the new token, just call it with no data.
-			$this->_request( '/users/sign_in' );
-		}
-		return $this->_token;
-	}
-
-	/**
-	 * Check if the API has been initialised. Otherwise set the last error.
-	 *
-	 * @return boolean Has the connection been initialised?
-	 */
-	private function _check_init() {
-		if ( is_null( $this->_token ) ) {
-			$this->_error( 'wp2d_api_connection_not_initialised', __( 'Connection not initialised.', 'wp-to-diaspora' ) );
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Check if we're logged in. Otherwise set the last error.
-	 *
-	 * @return boolean Are we logged in already?
-	 */
-	private function _check_login() {
-		if ( ! $this->_check_init() ) {
-			return false;
-		}
-		if ( ! $this->is_logged_in() ) {
-			$this->_error( 'wp2d_api_not_logged_in', __( 'Not logged in.', 'wp-to-diaspora' ) );
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Check if we are logged in.
-	 *
-	 * @return boolean Are we logged in already?
-	 */
-	public function is_logged_in() {
-		return $this->_is_logged_in;
-	}
-
-	/**
-	 * Log in to diaspora*.
-	 *
-	 * @param string  $username Username used for login.
-	 * @param string  $password Password used for login.
-	 * @param boolean $force    Force a new login even if we are already logged in.
-	 * @return boolean Did the login succeed?
-	 */
-	public function login( $username, $password, $force = false ) {
-		// Has the connection been initialised?
-		if ( ! $this->_check_init() ) {
-			$this->logout();
-			return false;
-		}
-
-		// Username and password both need to be set.
-		$username = ( isset( $username ) && '' !== $username ) ? $username : null;
-		$password = ( isset( $password ) && '' !== $password ) ? $password : null;
-		if ( ! isset( $username, $password ) ) {
-			$this->logout();
-			return false;
-		}
-
-		// If we are already logged in and not forcing a relogin, return.
-		if ( ! $force && $this->is_logged_in() &&
-			$username === $this->_username &&
-			$password === $this->_password ) {
-			return true;
-		}
-
-		// Set the newly passed username and password.
-		$this->_username = $username;
-		$this->_password = $password;
-
-		// Set up the login parameters.
-		$params = array(
-			'user[username]'     => $this->_username,
-			'user[password]'     => $this->_password,
-			'authenticity_token' => $this->_fetch_token(),
-		);
-
-		$args = array(
-			'method' => 'POST',
-			'body'   => $params,
-		);
-
-		// Try to sign in.
-		$this->_request( '/users/sign_in', $args );
-
-		// Can we load the bookmarklet to make sure we're logged in?
-		$response = $this->_request( '/bookmarklet' );
-
-		// If the request isn't successful, we are not logged in correctly.
-		if ( is_wp_error( $response ) || 200 !== $response->code ) {
-			// Login failed.
-			$this->_error( 'wp2d_api_login_failed', __( 'Login failed. Check your login details.', 'wp-to-diaspora' ), array( 'help_tab' => 'troubleshooting' ) );
-			$this->logout();
-			return false;
-		}
-
-		// Login succeeded.
-		$this->_is_logged_in = true;
-		return true;
-	}
-
-	/**
-	 * Perform a logout, resetting all login info.
-	 *
-	 * @since 1.6.0
-	 */
-	public function logout() {
-		$this->_is_logged_in = false;
-		$this->_username = null;
-		$this->_password = null;
-		$this->_aspects = array();
-		$this->_services = array();
-	}
-
-	/**
-	 * Perform a deinitialisation, resetting all class variables.
-	 *
-	 * @since 1.7.0
-	 */
-	public function deinit() {
-		$this->logout();
-		$this->_last_error = null;
-		$this->_token = null;
-		$this->_cookies = array();
-		$this->_last_request = null;
-	}
-
-	/**
-	 * Post to diaspora*.
-	 *
-	 * @param string       $text       The text to post.
-	 * @param array|string $aspects    The aspects to post to. Array or comma seperated ids.
-	 * @param array        $extra_data Any extra data to be added to the post call.
-	 * @return boolean|object Return the response data of the new diaspora* post if successfully posted, else false.
-	 */
-	public function post( $text, $aspects = 'public', $extra_data = array() ) {
-		// Are we logged in?
-		if ( ! $this->_check_login() ) {
-			return false;
-		}
-
-		// Put the aspects into a clean array.
-		$aspects = array_filter( WP2D_Helpers::str_to_arr( $aspects ) );
-
-		// If no aspects have been selected or the public one is also included, choose public only.
-		if ( empty( $aspects ) || in_array( 'public', $aspects ) ) {
-			$aspects = 'public';
-		}
-
-		// Prepare post data.
-		$post_data = array(
-			'aspect_ids'     => $aspects,
-			'status_message' => array(
-				'text' => $text,
-				'provider_display_name' => $this->provider,
-			),
-		);
-
-		// Add any extra data to the post.
-		if ( ! empty( $extra_data ) ) {
-				$post_data += $extra_data;
-		}
-
-		// Check if we can use the new wp_json_encode function.
-		$post_data = ( function_exists( 'wp_json_encode' ) )
-			? wp_json_encode( $post_data )
-			: json_encode( $post_data );
-
-		$args = array(
-			'method'  => 'POST',
-			'body'    => $post_data,
-			'headers' => array(
-				'Accept'       => 'application/json',
-				'Content-Type' => 'application/json',
-				'X-CSRF-Token' => $this->_fetch_token(),
-			),
-		);
-
-		// Submit the post.
-		$response = $this->_request( '/status_messages', $args );
-
-		if ( is_wp_error( $response ) ) {
-			$this->_error( 'wp2d_api_post_failed', $response->get_error_message() );
-			return false;
-		}
-
-		$diaspost = json_decode( $response->body );
-		if ( 201 !== $response->code ) {
-			$this->_error( 'wp2d_api_post_failed', ( isset( $diaspost->error ) ) ? $diaspost->error : _x( 'Unknown error occurred.', 'When an unknown error occurred in the WP2D_API object.', 'wp-to-diaspora' ) );
-			return false;
-		}
-
-		// Add additional info to our diaspora post object.
-		$diaspost->permalink = $this->get_pod_url( '/posts/' . $diaspost->guid );
-
-		return $diaspost;
-	}
-
-	/**
-	 * Delete a post or comment from diaspora*.
-	 *
-	 * @since 1.6.0
-	 *
-	 * @param string $what What to delete, 'post' or 'comment'.
-	 * @param string $id The ID of the post or comment to delete.
-	 * @return boolean If the deletion was successful.
-	 */
-	public function delete( $what, $id ) {
-		// Are we logged in?
-		if ( ! $this->_check_login() ) {
-			return false;
-		}
-
-		// For now, only deleting posts and comments is allowed.
-		if ( ! in_array( $what, array( 'post', 'comment' ) ) ) {
-			$this->_error( 'wp2d_api_delete_failed', __( 'You can only delete posts and comments.', 'wp-to-diaspora' ) );
-			return false;
-		}
-
-		$args = array(
-			'method'  => 'DELETE',
-			'headers' => array(
-				'Accept'       => 'application/json',
-				'Content-Type' => 'application/json',
-				'X-CSRF-Token' => $this->_fetch_token(),
-			),
-		);
-
-		// Try to delete the post or comment.
-		$response = $this->_request( '/' . $what . 's/' . $id, $args );
-
-		$error_message = '';
-
-		if ( is_wp_error( $response ) ) {
-			$error_message = $response->get_error_message();
-		} else {
-			switch ( $response->code ) {
-				case 204:
-					return true;
-				case 404:
-					$error_message = ( 'post' === $what )
-						? __( 'The post you tried to delete does not exist.', 'wp-to-diaspora' )
-						: __( 'The comment you tried to delete does not exist.', 'wp-to-diaspora' );
-					break;
-
-				// Due to diaspora* returning a proper 403 when trying to delete a foreign comment
-				// but returning a 500 when trying to delete a foreign post, this needs some special attention.
-				case 403:
-					if ( 'comment' === $what ) {
-						$error_message = __( 'The comment you tried to delete does not belong to you.', 'wp-to-diaspora' );
-						break;
-					}
-					// Fall through...
-				case 500:
-					if ( 'post' === $what ) {
-						$error_message = __( 'The post you tried to delete does not belong to you.', 'wp-to-diaspora' );
-						break;
-					}
-					// Fall through...
-				default:
-					$error_message = _x( 'Unknown error occurred.', 'When an unknown error occurred in the WP2D_API object.', 'wp-to-diaspora' );
-					break;
-			}
-		}
-
-		$this->_error( 'wp2d_api_delete_' . $what . '_failed', $error_message );
-		return false;
-	}
-
-	/**
-	 * Get the list of aspects.
-	 *
-	 * @param boolean $force Force to fetch new aspects.
-	 * @return array Array of aspect objects.
-	 */
-	public function get_aspects( $force = false ) {
-		$this->_aspects = $this->_get_aspects_services( 'aspects', $this->_aspects, $force );
-		return ( is_array( $this->_aspects ) ) ? $this->_aspects : false;
-	}
-
-	/**
-	 * Get the list of connected services.
-	 *
-	 * @param boolean $force Force to fetch new connected services.
-	 * @return array Array of service objects.
-	 */
-	public function get_services( $force = false ) {
-		$this->_services = $this->_get_aspects_services( 'services', $this->_services, $force );
-		return ( is_array( $this->_services ) ) ? $this->_services : false;
-	}
-
-	/**
-	 * Get the list of aspects or connected services.
-	 *
-	 * @param string  $type  Type of list to get.
-	 * @param array   $list  The current list of items.
-	 * @param boolean $force Force to fetch new list.
-	 * @return boolean Was the list fetched successfully?
-	 */
-	private function _get_aspects_services( $type, $list, $force ) {
-		if ( ! $this->_check_login() ) {
-			return false;
-		}
-
-		// Fetch the new list if the current list is empty or a reload is forced.
-		if ( empty( $list ) || (bool) $force ) {
-			$response = $this->_request( '/bookmarklet' );
-
-			if ( is_wp_error( $response ) || 200 !== $response->code ) {
-				switch ( $type ) {
-					case 'aspects':
-						$this->_error( 'wp2d_api_getting_aspects_failed', __( 'Error loading aspects.', 'wp-to-diaspora' ) );
-						break;
-					case 'services':
-						$this->_error( 'wp2d_api_getting_services_failed', __( 'Error loading services.', 'wp-to-diaspora' ) );
-						break;
-					default:
-						$this->_error( 'wp2d_api_getting_aspects_services_failed', _x( 'Unknown error occurred.', 'When an unknown error occurred in the WP2D_API object.', 'wp-to-diaspora' ) );
-						break;
-				}
-				return false;
-			}
-
-			// Load the aspects or services.
-			if ( is_array( $raw_list = json_decode( $this->_parse_regex( $type, $response->body ) ) ) ) {
-				// In case this fetch is forced, empty the list.
-				$list = array();
-
-				switch ( $type ) {
-					case 'aspects':
-						// Add the 'public' aspect, as it's global and not user specific.
-						$list['public'] = __( 'Public', 'wp-to-diaspora' );
-
-						// Add all user specific aspects.
-						foreach ( $raw_list as $aspect ) {
-							$list[ $aspect->id ] = $aspect->name;
-						}
-						break;
-					case 'services':
-						foreach ( $raw_list as $service ) {
-							$list[ $service ] = ucfirst( $service );
-						}
-						break;
-				}
-			}
-		}
-		return $list;
-	}
-
-	/**
-	 * Send an http(s) request via WP_HTTP API.
-	 *
-	 * @see WP_Http::request()
-	 *
-	 * @param string $url  The URL to request.
-	 * @param array  $args Arguments to be posted with the request.
-	 * @return object An object containing details about this request.
-	 */
-	private function _request( $url, $args = array() ) {
-		// Prefix the full pod URL if necessary.
-		if ( 0 === strpos( $url, '/' ) ) {
-			$url = $this->get_pod_url( $url );
-		}
-
-		// Disable redirections so we can verify HTTP response codes.
-		$defaults = array(
-			'redirection' => 0,
-			'sslverify'   => true,
-			'timeout'     => 60,
-			'method'      => 'GET',
-		);
-
-		// If the certificate bundle has been downloaded manually, use that instead.
-		// NOTE: This should actually never be necessary, it's a fallback!
-		if ( file_exists( WP2D_DIR . '/cacert.pem' ) ) {
-			$defaults['sslcertificates'] = WP2D_DIR . '/cacert.pem';
-		}
-
-		// Set the correct cookie.
-		if ( ! empty( $this->_cookies ) ) {
-			$defaults['cookies'] = $this->_cookies;
-		}
-
-		$args = wp_parse_args( $args, $defaults );
-
-		// Get the response from the WP_HTTP request.
-		$response = wp_remote_request( $url, $args );
-
-		if ( is_wp_error( $response ) ) {
-			$this->_last_error = $response;
-			return $response;
-		}
-
-		// Get the headers and the html response.
-		$headers = wp_remote_retrieve_headers( $response );
-		$body    = wp_remote_retrieve_body( $response );
-
-		// Remember this request.
-		$this->_last_request = new stdClass();
-		$this->_last_request->response = $response;
-		$this->_last_request->headers  = $headers;
-		$this->_last_request->body     = $body;
-		$this->_last_request->message  = wp_remote_retrieve_response_message( $response );
-		$this->_last_request->code     = wp_remote_retrieve_response_code( $response );
-
-		// Save the new token.
-		if ( $token = $this->_parse_regex( 'token', $body ) ) {
-			$this->_token = $token;
-		}
-
-		// Save the latest cookies.
-		if ( isset( $response['cookies'] ) ) {
-			$this->_cookies = $response['cookies'];
-		}
-
-		// Return the last request details.
-		return $this->_last_request;
-	}
-
-	/**
-	 * Helper method to set the last occurred error.
-	 *
-	 * @see WP_Error::__construct()
-	 * @since 1.6.0
-	 *
-	 * @param  string|int $code    Error code.
-	 * @param  string     $message Error message.
-	 * @param  mixed      $data    Error data.
-	 */
-	private function _error( $code, $message, $data = '' ) {
-		// Always add the code and message of the last request.
-		$data = array_merge( array_filter( (array) $data ), array(
-			'code'    => ( isset( $this->_last_request->code ) ) ? $this->_last_request->code : null,
-			'message' => ( isset( $this->_last_request->message ) ) ? $this->_last_request->message : null,
-		) );
-		$this->_last_error = new WP_Error( $code, $message, $data );
-	}
-
-	/**
-	 * Parse the regex and return the found string.
-	 *
-	 * @param string $regex   Shorthand of a saved regex or a custom regex.
-	 * @param string $content Text to parse the regex with.
-	 * @return string The found string, or an empty string.
-	 */
-	private function _parse_regex( $regex, $content ) {
-		// Use a shorthand regex if available.
-		if ( array_key_exists( $regex, $this->_regexes ) ) {
-			$regex = $this->_regexes[ $regex ];
-		}
-
-		preg_match( $regex, $content, $matches );
-		return trim( array_pop( $matches ) );
-	}
+  /**
+   * The provider name to display when posting to diaspora*.
+   *
+   * @var string
+   */
+  public $provider = 'WP to diaspora*';
+
+  /**
+   * The last http request error that occurred.
+   *
+   * @var WP_Error
+   */
+  private $_last_error;
+
+  /**
+   * Security token to be used for making requests.
+   *
+   * @var string
+   */
+  private $_token;
+
+  /**
+   * Save the cookies for the requests.
+   *
+   * @var array
+   */
+  private $_cookies;
+
+  /**
+   * The last http request made to diaspora*.
+   * Contains the response and request infos.
+   *
+   * @var object
+   */
+  private $_last_request;
+
+  /**
+   * Is this a secure server, use HTTPS instead of HTTP?
+   *
+   * @var boolean
+   */
+  private $_is_secure;
+
+  /**
+   * The pod domain to make the http requests to.
+   *
+   * @var string
+   */
+  private $_pod;
+
+  /**
+   * Username to use when logging in to diaspora*.
+   *
+   * @var string
+   */
+  private $_username;
+
+  /**
+   * Password to use when logging in to diaspora*.
+   *
+   * @var string
+   */
+  private $_password;
+
+  /**
+   * Remember the current login state.
+   *
+   * @var boolean
+   */
+  private $_is_logged_in = false;
+
+  /**
+   * The list of user's aspects, which get set after ever http request.
+   *
+   * @var array
+   */
+  private $_aspects = array();
+
+  /**
+   * The list of user's connected services, which get set after ever http request.
+   *
+   * @var array
+   */
+  private $_services = array();
+
+  /**
+   * List of regex expressions used to filter out details from http request responses.
+   *
+   * @var array
+   */
+  private $_regexes = array(
+    'token'    => '/content="(.*?)" name="csrf-token"|name="csrf-token" content="(.*?)"/',
+    'aspects'  => '/"aspects"\:(\[.*?\])/',
+    'services' => '/"configured_services"\:(\[.*?\])/',
+  );
+
+  /**
+   * The full pod url, with the used protocol.
+   *
+   * @param string $path Path to add to the pod url.
+   * @return string Full pod url.
+   */
+  public function get_pod_url( $path = '' ) {
+    $path = trim( $path, ' /' );
+
+    // Add a slash to the beginning?
+    if ( '' !== $path ) {
+      $path = '/' . $path;
+    }
+
+    return sprintf( 'http%s://%s%s', ( $this->_is_secure ) ? 's' : '', $this->_pod, $path );
+  }
+
+  /**
+   * Constructor to initialise the connection to diaspora*.
+   *
+   * @param string  $pod       The pod domain to connect to.
+   * @param boolean $is_secure Is this a secure server? (Default: true).
+   */
+  public function __construct( $pod, $is_secure = true ) {
+    // Set class variables.
+    $this->_pod       = $pod;
+    $this->_is_secure = (bool) $is_secure;
+  }
+
+  /**
+   * Initialise the connection to diaspora*. The pod and protocol can be changed by passing new parameters.
+   * Check if we can connect to the pod to retrieve the token.
+   *
+   * @param string  $pod       Pod domain to connect to, if it should be changed.
+   * @param boolean $is_secure Is this a secure server? (Default: true).
+   * @return boolean True if we could get the token, else false.
+   */
+  public function init( $pod = null, $is_secure = true ) {
+    // If we are changing pod, we need to fetch a new token.
+    $force_new_token = false;
+
+    // When initialising a connection, clear the last error.
+    // This is important when multiple init tries happen.
+    $this->_last_error = null;
+
+    // Change the pod we are connecting to?
+    if ( isset( $pod ) && ( $this->_pod !== $pod || $this->_is_secure !== $is_secure ) ) {
+      $this->_pod       = $pod;
+      $this->_is_secure = (bool) $is_secure;
+      $force_new_token  = true;
+    }
+
+    // Get and save the token.
+    if ( null === $this->_fetch_token( $force_new_token ) ) {
+      $error = ( $this->has_last_error() ) ? ' ' . $this->get_last_error() : '';
+      $this->_error( 'wp2d_api_init_failed',
+        sprintf(
+          _x( 'Failed to initialise connection to pod "%s".', 'Placeholder is the full pod URL.', 'wp-to-diaspora' ),
+          $this->get_pod_url()
+        ) . $error,
+        array( 'help_tab' => 'troubleshooting' )
+      );
+
+      return false;
+    }
+    return true;
+  }
+
+  /**
+   * Check if there is an API error around.
+   *
+   * @return boolean If there is an API error around.
+   */
+  public function has_last_error() {
+    return is_wp_error( $this->_last_error );
+  }
+
+  /**
+   * Get the last API error object.
+   *
+   * @param boolean $clear If the error should be cleared after returning it.
+   * @return WP_Error|null The last API error object or null.
+   */
+  public function get_last_error_object( $clear = true ) {
+    $last_error = $this->_last_error;
+    $clear && $this->_last_error = null;
+    return $last_error;
+  }
+
+  /**
+   * Get the last API error message.
+   *
+   * @param boolean $clear If the error should be cleared after returning it.
+   * @return string The last API error message.
+   */
+  public function get_last_error( $clear = false ) {
+    $last_error = ( $this->has_last_error() ) ? $this->_last_error->get_error_message() : '';
+    $clear && $this->_last_error = null;
+    return $last_error;
+  }
+
+  /**
+   * Fetch the secure token from Diaspora and save it for future use.
+   *
+   * @param boolean $force Force to fetch a new token.
+   * @return string The fetched token.
+   */
+  private function _fetch_token( $force = false ) {
+    if ( ! isset( $this->_token ) || (bool) $force ) {
+      // Go directly to the sign in page, as it would redirect to there anyway.
+      // Since _request function automatically saves the new token, just call it with no data.
+      $this->_request( '/users/sign_in' );
+    }
+    return $this->_token;
+  }
+
+  /**
+   * Check if the API has been initialised. Otherwise set the last error.
+   *
+   * @return boolean Has the connection been initialised?
+   */
+  private function _check_init() {
+    if ( is_null( $this->_token ) ) {
+      $this->_error( 'wp2d_api_connection_not_initialised', __( 'Connection not initialised.', 'wp-to-diaspora' ) );
+      return false;
+    }
+    return true;
+  }
+
+  /**
+   * Check if we're logged in. Otherwise set the last error.
+   *
+   * @return boolean Are we logged in already?
+   */
+  private function _check_login() {
+    if ( ! $this->_check_init() ) {
+      return false;
+    }
+    if ( ! $this->is_logged_in() ) {
+      $this->_error( 'wp2d_api_not_logged_in', __( 'Not logged in.', 'wp-to-diaspora' ) );
+      return false;
+    }
+    return true;
+  }
+
+  /**
+   * Check if we are logged in.
+   *
+   * @return boolean Are we logged in already?
+   */
+  public function is_logged_in() {
+    return $this->_is_logged_in;
+  }
+
+  /**
+   * Log in to diaspora*.
+   *
+   * @param string  $username Username used for login.
+   * @param string  $password Password used for login.
+   * @param boolean $force    Force a new login even if we are already logged in.
+   * @return boolean Did the login succeed?
+   */
+  public function login( $username, $password, $force = false ) {
+    // Has the connection been initialised?
+    if ( ! $this->_check_init() ) {
+      $this->logout();
+      return false;
+    }
+
+    // Username and password both need to be set.
+    $username = ( isset( $username ) && '' !== $username ) ? $username : null;
+    $password = ( isset( $password ) && '' !== $password ) ? $password : null;
+    if ( ! isset( $username, $password ) ) {
+      $this->logout();
+      return false;
+    }
+
+    // If we are already logged in and not forcing a relogin, return.
+    if ( ! $force && $this->is_logged_in() &&
+      $username === $this->_username &&
+      $password === $this->_password ) {
+      return true;
+    }
+
+    // Set the newly passed username and password.
+    $this->_username = $username;
+    $this->_password = $password;
+
+    // Set up the login parameters.
+    $params = array(
+      'user[username]'     => $this->_username,
+      'user[password]'     => $this->_password,
+      'authenticity_token' => $this->_fetch_token(),
+    );
+
+    $args = array(
+      'method' => 'POST',
+      'body'   => $params,
+    );
+
+    // Try to sign in.
+    $this->_request( '/users/sign_in', $args );
+
+    // Can we load the bookmarklet to make sure we're logged in?
+    $response = $this->_request( '/bookmarklet' );
+
+    // If the request isn't successful, we are not logged in correctly.
+    if ( is_wp_error( $response ) || 200 !== $response->code ) {
+      // Login failed.
+      $this->_error( 'wp2d_api_login_failed', __( 'Login failed. Check your login details.', 'wp-to-diaspora' ), array( 'help_tab' => 'troubleshooting' ) );
+      $this->logout();
+      return false;
+    }
+
+    // Login succeeded.
+    $this->_is_logged_in = true;
+    return true;
+  }
+
+  /**
+   * Perform a logout, resetting all login info.
+   *
+   * @since 1.6.0
+   */
+  public function logout() {
+    $this->_is_logged_in = false;
+    $this->_username = null;
+    $this->_password = null;
+    $this->_aspects = array();
+    $this->_services = array();
+  }
+
+  /**
+   * Perform a deinitialisation, resetting all class variables.
+   *
+   * @since 1.7.0
+   */
+  public function deinit() {
+    $this->logout();
+    $this->_last_error = null;
+    $this->_token = null;
+    $this->_cookies = array();
+    $this->_last_request = null;
+  }
+
+  /**
+   * Post to diaspora*.
+   *
+   * @param string       $text       The text to post.
+   * @param array|string $aspects    The aspects to post to. Array or comma seperated ids.
+   * @param array        $extra_data Any extra data to be added to the post call.
+   * @return boolean|object Return the response data of the new diaspora* post if successfully posted, else false.
+   */
+  public function post( $text, $aspects = 'public', $extra_data = array() ) {
+    // Are we logged in?
+    if ( ! $this->_check_login() ) {
+      return false;
+    }
+
+    // Put the aspects into a clean array.
+    $aspects = array_filter( WP2D_Helpers::str_to_arr( $aspects ) );
+
+    // If no aspects have been selected or the public one is also included, choose public only.
+    if ( empty( $aspects ) || in_array( 'public', $aspects ) ) {
+      $aspects = 'public';
+    }
+
+    // Prepare post data.
+    $post_data = array(
+      'aspect_ids'     => $aspects,
+      'status_message' => array(
+        'text' => $text,
+        'provider_display_name' => $this->provider,
+      ),
+    );
+
+    // Add any extra data to the post.
+    if ( ! empty( $extra_data ) ) {
+        $post_data += $extra_data;
+    }
+
+    // Check if we can use the new wp_json_encode function.
+    $post_data = ( function_exists( 'wp_json_encode' ) )
+      ? wp_json_encode( $post_data )
+      : json_encode( $post_data );
+
+    $args = array(
+      'method'  => 'POST',
+      'body'    => $post_data,
+      'headers' => array(
+        'Accept'       => 'application/json',
+        'Content-Type' => 'application/json',
+        'X-CSRF-Token' => $this->_fetch_token(),
+      ),
+    );
+
+    // Submit the post.
+    $response = $this->_request( '/status_messages', $args );
+
+    if ( is_wp_error( $response ) ) {
+      $this->_error( 'wp2d_api_post_failed', $response->get_error_message() );
+      return false;
+    }
+
+    $diaspost = json_decode( $response->body );
+    if ( 201 !== $response->code ) {
+      $this->_error( 'wp2d_api_post_failed', ( isset( $diaspost->error ) ) ? $diaspost->error : _x( 'Unknown error occurred.', 'When an unknown error occurred in the WP2D_API object.', 'wp-to-diaspora' ) );
+      return false;
+    }
+
+    // Add additional info to our diaspora post object.
+    $diaspost->permalink = $this->get_pod_url( '/posts/' . $diaspost->guid );
+
+    return $diaspost;
+  }
+
+  /**
+   * Delete a post or comment from diaspora*.
+   *
+   * @since 1.6.0
+   *
+   * @param string $what What to delete, 'post' or 'comment'.
+   * @param string $id The ID of the post or comment to delete.
+   * @return boolean If the deletion was successful.
+   */
+  public function delete( $what, $id ) {
+    // Are we logged in?
+    if ( ! $this->_check_login() ) {
+      return false;
+    }
+
+    // For now, only deleting posts and comments is allowed.
+    if ( ! in_array( $what, array( 'post', 'comment' ) ) ) {
+      $this->_error( 'wp2d_api_delete_failed', __( 'You can only delete posts and comments.', 'wp-to-diaspora' ) );
+      return false;
+    }
+
+    $args = array(
+      'method'  => 'DELETE',
+      'headers' => array(
+        'Accept'       => 'application/json',
+        'Content-Type' => 'application/json',
+        'X-CSRF-Token' => $this->_fetch_token(),
+      ),
+    );
+
+    // Try to delete the post or comment.
+    $response = $this->_request( '/' . $what . 's/' . $id, $args );
+
+    $error_message = '';
+
+    if ( is_wp_error( $response ) ) {
+      $error_message = $response->get_error_message();
+    } else {
+      switch ( $response->code ) {
+        case 204:
+          return true;
+        case 404:
+          $error_message = ( 'post' === $what )
+            ? __( 'The post you tried to delete does not exist.', 'wp-to-diaspora' )
+            : __( 'The comment you tried to delete does not exist.', 'wp-to-diaspora' );
+          break;
+
+        // Due to diaspora* returning a proper 403 when trying to delete a foreign comment
+        // but returning a 500 when trying to delete a foreign post, this needs some special attention.
+        case 403:
+          if ( 'comment' === $what ) {
+            $error_message = __( 'The comment you tried to delete does not belong to you.', 'wp-to-diaspora' );
+            break;
+          }
+          // Fall through...
+        case 500:
+          if ( 'post' === $what ) {
+            $error_message = __( 'The post you tried to delete does not belong to you.', 'wp-to-diaspora' );
+            break;
+          }
+          // Fall through...
+        default:
+          $error_message = _x( 'Unknown error occurred.', 'When an unknown error occurred in the WP2D_API object.', 'wp-to-diaspora' );
+          break;
+      }
+    }
+
+    $this->_error( 'wp2d_api_delete_' . $what . '_failed', $error_message );
+    return false;
+  }
+
+  /**
+   * Get the list of aspects.
+   *
+   * @param boolean $force Force to fetch new aspects.
+   * @return array Array of aspect objects.
+   */
+  public function get_aspects( $force = false ) {
+    $this->_aspects = $this->_get_aspects_services( 'aspects', $this->_aspects, $force );
+    return ( is_array( $this->_aspects ) ) ? $this->_aspects : false;
+  }
+
+  /**
+   * Get the list of connected services.
+   *
+   * @param boolean $force Force to fetch new connected services.
+   * @return array Array of service objects.
+   */
+  public function get_services( $force = false ) {
+    $this->_services = $this->_get_aspects_services( 'services', $this->_services, $force );
+    return ( is_array( $this->_services ) ) ? $this->_services : false;
+  }
+
+  /**
+   * Get the list of aspects or connected services.
+   *
+   * @param string  $type  Type of list to get.
+   * @param array   $list  The current list of items.
+   * @param boolean $force Force to fetch new list.
+   * @return boolean Was the list fetched successfully?
+   */
+  private function _get_aspects_services( $type, $list, $force ) {
+    if ( ! $this->_check_login() ) {
+      return false;
+    }
+
+    // Fetch the new list if the current list is empty or a reload is forced.
+    if ( empty( $list ) || (bool) $force ) {
+      $response = $this->_request( '/bookmarklet' );
+
+      if ( is_wp_error( $response ) || 200 !== $response->code ) {
+        switch ( $type ) {
+          case 'aspects':
+            $this->_error( 'wp2d_api_getting_aspects_failed', __( 'Error loading aspects.', 'wp-to-diaspora' ) );
+            break;
+          case 'services':
+            $this->_error( 'wp2d_api_getting_services_failed', __( 'Error loading services.', 'wp-to-diaspora' ) );
+            break;
+          default:
+            $this->_error( 'wp2d_api_getting_aspects_services_failed', _x( 'Unknown error occurred.', 'When an unknown error occurred in the WP2D_API object.', 'wp-to-diaspora' ) );
+            break;
+        }
+        return false;
+      }
+
+      // Load the aspects or services.
+      if ( is_array( $raw_list = json_decode( $this->_parse_regex( $type, $response->body ) ) ) ) {
+        // In case this fetch is forced, empty the list.
+        $list = array();
+
+        switch ( $type ) {
+          case 'aspects':
+            // Add the 'public' aspect, as it's global and not user specific.
+            $list['public'] = __( 'Public', 'wp-to-diaspora' );
+
+            // Add all user specific aspects.
+            foreach ( $raw_list as $aspect ) {
+              $list[ $aspect->id ] = $aspect->name;
+            }
+            break;
+          case 'services':
+            foreach ( $raw_list as $service ) {
+              $list[ $service ] = ucfirst( $service );
+            }
+            break;
+        }
+      }
+    }
+    return $list;
+  }
+
+  /**
+   * Send an http(s) request via WP_HTTP API.
+   *
+   * @see WP_Http::request()
+   *
+   * @param string $url  The URL to request.
+   * @param array  $args Arguments to be posted with the request.
+   * @return object An object containing details about this request.
+   */
+  private function _request( $url, $args = array() ) {
+    // Prefix the full pod URL if necessary.
+    if ( 0 === strpos( $url, '/' ) ) {
+      $url = $this->get_pod_url( $url );
+    }
+
+    // Disable redirections so we can verify HTTP response codes.
+    $defaults = array(
+      'redirection' => 0,
+      'sslverify'   => true,
+      'timeout'     => 60,
+      'method'      => 'GET',
+    );
+
+    // If the certificate bundle has been downloaded manually, use that instead.
+    // NOTE: This should actually never be necessary, it's a fallback!
+    if ( file_exists( WP2D_DIR . '/cacert.pem' ) ) {
+      $defaults['sslcertificates'] = WP2D_DIR . '/cacert.pem';
+    }
+
+    // Set the correct cookie.
+    if ( ! empty( $this->_cookies ) ) {
+      $defaults['cookies'] = $this->_cookies;
+    }
+
+    $args = wp_parse_args( $args, $defaults );
+
+    // Get the response from the WP_HTTP request.
+    $response = wp_remote_request( $url, $args );
+
+    if ( is_wp_error( $response ) ) {
+      $this->_last_error = $response;
+      return $response;
+    }
+
+    // Get the headers and the html response.
+    $headers = wp_remote_retrieve_headers( $response );
+    $body    = wp_remote_retrieve_body( $response );
+
+    // Remember this request.
+    $this->_last_request = new stdClass();
+    $this->_last_request->response = $response;
+    $this->_last_request->headers  = $headers;
+    $this->_last_request->body     = $body;
+    $this->_last_request->message  = wp_remote_retrieve_response_message( $response );
+    $this->_last_request->code     = wp_remote_retrieve_response_code( $response );
+
+    // Save the new token.
+    if ( $token = $this->_parse_regex( 'token', $body ) ) {
+      $this->_token = $token;
+    }
+
+    // Save the latest cookies.
+    if ( isset( $response['cookies'] ) ) {
+      $this->_cookies = $response['cookies'];
+    }
+
+    // Return the last request details.
+    return $this->_last_request;
+  }
+
+  /**
+   * Helper method to set the last occurred error.
+   *
+   * @see WP_Error::__construct()
+   * @since 1.6.0
+   *
+   * @param  string|int $code    Error code.
+   * @param  string     $message Error message.
+   * @param  mixed      $data    Error data.
+   */
+  private function _error( $code, $message, $data = '' ) {
+    // Always add the code and message of the last request.
+    $data = array_merge( array_filter( (array) $data ), array(
+      'code'    => ( isset( $this->_last_request->code ) ) ? $this->_last_request->code : null,
+      'message' => ( isset( $this->_last_request->message ) ) ? $this->_last_request->message : null,
+    ) );
+    $this->_last_error = new WP_Error( $code, $message, $data );
+  }
+
+  /**
+   * Parse the regex and return the found string.
+   *
+   * @param string $regex   Shorthand of a saved regex or a custom regex.
+   * @param string $content Text to parse the regex with.
+   * @return string The found string, or an empty string.
+   */
+  private function _parse_regex( $regex, $content ) {
+    // Use a shorthand regex if available.
+    if ( array_key_exists( $regex, $this->_regexes ) ) {
+      $regex = $this->_regexes[ $regex ];
+    }
+
+    preg_match( $regex, $content, $matches );
+    return trim( array_pop( $matches ) );
+  }
 }

lib/class-helpers.php

Indentation +138 added lines, -138 removed lines

@@ -14,142 +14,142 @@
  */
 class WP2D_Helpers {
 
-	/**
-	 * Debug text that get's accumulated before output.
-	 *
-	 * @var string
-	 */
-	private static $_debugging = '';
-
-	/**
-	 * Add a line to the debug output. Include the stack trace to see where it's coming from.
-	 *
-	 * @param string $text Text to add.
-	 */
-	public static function add_debugging( $text ) {
-		// Make sure we're in debug mode.
-		if ( defined( 'WP2D_DEBUGGING' ) && true === WP2D_DEBUGGING ) {
-			$d = '';
-			foreach ( debug_backtrace() as $dbt ) {
-				extract( $dbt );
-				// Only trace back as far as the plugin goes.
-				if ( strstr( $file, plugin_dir_path( dirname( __FILE__ ) ) ) ) {
-					$d = sprintf( "%s%s%s [%s:%s]\n", $class, $type, $function, basename( $file ), $line ) . $d;
-				}
-			}
-
-			self::$_debugging .= sprintf( "%s\n%s\n", date( 'Y.m.d H:i:s' ), $d . $text );
-
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Return the debug output.
-	 *
-	 * @return string The debug output.
-	 */
-	public static function get_debugging() {
-		if ( defined( 'WP2D_DEBUGGING' ) && true === WP2D_DEBUGGING ) {
-			return self::$_debugging;
-		}
-		return false;
-	}
-
-	/**
-	 * Convert a string with comma seperated values to an array.
-	 *
-	 * @todo Make $input by value.
-	 *
-	 * @param array|string $input The string to be converted.
-	 * @return array The converted array.
-	 */
-	public static function str_to_arr( &$input ) {
-		if ( ! is_array( $input ) ) {
-			// Explode string > Trim each entry > Remove blanks > Re-index array.
-			$input = array_values( array_filter( array_map( 'trim', explode( ',', $input ) ) ) );
-		} else {
-			// If we're already an array, make sure we return it clean.
-			self::arr_to_str( $input );
-			self::str_to_arr( $input );
-		}
-		return $input;
-	}
-
-	/**
-	 * Convert an array to a string with comma seperated values.
-	 *
-	 * @todo Make $input by value.
-	 *
-	 * @param array|string $input The array to be converted.
-	 * @return string The converted string.
-	 */
-	public static function arr_to_str( &$input ) {
-		if ( is_array( $input ) ) {
-			// Trim each entry > Remove blanks > Implode them together.
-			$input = implode( ',', array_filter( array_map( 'trim', $input ) ) );
-		} else {
-			// If we're already a string, make sure we return it clean.
-			self::str_to_arr( $input );
-			self::arr_to_str( $input );
-		}
-		return $input;
-	}
-
-	/**
-	 * Encrypt the passed string with the passed key.
-	 *
-	 * @param string $input String to be encrypted.
-	 * @param string $key   The key used for the encryption.
-	 * @return string The encrypted string.
-	 */
-	public static function encrypt( $input, $key = AUTH_KEY ) {
-		if ( is_null( $input ) || '' === $input ) {
-			return false;
-		}
-		global $wpdb;
-		return $wpdb->get_var( $wpdb->prepare( 'SELECT HEX(AES_ENCRYPT(%s,%s))', $input, $key ) );
-	}
-
-	/**
-	 * Decrypt the passed string with the passed key.
-	 *
-	 * @param string $input String to be decrypted.
-	 * @param string $key   The key used for the decryption.
-	 * @return string The decrypted string.
-	 */
-	public static function decrypt( $input, $key = AUTH_KEY ) {
-		if ( is_null( $input ) || '' === $input ) {
-			return false;
-		}
-		global $wpdb;
-		return $wpdb->get_var( $wpdb->prepare( 'SELECT AES_DECRYPT(UNHEX(%s),%s)', $input, $key ) );
-	}
-
-	/**
-	 * Set up and return an API connection using the currently saved options..
-	 *
-	 * @return WP2D_API The API object.
-	 */
-	public static function api_quick_connect() {
-		$options   = WP2D_Options::instance();
-		$pod       = (string) $options->get_option( 'pod' );
-		$is_secure = true;
-		$username  = (string) $options->get_option( 'username' );
-		$password  = WP2D_Helpers::decrypt( (string) $options->get_option( 'password' ) );
-
-		$api = new WP2D_API( $pod, $is_secure );
-
-		// This is necessary for correct error handling!
-		if ( $api->init() ) {
-			$api->login( $username, $password );
-		}
-
-		if ( $api->has_last_error() ) {
-			self::add_debugging( $api->get_last_error() );
-		}
-
-		return $api;
-	}
+  /**
+   * Debug text that get's accumulated before output.
+   *
+   * @var string
+   */
+  private static $_debugging = '';
+
+  /**
+   * Add a line to the debug output. Include the stack trace to see where it's coming from.
+   *
+   * @param string $text Text to add.
+   */
+  public static function add_debugging( $text ) {
+    // Make sure we're in debug mode.
+    if ( defined( 'WP2D_DEBUGGING' ) && true === WP2D_DEBUGGING ) {
+      $d = '';
+      foreach ( debug_backtrace() as $dbt ) {
+        extract( $dbt );
+        // Only trace back as far as the plugin goes.
+        if ( strstr( $file, plugin_dir_path( dirname( __FILE__ ) ) ) ) {
+          $d = sprintf( "%s%s%s [%s:%s]\n", $class, $type, $function, basename( $file ), $line ) . $d;
+        }
+      }
+
+      self::$_debugging .= sprintf( "%s\n%s\n", date( 'Y.m.d H:i:s' ), $d . $text );
+
+      return true;
+    }
+    return false;
+  }
+
+  /**
+   * Return the debug output.
+   *
+   * @return string The debug output.
+   */
+  public static function get_debugging() {
+    if ( defined( 'WP2D_DEBUGGING' ) && true === WP2D_DEBUGGING ) {
+      return self::$_debugging;
+    }
+    return false;
+  }
+
+  /**
+   * Convert a string with comma seperated values to an array.
+   *
+   * @todo Make $input by value.
+   *
+   * @param array|string $input The string to be converted.
+   * @return array The converted array.
+   */
+  public static function str_to_arr( &$input ) {
+    if ( ! is_array( $input ) ) {
+      // Explode string > Trim each entry > Remove blanks > Re-index array.
+      $input = array_values( array_filter( array_map( 'trim', explode( ',', $input ) ) ) );
+    } else {
+      // If we're already an array, make sure we return it clean.
+      self::arr_to_str( $input );
+      self::str_to_arr( $input );
+    }
+    return $input;
+  }
+
+  /**
+   * Convert an array to a string with comma seperated values.
+   *
+   * @todo Make $input by value.
+   *
+   * @param array|string $input The array to be converted.
+   * @return string The converted string.
+   */
+  public static function arr_to_str( &$input ) {
+    if ( is_array( $input ) ) {
+      // Trim each entry > Remove blanks > Implode them together.
+      $input = implode( ',', array_filter( array_map( 'trim', $input ) ) );
+    } else {
+      // If we're already a string, make sure we return it clean.
+      self::str_to_arr( $input );
+      self::arr_to_str( $input );
+    }
+    return $input;
+  }
+
+  /**
+   * Encrypt the passed string with the passed key.
+   *
+   * @param string $input String to be encrypted.
+   * @param string $key   The key used for the encryption.
+   * @return string The encrypted string.
+   */
+  public static function encrypt( $input, $key = AUTH_KEY ) {
+    if ( is_null( $input ) || '' === $input ) {
+      return false;
+    }
+    global $wpdb;
+    return $wpdb->get_var( $wpdb->prepare( 'SELECT HEX(AES_ENCRYPT(%s,%s))', $input, $key ) );
+  }
+
+  /**
+   * Decrypt the passed string with the passed key.
+   *
+   * @param string $input String to be decrypted.
+   * @param string $key   The key used for the decryption.
+   * @return string The decrypted string.
+   */
+  public static function decrypt( $input, $key = AUTH_KEY ) {
+    if ( is_null( $input ) || '' === $input ) {
+      return false;
+    }
+    global $wpdb;
+    return $wpdb->get_var( $wpdb->prepare( 'SELECT AES_DECRYPT(UNHEX(%s),%s)', $input, $key ) );
+  }
+
+  /**
+   * Set up and return an API connection using the currently saved options..
+   *
+   * @return WP2D_API The API object.
+   */
+  public static function api_quick_connect() {
+    $options   = WP2D_Options::instance();
+    $pod       = (string) $options->get_option( 'pod' );
+    $is_secure = true;
+    $username  = (string) $options->get_option( 'username' );
+    $password  = WP2D_Helpers::decrypt( (string) $options->get_option( 'password' ) );
+
+    $api = new WP2D_API( $pod, $is_secure );
+
+    // This is necessary for correct error handling!
+    if ( $api->init() ) {
+      $api->login( $username, $password );
+    }
+
+    if ( $api->has_last_error() ) {
+      self::add_debugging( $api->get_last_error() );
+    }
+
+    return $api;
+  }
 }

lib/class-contextual-help.php

Indentation +190 added lines, -190 removed lines

@@ -14,241 +14,241 @@ 
  */
 class WP2D_Contextual_Help {
 
-	/**
-	 * Only instance of this class.
-	 *
-	 * @var WP2D_Contextual_Help
-	 */
-	private static $_instance = null;
+  /**
+   * Only instance of this class.
+   *
+   * @var WP2D_Contextual_Help
+   */
+  private static $_instance = null;
 
-	/**
-	 * Create / Get the instance of this class.
-	 *
-	 * @return WP2D_Contextual_Help Instance of this class.
-	 */
-	public static function instance() {
-		if ( ! isset( self::$_instance ) ) {
-			self::$_instance = new self();
-			self::$_instance->_constants();
-			self::$_instance->_setup();
-		}
-		return self::$_instance;
-	}
+  /**
+   * Create / Get the instance of this class.
+   *
+   * @return WP2D_Contextual_Help Instance of this class.
+   */
+  public static function instance() {
+    if ( ! isset( self::$_instance ) ) {
+      self::$_instance = new self();
+      self::$_instance->_constants();
+      self::$_instance->_setup();
+    }
+    return self::$_instance;
+  }
 
-	/**
-	 * Define all the required constants.
-	 *
-	 * @since 1.5.0
-	 */
-	private function _constants() {
-		define( 'WP2D_EXT_WPORG',         esc_url( 'https://wordpress.org/plugins/wp-to-diaspora' ) );
-		define( 'WP2D_EXT_I18N',          esc_url( 'https://poeditor.com/join/project?hash=c085b3654a5e04c69ec942e0f136716a' ) );
-		define( 'WP2D_EXT_GH',            esc_url( 'https://github.com/gutobenn/wp-to-diaspora' ) );
-		define( 'WP2D_EXT_DONATE',        esc_url( 'https://github.com/gutobenn/wp-to-diaspora#donate' ) );
-		define( 'WP2D_EXT_GH_ISSUES',     esc_url( 'https://github.com/gutobenn/wp-to-diaspora/issues' ) );
-		define( 'WP2D_EXT_GH_ISSUES_NEW', esc_url( 'https://github.com/gutobenn/wp-to-diaspora/issues/new' ) );
-	}
+  /**
+   * Define all the required constants.
+   *
+   * @since 1.5.0
+   */
+  private function _constants() {
+    define( 'WP2D_EXT_WPORG',         esc_url( 'https://wordpress.org/plugins/wp-to-diaspora' ) );
+    define( 'WP2D_EXT_I18N',          esc_url( 'https://poeditor.com/join/project?hash=c085b3654a5e04c69ec942e0f136716a' ) );
+    define( 'WP2D_EXT_GH',            esc_url( 'https://github.com/gutobenn/wp-to-diaspora' ) );
+    define( 'WP2D_EXT_DONATE',        esc_url( 'https://github.com/gutobenn/wp-to-diaspora#donate' ) );
+    define( 'WP2D_EXT_GH_ISSUES',     esc_url( 'https://github.com/gutobenn/wp-to-diaspora/issues' ) );
+    define( 'WP2D_EXT_GH_ISSUES_NEW', esc_url( 'https://github.com/gutobenn/wp-to-diaspora/issues/new' ) );
+  }
 
-	/**
-	 * Set up the contextual help menu.
-	 */
-	private function _setup() {
-		// Do we display the help tabs?
-		$post_type = get_current_screen()->post_type;
-		$enabled_post_types = WP2D_Options::instance()->get_option( 'enabled_post_types' );
-		if ( '' !== $post_type && ! in_array( $post_type, $enabled_post_types ) ) {
-			return;
-		}
+  /**
+   * Set up the contextual help menu.
+   */
+  private function _setup() {
+    // Do we display the help tabs?
+    $post_type = get_current_screen()->post_type;
+    $enabled_post_types = WP2D_Options::instance()->get_option( 'enabled_post_types' );
+    if ( '' !== $post_type && ! in_array( $post_type, $enabled_post_types ) ) {
+      return;
+    }
 
-		// If we don't have a post type, we're on the main settings page.
-		if ( '' === $post_type ) {
-			// Set the sidebar in the contextual help.
-			$this->_set_sidebar();
+    // If we don't have a post type, we're on the main settings page.
+    if ( '' === $post_type ) {
+      // Set the sidebar in the contextual help.
+      $this->_set_sidebar();
 
-			// Add the main settings tabs and their content.
-			$this->_add_settings_help_tabs();
-		} else {
-			// Add the post type specific tabs and their content.
-			$this->_add_post_type_help_tabs();
-		}
-	}
+      // Add the main settings tabs and their content.
+      $this->_add_settings_help_tabs();
+    } else {
+      // Add the post type specific tabs and their content.
+      $this->_add_post_type_help_tabs();
+    }
+  }
 
-	/** Singleton, keep private. */
-	final private function __clone() { }
+  /** Singleton, keep private. */
+  final private function __clone() { }
 
-	/** Singleton, keep private. */
-	final private function __wakeup() { }
+  /** Singleton, keep private. */
+  final private function __wakeup() { }
 
-	/** Singleton, keep private. */
-	final private function __construct() { }
+  /** Singleton, keep private. */
+  final private function __construct() { }
 
-	/**
-	 * Set the sidebar in the contextual help.
-	 */
-	private function _set_sidebar() {
-		get_current_screen()->set_help_sidebar(
-			'<p><strong>' . esc_html__( 'WP to diaspora*', 'wp-to-diaspora' ) . '</strong></p>
+  /**
+   * Set the sidebar in the contextual help.
+   */
+  private function _set_sidebar() {
+    get_current_screen()->set_help_sidebar(
+      '<p><strong>' . esc_html__( 'WP to diaspora*', 'wp-to-diaspora' ) . '</strong></p>
 			<ul>
 				<li><a href="' . WP2D_EXT_GH     . '" target="_blank">GitHub</a>
 				<li><a href="' . WP2D_EXT_WPORG  . '" target="_blank">WordPress.org</a>
 				<li><a href="' . WP2D_EXT_I18N   . '" target="_blank">' . esc_html__( 'Help with translations', 'wp-to-diaspora' ) . '</a>
 				<li><a href="' . WP2D_EXT_DONATE . '" target="_blank">' . esc_html__( 'Make a donation', 'wp-to-diaspora' )        . '</a>
 			</ul>'
-		);
-	}
+    );
+  }
 
-	/**
-	 * Add help tabs to the contextual help on the settings page.
-	 */
-	private function _add_settings_help_tabs() {
-		$screen = get_current_screen();
+  /**
+   * Add help tabs to the contextual help on the settings page.
+   */
+  private function _add_settings_help_tabs() {
+    $screen = get_current_screen();
 
-		// A short overview of the plugin.
-		$screen->add_help_tab( array(
-			'id'      => 'overview',
-			'title'   => esc_html__( 'Overview', 'wp-to-diaspora' ),
-			'content' => '<p><strong>' . esc_html__( 'With WP to diaspora*, sharing your WordPress posts to diaspora* is as easy as ever.', 'wp-to-diaspora' ) . '</strong></p>
+    // A short overview of the plugin.
+    $screen->add_help_tab( array(
+      'id'      => 'overview',
+      'title'   => esc_html__( 'Overview', 'wp-to-diaspora' ),
+      'content' => '<p><strong>' . esc_html__( 'With WP to diaspora*, sharing your WordPress posts to diaspora* is as easy as ever.', 'wp-to-diaspora' ) . '</strong></p>
 				<ol>
 					<li>' . esc_html__( 'Enter your diaspora* login details on the "Setup" tab.', 'wp-to-diaspora' ) . '
 					<li>' . esc_html__( 'Define the default posting behaviour on the "Defaults" tab.', 'wp-to-diaspora' ) . '
 					<li>' . esc_html__( 'Automatically share your WordPress post on diaspora* when publishing it on your website.', 'wp-to-diaspora' ) . '
 					<li>' . esc_html__( 'Check out your new post on diaspora*.', 'wp-to-diaspora' ) . '
 				</ol>'
-		) );
+    ) );
 
-		// How to set up the connection to diaspora*.
-		$screen->add_help_tab( array(
-			'id'      => 'setup',
-			'title'   => esc_html__( 'Setup', 'wp-to-diaspora' ),
-			'content' => '<p><strong>' . esc_html__( 'Enter your diaspora* login details to connect your account.', 'wp-to-diaspora' ) . '</strong></p>
+    // How to set up the connection to diaspora*.
+    $screen->add_help_tab( array(
+      'id'      => 'setup',
+      'title'   => esc_html__( 'Setup', 'wp-to-diaspora' ),
+      'content' => '<p><strong>' . esc_html__( 'Enter your diaspora* login details to connect your account.', 'wp-to-diaspora' ) . '</strong></p>
 				<ul>
 					<li><strong>' . esc_html__( 'diaspora* Pod', 'wp-to-diaspora' ) . '</strong>: ' .
-						esc_html__( 'This is the domain name of the pod you are on (e.g. joindiaspora.com)', 'wp-to-diaspora' ) . '<br>
+            esc_html__( 'This is the domain name of the pod you are on (e.g. joindiaspora.com)', 'wp-to-diaspora' ) . '<br>
 							<em>' . sprintf( esc_html__( 'Use the "%s" button to prepopulate the input field to help choose your pod.', 'wp-to-diaspora' ), esc_html__( 'Refresh pod list', 'wp-to-diaspora' ) ) . '</em>
 					<li><strong>' . esc_html__( 'Username', 'wp-to-diaspora' ) . '</strong>: ' .
-						esc_html__( 'Your diaspora* username (without the pod domain).', 'wp-to-diaspora' ) . '
+            esc_html__( 'Your diaspora* username (without the pod domain).', 'wp-to-diaspora' ) . '
 					<li><strong>' . esc_html__( 'Password', 'wp-to-diaspora' ) . '</strong>: ' .
-						esc_html__( 'Your diaspora* password.', 'wp-to-diaspora' ) . '
+            esc_html__( 'Your diaspora* password.', 'wp-to-diaspora' ) . '
 				</ul>',
-		) );
+    ) );
 
-		// Explain the default options and what they do.
-		$screen->add_help_tab( array(
-			'id'      => 'defaults',
-			'title'   => esc_html__( 'Defaults', 'wp-to-diaspora' ),
-			'content' => '<p><strong>' . esc_html__( 'Define the default posting behaviour.', 'wp-to-diaspora' ) . '</strong></p>
+    // Explain the default options and what they do.
+    $screen->add_help_tab( array(
+      'id'      => 'defaults',
+      'title'   => esc_html__( 'Defaults', 'wp-to-diaspora' ),
+      'content' => '<p><strong>' . esc_html__( 'Define the default posting behaviour.', 'wp-to-diaspora' ) . '</strong></p>
 				<ul>
 					<li><strong>' . esc_html__( 'Post types', 'wp-to-diaspora' ) . '</strong>: ' .
-						esc_html__( 'Choose the post types that are allowed to be shared to diaspora*.', 'wp-to-diaspora' ) . '
+            esc_html__( 'Choose the post types that are allowed to be shared to diaspora*.', 'wp-to-diaspora' ) . '
 					<li><strong>' . esc_html__( 'Post to diaspora*', 'wp-to-diaspora' ) . '</strong>: ' .
-						esc_html__( 'Automatically share new posts to diaspora* when publishing them.', 'wp-to-diaspora' ) . '
+            esc_html__( 'Automatically share new posts to diaspora* when publishing them.', 'wp-to-diaspora' ) . '
 					<li><strong>' . esc_html__( 'Show "Posted at" link?', 'wp-to-diaspora' ) . '</strong>: ' .
-						esc_html__( 'Add a link back to your original post, at the bottom of the diaspora* post.', 'wp-to-diaspora' ) . '
+            esc_html__( 'Add a link back to your original post, at the bottom of the diaspora* post.', 'wp-to-diaspora' ) . '
 					<li><strong>' . esc_html__( 'Display', 'wp-to-diaspora' ) . '</strong>: ' .
-						esc_html__( 'Choose whether you would like to post the whole post or just the excerpt.', 'wp-to-diaspora' ) . '
+            esc_html__( 'Choose whether you would like to post the whole post or just the excerpt.', 'wp-to-diaspora' ) . '
 					<li><strong>' . esc_html__( 'Tags to post', 'wp-to-diaspora' ) . '</strong>: ' .
-						esc_html__( 'You can add tags to your post to make it easier to find on diaspora*.' ) . '<br>
+            esc_html__( 'You can add tags to your post to make it easier to find on diaspora*.' ) . '<br>
 							<ul>
 								<li><strong>' . esc_html__( 'Global tags', 'wp-to-diaspora' ) . '</strong>: ' . esc_html__( 'Tags that apply to all posts.', 'wp-to-diaspora' ) . '
 								<li><strong>' . esc_html__( 'Custom tags', 'wp-to-diaspora' ) . '</strong>: ' . esc_html__( 'Tags that apply to individual posts (can be set on each post).', 'wp-to-diaspora' ) . '
 								<li><strong>' . esc_html__( 'Post tags',   'wp-to-diaspora' ) . '</strong>: ' . esc_html__( 'Default WordPress Tags of individual posts.', 'wp-to-diaspora' ) . '
 							</ul>
 					<li><strong>' . esc_html__( 'Global tags', 'wp-to-diaspora' ) . '</strong>: ' .
-						esc_html__( 'A list of tags that gets added to every post.', 'wp-to-diaspora' ) . '
+            esc_html__( 'A list of tags that gets added to every post.', 'wp-to-diaspora' ) . '
 					<li><strong>' . esc_html__( 'Aspects', 'wp-to-diaspora' ) . '</strong>: ' .
-						esc_html__( 'Decide which of your diaspora* aspects can see your posts.', 'wp-to-diaspora' ) . '<br>
+            esc_html__( 'Decide which of your diaspora* aspects can see your posts.', 'wp-to-diaspora' ) . '<br>
 							<em>' . sprintf( esc_html__( 'Use the "%s" button to load your aspects from diaspora*.', 'wp-to-diaspora' ), esc_html__( 'Refresh Aspects', 'wp-to-diaspora' ) ) . '</em>
 					<li><strong>' . esc_html__( 'Services', 'wp-to-diaspora' ) . '</strong>: ' .
-						esc_html__( 'Choose the services your new diaspora* post gets shared to.', 'wp-to-diaspora' ) . '<br>
+            esc_html__( 'Choose the services your new diaspora* post gets shared to.', 'wp-to-diaspora' ) . '<br>
 							<em>' . sprintf( esc_html__( 'Use the "%s" button to fetch the list of your connected services from diaspora*.', 'wp-to-diaspora' ), esc_html__( 'Refresh Services', 'wp-to-diaspora' ) ) . '</em>
 				</ul>',
-		) );
+    ) );
 
-		// Explain the importance of SSL connections to the pod and the CA certificate bundle.
-		$defined_functions = get_defined_functions();
-		$ssl_can_install = ( ! array_diff( array( 'fopen', 'fwrite', 'fclose', 'file_get_contents', 'file_put_contents' ), $defined_functions['internal'] ) );
-		$ssl_cert_is_installed = ( file_exists( WP2D_DIR . '/cacert.pem' ) );
+    // Explain the importance of SSL connections to the pod and the CA certificate bundle.
+    $defined_functions = get_defined_functions();
+    $ssl_can_install = ( ! array_diff( array( 'fopen', 'fwrite', 'fclose', 'file_get_contents', 'file_put_contents' ), $defined_functions['internal'] ) );
+    $ssl_cert_is_installed = ( file_exists( WP2D_DIR . '/cacert.pem' ) );
 
-		$ssl_install_output = '';
-		if ( $ssl_cert_is_installed ) {
-			$ssl_install_output = esc_html__( 'Looks like you already have a custom bundle installed!', 'wp-to-diaspora' );
-		} elseif ( $ssl_can_install ) {
-			$ssl_install_output = sprintf(
-				esc_html_x( 'Your server should allow us to %sdo this%s for you :-)', 'Placeholders are HTML for links.', 'wp-to-diaspora' ),
-				'<a href="' . add_query_arg( 'wp2d_temp_ssl_fix', '' ) . '" class="button">', '</a>'
-			);
-		}
-		$screen->add_help_tab( array(
-			'id'      => 'ssl',
-			'title'   => esc_html__( 'SSL', 'wp-to-diaspora' ),
-			'content' => '<p><strong>' . esc_html__( 'WP to diaspora* makes sure the connection to your pod is secure!', 'wp-to-diaspora' ) . '</strong></p>
+    $ssl_install_output = '';
+    if ( $ssl_cert_is_installed ) {
+      $ssl_install_output = esc_html__( 'Looks like you already have a custom bundle installed!', 'wp-to-diaspora' );
+    } elseif ( $ssl_can_install ) {
+      $ssl_install_output = sprintf(
+        esc_html_x( 'Your server should allow us to %sdo this%s for you :-)', 'Placeholders are HTML for links.', 'wp-to-diaspora' ),
+        '<a href="' . add_query_arg( 'wp2d_temp_ssl_fix', '' ) . '" class="button">', '</a>'
+      );
+    }
+    $screen->add_help_tab( array(
+      'id'      => 'ssl',
+      'title'   => esc_html__( 'SSL', 'wp-to-diaspora' ),
+      'content' => '<p><strong>' . esc_html__( 'WP to diaspora* makes sure the connection to your pod is secure!', 'wp-to-diaspora' ) . '</strong></p>
 				<p>' . esc_html__( 'Most diaspora* pods are secured using SSL (Secure Sockets Layer), which makes your connection encrypted. For this connection to work, your server needs to know that those SSL certificates can be trusted.', 'wp-to-diaspora' ) . '</p>
 				<p>' . esc_html__( 'Therefore, if your WordPress installation or server does not have an up to date CA certificate bundle, WP to diaspora* may not work for you.', 'wp-to-diaspora' ) . '</p>
 				<p>' . esc_html__( 'Lucky for you though, we have you covered if this is the case for you!', 'wp-to-diaspora' ) . '</p>
 				<ol>
 					<li><strong>' . esc_html__( 'Check the WordPress certificate bundle', 'wp-to-diaspora' ) . '</strong>: ' .
-						esc_html__( 'The best option is to make sure that the WordPress internal certificate bundle is available and accessible. You should be able to find it here: "wp-includes/certificates/ca-bundle.crt".', 'wp-to-diaspora' ) . '
+            esc_html__( 'The best option is to make sure that the WordPress internal certificate bundle is available and accessible. You should be able to find it here: "wp-includes/certificates/ca-bundle.crt".', 'wp-to-diaspora' ) . '
 					<li><strong>' . esc_html__( 'Get in touch with your hosting provider', 'wp-to-diaspora' ) . '</strong>: ' .
-						esc_html__( 'Get in touch with your hosting provider and ask them to update the bundle on the server for you. They should know what you\'re talking about.', 'wp-to-diaspora' ) . '
+            esc_html__( 'Get in touch with your hosting provider and ask them to update the bundle on the server for you. They should know what you\'re talking about.', 'wp-to-diaspora' ) . '
 					<li><strong>' . esc_html__( 'Install the CA bundle yourself', 'wp-to-diaspora' ) . '</strong>: ' .
-						sprintf(
-							esc_html_x( 'If you maintain your own server, it\'s your job to keep the bundle up to date. You can find a short and simple way on how to do this %shere%s.', 'Placeholders are HTML for a link.', 'wp-to-diaspora' ),
-							'<a href="http://serverfault.com/a/394835" target="_blank">', '</a>'
-						) . '
+            sprintf(
+              esc_html_x( 'If you maintain your own server, it\'s your job to keep the bundle up to date. You can find a short and simple way on how to do this %shere%s.', 'Placeholders are HTML for a link.', 'wp-to-diaspora' ),
+              '<a href="http://serverfault.com/a/394835" target="_blank">', '</a>'
+            ) . '
 					<li><strong>' . esc_html__( 'Quick "temporary" fix', 'wp-to-diaspora' ) . '</strong>: ' .
-						sprintf(
-							esc_html_x( 'As a temporary solution, you can download the up to date %sCA certificate bundle%s (Right-click &#8594; Save As...) and place the cacert.pem file at the top level of the WP to diaspora* plugin folder. This is a "last resort" option.', 'Placeholders are HTML for links.', 'wp-to-diaspora' ),
-							'<a href="http://curl.haxx.se/ca/cacert.pem" download>', '</a>'
-						)
-						. '<br><p>' .
-						$ssl_install_output
-						. '</p>
+            sprintf(
+              esc_html_x( 'As a temporary solution, you can download the up to date %sCA certificate bundle%s (Right-click &#8594; Save As...) and place the cacert.pem file at the top level of the WP to diaspora* plugin folder. This is a "last resort" option.', 'Placeholders are HTML for links.', 'wp-to-diaspora' ),
+              '<a href="http://curl.haxx.se/ca/cacert.pem" download>', '</a>'
+            )
+            . '<br><p>' .
+            $ssl_install_output
+            . '</p>
 				</ul>
 				<p class="dashicons-before dashicons-info">' . esc_html__( 'NOTE: If you choose the temporary option, the copy procedure needs to be done every time the plugin is updated because all files get replaced!', 'wp-to-diaspora' ) . '</p>',
-		) );
+    ) );
 
-		// Explain the meta box and the differences to the global defaults.
-		$screen->add_help_tab( array(
-			'id' => 'meta-box',
-			'title'   => esc_html__( 'Meta Box', 'wp-to-diaspora' ),
-			'content' => '<p><strong>' . esc_html__( 'The Meta Box is the new "WP to diaspora*" box you see when editing a post.', 'wp-to-diaspora' ) . '</strong></p>
+    // Explain the meta box and the differences to the global defaults.
+    $screen->add_help_tab( array(
+      'id' => 'meta-box',
+      'title'   => esc_html__( 'Meta Box', 'wp-to-diaspora' ),
+      'content' => '<p><strong>' . esc_html__( 'The Meta Box is the new "WP to diaspora*" box you see when editing a post.', 'wp-to-diaspora' ) . '</strong></p>
 				<p>' . esc_html__( 'When creating or editing a post, you will notice a new meta box called "WP to diaspora*" which has some options. These options are almost the same as the options you can find in the "Defaults" tab on the settings page. These options are post-specific though, meaning they override the global defaults for the post itself. You will see that the default values are filled in automatically, allowing you to change individual ones as you please.', 'wp-to-diaspora' ) . '</p>
 				<p>' . esc_html__( 'There are a few important differences to the settings page:', 'wp-to-diaspora' ) . '</p>
 				<ul>
 					<li><strong>' . esc_html__( 'Already posted to diaspora*', 'wp-to-diaspora' ) . '</strong>: ' .
-						esc_html__( 'If the post has already been posted to diaspora* a link to the diaspora* post will appear at the top.', 'wp-to-diaspora' ) . '
+            esc_html__( 'If the post has already been posted to diaspora* a link to the diaspora* post will appear at the top.', 'wp-to-diaspora' ) . '
 					<li><strong>' . esc_html__( 'Custom tags', 'wp-to-diaspora' ) . '</strong>: ' .
-						esc_html__( 'A list of tags that gets added to this post. Note that they are seperate from the WordPress post tags!', 'wp-to-diaspora' ) . '
+            esc_html__( 'A list of tags that gets added to this post. Note that they are seperate from the WordPress post tags!', 'wp-to-diaspora' ) . '
 				</ul>
 				<p class="dashicons-before dashicons-info">' . esc_html__( 'If you don\'t see the meta box, make sure the post type you\'re on has been added to the "Post types" list on the settings page. Also make sure it has been selected from the "Screen Options" at the top of the screen.', 'wp-to-diaspora' ) . '</p>',
-		) );
+    ) );
 
-		// Troubleshooting.
-		$screen->add_help_tab( array(
-			'id' => 'troubleshooting',
-			'title'   => esc_html__( 'Troubleshooting', 'wp-to-diaspora' ),
-			'content' => '<p><strong>' . esc_html__( 'Troubleshooting common errors.', 'wp-to-diaspora' ) . '</strong></p>
+    // Troubleshooting.
+    $screen->add_help_tab( array(
+      'id' => 'troubleshooting',
+      'title'   => esc_html__( 'Troubleshooting', 'wp-to-diaspora' ),
+      'content' => '<p><strong>' . esc_html__( 'Troubleshooting common errors.', 'wp-to-diaspora' ) . '</strong></p>
 				<p>' . esc_html__( 'Here are a few common errors and their possible solutions:', 'wp-to-diaspora' ) . '</p>
 				<ul>
 					<li><strong>' . esc_html( sprintf( __( 'Failed to initialise connection to pod "%s"', 'wp-to-diaspora' ), 'xyz' ) ) . '</strong>: ' .
-						esc_html__( 'This could have multiple reasons.' ) . '
+            esc_html__( 'This could have multiple reasons.' ) . '
 						<ul>
 							<li>' . esc_html__( 'Make sure that your pod domain is entered correctly.', 'wp-to-diaspora' ) . '
 							<li>' .
-								esc_html__( 'It might be an SSL problem.', 'wp-to-diaspora' ) .
-								sprintf( ' <a href="#" class="open-help-tab" data-help-tab="ssl">%s</a>', esc_html__( 'Learn More', 'wp-to-diaspora' ) ) . '
+                esc_html__( 'It might be an SSL problem.', 'wp-to-diaspora' ) .
+                sprintf( ' <a href="#" class="open-help-tab" data-help-tab="ssl">%s</a>', esc_html__( 'Learn More', 'wp-to-diaspora' ) ) . '
 							<li>' . esc_html__( 'The pod might be offline at the moment.', 'wp-to-diaspora' ) . '
 						</ul>
 					<li><strong>' . esc_html__( 'Login failed. Check your login details.', 'wp-to-diaspora' ) . '</strong>: ' .
-						esc_html__( 'Make sure that your username and password are entered correctly.', 'wp-to-diaspora' ) . '
+            esc_html__( 'Make sure that your username and password are entered correctly.', 'wp-to-diaspora' ) . '
 				</ul>',
-		) );
+    ) );
 
-		// Show different ways to contribute to the plugin.
-		$screen->add_help_tab( array(
-			'id' => 'contributing',
-			'title'   => esc_html__( 'Contributing', 'wp-to-diaspora' ),
-			'content' => '<p><strong>' . esc_html__( 'So you feel like contributing to the WP to diaspora* plugin? Great!', 'wp-to-diaspora' ) . '</strong></p>
+    // Show different ways to contribute to the plugin.
+    $screen->add_help_tab( array(
+      'id' => 'contributing',
+      'title'   => esc_html__( 'Contributing', 'wp-to-diaspora' ),
+      'content' => '<p><strong>' . esc_html__( 'So you feel like contributing to the WP to diaspora* plugin? Great!', 'wp-to-diaspora' ) . '</strong></p>
 				<p>' . esc_html__( 'There are many different ways that you can help out with this plugin:', 'wp-to-diaspora' ) . '</p>
 				<ul>
 					<li><a href="' . WP2D_EXT_GH_ISSUES_NEW . '" target="_blank">' . esc_html__( 'Report a bug', 'wp-to-diaspora' )           . '</a>
@@ -256,42 +256,42 @@ 
 					<li><a href="' . WP2D_EXT_I18N          . '" target="_blank">' . esc_html__( 'Help with translations', 'wp-to-diaspora' ) . '</a>
 					<li><a href="' . WP2D_EXT_DONATE        . '" target="_blank">' . esc_html__( 'Make a donation', 'wp-to-diaspora' )        . '</a>
 				</ul>',
-		) );
-	}
+    ) );
+  }
 
-	/**
-	 * Add help tabs to the contextual help on the post pages.
-	 */
-	private function _add_post_type_help_tabs() {
-		get_current_screen()->add_help_tab( array(
-			'id'       => 'wp-to-diaspora',
-			'title'    => esc_html__( 'WP to diaspora*', 'wp-to-diaspora' ),
-			'content'  => '<p>' . sprintf(
-				esc_html__( 'For detailed information, refer to the contextual help on the %sWP to diaspora*%s settings page.', 'Placeholders represent the link.', 'wp-to-diaspora' ),
-				'<a href="options-general.php?page=wp_to_diaspora" target="_blank">', '</a>'
-			) . '</p>',
-		) );
-	}
+  /**
+   * Add help tabs to the contextual help on the post pages.
+   */
+  private function _add_post_type_help_tabs() {
+    get_current_screen()->add_help_tab( array(
+      'id'       => 'wp-to-diaspora',
+      'title'    => esc_html__( 'WP to diaspora*', 'wp-to-diaspora' ),
+      'content'  => '<p>' . sprintf(
+        esc_html__( 'For detailed information, refer to the contextual help on the %sWP to diaspora*%s settings page.', 'Placeholders represent the link.', 'wp-to-diaspora' ),
+        '<a href="options-general.php?page=wp_to_diaspora" target="_blank">', '</a>'
+      ) . '</p>',
+    ) );
+  }
 
-	/**
-	 * Get a link that directly opens a help tab via JS.
-	 *
-	 * @since 1.6.0
-	 *
-	 * @param WP_Error|string $error The WP_Error object with the tab id as data or the tab id itself.
-	 * @return string HTML link.
-	 */
-	public static function get_help_tab_quick_link( $error ) {
-		$help_tab = '';
-		if ( is_wp_error( $error ) && ( $error_data = $error->get_error_data() ) && array_key_exists( 'help_tab', $error_data ) ) {
-			$help_tab = $error_data['help_tab'];
-		} elseif ( is_string( $error ) ) {
-			$help_tab = $error;
-		}
-		if ( '' !== $help_tab ) {
-			return sprintf( '<a href="#" class="open-help-tab" data-help-tab="%1$s">%2$s</a>', $help_tab, esc_html__( 'Help', 'wp-to-diaspora' ) );
-		}
+  /**
+   * Get a link that directly opens a help tab via JS.
+   *
+   * @since 1.6.0
+   *
+   * @param WP_Error|string $error The WP_Error object with the tab id as data or the tab id itself.
+   * @return string HTML link.
+   */
+  public static function get_help_tab_quick_link( $error ) {
+    $help_tab = '';
+    if ( is_wp_error( $error ) && ( $error_data = $error->get_error_data() ) && array_key_exists( 'help_tab', $error_data ) ) {
+      $help_tab = $error_data['help_tab'];
+    } elseif ( is_string( $error ) ) {
+      $help_tab = $error;
+    }
+    if ( '' !== $help_tab ) {
+      return sprintf( '<a href="#" class="open-help-tab" data-help-tab="%1$s">%2$s</a>', $help_tab, esc_html__( 'Help', 'wp-to-diaspora' ) );
+    }
 
-		return '';
-	}
+    return '';
+  }
 }

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' );
+    }
+  }
 }