noplanman / wp-to-diaspora

wp-to-diaspora.php

Doc Comments +2 added lines, -2 removed lines

@@ -332,7 +332,7 @@ 
 	 *
 	 * @param array $links Links to display for plugin on plugins page.
 	 *
-	 * @return array Links to display for plugin on plugins page.
+	 * @return string[] 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>';
@@ -407,7 +407,7 @@ 
 	/**
 	 * Check the pod connection status.
 	 *
-	 * @return bool The status of the connection.
+	 * @return boolean|null The status of the connection.
 	 */
 	private function _check_pod_connection_status() {
 		$options = WP2D_Options::instance();

lib/class-contextual-help.php

Indentation +19 added lines, -19 removed lines

@@ -123,11 +123,11 @@ 
 			'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' ) . '
+									 esc_html__( 'This is the domain name of the pod you are on (e.g. joindiaspora.com)', 'wp-to-diaspora' ) . '
 					<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>',
 		] );
 
@@ -138,27 +138,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>',
 		] );
@@ -182,9 +182,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>',
 		] );
@@ -197,19 +197,19 @@ 
 				<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="https://github.com/DiasPHPora/wp-to-diaspora/wiki/SSL-and-TLS-Issues" 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="https://github.com/DiasPHPora/wp-to-diaspora/wiki/SSL-and-TLS-Issues" 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' ) . '
 					<li><strong>' . esc_html__( 'Invalid credentials. Please re-save your login info.', 'wp-to-diaspora' ) . '</strong>: ' .
-			             esc_html__( 'This may be due to defining WP2D_ENC_KEY after upgrading to 2.2.0, which saves a new encrypted version of your password.', 'wp-to-diaspora' ) .
-			             sprintf( ' <a href="https://github.com/DiasPHPora/wp-to-diaspora/wiki/Configuration#wp2d_enc_key-since-220" target="_blank">%s</a>', esc_html__( 'Learn more', 'wp-to-diaspora' ) ) . '
+									 esc_html__( 'This may be due to defining WP2D_ENC_KEY after upgrading to 2.2.0, which saves a new encrypted version of your password.', 'wp-to-diaspora' ) .
+									 sprintf( ' <a href="https://github.com/DiasPHPora/wp-to-diaspora/wiki/Configuration#wp2d_enc_key-since-220" target="_blank">%s</a>', esc_html__( 'Learn more', 'wp-to-diaspora' ) ) . '
 				</ul>',
 		] );
 

lib/class-options.php

Spacing +30 added lines, -30 removed lines

@@ -27,8 +27,8 @@ 
 	 * @var array
 	 */
 	private static $_default_options = [
-		'aspects_list'       => [],
-		'services_list'      => [],
+		'aspects_list'       => [ ],
+		'services_list'      => [ ],
 		'post_to_diaspora'   => true,
 		'enabled_post_types' => [ 'post' ],
 		'fullentrylink'      => true,
@@ -36,7 +36,7 @@ 
 		'tags_to_post'       => [ 'global', 'custom', 'post' ],
 		'global_tags'        => '',
 		'aspects'            => [ 'public' ],
-		'services'           => [],
+		'services'           => [ ],
 		'auth_key_hash'      => '',
 		'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 [ ];
 	}
 
 
@@ -225,7 +225,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;';
@@ -773,14 +773,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 );
@@ -930,19 +930,19 @@ 
 		/* 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'] ) {
+			if ( '' === $input[ 'password' ] || $this->get_option( 'password' ) === $input[ 'password' ] ) {
 				// Attempt a password upgrade if applicable.
 				$this->attempt_password_upgrade( true );
-				$input['password'] = $this->get_option( 'password' );
+				$input[ 'password' ] = $this->get_option( 'password' );
 			} else {
-				$input['password'] = WP2D_Helpers::encrypt( $input['password'] );
+				$input[ 'password' ] = WP2D_Helpers::encrypt( $input[ 'password' ] );
 			}
 
 			// Keep a note of the current AUTH_KEY.
@@ -950,15 +950,15 @@ 
 
 			// This is for when JS in not enabled, to make sure that the aspects and services
 			// are re-fetched 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.
@@ -971,26 +971,26 @@ 
 			$this->validate_multi_selects( 'tags_to_post', $input );
 
 			// Get unique, non-empty, trimmed tags and clean them up.
-			$this->validate_tags( $input['global_tags'] );
+			$this->validate_tags( $input[ 'global_tags' ] );
 
 			// Clean up the list of aspects. If the list is empty, only use the 'Public' aspect.
-			$this->validate_aspects_services( $input['aspects'], [ 'public' ] );
+			$this->validate_aspects_services( $input[ 'aspects' ], [ 'public' ] );
 
 			// Clean up the list of services.
-			$this->validate_aspects_services( $input['services'] );
+			$this->validate_aspects_services( $input[ 'services' ] );
 		}
 
 		// Reset to defaults.
-		if ( isset( $input['reset_defaults'] ) ) {
+		if ( isset( $input[ 'reset_defaults' ] ) ) {
 			// Set the input to the default options.
 			$input = self::$_default_options;
 
 			// Don't reset the fetched lists of aspects and services.
-			unset( $input['pod_list'], $input['aspects_list'], $input['services_list'] );
+			unset( $input[ 'pod_list' ], $input[ 'aspects_list' ], $input[ 'services_list' ] );
 		}
 
 		// Unset all unused input fields.
-		unset( $input['submit_defaults'], $input['reset_defaults'], $input['submit_setup'] );
+		unset( $input[ 'submit_defaults' ], $input[ 'reset_defaults' ], $input[ 'submit_setup' ] );
 
 		// Parse inputs with default options and return.
 		return wp_parse_args( $input, array_merge( self::$_default_options, self::$_options ) );
@@ -1048,7 +1048,7 @@ 
 					}
 				}
 			} else {
-				$options[ $select ] = [];
+				$options[ $select ] = [ ];
 			}
 		}
 
@@ -1097,7 +1097,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 {