noplanman / wp-to-diaspora

lib/class-api.php

Doc Comments +2 added lines, -2 removed lines

@@ -596,7 +596,7 @@ 
 	 *
 	 * @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.
+	 * @return string An object containing details about this request.
 	 */
 	private function _request( $url, $args = array() ) {
 		// Prefix the full pod URL if necessary.
@@ -665,7 +665,7 @@ 
 	 * @see WP_Error::__construct()
 	 * @since 1.6.0
 	 *
-	 * @param  string|int $code    Error code.
+	 * @param  string $code    Error code.
 	 * @param  string     $message Error message.
 	 * @param  mixed      $data    Error data.
 	 */

Indentation +3 added lines, -3 removed lines

@@ -315,9 +315,9 @@
 
 		// If we are already logged in and not forcing a relogin, return.
 		if ( ! $force &&
-		     $username === $this->_username &&
-		     $password === $this->_password &&
-		     $this->is_logged_in()
+				 $username === $this->_username &&
+				 $password === $this->_password &&
+				 $this->is_logged_in()
 		) {
 			return true;
 		}

Spacing +13 added lines, -13 removed lines

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

lib/class-options.php

Doc Comments +4 added lines, -4 removed lines

@@ -737,7 +737,7 @@ 
 	/**
 	 * Validate checkboxes, make them either true or false.
 	 *
-	 * @param string|array $checkboxes Checkboxes to validate.
+	 * @param string[] $checkboxes Checkboxes to validate.
 	 * @param array        $options    Options values themselves.
 	 * @return array The validated options.
 	 */
@@ -751,7 +751,7 @@ 
 	/**
 	 * Validate single-select fields and make sure their selected value are valid.
 	 *
-	 * @param string|array $selects Name(s) of the select fields.
+	 * @param string $selects Name(s) of the select fields.
 	 * @param array        $options Options values themselves.
 	 * @return array The validated options.
 	 */
@@ -767,7 +767,7 @@ 
 	/**
 	 * Validate multi-select fields and make sure their selected values are valid.
 	 *
-	 * @param string|array $selects Name(s) of the select fields.
+	 * @param string $selects Name(s) of the select fields.
 	 * @param array        $options Options values themselves.
 	 * @return array The validated options.
 	 */
@@ -821,7 +821,7 @@ 
 	 * 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.
+	 * @param string[] $default          Default value if not valid.
 	 * @return array The validated list of aspects or services.
 	 */
 	public function validate_aspects_services( &$aspects_services, $default = array() ) {

Braces +13 added lines, -5 removed lines

@@ -435,8 +435,11 @@ 
 		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 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;
 	}
 
@@ -474,9 +477,11 @@ 
 
 		<?php if ( $on_settings_page ) : ?>
 			<p class="description"><?php echo esc_html( $description ); ?></p>
-		<?php else : ?>
+		<?php else {
+	: ?>
 			</label>
 		<?php endif;
+}
 	}
 
 	/**
@@ -558,8 +563,11 @@ 
 				<?php foreach ( $list as $id => $name ) : ?>
 					<label><input type="checkbox" name="wp_to_diaspora_settings[<?php echo esc_attr( $type ); ?>][]" value="<?php echo esc_attr( $id ); ?>" <?php checked( in_array( $id, $items ) ); ?>><?php echo esc_html( $name ); ?></label>
 				<?php endforeach; ?>
-			<?php else : ?>
-				<label><?php echo $empty_label; ?></label>
+			<?php else {
+	: ?>
+				<label><?php echo $empty_label;
+}
+?></label>
 			<?php endif; ?>
 		</div>
 		<p class="description">

Spacing +33 added lines, -33 removed lines

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

lib/class-post.php

Spacing +27 added lines, -27 removed lines

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

lib/class-contextual-help.php

Indentation +39 added lines, -39 removed lines

@@ -123,12 +123,12 @@ 
 			'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>',
 		] );
 
@@ -139,27 +139,27 @@ 
 			'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>',
 		] );
@@ -196,30 +196,30 @@ 
 				<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>',
 		] );
@@ -233,9 +233,9 @@ 
 				<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>',
 		] );
@@ -248,17 +248,17 @@ 
 				<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>',
 		] );
 

Spacing +2 added lines, -2 removed lines

@@ -172,7 +172,7 @@ 
 			'fclose',
 			'file_get_contents',
 			'file_put_contents',
-		], $defined_functions['internal'] ) );
+		], $defined_functions[ 'internal' ] ) );
 
 		$ssl_cert_is_installed = file_exists( WP2D_DIR . '/cacert.pem' );
 
@@ -307,7 +307,7 @@ 
 	public static function get_help_tab_quick_link( $error ) {
 		$help_tab = '';
 		if ( is_wp_error( $error ) && ( $error_data = $error->get_error_data() ) && array_key_exists( 'help_tab', $error_data ) ) {
-			$help_tab = $error_data['help_tab'];
+			$help_tab = $error_data[ 'help_tab' ];
 		} elseif ( is_string( $error ) ) {
 			$help_tab = $error;
 		}

wp-to-diaspora.php

Spacing +10 added lines, -10 removed lines

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