noplanman / wp-to-diaspora

lib/class-options.php

Spacing +27 added lines, -27 removed lines

@@ -104,7 +104,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() ) {
@@ -124,11 +124,11 @@ 
 		// 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' );
+			$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">';
@@ -220,7 +220,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;';
@@ -598,7 +598,7 @@ 
 		<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>
-			<option value="post"   <?php selected( in_array( 'post',   $tags_to_post ) ); ?>><?php esc_html_e( 'Post tags',   'wp-to-diaspora' ); ?></option>
+			<option value="post"   <?php selected( in_array( 'post', $tags_to_post ) ); ?>><?php esc_html_e( 'Post tags', 'wp-to-diaspora' ); ?></option>
 		</select>
 
 		<?php if ( $on_settings_page ) : ?>
@@ -664,14 +664,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 ) ?: array();
+		$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 );
@@ -798,30 +798,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'] = array();
+		if ( isset( $input[ 'submit_defaults' ] ) ) {
+			if ( ! isset( $input[ 'enabled_post_types' ] ) ) {
+				$input[ 'enabled_post_types' ] = array();
 			}
 
 			// Checkboxes.
@@ -834,29 +834,29 @@ 
 			$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'], array( 'public' ) );
+			$this->validate_aspects_services( $input[ 'aspects' ], array( '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['aspects_list'] );
-			unset( $input['services_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'] );
+		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 ) );

lib/class-contextual-help.php

Spacing +15 added lines, -15 removed lines

@@ -41,11 +41,11 @@ 
 	 * @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/DiasPHPora/wp-to-diaspora' ) );
-		define( 'WP2D_EXT_DONATE',        esc_url( 'https://github.com/DiasPHPora/wp-to-diaspora#donate' ) );
-		define( 'WP2D_EXT_GH_ISSUES',     esc_url( 'https://github.com/DiasPHPora/wp-to-diaspora/issues' ) );
+		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/DiasPHPora/wp-to-diaspora' ) );
+		define( 'WP2D_EXT_DONATE', esc_url( 'https://github.com/DiasPHPora/wp-to-diaspora#donate' ) );
+		define( 'WP2D_EXT_GH_ISSUES', esc_url( 'https://github.com/DiasPHPora/wp-to-diaspora/issues' ) );
 		define( 'WP2D_EXT_GH_ISSUES_NEW', esc_url( 'https://github.com/DiasPHPora/wp-to-diaspora/issues/new' ) );
 	}
 
@@ -89,10 +89,10 @@ 
 		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>
+				<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>'
 		);
 	}
@@ -150,7 +150,7 @@ 
 							<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' ) . '
+								<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' ) . '
@@ -217,10 +217,10 @@ 
 			'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>
-					<li><a href="' . WP2D_EXT_GH_ISSUES_NEW . '" target="_blank">' . esc_html__( 'Suggest a new feature', 'wp-to-diaspora' )  . '</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>
+					<li><a href="' . WP2D_EXT_GH_ISSUES_NEW . '" target="_blank">' . esc_html__( 'Report a bug', 'wp-to-diaspora' ) . '</a>
+					<li><a href="' . WP2D_EXT_GH_ISSUES_NEW . '" target="_blank">' . esc_html__( 'Suggest a new feature', 'wp-to-diaspora' ) . '</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>',
 		) );
 	}
@@ -250,7 +250,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 +8 added lines, -8 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( $GLOBALS['wp_version'], $this->_min_wp, '<' )
+		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;
@@ -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
 	}
@@ -236,7 +236,7 @@ 
 				$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 ),
+					( ( false !== strpos( $tags_to_post_old, 'p' ) ) ? 'post' : null ),
 				) );
 				$options->set_option( 'tags_to_post', $tags_to_post );
 			}
@@ -290,7 +290,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;
 	}
 
@@ -378,7 +378,7 @@ 
 	 * @todo esc_html
 	 */
 	public function check_pod_connection_status_callback() {
-		if ( isset( $_REQUEST['debugging'] ) && ! defined( 'WP2D_DEBUGGING' ) ) {
+		if ( isset( $_REQUEST[ 'debugging' ] ) && ! defined( 'WP2D_DEBUGGING' ) ) {
 			define( 'WP2D_DEBUGGING', true );
 		}
 
@@ -392,7 +392,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.