WordPress Coding Standard fixes

Author: pfefferle

admin_panels.php

@@ -73,9 +73,9 @@ function openid_process_comment( $comment ) {
 	unset( $_SESSION['openid_posted_comment'] );
 
 	if ( ! empty( $openid_url ) ) {  // Comment form's OpenID url is filled in.
-		$_SESSION['openid_comment_post'] = $_POST;
+		$_SESSION['openid_comment_post']                          = $_POST;
 		$_SESSION['openid_comment_post']['comment_author_openid'] = $openid_url;
-		$_SESSION['openid_comment_post']['openid_skip'] = 1;
+		$_SESSION['openid_comment_post']['openid_skip']           = 1;
 
 		openid_start_login( $openid_url, 'comment' );
 
@@ -102,8 +102,8 @@ function openid_process_comment( $comment ) {
  * address.
  */
 function openid_require_name_email( $comment ) {
-	$user = wp_get_current_user();
-	$comment_author = $comment['comment_author'];
+	$user                 = wp_get_current_user();
+	$comment_author       = $comment['comment_author'];
 	$comment_author_email = $comment['comment_author_email'];
 
 	if ( get_option( 'require_name_email' ) && ! $user->ID ) {
@@ -185,9 +185,11 @@ function openid_sanitize_comment_cookies() {
 		// this might be an i-name, so we don't want to run clean_url()
 		remove_filter( 'pre_comment_author_url', 'clean_url' );
 
-		$comment_author_url = apply_filters( 'pre_comment_author_url',
-		$_COOKIE[ 'comment_author_openid_' . COOKIEHASH ] );
-		$comment_author_url = stripslashes( $comment_author_url );
+		$comment_author_url                            = apply_filters(
+			'pre_comment_author_url',
+			$_COOKIE[ 'comment_author_openid_' . COOKIEHASH ]
+		);
+		$comment_author_url                            = stripslashes( $comment_author_url );
 		$_COOKIE[ 'comment_author_url_' . COOKIEHASH ] = $comment_author_url;
 	}
 }
@@ -343,7 +345,7 @@ function openid_finish_comment( $identity_url, $action ) {
  * @param int $id id of comment to set as OpenID
  */
 function set_comment_openid( $id ) {
-	$comment = get_comment( $id );
+	$comment         = get_comment( $id );
 	$openid_comments = get_post_meta( $comment->comment_post_ID, 'openid_comments', true );
 	if ( ! is_array( $openid_comments ) ) {
 		$openid_comments = array();
@@ -359,7 +361,7 @@ function set_comment_openid( $id ) {
  * @param int $id id of comment to set as OpenID
  */
 function unset_comment_openid( $id ) {
-	$comment = get_comment( $id );
+	$comment         = get_comment( $id );
 	$openid_comments = get_post_meta( $comment->comment_post_ID, 'openid_comments', true );
 
 	if ( is_array( $openid_comments ) && in_array( $id, $openid_comments ) ) {
@@ -396,9 +398,9 @@ function openid_get_user_data_form( $data, $identity_url ) {
 	}
 
 	if ( $comment['author'] ) {
-		$data['nickname'] = $comment['author'];
+		$data['nickname']      = $comment['author'];
 		$data['user_nicename'] = $comment['author'];
-		$data['display_name'] = $comment['author'];
+		$data['display_name']  = $comment['author'];
 	}
 
 	return $data;

comments.php

@@ -232,10 +232,10 @@ function openid_customer_error_handler( $errno, $errmsg, $filename, $linenum, $v
  */
 function openid_generate_new_username( $url, $append = true ) {
 	$base = openid_normalize_username( $url );
-	$i = '';
+	$i    = '';
 	while ( true ) {
 		$username = openid_normalize_username( $base . $i );
-		$user = get_user_by( 'login', $username );
+		$user     = get_user_by( 'login', $username );
 		if ( $user ) {
 			if ( ! $append ) {
 				return null;
@@ -349,25 +349,25 @@ function openid_create_new_user( $identity_url, &$user_data ) {
 		$username = openid_generate_new_username( $identity_url );
 	}
 
-	$user_data['user_login'] = $username;
+	$user_data['user_login']   = $username;
 	$user_data['display_name'] = $username;
-	$user_data['user_pass'] = substr( md5( uniqid( microtime() ) ), 0, 7 );
-	$user_id = wp_insert_user( $user_data );
+	$user_data['user_pass']    = substr( md5( uniqid( microtime() ) ), 0, 7 );
+	$user_id                   = wp_insert_user( $user_data );
 
 	if ( $user_id instanceof WP_Error ) {
 		openid_message( $user_id->get_error_message() );
 		openid_status( 'error' );
 		return;
-	} else if ( is_integer( $user_id ) ) { // created ok
+	} elseif ( is_integer( $user_id ) ) { // created ok
 
 		$user_data['ID'] = $user_id;
 		// XXX this all looks redundant, see openid_set_current_user
 
-		$user = new WP_User( $user_id );
+		$user        = new WP_User( $user_id );
 		$credentials = array(
-			'user_login' => $user->user_login,
+			'user_login'    => $user->user_login,
 			'user_password' => $user_data['user_pass'],
-			'remember' => true,
+			'remember'      => true,
 		);
 
 		if ( ! wp_signon( $credentials ) ) {
@@ -419,10 +419,10 @@ function openid_create_new_user( $identity_url, &$user_data ) {
  */
 function openid_get_user_data( $identity_url ) {
 	$data = array(
-		'ID' => null,
-		'user_url' => $identity_url,
+		'ID'            => null,
+		'user_url'      => $identity_url,
 		'user_nicename' => $identity_url,
-		'display_name' => $identity_url,
+		'display_name'  => $identity_url,
 	);
 
 	// create proper website URL if OpenID is an i-name
@@ -462,7 +462,7 @@ function openid_get_user_data_ax( $data, $identity_url ) {
 	require_once( 'Auth/OpenID/AX.php' );
 
 	$response = openid_response();
-	$ax = Auth_OpenID_AX_FetchResponse::fromSuccessResponse( $response );
+	$ax       = Auth_OpenID_AX_FetchResponse::fromSuccessResponse( $response );
 
 	if ( ! $ax ) {
 		return $data;
@@ -475,9 +475,9 @@ function openid_get_user_data_ax( $data, $identity_url ) {
 
 	$nickname = $ax->getSingle( 'http://axschema.org/namePerson/friendly' );
 	if ( $nickname && ! is_a( $nickname, 'Auth_OpenID_AX_Error' ) ) {
-		$data['nickname'] = $ax->getSingle( 'http://axschema.org/namePerson/friendly' );
+		$data['nickname']      = $ax->getSingle( 'http://axschema.org/namePerson/friendly' );
 		$data['user_nicename'] = $ax->getSingle( 'http://axschema.org/namePerson/friendly' );
-		$data['display_name'] = $ax->getSingle( 'http://axschema.org/namePerson/friendly' );
+		$data['display_name']  = $ax->getSingle( 'http://axschema.org/namePerson/friendly' );
 	}
 
 	$fullname = $ax->getSingle( 'http://axschema.org/namePerson' );
@@ -505,9 +505,9 @@ function openid_get_user_data_ax( $data, $identity_url ) {
  */
 function openid_get_user_data_sreg( $data, $identity_url ) {
 	require_once( 'Auth/OpenID/SReg.php' );
-	$response = openid_response();
+	$response  = openid_response();
 	$sreg_resp = Auth_OpenID_SRegResponse::fromSuccessResponse( $response );
-	$sreg = $sreg_resp->contents();
+	$sreg      = $sreg_resp->contents();
 
 	if ( ! $sreg ) {
 		return $data;
@@ -518,9 +518,9 @@ function openid_get_user_data_sreg( $data, $identity_url ) {
 	}
 
 	if ( array_key_exists( 'nickname', $sreg ) && $sreg['nickname'] ) {
-		$data['nickname'] = $sreg['nickname'];
+		$data['nickname']      = $sreg['nickname'];
 		$data['user_nicename'] = $sreg['nickname'];
-		$data['display_name'] = $sreg['nickname'];
+		$data['display_name']  = $sreg['nickname'];
 	}
 
 	if ( array_key_exists( 'fullname', $sreg ) && $sreg['fullname'] ) {
@@ -625,7 +625,7 @@ function openid_clean_request() {
 
 		unset( $_GET['q'] );
 
-		$vars = explode( '&', $_SERVER['QUERY_STRING'] );
+		$vars  = explode( '&', $_SERVER['QUERY_STRING'] );
 		$clean = array();
 
 		foreach ( $vars as $v ) {
@@ -642,7 +642,7 @@ function openid_clean_request() {
 		// This results in the QUERY_STRING not having the correct information, but fortunately we
 		// can pull it out of REQUEST_URI
 
-		list($path, $query) = explode( '?', $_SERVER['REQUEST_URI'], 2 );
+		list($path, $query)      = explode( '?', $_SERVER['REQUEST_URI'], 2 );
 		$_SERVER['QUERY_STRING'] = $query;
 	}
 }

common.php

@@ -21,7 +21,7 @@ function openid_getConsumer() { // phpcs:ignore
 	if ( ! $consumer ) {
 		require_once 'Auth/OpenID/Consumer.php';
 
-		$store = openid_getStore();
+		$store    = openid_getStore();
 		$consumer = new Auth_OpenID_Consumer( $store );
 		if ( null === $consumer ) {
 			openid_error( 'OpenID consumer could not be created properly.' );
@@ -98,7 +98,7 @@ function finish_openid_auth() {
 			openid_status( 'success' );
 
 			$identity_url = $response->identity_url;
-			$escaped_url = htmlspecialchars( $identity_url, ENT_QUOTES );
+			$escaped_url  = htmlspecialchars( $identity_url, ENT_QUOTES );
 			return $escaped_url;
 
 		default:
@@ -124,7 +124,7 @@ function openid_begin_consumer( $url ) {
 		set_error_handler( 'openid_customer_error_handler' );
 
 		$consumer = openid_getConsumer();
-		$request = $consumer->begin( $url );
+		$request  = $consumer->begin( $url );
 
 		restore_error_handler();
 	}
@@ -150,16 +150,18 @@ function openid_start_login( $claimed_url, $action, $finish_url = null ) {
 
 	if ( null === $auth_request ) {
 		openid_status( 'error' );
-		openid_message(sprintf(
-			__( 'Could not discover an OpenID identity server endpoint at the url: %s', 'openid' ),
-			htmlentities( $claimed_url )
-		));
+		openid_message(
+			sprintf(
+				__( 'Could not discover an OpenID identity server endpoint at the url: %s', 'openid' ),
+				htmlentities( $claimed_url )
+			)
+		);
 
 		return;
 	}
 
 	@session_start();
-	$_SESSION['openid_action'] = $action;
+	$_SESSION['openid_action']     = $action;
 	$_SESSION['openid_finish_url'] = $finish_url;
 
 	$extensions = apply_filters( 'openid_auth_request_extensions', array(), $auth_request );
@@ -192,7 +194,7 @@ function openid_add_ax_extension( $extensions, $auth_request ) {
 				Auth_OpenID_AX_AttrInfo::make( 'http://axschema.org/contact/email', 1, true ),
 				Auth_OpenID_AX_AttrInfo::make( 'http://axschema.org/namePerson', 1, true ),
 			);
-			$fields = apply_filters( 'openid_consumer_ax_fields', $default_fields );
+			$fields         = apply_filters( 'openid_consumer_ax_fields', $default_fields );
 
 			$ax_request = new Auth_OpenID_AX_FetchRequest();
 			foreach ( $fields as $field ) {
@@ -218,8 +220,8 @@ function openid_add_sreg_extension( $extensions, $auth_request ) {
 		require_once( 'Auth/OpenID/SReg.php' );
 
 		if ( $auth_request->endpoint->usesExtension( Auth_OpenID_SREG_NS_URI_1_0 ) || $auth_request->endpoint->usesExtension( Auth_OpenID_SREG_NS_URI_1_1 ) ) {
-			$required = apply_filters( 'openid_consumer_sreg_required_fields', array() );
-			$optional = apply_filters( 'openid_consumer_sreg_optional_fields', array( 'nickname', 'email', 'fullname' ) );
+			$required     = apply_filters( 'openid_consumer_sreg_required_fields', array() );
+			$optional     = apply_filters( 'openid_consumer_sreg_optional_fields', array( 'nickname', 'email', 'fullname' ) );
 			$extensions[] = Auth_OpenID_SRegRequest::build( $required, $optional );
 		}
 	}